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

Diff of /eclass/eutils.eclass

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

Revision 1.325 Revision 1.363
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2011 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.325 2010/01/09 20:06:24 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.363 2011/09/12 20:44:01 mgorny 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
17 17
18inherit multilib portability 18inherit multilib portability
19 19
20DESCRIPTION="Based on the ${ECLASS} eclass" 20DESCRIPTION="Based on the ${ECLASS} eclass"
21 21
22if has "${EAPI:-0}" 0 1 2; then
23
22# @FUNCTION: epause 24# @FUNCTION: epause
23# @USAGE: [seconds] 25# @USAGE: [seconds]
24# @DESCRIPTION: 26# @DESCRIPTION:
25# Sleep for the specified number of seconds (default of 5 seconds). Useful when 27# Sleep for the specified number of seconds (default of 5 seconds). Useful when
26# printing a message the user should probably be reading and often used in 28# printing a message the user should probably be reading and often used in
27# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set, 29# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set,
28# don't wait at all. 30# don't wait at all. Defined in EAPIs 0 1 and 2.
29epause() { 31epause() {
30 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5} 32 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
31} 33}
32 34
33# @FUNCTION: ebeep 35# @FUNCTION: ebeep
34# @USAGE: [number of beeps] 36# @USAGE: [number of beeps]
35# @DESCRIPTION: 37# @DESCRIPTION:
36# Issue the specified number of beeps (default of 5 beeps). Useful when 38# Issue the specified number of beeps (default of 5 beeps). Useful when
37# printing a message the user should probably be reading and often used in 39# printing a message the user should probably be reading and often used in
38# conjunction with the epause function. If the EBEEP_IGNORE env var is set, 40# conjunction with the epause function. If the EBEEP_IGNORE env var is set,
39# don't beep at all. 41# don't beep at all. Defined in EAPIs 0 1 and 2.
40ebeep() { 42ebeep() {
41 local n 43 local n
42 if [[ -z ${EBEEP_IGNORE} ]] ; then 44 if [[ -z ${EBEEP_IGNORE} ]] ; then
43 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 45 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
44 echo -ne "\a" 46 echo -ne "\a"
47 sleep 1 49 sleep 1
48 done 50 done
49 fi 51 fi
50} 52}
51 53
54else
55
56ebeep() {
57 ewarn "QA Notice: ebeep is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
58}
59
60epause() {
61 ewarn "QA Notice: epause is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
62}
63
64fi
65
66# @FUNCTION: eqawarn
67# @USAGE: [message]
68# @DESCRIPTION:
69# Proxy to ewarn for package managers that don't provide eqawarn and use the PM
70# implementation if available. Reuses PORTAGE_ELOG_CLASSES as set by the dev
71# profile.
72if ! declare -F eqawarn >/dev/null ; then
73 eqawarn() {
74 has qa ${PORTAGE_ELOG_CLASSES} && ewarn "$@"
75 }
76fi
77
52# @FUNCTION: ecvs_clean 78# @FUNCTION: ecvs_clean
53# @USAGE: [list of dirs] 79# @USAGE: [list of dirs]
54# @DESCRIPTION: 80# @DESCRIPTION:
55# Remove CVS directories recursiveley. Useful when a source tarball contains 81# Remove CVS directories recursiveley. Useful when a source tarball contains
56# internal CVS directories. Defaults to $PWD. 82# internal CVS directories. Defaults to $PWD.
69 [[ -z $* ]] && set -- . 95 [[ -z $* ]] && set -- .
70 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf 96 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
71} 97}
72 98
73# @FUNCTION: eshopts_push 99# @FUNCTION: eshopts_push
74# @USAGE: [options to `set`] 100# @USAGE: [options to `set` or `shopt`]
75# @DESCRIPTION: 101# @DESCRIPTION:
76# Often times code will want to enable a shell option to change code behavior. 102# 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 103# 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 104# 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. 105# options onto a stack and (2) pass the specified arguments to set.
106#
107# If the first argument is '-s' or '-u', we assume you want to call `shopt`
108# rather than `set` as there are some options only available via that.
80# 109#
81# A common example is to disable shell globbing so that special meaning/care 110# 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: 111# may be used with variables/arguments to custom functions. That would be:
83# @CODE 112# @CODE
84# eshopts_push -o noglob 113# eshopts_push -o noglob
92# @CODE 121# @CODE
93eshopts_push() { 122eshopts_push() {
94 # have to assume __ESHOPTS_SAVE__ isn't screwed with 123 # have to assume __ESHOPTS_SAVE__ isn't screwed with
95 # as a `declare -a` here will reset its value 124 # as a `declare -a` here will reset its value
96 local i=${#__ESHOPTS_SAVE__[@]} 125 local i=${#__ESHOPTS_SAVE__[@]}
126 if [[ $1 == -[su] ]] ; then
97 __ESHOPTS_SAVE__[$i]=$- 127 __ESHOPTS_SAVE__[$i]=$(shopt -p)
98 [[ $# -eq 0 ]] && return 0 128 [[ $# -eq 0 ]] && return 0
129 shopt "$@" || die "eshopts_push: bad options to shopt: $*"
130 else
131 __ESHOPTS_SAVE__[$i]=$-
132 [[ $# -eq 0 ]] && return 0
99 set "$@" || die "eshopts_push: bad options to set: $*" 133 set "$@" || die "eshopts_push: bad options to set: $*"
134 fi
100} 135}
101 136
102# @FUNCTION: eshopts_pop 137# @FUNCTION: eshopts_pop
103# @USAGE: 138# @USAGE:
104# @DESCRIPTION: 139# @DESCRIPTION:
108 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments" 143 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
109 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 )) 144 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
110 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair" 145 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
111 local s=${__ESHOPTS_SAVE__[$i]} 146 local s=${__ESHOPTS_SAVE__[$i]}
112 unset __ESHOPTS_SAVE__[$i] 147 unset __ESHOPTS_SAVE__[$i]
148 if [[ ${s} == "shopt -"* ]] ; then
149 eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
150 else
113 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-" 151 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
114 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}" 152 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
153 fi
115} 154}
116 155
117# @VARIABLE: EPATCH_SOURCE 156# @VARIABLE: EPATCH_SOURCE
118# @DESCRIPTION: 157# @DESCRIPTION:
119# Default directory to search for patches. 158# Default directory to search for patches.
162# If you do not specify any options, then epatch will default to the directory 201# If you do not specify any options, then epatch will default to the directory
163# specified by EPATCH_SOURCE. 202# specified by EPATCH_SOURCE.
164# 203#
165# When processing directories, epatch will apply all patches that match: 204# When processing directories, epatch will apply all patches that match:
166# @CODE 205# @CODE
167# ${EPATCH_FORCE} == "yes" 206# if ${EPATCH_FORCE} != "yes"
168# ??_${ARCH}_foo.${EPATCH_SUFFIX} 207# ??_${ARCH}_foo.${EPATCH_SUFFIX}
169# else 208# else
170# *.${EPATCH_SUFFIX} 209# *.${EPATCH_SUFFIX}
171# @CODE 210# @CODE
172# The leading ?? are typically numbers used to force consistent patch ordering. 211# The leading ?? are typically numbers used to force consistent patch ordering.
211 local EPATCH_SUFFIX=$1 250 local EPATCH_SUFFIX=$1
212 251
213 elif [[ -d $1 ]] ; then 252 elif [[ -d $1 ]] ; then
214 # Some people like to make dirs of patches w/out suffixes (vim) 253 # Some people like to make dirs of patches w/out suffixes (vim)
215 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"} 254 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
255
256 elif [[ -f ${EPATCH_SOURCE}/$1 ]] ; then
257 # Re-use EPATCH_SOURCE as a search dir
258 epatch "${EPATCH_SOURCE}/$1"
259 return $?
216 260
217 else 261 else
218 # sanity check ... if it isn't a dir or file, wtf man ? 262 # sanity check ... if it isn't a dir or file, wtf man ?
219 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1 263 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
220 echo 264 echo
251 # ???_arch_foo.patch 295 # ???_arch_foo.patch
252 # Else, skip this input altogether 296 # Else, skip this input altogether
253 local a=${patchname#*_} # strip the ???_ 297 local a=${patchname#*_} # strip the ???_
254 a=${a%%_*} # strip the _foo.patch 298 a=${a%%_*} # strip the _foo.patch
255 if ! [[ ${SINGLE_PATCH} == "yes" || \ 299 if ! [[ ${SINGLE_PATCH} == "yes" || \
256 ${EPATCH_FORCE} == "yes" || \ 300 ${EPATCH_FORCE} == "yes" || \
257 ${a} == all || \ 301 ${a} == all || \
258 ${a} == ${ARCH} ]] 302 ${a} == ${ARCH} ]]
259 then 303 then
260 continue 304 continue
261 fi 305 fi
262 306
263 # Let people filter things dynamically 307 # Let people filter things dynamically
267 311
268 local ex 312 local ex
269 for ex in ${EPATCH_EXCLUDE} ; do 313 for ex in ${EPATCH_EXCLUDE} ; do
270 if [[ ${patchname} == ${ex} ]] ; then 314 if [[ ${patchname} == ${ex} ]] ; then
271 eshopts_pop 315 eshopts_pop
272 continue 316 continue 2
273 fi 317 fi
274 done 318 done
319
275 eshopts_pop 320 eshopts_pop
276 fi 321 fi
277 322
278 if [[ ${SINGLE_PATCH} == "yes" ]] ; then 323 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
279 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then 324 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
319 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }') 364 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
320 if [[ -n ${abs_paths} ]] ; then 365 if [[ -n ${abs_paths} ]] ; then
321 count=1 366 count=1
322 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}" 367 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
323 fi 368 fi
369 # Similar reason, but with relative paths.
370 local rel_paths=$(egrep -n '^[-+]{3} [^ ]*[.][.]/' "${PATCH_TARGET}")
371 if [[ -n ${rel_paths} ]] ; then
372 eqawarn "QA Notice: Your patch uses relative paths '../'."
373 eqawarn " In the future this will cause a failure."
374 eqawarn "${rel_paths}"
375 fi
324 376
325 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/ 377 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
326 while [[ ${count} -lt 5 ]] ; do 378 while [[ ${count} -lt 5 ]] ; do
327 # Generate some useful debug info ... 379 # Generate some useful debug info ...
328 ( 380 (
329 _epatch_draw_line "***** ${patchname} *****" 381 _epatch_draw_line "***** ${patchname} *****"
330 echo 382 echo
331 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'" 383 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
332 echo 384 echo
333 _epatch_draw_line "***** ${patchname} *****" 385 _epatch_draw_line "***** ${patchname} *****"
386 patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}" 2>&1
387 ret=$?
388 echo
389 echo "patch program exited with status ${ret}"
390 exit ${ret}
334 ) >> "${STDERR_TARGET}" 391 ) >> "${STDERR_TARGET}"
335 392
336 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then 393 if [ $? -eq 0 ] ; then
337 ( 394 (
338 _epatch_draw_line "***** ${patchname} *****" 395 _epatch_draw_line "***** ${patchname} *****"
339 echo 396 echo
340 echo "ACTUALLY APPLYING ${patchname} ..." 397 echo "ACTUALLY APPLYING ${patchname} ..."
341 echo 398 echo
342 _epatch_draw_line "***** ${patchname} *****" 399 _epatch_draw_line "***** ${patchname} *****"
343 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1 400 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
401 ret=$?
402 echo
403 echo "patch program exited with status ${ret}"
404 exit ${ret}
344 ) >> "${STDERR_TARGET}" 405 ) >> "${STDERR_TARGET}"
345 406
346 if [ $? -ne 0 ] ; then 407 if [ $? -ne 0 ] ; then
347 echo 408 echo
348 eerror "A dry-run of patch command succeeded, but actually" 409 eerror "A dry-run of patch command succeeded, but actually"
379 done 440 done
380 441
381 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching" 442 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
382 : # everything worked 443 : # everything worked
383} 444}
445
446# @FUNCTION: epatch_user
447# @USAGE:
448# @DESCRIPTION:
449# Applies user-provided patches to the source tree. The patches are
450# taken from /etc/portage/patches/<CATEGORY>/<PF|P|PN>/, where the first
451# of these three directories to exist will be the one to use, ignoring
452# any more general directories which might exist as well.
453#
454# User patches are intended for quick testing of patches without ebuild
455# modifications, as well as for permanent customizations a user might
456# desire. Obviously, there can be no official support for arbitrarily
457# patched ebuilds. So whenever a build log in a bug report mentions that
458# user patches were applied, the user should be asked to reproduce the
459# problem without these.
460#
461# Not all ebuilds do call this function, so placing patches in the
462# stated directory might or might not work, depending on the package and
463# the eclasses it inherits and uses. It is safe to call the function
464# repeatedly, so it is always possible to add a call at the ebuild
465# level. The first call is the time when the patches will be
466# applied.
467#
468# Ideally, this function should be called after gentoo-specific patches
469# have been applied, so that their code can be modified as well, but
470# before calls to e.g. eautoreconf, as the user patches might affect
471# autotool input files as well.
384epatch_user() { 472epatch_user() {
385 [[ $# -ne 0 ]] && die "epatch_user takes no options" 473 [[ $# -ne 0 ]] && die "epatch_user takes no options"
474
475 # Allow multiple calls to this function; ignore all but the first
476 local applied="${T}/epatch_user.applied"
477 [[ -e ${applied} ]] && return 2
386 478
387 # don't clobber any EPATCH vars that the parent might want 479 # don't clobber any EPATCH vars that the parent might want
388 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches 480 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
389 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do 481 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
390 EPATCH_SOURCE=${base}/${CTARGET}/${check} 482 EPATCH_SOURCE=${base}/${CTARGET}/${check}
394 EPATCH_SOURCE=${EPATCH_SOURCE} \ 486 EPATCH_SOURCE=${EPATCH_SOURCE} \
395 EPATCH_SUFFIX="patch" \ 487 EPATCH_SUFFIX="patch" \
396 EPATCH_FORCE="yes" \ 488 EPATCH_FORCE="yes" \
397 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \ 489 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
398 epatch 490 epatch
399 break 491 echo "${EPATCH_SOURCE}" > "${applied}"
492 return 0
400 fi 493 fi
401 done 494 done
495 echo "none" > "${applied}"
496 return 1
402} 497}
403 498
404# @FUNCTION: emktemp 499# @FUNCTION: emktemp
405# @USAGE: [temp dir] 500# @USAGE: [temp dir]
406# @DESCRIPTION: 501# @DESCRIPTION:
450egetent() { 545egetent() {
451 case ${CHOST} in 546 case ${CHOST} in
452 *-darwin[678]) 547 *-darwin[678])
453 case "$2" in 548 case "$2" in
454 *[!0-9]*) # Non numeric 549 *[!0-9]*) # Non numeric
455 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 550 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2\$/) {print \$0;exit;} }"
456 ;; 551 ;;
457 *) # Numeric 552 *) # Numeric
458 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 553 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
459 ;; 554 ;;
460 esac 555 esac
678 fi 773 fi
679 ;; 774 ;;
680 775
681 *) 776 *)
682 if [[ -z $@ ]] ; then 777 if [[ -z $@ ]] ; then
683 useradd ${opts} \ 778 useradd -r ${opts} \
684 -c "added by portage for ${PN}" \ 779 -c "added by portage for ${PN}" \
685 ${euser} \ 780 ${euser} \
686 || die "enewuser failed" 781 || die "enewuser failed"
687 else 782 else
688 einfo " - Extra: $@" 783 einfo " - Extra: $@"
689 useradd ${opts} "$@" \ 784 useradd -r ${opts} "$@" \
690 ${euser} \ 785 ${euser} \
691 || die "enewuser failed" 786 || die "enewuser failed"
692 fi 787 fi
693 ;; 788 ;;
694 esac 789 esac
807 esac 902 esac
808 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 903 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
809 ;; 904 ;;
810 905
811 *) 906 *)
907 # We specify -r so that we get a GID in the system range from login.defs
812 groupadd ${opts} ${egroup} || die "enewgroup failed" 908 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
813 ;; 909 ;;
814 esac 910 esac
815 export SANDBOX_ON="${oldsandbox}" 911 export SANDBOX_ON="${oldsandbox}"
816} 912}
817 913
828 924
829# Make a desktop file ! 925# Make a desktop file !
830# Great for making those icons in kde/gnome startmenu ! 926# Great for making those icons in kde/gnome startmenu !
831# Amaze your friends ! Get the women ! Join today ! 927# Amaze your friends ! Get the women ! Join today !
832# 928#
833# make_desktop_entry(<command>, [name], [icon], [type], [path]) 929# make_desktop_entry(<command>, [name], [icon], [type], [fields])
834# 930#
835# binary: what command does the app run with ? 931# binary: what command does the app run with ?
836# name: the name that will show up in the menu 932# name: the name that will show up in the menu
837# icon: give your little like a pretty little icon ... 933# icon: give your little like a pretty little icon ...
838# this can be relative (to /usr/share/pixmaps) or 934# this can be relative (to /usr/share/pixmaps) or
839# a full path to an icon 935# a full path to an icon
840# type: what kind of application is this ? for categories: 936# type: what kind of application is this ? for categories:
841# http://standards.freedesktop.org/menu-spec/latest/apa.html 937# http://standards.freedesktop.org/menu-spec/latest/apa.html
842# path: if your app needs to startup in a specific dir 938# fields: extra fields to append to the desktop file; a printf string
843make_desktop_entry() { 939make_desktop_entry() {
844 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 940 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
845 941
846 local exec=${1} 942 local exec=${1}
847 local name=${2:-${PN}} 943 local name=${2:-${PN}}
848 local icon=${3:-${PN}} 944 local icon=${3:-${PN}}
849 local type=${4} 945 local type=${4}
850 local path=${5} 946 local fields=${5}
851 947
852 if [[ -z ${type} ]] ; then 948 if [[ -z ${type} ]] ; then
853 local catmaj=${CATEGORY%%-*} 949 local catmaj=${CATEGORY%%-*}
854 local catmin=${CATEGORY##*-} 950 local catmin=${CATEGORY##*-}
855 case ${catmaj} in 951 case ${catmaj} in
856 app) 952 app)
857 case ${catmin} in 953 case ${catmin} in
858 accessibility) type=Accessibility;; 954 accessibility) type=Accessibility;;
859 admin) type=System;; 955 admin) type=System;;
860 antivirus) type=System;; 956 antivirus) type=System;;
861 arch) type=Archiving;; 957 arch) type=Archiving;;
862 backup) type=Archiving;; 958 backup) type=Archiving;;
863 cdr) type=DiscBurning;; 959 cdr) type=DiscBurning;;
864 dicts) type=Dictionary;; 960 dicts) type=Dictionary;;
865 doc) type=Documentation;; 961 doc) type=Documentation;;
866 editors) type=TextEditor;; 962 editors) type=TextEditor;;
867 emacs) type=TextEditor;; 963 emacs) type=TextEditor;;
868 emulation) type=Emulator;; 964 emulation) type=Emulator;;
869 laptop) type=HardwareSettings;; 965 laptop) type=HardwareSettings;;
870 office) type=Office;; 966 office) type=Office;;
871 pda) type=PDA;; 967 pda) type=PDA;;
872 vim) type=TextEditor;; 968 vim) type=TextEditor;;
873 xemacs) type=TextEditor;; 969 xemacs) type=TextEditor;;
874 *) type=;;
875 esac 970 esac
876 ;; 971 ;;
877 972
878 dev) 973 dev)
879 type="Development" 974 type="Development"
880 ;; 975 ;;
881 976
882 games) 977 games)
883 case ${catmin} in 978 case ${catmin} in
884 action|fps) type=ActionGame;; 979 action|fps) type=ActionGame;;
885 arcade) type=ArcadeGame;; 980 arcade) type=ArcadeGame;;
886 board) type=BoardGame;; 981 board) type=BoardGame;;
887 emulation) type=Emulator;; 982 emulation) type=Emulator;;
888 kids) type=KidsGame;; 983 kids) type=KidsGame;;
889 puzzle) type=LogicGame;; 984 puzzle) type=LogicGame;;
890 roguelike) type=RolePlaying;; 985 roguelike) type=RolePlaying;;
891 rpg) type=RolePlaying;; 986 rpg) type=RolePlaying;;
892 simulation) type=Simulation;; 987 simulation) type=Simulation;;
893 sports) type=SportsGame;; 988 sports) type=SportsGame;;
894 strategy) type=StrategyGame;; 989 strategy) type=StrategyGame;;
895 *) type=;;
896 esac 990 esac
897 type="Game;${type}" 991 type="Game;${type}"
898 ;; 992 ;;
899 993
900 gnome) 994 gnome)
909 type="Network;Email" 1003 type="Network;Email"
910 ;; 1004 ;;
911 1005
912 media) 1006 media)
913 case ${catmin} in 1007 case ${catmin} in
1008 gfx)
914 gfx) type=Graphics;; 1009 type=Graphics
1010 ;;
1011 *)
1012 case ${catmin} in
915 radio) type=Tuner;; 1013 radio) type=Tuner;;
916 sound) type=Audio;; 1014 sound) type=Audio;;
917 tv) type=TV;; 1015 tv) type=TV;;
918 video) type=Video;; 1016 video) type=Video;;
919 *) type=;; 1017 esac
1018 type="AudioVideo;${type}"
1019 ;;
920 esac 1020 esac
921 type="AudioVideo;${type}"
922 ;; 1021 ;;
923 1022
924 net) 1023 net)
925 case ${catmin} in 1024 case ${catmin} in
926 dialup) type=Dialup;; 1025 dialup) type=Dialup;;
927 ftp) type=FileTransfer;; 1026 ftp) type=FileTransfer;;
928 im) type=InstantMessaging;; 1027 im) type=InstantMessaging;;
929 irc) type=IRCClient;; 1028 irc) type=IRCClient;;
930 mail) type=Email;; 1029 mail) type=Email;;
931 news) type=News;; 1030 news) type=News;;
932 nntp) type=News;; 1031 nntp) type=News;;
933 p2p) type=FileTransfer;; 1032 p2p) type=FileTransfer;;
934 *) type=;; 1033 voip) type=Telephony;;
935 esac 1034 esac
936 type="Network;${type}" 1035 type="Network;${type}"
937 ;; 1036 ;;
938 1037
939 sci) 1038 sci)
940 case ${catmin} in 1039 case ${catmin} in
941 astro*) type=Astronomy;; 1040 astro*) type=Astronomy;;
942 bio*) type=Biology;; 1041 bio*) type=Biology;;
943 calc*) type=Calculator;; 1042 calc*) type=Calculator;;
944 chem*) type=Chemistry;; 1043 chem*) type=Chemistry;;
945 elec*) type=Electronics;; 1044 elec*) type=Electronics;;
946 geo*) type=Geology;; 1045 geo*) type=Geology;;
947 math*) type=Math;; 1046 math*) type=Math;;
948 physics) type=Physics;; 1047 physics) type=Physics;;
949 visual*) type=DataVisualization;; 1048 visual*) type=DataVisualization;;
950 *) type=;;
951 esac 1049 esac
952 type="Science;${type}" 1050 type="Education;Science;${type}"
953 ;; 1051 ;;
954 1052
955 sys) 1053 sys)
956 type="System" 1054 type="System"
957 ;; 1055 ;;
958 1056
959 www) 1057 www)
960 case ${catmin} in 1058 case ${catmin} in
961 client) type=WebBrowser;; 1059 client) type=WebBrowser;;
962 *) type=;;
963 esac 1060 esac
964 type="Network" 1061 type="Network;${type}"
965 ;; 1062 ;;
966 1063
967 *) 1064 *)
968 type= 1065 type=
969 ;; 1066 ;;
974 else 1071 else
975 local desktop_name="${PN}-${SLOT}" 1072 local desktop_name="${PN}-${SLOT}"
976 fi 1073 fi
977 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1074 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
978 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1075 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
1076
1077 # Don't append another ";" when a valid category value is provided.
1078 type=${type%;}${type:+;}
1079
1080 eshopts_push -s extglob
1081 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
1082 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1083 ewarn "allowed in .desktop files if the value is not an absolute path."
1084 icon=${icon%.@(xpm|png|svg)}
1085 fi
1086 eshopts_pop
979 1087
980 cat <<-EOF > "${desktop}" 1088 cat <<-EOF > "${desktop}"
981 [Desktop Entry] 1089 [Desktop Entry]
982 Name=${name} 1090 Name=${name}
983 Type=Application 1091 Type=Application
984 Comment=${DESCRIPTION} 1092 Comment=${DESCRIPTION}
985 Exec=${exec} 1093 Exec=${exec}
986 TryExec=${exec%% *} 1094 TryExec=${exec%% *}
987 Icon=${icon} 1095 Icon=${icon}
988 Categories=${type}; 1096 Categories=${type}
989 EOF 1097 EOF
990 1098
991 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1099 if [[ ${fields:-=} != *=* ]] ; then
1100 # 5th arg used to be value to Path=
1101 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
1102 fields="Path=${fields}"
1103 fi
1104 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
992 1105
993 ( 1106 (
994 # wrap the env here so that the 'insinto' call 1107 # wrap the env here so that the 'insinto' call
995 # doesn't corrupt the env of the caller 1108 # doesn't corrupt the env of the caller
996 insinto /usr/share/applications 1109 insinto /usr/share/applications
997 doins "${desktop}" 1110 doins "${desktop}"
998 ) 1111 ) || die "installing desktop file failed"
999} 1112}
1000 1113
1001# @FUNCTION: validate_desktop_entries 1114# @FUNCTION: validate_desktop_entries
1002# @USAGE: [directories] 1115# @USAGE: [directories]
1003# @MAINTAINER: 1116# @MAINTAINER:
1282 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1395 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1283 1396
1284 local shrtsrc=$(basename "${src}") 1397 local shrtsrc=$(basename "${src}")
1285 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1398 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1286 if [[ -z ${skip} ]] ; then 1399 if [[ -z ${skip} ]] ; then
1287 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1400 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1288 local skip=0 1401 local skip=0
1289 exe=tail 1402 exe=tail
1290 case ${ver} in 1403 case ${ver} in
1291 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1404 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1292 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1405 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1294 2.0|2.0.1) 1407 2.0|2.0.1)
1295 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1408 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1296 ;; 1409 ;;
1297 2.1.1) 1410 2.1.1)
1298 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1411 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1299 let skip="skip + 1" 1412 (( skip++ ))
1300 ;; 1413 ;;
1301 2.1.2) 1414 2.1.2)
1302 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1415 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1303 let skip="skip + 1" 1416 (( skip++ ))
1304 ;; 1417 ;;
1305 2.1.3) 1418 2.1.3)
1306 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1419 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1307 let skip="skip + 1" 1420 (( skip++ ))
1308 ;; 1421 ;;
1309 2.1.4|2.1.5) 1422 2.1.4|2.1.5)
1310 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1423 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1311 skip=$(head -n ${skip} "${src}" | wc -c) 1424 skip=$(head -n ${skip} "${src}" | wc -c)
1312 exe="dd" 1425 exe="dd"
1321 esac 1434 esac
1322 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1435 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1323 fi 1436 fi
1324 case ${exe} in 1437 case ${exe} in
1325 tail) exe="tail -n +${skip} '${src}'";; 1438 tail) exe="tail -n +${skip} '${src}'";;
1326 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1439 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1327 *) die "makeself cant handle exe '${exe}'" 1440 *) die "makeself cant handle exe '${exe}'"
1328 esac 1441 esac
1329 1442
1330 # lets grab the first few bytes of the file to figure out what kind of archive it is 1443 # lets grab the first few bytes of the file to figure out what kind of archive it is
1331 local tmpfile=$(emktemp) 1444 local filetype tmpfile=$(emktemp)
1332 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1445 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1333 local filetype=$(file -b "${tmpfile}") 1446 filetype=$(file -b "${tmpfile}") || die
1334 case ${filetype} in 1447 case ${filetype} in
1335 *tar\ archive*) 1448 *tar\ archive*)
1336 eval ${exe} | tar --no-same-owner -xf - 1449 eval ${exe} | tar --no-same-owner -xf -
1337 ;; 1450 ;;
1338 bzip2*) 1451 bzip2*)
1464 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1577 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1465 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1578 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1466 export CDROM_SET=-1 1579 export CDROM_SET=-1
1467 for f in ${CDROM_CHECK_1//:/ } ; do 1580 for f in ${CDROM_CHECK_1//:/ } ; do
1468 ((++CDROM_SET)) 1581 ((++CDROM_SET))
1469 [[ -e ${CD_ROOT}/${f} ]] && break 1582 [[ -e ${CDROM_ROOT}/${f} ]] && break
1470 done 1583 done
1471 export CDROM_MATCH=${f} 1584 export CDROM_MATCH=${f}
1472 return 1585 return
1473 fi 1586 fi
1474 1587
1648 else 1761 else
1649 newls="" 1762 newls=""
1650 fi 1763 fi
1651 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do 1764 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1652 if [[ ${op} == "-i" ]] ; then 1765 if [[ ${op} == "-i" ]] ; then
1653 hasq ${f} ${ls} && newls="${newls} ${f}" 1766 has ${f} ${ls} && newls="${newls} ${f}"
1654 else 1767 else
1655 hasq ${f} ${ls} || newls="${newls} ${f}" 1768 has ${f} ${ls} || newls="${newls} ${f}"
1656 fi 1769 fi
1657 done 1770 done
1658 ls=${newls} 1771 ls=${newls}
1659 done 1772 done
1660 else 1773 else
1662 fi 1775 fi
1663 1776
1664 nols="" 1777 nols=""
1665 newls="" 1778 newls=""
1666 for f in ${LINGUAS} ; do 1779 for f in ${LINGUAS} ; do
1667 if hasq ${f} ${ls} ; then 1780 if has ${f} ${ls} ; then
1668 newls="${newls} ${f}" 1781 newls="${newls} ${f}"
1669 else 1782 else
1670 nols="${nols} ${f}" 1783 nols="${nols} ${f}"
1671 fi 1784 fi
1672 done 1785 done
1727 ewarn "the libraries are not being removed. You need to run revdep-rebuild" 1840 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1728 ewarn "in order to remove these old dependencies. If you do not have this" 1841 ewarn "in order to remove these old dependencies. If you do not have this"
1729 ewarn "helper program, simply emerge the 'gentoolkit' package." 1842 ewarn "helper program, simply emerge the 'gentoolkit' package."
1730 ewarn 1843 ewarn
1731 fi 1844 fi
1845 # temp hack for #348634 #357225
1846 [[ ${PN} == "mpfr" ]] && lib=${lib##*/}
1732 ewarn " # revdep-rebuild --library ${lib##*/}" 1847 ewarn " # revdep-rebuild --library '${lib}'"
1733 done 1848 done
1734 if [[ ${notice} -eq 1 ]] ; then 1849 if [[ ${notice} -eq 1 ]] ; then
1735 ewarn 1850 ewarn
1736 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1851 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1737 ewarn "delete the old libraries. Here is a copy & paste for the lazy:" 1852 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1742} 1857}
1743 1858
1744# @FUNCTION: built_with_use 1859# @FUNCTION: built_with_use
1745# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1860# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1746# @DESCRIPTION: 1861# @DESCRIPTION:
1862#
1863# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1864#
1747# A temporary hack until portage properly supports DEPENDing on USE 1865# A temporary hack until portage properly supports DEPENDing on USE
1748# flags being enabled in packages. This will check to see if the specified 1866# flags being enabled in packages. This will check to see if the specified
1749# DEPEND atom was built with the specified list of USE flags. The 1867# DEPEND atom was built with the specified list of USE flags. The
1750# --missing option controls the behavior if called on a package that does 1868# --missing option controls the behavior if called on a package that does
1751# not actually support the defined USE flags (aka listed in IUSE). 1869# not actually support the defined USE flags (aka listed in IUSE).
1880 else 1998 else
1881 newbin "${tmpwrapper}" "${wrapper}" || die 1999 newbin "${tmpwrapper}" "${wrapper}" || die
1882 fi 2000 fi
1883} 2001}
1884 2002
1885# @FUNCTION: prepalldocs 2003# @FUNCTION: path_exists
1886# @USAGE: 2004# @USAGE: [-a|-o] <paths>
1887# @DESCRIPTION: 2005# @DESCRIPTION:
1888# Compress files in /usr/share/doc which are not already 2006# Check if the specified paths exist. Works for all types of paths
1889# compressed, excluding /usr/share/doc/${PF}/html. 2007# (files/dirs/etc...). The -a and -o flags control the requirements
1890# Uses the ecompressdir to do the compression. 2008# of the paths. They correspond to "and" and "or" logic. So the -a
1891# 2009-02-18 by betelgeuse: 2009# flag means all the paths must exist while the -o flag means at least
1892# Commented because ecompressdir is even more internal to 2010# one of the paths must exist. The default behavior is "and". If no
1893# Portage than prepalldocs (it's not even mentioned in man 5 2011# paths are specified, then the return value is "false".
1894# ebuild). Please submit a better version for review to gentoo-dev 2012path_exists() {
1895# if you want prepalldocs here. 2013 local opt=$1
1896#prepalldocs() { 2014 [[ ${opt} == -[ao] ]] && shift || opt="-a"
1897# if [[ -n $1 ]] ; then
1898# ewarn "prepalldocs: invalid usage; takes no arguments"
1899# fi
1900 2015
1901# cd "${D}" 2016 # no paths -> return false
1902# [[ -d usr/share/doc ]] || return 0 2017 # same behavior as: [[ -e "" ]]
2018 [[ $# -eq 0 ]] && return 1
1903 2019
1904# find usr/share/doc -exec gzip {} + 2020 local p r=0
1905# ecompressdir --ignore /usr/share/doc/${PF}/html 2021 for p in "$@" ; do
1906# ecompressdir --queue /usr/share/doc 2022 [[ -e ${p} ]]
1907#} 2023 : $(( r += $? ))
2024 done
2025
2026 case ${opt} in
2027 -a) return $(( r != 0 )) ;;
2028 -o) return $(( r == $# )) ;;
2029 esac
2030}

Legend:
Removed from v.1.325  
changed lines
  Added in v.1.363

  ViewVC Help
Powered by ViewVC 1.1.20