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

Diff of /eclass/eutils.eclass

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

Revision 1.332 Revision 1.367
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.332 2010/02/17 02:22:43 reavertm Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.367 2011/10/26 23:27:16 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 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"
58} 58}
59 59
60epause() { 60epause() {
61 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"
62} 62}
63 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 }
64fi 76fi
65 77
66# @FUNCTION: ecvs_clean 78# @FUNCTION: ecvs_clean
67# @USAGE: [list of dirs] 79# @USAGE: [list of dirs]
68# @DESCRIPTION: 80# @DESCRIPTION:
189# 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
190# specified by EPATCH_SOURCE. 202# specified by EPATCH_SOURCE.
191# 203#
192# When processing directories, epatch will apply all patches that match: 204# When processing directories, epatch will apply all patches that match:
193# @CODE 205# @CODE
194# ${EPATCH_FORCE} == "yes" 206# if ${EPATCH_FORCE} != "yes"
195# ??_${ARCH}_foo.${EPATCH_SUFFIX} 207# ??_${ARCH}_foo.${EPATCH_SUFFIX}
196# else 208# else
197# *.${EPATCH_SUFFIX} 209# *.${EPATCH_SUFFIX}
198# @CODE 210# @CODE
199# The leading ?? are typically numbers used to force consistent patch ordering. 211# The leading ?? are typically numbers used to force consistent patch ordering.
238 local EPATCH_SUFFIX=$1 250 local EPATCH_SUFFIX=$1
239 251
240 elif [[ -d $1 ]] ; then 252 elif [[ -d $1 ]] ; then
241 # 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)
242 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 $?
243 260
244 else 261 else
245 # 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 ?
246 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1 263 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
247 echo 264 echo
278 # ???_arch_foo.patch 295 # ???_arch_foo.patch
279 # Else, skip this input altogether 296 # Else, skip this input altogether
280 local a=${patchname#*_} # strip the ???_ 297 local a=${patchname#*_} # strip the ???_
281 a=${a%%_*} # strip the _foo.patch 298 a=${a%%_*} # strip the _foo.patch
282 if ! [[ ${SINGLE_PATCH} == "yes" || \ 299 if ! [[ ${SINGLE_PATCH} == "yes" || \
283 ${EPATCH_FORCE} == "yes" || \ 300 ${EPATCH_FORCE} == "yes" || \
284 ${a} == all || \ 301 ${a} == all || \
285 ${a} == ${ARCH} ]] 302 ${a} == ${ARCH} ]]
286 then 303 then
287 continue 304 continue
288 fi 305 fi
289 306
290 # Let people filter things dynamically 307 # Let people filter things dynamically
347 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 }')
348 if [[ -n ${abs_paths} ]] ; then 365 if [[ -n ${abs_paths} ]] ; then
349 count=1 366 count=1
350 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}"
351 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
352 376
353 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/ 377 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
354 while [[ ${count} -lt 5 ]] ; do 378 while [[ ${count} -lt 5 ]] ; do
355 # Generate some useful debug info ... 379 # Generate some useful debug info ...
356 ( 380 (
357 _epatch_draw_line "***** ${patchname} *****" 381 _epatch_draw_line "***** ${patchname} *****"
358 echo 382 echo
359 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'" 383 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
360 echo 384 echo
361 _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}
362 ) >> "${STDERR_TARGET}" 391 ) >> "${STDERR_TARGET}"
363 392
364 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then 393 if [ $? -eq 0 ] ; then
365 ( 394 (
366 _epatch_draw_line "***** ${patchname} *****" 395 _epatch_draw_line "***** ${patchname} *****"
367 echo 396 echo
368 echo "ACTUALLY APPLYING ${patchname} ..." 397 echo "ACTUALLY APPLYING ${patchname} ..."
369 echo 398 echo
370 _epatch_draw_line "***** ${patchname} *****" 399 _epatch_draw_line "***** ${patchname} *****"
371 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}
372 ) >> "${STDERR_TARGET}" 405 ) >> "${STDERR_TARGET}"
373 406
374 if [ $? -ne 0 ] ; then 407 if [ $? -ne 0 ] ; then
375 echo 408 echo
376 eerror "A dry-run of patch command succeeded, but actually" 409 eerror "A dry-run of patch command succeeded, but actually"
407 done 440 done
408 441
409 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching" 442 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
410 : # everything worked 443 : # everything worked
411} 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.
412epatch_user() { 472epatch_user() {
413 [[ $# -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
414 478
415 # don't clobber any EPATCH vars that the parent might want 479 # don't clobber any EPATCH vars that the parent might want
416 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches 480 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
417 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do 481 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
418 EPATCH_SOURCE=${base}/${CTARGET}/${check} 482 EPATCH_SOURCE=${base}/${CTARGET}/${check}
422 EPATCH_SOURCE=${EPATCH_SOURCE} \ 486 EPATCH_SOURCE=${EPATCH_SOURCE} \
423 EPATCH_SUFFIX="patch" \ 487 EPATCH_SUFFIX="patch" \
424 EPATCH_FORCE="yes" \ 488 EPATCH_FORCE="yes" \
425 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \ 489 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
426 epatch 490 epatch
427 break 491 echo "${EPATCH_SOURCE}" > "${applied}"
492 return 0
428 fi 493 fi
429 done 494 done
495 echo "none" > "${applied}"
496 return 1
430} 497}
431 498
432# @FUNCTION: emktemp 499# @FUNCTION: emktemp
433# @USAGE: [temp dir] 500# @USAGE: [temp dir]
434# @DESCRIPTION: 501# @DESCRIPTION:
478egetent() { 545egetent() {
479 case ${CHOST} in 546 case ${CHOST} in
480 *-darwin[678]) 547 *-darwin[678])
481 case "$2" in 548 case "$2" in
482 *[!0-9]*) # Non numeric 549 *[!0-9]*) # Non numeric
483 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 550 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2\$/) {print \$0;exit;} }"
484 ;; 551 ;;
485 *) # Numeric 552 *) # Numeric
486 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 553 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
487 ;; 554 ;;
488 esac 555 esac
706 fi 773 fi
707 ;; 774 ;;
708 775
709 *) 776 *)
710 if [[ -z $@ ]] ; then 777 if [[ -z $@ ]] ; then
711 useradd ${opts} \ 778 useradd -r ${opts} \
712 -c "added by portage for ${PN}" \ 779 -c "added by portage for ${PN}" \
713 ${euser} \ 780 ${euser} \
714 || die "enewuser failed" 781 || die "enewuser failed"
715 else 782 else
716 einfo " - Extra: $@" 783 einfo " - Extra: $@"
717 useradd ${opts} "$@" \ 784 useradd -r ${opts} "$@" \
718 ${euser} \ 785 ${euser} \
719 || die "enewuser failed" 786 || die "enewuser failed"
720 fi 787 fi
721 ;; 788 ;;
722 esac 789 esac
835 esac 902 esac
836 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 903 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
837 ;; 904 ;;
838 905
839 *) 906 *)
907 # We specify -r so that we get a GID in the system range from login.defs
840 groupadd ${opts} ${egroup} || die "enewgroup failed" 908 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
841 ;; 909 ;;
842 esac 910 esac
843 export SANDBOX_ON="${oldsandbox}" 911 export SANDBOX_ON="${oldsandbox}"
844} 912}
845 913
849# A handy replacement for dos2unix, recode, fixdos, etc... This allows you 917# A handy replacement for dos2unix, recode, fixdos, etc... This allows you
850# 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
851# 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
852# 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.
853edos2unix() { 921edos2unix() {
854 echo "$@" | xargs sed -i 's/\r$//' 922 [[ $# -eq 0 ]] && return 0
923 sed -i 's/\r$//' -- "$@" || die
855} 924}
856 925
857# Make a desktop file ! 926# Make a desktop file !
858# Great for making those icons in kde/gnome startmenu ! 927# Great for making those icons in kde/gnome startmenu !
859# Amaze your friends ! Get the women ! Join today ! 928# Amaze your friends ! Get the women ! Join today !
860# 929#
861# make_desktop_entry(<command>, [name], [icon], [type], [path]) 930# make_desktop_entry(<command>, [name], [icon], [type], [fields])
862# 931#
863# binary: what command does the app run with ? 932# binary: what command does the app run with ?
864# name: the name that will show up in the menu 933# name: the name that will show up in the menu
865# icon: give your little like a pretty little icon ... 934# icon: give your little like a pretty little icon ...
866# this can be relative (to /usr/share/pixmaps) or 935# this can be relative (to /usr/share/pixmaps) or
867# a full path to an icon 936# a full path to an icon
868# type: what kind of application is this ? for categories: 937# type: what kind of application is this ? for categories:
869# http://standards.freedesktop.org/menu-spec/latest/apa.html 938# http://standards.freedesktop.org/menu-spec/latest/apa.html
870# path: if your app needs to startup in a specific dir 939# fields: extra fields to append to the desktop file; a printf string
871make_desktop_entry() { 940make_desktop_entry() {
872 [[ -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"
873 942
874 local exec=${1} 943 local exec=${1}
875 local name=${2:-${PN}} 944 local name=${2:-${PN}}
876 local icon=${3:-${PN}} 945 local icon=${3:-${PN}}
877 local type=${4} 946 local type=${4}
878 local path=${5} 947 local fields=${5}
879 948
880 if [[ -z ${type} ]] ; then 949 if [[ -z ${type} ]] ; then
881 local catmaj=${CATEGORY%%-*} 950 local catmaj=${CATEGORY%%-*}
882 local catmin=${CATEGORY##*-} 951 local catmin=${CATEGORY##*-}
883 case ${catmaj} in 952 case ${catmaj} in
884 app) 953 app)
885 case ${catmin} in 954 case ${catmin} in
886 accessibility) type=Accessibility;; 955 accessibility) type=Accessibility;;
887 admin) type=System;; 956 admin) type=System;;
888 antivirus) type=System;; 957 antivirus) type=System;;
889 arch) type=Archiving;; 958 arch) type=Archiving;;
890 backup) type=Archiving;; 959 backup) type=Archiving;;
891 cdr) type=DiscBurning;; 960 cdr) type=DiscBurning;;
892 dicts) type=Dictionary;; 961 dicts) type=Dictionary;;
893 doc) type=Documentation;; 962 doc) type=Documentation;;
894 editors) type=TextEditor;; 963 editors) type=TextEditor;;
895 emacs) type=TextEditor;; 964 emacs) type=TextEditor;;
896 emulation) type=Emulator;; 965 emulation) type=Emulator;;
897 laptop) type=HardwareSettings;; 966 laptop) type=HardwareSettings;;
898 office) type=Office;; 967 office) type=Office;;
899 pda) type=PDA;; 968 pda) type=PDA;;
900 vim) type=TextEditor;; 969 vim) type=TextEditor;;
901 xemacs) type=TextEditor;; 970 xemacs) type=TextEditor;;
902 *) type=;;
903 esac 971 esac
904 ;; 972 ;;
905 973
906 dev) 974 dev)
907 type="Development" 975 type="Development"
908 ;; 976 ;;
909 977
910 games) 978 games)
911 case ${catmin} in 979 case ${catmin} in
912 action|fps) type=ActionGame;; 980 action|fps) type=ActionGame;;
913 arcade) type=ArcadeGame;; 981 arcade) type=ArcadeGame;;
914 board) type=BoardGame;; 982 board) type=BoardGame;;
915 emulation) type=Emulator;; 983 emulation) type=Emulator;;
916 kids) type=KidsGame;; 984 kids) type=KidsGame;;
917 puzzle) type=LogicGame;; 985 puzzle) type=LogicGame;;
918 roguelike) type=RolePlaying;; 986 roguelike) type=RolePlaying;;
919 rpg) type=RolePlaying;; 987 rpg) type=RolePlaying;;
920 simulation) type=Simulation;; 988 simulation) type=Simulation;;
921 sports) type=SportsGame;; 989 sports) type=SportsGame;;
922 strategy) type=StrategyGame;; 990 strategy) type=StrategyGame;;
923 *) type=;;
924 esac 991 esac
925 type="Game;${type}" 992 type="Game;${type}"
926 ;; 993 ;;
927 994
928 gnome) 995 gnome)
937 type="Network;Email" 1004 type="Network;Email"
938 ;; 1005 ;;
939 1006
940 media) 1007 media)
941 case ${catmin} in 1008 case ${catmin} in
1009 gfx)
942 gfx) type=Graphics;; 1010 type=Graphics
1011 ;;
1012 *)
1013 case ${catmin} in
943 radio) type=Tuner;; 1014 radio) type=Tuner;;
944 sound) type=Audio;; 1015 sound) type=Audio;;
945 tv) type=TV;; 1016 tv) type=TV;;
946 video) type=Video;; 1017 video) type=Video;;
947 *) type=;; 1018 esac
1019 type="AudioVideo;${type}"
1020 ;;
948 esac 1021 esac
949 type="AudioVideo;${type}"
950 ;; 1022 ;;
951 1023
952 net) 1024 net)
953 case ${catmin} in 1025 case ${catmin} in
954 dialup) type=Dialup;; 1026 dialup) type=Dialup;;
955 ftp) type=FileTransfer;; 1027 ftp) type=FileTransfer;;
956 im) type=InstantMessaging;; 1028 im) type=InstantMessaging;;
957 irc) type=IRCClient;; 1029 irc) type=IRCClient;;
958 mail) type=Email;; 1030 mail) type=Email;;
959 news) type=News;; 1031 news) type=News;;
960 nntp) type=News;; 1032 nntp) type=News;;
961 p2p) type=FileTransfer;; 1033 p2p) type=FileTransfer;;
962 *) type=;; 1034 voip) type=Telephony;;
963 esac 1035 esac
964 type="Network;${type}" 1036 type="Network;${type}"
965 ;; 1037 ;;
966 1038
967 sci) 1039 sci)
968 case ${catmin} in 1040 case ${catmin} in
969 astro*) type=Astronomy;; 1041 astro*) type=Astronomy;;
970 bio*) type=Biology;; 1042 bio*) type=Biology;;
971 calc*) type=Calculator;; 1043 calc*) type=Calculator;;
972 chem*) type=Chemistry;; 1044 chem*) type=Chemistry;;
973 elec*) type=Electronics;; 1045 elec*) type=Electronics;;
974 geo*) type=Geology;; 1046 geo*) type=Geology;;
975 math*) type=Math;; 1047 math*) type=Math;;
976 physics) type=Physics;; 1048 physics) type=Physics;;
977 visual*) type=DataVisualization;; 1049 visual*) type=DataVisualization;;
978 *) type=;;
979 esac 1050 esac
980 type="Science;${type}" 1051 type="Education;Science;${type}"
981 ;; 1052 ;;
982 1053
983 sys) 1054 sys)
984 type="System" 1055 type="System"
985 ;; 1056 ;;
986 1057
987 www) 1058 www)
988 case ${catmin} in 1059 case ${catmin} in
989 client) type=WebBrowser;; 1060 client) type=WebBrowser;;
990 *) type=;;
991 esac 1061 esac
992 type="Network" 1062 type="Network;${type}"
993 ;; 1063 ;;
994 1064
995 *) 1065 *)
996 type= 1066 type=
997 ;; 1067 ;;
1002 else 1072 else
1003 local desktop_name="${PN}-${SLOT}" 1073 local desktop_name="${PN}-${SLOT}"
1004 fi 1074 fi
1005 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1075 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
1006 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1076 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
1077
1078 # Don't append another ";" when a valid category value is provided.
1079 type=${type%;}${type:+;}
1080
1081 eshopts_push -s extglob
1082 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
1083 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1084 ewarn "allowed in .desktop files if the value is not an absolute path."
1085 icon=${icon%.@(xpm|png|svg)}
1086 fi
1087 eshopts_pop
1007 1088
1008 cat <<-EOF > "${desktop}" 1089 cat <<-EOF > "${desktop}"
1009 [Desktop Entry] 1090 [Desktop Entry]
1010 Name=${name} 1091 Name=${name}
1011 Type=Application 1092 Type=Application
1012 Comment=${DESCRIPTION} 1093 Comment=${DESCRIPTION}
1013 Exec=${exec} 1094 Exec=${exec}
1014 TryExec=${exec%% *} 1095 TryExec=${exec%% *}
1015 Icon=${icon} 1096 Icon=${icon}
1016 Categories=${type}; 1097 Categories=${type}
1017 EOF 1098 EOF
1018 1099
1019 [[ ${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}"
1020 1106
1021 ( 1107 (
1022 # wrap the env here so that the 'insinto' call 1108 # wrap the env here so that the 'insinto' call
1023 # doesn't corrupt the env of the caller 1109 # doesn't corrupt the env of the caller
1024 insinto /usr/share/applications 1110 insinto /usr/share/applications
1025 doins "${desktop}" 1111 doins "${desktop}"
1026 ) 1112 ) || die "installing desktop file failed"
1027} 1113}
1028 1114
1029# @FUNCTION: validate_desktop_entries 1115# @FUNCTION: validate_desktop_entries
1030# @USAGE: [directories] 1116# @USAGE: [directories]
1031# @MAINTAINER: 1117# @MAINTAINER:
1310 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1396 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1311 1397
1312 local shrtsrc=$(basename "${src}") 1398 local shrtsrc=$(basename "${src}")
1313 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1399 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1314 if [[ -z ${skip} ]] ; then 1400 if [[ -z ${skip} ]] ; then
1315 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1401 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1316 local skip=0 1402 local skip=0
1317 exe=tail 1403 exe=tail
1318 case ${ver} in 1404 case ${ver} in
1319 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
1320 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1406 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1322 2.0|2.0.1) 1408 2.0|2.0.1)
1323 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1409 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1324 ;; 1410 ;;
1325 2.1.1) 1411 2.1.1)
1326 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1412 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1327 let skip="skip + 1" 1413 (( skip++ ))
1328 ;; 1414 ;;
1329 2.1.2) 1415 2.1.2)
1330 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1416 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1331 let skip="skip + 1" 1417 (( skip++ ))
1332 ;; 1418 ;;
1333 2.1.3) 1419 2.1.3)
1334 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1420 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1335 let skip="skip + 1" 1421 (( skip++ ))
1336 ;; 1422 ;;
1337 2.1.4|2.1.5) 1423 2.1.4|2.1.5)
1338 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)
1339 skip=$(head -n ${skip} "${src}" | wc -c) 1425 skip=$(head -n ${skip} "${src}" | wc -c)
1340 exe="dd" 1426 exe="dd"
1349 esac 1435 esac
1350 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1436 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1351 fi 1437 fi
1352 case ${exe} in 1438 case ${exe} in
1353 tail) exe="tail -n +${skip} '${src}'";; 1439 tail) exe="tail -n +${skip} '${src}'";;
1354 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1440 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1355 *) die "makeself cant handle exe '${exe}'" 1441 *) die "makeself cant handle exe '${exe}'"
1356 esac 1442 esac
1357 1443
1358 # 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
1359 local tmpfile=$(emktemp) 1445 local filetype tmpfile=$(emktemp)
1360 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1446 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1361 local filetype=$(file -b "${tmpfile}") 1447 filetype=$(file -b "${tmpfile}") || die
1362 case ${filetype} in 1448 case ${filetype} in
1363 *tar\ archive*) 1449 *tar\ archive*)
1364 eval ${exe} | tar --no-same-owner -xf - 1450 eval ${exe} | tar --no-same-owner -xf -
1365 ;; 1451 ;;
1366 bzip2*) 1452 bzip2*)
1492 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1578 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1493 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1579 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1494 export CDROM_SET=-1 1580 export CDROM_SET=-1
1495 for f in ${CDROM_CHECK_1//:/ } ; do 1581 for f in ${CDROM_CHECK_1//:/ } ; do
1496 ((++CDROM_SET)) 1582 ((++CDROM_SET))
1497 [[ -e ${CD_ROOT}/${f} ]] && break 1583 [[ -e ${CDROM_ROOT}/${f} ]] && break
1498 done 1584 done
1499 export CDROM_MATCH=${f} 1585 export CDROM_MATCH=${f}
1500 return 1586 return
1501 fi 1587 fi
1502 1588
1676 else 1762 else
1677 newls="" 1763 newls=""
1678 fi 1764 fi
1679 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do 1765 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1680 if [[ ${op} == "-i" ]] ; then 1766 if [[ ${op} == "-i" ]] ; then
1681 hasq ${f} ${ls} && newls="${newls} ${f}" 1767 has ${f} ${ls} && newls="${newls} ${f}"
1682 else 1768 else
1683 hasq ${f} ${ls} || newls="${newls} ${f}" 1769 has ${f} ${ls} || newls="${newls} ${f}"
1684 fi 1770 fi
1685 done 1771 done
1686 ls=${newls} 1772 ls=${newls}
1687 done 1773 done
1688 else 1774 else
1690 fi 1776 fi
1691 1777
1692 nols="" 1778 nols=""
1693 newls="" 1779 newls=""
1694 for f in ${LINGUAS} ; do 1780 for f in ${LINGUAS} ; do
1695 if hasq ${f} ${ls} ; then 1781 if has ${f} ${ls} ; then
1696 newls="${newls} ${f}" 1782 newls="${newls} ${f}"
1697 else 1783 else
1698 nols="${nols} ${f}" 1784 nols="${nols} ${f}"
1699 fi 1785 fi
1700 done 1786 done
1755 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"
1756 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"
1757 ewarn "helper program, simply emerge the 'gentoolkit' package." 1843 ewarn "helper program, simply emerge the 'gentoolkit' package."
1758 ewarn 1844 ewarn
1759 fi 1845 fi
1846 # temp hack for #348634 #357225
1847 [[ ${PN} == "mpfr" ]] && lib=${lib##*/}
1760 ewarn " # revdep-rebuild --library ${lib##*/}" 1848 ewarn " # revdep-rebuild --library '${lib}'"
1761 done 1849 done
1762 if [[ ${notice} -eq 1 ]] ; then 1850 if [[ ${notice} -eq 1 ]] ; then
1763 ewarn 1851 ewarn
1764 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"
1765 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:"
1911 else 1999 else
1912 newbin "${tmpwrapper}" "${wrapper}" || die 2000 newbin "${tmpwrapper}" "${wrapper}" || die
1913 fi 2001 fi
1914} 2002}
1915 2003
1916# @FUNCTION: prepalldocs 2004# @FUNCTION: path_exists
1917# @USAGE: 2005# @USAGE: [-a|-o] <paths>
1918# @DESCRIPTION: 2006# @DESCRIPTION:
1919# Compress files in /usr/share/doc which are not already 2007# Check if the specified paths exist. Works for all types of paths
1920# compressed, excluding /usr/share/doc/${PF}/html. 2008# (files/dirs/etc...). The -a and -o flags control the requirements
1921# Uses the ecompressdir to do the compression. 2009# of the paths. They correspond to "and" and "or" logic. So the -a
1922# 2009-02-18 by betelgeuse: 2010# flag means all the paths must exist while the -o flag means at least
1923# Commented because ecompressdir is even more internal to 2011# one of the paths must exist. The default behavior is "and". If no
1924# Portage than prepalldocs (it's not even mentioned in man 5 2012# paths are specified, then the return value is "false".
1925# ebuild). Please submit a better version for review to gentoo-dev 2013path_exists() {
1926# if you want prepalldocs here. 2014 local opt=$1
1927#prepalldocs() { 2015 [[ ${opt} == -[ao] ]] && shift || opt="-a"
1928# if [[ -n $1 ]] ; then
1929# ewarn "prepalldocs: invalid usage; takes no arguments"
1930# fi
1931 2016
1932# cd "${D}" 2017 # no paths -> return false
1933# [[ -d usr/share/doc ]] || return 0 2018 # same behavior as: [[ -e "" ]]
2019 [[ $# -eq 0 ]] && return 1
1934 2020
1935# find usr/share/doc -exec gzip {} + 2021 local p r=0
1936# ecompressdir --ignore /usr/share/doc/${PF}/html 2022 for p in "$@" ; do
1937# ecompressdir --queue /usr/share/doc 2023 [[ -e ${p} ]]
1938#} 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: use_if_iuse
2051# @USAGE: <flag>
2052# @DESCRIPTION:
2053# Return true if the given flag is in USE and IUSE.
2054#
2055# Note that this function should not be used in the global scope.
2056use_if_iuse() {
2057 in_iuse $1 || return 1
2058 use $1
2059}
2060
2061# @FUNCTION: usex
2062# @USAGE: <USE flag> [true output] [false output] [true suffix] [false suffix]
2063# @DESCRIPTION:
2064# If USE flag is set, echo [true output][true suffix] (defaults to "yes"),
2065# otherwise echo [false output][false suffix] (defaults to "no").
2066usex() { use "$1" && echo "${2-yes}$4" || echo "${3-no}$5" ; } #382963

Legend:
Removed from v.1.332  
changed lines
  Added in v.1.367

  ViewVC Help
Powered by ViewVC 1.1.20