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

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

  ViewVC Help
Powered by ViewVC 1.1.20