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

Diff of /eclass/eutils.eclass

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

Revision 1.242 Revision 1.268
1# Copyright 1999-2006 Gentoo Foundation 1# Copyright 1999-2006 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.242 2006/06/24 04:36:33 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.268 2007/01/13 19:36:14 vapier Exp $
4# 4#
5# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
6# have to implement themselves. 6# have to implement themselves.
7# 7#
8# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
18# outputting to a terminal, don't wait. For compatability purposes, the argument 18# outputting to a terminal, don't wait. For compatability purposes, the argument
19# must be an integer greater than zero. 19# must be an integer greater than zero.
20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
21epause() { 21epause() {
22 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
23 sleep ${1:-5}
24 fi
25} 23}
26 24
27# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
28# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
29# don't beep. 27# don't beep.
30# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
31ebeep() { 29ebeep() {
32 local n 30 local n
33 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
34 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
35 echo -ne "\a" 33 echo -ne "\a"
36 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
37 echo -ne "\a" 35 echo -ne "\a"
38 sleep 1 36 sleep 1
39 done 37 done
40 fi 38 fi
41} 39}
42 40
43# This function generate linker scripts in /usr/lib for dynamic 41# This function generate linker scripts in /usr/lib for dynamic
44# libs in /lib. This is to fix linking problems when you have 42# libs in /lib. This is to fix linking problems when you have
45# the .so in /lib, and the .a in /usr/lib. What happens is that 43# the .so in /lib, and the .a in /usr/lib. What happens is that
46# in some cases when linking dynamic, the .a in /usr/lib is used 44# in some cases when linking dynamic, the .a in /usr/lib is used
47# instead of the .so in /lib due to gcc/libtool tweaking ld's 45# instead of the .so in /lib due to gcc/libtool tweaking ld's
48# library search path. This cause many builds to fail. 46# library search path. This cause many builds to fail.
49# See bug #4411 for more info. 47# See bug #4411 for more info.
50# 48#
51# To use, simply call: 49# To use, simply call:
52# 50#
53# gen_usr_ldscript libfoo.so 51# gen_usr_ldscript libfoo.so
54# 52#
55# Note that you should in general use the unversioned name of 53# Note that you should in general use the unversioned name of
56# the library, as ldconfig should usually update it correctly 54# the library, as ldconfig should usually update it correctly
57# to point to the latest version of the library present. 55# to point to the latest version of the library present.
58# 56#
59# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
60# 58#
61gen_usr_ldscript() { 59gen_usr_ldscript() {
60 if [[ $(type -t _tc_gen_usr_ldscript) == "function" ]] ; then
61 _tc_gen_usr_ldscript "$@"
62 return $?
63 fi
64
65 ewarn "QA Notice: Please upgrade your ebuild to use toolchain-funcs"
66 ewarn "QA Notice: rather than gen_usr_ldscript() from eutils"
67
62 local lib libdir=$(get_libdir) 68 local lib libdir=$(get_libdir)
63 # Just make sure it exists 69 # Just make sure it exists
64 dodir /usr/${libdir} 70 dodir /usr/${libdir}
65 71
66 for lib in "${@}" ; do 72 for lib in "${@}" ; do
87# Default options for patch 93# Default options for patch
88# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 94# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
89# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 95# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
90# Set -E to automatically remove empty files. 96# Set -E to automatically remove empty files.
91EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
92# List of patches not to apply. Not this is only file names, 98# List of patches not to apply. Not this is only file names,
93# and not the full path .. 99# and not the full path ..
94EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
95# Change the printed message for a single patch. 101# Change the printed message for a single patch.
96EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
97# Change the printed message for multiple patches. 103# Change the printed message for multiple patches.
98EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 104EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
99# Force applying bulk patches even if not following the style: 105# Force applying bulk patches even if not following the style:
100# 106#
101# ??_${ARCH}_foo.${EPATCH_SUFFIX} 107# ??_${ARCH}_foo.${EPATCH_SUFFIX}
102# 108#
103EPATCH_FORCE="no" 109EPATCH_FORCE="no"
104 110
105# This function is for bulk patching, or in theory for just one 111# This function is for bulk patching, or in theory for just one
106# or two patches. 112# or two patches.
117# 123#
118# Patches are applied in current directory. 124# Patches are applied in current directory.
119# 125#
120# Bulk Patches should preferibly have the form of: 126# Bulk Patches should preferibly have the form of:
121# 127#
122# ??_${ARCH}_foo.${EPATCH_SUFFIX} 128# ??_${ARCH}_foo.${EPATCH_SUFFIX}
123# 129#
124# For example: 130# For example:
125# 131#
126# 01_all_misc-fix.patch.bz2 132# 01_all_misc-fix.patch.bz2
127# 02_sparc_another-fix.patch.bz2 133# 02_sparc_another-fix.patch.bz2
128# 134#
129# This ensures that there are a set order, and you can have ARCH 135# This ensures that there are a set order, and you can have ARCH
130# specific patches. 136# specific patches.
131# 137#
132# If you however give an argument to epatch(), it will treat it as a 138# If you however give an argument to epatch(), it will treat it as a
220 fi 226 fi
221 for x in ${EPATCH_SOURCE} 227 for x in ${EPATCH_SOURCE}
222 do 228 do
223 # New ARCH dependant patch naming scheme ... 229 # New ARCH dependant patch naming scheme ...
224 # 230 #
225 # ???_arch_foo.patch 231 # ???_arch_foo.patch
226 # 232 #
227 if [ -f ${x} ] && \ 233 if [ -f ${x} ] && \
228 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \ 234 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
229 [ "${EPATCH_FORCE}" = "yes" ]) 235 [ "${EPATCH_FORCE}" = "yes" ])
230 then 236 then
231 local count=0 237 local count=0
232 local popts="${EPATCH_OPTS}" 238 local popts="${EPATCH_OPTS}"
233 local patchname=${x##*/} 239 local patchname=${x##*/}
234 240
247 einfo "${EPATCH_SINGLE_MSG}" 253 einfo "${EPATCH_SINGLE_MSG}"
248 else 254 else
249 einfo "Applying ${patchname} ..." 255 einfo "Applying ${patchname} ..."
250 fi 256 fi
251 else 257 else
252 einfo " ${patchname} ..." 258 einfo " ${patchname} ..."
253 fi 259 fi
254 260
255 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 261 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
256 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 262 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
257 263
262 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
263 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
264 270
265 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
266 then 272 then
267 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
268 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
269 else 275 else
270 PATCH_TARGET="${x}" 276 PATCH_TARGET="${x}"
271 fi 277 fi
272 278
273 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
274 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 280 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 281
276 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
277 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
278 284
448 eerror "No username specified !" 454 eerror "No username specified !"
449 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
450 fi 456 fi
451 457
452 # lets see if the username already exists 458 # lets see if the username already exists
453 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
454 return 0 460 return 0
455 fi 461 fi
456 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
457 463
458 # options to pass to useradd 464 # options to pass to useradd
459 local opts= 465 local opts=
460 466
461 # handle uid 467 # handle uid
462 local euid=$1; shift 468 local euid=$1; shift
463 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
464 if [[ ${euid} -gt 0 ]] ; then 470 if [[ ${euid} -gt 0 ]] ; then
465 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
466 euid="next" 472 euid="next"
467 fi 473 fi
468 else 474 else
469 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
470 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
471 fi 477 fi
472 else 478 else
473 euid="next" 479 euid="next"
474 fi 480 fi
475 if [[ ${euid} == "next" ]] ; then 481 if [[ ${euid} == "next" ]] ; then
476 for euid in $(seq 101 999) ; do 482 for ((euid = 101; euid <= 999; euid++)); do
477 [[ -z $(egetent passwd ${euid}) ]] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
478 done 484 done
479 fi 485 fi
480 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
481 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
495 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do 501 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
496 [[ -x ${ROOT}${shell} ]] && break 502 [[ -x ${ROOT}${shell} ]] && break
497 done 503 done
498 504
499 if [[ ${shell} == "/dev/null" ]] ; then 505 if [[ ${shell} == "/dev/null" ]] ; then
500 eerror "Unable to identify the shell to use" 506 eerror "Unable to identify the shell to use, proceeding with userland default."
501 die "Unable to identify the shell to use" 507 case ${USERLAND} in
508 GNU) shell="/bin/false" ;;
509 BSD) shell="/sbin/nologin" ;;
510 Darwin) shell="/usr/sbin/nologin" ;;
511 *) die "Unable to identify the default shell for userland ${USERLAND}"
512 esac
502 fi 513 fi
503 514
504 eshell=${shell} 515 eshell=${shell}
505 fi 516 fi
506 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
651 eerror "No group specified !" 662 eerror "No group specified !"
652 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
653 fi 664 fi
654 665
655 # see if group already exists 666 # see if group already exists
656 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
657 then
658 return 0 668 return 0
659 fi 669 fi
660 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
661 671
662 # options to pass to useradd 672 # options to pass to useradd
705 fi 715 fi
706 716
707 # If we need the next available 717 # If we need the next available
708 case ${egid} in 718 case ${egid} in
709 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
710 for egid in $(seq 101 999); do 720 for ((egid = 101; egid <= 999; egid++)); do
711 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
712 done 722 done
713 esac 723 esac
714 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
715 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
716 ;; 726 ;;
717 727
718 *-freebsd*|*-dragonfly*) 728 *-freebsd*|*-dragonfly*)
719 case ${egid} in 729 case ${egid} in
720 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
721 for egid in $(seq 101 999); do 731 for ((egid = 101; egid <= 999; egid++)); do
722 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
723 done 733 done
724 esac 734 esac
725 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
726 ;; 736 ;;
727 737
728 *-netbsd*) 738 *-netbsd*)
729 case ${egid} in 739 case ${egid} in
730 *[!0-9]*) # Non numeric 740 *[!0-9]*) # Non numeric
731 for egid in $(seq 101 999); do 741 for ((egid = 101; egid <= 999; egid++)); do
732 [ -z "`egetent group ${egid}`" ] && break 742 [[ -z $(egetent group ${egid}) ]] && break
733 done 743 done
734 esac 744 esac
735 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
736 ;; 746 ;;
737 747
745# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
746# vapier@gentoo.org 756# vapier@gentoo.org
747# 757#
748# edos2unix(file, <more files> ...) 758# edos2unix(file, <more files> ...)
749edos2unix() { 759edos2unix() {
750 for f in "$@" 760 echo "$@" | xargs sed -i 's/\r$//'
751 do
752 cp "${f}" ${T}/edos2unix
753 sed 's/\r$//' ${T}/edos2unix > "${f}"
754 done
755} 761}
756 762
757 763
758############################################################## 764##############################################################
759# START: Handle .desktop files and menu entries # 765# START: Handle .desktop files and menu entries #
760# maybe this should be separated into a new eclass some time # 766# maybe this should be separated into a new eclass some time #
761# lanius@gentoo.org # 767# lanius@gentoo.org #
762############################################################## 768##############################################################
763 769
764# Make a desktop file ! 770# Make a desktop file !
765# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
766# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
767# 773#
768# make_desktop_entry(<command>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
769# 775#
770# binary: what command does the app run with ? 776# binary: what command does the app run with ?
771# name: the name that will show up in the menu 777# name: the name that will show up in the menu
772# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
773# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
774# a full path to an icon 780# a full path to an icon
775# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
776# http://www.freedesktop.org/Standards/desktop-entry-spec 782# http://www.freedesktop.org/Standards/desktop-entry-spec
777# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
778make_desktop_entry() { 784make_desktop_entry() {
779 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 785 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
780 786
788 local catmaj=${CATEGORY%%-*} 794 local catmaj=${CATEGORY%%-*}
789 local catmin=${CATEGORY##*-} 795 local catmin=${CATEGORY##*-}
790 case ${catmaj} in 796 case ${catmaj} in
791 app) 797 app)
792 case ${catmin} in 798 case ${catmin} in
793 admin) type=System;; 799 admin) type=System;;
794 cdr) type=DiscBurning;; 800 cdr) type=DiscBurning;;
795 dicts) type=Dictionary;; 801 dicts) type=Dictionary;;
796 editors) type=TextEditor;; 802 editors) type=TextEditor;;
797 emacs) type=TextEditor;; 803 emacs) type=TextEditor;;
798 emulation) type=Emulator;; 804 emulation) type=Emulator;;
799 laptop) type=HardwareSettings;; 805 laptop) type=HardwareSettings;;
800 office) type=Office;; 806 office) type=Office;;
801 vim) type=TextEditor;; 807 vim) type=TextEditor;;
802 xemacs) type=TextEditor;; 808 xemacs) type=TextEditor;;
803 *) type=;; 809 *) type=;;
804 esac 810 esac
805 ;; 811 ;;
806 812
807 dev) 813 dev)
808 type="Development" 814 type="Development"
809 ;; 815 ;;
810 816
811 games) 817 games)
812 case ${catmin} in 818 case ${catmin} in
813 action) type=ActionGame;; 819 action|fps) type=ActionGame;;
814 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
815 board) type=BoardGame;; 821 board) type=BoardGame;;
816 kid) type=KidsGame;; 822 kids) type=KidsGame;;
817 emulation) type=Emulator;; 823 emulation) type=Emulator;;
818 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
819 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
820 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
821 simulation) type=Simulation;; 827 simulation) type=Simulation;;
822 sports) type=SportsGame;; 828 sports) type=SportsGame;;
823 strategy) type=StrategyGame;; 829 strategy) type=StrategyGame;;
824 *) type=;; 830 *) type=;;
825 esac 831 esac
826 type="Game;${type}" 832 type="Game;${type}"
827 ;; 833 ;;
828 834
829 mail) 835 mail)
833 media) 839 media)
834 case ${catmin} in 840 case ${catmin} in
835 gfx) type=Graphics;; 841 gfx) type=Graphics;;
836 radio) type=Tuner;; 842 radio) type=Tuner;;
837 sound) type=Audio;; 843 sound) type=Audio;;
838 tv) type=TV;; 844 tv) type=TV;;
839 video) type=Video;; 845 video) type=Video;;
840 *) type=;; 846 *) type=;;
841 esac 847 esac
842 type="AudioVideo;${type}" 848 type="AudioVideo;${type}"
843 ;; 849 ;;
844 850
845 net) 851 net)
846 case ${catmin} in 852 case ${catmin} in
847 dialup) type=Dialup;; 853 dialup) type=Dialup;;
848 ftp) type=FileTransfer;; 854 ftp) type=FileTransfer;;
849 im) type=InstantMessaging;; 855 im) type=InstantMessaging;;
850 irc) type=IRCClient;; 856 irc) type=IRCClient;;
851 mail) type=Email;; 857 mail) type=Email;;
852 news) type=News;; 858 news) type=News;;
853 nntp) type=News;; 859 nntp) type=News;;
854 p2p) type=FileTransfer;; 860 p2p) type=FileTransfer;;
855 *) type=;; 861 *) type=;;
856 esac 862 esac
857 type="Network;${type}" 863 type="Network;${type}"
858 ;; 864 ;;
859 865
860 sci) 866 sci)
861 case ${catmin} in 867 case ${catmin} in
862 astro*) type=Astronomy;; 868 astro*) type=Astronomy;;
863 bio*) type=Biology;; 869 bio*) type=Biology;;
864 calc*) type=Calculator;; 870 calc*) type=Calculator;;
865 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
866 geo*) type=Geology;; 872 geo*) type=Geology;;
867 math*) type=Math;; 873 math*) type=Math;;
868 *) type=;; 874 *) type=;;
869 esac 875 esac
870 type="Science;${type}" 876 type="Science;${type}"
871 ;; 877 ;;
872 878
873 www) 879 www)
874 case ${catmin} in 880 case ${catmin} in
875 client) type=WebBrowser;; 881 client) type=WebBrowser;;
876 *) type=;; 882 *) type=;;
877 esac 883 esac
878 type="Network" 884 type="Network"
879 ;; 885 ;;
880 886
881 *) 887 *)
911 ) 917 )
912} 918}
913 919
914# Make a GDM/KDM Session file 920# Make a GDM/KDM Session file
915# 921#
916# make_desktop_entry(<title>, <command>) 922# make_session_desktop(<title>, <command>)
917# title: File to execute to start the Window Manager 923# title: File to execute to start the Window Manager
918# command: Name of the Window Manager 924# command: Name of the Window Manager
919 925
920make_session_desktop() { 926make_session_desktop() {
921 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 927 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
972 insinto /usr/share/pixmaps 978 insinto /usr/share/pixmaps
973 newins "$1" "$2" 979 newins "$1" "$2"
974} 980}
975 981
976############################################################## 982##############################################################
977# END: Handle .desktop files and menu entries # 983# END: Handle .desktop files and menu entries #
978############################################################## 984##############################################################
979 985
980 986
981# for internal use only (unpack_pdv and unpack_makeself) 987# for internal use only (unpack_pdv and unpack_makeself)
982find_unpackable_file() { 988find_unpackable_file() {
1001# the middle of the archive. Valve seems to use it a lot ... too bad 1007# the middle of the archive. Valve seems to use it a lot ... too bad
1002# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1008# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1003# 1009#
1004# Usage: unpack_pdv [file to unpack] [size of off_t] 1010# Usage: unpack_pdv [file to unpack] [size of off_t]
1005# - you have to specify the off_t size ... i have no idea how to extract that 1011# - you have to specify the off_t size ... i have no idea how to extract that
1006# information out of the binary executable myself. basically you pass in 1012# information out of the binary executable myself. basically you pass in
1007# the size of the off_t type (in bytes) on the machine that built the pdv 1013# the size of the off_t type (in bytes) on the machine that built the pdv
1008# archive. one way to determine this is by running the following commands: 1014# archive. one way to determine this is by running the following commands:
1009# strings <pdv archive> | grep lseek 1015# strings <pdv archive> | grep lseek
1010# strace -elseek <pdv archive> 1016# strace -elseek <pdv archive>
1011# basically look for the first lseek command (we do the strings/grep because 1017# basically look for the first lseek command (we do the strings/grep because
1012# sometimes the function call is _llseek or something) and steal the 2nd 1018# sometimes the function call is _llseek or something) and steal the 2nd
1013# parameter. here is an example: 1019# parameter. here is an example:
1014# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1020# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1015# lseek 1021# lseek
1016# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1022# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1017# lseek(3, -4, SEEK_END) = 2981250 1023# lseek(3, -4, SEEK_END) = 2981250
1018# thus we would pass in the value of '4' as the second parameter. 1024# thus we would pass in the value of '4' as the second parameter.
1019unpack_pdv() { 1025unpack_pdv() {
1020 local src=$(find_unpackable_file $1) 1026 local src=$(find_unpackable_file $1)
1021 local sizeoff_t=$2 1027 local sizeoff_t=$2
1022 1028
1023 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1029 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1024 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1030 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1025 1031
1026 local shrtsrc=$(basename "${src}") 1032 local shrtsrc=$(basename "${src}")
1027 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1033 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1028 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1034 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1029 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1035 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1030 1036
1031 # grab metadata for debug reasons 1037 # grab metadata for debug reasons
1032 local metafile="$(emktemp)" 1038 local metafile="$(emktemp)"
1033 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1039 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
1034 1040
1093# many other game companies. 1099# many other game companies.
1094# 1100#
1095# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1101# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1096# - If the file is not specified then unpack will utilize ${A}. 1102# - If the file is not specified then unpack will utilize ${A}.
1097# - If the offset is not specified then we will attempt to extract 1103# - If the offset is not specified then we will attempt to extract
1098# the proper offset from the script itself. 1104# the proper offset from the script itself.
1099unpack_makeself() { 1105unpack_makeself() {
1100 local src_input=${1:-${A}} 1106 local src_input=${1:-${A}}
1101 local src=$(find_unpackable_file "${src_input}") 1107 local src=$(find_unpackable_file "${src_input}")
1102 local skip=$2 1108 local skip=$2
1103 local exe=$3 1109 local exe=$3
1153 # lets grab the first few bytes of the file to figure out what kind of archive it is 1159 # lets grab the first few bytes of the file to figure out what kind of archive it is
1154 local tmpfile="$(emktemp)" 1160 local tmpfile="$(emktemp)"
1155 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1161 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1156 local filetype="$(file -b "${tmpfile}")" 1162 local filetype="$(file -b "${tmpfile}")"
1157 case ${filetype} in 1163 case ${filetype} in
1158 *tar\ archive) 1164 *tar\ archive*)
1159 eval ${exe} | tar --no-same-owner -xf - 1165 eval ${exe} | tar --no-same-owner -xf -
1160 ;; 1166 ;;
1161 bzip2*) 1167 bzip2*)
1162 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1168 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1163 ;; 1169 ;;
1199 # accepted ... if we don't find a match, we make the user accept 1205 # accepted ... if we don't find a match, we make the user accept
1200 local shopts=$- 1206 local shopts=$-
1201 local alic 1207 local alic
1202 set -o noglob #so that bash doesn't expand "*" 1208 set -o noglob #so that bash doesn't expand "*"
1203 for alic in ${ACCEPT_LICENSE} ; do 1209 for alic in ${ACCEPT_LICENSE} ; do
1204 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1210 if [[ ${alic} == ${l} ]]; then
1205 set +o noglob; set -${shopts} #reset old shell opts 1211 set +o noglob; set -${shopts} #reset old shell opts
1206 return 0 1212 return 0
1207 fi 1213 fi
1208 done 1214 done
1209 set +o noglob; set -$shopts #reset old shell opts 1215 set +o noglob; set -$shopts #reset old shell opts
1211 local licmsg="$(emktemp)" 1217 local licmsg="$(emktemp)"
1212 cat << EOF > ${licmsg} 1218 cat << EOF > ${licmsg}
1213********************************************************** 1219**********************************************************
1214The following license outlines the terms of use of this 1220The following license outlines the terms of use of this
1215package. You MUST accept this license for installation to 1221package. You MUST accept this license for installation to
1216continue. When you are done viewing, hit 'q'. If you 1222continue. When you are done viewing, hit 'q'. If you
1217CTRL+C out of this, the install will not run! 1223CTRL+C out of this, the install will not run!
1218********************************************************** 1224**********************************************************
1219 1225
1220EOF 1226EOF
1221 cat ${lic} >> ${licmsg} 1227 cat ${lic} >> ${licmsg}
1242# and when the function returns, you can assume that the cd has been 1248# and when the function returns, you can assume that the cd has been
1243# found at CDROM_ROOT. 1249# found at CDROM_ROOT.
1244# 1250#
1245# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1251# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1246# etc... if you want to give the cds better names, then just export 1252# etc... if you want to give the cds better names, then just export
1247# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1253# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1254# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1255# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1256# CDROM_NAME_2="data cd"
1257# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1248# 1258#
1249# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1259# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1250# 1260#
1251# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1261# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1252# - this will attempt to locate a cd based upon a file that is on 1262# - this will attempt to locate a cd based upon a file that is on
1253# the cd ... the more files you give this function, the more cds 1263# the cd ... the more files you give this function, the more cds
1254# the cdrom functions will handle 1264# the cdrom functions will handle
1255cdrom_get_cds() { 1265cdrom_get_cds() {
1256 # first we figure out how many cds we're dealing with by 1266 # first we figure out how many cds we're dealing with by
1257 # the # of files they gave us 1267 # the # of files they gave us
1258 local cdcnt=0 1268 local cdcnt=0
1259 local f= 1269 local f=
1303 echo 1313 echo
1304 einfo "For example:" 1314 einfo "For example:"
1305 einfo "export CD_ROOT=/mnt/cdrom" 1315 einfo "export CD_ROOT=/mnt/cdrom"
1306 echo 1316 echo
1307 else 1317 else
1318 if [[ -n ${CDROM_NAME_SET} ]] ; then
1319 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1320 cdcnt=0
1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1322 ((++cdcnt))
1323 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1324 done
1325 fi
1326
1308 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1327 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1309 cdcnt=0 1328 cdcnt=0
1310 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1329 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1311 ((++cdcnt)) 1330 ((++cdcnt))
1312 var="CDROM_NAME_${cdcnt}" 1331 var="CDROM_NAME_${cdcnt}"
1379 1398
1380 while [[ -n ${cdset[${i}]} ]] ; do 1399 while [[ -n ${cdset[${i}]} ]] ; do
1381 local dir=$(dirname ${cdset[${i}]}) 1400 local dir=$(dirname ${cdset[${i}]})
1382 local file=$(basename ${cdset[${i}]}) 1401 local file=$(basename ${cdset[${i}]})
1383 1402
1384 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do 1403 local point= node= fs= foo=
1385 [[ -d ${mline}/${dir} ]] || continue 1404 while read point node fs foo ; do
1405 [[ " cd9660 iso9660 " != *" ${fs} "* ]] && \
1406 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1407 && continue
1408 point=${point//\040/ }
1386 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then 1409 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1387 export CDROM_ROOT=${mline} 1410 export CDROM_ROOT=${point}
1388 export CDROM_SET=${i} 1411 export CDROM_SET=${i}
1389 export CDROM_MATCH=${cdset[${i}]} 1412 export CDROM_MATCH=${cdset[${i}]}
1390 return 1413 return
1391 fi 1414 done <<< "$(get_mounts)"
1392 done
1393 1415
1394 ((++i)) 1416 ((++i))
1395 done 1417 done
1396 1418
1397 echo 1419 echo
1425 1447
1426# Make sure that LINGUAS only contains languages that 1448# Make sure that LINGUAS only contains languages that
1427# a package can support 1449# a package can support
1428# 1450#
1429# usage: strip-linguas <allow LINGUAS> 1451# usage: strip-linguas <allow LINGUAS>
1430# strip-linguas -i <directories of .po files> 1452# strip-linguas -i <directories of .po files>
1431# strip-linguas -u <directories of .po files> 1453# strip-linguas -u <directories of .po files>
1432# 1454#
1433# The first form allows you to specify a list of LINGUAS. 1455# The first form allows you to specify a list of LINGUAS.
1434# The -i builds a list of po files found in all the 1456# The -i builds a list of po files found in all the
1435# directories and uses the intersection of the lists. 1457# directories and uses the intersection of the lists.
1436# The -u builds a list of po files found in all the 1458# The -u builds a list of po files found in all the
1437# directories and uses the union of the lists. 1459# directories and uses the union of the lists.
1438strip-linguas() { 1460strip-linguas() {
1439 local ls newls nols 1461 local ls newls nols
1440 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1462 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1441 local op=$1; shift 1463 local op=$1; shift
1442 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1464 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1467 newls="${newls} ${f}" 1489 newls="${newls} ${f}"
1468 else 1490 else
1469 nols="${nols} ${f}" 1491 nols="${nols} ${f}"
1470 fi 1492 fi
1471 done 1493 done
1472 [[ -n ${newls} ]] \ 1494 [[ -n ${nols} ]] \
1473 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1495 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1474 export LINGUAS=${newls:1} 1496 export LINGUAS=${newls:1}
1475} 1497}
1476 1498
1477# moved from kernel.eclass since they are generally useful outside of 1499# moved from kernel.eclass since they are generally useful outside of
1486 while ((i--)) ; do 1508 while ((i--)) ; do
1487 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1509 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1488 done 1510 done
1489 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1511 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1490 case ${ARCH} in 1512 case ${ARCH} in
1491 x86) export ARCH="i386";; 1513 x86) export ARCH="i386";;
1492 amd64) export ARCH="x86_64";; 1514 amd64) export ARCH="x86_64";;
1493 hppa) export ARCH="parisc";; 1515 hppa) export ARCH="parisc";;
1494 mips) export ARCH="mips";; 1516 mips) export ARCH="mips";;
1495 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one! 1517 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1496 *) export ARCH="${ARCH}";; 1518 *) export ARCH="${ARCH}";;
1497 esac 1519 esac
1498} 1520}
1499 1521
1500# set's ARCH back to what portage expects 1522# set's ARCH back to what portage expects
1501set_arch_to_portage() { 1523set_arch_to_portage() {
1508 1530
1509# Jeremy Huddleston <eradicator@gentoo.org>: 1531# Jeremy Huddleston <eradicator@gentoo.org>:
1510# preserve_old_lib /path/to/libblah.so.0 1532# preserve_old_lib /path/to/libblah.so.0
1511# preserve_old_lib_notify /path/to/libblah.so.0 1533# preserve_old_lib_notify /path/to/libblah.so.0
1512# 1534#
1513# These functions are useful when a lib in your package changes --library. Such 1535# These functions are useful when a lib in your package changes --library. Such
1514# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1536# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1515# would break packages that link against it. Most people get around this 1537# would break packages that link against it. Most people get around this
1516# by using the portage SLOT mechanism, but that is not always a relevant 1538# by using the portage SLOT mechanism, but that is not always a relevant
1517# solution, so instead you can add the following to your ebuilds: 1539# solution, so instead you can add the following to your ebuilds:
1518# 1540#
1519# src_install() { 1541# pkg_preinst() {
1520# ... 1542# ...
1521# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1543# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1522# ... 1544# ...
1523# } 1545# }
1524# 1546#
1527# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1549# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1528# ... 1550# ...
1529# } 1551# }
1530 1552
1531preserve_old_lib() { 1553preserve_old_lib() {
1532 LIB=$1 1554 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1555 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1556# die "Invalid preserve_old_lib() usage"
1557 fi
1558 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1533 1559
1534 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1560 local lib dir
1535 SONAME=`basename ${LIB}` 1561 for lib in "$@" ; do
1536 DIRNAME=`dirname ${LIB}` 1562 [[ -e ${ROOT}/${lib} ]] || continue
1537 1563 dir=${lib%/*}
1538 dodir ${DIRNAME} 1564 dodir ${dir} || die "dodir ${dir} failed"
1539 cp ${ROOT}${LIB} ${D}${DIRNAME} 1565 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1540 touch ${D}${LIB} 1566 touch "${D}"/${lib}
1541 fi 1567 done
1542} 1568}
1543 1569
1544preserve_old_lib_notify() { 1570preserve_old_lib_notify() {
1545 LIB=$1 1571 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1572 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1573# die "Invalid preserve_old_lib_notify() usage"
1574 fi
1546 1575
1547 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1576 local lib notice=0
1548 SONAME=`basename ${LIB}` 1577 for lib in "$@" ; do
1549 1578 [[ -e ${ROOT}/${lib} ]] || continue
1579 if [[ ${notice} -eq 0 ]] ; then
1580 notice=1
1550 ewarn "An old version of an installed library was detected on your system." 1581 ewarn "Old versions of installed libraries were detected on your system."
1551 ewarn "In order to avoid breaking packages that link against it, this older version" 1582 ewarn "In order to avoid breaking packages that depend on these old libs,"
1552 ewarn "is not being removed. In order to make full use of this newer version," 1583 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1553 ewarn "you will need to execute the following command:" 1584 ewarn "in order to remove these old dependencies. If you do not have this"
1554 ewarn " revdep-rebuild --library ${SONAME}" 1585 ewarn "helper program, simply emerge the 'gentoolkit' package."
1555 ewarn 1586 ewarn
1556 ewarn "After doing that, you can safely remove ${LIB}"
1557 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1558 fi 1587 fi
1588 ewarn " # revdep-rebuild --library ${lib##*/}"
1589 done
1559} 1590}
1560 1591
1561# Hack for people to figure out if a package was built with 1592# Hack for people to figure out if a package was built with
1562# certain USE flags 1593# certain USE flags
1563# 1594#
1564# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1595# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1565# ex: built_with_use xchat gtk2 1596# ex: built_with_use xchat gtk2
1566# 1597#
1567# Flags: -a all USE flags should be utilized 1598# Flags: -a all USE flags should be utilized
1568# -o at least one USE flag should be utilized 1599# -o at least one USE flag should be utilized
1569# Note: the default flag is '-a' 1600# Note: the default flag is '-a'
1570built_with_use() { 1601built_with_use() {
1571 local opt=$1 1602 local opt=$1
1572 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1603 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1573 1604
1574 local PKG=$(best_version $1) 1605 local PKG=$(best_version $1)
1606 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1575 shift 1607 shift
1576 1608
1577 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE 1609 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1610 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1578 1611
1579 # if the USE file doesnt exist, assume the $PKG is either 1612 # if the USE file doesnt exist, assume the $PKG is either
1580 # injected or package.provided 1613 # injected or package.provided
1581 [[ ! -e ${USEFILE} ]] && return 0 1614 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1615
1616 local IUSE_BUILT=$(<${IUSEFILE})
1617 # Don't check USE_EXPAND #147237
1618 local expand
1619 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1620 if [[ $1 == ${expand}_* ]] ; then
1621 expand=""
1622 break
1623 fi
1624 done
1625 if [[ -n ${expand} ]] ; then
1626 has $1 ${IUSE_BUILT} || die "$PKG does not actually support the $1 USE flag!"
1627 fi
1582 1628
1583 local USE_BUILT=$(<${USEFILE}) 1629 local USE_BUILT=$(<${USEFILE})
1584 while [[ $# -gt 0 ]] ; do 1630 while [[ $# -gt 0 ]] ; do
1585 if [[ ${opt} = "-o" ]] ; then 1631 if [[ ${opt} = "-o" ]] ; then
1586 has $1 ${USE_BUILT} && return 0 1632 has $1 ${USE_BUILT} && return 0
1601 local f 1647 local f
1602 for f in $(find ${dir} -name configure) ; do 1648 for f in $(find ${dir} -name configure) ; do
1603 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1649 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1604 done 1650 done
1605 eend 0 1651 eend 0
1606}
1607
1608# dopamd <file> [more files]
1609#
1610# Install pam auth config file in /etc/pam.d
1611dopamd() {
1612 [[ -z $1 ]] && die "dopamd requires at least one argument"
1613
1614 use pam || return 0
1615
1616 INSDESTTREE=/etc/pam.d \
1617 doins "$@" || die "failed to install $@"
1618}
1619# newpamd <old name> <new name>
1620#
1621# Install pam file <old name> as <new name> in /etc/pam.d
1622newpamd() {
1623 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1624
1625 use pam || return 0
1626
1627 INSDESTTREE=/etc/pam.d \
1628 newins "$1" "$2" || die "failed to install $1 as $2"
1629} 1652}
1630 1653
1631# make a wrapper script ... 1654# make a wrapper script ...
1632# NOTE: this was originally games_make_wrapper, but I noticed other places where 1655# NOTE: this was originally games_make_wrapper, but I noticed other places where
1633# this could be used, so I have moved it here and made it not games-specific 1656# this could be used, so I have moved it here and made it not games-specific

Legend:
Removed from v.1.242  
changed lines
  Added in v.1.268

  ViewVC Help
Powered by ViewVC 1.1.20