/[gentoo-x86]/eclass/eutils.eclass
Gentoo

Diff of /eclass/eutils.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.338 Revision 1.363
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.338 2010/03/07 02:52:25 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.363 2011/09/12 20:44:01 mgorny 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
59 59
60epause() { 60epause() {
61 ewarn "QA Notice: epause is not defined in EAPI=${EAPI}, 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 ewarn for package managers that don't provide eqawarn and use the PM
70# implementation if available. Reuses PORTAGE_ELOG_CLASSES as set by the dev
71# profile.
72if ! declare -F eqawarn >/dev/null ; then
73 eqawarn() {
74 has qa ${PORTAGE_ELOG_CLASSES} && ewarn "$@"
75 }
64fi 76fi
65 77
66# @FUNCTION: ecvs_clean 78# @FUNCTION: ecvs_clean
67# @USAGE: [list of dirs] 79# @USAGE: [list of dirs]
68# @DESCRIPTION: 80# @DESCRIPTION:
189# If you do not specify any options, then epatch will default to the directory 201# If you do not specify any options, then epatch will default to the directory
190# specified by EPATCH_SOURCE. 202# specified by EPATCH_SOURCE.
191# 203#
192# When processing directories, epatch will apply all patches that match: 204# When processing directories, epatch will apply all patches that match:
193# @CODE 205# @CODE
194# ${EPATCH_FORCE} == "yes" 206# if ${EPATCH_FORCE} != "yes"
195# ??_${ARCH}_foo.${EPATCH_SUFFIX} 207# ??_${ARCH}_foo.${EPATCH_SUFFIX}
196# else 208# else
197# *.${EPATCH_SUFFIX} 209# *.${EPATCH_SUFFIX}
198# @CODE 210# @CODE
199# The leading ?? are typically numbers used to force consistent patch ordering. 211# The leading ?? are typically numbers used to force consistent patch ordering.
238 local EPATCH_SUFFIX=$1 250 local EPATCH_SUFFIX=$1
239 251
240 elif [[ -d $1 ]] ; then 252 elif [[ -d $1 ]] ; then
241 # Some people like to make dirs of patches w/out suffixes (vim) 253 # Some people like to make dirs of patches w/out suffixes (vim)
242 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"} 254 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
255
256 elif [[ -f ${EPATCH_SOURCE}/$1 ]] ; then
257 # Re-use EPATCH_SOURCE as a search dir
258 epatch "${EPATCH_SOURCE}/$1"
259 return $?
243 260
244 else 261 else
245 # sanity check ... if it isn't a dir or file, wtf man ? 262 # sanity check ... if it isn't a dir or file, wtf man ?
246 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1 263 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
247 echo 264 echo
278 # ???_arch_foo.patch 295 # ???_arch_foo.patch
279 # Else, skip this input altogether 296 # Else, skip this input altogether
280 local a=${patchname#*_} # strip the ???_ 297 local a=${patchname#*_} # strip the ???_
281 a=${a%%_*} # strip the _foo.patch 298 a=${a%%_*} # strip the _foo.patch
282 if ! [[ ${SINGLE_PATCH} == "yes" || \ 299 if ! [[ ${SINGLE_PATCH} == "yes" || \
283 ${EPATCH_FORCE} == "yes" || \ 300 ${EPATCH_FORCE} == "yes" || \
284 ${a} == all || \ 301 ${a} == all || \
285 ${a} == ${ARCH} ]] 302 ${a} == ${ARCH} ]]
286 then 303 then
287 continue 304 continue
288 fi 305 fi
289 306
290 # Let people filter things dynamically 307 # Let people filter things dynamically
347 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }') 364 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
348 if [[ -n ${abs_paths} ]] ; then 365 if [[ -n ${abs_paths} ]] ; then
349 count=1 366 count=1
350 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}" 367 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
351 fi 368 fi
369 # Similar reason, but with relative paths.
370 local rel_paths=$(egrep -n '^[-+]{3} [^ ]*[.][.]/' "${PATCH_TARGET}")
371 if [[ -n ${rel_paths} ]] ; then
372 eqawarn "QA Notice: Your patch uses relative paths '../'."
373 eqawarn " In the future this will cause a failure."
374 eqawarn "${rel_paths}"
375 fi
352 376
353 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/ 377 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
354 while [[ ${count} -lt 5 ]] ; do 378 while [[ ${count} -lt 5 ]] ; do
355 # Generate some useful debug info ... 379 # Generate some useful debug info ...
356 ( 380 (
357 _epatch_draw_line "***** ${patchname} *****" 381 _epatch_draw_line "***** ${patchname} *****"
358 echo 382 echo
359 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'" 383 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
360 echo 384 echo
361 _epatch_draw_line "***** ${patchname} *****" 385 _epatch_draw_line "***** ${patchname} *****"
386 patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}" 2>&1
387 ret=$?
388 echo
389 echo "patch program exited with status ${ret}"
390 exit ${ret}
362 ) >> "${STDERR_TARGET}" 391 ) >> "${STDERR_TARGET}"
363 392
364 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then 393 if [ $? -eq 0 ] ; then
365 ( 394 (
366 _epatch_draw_line "***** ${patchname} *****" 395 _epatch_draw_line "***** ${patchname} *****"
367 echo 396 echo
368 echo "ACTUALLY APPLYING ${patchname} ..." 397 echo "ACTUALLY APPLYING ${patchname} ..."
369 echo 398 echo
370 _epatch_draw_line "***** ${patchname} *****" 399 _epatch_draw_line "***** ${patchname} *****"
371 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1 400 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
401 ret=$?
402 echo
403 echo "patch program exited with status ${ret}"
404 exit ${ret}
372 ) >> "${STDERR_TARGET}" 405 ) >> "${STDERR_TARGET}"
373 406
374 if [ $? -ne 0 ] ; then 407 if [ $? -ne 0 ] ; then
375 echo 408 echo
376 eerror "A dry-run of patch command succeeded, but actually" 409 eerror "A dry-run of patch command succeeded, but actually"
407 done 440 done
408 441
409 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching" 442 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
410 : # everything worked 443 : # everything worked
411} 444}
445
446# @FUNCTION: epatch_user
447# @USAGE:
448# @DESCRIPTION:
449# Applies user-provided patches to the source tree. The patches are
450# taken from /etc/portage/patches/<CATEGORY>/<PF|P|PN>/, where the first
451# of these three directories to exist will be the one to use, ignoring
452# any more general directories which might exist as well.
453#
454# User patches are intended for quick testing of patches without ebuild
455# modifications, as well as for permanent customizations a user might
456# desire. Obviously, there can be no official support for arbitrarily
457# patched ebuilds. So whenever a build log in a bug report mentions that
458# user patches were applied, the user should be asked to reproduce the
459# problem without these.
460#
461# Not all ebuilds do call this function, so placing patches in the
462# stated directory might or might not work, depending on the package and
463# the eclasses it inherits and uses. It is safe to call the function
464# repeatedly, so it is always possible to add a call at the ebuild
465# level. The first call is the time when the patches will be
466# applied.
467#
468# Ideally, this function should be called after gentoo-specific patches
469# have been applied, so that their code can be modified as well, but
470# before calls to e.g. eautoreconf, as the user patches might affect
471# autotool input files as well.
412epatch_user() { 472epatch_user() {
413 [[ $# -ne 0 ]] && die "epatch_user takes no options" 473 [[ $# -ne 0 ]] && die "epatch_user takes no options"
474
475 # Allow multiple calls to this function; ignore all but the first
476 local applied="${T}/epatch_user.applied"
477 [[ -e ${applied} ]] && return 2
414 478
415 # don't clobber any EPATCH vars that the parent might want 479 # don't clobber any EPATCH vars that the parent might want
416 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches 480 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
417 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do 481 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
418 EPATCH_SOURCE=${base}/${CTARGET}/${check} 482 EPATCH_SOURCE=${base}/${CTARGET}/${check}
422 EPATCH_SOURCE=${EPATCH_SOURCE} \ 486 EPATCH_SOURCE=${EPATCH_SOURCE} \
423 EPATCH_SUFFIX="patch" \ 487 EPATCH_SUFFIX="patch" \
424 EPATCH_FORCE="yes" \ 488 EPATCH_FORCE="yes" \
425 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \ 489 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
426 epatch 490 epatch
427 break 491 echo "${EPATCH_SOURCE}" > "${applied}"
492 return 0
428 fi 493 fi
429 done 494 done
495 echo "none" > "${applied}"
496 return 1
430} 497}
431 498
432# @FUNCTION: emktemp 499# @FUNCTION: emktemp
433# @USAGE: [temp dir] 500# @USAGE: [temp dir]
434# @DESCRIPTION: 501# @DESCRIPTION:
478egetent() { 545egetent() {
479 case ${CHOST} in 546 case ${CHOST} in
480 *-darwin[678]) 547 *-darwin[678])
481 case "$2" in 548 case "$2" in
482 *[!0-9]*) # Non numeric 549 *[!0-9]*) # Non numeric
483 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 550 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2\$/) {print \$0;exit;} }"
484 ;; 551 ;;
485 *) # Numeric 552 *) # Numeric
486 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 553 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
487 ;; 554 ;;
488 esac 555 esac
706 fi 773 fi
707 ;; 774 ;;
708 775
709 *) 776 *)
710 if [[ -z $@ ]] ; then 777 if [[ -z $@ ]] ; then
711 useradd ${opts} \ 778 useradd -r ${opts} \
712 -c "added by portage for ${PN}" \ 779 -c "added by portage for ${PN}" \
713 ${euser} \ 780 ${euser} \
714 || die "enewuser failed" 781 || die "enewuser failed"
715 else 782 else
716 einfo " - Extra: $@" 783 einfo " - Extra: $@"
717 useradd ${opts} "$@" \ 784 useradd -r ${opts} "$@" \
718 ${euser} \ 785 ${euser} \
719 || die "enewuser failed" 786 || die "enewuser failed"
720 fi 787 fi
721 ;; 788 ;;
722 esac 789 esac
835 esac 902 esac
836 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 903 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
837 ;; 904 ;;
838 905
839 *) 906 *)
907 # We specify -r so that we get a GID in the system range from login.defs
840 groupadd ${opts} ${egroup} || die "enewgroup failed" 908 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
841 ;; 909 ;;
842 esac 910 esac
843 export SANDBOX_ON="${oldsandbox}" 911 export SANDBOX_ON="${oldsandbox}"
844} 912}
845 913
856 924
857# Make a desktop file ! 925# Make a desktop file !
858# Great for making those icons in kde/gnome startmenu ! 926# Great for making those icons in kde/gnome startmenu !
859# Amaze your friends ! Get the women ! Join today ! 927# Amaze your friends ! Get the women ! Join today !
860# 928#
861# make_desktop_entry(<command>, [name], [icon], [type], [path]) 929# make_desktop_entry(<command>, [name], [icon], [type], [fields])
862# 930#
863# binary: what command does the app run with ? 931# binary: what command does the app run with ?
864# name: the name that will show up in the menu 932# name: the name that will show up in the menu
865# icon: give your little like a pretty little icon ... 933# icon: give your little like a pretty little icon ...
866# this can be relative (to /usr/share/pixmaps) or 934# this can be relative (to /usr/share/pixmaps) or
867# a full path to an icon 935# a full path to an icon
868# type: what kind of application is this ? for categories: 936# type: what kind of application is this ? for categories:
869# http://standards.freedesktop.org/menu-spec/latest/apa.html 937# http://standards.freedesktop.org/menu-spec/latest/apa.html
870# path: if your app needs to startup in a specific dir 938# fields: extra fields to append to the desktop file; a printf string
871make_desktop_entry() { 939make_desktop_entry() {
872 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 940 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
873 941
874 local exec=${1} 942 local exec=${1}
875 local name=${2:-${PN}} 943 local name=${2:-${PN}}
876 local icon=${3:-${PN}} 944 local icon=${3:-${PN}}
877 local type=${4} 945 local type=${4}
878 local path=${5} 946 local fields=${5}
879 947
880 if [[ -z ${type} ]] ; then 948 if [[ -z ${type} ]] ; then
881 local catmaj=${CATEGORY%%-*} 949 local catmaj=${CATEGORY%%-*}
882 local catmin=${CATEGORY##*-} 950 local catmin=${CATEGORY##*-}
883 case ${catmaj} in 951 case ${catmaj} in
935 type="Network;Email" 1003 type="Network;Email"
936 ;; 1004 ;;
937 1005
938 media) 1006 media)
939 case ${catmin} in 1007 case ${catmin} in
1008 gfx)
940 gfx) type=Graphics;; 1009 type=Graphics
1010 ;;
1011 *)
1012 case ${catmin} in
941 radio) type=Tuner;; 1013 radio) type=Tuner;;
942 sound) type=Audio;; 1014 sound) type=Audio;;
943 tv) type=TV;; 1015 tv) type=TV;;
944 video) type=Video;; 1016 video) type=Video;;
1017 esac
1018 type="AudioVideo;${type}"
1019 ;;
945 esac 1020 esac
946 type="AudioVideo;${type}"
947 ;; 1021 ;;
948 1022
949 net) 1023 net)
950 case ${catmin} in 1024 case ${catmin} in
951 dialup) type=Dialup;; 1025 dialup) type=Dialup;;
1020 TryExec=${exec%% *} 1094 TryExec=${exec%% *}
1021 Icon=${icon} 1095 Icon=${icon}
1022 Categories=${type} 1096 Categories=${type}
1023 EOF 1097 EOF
1024 1098
1025 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1099 if [[ ${fields:-=} != *=* ]] ; then
1100 # 5th arg used to be value to Path=
1101 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
1102 fields="Path=${fields}"
1103 fi
1104 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
1026 1105
1027 ( 1106 (
1028 # wrap the env here so that the 'insinto' call 1107 # wrap the env here so that the 'insinto' call
1029 # doesn't corrupt the env of the caller 1108 # doesn't corrupt the env of the caller
1030 insinto /usr/share/applications 1109 insinto /usr/share/applications
1031 doins "${desktop}" 1110 doins "${desktop}"
1032 ) 1111 ) || die "installing desktop file failed"
1033} 1112}
1034 1113
1035# @FUNCTION: validate_desktop_entries 1114# @FUNCTION: validate_desktop_entries
1036# @USAGE: [directories] 1115# @USAGE: [directories]
1037# @MAINTAINER: 1116# @MAINTAINER:
1316 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1395 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1317 1396
1318 local shrtsrc=$(basename "${src}") 1397 local shrtsrc=$(basename "${src}")
1319 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1398 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1320 if [[ -z ${skip} ]] ; then 1399 if [[ -z ${skip} ]] ; then
1321 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1400 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1322 local skip=0 1401 local skip=0
1323 exe=tail 1402 exe=tail
1324 case ${ver} in 1403 case ${ver} in
1325 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1404 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1326 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1405 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1328 2.0|2.0.1) 1407 2.0|2.0.1)
1329 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1408 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1330 ;; 1409 ;;
1331 2.1.1) 1410 2.1.1)
1332 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1411 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1333 let skip="skip + 1" 1412 (( skip++ ))
1334 ;; 1413 ;;
1335 2.1.2) 1414 2.1.2)
1336 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1415 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1337 let skip="skip + 1" 1416 (( skip++ ))
1338 ;; 1417 ;;
1339 2.1.3) 1418 2.1.3)
1340 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1419 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1341 let skip="skip + 1" 1420 (( skip++ ))
1342 ;; 1421 ;;
1343 2.1.4|2.1.5) 1422 2.1.4|2.1.5)
1344 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1423 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1345 skip=$(head -n ${skip} "${src}" | wc -c) 1424 skip=$(head -n ${skip} "${src}" | wc -c)
1346 exe="dd" 1425 exe="dd"
1355 esac 1434 esac
1356 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1435 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1357 fi 1436 fi
1358 case ${exe} in 1437 case ${exe} in
1359 tail) exe="tail -n +${skip} '${src}'";; 1438 tail) exe="tail -n +${skip} '${src}'";;
1360 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1439 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1361 *) die "makeself cant handle exe '${exe}'" 1440 *) die "makeself cant handle exe '${exe}'"
1362 esac 1441 esac
1363 1442
1364 # lets grab the first few bytes of the file to figure out what kind of archive it is 1443 # lets grab the first few bytes of the file to figure out what kind of archive it is
1365 local tmpfile=$(emktemp) 1444 local filetype tmpfile=$(emktemp)
1366 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1445 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1367 local filetype=$(file -b "${tmpfile}") 1446 filetype=$(file -b "${tmpfile}") || die
1368 case ${filetype} in 1447 case ${filetype} in
1369 *tar\ archive*) 1448 *tar\ archive*)
1370 eval ${exe} | tar --no-same-owner -xf - 1449 eval ${exe} | tar --no-same-owner -xf -
1371 ;; 1450 ;;
1372 bzip2*) 1451 bzip2*)
1498 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1577 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1499 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1578 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1500 export CDROM_SET=-1 1579 export CDROM_SET=-1
1501 for f in ${CDROM_CHECK_1//:/ } ; do 1580 for f in ${CDROM_CHECK_1//:/ } ; do
1502 ((++CDROM_SET)) 1581 ((++CDROM_SET))
1503 [[ -e ${CD_ROOT}/${f} ]] && break 1582 [[ -e ${CDROM_ROOT}/${f} ]] && break
1504 done 1583 done
1505 export CDROM_MATCH=${f} 1584 export CDROM_MATCH=${f}
1506 return 1585 return
1507 fi 1586 fi
1508 1587
1682 else 1761 else
1683 newls="" 1762 newls=""
1684 fi 1763 fi
1685 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do 1764 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1686 if [[ ${op} == "-i" ]] ; then 1765 if [[ ${op} == "-i" ]] ; then
1687 hasq ${f} ${ls} && newls="${newls} ${f}" 1766 has ${f} ${ls} && newls="${newls} ${f}"
1688 else 1767 else
1689 hasq ${f} ${ls} || newls="${newls} ${f}" 1768 has ${f} ${ls} || newls="${newls} ${f}"
1690 fi 1769 fi
1691 done 1770 done
1692 ls=${newls} 1771 ls=${newls}
1693 done 1772 done
1694 else 1773 else
1696 fi 1775 fi
1697 1776
1698 nols="" 1777 nols=""
1699 newls="" 1778 newls=""
1700 for f in ${LINGUAS} ; do 1779 for f in ${LINGUAS} ; do
1701 if hasq ${f} ${ls} ; then 1780 if has ${f} ${ls} ; then
1702 newls="${newls} ${f}" 1781 newls="${newls} ${f}"
1703 else 1782 else
1704 nols="${nols} ${f}" 1783 nols="${nols} ${f}"
1705 fi 1784 fi
1706 done 1785 done
1761 ewarn "the libraries are not being removed. You need to run revdep-rebuild" 1840 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1762 ewarn "in order to remove these old dependencies. If you do not have this" 1841 ewarn "in order to remove these old dependencies. If you do not have this"
1763 ewarn "helper program, simply emerge the 'gentoolkit' package." 1842 ewarn "helper program, simply emerge the 'gentoolkit' package."
1764 ewarn 1843 ewarn
1765 fi 1844 fi
1845 # temp hack for #348634 #357225
1846 [[ ${PN} == "mpfr" ]] && lib=${lib##*/}
1766 ewarn " # revdep-rebuild --library ${lib##*/}" 1847 ewarn " # revdep-rebuild --library '${lib}'"
1767 done 1848 done
1768 if [[ ${notice} -eq 1 ]] ; then 1849 if [[ ${notice} -eq 1 ]] ; then
1769 ewarn 1850 ewarn
1770 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1851 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1771 ewarn "delete the old libraries. Here is a copy & paste for the lazy:" 1852 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1917 else 1998 else
1918 newbin "${tmpwrapper}" "${wrapper}" || die 1999 newbin "${tmpwrapper}" "${wrapper}" || die
1919 fi 2000 fi
1920} 2001}
1921 2002
1922# @FUNCTION: prepalldocs 2003# @FUNCTION: path_exists
1923# @USAGE: 2004# @USAGE: [-a|-o] <paths>
1924# @DESCRIPTION: 2005# @DESCRIPTION:
1925# Compress files in /usr/share/doc which are not already 2006# Check if the specified paths exist. Works for all types of paths
1926# compressed, excluding /usr/share/doc/${PF}/html. 2007# (files/dirs/etc...). The -a and -o flags control the requirements
1927# Uses the ecompressdir to do the compression. 2008# of the paths. They correspond to "and" and "or" logic. So the -a
1928# 2009-02-18 by betelgeuse: 2009# flag means all the paths must exist while the -o flag means at least
1929# Commented because ecompressdir is even more internal to 2010# one of the paths must exist. The default behavior is "and". If no
1930# Portage than prepalldocs (it's not even mentioned in man 5 2011# paths are specified, then the return value is "false".
1931# ebuild). Please submit a better version for review to gentoo-dev 2012path_exists() {
1932# if you want prepalldocs here. 2013 local opt=$1
1933#prepalldocs() { 2014 [[ ${opt} == -[ao] ]] && shift || opt="-a"
1934# if [[ -n $1 ]] ; then
1935# ewarn "prepalldocs: invalid usage; takes no arguments"
1936# fi
1937 2015
1938# cd "${D}" 2016 # no paths -> return false
1939# [[ -d usr/share/doc ]] || return 0 2017 # same behavior as: [[ -e "" ]]
2018 [[ $# -eq 0 ]] && return 1
1940 2019
1941# find usr/share/doc -exec gzip {} + 2020 local p r=0
1942# ecompressdir --ignore /usr/share/doc/${PF}/html 2021 for p in "$@" ; do
1943# ecompressdir --queue /usr/share/doc 2022 [[ -e ${p} ]]
1944#} 2023 : $(( r += $? ))
2024 done
2025
2026 case ${opt} in
2027 -a) return $(( r != 0 )) ;;
2028 -o) return $(( r == $# )) ;;
2029 esac
2030}

Legend:
Removed from v.1.338  
changed lines
  Added in v.1.363

  ViewVC Help
Powered by ViewVC 1.1.20