/[gentoo-x86]/eclass/eutils.eclass
Gentoo

Diff of /eclass/eutils.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.149 Revision 1.182
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.149 2005/02/04 21:24:53 chriswhite Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.182 2005/06/11 00:02:26 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
… …
11 11
12inherit multilib 12inherit multilib
13ECLASS=eutils 13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS" 14INHERITED="$INHERITED $ECLASS"
15 15
16DEPEND="!bootstrap? ( sys-devel/patch )" 16DEPEND="!bootstrap? ( sys-devel/patch userland_GNU? ( sys-apps/shadow ) )"
17# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 18
18DESCRIPTION="Based on the ${ECLASS} eclass" 19DESCRIPTION="Based on the ${ECLASS} eclass"
19
20# ecpu_check
21# Usage:
22#
23# ecpu_check array_of_cpu_flags
24#
25# array_of_cpu_flags - An array of cpu flags to check against USE flags
26#
27# Checks user USE related cpu flags against /proc/cpuinfo. If user enables a
28# cpu flag that is not supported in their processor flags, it will warn the
29# user if CROSSCOMPILE is not set to 1 ( because cross compile users are
30# obviously using different cpu flags than their own cpu ). Examples:
31#
32# CPU_FLAGS=(mmx mmx2 sse sse2)
33# ecpu_check CPU_FLAGS
34# Chris White <chriswhite@gentoo.org> (03 Feb 2005)
35
36ecpu_check() {
37 # Think about changing below to: if [ "${CROSSCOMPILE}" -ne 1 -a -e "/proc/cpuinfo" ]
38 # and dropping the else if you do not plan on adding anything to that
39 # empty block ....
40 # PS: also try to add some quoting, and consider rather using ${foo} than $foo ...
41 if [ "${CROSSCOMPILE}" != "1" -a -e "/proc/cpuinfo" ]
42 then
43 CPU_FLAGS=${1}
44 USER_CPU=`grep "flags" /proc/cpuinfo`
45
46 for flags in `seq 1 ${#CPU_FLAGS[@]}`
47 do
48 if has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && ! has ${CPU_FLAGS[${flags} - 1]} ${USE}
49 then
50 ewarn "Your system is ${CPU_FLAGS[${flags} - 1]} capable but you don't have it enabled!"
51 ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
52 fi
53
54 if ! has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && has ${CPU_FLAGS[${flags} -1]} ${USE}
55 then
56 ewarn "You have ${CPU_FLAGS[${flags} - 1]} support enabled but your processor doesn't"
57 ewarn "Seem to support it! You might be cross compiling or do not have /proc filesystem"
58 ewarn "enabled. If either is the case, set CROSSCOMPILE to 1 to disable this warning."
59 fi
60 done
61 fi
62}
63 20
64# Wait for the supplied number of seconds. If no argument is supplied, defaults 21# Wait for the supplied number of seconds. If no argument is supplied, defaults
65# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 22# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
66# outputting to a terminal, don't wait. For compatability purposes, the argument 23# outputting to a terminal, don't wait. For compatability purposes, the argument
67# must be an integer greater than zero. 24# must be an integer greater than zero.
… …
109gen_usr_ldscript() { 66gen_usr_ldscript() {
110 local libdir="$(get_libdir)" 67 local libdir="$(get_libdir)"
111 # Just make sure it exists 68 # Just make sure it exists
112 dodir /usr/${libdir} 69 dodir /usr/${libdir}
113 70
71 for lib in "${@}" ; do
114 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 72 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
115/* GNU ld script 73 /* GNU ld script
116 Because Gentoo have critical dynamic libraries 74 Since Gentoo has critical dynamic libraries
117 in /lib, and the static versions in /usr/lib, we 75 in /lib, and the static versions in /usr/lib,
118 need to have a "fake" dynamic lib in /usr/lib, 76 we need to have a "fake" dynamic lib in /usr/lib,
119 otherwise we run into linking problems. 77 otherwise we run into linking problems.
120 See bug #4411 on http://bugs.gentoo.org/ for 78
121 more info. */ 79 See bug http://bugs.gentoo.org/4411 for more info.
80 */
122GROUP ( /${libdir}/${1} ) 81 GROUP ( /${libdir}/${lib} )
123END_LDSCRIPT 82 END_LDSCRIPT
124 fperms a+x "/usr/${libdir}/${1}" 83 fperms a+x "/usr/${libdir}/${lib}"
84 done
125} 85}
126 86
127# Simple function to draw a line consisting of '=' the same length as $* 87# Simple function to draw a line consisting of '=' the same length as $*
88# - only to be used by epatch()
128# 89#
129# <azarah@gentoo.org> (11 Nov 2002) 90# <azarah@gentoo.org> (11 Nov 2002)
130# 91#
131draw_line() { 92draw_line() {
132 local i=0 93 local i=0
… …
158EPATCH_SOURCE="${WORKDIR}/patch" 119EPATCH_SOURCE="${WORKDIR}/patch"
159# Default extension for patches 120# Default extension for patches
160EPATCH_SUFFIX="patch.bz2" 121EPATCH_SUFFIX="patch.bz2"
161# Default options for patch 122# Default options for patch
162# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 123# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
163EPATCH_OPTS="-g0" 124# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
125EPATCH_OPTS="-g0 --no-backup-if-mismatch"
164# List of patches not to apply. Not this is only file names, 126# List of patches not to apply. Not this is only file names,
165# and not the full path .. 127# and not the full path ..
166EPATCH_EXCLUDE="" 128EPATCH_EXCLUDE=""
167# Change the printed message for a single patch. 129# Change the printed message for a single patch.
168EPATCH_SINGLE_MSG="" 130EPATCH_SINGLE_MSG=""
131# Change the printed message for multiple patches.
132EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
169# Force applying bulk patches even if not following the style: 133# Force applying bulk patches even if not following the style:
170# 134#
171# ??_${ARCH}_foo.${EPATCH_SUFFIX} 135# ??_${ARCH}_foo.${EPATCH_SUFFIX}
172# 136#
173EPATCH_FORCE="no" 137EPATCH_FORCE="no"
… …
214 local x="" 178 local x=""
215 179
216 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
217 then 181 then
218 local m="" 182 local m=""
219 einfo "${#} patches to apply ..."
220 for m in "$@" ; do 183 for m in "$@" ; do
221 epatch "${m}" 184 epatch "${m}"
222 done 185 done
223 return 0 186 return 0
224 fi 187 fi
… …
278 ;; 241 ;;
279 esac 242 esac
280 243
281 if [ "${SINGLE_PATCH}" = "no" ] 244 if [ "${SINGLE_PATCH}" = "no" ]
282 then 245 then
283 einfo "Applying various patches (bugfixes/updates) ..." 246 einfo "${EPATCH_MULTI_MSG}"
284 fi 247 fi
285 for x in ${EPATCH_SOURCE} 248 for x in ${EPATCH_SOURCE}
286 do 249 do
287 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
288 # 251 #
289 # ???_arch_foo.patch 252 # ???_arch_foo.patch
290 # 253 #
291 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
292 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 255 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
293 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
294 then 257 then
295 local count=0 258 local count=0
296 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
260 local patchname=${x##*/}
297 261
298 if [ -n "${EPATCH_EXCLUDE}" ] 262 if [ -n "${EPATCH_EXCLUDE}" ]
299 then 263 then
300 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 264 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
301 then 265 then
302 continue 266 continue
303 fi 267 fi
304 fi 268 fi
305 269
… …
307 then 271 then
308 if [ -n "${EPATCH_SINGLE_MSG}" ] 272 if [ -n "${EPATCH_SINGLE_MSG}" ]
309 then 273 then
310 einfo "${EPATCH_SINGLE_MSG}" 274 einfo "${EPATCH_SINGLE_MSG}"
311 else 275 else
312 einfo "Applying ${x##*/} ..." 276 einfo "Applying ${patchname} ..."
313 fi 277 fi
314 else 278 else
315 einfo " ${x##*/} ..." 279 einfo " ${patchname} ..."
316 fi 280 fi
317 281
318 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
319 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
320 284
321 # Allow for prefix to differ ... im lazy, so shoot me :/ 285 # Allow for prefix to differ ... im lazy, so shoot me :/
322 while [ "${count}" -lt 5 ] 286 while [ "${count}" -lt 5 ]
323 do 287 do
324 # Generate some useful debug info ... 288 # Generate some useful debug info ...
325 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
326 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
327 291
328 if [ "${PATCH_SUFFIX}" != "patch" ] 292 if [ "${PATCH_SUFFIX}" != "patch" ]
329 then 293 then
330 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
332 else 296 else
333 PATCH_TARGET="${x}" 297 PATCH_TARGET="${x}"
334 fi 298 fi
335 299
336 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 302
339 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
340 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
341 305
342 if [ "${PATCH_SUFFIX}" != "patch" ] 306 if [ "${PATCH_SUFFIX}" != "patch" ]
343 then 307 then
344 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
345 then 309 then
346 echo 310 echo
347 eerror "Could not extract patch!" 311 eerror "Could not extract patch!"
348 #die "Could not extract patch!" 312 #die "Could not extract patch!"
349 count=5 313 count=5
350 break 314 break
351 fi 315 fi
352 fi 316 fi
353 317
354 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
355 then 319 then
356 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
357 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
358 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
359 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
360 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
361 325
362 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
363 327
364 if [ "$?" -ne 0 ] 328 if [ "$?" -ne 0 ]
365 then 329 then
366 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
367 echo 331 echo
368 eerror "A dry-run of patch command succeeded, but actually" 332 eerror "A dry-run of patch command succeeded, but actually"
369 eerror "applying the patch failed!" 333 eerror "applying the patch failed!"
370 #die "Real world sux compared to the dreamworld!" 334 #die "Real world sux compared to the dreamworld!"
371 count=5 335 count=5
372 fi 336 fi
373 337
374 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 338 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
375 339
376 break 340 break
377 fi 341 fi
378 342
379 count=$((count + 1)) 343 count=$((count + 1))
… …
385 fi 349 fi
386 350
387 if [ "${count}" -eq 5 ] 351 if [ "${count}" -eq 5 ]
388 then 352 then
389 echo 353 echo
390 eerror "Failed Patch: ${x##*/}!" 354 eerror "Failed Patch: ${patchname} !"
355 eerror " ( ${PATCH_TARGET} )"
391 eerror 356 eerror
392 eerror "Include in your bugreport the contents of:" 357 eerror "Include in your bugreport the contents of:"
393 eerror 358 eerror
394 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 359 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
395 echo 360 echo
396 die "Failed Patch: ${x##*/}!" 361 die "Failed Patch: ${patchname}!"
397 fi 362 fi
398 363
399 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 364 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
400 365
401 eend 0 366 eend 0
402 fi 367 fi
403 done 368 done
404 if [ "${SINGLE_PATCH}" = "no" ] 369 if [ "${SINGLE_PATCH}" = "no" ]
405 then 370 then
406 einfo "Done with patching" 371 einfo "Done with patching"
407 fi
408}
409
410# This function return true if we are using the NPTL pthreads
411# implementation.
412#
413# <azarah@gentoo.org> (06 March 2003)
414#
415have_NPTL() {
416 cat > ${T}/test-nptl.c <<-"END"
417 #define _XOPEN_SOURCE
418 #include <unistd.h>
419 #include <stdio.h>
420
421 int main()
422 {
423 char buf[255];
424 char *str = buf;
425
426 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
427 if (NULL != str) {
428 printf("%s\n", str);
429 if (NULL != strstr(str, "NPTL"))
430 return 0;
431 }
432
433 return 1;
434 }
435 END
436
437 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
438 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
439 then
440 echo "yes"
441 einfon "Checking what PTHREADS implementation we have ..."
442 if ${T}/nptl
443 then
444 return 0
445 else
446 return 1
447 fi
448 else
449 echo "no"
450 fi
451
452 return 1
453}
454
455# This function check how many cpu's are present, and then set
456# -j in MAKEOPTS accordingly.
457#
458# Thanks to nall <nall@gentoo.org> for this.
459#
460get_number_of_jobs() {
461 local jobs=0
462
463 if [ ! -r /proc/cpuinfo ]
464 then
465 return 1
466 fi
467
468 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
469 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
470 then
471 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
472 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
473 ADMINPARAM="${ADMINPARAM/-j}"
474 fi
475
476 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
477
478 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
479 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
480 then
481 # these archs will always have "[Pp]rocessor"
482 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
483
484 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
485 then
486 # sparc always has "ncpus active"
487 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
488
489 elif [ "${ARCH}" = "alpha" ]
490 then
491 # alpha has "cpus active", but only when compiled with SMP
492 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
493 then
494 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
495 else
496 jobs=2
497 fi
498
499 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
500 then
501 # ppc has "processor", but only when compiled with SMP
502 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
503 then
504 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
505 else
506 jobs=2
507 fi
508 elif [ "${ARCH}" = "s390" ]
509 then
510 # s390 has "# processors : "
511 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
512 else
513 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
514 die "Unknown ARCH -- ${ARCH}!"
515 fi
516
517 # Make sure the number is valid ...
518 if [ "${jobs}" -lt 1 ]
519 then
520 jobs=1
521 fi
522
523 if [ -n "${ADMINPARAM}" ]
524 then
525 if [ "${jobs}" -gt "${ADMINPARAM}" ]
526 then
527 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
528 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
529 else
530 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
531 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
532 fi
533 fi 372 fi
534} 373}
535 374
536# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
537# does not exist on the users system 376# does not exist on the users system
… …
571# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
572# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
573# 412#
574# egetent(database, key) 413# egetent(database, key)
575egetent() { 414egetent() {
576 if useq ppc-macos ; then 415 if [[ "${USERLAND}" == "Darwin" ]] ; then
577 case "$2" in 416 case "$2" in
578 *[!0-9]*) # Non numeric 417 *[!0-9]*) # Non numeric
579 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 418 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
580 ;; 419 ;;
581 *) # Numeric 420 *) # Numeric
582 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 421 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
583 ;; 422 ;;
584 esac 423 esac
585 elif useq x86-fbsd ; then 424 elif [[ "${USERLAND}" == "BSD" ]] ; then
586 local action 425 local action
587 if [ "$1" == "passwd" ] 426 if [ "$1" == "passwd" ]
588 then 427 then
589 action="user" 428 action="user"
590 else 429 else
… …
610# homedir: /dev/null 449# homedir: /dev/null
611# groups: none 450# groups: none
612# extra: comment of 'added by portage for ${PN}' 451# extra: comment of 'added by portage for ${PN}'
613enewuser() { 452enewuser() {
614 # get the username 453 # get the username
615 local euser="$1"; shift 454 local euser=$1; shift
616 if [ -z "${euser}" ] 455 if [[ -z ${euser} ]] ; then
617 then
618 eerror "No username specified !" 456 eerror "No username specified !"
619 die "Cannot call enewuser without a username" 457 die "Cannot call enewuser without a username"
620 fi 458 fi
621 459
622 # lets see if the username already exists 460 # lets see if the username already exists
623 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 461 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
624 then
625 return 0 462 return 0
626 fi 463 fi
627 einfo "Adding user '${euser}' to your system ..." 464 einfo "Adding user '${euser}' to your system ..."
628 465
629 # options to pass to useradd 466 # options to pass to useradd
630 local opts= 467 local opts=
631 468
632 # handle uid 469 # handle uid
633 local euid="$1"; shift 470 local euid=$1; shift
634 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 471 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
635 then
636 if [ "${euid}" -gt 0 ] 472 if [[ ${euid} -gt 0 ]] ; then
637 then
638 if [ ! -z "`egetent passwd ${euid}`" ] 473 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
639 then
640 euid="next" 474 euid="next"
641 fi 475 fi
642 else 476 else
643 eerror "Userid given but is not greater than 0 !" 477 eerror "Userid given but is not greater than 0 !"
644 die "${euid} is not a valid UID" 478 die "${euid} is not a valid UID"
645 fi 479 fi
646 else 480 else
647 euid="next" 481 euid="next"
648 fi 482 fi
649 if [ "${euid}" == "next" ] 483 if [[ ${euid} == "next" ]] ; then
650 then
651 local pwrange 484 local pwrange
652 if [ "${USERLAND}" == "BSD" ] ; then 485 if [[ ${USERLAND} == "BSD" ]] ; then
653 pwrange="`jot 898 101`" 486 pwrange=$(jot 898 101)
654 else 487 else
655 pwrange="`seq 101 999`" 488 pwrange=$(seq 101 999)
656 fi 489 fi
657 for euid in ${pwrange} ; do 490 for euid in ${pwrange} ; do
658 [ -z "`egetent passwd ${euid}`" ] && break 491 [[ -z $(egetent passwd ${euid}) ]] && break
659 done 492 done
660 fi 493 fi
661 opts="${opts} -u ${euid}" 494 opts="${opts} -u ${euid}"
662 einfo " - Userid: ${euid}" 495 einfo " - Userid: ${euid}"
663 496
664 # handle shell 497 # handle shell
665 local eshell="$1"; shift 498 local eshell=$1; shift
666 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
667 then
668 if [ ! -e "${eshell}" ] 500 if [[ ! -e ${eshell} ]] ; then
669 then
670 eerror "A shell was specified but it does not exist !" 501 eerror "A shell was specified but it does not exist !"
671 die "${eshell} does not exist" 502 die "${eshell} does not exist"
672 fi 503 fi
673 else 504 else
674 if [ "${USERLAND}" == "BSD" ] 505 case ${USERLAND} in
675 then
676 eshell="/usr/bin/false" 506 Darwin) eshell="/usr/bin/false";;
677 else 507 BSD) eshell="/usr/sbin/nologin";;
678 eshell="/bin/false" 508 *) eshell="/bin/false";;
679 fi 509 esac
680 fi 510 fi
681 einfo " - Shell: ${eshell}" 511 einfo " - Shell: ${eshell}"
682 opts="${opts} -s ${eshell}" 512 opts="${opts} -s ${eshell}"
683 513
684 # handle homedir 514 # handle homedir
685 local ehome="$1"; shift 515 local ehome=$1; shift
686 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 516 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
687 then
688 ehome="/dev/null" 517 ehome="/dev/null"
689 fi 518 fi
690 einfo " - Home: ${ehome}" 519 einfo " - Home: ${ehome}"
691 opts="${opts} -d ${ehome}" 520 opts="${opts} -d ${ehome}"
692 521
693 # handle groups 522 # handle groups
694 local egroups="$1"; shift 523 local egroups=$1; shift
695 if [ ! -z "${egroups}" ] 524 if [[ ! -z ${egroups} ]] ; then
696 then
697 local oldifs="${IFS}" 525 local oldifs=${IFS}
698 local defgroup="" exgroups="" 526 local defgroup="" exgroups=""
699 527
700 export IFS="," 528 export IFS=","
701 for g in ${egroups} 529 for g in ${egroups} ; do
702 do
703 export IFS="${oldifs}" 530 export IFS=${oldifs}
704 if [ -z "`egetent group \"${g}\"`" ] 531 if [[ -z $(egetent group "${g}") ]] ; then
705 then
706 eerror "You must add group ${g} to the system first" 532 eerror "You must add group ${g} to the system first"
707 die "${g} is not a valid GID" 533 die "${g} is not a valid GID"
708 fi 534 fi
709 if [ -z "${defgroup}" ] 535 if [[ -z ${defgroup} ]] ; then
710 then
711 defgroup="${g}" 536 defgroup=${g}
712 else 537 else
713 exgroups="${exgroups},${g}" 538 exgroups="${exgroups},${g}"
714 fi 539 fi
715 export IFS="," 540 export IFS=","
716 done 541 done
717 export IFS="${oldifs}" 542 export IFS=${oldifs}
718 543
719 opts="${opts} -g ${defgroup}" 544 opts="${opts} -g ${defgroup}"
720 if [ ! -z "${exgroups}" ] 545 if [[ ! -z ${exgroups} ]] ; then
721 then
722 opts="${opts} -G ${exgroups:1}" 546 opts="${opts} -G ${exgroups:1}"
723 fi 547 fi
724 else 548 else
725 egroups="(none)" 549 egroups="(none)"
726 fi 550 fi
727 einfo " - Groups: ${egroups}" 551 einfo " - Groups: ${egroups}"
728 552
729 # handle extra and add the user 553 # handle extra and add the user
730 local eextra="$@"
731 local oldsandbox="${SANDBOX_ON}" 554 local oldsandbox=${SANDBOX_ON}
732 export SANDBOX_ON="0" 555 export SANDBOX_ON="0"
733 if useq ppc-macos 556 case ${USERLAND} in
734 then 557 Darwin)
735 ### Make the user 558 ### Make the user
736 if [ -z "${eextra}" ] 559 if [[ -z $@ ]] ; then
737 then
738 dscl . create /users/${euser} uid ${euid} 560 dscl . create /users/${euser} uid ${euid}
739 dscl . create /users/${euser} shell ${eshell} 561 dscl . create /users/${euser} shell ${eshell}
740 dscl . create /users/${euser} home ${ehome} 562 dscl . create /users/${euser} home ${ehome}
741 dscl . create /users/${euser} realname "added by portage for ${PN}" 563 dscl . create /users/${euser} realname "added by portage for ${PN}"
742 ### Add the user to the groups specified 564 ### Add the user to the groups specified
743 local oldifs="${IFS}" 565 local oldifs=${IFS}
744 export IFS="," 566 export IFS=","
745 for g in ${egroups} 567 for g in ${egroups} ; do
746 do
747 dscl . merge /groups/${g} users ${euser} 568 dscl . merge /groups/${g} users ${euser}
748 done 569 done
749 export IFS="${oldifs}" 570 export IFS=${oldifs}
750 else 571 else
751 einfo "Extra options are not supported on macos yet" 572 einfo "Extra options are not supported on Darwin yet"
752 einfo "Please report the ebuild along with the info below" 573 einfo "Please report the ebuild along with the info below"
753 einfo "eextra: ${eextra}" 574 einfo "eextra: $@"
754 die "Required function missing" 575 die "Required function missing"
755 fi 576 fi
756 elif use x86-fbsd ; then 577 ;;
757 if [ -z "${eextra}" ] 578 BSD)
758 then 579 if [[ -z $@ ]] ; then
759 pw useradd ${euser} ${opts} \ 580 pw useradd ${euser} ${opts} \
760 -c "added by portage for ${PN}" \ 581 -c "added by portage for ${PN}" \
761 die "enewuser failed" 582 die "enewuser failed"
762 else 583 else
763 einfo " - Extra: ${eextra}" 584 einfo " - Extra: $@"
764 pw useradd ${euser} ${opts} \ 585 pw useradd ${euser} ${opts} \
765 -c ${eextra} || die "enewuser failed" 586 "$@" || die "enewuser failed"
766 fi 587 fi
767 else 588 ;;
768 if [ -z "${eextra}" ] 589 *)
769 then 590 if [[ -z $@ ]] ; then
770 useradd ${opts} ${euser} \ 591 useradd ${opts} ${euser} \
771 -c "added by portage for ${PN}" \ 592 -c "added by portage for ${PN}" \
772 || die "enewuser failed" 593 || die "enewuser failed"
773 else 594 else
774 einfo " - Extra: ${eextra}" 595 einfo " - Extra: $@"
775 useradd ${opts} ${euser} ${eextra} \ 596 useradd ${opts} ${euser} "$@" \
776 || die "enewuser failed" 597 || die "enewuser failed"
777 fi 598 fi
778 fi 599 ;;
600 esac
779 export SANDBOX_ON="${oldsandbox}" 601 export SANDBOX_ON=${oldsandbox}
780 602
781 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 603 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
782 then 604 then
783 einfo " - Creating ${ehome} in ${D}" 605 einfo " - Creating ${ehome} in ${D}"
784 dodir ${ehome} 606 dodir ${ehome}
… …
821 then 643 then
822 if [ "${egid}" -gt 0 ] 644 if [ "${egid}" -gt 0 ]
823 then 645 then
824 if [ -z "`egetent group ${egid}`" ] 646 if [ -z "`egetent group ${egid}`" ]
825 then 647 then
826 if useq ppc-macos ; then 648 if [[ "${USERLAND}" == "Darwin" ]]; then
827 opts="${opts} ${egid}" 649 opts="${opts} ${egid}"
828 else 650 else
829 opts="${opts} -g ${egid}" 651 opts="${opts} -g ${egid}"
830 fi 652 fi
831 else 653 else
… …
845 opts="${opts} ${eextra}" 667 opts="${opts} ${eextra}"
846 668
847 # add the group 669 # add the group
848 local oldsandbox="${SANDBOX_ON}" 670 local oldsandbox="${SANDBOX_ON}"
849 export SANDBOX_ON="0" 671 export SANDBOX_ON="0"
850 if useq ppc-macos ; then 672 if [[ "${USERLAND}" == "Darwin" ]]; then
851 if [ ! -z "${eextra}" ]; 673 if [ ! -z "${eextra}" ];
852 then 674 then
853 einfo "Extra options are not supported on macos yet" 675 einfo "Extra options are not supported on Darwin/OS X yet"
854 einfo "Please report the ebuild along with the info below" 676 einfo "Please report the ebuild along with the info below"
855 einfo "eextra: ${eextra}" 677 einfo "eextra: ${eextra}"
856 die "Required function missing" 678 die "Required function missing"
857 fi 679 fi
858 680
… …
863 [ -z "`egetent group ${egid}`" ] && break 685 [ -z "`egetent group ${egid}`" ] && break
864 done 686 done
865 esac 687 esac
866 dscl . create /groups/${egroup} gid ${egid} 688 dscl . create /groups/${egroup} gid ${egid}
867 dscl . create /groups/${egroup} passwd '*' 689 dscl . create /groups/${egroup} passwd '*'
868 elif use x86-fbsd ; then 690 elif [[ "${USERLAND}" == "BSD" ]] ; then
869 case ${egid} in 691 case ${egid} in
870 *[!0-9]*) # Non numeric 692 *[!0-9]*) # Non numeric
871 for egid in `jot 898 101`; do 693 for egid in `jot 898 101`; do
872 [ -z "`egetent group ${egid}`" ] && break 694 [ -z "`egetent group ${egid}`" ] && break
873 done 695 done
… …
908# name: the name that will show up in the menu 730# name: the name that will show up in the menu
909# icon: give your little like a pretty little icon ... 731# icon: give your little like a pretty little icon ...
910# this can be relative (to /usr/share/pixmaps) or 732# this can be relative (to /usr/share/pixmaps) or
911# a full path to an icon 733# a full path to an icon
912# type: what kind of application is this ? for categories: 734# type: what kind of application is this ? for categories:
913# http://www.freedesktop.org/standards/menu-spec/ 735# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
914# path: if your app needs to startup in a specific dir 736# path: if your app needs to startup in a specific dir
915make_desktop_entry() { 737make_desktop_entry() {
916 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 738 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
917 739
918 local exec="${1}" 740 local exec=${1}
919 local name="${2:-${PN}}" 741 local name=${2:-${PN}}
920 local icon="${3:-${PN}.png}" 742 local icon=${3:-${PN}.png}
921 local type="${4}" 743 local type=${4}
922 local subdir="${6}" 744 local path=${5}
923 local path="${5:-${GAMES_BINDIR}}" 745
924 if [ -z "${type}" ] 746 if [[ -z ${type} ]] ; then
925 then 747 local catmaj=${CATEGORY%%-*}
926 case ${CATEGORY} in 748 local catmin=${CATEGORY##*-}
927 "app-emulation") 749 case ${catmaj} in
928 type=Emulator 750 app)
929 subdir="Emulation" 751 case ${catmin} in
752 admin) type=System;;
753 cdr) type=DiscBurning;;
754 dicts) type=Dictionary;;
755 editors) type=TextEditor;;
756 emacs) type=TextEditor;;
757 emulation) type=Emulator;;
758 laptop) type=HardwareSettings;;
759 office) type=Office;;
760 vim) type=TextEditor;;
761 xemacs) type=TextEditor;;
762 *) type=;;
763 esac
930 ;; 764 ;;
931 "games-"*) 765
932 type=Game 766 dev)
933 subdir="Games" 767 type="Development"
934 ;; 768 ;;
935 "net-"*) 769
936 type=Network 770 games)
937 subdir="${type}" 771 [[ -z ${path} ]] && path=${GAMES_BINDIR}
772
773 case ${catmin} in
774 action) type=ActionGame;;
775 arcade) type=ArcadeGame;;
776 board) type=BoardGame;;
777 kid) type=KidsGame;;
778 emulation) type=Emulator;;
779 puzzle) type=LogicGame;;
780 rpg) type=RolePlaying;;
781 roguelike) type=RolePlaying;;
782 simulation) type=Simulation;;
783 sports) type=SportsGame;;
784 strategy) type=StrategyGame;;
785 *) type=;;
786 esac
787 type="Game;${type}"
938 ;; 788 ;;
789
790 mail)
791 type="Network;Email"
792 ;;
793
794 media)
795 case ${catmin} in
796 gfx) type=Graphics;;
797 radio) type=Tuner;;
798 sound) type=Audio;;
799 tv) type=TV;;
800 video) type=Video;;
801 *) type=;;
802 esac
803 type="AudioVideo;${type}"
804 ;;
805
806 net)
807 case ${catmin} in
808 dialup) type=Dialup;;
809 ftp) type=FileTransfer;;
810 im) type=InstantMessaging;;
811 irc) type=IRCClient;;
812 mail) type=Email;;
813 news) type=News;;
814 nntp) type=News;;
815 p2p) type=FileTransfer;;
816 *) type=;;
817 esac
818 type="Network;${type}"
819 ;;
820
821 sci)
822 case ${catmin} in
823 astro*) type=Astronomoy;;
824 bio*) type=Biology;;
825 calc*) type=Calculator;;
826 chem*) type=Chemistry;;
827 geo*) type=Geology;;
828 math*) type=Math;;
829 *) type=;;
830 esac
831 type="Science;${type}"
832 ;;
833
834 www)
835 case ${catmin} in
836 client) type=WebBrowser;;
837 *) type=;;
838 esac
839 type="Network"
840 ;;
841
939 *) 842 *)
940 type= 843 type=
941 subdir=
942 ;; 844 ;;
943 esac 845 esac
944 fi 846 fi
847 if [ "${SLOT}" == "0" ] ; then
848 local desktop_name="${PN}"
849 else
850 local desktop_name="${PN}-${SLOT}"
851 fi
945 local desktop="${T}/${exec}.desktop" 852 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
946 853
947echo "[Desktop Entry] 854echo "[Desktop Entry]
948Encoding=UTF-8 855Encoding=UTF-8
949Version=0.9.2 856Version=0.9.2
950Name=${name} 857Name=${name}
… …
966# make_desktop_entry(<title>, <command>) 873# make_desktop_entry(<title>, <command>)
967# title: File to execute to start the Window Manager 874# title: File to execute to start the Window Manager
968# command: Name of the Window Manager 875# command: Name of the Window Manager
969 876
970make_session_desktop() { 877make_session_desktop() {
971
972 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 878 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
973 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 879 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
974 880
975 local title="${1}" 881 local title=$1
976 local command="${2}" 882 local command=$2
977 local desktop="${T}/${wm}.desktop" 883 local desktop=${T}/${wm}.desktop
978 884
979echo "[Desktop Entry] 885echo "[Desktop Entry]
980Encoding=UTF-8 886Encoding=UTF-8
981Name=${title} 887Name=${title}
982Comment=This session logs you into ${title} 888Comment=This session logs you into ${title}
… …
984TryExec=${command} 890TryExec=${command}
985Type=Application" > "${desktop}" 891Type=Application" > "${desktop}"
986 892
987 insinto /usr/share/xsessions 893 insinto /usr/share/xsessions
988 doins "${desktop}" 894 doins "${desktop}"
989
990 return 0
991} 895}
992 896
993domenu() { 897domenu() {
994 local i 898 local i j
995 local j
996 insinto /usr/share/applications 899 insinto /usr/share/applications
997 for i in ${@} 900 for i in "$@" ; do
998 do
999 if [ -f "${i}" ]; 901 if [[ -f ${i} ]] ; then
1000 then
1001 doins ${i} 902 doins "${i}"
1002 elif [ -d "${i}" ]; 903 elif [[ -d ${i} ]] ; then
1003 then
1004 for j in ${i}/*.desktop 904 for j in "${i}"/*.desktop ; do
1005 do
1006 doins ${j} 905 doins "${j}"
1007 done 906 done
1008 fi 907 fi
1009 done 908 done
1010} 909}
910newmenu() {
911 insinto /usr/share/applications
912 newins "$1" "$2"
913}
1011 914
1012doicon() { 915doicon() {
1013 local i 916 local i j
1014 local j
1015 insinto /usr/share/pixmaps 917 insinto /usr/share/pixmaps
1016 for i in ${@} 918 for i in "$@" ; do
1017 do
1018 if [ -f "${i}" ]; 919 if [[ -f ${i} ]] ; then
1019 then
1020 doins ${i} 920 doins "${i}"
1021 elif [ -d "${i}" ]; 921 elif [[ -d ${i} ]] ; then
1022 then
1023 for j in ${i}/*.png 922 for j in "${i}"/*.png ; do
1024 do
1025 doins ${j} 923 doins "${j}"
1026 done 924 done
1027 fi 925 fi
1028 done 926 done
927}
928newicon() {
929 insinto /usr/share/pixmaps
930 newins "$1" "$2"
1029} 931}
1030 932
1031############################################################## 933##############################################################
1032# END: Handle .desktop files and menu entries # 934# END: Handle .desktop files and menu entries #
1033############################################################## 935##############################################################
… …
1434 local mline="" 1336 local mline=""
1435 local showedmsg=0 1337 local showedmsg=0
1436 1338
1437 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1339 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1438 [[ -d ${mline}/${dir} ]] || continue 1340 [[ -d ${mline}/${dir} ]] || continue
1439 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1341 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1440 && export CDROM_ROOT=${mline} 1342 && export CDROM_ROOT=${mline}
1441 done 1343 done
1442 1344
1443 if [[ -z ${CDROM_ROOT} ]] ; then 1345 if [[ -z ${CDROM_ROOT} ]] ; then
1444 echo 1346 echo
… …
1478# directories and uses the intersection of the lists. 1380# directories and uses the intersection of the lists.
1479# The -u builds a list of po files found in all the 1381# The -u builds a list of po files found in all the
1480# directories and uses the union of the lists. 1382# directories and uses the union of the lists.
1481strip-linguas() { 1383strip-linguas() {
1482 local ls newls 1384 local ls newls
1483 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1385 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1484 local op="$1"; shift 1386 local op=$1; shift
1485 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1387 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1486 local d f 1388 local d f
1487 for d in "$@" ; do 1389 for d in "$@" ; do
1488 if [ "${op}" == "-u" ] ; then 1390 if [[ ${op} == "-u" ]] ; then
1489 newls="${ls}" 1391 newls=${ls}
1490 else 1392 else
1491 newls="" 1393 newls=""
1492 fi 1394 fi
1493 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1395 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1494 if [ "${op}" == "-i" ] ; then 1396 if [[ ${op} == "-i" ]] ; then
1495 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1397 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1496 else 1398 else
1497 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1399 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1498 fi 1400 fi
1499 done 1401 done
1500 ls="${newls}" 1402 ls=${newls}
1501 done 1403 done
1502 ls="${ls//.po}" 1404 ls=${ls//.po}
1503 else 1405 else
1504 ls="$@" 1406 ls=$@
1505 fi 1407 fi
1506 1408
1507 ls=" ${ls} " 1409 ls=" ${ls} "
1508 newls="" 1410 newls=""
1509 for f in ${LINGUAS} ; do 1411 for f in ${LINGUAS} ; do
1510 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1412 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1511 newls="${newls} ${f}" 1413 newls="${newls} ${f}"
1512 else 1414 else
1513 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1415 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1514 fi 1416 fi
1515 done 1417 done
1516 if [ -z "${newls}" ] ; then 1418 if [[ -z ${newls} ]] ; then
1517 unset LINGUAS 1419 export LINGUAS=""
1518 else 1420 else
1519 export LINGUAS="${newls}" 1421 export LINGUAS=${newls:1}
1520 fi 1422 fi
1521} 1423}
1522 1424
1523# moved from kernel.eclass since they are generally useful outside of 1425# moved from kernel.eclass since they are generally useful outside of
1524# kernel.eclass -iggy (20041002) 1426# kernel.eclass -iggy (20041002)
… …
1532 while ((i--)) ; do 1434 while ((i--)) ; do
1533 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1435 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1534 done 1436 done
1535 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1437 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1536 case ${ARCH} in 1438 case ${ARCH} in
1537 x86) export ARCH="i386";; 1439 x86) export ARCH="i386";;
1538 amd64) export ARCH="x86_64";; 1440 amd64) export ARCH="x86_64";;
1539 hppa) export ARCH="parisc";; 1441 hppa) export ARCH="parisc";;
1540 mips) export ARCH="mips";; 1442 mips) export ARCH="mips";;
1541 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one! 1443 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1542 *) export ARCH="${ARCH}";; 1444 *) export ARCH="${ARCH}";;
1543 esac 1445 esac
1544} 1446}
1545 1447
1546# set's ARCH back to what portage expects 1448# set's ARCH back to what portage expects
1547set_arch_to_portage() { 1449set_arch_to_portage() {
… …
1646 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1548 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1647 done 1549 done
1648 eend 0 1550 eend 0
1649} 1551}
1650 1552
1651# dopamd [ file ] [ new file ] 1553# dopamd <file> [more files]
1652# 1554#
1653# Install pam auth config file in /etc/pam.d 1555# Install pam auth config file in /etc/pam.d
1654#
1655# The first argument, 'file' is required. Install as 'new file', if
1656# specified.
1657
1658dopamd() { 1556dopamd() {
1659 local pamd="$1" newpamd="${2:-$1}"
1660 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1557 [[ -z $1 ]] && die "dopamd requires at least one argument"
1661 1558
1662 use pam || return 0 1559 use pam || return 0
1663 1560
1664 insinto /etc/pam.d 1561 INSDESTTREE=/etc/pam.d \
1665 # these are the default doins options, but be explicit just in case 1562 doins "$@" || die "failed to install $@"
1666 insopts -m 0644 -o root -g root
1667 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}"
1668} 1563}
1564# newpamd <old name> <new name>
1565#
1566# Install pam file <old name> as <new name> in /etc/pam.d
1567newpamd() {
1568 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1569
1570 use pam || return 0
1571
1572 INSDESTTREE=/etc/pam.d \
1573 newins "$1" "$2" || die "failed to install $1 as $2"
1574}
1575
1576# make a wrapper script ...
1577# NOTE: this was originally games_make_wrapper, but I noticed other places where
1578# this could be used, so I have moved it here and made it not games-specific
1579# -- wolf31o2
1580# $1 == wrapper name
1581# $2 == binary to run
1582# $3 == directory to chdir before running binary
1583# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1584# $5 == path for wrapper
1585make_wrapper() {
1586 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1587 local tmpwrapper=$(emktemp)
1588 cat << EOF > "${tmpwrapper}"
1589#!/bin/sh
1590cd "${chdir}"
1591export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1592exec ${bin} "\$@"
1593EOF
1594 chmod go+rx "${tmpwrapper}"
1595 if [ -n "${5}" ]
1596 then
1597 exeinto ${5}
1598 newexe "${tmpwrapper}" "${wrapper}"
1599 else
1600 newbin "${tmpwrapper}" "${wrapper}"
1601 fi
1602}
Legend:
Removed from v.1.149  
changed lines
  Added in v.1.182
  ViewVC Help
Powered by ViewVC 1.1.13