/[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.360
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.360 2011/08/07 23:35:28 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"
422 EPATCH_SOURCE=${EPATCH_SOURCE} \ 454 EPATCH_SOURCE=${EPATCH_SOURCE} \
423 EPATCH_SUFFIX="patch" \ 455 EPATCH_SUFFIX="patch" \
424 EPATCH_FORCE="yes" \ 456 EPATCH_FORCE="yes" \
425 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \ 457 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
426 epatch 458 epatch
427 break 459 return 0
428 fi 460 fi
429 done 461 done
462 return 1
430} 463}
431 464
432# @FUNCTION: emktemp 465# @FUNCTION: emktemp
433# @USAGE: [temp dir] 466# @USAGE: [temp dir]
434# @DESCRIPTION: 467# @DESCRIPTION:
478egetent() { 511egetent() {
479 case ${CHOST} in 512 case ${CHOST} in
480 *-darwin[678]) 513 *-darwin[678])
481 case "$2" in 514 case "$2" in
482 *[!0-9]*) # Non numeric 515 *[!0-9]*) # Non numeric
483 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 516 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2\$/) {print \$0;exit;} }"
484 ;; 517 ;;
485 *) # Numeric 518 *) # Numeric
486 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 519 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
487 ;; 520 ;;
488 esac 521 esac
706 fi 739 fi
707 ;; 740 ;;
708 741
709 *) 742 *)
710 if [[ -z $@ ]] ; then 743 if [[ -z $@ ]] ; then
711 useradd ${opts} \ 744 useradd -r ${opts} \
712 -c "added by portage for ${PN}" \ 745 -c "added by portage for ${PN}" \
713 ${euser} \ 746 ${euser} \
714 || die "enewuser failed" 747 || die "enewuser failed"
715 else 748 else
716 einfo " - Extra: $@" 749 einfo " - Extra: $@"
717 useradd ${opts} "$@" \ 750 useradd -r ${opts} "$@" \
718 ${euser} \ 751 ${euser} \
719 || die "enewuser failed" 752 || die "enewuser failed"
720 fi 753 fi
721 ;; 754 ;;
722 esac 755 esac
835 esac 868 esac
836 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 869 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
837 ;; 870 ;;
838 871
839 *) 872 *)
873 # We specify -r so that we get a GID in the system range from login.defs
840 groupadd ${opts} ${egroup} || die "enewgroup failed" 874 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
841 ;; 875 ;;
842 esac 876 esac
843 export SANDBOX_ON="${oldsandbox}" 877 export SANDBOX_ON="${oldsandbox}"
844} 878}
845 879
856 890
857# Make a desktop file ! 891# Make a desktop file !
858# Great for making those icons in kde/gnome startmenu ! 892# Great for making those icons in kde/gnome startmenu !
859# Amaze your friends ! Get the women ! Join today ! 893# Amaze your friends ! Get the women ! Join today !
860# 894#
861# make_desktop_entry(<command>, [name], [icon], [type], [path]) 895# make_desktop_entry(<command>, [name], [icon], [type], [fields])
862# 896#
863# binary: what command does the app run with ? 897# binary: what command does the app run with ?
864# name: the name that will show up in the menu 898# name: the name that will show up in the menu
865# icon: give your little like a pretty little icon ... 899# icon: give your little like a pretty little icon ...
866# this can be relative (to /usr/share/pixmaps) or 900# this can be relative (to /usr/share/pixmaps) or
867# a full path to an icon 901# a full path to an icon
868# type: what kind of application is this ? for categories: 902# type: what kind of application is this ? for categories:
869# http://standards.freedesktop.org/menu-spec/latest/apa.html 903# http://standards.freedesktop.org/menu-spec/latest/apa.html
870# path: if your app needs to startup in a specific dir 904# fields: extra fields to append to the desktop file; a printf string
871make_desktop_entry() { 905make_desktop_entry() {
872 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 906 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
873 907
874 local exec=${1} 908 local exec=${1}
875 local name=${2:-${PN}} 909 local name=${2:-${PN}}
876 local icon=${3:-${PN}} 910 local icon=${3:-${PN}}
877 local type=${4} 911 local type=${4}
878 local path=${5} 912 local fields=${5}
879 913
880 if [[ -z ${type} ]] ; then 914 if [[ -z ${type} ]] ; then
881 local catmaj=${CATEGORY%%-*} 915 local catmaj=${CATEGORY%%-*}
882 local catmin=${CATEGORY##*-} 916 local catmin=${CATEGORY##*-}
883 case ${catmaj} in 917 case ${catmaj} in
884 app) 918 app)
885 case ${catmin} in 919 case ${catmin} in
886 accessibility) type=Accessibility;; 920 accessibility) type=Accessibility;;
887 admin) type=System;; 921 admin) type=System;;
888 antivirus) type=System;; 922 antivirus) type=System;;
889 arch) type=Archiving;; 923 arch) type=Archiving;;
890 backup) type=Archiving;; 924 backup) type=Archiving;;
891 cdr) type=DiscBurning;; 925 cdr) type=DiscBurning;;
892 dicts) type=Dictionary;; 926 dicts) type=Dictionary;;
893 doc) type=Documentation;; 927 doc) type=Documentation;;
894 editors) type=TextEditor;; 928 editors) type=TextEditor;;
895 emacs) type=TextEditor;; 929 emacs) type=TextEditor;;
896 emulation) type=Emulator;; 930 emulation) type=Emulator;;
897 laptop) type=HardwareSettings;; 931 laptop) type=HardwareSettings;;
898 office) type=Office;; 932 office) type=Office;;
899 pda) type=PDA;; 933 pda) type=PDA;;
900 vim) type=TextEditor;; 934 vim) type=TextEditor;;
901 xemacs) type=TextEditor;; 935 xemacs) type=TextEditor;;
902 *) type=;;
903 esac 936 esac
904 ;; 937 ;;
905 938
906 dev) 939 dev)
907 type="Development" 940 type="Development"
908 ;; 941 ;;
909 942
910 games) 943 games)
911 case ${catmin} in 944 case ${catmin} in
912 action|fps) type=ActionGame;; 945 action|fps) type=ActionGame;;
913 arcade) type=ArcadeGame;; 946 arcade) type=ArcadeGame;;
914 board) type=BoardGame;; 947 board) type=BoardGame;;
915 emulation) type=Emulator;; 948 emulation) type=Emulator;;
916 kids) type=KidsGame;; 949 kids) type=KidsGame;;
917 puzzle) type=LogicGame;; 950 puzzle) type=LogicGame;;
918 roguelike) type=RolePlaying;; 951 roguelike) type=RolePlaying;;
919 rpg) type=RolePlaying;; 952 rpg) type=RolePlaying;;
920 simulation) type=Simulation;; 953 simulation) type=Simulation;;
921 sports) type=SportsGame;; 954 sports) type=SportsGame;;
922 strategy) type=StrategyGame;; 955 strategy) type=StrategyGame;;
923 *) type=;;
924 esac 956 esac
925 type="Game;${type}" 957 type="Game;${type}"
926 ;; 958 ;;
927 959
928 gnome) 960 gnome)
937 type="Network;Email" 969 type="Network;Email"
938 ;; 970 ;;
939 971
940 media) 972 media)
941 case ${catmin} in 973 case ${catmin} in
974 gfx)
942 gfx) type=Graphics;; 975 type=Graphics
976 ;;
977 *)
978 case ${catmin} in
943 radio) type=Tuner;; 979 radio) type=Tuner;;
944 sound) type=Audio;; 980 sound) type=Audio;;
945 tv) type=TV;; 981 tv) type=TV;;
946 video) type=Video;; 982 video) type=Video;;
947 *) type=;; 983 esac
984 type="AudioVideo;${type}"
985 ;;
948 esac 986 esac
949 type="AudioVideo;${type}"
950 ;; 987 ;;
951 988
952 net) 989 net)
953 case ${catmin} in 990 case ${catmin} in
954 dialup) type=Dialup;; 991 dialup) type=Dialup;;
955 ftp) type=FileTransfer;; 992 ftp) type=FileTransfer;;
956 im) type=InstantMessaging;; 993 im) type=InstantMessaging;;
957 irc) type=IRCClient;; 994 irc) type=IRCClient;;
958 mail) type=Email;; 995 mail) type=Email;;
959 news) type=News;; 996 news) type=News;;
960 nntp) type=News;; 997 nntp) type=News;;
961 p2p) type=FileTransfer;; 998 p2p) type=FileTransfer;;
962 *) type=;; 999 voip) type=Telephony;;
963 esac 1000 esac
964 type="Network;${type}" 1001 type="Network;${type}"
965 ;; 1002 ;;
966 1003
967 sci) 1004 sci)
968 case ${catmin} in 1005 case ${catmin} in
969 astro*) type=Astronomy;; 1006 astro*) type=Astronomy;;
970 bio*) type=Biology;; 1007 bio*) type=Biology;;
971 calc*) type=Calculator;; 1008 calc*) type=Calculator;;
972 chem*) type=Chemistry;; 1009 chem*) type=Chemistry;;
973 elec*) type=Electronics;; 1010 elec*) type=Electronics;;
974 geo*) type=Geology;; 1011 geo*) type=Geology;;
975 math*) type=Math;; 1012 math*) type=Math;;
976 physics) type=Physics;; 1013 physics) type=Physics;;
977 visual*) type=DataVisualization;; 1014 visual*) type=DataVisualization;;
978 *) type=;;
979 esac 1015 esac
980 type="Science;${type}" 1016 type="Education;Science;${type}"
981 ;; 1017 ;;
982 1018
983 sys) 1019 sys)
984 type="System" 1020 type="System"
985 ;; 1021 ;;
986 1022
987 www) 1023 www)
988 case ${catmin} in 1024 case ${catmin} in
989 client) type=WebBrowser;; 1025 client) type=WebBrowser;;
990 *) type=;;
991 esac 1026 esac
992 type="Network" 1027 type="Network;${type}"
993 ;; 1028 ;;
994 1029
995 *) 1030 *)
996 type= 1031 type=
997 ;; 1032 ;;
1002 else 1037 else
1003 local desktop_name="${PN}-${SLOT}" 1038 local desktop_name="${PN}-${SLOT}"
1004 fi 1039 fi
1005 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1040 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
1006 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1041 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
1042
1043 # Don't append another ";" when a valid category value is provided.
1044 type=${type%;}${type:+;}
1045
1046 eshopts_push -s extglob
1047 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
1048 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1049 ewarn "allowed in .desktop files if the value is not an absolute path."
1050 icon=${icon%.@(xpm|png|svg)}
1051 fi
1052 eshopts_pop
1007 1053
1008 cat <<-EOF > "${desktop}" 1054 cat <<-EOF > "${desktop}"
1009 [Desktop Entry] 1055 [Desktop Entry]
1010 Name=${name} 1056 Name=${name}
1011 Type=Application 1057 Type=Application
1012 Comment=${DESCRIPTION} 1058 Comment=${DESCRIPTION}
1013 Exec=${exec} 1059 Exec=${exec}
1014 TryExec=${exec%% *} 1060 TryExec=${exec%% *}
1015 Icon=${icon} 1061 Icon=${icon}
1016 Categories=${type}; 1062 Categories=${type}
1017 EOF 1063 EOF
1018 1064
1019 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1065 if [[ ${fields:-=} != *=* ]] ; then
1066 # 5th arg used to be value to Path=
1067 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
1068 fields="Path=${fields}"
1069 fi
1070 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
1020 1071
1021 ( 1072 (
1022 # wrap the env here so that the 'insinto' call 1073 # wrap the env here so that the 'insinto' call
1023 # doesn't corrupt the env of the caller 1074 # doesn't corrupt the env of the caller
1024 insinto /usr/share/applications 1075 insinto /usr/share/applications
1025 doins "${desktop}" 1076 doins "${desktop}"
1026 ) 1077 ) || die "installing desktop file failed"
1027} 1078}
1028 1079
1029# @FUNCTION: validate_desktop_entries 1080# @FUNCTION: validate_desktop_entries
1030# @USAGE: [directories] 1081# @USAGE: [directories]
1031# @MAINTAINER: 1082# @MAINTAINER:
1310 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1361 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1311 1362
1312 local shrtsrc=$(basename "${src}") 1363 local shrtsrc=$(basename "${src}")
1313 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1364 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1314 if [[ -z ${skip} ]] ; then 1365 if [[ -z ${skip} ]] ; then
1315 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1366 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1316 local skip=0 1367 local skip=0
1317 exe=tail 1368 exe=tail
1318 case ${ver} in 1369 case ${ver} in
1319 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1370 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) 1371 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1322 2.0|2.0.1) 1373 2.0|2.0.1)
1323 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1374 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1324 ;; 1375 ;;
1325 2.1.1) 1376 2.1.1)
1326 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1377 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1327 let skip="skip + 1" 1378 (( skip++ ))
1328 ;; 1379 ;;
1329 2.1.2) 1380 2.1.2)
1330 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1381 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1331 let skip="skip + 1" 1382 (( skip++ ))
1332 ;; 1383 ;;
1333 2.1.3) 1384 2.1.3)
1334 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1385 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1335 let skip="skip + 1" 1386 (( skip++ ))
1336 ;; 1387 ;;
1337 2.1.4|2.1.5) 1388 2.1.4|2.1.5)
1338 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1389 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1339 skip=$(head -n ${skip} "${src}" | wc -c) 1390 skip=$(head -n ${skip} "${src}" | wc -c)
1340 exe="dd" 1391 exe="dd"
1349 esac 1400 esac
1350 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1401 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1351 fi 1402 fi
1352 case ${exe} in 1403 case ${exe} in
1353 tail) exe="tail -n +${skip} '${src}'";; 1404 tail) exe="tail -n +${skip} '${src}'";;
1354 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1405 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1355 *) die "makeself cant handle exe '${exe}'" 1406 *) die "makeself cant handle exe '${exe}'"
1356 esac 1407 esac
1357 1408
1358 # lets grab the first few bytes of the file to figure out what kind of archive it is 1409 # lets grab the first few bytes of the file to figure out what kind of archive it is
1359 local tmpfile=$(emktemp) 1410 local filetype tmpfile=$(emktemp)
1360 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1411 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1361 local filetype=$(file -b "${tmpfile}") 1412 filetype=$(file -b "${tmpfile}") || die
1362 case ${filetype} in 1413 case ${filetype} in
1363 *tar\ archive*) 1414 *tar\ archive*)
1364 eval ${exe} | tar --no-same-owner -xf - 1415 eval ${exe} | tar --no-same-owner -xf -
1365 ;; 1416 ;;
1366 bzip2*) 1417 bzip2*)
1492 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1543 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1493 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1544 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1494 export CDROM_SET=-1 1545 export CDROM_SET=-1
1495 for f in ${CDROM_CHECK_1//:/ } ; do 1546 for f in ${CDROM_CHECK_1//:/ } ; do
1496 ((++CDROM_SET)) 1547 ((++CDROM_SET))
1497 [[ -e ${CD_ROOT}/${f} ]] && break 1548 [[ -e ${CDROM_ROOT}/${f} ]] && break
1498 done 1549 done
1499 export CDROM_MATCH=${f} 1550 export CDROM_MATCH=${f}
1500 return 1551 return
1501 fi 1552 fi
1502 1553
1676 else 1727 else
1677 newls="" 1728 newls=""
1678 fi 1729 fi
1679 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do 1730 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1680 if [[ ${op} == "-i" ]] ; then 1731 if [[ ${op} == "-i" ]] ; then
1681 hasq ${f} ${ls} && newls="${newls} ${f}" 1732 has ${f} ${ls} && newls="${newls} ${f}"
1682 else 1733 else
1683 hasq ${f} ${ls} || newls="${newls} ${f}" 1734 has ${f} ${ls} || newls="${newls} ${f}"
1684 fi 1735 fi
1685 done 1736 done
1686 ls=${newls} 1737 ls=${newls}
1687 done 1738 done
1688 else 1739 else
1690 fi 1741 fi
1691 1742
1692 nols="" 1743 nols=""
1693 newls="" 1744 newls=""
1694 for f in ${LINGUAS} ; do 1745 for f in ${LINGUAS} ; do
1695 if hasq ${f} ${ls} ; then 1746 if has ${f} ${ls} ; then
1696 newls="${newls} ${f}" 1747 newls="${newls} ${f}"
1697 else 1748 else
1698 nols="${nols} ${f}" 1749 nols="${nols} ${f}"
1699 fi 1750 fi
1700 done 1751 done
1755 ewarn "the libraries are not being removed. You need to run revdep-rebuild" 1806 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" 1807 ewarn "in order to remove these old dependencies. If you do not have this"
1757 ewarn "helper program, simply emerge the 'gentoolkit' package." 1808 ewarn "helper program, simply emerge the 'gentoolkit' package."
1758 ewarn 1809 ewarn
1759 fi 1810 fi
1811 # temp hack for #348634 #357225
1812 [[ ${PN} == "mpfr" ]] && lib=${lib##*/}
1760 ewarn " # revdep-rebuild --library ${lib##*/}" 1813 ewarn " # revdep-rebuild --library '${lib}'"
1761 done 1814 done
1762 if [[ ${notice} -eq 1 ]] ; then 1815 if [[ ${notice} -eq 1 ]] ; then
1763 ewarn 1816 ewarn
1764 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1817 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:" 1818 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1911 else 1964 else
1912 newbin "${tmpwrapper}" "${wrapper}" || die 1965 newbin "${tmpwrapper}" "${wrapper}" || die
1913 fi 1966 fi
1914} 1967}
1915 1968
1916# @FUNCTION: prepalldocs 1969# @FUNCTION: path_exists
1917# @USAGE: 1970# @USAGE: [-a|-o] <paths>
1918# @DESCRIPTION: 1971# @DESCRIPTION:
1919# Compress files in /usr/share/doc which are not already 1972# Check if the specified paths exist. Works for all types of paths
1920# compressed, excluding /usr/share/doc/${PF}/html. 1973# (files/dirs/etc...). The -a and -o flags control the requirements
1921# Uses the ecompressdir to do the compression. 1974# of the paths. They correspond to "and" and "or" logic. So the -a
1922# 2009-02-18 by betelgeuse: 1975# flag means all the paths must exist while the -o flag means at least
1923# Commented because ecompressdir is even more internal to 1976# 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 1977# paths are specified, then the return value is "false".
1925# ebuild). Please submit a better version for review to gentoo-dev 1978path_exists() {
1926# if you want prepalldocs here. 1979 local opt=$1
1927#prepalldocs() { 1980 [[ ${opt} == -[ao] ]] && shift || opt="-a"
1928# if [[ -n $1 ]] ; then
1929# ewarn "prepalldocs: invalid usage; takes no arguments"
1930# fi
1931 1981
1932# cd "${D}" 1982 # no paths -> return false
1933# [[ -d usr/share/doc ]] || return 0 1983 # same behavior as: [[ -e "" ]]
1984 [[ $# -eq 0 ]] && return 1
1934 1985
1935# find usr/share/doc -exec gzip {} + 1986 local p r=0
1936# ecompressdir --ignore /usr/share/doc/${PF}/html 1987 for p in "$@" ; do
1937# ecompressdir --queue /usr/share/doc 1988 [[ -e ${p} ]]
1938#} 1989 : $(( r += $? ))
1990 done
1991
1992 case ${opt} in
1993 -a) return $(( r != 0 )) ;;
1994 -o) return $(( r == $# )) ;;
1995 esac
1996}

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

  ViewVC Help
Powered by ViewVC 1.1.20