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

Diff of /eclass/eutils.eclass

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

Revision 1.107 Revision 1.128
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2004 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.107 2004/09/29 15:16:42 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.128 2004/12/23 09:20:45 eradicator 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.
48# to accomidate the needs of multilib systems. It's no longer a good idea 48# to accomidate the needs of multilib systems. It's no longer a good idea
49# to assume all libraries will end up in lib. Replace any (sane) instances 49# to assume all libraries will end up in lib. Replace any (sane) instances
50# where lib is named directly with $(get_libdir) if possible. 50# where lib is named directly with $(get_libdir) if possible.
51# 51#
52# Travis Tilley <lv@gentoo.org> (24 Aug 2004) 52# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
53#
54# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004):
55# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set,
56# fall back on old behavior. Any profile that has these set should also
57# depend on a newer version of portage (not yet released) which uses these
58# over CONF_LIBDIR in econf, dolib, etc...
59#
60# For now, this is restricted to the sparc64-multilib ${PROFILE_ARCH} as it
61# is still in testing.
53get_libdir() { 62get_libdir() {
54 LIBDIR_TEST=$(type econf) 63 LIBDIR_TEST=$(type econf)
55 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 64 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
56 # if there is an override, we want to use that... always. 65 # if there is an override, we want to use that... always.
57 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 66 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
62 # # and if there isnt an override, and we're using a version of 71 # # and if there isnt an override, and we're using a version of
63 # # portage without CONF_LIBDIR support, force the use of lib. dolib 72 # # portage without CONF_LIBDIR support, force the use of lib. dolib
64 # # and friends from portage 2.0.50 wont be too happy otherwise. 73 # # and friends from portage 2.0.50 wont be too happy otherwise.
65 # CONF_LIBDIR="lib" 74 # CONF_LIBDIR="lib"
66 #fi 75 #fi
76 elif [ "${PROFILE_ARCH}" = "sparc64-multilib" ]; then # Using eradicator's LIBDIR_<abi> approach...
77 CONF_LIBDIR="$(get_abi_LIBDIR)"
67 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support 78 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
68 # will be <portage-2.0.51_pre20 79 # will be <portage-2.0.51_pre20
69 CONF_LIBDIR="lib" 80 CONF_LIBDIR="lib"
70 fi 81 fi
71 # and of course, default to lib if CONF_LIBDIR isnt set 82 # and of course, default to lib if CONF_LIBDIR isnt set
72 echo ${CONF_LIBDIR:=lib} 83 echo ${CONF_LIBDIR:=lib}
73 unset LIBDIR_TEST 84 unset LIBDIR_TEST
74} 85}
75 86
76
77get_multilibdir() { 87get_multilibdir() {
88 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_multilibdir called, but it shouldn't be needed on sparc64-multilib"
78 echo ${CONF_MULTILIBDIR:=lib32} 89 echo ${CONF_MULTILIBDIR:=lib32}
79} 90}
80
81 91
82# Sometimes you need to override the value returned by get_libdir. A good 92# Sometimes you need to override the value returned by get_libdir. A good
83# example of this is xorg-x11, where lib32 isnt a supported configuration, 93# example of this is xorg-x11, where lib32 isnt a supported configuration,
84# and where lib64 -must- be used on amd64 (for applications that need lib 94# and where lib64 -must- be used on amd64 (for applications that need lib
85# to be 32bit, such as adobe acrobat). Note that this override also bypasses 95# to be 32bit, such as adobe acrobat). Note that this override also bypasses
89# 99#
90# get_libdir_override lib64 100# get_libdir_override lib64
91# 101#
92# Travis Tilley <lv@gentoo.org> (31 Aug 2004) 102# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
93get_libdir_override() { 103get_libdir_override() {
104 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_libdir_override called, but it shouldn't be needed on sparc64-multilib..."
94 CONF_LIBDIR="$1" 105 CONF_LIBDIR="$1"
95 CONF_LIBDIR_OVERRIDE="$1" 106 CONF_LIBDIR_OVERRIDE="$1"
96} 107}
97 108
98# This function generate linker scripts in /usr/lib for dynamic 109# This function generate linker scripts in /usr/lib for dynamic
112# to point to the latest version of the library present. 123# to point to the latest version of the library present.
113# 124#
114# <azarah@gentoo.org> (26 Oct 2002) 125# <azarah@gentoo.org> (26 Oct 2002)
115# 126#
116gen_usr_ldscript() { 127gen_usr_ldscript() {
128 local libdir="$(get_libdir)"
117 # Just make sure it exists 129 # Just make sure it exists
118 dodir /usr/$(get_libdir) 130 dodir /usr/${libdir}
119 131
120 cat > "${D}/usr/$(get_libdir)/$1" << END_LDSCRIPT 132 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT
121/* GNU ld script 133/* GNU ld script
122 Because Gentoo have critical dynamic libraries 134 Because Gentoo have critical dynamic libraries
123 in /lib, and the static versions in /usr/lib, we 135 in /lib, and the static versions in /usr/lib, we
124 need to have a "fake" dynamic lib in /usr/lib, 136 need to have a "fake" dynamic lib in /usr/lib,
125 otherwise we run into linking problems. 137 otherwise we run into linking problems.
126 See bug #4411 on http://bugs.gentoo.org/ for 138 See bug #4411 on http://bugs.gentoo.org/ for
127 more info. */ 139 more info. */
128GROUP ( /$(get_libdir)/$1 ) 140GROUP ( /${libdir}/${1} )
129END_LDSCRIPT 141END_LDSCRIPT
142 fperms a+x "/usr/${libdir}/${1}"
130} 143}
131 144
132# Simple function to draw a line consisting of '=' the same length as $* 145# Simple function to draw a line consisting of '=' the same length as $*
133# 146#
134# <azarah@gentoo.org> (11 Nov 2002) 147# <azarah@gentoo.org> (11 Nov 2002)
219 local x="" 232 local x=""
220 233
221 if [ "$#" -gt 1 ] 234 if [ "$#" -gt 1 ]
222 then 235 then
223 local m="" 236 local m=""
224 einfo "${#} patches to apply..." 237 einfo "${#} patches to apply ..."
225 for m in "$@" ; do 238 for m in "$@" ; do
226 epatch "${m}" 239 epatch "${m}"
227 done 240 done
228 return 0 241 return 0
229 fi 242 fi
243 local EPATCH_SOURCE="$1/*" 256 local EPATCH_SOURCE="$1/*"
244 else 257 else
245 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 258 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
246 fi 259 fi
247 else 260 else
248 if [ ! -d ${EPATCH_SOURCE} ] 261 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
249 then 262 then
250 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 263 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
251 then 264 then
252 EPATCH_SOURCE="$1" 265 EPATCH_SOURCE="$1"
253 fi 266 fi
282 ;; 295 ;;
283 esac 296 esac
284 297
285 if [ "${SINGLE_PATCH}" = "no" ] 298 if [ "${SINGLE_PATCH}" = "no" ]
286 then 299 then
287 einfo "Applying various patches (bugfixes/updates)..." 300 einfo "Applying various patches (bugfixes/updates) ..."
288 fi 301 fi
289 for x in ${EPATCH_SOURCE} 302 for x in ${EPATCH_SOURCE}
290 do 303 do
291 # New ARCH dependant patch naming scheme... 304 # New ARCH dependant patch naming scheme ...
292 # 305 #
293 # ???_arch_foo.patch 306 # ???_arch_foo.patch
294 # 307 #
295 if [ -f ${x} ] && \ 308 if [ -f ${x} ] && \
296 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 309 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \
311 then 324 then
312 if [ -n "${EPATCH_SINGLE_MSG}" ] 325 if [ -n "${EPATCH_SINGLE_MSG}" ]
313 then 326 then
314 einfo "${EPATCH_SINGLE_MSG}" 327 einfo "${EPATCH_SINGLE_MSG}"
315 else 328 else
316 einfo "Applying ${x##*/}..." 329 einfo "Applying ${x##*/} ..."
317 fi 330 fi
318 else 331 else
319 einfo " ${x##*/}..." 332 einfo " ${x##*/} ..."
320 fi 333 fi
321 334
322 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 335 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
323 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 336 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
324 337
357 370
358 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 371 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
359 then 372 then
360 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 373 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
361 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 374 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
362 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 375 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
363 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 376 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
364 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 377 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
365 378
366 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 379 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1
367 380
436 449
437 return 1; 450 return 1;
438 } 451 }
439 END 452 END
440 453
441 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... " 454 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
442 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null 455 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
443 then 456 then
444 echo "yes" 457 echo "yes"
445 einfon "Checking what PTHREADS implementation we have ... " 458 einfon "Checking what PTHREADS implementation we have ..."
446 if ${T}/nptl 459 if ${T}/nptl
447 then 460 then
448 return 0 461 return 0
449 else 462 else
450 return 1 463 return 1
526 539
527 if [ -n "${ADMINPARAM}" ] 540 if [ -n "${ADMINPARAM}" ]
528 then 541 then
529 if [ "${jobs}" -gt "${ADMINPARAM}" ] 542 if [ "${jobs}" -gt "${ADMINPARAM}" ]
530 then 543 then
531 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..." 544 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
532 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}" 545 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
533 else 546 else
534 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..." 547 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
535 export MAKEOPTS="${MAKEOPTS} -j${jobs}" 548 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
536 fi 549 fi
537 fi 550 fi
538} 551}
539 552
540# Cheap replacement for when debianutils (and thus mktemp) 553# Cheap replacement for when debianutils (and thus mktemp)
541# does not exist on the users system 554# does not exist on the users system
542# vapier@gentoo.org 555# vapier@gentoo.org
543# 556#
544# Takes just 1 parameter (the directory to create tmpfile in) 557# Takes just 1 optional parameter (the directory to create tmpfile in)
545mymktemp() { 558emktemp() {
559 local exe="touch"
560 [ "$1" == "-d" ] && exe="mkdir" && shift
546 local topdir="$1" 561 local topdir="$1"
547 562
548 [ -z "${topdir}" ] && topdir=/tmp 563 if [ -z "${topdir}" ]
549 if [ "`which mktemp 2>/dev/null`" ]
550 then 564 then
551 mktemp -p ${topdir} 565 [ -z "${T}" ] \
552 else 566 && topdir="/tmp" \
567 || topdir="${T}"
568 fi
569
570 if [ -z "$(type -p mktemp)" ]
571 then
572 local tmp=/
573 while [ -e "${tmp}" ] ; do
553 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 574 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
554 touch ${tmp} 575 done
576 ${exe} "${tmp}"
555 echo ${tmp} 577 echo "${tmp}"
578 else
579 [ "${exe}" == "touch" ] \
580 && exe="-p" \
581 || exe="-d"
582 mktemp ${exe} "${topdir}"
556 fi 583 fi
557} 584}
558 585
559# Small wrapper for getent (Linux) and nidump (Mac OS X) 586# Small wrapper for getent (Linux), nidump (Mac OS X),
560# used in enewuser()/enewgroup() 587# and pw (FreeBSD) used in enewuser()/enewgroup()
561# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 588# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
589# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
562# 590#
563# egetent(database, key) 591# egetent(database, key)
564egetent() { 592egetent() {
565 if use macos || use ppc-macos ; then 593 if useq ppc-macos ; then
566 case "$2" in 594 case "$2" in
567 *[!0-9]*) # Non numeric 595 *[!0-9]*) # Non numeric
568 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 596 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
569 ;; 597 ;;
570 *) # Numeric 598 *) # Numeric
571 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 599 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
572 ;; 600 ;;
573 esac 601 esac
602 elif useq x86-fbsd ; then
603 local action
604 if [ "$1" == "passwd" ]
605 then
606 action="user"
574 else 607 else
608 action="group"
609 fi
610 pw show "${action}" "$2" -q
611 else
612 which nscd >& /dev/null && nscd -i "$1"
575 getent "$1" "$2" 613 getent "$1" "$2"
576 fi 614 fi
577} 615}
578 616
579# Simplify/standardize adding users to the system 617# Simplify/standardize adding users to the system
626 euid="next" 664 euid="next"
627 fi 665 fi
628 if [ "${euid}" == "next" ] 666 if [ "${euid}" == "next" ]
629 then 667 then
630 local pwrange 668 local pwrange
631 if use macos || use ppc-macos ; then 669 if [ "${USERLAND}" == "BSD" ] ; then
632 pwrange="`jot 898 101`" 670 pwrange="`jot 898 101`"
633 else 671 else
634 pwrange="`seq 101 999`" 672 pwrange="`seq 101 999`"
635 fi 673 fi
636 for euid in ${pwrange} ; do 674 for euid in ${pwrange} ; do
648 then 686 then
649 eerror "A shell was specified but it does not exist !" 687 eerror "A shell was specified but it does not exist !"
650 die "${eshell} does not exist" 688 die "${eshell} does not exist"
651 fi 689 fi
652 else 690 else
691 if [ "${USERLAND}" == "BSD" ]
692 then
693 eshell="/usr/bin/false"
694 else
653 eshell="/bin/false" 695 eshell="/bin/false"
696 fi
654 fi 697 fi
655 einfo " - Shell: ${eshell}" 698 einfo " - Shell: ${eshell}"
656 opts="${opts} -s ${eshell}" 699 opts="${opts} -s ${eshell}"
657 700
658 # handle homedir 701 # handle homedir
672 local defgroup="" exgroups="" 715 local defgroup="" exgroups=""
673 716
674 export IFS="," 717 export IFS=","
675 for g in ${egroups} 718 for g in ${egroups}
676 do 719 do
720 export IFS="${oldifs}"
677 if [ -z "`egetent group \"${g}\"`" ] 721 if [ -z "`egetent group \"${g}\"`" ]
678 then 722 then
679 eerror "You must add group ${g} to the system first" 723 eerror "You must add group ${g} to the system first"
680 die "${g} is not a valid GID" 724 die "${g} is not a valid GID"
681 fi 725 fi
683 then 727 then
684 defgroup="${g}" 728 defgroup="${g}"
685 else 729 else
686 exgroups="${exgroups},${g}" 730 exgroups="${exgroups},${g}"
687 fi 731 fi
732 export IFS=","
688 done 733 done
689 export IFS="${oldifs}" 734 export IFS="${oldifs}"
690 735
691 opts="${opts} -g ${defgroup}" 736 opts="${opts} -g ${defgroup}"
692 if [ ! -z "${exgroups}" ] 737 if [ ! -z "${exgroups}" ]
700 745
701 # handle extra and add the user 746 # handle extra and add the user
702 local eextra="$@" 747 local eextra="$@"
703 local oldsandbox="${SANDBOX_ON}" 748 local oldsandbox="${SANDBOX_ON}"
704 export SANDBOX_ON="0" 749 export SANDBOX_ON="0"
705 if use macos || use ppc-macos ; 750 if useq ppc-macos
706 then 751 then
707 ### Make the user 752 ### Make the user
708 if [ -z "${eextra}" ] 753 if [ -z "${eextra}" ]
709 then 754 then
710 dscl . create /users/${euser} uid ${euid} 755 dscl . create /users/${euser} uid ${euid}
711 dscl . create /users/${euser} shell ${eshell} 756 dscl . create /users/${euser} shell ${eshell}
712 dscl . create /users/${euser} home ${ehome} 757 dscl . create /users/${euser} home ${ehome}
713 dscl . create /users/${euser} realname "added by portage for ${PN}" 758 dscl . create /users/${euser} realname "added by portage for ${PN}"
714 ### Add the user to the groups specified 759 ### Add the user to the groups specified
760 local oldifs="${IFS}"
761 export IFS=","
715 for g in ${egroups} 762 for g in ${egroups}
716 do 763 do
717 # $egroups is , delimited, not space
718 ewarn "This is code is wrong; someone on the OS X team should fix it"
719 dscl . merge /groups/${g} users ${euser} 764 dscl . merge /groups/${g} users ${euser}
720 done 765 done
766 export IFS="${oldifs}"
721 else 767 else
722 einfo "Extra options are not supported on macos yet" 768 einfo "Extra options are not supported on macos yet"
723 einfo "Please report the ebuild along with the info below" 769 einfo "Please report the ebuild along with the info below"
724 einfo "eextra: ${eextra}" 770 einfo "eextra: ${eextra}"
725 die "Required function missing" 771 die "Required function missing"
772 fi
773 elif use x86-fbsd ; then
774 if [ -z "${eextra}" ]
775 then
776 pw useradd ${euser} ${opts} \
777 -c "added by portage for ${PN}" \
778 die "enewuser failed"
779 else
780 einfo " - Extra: ${eextra}"
781 pw useradd ${euser} ${opts} \
782 -c ${eextra} || die "enewuser failed"
726 fi 783 fi
727 else 784 else
728 if [ -z "${eextra}" ] 785 if [ -z "${eextra}" ]
729 then 786 then
730 useradd ${opts} ${euser} \ 787 useradd ${opts} ${euser} \
781 then 838 then
782 if [ "${egid}" -gt 0 ] 839 if [ "${egid}" -gt 0 ]
783 then 840 then
784 if [ -z "`egetent group ${egid}`" ] 841 if [ -z "`egetent group ${egid}`" ]
785 then 842 then
786 if use macos || use ppc-macos ; then 843 if useq ppc-macos ; then
787 opts="${opts} ${egid}" 844 opts="${opts} ${egid}"
788 else 845 else
789 opts="${opts} -g ${egid}" 846 opts="${opts} -g ${egid}"
790 fi 847 fi
791 else 848 else
805 opts="${opts} ${eextra}" 862 opts="${opts} ${eextra}"
806 863
807 # add the group 864 # add the group
808 local oldsandbox="${SANDBOX_ON}" 865 local oldsandbox="${SANDBOX_ON}"
809 export SANDBOX_ON="0" 866 export SANDBOX_ON="0"
810 if use macos || use ppc-macos ; 867 if useq ppc-macos ; then
811 then
812 if [ ! -z "${eextra}" ]; 868 if [ ! -z "${eextra}" ];
813 then 869 then
814 einfo "Extra options are not supported on macos yet" 870 einfo "Extra options are not supported on macos yet"
815 einfo "Please report the ebuild along with the info below" 871 einfo "Please report the ebuild along with the info below"
816 einfo "eextra: ${eextra}" 872 einfo "eextra: ${eextra}"
824 [ -z "`egetent group ${egid}`" ] && break 880 [ -z "`egetent group ${egid}`" ] && break
825 done 881 done
826 esac 882 esac
827 dscl . create /groups/${egroup} gid ${egid} 883 dscl . create /groups/${egroup} gid ${egid}
828 dscl . create /groups/${egroup} passwd '*' 884 dscl . create /groups/${egroup} passwd '*'
885 elif use x86-fbsd ; then
886 case ${egid} in
887 *[!0-9]*) # Non numeric
888 for egid in `jot 898 101`; do
889 [ -z "`egetent group ${egid}`" ] && break
890 done
891 esac
892 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
829 else 893 else
830 groupadd ${opts} ${egroup} || die "enewgroup failed" 894 groupadd ${opts} ${egroup} || die "enewgroup failed"
831 fi 895 fi
832 export SANDBOX_ON="${oldsandbox}" 896 export SANDBOX_ON="${oldsandbox}"
833} 897}
834 898
835# Simple script to replace 'dos2unix' binaries 899# Simple script to replace 'dos2unix' binaries
836# vapier@gentoo.org 900# vapier@gentoo.org
837# 901#
838# edos2unix(file, <more files>...) 902# edos2unix(file, <more files> ...)
839edos2unix() { 903edos2unix() {
840 for f in "$@" 904 for f in "$@"
841 do 905 do
842 cp "${f}" ${T}/edos2unix 906 cp "${f}" ${T}/edos2unix
843 sed 's/\r$//' ${T}/edos2unix > "${f}" 907 sed 's/\r$//' ${T}/edos2unix > "${f}"
845} 909}
846 910
847# Make a desktop file ! 911# Make a desktop file !
848# Great for making those icons in kde/gnome startmenu ! 912# Great for making those icons in kde/gnome startmenu !
849# Amaze your friends ! Get the women ! Join today ! 913# Amaze your friends ! Get the women ! Join today !
850# gnome2 /usr/share/applications
851# gnome1 /usr/share/gnome/apps/
852# KDE ${KDEDIR}/share/applnk /usr/share/applnk
853# 914#
854# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 915# make_desktop_entry(<binary>, [name], [icon], [type], [path])
855# 916#
856# binary: what binary does the app run with ? 917# binary: what binary does the app run with ?
857# name: the name that will show up in the menu 918# name: the name that will show up in the menu
858# icon: give your little like a pretty little icon ... 919# icon: give your little like a pretty little icon ...
859# this can be relative (to /usr/share/pixmaps) or 920# this can be relative (to /usr/share/pixmaps) or
860# a full path to an icon 921# a full path to an icon
861# type: what kind of application is this ? for categories: 922# type: what kind of application is this ? for categories:
862# http://www.freedesktop.org/standards/menu-spec/ 923# http://www.freedesktop.org/standards/menu-spec/
863# path: if your app needs to startup in a specific dir 924# path: if your app needs to startup in a specific dir
864make_desktop_entry() { 925make_desktop_entry() {
865 [ -z "$1" ] && eerror "You must specify the executable" && return 1 926 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1
866 927
867 local exec="${1}" 928 local exec="${1}"
868 local name="${2:-${PN}}" 929 local name="${2:-${PN}}"
869 local icon="${3:-${PN}.png}" 930 local icon="${3:-${PN}.png}"
870 local type="${4}" 931 local type="${4}"
902Exec=${exec} 963Exec=${exec}
903Path=${path} 964Path=${path}
904Icon=${icon} 965Icon=${icon}
905Categories=Application;${type};" > "${desktop}" 966Categories=Application;${type};" > "${desktop}"
906 967
907 if [ -d "/usr/share/applications" ]
908 then
909 insinto /usr/share/applications 968 insinto /usr/share/applications
910 doins "${desktop}" 969 doins "${desktop}"
911 fi
912
913 #if [ -d "/usr/share/gnome/apps" ]
914 #then
915 # insinto /usr/share/gnome/apps/Games
916 # doins ${desktop}
917 #fi
918
919 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ]
920 #then
921 # for ver in /usr/kde/*
922 # do
923 # insinto ${ver}/share/applnk/Games
924 # doins ${desktop}
925 # done
926 #fi
927
928 if [ -d "/usr/share/applnk" ]
929 then
930 insinto /usr/share/applnk/${subdir}
931 doins "${desktop}"
932 fi
933 970
934 return 0 971 return 0
935} 972}
936 973
937# for internal use only (unpack_pdv and unpack_makeself) 974# for internal use only (unpack_pdv and unpack_makeself)
986 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1023 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
987 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1024 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
988 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1025 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
989 1026
990 # grab metadata for debug reasons 1027 # grab metadata for debug reasons
991 local metafile="`mymktemp ${T}`" 1028 local metafile="$(emktemp)"
992 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1029 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
993 1030
994 # rip out the final file name from the metadata 1031 # rip out the final file name from the metadata
995 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1032 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
996 datafile="`basename ${datafile}`" 1033 datafile="`basename ${datafile}`"
997 1034
998 # now lets uncompress/untar the file if need be 1035 # now lets uncompress/untar the file if need be
999 local tmpfile="`mymktemp ${T}`" 1036 local tmpfile="$(emktemp)"
1000 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1037 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1001 1038
1002 local iscompressed="`file -b ${tmpfile}`" 1039 local iscompressed="`file -b ${tmpfile}`"
1003 if [ "${iscompressed:0:8}" == "compress" ] ; then 1040 if [ "${iscompressed:0:8}" == "compress" ] ; then
1004 iscompressed=1 1041 iscompressed=1
1049# Unpack those pesky makeself generated files ... 1086# Unpack those pesky makeself generated files ...
1050# They're shell scripts with the binary package tagged onto 1087# They're shell scripts with the binary package tagged onto
1051# the end of the archive. Loki utilized the format as does 1088# the end of the archive. Loki utilized the format as does
1052# many other game companies. 1089# many other game companies.
1053# 1090#
1054# Usage: unpack_makeself [file to unpack] [offset] 1091# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1055# - If the file is not specified then unpack will utilize ${A}. 1092# - If the file is not specified then unpack will utilize ${A}.
1056# - If the offset is not specified then we will attempt to extract 1093# - If the offset is not specified then we will attempt to extract
1057# the proper offset from the script itself. 1094# the proper offset from the script itself.
1058unpack_makeself() { 1095unpack_makeself() {
1059 local src="`find_unpackable_file $1`" 1096 local src="$(find_unpackable_file "$1")"
1060 local skip="$2" 1097 local skip="$2"
1098 local exe="$3"
1061 1099
1062 local shrtsrc="`basename ${src}`" 1100 local shrtsrc="$(basename "${src}")"
1063 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1101 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1064 if [ -z "${skip}" ] 1102 if [ -z "${skip}" ]
1065 then 1103 then
1066 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1104 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1067 local skip=0 1105 local skip=0
1106 exe=tail
1068 case ${ver} in 1107 case ${ver} in
1069 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1108 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1070 skip=`grep -a ^skip= ${src} | cut -d= -f2` 1109 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1071 ;; 1110 ;;
1072 2.0|2.0.1) 1111 2.0|2.0.1)
1073 skip=`grep -a ^$'\t'tail ${src} | awk '{print $2}' | cut -b2-` 1112 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1074 ;; 1113 ;;
1075 2.1.1) 1114 2.1.1)
1076 skip=`grep -a ^offset= ${src} | awk '{print $2}' | cut -b2-` 1115 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1077 let skip="skip + 1" 1116 let skip="skip + 1"
1078 ;; 1117 ;;
1079 2.1.2) 1118 2.1.2)
1080 skip=`grep -a ^offset= ${src} | awk '{print $3}' | head -n 1` 1119 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1081 let skip="skip + 1" 1120 let skip="skip + 1"
1082 ;; 1121 ;;
1083 2.1.3) 1122 2.1.3)
1084 skip=`grep -a ^offset= ${src} | awk '{print $3}'` 1123 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1085 let skip="skip + 1" 1124 let skip="skip + 1"
1125 ;;
1126 2.1.4)
1127 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1128 skip=$(head -n ${skip} "${src}" | wc -c)
1129 exe="dd"
1086 ;; 1130 ;;
1087 *) 1131 *)
1088 eerror "I'm sorry, but I was unable to support the Makeself file." 1132 eerror "I'm sorry, but I was unable to support the Makeself file."
1089 eerror "The version I detected was '${ver}'." 1133 eerror "The version I detected was '${ver}'."
1090 eerror "Please file a bug about the file ${shrtsrc} at" 1134 eerror "Please file a bug about the file ${shrtsrc} at"
1092 die "makeself version '${ver}' not supported" 1136 die "makeself version '${ver}' not supported"
1093 ;; 1137 ;;
1094 esac 1138 esac
1095 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1139 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1096 fi 1140 fi
1141 case ${exe} in
1142 tail) exe="tail -n +${skip} '${src}'";;
1143 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1144 *) die "makeself cant handle exe '${exe}'"
1145 esac
1097 1146
1098 # lets grab the first few bytes of the file to figure out what kind of archive it is 1147 # lets grab the first few bytes of the file to figure out what kind of archive it is
1099 local tmpfile="`mymktemp ${T}`" 1148 local tmpfile="$(emktemp)"
1100 tail -n +${skip} ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1149 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1101 local filetype="`file -b ${tmpfile}`" 1150 local filetype="$(file -b "${tmpfile}")"
1102 case ${filetype} in 1151 case ${filetype} in
1103 *tar\ archive) 1152 *tar\ archive)
1104 tail -n +${skip} ${src} | tar --no-same-owner -xf - 1153 eval ${exe} | tar --no-same-owner -xf -
1105 ;; 1154 ;;
1106 bzip2*) 1155 bzip2*)
1107 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf - 1156 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1108 ;; 1157 ;;
1109 gzip*) 1158 gzip*)
1110 tail -n +${skip} ${src} | tar --no-same-owner -xzf - 1159 eval ${exe} | tar --no-same-owner -xzf -
1111 ;; 1160 ;;
1112 compress*) 1161 compress*)
1113 tail -n +${skip} ${src} | gunzip | tar --no-same-owner -xf - 1162 eval ${exe} | gunzip | tar --no-same-owner -xf -
1114 ;; 1163 ;;
1115 *) 1164 *)
1116 eerror "Unknown filetype \"${filetype}\" ?" 1165 eerror "Unknown filetype \"${filetype}\" ?"
1117 false 1166 false
1118 ;; 1167 ;;
1151 return 0 1200 return 0
1152 fi 1201 fi
1153 done 1202 done
1154 set +o noglob; set -$shopts #reset old shell opts 1203 set +o noglob; set -$shopts #reset old shell opts
1155 1204
1156 local licmsg="`mymktemp ${T}`" 1205 local licmsg="$(emktemp)"
1157 cat << EOF > ${licmsg} 1206 cat << EOF > ${licmsg}
1158********************************************************** 1207**********************************************************
1159The following license outlines the terms of use of this 1208The following license outlines the terms of use of this
1160package. You MUST accept this license for installation to 1209package. You MUST accept this license for installation to
1161continue. When you are done viewing, hit 'q'. If you 1210continue. When you are done viewing, hit 'q'. If you
1389 1438
1390 ls=" ${ls} " 1439 ls=" ${ls} "
1391 newls="" 1440 newls=""
1392 for f in ${LINGUAS} ; do 1441 for f in ${LINGUAS} ; do
1393 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1442 if [ "${ls/ ${f} /}" != "${ls}" ] ; then
1394 nl="${newls} ${f}" 1443 newls="${newls} ${f}"
1395 else 1444 else
1396 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1445 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1397 fi 1446 fi
1398 done 1447 done
1399 if [ -z "${newls}" ] ; then 1448 if [ -z "${newls}" ] ; then
1400 unset LINGUAS 1449 unset LINGUAS
1401 else 1450 else
1402 export LINGUAS="${newls}" 1451 export LINGUAS="${newls}"
1403 fi 1452 fi
1404} 1453}
1454
1455# moved from kernel.eclass since they are generally useful outside of
1456# kernel.eclass -iggy (20041002)
1457
1458# the following functions are useful in kernel module ebuilds, etc.
1459# for an example see ivtv or drbd ebuilds
1460
1461# set's ARCH to match what the kernel expects
1462set_arch_to_kernel() {
1463 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1464 case ${ARCH} in
1465 x86) export ARCH="i386";;
1466 amd64) export ARCH="x86_64";;
1467 hppa) export ARCH="parisc";;
1468 mips) export ARCH="mips";;
1469 *) export ARCH="${ARCH}";;
1470 esac
1471}
1472
1473# set's ARCH back to what portage expects
1474set_arch_to_portage() {
1475 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1476}
1477
1478# Jeremy Huddleston <eradicator@gentoo.org>:
1479# preserve_old_lib /path/to/libblah.so.0
1480# preserve_old_lib_notify /path/to/libblah.so.0
1481#
1482# These functions are useful when a lib in your package changes --soname. Such
1483# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1484# would break packages that link against it. Most people get around this
1485# by using the portage SLOT mechanism, but that is not always a relevant
1486# solution, so instead you can add the following to your ebuilds:
1487#
1488# src_install() {
1489# ...
1490# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1491# ...
1492# }
1493#
1494# pkg_postinst() {
1495# ...
1496# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1497# ...
1498# }
1499
1500preserve_old_lib() {
1501 LIB=$1
1502
1503 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1504 SONAME=`basename ${LIB}`
1505 DIRNAME=`dirname ${LIB}`
1506
1507 dodir ${DIRNAME}
1508 cp ${ROOT}${LIB} ${D}${DIRNAME}
1509 touch ${D}${LIB}
1510 fi
1511}
1512
1513preserve_old_lib_notify() {
1514 LIB=$1
1515
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1517 SONAME=`basename ${LIB}`
1518
1519 einfo "An old version of an installed library was detected on your system."
1520 einfo "In order to avoid breaking packages that link against is, this older version"
1521 einfo "is not being removed. In order to make full use of this newer version,"
1522 einfo "you will need to execute the following command:"
1523 einfo " revdep-rebuild --soname ${SONAME}"
1524 einfo
1525 einfo "After doing that, you can safely remove ${LIB}"
1526 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1527 fi
1528}
1529
1530# Hack for people to figure out if a package was built with
1531# certain USE flags
1532#
1533# Usage: built_with_use <DEPEND ATOM> <List of USE flags>
1534# ex: built_with_use xchat gtk2
1535built_with_use() {
1536 local PKG=$(portageq best_version ${ROOT} $1)
1537 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1538 [[ ! -e ${USEFILE} ]] && return 1
1539
1540 local USE_BUILT=$(<${USEFILE})
1541
1542 shift
1543 while [ $# -gt 0 ] ; do
1544 has $1 ${USE_BUILT} || return 1
1545 shift
1546 done
1547 return 0
1548}
1549
1550# Many configure scripts wrongly bail when a C++ compiler
1551# could not be detected. #73450
1552epunt_cxx() {
1553 local dir=$1
1554 [[ -z ${dir} ]] && dir=${S}
1555 ebegin "Removing useless C++ checks"
1556 local f
1557 for f in $(find ${dir} -name configure) ; do
1558 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1559 done
1560 eend 0
1561}
1562
1563# get_abi_var <VAR> [<ABI>]
1564# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1565#
1566# This code is for testing purposes only with the sparc64-multilib ${PROFILE_ARCH}
1567# and getting a more multilib-aware portage layout. It may end up being used, but for now
1568# it is subject to removal if a better way is worked out.
1569#
1570# ex:
1571# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
1572#
1573# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
1574# This will hopefully be added to portage soon...
1575#
1576# If <ABI> is not specified, ${ABI} is used.
1577# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
1578# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
1579#
1580# Jeremy Huddleston <eradicator@gentoo.org>
1581get_abi_var() {
1582 local flag=$1
1583 local abi
1584 if [ $# -gt 1 ]; then
1585 abi=$1
1586 elif [ -n "${ABI}" ]; then
1587 abi=${ABI}
1588 elif [ -n "${DEFAULT_ABI}" ]; then
1589 abi=${DEFAULT_ABI}
1590 else
1591 return ""
1592 fi
1593 eval echo \${${flag}_${abi}}
1594}
1595
1596get_abi_CFLAGS() { get_abi_var CFLAGS $1; }
1597get_abi_CXXFLAGS() { get_abi_var CXXFLAGS $1; }
1598get_abi_ASFLAGS() { get_abi_var ASFLAGS $1; }
1599get_abi_LIBDIR() { get_abi_var LIBDIR $1; }
1600

Legend:
Removed from v.1.107  
changed lines
  Added in v.1.128

  ViewVC Help
Powered by ViewVC 1.1.20