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