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

Diff of /eclass/eutils.eclass

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

Revision 1.218 Revision 1.264
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2006 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.218 2005/11/22 11:15:34 flameeyes Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.264 2006/11/14 12:04:48 uberlord Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 11
12inherit multilib portability 12inherit multilib portability
13
14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 13
17DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
18 15
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 16# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
21# outputting to a terminal, don't wait. For compatability purposes, the argument 18# outputting to a terminal, don't wait. For compatability purposes, the argument
22# must be an integer greater than zero. 19# must be an integer greater than zero.
23# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
24epause() { 21epause() {
25 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
26 sleep ${1:-5}
27 fi
28} 23}
29 24
30# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
31# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
32# don't beep. 27# don't beep.
33# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
34ebeep() { 29ebeep() {
35 local n 30 local n
36 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
37 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
38 echo -ne "\a" 33 echo -ne "\a"
39 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
40 echo -ne "\a" 35 echo -ne "\a"
41 sleep 1 36 sleep 1
60# to point to the latest version of the library present. 55# to point to the latest version of the library present.
61# 56#
62# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
63# 58#
64gen_usr_ldscript() { 59gen_usr_ldscript() {
60 if [[ $(type -t _tc_gen_usr_ldscript) == "function" ]] ; then
61 _tc_gen_usr_ldscript "$@"
62 return $?
63 fi
64
65 ewarn "QA Notice: Please upgrade your ebuild to use toolchain-funcs"
66 ewarn "QA Notice: rather than gen_usr_ldscript() from eutils"
67
65 local libdir="$(get_libdir)" 68 local lib libdir=$(get_libdir)
66 # Just make sure it exists 69 # Just make sure it exists
67 dodir /usr/${libdir} 70 dodir /usr/${libdir}
68 71
69 for lib in "${@}" ; do 72 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 73 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
76 79
77 See bug http://bugs.gentoo.org/4411 for more info. 80 See bug http://bugs.gentoo.org/4411 for more info.
78 */ 81 */
79 GROUP ( /${libdir}/${lib} ) 82 GROUP ( /${libdir}/${lib} )
80 END_LDSCRIPT 83 END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}" 84 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
82 done 85 done
83} 86}
84 87
85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
87#
88# <azarah@gentoo.org> (11 Nov 2002)
89#
90draw_line() {
91 local i=0
92 local str_length=""
93
94 # Handle calls that do not have args, or wc not being installed ...
95 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
96 then
97 echo "==============================================================="
98 return 0
99 fi
100
101 # Get the length of $*
102 str_length="$(echo -n "$*" | wc -m)"
103
104 while [ "$i" -lt "${str_length}" ]
105 do
106 echo -n "="
107
108 i=$((i + 1))
109 done
110
111 echo
112
113 return 0
114}
115 88
116# Default directory where patches are located 89# Default directory where patches are located
117EPATCH_SOURCE="${WORKDIR}/patch" 90EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 91# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 92EPATCH_SUFFIX="patch.bz2"
120# Default options for patch 93# Default options for patch
121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 94# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 95# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
96# Set -E to automatically remove empty files.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch" 97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
124# List of patches not to apply. Not this is only file names, 98# List of patches not to apply. Not this is only file names,
125# and not the full path .. 99# and not the full path ..
126EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 101# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
166# hand its a directory, it will set EPATCH_SOURCE to this. 140# hand its a directory, it will set EPATCH_SOURCE to this.
167# 141#
168# <azarah@gentoo.org> (10 Nov 2002) 142# <azarah@gentoo.org> (10 Nov 2002)
169# 143#
170epatch() { 144epatch() {
145 _epatch_draw_line() {
146 [[ -z $1 ]] && set "$(printf "%65s" '')"
147 echo "${1//?/=}"
148 }
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; } 149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 150 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 153 local PATCH_SUFFIX=""
285 263
286 # Allow for prefix to differ ... im lazy, so shoot me :/ 264 # Allow for prefix to differ ... im lazy, so shoot me :/
287 while [ "${count}" -lt 5 ] 265 while [ "${count}" -lt 5 ]
288 do 266 do
289 # Generate some useful debug info ... 267 # Generate some useful debug info ...
290 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
292 270
293 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
294 then 272 then
295 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 278
301 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 280 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 281
304 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
306 284
307 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
308 then 286 then
309 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 287 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
310 then 288 then
316 fi 294 fi
317 fi 295 fi
318 296
319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 297 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
320 then 298 then
321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 301 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 303 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
326 304
327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 305 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert 306 _epatch_assert
329 307
330 if [ "$?" -ne 0 ] 308 if [ "$?" -ne 0 ]
396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
397 done 375 done
398 ${exe} "${tmp}" || ${exe} -p "${tmp}" 376 ${exe} "${tmp}" || ${exe} -p "${tmp}"
399 echo "${tmp}" 377 echo "${tmp}"
400 else 378 else
401 [[ ${exe} == "touch" ]] \ 379 if [[ ${exe} == "touch" ]] ; then
402 && exe="-p" \ 380 [[ ${USERLAND} == "GNU" ]] \
403 || exe="-d" 381 && mktemp -p "${topdir}" \
404 mktemp ${exe} "${topdir}" 382 || TMPDIR="${topdir}" mktemp -t tmp
383 else
384 [[ ${USERLAND} == "GNU" ]] \
385 && mktemp -d "${topdir}" \
386 || TMPDIR="${topdir}" mktemp -dt tmp
387 fi
405 fi 388 fi
406} 389}
407 390
408# Small wrapper for getent (Linux), nidump (Mac OS X), 391# Small wrapper for getent (Linux), nidump (Mac OS X),
409# and pw (FreeBSD) used in enewuser()/enewgroup() 392# and pw (FreeBSD) used in enewuser()/enewgroup()
421 *) # Numeric 404 *) # Numeric
422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 405 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
423 ;; 406 ;;
424 esac 407 esac
425 ;; 408 ;;
426 *-freebsd*) 409 *-freebsd*|*-dragonfly*)
427 local opts action="user" 410 local opts action="user"
428 [[ $1 == "passwd" ]] || action="group" 411 [[ $1 == "passwd" ]] || action="group"
429 412
430 # lookup by uid/gid 413 # lookup by uid/gid
431 if [[ $2 == [[:digit:]]* ]] ; then 414 if [[ $2 == [[:digit:]]* ]] ; then
456# shell: /bin/false 439# shell: /bin/false
457# homedir: /dev/null 440# homedir: /dev/null
458# groups: none 441# groups: none
459# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
460enewuser() { 443enewuser() {
444 case ${EBUILD_PHASE} in
445 unpack|compile|test|install)
446 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
447 eerror "Package fails at QA and at life. Please file a bug."
448 die "Bad package! enewuser is only for use in pkg_* functions!"
449 esac
450
461 # get the username 451 # get the username
462 local euser=$1; shift 452 local euser=$1; shift
463 if [[ -z ${euser} ]] ; then 453 if [[ -z ${euser} ]] ; then
464 eerror "No username specified !" 454 eerror "No username specified !"
465 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
466 fi 456 fi
467 457
468 # lets see if the username already exists 458 # lets see if the username already exists
469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
470 return 0 460 return 0
471 fi 461 fi
472 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
473 463
474 # options to pass to useradd 464 # options to pass to useradd
475 local opts= 465 local opts=
476 466
477 # handle uid 467 # handle uid
478 local euid=$1; shift 468 local euid=$1; shift
479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
480 if [[ ${euid} -gt 0 ]] ; then 470 if [[ ${euid} -gt 0 ]] ; then
481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
482 euid="next" 472 euid="next"
483 fi 473 fi
484 else 474 else
485 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
486 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
487 fi 477 fi
488 else 478 else
489 euid="next" 479 euid="next"
490 fi 480 fi
491 if [[ ${euid} == "next" ]] ; then 481 if [[ ${euid} == "next" ]] ; then
492 for euid in $(seq 101 999) ; do 482 for ((euid = 101; euid <= 999; euid++)); do
493 [[ -z $(egetent passwd ${euid}) ]] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
494 done 484 done
495 fi 485 fi
496 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
497 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
498 488
499 # handle shell 489 # handle shell
500 local eshell=$1; shift 490 local eshell=$1; shift
501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
502 if [[ ! -e ${eshell} ]] ; then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
503 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
504 die "${eshell} does not exist" 494 die "${eshell} does not exist in ${ROOT}"
495 fi
496 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
497 eerror "Do not specify ${eshell} yourself, use -1"
498 die "Pass '-1' as the shell parameter"
505 fi 499 fi
506 else 500 else
507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do 501 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
508 [[ -x ${ROOT}${shell} ]] && break 502 [[ -x ${ROOT}${shell} ]] && break
509 done 503 done
510 504
511 if [[ ${shell} == "/dev/null" ]] ; then 505 if [[ ${shell} == "/dev/null" ]] ; then
512 eerror "Unable to identify the shell to use" 506 eerror "Unable to identify the shell to use, proceeding with userland default."
513 die "Unable to identify the shell to use" 507 case ${USERLAND} in
508 GNU) shell="/bin/false" ;;
509 BSD) shell="/sbin/nologin" ;;
510 Darwin) shell="/usr/sbin/nologin" ;;
511 *) die "Unable to identify the default shell for userland ${USERLAND}"
512 esac
514 fi 513 fi
515 514
516 eshell=${shell} 515 eshell=${shell}
517 fi 516 fi
518 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
580 einfo "Please report the ebuild along with the info below" 579 einfo "Please report the ebuild along with the info below"
581 einfo "eextra: $@" 580 einfo "eextra: $@"
582 die "Required function missing" 581 die "Required function missing"
583 fi 582 fi
584 ;; 583 ;;
585 *-freebsd*) 584 *-freebsd*|*-dragonfly*)
586 if [[ -z $@ ]] ; then 585 if [[ -z $@ ]] ; then
587 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
588 -c "added by portage for ${PN}" \ 587 -c "added by portage for ${PN}" \
589 die "enewuser failed" 588 die "enewuser failed"
590 else 589 else
647# Default values if you do not specify any: 646# Default values if you do not specify any:
648# groupname: REQUIRED ! 647# groupname: REQUIRED !
649# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
650# extra: none 649# extra: none
651enewgroup() { 650enewgroup() {
651 case ${EBUILD_PHASE} in
652 unpack|compile|test|install)
653 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
654 eerror "Package fails at QA and at life. Please file a bug."
655 die "Bad package! enewgroup is only for use in pkg_* functions!"
656 esac
657
652 # get the group 658 # get the group
653 local egroup="$1"; shift 659 local egroup="$1"; shift
654 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
655 then 661 then
656 eerror "No group specified !" 662 eerror "No group specified !"
657 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
658 fi 664 fi
659 665
660 # see if group already exists 666 # see if group already exists
661 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
662 then
663 return 0 668 return 0
664 fi 669 fi
665 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
666 671
667 # options to pass to useradd 672 # options to pass to useradd
710 fi 715 fi
711 716
712 # If we need the next available 717 # If we need the next available
713 case ${egid} in 718 case ${egid} in
714 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
715 for egid in $(seq 101 999); do 720 for ((egid = 101; egid <= 999; egid++)); do
716 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
717 done 722 done
718 esac 723 esac
719 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
720 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
721 ;; 726 ;;
722 727
723 *-freebsd*) 728 *-freebsd*|*-dragonfly*)
724 case ${egid} in 729 case ${egid} in
725 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
726 for egid in $(seq 101 999); do 731 for ((egid = 101; egid <= 999; egid++)); do
727 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
728 done 733 done
729 esac 734 esac
730 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
731 ;; 736 ;;
732 737
733 *-netbsd*) 738 *-netbsd*)
734 case ${egid} in 739 case ${egid} in
735 *[!0-9]*) # Non numeric 740 *[!0-9]*) # Non numeric
736 for egid in $(seq 101 999); do 741 for ((egid = 101; egid <= 999; egid++)); do
737 [ -z "`egetent group ${egid}`" ] && break 742 [[ -z $(egetent group ${egid}) ]] && break
738 done 743 done
739 esac 744 esac
740 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
741 ;; 746 ;;
742 747
750# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
751# vapier@gentoo.org 756# vapier@gentoo.org
752# 757#
753# edos2unix(file, <more files> ...) 758# edos2unix(file, <more files> ...)
754edos2unix() { 759edos2unix() {
755 for f in "$@" 760 echo "$@" | xargs sed -i 's/\r$//'
756 do
757 cp "${f}" ${T}/edos2unix
758 sed 's/\r$//' ${T}/edos2unix > "${f}"
759 done
760} 761}
761 762
762 763
763############################################################## 764##############################################################
764# START: Handle .desktop files and menu entries # 765# START: Handle .desktop files and menu entries #
768 769
769# Make a desktop file ! 770# Make a desktop file !
770# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
771# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
772# 773#
773# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
774# 775#
775# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
776# name: the name that will show up in the menu 777# name: the name that will show up in the menu
777# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
778# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
779# a full path to an icon 780# a full path to an icon
780# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
816 games) 817 games)
817 case ${catmin} in 818 case ${catmin} in
818 action) type=ActionGame;; 819 action) type=ActionGame;;
819 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
820 board) type=BoardGame;; 821 board) type=BoardGame;;
821 kid) type=KidsGame;; 822 kids) type=KidsGame;;
822 emulation) type=Emulator;; 823 emulation) type=Emulator;;
823 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
824 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
825 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
826 simulation) type=Simulation;; 827 simulation) type=Simulation;;
892 local desktop_name="${PN}" 893 local desktop_name="${PN}"
893 else 894 else
894 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
895 fi 896 fi
896 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
898# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
897 899
898echo "[Desktop Entry] 900echo "[Desktop Entry]
899Encoding=UTF-8 901Encoding=UTF-8
900Version=0.9.2 902Version=0.9.2
901Name=${name} 903Name=${name}
902Type=Application 904Type=Application
903Comment=${DESCRIPTION} 905Comment=${DESCRIPTION}
904Exec=${exec} 906Exec=${exec}
907TryExec=${exec%% *}
905Path=${path} 908Path=${path}
906Icon=${icon} 909Icon=${icon}
907Categories=Application;${type};" > "${desktop}" 910Categories=Application;${type};" > "${desktop}"
908 911
909 ( 912 (
914 ) 917 )
915} 918}
916 919
917# Make a GDM/KDM Session file 920# Make a GDM/KDM Session file
918# 921#
919# make_desktop_entry(<title>, <command>) 922# make_session_desktop(<title>, <command>)
920# title: File to execute to start the Window Manager 923# title: File to execute to start the Window Manager
921# command: Name of the Window Manager 924# command: Name of the Window Manager
922 925
923make_session_desktop() { 926make_session_desktop() {
924 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 927 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
1112 if [[ -z ${skip} ]] ; then 1115 if [[ -z ${skip} ]] ; then
1113 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1116 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1114 local skip=0 1117 local skip=0
1115 exe=tail 1118 exe=tail
1116 case ${ver} in 1119 case ${ver} in
1117 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1120 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1118 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1121 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1119 ;; 1122 ;;
1120 2.0|2.0.1) 1123 2.0|2.0.1)
1121 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1124 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1122 ;; 1125 ;;
1156 # lets grab the first few bytes of the file to figure out what kind of archive it is 1159 # lets grab the first few bytes of the file to figure out what kind of archive it is
1157 local tmpfile="$(emktemp)" 1160 local tmpfile="$(emktemp)"
1158 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1161 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1159 local filetype="$(file -b "${tmpfile}")" 1162 local filetype="$(file -b "${tmpfile}")"
1160 case ${filetype} in 1163 case ${filetype} in
1161 *tar\ archive) 1164 *tar\ archive*)
1162 eval ${exe} | tar --no-same-owner -xf - 1165 eval ${exe} | tar --no-same-owner -xf -
1163 ;; 1166 ;;
1164 bzip2*) 1167 bzip2*)
1165 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1168 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1166 ;; 1169 ;;
1202 # accepted ... if we don't find a match, we make the user accept 1205 # accepted ... if we don't find a match, we make the user accept
1203 local shopts=$- 1206 local shopts=$-
1204 local alic 1207 local alic
1205 set -o noglob #so that bash doesn't expand "*" 1208 set -o noglob #so that bash doesn't expand "*"
1206 for alic in ${ACCEPT_LICENSE} ; do 1209 for alic in ${ACCEPT_LICENSE} ; do
1207 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1210 if [[ ${alic} == ${l} ]]; then
1208 set +o noglob; set -${shopts} #reset old shell opts 1211 set +o noglob; set -${shopts} #reset old shell opts
1209 return 0 1212 return 0
1210 fi 1213 fi
1211 done 1214 done
1212 set +o noglob; set -$shopts #reset old shell opts 1215 set +o noglob; set -$shopts #reset old shell opts
1245# and when the function returns, you can assume that the cd has been 1248# and when the function returns, you can assume that the cd has been
1246# found at CDROM_ROOT. 1249# found at CDROM_ROOT.
1247# 1250#
1248# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1251# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1249# etc... if you want to give the cds better names, then just export 1252# etc... if you want to give the cds better names, then just export
1250# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1253# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1254# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1255# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1256# CDROM_NAME_2="data cd"
1257# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1251# 1258#
1252# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1259# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1253# 1260#
1254# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1261# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1255# - this will attempt to locate a cd based upon a file that is on 1262# - this will attempt to locate a cd based upon a file that is on
1306 echo 1313 echo
1307 einfo "For example:" 1314 einfo "For example:"
1308 einfo "export CD_ROOT=/mnt/cdrom" 1315 einfo "export CD_ROOT=/mnt/cdrom"
1309 echo 1316 echo
1310 else 1317 else
1318 if [[ -n ${CDROM_NAME_SET} ]] ; then
1319 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1320 cdcnt=0
1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1322 ((++cdcnt))
1323 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1324 done
1325 fi
1326
1311 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1327 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1312 cdcnt=0 1328 cdcnt=0
1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1329 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1314 ((++cdcnt)) 1330 ((++cdcnt))
1315 var="CDROM_NAME_${cdcnt}" 1331 var="CDROM_NAME_${cdcnt}"
1382 1398
1383 while [[ -n ${cdset[${i}]} ]] ; do 1399 while [[ -n ${cdset[${i}]} ]] ; do
1384 local dir=$(dirname ${cdset[${i}]}) 1400 local dir=$(dirname ${cdset[${i}]})
1385 local file=$(basename ${cdset[${i}]}) 1401 local file=$(basename ${cdset[${i}]})
1386 1402
1387 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do 1403 local point= node= fs= foo=
1388 [[ -d ${mline}/${dir} ]] || continue 1404 while read point node fs foo ; do
1405 [[ " cd9660 iso9660 " != *" ${fs} "* ]] && \
1406 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1407 && continue
1408 point=${point//\040/ }
1389 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then 1409 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1390 export CDROM_ROOT=${mline} 1410 export CDROM_ROOT=${point}
1391 export CDROM_SET=${i} 1411 export CDROM_SET=${i}
1392 export CDROM_MATCH=${cdset[${i}]} 1412 export CDROM_MATCH=${cdset[${i}]}
1393 return 1413 return
1394 fi 1414 done <<< "$(get_mounts)"
1395 done
1396 1415
1397 ((++i)) 1416 ((++i))
1398 done 1417 done
1399 1418
1400 echo 1419 echo
1420 echo 1439 echo
1421 einfo "If you are having trouble with the detection" 1440 einfo "If you are having trouble with the detection"
1422 einfo "of your CD, it is possible that you do not have" 1441 einfo "of your CD, it is possible that you do not have"
1423 einfo "Joliet support enabled in your kernel. Please" 1442 einfo "Joliet support enabled in your kernel. Please"
1424 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1443 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1425 read 1444 read || die "something is screwed with your system"
1426 done 1445 done
1427} 1446}
1428 1447
1429# Make sure that LINGUAS only contains languages that 1448# Make sure that LINGUAS only contains languages that
1430# a package can support 1449# a package can support
1437# The -i builds a list of po files found in all the 1456# The -i builds a list of po files found in all the
1438# directories and uses the intersection of the lists. 1457# directories and uses the intersection of the lists.
1439# The -u builds a list of po files found in all the 1458# The -u builds a list of po files found in all the
1440# directories and uses the union of the lists. 1459# directories and uses the union of the lists.
1441strip-linguas() { 1460strip-linguas() {
1442 local ls newls 1461 local ls newls nols
1443 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1462 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1444 local op=$1; shift 1463 local op=$1; shift
1445 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1464 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1446 local d f 1465 local d f
1447 for d in "$@" ; do 1466 for d in "$@" ; do
1448 if [[ ${op} == "-u" ]] ; then 1467 if [[ ${op} == "-u" ]] ; then
1449 newls=${ls} 1468 newls=${ls}
1450 else 1469 else
1451 newls="" 1470 newls=""
1452 fi 1471 fi
1453 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1472 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1454 if [[ ${op} == "-i" ]] ; then 1473 if [[ ${op} == "-i" ]] ; then
1455 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1474 hasq ${f} ${ls} && newls="${newls} ${f}"
1456 else 1475 else
1457 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1476 hasq ${f} ${ls} || newls="${newls} ${f}"
1458 fi 1477 fi
1459 done 1478 done
1460 ls=${newls} 1479 ls=${newls}
1461 done 1480 done
1462 ls=${ls//.po}
1463 else 1481 else
1464 ls=$@ 1482 ls="$@"
1465 fi 1483 fi
1466 1484
1467 ls=" ${ls} " 1485 nols=""
1468 newls="" 1486 newls=""
1469 for f in ${LINGUAS} ; do 1487 for f in ${LINGUAS} ; do
1470 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1488 if hasq ${f} ${ls} ; then
1471 newls="${newls} ${f}" 1489 newls="${newls} ${f}"
1472 else 1490 else
1473 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1491 nols="${nols} ${f}"
1474 fi 1492 fi
1475 done 1493 done
1476 if [[ -z ${newls} ]] ; then 1494 [[ -n ${nols} ]] \
1477 export LINGUAS="" 1495 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1478 else
1479 export LINGUAS=${newls:1} 1496 export LINGUAS=${newls:1}
1480 fi
1481} 1497}
1482 1498
1483# moved from kernel.eclass since they are generally useful outside of 1499# moved from kernel.eclass since they are generally useful outside of
1484# kernel.eclass -iggy (20041002) 1500# kernel.eclass -iggy (20041002)
1485 1501
1514 1530
1515# Jeremy Huddleston <eradicator@gentoo.org>: 1531# Jeremy Huddleston <eradicator@gentoo.org>:
1516# preserve_old_lib /path/to/libblah.so.0 1532# preserve_old_lib /path/to/libblah.so.0
1517# preserve_old_lib_notify /path/to/libblah.so.0 1533# preserve_old_lib_notify /path/to/libblah.so.0
1518# 1534#
1519# These functions are useful when a lib in your package changes --soname. Such 1535# These functions are useful when a lib in your package changes --library. Such
1520# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1536# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1521# would break packages that link against it. Most people get around this 1537# would break packages that link against it. Most people get around this
1522# by using the portage SLOT mechanism, but that is not always a relevant 1538# by using the portage SLOT mechanism, but that is not always a relevant
1523# solution, so instead you can add the following to your ebuilds: 1539# solution, so instead you can add the following to your ebuilds:
1524# 1540#
1555 1571
1556 ewarn "An old version of an installed library was detected on your system." 1572 ewarn "An old version of an installed library was detected on your system."
1557 ewarn "In order to avoid breaking packages that link against it, this older version" 1573 ewarn "In order to avoid breaking packages that link against it, this older version"
1558 ewarn "is not being removed. In order to make full use of this newer version," 1574 ewarn "is not being removed. In order to make full use of this newer version,"
1559 ewarn "you will need to execute the following command:" 1575 ewarn "you will need to execute the following command:"
1560 ewarn " revdep-rebuild --soname ${SONAME}" 1576 ewarn " revdep-rebuild --library ${SONAME}"
1561 ewarn 1577 ewarn
1562 ewarn "After doing that, you can safely remove ${LIB}" 1578 ewarn "After doing that, you can safely remove ${LIB}"
1563 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1579 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1564 fi 1580 fi
1565} 1581}
1576built_with_use() { 1592built_with_use() {
1577 local opt=$1 1593 local opt=$1
1578 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1594 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1579 1595
1580 local PKG=$(best_version $1) 1596 local PKG=$(best_version $1)
1597 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1581 shift 1598 shift
1582 1599
1583 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE 1600 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1601 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1584 1602
1585 # if the USE file doesnt exist, assume the $PKG is either 1603 # if the USE file doesnt exist, assume the $PKG is either
1586 # injected or package.provided 1604 # injected or package.provided
1587 [[ ! -e ${USEFILE} ]] && return 0 1605 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1606
1607 local IUSE_BUILT=$(<${IUSEFILE})
1608 # Don't check USE_EXPAND #147237
1609 local expand
1610 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1611 if [[ $1 == ${expand}_* ]] ; then
1612 expand=""
1613 break
1614 fi
1615 done
1616 if [[ -n ${expand} ]] ; then
1617 has $1 ${IUSE_BUILT} || die "$PKG does not actually support the $1 USE flag!"
1618 fi
1588 1619
1589 local USE_BUILT=$(<${USEFILE}) 1620 local USE_BUILT=$(<${USEFILE})
1590 while [[ $# -gt 0 ]] ; do 1621 while [[ $# -gt 0 ]] ; do
1591 if [[ ${opt} = "-o" ]] ; then 1622 if [[ ${opt} = "-o" ]] ; then
1592 has $1 ${USE_BUILT} && return 0 1623 has $1 ${USE_BUILT} && return 0

Legend:
Removed from v.1.218  
changed lines
  Added in v.1.264

  ViewVC Help
Powered by ViewVC 1.1.20