/[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.359
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.359 2011/07/20 05:46:46 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
348 # such patches. 362 # such patches.
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}"
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}"
353 fi 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 ...
424 EPATCH_SOURCE=${EPATCH_SOURCE} \ 445 EPATCH_SOURCE=${EPATCH_SOURCE} \
425 EPATCH_SUFFIX="patch" \ 446 EPATCH_SUFFIX="patch" \
426 EPATCH_FORCE="yes" \ 447 EPATCH_FORCE="yes" \
427 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \ 448 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
428 epatch 449 epatch
429 break 450 return 0
430 fi 451 fi
431 done 452 done
453 return 1
432} 454}
433 455
434# @FUNCTION: emktemp 456# @FUNCTION: emktemp
435# @USAGE: [temp dir] 457# @USAGE: [temp dir]
436# @DESCRIPTION: 458# @DESCRIPTION:
480egetent() { 502egetent() {
481 case ${CHOST} in 503 case ${CHOST} in
482 *-darwin[678]) 504 *-darwin[678])
483 case "$2" in 505 case "$2" in
484 *[!0-9]*) # Non numeric 506 *[!0-9]*) # Non numeric
485 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 507 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2\$/) {print \$0;exit;} }"
486 ;; 508 ;;
487 *) # Numeric 509 *) # Numeric
488 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 510 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
489 ;; 511 ;;
490 esac 512 esac
708 fi 730 fi
709 ;; 731 ;;
710 732
711 *) 733 *)
712 if [[ -z $@ ]] ; then 734 if [[ -z $@ ]] ; then
713 useradd ${opts} \ 735 useradd -r ${opts} \
714 -c "added by portage for ${PN}" \ 736 -c "added by portage for ${PN}" \
715 ${euser} \ 737 ${euser} \
716 || die "enewuser failed" 738 || die "enewuser failed"
717 else 739 else
718 einfo " - Extra: $@" 740 einfo " - Extra: $@"
719 useradd ${opts} "$@" \ 741 useradd -r ${opts} "$@" \
720 ${euser} \ 742 ${euser} \
721 || die "enewuser failed" 743 || die "enewuser failed"
722 fi 744 fi
723 ;; 745 ;;
724 esac 746 esac
837 esac 859 esac
838 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 860 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
839 ;; 861 ;;
840 862
841 *) 863 *)
864 # We specify -r so that we get a GID in the system range from login.defs
842 groupadd ${opts} ${egroup} || die "enewgroup failed" 865 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
843 ;; 866 ;;
844 esac 867 esac
845 export SANDBOX_ON="${oldsandbox}" 868 export SANDBOX_ON="${oldsandbox}"
846} 869}
847 870
858 881
859# Make a desktop file ! 882# Make a desktop file !
860# Great for making those icons in kde/gnome startmenu ! 883# Great for making those icons in kde/gnome startmenu !
861# Amaze your friends ! Get the women ! Join today ! 884# Amaze your friends ! Get the women ! Join today !
862# 885#
863# make_desktop_entry(<command>, [name], [icon], [type], [path]) 886# make_desktop_entry(<command>, [name], [icon], [type], [fields])
864# 887#
865# binary: what command does the app run with ? 888# binary: what command does the app run with ?
866# name: the name that will show up in the menu 889# name: the name that will show up in the menu
867# icon: give your little like a pretty little icon ... 890# icon: give your little like a pretty little icon ...
868# this can be relative (to /usr/share/pixmaps) or 891# this can be relative (to /usr/share/pixmaps) or
869# a full path to an icon 892# a full path to an icon
870# type: what kind of application is this ? for categories: 893# type: what kind of application is this ? for categories:
871# http://standards.freedesktop.org/menu-spec/latest/apa.html 894# http://standards.freedesktop.org/menu-spec/latest/apa.html
872# path: if your app needs to startup in a specific dir 895# fields: extra fields to append to the desktop file; a printf string
873make_desktop_entry() { 896make_desktop_entry() {
874 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 897 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
875 898
876 local exec=${1} 899 local exec=${1}
877 local name=${2:-${PN}} 900 local name=${2:-${PN}}
878 local icon=${3:-${PN}} 901 local icon=${3:-${PN}}
879 local type=${4} 902 local type=${4}
880 local path=${5} 903 local fields=${5}
881 904
882 if [[ -z ${type} ]] ; then 905 if [[ -z ${type} ]] ; then
883 local catmaj=${CATEGORY%%-*} 906 local catmaj=${CATEGORY%%-*}
884 local catmin=${CATEGORY##*-} 907 local catmin=${CATEGORY##*-}
885 case ${catmaj} in 908 case ${catmaj} in
886 app) 909 app)
887 case ${catmin} in 910 case ${catmin} in
888 accessibility) type=Accessibility;; 911 accessibility) type=Accessibility;;
889 admin) type=System;; 912 admin) type=System;;
890 antivirus) type=System;; 913 antivirus) type=System;;
891 arch) type=Archiving;; 914 arch) type=Archiving;;
892 backup) type=Archiving;; 915 backup) type=Archiving;;
893 cdr) type=DiscBurning;; 916 cdr) type=DiscBurning;;
894 dicts) type=Dictionary;; 917 dicts) type=Dictionary;;
895 doc) type=Documentation;; 918 doc) type=Documentation;;
896 editors) type=TextEditor;; 919 editors) type=TextEditor;;
897 emacs) type=TextEditor;; 920 emacs) type=TextEditor;;
898 emulation) type=Emulator;; 921 emulation) type=Emulator;;
899 laptop) type=HardwareSettings;; 922 laptop) type=HardwareSettings;;
900 office) type=Office;; 923 office) type=Office;;
901 pda) type=PDA;; 924 pda) type=PDA;;
902 vim) type=TextEditor;; 925 vim) type=TextEditor;;
903 xemacs) type=TextEditor;; 926 xemacs) type=TextEditor;;
904 *) type=;;
905 esac 927 esac
906 ;; 928 ;;
907 929
908 dev) 930 dev)
909 type="Development" 931 type="Development"
910 ;; 932 ;;
911 933
912 games) 934 games)
913 case ${catmin} in 935 case ${catmin} in
914 action|fps) type=ActionGame;; 936 action|fps) type=ActionGame;;
915 arcade) type=ArcadeGame;; 937 arcade) type=ArcadeGame;;
916 board) type=BoardGame;; 938 board) type=BoardGame;;
917 emulation) type=Emulator;; 939 emulation) type=Emulator;;
918 kids) type=KidsGame;; 940 kids) type=KidsGame;;
919 puzzle) type=LogicGame;; 941 puzzle) type=LogicGame;;
920 roguelike) type=RolePlaying;; 942 roguelike) type=RolePlaying;;
921 rpg) type=RolePlaying;; 943 rpg) type=RolePlaying;;
922 simulation) type=Simulation;; 944 simulation) type=Simulation;;
923 sports) type=SportsGame;; 945 sports) type=SportsGame;;
924 strategy) type=StrategyGame;; 946 strategy) type=StrategyGame;;
925 *) type=;;
926 esac 947 esac
927 type="Game;${type}" 948 type="Game;${type}"
928 ;; 949 ;;
929 950
930 gnome) 951 gnome)
939 type="Network;Email" 960 type="Network;Email"
940 ;; 961 ;;
941 962
942 media) 963 media)
943 case ${catmin} in 964 case ${catmin} in
965 gfx)
944 gfx) type=Graphics;; 966 type=Graphics
967 ;;
968 *)
969 case ${catmin} in
945 radio) type=Tuner;; 970 radio) type=Tuner;;
946 sound) type=Audio;; 971 sound) type=Audio;;
947 tv) type=TV;; 972 tv) type=TV;;
948 video) type=Video;; 973 video) type=Video;;
949 *) type=;; 974 esac
975 type="AudioVideo;${type}"
976 ;;
950 esac 977 esac
951 type="AudioVideo;${type}"
952 ;; 978 ;;
953 979
954 net) 980 net)
955 case ${catmin} in 981 case ${catmin} in
956 dialup) type=Dialup;; 982 dialup) type=Dialup;;
957 ftp) type=FileTransfer;; 983 ftp) type=FileTransfer;;
958 im) type=InstantMessaging;; 984 im) type=InstantMessaging;;
959 irc) type=IRCClient;; 985 irc) type=IRCClient;;
960 mail) type=Email;; 986 mail) type=Email;;
961 news) type=News;; 987 news) type=News;;
962 nntp) type=News;; 988 nntp) type=News;;
963 p2p) type=FileTransfer;; 989 p2p) type=FileTransfer;;
964 voip) type=Telephony;; 990 voip) type=Telephony;;
965 *) type=;;
966 esac 991 esac
967 type="Network;${type}" 992 type="Network;${type}"
968 ;; 993 ;;
969 994
970 sci) 995 sci)
971 case ${catmin} in 996 case ${catmin} in
972 astro*) type=Astronomy;; 997 astro*) type=Astronomy;;
973 bio*) type=Biology;; 998 bio*) type=Biology;;
974 calc*) type=Calculator;; 999 calc*) type=Calculator;;
975 chem*) type=Chemistry;; 1000 chem*) type=Chemistry;;
976 elec*) type=Electronics;; 1001 elec*) type=Electronics;;
977 geo*) type=Geology;; 1002 geo*) type=Geology;;
978 math*) type=Math;; 1003 math*) type=Math;;
979 physics) type=Physics;; 1004 physics) type=Physics;;
980 visual*) type=DataVisualization;; 1005 visual*) type=DataVisualization;;
981 *) type=;;
982 esac 1006 esac
983 type="Education;Science;${type}" 1007 type="Education;Science;${type}"
984 ;; 1008 ;;
985 1009
986 sys) 1010 sys)
988 ;; 1012 ;;
989 1013
990 www) 1014 www)
991 case ${catmin} in 1015 case ${catmin} in
992 client) type=WebBrowser;; 1016 client) type=WebBrowser;;
993 *) type=;;
994 esac 1017 esac
995 type="Network;${type}" 1018 type="Network;${type}"
996 ;; 1019 ;;
997 1020
998 *) 1021 *)
1010 1033
1011 # Don't append another ";" when a valid category value is provided. 1034 # Don't append another ";" when a valid category value is provided.
1012 type=${type%;}${type:+;} 1035 type=${type%;}${type:+;}
1013 1036
1014 eshopts_push -s extglob 1037 eshopts_push -s extglob
1015 if [[ -n ${icon} && ${icon} != /* && ${icon} == *.@(xpm|png|svg) ]]; then 1038 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" 1039 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." 1040 ewarn "allowed in .desktop files if the value is not an absolute path."
1018 icon=${icon%.@(xpm|png|svg)} 1041 icon=${icon%.@(xpm|png|svg)}
1019 fi 1042 fi
1020 eshopts_pop 1043 eshopts_pop
1028 TryExec=${exec%% *} 1051 TryExec=${exec%% *}
1029 Icon=${icon} 1052 Icon=${icon}
1030 Categories=${type} 1053 Categories=${type}
1031 EOF 1054 EOF
1032 1055
1033 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1056 if [[ ${fields:-=} != *=* ]] ; then
1057 # 5th arg used to be value to Path=
1058 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
1059 fields="Path=${fields}"
1060 fi
1061 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
1034 1062
1035 ( 1063 (
1036 # wrap the env here so that the 'insinto' call 1064 # wrap the env here so that the 'insinto' call
1037 # doesn't corrupt the env of the caller 1065 # doesn't corrupt the env of the caller
1038 insinto /usr/share/applications 1066 insinto /usr/share/applications
1039 doins "${desktop}" 1067 doins "${desktop}"
1040 ) 1068 ) || die "installing desktop file failed"
1041} 1069}
1042 1070
1043# @FUNCTION: validate_desktop_entries 1071# @FUNCTION: validate_desktop_entries
1044# @USAGE: [directories] 1072# @USAGE: [directories]
1045# @MAINTAINER: 1073# @MAINTAINER:
1324 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1352 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1325 1353
1326 local shrtsrc=$(basename "${src}") 1354 local shrtsrc=$(basename "${src}")
1327 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1355 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1328 if [[ -z ${skip} ]] ; then 1356 if [[ -z ${skip} ]] ; then
1329 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1357 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1330 local skip=0 1358 local skip=0
1331 exe=tail 1359 exe=tail
1332 case ${ver} in 1360 case ${ver} in
1333 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1361 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) 1362 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1336 2.0|2.0.1) 1364 2.0|2.0.1)
1337 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1365 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1338 ;; 1366 ;;
1339 2.1.1) 1367 2.1.1)
1340 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1368 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1341 let skip="skip + 1" 1369 (( skip++ ))
1342 ;; 1370 ;;
1343 2.1.2) 1371 2.1.2)
1344 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1372 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1345 let skip="skip + 1" 1373 (( skip++ ))
1346 ;; 1374 ;;
1347 2.1.3) 1375 2.1.3)
1348 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1376 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1349 let skip="skip + 1" 1377 (( skip++ ))
1350 ;; 1378 ;;
1351 2.1.4|2.1.5) 1379 2.1.4|2.1.5)
1352 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1380 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1353 skip=$(head -n ${skip} "${src}" | wc -c) 1381 skip=$(head -n ${skip} "${src}" | wc -c)
1354 exe="dd" 1382 exe="dd"
1363 esac 1391 esac
1364 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1392 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1365 fi 1393 fi
1366 case ${exe} in 1394 case ${exe} in
1367 tail) exe="tail -n +${skip} '${src}'";; 1395 tail) exe="tail -n +${skip} '${src}'";;
1368 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1396 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1369 *) die "makeself cant handle exe '${exe}'" 1397 *) die "makeself cant handle exe '${exe}'"
1370 esac 1398 esac
1371 1399
1372 # lets grab the first few bytes of the file to figure out what kind of archive it is 1400 # lets grab the first few bytes of the file to figure out what kind of archive it is
1373 local tmpfile=$(emktemp) 1401 local filetype tmpfile=$(emktemp)
1374 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1402 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1375 local filetype=$(file -b "${tmpfile}") 1403 filetype=$(file -b "${tmpfile}") || die
1376 case ${filetype} in 1404 case ${filetype} in
1377 *tar\ archive*) 1405 *tar\ archive*)
1378 eval ${exe} | tar --no-same-owner -xf - 1406 eval ${exe} | tar --no-same-owner -xf -
1379 ;; 1407 ;;
1380 bzip2*) 1408 bzip2*)
1506 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1534 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1507 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1535 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1508 export CDROM_SET=-1 1536 export CDROM_SET=-1
1509 for f in ${CDROM_CHECK_1//:/ } ; do 1537 for f in ${CDROM_CHECK_1//:/ } ; do
1510 ((++CDROM_SET)) 1538 ((++CDROM_SET))
1511 [[ -e ${CD_ROOT}/${f} ]] && break 1539 [[ -e ${CDROM_ROOT}/${f} ]] && break
1512 done 1540 done
1513 export CDROM_MATCH=${f} 1541 export CDROM_MATCH=${f}
1514 return 1542 return
1515 fi 1543 fi
1516 1544
1690 else 1718 else
1691 newls="" 1719 newls=""
1692 fi 1720 fi
1693 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do 1721 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1694 if [[ ${op} == "-i" ]] ; then 1722 if [[ ${op} == "-i" ]] ; then
1695 hasq ${f} ${ls} && newls="${newls} ${f}" 1723 has ${f} ${ls} && newls="${newls} ${f}"
1696 else 1724 else
1697 hasq ${f} ${ls} || newls="${newls} ${f}" 1725 has ${f} ${ls} || newls="${newls} ${f}"
1698 fi 1726 fi
1699 done 1727 done
1700 ls=${newls} 1728 ls=${newls}
1701 done 1729 done
1702 else 1730 else
1704 fi 1732 fi
1705 1733
1706 nols="" 1734 nols=""
1707 newls="" 1735 newls=""
1708 for f in ${LINGUAS} ; do 1736 for f in ${LINGUAS} ; do
1709 if hasq ${f} ${ls} ; then 1737 if has ${f} ${ls} ; then
1710 newls="${newls} ${f}" 1738 newls="${newls} ${f}"
1711 else 1739 else
1712 nols="${nols} ${f}" 1740 nols="${nols} ${f}"
1713 fi 1741 fi
1714 done 1742 done
1769 ewarn "the libraries are not being removed. You need to run revdep-rebuild" 1797 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" 1798 ewarn "in order to remove these old dependencies. If you do not have this"
1771 ewarn "helper program, simply emerge the 'gentoolkit' package." 1799 ewarn "helper program, simply emerge the 'gentoolkit' package."
1772 ewarn 1800 ewarn
1773 fi 1801 fi
1802 # temp hack for #348634 #357225
1803 [[ ${PN} == "mpfr" ]] && lib=${lib##*/}
1774 ewarn " # revdep-rebuild --library ${lib##*/}" 1804 ewarn " # revdep-rebuild --library '${lib}'"
1775 done 1805 done
1776 if [[ ${notice} -eq 1 ]] ; then 1806 if [[ ${notice} -eq 1 ]] ; then
1777 ewarn 1807 ewarn
1778 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1808 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:" 1809 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1925 else 1955 else
1926 newbin "${tmpwrapper}" "${wrapper}" || die 1956 newbin "${tmpwrapper}" "${wrapper}" || die
1927 fi 1957 fi
1928} 1958}
1929 1959
1930# @FUNCTION: prepalldocs 1960# @FUNCTION: path_exists
1931# @USAGE: 1961# @USAGE: [-a|-o] <paths>
1932# @DESCRIPTION: 1962# @DESCRIPTION:
1933# Compress files in /usr/share/doc which are not already 1963# Check if the specified paths exist. Works for all types of paths
1934# compressed, excluding /usr/share/doc/${PF}/html. 1964# (files/dirs/etc...). The -a and -o flags control the requirements
1935# Uses the ecompressdir to do the compression. 1965# of the paths. They correspond to "and" and "or" logic. So the -a
1936# 2009-02-18 by betelgeuse: 1966# flag means all the paths must exist while the -o flag means at least
1937# Commented because ecompressdir is even more internal to 1967# 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 1968# paths are specified, then the return value is "false".
1939# ebuild). Please submit a better version for review to gentoo-dev 1969path_exists() {
1940# if you want prepalldocs here. 1970 local opt=$1
1941#prepalldocs() { 1971 [[ ${opt} == -[ao] ]] && shift || opt="-a"
1942# if [[ -n $1 ]] ; then
1943# ewarn "prepalldocs: invalid usage; takes no arguments"
1944# fi
1945 1972
1946# cd "${D}" 1973 # no paths -> return false
1947# [[ -d usr/share/doc ]] || return 0 1974 # same behavior as: [[ -e "" ]]
1975 [[ $# -eq 0 ]] && return 1
1948 1976
1949# find usr/share/doc -exec gzip {} + 1977 local p r=0
1950# ecompressdir --ignore /usr/share/doc/${PF}/html 1978 for p in "$@" ; do
1951# ecompressdir --queue /usr/share/doc 1979 [[ -e ${p} ]]
1952#} 1980 : $(( r += $? ))
1981 done
1982
1983 case ${opt} in
1984 -a) return $(( r != 0 )) ;;
1985 -o) return $(( r == $# )) ;;
1986 esac
1987}

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

  ViewVC Help
Powered by ViewVC 1.1.20