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

Diff of /eclass/eutils.eclass

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

Revision 1.256 Revision 1.280
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.256 2006/10/31 19:29:12 agriffis Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.280 2007/05/05 07:52:26 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
366 [[ -z ${T} ]] \ 366 [[ -z ${T} ]] \
367 && topdir="/tmp" \ 367 && topdir="/tmp" \
368 || topdir=${T} 368 || topdir=${T}
369 fi 369 fi
370 370
371 if [[ -z $(type -p mktemp) ]] ; then 371 if ! type -P mktemp > /dev/null ; then
372 # system lacks `mktemp` so we have to fake it
372 local tmp=/ 373 local tmp=/
373 while [[ -e ${tmp} ]] ; do 374 while [[ -e ${tmp} ]] ; do
374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 375 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
375 done 376 done
376 ${exe} "${tmp}" || ${exe} -p "${tmp}" 377 ${exe} "${tmp}" || ${exe} -p "${tmp}"
377 echo "${tmp}" 378 echo "${tmp}"
378 else 379 else
380 # the args here will give slightly wierd names on BSD,
381 # but should produce a usable file on all userlands
379 if [[ ${exe} == "touch" ]] ; then 382 if [[ ${exe} == "touch" ]] ; then
380 [[ ${USERLAND} == "GNU" ]] \
381 && mktemp -p "${topdir}" \
382 || TMPDIR="${topdir}" mktemp -t tmp 383 TMPDIR="${topdir}" mktemp -t tmp.XXXXXXXXXX
383 else 384 else
384 [[ ${USERLAND} == "GNU" ]] \
385 && mktemp -d "${topdir}" \
386 || TMPDIR="${topdir}" mktemp -dt tmp 385 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX
387 fi 386 fi
388 fi 387 fi
389} 388}
390 389
391# Small wrapper for getent (Linux), nidump (Mac OS X), 390# Small wrapper for getent (Linux), nidump (Mac OS X),
755# Simple script to replace 'dos2unix' binaries 754# Simple script to replace 'dos2unix' binaries
756# vapier@gentoo.org 755# vapier@gentoo.org
757# 756#
758# edos2unix(file, <more files> ...) 757# edos2unix(file, <more files> ...)
759edos2unix() { 758edos2unix() {
760 for f in "$@" 759 echo "$@" | xargs sed -i 's/\r$//'
761 do
762 cp "${f}" ${T}/edos2unix
763 sed 's/\r$//' ${T}/edos2unix > "${f}"
764 done
765} 760}
766 761
767 762
768############################################################## 763##############################################################
769# START: Handle .desktop files and menu entries # 764# START: Handle .desktop files and menu entries #
770# maybe this should be separated into a new eclass some time # 765# maybe this should be separated into a new eclass some time #
771# lanius@gentoo.org # 766# lanius@gentoo.org #
772############################################################## 767##############################################################
773 768
774# Make a desktop file ! 769# Make a desktop file !
775# Great for making those icons in kde/gnome startmenu ! 770# Great for making those icons in kde/gnome startmenu !
776# Amaze your friends ! Get the women ! Join today ! 771# Amaze your friends ! Get the women ! Join today !
777# 772#
778# make_desktop_entry(<command>, [name], [icon], [type], [path]) 773# make_desktop_entry(<command>, [name], [icon], [type], [path])
779# 774#
780# binary: what command does the app run with ? 775# binary: what command does the app run with ?
781# name: the name that will show up in the menu 776# name: the name that will show up in the menu
782# icon: give your little like a pretty little icon ... 777# icon: give your little like a pretty little icon ...
783# this can be relative (to /usr/share/pixmaps) or 778# this can be relative (to /usr/share/pixmaps) or
784# a full path to an icon 779# a full path to an icon
785# type: what kind of application is this ? for categories: 780# type: what kind of application is this ? for categories:
786# http://www.freedesktop.org/Standards/desktop-entry-spec 781# http://www.freedesktop.org/Standards/desktop-entry-spec
787# path: if your app needs to startup in a specific dir 782# path: if your app needs to startup in a specific dir
788make_desktop_entry() { 783make_desktop_entry() {
789 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 784 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
790 785
798 local catmaj=${CATEGORY%%-*} 793 local catmaj=${CATEGORY%%-*}
799 local catmin=${CATEGORY##*-} 794 local catmin=${CATEGORY##*-}
800 case ${catmaj} in 795 case ${catmaj} in
801 app) 796 app)
802 case ${catmin} in 797 case ${catmin} in
803 admin) type=System;; 798 admin) type=System;;
804 cdr) type=DiscBurning;; 799 cdr) type=DiscBurning;;
805 dicts) type=Dictionary;; 800 dicts) type=Dictionary;;
806 editors) type=TextEditor;; 801 editors) type=TextEditor;;
807 emacs) type=TextEditor;; 802 emacs) type=TextEditor;;
808 emulation) type=Emulator;; 803 emulation) type=Emulator;;
809 laptop) type=HardwareSettings;; 804 laptop) type=HardwareSettings;;
810 office) type=Office;; 805 office) type=Office;;
811 vim) type=TextEditor;; 806 vim) type=TextEditor;;
812 xemacs) type=TextEditor;; 807 xemacs) type=TextEditor;;
813 *) type=;; 808 *) type=;;
814 esac 809 esac
815 ;; 810 ;;
816 811
817 dev) 812 dev)
818 type="Development" 813 type="Development"
819 ;; 814 ;;
820 815
821 games) 816 games)
822 case ${catmin} in 817 case ${catmin} in
823 action) type=ActionGame;; 818 action|fps) type=ActionGame;;
824 arcade) type=ArcadeGame;; 819 arcade) type=ArcadeGame;;
825 board) type=BoardGame;; 820 board) type=BoardGame;;
826 kids) type=KidsGame;; 821 kids) type=KidsGame;;
827 emulation) type=Emulator;; 822 emulation) type=Emulator;;
828 puzzle) type=LogicGame;; 823 puzzle) type=LogicGame;;
829 rpg) type=RolePlaying;; 824 rpg) type=RolePlaying;;
830 roguelike) type=RolePlaying;; 825 roguelike) type=RolePlaying;;
831 simulation) type=Simulation;; 826 simulation) type=Simulation;;
832 sports) type=SportsGame;; 827 sports) type=SportsGame;;
833 strategy) type=StrategyGame;; 828 strategy) type=StrategyGame;;
834 *) type=;; 829 *) type=;;
835 esac 830 esac
836 type="Game;${type}" 831 type="Game;${type}"
837 ;; 832 ;;
838 833
839 mail) 834 mail)
843 media) 838 media)
844 case ${catmin} in 839 case ${catmin} in
845 gfx) type=Graphics;; 840 gfx) type=Graphics;;
846 radio) type=Tuner;; 841 radio) type=Tuner;;
847 sound) type=Audio;; 842 sound) type=Audio;;
848 tv) type=TV;; 843 tv) type=TV;;
849 video) type=Video;; 844 video) type=Video;;
850 *) type=;; 845 *) type=;;
851 esac 846 esac
852 type="AudioVideo;${type}" 847 type="AudioVideo;${type}"
853 ;; 848 ;;
854 849
855 net) 850 net)
856 case ${catmin} in 851 case ${catmin} in
857 dialup) type=Dialup;; 852 dialup) type=Dialup;;
858 ftp) type=FileTransfer;; 853 ftp) type=FileTransfer;;
859 im) type=InstantMessaging;; 854 im) type=InstantMessaging;;
860 irc) type=IRCClient;; 855 irc) type=IRCClient;;
861 mail) type=Email;; 856 mail) type=Email;;
862 news) type=News;; 857 news) type=News;;
863 nntp) type=News;; 858 nntp) type=News;;
864 p2p) type=FileTransfer;; 859 p2p) type=FileTransfer;;
865 *) type=;; 860 *) type=;;
866 esac 861 esac
867 type="Network;${type}" 862 type="Network;${type}"
868 ;; 863 ;;
869 864
870 sci) 865 sci)
871 case ${catmin} in 866 case ${catmin} in
872 astro*) type=Astronomy;; 867 astro*) type=Astronomy;;
873 bio*) type=Biology;; 868 bio*) type=Biology;;
874 calc*) type=Calculator;; 869 calc*) type=Calculator;;
875 chem*) type=Chemistry;; 870 chem*) type=Chemistry;;
876 geo*) type=Geology;; 871 geo*) type=Geology;;
877 math*) type=Math;; 872 math*) type=Math;;
878 *) type=;; 873 *) type=;;
879 esac 874 esac
880 type="Science;${type}" 875 type="Science;${type}"
881 ;; 876 ;;
882 877
883 www) 878 www)
884 case ${catmin} in 879 case ${catmin} in
885 client) type=WebBrowser;; 880 client) type=WebBrowser;;
886 *) type=;; 881 *) type=;;
887 esac 882 esac
888 type="Network" 883 type="Network"
889 ;; 884 ;;
890 885
891 *) 886 *)
896 if [ "${SLOT}" == "0" ] ; then 891 if [ "${SLOT}" == "0" ] ; then
897 local desktop_name="${PN}" 892 local desktop_name="${PN}"
898 else 893 else
899 local desktop_name="${PN}-${SLOT}" 894 local desktop_name="${PN}-${SLOT}"
900 fi 895 fi
901 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 896 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
902# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 897 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
903 898
899 cat <<-EOF > "${desktop}"
904echo "[Desktop Entry] 900 [Desktop Entry]
905Encoding=UTF-8 901 Encoding=UTF-8
906Version=0.9.2 902 Version=0.9.2
907Name=${name} 903 Name=${name}
908Type=Application 904 Type=Application
909Comment=${DESCRIPTION} 905 Comment=${DESCRIPTION}
910Exec=${exec} 906 Exec=${exec}
911TryExec=${exec%% *} 907 TryExec=${exec%% *}
912Path=${path} 908 Path=${path}
913Icon=${icon} 909 Icon=${icon}
914Categories=Application;${type};" > "${desktop}" 910 Categories=Application;${type};
911 EOF
915 912
916 ( 913 (
917 # wrap the env here so that the 'insinto' call 914 # wrap the env here so that the 'insinto' call
918 # doesn't corrupt the env of the caller 915 # doesn't corrupt the env of the caller
919 insinto /usr/share/applications 916 insinto /usr/share/applications
920 doins "${desktop}" 917 doins "${desktop}"
921 ) 918 )
922} 919}
923 920
921
922# Validate desktop entries using desktop-file-utils
923# Carsten Lohrke <carlo@gentoo.org>
924#
925# Usage: validate_desktop_entries [directory ...]
926
927validate_desktop_entries() {
928 if [[ -x /usr/bin/desktop-file-validate ]] ; then
929 einfo "Checking desktop entry validity"
930 local directories=""
931 for d in /usr/share/applications $@ ; do
932 [[ -d ${D}${d} ]] && directories="${directories} ${D}${d}"
933 done
934 if [[ -n ${directories} ]] ; then
935 for FILE in $(find ${directories} -name "*\.desktop" \
936 -not -path '*.hidden*' | sort -u 2>/dev/null)
937 do
938 local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \
939 sed -e "s|error: ||" -e "s|${FILE}:|--|g" )
940 [[ -n $temp ]] && elog ${temp/--/${FILE/${D}/}:}
941 done
942 fi
943 echo ""
944 else
945 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
946 fi
947}
948
949
924# Make a GDM/KDM Session file 950# Make a GDM/KDM Session file
925# 951#
926# make_session_desktop(<title>, <command>) 952# make_session_desktop(<title>, <command>)
927# title: File to execute to start the Window Manager 953# title: File to execute to start the Window Manager
928# command: Name of the Window Manager 954# command: Name of the Window Manager
933 959
934 local title=$1 960 local title=$1
935 local command=$2 961 local command=$2
936 local desktop=${T}/${wm}.desktop 962 local desktop=${T}/${wm}.desktop
937 963
964 cat <<-EOF > "${desktop}"
938echo "[Desktop Entry] 965 [Desktop Entry]
939Encoding=UTF-8 966 Encoding=UTF-8
940Name=${title} 967 Name=${title}
941Comment=This session logs you into ${title} 968 Comment=This session logs you into ${title}
942Exec=${command} 969 Exec=${command}
943TryExec=${command} 970 TryExec=${command}
944Type=Application" > "${desktop}" 971 Type=Application
972 EOF
945 973
974 (
975 # wrap the env here so that the 'insinto' call
976 # doesn't corrupt the env of the caller
946 insinto /usr/share/xsessions 977 insinto /usr/share/xsessions
947 doins "${desktop}" 978 doins "${desktop}"
979 )
948} 980}
949 981
950domenu() { 982domenu() {
983 (
984 # wrap the env here so that the 'insinto' call
985 # doesn't corrupt the env of the caller
951 local i j 986 local i j ret=0
952 insinto /usr/share/applications 987 insinto /usr/share/applications
953 for i in "$@" ; do 988 for i in "$@" ; do
954 if [[ -f ${i} ]] ; then 989 if [[ -f ${i} ]] ; then
955 doins "${i}" 990 doins "${i}"
991 ((ret+=$?))
956 elif [[ -d ${i} ]] ; then 992 elif [[ -d ${i} ]] ; then
957 for j in "${i}"/*.desktop ; do 993 for j in "${i}"/*.desktop ; do
958 doins "${j}" 994 doins "${j}"
995 ((ret+=$?))
959 done 996 done
960 fi 997 fi
961 done 998 done
999 exit ${ret}
1000 )
962} 1001}
963newmenu() { 1002newmenu() {
1003 (
1004 # wrap the env here so that the 'insinto' call
1005 # doesn't corrupt the env of the caller
964 insinto /usr/share/applications 1006 insinto /usr/share/applications
965 newins "$1" "$2" 1007 newins "$@"
1008 )
966} 1009}
967 1010
968doicon() { 1011doicon() {
1012 (
1013 # wrap the env here so that the 'insinto' call
1014 # doesn't corrupt the env of the caller
969 local i j 1015 local i j ret
970 insinto /usr/share/pixmaps 1016 insinto /usr/share/pixmaps
971 for i in "$@" ; do 1017 for i in "$@" ; do
972 if [[ -f ${i} ]] ; then 1018 if [[ -f ${i} ]] ; then
973 doins "${i}" 1019 doins "${i}"
1020 ((ret+=$?))
974 elif [[ -d ${i} ]] ; then 1021 elif [[ -d ${i} ]] ; then
975 for j in "${i}"/*.png ; do 1022 for j in "${i}"/*.png ; do
976 doins "${j}" 1023 doins "${j}"
1024 ((ret+=$?))
977 done 1025 done
978 fi 1026 fi
979 done 1027 done
1028 exit ${ret}
1029 )
980} 1030}
981newicon() { 1031newicon() {
1032 (
1033 # wrap the env here so that the 'insinto' call
1034 # doesn't corrupt the env of the caller
982 insinto /usr/share/pixmaps 1035 insinto /usr/share/pixmaps
983 newins "$1" "$2" 1036 newins "$@"
1037 )
984} 1038}
985 1039
986############################################################## 1040##############################################################
987# END: Handle .desktop files and menu entries # 1041# END: Handle .desktop files and menu entries #
988############################################################## 1042##############################################################
989 1043
990 1044
991# for internal use only (unpack_pdv and unpack_makeself) 1045# for internal use only (unpack_pdv and unpack_makeself)
992find_unpackable_file() { 1046find_unpackable_file() {
1011# the middle of the archive. Valve seems to use it a lot ... too bad 1065# the middle of the archive. Valve seems to use it a lot ... too bad
1012# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1066# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1013# 1067#
1014# Usage: unpack_pdv [file to unpack] [size of off_t] 1068# Usage: unpack_pdv [file to unpack] [size of off_t]
1015# - you have to specify the off_t size ... i have no idea how to extract that 1069# - you have to specify the off_t size ... i have no idea how to extract that
1016# information out of the binary executable myself. basically you pass in 1070# information out of the binary executable myself. basically you pass in
1017# the size of the off_t type (in bytes) on the machine that built the pdv 1071# the size of the off_t type (in bytes) on the machine that built the pdv
1018# archive. one way to determine this is by running the following commands: 1072# archive. one way to determine this is by running the following commands:
1019# strings <pdv archive> | grep lseek 1073# strings <pdv archive> | grep lseek
1020# strace -elseek <pdv archive> 1074# strace -elseek <pdv archive>
1021# basically look for the first lseek command (we do the strings/grep because 1075# basically look for the first lseek command (we do the strings/grep because
1022# sometimes the function call is _llseek or something) and steal the 2nd 1076# sometimes the function call is _llseek or something) and steal the 2nd
1023# parameter. here is an example: 1077# parameter. here is an example:
1024# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1078# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1025# lseek 1079# lseek
1026# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1080# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1027# lseek(3, -4, SEEK_END) = 2981250 1081# lseek(3, -4, SEEK_END) = 2981250
1028# thus we would pass in the value of '4' as the second parameter. 1082# thus we would pass in the value of '4' as the second parameter.
1029unpack_pdv() { 1083unpack_pdv() {
1030 local src=$(find_unpackable_file $1) 1084 local src=$(find_unpackable_file "$1")
1031 local sizeoff_t=$2 1085 local sizeoff_t=$2
1032 1086
1033 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1087 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1034 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1088 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1035 1089
1036 local shrtsrc=$(basename "${src}") 1090 local shrtsrc=$(basename "${src}")
1037 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1091 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1038 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1092 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
1039 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1093 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
1040 1094
1041 # grab metadata for debug reasons 1095 # grab metadata for debug reasons
1042 local metafile="$(emktemp)" 1096 local metafile=$(emktemp)
1043 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1097 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1044 1098
1045 # rip out the final file name from the metadata 1099 # rip out the final file name from the metadata
1046 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1100 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1047 datafile="`basename ${datafile}`" 1101 datafile=$(basename "${datafile}")
1048 1102
1049 # now lets uncompress/untar the file if need be 1103 # now lets uncompress/untar the file if need be
1050 local tmpfile="$(emktemp)" 1104 local tmpfile=$(emktemp)
1051 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1105 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1052 1106
1053 local iscompressed="`file -b ${tmpfile}`" 1107 local iscompressed=$(file -b "${tmpfile}")
1054 if [ "${iscompressed:0:8}" == "compress" ] ; then 1108 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1055 iscompressed=1 1109 iscompressed=1
1056 mv ${tmpfile}{,.Z} 1110 mv ${tmpfile}{,.Z}
1057 gunzip ${tmpfile} 1111 gunzip ${tmpfile}
1058 else 1112 else
1059 iscompressed=0 1113 iscompressed=0
1060 fi 1114 fi
1061 local istar="`file -b ${tmpfile}`" 1115 local istar=$(file -b "${tmpfile}")
1062 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1116 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1063 istar=1 1117 istar=1
1064 else 1118 else
1065 istar=0 1119 istar=0
1066 fi 1120 fi
1067 1121
1103# many other game companies. 1157# many other game companies.
1104# 1158#
1105# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1159# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1106# - If the file is not specified then unpack will utilize ${A}. 1160# - If the file is not specified then unpack will utilize ${A}.
1107# - If the offset is not specified then we will attempt to extract 1161# - If the offset is not specified then we will attempt to extract
1108# the proper offset from the script itself. 1162# the proper offset from the script itself.
1109unpack_makeself() { 1163unpack_makeself() {
1110 local src_input=${1:-${A}} 1164 local src_input=${1:-${A}}
1111 local src=$(find_unpackable_file "${src_input}") 1165 local src=$(find_unpackable_file "${src_input}")
1112 local skip=$2 1166 local skip=$2
1113 local exe=$3 1167 local exe=$3
1159 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1213 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1160 *) die "makeself cant handle exe '${exe}'" 1214 *) die "makeself cant handle exe '${exe}'"
1161 esac 1215 esac
1162 1216
1163 # lets grab the first few bytes of the file to figure out what kind of archive it is 1217 # lets grab the first few bytes of the file to figure out what kind of archive it is
1164 local tmpfile="$(emktemp)" 1218 local tmpfile=$(emktemp)
1165 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1219 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1166 local filetype="$(file -b "${tmpfile}")" 1220 local filetype=$(file -b "${tmpfile}")
1167 case ${filetype} in 1221 case ${filetype} in
1168 *tar\ archive) 1222 *tar\ archive*)
1169 eval ${exe} | tar --no-same-owner -xf - 1223 eval ${exe} | tar --no-same-owner -xf -
1170 ;; 1224 ;;
1171 bzip2*) 1225 bzip2*)
1172 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1226 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1173 ;; 1227 ;;
1216 return 0 1270 return 0
1217 fi 1271 fi
1218 done 1272 done
1219 set +o noglob; set -$shopts #reset old shell opts 1273 set +o noglob; set -$shopts #reset old shell opts
1220 1274
1221 local licmsg="$(emktemp)" 1275 local licmsg=$(emktemp)
1222 cat << EOF > ${licmsg} 1276 cat <<-EOF > ${licmsg}
1223********************************************************** 1277 **********************************************************
1224The following license outlines the terms of use of this 1278 The following license outlines the terms of use of this
1225package. You MUST accept this license for installation to 1279 package. You MUST accept this license for installation to
1226continue. When you are done viewing, hit 'q'. If you 1280 continue. When you are done viewing, hit 'q'. If you
1227CTRL+C out of this, the install will not run! 1281 CTRL+C out of this, the install will not run!
1228********************************************************** 1282 **********************************************************
1229 1283
1230EOF 1284 EOF
1231 cat ${lic} >> ${licmsg} 1285 cat ${lic} >> ${licmsg}
1232 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1286 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1233 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1287 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1234 read alic 1288 read alic
1235 case ${alic} in 1289 case ${alic} in
1253# found at CDROM_ROOT. 1307# found at CDROM_ROOT.
1254# 1308#
1255# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1309# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1256# etc... if you want to give the cds better names, then just export 1310# etc... if you want to give the cds better names, then just export
1257# the appropriate CDROM_NAME variable before calling cdrom_get_cds(). 1311# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1258# - CDROM_NAME="fooie cd" - for when you only want 1 cd 1312# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1259# - CDROM_NAME_1="install cd" - for when you want more than 1 cd 1313# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1260# CDROM_NAME_2="data cd" 1314# CDROM_NAME_2="data cd"
1261# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_# 1315# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1262# 1316#
1263# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1317# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1264# 1318#
1265# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1319# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1266# - this will attempt to locate a cd based upon a file that is on 1320# - this will attempt to locate a cd based upon a file that is on
1267# the cd ... the more files you give this function, the more cds 1321# the cd ... the more files you give this function, the more cds
1268# the cdrom functions will handle 1322# the cdrom functions will handle
1269cdrom_get_cds() { 1323cdrom_get_cds() {
1270 # first we figure out how many cds we're dealing with by 1324 # first we figure out how many cds we're dealing with by
1271 # the # of files they gave us 1325 # the # of files they gave us
1272 local cdcnt=0 1326 local cdcnt=0
1273 local f= 1327 local f=
1402 1456
1403 while [[ -n ${cdset[${i}]} ]] ; do 1457 while [[ -n ${cdset[${i}]} ]] ; do
1404 local dir=$(dirname ${cdset[${i}]}) 1458 local dir=$(dirname ${cdset[${i}]})
1405 local file=$(basename ${cdset[${i}]}) 1459 local file=$(basename ${cdset[${i}]})
1406 1460
1407 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do 1461 local point= node= fs= foo=
1408 [[ -d ${mline}/${dir} ]] || continue 1462 while read point node fs foo ; do
1463 [[ " cd9660 iso9660 " != *" ${fs} "* ]] && \
1464 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1465 && continue
1466 point=${point//\040/ }
1409 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then 1467 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1410 export CDROM_ROOT=${mline} 1468 export CDROM_ROOT=${point}
1411 export CDROM_SET=${i} 1469 export CDROM_SET=${i}
1412 export CDROM_MATCH=${cdset[${i}]} 1470 export CDROM_MATCH=${cdset[${i}]}
1413 return 1471 return
1414 fi 1472 done <<< "$(get_mounts)"
1415 done
1416 1473
1417 ((++i)) 1474 ((++i))
1418 done 1475 done
1419 1476
1420 echo 1477 echo
1448 1505
1449# Make sure that LINGUAS only contains languages that 1506# Make sure that LINGUAS only contains languages that
1450# a package can support 1507# a package can support
1451# 1508#
1452# usage: strip-linguas <allow LINGUAS> 1509# usage: strip-linguas <allow LINGUAS>
1453# strip-linguas -i <directories of .po files> 1510# strip-linguas -i <directories of .po files>
1454# strip-linguas -u <directories of .po files> 1511# strip-linguas -u <directories of .po files>
1455# 1512#
1456# The first form allows you to specify a list of LINGUAS. 1513# The first form allows you to specify a list of LINGUAS.
1457# The -i builds a list of po files found in all the 1514# The -i builds a list of po files found in all the
1458# directories and uses the intersection of the lists. 1515# directories and uses the intersection of the lists.
1459# The -u builds a list of po files found in all the 1516# The -u builds a list of po files found in all the
1460# directories and uses the union of the lists. 1517# directories and uses the union of the lists.
1461strip-linguas() { 1518strip-linguas() {
1462 local ls newls nols 1519 local ls newls nols
1463 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1520 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1464 local op=$1; shift 1521 local op=$1; shift
1465 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1522 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1509 while ((i--)) ; do 1566 while ((i--)) ; do
1510 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1567 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1511 done 1568 done
1512 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1569 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1513 case ${ARCH} in 1570 case ${ARCH} in
1514 x86) export ARCH="i386";; 1571 x86) export ARCH="i386";;
1515 amd64) export ARCH="x86_64";; 1572 amd64) export ARCH="x86_64";;
1516 hppa) export ARCH="parisc";; 1573 hppa) export ARCH="parisc";;
1517 mips) export ARCH="mips";; 1574 mips) export ARCH="mips";;
1518 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! 1575 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!
1519 *) export ARCH="${ARCH}";; 1576 *) export ARCH="${ARCH}";;
1520 esac 1577 esac
1521} 1578}
1522 1579
1523# set's ARCH back to what portage expects 1580# set's ARCH back to what portage expects
1524set_arch_to_portage() { 1581set_arch_to_portage() {
1531 1588
1532# Jeremy Huddleston <eradicator@gentoo.org>: 1589# Jeremy Huddleston <eradicator@gentoo.org>:
1533# preserve_old_lib /path/to/libblah.so.0 1590# preserve_old_lib /path/to/libblah.so.0
1534# preserve_old_lib_notify /path/to/libblah.so.0 1591# preserve_old_lib_notify /path/to/libblah.so.0
1535# 1592#
1536# These functions are useful when a lib in your package changes --library. Such 1593# These functions are useful when a lib in your package changes --library. Such
1537# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1594# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1538# would break packages that link against it. Most people get around this 1595# would break packages that link against it. Most people get around this
1539# by using the portage SLOT mechanism, but that is not always a relevant 1596# by using the portage SLOT mechanism, but that is not always a relevant
1540# solution, so instead you can add the following to your ebuilds: 1597# solution, so instead you can add the following to your ebuilds:
1541# 1598#
1542# src_install() { 1599# pkg_preinst() {
1543# ... 1600# ...
1544# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1601# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1545# ... 1602# ...
1546# } 1603# }
1547# 1604#
1550# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1607# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1551# ... 1608# ...
1552# } 1609# }
1553 1610
1554preserve_old_lib() { 1611preserve_old_lib() {
1555 LIB=$1 1612 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1613 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1614 die "Invalid preserve_old_lib() usage"
1615 fi
1616 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1556 1617
1557 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1618 local lib dir
1558 SONAME=`basename ${LIB}` 1619 for lib in "$@" ; do
1559 DIRNAME=`dirname ${LIB}` 1620 [[ -e ${ROOT}/${lib} ]] || continue
1560 1621 dir=${lib%/*}
1561 dodir ${DIRNAME} 1622 dodir ${dir} || die "dodir ${dir} failed"
1562 cp ${ROOT}${LIB} ${D}${DIRNAME} 1623 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1563 touch ${D}${LIB} 1624 touch "${D}"/${lib}
1564 fi 1625 done
1565} 1626}
1566 1627
1567preserve_old_lib_notify() { 1628preserve_old_lib_notify() {
1568 LIB=$1 1629 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1630 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1631 die "Invalid preserve_old_lib_notify() usage"
1632 fi
1569 1633
1570 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1634 local lib notice=0
1571 SONAME=`basename ${LIB}` 1635 for lib in "$@" ; do
1572 1636 [[ -e ${ROOT}/${lib} ]] || continue
1637 if [[ ${notice} -eq 0 ]] ; then
1638 notice=1
1573 ewarn "An old version of an installed library was detected on your system." 1639 ewarn "Old versions of installed libraries were detected on your system."
1574 ewarn "In order to avoid breaking packages that link against it, this older version" 1640 ewarn "In order to avoid breaking packages that depend on these old libs,"
1575 ewarn "is not being removed. In order to make full use of this newer version," 1641 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1576 ewarn "you will need to execute the following command:" 1642 ewarn "in order to remove these old dependencies. If you do not have this"
1577 ewarn " revdep-rebuild --library ${SONAME}" 1643 ewarn "helper program, simply emerge the 'gentoolkit' package."
1578 ewarn 1644 ewarn
1579 ewarn "After doing that, you can safely remove ${LIB}"
1580 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1581 fi 1645 fi
1646 ewarn " # revdep-rebuild --library ${lib##*/}"
1647 done
1582} 1648}
1583 1649
1584# Hack for people to figure out if a package was built with 1650# Hack for people to figure out if a package was built with
1585# certain USE flags 1651# certain USE flags
1586# 1652#
1587# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1653# Usage: built_with_use [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1588# ex: built_with_use xchat gtk2 1654# ex: built_with_use xchat gtk2
1589# 1655#
1590# Flags: -a all USE flags should be utilized 1656# Flags: -a all USE flags should be utilized
1591# -o at least one USE flag should be utilized 1657# -o at least one USE flag should be utilized
1658# --missing peform the specified action if the flag is not in IUSE (true/false/die)
1659# --hidden USE flag we're checking is hidden expanded so it isnt in IUSE
1592# Note: the default flag is '-a' 1660# Note: the default flag is '-a'
1593built_with_use() { 1661built_with_use() {
1662 local hidden="no"
1663 if [[ $1 == "--hidden" ]] ; then
1664 hidden="yes"
1665 shift
1666 fi
1667
1668 local missing_action="die"
1669 if [[ $1 == "--missing" ]] ; then
1670 missing_action=$2
1671 shift ; shift
1672 case ${missing_action} in
1673 true|false|die) ;;
1674 *) die "unknown action '${missing_action}'";;
1675 esac
1676 fi
1677
1594 local opt=$1 1678 local opt=$1
1595 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1679 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1596 1680
1597 local PKG=$(best_version $1) 1681 local PKG=$(best_version $1)
1598 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package" 1682 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1599 shift 1683 shift
1600 1684
1601 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE 1685 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1602 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE 1686 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1603 1687
1604 # if the USE file doesnt exist, assume the $PKG is either 1688 # if the IUSE file doesn't exist, the read will error out, we need to handle
1605 # injected or package.provided 1689 # this gracefully
1690 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1691 case ${missing_action} in
1692 true) return 0;;
1693 false) return 1;;
1606 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with" 1694 die) die "Unable to determine what USE flags $PKG was built with";;
1695 esac
1696 fi
1607 1697
1698 if [[ ${hidden} == "no" ]] ; then
1608 local IUSE_BUILT=$(<${IUSEFILE}) 1699 local IUSE_BUILT=$(<${IUSEFILE})
1609 # Don't check USE_EXPAND #147237 1700 # Don't check USE_EXPAND #147237
1610 local expand 1701 local expand
1611 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1702 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1612 if [[ $1 == ${expand}_* ]] ; then 1703 if [[ $1 == ${expand}_* ]] ; then
1613 expand="" 1704 expand=""
1614 break 1705 break
1615 fi 1706 fi
1616 done 1707 done
1617 if [[ -n ${expand} ]] ; then 1708 if [[ -n ${expand} ]] ; then
1709 if ! has $1 ${IUSE_BUILT} ; then
1710 case ${missing_action} in
1711 true) return 0;;
1712 false) return 1;;
1618 has $1 ${IUSE_BUILT} || die "$PKG does not actually support the $1 USE flag!" 1713 die) die "$PKG does not actually support the $1 USE flag!";;
1714 esac
1715 fi
1716 fi
1619 fi 1717 fi
1620 1718
1621 local USE_BUILT=$(<${USEFILE}) 1719 local USE_BUILT=$(<${USEFILE})
1622 while [[ $# -gt 0 ]] ; do 1720 while [[ $# -gt 0 ]] ; do
1623 if [[ ${opt} = "-o" ]] ; then 1721 if [[ ${opt} = "-o" ]] ; then
1639 local f 1737 local f
1640 for f in $(find ${dir} -name configure) ; do 1738 for f in $(find ${dir} -name configure) ; do
1641 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1739 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1642 done 1740 done
1643 eend 0 1741 eend 0
1644}
1645
1646# dopamd <file> [more files]
1647#
1648# Install pam auth config file in /etc/pam.d
1649dopamd() {
1650 [[ -z $1 ]] && die "dopamd requires at least one argument"
1651
1652 use pam || return 0
1653
1654 INSDESTTREE=/etc/pam.d \
1655 doins "$@" || die "failed to install $@"
1656}
1657# newpamd <old name> <new name>
1658#
1659# Install pam file <old name> as <new name> in /etc/pam.d
1660newpamd() {
1661 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1662
1663 use pam || return 0
1664
1665 INSDESTTREE=/etc/pam.d \
1666 newins "$1" "$2" || die "failed to install $1 as $2"
1667} 1742}
1668 1743
1669# make a wrapper script ... 1744# make a wrapper script ...
1670# NOTE: this was originally games_make_wrapper, but I noticed other places where 1745# NOTE: this was originally games_make_wrapper, but I noticed other places where
1671# this could be used, so I have moved it here and made it not games-specific 1746# this could be used, so I have moved it here and made it not games-specific

Legend:
Removed from v.1.256  
changed lines
  Added in v.1.280

  ViewVC Help
Powered by ViewVC 1.1.20