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

Diff of /eclass/eutils.eclass

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

Revision 1.195 Revision 1.228
1# Copyright 1999-2005 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.195 2005/09/01 05:56:35 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.228 2006/03/10 23:24:21 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.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13 13
14DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745. 15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
60# to point to the latest version of the library present. 60# to point to the latest version of the library present.
61# 61#
62# <azarah@gentoo.org> (26 Oct 2002) 62# <azarah@gentoo.org> (26 Oct 2002)
63# 63#
64gen_usr_ldscript() { 64gen_usr_ldscript() {
65 local libdir="$(get_libdir)" 65 local lib libdir=$(get_libdir)
66 # Just make sure it exists 66 # Just make sure it exists
67 dodir /usr/${libdir} 67 dodir /usr/${libdir}
68 68
69 for lib in "${@}" ; do 69 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
76 76
77 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */ 78 */
79 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
80 END_LDSCRIPT 80 END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
82 done 82 done
83} 83}
84 84
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 85
116# Default directory where patches are located 86# Default directory where patches are located
117EPATCH_SOURCE="${WORKDIR}/patch" 87EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 88# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 89EPATCH_SUFFIX="patch.bz2"
166# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
167# 137#
168# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
169# 139#
170epatch() { 140epatch() {
141 _epatch_draw_line() {
142 # this func produces a lot of pointless noise when debugging is turned on ...
143 local is_debug=0
144 [[ $- == *x* ]] && is_debug=1 && set +x
145
146 local i=0 str_length="" str_out=""
147
148 # Handle calls that do not have args, or wc not being installed ...
149 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
150 str_length=65
151 else
152 str_length=$(echo -n "$*" | wc -m)
153 fi
154
155 while ((i++ < ${str_length})) ; do
156 str_out="${str_out}="
157 done
158 echo ${str_out}
159
160 [[ ${is_debug} -eq 1 ]] && set -x
161 return 0
162 }
163 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 164 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 165 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 166 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 167 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 168 local SINGLE_PATCH="no"
284 277
285 # Allow for prefix to differ ... im lazy, so shoot me :/ 278 # Allow for prefix to differ ... im lazy, so shoot me :/
286 while [ "${count}" -lt 5 ] 279 while [ "${count}" -lt 5 ]
287 do 280 do
288 # Generate some useful debug info ... 281 # Generate some useful debug info ...
289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 284
292 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
293 then 286 then
294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 287 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 292
300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 293 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 294 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 295
303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 297 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 298
306 if [ "${PATCH_SUFFIX}" != "patch" ] 299 if [ "${PATCH_SUFFIX}" != "patch" ]
307 then 300 then
308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 301 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
309 then 302 then
313 count=5 306 count=5
314 break 307 break
315 fi 308 fi
316 fi 309 fi
317 310
318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 311 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
319 then 312 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 313 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 314 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 315 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 316 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 317 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 318
326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 319 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
320 _epatch_assert
327 321
328 if [ "$?" -ne 0 ] 322 if [ "$?" -ne 0 ]
329 then 323 then
330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 324 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo 325 echo
394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 388 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 389 done
396 ${exe} "${tmp}" || ${exe} -p "${tmp}" 390 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 391 echo "${tmp}"
398 else 392 else
399 [[ ${exe} == "touch" ]] \ 393 if [[ ${exe} == "touch" ]] ; then
400 && exe="-p" \ 394 [[ ${USERLAND} == "GNU" ]] \
401 || exe="-d" 395 && mktemp -p "${topdir}" \
402 mktemp ${exe} "${topdir}" 396 || TMPDIR="${topdir}" mktemp -t tmp
397 else
398 [[ ${USERLAND} == "GNU" ]] \
399 && mktemp -d "${topdir}" \
400 || TMPDIR="${topdir}" mktemp -dt tmp
401 fi
403 fi 402 fi
404} 403}
405 404
406# Small wrapper for getent (Linux), nidump (Mac OS X), 405# Small wrapper for getent (Linux), nidump (Mac OS X),
407# and pw (FreeBSD) used in enewuser()/enewgroup() 406# and pw (FreeBSD) used in enewuser()/enewgroup()
408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 407# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 408# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
410# 409#
411# egetent(database, key) 410# egetent(database, key)
412egetent() { 411egetent() {
413 if [[ "${USERLAND}" == "Darwin" ]] ; then 412 case ${CHOST} in
413 *-darwin*)
414 case "$2" in 414 case "$2" in
415 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
417 ;; 417 ;;
418 *) # Numeric 418 *) # Numeric
419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
420 ;; 420 ;;
421 esac 421 esac
422 elif [[ "${USERLAND}" == "BSD" ]] ; then 422 ;;
423 local action 423 *-freebsd*|*-dragonfly*)
424 if [ "$1" == "passwd" ] 424 local opts action="user"
425 then 425 [[ $1 == "passwd" ]] || action="group"
426 action="user" 426
427 else 427 # lookup by uid/gid
428 action="group" 428 if [[ $2 == [[:digit:]]* ]] ; then
429 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi 430 fi
431
430 pw show "${action}" "$2" -q 432 pw show ${action} ${opts} "$2" -q
431 else 433 ;;
434 *-netbsd*|*-openbsd*)
435 grep "$2:\*:" /etc/$1
436 ;;
437 *)
432 which nscd >& /dev/null && nscd -i "$1" 438 type -p nscd >& /dev/null && nscd -i "$1"
433 getent "$1" "$2" 439 getent "$1" "$2"
434 fi 440 ;;
441 esac
435} 442}
436 443
437# Simplify/standardize adding users to the system 444# Simplify/standardize adding users to the system
438# vapier@gentoo.org 445# vapier@gentoo.org
439# 446#
477 fi 484 fi
478 else 485 else
479 euid="next" 486 euid="next"
480 fi 487 fi
481 if [[ ${euid} == "next" ]] ; then 488 if [[ ${euid} == "next" ]] ; then
482 local pwrange 489 for euid in $(seq 101 999) ; do
483 if [[ ${USERLAND} == "BSD" ]] ; then
484 pwrange=$(jot 898 101)
485 else
486 pwrange=$(seq 101 999)
487 fi
488 for euid in ${pwrange} ; do
489 [[ -z $(egetent passwd ${euid}) ]] && break 490 [[ -z $(egetent passwd ${euid}) ]] && break
490 done 491 done
491 fi 492 fi
492 opts="${opts} -u ${euid}" 493 opts="${opts} -u ${euid}"
493 einfo " - Userid: ${euid}" 494 einfo " - Userid: ${euid}"
494 495
495 # handle shell 496 # handle shell
496 local eshell=$1; shift 497 local eshell=$1; shift
497 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 498 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
498 if [[ ! -e ${eshell} ]] ; then 499 if [[ ! -e ${ROOT}${eshell} ]] ; then
499 eerror "A shell was specified but it does not exist !" 500 eerror "A shell was specified but it does not exist !"
500 die "${eshell} does not exist" 501 die "${eshell} does not exist in ${ROOT}"
501 fi 502 fi
503 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
504 eerror "Do not specify ${eshell} yourself, use -1"
505 die "Pass '-1' as the shell parameter"
506 fi
502 else 507 else
503 case ${USERLAND} in 508 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
504 Darwin) eshell="/usr/bin/false";; 509 [[ -x ${ROOT}${shell} ]] && break
505 BSD) eshell="/usr/sbin/nologin";; 510 done
506 *) eshell="/bin/false";; 511
507 esac 512 if [[ ${shell} == "/dev/null" ]] ; then
513 eerror "Unable to identify the shell to use"
514 die "Unable to identify the shell to use"
515 fi
516
517 eshell=${shell}
508 fi 518 fi
509 einfo " - Shell: ${eshell}" 519 einfo " - Shell: ${eshell}"
510 opts="${opts} -s ${eshell}" 520 opts="${opts} -s ${eshell}"
511 521
512 # handle homedir 522 # handle homedir
549 einfo " - Groups: ${egroups}" 559 einfo " - Groups: ${egroups}"
550 560
551 # handle extra and add the user 561 # handle extra and add the user
552 local oldsandbox=${SANDBOX_ON} 562 local oldsandbox=${SANDBOX_ON}
553 export SANDBOX_ON="0" 563 export SANDBOX_ON="0"
554 case ${USERLAND} in 564 case ${CHOST} in
555 Darwin) 565 *-darwin*)
556 ### Make the user 566 ### Make the user
557 if [[ -z $@ ]] ; then 567 if [[ -z $@ ]] ; then
558 dscl . create /users/${euser} uid ${euid} 568 dscl . create /users/${euser} uid ${euid}
559 dscl . create /users/${euser} shell ${eshell} 569 dscl . create /users/${euser} shell ${eshell}
560 dscl . create /users/${euser} home ${ehome} 570 dscl . create /users/${euser} home ${ehome}
571 einfo "Please report the ebuild along with the info below" 581 einfo "Please report the ebuild along with the info below"
572 einfo "eextra: $@" 582 einfo "eextra: $@"
573 die "Required function missing" 583 die "Required function missing"
574 fi 584 fi
575 ;; 585 ;;
576 BSD) 586 *-freebsd*|*-dragonfly*)
577 if [[ -z $@ ]] ; then 587 if [[ -z $@ ]] ; then
578 pw useradd ${euser} ${opts} \ 588 pw useradd ${euser} ${opts} \
579 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
580 die "enewuser failed" 590 die "enewuser failed"
581 else 591 else
582 einfo " - Extra: $@" 592 einfo " - Extra: $@"
583 pw useradd ${euser} ${opts} \ 593 pw useradd ${euser} ${opts} \
584 "$@" || die "enewuser failed" 594 "$@" || die "enewuser failed"
585 fi 595 fi
586 ;; 596 ;;
597
598 *-netbsd*)
599 if [[ -z $@ ]] ; then
600 useradd ${opts} ${euser} || die "enewuser failed"
601 else
602 einfo " - Extra: $@"
603 useradd ${opts} ${euser} "$@" || die "enewuser failed"
604 fi
605 ;;
606
607 *-openbsd*)
608 if [[ -z $@ ]] ; then
609 useradd -u ${euid} -s ${eshell} \
610 -d ${ehome} -c "Added by portage for ${PN}" \
611 -g ${egroups} ${euser} || die "enewuser failed"
612 else
613 einfo " - Extra: $@"
614 useradd -u ${euid} -s ${eshell} \
615 -d ${ehome} -c "Added by portage for ${PN}" \
616 -g ${egroups} ${euser} "$@" || die "enewuser failed"
617 fi
618 ;;
619
587 *) 620 *)
588 if [[ -z $@ ]] ; then 621 if [[ -z $@ ]] ; then
589 useradd ${opts} ${euser} \ 622 useradd ${opts} ${euser} \
590 -c "added by portage for ${PN}" \ 623 -c "added by portage for ${PN}" \
591 || die "enewuser failed" 624 || die "enewuser failed"
641 then 674 then
642 if [ "${egid}" -gt 0 ] 675 if [ "${egid}" -gt 0 ]
643 then 676 then
644 if [ -z "`egetent group ${egid}`" ] 677 if [ -z "`egetent group ${egid}`" ]
645 then 678 then
646 if [[ "${USERLAND}" == "Darwin" ]]; then 679 if [[ "${CHOST}" == *-darwin* ]]; then
647 opts="${opts} ${egid}" 680 opts="${opts} ${egid}"
648 else 681 else
649 opts="${opts} -g ${egid}" 682 opts="${opts} -g ${egid}"
650 fi 683 fi
651 else 684 else
665 opts="${opts} ${eextra}" 698 opts="${opts} ${eextra}"
666 699
667 # add the group 700 # add the group
668 local oldsandbox="${SANDBOX_ON}" 701 local oldsandbox="${SANDBOX_ON}"
669 export SANDBOX_ON="0" 702 export SANDBOX_ON="0"
670 if [[ "${USERLAND}" == "Darwin" ]]; then 703 case ${CHOST} in
704 *-darwin*)
671 if [ ! -z "${eextra}" ]; 705 if [ ! -z "${eextra}" ];
672 then 706 then
673 einfo "Extra options are not supported on Darwin/OS X yet" 707 einfo "Extra options are not supported on Darwin/OS X yet"
674 einfo "Please report the ebuild along with the info below" 708 einfo "Please report the ebuild along with the info below"
675 einfo "eextra: ${eextra}" 709 einfo "eextra: ${eextra}"
676 die "Required function missing" 710 die "Required function missing"
677 fi 711 fi
678 712
679 # If we need the next available 713 # If we need the next available
680 case ${egid} in 714 case ${egid} in
681 *[!0-9]*) # Non numeric 715 *[!0-9]*) # Non numeric
682 for egid in `jot 898 101`; do 716 for egid in $(seq 101 999); do
683 [ -z "`egetent group ${egid}`" ] && break 717 [ -z "`egetent group ${egid}`" ] && break
684 done 718 done
685 esac 719 esac
686 dscl . create /groups/${egroup} gid ${egid} 720 dscl . create /groups/${egroup} gid ${egid}
687 dscl . create /groups/${egroup} passwd '*' 721 dscl . create /groups/${egroup} passwd '*'
688 elif [[ "${USERLAND}" == "BSD" ]] ; then 722 ;;
723
724 *-freebsd*|*-dragonfly*)
689 case ${egid} in 725 case ${egid} in
690 *[!0-9]*) # Non numeric 726 *[!0-9]*) # Non numeric
691 for egid in `jot 898 101`; do 727 for egid in $(seq 101 999); do
692 [ -z "`egetent group ${egid}`" ] && break 728 [ -z "`egetent group ${egid}`" ] && break
693 done 729 done
694 esac 730 esac
695 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 731 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
696 else 732 ;;
733
734 *-netbsd*)
735 case ${egid} in
736 *[!0-9]*) # Non numeric
737 for egid in $(seq 101 999); do
738 [ -z "`egetent group ${egid}`" ] && break
739 done
740 esac
741 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
742 ;;
743
744 *)
697 groupadd ${opts} ${egroup} || die "enewgroup failed" 745 groupadd ${opts} ${egroup} || die "enewgroup failed"
698 fi 746 ;;
747 esac
699 export SANDBOX_ON="${oldsandbox}" 748 export SANDBOX_ON="${oldsandbox}"
700} 749}
701 750
702# Simple script to replace 'dos2unix' binaries 751# Simple script to replace 'dos2unix' binaries
703# vapier@gentoo.org 752# vapier@gentoo.org
814 type="Network;${type}" 863 type="Network;${type}"
815 ;; 864 ;;
816 865
817 sci) 866 sci)
818 case ${catmin} in 867 case ${catmin} in
819 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
820 bio*) type=Biology;; 869 bio*) type=Biology;;
821 calc*) type=Calculator;; 870 calc*) type=Calculator;;
822 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
823 geo*) type=Geology;; 872 geo*) type=Geology;;
824 math*) type=Math;; 873 math*) type=Math;;
856Exec=${exec} 905Exec=${exec}
857Path=${path} 906Path=${path}
858Icon=${icon} 907Icon=${icon}
859Categories=Application;${type};" > "${desktop}" 908Categories=Application;${type};" > "${desktop}"
860 909
910 (
911 # wrap the env here so that the 'insinto' call
912 # doesn't corrupt the env of the caller
861 insinto /usr/share/applications 913 insinto /usr/share/applications
862 doins "${desktop}" 914 doins "${desktop}"
863 915 )
864 return 0
865} 916}
866 917
867# Make a GDM/KDM Session file 918# Make a GDM/KDM Session file
868# 919#
869# make_desktop_entry(<title>, <command>) 920# make_desktop_entry(<title>, <command>)
931############################################################## 982##############################################################
932 983
933 984
934# for internal use only (unpack_pdv and unpack_makeself) 985# for internal use only (unpack_pdv and unpack_makeself)
935find_unpackable_file() { 986find_unpackable_file() {
936 local src="$1" 987 local src=$1
937 if [ -z "${src}" ] 988 if [[ -z ${src} ]] ; then
938 then
939 src="${DISTDIR}/${A}" 989 src=${DISTDIR}/${A}
940 else 990 else
941 if [ -e "${DISTDIR}/${src}" ] 991 if [[ -e ${DISTDIR}/${src} ]] ; then
942 then
943 src="${DISTDIR}/${src}" 992 src=${DISTDIR}/${src}
944 elif [ -e "${PWD}/${src}" ] 993 elif [[ -e ${PWD}/${src} ]] ; then
945 then
946 src="${PWD}/${src}" 994 src=${PWD}/${src}
947 elif [ -e "${src}" ] 995 elif [[ -e ${src} ]] ; then
948 then
949 src="${src}" 996 src=${src}
950 fi
951 fi 997 fi
952 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 998 fi
999 [[ ! -e ${src} ]] && return 1
953 echo "${src}" 1000 echo "${src}"
954} 1001}
955 1002
956# Unpack those pesky pdv generated files ... 1003# Unpack those pesky pdv generated files ...
957# They're self-unpacking programs with the binary package stuffed in 1004# They're self-unpacking programs with the binary package stuffed in
972# lseek 1019# lseek
973# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1020# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
974# lseek(3, -4, SEEK_END) = 2981250 1021# lseek(3, -4, SEEK_END) = 2981250
975# thus we would pass in the value of '4' as the second parameter. 1022# thus we would pass in the value of '4' as the second parameter.
976unpack_pdv() { 1023unpack_pdv() {
977 local src="`find_unpackable_file $1`" 1024 local src=$(find_unpackable_file $1)
978 local sizeoff_t="$2" 1025 local sizeoff_t=$2
979 1026
1027 [[ -z ${src} ]] && die "Could not locate source for '$1'"
980 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1028 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
981 1029
982 local shrtsrc="`basename ${src}`" 1030 local shrtsrc=$(basename "${src}")
983 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1031 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
984 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1032 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
985 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1033 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
986 1034
987 # grab metadata for debug reasons 1035 # grab metadata for debug reasons
1051# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1099# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1052# - If the file is not specified then unpack will utilize ${A}. 1100# - If the file is not specified then unpack will utilize ${A}.
1053# - If the offset is not specified then we will attempt to extract 1101# - If the offset is not specified then we will attempt to extract
1054# the proper offset from the script itself. 1102# the proper offset from the script itself.
1055unpack_makeself() { 1103unpack_makeself() {
1104 local src_input=${1:-${A}}
1056 local src="$(find_unpackable_file "$1")" 1105 local src=$(find_unpackable_file "${src_input}")
1057 local skip="$2" 1106 local skip=$2
1058 local exe="$3" 1107 local exe=$3
1059 1108
1109 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1110
1060 local shrtsrc="$(basename "${src}")" 1111 local shrtsrc=$(basename "${src}")
1061 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1112 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1062 if [ -z "${skip}" ] 1113 if [[ -z ${skip} ]] ; then
1063 then
1064 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1114 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1065 local skip=0 1115 local skip=0
1066 exe=tail 1116 exe=tail
1067 case ${ver} in 1117 case ${ver} in
1068 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1118 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1069 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1119 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1081 ;; 1131 ;;
1082 2.1.3) 1132 2.1.3)
1083 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1133 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1084 let skip="skip + 1" 1134 let skip="skip + 1"
1085 ;; 1135 ;;
1086 2.1.4) 1136 2.1.4|2.1.5)
1087 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1137 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1088 skip=$(head -n ${skip} "${src}" | wc -c) 1138 skip=$(head -n ${skip} "${src}" | wc -c)
1089 exe="dd" 1139 exe="dd"
1090 ;; 1140 ;;
1091 *) 1141 *)
1136check_license() { 1186check_license() {
1137 local lic=$1 1187 local lic=$1
1138 if [ -z "${lic}" ] ; then 1188 if [ -z "${lic}" ] ; then
1139 lic="${PORTDIR}/licenses/${LICENSE}" 1189 lic="${PORTDIR}/licenses/${LICENSE}"
1140 else 1190 else
1141 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1191 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1142 lic="${PORTDIR}/licenses/${src}" 1192 lic="${PORTDIR}/licenses/${lic}"
1143 elif [ -e "${PWD}/${src}" ] ; then 1193 elif [ -e "${PWD}/${lic}" ] ; then
1144 lic="${PWD}/${src}" 1194 lic="${PWD}/${lic}"
1145 elif [ -e "${src}" ] ; then 1195 elif [ -e "${lic}" ] ; then
1146 lic="${src}" 1196 lic="${lic}"
1147 fi
1148 fi 1197 fi
1198 fi
1149 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1199 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1150 local l="`basename ${lic}`" 1200 local l="`basename ${lic}`"
1151 1201
1152 # here is where we check for the licenses the user already 1202 # here is where we check for the licenses the user already
1153 # accepted ... if we don't find a match, we make the user accept 1203 # accepted ... if we don't find a match, we make the user accept
1154 local shopts=$- 1204 local shopts=$-
1210 # first we figure out how many cds we're dealing with by 1260 # first we figure out how many cds we're dealing with by
1211 # the # of files they gave us 1261 # the # of files they gave us
1212 local cdcnt=0 1262 local cdcnt=0
1213 local f= 1263 local f=
1214 for f in "$@" ; do 1264 for f in "$@" ; do
1215 cdcnt=$((cdcnt + 1)) 1265 ((++cdcnt))
1216 export CDROM_CHECK_${cdcnt}="$f" 1266 export CDROM_CHECK_${cdcnt}="$f"
1217 done 1267 done
1218 export CDROM_TOTAL_CDS=${cdcnt} 1268 export CDROM_TOTAL_CDS=${cdcnt}
1219 export CDROM_CURRENT_CD=1 1269 export CDROM_CURRENT_CD=1
1220 1270
1221 # now we see if the user gave use CD_ROOT ... 1271 # now we see if the user gave use CD_ROOT ...
1222 # if they did, let's just believe them that it's correct 1272 # if they did, let's just believe them that it's correct
1223 if [[ ! -z ${CD_ROOT} ]] ; then
1224 export CDROM_ROOT=${CD_ROOT}
1225 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1226 return
1227 fi
1228 # do the same for CD_ROOT_X
1229 if [[ ! -z ${CD_ROOT_1} ]] ; then 1273 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1230 local var= 1274 local var=
1231 cdcnt=0 1275 cdcnt=0
1232 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1276 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1233 cdcnt=$((cdcnt + 1)) 1277 ((++cdcnt))
1234 var="CD_ROOT_${cdcnt}" 1278 var="CD_ROOT_${cdcnt}"
1279 [[ -z ${!var} ]] && var="CD_ROOT"
1235 if [[ -z ${!var} ]] ; then 1280 if [[ -z ${!var} ]] ; then
1236 eerror "You must either use just the CD_ROOT" 1281 eerror "You must either use just the CD_ROOT"
1237 eerror "or specify ALL the CD_ROOT_X variables." 1282 eerror "or specify ALL the CD_ROOT_X variables."
1238 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1283 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1239 die "could not locate CD_ROOT_${cdcnt}" 1284 die "could not locate CD_ROOT_${cdcnt}"
1240 fi 1285 fi
1241 export CDROM_ROOTS_${cdcnt}="${!var}"
1242 done 1286 done
1243 export CDROM_ROOT=${CDROM_ROOTS_1} 1287 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1244 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1288 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1289 export CDROM_SET=-1
1290 for f in ${CDROM_CHECK_1//:/ } ; do
1291 ((++CDROM_SET))
1292 [[ -e ${CD_ROOT}/${f} ]] && break
1293 done
1294 export CDROM_MATCH=${f}
1245 return 1295 return
1246 fi 1296 fi
1247 1297
1298 # User didn't help us out so lets make sure they know they can
1299 # simplify the whole process ...
1248 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1300 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1249 einfon "This ebuild will need the " 1301 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1250 if [[ -z ${CDROM_NAME} ]] ; then
1251 echo "cdrom for ${PN}."
1252 else
1253 echo "${CDROM_NAME}."
1254 fi
1255 echo 1302 echo
1256 einfo "If you do not have the CD, but have the data files" 1303 einfo "If you do not have the CD, but have the data files"
1257 einfo "mounted somewhere on your filesystem, just export" 1304 einfo "mounted somewhere on your filesystem, just export"
1258 einfo "the variable CD_ROOT so that it points to the" 1305 einfo "the variable CD_ROOT so that it points to the"
1259 einfo "directory containing the files." 1306 einfo "directory containing the files."
1263 echo 1310 echo
1264 else 1311 else
1265 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1312 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1266 cdcnt=0 1313 cdcnt=0
1267 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1314 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1268 cdcnt=$((cdcnt + 1)) 1315 ((++cdcnt))
1269 var="CDROM_NAME_${cdcnt}" 1316 var="CDROM_NAME_${cdcnt}"
1270 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1317 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1271 done 1318 done
1272 echo 1319 echo
1273 einfo "If you do not have the CDs, but have the data files" 1320 einfo "If you do not have the CDs, but have the data files"
1274 einfo "mounted somewhere on your filesystem, just export" 1321 einfo "mounted somewhere on your filesystem, just export"
1275 einfo "the following variables so they point to the right place:" 1322 einfo "the following variables so they point to the right place:"
1276 einfon "" 1323 einfon ""
1277 cdcnt=0 1324 cdcnt=0
1278 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1325 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1279 cdcnt=$((cdcnt + 1)) 1326 ((++cdcnt))
1280 echo -n " CD_ROOT_${cdcnt}" 1327 echo -n " CD_ROOT_${cdcnt}"
1281 done 1328 done
1282 echo 1329 echo
1283 einfo "Or, if you have all the files in the same place, or" 1330 einfo "Or, if you have all the files in the same place, or"
1284 einfo "you only have one cdrom, you can export CD_ROOT" 1331 einfo "you only have one cdrom, you can export CD_ROOT"
1287 echo 1334 echo
1288 einfo "For example:" 1335 einfo "For example:"
1289 einfo "export CD_ROOT_1=/mnt/cdrom" 1336 einfo "export CD_ROOT_1=/mnt/cdrom"
1290 echo 1337 echo
1291 fi 1338 fi
1339
1340 export CDROM_SET=""
1292 export CDROM_CURRENT_CD=0 1341 export CDROM_CURRENT_CD=0
1293 cdrom_load_next_cd 1342 cdrom_load_next_cd
1294} 1343}
1295 1344
1296# this is only used when you need access to more than one cd. 1345# this is only used when you need access to more than one cd.
1297# when you have finished using the first cd, just call this function. 1346# when you have finished using the first cd, just call this function.
1298# when it returns, CDROM_ROOT will be pointing to the second cd. 1347# when it returns, CDROM_ROOT will be pointing to the second cd.
1299# remember, you can only go forward in the cd chain, you can't go back. 1348# remember, you can only go forward in the cd chain, you can't go back.
1300cdrom_load_next_cd() { 1349cdrom_load_next_cd() {
1301 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1302 local var= 1350 local var
1303 1351 ((++CDROM_CURRENT_CD))
1304 if [[ ! -z ${CD_ROOT} ]] ; then
1305 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1306 return
1307 fi
1308 1352
1309 unset CDROM_ROOT 1353 unset CDROM_ROOT
1310 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1354 var=CD_ROOT_${CDROM_CURRENT_CD}
1355 [[ -z ${!var} ]] && var="CD_ROOT"
1311 if [[ -z ${!var} ]] ; then 1356 if [[ -z ${!var} ]] ; then
1312 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1357 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1313 cdrom_locate_file_on_cd ${!var} 1358 _cdrom_locate_file_on_cd ${!var}
1314 else 1359 else
1315 export CDROM_ROOT=${!var} 1360 export CDROM_ROOT=${!var}
1316 fi 1361 fi
1317 1362
1318 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1363 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1323# all it does is try to locate a give file on a cd ... if the cd isn't 1368# all it does is try to locate a give file on a cd ... if the cd isn't
1324# found, then a message asking for the user to insert the cdrom will be 1369# found, then a message asking for the user to insert the cdrom will be
1325# displayed and we'll hang out here until: 1370# displayed and we'll hang out here until:
1326# (1) the file is found on a mounted cdrom 1371# (1) the file is found on a mounted cdrom
1327# (2) the user hits CTRL+C 1372# (2) the user hits CTRL+C
1328cdrom_locate_file_on_cd() { 1373_cdrom_locate_file_on_cd() {
1374 local mline=""
1375 local showedmsg=0
1376
1329 while [[ -z ${CDROM_ROOT} ]] ; do 1377 while [[ -z ${CDROM_ROOT} ]] ; do
1330 local dir=$(dirname "$*") 1378 local i=0
1379 local -a cdset=(${*//:/ })
1380 if [[ -n ${CDROM_SET} ]] ; then
1381 cdset=(${cdset[${CDROM_SET}]})
1382 fi
1383
1384 while [[ -n ${cdset[${i}]} ]] ; do
1385 local dir=$(dirname ${cdset[${i}]})
1331 local file=$(basename "$*") 1386 local file=$(basename ${cdset[${i}]})
1332 local mline=""
1333 local showedmsg=0
1334 1387
1335 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1388 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1336 [[ -d ${mline}/${dir} ]] || continue 1389 [[ -d ${mline}/${dir} ]] || continue
1337 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1390 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1338 && export CDROM_ROOT=${mline} 1391 export CDROM_ROOT=${mline}
1392 export CDROM_SET=${i}
1393 export CDROM_MATCH=${cdset[${i}]}
1394 return
1395 fi
1396 done
1397
1398 ((++i))
1339 done 1399 done
1340 1400
1341 if [[ -z ${CDROM_ROOT} ]] ; then
1342 echo 1401 echo
1343 if [[ ${showedmsg} -eq 0 ]] ; then 1402 if [[ ${showedmsg} -eq 0 ]] ; then
1344 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1403 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1345 if [[ -z ${CDROM_NAME} ]] ; then 1404 if [[ -z ${CDROM_NAME} ]] ; then
1346 einfo "Please insert the cdrom for ${PN} now !" 1405 einfo "Please insert+mount the cdrom for ${PN} now !"
1347 else
1348 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1349 fi
1350 else 1406 else
1351 if [[ -z ${CDROM_NAME_1} ]] ; then
1352 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1353 else
1354 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1355 einfo "Please insert+mount the ${!var} cdrom now !" 1407 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1356 fi
1357 fi 1408 fi
1358 showedmsg=1 1409 else
1410 if [[ -z ${CDROM_NAME_1} ]] ; then
1411 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1412 else
1413 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1414 einfo "Please insert+mount the ${!var} cdrom now !"
1415 fi
1359 fi 1416 fi
1417 showedmsg=1
1418 fi
1360 einfo "Press return to scan for the cd again" 1419 einfo "Press return to scan for the cd again"
1361 einfo "or hit CTRL+C to abort the emerge." 1420 einfo "or hit CTRL+C to abort the emerge."
1362 echo 1421 echo
1363 einfo "If you are having trouble with the detection" 1422 einfo "If you are having trouble with the detection"
1364 einfo "of your CD, it is possible that you do not have" 1423 einfo "of your CD, it is possible that you do not have"
1365 einfo "Joliet support enabled in your kernel. Please" 1424 einfo "Joliet support enabled in your kernel. Please"
1366 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1425 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1367 read 1426 read || die "something is screwed with your system"
1368 fi
1369 done 1427 done
1370} 1428}
1371 1429
1372# Make sure that LINGUAS only contains languages that 1430# Make sure that LINGUAS only contains languages that
1373# a package can support 1431# a package can support
1383# directories and uses the union of the lists. 1441# directories and uses the union of the lists.
1384strip-linguas() { 1442strip-linguas() {
1385 local ls newls 1443 local ls newls
1386 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1444 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1387 local op=$1; shift 1445 local op=$1; shift
1388 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1446 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1389 local d f 1447 local d f
1390 for d in "$@" ; do 1448 for d in "$@" ; do
1391 if [[ ${op} == "-u" ]] ; then 1449 if [[ ${op} == "-u" ]] ; then
1392 newls=${ls} 1450 newls=${ls}
1393 else 1451 else
1394 newls="" 1452 newls=""
1395 fi 1453 fi
1396 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1454 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1397 if [[ ${op} == "-i" ]] ; then 1455 if [[ ${op} == "-i" ]] ; then
1398 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1456 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1399 else 1457 else
1400 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1458 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1401 fi 1459 fi
1457 1515
1458# Jeremy Huddleston <eradicator@gentoo.org>: 1516# Jeremy Huddleston <eradicator@gentoo.org>:
1459# preserve_old_lib /path/to/libblah.so.0 1517# preserve_old_lib /path/to/libblah.so.0
1460# preserve_old_lib_notify /path/to/libblah.so.0 1518# preserve_old_lib_notify /path/to/libblah.so.0
1461# 1519#
1462# These functions are useful when a lib in your package changes --soname. Such 1520# These functions are useful when a lib in your package changes --library. Such
1463# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1521# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1464# would break packages that link against it. Most people get around this 1522# would break packages that link against it. Most people get around this
1465# by using the portage SLOT mechanism, but that is not always a relevant 1523# by using the portage SLOT mechanism, but that is not always a relevant
1466# solution, so instead you can add the following to your ebuilds: 1524# solution, so instead you can add the following to your ebuilds:
1467# 1525#
1498 1556
1499 ewarn "An old version of an installed library was detected on your system." 1557 ewarn "An old version of an installed library was detected on your system."
1500 ewarn "In order to avoid breaking packages that link against it, this older version" 1558 ewarn "In order to avoid breaking packages that link against it, this older version"
1501 ewarn "is not being removed. In order to make full use of this newer version," 1559 ewarn "is not being removed. In order to make full use of this newer version,"
1502 ewarn "you will need to execute the following command:" 1560 ewarn "you will need to execute the following command:"
1503 ewarn " revdep-rebuild --soname ${SONAME}" 1561 ewarn " revdep-rebuild --library ${SONAME}"
1504 ewarn 1562 ewarn
1505 ewarn "After doing that, you can safely remove ${LIB}" 1563 ewarn "After doing that, you can safely remove ${LIB}"
1506 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1564 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1507 fi 1565 fi
1508} 1566}
1521 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1579 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1522 1580
1523 local PKG=$(best_version $1) 1581 local PKG=$(best_version $1)
1524 shift 1582 shift
1525 1583
1526 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1584 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1585
1586 # if the USE file doesnt exist, assume the $PKG is either
1587 # injected or package.provided
1527 [[ ! -e ${USEFILE} ]] && return 1 1588 [[ ! -e ${USEFILE} ]] && return 0
1528 1589
1529 local USE_BUILT=$(<${USEFILE}) 1590 local USE_BUILT=$(<${USEFILE})
1530 while [[ $# -gt 0 ]] ; do 1591 while [[ $# -gt 0 ]] ; do
1531 if [[ ${opt} = "-o" ]] ; then 1592 if [[ ${opt} = "-o" ]] ; then
1532 has $1 ${USE_BUILT} && return 0 1593 has $1 ${USE_BUILT} && return 0
1584# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1645# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1585# $5 == path for wrapper 1646# $5 == path for wrapper
1586make_wrapper() { 1647make_wrapper() {
1587 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1648 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1588 local tmpwrapper=$(emktemp) 1649 local tmpwrapper=$(emktemp)
1650 # We don't want to quote ${bin} so that people can pass complex
1651 # things as $bin ... "./someprog --args"
1589 cat << EOF > "${tmpwrapper}" 1652 cat << EOF > "${tmpwrapper}"
1590#!/bin/sh 1653#!/bin/sh
1591cd "${chdir}" 1654cd "${chdir:-.}"
1655if [ -n "${libdir}" ] ; then
1656 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1592export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1657 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1658 else
1659 export LD_LIBRARY_PATH="${libdir}"
1660 fi
1661fi
1593exec ${bin} "\$@" 1662exec ${bin} "\$@"
1594EOF 1663EOF
1595 chmod go+rx "${tmpwrapper}" 1664 chmod go+rx "${tmpwrapper}"
1596 if [ -n "${5}" ] 1665 if [[ -n ${path} ]] ; then
1597 then
1598 exeinto ${5} 1666 exeinto "${path}"
1599 newexe "${tmpwrapper}" "${wrapper}" 1667 newexe "${tmpwrapper}" "${wrapper}"
1600 else 1668 else
1601 newbin "${tmpwrapper}" "${wrapper}" 1669 newbin "${tmpwrapper}" "${wrapper}"
1602 fi 1670 fi
1603} 1671}

Legend:
Removed from v.1.195  
changed lines
  Added in v.1.228

  ViewVC Help
Powered by ViewVC 1.1.20