/[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.361
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.361 2011/08/08 02:01:40 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 einfo for package managers that don't provide eqawarn and use the PM
70# implementation if available.
71if ! declare -F eqawarn >/dev/null ; then
72 eqawarn() {
73 einfo "$@"
74 }
64fi 75fi
65 76
66# @FUNCTION: ecvs_clean 77# @FUNCTION: ecvs_clean
67# @USAGE: [list of dirs] 78# @USAGE: [list of dirs]
68# @DESCRIPTION: 79# @DESCRIPTION:
189# If you do not specify any options, then epatch will default to the directory 200# If you do not specify any options, then epatch will default to the directory
190# specified by EPATCH_SOURCE. 201# specified by EPATCH_SOURCE.
191# 202#
192# When processing directories, epatch will apply all patches that match: 203# When processing directories, epatch will apply all patches that match:
193# @CODE 204# @CODE
194# ${EPATCH_FORCE} == "yes" 205# if ${EPATCH_FORCE} != "yes"
195# ??_${ARCH}_foo.${EPATCH_SUFFIX} 206# ??_${ARCH}_foo.${EPATCH_SUFFIX}
196# else 207# else
197# *.${EPATCH_SUFFIX} 208# *.${EPATCH_SUFFIX}
198# @CODE 209# @CODE
199# The leading ?? are typically numbers used to force consistent patch ordering. 210# The leading ?? are typically numbers used to force consistent patch ordering.
238 local EPATCH_SUFFIX=$1 249 local EPATCH_SUFFIX=$1
239 250
240 elif [[ -d $1 ]] ; then 251 elif [[ -d $1 ]] ; then
241 # Some people like to make dirs of patches w/out suffixes (vim) 252 # Some people like to make dirs of patches w/out suffixes (vim)
242 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"} 253 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
254
255 elif [[ -f ${EPATCH_SOURCE}/$1 ]] ; then
256 # Re-use EPATCH_SOURCE as a search dir
257 epatch "${EPATCH_SOURCE}/$1"
258 return $?
243 259
244 else 260 else
245 # sanity check ... if it isn't a dir or file, wtf man ? 261 # sanity check ... if it isn't a dir or file, wtf man ?
246 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1 262 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
247 echo 263 echo
278 # ???_arch_foo.patch 294 # ???_arch_foo.patch
279 # Else, skip this input altogether 295 # Else, skip this input altogether
280 local a=${patchname#*_} # strip the ???_ 296 local a=${patchname#*_} # strip the ???_
281 a=${a%%_*} # strip the _foo.patch 297 a=${a%%_*} # strip the _foo.patch
282 if ! [[ ${SINGLE_PATCH} == "yes" || \ 298 if ! [[ ${SINGLE_PATCH} == "yes" || \
283 ${EPATCH_FORCE} == "yes" || \ 299 ${EPATCH_FORCE} == "yes" || \
284 ${a} == all || \ 300 ${a} == all || \
285 ${a} == ${ARCH} ]] 301 ${a} == ${ARCH} ]]
286 then 302 then
287 continue 303 continue
288 fi 304 fi
289 305
290 # Let people filter things dynamically 306 # Let people filter things dynamically
347 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }') 363 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
348 if [[ -n ${abs_paths} ]] ; then 364 if [[ -n ${abs_paths} ]] ; then
349 count=1 365 count=1
350 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}" 366 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
351 fi 367 fi
368 # Similar reason, but with relative paths.
369 local rel_paths=$(egrep -n '^[-+]{3} [^ ]*[.][.]/' "${PATCH_TARGET}")
370 if [[ -n ${rel_paths} ]] ; then
371 eqawarn "QA Notice: Your patch uses relative paths '../'."
372 eqawarn " In the future this will cause a failure."
373 eqawarn "${rel_paths}"
374 fi
352 375
353 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/ 376 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
354 while [[ ${count} -lt 5 ]] ; do 377 while [[ ${count} -lt 5 ]] ; do
355 # Generate some useful debug info ... 378 # Generate some useful debug info ...
356 ( 379 (
357 _epatch_draw_line "***** ${patchname} *****" 380 _epatch_draw_line "***** ${patchname} *****"
358 echo 381 echo
359 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'" 382 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
360 echo 383 echo
361 _epatch_draw_line "***** ${patchname} *****" 384 _epatch_draw_line "***** ${patchname} *****"
385 patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}" 2>&1
386 ret=$?
387 echo
388 echo "patch program exited with status ${ret}"
389 exit ${ret}
362 ) >> "${STDERR_TARGET}" 390 ) >> "${STDERR_TARGET}"
363 391
364 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then 392 if [ $? -eq 0 ] ; then
365 ( 393 (
366 _epatch_draw_line "***** ${patchname} *****" 394 _epatch_draw_line "***** ${patchname} *****"
367 echo 395 echo
368 echo "ACTUALLY APPLYING ${patchname} ..." 396 echo "ACTUALLY APPLYING ${patchname} ..."
369 echo 397 echo
370 _epatch_draw_line "***** ${patchname} *****" 398 _epatch_draw_line "***** ${patchname} *****"
371 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1 399 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
400 ret=$?
401 echo
402 echo "patch program exited with status ${ret}"
403 exit ${ret}
372 ) >> "${STDERR_TARGET}" 404 ) >> "${STDERR_TARGET}"
373 405
374 if [ $? -ne 0 ] ; then 406 if [ $? -ne 0 ] ; then
375 echo 407 echo
376 eerror "A dry-run of patch command succeeded, but actually" 408 eerror "A dry-run of patch command succeeded, but actually"
407 done 439 done
408 440
409 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching" 441 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
410 : # everything worked 442 : # everything worked
411} 443}
444
445# @FUNCTION: epatch_user
446# @USAGE:
447# @DESCRIPTION:
448# Applies user-provided patches to the source tree. The patches are
449# taken from /etc/portage/patches/<CATEGORY>/<PF|P|PN>/, where the first
450# of these three directories to exist will be the one to use, ignoring
451# any more general directories which might exist as well.
452#
453# User patches are intended for quick testing of patches without ebuild
454# modifications, as well as for permanent customizations a user might
455# desire. Obviously, there can be no official support for arbitrarily
456# patched ebuilds. So whenever a build log in a bug report mentions that
457# user patches were applied, the user should be asked to reproduce the
458# problem without these.
459#
460# Not all ebuilds do call this function, so placing patches in the
461# stated directory might or might not work, depending on the package and
462# the eclasses it inherits and uses. It is safe to call the function
463# repeatedly, so it is always possible to add a call at the ebuild
464# level. The first call is the time when the patches will be
465# applied.
466#
467# Ideally, this function should be called after gentoo-specific patches
468# have been applied, so that their code can be modified as well, but
469# before calls to e.g. eautoreconf, as the user patches might affect
470# autotool input files as well.
412epatch_user() { 471epatch_user() {
413 [[ $# -ne 0 ]] && die "epatch_user takes no options" 472 [[ $# -ne 0 ]] && die "epatch_user takes no options"
473
474 # Allow multiple calls to this function; ignore all but the first
475 local applied="${T}/epach_user.applied"
476 [[ -e ${applied} ]] && return 2
414 477
415 # don't clobber any EPATCH vars that the parent might want 478 # don't clobber any EPATCH vars that the parent might want
416 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches 479 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
417 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do 480 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
418 EPATCH_SOURCE=${base}/${CTARGET}/${check} 481 EPATCH_SOURCE=${base}/${CTARGET}/${check}
422 EPATCH_SOURCE=${EPATCH_SOURCE} \ 485 EPATCH_SOURCE=${EPATCH_SOURCE} \
423 EPATCH_SUFFIX="patch" \ 486 EPATCH_SUFFIX="patch" \
424 EPATCH_FORCE="yes" \ 487 EPATCH_FORCE="yes" \
425 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \ 488 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
426 epatch 489 epatch
427 break 490 echo "${EPATCH_SOURCE}" > "${applied}"
491 return 0
428 fi 492 fi
429 done 493 done
494 echo "none" > "${applied}"
495 return 1
430} 496}
431 497
432# @FUNCTION: emktemp 498# @FUNCTION: emktemp
433# @USAGE: [temp dir] 499# @USAGE: [temp dir]
434# @DESCRIPTION: 500# @DESCRIPTION:
478egetent() { 544egetent() {
479 case ${CHOST} in 545 case ${CHOST} in
480 *-darwin[678]) 546 *-darwin[678])
481 case "$2" in 547 case "$2" in
482 *[!0-9]*) # Non numeric 548 *[!0-9]*) # Non numeric
483 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 549 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2\$/) {print \$0;exit;} }"
484 ;; 550 ;;
485 *) # Numeric 551 *) # Numeric
486 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 552 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
487 ;; 553 ;;
488 esac 554 esac
706 fi 772 fi
707 ;; 773 ;;
708 774
709 *) 775 *)
710 if [[ -z $@ ]] ; then 776 if [[ -z $@ ]] ; then
711 useradd ${opts} \ 777 useradd -r ${opts} \
712 -c "added by portage for ${PN}" \ 778 -c "added by portage for ${PN}" \
713 ${euser} \ 779 ${euser} \
714 || die "enewuser failed" 780 || die "enewuser failed"
715 else 781 else
716 einfo " - Extra: $@" 782 einfo " - Extra: $@"
717 useradd ${opts} "$@" \ 783 useradd -r ${opts} "$@" \
718 ${euser} \ 784 ${euser} \
719 || die "enewuser failed" 785 || die "enewuser failed"
720 fi 786 fi
721 ;; 787 ;;
722 esac 788 esac
835 esac 901 esac
836 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 902 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
837 ;; 903 ;;
838 904
839 *) 905 *)
906 # We specify -r so that we get a GID in the system range from login.defs
840 groupadd ${opts} ${egroup} || die "enewgroup failed" 907 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
841 ;; 908 ;;
842 esac 909 esac
843 export SANDBOX_ON="${oldsandbox}" 910 export SANDBOX_ON="${oldsandbox}"
844} 911}
845 912
856 923
857# Make a desktop file ! 924# Make a desktop file !
858# Great for making those icons in kde/gnome startmenu ! 925# Great for making those icons in kde/gnome startmenu !
859# Amaze your friends ! Get the women ! Join today ! 926# Amaze your friends ! Get the women ! Join today !
860# 927#
861# make_desktop_entry(<command>, [name], [icon], [type], [path]) 928# make_desktop_entry(<command>, [name], [icon], [type], [fields])
862# 929#
863# binary: what command does the app run with ? 930# binary: what command does the app run with ?
864# name: the name that will show up in the menu 931# name: the name that will show up in the menu
865# icon: give your little like a pretty little icon ... 932# icon: give your little like a pretty little icon ...
866# this can be relative (to /usr/share/pixmaps) or 933# this can be relative (to /usr/share/pixmaps) or
867# a full path to an icon 934# a full path to an icon
868# type: what kind of application is this ? for categories: 935# type: what kind of application is this ? for categories:
869# http://standards.freedesktop.org/menu-spec/latest/apa.html 936# http://standards.freedesktop.org/menu-spec/latest/apa.html
870# path: if your app needs to startup in a specific dir 937# fields: extra fields to append to the desktop file; a printf string
871make_desktop_entry() { 938make_desktop_entry() {
872 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 939 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
873 940
874 local exec=${1} 941 local exec=${1}
875 local name=${2:-${PN}} 942 local name=${2:-${PN}}
876 local icon=${3:-${PN}} 943 local icon=${3:-${PN}}
877 local type=${4} 944 local type=${4}
878 local path=${5} 945 local fields=${5}
879 946
880 if [[ -z ${type} ]] ; then 947 if [[ -z ${type} ]] ; then
881 local catmaj=${CATEGORY%%-*} 948 local catmaj=${CATEGORY%%-*}
882 local catmin=${CATEGORY##*-} 949 local catmin=${CATEGORY##*-}
883 case ${catmaj} in 950 case ${catmaj} in
884 app) 951 app)
885 case ${catmin} in 952 case ${catmin} in
886 accessibility) type=Accessibility;; 953 accessibility) type=Accessibility;;
887 admin) type=System;; 954 admin) type=System;;
888 antivirus) type=System;; 955 antivirus) type=System;;
889 arch) type=Archiving;; 956 arch) type=Archiving;;
890 backup) type=Archiving;; 957 backup) type=Archiving;;
891 cdr) type=DiscBurning;; 958 cdr) type=DiscBurning;;
892 dicts) type=Dictionary;; 959 dicts) type=Dictionary;;
893 doc) type=Documentation;; 960 doc) type=Documentation;;
894 editors) type=TextEditor;; 961 editors) type=TextEditor;;
895 emacs) type=TextEditor;; 962 emacs) type=TextEditor;;
896 emulation) type=Emulator;; 963 emulation) type=Emulator;;
897 laptop) type=HardwareSettings;; 964 laptop) type=HardwareSettings;;
898 office) type=Office;; 965 office) type=Office;;
899 pda) type=PDA;; 966 pda) type=PDA;;
900 vim) type=TextEditor;; 967 vim) type=TextEditor;;
901 xemacs) type=TextEditor;; 968 xemacs) type=TextEditor;;
902 *) type=;;
903 esac 969 esac
904 ;; 970 ;;
905 971
906 dev) 972 dev)
907 type="Development" 973 type="Development"
908 ;; 974 ;;
909 975
910 games) 976 games)
911 case ${catmin} in 977 case ${catmin} in
912 action|fps) type=ActionGame;; 978 action|fps) type=ActionGame;;
913 arcade) type=ArcadeGame;; 979 arcade) type=ArcadeGame;;
914 board) type=BoardGame;; 980 board) type=BoardGame;;
915 emulation) type=Emulator;; 981 emulation) type=Emulator;;
916 kids) type=KidsGame;; 982 kids) type=KidsGame;;
917 puzzle) type=LogicGame;; 983 puzzle) type=LogicGame;;
918 roguelike) type=RolePlaying;; 984 roguelike) type=RolePlaying;;
919 rpg) type=RolePlaying;; 985 rpg) type=RolePlaying;;
920 simulation) type=Simulation;; 986 simulation) type=Simulation;;
921 sports) type=SportsGame;; 987 sports) type=SportsGame;;
922 strategy) type=StrategyGame;; 988 strategy) type=StrategyGame;;
923 *) type=;;
924 esac 989 esac
925 type="Game;${type}" 990 type="Game;${type}"
926 ;; 991 ;;
927 992
928 gnome) 993 gnome)
937 type="Network;Email" 1002 type="Network;Email"
938 ;; 1003 ;;
939 1004
940 media) 1005 media)
941 case ${catmin} in 1006 case ${catmin} in
1007 gfx)
942 gfx) type=Graphics;; 1008 type=Graphics
1009 ;;
1010 *)
1011 case ${catmin} in
943 radio) type=Tuner;; 1012 radio) type=Tuner;;
944 sound) type=Audio;; 1013 sound) type=Audio;;
945 tv) type=TV;; 1014 tv) type=TV;;
946 video) type=Video;; 1015 video) type=Video;;
947 *) type=;; 1016 esac
1017 type="AudioVideo;${type}"
1018 ;;
948 esac 1019 esac
949 type="AudioVideo;${type}"
950 ;; 1020 ;;
951 1021
952 net) 1022 net)
953 case ${catmin} in 1023 case ${catmin} in
954 dialup) type=Dialup;; 1024 dialup) type=Dialup;;
955 ftp) type=FileTransfer;; 1025 ftp) type=FileTransfer;;
956 im) type=InstantMessaging;; 1026 im) type=InstantMessaging;;
957 irc) type=IRCClient;; 1027 irc) type=IRCClient;;
958 mail) type=Email;; 1028 mail) type=Email;;
959 news) type=News;; 1029 news) type=News;;
960 nntp) type=News;; 1030 nntp) type=News;;
961 p2p) type=FileTransfer;; 1031 p2p) type=FileTransfer;;
962 *) type=;; 1032 voip) type=Telephony;;
963 esac 1033 esac
964 type="Network;${type}" 1034 type="Network;${type}"
965 ;; 1035 ;;
966 1036
967 sci) 1037 sci)
968 case ${catmin} in 1038 case ${catmin} in
969 astro*) type=Astronomy;; 1039 astro*) type=Astronomy;;
970 bio*) type=Biology;; 1040 bio*) type=Biology;;
971 calc*) type=Calculator;; 1041 calc*) type=Calculator;;
972 chem*) type=Chemistry;; 1042 chem*) type=Chemistry;;
973 elec*) type=Electronics;; 1043 elec*) type=Electronics;;
974 geo*) type=Geology;; 1044 geo*) type=Geology;;
975 math*) type=Math;; 1045 math*) type=Math;;
976 physics) type=Physics;; 1046 physics) type=Physics;;
977 visual*) type=DataVisualization;; 1047 visual*) type=DataVisualization;;
978 *) type=;;
979 esac 1048 esac
980 type="Science;${type}" 1049 type="Education;Science;${type}"
981 ;; 1050 ;;
982 1051
983 sys) 1052 sys)
984 type="System" 1053 type="System"
985 ;; 1054 ;;
986 1055
987 www) 1056 www)
988 case ${catmin} in 1057 case ${catmin} in
989 client) type=WebBrowser;; 1058 client) type=WebBrowser;;
990 *) type=;;
991 esac 1059 esac
992 type="Network" 1060 type="Network;${type}"
993 ;; 1061 ;;
994 1062
995 *) 1063 *)
996 type= 1064 type=
997 ;; 1065 ;;
1002 else 1070 else
1003 local desktop_name="${PN}-${SLOT}" 1071 local desktop_name="${PN}-${SLOT}"
1004 fi 1072 fi
1005 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1073 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
1006 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1074 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
1075
1076 # Don't append another ";" when a valid category value is provided.
1077 type=${type%;}${type:+;}
1078
1079 eshopts_push -s extglob
1080 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
1081 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1082 ewarn "allowed in .desktop files if the value is not an absolute path."
1083 icon=${icon%.@(xpm|png|svg)}
1084 fi
1085 eshopts_pop
1007 1086
1008 cat <<-EOF > "${desktop}" 1087 cat <<-EOF > "${desktop}"
1009 [Desktop Entry] 1088 [Desktop Entry]
1010 Name=${name} 1089 Name=${name}
1011 Type=Application 1090 Type=Application
1012 Comment=${DESCRIPTION} 1091 Comment=${DESCRIPTION}
1013 Exec=${exec} 1092 Exec=${exec}
1014 TryExec=${exec%% *} 1093 TryExec=${exec%% *}
1015 Icon=${icon} 1094 Icon=${icon}
1016 Categories=${type}; 1095 Categories=${type}
1017 EOF 1096 EOF
1018 1097
1019 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1098 if [[ ${fields:-=} != *=* ]] ; then
1099 # 5th arg used to be value to Path=
1100 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
1101 fields="Path=${fields}"
1102 fi
1103 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
1020 1104
1021 ( 1105 (
1022 # wrap the env here so that the 'insinto' call 1106 # wrap the env here so that the 'insinto' call
1023 # doesn't corrupt the env of the caller 1107 # doesn't corrupt the env of the caller
1024 insinto /usr/share/applications 1108 insinto /usr/share/applications
1025 doins "${desktop}" 1109 doins "${desktop}"
1026 ) 1110 ) || die "installing desktop file failed"
1027} 1111}
1028 1112
1029# @FUNCTION: validate_desktop_entries 1113# @FUNCTION: validate_desktop_entries
1030# @USAGE: [directories] 1114# @USAGE: [directories]
1031# @MAINTAINER: 1115# @MAINTAINER:
1310 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1394 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1311 1395
1312 local shrtsrc=$(basename "${src}") 1396 local shrtsrc=$(basename "${src}")
1313 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1397 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1314 if [[ -z ${skip} ]] ; then 1398 if [[ -z ${skip} ]] ; then
1315 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1399 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1316 local skip=0 1400 local skip=0
1317 exe=tail 1401 exe=tail
1318 case ${ver} in 1402 case ${ver} in
1319 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1403 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) 1404 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1322 2.0|2.0.1) 1406 2.0|2.0.1)
1323 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1407 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1324 ;; 1408 ;;
1325 2.1.1) 1409 2.1.1)
1326 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1410 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1327 let skip="skip + 1" 1411 (( skip++ ))
1328 ;; 1412 ;;
1329 2.1.2) 1413 2.1.2)
1330 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1414 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1331 let skip="skip + 1" 1415 (( skip++ ))
1332 ;; 1416 ;;
1333 2.1.3) 1417 2.1.3)
1334 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1418 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1335 let skip="skip + 1" 1419 (( skip++ ))
1336 ;; 1420 ;;
1337 2.1.4|2.1.5) 1421 2.1.4|2.1.5)
1338 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1422 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1339 skip=$(head -n ${skip} "${src}" | wc -c) 1423 skip=$(head -n ${skip} "${src}" | wc -c)
1340 exe="dd" 1424 exe="dd"
1349 esac 1433 esac
1350 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1434 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1351 fi 1435 fi
1352 case ${exe} in 1436 case ${exe} in
1353 tail) exe="tail -n +${skip} '${src}'";; 1437 tail) exe="tail -n +${skip} '${src}'";;
1354 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1438 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1355 *) die "makeself cant handle exe '${exe}'" 1439 *) die "makeself cant handle exe '${exe}'"
1356 esac 1440 esac
1357 1441
1358 # lets grab the first few bytes of the file to figure out what kind of archive it is 1442 # lets grab the first few bytes of the file to figure out what kind of archive it is
1359 local tmpfile=$(emktemp) 1443 local filetype tmpfile=$(emktemp)
1360 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1444 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1361 local filetype=$(file -b "${tmpfile}") 1445 filetype=$(file -b "${tmpfile}") || die
1362 case ${filetype} in 1446 case ${filetype} in
1363 *tar\ archive*) 1447 *tar\ archive*)
1364 eval ${exe} | tar --no-same-owner -xf - 1448 eval ${exe} | tar --no-same-owner -xf -
1365 ;; 1449 ;;
1366 bzip2*) 1450 bzip2*)
1492 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1576 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1493 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1577 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1494 export CDROM_SET=-1 1578 export CDROM_SET=-1
1495 for f in ${CDROM_CHECK_1//:/ } ; do 1579 for f in ${CDROM_CHECK_1//:/ } ; do
1496 ((++CDROM_SET)) 1580 ((++CDROM_SET))
1497 [[ -e ${CD_ROOT}/${f} ]] && break 1581 [[ -e ${CDROM_ROOT}/${f} ]] && break
1498 done 1582 done
1499 export CDROM_MATCH=${f} 1583 export CDROM_MATCH=${f}
1500 return 1584 return
1501 fi 1585 fi
1502 1586
1676 else 1760 else
1677 newls="" 1761 newls=""
1678 fi 1762 fi
1679 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do 1763 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1680 if [[ ${op} == "-i" ]] ; then 1764 if [[ ${op} == "-i" ]] ; then
1681 hasq ${f} ${ls} && newls="${newls} ${f}" 1765 has ${f} ${ls} && newls="${newls} ${f}"
1682 else 1766 else
1683 hasq ${f} ${ls} || newls="${newls} ${f}" 1767 has ${f} ${ls} || newls="${newls} ${f}"
1684 fi 1768 fi
1685 done 1769 done
1686 ls=${newls} 1770 ls=${newls}
1687 done 1771 done
1688 else 1772 else
1690 fi 1774 fi
1691 1775
1692 nols="" 1776 nols=""
1693 newls="" 1777 newls=""
1694 for f in ${LINGUAS} ; do 1778 for f in ${LINGUAS} ; do
1695 if hasq ${f} ${ls} ; then 1779 if has ${f} ${ls} ; then
1696 newls="${newls} ${f}" 1780 newls="${newls} ${f}"
1697 else 1781 else
1698 nols="${nols} ${f}" 1782 nols="${nols} ${f}"
1699 fi 1783 fi
1700 done 1784 done
1755 ewarn "the libraries are not being removed. You need to run revdep-rebuild" 1839 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" 1840 ewarn "in order to remove these old dependencies. If you do not have this"
1757 ewarn "helper program, simply emerge the 'gentoolkit' package." 1841 ewarn "helper program, simply emerge the 'gentoolkit' package."
1758 ewarn 1842 ewarn
1759 fi 1843 fi
1844 # temp hack for #348634 #357225
1845 [[ ${PN} == "mpfr" ]] && lib=${lib##*/}
1760 ewarn " # revdep-rebuild --library ${lib##*/}" 1846 ewarn " # revdep-rebuild --library '${lib}'"
1761 done 1847 done
1762 if [[ ${notice} -eq 1 ]] ; then 1848 if [[ ${notice} -eq 1 ]] ; then
1763 ewarn 1849 ewarn
1764 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1850 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:" 1851 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1911 else 1997 else
1912 newbin "${tmpwrapper}" "${wrapper}" || die 1998 newbin "${tmpwrapper}" "${wrapper}" || die
1913 fi 1999 fi
1914} 2000}
1915 2001
1916# @FUNCTION: prepalldocs 2002# @FUNCTION: path_exists
1917# @USAGE: 2003# @USAGE: [-a|-o] <paths>
1918# @DESCRIPTION: 2004# @DESCRIPTION:
1919# Compress files in /usr/share/doc which are not already 2005# Check if the specified paths exist. Works for all types of paths
1920# compressed, excluding /usr/share/doc/${PF}/html. 2006# (files/dirs/etc...). The -a and -o flags control the requirements
1921# Uses the ecompressdir to do the compression. 2007# of the paths. They correspond to "and" and "or" logic. So the -a
1922# 2009-02-18 by betelgeuse: 2008# flag means all the paths must exist while the -o flag means at least
1923# Commented because ecompressdir is even more internal to 2009# 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 2010# paths are specified, then the return value is "false".
1925# ebuild). Please submit a better version for review to gentoo-dev 2011path_exists() {
1926# if you want prepalldocs here. 2012 local opt=$1
1927#prepalldocs() { 2013 [[ ${opt} == -[ao] ]] && shift || opt="-a"
1928# if [[ -n $1 ]] ; then
1929# ewarn "prepalldocs: invalid usage; takes no arguments"
1930# fi
1931 2014
1932# cd "${D}" 2015 # no paths -> return false
1933# [[ -d usr/share/doc ]] || return 0 2016 # same behavior as: [[ -e "" ]]
2017 [[ $# -eq 0 ]] && return 1
1934 2018
1935# find usr/share/doc -exec gzip {} + 2019 local p r=0
1936# ecompressdir --ignore /usr/share/doc/${PF}/html 2020 for p in "$@" ; do
1937# ecompressdir --queue /usr/share/doc 2021 [[ -e ${p} ]]
1938#} 2022 : $(( r += $? ))
2023 done
2024
2025 case ${opt} in
2026 -a) return $(( r != 0 )) ;;
2027 -o) return $(( r == $# )) ;;
2028 esac
2029}

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

  ViewVC Help
Powered by ViewVC 1.1.20