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

Diff of /eclass/eutils.eclass

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

Revision 1.192 Revision 1.217
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.192 2005/07/15 22:16:49 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.217 2005/11/18 03:29:38 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"
166# hand its a directory, it will set EPATCH_SOURCE to this. 166# hand its a directory, it will set EPATCH_SOURCE to this.
167# 167#
168# <azarah@gentoo.org> (10 Nov 2002) 168# <azarah@gentoo.org> (10 Nov 2002)
169# 169#
170epatch() { 170epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 172 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 173 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 174 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 175 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 176 local SINGLE_PATCH="no"
176 local x="" 177 local x=""
178
179 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
177 180
178 if [ "$#" -gt 1 ] 181 if [ "$#" -gt 1 ]
179 then 182 then
180 local m="" 183 local m=""
181 for m in "$@" ; do 184 for m in "$@" ; do
311 count=5 314 count=5
312 break 315 break
313 fi 316 fi
314 fi 317 fi
315 318
316 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
317 then 320 then
318 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
319 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 326
324 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert
325 329
326 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
327 then 331 then
328 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 332 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
329 echo 333 echo
375# vapier@gentoo.org 379# vapier@gentoo.org
376# 380#
377# Takes just 1 optional parameter (the directory to create tmpfile in) 381# Takes just 1 optional parameter (the directory to create tmpfile in)
378emktemp() { 382emktemp() {
379 local exe="touch" 383 local exe="touch"
380 [ "$1" == "-d" ] && exe="mkdir" && shift 384 [[ $1 == -d ]] && exe="mkdir" && shift
381 local topdir="$1" 385 local topdir=$1
382 386
383 if [ -z "${topdir}" ] 387 if [[ -z ${topdir} ]] ; then
384 then
385 [ -z "${T}" ] \ 388 [[ -z ${T} ]] \
386 && topdir="/tmp" \ 389 && topdir="/tmp" \
387 || topdir="${T}" 390 || topdir=${T}
388 fi 391 fi
389 392
390 if [ -z "$(type -p mktemp)" ] 393 if [[ -z $(type -p mktemp) ]] ; then
391 then
392 local tmp=/ 394 local tmp=/
393 while [ -e "${tmp}" ] ; do 395 while [[ -e ${tmp} ]] ; do
394 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 397 done
396 ${exe} "${tmp}" 398 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 399 echo "${tmp}"
398 else 400 else
399 [ "${exe}" == "touch" ] \ 401 [[ ${exe} == "touch" ]] \
400 && exe="-p" \ 402 && exe="-p" \
401 || exe="-d" 403 || exe="-d"
402 mktemp ${exe} "${topdir}" 404 mktemp ${exe} "${topdir}"
403 fi 405 fi
404} 406}
408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
410# 412#
411# egetent(database, key) 413# egetent(database, key)
412egetent() { 414egetent() {
413 if [[ "${USERLAND}" == "Darwin" ]] ; then 415 case ${CHOST} in
416 *-darwin*)
414 case "$2" in 417 case "$2" in
415 *[!0-9]*) # Non numeric 418 *[!0-9]*) # Non numeric
416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
417 ;; 420 ;;
418 *) # Numeric 421 *) # Numeric
419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
420 ;; 423 ;;
421 esac 424 esac
422 elif [[ "${USERLAND}" == "BSD" ]] ; then 425 ;;
423 local action 426 *-freebsd*)
424 if [ "$1" == "passwd" ] 427 local opts action="user"
425 then 428 [[ $1 == "passwd" ]] || action="group"
426 action="user" 429
427 else 430 # lookup by uid/gid
428 action="group" 431 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi 433 fi
434
430 pw show "${action}" "$2" -q 435 pw show ${action} ${opts} "$2" -q
431 else 436 ;;
437 *-netbsd*)
438 grep "$2:\*:" /etc/$1
439 ;;
440 *)
432 which nscd >& /dev/null && nscd -i "$1" 441 type -p nscd >& /dev/null && nscd -i "$1"
433 getent "$1" "$2" 442 getent "$1" "$2"
434 fi 443 ;;
444 esac
435} 445}
436 446
437# Simplify/standardize adding users to the system 447# Simplify/standardize adding users to the system
438# vapier@gentoo.org 448# vapier@gentoo.org
439# 449#
477 fi 487 fi
478 else 488 else
479 euid="next" 489 euid="next"
480 fi 490 fi
481 if [[ ${euid} == "next" ]] ; then 491 if [[ ${euid} == "next" ]] ; then
482 local pwrange 492 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 493 [[ -z $(egetent passwd ${euid}) ]] && break
490 done 494 done
491 fi 495 fi
492 opts="${opts} -u ${euid}" 496 opts="${opts} -u ${euid}"
493 einfo " - Userid: ${euid}" 497 einfo " - Userid: ${euid}"
498 if [[ ! -e ${eshell} ]] ; then 502 if [[ ! -e ${eshell} ]] ; then
499 eerror "A shell was specified but it does not exist !" 503 eerror "A shell was specified but it does not exist !"
500 die "${eshell} does not exist" 504 die "${eshell} does not exist"
501 fi 505 fi
502 else 506 else
503 case ${USERLAND} in 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
504 Darwin) eshell="/usr/bin/false";; 508 [[ -x ${ROOT}${shell} ]] && break
505 BSD) eshell="/usr/sbin/nologin";; 509 done
506 *) eshell="/bin/false";; 510
507 esac 511 if [[ ${shell} == "/dev/null" ]] ; then
512 eerror "Unable to identify the shell to use"
513 die "Unable to identify the shell to use"
514 fi
515
516 eshell=${shell}
508 fi 517 fi
509 einfo " - Shell: ${eshell}" 518 einfo " - Shell: ${eshell}"
510 opts="${opts} -s ${eshell}" 519 opts="${opts} -s ${eshell}"
511 520
512 # handle homedir 521 # handle homedir
549 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
550 559
551 # handle extra and add the user 560 # handle extra and add the user
552 local oldsandbox=${SANDBOX_ON} 561 local oldsandbox=${SANDBOX_ON}
553 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
554 case ${USERLAND} in 563 case ${CHOST} in
555 Darwin) 564 *-darwin*)
556 ### Make the user 565 ### Make the user
557 if [[ -z $@ ]] ; then 566 if [[ -z $@ ]] ; then
558 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
559 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
560 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
571 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
572 einfo "eextra: $@" 581 einfo "eextra: $@"
573 die "Required function missing" 582 die "Required function missing"
574 fi 583 fi
575 ;; 584 ;;
576 BSD) 585 *-freebsd*)
577 if [[ -z $@ ]] ; then 586 if [[ -z $@ ]] ; then
578 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
579 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
580 die "enewuser failed" 589 die "enewuser failed"
581 else 590 else
582 einfo " - Extra: $@" 591 einfo " - Extra: $@"
583 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
584 "$@" || die "enewuser failed" 593 "$@" || die "enewuser failed"
594 fi
595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
600 else
601 einfo " - Extra: $@"
602 useradd ${opts} ${euser} "$@" || die "enewuser failed"
585 fi 603 fi
586 ;; 604 ;;
587 *) 605 *)
588 if [[ -z $@ ]] ; then 606 if [[ -z $@ ]] ; then
589 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
594 useradd ${opts} ${euser} "$@" \ 612 useradd ${opts} ${euser} "$@" \
595 || die "enewuser failed" 613 || die "enewuser failed"
596 fi 614 fi
597 ;; 615 ;;
598 esac 616 esac
617
618 if [[ ! -e ${ROOT}/${ehome} ]] ; then
619 einfo " - Creating ${ehome} in ${ROOT}"
620 mkdir -p "${ROOT}/${ehome}"
621 chown ${euser} "${ROOT}/${ehome}"
622 chmod 755 "${ROOT}/${ehome}"
623 fi
624
599 export SANDBOX_ON=${oldsandbox} 625 export SANDBOX_ON=${oldsandbox}
600
601 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
602 then
603 einfo " - Creating ${ehome} in ${D}"
604 dodir ${ehome}
605 fowners ${euser} ${ehome}
606 fperms 755 ${ehome}
607 fi
608} 626}
609 627
610# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
611# vapier@gentoo.org 629# vapier@gentoo.org
612# 630#
641 then 659 then
642 if [ "${egid}" -gt 0 ] 660 if [ "${egid}" -gt 0 ]
643 then 661 then
644 if [ -z "`egetent group ${egid}`" ] 662 if [ -z "`egetent group ${egid}`" ]
645 then 663 then
646 if [[ "${USERLAND}" == "Darwin" ]]; then 664 if [[ "${CHOST}" == *-darwin* ]]; then
647 opts="${opts} ${egid}" 665 opts="${opts} ${egid}"
648 else 666 else
649 opts="${opts} -g ${egid}" 667 opts="${opts} -g ${egid}"
650 fi 668 fi
651 else 669 else
665 opts="${opts} ${eextra}" 683 opts="${opts} ${eextra}"
666 684
667 # add the group 685 # add the group
668 local oldsandbox="${SANDBOX_ON}" 686 local oldsandbox="${SANDBOX_ON}"
669 export SANDBOX_ON="0" 687 export SANDBOX_ON="0"
670 if [[ "${USERLAND}" == "Darwin" ]]; then 688 case ${CHOST} in
689 *-darwin*)
671 if [ ! -z "${eextra}" ]; 690 if [ ! -z "${eextra}" ];
672 then 691 then
673 einfo "Extra options are not supported on Darwin/OS X yet" 692 einfo "Extra options are not supported on Darwin/OS X yet"
674 einfo "Please report the ebuild along with the info below" 693 einfo "Please report the ebuild along with the info below"
675 einfo "eextra: ${eextra}" 694 einfo "eextra: ${eextra}"
676 die "Required function missing" 695 die "Required function missing"
677 fi 696 fi
678 697
679 # If we need the next available 698 # If we need the next available
680 case ${egid} in 699 case ${egid} in
681 *[!0-9]*) # Non numeric 700 *[!0-9]*) # Non numeric
682 for egid in `jot 898 101`; do 701 for egid in $(seq 101 999); do
683 [ -z "`egetent group ${egid}`" ] && break 702 [ -z "`egetent group ${egid}`" ] && break
684 done 703 done
685 esac 704 esac
686 dscl . create /groups/${egroup} gid ${egid} 705 dscl . create /groups/${egroup} gid ${egid}
687 dscl . create /groups/${egroup} passwd '*' 706 dscl . create /groups/${egroup} passwd '*'
688 elif [[ "${USERLAND}" == "BSD" ]] ; then 707 ;;
708
709 *-freebsd*)
689 case ${egid} in 710 case ${egid} in
690 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
691 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
692 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
693 done 714 done
694 esac 715 esac
695 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 716 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
696 else 717 ;;
718
719 *-netbsd*)
720 case ${egid} in
721 *[!0-9]*) # Non numeric
722 for egid in $(seq 101 999); do
723 [ -z "`egetent group ${egid}`" ] && break
724 done
725 esac
726 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
727 ;;
728
729 *)
697 groupadd ${opts} ${egroup} || die "enewgroup failed" 730 groupadd ${opts} ${egroup} || die "enewgroup failed"
698 fi 731 ;;
732 esac
699 export SANDBOX_ON="${oldsandbox}" 733 export SANDBOX_ON="${oldsandbox}"
700} 734}
701 735
702# Simple script to replace 'dos2unix' binaries 736# Simple script to replace 'dos2unix' binaries
703# vapier@gentoo.org 737# vapier@gentoo.org
814 type="Network;${type}" 848 type="Network;${type}"
815 ;; 849 ;;
816 850
817 sci) 851 sci)
818 case ${catmin} in 852 case ${catmin} in
819 astro*) type=Astronomoy;; 853 astro*) type=Astronomy;;
820 bio*) type=Biology;; 854 bio*) type=Biology;;
821 calc*) type=Calculator;; 855 calc*) type=Calculator;;
822 chem*) type=Chemistry;; 856 chem*) type=Chemistry;;
823 geo*) type=Geology;; 857 geo*) type=Geology;;
824 math*) type=Math;; 858 math*) type=Math;;
856Exec=${exec} 890Exec=${exec}
857Path=${path} 891Path=${path}
858Icon=${icon} 892Icon=${icon}
859Categories=Application;${type};" > "${desktop}" 893Categories=Application;${type};" > "${desktop}"
860 894
895 (
896 # wrap the env here so that the 'insinto' call
897 # doesn't corrupt the env of the caller
861 insinto /usr/share/applications 898 insinto /usr/share/applications
862 doins "${desktop}" 899 doins "${desktop}"
863 900 )
864 return 0
865} 901}
866 902
867# Make a GDM/KDM Session file 903# Make a GDM/KDM Session file
868# 904#
869# make_desktop_entry(<title>, <command>) 905# make_desktop_entry(<title>, <command>)
931############################################################## 967##############################################################
932 968
933 969
934# for internal use only (unpack_pdv and unpack_makeself) 970# for internal use only (unpack_pdv and unpack_makeself)
935find_unpackable_file() { 971find_unpackable_file() {
936 local src="$1" 972 local src=$1
937 if [ -z "${src}" ] 973 if [[ -z ${src} ]] ; then
938 then
939 src="${DISTDIR}/${A}" 974 src=${DISTDIR}/${A}
940 else 975 else
941 if [ -e "${DISTDIR}/${src}" ] 976 if [[ -e ${DISTDIR}/${src} ]] ; then
942 then
943 src="${DISTDIR}/${src}" 977 src=${DISTDIR}/${src}
944 elif [ -e "${PWD}/${src}" ] 978 elif [[ -e ${PWD}/${src} ]] ; then
945 then
946 src="${PWD}/${src}" 979 src=${PWD}/${src}
947 elif [ -e "${src}" ] 980 elif [[ -e ${src} ]] ; then
948 then
949 src="${src}" 981 src=${src}
950 fi
951 fi 982 fi
952 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 983 fi
984 [[ ! -e ${src} ]] && return 1
953 echo "${src}" 985 echo "${src}"
954} 986}
955 987
956# Unpack those pesky pdv generated files ... 988# Unpack those pesky pdv generated files ...
957# They're self-unpacking programs with the binary package stuffed in 989# They're self-unpacking programs with the binary package stuffed in
972# lseek 1004# lseek
973# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1005# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
974# lseek(3, -4, SEEK_END) = 2981250 1006# lseek(3, -4, SEEK_END) = 2981250
975# thus we would pass in the value of '4' as the second parameter. 1007# thus we would pass in the value of '4' as the second parameter.
976unpack_pdv() { 1008unpack_pdv() {
977 local src="`find_unpackable_file $1`" 1009 local src=$(find_unpackable_file $1)
978 local sizeoff_t="$2" 1010 local sizeoff_t=$2
979 1011
1012 [[ -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 :(" 1013 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
981 1014
982 local shrtsrc="`basename ${src}`" 1015 local shrtsrc=$(basename "${src}")
983 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1016 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
984 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1017 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\"` 1018 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
986 1019
987 # grab metadata for debug reasons 1020 # grab metadata for debug reasons
1051# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1084# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1052# - If the file is not specified then unpack will utilize ${A}. 1085# - If the file is not specified then unpack will utilize ${A}.
1053# - If the offset is not specified then we will attempt to extract 1086# - If the offset is not specified then we will attempt to extract
1054# the proper offset from the script itself. 1087# the proper offset from the script itself.
1055unpack_makeself() { 1088unpack_makeself() {
1089 local src_input=${1:-${A}}
1056 local src="$(find_unpackable_file "$1")" 1090 local src=$(find_unpackable_file "${src_input}")
1057 local skip="$2" 1091 local skip=$2
1058 local exe="$3" 1092 local exe=$3
1059 1093
1094 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1095
1060 local shrtsrc="$(basename "${src}")" 1096 local shrtsrc=$(basename "${src}")
1061 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1097 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1062 if [ -z "${skip}" ] 1098 if [[ -z ${skip} ]] ; then
1063 then
1064 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1099 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1065 local skip=0 1100 local skip=0
1066 exe=tail 1101 exe=tail
1067 case ${ver} in 1102 case ${ver} in
1068 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1103 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1069 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1104 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1081 ;; 1116 ;;
1082 2.1.3) 1117 2.1.3)
1083 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1118 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1084 let skip="skip + 1" 1119 let skip="skip + 1"
1085 ;; 1120 ;;
1086 2.1.4) 1121 2.1.4|2.1.5)
1087 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1122 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1088 skip=$(head -n ${skip} "${src}" | wc -c) 1123 skip=$(head -n ${skip} "${src}" | wc -c)
1089 exe="dd" 1124 exe="dd"
1090 ;; 1125 ;;
1091 *) 1126 *)
1136check_license() { 1171check_license() {
1137 local lic=$1 1172 local lic=$1
1138 if [ -z "${lic}" ] ; then 1173 if [ -z "${lic}" ] ; then
1139 lic="${PORTDIR}/licenses/${LICENSE}" 1174 lic="${PORTDIR}/licenses/${LICENSE}"
1140 else 1175 else
1141 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1176 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1142 lic="${PORTDIR}/licenses/${src}" 1177 lic="${PORTDIR}/licenses/${lic}"
1143 elif [ -e "${PWD}/${src}" ] ; then 1178 elif [ -e "${PWD}/${lic}" ] ; then
1144 lic="${PWD}/${src}" 1179 lic="${PWD}/${lic}"
1145 elif [ -e "${src}" ] ; then 1180 elif [ -e "${lic}" ] ; then
1146 lic="${src}" 1181 lic="${lic}"
1147 fi
1148 fi 1182 fi
1183 fi
1149 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1184 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1150 local l="`basename ${lic}`" 1185 local l="`basename ${lic}`"
1151 1186
1152 # here is where we check for the licenses the user already 1187 # 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 1188 # accepted ... if we don't find a match, we make the user accept
1154 local shopts=$- 1189 local shopts=$-
1210 # first we figure out how many cds we're dealing with by 1245 # first we figure out how many cds we're dealing with by
1211 # the # of files they gave us 1246 # the # of files they gave us
1212 local cdcnt=0 1247 local cdcnt=0
1213 local f= 1248 local f=
1214 for f in "$@" ; do 1249 for f in "$@" ; do
1215 cdcnt=$((cdcnt + 1)) 1250 ((++cdcnt))
1216 export CDROM_CHECK_${cdcnt}="$f" 1251 export CDROM_CHECK_${cdcnt}="$f"
1217 done 1252 done
1218 export CDROM_TOTAL_CDS=${cdcnt} 1253 export CDROM_TOTAL_CDS=${cdcnt}
1219 export CDROM_CURRENT_CD=1 1254 export CDROM_CURRENT_CD=1
1220 1255
1221 # now we see if the user gave use CD_ROOT ... 1256 # now we see if the user gave use CD_ROOT ...
1222 # if they did, let's just believe them that it's correct 1257 # 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 1258 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1230 local var= 1259 local var=
1231 cdcnt=0 1260 cdcnt=0
1232 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1261 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1233 cdcnt=$((cdcnt + 1)) 1262 ((++cdcnt))
1234 var="CD_ROOT_${cdcnt}" 1263 var="CD_ROOT_${cdcnt}"
1264 [[ -z ${!var} ]] && var="CD_ROOT"
1235 if [[ -z ${!var} ]] ; then 1265 if [[ -z ${!var} ]] ; then
1236 eerror "You must either use just the CD_ROOT" 1266 eerror "You must either use just the CD_ROOT"
1237 eerror "or specify ALL the CD_ROOT_X variables." 1267 eerror "or specify ALL the CD_ROOT_X variables."
1238 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1268 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1239 die "could not locate CD_ROOT_${cdcnt}" 1269 die "could not locate CD_ROOT_${cdcnt}"
1240 fi 1270 fi
1241 export CDROM_ROOTS_${cdcnt}="${!var}"
1242 done 1271 done
1243 export CDROM_ROOT=${CDROM_ROOTS_1} 1272 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1244 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1273 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1274 export CDROM_SET=-1
1275 for f in ${CDROM_CHECK_1//:/ } ; do
1276 ((++CDROM_SET))
1277 [[ -e ${CD_ROOT}/${f} ]] && break
1278 done
1279 export CDROM_MATCH=${f}
1245 return 1280 return
1246 fi 1281 fi
1247 1282
1283 # User didn't help us out so lets make sure they know they can
1284 # simplify the whole process ...
1248 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1285 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1249 einfon "This ebuild will need the " 1286 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 1287 echo
1256 einfo "If you do not have the CD, but have the data files" 1288 einfo "If you do not have the CD, but have the data files"
1257 einfo "mounted somewhere on your filesystem, just export" 1289 einfo "mounted somewhere on your filesystem, just export"
1258 einfo "the variable CD_ROOT so that it points to the" 1290 einfo "the variable CD_ROOT so that it points to the"
1259 einfo "directory containing the files." 1291 einfo "directory containing the files."
1263 echo 1295 echo
1264 else 1296 else
1265 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1297 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1266 cdcnt=0 1298 cdcnt=0
1267 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1299 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1268 cdcnt=$((cdcnt + 1)) 1300 ((++cdcnt))
1269 var="CDROM_NAME_${cdcnt}" 1301 var="CDROM_NAME_${cdcnt}"
1270 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1302 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1271 done 1303 done
1272 echo 1304 echo
1273 einfo "If you do not have the CDs, but have the data files" 1305 einfo "If you do not have the CDs, but have the data files"
1274 einfo "mounted somewhere on your filesystem, just export" 1306 einfo "mounted somewhere on your filesystem, just export"
1275 einfo "the following variables so they point to the right place:" 1307 einfo "the following variables so they point to the right place:"
1276 einfon "" 1308 einfon ""
1277 cdcnt=0 1309 cdcnt=0
1278 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1310 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1279 cdcnt=$((cdcnt + 1)) 1311 ((++cdcnt))
1280 echo -n " CD_ROOT_${cdcnt}" 1312 echo -n " CD_ROOT_${cdcnt}"
1281 done 1313 done
1282 echo 1314 echo
1283 einfo "Or, if you have all the files in the same place, or" 1315 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" 1316 einfo "you only have one cdrom, you can export CD_ROOT"
1287 echo 1319 echo
1288 einfo "For example:" 1320 einfo "For example:"
1289 einfo "export CD_ROOT_1=/mnt/cdrom" 1321 einfo "export CD_ROOT_1=/mnt/cdrom"
1290 echo 1322 echo
1291 fi 1323 fi
1324
1325 export CDROM_SET=""
1292 export CDROM_CURRENT_CD=0 1326 export CDROM_CURRENT_CD=0
1293 cdrom_load_next_cd 1327 cdrom_load_next_cd
1294} 1328}
1295 1329
1296# this is only used when you need access to more than one cd. 1330# 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. 1331# 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. 1332# 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. 1333# remember, you can only go forward in the cd chain, you can't go back.
1300cdrom_load_next_cd() { 1334cdrom_load_next_cd() {
1301 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1302 local var= 1335 local var
1303 1336 ((++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 1337
1309 unset CDROM_ROOT 1338 unset CDROM_ROOT
1310 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1339 var=CD_ROOT_${CDROM_CURRENT_CD}
1340 [[ -z ${!var} ]] && var="CD_ROOT"
1311 if [[ -z ${!var} ]] ; then 1341 if [[ -z ${!var} ]] ; then
1312 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1342 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1313 cdrom_locate_file_on_cd ${!var} 1343 _cdrom_locate_file_on_cd ${!var}
1314 else 1344 else
1315 export CDROM_ROOT=${!var} 1345 export CDROM_ROOT=${!var}
1316 fi 1346 fi
1317 1347
1318 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1348 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 1353# 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 1354# found, then a message asking for the user to insert the cdrom will be
1325# displayed and we'll hang out here until: 1355# displayed and we'll hang out here until:
1326# (1) the file is found on a mounted cdrom 1356# (1) the file is found on a mounted cdrom
1327# (2) the user hits CTRL+C 1357# (2) the user hits CTRL+C
1328cdrom_locate_file_on_cd() { 1358_cdrom_locate_file_on_cd() {
1359 local mline=""
1360 local showedmsg=0
1361
1329 while [[ -z ${CDROM_ROOT} ]] ; do 1362 while [[ -z ${CDROM_ROOT} ]] ; do
1330 local dir=$(dirname "$*") 1363 local i=0
1364 local -a cdset=(${*//:/ })
1365 if [[ -n ${CDROM_SET} ]] ; then
1366 cdset=(${cdset[${CDROM_SET}]})
1367 fi
1368
1369 while [[ -n ${cdset[${i}]} ]] ; do
1370 local dir=$(dirname ${cdset[${i}]})
1331 local file=$(basename "$*") 1371 local file=$(basename ${cdset[${i}]})
1332 local mline=""
1333 local showedmsg=0
1334 1372
1335 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1373 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1336 [[ -d ${mline}/${dir} ]] || continue 1374 [[ -d ${mline}/${dir} ]] || continue
1337 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1375 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1338 && export CDROM_ROOT=${mline} 1376 export CDROM_ROOT=${mline}
1377 export CDROM_SET=${i}
1378 export CDROM_MATCH=${cdset[${i}]}
1379 return
1380 fi
1381 done
1382
1383 ((++i))
1339 done 1384 done
1340 1385
1341 if [[ -z ${CDROM_ROOT} ]] ; then
1342 echo 1386 echo
1343 if [[ ${showedmsg} -eq 0 ]] ; then 1387 if [[ ${showedmsg} -eq 0 ]] ; then
1344 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1388 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1345 if [[ -z ${CDROM_NAME} ]] ; then 1389 if [[ -z ${CDROM_NAME} ]] ; then
1346 einfo "Please insert the cdrom for ${PN} now !" 1390 einfo "Please insert+mount the cdrom for ${PN} now !"
1347 else
1348 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1349 fi
1350 else 1391 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 !" 1392 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1356 fi
1357 fi 1393 fi
1358 showedmsg=1 1394 else
1395 if [[ -z ${CDROM_NAME_1} ]] ; then
1396 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1397 else
1398 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1399 einfo "Please insert+mount the ${!var} cdrom now !"
1400 fi
1359 fi 1401 fi
1402 showedmsg=1
1403 fi
1360 einfo "Press return to scan for the cd again" 1404 einfo "Press return to scan for the cd again"
1361 einfo "or hit CTRL+C to abort the emerge." 1405 einfo "or hit CTRL+C to abort the emerge."
1362 echo 1406 echo
1363 einfo "If you are having trouble with the detection" 1407 einfo "If you are having trouble with the detection"
1364 einfo "of your CD, it is possible that you do not have" 1408 einfo "of your CD, it is possible that you do not have"
1365 einfo "Joliet support enabled in your kernel. Please" 1409 einfo "Joliet support enabled in your kernel. Please"
1366 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1410 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1367 read 1411 read
1368 fi
1369 done 1412 done
1370} 1413}
1371 1414
1372# Make sure that LINGUAS only contains languages that 1415# Make sure that LINGUAS only contains languages that
1373# a package can support 1416# a package can support
1521 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1564 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1522 1565
1523 local PKG=$(best_version $1) 1566 local PKG=$(best_version $1)
1524 shift 1567 shift
1525 1568
1526 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1569 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1570
1571 # if the USE file doesnt exist, assume the $PKG is either
1572 # injected or package.provided
1527 [[ ! -e ${USEFILE} ]] && return 1 1573 [[ ! -e ${USEFILE} ]] && return 0
1528 1574
1529 local USE_BUILT=$(<${USEFILE}) 1575 local USE_BUILT=$(<${USEFILE})
1530 while [[ $# -gt 0 ]] ; do 1576 while [[ $# -gt 0 ]] ; do
1531 if [[ ${opt} = "-o" ]] ; then 1577 if [[ ${opt} = "-o" ]] ; then
1532 has $1 ${USE_BUILT} && return 0 1578 has $1 ${USE_BUILT} && return 0
1584# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1630# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1585# $5 == path for wrapper 1631# $5 == path for wrapper
1586make_wrapper() { 1632make_wrapper() {
1587 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1633 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1588 local tmpwrapper=$(emktemp) 1634 local tmpwrapper=$(emktemp)
1635 # We don't want to quote ${bin} so that people can pass complex
1636 # things as $bin ... "./someprog --args"
1589 cat << EOF > "${tmpwrapper}" 1637 cat << EOF > "${tmpwrapper}"
1590#!/bin/sh 1638#!/bin/sh
1591cd "${chdir}" 1639cd "${chdir:-.}"
1640if [ -n "${libdir}" ] ; then
1641 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1592export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1642 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1643 else
1644 export LD_LIBRARY_PATH="${libdir}"
1645 fi
1646fi
1593exec ${bin} "\$@" 1647exec ${bin} "\$@"
1594EOF 1648EOF
1595 chmod go+rx "${tmpwrapper}" 1649 chmod go+rx "${tmpwrapper}"
1596 if [ -n "${5}" ] 1650 if [[ -n ${path} ]] ; then
1597 then
1598 exeinto ${5} 1651 exeinto "${path}"
1599 newexe "${tmpwrapper}" "${wrapper}" 1652 newexe "${tmpwrapper}" "${wrapper}"
1600 else 1653 else
1601 newbin "${tmpwrapper}" "${wrapper}" 1654 newbin "${tmpwrapper}" "${wrapper}"
1602 fi 1655 fi
1603} 1656}

Legend:
Removed from v.1.192  
changed lines
  Added in v.1.217

  ViewVC Help
Powered by ViewVC 1.1.20