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

Diff of /eclass/eutils.eclass

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

Revision 1.200 Revision 1.226
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.200 2005/09/23 20:44:26 wolf31o2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.226 2006/02/20 11:56:33 flameeyes 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.
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 local i=0 str_length="" str_out=""
143
144 # Handle calls that do not have args, or wc not being installed ...
145 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
146 str_length=65
147 else
148 str_length=$(echo -n "$*" | wc -m)
149 fi
150
151 while ((i++ < ${str_length})) ; do
152 str_out="${str_out}="
153 done
154 echo ${str_out}
155
156 return 0
157 }
158 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 159 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 160 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 161 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 162 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 163 local SINGLE_PATCH="no"
284 272
285 # Allow for prefix to differ ... im lazy, so shoot me :/ 273 # Allow for prefix to differ ... im lazy, so shoot me :/
286 while [ "${count}" -lt 5 ] 274 while [ "${count}" -lt 5 ]
287 do 275 do
288 # Generate some useful debug info ... 276 # Generate some useful debug info ...
289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 277 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 279
292 if [ "${PATCH_SUFFIX}" != "patch" ] 280 if [ "${PATCH_SUFFIX}" != "patch" ]
293 then 281 then
294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 287
300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 288 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 289 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 290
303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 292 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 293
306 if [ "${PATCH_SUFFIX}" != "patch" ] 294 if [ "${PATCH_SUFFIX}" != "patch" ]
307 then 295 then
308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 296 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
309 then 297 then
313 count=5 301 count=5
314 break 302 break
315 fi 303 fi
316 fi 304 fi
317 305
318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 306 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
319 then 307 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 308 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 309 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 310 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 311 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 312 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 313
326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 314 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
315 _epatch_assert
327 316
328 if [ "$?" -ne 0 ] 317 if [ "$?" -ne 0 ]
329 then 318 then
330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 319 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo 320 echo
394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 383 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 384 done
396 ${exe} "${tmp}" || ${exe} -p "${tmp}" 385 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 386 echo "${tmp}"
398 else 387 else
399 [[ ${exe} == "touch" ]] \ 388 if [[ ${exe} == "touch" ]] ; then
400 && exe="-p" \ 389 [[ ${USERLAND} == "GNU" ]] \
401 || exe="-d" 390 && mktemp -p "${topdir}" \
402 mktemp ${exe} "${topdir}" 391 || TMPDIR="${topdir}" mktemp -t tmp
392 else
393 [[ ${USERLAND} == "GNU" ]] \
394 && mktemp -d "${topdir}" \
395 || TMPDIR="${topdir}" mktemp -dt tmp
396 fi
403 fi 397 fi
404} 398}
405 399
406# Small wrapper for getent (Linux), nidump (Mac OS X), 400# Small wrapper for getent (Linux), nidump (Mac OS X),
407# and pw (FreeBSD) used in enewuser()/enewgroup() 401# and pw (FreeBSD) used in enewuser()/enewgroup()
408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 402# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 403# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
410# 404#
411# egetent(database, key) 405# egetent(database, key)
412egetent() { 406egetent() {
413 if [[ "${USERLAND}" == "Darwin" ]] ; then 407 case ${CHOST} in
408 *-darwin*)
414 case "$2" in 409 case "$2" in
415 *[!0-9]*) # Non numeric 410 *[!0-9]*) # Non numeric
416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 411 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
417 ;; 412 ;;
418 *) # Numeric 413 *) # Numeric
419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 414 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
420 ;; 415 ;;
421 esac 416 esac
422 elif [[ "${USERLAND}" == "BSD" ]] ; then 417 ;;
423 local action 418 *-freebsd*|*-dragonfly*)
424 if [ "$1" == "passwd" ] 419 local opts action="user"
425 then 420 [[ $1 == "passwd" ]] || action="group"
426 action="user" 421
427 else 422 # lookup by uid/gid
428 action="group" 423 if [[ $2 == [[:digit:]]* ]] ; then
424 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi 425 fi
426
430 pw show "${action}" "$2" -q 427 pw show ${action} ${opts} "$2" -q
431 else 428 ;;
429 *-netbsd*|*-openbsd*)
430 grep "$2:\*:" /etc/$1
431 ;;
432 *)
432 which nscd >& /dev/null && nscd -i "$1" 433 type -p nscd >& /dev/null && nscd -i "$1"
433 getent "$1" "$2" 434 getent "$1" "$2"
434 fi 435 ;;
436 esac
435} 437}
436 438
437# Simplify/standardize adding users to the system 439# Simplify/standardize adding users to the system
438# vapier@gentoo.org 440# vapier@gentoo.org
439# 441#
487 einfo " - Userid: ${euid}" 489 einfo " - Userid: ${euid}"
488 490
489 # handle shell 491 # handle shell
490 local eshell=$1; shift 492 local eshell=$1; shift
491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 493 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
492 if [[ ! -e ${eshell} ]] ; then 494 if [[ ! -e ${ROOT}${eshell} ]] ; then
493 eerror "A shell was specified but it does not exist !" 495 eerror "A shell was specified but it does not exist !"
494 die "${eshell} does not exist" 496 die "${eshell} does not exist in ${ROOT}"
495 fi 497 fi
498 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
499 eerror "Do not specify ${eshell} yourself, use -1"
500 die "Pass '-1' as the shell parameter"
501 fi
496 else 502 else
497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null; do 503 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
498 [[ -x ${ROOT}${shell} ]] && break; 504 [[ -x ${ROOT}${shell} ]] && break
499 done 505 done
500 506
501 if [[ ${shell} == "/dev/null" ]]; then 507 if [[ ${shell} == "/dev/null" ]] ; then
502 eerror "Unable to identify the shell to use" 508 eerror "Unable to identify the shell to use"
503 die "Unable to identify the shell to use" 509 die "Unable to identify the shell to use"
504 fi 510 fi
505 511
506 eshell=${shell} 512 eshell=${shell}
548 einfo " - Groups: ${egroups}" 554 einfo " - Groups: ${egroups}"
549 555
550 # handle extra and add the user 556 # handle extra and add the user
551 local oldsandbox=${SANDBOX_ON} 557 local oldsandbox=${SANDBOX_ON}
552 export SANDBOX_ON="0" 558 export SANDBOX_ON="0"
553 case ${USERLAND} in 559 case ${CHOST} in
554 Darwin) 560 *-darwin*)
555 ### Make the user 561 ### Make the user
556 if [[ -z $@ ]] ; then 562 if [[ -z $@ ]] ; then
557 dscl . create /users/${euser} uid ${euid} 563 dscl . create /users/${euser} uid ${euid}
558 dscl . create /users/${euser} shell ${eshell} 564 dscl . create /users/${euser} shell ${eshell}
559 dscl . create /users/${euser} home ${ehome} 565 dscl . create /users/${euser} home ${ehome}
570 einfo "Please report the ebuild along with the info below" 576 einfo "Please report the ebuild along with the info below"
571 einfo "eextra: $@" 577 einfo "eextra: $@"
572 die "Required function missing" 578 die "Required function missing"
573 fi 579 fi
574 ;; 580 ;;
575 BSD) 581 *-freebsd*|*-dragonfly*)
576 if [[ -z $@ ]] ; then 582 if [[ -z $@ ]] ; then
577 pw useradd ${euser} ${opts} \ 583 pw useradd ${euser} ${opts} \
578 -c "added by portage for ${PN}" \ 584 -c "added by portage for ${PN}" \
579 die "enewuser failed" 585 die "enewuser failed"
580 else 586 else
581 einfo " - Extra: $@" 587 einfo " - Extra: $@"
582 pw useradd ${euser} ${opts} \ 588 pw useradd ${euser} ${opts} \
583 "$@" || die "enewuser failed" 589 "$@" || die "enewuser failed"
584 fi 590 fi
585 ;; 591 ;;
592
593 *-netbsd*)
594 if [[ -z $@ ]] ; then
595 useradd ${opts} ${euser} || die "enewuser failed"
596 else
597 einfo " - Extra: $@"
598 useradd ${opts} ${euser} "$@" || die "enewuser failed"
599 fi
600 ;;
601
602 *-openbsd*)
603 if [[ -z $@ ]] ; then
604 useradd -u ${euid} -s ${eshell} \
605 -d ${ehome} -c "Added by portage for ${PN}" \
606 -g ${egroups} ${euser} || die "enewuser failed"
607 else
608 einfo " - Extra: $@"
609 useradd -u ${euid} -s ${eshell} \
610 -d ${ehome} -c "Added by portage for ${PN}" \
611 -g ${egroups} ${euser} "$@" || die "enewuser failed"
612 fi
613 ;;
614
586 *) 615 *)
587 if [[ -z $@ ]] ; then 616 if [[ -z $@ ]] ; then
588 useradd ${opts} ${euser} \ 617 useradd ${opts} ${euser} \
589 -c "added by portage for ${PN}" \ 618 -c "added by portage for ${PN}" \
590 || die "enewuser failed" 619 || die "enewuser failed"
640 then 669 then
641 if [ "${egid}" -gt 0 ] 670 if [ "${egid}" -gt 0 ]
642 then 671 then
643 if [ -z "`egetent group ${egid}`" ] 672 if [ -z "`egetent group ${egid}`" ]
644 then 673 then
645 if [[ "${USERLAND}" == "Darwin" ]]; then 674 if [[ "${CHOST}" == *-darwin* ]]; then
646 opts="${opts} ${egid}" 675 opts="${opts} ${egid}"
647 else 676 else
648 opts="${opts} -g ${egid}" 677 opts="${opts} -g ${egid}"
649 fi 678 fi
650 else 679 else
664 opts="${opts} ${eextra}" 693 opts="${opts} ${eextra}"
665 694
666 # add the group 695 # add the group
667 local oldsandbox="${SANDBOX_ON}" 696 local oldsandbox="${SANDBOX_ON}"
668 export SANDBOX_ON="0" 697 export SANDBOX_ON="0"
669 if [[ "${USERLAND}" == "Darwin" ]]; then 698 case ${CHOST} in
699 *-darwin*)
670 if [ ! -z "${eextra}" ]; 700 if [ ! -z "${eextra}" ];
671 then 701 then
672 einfo "Extra options are not supported on Darwin/OS X yet" 702 einfo "Extra options are not supported on Darwin/OS X yet"
673 einfo "Please report the ebuild along with the info below" 703 einfo "Please report the ebuild along with the info below"
674 einfo "eextra: ${eextra}" 704 einfo "eextra: ${eextra}"
675 die "Required function missing" 705 die "Required function missing"
676 fi 706 fi
677 707
678 # If we need the next available 708 # If we need the next available
679 case ${egid} in 709 case ${egid} in
680 *[!0-9]*) # Non numeric 710 *[!0-9]*) # Non numeric
681 for egid in $(seq 101 999); do 711 for egid in $(seq 101 999); do
682 [ -z "`egetent group ${egid}`" ] && break 712 [ -z "`egetent group ${egid}`" ] && break
683 done 713 done
684 esac 714 esac
685 dscl . create /groups/${egroup} gid ${egid} 715 dscl . create /groups/${egroup} gid ${egid}
686 dscl . create /groups/${egroup} passwd '*' 716 dscl . create /groups/${egroup} passwd '*'
687 elif [[ "${USERLAND}" == "BSD" ]] ; then 717 ;;
718
719 *-freebsd*|*-dragonfly*)
688 case ${egid} in 720 case ${egid} in
689 *[!0-9]*) # Non numeric 721 *[!0-9]*) # Non numeric
690 for egid in $(seq 101 999); do 722 for egid in $(seq 101 999); do
691 [ -z "`egetent group ${egid}`" ] && break 723 [ -z "`egetent group ${egid}`" ] && break
692 done 724 done
693 esac 725 esac
694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 726 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
695 else 727 ;;
728
729 *-netbsd*)
730 case ${egid} in
731 *[!0-9]*) # Non numeric
732 for egid in $(seq 101 999); do
733 [ -z "`egetent group ${egid}`" ] && break
734 done
735 esac
736 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
737 ;;
738
739 *)
696 groupadd ${opts} ${egroup} || die "enewgroup failed" 740 groupadd ${opts} ${egroup} || die "enewgroup failed"
697 fi 741 ;;
742 esac
698 export SANDBOX_ON="${oldsandbox}" 743 export SANDBOX_ON="${oldsandbox}"
699} 744}
700 745
701# Simple script to replace 'dos2unix' binaries 746# Simple script to replace 'dos2unix' binaries
702# vapier@gentoo.org 747# vapier@gentoo.org
813 type="Network;${type}" 858 type="Network;${type}"
814 ;; 859 ;;
815 860
816 sci) 861 sci)
817 case ${catmin} in 862 case ${catmin} in
818 astro*) type=Astronomoy;; 863 astro*) type=Astronomy;;
819 bio*) type=Biology;; 864 bio*) type=Biology;;
820 calc*) type=Calculator;; 865 calc*) type=Calculator;;
821 chem*) type=Chemistry;; 866 chem*) type=Chemistry;;
822 geo*) type=Geology;; 867 geo*) type=Geology;;
823 math*) type=Math;; 868 math*) type=Math;;
855Exec=${exec} 900Exec=${exec}
856Path=${path} 901Path=${path}
857Icon=${icon} 902Icon=${icon}
858Categories=Application;${type};" > "${desktop}" 903Categories=Application;${type};" > "${desktop}"
859 904
905 (
906 # wrap the env here so that the 'insinto' call
907 # doesn't corrupt the env of the caller
860 insinto /usr/share/applications 908 insinto /usr/share/applications
861 doins "${desktop}" 909 doins "${desktop}"
862 910 )
863 return 0
864} 911}
865 912
866# Make a GDM/KDM Session file 913# Make a GDM/KDM Session file
867# 914#
868# make_desktop_entry(<title>, <command>) 915# make_desktop_entry(<title>, <command>)
973 local sizeoff_t=$2 1020 local sizeoff_t=$2
974 1021
975 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1022 [[ -z ${src} ]] && die "Could not locate source for '$1'"
976 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1023 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
977 1024
978 local shrtsrc="`basename ${src}`" 1025 local shrtsrc=$(basename "${src}")
979 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1026 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
980 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1027 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
981 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1028 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
982 1029
983 # grab metadata for debug reasons 1030 # grab metadata for debug reasons
1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1094# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1048# - If the file is not specified then unpack will utilize ${A}. 1095# - If the file is not specified then unpack will utilize ${A}.
1049# - If the offset is not specified then we will attempt to extract 1096# - If the offset is not specified then we will attempt to extract
1050# the proper offset from the script itself. 1097# the proper offset from the script itself.
1051unpack_makeself() { 1098unpack_makeself() {
1099 local src_input=${1:-${A}}
1052 local src=$(find_unpackable_file "$1") 1100 local src=$(find_unpackable_file "${src_input}")
1053 local skip=$2 1101 local skip=$2
1054 local exe=$3 1102 local exe=$3
1055 1103
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1104 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1057 1105
1058 local shrtsrc=$(basename "${src}") 1106 local shrtsrc=$(basename "${src}")
1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1107 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1060 if [ -z "${skip}" ] 1108 if [[ -z ${skip} ]] ; then
1061 then
1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1109 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1063 local skip=0 1110 local skip=0
1064 exe=tail 1111 exe=tail
1065 case ${ver} in 1112 case ${ver} in
1066 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1113 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1067 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1114 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1079 ;; 1126 ;;
1080 2.1.3) 1127 2.1.3)
1081 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1128 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1082 let skip="skip + 1" 1129 let skip="skip + 1"
1083 ;; 1130 ;;
1084 2.1.4) 1131 2.1.4|2.1.5)
1085 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1132 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1086 skip=$(head -n ${skip} "${src}" | wc -c) 1133 skip=$(head -n ${skip} "${src}" | wc -c)
1087 exe="dd" 1134 exe="dd"
1088 ;; 1135 ;;
1089 *) 1136 *)
1208 # first we figure out how many cds we're dealing with by 1255 # first we figure out how many cds we're dealing with by
1209 # the # of files they gave us 1256 # the # of files they gave us
1210 local cdcnt=0 1257 local cdcnt=0
1211 local f= 1258 local f=
1212 for f in "$@" ; do 1259 for f in "$@" ; do
1213 cdcnt=$((cdcnt + 1)) 1260 ((++cdcnt))
1214 export CDROM_CHECK_${cdcnt}="$f" 1261 export CDROM_CHECK_${cdcnt}="$f"
1215 done 1262 done
1216 export CDROM_TOTAL_CDS=${cdcnt} 1263 export CDROM_TOTAL_CDS=${cdcnt}
1217 export CDROM_CURRENT_CD=1 1264 export CDROM_CURRENT_CD=1
1218 1265
1219 # now we see if the user gave use CD_ROOT ... 1266 # now we see if the user gave use CD_ROOT ...
1220 # if they did, let's just believe them that it's correct 1267 # if they did, let's just believe them that it's correct
1221 if [[ ! -z ${CD_ROOT} ]] ; then
1222 export CDROM_ROOT=${CD_ROOT}
1223 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1224 return
1225 fi
1226 # do the same for CD_ROOT_X
1227 if [[ ! -z ${CD_ROOT_1} ]] ; then 1268 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1228 local var= 1269 local var=
1229 cdcnt=0 1270 cdcnt=0
1230 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1271 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1231 cdcnt=$((cdcnt + 1)) 1272 ((++cdcnt))
1232 var="CD_ROOT_${cdcnt}" 1273 var="CD_ROOT_${cdcnt}"
1274 [[ -z ${!var} ]] && var="CD_ROOT"
1233 if [[ -z ${!var} ]] ; then 1275 if [[ -z ${!var} ]] ; then
1234 eerror "You must either use just the CD_ROOT" 1276 eerror "You must either use just the CD_ROOT"
1235 eerror "or specify ALL the CD_ROOT_X variables." 1277 eerror "or specify ALL the CD_ROOT_X variables."
1236 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1237 die "could not locate CD_ROOT_${cdcnt}" 1279 die "could not locate CD_ROOT_${cdcnt}"
1238 fi 1280 fi
1239 export CDROM_ROOTS_${cdcnt}="${!var}"
1240 done 1281 done
1241 export CDROM_ROOT=${CDROM_ROOTS_1} 1282 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1242 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1283 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1284 export CDROM_SET=-1
1285 for f in ${CDROM_CHECK_1//:/ } ; do
1286 ((++CDROM_SET))
1287 [[ -e ${CD_ROOT}/${f} ]] && break
1288 done
1289 export CDROM_MATCH=${f}
1243 return 1290 return
1244 fi 1291 fi
1245 1292
1293 # User didn't help us out so lets make sure they know they can
1294 # simplify the whole process ...
1246 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1295 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1247 einfon "This ebuild will need the " 1296 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1248 if [[ -z ${CDROM_NAME} ]] ; then
1249 echo "cdrom for ${PN}."
1250 else
1251 echo "${CDROM_NAME}."
1252 fi
1253 echo 1297 echo
1254 einfo "If you do not have the CD, but have the data files" 1298 einfo "If you do not have the CD, but have the data files"
1255 einfo "mounted somewhere on your filesystem, just export" 1299 einfo "mounted somewhere on your filesystem, just export"
1256 einfo "the variable CD_ROOT so that it points to the" 1300 einfo "the variable CD_ROOT so that it points to the"
1257 einfo "directory containing the files." 1301 einfo "directory containing the files."
1261 echo 1305 echo
1262 else 1306 else
1263 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1307 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1264 cdcnt=0 1308 cdcnt=0
1265 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1309 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1266 cdcnt=$((cdcnt + 1)) 1310 ((++cdcnt))
1267 var="CDROM_NAME_${cdcnt}" 1311 var="CDROM_NAME_${cdcnt}"
1268 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1312 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1269 done 1313 done
1270 echo 1314 echo
1271 einfo "If you do not have the CDs, but have the data files" 1315 einfo "If you do not have the CDs, but have the data files"
1272 einfo "mounted somewhere on your filesystem, just export" 1316 einfo "mounted somewhere on your filesystem, just export"
1273 einfo "the following variables so they point to the right place:" 1317 einfo "the following variables so they point to the right place:"
1274 einfon "" 1318 einfon ""
1275 cdcnt=0 1319 cdcnt=0
1276 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1320 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1277 cdcnt=$((cdcnt + 1)) 1321 ((++cdcnt))
1278 echo -n " CD_ROOT_${cdcnt}" 1322 echo -n " CD_ROOT_${cdcnt}"
1279 done 1323 done
1280 echo 1324 echo
1281 einfo "Or, if you have all the files in the same place, or" 1325 einfo "Or, if you have all the files in the same place, or"
1282 einfo "you only have one cdrom, you can export CD_ROOT" 1326 einfo "you only have one cdrom, you can export CD_ROOT"
1285 echo 1329 echo
1286 einfo "For example:" 1330 einfo "For example:"
1287 einfo "export CD_ROOT_1=/mnt/cdrom" 1331 einfo "export CD_ROOT_1=/mnt/cdrom"
1288 echo 1332 echo
1289 fi 1333 fi
1334
1335 export CDROM_SET=""
1290 export CDROM_CURRENT_CD=0 1336 export CDROM_CURRENT_CD=0
1291 cdrom_load_next_cd 1337 cdrom_load_next_cd
1292} 1338}
1293 1339
1294# this is only used when you need access to more than one cd. 1340# this is only used when you need access to more than one cd.
1295# when you have finished using the first cd, just call this function. 1341# when you have finished using the first cd, just call this function.
1296# when it returns, CDROM_ROOT will be pointing to the second cd. 1342# when it returns, CDROM_ROOT will be pointing to the second cd.
1297# remember, you can only go forward in the cd chain, you can't go back. 1343# remember, you can only go forward in the cd chain, you can't go back.
1298cdrom_load_next_cd() { 1344cdrom_load_next_cd() {
1299 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1300 local var= 1345 local var
1301 1346 ((++CDROM_CURRENT_CD))
1302 if [[ ! -z ${CD_ROOT} ]] ; then
1303 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1304 return
1305 fi
1306 1347
1307 unset CDROM_ROOT 1348 unset CDROM_ROOT
1308 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1349 var=CD_ROOT_${CDROM_CURRENT_CD}
1350 [[ -z ${!var} ]] && var="CD_ROOT"
1309 if [[ -z ${!var} ]] ; then 1351 if [[ -z ${!var} ]] ; then
1310 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1352 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1311 cdrom_locate_file_on_cd ${!var} 1353 _cdrom_locate_file_on_cd ${!var}
1312 else 1354 else
1313 export CDROM_ROOT=${!var} 1355 export CDROM_ROOT=${!var}
1314 fi 1356 fi
1315 1357
1316 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1358 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1321# all it does is try to locate a give file on a cd ... if the cd isn't 1363# all it does is try to locate a give file on a cd ... if the cd isn't
1322# found, then a message asking for the user to insert the cdrom will be 1364# found, then a message asking for the user to insert the cdrom will be
1323# displayed and we'll hang out here until: 1365# displayed and we'll hang out here until:
1324# (1) the file is found on a mounted cdrom 1366# (1) the file is found on a mounted cdrom
1325# (2) the user hits CTRL+C 1367# (2) the user hits CTRL+C
1326cdrom_locate_file_on_cd() { 1368_cdrom_locate_file_on_cd() {
1369 local mline=""
1370 local showedmsg=0
1371
1327 while [[ -z ${CDROM_ROOT} ]] ; do 1372 while [[ -z ${CDROM_ROOT} ]] ; do
1328 local dir=$(dirname "$*") 1373 local i=0
1374 local -a cdset=(${*//:/ })
1375 if [[ -n ${CDROM_SET} ]] ; then
1376 cdset=(${cdset[${CDROM_SET}]})
1377 fi
1378
1379 while [[ -n ${cdset[${i}]} ]] ; do
1380 local dir=$(dirname ${cdset[${i}]})
1329 local file=$(basename "$*") 1381 local file=$(basename ${cdset[${i}]})
1330 local mline=""
1331 local showedmsg=0
1332 1382
1333 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1383 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1334 [[ -d ${mline}/${dir} ]] || continue 1384 [[ -d ${mline}/${dir} ]] || continue
1335 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1385 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1336 && export CDROM_ROOT=${mline} 1386 export CDROM_ROOT=${mline}
1387 export CDROM_SET=${i}
1388 export CDROM_MATCH=${cdset[${i}]}
1389 return
1390 fi
1391 done
1392
1393 ((++i))
1337 done 1394 done
1338 1395
1339 if [[ -z ${CDROM_ROOT} ]] ; then
1340 echo 1396 echo
1341 if [[ ${showedmsg} -eq 0 ]] ; then 1397 if [[ ${showedmsg} -eq 0 ]] ; then
1342 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1398 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1343 if [[ -z ${CDROM_NAME} ]] ; then 1399 if [[ -z ${CDROM_NAME} ]] ; then
1344 einfo "Please insert the cdrom for ${PN} now !" 1400 einfo "Please insert+mount the cdrom for ${PN} now !"
1345 else
1346 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1347 fi
1348 else 1401 else
1349 if [[ -z ${CDROM_NAME_1} ]] ; then
1350 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1351 else
1352 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1353 einfo "Please insert+mount the ${!var} cdrom now !" 1402 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1354 fi
1355 fi 1403 fi
1356 showedmsg=1 1404 else
1405 if [[ -z ${CDROM_NAME_1} ]] ; then
1406 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1407 else
1408 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1409 einfo "Please insert+mount the ${!var} cdrom now !"
1410 fi
1357 fi 1411 fi
1412 showedmsg=1
1413 fi
1358 einfo "Press return to scan for the cd again" 1414 einfo "Press return to scan for the cd again"
1359 einfo "or hit CTRL+C to abort the emerge." 1415 einfo "or hit CTRL+C to abort the emerge."
1360 echo 1416 echo
1361 einfo "If you are having trouble with the detection" 1417 einfo "If you are having trouble with the detection"
1362 einfo "of your CD, it is possible that you do not have" 1418 einfo "of your CD, it is possible that you do not have"
1363 einfo "Joliet support enabled in your kernel. Please" 1419 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1420 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1365 read 1421 read || die "something is screwed with your system"
1366 fi
1367 done 1422 done
1368} 1423}
1369 1424
1370# Make sure that LINGUAS only contains languages that 1425# Make sure that LINGUAS only contains languages that
1371# a package can support 1426# a package can support
1381# directories and uses the union of the lists. 1436# directories and uses the union of the lists.
1382strip-linguas() { 1437strip-linguas() {
1383 local ls newls 1438 local ls newls
1384 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1439 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1385 local op=$1; shift 1440 local op=$1; shift
1386 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1441 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1387 local d f 1442 local d f
1388 for d in "$@" ; do 1443 for d in "$@" ; do
1389 if [[ ${op} == "-u" ]] ; then 1444 if [[ ${op} == "-u" ]] ; then
1390 newls=${ls} 1445 newls=${ls}
1391 else 1446 else
1392 newls="" 1447 newls=""
1393 fi 1448 fi
1394 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1449 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1395 if [[ ${op} == "-i" ]] ; then 1450 if [[ ${op} == "-i" ]] ; then
1396 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1451 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1397 else 1452 else
1398 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1453 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1399 fi 1454 fi
1519 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1574 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1520 1575
1521 local PKG=$(best_version $1) 1576 local PKG=$(best_version $1)
1522 shift 1577 shift
1523 1578
1524 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1579 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1580
1581 # if the USE file doesnt exist, assume the $PKG is either
1582 # injected or package.provided
1525 [[ ! -e ${USEFILE} ]] && return 1 1583 [[ ! -e ${USEFILE} ]] && return 0
1526 1584
1527 local USE_BUILT=$(<${USEFILE}) 1585 local USE_BUILT=$(<${USEFILE})
1528 while [[ $# -gt 0 ]] ; do 1586 while [[ $# -gt 0 ]] ; do
1529 if [[ ${opt} = "-o" ]] ; then 1587 if [[ ${opt} = "-o" ]] ; then
1530 has $1 ${USE_BUILT} && return 0 1588 has $1 ${USE_BUILT} && return 0
1582# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1640# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1583# $5 == path for wrapper 1641# $5 == path for wrapper
1584make_wrapper() { 1642make_wrapper() {
1585 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1643 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1586 local tmpwrapper=$(emktemp) 1644 local tmpwrapper=$(emktemp)
1645 # We don't want to quote ${bin} so that people can pass complex
1646 # things as $bin ... "./someprog --args"
1587 cat << EOF > "${tmpwrapper}" 1647 cat << EOF > "${tmpwrapper}"
1588#!/bin/sh 1648#!/bin/sh
1589cd "${chdir}" 1649cd "${chdir:-.}"
1650if [ -n "${libdir}" ] ; then
1651 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1590export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1652 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1653 else
1654 export LD_LIBRARY_PATH="${libdir}"
1655 fi
1656fi
1591exec ${bin} "\$@" 1657exec ${bin} "\$@"
1592EOF 1658EOF
1593 chmod go+rx "${tmpwrapper}" 1659 chmod go+rx "${tmpwrapper}"
1594 if [ -n "${5}" ] 1660 if [[ -n ${path} ]] ; then
1595 then
1596 exeinto ${5} 1661 exeinto "${path}"
1597 newexe "${tmpwrapper}" "${wrapper}" 1662 newexe "${tmpwrapper}" "${wrapper}"
1598 else 1663 else
1599 newbin "${tmpwrapper}" "${wrapper}" 1664 newbin "${tmpwrapper}" "${wrapper}"
1600 fi 1665 fi
1601} 1666}

Legend:
Removed from v.1.200  
changed lines
  Added in v.1.226

  ViewVC Help
Powered by ViewVC 1.1.20