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

Diff of /eclass/eutils.eclass

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

Revision 1.253 Revision 1.275
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.253 2006/10/06 07:00:14 flameeyes Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.275 2007/02/17 00:17:39 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!
37 done 37 done
38 fi 38 fi
39} 39}
40 40
41# This function generate linker scripts in /usr/lib for dynamic 41# This function generate linker scripts in /usr/lib for dynamic
42# 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
43# 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
44# 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
45# 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
46# library search path. This cause many builds to fail. 46# library search path. This cause many builds to fail.
47# See bug #4411 for more info. 47# See bug #4411 for more info.
48# 48#
49# To use, simply call: 49# To use, simply call:
50# 50#
51# gen_usr_ldscript libfoo.so 51# gen_usr_ldscript libfoo.so
52# 52#
53# Note that you should in general use the unversioned name of 53# Note that you should in general use the unversioned name of
54# the library, as ldconfig should usually update it correctly 54# the library, as ldconfig should usually update it correctly
55# to point to the latest version of the library present. 55# to point to the latest version of the library present.
56# 56#
93# Default options for patch 93# Default options for patch
94# 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
95# 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.
96# Set -E to automatically remove empty files. 96# Set -E to automatically remove empty files.
97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
98# 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,
99# and not the full path .. 99# and not the full path ..
100EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
101# Change the printed message for a single patch. 101# Change the printed message for a single patch.
102EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
103# Change the printed message for multiple patches. 103# Change the printed message for multiple patches.
104EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 104EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
105# Force applying bulk patches even if not following the style: 105# Force applying bulk patches even if not following the style:
106# 106#
107# ??_${ARCH}_foo.${EPATCH_SUFFIX} 107# ??_${ARCH}_foo.${EPATCH_SUFFIX}
108# 108#
109EPATCH_FORCE="no" 109EPATCH_FORCE="no"
110 110
111# 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
112# or two patches. 112# or two patches.
123# 123#
124# Patches are applied in current directory. 124# Patches are applied in current directory.
125# 125#
126# Bulk Patches should preferibly have the form of: 126# Bulk Patches should preferibly have the form of:
127# 127#
128# ??_${ARCH}_foo.${EPATCH_SUFFIX} 128# ??_${ARCH}_foo.${EPATCH_SUFFIX}
129# 129#
130# For example: 130# For example:
131# 131#
132# 01_all_misc-fix.patch.bz2 132# 01_all_misc-fix.patch.bz2
133# 02_sparc_another-fix.patch.bz2 133# 02_sparc_another-fix.patch.bz2
134# 134#
135# 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
136# specific patches. 136# specific patches.
137# 137#
138# 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
226 fi 226 fi
227 for x in ${EPATCH_SOURCE} 227 for x in ${EPATCH_SOURCE}
228 do 228 do
229 # New ARCH dependant patch naming scheme ... 229 # New ARCH dependant patch naming scheme ...
230 # 230 #
231 # ???_arch_foo.patch 231 # ???_arch_foo.patch
232 # 232 #
233 if [ -f ${x} ] && \ 233 if [ -f ${x} ] && \
234 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \ 234 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
235 [ "${EPATCH_FORCE}" = "yes" ]) 235 [ "${EPATCH_FORCE}" = "yes" ])
236 then 236 then
237 local count=0 237 local count=0
238 local popts="${EPATCH_OPTS}" 238 local popts="${EPATCH_OPTS}"
239 local patchname=${x##*/} 239 local patchname=${x##*/}
240 240
268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
270 270
271 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
272 then 272 then
273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 else 275 else
276 PATCH_TARGET="${x}" 276 PATCH_TARGET="${x}"
277 fi 277 fi
278 278
279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
280 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##*/}
281 281
282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
284 284
454 eerror "No username specified !" 454 eerror "No username specified !"
455 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
456 fi 456 fi
457 457
458 # lets see if the username already exists 458 # lets see if the username already exists
459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
460 return 0 460 return 0
461 fi 461 fi
462 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
463 463
464 # options to pass to useradd 464 # options to pass to useradd
465 local opts= 465 local opts=
466 466
467 # handle uid 467 # handle uid
468 local euid=$1; shift 468 local euid=$1; shift
469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
470 if [[ ${euid} -gt 0 ]] ; then 470 if [[ ${euid} -gt 0 ]] ; then
471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
472 euid="next" 472 euid="next"
473 fi 473 fi
474 else 474 else
475 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
476 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
477 fi 477 fi
478 else 478 else
479 euid="next" 479 euid="next"
480 fi 480 fi
481 if [[ ${euid} == "next" ]] ; then 481 if [[ ${euid} == "next" ]] ; then
482 for euid in $(seq 101 999) ; do 482 for ((euid = 101; euid <= 999; euid++)); do
483 [[ -z $(egetent passwd ${euid}) ]] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
484 done 484 done
485 fi 485 fi
486 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
487 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
662 eerror "No group specified !" 662 eerror "No group specified !"
663 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
664 fi 664 fi
665 665
666 # see if group already exists 666 # see if group already exists
667 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
668 then
669 return 0 668 return 0
670 fi 669 fi
671 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
672 671
673 # options to pass to useradd 672 # options to pass to useradd
716 fi 715 fi
717 716
718 # If we need the next available 717 # If we need the next available
719 case ${egid} in 718 case ${egid} in
720 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
721 for egid in $(seq 101 999); do 720 for ((egid = 101; egid <= 999; egid++)); do
722 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
723 done 722 done
724 esac 723 esac
725 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
726 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
727 ;; 726 ;;
728 727
729 *-freebsd*|*-dragonfly*) 728 *-freebsd*|*-dragonfly*)
730 case ${egid} in 729 case ${egid} in
731 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
732 for egid in $(seq 101 999); do 731 for ((egid = 101; egid <= 999; egid++)); do
733 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
734 done 733 done
735 esac 734 esac
736 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
737 ;; 736 ;;
738 737
739 *-netbsd*) 738 *-netbsd*)
740 case ${egid} in 739 case ${egid} in
741 *[!0-9]*) # Non numeric 740 *[!0-9]*) # Non numeric
742 for egid in $(seq 101 999); do 741 for ((egid = 101; egid <= 999; egid++)); do
743 [ -z "`egetent group ${egid}`" ] && break 742 [[ -z $(egetent group ${egid}) ]] && break
744 done 743 done
745 esac 744 esac
746 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
747 ;; 746 ;;
748 747
756# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
757# vapier@gentoo.org 756# vapier@gentoo.org
758# 757#
759# edos2unix(file, <more files> ...) 758# edos2unix(file, <more files> ...)
760edos2unix() { 759edos2unix() {
761 for f in "$@" 760 echo "$@" | xargs sed -i 's/\r$//'
762 do
763 cp "${f}" ${T}/edos2unix
764 sed 's/\r$//' ${T}/edos2unix > "${f}"
765 done
766} 761}
767 762
768 763
769############################################################## 764##############################################################
770# START: Handle .desktop files and menu entries # 765# START: Handle .desktop files and menu entries #
771# maybe this should be separated into a new eclass some time # 766# maybe this should be separated into a new eclass some time #
772# lanius@gentoo.org # 767# lanius@gentoo.org #
773############################################################## 768##############################################################
774 769
775# Make a desktop file ! 770# Make a desktop file !
776# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
777# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
778# 773#
779# make_desktop_entry(<command>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
780# 775#
781# binary: what command does the app run with ? 776# binary: what command does the app run with ?
782# name: the name that will show up in the menu 777# name: the name that will show up in the menu
783# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
784# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
785# a full path to an icon 780# a full path to an icon
786# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
787# http://www.freedesktop.org/Standards/desktop-entry-spec 782# http://www.freedesktop.org/Standards/desktop-entry-spec
788# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
789make_desktop_entry() { 784make_desktop_entry() {
790 [[ -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
791 786
799 local catmaj=${CATEGORY%%-*} 794 local catmaj=${CATEGORY%%-*}
800 local catmin=${CATEGORY##*-} 795 local catmin=${CATEGORY##*-}
801 case ${catmaj} in 796 case ${catmaj} in
802 app) 797 app)
803 case ${catmin} in 798 case ${catmin} in
804 admin) type=System;; 799 admin) type=System;;
805 cdr) type=DiscBurning;; 800 cdr) type=DiscBurning;;
806 dicts) type=Dictionary;; 801 dicts) type=Dictionary;;
807 editors) type=TextEditor;; 802 editors) type=TextEditor;;
808 emacs) type=TextEditor;; 803 emacs) type=TextEditor;;
809 emulation) type=Emulator;; 804 emulation) type=Emulator;;
810 laptop) type=HardwareSettings;; 805 laptop) type=HardwareSettings;;
811 office) type=Office;; 806 office) type=Office;;
812 vim) type=TextEditor;; 807 vim) type=TextEditor;;
813 xemacs) type=TextEditor;; 808 xemacs) type=TextEditor;;
814 *) type=;; 809 *) type=;;
815 esac 810 esac
816 ;; 811 ;;
817 812
818 dev) 813 dev)
819 type="Development" 814 type="Development"
820 ;; 815 ;;
821 816
822 games) 817 games)
823 case ${catmin} in 818 case ${catmin} in
824 action) type=ActionGame;; 819 action|fps) type=ActionGame;;
825 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
826 board) type=BoardGame;; 821 board) type=BoardGame;;
827 kids) type=KidsGame;; 822 kids) type=KidsGame;;
828 emulation) type=Emulator;; 823 emulation) type=Emulator;;
829 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
830 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
831 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
832 simulation) type=Simulation;; 827 simulation) type=Simulation;;
833 sports) type=SportsGame;; 828 sports) type=SportsGame;;
834 strategy) type=StrategyGame;; 829 strategy) type=StrategyGame;;
835 *) type=;; 830 *) type=;;
836 esac 831 esac
837 type="Game;${type}" 832 type="Game;${type}"
838 ;; 833 ;;
839 834
840 mail) 835 mail)
844 media) 839 media)
845 case ${catmin} in 840 case ${catmin} in
846 gfx) type=Graphics;; 841 gfx) type=Graphics;;
847 radio) type=Tuner;; 842 radio) type=Tuner;;
848 sound) type=Audio;; 843 sound) type=Audio;;
849 tv) type=TV;; 844 tv) type=TV;;
850 video) type=Video;; 845 video) type=Video;;
851 *) type=;; 846 *) type=;;
852 esac 847 esac
853 type="AudioVideo;${type}" 848 type="AudioVideo;${type}"
854 ;; 849 ;;
855 850
856 net) 851 net)
857 case ${catmin} in 852 case ${catmin} in
858 dialup) type=Dialup;; 853 dialup) type=Dialup;;
859 ftp) type=FileTransfer;; 854 ftp) type=FileTransfer;;
860 im) type=InstantMessaging;; 855 im) type=InstantMessaging;;
861 irc) type=IRCClient;; 856 irc) type=IRCClient;;
862 mail) type=Email;; 857 mail) type=Email;;
863 news) type=News;; 858 news) type=News;;
864 nntp) type=News;; 859 nntp) type=News;;
865 p2p) type=FileTransfer;; 860 p2p) type=FileTransfer;;
866 *) type=;; 861 *) type=;;
867 esac 862 esac
868 type="Network;${type}" 863 type="Network;${type}"
869 ;; 864 ;;
870 865
871 sci) 866 sci)
872 case ${catmin} in 867 case ${catmin} in
873 astro*) type=Astronomy;; 868 astro*) type=Astronomy;;
874 bio*) type=Biology;; 869 bio*) type=Biology;;
875 calc*) type=Calculator;; 870 calc*) type=Calculator;;
876 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
877 geo*) type=Geology;; 872 geo*) type=Geology;;
878 math*) type=Math;; 873 math*) type=Math;;
879 *) type=;; 874 *) type=;;
880 esac 875 esac
881 type="Science;${type}" 876 type="Science;${type}"
882 ;; 877 ;;
883 878
884 www) 879 www)
885 case ${catmin} in 880 case ${catmin} in
886 client) type=WebBrowser;; 881 client) type=WebBrowser;;
887 *) type=;; 882 *) type=;;
888 esac 883 esac
889 type="Network" 884 type="Network"
890 ;; 885 ;;
891 886
892 *) 887 *)
897 if [ "${SLOT}" == "0" ] ; then 892 if [ "${SLOT}" == "0" ] ; then
898 local desktop_name="${PN}" 893 local desktop_name="${PN}"
899 else 894 else
900 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
901 fi 896 fi
902 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 897 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
903# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 898 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
904 899
900 cat <<-EOF > "${desktop}"
905echo "[Desktop Entry] 901 [Desktop Entry]
906Encoding=UTF-8 902 Encoding=UTF-8
907Version=0.9.2 903 Version=0.9.2
908Name=${name} 904 Name=${name}
909Type=Application 905 Type=Application
910Comment=${DESCRIPTION} 906 Comment=${DESCRIPTION}
911Exec=${exec} 907 Exec=${exec}
912TryExec=${exec%% *} 908 TryExec=${exec%% *}
913Path=${path} 909 Path=${path}
914Icon=${icon} 910 Icon=${icon}
915Categories=Application;${type};" > "${desktop}" 911 Categories=Application;${type};
912 EOF
916 913
917 ( 914 (
918 # wrap the env here so that the 'insinto' call 915 # wrap the env here so that the 'insinto' call
919 # doesn't corrupt the env of the caller 916 # doesn't corrupt the env of the caller
920 insinto /usr/share/applications 917 insinto /usr/share/applications
922 ) 919 )
923} 920}
924 921
925# Make a GDM/KDM Session file 922# Make a GDM/KDM Session file
926# 923#
927# make_desktop_entry(<title>, <command>) 924# make_session_desktop(<title>, <command>)
928# title: File to execute to start the Window Manager 925# title: File to execute to start the Window Manager
929# command: Name of the Window Manager 926# command: Name of the Window Manager
930 927
931make_session_desktop() { 928make_session_desktop() {
932 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 929 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
934 931
935 local title=$1 932 local title=$1
936 local command=$2 933 local command=$2
937 local desktop=${T}/${wm}.desktop 934 local desktop=${T}/${wm}.desktop
938 935
936 cat <<-EOF > "${desktop}"
939echo "[Desktop Entry] 937 [Desktop Entry]
940Encoding=UTF-8 938 Encoding=UTF-8
941Name=${title} 939 Name=${title}
942Comment=This session logs you into ${title} 940 Comment=This session logs you into ${title}
943Exec=${command} 941 Exec=${command}
944TryExec=${command} 942 TryExec=${command}
945Type=Application" > "${desktop}" 943 Type=Application
944 EOF
946 945
946 (
947 # wrap the env here so that the 'insinto' call
948 # doesn't corrupt the env of the caller
947 insinto /usr/share/xsessions 949 insinto /usr/share/xsessions
948 doins "${desktop}" 950 doins "${desktop}"
951 )
949} 952}
950 953
951domenu() { 954domenu() {
955 (
956 # wrap the env here so that the 'insinto' call
957 # doesn't corrupt the env of the caller
952 local i j 958 local i j ret=0
953 insinto /usr/share/applications 959 insinto /usr/share/applications
954 for i in "$@" ; do 960 for i in "$@" ; do
955 if [[ -f ${i} ]] ; then 961 if [[ -f ${i} ]] ; then
956 doins "${i}" 962 doins "${i}"
963 ((ret+=$?))
957 elif [[ -d ${i} ]] ; then 964 elif [[ -d ${i} ]] ; then
958 for j in "${i}"/*.desktop ; do 965 for j in "${i}"/*.desktop ; do
959 doins "${j}" 966 doins "${j}"
967 ((ret+=$?))
960 done 968 done
961 fi 969 fi
962 done 970 done
971 exit ${ret}
972 )
963} 973}
964newmenu() { 974newmenu() {
975 (
976 # wrap the env here so that the 'insinto' call
977 # doesn't corrupt the env of the caller
965 insinto /usr/share/applications 978 insinto /usr/share/applications
966 newins "$1" "$2" 979 newins "$@"
980 )
967} 981}
968 982
969doicon() { 983doicon() {
984 (
985 # wrap the env here so that the 'insinto' call
986 # doesn't corrupt the env of the caller
970 local i j 987 local i j ret
971 insinto /usr/share/pixmaps 988 insinto /usr/share/pixmaps
972 for i in "$@" ; do 989 for i in "$@" ; do
973 if [[ -f ${i} ]] ; then 990 if [[ -f ${i} ]] ; then
974 doins "${i}" 991 doins "${i}"
992 ((ret+=$?))
975 elif [[ -d ${i} ]] ; then 993 elif [[ -d ${i} ]] ; then
976 for j in "${i}"/*.png ; do 994 for j in "${i}"/*.png ; do
977 doins "${j}" 995 doins "${j}"
996 ((ret+=$?))
978 done 997 done
979 fi 998 fi
980 done 999 done
1000 exit ${ret}
1001 )
981} 1002}
982newicon() { 1003newicon() {
1004 (
1005 # wrap the env here so that the 'insinto' call
1006 # doesn't corrupt the env of the caller
983 insinto /usr/share/pixmaps 1007 insinto /usr/share/pixmaps
984 newins "$1" "$2" 1008 newins "$@"
1009 )
985} 1010}
986 1011
987############################################################## 1012##############################################################
988# END: Handle .desktop files and menu entries # 1013# END: Handle .desktop files and menu entries #
989############################################################## 1014##############################################################
990 1015
991 1016
992# for internal use only (unpack_pdv and unpack_makeself) 1017# for internal use only (unpack_pdv and unpack_makeself)
993find_unpackable_file() { 1018find_unpackable_file() {
1012# the middle of the archive. Valve seems to use it a lot ... too bad 1037# the middle of the archive. Valve seems to use it a lot ... too bad
1013# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1038# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1014# 1039#
1015# Usage: unpack_pdv [file to unpack] [size of off_t] 1040# Usage: unpack_pdv [file to unpack] [size of off_t]
1016# - you have to specify the off_t size ... i have no idea how to extract that 1041# - you have to specify the off_t size ... i have no idea how to extract that
1017# information out of the binary executable myself. basically you pass in 1042# information out of the binary executable myself. basically you pass in
1018# the size of the off_t type (in bytes) on the machine that built the pdv 1043# the size of the off_t type (in bytes) on the machine that built the pdv
1019# archive. one way to determine this is by running the following commands: 1044# archive. one way to determine this is by running the following commands:
1020# strings <pdv archive> | grep lseek 1045# strings <pdv archive> | grep lseek
1021# strace -elseek <pdv archive> 1046# strace -elseek <pdv archive>
1022# basically look for the first lseek command (we do the strings/grep because 1047# basically look for the first lseek command (we do the strings/grep because
1023# sometimes the function call is _llseek or something) and steal the 2nd 1048# sometimes the function call is _llseek or something) and steal the 2nd
1024# parameter. here is an example: 1049# parameter. here is an example:
1025# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1050# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1026# lseek 1051# lseek
1027# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1052# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1028# lseek(3, -4, SEEK_END) = 2981250 1053# lseek(3, -4, SEEK_END) = 2981250
1029# thus we would pass in the value of '4' as the second parameter. 1054# thus we would pass in the value of '4' as the second parameter.
1030unpack_pdv() { 1055unpack_pdv() {
1031 local src=$(find_unpackable_file $1) 1056 local src=$(find_unpackable_file "$1")
1032 local sizeoff_t=$2 1057 local sizeoff_t=$2
1033 1058
1034 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1059 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1035 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1060 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1036 1061
1037 local shrtsrc=$(basename "${src}") 1062 local shrtsrc=$(basename "${src}")
1038 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1063 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1039 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1064 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
1040 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1065 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
1041 1066
1042 # grab metadata for debug reasons 1067 # grab metadata for debug reasons
1043 local metafile="$(emktemp)" 1068 local metafile=$(emktemp)
1044 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1069 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1045 1070
1046 # rip out the final file name from the metadata 1071 # rip out the final file name from the metadata
1047 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1072 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1048 datafile="`basename ${datafile}`" 1073 datafile=$(basename "${datafile}")
1049 1074
1050 # now lets uncompress/untar the file if need be 1075 # now lets uncompress/untar the file if need be
1051 local tmpfile="$(emktemp)" 1076 local tmpfile=$(emktemp)
1052 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1077 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1053 1078
1054 local iscompressed="`file -b ${tmpfile}`" 1079 local iscompressed=$(file -b "${tmpfile}")
1055 if [ "${iscompressed:0:8}" == "compress" ] ; then 1080 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1056 iscompressed=1 1081 iscompressed=1
1057 mv ${tmpfile}{,.Z} 1082 mv ${tmpfile}{,.Z}
1058 gunzip ${tmpfile} 1083 gunzip ${tmpfile}
1059 else 1084 else
1060 iscompressed=0 1085 iscompressed=0
1061 fi 1086 fi
1062 local istar="`file -b ${tmpfile}`" 1087 local istar=$(file -b "${tmpfile}")
1063 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1088 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1064 istar=1 1089 istar=1
1065 else 1090 else
1066 istar=0 1091 istar=0
1067 fi 1092 fi
1068 1093
1104# many other game companies. 1129# many other game companies.
1105# 1130#
1106# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1131# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1107# - If the file is not specified then unpack will utilize ${A}. 1132# - If the file is not specified then unpack will utilize ${A}.
1108# - If the offset is not specified then we will attempt to extract 1133# - If the offset is not specified then we will attempt to extract
1109# the proper offset from the script itself. 1134# the proper offset from the script itself.
1110unpack_makeself() { 1135unpack_makeself() {
1111 local src_input=${1:-${A}} 1136 local src_input=${1:-${A}}
1112 local src=$(find_unpackable_file "${src_input}") 1137 local src=$(find_unpackable_file "${src_input}")
1113 local skip=$2 1138 local skip=$2
1114 local exe=$3 1139 local exe=$3
1160 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1185 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1161 *) die "makeself cant handle exe '${exe}'" 1186 *) die "makeself cant handle exe '${exe}'"
1162 esac 1187 esac
1163 1188
1164 # lets grab the first few bytes of the file to figure out what kind of archive it is 1189 # lets grab the first few bytes of the file to figure out what kind of archive it is
1165 local tmpfile="$(emktemp)" 1190 local tmpfile=$(emktemp)
1166 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1191 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1167 local filetype="$(file -b "${tmpfile}")" 1192 local filetype=$(file -b "${tmpfile}")
1168 case ${filetype} in 1193 case ${filetype} in
1169 *tar\ archive) 1194 *tar\ archive*)
1170 eval ${exe} | tar --no-same-owner -xf - 1195 eval ${exe} | tar --no-same-owner -xf -
1171 ;; 1196 ;;
1172 bzip2*) 1197 bzip2*)
1173 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1198 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1174 ;; 1199 ;;
1210 # accepted ... if we don't find a match, we make the user accept 1235 # accepted ... if we don't find a match, we make the user accept
1211 local shopts=$- 1236 local shopts=$-
1212 local alic 1237 local alic
1213 set -o noglob #so that bash doesn't expand "*" 1238 set -o noglob #so that bash doesn't expand "*"
1214 for alic in ${ACCEPT_LICENSE} ; do 1239 for alic in ${ACCEPT_LICENSE} ; do
1215 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1240 if [[ ${alic} == ${l} ]]; then
1216 set +o noglob; set -${shopts} #reset old shell opts 1241 set +o noglob; set -${shopts} #reset old shell opts
1217 return 0 1242 return 0
1218 fi 1243 fi
1219 done 1244 done
1220 set +o noglob; set -$shopts #reset old shell opts 1245 set +o noglob; set -$shopts #reset old shell opts
1221 1246
1222 local licmsg="$(emktemp)" 1247 local licmsg=$(emktemp)
1223 cat << EOF > ${licmsg} 1248 cat <<-EOF > ${licmsg}
1224********************************************************** 1249 **********************************************************
1225The following license outlines the terms of use of this 1250 The following license outlines the terms of use of this
1226package. You MUST accept this license for installation to 1251 package. You MUST accept this license for installation to
1227continue. When you are done viewing, hit 'q'. If you 1252 continue. When you are done viewing, hit 'q'. If you
1228CTRL+C out of this, the install will not run! 1253 CTRL+C out of this, the install will not run!
1229********************************************************** 1254 **********************************************************
1230 1255
1231EOF 1256 EOF
1232 cat ${lic} >> ${licmsg} 1257 cat ${lic} >> ${licmsg}
1233 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1258 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1234 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1259 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1235 read alic 1260 read alic
1236 case ${alic} in 1261 case ${alic} in
1254# found at CDROM_ROOT. 1279# found at CDROM_ROOT.
1255# 1280#
1256# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1281# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1257# etc... if you want to give the cds better names, then just export 1282# etc... if you want to give the cds better names, then just export
1258# the appropriate CDROM_NAME variable before calling cdrom_get_cds(). 1283# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1259# - CDROM_NAME="fooie cd" - for when you only want 1 cd 1284# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1260# - CDROM_NAME_1="install cd" - for when you want more than 1 cd 1285# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1261# CDROM_NAME_2="data cd" 1286# CDROM_NAME_2="data cd"
1262# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_# 1287# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1263# 1288#
1264# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1289# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1265# 1290#
1266# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1291# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1267# - this will attempt to locate a cd based upon a file that is on 1292# - this will attempt to locate a cd based upon a file that is on
1268# the cd ... the more files you give this function, the more cds 1293# the cd ... the more files you give this function, the more cds
1269# the cdrom functions will handle 1294# the cdrom functions will handle
1270cdrom_get_cds() { 1295cdrom_get_cds() {
1271 # first we figure out how many cds we're dealing with by 1296 # first we figure out how many cds we're dealing with by
1272 # the # of files they gave us 1297 # the # of files they gave us
1273 local cdcnt=0 1298 local cdcnt=0
1274 local f= 1299 local f=
1403 1428
1404 while [[ -n ${cdset[${i}]} ]] ; do 1429 while [[ -n ${cdset[${i}]} ]] ; do
1405 local dir=$(dirname ${cdset[${i}]}) 1430 local dir=$(dirname ${cdset[${i}]})
1406 local file=$(basename ${cdset[${i}]}) 1431 local file=$(basename ${cdset[${i}]})
1407 1432
1408 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do 1433 local point= node= fs= foo=
1409 [[ -d ${mline}/${dir} ]] || continue 1434 while read point node fs foo ; do
1435 [[ " cd9660 iso9660 " != *" ${fs} "* ]] && \
1436 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1437 && continue
1438 point=${point//\040/ }
1410 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then 1439 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1411 export CDROM_ROOT=${mline} 1440 export CDROM_ROOT=${point}
1412 export CDROM_SET=${i} 1441 export CDROM_SET=${i}
1413 export CDROM_MATCH=${cdset[${i}]} 1442 export CDROM_MATCH=${cdset[${i}]}
1414 return 1443 return
1415 fi 1444 done <<< "$(get_mounts)"
1416 done
1417 1445
1418 ((++i)) 1446 ((++i))
1419 done 1447 done
1420 1448
1421 echo 1449 echo
1449 1477
1450# Make sure that LINGUAS only contains languages that 1478# Make sure that LINGUAS only contains languages that
1451# a package can support 1479# a package can support
1452# 1480#
1453# usage: strip-linguas <allow LINGUAS> 1481# usage: strip-linguas <allow LINGUAS>
1454# strip-linguas -i <directories of .po files> 1482# strip-linguas -i <directories of .po files>
1455# strip-linguas -u <directories of .po files> 1483# strip-linguas -u <directories of .po files>
1456# 1484#
1457# The first form allows you to specify a list of LINGUAS. 1485# The first form allows you to specify a list of LINGUAS.
1458# The -i builds a list of po files found in all the 1486# The -i builds a list of po files found in all the
1459# directories and uses the intersection of the lists. 1487# directories and uses the intersection of the lists.
1460# The -u builds a list of po files found in all the 1488# The -u builds a list of po files found in all the
1461# directories and uses the union of the lists. 1489# directories and uses the union of the lists.
1462strip-linguas() { 1490strip-linguas() {
1463 local ls newls nols 1491 local ls newls nols
1464 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1492 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1465 local op=$1; shift 1493 local op=$1; shift
1466 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1494 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1510 while ((i--)) ; do 1538 while ((i--)) ; do
1511 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1539 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1512 done 1540 done
1513 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1541 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1514 case ${ARCH} in 1542 case ${ARCH} in
1515 x86) export ARCH="i386";; 1543 x86) export ARCH="i386";;
1516 amd64) export ARCH="x86_64";; 1544 amd64) export ARCH="x86_64";;
1517 hppa) export ARCH="parisc";; 1545 hppa) export ARCH="parisc";;
1518 mips) export ARCH="mips";; 1546 mips) export ARCH="mips";;
1519 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! 1547 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!
1520 *) export ARCH="${ARCH}";; 1548 *) export ARCH="${ARCH}";;
1521 esac 1549 esac
1522} 1550}
1523 1551
1524# set's ARCH back to what portage expects 1552# set's ARCH back to what portage expects
1525set_arch_to_portage() { 1553set_arch_to_portage() {
1532 1560
1533# Jeremy Huddleston <eradicator@gentoo.org>: 1561# Jeremy Huddleston <eradicator@gentoo.org>:
1534# preserve_old_lib /path/to/libblah.so.0 1562# preserve_old_lib /path/to/libblah.so.0
1535# preserve_old_lib_notify /path/to/libblah.so.0 1563# preserve_old_lib_notify /path/to/libblah.so.0
1536# 1564#
1537# These functions are useful when a lib in your package changes --library. Such 1565# These functions are useful when a lib in your package changes --library. Such
1538# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1566# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1539# would break packages that link against it. Most people get around this 1567# would break packages that link against it. Most people get around this
1540# by using the portage SLOT mechanism, but that is not always a relevant 1568# by using the portage SLOT mechanism, but that is not always a relevant
1541# solution, so instead you can add the following to your ebuilds: 1569# solution, so instead you can add the following to your ebuilds:
1542# 1570#
1543# src_install() { 1571# pkg_preinst() {
1544# ... 1572# ...
1545# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1573# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1546# ... 1574# ...
1547# } 1575# }
1548# 1576#
1551# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1579# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1552# ... 1580# ...
1553# } 1581# }
1554 1582
1555preserve_old_lib() { 1583preserve_old_lib() {
1556 LIB=$1 1584 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1585 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1586# die "Invalid preserve_old_lib() usage"
1587 fi
1588 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1557 1589
1558 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1590 local lib dir
1559 SONAME=`basename ${LIB}` 1591 for lib in "$@" ; do
1560 DIRNAME=`dirname ${LIB}` 1592 [[ -e ${ROOT}/${lib} ]] || continue
1561 1593 dir=${lib%/*}
1562 dodir ${DIRNAME} 1594 dodir ${dir} || die "dodir ${dir} failed"
1563 cp ${ROOT}${LIB} ${D}${DIRNAME} 1595 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1564 touch ${D}${LIB} 1596 touch "${D}"/${lib}
1565 fi 1597 done
1566} 1598}
1567 1599
1568preserve_old_lib_notify() { 1600preserve_old_lib_notify() {
1569 LIB=$1 1601 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1602 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1603# die "Invalid preserve_old_lib_notify() usage"
1604 fi
1570 1605
1571 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1606 local lib notice=0
1572 SONAME=`basename ${LIB}` 1607 for lib in "$@" ; do
1573 1608 [[ -e ${ROOT}/${lib} ]] || continue
1609 if [[ ${notice} -eq 0 ]] ; then
1610 notice=1
1574 ewarn "An old version of an installed library was detected on your system." 1611 ewarn "Old versions of installed libraries were detected on your system."
1575 ewarn "In order to avoid breaking packages that link against it, this older version" 1612 ewarn "In order to avoid breaking packages that depend on these old libs,"
1576 ewarn "is not being removed. In order to make full use of this newer version," 1613 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1577 ewarn "you will need to execute the following command:" 1614 ewarn "in order to remove these old dependencies. If you do not have this"
1578 ewarn " revdep-rebuild --library ${SONAME}" 1615 ewarn "helper program, simply emerge the 'gentoolkit' package."
1579 ewarn 1616 ewarn
1580 ewarn "After doing that, you can safely remove ${LIB}"
1581 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1582 fi 1617 fi
1618 ewarn " # revdep-rebuild --library ${lib##*/}"
1619 done
1583} 1620}
1584 1621
1585# Hack for people to figure out if a package was built with 1622# Hack for people to figure out if a package was built with
1586# certain USE flags 1623# certain USE flags
1587# 1624#
1588# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1625# Usage: built_with_use [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1589# ex: built_with_use xchat gtk2 1626# ex: built_with_use xchat gtk2
1590# 1627#
1591# Flags: -a all USE flags should be utilized 1628# Flags: -a all USE flags should be utilized
1592# -o at least one USE flag should be utilized 1629# -o at least one USE flag should be utilized
1630# --missing peform the specified action if the flag is not in IUSE (true/false/die)
1631# --hidden USE flag we're checking is hidden expanded so it isnt in IUSE
1593# Note: the default flag is '-a' 1632# Note: the default flag is '-a'
1594built_with_use() { 1633built_with_use() {
1634 local hidden="no"
1635 if [[ $1 == "--hidden" ]] ; then
1636 hidden="yes"
1637 shift
1638 fi
1639
1640 local missing_action="die"
1641 if [[ $1 == "--missing" ]] ; then
1642 missing_action=$2
1643 shift ; shift
1644 case ${missing_action} in
1645 true|false|die) ;;
1646 *) die "unknown action '${missing_action}'";;
1647 esac
1648 fi
1649
1595 local opt=$1 1650 local opt=$1
1596 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1651 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1597 1652
1598 local PKG=$(best_version $1) 1653 local PKG=$(best_version $1)
1599 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package" 1654 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1600 shift 1655 shift
1601 1656
1602 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE 1657 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1603 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE 1658 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1604 1659
1605 # if the USE file doesnt exist, assume the $PKG is either 1660 # if the IUSE file doesn't exist, the read will error out, we need to handle
1606 # injected or package.provided 1661 # this gracefully
1662 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1663 case ${missing_action} in
1664 true) return 0;;
1665 false) return 1;;
1607 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with" 1666 die) die "Unable to determine what USE flags $PKG was built with";;
1667 esac
1668 fi
1608 1669
1670 if [[ ${hidden} == "no" ]] ; then
1609 local IUSE_BUILT=$(<${IUSEFILE}) 1671 local IUSE_BUILT=$(<${IUSEFILE})
1610 # Don't check USE_EXPAND #147237 1672 # Don't check USE_EXPAND #147237
1611 local expand 1673 local expand
1612 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1674 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1613 if [[ $1 == ${expand}_* ]] ; then 1675 if [[ $1 == ${expand}_* ]] ; then
1614 expand="" 1676 expand=""
1615 break 1677 break
1616 fi 1678 fi
1617 done 1679 done
1618 if [[ -n ${expand} ]] ; then 1680 if [[ -n ${expand} ]] ; then
1681 if ! has $1 ${IUSE_BUILT} ; then
1682 case ${missing_action} in
1683 true) return 0;;
1684 false) return 1;;
1619 has $1 ${IUSE_BUILT} || die "$PKG does not actually support the $1 USE flag!" 1685 die) die "$PKG does not actually support the $1 USE flag!";;
1686 esac
1687 fi
1688 fi
1620 fi 1689 fi
1621 1690
1622 local USE_BUILT=$(<${USEFILE}) 1691 local USE_BUILT=$(<${USEFILE})
1623 while [[ $# -gt 0 ]] ; do 1692 while [[ $# -gt 0 ]] ; do
1624 if [[ ${opt} = "-o" ]] ; then 1693 if [[ ${opt} = "-o" ]] ; then
1640 local f 1709 local f
1641 for f in $(find ${dir} -name configure) ; do 1710 for f in $(find ${dir} -name configure) ; do
1642 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1711 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1643 done 1712 done
1644 eend 0 1713 eend 0
1645}
1646
1647# dopamd <file> [more files]
1648#
1649# Install pam auth config file in /etc/pam.d
1650dopamd() {
1651 [[ -z $1 ]] && die "dopamd requires at least one argument"
1652
1653 use pam || return 0
1654
1655 INSDESTTREE=/etc/pam.d \
1656 doins "$@" || die "failed to install $@"
1657}
1658# newpamd <old name> <new name>
1659#
1660# Install pam file <old name> as <new name> in /etc/pam.d
1661newpamd() {
1662 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1663
1664 use pam || return 0
1665
1666 INSDESTTREE=/etc/pam.d \
1667 newins "$1" "$2" || die "failed to install $1 as $2"
1668} 1714}
1669 1715
1670# make a wrapper script ... 1716# make a wrapper script ...
1671# NOTE: this was originally games_make_wrapper, but I noticed other places where 1717# NOTE: this was originally games_make_wrapper, but I noticed other places where
1672# this could be used, so I have moved it here and made it not games-specific 1718# this could be used, so I have moved it here and made it not games-specific

Legend:
Removed from v.1.253  
changed lines
  Added in v.1.275

  ViewVC Help
Powered by ViewVC 1.1.20