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

Diff of /eclass/eutils.eclass

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

Revision 1.334 Revision 1.366
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.334 2010/02/26 03:15:26 abcd Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.366 2011/09/30 16:51:01 vapier 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
52} 52}
53 53
54else 54else
55 55
56ebeep() { 56ebeep() {
57 [[ $(type -t eqawarn) == function ]] && \
58 eqawarn "QA Notice: ebeep is not defined in EAPI=3, please file a bug at http://bugs.gentoo.org" 57 ewarn "QA Notice: ebeep is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
59} 58}
60 59
61epause() { 60epause() {
62 [[ $(type -t eqawarn) == function ]] && \
63 eqawarn "QA Notice: epause is not defined in EAPI=3, please file a bug at http://bugs.gentoo.org" 61 ewarn "QA Notice: epause is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
64} 62}
65 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 }
66fi 76fi
67 77
68# @FUNCTION: ecvs_clean 78# @FUNCTION: ecvs_clean
69# @USAGE: [list of dirs] 79# @USAGE: [list of dirs]
70# @DESCRIPTION: 80# @DESCRIPTION:
191# 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
192# specified by EPATCH_SOURCE. 202# specified by EPATCH_SOURCE.
193# 203#
194# When processing directories, epatch will apply all patches that match: 204# When processing directories, epatch will apply all patches that match:
195# @CODE 205# @CODE
196# ${EPATCH_FORCE} == "yes" 206# if ${EPATCH_FORCE} != "yes"
197# ??_${ARCH}_foo.${EPATCH_SUFFIX} 207# ??_${ARCH}_foo.${EPATCH_SUFFIX}
198# else 208# else
199# *.${EPATCH_SUFFIX} 209# *.${EPATCH_SUFFIX}
200# @CODE 210# @CODE
201# The leading ?? are typically numbers used to force consistent patch ordering. 211# The leading ?? are typically numbers used to force consistent patch ordering.
240 local EPATCH_SUFFIX=$1 250 local EPATCH_SUFFIX=$1
241 251
242 elif [[ -d $1 ]] ; then 252 elif [[ -d $1 ]] ; then
243 # 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)
244 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 $?
245 260
246 else 261 else
247 # 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 ?
248 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1 263 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
249 echo 264 echo
280 # ???_arch_foo.patch 295 # ???_arch_foo.patch
281 # Else, skip this input altogether 296 # Else, skip this input altogether
282 local a=${patchname#*_} # strip the ???_ 297 local a=${patchname#*_} # strip the ???_
283 a=${a%%_*} # strip the _foo.patch 298 a=${a%%_*} # strip the _foo.patch
284 if ! [[ ${SINGLE_PATCH} == "yes" || \ 299 if ! [[ ${SINGLE_PATCH} == "yes" || \
285 ${EPATCH_FORCE} == "yes" || \ 300 ${EPATCH_FORCE} == "yes" || \
286 ${a} == all || \ 301 ${a} == all || \
287 ${a} == ${ARCH} ]] 302 ${a} == ${ARCH} ]]
288 then 303 then
289 continue 304 continue
290 fi 305 fi
291 306
292 # Let people filter things dynamically 307 # Let people filter things dynamically
349 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 }')
350 if [[ -n ${abs_paths} ]] ; then 365 if [[ -n ${abs_paths} ]] ; then
351 count=1 366 count=1
352 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}"
353 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
354 376
355 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/ 377 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
356 while [[ ${count} -lt 5 ]] ; do 378 while [[ ${count} -lt 5 ]] ; do
357 # Generate some useful debug info ... 379 # Generate some useful debug info ...
358 ( 380 (
359 _epatch_draw_line "***** ${patchname} *****" 381 _epatch_draw_line "***** ${patchname} *****"
360 echo 382 echo
361 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'" 383 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
362 echo 384 echo
363 _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}
364 ) >> "${STDERR_TARGET}" 391 ) >> "${STDERR_TARGET}"
365 392
366 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then 393 if [ $? -eq 0 ] ; then
367 ( 394 (
368 _epatch_draw_line "***** ${patchname} *****" 395 _epatch_draw_line "***** ${patchname} *****"
369 echo 396 echo
370 echo "ACTUALLY APPLYING ${patchname} ..." 397 echo "ACTUALLY APPLYING ${patchname} ..."
371 echo 398 echo
372 _epatch_draw_line "***** ${patchname} *****" 399 _epatch_draw_line "***** ${patchname} *****"
373 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}
374 ) >> "${STDERR_TARGET}" 405 ) >> "${STDERR_TARGET}"
375 406
376 if [ $? -ne 0 ] ; then 407 if [ $? -ne 0 ] ; then
377 echo 408 echo
378 eerror "A dry-run of patch command succeeded, but actually" 409 eerror "A dry-run of patch command succeeded, but actually"
409 done 440 done
410 441
411 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching" 442 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
412 : # everything worked 443 : # everything worked
413} 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.
414epatch_user() { 472epatch_user() {
415 [[ $# -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
416 478
417 # don't clobber any EPATCH vars that the parent might want 479 # don't clobber any EPATCH vars that the parent might want
418 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches 480 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
419 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do 481 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
420 EPATCH_SOURCE=${base}/${CTARGET}/${check} 482 EPATCH_SOURCE=${base}/${CTARGET}/${check}
424 EPATCH_SOURCE=${EPATCH_SOURCE} \ 486 EPATCH_SOURCE=${EPATCH_SOURCE} \
425 EPATCH_SUFFIX="patch" \ 487 EPATCH_SUFFIX="patch" \
426 EPATCH_FORCE="yes" \ 488 EPATCH_FORCE="yes" \
427 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \ 489 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
428 epatch 490 epatch
429 break 491 echo "${EPATCH_SOURCE}" > "${applied}"
492 return 0
430 fi 493 fi
431 done 494 done
495 echo "none" > "${applied}"
496 return 1
432} 497}
433 498
434# @FUNCTION: emktemp 499# @FUNCTION: emktemp
435# @USAGE: [temp dir] 500# @USAGE: [temp dir]
436# @DESCRIPTION: 501# @DESCRIPTION:
480egetent() { 545egetent() {
481 case ${CHOST} in 546 case ${CHOST} in
482 *-darwin[678]) 547 *-darwin[678])
483 case "$2" in 548 case "$2" in
484 *[!0-9]*) # Non numeric 549 *[!0-9]*) # Non numeric
485 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 550 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2\$/) {print \$0;exit;} }"
486 ;; 551 ;;
487 *) # Numeric 552 *) # Numeric
488 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 553 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
489 ;; 554 ;;
490 esac 555 esac
708 fi 773 fi
709 ;; 774 ;;
710 775
711 *) 776 *)
712 if [[ -z $@ ]] ; then 777 if [[ -z $@ ]] ; then
713 useradd ${opts} \ 778 useradd -r ${opts} \
714 -c "added by portage for ${PN}" \ 779 -c "added by portage for ${PN}" \
715 ${euser} \ 780 ${euser} \
716 || die "enewuser failed" 781 || die "enewuser failed"
717 else 782 else
718 einfo " - Extra: $@" 783 einfo " - Extra: $@"
719 useradd ${opts} "$@" \ 784 useradd -r ${opts} "$@" \
720 ${euser} \ 785 ${euser} \
721 || die "enewuser failed" 786 || die "enewuser failed"
722 fi 787 fi
723 ;; 788 ;;
724 esac 789 esac
837 esac 902 esac
838 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 903 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
839 ;; 904 ;;
840 905
841 *) 906 *)
907 # We specify -r so that we get a GID in the system range from login.defs
842 groupadd ${opts} ${egroup} || die "enewgroup failed" 908 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
843 ;; 909 ;;
844 esac 910 esac
845 export SANDBOX_ON="${oldsandbox}" 911 export SANDBOX_ON="${oldsandbox}"
846} 912}
847 913
851# A handy replacement for dos2unix, recode, fixdos, etc... This allows you 917# A handy replacement for dos2unix, recode, fixdos, etc... This allows you
852# to remove all of these text utilities from DEPEND variables because this 918# to remove all of these text utilities from DEPEND variables because this
853# is a script based solution. Just give it a list of files to convert and 919# is a script based solution. Just give it a list of files to convert and
854# they will all be changed from the DOS CRLF format to the UNIX LF format. 920# they will all be changed from the DOS CRLF format to the UNIX LF format.
855edos2unix() { 921edos2unix() {
856 echo "$@" | xargs sed -i 's/\r$//' 922 [[ $# -eq 0 ]] && return 0
923 sed -i 's/\r$//' -- "$@" || die
857} 924}
858 925
859# Make a desktop file ! 926# Make a desktop file !
860# Great for making those icons in kde/gnome startmenu ! 927# Great for making those icons in kde/gnome startmenu !
861# Amaze your friends ! Get the women ! Join today ! 928# Amaze your friends ! Get the women ! Join today !
862# 929#
863# make_desktop_entry(<command>, [name], [icon], [type], [path]) 930# make_desktop_entry(<command>, [name], [icon], [type], [fields])
864# 931#
865# binary: what command does the app run with ? 932# binary: what command does the app run with ?
866# name: the name that will show up in the menu 933# name: the name that will show up in the menu
867# icon: give your little like a pretty little icon ... 934# icon: give your little like a pretty little icon ...
868# this can be relative (to /usr/share/pixmaps) or 935# this can be relative (to /usr/share/pixmaps) or
869# a full path to an icon 936# a full path to an icon
870# type: what kind of application is this ? for categories: 937# type: what kind of application is this ? for categories:
871# http://standards.freedesktop.org/menu-spec/latest/apa.html 938# http://standards.freedesktop.org/menu-spec/latest/apa.html
872# path: if your app needs to startup in a specific dir 939# fields: extra fields to append to the desktop file; a printf string
873make_desktop_entry() { 940make_desktop_entry() {
874 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 941 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
875 942
876 local exec=${1} 943 local exec=${1}
877 local name=${2:-${PN}} 944 local name=${2:-${PN}}
878 local icon=${3:-${PN}} 945 local icon=${3:-${PN}}
879 local type=${4} 946 local type=${4}
880 local path=${5} 947 local fields=${5}
881 948
882 if [[ -z ${type} ]] ; then 949 if [[ -z ${type} ]] ; then
883 local catmaj=${CATEGORY%%-*} 950 local catmaj=${CATEGORY%%-*}
884 local catmin=${CATEGORY##*-} 951 local catmin=${CATEGORY##*-}
885 case ${catmaj} in 952 case ${catmaj} in
886 app) 953 app)
887 case ${catmin} in 954 case ${catmin} in
888 accessibility) type=Accessibility;; 955 accessibility) type=Accessibility;;
889 admin) type=System;; 956 admin) type=System;;
890 antivirus) type=System;; 957 antivirus) type=System;;
891 arch) type=Archiving;; 958 arch) type=Archiving;;
892 backup) type=Archiving;; 959 backup) type=Archiving;;
893 cdr) type=DiscBurning;; 960 cdr) type=DiscBurning;;
894 dicts) type=Dictionary;; 961 dicts) type=Dictionary;;
895 doc) type=Documentation;; 962 doc) type=Documentation;;
896 editors) type=TextEditor;; 963 editors) type=TextEditor;;
897 emacs) type=TextEditor;; 964 emacs) type=TextEditor;;
898 emulation) type=Emulator;; 965 emulation) type=Emulator;;
899 laptop) type=HardwareSettings;; 966 laptop) type=HardwareSettings;;
900 office) type=Office;; 967 office) type=Office;;
901 pda) type=PDA;; 968 pda) type=PDA;;
902 vim) type=TextEditor;; 969 vim) type=TextEditor;;
903 xemacs) type=TextEditor;; 970 xemacs) type=TextEditor;;
904 *) type=;;
905 esac 971 esac
906 ;; 972 ;;
907 973
908 dev) 974 dev)
909 type="Development" 975 type="Development"
910 ;; 976 ;;
911 977
912 games) 978 games)
913 case ${catmin} in 979 case ${catmin} in
914 action|fps) type=ActionGame;; 980 action|fps) type=ActionGame;;
915 arcade) type=ArcadeGame;; 981 arcade) type=ArcadeGame;;
916 board) type=BoardGame;; 982 board) type=BoardGame;;
917 emulation) type=Emulator;; 983 emulation) type=Emulator;;
918 kids) type=KidsGame;; 984 kids) type=KidsGame;;
919 puzzle) type=LogicGame;; 985 puzzle) type=LogicGame;;
920 roguelike) type=RolePlaying;; 986 roguelike) type=RolePlaying;;
921 rpg) type=RolePlaying;; 987 rpg) type=RolePlaying;;
922 simulation) type=Simulation;; 988 simulation) type=Simulation;;
923 sports) type=SportsGame;; 989 sports) type=SportsGame;;
924 strategy) type=StrategyGame;; 990 strategy) type=StrategyGame;;
925 *) type=;;
926 esac 991 esac
927 type="Game;${type}" 992 type="Game;${type}"
928 ;; 993 ;;
929 994
930 gnome) 995 gnome)
939 type="Network;Email" 1004 type="Network;Email"
940 ;; 1005 ;;
941 1006
942 media) 1007 media)
943 case ${catmin} in 1008 case ${catmin} in
1009 gfx)
944 gfx) type=Graphics;; 1010 type=Graphics
1011 ;;
1012 *)
1013 case ${catmin} in
945 radio) type=Tuner;; 1014 radio) type=Tuner;;
946 sound) type=Audio;; 1015 sound) type=Audio;;
947 tv) type=TV;; 1016 tv) type=TV;;
948 video) type=Video;; 1017 video) type=Video;;
949 *) type=;; 1018 esac
1019 type="AudioVideo;${type}"
1020 ;;
950 esac 1021 esac
951 type="AudioVideo;${type}"
952 ;; 1022 ;;
953 1023
954 net) 1024 net)
955 case ${catmin} in 1025 case ${catmin} in
956 dialup) type=Dialup;; 1026 dialup) type=Dialup;;
957 ftp) type=FileTransfer;; 1027 ftp) type=FileTransfer;;
958 im) type=InstantMessaging;; 1028 im) type=InstantMessaging;;
959 irc) type=IRCClient;; 1029 irc) type=IRCClient;;
960 mail) type=Email;; 1030 mail) type=Email;;
961 news) type=News;; 1031 news) type=News;;
962 nntp) type=News;; 1032 nntp) type=News;;
963 p2p) type=FileTransfer;; 1033 p2p) type=FileTransfer;;
964 voip) type=Telephony;; 1034 voip) type=Telephony;;
965 *) type=;;
966 esac 1035 esac
967 type="Network;${type}" 1036 type="Network;${type}"
968 ;; 1037 ;;
969 1038
970 sci) 1039 sci)
971 case ${catmin} in 1040 case ${catmin} in
972 astro*) type=Astronomy;; 1041 astro*) type=Astronomy;;
973 bio*) type=Biology;; 1042 bio*) type=Biology;;
974 calc*) type=Calculator;; 1043 calc*) type=Calculator;;
975 chem*) type=Chemistry;; 1044 chem*) type=Chemistry;;
976 elec*) type=Electronics;; 1045 elec*) type=Electronics;;
977 geo*) type=Geology;; 1046 geo*) type=Geology;;
978 math*) type=Math;; 1047 math*) type=Math;;
979 physics) type=Physics;; 1048 physics) type=Physics;;
980 visual*) type=DataVisualization;; 1049 visual*) type=DataVisualization;;
981 *) type=;;
982 esac 1050 esac
983 type="Education;Science;${type}" 1051 type="Education;Science;${type}"
984 ;; 1052 ;;
985 1053
986 sys) 1054 sys)
988 ;; 1056 ;;
989 1057
990 www) 1058 www)
991 case ${catmin} in 1059 case ${catmin} in
992 client) type=WebBrowser;; 1060 client) type=WebBrowser;;
993 *) type=;;
994 esac 1061 esac
995 type="Network;${type}" 1062 type="Network;${type}"
996 ;; 1063 ;;
997 1064
998 *) 1065 *)
1010 1077
1011 # Don't append another ";" when a valid category value is provided. 1078 # Don't append another ";" when a valid category value is provided.
1012 type=${type%;}${type:+;} 1079 type=${type%;}${type:+;}
1013 1080
1014 eshopts_push -s extglob 1081 eshopts_push -s extglob
1015 if [[ -n ${icon} && ${icon} != /* && ${icon} == *.@(xpm|png|svg) ]]; then 1082 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
1016 ewarn "As described in the Icon Theme Specification, icon file extensions are not" 1083 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1017 ewarn "allowed in .desktop files if the value is not an absolute path." 1084 ewarn "allowed in .desktop files if the value is not an absolute path."
1018 icon=${icon%.@(xpm|png|svg)} 1085 icon=${icon%.@(xpm|png|svg)}
1019 fi 1086 fi
1020 eshopts_pop 1087 eshopts_pop
1028 TryExec=${exec%% *} 1095 TryExec=${exec%% *}
1029 Icon=${icon} 1096 Icon=${icon}
1030 Categories=${type} 1097 Categories=${type}
1031 EOF 1098 EOF
1032 1099
1033 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1100 if [[ ${fields:-=} != *=* ]] ; then
1101 # 5th arg used to be value to Path=
1102 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
1103 fields="Path=${fields}"
1104 fi
1105 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
1034 1106
1035 ( 1107 (
1036 # wrap the env here so that the 'insinto' call 1108 # wrap the env here so that the 'insinto' call
1037 # doesn't corrupt the env of the caller 1109 # doesn't corrupt the env of the caller
1038 insinto /usr/share/applications 1110 insinto /usr/share/applications
1039 doins "${desktop}" 1111 doins "${desktop}"
1040 ) 1112 ) || die "installing desktop file failed"
1041} 1113}
1042 1114
1043# @FUNCTION: validate_desktop_entries 1115# @FUNCTION: validate_desktop_entries
1044# @USAGE: [directories] 1116# @USAGE: [directories]
1045# @MAINTAINER: 1117# @MAINTAINER:
1324 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1396 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1325 1397
1326 local shrtsrc=$(basename "${src}") 1398 local shrtsrc=$(basename "${src}")
1327 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1399 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1328 if [[ -z ${skip} ]] ; then 1400 if [[ -z ${skip} ]] ; then
1329 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1401 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1330 local skip=0 1402 local skip=0
1331 exe=tail 1403 exe=tail
1332 case ${ver} in 1404 case ${ver} in
1333 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1405 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1334 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1406 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1336 2.0|2.0.1) 1408 2.0|2.0.1)
1337 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1409 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1338 ;; 1410 ;;
1339 2.1.1) 1411 2.1.1)
1340 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1412 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1341 let skip="skip + 1" 1413 (( skip++ ))
1342 ;; 1414 ;;
1343 2.1.2) 1415 2.1.2)
1344 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1416 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1345 let skip="skip + 1" 1417 (( skip++ ))
1346 ;; 1418 ;;
1347 2.1.3) 1419 2.1.3)
1348 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1420 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1349 let skip="skip + 1" 1421 (( skip++ ))
1350 ;; 1422 ;;
1351 2.1.4|2.1.5) 1423 2.1.4|2.1.5)
1352 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1424 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1353 skip=$(head -n ${skip} "${src}" | wc -c) 1425 skip=$(head -n ${skip} "${src}" | wc -c)
1354 exe="dd" 1426 exe="dd"
1363 esac 1435 esac
1364 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1436 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1365 fi 1437 fi
1366 case ${exe} in 1438 case ${exe} in
1367 tail) exe="tail -n +${skip} '${src}'";; 1439 tail) exe="tail -n +${skip} '${src}'";;
1368 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1440 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1369 *) die "makeself cant handle exe '${exe}'" 1441 *) die "makeself cant handle exe '${exe}'"
1370 esac 1442 esac
1371 1443
1372 # lets grab the first few bytes of the file to figure out what kind of archive it is 1444 # lets grab the first few bytes of the file to figure out what kind of archive it is
1373 local tmpfile=$(emktemp) 1445 local filetype tmpfile=$(emktemp)
1374 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1446 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1375 local filetype=$(file -b "${tmpfile}") 1447 filetype=$(file -b "${tmpfile}") || die
1376 case ${filetype} in 1448 case ${filetype} in
1377 *tar\ archive*) 1449 *tar\ archive*)
1378 eval ${exe} | tar --no-same-owner -xf - 1450 eval ${exe} | tar --no-same-owner -xf -
1379 ;; 1451 ;;
1380 bzip2*) 1452 bzip2*)
1506 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1578 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1507 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1579 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1508 export CDROM_SET=-1 1580 export CDROM_SET=-1
1509 for f in ${CDROM_CHECK_1//:/ } ; do 1581 for f in ${CDROM_CHECK_1//:/ } ; do
1510 ((++CDROM_SET)) 1582 ((++CDROM_SET))
1511 [[ -e ${CD_ROOT}/${f} ]] && break 1583 [[ -e ${CDROM_ROOT}/${f} ]] && break
1512 done 1584 done
1513 export CDROM_MATCH=${f} 1585 export CDROM_MATCH=${f}
1514 return 1586 return
1515 fi 1587 fi
1516 1588
1690 else 1762 else
1691 newls="" 1763 newls=""
1692 fi 1764 fi
1693 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do 1765 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1694 if [[ ${op} == "-i" ]] ; then 1766 if [[ ${op} == "-i" ]] ; then
1695 hasq ${f} ${ls} && newls="${newls} ${f}" 1767 has ${f} ${ls} && newls="${newls} ${f}"
1696 else 1768 else
1697 hasq ${f} ${ls} || newls="${newls} ${f}" 1769 has ${f} ${ls} || newls="${newls} ${f}"
1698 fi 1770 fi
1699 done 1771 done
1700 ls=${newls} 1772 ls=${newls}
1701 done 1773 done
1702 else 1774 else
1704 fi 1776 fi
1705 1777
1706 nols="" 1778 nols=""
1707 newls="" 1779 newls=""
1708 for f in ${LINGUAS} ; do 1780 for f in ${LINGUAS} ; do
1709 if hasq ${f} ${ls} ; then 1781 if has ${f} ${ls} ; then
1710 newls="${newls} ${f}" 1782 newls="${newls} ${f}"
1711 else 1783 else
1712 nols="${nols} ${f}" 1784 nols="${nols} ${f}"
1713 fi 1785 fi
1714 done 1786 done
1769 ewarn "the libraries are not being removed. You need to run revdep-rebuild" 1841 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1770 ewarn "in order to remove these old dependencies. If you do not have this" 1842 ewarn "in order to remove these old dependencies. If you do not have this"
1771 ewarn "helper program, simply emerge the 'gentoolkit' package." 1843 ewarn "helper program, simply emerge the 'gentoolkit' package."
1772 ewarn 1844 ewarn
1773 fi 1845 fi
1846 # temp hack for #348634 #357225
1847 [[ ${PN} == "mpfr" ]] && lib=${lib##*/}
1774 ewarn " # revdep-rebuild --library ${lib##*/}" 1848 ewarn " # revdep-rebuild --library '${lib}'"
1775 done 1849 done
1776 if [[ ${notice} -eq 1 ]] ; then 1850 if [[ ${notice} -eq 1 ]] ; then
1777 ewarn 1851 ewarn
1778 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1852 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1779 ewarn "delete the old libraries. Here is a copy & paste for the lazy:" 1853 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1925 else 1999 else
1926 newbin "${tmpwrapper}" "${wrapper}" || die 2000 newbin "${tmpwrapper}" "${wrapper}" || die
1927 fi 2001 fi
1928} 2002}
1929 2003
1930# @FUNCTION: prepalldocs 2004# @FUNCTION: path_exists
1931# @USAGE: 2005# @USAGE: [-a|-o] <paths>
1932# @DESCRIPTION: 2006# @DESCRIPTION:
1933# Compress files in /usr/share/doc which are not already 2007# Check if the specified paths exist. Works for all types of paths
1934# compressed, excluding /usr/share/doc/${PF}/html. 2008# (files/dirs/etc...). The -a and -o flags control the requirements
1935# Uses the ecompressdir to do the compression. 2009# of the paths. They correspond to "and" and "or" logic. So the -a
1936# 2009-02-18 by betelgeuse: 2010# flag means all the paths must exist while the -o flag means at least
1937# Commented because ecompressdir is even more internal to 2011# one of the paths must exist. The default behavior is "and". If no
1938# Portage than prepalldocs (it's not even mentioned in man 5 2012# paths are specified, then the return value is "false".
1939# ebuild). Please submit a better version for review to gentoo-dev 2013path_exists() {
1940# if you want prepalldocs here. 2014 local opt=$1
1941#prepalldocs() { 2015 [[ ${opt} == -[ao] ]] && shift || opt="-a"
1942# if [[ -n $1 ]] ; then
1943# ewarn "prepalldocs: invalid usage; takes no arguments"
1944# fi
1945 2016
1946# cd "${D}" 2017 # no paths -> return false
1947# [[ -d usr/share/doc ]] || return 0 2018 # same behavior as: [[ -e "" ]]
2019 [[ $# -eq 0 ]] && return 1
1948 2020
1949# find usr/share/doc -exec gzip {} + 2021 local p r=0
1950# ecompressdir --ignore /usr/share/doc/${PF}/html 2022 for p in "$@" ; do
1951# ecompressdir --queue /usr/share/doc 2023 [[ -e ${p} ]]
1952#} 2024 : $(( r += $? ))
2025 done
2026
2027 case ${opt} in
2028 -a) return $(( r != 0 )) ;;
2029 -o) return $(( r == $# )) ;;
2030 esac
2031}
2032
2033# @FUNCTION: in_iuse
2034# @USAGE: <flag>
2035# @DESCRIPTION:
2036# Determines whether the given flag is in IUSE. Strips IUSE default prefixes
2037# as necessary.
2038#
2039# Note that this function should not be used in the global scope.
2040in_iuse() {
2041 debug-print-function ${FUNCNAME} "${@}"
2042 [[ ${#} -eq 1 ]] || die "Invalid args to ${FUNCNAME}()"
2043
2044 local flag=${1}
2045 local liuse=( ${IUSE} )
2046
2047 has "${flag}" "${liuse[@]#[+-]}"
2048}
2049
2050# @FUNCTION: usex
2051# @USAGE: <USE flag> [true output] [false output] [true suffix] [false suffix]
2052# @DESCRIPTION:
2053# If USE flag is set, echo [true output][true suffix] (defaults to "yes"),
2054# otherwise echo [false output][false suffix] (defaults to "no").
2055usex() { use "$1" && echo "${2-yes}$4" || echo "${3-no}$5" ; } #382963

Legend:
Removed from v.1.334  
changed lines
  Added in v.1.366

  ViewVC Help
Powered by ViewVC 1.1.20