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

Diff of /eclass/eutils.eclass

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

Revision 1.114 Revision 1.134
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.114 2004/10/06 04:21:08 usata Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.134 2004/12/30 21:48:23 seemant 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
221 local x="" 232 local x=""
222 233
223 if [ "$#" -gt 1 ] 234 if [ "$#" -gt 1 ]
224 then 235 then
225 local m="" 236 local m=""
226 einfo "${#} patches to apply..." 237 einfo "${#} patches to apply ..."
227 for m in "$@" ; do 238 for m in "$@" ; do
228 epatch "${m}" 239 epatch "${m}"
229 done 240 done
230 return 0 241 return 0
231 fi 242 fi
245 local EPATCH_SOURCE="$1/*" 256 local EPATCH_SOURCE="$1/*"
246 else 257 else
247 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 258 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
248 fi 259 fi
249 else 260 else
250 if [ ! -d ${EPATCH_SOURCE} ] 261 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
251 then 262 then
252 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 263 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
253 then 264 then
254 EPATCH_SOURCE="$1" 265 EPATCH_SOURCE="$1"
255 fi 266 fi
284 ;; 295 ;;
285 esac 296 esac
286 297
287 if [ "${SINGLE_PATCH}" = "no" ] 298 if [ "${SINGLE_PATCH}" = "no" ]
288 then 299 then
289 einfo "Applying various patches (bugfixes/updates)..." 300 einfo "Applying various patches (bugfixes/updates) ..."
290 fi 301 fi
291 for x in ${EPATCH_SOURCE} 302 for x in ${EPATCH_SOURCE}
292 do 303 do
293 # New ARCH dependant patch naming scheme... 304 # New ARCH dependant patch naming scheme ...
294 # 305 #
295 # ???_arch_foo.patch 306 # ???_arch_foo.patch
296 # 307 #
297 if [ -f ${x} ] && \ 308 if [ -f ${x} ] && \
298 ([ "${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}" ] || \
313 then 324 then
314 if [ -n "${EPATCH_SINGLE_MSG}" ] 325 if [ -n "${EPATCH_SINGLE_MSG}" ]
315 then 326 then
316 einfo "${EPATCH_SINGLE_MSG}" 327 einfo "${EPATCH_SINGLE_MSG}"
317 else 328 else
318 einfo "Applying ${x##*/}..." 329 einfo "Applying ${x##*/} ..."
319 fi 330 fi
320 else 331 else
321 einfo " ${x##*/}..." 332 einfo " ${x##*/} ..."
322 fi 333 fi
323 334
324 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 335 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
325 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 336 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
326 337
359 370
360 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
361 then 372 then
362 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 373 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
363 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 374 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
364 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 375 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
365 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 376 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
366 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 377 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
367 378
368 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
369 380
438 449
439 return 1; 450 return 1;
440 } 451 }
441 END 452 END
442 453
443 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... " 454 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
444 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null 455 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
445 then 456 then
446 echo "yes" 457 echo "yes"
447 einfon "Checking what PTHREADS implementation we have ... " 458 einfon "Checking what PTHREADS implementation we have ..."
448 if ${T}/nptl 459 if ${T}/nptl
449 then 460 then
450 return 0 461 return 0
451 else 462 else
452 return 1 463 return 1
528 539
529 if [ -n "${ADMINPARAM}" ] 540 if [ -n "${ADMINPARAM}" ]
530 then 541 then
531 if [ "${jobs}" -gt "${ADMINPARAM}" ] 542 if [ "${jobs}" -gt "${ADMINPARAM}" ]
532 then 543 then
533 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..." 544 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
534 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}" 545 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
535 else 546 else
536 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..." 547 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
537 export MAKEOPTS="${MAKEOPTS} -j${jobs}" 548 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
538 fi 549 fi
539 fi 550 fi
540} 551}
541 552
542# Cheap replacement for when debianutils (and thus mktemp) 553# Cheap replacement for when debianutils (and thus mktemp)
543# does not exist on the users system 554# does not exist on the users system
544# vapier@gentoo.org 555# vapier@gentoo.org
545# 556#
546# Takes just 1 parameter (the directory to create tmpfile in) 557# Takes just 1 optional parameter (the directory to create tmpfile in)
547mymktemp() { 558emktemp() {
559 local exe="touch"
560 [ "$1" == "-d" ] && exe="mkdir" && shift
548 local topdir="$1" 561 local topdir="$1"
549 562
550 [ -z "${topdir}" ] && topdir=/tmp 563 if [ -z "${topdir}" ]
551 if [ "`which mktemp 2>/dev/null`" ]
552 then 564 then
553 mktemp -p ${topdir} 565 [ -z "${T}" ] \
554 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
555 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 574 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
556 touch ${tmp} 575 done
576 ${exe} "${tmp}"
557 echo ${tmp} 577 echo "${tmp}"
578 else
579 [ "${exe}" == "touch" ] \
580 && exe="-p" \
581 || exe="-d"
582 mktemp ${exe} "${topdir}"
558 fi 583 fi
559} 584}
560 585
561# Small wrapper for getent (Linux), nidump (Mac OS X), 586# Small wrapper for getent (Linux), nidump (Mac OS X),
562# and pw (FreeBSD) used in enewuser()/enewgroup() 587# and pw (FreeBSD) used in enewuser()/enewgroup()
563# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 588# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
564# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 589# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
565# 590#
566# egetent(database, key) 591# egetent(database, key)
567egetent() { 592egetent() {
568 if useq macos || useq ppc-macos ; then 593 if useq ppc-macos ; then
569 case "$2" in 594 case "$2" in
570 *[!0-9]*) # Non numeric 595 *[!0-9]*) # Non numeric
571 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 596 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
572 ;; 597 ;;
573 *) # Numeric 598 *) # Numeric
690 local defgroup="" exgroups="" 715 local defgroup="" exgroups=""
691 716
692 export IFS="," 717 export IFS=","
693 for g in ${egroups} 718 for g in ${egroups}
694 do 719 do
720 export IFS="${oldifs}"
695 if [ -z "`egetent group \"${g}\"`" ] 721 if [ -z "`egetent group \"${g}\"`" ]
696 then 722 then
697 eerror "You must add group ${g} to the system first" 723 eerror "You must add group ${g} to the system first"
698 die "${g} is not a valid GID" 724 die "${g} is not a valid GID"
699 fi 725 fi
701 then 727 then
702 defgroup="${g}" 728 defgroup="${g}"
703 else 729 else
704 exgroups="${exgroups},${g}" 730 exgroups="${exgroups},${g}"
705 fi 731 fi
732 export IFS=","
706 done 733 done
707 export IFS="${oldifs}" 734 export IFS="${oldifs}"
708 735
709 opts="${opts} -g ${defgroup}" 736 opts="${opts} -g ${defgroup}"
710 if [ ! -z "${exgroups}" ] 737 if [ ! -z "${exgroups}" ]
718 745
719 # handle extra and add the user 746 # handle extra and add the user
720 local eextra="$@" 747 local eextra="$@"
721 local oldsandbox="${SANDBOX_ON}" 748 local oldsandbox="${SANDBOX_ON}"
722 export SANDBOX_ON="0" 749 export SANDBOX_ON="0"
723 if useq macos || useq ppc-macos ; 750 if useq ppc-macos
724 then 751 then
725 ### Make the user 752 ### Make the user
726 if [ -z "${eextra}" ] 753 if [ -z "${eextra}" ]
727 then 754 then
728 dscl . create /users/${euser} uid ${euid} 755 dscl . create /users/${euser} uid ${euid}
729 dscl . create /users/${euser} shell ${eshell} 756 dscl . create /users/${euser} shell ${eshell}
730 dscl . create /users/${euser} home ${ehome} 757 dscl . create /users/${euser} home ${ehome}
731 dscl . create /users/${euser} realname "added by portage for ${PN}" 758 dscl . create /users/${euser} realname "added by portage for ${PN}"
732 ### Add the user to the groups specified 759 ### Add the user to the groups specified
760 local oldifs="${IFS}"
761 export IFS=","
733 for g in ${egroups} 762 for g in ${egroups}
734 do 763 do
735 # $egroups is , delimited, not space
736 ewarn "This is code is wrong; someone on the OS X team should fix it"
737 dscl . merge /groups/${g} users ${euser} 764 dscl . merge /groups/${g} users ${euser}
738 done 765 done
766 export IFS="${oldifs}"
739 else 767 else
740 einfo "Extra options are not supported on macos yet" 768 einfo "Extra options are not supported on macos yet"
741 einfo "Please report the ebuild along with the info below" 769 einfo "Please report the ebuild along with the info below"
742 einfo "eextra: ${eextra}" 770 einfo "eextra: ${eextra}"
743 die "Required function missing" 771 die "Required function missing"
810 then 838 then
811 if [ "${egid}" -gt 0 ] 839 if [ "${egid}" -gt 0 ]
812 then 840 then
813 if [ -z "`egetent group ${egid}`" ] 841 if [ -z "`egetent group ${egid}`" ]
814 then 842 then
815 if useq macos || useq ppc-macos ; then 843 if useq ppc-macos ; then
816 opts="${opts} ${egid}" 844 opts="${opts} ${egid}"
817 else 845 else
818 opts="${opts} -g ${egid}" 846 opts="${opts} -g ${egid}"
819 fi 847 fi
820 else 848 else
834 opts="${opts} ${eextra}" 862 opts="${opts} ${eextra}"
835 863
836 # add the group 864 # add the group
837 local oldsandbox="${SANDBOX_ON}" 865 local oldsandbox="${SANDBOX_ON}"
838 export SANDBOX_ON="0" 866 export SANDBOX_ON="0"
839 if useq macos || useq ppc-macos ; 867 if useq ppc-macos ; then
840 then
841 if [ ! -z "${eextra}" ]; 868 if [ ! -z "${eextra}" ];
842 then 869 then
843 einfo "Extra options are not supported on macos yet" 870 einfo "Extra options are not supported on macos yet"
844 einfo "Please report the ebuild along with the info below" 871 einfo "Please report the ebuild along with the info below"
845 einfo "eextra: ${eextra}" 872 einfo "eextra: ${eextra}"
870} 897}
871 898
872# Simple script to replace 'dos2unix' binaries 899# Simple script to replace 'dos2unix' binaries
873# vapier@gentoo.org 900# vapier@gentoo.org
874# 901#
875# edos2unix(file, <more files>...) 902# edos2unix(file, <more files> ...)
876edos2unix() { 903edos2unix() {
877 for f in "$@" 904 for f in "$@"
878 do 905 do
879 cp "${f}" ${T}/edos2unix 906 cp "${f}" ${T}/edos2unix
880 sed 's/\r$//' ${T}/edos2unix > "${f}" 907 sed 's/\r$//' ${T}/edos2unix > "${f}"
881 done 908 done
882} 909}
883 910
911
912##############################################################
913# START: Handle .desktop files and menu entries #
914# maybe this should be separated into a new eclass some time #
915# lanius@gentoo.org #
916##############################################################
917
884# Make a desktop file ! 918# Make a desktop file !
885# Great for making those icons in kde/gnome startmenu ! 919# Great for making those icons in kde/gnome startmenu !
886# Amaze your friends ! Get the women ! Join today ! 920# Amaze your friends ! Get the women ! Join today !
887# gnome2 /usr/share/applications
888# gnome1 /usr/share/gnome/apps/
889# KDE ${KDEDIR}/share/applnk /usr/share/applnk
890# 921#
891# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 922# make_desktop_entry(<binary>, [name], [icon], [type], [path])
892# 923#
893# binary: what binary does the app run with ? 924# binary: what binary does the app run with ?
894# name: the name that will show up in the menu 925# name: the name that will show up in the menu
895# icon: give your little like a pretty little icon ... 926# icon: give your little like a pretty little icon ...
896# this can be relative (to /usr/share/pixmaps) or 927# this can be relative (to /usr/share/pixmaps) or
897# a full path to an icon 928# a full path to an icon
898# type: what kind of application is this ? for categories: 929# type: what kind of application is this ? for categories:
899# http://www.freedesktop.org/standards/menu-spec/ 930# http://www.freedesktop.org/standards/menu-spec/
900# path: if your app needs to startup in a specific dir 931# path: if your app needs to startup in a specific dir
901make_desktop_entry() { 932make_desktop_entry() {
902 [ -z "$1" ] && eerror "You must specify the executable" && return 1 933 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1
903 934
904 local exec="${1}" 935 local exec="${1}"
905 local name="${2:-${PN}}" 936 local name="${2:-${PN}}"
906 local icon="${3:-${PN}.png}" 937 local icon="${3:-${PN}.png}"
907 local type="${4}" 938 local type="${4}"
939Exec=${exec} 970Exec=${exec}
940Path=${path} 971Path=${path}
941Icon=${icon} 972Icon=${icon}
942Categories=Application;${type};" > "${desktop}" 973Categories=Application;${type};" > "${desktop}"
943 974
944 if [ -d "/usr/share/applications" ]
945 then
946 insinto /usr/share/applications 975 insinto /usr/share/applications
947 doins "${desktop}" 976 doins "${desktop}"
948 fi
949
950 #if [ -d "/usr/share/gnome/apps" ]
951 #then
952 # insinto /usr/share/gnome/apps/Games
953 # doins ${desktop}
954 #fi
955
956 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ]
957 #then
958 # for ver in /usr/kde/*
959 # do
960 # insinto ${ver}/share/applnk/Games
961 # doins ${desktop}
962 # done
963 #fi
964
965 if [ -d "/usr/share/applnk" ]
966 then
967 insinto /usr/share/applnk/${subdir}
968 doins "${desktop}"
969 fi
970 977
971 return 0 978 return 0
972} 979}
980
981# Make a GDM/KDM Session file
982#
983# make_desktop_entry(<title>, <command>)
984# title: File to execute to start the Window Manager
985# command: Name of the Window Manager
986
987make_session_desktop() {
988
989 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1
990 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1
991
992 local title="${1}"
993 local command="${2}"
994 local desktop="${T}/${wm}.desktop"
995
996echo "[Desktop Entry]
997Encoding=UTF-8
998Name=${title}
999Comment=This session logs you into ${title}
1000Exec=${command}
1001TryExec=${command}
1002Type=Application" > "${desktop}"
1003
1004 insinto /usr/share/xsessions
1005 doins "${desktop}"
1006
1007 return 0
1008}
1009
1010domenu() {
1011 local i
1012 local j
1013 insinto /usr/share/applications
1014 for i in ${@}
1015 do
1016 if [ -f "${i}" ];
1017 then
1018 doins ${i}
1019 elif [ -d "${i}" ];
1020 then
1021 for j in ${i}/*.desktop
1022 do
1023 doins ${j}
1024 done
1025 fi
1026 done
1027}
1028
1029doicon() {
1030 local i
1031 local j
1032 insinto /usr/share/pixmaps
1033 for i in ${@}
1034 do
1035 if [ -f "${i}" ];
1036 then
1037 doins ${i}
1038 elif [ -d "${i}" ];
1039 then
1040 for j in ${i}/*.png
1041 do
1042 doins ${j}
1043 done
1044 fi
1045 done
1046}
1047
1048##############################################################
1049# END: Handle .desktop files and menu entries #
1050##############################################################
1051
973 1052
974# for internal use only (unpack_pdv and unpack_makeself) 1053# for internal use only (unpack_pdv and unpack_makeself)
975find_unpackable_file() { 1054find_unpackable_file() {
976 local src="$1" 1055 local src="$1"
977 if [ -z "${src}" ] 1056 if [ -z "${src}" ]
1023 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1102 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1024 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1103 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1025 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1104 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1026 1105
1027 # grab metadata for debug reasons 1106 # grab metadata for debug reasons
1028 local metafile="`mymktemp ${T}`" 1107 local metafile="$(emktemp)"
1029 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1108 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
1030 1109
1031 # rip out the final file name from the metadata 1110 # rip out the final file name from the metadata
1032 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1111 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
1033 datafile="`basename ${datafile}`" 1112 datafile="`basename ${datafile}`"
1034 1113
1035 # now lets uncompress/untar the file if need be 1114 # now lets uncompress/untar the file if need be
1036 local tmpfile="`mymktemp ${T}`" 1115 local tmpfile="$(emktemp)"
1037 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1116 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1038 1117
1039 local iscompressed="`file -b ${tmpfile}`" 1118 local iscompressed="`file -b ${tmpfile}`"
1040 if [ "${iscompressed:0:8}" == "compress" ] ; then 1119 if [ "${iscompressed:0:8}" == "compress" ] ; then
1041 iscompressed=1 1120 iscompressed=1
1143 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1222 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1144 *) die "makeself cant handle exe '${exe}'" 1223 *) die "makeself cant handle exe '${exe}'"
1145 esac 1224 esac
1146 1225
1147 # lets grab the first few bytes of the file to figure out what kind of archive it is 1226 # lets grab the first few bytes of the file to figure out what kind of archive it is
1148 local tmpfile="$(mymktemp "${T}")" 1227 local tmpfile="$(emktemp)"
1149 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1228 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1150 local filetype="$(file -b "${tmpfile}")" 1229 local filetype="$(file -b "${tmpfile}")"
1151 case ${filetype} in 1230 case ${filetype} in
1152 *tar\ archive) 1231 *tar\ archive)
1153 eval ${exe} | tar --no-same-owner -xf - 1232 eval ${exe} | tar --no-same-owner -xf -
1200 return 0 1279 return 0
1201 fi 1280 fi
1202 done 1281 done
1203 set +o noglob; set -$shopts #reset old shell opts 1282 set +o noglob; set -$shopts #reset old shell opts
1204 1283
1205 local licmsg="`mymktemp ${T}`" 1284 local licmsg="$(emktemp)"
1206 cat << EOF > ${licmsg} 1285 cat << EOF > ${licmsg}
1207********************************************************** 1286**********************************************************
1208The following license outlines the terms of use of this 1287The following license outlines the terms of use of this
1209package. You MUST accept this license for installation to 1288package. You MUST accept this license for installation to
1210continue. When you are done viewing, hit 'q'. If you 1289continue. When you are done viewing, hit 'q'. If you
1258 export CDROM_TOTAL_CDS=${cdcnt} 1337 export CDROM_TOTAL_CDS=${cdcnt}
1259 export CDROM_CURRENT_CD=1 1338 export CDROM_CURRENT_CD=1
1260 1339
1261 # now we see if the user gave use CD_ROOT ... 1340 # now we see if the user gave use CD_ROOT ...
1262 # if they did, let's just believe them that it's correct 1341 # if they did, let's just believe them that it's correct
1263 if [ ! -z "${CD_ROOT}" ] ; then 1342 if [[ ! -z ${CD_ROOT} ]] ; then
1264 export CDROM_ROOT="${CD_ROOT}" 1343 export CDROM_ROOT=${CD_ROOT}
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1344 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1266 return 1345 return
1267 fi 1346 fi
1268 # do the same for CD_ROOT_X 1347 # do the same for CD_ROOT_X
1269 if [ ! -z "${CD_ROOT_1}" ] ; then 1348 if [[ ! -z ${CD_ROOT_1} ]] ; then
1270 local var= 1349 local var=
1271 cdcnt=0 1350 cdcnt=0
1272 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1351 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1273 cdcnt=$((cdcnt + 1)) 1352 cdcnt=$((cdcnt + 1))
1274 var="CD_ROOT_${cdcnt}" 1353 var="CD_ROOT_${cdcnt}"
1275 if [ -z "${!var}" ] ; then 1354 if [[ -z ${!var} ]] ; then
1276 eerror "You must either use just the CD_ROOT" 1355 eerror "You must either use just the CD_ROOT"
1277 eerror "or specify ALL the CD_ROOT_X variables." 1356 eerror "or specify ALL the CD_ROOT_X variables."
1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1357 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1279 die "could not locate CD_ROOT_${cdcnt}" 1358 die "could not locate CD_ROOT_${cdcnt}"
1280 fi 1359 fi
1283 export CDROM_ROOT=${CDROM_ROOTS_1} 1362 export CDROM_ROOT=${CDROM_ROOTS_1}
1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1363 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 return 1364 return
1286 fi 1365 fi
1287 1366
1288 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1367 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1289 einfon "This ebuild will need the " 1368 einfon "This ebuild will need the "
1290 if [ -z "${CDROM_NAME}" ] ; then 1369 if [[ -z ${CDROM_NAME} ]] ; then
1291 echo "cdrom for ${PN}." 1370 echo "cdrom for ${PN}."
1292 else 1371 else
1293 echo "${CDROM_NAME}." 1372 echo "${CDROM_NAME}."
1294 fi 1373 fi
1295 echo 1374 echo
1296 einfo "If you do not have the CD, but have the data files" 1375 einfo "If you do not have the CD, but have the data files"
1297 einfo "mounted somewhere on your filesystem, just export" 1376 einfo "mounted somewhere on your filesystem, just export"
1298 einfo "the variable CD_ROOT so that it points to the" 1377 einfo "the variable CD_ROOT so that it points to the"
1299 einfo "directory containing the files." 1378 einfo "directory containing the files."
1300 echo 1379 echo
1380 einfo "For example:"
1381 einfo "export CD_ROOT=/mnt/cdrom"
1382 echo
1301 else 1383 else
1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1384 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303 cdcnt=0 1385 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1386 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1387 cdcnt=$((cdcnt + 1))
1306 var="CDROM_NAME_${cdcnt}" 1388 var="CDROM_NAME_${cdcnt}"
1307 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1389 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1308 done 1390 done
1309 echo 1391 echo
1310 einfo "If you do not have the CDs, but have the data files" 1392 einfo "If you do not have the CDs, but have the data files"
1311 einfo "mounted somewhere on your filesystem, just export" 1393 einfo "mounted somewhere on your filesystem, just export"
1312 einfo "the following variables so they point to the right place:" 1394 einfo "the following variables so they point to the right place:"
1313 einfon "" 1395 einfon ""
1314 cdcnt=0 1396 cdcnt=0
1315 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1397 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1316 cdcnt=$((cdcnt + 1)) 1398 cdcnt=$((cdcnt + 1))
1317 echo -n " CD_ROOT_${cdcnt}" 1399 echo -n " CD_ROOT_${cdcnt}"
1318 done 1400 done
1319 echo 1401 echo
1320 einfo "Or, if you have all the files in the same place, or" 1402 einfo "Or, if you have all the files in the same place, or"
1321 einfo "you only have one cdrom, you can export CD_ROOT" 1403 einfo "you only have one cdrom, you can export CD_ROOT"
1322 einfo "and that place will be used as the same data source" 1404 einfo "and that place will be used as the same data source"
1323 einfo "for all the CDs." 1405 einfo "for all the CDs."
1324 echo 1406 echo
1407 einfo "For example:"
1408 einfo "export CD_ROOT_1=/mnt/cdrom"
1409 echo
1325 fi 1410 fi
1326 export CDROM_CURRENT_CD=0 1411 export CDROM_CURRENT_CD=0
1327 cdrom_load_next_cd 1412 cdrom_load_next_cd
1328} 1413}
1329 1414
1333# remember, you can only go forward in the cd chain, you can't go back. 1418# remember, you can only go forward in the cd chain, you can't go back.
1334cdrom_load_next_cd() { 1419cdrom_load_next_cd() {
1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1420 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336 local var= 1421 local var=
1337 1422
1338 if [ ! -z "${CD_ROOT}" ] ; then 1423 if [[ ! -z ${CD_ROOT} ]] ; then
1339 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1424 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1340 return 1425 return
1341 fi 1426 fi
1342 1427
1343 unset CDROM_ROOT 1428 unset CDROM_ROOT
1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1429 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1345 if [ -z "${!var}" ] ; then 1430 if [[ -z ${!var} ]] ; then
1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1431 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347 cdrom_locate_file_on_cd ${!var} 1432 cdrom_locate_file_on_cd ${!var}
1348 else 1433 else
1349 export CDROM_ROOT="${!var}" 1434 export CDROM_ROOT=${!var}
1350 fi 1435 fi
1351 1436
1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1437 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1353} 1438}
1354 1439
1358# found, then a message asking for the user to insert the cdrom will be 1443# found, then a message asking for the user to insert the cdrom will be
1359# displayed and we'll hang out here until: 1444# displayed and we'll hang out here until:
1360# (1) the file is found on a mounted cdrom 1445# (1) the file is found on a mounted cdrom
1361# (2) the user hits CTRL+C 1446# (2) the user hits CTRL+C
1362cdrom_locate_file_on_cd() { 1447cdrom_locate_file_on_cd() {
1363 while [ -z "${CDROM_ROOT}" ] ; do 1448 while [[ -z ${CDROM_ROOT} ]] ; do
1364 local dir="$(dirname ${@})" 1449 local dir="$(dirname ${@})"
1365 local file="$(basename ${@})" 1450 local file="$(basename ${@})"
1366 local mline="" 1451 local mline=""
1367 local showedmsg=0 1452 local showedmsg=0
1368 1453
1369 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1454 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1370 [ -d "${mline}/${dir}" ] || continue 1455 [[ -d ${mline}/${dir} ]] || continue
1371 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1456 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \
1372 && export CDROM_ROOT=${mline} 1457 && export CDROM_ROOT=${mline}
1373 done 1458 done
1374 1459
1375 if [ -z "${CDROM_ROOT}" ] ; then 1460 if [[ -z ${CDROM_ROOT} ]] ; then
1376 echo 1461 echo
1377 if [ ${showedmsg} -eq 0 ] ; then 1462 if [[ ${showedmsg} -eq 0 ]] ; then
1378 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1463 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1379 if [ -z "${CDROM_NAME}" ] ; then 1464 if [[ -z ${CDROM_NAME} ]] ; then
1380 einfo "Please insert the cdrom for ${PN} now !" 1465 einfo "Please insert the cdrom for ${PN} now !"
1381 else 1466 else
1382 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1467 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383 fi 1468 fi
1384 else 1469 else
1385 if [ -z "${CDROM_NAME_1}" ] ; then 1470 if [[ -z ${CDROM_NAME_1} ]] ; then
1386 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1471 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1387 else 1472 else
1388 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1473 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1389 einfo "Please insert+mount the ${!var} cdrom now !" 1474 einfo "Please insert+mount the ${!var} cdrom now !"
1390 fi 1475 fi
1438 1523
1439 ls=" ${ls} " 1524 ls=" ${ls} "
1440 newls="" 1525 newls=""
1441 for f in ${LINGUAS} ; do 1526 for f in ${LINGUAS} ; do
1442 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1527 if [ "${ls/ ${f} /}" != "${ls}" ] ; then
1443 nl="${newls} ${f}" 1528 newls="${newls} ${f}"
1444 else 1529 else
1445 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1530 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1446 fi 1531 fi
1447 done 1532 done
1448 if [ -z "${newls}" ] ; then 1533 if [ -z "${newls}" ] ; then
1509 touch ${D}${LIB} 1594 touch ${D}${LIB}
1510 fi 1595 fi
1511} 1596}
1512 1597
1513preserve_old_lib_notify() { 1598preserve_old_lib_notify() {
1514 LIB=$1 1599 LIB=$1
1515 1600
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1601 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1517 SONAME=`basename ${LIB}` 1602 SONAME=`basename ${LIB}`
1518 1603
1519 einfo "An old version of an installed library was detected on your system." 1604 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" 1605 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," 1606 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:" 1607 einfo "you will need to execute the following command:"
1523 einfo " revdep-rebuild --soname ${SONAME}" 1608 einfo " revdep-rebuild --soname ${SONAME}"
1524 einfo 1609 einfo
1525 einfo "After doing that, you can safely remove ${LIB}" 1610 einfo "After doing that, you can safely remove ${LIB}"
1526 fi 1611 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1612 fi
1527} 1613}
1614
1615# Hack for people to figure out if a package was built with
1616# certain USE flags
1617#
1618# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1619# ex: built_with_use xchat gtk2
1620#
1621# Flags: -a all USE flags should be utilized
1622# -o at least one USE flag should be utilized
1623# Note: the default flag is '-a'
1624built_with_use() {
1625 local opt=$1
1626 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1627
1628 local PKG=$(best_version $1)
1629 shift
1630
1631 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1632 [[ ! -e ${USEFILE} ]] && return 1
1633
1634 local USE_BUILT=$(<${USEFILE})
1635 while [[ $# -gt 0 ]] ; do
1636 if [[ ${opt} = "-o" ]] ; then
1637 has $1 ${USE_BUILT} && return 0
1638 else
1639 has $1 ${USE_BUILT} || return 1
1640 fi
1641 shift
1642 done
1643 [[ ${opt} = "-a" ]]
1644}
1645
1646# Many configure scripts wrongly bail when a C++ compiler
1647# could not be detected. #73450
1648epunt_cxx() {
1649 local dir=$1
1650 [[ -z ${dir} ]] && dir=${S}
1651 ebegin "Removing useless C++ checks"
1652 local f
1653 for f in $(find ${dir} -name configure) ; do
1654 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1655 done
1656 eend 0
1657}
1658
1659# get_abi_var <VAR> [<ABI>]
1660# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1661#
1662# This code is for testing purposes only with the sparc64-multilib ${PROFILE_ARCH}
1663# and getting a more multilib-aware portage layout. It may end up being used, but for now
1664# it is subject to removal if a better way is worked out.
1665#
1666# ex:
1667# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
1668#
1669# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
1670# This will hopefully be added to portage soon...
1671#
1672# If <ABI> is not specified, ${ABI} is used.
1673# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
1674# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
1675#
1676# Jeremy Huddleston <eradicator@gentoo.org>
1677get_abi_var() {
1678 local flag=$1
1679 local abi
1680 if [ $# -gt 1 ]; then
1681 abi=$1
1682 elif [ -n "${ABI}" ]; then
1683 abi=${ABI}
1684 elif [ -n "${DEFAULT_ABI}" ]; then
1685 abi=${DEFAULT_ABI}
1686 else
1687 return 1
1688 fi
1689 eval echo \${${flag}_${abi}}
1690}
1691
1692get_abi_CFLAGS() { get_abi_var CFLAGS $1; }
1693get_abi_CXXFLAGS() { get_abi_var CXXFLAGS $1; }
1694get_abi_ASFLAGS() { get_abi_var ASFLAGS $1; }
1695get_abi_LIBDIR() { get_abi_var LIBDIR $1; }
1696

Legend:
Removed from v.1.114  
changed lines
  Added in v.1.134

  ViewVC Help
Powered by ViewVC 1.1.20