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

Diff of /eclass/eutils.eclass

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

Revision 1.283 Revision 1.324
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2009 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.283 2007/06/16 08:03:28 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.324 2010/01/03 19:57:10 zmedico Exp $
4 4
5# @ECLASS: eutils.eclass 5# @ECLASS: eutils.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# base-system@gentoo.org 7# base-system@gentoo.org
8# @BLURB: many extra (but common) functions that are used in ebuilds 8# @BLURB: many extra (but common) functions that are used in ebuilds
9# @DESCRIPTION: 9# @DESCRIPTION:
10# The eutils eclass contains a suite of functions that complement 10# The eutils eclass contains a suite of functions that complement
11# the ones that ebuild.sh already contain. The idea is that the functions 11# the ones that ebuild.sh already contain. The idea is that the functions
12# are not required in all ebuilds but enough utilize them to have a common 12# are not required in all ebuilds but enough utilize them to have a common
13# home rather than having multiple ebuilds implementing the same thing. 13# home rather than having multiple ebuilds implementing the same thing.
14# 14#
15# Due to the nature of this eclass, some functions may have maintainers 15# Due to the nature of this eclass, some functions may have maintainers
16# different from the overall eclass! 16# different from the overall eclass!
17 17
18inherit multilib portability 18inherit multilib portability
19 19
47 sleep 1 47 sleep 1
48 done 48 done
49 fi 49 fi
50} 50}
51 51
52# @FUNCTION: ecvs_clean
53# @USAGE: [list of dirs]
54# @DESCRIPTION:
55# Remove CVS directories recursiveley. Useful when a source tarball contains
56# internal CVS directories. Defaults to $PWD.
57ecvs_clean() {
58 [[ -z $* ]] && set -- .
59 find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
60 find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
61}
62
63# @FUNCTION: esvn_clean
64# @USAGE: [list of dirs]
65# @DESCRIPTION:
66# Remove .svn directories recursiveley. Useful when a source tarball contains
67# internal Subversion directories. Defaults to $PWD.
68esvn_clean() {
69 [[ -z $* ]] && set -- .
70 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
71}
72
73# @FUNCTION: eshopts_push
74# @USAGE: [options to `set`]
75# @DESCRIPTION:
76# Often times code will want to enable a shell option to change code behavior.
77# Since changing shell options can easily break other pieces of code (which
78# assume the default state), eshopts_push is used to (1) push the current shell
79# options onto a stack and (2) pass the specified arguments to set.
80#
81# A common example is to disable shell globbing so that special meaning/care
82# may be used with variables/arguments to custom functions. That would be:
83# @CODE
84# eshopts_push -o noglob
85# for x in ${foo} ; do
86# if ...some check... ; then
87# eshopts_pop
88# return 0
89# fi
90# done
91# eshopts_pop
92# @CODE
93eshopts_push() {
94 # have to assume __ESHOPTS_SAVE__ isn't screwed with
95 # as a `declare -a` here will reset its value
96 local i=${#__ESHOPTS_SAVE__[@]}
97 __ESHOPTS_SAVE__[$i]=$-
98 [[ $# -eq 0 ]] && return 0
99 set "$@" || die "eshopts_push: bad options to set: $*"
100}
101
102# @FUNCTION: eshopts_pop
103# @USAGE:
104# @DESCRIPTION:
105# Restore the shell options to the state saved with the corresponding
106# eshopts_push call. See that function for more details.
107eshopts_pop() {
108 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
109 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
110 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
111 local s=${__ESHOPTS_SAVE__[$i]}
112 unset __ESHOPTS_SAVE__[$i]
113 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
114 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
115}
116
52# Default directory where patches are located 117# Default directory where patches are located
53EPATCH_SOURCE="${WORKDIR}/patch" 118EPATCH_SOURCE="${WORKDIR}/patch"
54# Default extension for patches 119# Default extension for patches
55EPATCH_SUFFIX="patch.bz2" 120EPATCH_SUFFIX="patch.bz2"
56# Default options for patch 121# Default options for patch
57# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 122# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
58# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 123# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
59# Set -E to automatically remove empty files. 124# Set -E to automatically remove empty files.
60EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 125EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
61# List of patches not to apply. Not this is only file names, 126# List of patches not to apply. Note this is only file names,
62# and not the full path .. 127# and not the full path ..
63EPATCH_EXCLUDE="" 128EPATCH_EXCLUDE=""
64# Change the printed message for a single patch. 129# Change the printed message for a single patch.
65EPATCH_SINGLE_MSG="" 130EPATCH_SINGLE_MSG=""
66# Change the printed message for multiple patches. 131# Change the printed message for multiple patches.
84# bug they should be left as is to ensure an ebuild can rely on 149# bug they should be left as is to ensure an ebuild can rely on
85# them for. 150# them for.
86# 151#
87# Patches are applied in current directory. 152# Patches are applied in current directory.
88# 153#
89# Bulk Patches should preferibly have the form of: 154# Bulk Patches should preferably have the form of:
90# 155#
91# ??_${ARCH}_foo.${EPATCH_SUFFIX} 156# ??_${ARCH}_foo.${EPATCH_SUFFIX}
92# 157#
93# For example: 158# For example:
94# 159#
143 local EPATCH_SOURCE="$1/*" 208 local EPATCH_SOURCE="$1/*"
144 else 209 else
145 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 210 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
146 fi 211 fi
147 else 212 else
148 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ] 213 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then
149 then
150 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 214 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
151 then 215 then
152 EPATCH_SOURCE="$1" 216 EPATCH_SOURCE="$1"
153 fi 217 fi
154 218
163 227
164 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 228 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
165 fi 229 fi
166 230
167 case ${EPATCH_SUFFIX##*\.} in 231 case ${EPATCH_SUFFIX##*\.} in
232 xz)
233 PIPE_CMD="xz -dc"
234 PATCH_SUFFIX="xz"
235 ;;
236 lzma)
237 PIPE_CMD="lzma -dc"
238 PATCH_SUFFIX="lzma"
239 ;;
168 bz2) 240 bz2)
169 PIPE_CMD="bzip2 -dc" 241 PIPE_CMD="bzip2 -dc"
170 PATCH_SUFFIX="bz2" 242 PATCH_SUFFIX="bz2"
171 ;; 243 ;;
172 gz|Z|z) 244 gz|Z|z)
222 fi 294 fi
223 295
224 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 296 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
225 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 297 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
226 298
299 # Decompress the patch if need be
300 if [[ ${PATCH_SUFFIX} != "patch" ]] ; then
301 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303
304 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 ; then
305 echo
306 eerror "Could not extract patch!"
307 #die "Could not extract patch!"
308 count=5
309 break
310 fi
311 else
312 PATCH_TARGET="${x}"
313 fi
314
315 # Check for absolute paths in patches. If sandbox is disabled,
316 # people could (accidently) patch files in the root filesystem.
317 # Or trigger other unpleasantries #237667. So disallow -p0 on
318 # such patches.
319 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
320 if [[ -n ${abs_paths} ]] ; then
321 count=1
322 echo "NOTE: skipping -p0 due to absolute paths in patch:" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
323 echo "${abs_paths}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
324 fi
325
227 # Allow for prefix to differ ... im lazy, so shoot me :/ 326 # Allow for prefix to differ ... im lazy, so shoot me :/
228 while [ "${count}" -lt 5 ] 327 while [ "${count}" -lt 5 ]
229 do 328 do
230 # Generate some useful debug info ... 329 # Generate some useful debug info ...
231 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 330 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
232 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 331 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
233 332
234 if [ "${PATCH_SUFFIX}" != "patch" ]
235 then
236 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
237 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
238 else
239 PATCH_TARGET="${x}"
240 fi
241
242 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 333 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
243 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 334 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
244 335
245 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 336 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
246 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 337 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
247
248 if [ "${PATCH_SUFFIX}" != "patch" ]
249 then
250 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
251 then
252 echo
253 eerror "Could not extract patch!"
254 #die "Could not extract patch!"
255 count=5
256 break
257 fi
258 fi
259 338
260 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 339 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
261 then 340 then
262 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 341 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
263 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 342 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
311 done 390 done
312 if [ "${SINGLE_PATCH}" = "no" ] 391 if [ "${SINGLE_PATCH}" = "no" ]
313 then 392 then
314 einfo "Done with patching" 393 einfo "Done with patching"
315 fi 394 fi
395}
396epatch_user() {
397 [[ $# -ne 0 ]] && die "epatch_user takes no options"
398
399 # don't clobber any EPATCH vars that the parent might want
400 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
401 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
402 EPATCH_SOURCE=${base}/${CTARGET}/${check}
403 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
404 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
405 if [[ -d ${EPATCH_SOURCE} ]] ; then
406 EPATCH_SOURCE=${EPATCH_SOURCE} \
407 EPATCH_SUFFIX="patch" \
408 EPATCH_FORCE="yes" \
409 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
410 epatch
411 break
412 fi
413 done
316} 414}
317 415
318# @FUNCTION: emktemp 416# @FUNCTION: emktemp
319# @USAGE: [temp dir] 417# @USAGE: [temp dir]
320# @DESCRIPTION: 418# @DESCRIPTION:
356# base-system@gentoo.org (Linux) 454# base-system@gentoo.org (Linux)
357# Joe Jezak <josejx@gmail.com> (OS X) 455# Joe Jezak <josejx@gmail.com> (OS X)
358# usata@gentoo.org (OS X) 456# usata@gentoo.org (OS X)
359# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 457# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
360# @DESCRIPTION: 458# @DESCRIPTION:
361# Small wrapper for getent (Linux), nidump (Mac OS X), 459# Small wrapper for getent (Linux),
460# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
362# and pw (FreeBSD) used in enewuser()/enewgroup() 461# and pw (FreeBSD) used in enewuser()/enewgroup()
363egetent() { 462egetent() {
364 case ${CHOST} in 463 case ${CHOST} in
365 *-darwin*) 464 *-darwin[678])
366 case "$2" in 465 case "$2" in
367 *[!0-9]*) # Non numeric 466 *[!0-9]*) # Non numeric
368 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 467 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
369 ;; 468 ;;
370 *) # Numeric 469 *) # Numeric
371 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 470 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
471 ;;
472 esac
473 ;;
474 *-darwin*)
475 local mytype=$1
476 [[ "passwd" == $mytype ]] && mytype="Users"
477 [[ "group" == $mytype ]] && mytype="Groups"
478 case "$2" in
479 *[!0-9]*) # Non numeric
480 dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
481 ;;
482 *) # Numeric
483 local mykey="UniqueID"
484 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
485 dscl . -search /$mytype $mykey $2 2>/dev/null
372 ;; 486 ;;
373 esac 487 esac
374 ;; 488 ;;
375 *-freebsd*|*-dragonfly*) 489 *-freebsd*|*-dragonfly*)
376 local opts action="user" 490 local opts action="user"
576 fi 690 fi
577 ;; 691 ;;
578 692
579 *) 693 *)
580 if [[ -z $@ ]] ; then 694 if [[ -z $@ ]] ; then
581 useradd ${opts} ${euser} \ 695 useradd ${opts} \
582 -c "added by portage for ${PN}" \ 696 -c "added by portage for ${PN}" \
697 ${euser} \
583 || die "enewuser failed" 698 || die "enewuser failed"
584 else 699 else
585 einfo " - Extra: $@" 700 einfo " - Extra: $@"
586 useradd ${opts} ${euser} "$@" \ 701 useradd ${opts} "$@" \
702 ${euser} \
587 || die "enewuser failed" 703 || die "enewuser failed"
588 fi 704 fi
589 ;; 705 ;;
590 esac 706 esac
591 707
732# name: the name that will show up in the menu 848# name: the name that will show up in the menu
733# icon: give your little like a pretty little icon ... 849# icon: give your little like a pretty little icon ...
734# this can be relative (to /usr/share/pixmaps) or 850# this can be relative (to /usr/share/pixmaps) or
735# a full path to an icon 851# a full path to an icon
736# type: what kind of application is this ? for categories: 852# type: what kind of application is this ? for categories:
737# http://www.freedesktop.org/Standards/desktop-entry-spec 853# http://standards.freedesktop.org/menu-spec/latest/apa.html
738# path: if your app needs to startup in a specific dir 854# path: if your app needs to startup in a specific dir
739make_desktop_entry() { 855make_desktop_entry() {
740 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 856 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
741 857
742 local exec=${1} 858 local exec=${1}
743 local name=${2:-${PN}} 859 local name=${2:-${PN}}
744 local icon=${3:-${PN}.png} 860 local icon=${3:-${PN}}
745 local type=${4} 861 local type=${4}
746 local path=${5} 862 local path=${5}
747 863
748 if [[ -z ${type} ]] ; then 864 if [[ -z ${type} ]] ; then
749 local catmaj=${CATEGORY%%-*} 865 local catmaj=${CATEGORY%%-*}
750 local catmin=${CATEGORY##*-} 866 local catmin=${CATEGORY##*-}
751 case ${catmaj} in 867 case ${catmaj} in
752 app) 868 app)
753 case ${catmin} in 869 case ${catmin} in
870 accessibility) type=Accessibility;;
754 admin) type=System;; 871 admin) type=System;;
872 antivirus) type=System;;
873 arch) type=Archiving;;
874 backup) type=Archiving;;
755 cdr) type=DiscBurning;; 875 cdr) type=DiscBurning;;
756 dicts) type=Dictionary;; 876 dicts) type=Dictionary;;
877 doc) type=Documentation;;
757 editors) type=TextEditor;; 878 editors) type=TextEditor;;
758 emacs) type=TextEditor;; 879 emacs) type=TextEditor;;
759 emulation) type=Emulator;; 880 emulation) type=Emulator;;
760 laptop) type=HardwareSettings;; 881 laptop) type=HardwareSettings;;
761 office) type=Office;; 882 office) type=Office;;
883 pda) type=PDA;;
762 vim) type=TextEditor;; 884 vim) type=TextEditor;;
763 xemacs) type=TextEditor;; 885 xemacs) type=TextEditor;;
764 *) type=;; 886 *) type=;;
765 esac 887 esac
766 ;; 888 ;;
772 games) 894 games)
773 case ${catmin} in 895 case ${catmin} in
774 action|fps) type=ActionGame;; 896 action|fps) type=ActionGame;;
775 arcade) type=ArcadeGame;; 897 arcade) type=ArcadeGame;;
776 board) type=BoardGame;; 898 board) type=BoardGame;;
899 emulation) type=Emulator;;
777 kids) type=KidsGame;; 900 kids) type=KidsGame;;
778 emulation) type=Emulator;;
779 puzzle) type=LogicGame;; 901 puzzle) type=LogicGame;;
902 roguelike) type=RolePlaying;;
780 rpg) type=RolePlaying;; 903 rpg) type=RolePlaying;;
781 roguelike) type=RolePlaying;;
782 simulation) type=Simulation;; 904 simulation) type=Simulation;;
783 sports) type=SportsGame;; 905 sports) type=SportsGame;;
784 strategy) type=StrategyGame;; 906 strategy) type=StrategyGame;;
785 *) type=;; 907 *) type=;;
786 esac 908 esac
787 type="Game;${type}" 909 type="Game;${type}"
910 ;;
911
912 gnome)
913 type="Gnome;GTK"
914 ;;
915
916 kde)
917 type="KDE;Qt"
788 ;; 918 ;;
789 919
790 mail) 920 mail)
791 type="Network;Email" 921 type="Network;Email"
792 ;; 922 ;;
818 type="Network;${type}" 948 type="Network;${type}"
819 ;; 949 ;;
820 950
821 sci) 951 sci)
822 case ${catmin} in 952 case ${catmin} in
823 astro*) type=Astronomy;; 953 astro*) type=Astronomy;;
824 bio*) type=Biology;; 954 bio*) type=Biology;;
825 calc*) type=Calculator;; 955 calc*) type=Calculator;;
826 chem*) type=Chemistry;; 956 chem*) type=Chemistry;;
957 elec*) type=Electronics;;
827 geo*) type=Geology;; 958 geo*) type=Geology;;
828 math*) type=Math;; 959 math*) type=Math;;
960 physics) type=Physics;;
961 visual*) type=DataVisualization;;
829 *) type=;; 962 *) type=;;
830 esac 963 esac
831 type="Science;${type}" 964 type="Science;${type}"
965 ;;
966
967 sys)
968 type="System"
832 ;; 969 ;;
833 970
834 www) 971 www)
835 case ${catmin} in 972 case ${catmin} in
836 client) type=WebBrowser;; 973 client) type=WebBrowser;;
852 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 989 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
853 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 990 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
854 991
855 cat <<-EOF > "${desktop}" 992 cat <<-EOF > "${desktop}"
856 [Desktop Entry] 993 [Desktop Entry]
857 Encoding=UTF-8
858 Version=0.9.2
859 Name=${name} 994 Name=${name}
860 Type=Application 995 Type=Application
861 Comment=${DESCRIPTION} 996 Comment=${DESCRIPTION}
862 Exec=${exec} 997 Exec=${exec}
863 TryExec=${exec%% *} 998 TryExec=${exec%% *}
864 Path=${path}
865 Icon=${icon} 999 Icon=${icon}
866 Categories=Application;${type}; 1000 Categories=${type};
867 EOF 1001 EOF
1002
1003 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}"
868 1004
869 ( 1005 (
870 # wrap the env here so that the 'insinto' call 1006 # wrap the env here so that the 'insinto' call
871 # doesn't corrupt the env of the caller 1007 # doesn't corrupt the env of the caller
872 insinto /usr/share/applications 1008 insinto /usr/share/applications
901 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo." 1037 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
902 fi 1038 fi
903} 1039}
904 1040
905# @FUNCTION: make_session_desktop 1041# @FUNCTION: make_session_desktop
906# @USAGE: <title> <command> 1042# @USAGE: <title> <command> [command args...]
907# @DESCRIPTION: 1043# @DESCRIPTION:
908# Make a GDM/KDM Session file. The title is the file to execute to start the 1044# Make a GDM/KDM Session file. The title is the file to execute to start the
909# Window Manager. The command is the name of the Window Manager. 1045# Window Manager. The command is the name of the Window Manager.
1046#
1047# You can set the name of the file via the ${wm} variable.
910make_session_desktop() { 1048make_session_desktop() {
911 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 1049 [[ -z $1 ]] && eerror "$0: You must specify the title" && return 1
912 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1 1050 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
913 1051
914 local title=$1 1052 local title=$1
915 local command=$2 1053 local command=$2
916 local desktop=${T}/${wm}.desktop 1054 local desktop=${T}/${wm:-${PN}}.desktop
1055 shift 2
917 1056
918 cat <<-EOF > "${desktop}" 1057 cat <<-EOF > "${desktop}"
919 [Desktop Entry] 1058 [Desktop Entry]
920 Encoding=UTF-8
921 Name=${title} 1059 Name=${title}
922 Comment=This session logs you into ${title} 1060 Comment=This session logs you into ${title}
923 Exec=${command} 1061 Exec=${command} $*
924 TryExec=${command} 1062 TryExec=${command}
925 Type=Application 1063 Type=XSession
926 EOF 1064 EOF
927 1065
928 ( 1066 (
929 # wrap the env here so that the 'insinto' call 1067 # wrap the env here so that the 'insinto' call
930 # doesn't corrupt the env of the caller 1068 # doesn't corrupt the env of the caller
951 elif [[ -d ${i} ]] ; then 1089 elif [[ -d ${i} ]] ; then
952 for j in "${i}"/*.desktop ; do 1090 for j in "${i}"/*.desktop ; do
953 doins "${j}" 1091 doins "${j}"
954 ((ret+=$?)) 1092 ((ret+=$?))
955 done 1093 done
1094 else
1095 ((++ret))
956 fi 1096 fi
957 done 1097 done
958 exit ${ret} 1098 exit ${ret}
959 ) 1099 )
960} 1100}
990 elif [[ -d ${i} ]] ; then 1130 elif [[ -d ${i} ]] ; then
991 for j in "${i}"/*.png ; do 1131 for j in "${i}"/*.png ; do
992 doins "${j}" 1132 doins "${j}"
993 ((ret+=$?)) 1133 ((ret+=$?))
994 done 1134 done
1135 else
1136 ((++ret))
995 fi 1137 fi
996 done 1138 done
997 exit ${ret} 1139 exit ${ret}
998 ) 1140 )
999} 1141}
1034# @DESCRIPTION: 1176# @DESCRIPTION:
1035# Unpack those pesky pdv generated files ... 1177# Unpack those pesky pdv generated files ...
1036# They're self-unpacking programs with the binary package stuffed in 1178# They're self-unpacking programs with the binary package stuffed in
1037# the middle of the archive. Valve seems to use it a lot ... too bad 1179# the middle of the archive. Valve seems to use it a lot ... too bad
1038# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1180# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1039# 1181#
1040# You have to specify the off_t size ... I have no idea how to extract that 1182# You have to specify the off_t size ... I have no idea how to extract that
1041# information out of the binary executable myself. Basically you pass in 1183# information out of the binary executable myself. Basically you pass in
1042# the size of the off_t type (in bytes) on the machine that built the pdv 1184# the size of the off_t type (in bytes) on the machine that built the pdv
1043# archive. 1185# archive.
1044# 1186#
1045# One way to determine this is by running the following commands: 1187# One way to determine this is by running the following commands:
1188#
1189# @CODE
1046# strings <pdv archive> | grep lseek 1190# strings <pdv archive> | grep lseek
1047# strace -elseek <pdv archive> 1191# strace -elseek <pdv archive>
1192# @CODE
1193#
1048# Basically look for the first lseek command (we do the strings/grep because 1194# Basically look for the first lseek command (we do the strings/grep because
1049# sometimes the function call is _llseek or something) and steal the 2nd 1195# sometimes the function call is _llseek or something) and steal the 2nd
1050# parameter. Here is an example: 1196# parameter. Here is an example:
1197#
1198# @CODE
1051# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1199# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1052# lseek 1200# lseek
1053# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1201# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1054# lseek(3, -4, SEEK_END) = 2981250 1202# lseek(3, -4, SEEK_END) = 2981250
1203# @CODE
1204#
1055# Thus we would pass in the value of '4' as the second parameter. 1205# Thus we would pass in the value of '4' as the second parameter.
1056unpack_pdv() { 1206unpack_pdv() {
1057 local src=$(find_unpackable_file "$1") 1207 local src=$(find_unpackable_file "$1")
1058 local sizeoff_t=$2 1208 local sizeoff_t=$2
1059 1209
1129# @DESCRIPTION: 1279# @DESCRIPTION:
1130# Unpack those pesky makeself generated files ... 1280# Unpack those pesky makeself generated files ...
1131# They're shell scripts with the binary package tagged onto 1281# They're shell scripts with the binary package tagged onto
1132# the end of the archive. Loki utilized the format as does 1282# the end of the archive. Loki utilized the format as does
1133# many other game companies. 1283# many other game companies.
1134# 1284#
1135# If the file is not specified, then ${A} is used. If the 1285# If the file is not specified, then ${A} is used. If the
1136# offset is not specified then we will attempt to extract 1286# offset is not specified then we will attempt to extract
1137# the proper offset from the script itself. 1287# the proper offset from the script itself.
1138unpack_makeself() { 1288unpack_makeself() {
1139 local src_input=${1:-${A}} 1289 local src_input=${1:-${A}}
1230 lic="${PWD}/${lic}" 1380 lic="${PWD}/${lic}"
1231 elif [ -e "${lic}" ] ; then 1381 elif [ -e "${lic}" ] ; then
1232 lic="${lic}" 1382 lic="${lic}"
1233 fi 1383 fi
1234 fi 1384 fi
1235 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1236 local l="`basename ${lic}`" 1385 local l="`basename ${lic}`"
1237 1386
1238 # here is where we check for the licenses the user already 1387 # here is where we check for the licenses the user already
1239 # accepted ... if we don't find a match, we make the user accept 1388 # accepted ... if we don't find a match, we make the user accept
1240 local shopts=$-
1241 local alic 1389 local alic
1242 set -o noglob #so that bash doesn't expand "*" 1390 eshopts_push -o noglob # so that bash doesn't expand "*"
1243 for alic in ${ACCEPT_LICENSE} ; do 1391 for alic in ${ACCEPT_LICENSE} ; do
1244 if [[ ${alic} == ${l} ]]; then 1392 if [[ ${alic} == ${l} ]]; then
1245 set +o noglob; set -${shopts} #reset old shell opts 1393 eshopts_pop
1246 return 0 1394 return 0
1247 fi 1395 fi
1248 done 1396 done
1249 set +o noglob; set -$shopts #reset old shell opts 1397 eshopts_pop
1398 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1250 1399
1251 local licmsg=$(emktemp) 1400 local licmsg=$(emktemp)
1252 cat <<-EOF > ${licmsg} 1401 cat <<-EOF > ${licmsg}
1253 ********************************************************** 1402 **********************************************************
1254 The following license outlines the terms of use of this 1403 The following license outlines the terms of use of this
1255 package. You MUST accept this license for installation to 1404 package. You MUST accept this license for installation to
1256 continue. When you are done viewing, hit 'q'. If you 1405 continue. When you are done viewing, hit 'q'. If you
1257 CTRL+C out of this, the install will not run! 1406 CTRL+C out of this, the install will not run!
1258 ********************************************************** 1407 **********************************************************
1259 1408
1260 EOF 1409 EOF
1261 cat ${lic} >> ${licmsg} 1410 cat ${lic} >> ${licmsg}
1262 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1411 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1263 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1412 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1264 read alic 1413 read alic
1277# @FUNCTION: cdrom_get_cds 1426# @FUNCTION: cdrom_get_cds
1278# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...] 1427# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...]
1279# @DESCRIPTION: 1428# @DESCRIPTION:
1280# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates 1429# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates
1281# the whole 'non-interactive' policy, but damnit I want CD support ! 1430# the whole 'non-interactive' policy, but damnit I want CD support !
1282# 1431#
1283# With these cdrom functions we handle all the user interaction and 1432# With these cdrom functions we handle all the user interaction and
1284# standardize everything. All you have to do is call cdrom_get_cds() 1433# standardize everything. All you have to do is call cdrom_get_cds()
1285# and when the function returns, you can assume that the cd has been 1434# and when the function returns, you can assume that the cd has been
1286# found at CDROM_ROOT. 1435# found at CDROM_ROOT.
1287# 1436#
1288# The function will attempt to locate a cd based upon a file that is on 1437# The function will attempt to locate a cd based upon a file that is on
1289# the cd. The more files you give this function, the more cds 1438# the cd. The more files you give this function, the more cds
1290# the cdrom functions will handle. 1439# the cdrom functions will handle.
1291# 1440#
1292# Normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1441# Normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1293# etc... If you want to give the cds better names, then just export 1442# etc... If you want to give the cds better names, then just export
1294# the appropriate CDROM_NAME variable before calling cdrom_get_cds(). 1443# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1295# Use CDROM_NAME for one cd, or CDROM_NAME_# for multiple cds. You can 1444# Use CDROM_NAME for one cd, or CDROM_NAME_# for multiple cds. You can
1296# also use the CDROM_NAME_SET bash array. 1445# also use the CDROM_NAME_SET bash array.
1297# 1446#
1298# For those multi cd ebuilds, see the cdrom_load_next_cd() function. 1447# For those multi cd ebuilds, see the cdrom_load_next_cd() function.
1299cdrom_get_cds() { 1448cdrom_get_cds() {
1300 # first we figure out how many cds we're dealing with by 1449 # first we figure out how many cds we're dealing with by
1301 # the # of files they gave us 1450 # the # of files they gave us
1302 local cdcnt=0 1451 local cdcnt=0
1423# displayed and we'll hang out here until: 1572# displayed and we'll hang out here until:
1424# (1) the file is found on a mounted cdrom 1573# (1) the file is found on a mounted cdrom
1425# (2) the user hits CTRL+C 1574# (2) the user hits CTRL+C
1426_cdrom_locate_file_on_cd() { 1575_cdrom_locate_file_on_cd() {
1427 local mline="" 1576 local mline=""
1428 local showedmsg=0 1577 local showedmsg=0 showjolietmsg=0
1429 1578
1430 while [[ -z ${CDROM_ROOT} ]] ; do 1579 while [[ -z ${CDROM_ROOT} ]] ; do
1431 local i=0 1580 local i=0
1432 local -a cdset=(${*//:/ }) 1581 local -a cdset=(${*//:/ })
1433 if [[ -n ${CDROM_SET} ]] ; then 1582 if [[ -n ${CDROM_SET} ]] ; then
1442 while read point node fs foo ; do 1591 while read point node fs foo ; do
1443 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \ 1592 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1444 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \ 1593 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1445 && continue 1594 && continue
1446 point=${point//\040/ } 1595 point=${point//\040/ }
1596 [[ ! -d ${point}/${dir} ]] && continue
1447 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue 1597 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1448 export CDROM_ROOT=${point} 1598 export CDROM_ROOT=${point}
1449 export CDROM_SET=${i} 1599 export CDROM_SET=${i}
1450 export CDROM_MATCH=${cdset[${i}]} 1600 export CDROM_MATCH=${cdset[${i}]}
1451 return 1601 return
1473 showedmsg=1 1623 showedmsg=1
1474 fi 1624 fi
1475 einfo "Press return to scan for the cd again" 1625 einfo "Press return to scan for the cd again"
1476 einfo "or hit CTRL+C to abort the emerge." 1626 einfo "or hit CTRL+C to abort the emerge."
1477 echo 1627 echo
1628 if [[ ${showjolietmsg} -eq 0 ]] ; then
1629 showjolietmsg=1
1630 else
1478 einfo "If you are having trouble with the detection" 1631 ewarn "If you are having trouble with the detection"
1479 einfo "of your CD, it is possible that you do not have" 1632 ewarn "of your CD, it is possible that you do not have"
1480 einfo "Joliet support enabled in your kernel. Please" 1633 ewarn "Joliet support enabled in your kernel. Please"
1481 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1634 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1635 ebeep 5
1636 fi
1482 read || die "something is screwed with your system" 1637 read || die "something is screwed with your system"
1483 done 1638 done
1484} 1639}
1485 1640
1641# @FUNCTION: strip-linguas
1642# @USAGE: [<allow LINGUAS>|<-i|-u> <directories of .po files>]
1643# @DESCRIPTION:
1486# Make sure that LINGUAS only contains languages that 1644# Make sure that LINGUAS only contains languages that
1487# a package can support 1645# a package can support. The first form allows you to
1488# 1646# specify a list of LINGUAS. The -i builds a list of po
1489# usage: strip-linguas <allow LINGUAS> 1647# files found in all the directories and uses the
1490# strip-linguas -i <directories of .po files> 1648# intersection of the lists. The -u builds a list of po
1491# strip-linguas -u <directories of .po files> 1649# files found in all the directories and uses the union
1492# 1650# of the lists.
1493# The first form allows you to specify a list of LINGUAS.
1494# The -i builds a list of po files found in all the
1495# directories and uses the intersection of the lists.
1496# The -u builds a list of po files found in all the
1497# directories and uses the union of the lists.
1498strip-linguas() { 1651strip-linguas() {
1499 local ls newls nols 1652 local ls newls nols
1500 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1653 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1501 local op=$1; shift 1654 local op=$1; shift
1502 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1655 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1503 local d f 1656 local d f
1504 for d in "$@" ; do 1657 for d in "$@" ; do
1505 if [[ ${op} == "-u" ]] ; then 1658 if [[ ${op} == "-u" ]] ; then
1506 newls=${ls} 1659 newls=${ls}
1507 else 1660 else
1508 newls="" 1661 newls=""
1509 fi 1662 fi
1510 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1663 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1511 if [[ ${op} == "-i" ]] ; then 1664 if [[ ${op} == "-i" ]] ; then
1512 hasq ${f} ${ls} && newls="${newls} ${f}" 1665 hasq ${f} ${ls} && newls="${newls} ${f}"
1513 else 1666 else
1514 hasq ${f} ${ls} || newls="${newls} ${f}" 1667 hasq ${f} ${ls} || newls="${newls} ${f}"
1515 fi 1668 fi
1528 else 1681 else
1529 nols="${nols} ${f}" 1682 nols="${nols} ${f}"
1530 fi 1683 fi
1531 done 1684 done
1532 [[ -n ${nols} ]] \ 1685 [[ -n ${nols} ]] \
1533 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1686 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1534 export LINGUAS=${newls:1} 1687 export LINGUAS=${newls:1}
1535}
1536
1537# @FUNCTION: set_arch_to_kernel
1538# @DESCRIPTION:
1539# Set the env ARCH to match what the kernel expects.
1540set_arch_to_kernel() {
1541 i=10
1542 while ((i--)) ; do
1543 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1544 done
1545 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1546 case ${ARCH} in
1547 x86) export ARCH="i386";;
1548 amd64) export ARCH="x86_64";;
1549 hppa) export ARCH="parisc";;
1550 mips) export ARCH="mips";;
1551 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!
1552 *) export ARCH="${ARCH}";;
1553 esac
1554}
1555
1556# @FUNCTION: set_arch_to_portage
1557# @DESCRIPTION:
1558# Set the env ARCH to match what portage expects.
1559set_arch_to_portage() {
1560 i=10
1561 while ((i--)) ; do
1562 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1563 done
1564 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1565} 1688}
1566 1689
1567# @FUNCTION: preserve_old_lib 1690# @FUNCTION: preserve_old_lib
1568# @USAGE: <libs to preserve> [more libs] 1691# @USAGE: <libs to preserve> [more libs]
1569# @DESCRIPTION: 1692# @DESCRIPTION:
1578 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1701 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1579 die "Invalid preserve_old_lib() usage" 1702 die "Invalid preserve_old_lib() usage"
1580 fi 1703 fi
1581 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]" 1704 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1582 1705
1706 # let portage worry about it
1707 has preserve-libs ${FEATURES} && return 0
1708
1583 local lib dir 1709 local lib dir
1584 for lib in "$@" ; do 1710 for lib in "$@" ; do
1585 [[ -e ${ROOT}/${lib} ]] || continue 1711 [[ -e ${ROOT}/${lib} ]] || continue
1586 dir=${lib%/*} 1712 dir=${lib%/*}
1587 dodir ${dir} || die "dodir ${dir} failed" 1713 dodir ${dir} || die "dodir ${dir} failed"
1597preserve_old_lib_notify() { 1723preserve_old_lib_notify() {
1598 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1724 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1599 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only" 1725 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1600 die "Invalid preserve_old_lib_notify() usage" 1726 die "Invalid preserve_old_lib_notify() usage"
1601 fi 1727 fi
1728
1729 # let portage worry about it
1730 has preserve-libs ${FEATURES} && return 0
1602 1731
1603 local lib notice=0 1732 local lib notice=0
1604 for lib in "$@" ; do 1733 for lib in "$@" ; do
1605 [[ -e ${ROOT}/${lib} ]] || continue 1734 [[ -e ${ROOT}/${lib} ]] || continue
1606 if [[ ${notice} -eq 0 ]] ; then 1735 if [[ ${notice} -eq 0 ]] ; then
1612 ewarn "helper program, simply emerge the 'gentoolkit' package." 1741 ewarn "helper program, simply emerge the 'gentoolkit' package."
1613 ewarn 1742 ewarn
1614 fi 1743 fi
1615 ewarn " # revdep-rebuild --library ${lib##*/}" 1744 ewarn " # revdep-rebuild --library ${lib##*/}"
1616 done 1745 done
1746 if [[ ${notice} -eq 1 ]] ; then
1747 ewarn
1748 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1749 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1750 for lib in "$@" ; do
1751 ewarn " # rm '${lib}'"
1752 done
1753 fi
1617} 1754}
1618 1755
1619# @FUNCTION: built_with_use 1756# @FUNCTION: built_with_use
1620# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1757# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1621# @DESCRIPTION: 1758# @DESCRIPTION:
1625# --missing option controls the behavior if called on a package that does 1762# --missing option controls the behavior if called on a package that does
1626# not actually support the defined USE flags (aka listed in IUSE). 1763# not actually support the defined USE flags (aka listed in IUSE).
1627# The default is to abort (call die). The -a and -o flags control 1764# The default is to abort (call die). The -a and -o flags control
1628# the requirements of the USE flags. They correspond to "and" and "or" 1765# the requirements of the USE flags. They correspond to "and" and "or"
1629# logic. So the -a flag means all listed USE flags must be enabled 1766# logic. So the -a flag means all listed USE flags must be enabled
1630# while the -o flag means at least one of the listed fIUSE flags must be 1767# while the -o flag means at least one of the listed IUSE flags must be
1631# enabled. The --hidden option is really for internal use only as it 1768# enabled. The --hidden option is really for internal use only as it
1632# means the USE flag we're checking is hidden expanded, so it won't be found 1769# means the USE flag we're checking is hidden expanded, so it won't be found
1633# in IUSE like normal USE flags. 1770# in IUSE like normal USE flags.
1634# 1771#
1635# Remember that this function isn't terribly intelligent so order of optional 1772# Remember that this function isn't terribly intelligent so order of optional
1636# flags matter. 1773# flags matter.
1637built_with_use() { 1774built_with_use() {
1638 local hidden="no" 1775 local hidden="no"
1639 if [[ $1 == "--hidden" ]] ; then 1776 if [[ $1 == "--hidden" ]] ; then
1670 die) die "Unable to determine what USE flags $PKG was built with";; 1807 die) die "Unable to determine what USE flags $PKG was built with";;
1671 esac 1808 esac
1672 fi 1809 fi
1673 1810
1674 if [[ ${hidden} == "no" ]] ; then 1811 if [[ ${hidden} == "no" ]] ; then
1675 local IUSE_BUILT=$(<${IUSEFILE}) 1812 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1676 # Don't check USE_EXPAND #147237 1813 # Don't check USE_EXPAND #147237
1677 local expand 1814 local expand
1678 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1815 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1679 if [[ $1 == ${expand}_* ]] ; then 1816 if [[ $1 == ${expand}_* ]] ; then
1680 expand="" 1817 expand=""
1681 break 1818 break
1682 fi 1819 fi
1683 done 1820 done
1684 if [[ -n ${expand} ]] ; then 1821 if [[ -n ${expand} ]] ; then
1685 if ! has $1 ${IUSE_BUILT} ; then 1822 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1686 case ${missing_action} in 1823 case ${missing_action} in
1687 true) return 0;; 1824 true) return 0;;
1688 false) return 1;; 1825 false) return 1;;
1689 die) die "$PKG does not actually support the $1 USE flag!";; 1826 die) die "$PKG does not actually support the $1 USE flag!";;
1690 esac 1827 esac
1702 shift 1839 shift
1703 done 1840 done
1704 [[ ${opt} = "-a" ]] 1841 [[ ${opt} = "-a" ]]
1705} 1842}
1706 1843
1707# @DESCRIPTION: epunt_cxx 1844# @FUNCTION: epunt_cxx
1708# @USAGE: [dir to scan] 1845# @USAGE: [dir to scan]
1709# @DESCRIPTION: 1846# @DESCRIPTION:
1710# Many configure scripts wrongly bail when a C++ compiler could not be 1847# Many configure scripts wrongly bail when a C++ compiler could not be
1711# detected. If dir is not specified, then it defaults to ${S}. 1848# detected. If dir is not specified, then it defaults to ${S}.
1712# 1849#
1714epunt_cxx() { 1851epunt_cxx() {
1715 local dir=$1 1852 local dir=$1
1716 [[ -z ${dir} ]] && dir=${S} 1853 [[ -z ${dir} ]] && dir=${S}
1717 ebegin "Removing useless C++ checks" 1854 ebegin "Removing useless C++ checks"
1718 local f 1855 local f
1719 for f in $(find ${dir} -name configure) ; do 1856 find "${dir}" -name configure | while read f ; do
1720 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1857 patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1721 done 1858 done
1722 eend 0 1859 eend 0
1723} 1860}
1724 1861
1725# @FUNCTION: make_wrapper 1862# @FUNCTION: make_wrapper
1726# @USAGE: <wrapper> <target> <chdir> [libpaths] [installpath] 1863# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1727# @DESCRIPTION: 1864# @DESCRIPTION:
1728# Create a shell wrapper script named wrapper in installpath 1865# Create a shell wrapper script named wrapper in installpath
1729# (defaults to the bindir) to execute target (default of wrapper) by 1866# (defaults to the bindir) to execute target (default of wrapper) by
1730# first optionally setting LD_LIBRARY_PATH to the colon-delimited 1867# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1731# libpaths followed by optionally changing directory to chdir. 1868# libpaths followed by optionally changing directory to chdir.
1754 ) || die 1891 ) || die
1755 else 1892 else
1756 newbin "${tmpwrapper}" "${wrapper}" || die 1893 newbin "${tmpwrapper}" "${wrapper}" || die
1757 fi 1894 fi
1758} 1895}
1896
1897# @FUNCTION: prepalldocs
1898# @USAGE:
1899# @DESCRIPTION:
1900# Compress files in /usr/share/doc which are not already
1901# compressed, excluding /usr/share/doc/${PF}/html.
1902# Uses the ecompressdir to do the compression.
1903# 2009-02-18 by betelgeuse:
1904# Commented because ecompressdir is even more internal to
1905# Portage than prepalldocs (it's not even mentioned in man 5
1906# ebuild). Please submit a better version for review to gentoo-dev
1907# if you want prepalldocs here.
1908#prepalldocs() {
1909# if [[ -n $1 ]] ; then
1910# ewarn "prepalldocs: invalid usage; takes no arguments"
1911# fi
1912
1913# cd "${D}"
1914# [[ -d usr/share/doc ]] || return 0
1915
1916# find usr/share/doc -exec gzip {} +
1917# ecompressdir --ignore /usr/share/doc/${PF}/html
1918# ecompressdir --queue /usr/share/doc
1919#}

Legend:
Removed from v.1.283  
changed lines
  Added in v.1.324

  ViewVC Help
Powered by ViewVC 1.1.20