/[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.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.334 2010/02/26 03:15:26 abcd 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 [[ $(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 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 }
66fi 75fi
67 76
68# @FUNCTION: ecvs_clean 77# @FUNCTION: ecvs_clean
69# @USAGE: [list of dirs] 78# @USAGE: [list of dirs]
70# @DESCRIPTION: 79# @DESCRIPTION:
191# 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
192# specified by EPATCH_SOURCE. 201# specified by EPATCH_SOURCE.
193# 202#
194# When processing directories, epatch will apply all patches that match: 203# When processing directories, epatch will apply all patches that match:
195# @CODE 204# @CODE
196# ${EPATCH_FORCE} == "yes" 205# if ${EPATCH_FORCE} != "yes"
197# ??_${ARCH}_foo.${EPATCH_SUFFIX} 206# ??_${ARCH}_foo.${EPATCH_SUFFIX}
198# else 207# else
199# *.${EPATCH_SUFFIX} 208# *.${EPATCH_SUFFIX}
200# @CODE 209# @CODE
201# The leading ?? are typically numbers used to force consistent patch ordering. 210# The leading ?? are typically numbers used to force consistent patch ordering.
240 local EPATCH_SUFFIX=$1 249 local EPATCH_SUFFIX=$1
241 250
242 elif [[ -d $1 ]] ; then 251 elif [[ -d $1 ]] ; then
243 # 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)
244 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 $?
245 259
246 else 260 else
247 # 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 ?
248 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1 262 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
249 echo 263 echo
280 # ???_arch_foo.patch 294 # ???_arch_foo.patch
281 # Else, skip this input altogether 295 # Else, skip this input altogether
282 local a=${patchname#*_} # strip the ???_ 296 local a=${patchname#*_} # strip the ???_
283 a=${a%%_*} # strip the _foo.patch 297 a=${a%%_*} # strip the _foo.patch
284 if ! [[ ${SINGLE_PATCH} == "yes" || \ 298 if ! [[ ${SINGLE_PATCH} == "yes" || \
285 ${EPATCH_FORCE} == "yes" || \ 299 ${EPATCH_FORCE} == "yes" || \
286 ${a} == all || \ 300 ${a} == all || \
287 ${a} == ${ARCH} ]] 301 ${a} == ${ARCH} ]]
288 then 302 then
289 continue 303 continue
290 fi 304 fi
291 305
292 # Let people filter things dynamically 306 # Let people filter things dynamically
349 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 }')
350 if [[ -n ${abs_paths} ]] ; then 364 if [[ -n ${abs_paths} ]] ; then
351 count=1 365 count=1
352 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}"
353 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
354 375
355 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/ 376 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
356 while [[ ${count} -lt 5 ]] ; do 377 while [[ ${count} -lt 5 ]] ; do
357 # Generate some useful debug info ... 378 # Generate some useful debug info ...
358 ( 379 (
359 _epatch_draw_line "***** ${patchname} *****" 380 _epatch_draw_line "***** ${patchname} *****"
360 echo 381 echo
361 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'" 382 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
362 echo 383 echo
363 _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}
364 ) >> "${STDERR_TARGET}" 390 ) >> "${STDERR_TARGET}"
365 391
366 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then 392 if [ $? -eq 0 ] ; then
367 ( 393 (
368 _epatch_draw_line "***** ${patchname} *****" 394 _epatch_draw_line "***** ${patchname} *****"
369 echo 395 echo
370 echo "ACTUALLY APPLYING ${patchname} ..." 396 echo "ACTUALLY APPLYING ${patchname} ..."
371 echo 397 echo
372 _epatch_draw_line "***** ${patchname} *****" 398 _epatch_draw_line "***** ${patchname} *****"
373 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}
374 ) >> "${STDERR_TARGET}" 404 ) >> "${STDERR_TARGET}"
375 405
376 if [ $? -ne 0 ] ; then 406 if [ $? -ne 0 ] ; then
377 echo 407 echo
378 eerror "A dry-run of patch command succeeded, but actually" 408 eerror "A dry-run of patch command succeeded, but actually"
424 EPATCH_SOURCE=${EPATCH_SOURCE} \ 454 EPATCH_SOURCE=${EPATCH_SOURCE} \
425 EPATCH_SUFFIX="patch" \ 455 EPATCH_SUFFIX="patch" \
426 EPATCH_FORCE="yes" \ 456 EPATCH_FORCE="yes" \
427 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \ 457 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
428 epatch 458 epatch
429 break 459 return 0
430 fi 460 fi
431 done 461 done
462 return 1
432} 463}
433 464
434# @FUNCTION: emktemp 465# @FUNCTION: emktemp
435# @USAGE: [temp dir] 466# @USAGE: [temp dir]
436# @DESCRIPTION: 467# @DESCRIPTION:
480egetent() { 511egetent() {
481 case ${CHOST} in 512 case ${CHOST} in
482 *-darwin[678]) 513 *-darwin[678])
483 case "$2" in 514 case "$2" in
484 *[!0-9]*) # Non numeric 515 *[!0-9]*) # Non numeric
485 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 516 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2\$/) {print \$0;exit;} }"
486 ;; 517 ;;
487 *) # Numeric 518 *) # Numeric
488 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 519 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
489 ;; 520 ;;
490 esac 521 esac
708 fi 739 fi
709 ;; 740 ;;
710 741
711 *) 742 *)
712 if [[ -z $@ ]] ; then 743 if [[ -z $@ ]] ; then
713 useradd ${opts} \ 744 useradd -r ${opts} \
714 -c "added by portage for ${PN}" \ 745 -c "added by portage for ${PN}" \
715 ${euser} \ 746 ${euser} \
716 || die "enewuser failed" 747 || die "enewuser failed"
717 else 748 else
718 einfo " - Extra: $@" 749 einfo " - Extra: $@"
719 useradd ${opts} "$@" \ 750 useradd -r ${opts} "$@" \
720 ${euser} \ 751 ${euser} \
721 || die "enewuser failed" 752 || die "enewuser failed"
722 fi 753 fi
723 ;; 754 ;;
724 esac 755 esac
837 esac 868 esac
838 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 869 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
839 ;; 870 ;;
840 871
841 *) 872 *)
873 # We specify -r so that we get a GID in the system range from login.defs
842 groupadd ${opts} ${egroup} || die "enewgroup failed" 874 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
843 ;; 875 ;;
844 esac 876 esac
845 export SANDBOX_ON="${oldsandbox}" 877 export SANDBOX_ON="${oldsandbox}"
846} 878}
847 879
858 890
859# Make a desktop file ! 891# Make a desktop file !
860# Great for making those icons in kde/gnome startmenu ! 892# Great for making those icons in kde/gnome startmenu !
861# Amaze your friends ! Get the women ! Join today ! 893# Amaze your friends ! Get the women ! Join today !
862# 894#
863# make_desktop_entry(<command>, [name], [icon], [type], [path]) 895# make_desktop_entry(<command>, [name], [icon], [type], [fields])
864# 896#
865# binary: what command does the app run with ? 897# binary: what command does the app run with ?
866# name: the name that will show up in the menu 898# name: the name that will show up in the menu
867# icon: give your little like a pretty little icon ... 899# icon: give your little like a pretty little icon ...
868# this can be relative (to /usr/share/pixmaps) or 900# this can be relative (to /usr/share/pixmaps) or
869# a full path to an icon 901# a full path to an icon
870# type: what kind of application is this ? for categories: 902# type: what kind of application is this ? for categories:
871# http://standards.freedesktop.org/menu-spec/latest/apa.html 903# http://standards.freedesktop.org/menu-spec/latest/apa.html
872# path: if your app needs to startup in a specific dir 904# fields: extra fields to append to the desktop file; a printf string
873make_desktop_entry() { 905make_desktop_entry() {
874 [[ -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"
875 907
876 local exec=${1} 908 local exec=${1}
877 local name=${2:-${PN}} 909 local name=${2:-${PN}}
878 local icon=${3:-${PN}} 910 local icon=${3:-${PN}}
879 local type=${4} 911 local type=${4}
880 local path=${5} 912 local fields=${5}
881 913
882 if [[ -z ${type} ]] ; then 914 if [[ -z ${type} ]] ; then
883 local catmaj=${CATEGORY%%-*} 915 local catmaj=${CATEGORY%%-*}
884 local catmin=${CATEGORY##*-} 916 local catmin=${CATEGORY##*-}
885 case ${catmaj} in 917 case ${catmaj} in
886 app) 918 app)
887 case ${catmin} in 919 case ${catmin} in
888 accessibility) type=Accessibility;; 920 accessibility) type=Accessibility;;
889 admin) type=System;; 921 admin) type=System;;
890 antivirus) type=System;; 922 antivirus) type=System;;
891 arch) type=Archiving;; 923 arch) type=Archiving;;
892 backup) type=Archiving;; 924 backup) type=Archiving;;
893 cdr) type=DiscBurning;; 925 cdr) type=DiscBurning;;
894 dicts) type=Dictionary;; 926 dicts) type=Dictionary;;
895 doc) type=Documentation;; 927 doc) type=Documentation;;
896 editors) type=TextEditor;; 928 editors) type=TextEditor;;
897 emacs) type=TextEditor;; 929 emacs) type=TextEditor;;
898 emulation) type=Emulator;; 930 emulation) type=Emulator;;
899 laptop) type=HardwareSettings;; 931 laptop) type=HardwareSettings;;
900 office) type=Office;; 932 office) type=Office;;
901 pda) type=PDA;; 933 pda) type=PDA;;
902 vim) type=TextEditor;; 934 vim) type=TextEditor;;
903 xemacs) type=TextEditor;; 935 xemacs) type=TextEditor;;
904 *) type=;;
905 esac 936 esac
906 ;; 937 ;;
907 938
908 dev) 939 dev)
909 type="Development" 940 type="Development"
910 ;; 941 ;;
911 942
912 games) 943 games)
913 case ${catmin} in 944 case ${catmin} in
914 action|fps) type=ActionGame;; 945 action|fps) type=ActionGame;;
915 arcade) type=ArcadeGame;; 946 arcade) type=ArcadeGame;;
916 board) type=BoardGame;; 947 board) type=BoardGame;;
917 emulation) type=Emulator;; 948 emulation) type=Emulator;;
918 kids) type=KidsGame;; 949 kids) type=KidsGame;;
919 puzzle) type=LogicGame;; 950 puzzle) type=LogicGame;;
920 roguelike) type=RolePlaying;; 951 roguelike) type=RolePlaying;;
921 rpg) type=RolePlaying;; 952 rpg) type=RolePlaying;;
922 simulation) type=Simulation;; 953 simulation) type=Simulation;;
923 sports) type=SportsGame;; 954 sports) type=SportsGame;;
924 strategy) type=StrategyGame;; 955 strategy) type=StrategyGame;;
925 *) type=;;
926 esac 956 esac
927 type="Game;${type}" 957 type="Game;${type}"
928 ;; 958 ;;
929 959
930 gnome) 960 gnome)
939 type="Network;Email" 969 type="Network;Email"
940 ;; 970 ;;
941 971
942 media) 972 media)
943 case ${catmin} in 973 case ${catmin} in
974 gfx)
944 gfx) type=Graphics;; 975 type=Graphics
976 ;;
977 *)
978 case ${catmin} in
945 radio) type=Tuner;; 979 radio) type=Tuner;;
946 sound) type=Audio;; 980 sound) type=Audio;;
947 tv) type=TV;; 981 tv) type=TV;;
948 video) type=Video;; 982 video) type=Video;;
949 *) type=;; 983 esac
984 type="AudioVideo;${type}"
985 ;;
950 esac 986 esac
951 type="AudioVideo;${type}"
952 ;; 987 ;;
953 988
954 net) 989 net)
955 case ${catmin} in 990 case ${catmin} in
956 dialup) type=Dialup;; 991 dialup) type=Dialup;;
957 ftp) type=FileTransfer;; 992 ftp) type=FileTransfer;;
958 im) type=InstantMessaging;; 993 im) type=InstantMessaging;;
959 irc) type=IRCClient;; 994 irc) type=IRCClient;;
960 mail) type=Email;; 995 mail) type=Email;;
961 news) type=News;; 996 news) type=News;;
962 nntp) type=News;; 997 nntp) type=News;;
963 p2p) type=FileTransfer;; 998 p2p) type=FileTransfer;;
964 voip) type=Telephony;; 999 voip) type=Telephony;;
965 *) type=;;
966 esac 1000 esac
967 type="Network;${type}" 1001 type="Network;${type}"
968 ;; 1002 ;;
969 1003
970 sci) 1004 sci)
971 case ${catmin} in 1005 case ${catmin} in
972 astro*) type=Astronomy;; 1006 astro*) type=Astronomy;;
973 bio*) type=Biology;; 1007 bio*) type=Biology;;
974 calc*) type=Calculator;; 1008 calc*) type=Calculator;;
975 chem*) type=Chemistry;; 1009 chem*) type=Chemistry;;
976 elec*) type=Electronics;; 1010 elec*) type=Electronics;;
977 geo*) type=Geology;; 1011 geo*) type=Geology;;
978 math*) type=Math;; 1012 math*) type=Math;;
979 physics) type=Physics;; 1013 physics) type=Physics;;
980 visual*) type=DataVisualization;; 1014 visual*) type=DataVisualization;;
981 *) type=;;
982 esac 1015 esac
983 type="Education;Science;${type}" 1016 type="Education;Science;${type}"
984 ;; 1017 ;;
985 1018
986 sys) 1019 sys)
988 ;; 1021 ;;
989 1022
990 www) 1023 www)
991 case ${catmin} in 1024 case ${catmin} in
992 client) type=WebBrowser;; 1025 client) type=WebBrowser;;
993 *) type=;;
994 esac 1026 esac
995 type="Network;${type}" 1027 type="Network;${type}"
996 ;; 1028 ;;
997 1029
998 *) 1030 *)
1010 1042
1011 # Don't append another ";" when a valid category value is provided. 1043 # Don't append another ";" when a valid category value is provided.
1012 type=${type%;}${type:+;} 1044 type=${type%;}${type:+;}
1013 1045
1014 eshopts_push -s extglob 1046 eshopts_push -s extglob
1015 if [[ -n ${icon} && ${icon} != /* && ${icon} == *.@(xpm|png|svg) ]]; then 1047 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" 1048 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." 1049 ewarn "allowed in .desktop files if the value is not an absolute path."
1018 icon=${icon%.@(xpm|png|svg)} 1050 icon=${icon%.@(xpm|png|svg)}
1019 fi 1051 fi
1020 eshopts_pop 1052 eshopts_pop
1028 TryExec=${exec%% *} 1060 TryExec=${exec%% *}
1029 Icon=${icon} 1061 Icon=${icon}
1030 Categories=${type} 1062 Categories=${type}
1031 EOF 1063 EOF
1032 1064
1033 [[ ${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}"
1034 1071
1035 ( 1072 (
1036 # wrap the env here so that the 'insinto' call 1073 # wrap the env here so that the 'insinto' call
1037 # doesn't corrupt the env of the caller 1074 # doesn't corrupt the env of the caller
1038 insinto /usr/share/applications 1075 insinto /usr/share/applications
1039 doins "${desktop}" 1076 doins "${desktop}"
1040 ) 1077 ) || die "installing desktop file failed"
1041} 1078}
1042 1079
1043# @FUNCTION: validate_desktop_entries 1080# @FUNCTION: validate_desktop_entries
1044# @USAGE: [directories] 1081# @USAGE: [directories]
1045# @MAINTAINER: 1082# @MAINTAINER:
1324 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1361 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1325 1362
1326 local shrtsrc=$(basename "${src}") 1363 local shrtsrc=$(basename "${src}")
1327 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1364 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1328 if [[ -z ${skip} ]] ; then 1365 if [[ -z ${skip} ]] ; then
1329 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1366 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1330 local skip=0 1367 local skip=0
1331 exe=tail 1368 exe=tail
1332 case ${ver} in 1369 case ${ver} in
1333 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
1334 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1371 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1336 2.0|2.0.1) 1373 2.0|2.0.1)
1337 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1374 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1338 ;; 1375 ;;
1339 2.1.1) 1376 2.1.1)
1340 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1377 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1341 let skip="skip + 1" 1378 (( skip++ ))
1342 ;; 1379 ;;
1343 2.1.2) 1380 2.1.2)
1344 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1381 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1345 let skip="skip + 1" 1382 (( skip++ ))
1346 ;; 1383 ;;
1347 2.1.3) 1384 2.1.3)
1348 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1385 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1349 let skip="skip + 1" 1386 (( skip++ ))
1350 ;; 1387 ;;
1351 2.1.4|2.1.5) 1388 2.1.4|2.1.5)
1352 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)
1353 skip=$(head -n ${skip} "${src}" | wc -c) 1390 skip=$(head -n ${skip} "${src}" | wc -c)
1354 exe="dd" 1391 exe="dd"
1363 esac 1400 esac
1364 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1401 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1365 fi 1402 fi
1366 case ${exe} in 1403 case ${exe} in
1367 tail) exe="tail -n +${skip} '${src}'";; 1404 tail) exe="tail -n +${skip} '${src}'";;
1368 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1405 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1369 *) die "makeself cant handle exe '${exe}'" 1406 *) die "makeself cant handle exe '${exe}'"
1370 esac 1407 esac
1371 1408
1372 # 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
1373 local tmpfile=$(emktemp) 1410 local filetype tmpfile=$(emktemp)
1374 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1411 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1375 local filetype=$(file -b "${tmpfile}") 1412 filetype=$(file -b "${tmpfile}") || die
1376 case ${filetype} in 1413 case ${filetype} in
1377 *tar\ archive*) 1414 *tar\ archive*)
1378 eval ${exe} | tar --no-same-owner -xf - 1415 eval ${exe} | tar --no-same-owner -xf -
1379 ;; 1416 ;;
1380 bzip2*) 1417 bzip2*)
1506 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1543 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1507 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1544 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1508 export CDROM_SET=-1 1545 export CDROM_SET=-1
1509 for f in ${CDROM_CHECK_1//:/ } ; do 1546 for f in ${CDROM_CHECK_1//:/ } ; do
1510 ((++CDROM_SET)) 1547 ((++CDROM_SET))
1511 [[ -e ${CD_ROOT}/${f} ]] && break 1548 [[ -e ${CDROM_ROOT}/${f} ]] && break
1512 done 1549 done
1513 export CDROM_MATCH=${f} 1550 export CDROM_MATCH=${f}
1514 return 1551 return
1515 fi 1552 fi
1516 1553
1690 else 1727 else
1691 newls="" 1728 newls=""
1692 fi 1729 fi
1693 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do 1730 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1694 if [[ ${op} == "-i" ]] ; then 1731 if [[ ${op} == "-i" ]] ; then
1695 hasq ${f} ${ls} && newls="${newls} ${f}" 1732 has ${f} ${ls} && newls="${newls} ${f}"
1696 else 1733 else
1697 hasq ${f} ${ls} || newls="${newls} ${f}" 1734 has ${f} ${ls} || newls="${newls} ${f}"
1698 fi 1735 fi
1699 done 1736 done
1700 ls=${newls} 1737 ls=${newls}
1701 done 1738 done
1702 else 1739 else
1704 fi 1741 fi
1705 1742
1706 nols="" 1743 nols=""
1707 newls="" 1744 newls=""
1708 for f in ${LINGUAS} ; do 1745 for f in ${LINGUAS} ; do
1709 if hasq ${f} ${ls} ; then 1746 if has ${f} ${ls} ; then
1710 newls="${newls} ${f}" 1747 newls="${newls} ${f}"
1711 else 1748 else
1712 nols="${nols} ${f}" 1749 nols="${nols} ${f}"
1713 fi 1750 fi
1714 done 1751 done
1769 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"
1770 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"
1771 ewarn "helper program, simply emerge the 'gentoolkit' package." 1808 ewarn "helper program, simply emerge the 'gentoolkit' package."
1772 ewarn 1809 ewarn
1773 fi 1810 fi
1811 # temp hack for #348634 #357225
1812 [[ ${PN} == "mpfr" ]] && lib=${lib##*/}
1774 ewarn " # revdep-rebuild --library ${lib##*/}" 1813 ewarn " # revdep-rebuild --library '${lib}'"
1775 done 1814 done
1776 if [[ ${notice} -eq 1 ]] ; then 1815 if [[ ${notice} -eq 1 ]] ; then
1777 ewarn 1816 ewarn
1778 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"
1779 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:"
1925 else 1964 else
1926 newbin "${tmpwrapper}" "${wrapper}" || die 1965 newbin "${tmpwrapper}" "${wrapper}" || die
1927 fi 1966 fi
1928} 1967}
1929 1968
1930# @FUNCTION: prepalldocs 1969# @FUNCTION: path_exists
1931# @USAGE: 1970# @USAGE: [-a|-o] <paths>
1932# @DESCRIPTION: 1971# @DESCRIPTION:
1933# Compress files in /usr/share/doc which are not already 1972# Check if the specified paths exist. Works for all types of paths
1934# compressed, excluding /usr/share/doc/${PF}/html. 1973# (files/dirs/etc...). The -a and -o flags control the requirements
1935# Uses the ecompressdir to do the compression. 1974# of the paths. They correspond to "and" and "or" logic. So the -a
1936# 2009-02-18 by betelgeuse: 1975# flag means all the paths must exist while the -o flag means at least
1937# Commented because ecompressdir is even more internal to 1976# 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 1977# paths are specified, then the return value is "false".
1939# ebuild). Please submit a better version for review to gentoo-dev 1978path_exists() {
1940# if you want prepalldocs here. 1979 local opt=$1
1941#prepalldocs() { 1980 [[ ${opt} == -[ao] ]] && shift || opt="-a"
1942# if [[ -n $1 ]] ; then
1943# ewarn "prepalldocs: invalid usage; takes no arguments"
1944# fi
1945 1981
1946# cd "${D}" 1982 # no paths -> return false
1947# [[ -d usr/share/doc ]] || return 0 1983 # same behavior as: [[ -e "" ]]
1984 [[ $# -eq 0 ]] && return 1
1948 1985
1949# find usr/share/doc -exec gzip {} + 1986 local p r=0
1950# ecompressdir --ignore /usr/share/doc/${PF}/html 1987 for p in "$@" ; do
1951# ecompressdir --queue /usr/share/doc 1988 [[ -e ${p} ]]
1952#} 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.334  
changed lines
  Added in v.1.360

  ViewVC Help
Powered by ViewVC 1.1.20