/[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.229
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.229 2006/03/16 03:44:54 agriffis 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 [[ -z $1 ]] && set "$(printf "%65s" '')"
143 echo "${1//?/=}"
144 }
145 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 146 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 147 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 148 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 149 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 150 local SINGLE_PATCH="no"
284 259
285 # Allow for prefix to differ ... im lazy, so shoot me :/ 260 # Allow for prefix to differ ... im lazy, so shoot me :/
286 while [ "${count}" -lt 5 ] 261 while [ "${count}" -lt 5 ]
287 do 262 do
288 # Generate some useful debug info ... 263 # Generate some useful debug info ...
289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 264 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 265 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 266
292 if [ "${PATCH_SUFFIX}" != "patch" ] 267 if [ "${PATCH_SUFFIX}" != "patch" ]
293 then 268 then
294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 274
300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 275 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 276 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 277
303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 280
306 if [ "${PATCH_SUFFIX}" != "patch" ] 281 if [ "${PATCH_SUFFIX}" != "patch" ]
307 then 282 then
308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 283 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
309 then 284 then
313 count=5 288 count=5
314 break 289 break
315 fi 290 fi
316 fi 291 fi
317 292
318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 293 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
319 then 294 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 297 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 298 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 300
326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 301 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
302 _epatch_assert
327 303
328 if [ "$?" -ne 0 ] 304 if [ "$?" -ne 0 ]
329 then 305 then
330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 306 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo 307 echo
394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 370 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 371 done
396 ${exe} "${tmp}" || ${exe} -p "${tmp}" 372 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 373 echo "${tmp}"
398 else 374 else
399 [[ ${exe} == "touch" ]] \ 375 if [[ ${exe} == "touch" ]] ; then
400 && exe="-p" \ 376 [[ ${USERLAND} == "GNU" ]] \
401 || exe="-d" 377 && mktemp -p "${topdir}" \
402 mktemp ${exe} "${topdir}" 378 || TMPDIR="${topdir}" mktemp -t tmp
379 else
380 [[ ${USERLAND} == "GNU" ]] \
381 && mktemp -d "${topdir}" \
382 || TMPDIR="${topdir}" mktemp -dt tmp
383 fi
403 fi 384 fi
404} 385}
405 386
406# Small wrapper for getent (Linux), nidump (Mac OS X), 387# Small wrapper for getent (Linux), nidump (Mac OS X),
407# and pw (FreeBSD) used in enewuser()/enewgroup() 388# and pw (FreeBSD) used in enewuser()/enewgroup()
408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 389# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 390# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
410# 391#
411# egetent(database, key) 392# egetent(database, key)
412egetent() { 393egetent() {
413 if [[ "${USERLAND}" == "Darwin" ]] ; then 394 case ${CHOST} in
395 *-darwin*)
414 case "$2" in 396 case "$2" in
415 *[!0-9]*) # Non numeric 397 *[!0-9]*) # Non numeric
416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 398 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
417 ;; 399 ;;
418 *) # Numeric 400 *) # Numeric
419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 401 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
420 ;; 402 ;;
421 esac 403 esac
422 elif [[ "${USERLAND}" == "BSD" ]] ; then 404 ;;
423 local action 405 *-freebsd*|*-dragonfly*)
424 if [ "$1" == "passwd" ] 406 local opts action="user"
425 then 407 [[ $1 == "passwd" ]] || action="group"
426 action="user" 408
427 else 409 # lookup by uid/gid
428 action="group" 410 if [[ $2 == [[:digit:]]* ]] ; then
411 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi 412 fi
413
430 pw show "${action}" "$2" -q 414 pw show ${action} ${opts} "$2" -q
431 else 415 ;;
416 *-netbsd*|*-openbsd*)
417 grep "$2:\*:" /etc/$1
418 ;;
419 *)
432 which nscd >& /dev/null && nscd -i "$1" 420 type -p nscd >& /dev/null && nscd -i "$1"
433 getent "$1" "$2" 421 getent "$1" "$2"
434 fi 422 ;;
423 esac
435} 424}
436 425
437# Simplify/standardize adding users to the system 426# Simplify/standardize adding users to the system
438# vapier@gentoo.org 427# vapier@gentoo.org
439# 428#
487 einfo " - Userid: ${euid}" 476 einfo " - Userid: ${euid}"
488 477
489 # handle shell 478 # handle shell
490 local eshell=$1; shift 479 local eshell=$1; shift
491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 480 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
492 if [[ ! -e ${eshell} ]] ; then 481 if [[ ! -e ${ROOT}${eshell} ]] ; then
493 eerror "A shell was specified but it does not exist !" 482 eerror "A shell was specified but it does not exist !"
494 die "${eshell} does not exist" 483 die "${eshell} does not exist in ${ROOT}"
495 fi 484 fi
485 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
486 eerror "Do not specify ${eshell} yourself, use -1"
487 die "Pass '-1' as the shell parameter"
488 fi
496 else 489 else
497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null; do 490 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
498 [[ -x ${ROOT}${shell} ]] && break; 491 [[ -x ${ROOT}${shell} ]] && break
499 done 492 done
500 493
501 if [[ ${shell} == "/dev/null" ]]; then 494 if [[ ${shell} == "/dev/null" ]] ; then
502 eerror "Unable to identify the shell to use" 495 eerror "Unable to identify the shell to use"
503 die "Unable to identify the shell to use" 496 die "Unable to identify the shell to use"
504 fi 497 fi
505 498
506 eshell=${shell} 499 eshell=${shell}
548 einfo " - Groups: ${egroups}" 541 einfo " - Groups: ${egroups}"
549 542
550 # handle extra and add the user 543 # handle extra and add the user
551 local oldsandbox=${SANDBOX_ON} 544 local oldsandbox=${SANDBOX_ON}
552 export SANDBOX_ON="0" 545 export SANDBOX_ON="0"
553 case ${USERLAND} in 546 case ${CHOST} in
554 Darwin) 547 *-darwin*)
555 ### Make the user 548 ### Make the user
556 if [[ -z $@ ]] ; then 549 if [[ -z $@ ]] ; then
557 dscl . create /users/${euser} uid ${euid} 550 dscl . create /users/${euser} uid ${euid}
558 dscl . create /users/${euser} shell ${eshell} 551 dscl . create /users/${euser} shell ${eshell}
559 dscl . create /users/${euser} home ${ehome} 552 dscl . create /users/${euser} home ${ehome}
570 einfo "Please report the ebuild along with the info below" 563 einfo "Please report the ebuild along with the info below"
571 einfo "eextra: $@" 564 einfo "eextra: $@"
572 die "Required function missing" 565 die "Required function missing"
573 fi 566 fi
574 ;; 567 ;;
575 BSD) 568 *-freebsd*|*-dragonfly*)
576 if [[ -z $@ ]] ; then 569 if [[ -z $@ ]] ; then
577 pw useradd ${euser} ${opts} \ 570 pw useradd ${euser} ${opts} \
578 -c "added by portage for ${PN}" \ 571 -c "added by portage for ${PN}" \
579 die "enewuser failed" 572 die "enewuser failed"
580 else 573 else
581 einfo " - Extra: $@" 574 einfo " - Extra: $@"
582 pw useradd ${euser} ${opts} \ 575 pw useradd ${euser} ${opts} \
583 "$@" || die "enewuser failed" 576 "$@" || die "enewuser failed"
584 fi 577 fi
585 ;; 578 ;;
579
580 *-netbsd*)
581 if [[ -z $@ ]] ; then
582 useradd ${opts} ${euser} || die "enewuser failed"
583 else
584 einfo " - Extra: $@"
585 useradd ${opts} ${euser} "$@" || die "enewuser failed"
586 fi
587 ;;
588
589 *-openbsd*)
590 if [[ -z $@ ]] ; then
591 useradd -u ${euid} -s ${eshell} \
592 -d ${ehome} -c "Added by portage for ${PN}" \
593 -g ${egroups} ${euser} || die "enewuser failed"
594 else
595 einfo " - Extra: $@"
596 useradd -u ${euid} -s ${eshell} \
597 -d ${ehome} -c "Added by portage for ${PN}" \
598 -g ${egroups} ${euser} "$@" || die "enewuser failed"
599 fi
600 ;;
601
586 *) 602 *)
587 if [[ -z $@ ]] ; then 603 if [[ -z $@ ]] ; then
588 useradd ${opts} ${euser} \ 604 useradd ${opts} ${euser} \
589 -c "added by portage for ${PN}" \ 605 -c "added by portage for ${PN}" \
590 || die "enewuser failed" 606 || die "enewuser failed"
640 then 656 then
641 if [ "${egid}" -gt 0 ] 657 if [ "${egid}" -gt 0 ]
642 then 658 then
643 if [ -z "`egetent group ${egid}`" ] 659 if [ -z "`egetent group ${egid}`" ]
644 then 660 then
645 if [[ "${USERLAND}" == "Darwin" ]]; then 661 if [[ "${CHOST}" == *-darwin* ]]; then
646 opts="${opts} ${egid}" 662 opts="${opts} ${egid}"
647 else 663 else
648 opts="${opts} -g ${egid}" 664 opts="${opts} -g ${egid}"
649 fi 665 fi
650 else 666 else
664 opts="${opts} ${eextra}" 680 opts="${opts} ${eextra}"
665 681
666 # add the group 682 # add the group
667 local oldsandbox="${SANDBOX_ON}" 683 local oldsandbox="${SANDBOX_ON}"
668 export SANDBOX_ON="0" 684 export SANDBOX_ON="0"
669 if [[ "${USERLAND}" == "Darwin" ]]; then 685 case ${CHOST} in
686 *-darwin*)
670 if [ ! -z "${eextra}" ]; 687 if [ ! -z "${eextra}" ];
671 then 688 then
672 einfo "Extra options are not supported on Darwin/OS X yet" 689 einfo "Extra options are not supported on Darwin/OS X yet"
673 einfo "Please report the ebuild along with the info below" 690 einfo "Please report the ebuild along with the info below"
674 einfo "eextra: ${eextra}" 691 einfo "eextra: ${eextra}"
675 die "Required function missing" 692 die "Required function missing"
676 fi 693 fi
677 694
678 # If we need the next available 695 # If we need the next available
679 case ${egid} in 696 case ${egid} in
680 *[!0-9]*) # Non numeric 697 *[!0-9]*) # Non numeric
681 for egid in $(seq 101 999); do 698 for egid in $(seq 101 999); do
682 [ -z "`egetent group ${egid}`" ] && break 699 [ -z "`egetent group ${egid}`" ] && break
683 done 700 done
684 esac 701 esac
685 dscl . create /groups/${egroup} gid ${egid} 702 dscl . create /groups/${egroup} gid ${egid}
686 dscl . create /groups/${egroup} passwd '*' 703 dscl . create /groups/${egroup} passwd '*'
687 elif [[ "${USERLAND}" == "BSD" ]] ; then 704 ;;
705
706 *-freebsd*|*-dragonfly*)
688 case ${egid} in 707 case ${egid} in
689 *[!0-9]*) # Non numeric 708 *[!0-9]*) # Non numeric
690 for egid in $(seq 101 999); do 709 for egid in $(seq 101 999); do
691 [ -z "`egetent group ${egid}`" ] && break 710 [ -z "`egetent group ${egid}`" ] && break
692 done 711 done
693 esac 712 esac
694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 713 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
695 else 714 ;;
715
716 *-netbsd*)
717 case ${egid} in
718 *[!0-9]*) # Non numeric
719 for egid in $(seq 101 999); do
720 [ -z "`egetent group ${egid}`" ] && break
721 done
722 esac
723 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
724 ;;
725
726 *)
696 groupadd ${opts} ${egroup} || die "enewgroup failed" 727 groupadd ${opts} ${egroup} || die "enewgroup failed"
697 fi 728 ;;
729 esac
698 export SANDBOX_ON="${oldsandbox}" 730 export SANDBOX_ON="${oldsandbox}"
699} 731}
700 732
701# Simple script to replace 'dos2unix' binaries 733# Simple script to replace 'dos2unix' binaries
702# vapier@gentoo.org 734# vapier@gentoo.org
813 type="Network;${type}" 845 type="Network;${type}"
814 ;; 846 ;;
815 847
816 sci) 848 sci)
817 case ${catmin} in 849 case ${catmin} in
818 astro*) type=Astronomoy;; 850 astro*) type=Astronomy;;
819 bio*) type=Biology;; 851 bio*) type=Biology;;
820 calc*) type=Calculator;; 852 calc*) type=Calculator;;
821 chem*) type=Chemistry;; 853 chem*) type=Chemistry;;
822 geo*) type=Geology;; 854 geo*) type=Geology;;
823 math*) type=Math;; 855 math*) type=Math;;
855Exec=${exec} 887Exec=${exec}
856Path=${path} 888Path=${path}
857Icon=${icon} 889Icon=${icon}
858Categories=Application;${type};" > "${desktop}" 890Categories=Application;${type};" > "${desktop}"
859 891
892 (
893 # wrap the env here so that the 'insinto' call
894 # doesn't corrupt the env of the caller
860 insinto /usr/share/applications 895 insinto /usr/share/applications
861 doins "${desktop}" 896 doins "${desktop}"
862 897 )
863 return 0
864} 898}
865 899
866# Make a GDM/KDM Session file 900# Make a GDM/KDM Session file
867# 901#
868# make_desktop_entry(<title>, <command>) 902# make_desktop_entry(<title>, <command>)
973 local sizeoff_t=$2 1007 local sizeoff_t=$2
974 1008
975 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1009 [[ -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 :(" 1010 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
977 1011
978 local shrtsrc="`basename ${src}`" 1012 local shrtsrc=$(basename "${src}")
979 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1013 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
980 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1014 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\"` 1015 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
982 1016
983 # grab metadata for debug reasons 1017 # grab metadata for debug reasons
1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1081# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1048# - If the file is not specified then unpack will utilize ${A}. 1082# - If the file is not specified then unpack will utilize ${A}.
1049# - If the offset is not specified then we will attempt to extract 1083# - If the offset is not specified then we will attempt to extract
1050# the proper offset from the script itself. 1084# the proper offset from the script itself.
1051unpack_makeself() { 1085unpack_makeself() {
1086 local src_input=${1:-${A}}
1052 local src=$(find_unpackable_file "$1") 1087 local src=$(find_unpackable_file "${src_input}")
1053 local skip=$2 1088 local skip=$2
1054 local exe=$3 1089 local exe=$3
1055 1090
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1091 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1057 1092
1058 local shrtsrc=$(basename "${src}") 1093 local shrtsrc=$(basename "${src}")
1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1094 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1060 if [ -z "${skip}" ] 1095 if [[ -z ${skip} ]] ; then
1061 then
1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1096 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1063 local skip=0 1097 local skip=0
1064 exe=tail 1098 exe=tail
1065 case ${ver} in 1099 case ${ver} in
1066 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1100 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1067 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1101 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1079 ;; 1113 ;;
1080 2.1.3) 1114 2.1.3)
1081 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1115 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1082 let skip="skip + 1" 1116 let skip="skip + 1"
1083 ;; 1117 ;;
1084 2.1.4) 1118 2.1.4|2.1.5)
1085 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1119 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1086 skip=$(head -n ${skip} "${src}" | wc -c) 1120 skip=$(head -n ${skip} "${src}" | wc -c)
1087 exe="dd" 1121 exe="dd"
1088 ;; 1122 ;;
1089 *) 1123 *)
1208 # first we figure out how many cds we're dealing with by 1242 # first we figure out how many cds we're dealing with by
1209 # the # of files they gave us 1243 # the # of files they gave us
1210 local cdcnt=0 1244 local cdcnt=0
1211 local f= 1245 local f=
1212 for f in "$@" ; do 1246 for f in "$@" ; do
1213 cdcnt=$((cdcnt + 1)) 1247 ((++cdcnt))
1214 export CDROM_CHECK_${cdcnt}="$f" 1248 export CDROM_CHECK_${cdcnt}="$f"
1215 done 1249 done
1216 export CDROM_TOTAL_CDS=${cdcnt} 1250 export CDROM_TOTAL_CDS=${cdcnt}
1217 export CDROM_CURRENT_CD=1 1251 export CDROM_CURRENT_CD=1
1218 1252
1219 # now we see if the user gave use CD_ROOT ... 1253 # now we see if the user gave use CD_ROOT ...
1220 # if they did, let's just believe them that it's correct 1254 # 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 1255 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1228 local var= 1256 local var=
1229 cdcnt=0 1257 cdcnt=0
1230 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1258 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1231 cdcnt=$((cdcnt + 1)) 1259 ((++cdcnt))
1232 var="CD_ROOT_${cdcnt}" 1260 var="CD_ROOT_${cdcnt}"
1261 [[ -z ${!var} ]] && var="CD_ROOT"
1233 if [[ -z ${!var} ]] ; then 1262 if [[ -z ${!var} ]] ; then
1234 eerror "You must either use just the CD_ROOT" 1263 eerror "You must either use just the CD_ROOT"
1235 eerror "or specify ALL the CD_ROOT_X variables." 1264 eerror "or specify ALL the CD_ROOT_X variables."
1236 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1265 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1237 die "could not locate CD_ROOT_${cdcnt}" 1266 die "could not locate CD_ROOT_${cdcnt}"
1238 fi 1267 fi
1239 export CDROM_ROOTS_${cdcnt}="${!var}"
1240 done 1268 done
1241 export CDROM_ROOT=${CDROM_ROOTS_1} 1269 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1242 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1270 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1271 export CDROM_SET=-1
1272 for f in ${CDROM_CHECK_1//:/ } ; do
1273 ((++CDROM_SET))
1274 [[ -e ${CD_ROOT}/${f} ]] && break
1275 done
1276 export CDROM_MATCH=${f}
1243 return 1277 return
1244 fi 1278 fi
1245 1279
1280 # User didn't help us out so lets make sure they know they can
1281 # simplify the whole process ...
1246 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1282 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1247 einfon "This ebuild will need the " 1283 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 1284 echo
1254 einfo "If you do not have the CD, but have the data files" 1285 einfo "If you do not have the CD, but have the data files"
1255 einfo "mounted somewhere on your filesystem, just export" 1286 einfo "mounted somewhere on your filesystem, just export"
1256 einfo "the variable CD_ROOT so that it points to the" 1287 einfo "the variable CD_ROOT so that it points to the"
1257 einfo "directory containing the files." 1288 einfo "directory containing the files."
1261 echo 1292 echo
1262 else 1293 else
1263 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1294 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1264 cdcnt=0 1295 cdcnt=0
1265 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1296 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1266 cdcnt=$((cdcnt + 1)) 1297 ((++cdcnt))
1267 var="CDROM_NAME_${cdcnt}" 1298 var="CDROM_NAME_${cdcnt}"
1268 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1299 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1269 done 1300 done
1270 echo 1301 echo
1271 einfo "If you do not have the CDs, but have the data files" 1302 einfo "If you do not have the CDs, but have the data files"
1272 einfo "mounted somewhere on your filesystem, just export" 1303 einfo "mounted somewhere on your filesystem, just export"
1273 einfo "the following variables so they point to the right place:" 1304 einfo "the following variables so they point to the right place:"
1274 einfon "" 1305 einfon ""
1275 cdcnt=0 1306 cdcnt=0
1276 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1307 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1277 cdcnt=$((cdcnt + 1)) 1308 ((++cdcnt))
1278 echo -n " CD_ROOT_${cdcnt}" 1309 echo -n " CD_ROOT_${cdcnt}"
1279 done 1310 done
1280 echo 1311 echo
1281 einfo "Or, if you have all the files in the same place, or" 1312 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" 1313 einfo "you only have one cdrom, you can export CD_ROOT"
1285 echo 1316 echo
1286 einfo "For example:" 1317 einfo "For example:"
1287 einfo "export CD_ROOT_1=/mnt/cdrom" 1318 einfo "export CD_ROOT_1=/mnt/cdrom"
1288 echo 1319 echo
1289 fi 1320 fi
1321
1322 export CDROM_SET=""
1290 export CDROM_CURRENT_CD=0 1323 export CDROM_CURRENT_CD=0
1291 cdrom_load_next_cd 1324 cdrom_load_next_cd
1292} 1325}
1293 1326
1294# this is only used when you need access to more than one cd. 1327# 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. 1328# 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. 1329# 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. 1330# remember, you can only go forward in the cd chain, you can't go back.
1298cdrom_load_next_cd() { 1331cdrom_load_next_cd() {
1299 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1300 local var= 1332 local var
1301 1333 ((++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 1334
1307 unset CDROM_ROOT 1335 unset CDROM_ROOT
1308 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1336 var=CD_ROOT_${CDROM_CURRENT_CD}
1337 [[ -z ${!var} ]] && var="CD_ROOT"
1309 if [[ -z ${!var} ]] ; then 1338 if [[ -z ${!var} ]] ; then
1310 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1339 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1311 cdrom_locate_file_on_cd ${!var} 1340 _cdrom_locate_file_on_cd ${!var}
1312 else 1341 else
1313 export CDROM_ROOT=${!var} 1342 export CDROM_ROOT=${!var}
1314 fi 1343 fi
1315 1344
1316 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1345 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 1350# 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 1351# found, then a message asking for the user to insert the cdrom will be
1323# displayed and we'll hang out here until: 1352# displayed and we'll hang out here until:
1324# (1) the file is found on a mounted cdrom 1353# (1) the file is found on a mounted cdrom
1325# (2) the user hits CTRL+C 1354# (2) the user hits CTRL+C
1326cdrom_locate_file_on_cd() { 1355_cdrom_locate_file_on_cd() {
1356 local mline=""
1357 local showedmsg=0
1358
1327 while [[ -z ${CDROM_ROOT} ]] ; do 1359 while [[ -z ${CDROM_ROOT} ]] ; do
1328 local dir=$(dirname "$*") 1360 local i=0
1361 local -a cdset=(${*//:/ })
1362 if [[ -n ${CDROM_SET} ]] ; then
1363 cdset=(${cdset[${CDROM_SET}]})
1364 fi
1365
1366 while [[ -n ${cdset[${i}]} ]] ; do
1367 local dir=$(dirname ${cdset[${i}]})
1329 local file=$(basename "$*") 1368 local file=$(basename ${cdset[${i}]})
1330 local mline=""
1331 local showedmsg=0
1332 1369
1333 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1370 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1334 [[ -d ${mline}/${dir} ]] || continue 1371 [[ -d ${mline}/${dir} ]] || continue
1335 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1372 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1336 && export CDROM_ROOT=${mline} 1373 export CDROM_ROOT=${mline}
1374 export CDROM_SET=${i}
1375 export CDROM_MATCH=${cdset[${i}]}
1376 return
1377 fi
1378 done
1379
1380 ((++i))
1337 done 1381 done
1338 1382
1339 if [[ -z ${CDROM_ROOT} ]] ; then
1340 echo 1383 echo
1341 if [[ ${showedmsg} -eq 0 ]] ; then 1384 if [[ ${showedmsg} -eq 0 ]] ; then
1342 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1385 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1343 if [[ -z ${CDROM_NAME} ]] ; then 1386 if [[ -z ${CDROM_NAME} ]] ; then
1344 einfo "Please insert the cdrom for ${PN} now !" 1387 einfo "Please insert+mount the cdrom for ${PN} now !"
1345 else
1346 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1347 fi
1348 else 1388 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 !" 1389 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1354 fi
1355 fi 1390 fi
1356 showedmsg=1 1391 else
1392 if [[ -z ${CDROM_NAME_1} ]] ; then
1393 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1394 else
1395 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1396 einfo "Please insert+mount the ${!var} cdrom now !"
1397 fi
1357 fi 1398 fi
1399 showedmsg=1
1400 fi
1358 einfo "Press return to scan for the cd again" 1401 einfo "Press return to scan for the cd again"
1359 einfo "or hit CTRL+C to abort the emerge." 1402 einfo "or hit CTRL+C to abort the emerge."
1360 echo 1403 echo
1361 einfo "If you are having trouble with the detection" 1404 einfo "If you are having trouble with the detection"
1362 einfo "of your CD, it is possible that you do not have" 1405 einfo "of your CD, it is possible that you do not have"
1363 einfo "Joliet support enabled in your kernel. Please" 1406 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1407 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1365 read 1408 read || die "something is screwed with your system"
1366 fi
1367 done 1409 done
1368} 1410}
1369 1411
1370# Make sure that LINGUAS only contains languages that 1412# Make sure that LINGUAS only contains languages that
1371# a package can support 1413# a package can support
1381# directories and uses the union of the lists. 1423# directories and uses the union of the lists.
1382strip-linguas() { 1424strip-linguas() {
1383 local ls newls 1425 local ls newls
1384 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1426 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1385 local op=$1; shift 1427 local op=$1; shift
1386 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1428 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1387 local d f 1429 local d f
1388 for d in "$@" ; do 1430 for d in "$@" ; do
1389 if [[ ${op} == "-u" ]] ; then 1431 if [[ ${op} == "-u" ]] ; then
1390 newls=${ls} 1432 newls=${ls}
1391 else 1433 else
1392 newls="" 1434 newls=""
1393 fi 1435 fi
1394 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1436 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1395 if [[ ${op} == "-i" ]] ; then 1437 if [[ ${op} == "-i" ]] ; then
1396 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1438 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1397 else 1439 else
1398 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1440 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1399 fi 1441 fi
1455 1497
1456# Jeremy Huddleston <eradicator@gentoo.org>: 1498# Jeremy Huddleston <eradicator@gentoo.org>:
1457# preserve_old_lib /path/to/libblah.so.0 1499# preserve_old_lib /path/to/libblah.so.0
1458# preserve_old_lib_notify /path/to/libblah.so.0 1500# preserve_old_lib_notify /path/to/libblah.so.0
1459# 1501#
1460# These functions are useful when a lib in your package changes --soname. Such 1502# These functions are useful when a lib in your package changes --library. Such
1461# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1503# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1462# would break packages that link against it. Most people get around this 1504# would break packages that link against it. Most people get around this
1463# by using the portage SLOT mechanism, but that is not always a relevant 1505# by using the portage SLOT mechanism, but that is not always a relevant
1464# solution, so instead you can add the following to your ebuilds: 1506# solution, so instead you can add the following to your ebuilds:
1465# 1507#
1496 1538
1497 ewarn "An old version of an installed library was detected on your system." 1539 ewarn "An old version of an installed library was detected on your system."
1498 ewarn "In order to avoid breaking packages that link against it, this older version" 1540 ewarn "In order to avoid breaking packages that link against it, this older version"
1499 ewarn "is not being removed. In order to make full use of this newer version," 1541 ewarn "is not being removed. In order to make full use of this newer version,"
1500 ewarn "you will need to execute the following command:" 1542 ewarn "you will need to execute the following command:"
1501 ewarn " revdep-rebuild --soname ${SONAME}" 1543 ewarn " revdep-rebuild --library ${SONAME}"
1502 ewarn 1544 ewarn
1503 ewarn "After doing that, you can safely remove ${LIB}" 1545 ewarn "After doing that, you can safely remove ${LIB}"
1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1546 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1505 fi 1547 fi
1506} 1548}
1519 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1561 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1520 1562
1521 local PKG=$(best_version $1) 1563 local PKG=$(best_version $1)
1522 shift 1564 shift
1523 1565
1524 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1566 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1567
1568 # if the USE file doesnt exist, assume the $PKG is either
1569 # injected or package.provided
1525 [[ ! -e ${USEFILE} ]] && return 1 1570 [[ ! -e ${USEFILE} ]] && return 0
1526 1571
1527 local USE_BUILT=$(<${USEFILE}) 1572 local USE_BUILT=$(<${USEFILE})
1528 while [[ $# -gt 0 ]] ; do 1573 while [[ $# -gt 0 ]] ; do
1529 if [[ ${opt} = "-o" ]] ; then 1574 if [[ ${opt} = "-o" ]] ; then
1530 has $1 ${USE_BUILT} && return 0 1575 has $1 ${USE_BUILT} && return 0
1582# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1627# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1583# $5 == path for wrapper 1628# $5 == path for wrapper
1584make_wrapper() { 1629make_wrapper() {
1585 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1630 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1586 local tmpwrapper=$(emktemp) 1631 local tmpwrapper=$(emktemp)
1632 # We don't want to quote ${bin} so that people can pass complex
1633 # things as $bin ... "./someprog --args"
1587 cat << EOF > "${tmpwrapper}" 1634 cat << EOF > "${tmpwrapper}"
1588#!/bin/sh 1635#!/bin/sh
1589cd "${chdir}" 1636cd "${chdir:-.}"
1637if [ -n "${libdir}" ] ; then
1638 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1590export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1639 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1640 else
1641 export LD_LIBRARY_PATH="${libdir}"
1642 fi
1643fi
1591exec ${bin} "\$@" 1644exec ${bin} "\$@"
1592EOF 1645EOF
1593 chmod go+rx "${tmpwrapper}" 1646 chmod go+rx "${tmpwrapper}"
1594 if [ -n "${5}" ] 1647 if [[ -n ${path} ]] ; then
1595 then
1596 exeinto ${5} 1648 exeinto "${path}"
1597 newexe "${tmpwrapper}" "${wrapper}" 1649 newexe "${tmpwrapper}" "${wrapper}"
1598 else 1650 else
1599 newbin "${tmpwrapper}" "${wrapper}" 1651 newbin "${tmpwrapper}" "${wrapper}"
1600 fi 1652 fi
1601} 1653}

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

  ViewVC Help
Powered by ViewVC 1.1.20