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

Diff of /eclass/eutils.eclass

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

Revision 1.293 Revision 1.315
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2007 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.293 2007/11/20 22:32:01 wolf31o2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.315 2009/02/21 23:28:21 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
47 sleep 1 47 sleep 1
48 done 48 done
49 fi 49 fi
50} 50}
51 51
52# @FUNCTION: ecvs_clean
53# @USAGE: [list of dirs]
54# @DESCRIPTION:
55# Remove CVS directories recursiveley. Useful when a source tarball contains
56# internal CVS directories. Defaults to $PWD.
57ecvs_clean() {
58 [[ -z $* ]] && set -- .
59 find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
60 find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
61}
62
63# @FUNCTION: esvn_clean
64# @USAGE: [list of dirs]
65# @DESCRIPTION:
66# Remove .svn directories recursiveley. Useful when a source tarball contains
67# internal Subversion directories. Defaults to $PWD.
68esvn_clean() {
69 [[ -z $* ]] && set -- .
70 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
71}
72
52# Default directory where patches are located 73# Default directory where patches are located
53EPATCH_SOURCE="${WORKDIR}/patch" 74EPATCH_SOURCE="${WORKDIR}/patch"
54# Default extension for patches 75# Default extension for patches
55EPATCH_SUFFIX="patch.bz2" 76EPATCH_SUFFIX="patch.bz2"
56# Default options for patch 77# Default options for patch
57# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 78# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
58# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 79# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
59# Set -E to automatically remove empty files. 80# Set -E to automatically remove empty files.
60EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 81EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
61# List of patches not to apply. Not this is only file names, 82# List of patches not to apply. Note this is only file names,
62# and not the full path .. 83# and not the full path ..
63EPATCH_EXCLUDE="" 84EPATCH_EXCLUDE=""
64# Change the printed message for a single patch. 85# Change the printed message for a single patch.
65EPATCH_SINGLE_MSG="" 86EPATCH_SINGLE_MSG=""
66# Change the printed message for multiple patches. 87# Change the printed message for multiple patches.
84# bug they should be left as is to ensure an ebuild can rely on 105# bug they should be left as is to ensure an ebuild can rely on
85# them for. 106# them for.
86# 107#
87# Patches are applied in current directory. 108# Patches are applied in current directory.
88# 109#
89# Bulk Patches should preferibly have the form of: 110# Bulk Patches should preferably have the form of:
90# 111#
91# ??_${ARCH}_foo.${EPATCH_SUFFIX} 112# ??_${ARCH}_foo.${EPATCH_SUFFIX}
92# 113#
93# For example: 114# For example:
94# 115#
143 local EPATCH_SOURCE="$1/*" 164 local EPATCH_SOURCE="$1/*"
144 else 165 else
145 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 166 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
146 fi 167 fi
147 else 168 else
148 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ] 169 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then
149 then
150 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 170 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
151 then 171 then
152 EPATCH_SOURCE="$1" 172 EPATCH_SOURCE="$1"
153 fi 173 fi
154 174
163 183
164 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 184 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
165 fi 185 fi
166 186
167 case ${EPATCH_SUFFIX##*\.} in 187 case ${EPATCH_SUFFIX##*\.} in
188 lzma)
189 PIPE_CMD="lzma -dc"
190 PATCH_SUFFIX="lzma"
191 ;;
168 bz2) 192 bz2)
169 PIPE_CMD="bzip2 -dc" 193 PIPE_CMD="bzip2 -dc"
170 PATCH_SUFFIX="bz2" 194 PATCH_SUFFIX="bz2"
171 ;; 195 ;;
172 gz|Z|z) 196 gz|Z|z)
222 fi 246 fi
223 247
224 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 248 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
225 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 249 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
226 250
251 # Decompress the patch if need be
252 if [[ ${PATCH_SUFFIX} != "patch" ]] ; then
253 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
254 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
255
256 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 ; then
257 echo
258 eerror "Could not extract patch!"
259 #die "Could not extract patch!"
260 count=5
261 break
262 fi
263 else
264 PATCH_TARGET="${x}"
265 fi
266
267 # Check for absolute paths in patches. If sandbox is disabled,
268 # people could (accidently) patch files in the root filesystem.
269 # Or trigger other unpleasantries #237667. So disallow -p0 on
270 # such patches.
271 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
272 if [[ -n ${abs_paths} ]] ; then
273 count=1
274 echo "NOTE: skipping -p0 due to absolute paths in patch:" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 echo "${abs_paths}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
276 fi
277
227 # Allow for prefix to differ ... im lazy, so shoot me :/ 278 # Allow for prefix to differ ... im lazy, so shoot me :/
228 while [ "${count}" -lt 5 ] 279 while [ "${count}" -lt 5 ]
229 do 280 do
230 # Generate some useful debug info ... 281 # Generate some useful debug info ...
231 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
232 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
233 284
234 if [ "${PATCH_SUFFIX}" != "patch" ]
235 then
236 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
237 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
238 else
239 PATCH_TARGET="${x}"
240 fi
241
242 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 285 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
243 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 286 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
244 287
245 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 288 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
246 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 289 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
247
248 if [ "${PATCH_SUFFIX}" != "patch" ]
249 then
250 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
251 then
252 echo
253 eerror "Could not extract patch!"
254 #die "Could not extract patch!"
255 count=5
256 break
257 fi
258 fi
259 290
260 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 291 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
261 then 292 then
262 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 293 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
263 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 294 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
356# base-system@gentoo.org (Linux) 387# base-system@gentoo.org (Linux)
357# Joe Jezak <josejx@gmail.com> (OS X) 388# Joe Jezak <josejx@gmail.com> (OS X)
358# usata@gentoo.org (OS X) 389# usata@gentoo.org (OS X)
359# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 390# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
360# @DESCRIPTION: 391# @DESCRIPTION:
361# Small wrapper for getent (Linux), nidump (Mac OS X), 392# Small wrapper for getent (Linux),
393# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
362# and pw (FreeBSD) used in enewuser()/enewgroup() 394# and pw (FreeBSD) used in enewuser()/enewgroup()
363egetent() { 395egetent() {
364 case ${CHOST} in 396 case ${CHOST} in
397 *-darwin9)
398 local mytype=$1
399 [[ "passwd" == $mytype ]] && mytype="Users"
400 [[ "group" == $mytype ]] && mytype="Groups"
401 case "$2" in
402 *[!0-9]*) # Non numeric
403 dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
404 ;;
405 *) # Numeric
406 local mykey="UniqueID"
407 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
408 dscl . -search /$mytype $mykey $2 2>/dev/null
409 ;;
410 esac
411 ;;
365 *-darwin*) 412 *-darwin*)
366 case "$2" in 413 case "$2" in
367 *[!0-9]*) # Non numeric 414 *[!0-9]*) # Non numeric
368 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 415 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
369 ;; 416 ;;
922 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo." 969 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
923 fi 970 fi
924} 971}
925 972
926# @FUNCTION: make_session_desktop 973# @FUNCTION: make_session_desktop
927# @USAGE: <title> <command> 974# @USAGE: <title> <command> [command args...]
928# @DESCRIPTION: 975# @DESCRIPTION:
929# Make a GDM/KDM Session file. The title is the file to execute to start the 976# Make a GDM/KDM Session file. The title is the file to execute to start the
930# Window Manager. The command is the name of the Window Manager. 977# Window Manager. The command is the name of the Window Manager.
978#
979# You can set the name of the file via the ${wm} variable.
931make_session_desktop() { 980make_session_desktop() {
932 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 981 [[ -z $1 ]] && eerror "$0: You must specify the title" && return 1
933 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1 982 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
934 983
935 local title=$1 984 local title=$1
936 local command=$2 985 local command=$2
937 local desktop=${T}/${wm}.desktop 986 local desktop=${T}/${wm:-${PN}}.desktop
987 shift 2
938 988
939 cat <<-EOF > "${desktop}" 989 cat <<-EOF > "${desktop}"
940 [Desktop Entry] 990 [Desktop Entry]
941 Name=${title} 991 Name=${title}
942 Comment=This session logs you into ${title} 992 Comment=This session logs you into ${title}
943 Exec=${command} 993 Exec=${command} $*
944 TryExec=${command} 994 TryExec=${command}
945 Type=Application 995 Type=XSession
946 EOF 996 EOF
947 997
948 ( 998 (
949 # wrap the env here so that the 'insinto' call 999 # wrap the env here so that the 'insinto' call
950 # doesn't corrupt the env of the caller 1000 # doesn't corrupt the env of the caller
1455# displayed and we'll hang out here until: 1505# displayed and we'll hang out here until:
1456# (1) the file is found on a mounted cdrom 1506# (1) the file is found on a mounted cdrom
1457# (2) the user hits CTRL+C 1507# (2) the user hits CTRL+C
1458_cdrom_locate_file_on_cd() { 1508_cdrom_locate_file_on_cd() {
1459 local mline="" 1509 local mline=""
1460 local showedmsg=0 1510 local showedmsg=0 showjolietmsg=0
1461 1511
1462 while [[ -z ${CDROM_ROOT} ]] ; do 1512 while [[ -z ${CDROM_ROOT} ]] ; do
1463 local i=0 1513 local i=0
1464 local -a cdset=(${*//:/ }) 1514 local -a cdset=(${*//:/ })
1465 if [[ -n ${CDROM_SET} ]] ; then 1515 if [[ -n ${CDROM_SET} ]] ; then
1506 showedmsg=1 1556 showedmsg=1
1507 fi 1557 fi
1508 einfo "Press return to scan for the cd again" 1558 einfo "Press return to scan for the cd again"
1509 einfo "or hit CTRL+C to abort the emerge." 1559 einfo "or hit CTRL+C to abort the emerge."
1510 echo 1560 echo
1561 if [[ ${showjolietmsg} -eq 0 ]] ; then
1562 showjolietmsg=1
1563 else
1511 einfo "If you are having trouble with the detection" 1564 ewarn "If you are having trouble with the detection"
1512 einfo "of your CD, it is possible that you do not have" 1565 ewarn "of your CD, it is possible that you do not have"
1513 einfo "Joliet support enabled in your kernel. Please" 1566 ewarn "Joliet support enabled in your kernel. Please"
1514 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1567 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1568 ebeep 5
1569 fi
1515 read || die "something is screwed with your system" 1570 read || die "something is screwed with your system"
1516 done 1571 done
1517} 1572}
1518 1573
1519# @FUNCTION: strip-linguas 1574# @FUNCTION: strip-linguas
1528# of the lists. 1583# of the lists.
1529strip-linguas() { 1584strip-linguas() {
1530 local ls newls nols 1585 local ls newls nols
1531 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1586 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1532 local op=$1; shift 1587 local op=$1; shift
1533 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1588 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1534 local d f 1589 local d f
1535 for d in "$@" ; do 1590 for d in "$@" ; do
1536 if [[ ${op} == "-u" ]] ; then 1591 if [[ ${op} == "-u" ]] ; then
1537 newls=${ls} 1592 newls=${ls}
1538 else 1593 else
1539 newls="" 1594 newls=""
1540 fi 1595 fi
1541 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1596 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1542 if [[ ${op} == "-i" ]] ; then 1597 if [[ ${op} == "-i" ]] ; then
1543 hasq ${f} ${ls} && newls="${newls} ${f}" 1598 hasq ${f} ${ls} && newls="${newls} ${f}"
1544 else 1599 else
1545 hasq ${f} ${ls} || newls="${newls} ${f}" 1600 hasq ${f} ${ls} || newls="${newls} ${f}"
1546 fi 1601 fi
1579 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1634 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1580 die "Invalid preserve_old_lib() usage" 1635 die "Invalid preserve_old_lib() usage"
1581 fi 1636 fi
1582 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]" 1637 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1583 1638
1639 # let portage worry about it
1640 has preserve-libs ${FEATURES} && return 0
1641
1584 local lib dir 1642 local lib dir
1585 for lib in "$@" ; do 1643 for lib in "$@" ; do
1586 [[ -e ${ROOT}/${lib} ]] || continue 1644 [[ -e ${ROOT}/${lib} ]] || continue
1587 dir=${lib%/*} 1645 dir=${lib%/*}
1588 dodir ${dir} || die "dodir ${dir} failed" 1646 dodir ${dir} || die "dodir ${dir} failed"
1598preserve_old_lib_notify() { 1656preserve_old_lib_notify() {
1599 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1657 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1600 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only" 1658 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1601 die "Invalid preserve_old_lib_notify() usage" 1659 die "Invalid preserve_old_lib_notify() usage"
1602 fi 1660 fi
1661
1662 # let portage worry about it
1663 has preserve-libs ${FEATURES} && return 0
1603 1664
1604 local lib notice=0 1665 local lib notice=0
1605 for lib in "$@" ; do 1666 for lib in "$@" ; do
1606 [[ -e ${ROOT}/${lib} ]] || continue 1667 [[ -e ${ROOT}/${lib} ]] || continue
1607 if [[ ${notice} -eq 0 ]] ; then 1668 if [[ ${notice} -eq 0 ]] ; then
1616 ewarn " # revdep-rebuild --library ${lib##*/}" 1677 ewarn " # revdep-rebuild --library ${lib##*/}"
1617 done 1678 done
1618 if [[ ${notice} -eq 1 ]] ; then 1679 if [[ ${notice} -eq 1 ]] ; then
1619 ewarn 1680 ewarn
1620 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1681 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1621 ewarn "delete the old libraries." 1682 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1683 for lib in "$@" ; do
1684 ewarn " # rm '${lib}'"
1685 done
1622 fi 1686 fi
1623} 1687}
1624 1688
1625# @FUNCTION: built_with_use 1689# @FUNCTION: built_with_use
1626# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1690# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1631# --missing option controls the behavior if called on a package that does 1695# --missing option controls the behavior if called on a package that does
1632# not actually support the defined USE flags (aka listed in IUSE). 1696# not actually support the defined USE flags (aka listed in IUSE).
1633# The default is to abort (call die). The -a and -o flags control 1697# The default is to abort (call die). The -a and -o flags control
1634# the requirements of the USE flags. They correspond to "and" and "or" 1698# the requirements of the USE flags. They correspond to "and" and "or"
1635# logic. So the -a flag means all listed USE flags must be enabled 1699# logic. So the -a flag means all listed USE flags must be enabled
1636# while the -o flag means at least one of the listed fIUSE flags must be 1700# while the -o flag means at least one of the listed IUSE flags must be
1637# enabled. The --hidden option is really for internal use only as it 1701# enabled. The --hidden option is really for internal use only as it
1638# means the USE flag we're checking is hidden expanded, so it won't be found 1702# means the USE flag we're checking is hidden expanded, so it won't be found
1639# in IUSE like normal USE flags. 1703# in IUSE like normal USE flags.
1640# 1704#
1641# Remember that this function isn't terribly intelligent so order of optional 1705# Remember that this function isn't terribly intelligent so order of optional
1676 die) die "Unable to determine what USE flags $PKG was built with";; 1740 die) die "Unable to determine what USE flags $PKG was built with";;
1677 esac 1741 esac
1678 fi 1742 fi
1679 1743
1680 if [[ ${hidden} == "no" ]] ; then 1744 if [[ ${hidden} == "no" ]] ; then
1681 local IUSE_BUILT=$(<${IUSEFILE}) 1745 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1682 # Don't check USE_EXPAND #147237 1746 # Don't check USE_EXPAND #147237
1683 local expand 1747 local expand
1684 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1748 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1685 if [[ $1 == ${expand}_* ]] ; then 1749 if [[ $1 == ${expand}_* ]] ; then
1686 expand="" 1750 expand=""
1687 break 1751 break
1688 fi 1752 fi
1689 done 1753 done
1690 if [[ -n ${expand} ]] ; then 1754 if [[ -n ${expand} ]] ; then
1691 if ! has $1 ${IUSE_BUILT} ; then 1755 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1692 case ${missing_action} in 1756 case ${missing_action} in
1693 true) return 0;; 1757 true) return 0;;
1694 false) return 1;; 1758 false) return 1;;
1695 die) die "$PKG does not actually support the $1 USE flag!";; 1759 die) die "$PKG does not actually support the $1 USE flag!";;
1696 esac 1760 esac
1720epunt_cxx() { 1784epunt_cxx() {
1721 local dir=$1 1785 local dir=$1
1722 [[ -z ${dir} ]] && dir=${S} 1786 [[ -z ${dir} ]] && dir=${S}
1723 ebegin "Removing useless C++ checks" 1787 ebegin "Removing useless C++ checks"
1724 local f 1788 local f
1725 for f in $(find ${dir} -name configure) ; do 1789 find "${dir}" -name configure | while read f ; do
1726 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1790 patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1727 done 1791 done
1728 eend 0 1792 eend 0
1729} 1793}
1730 1794
1731# @FUNCTION: make_wrapper 1795# @FUNCTION: make_wrapper
1732# @USAGE: <wrapper> <target> <chdir> [libpaths] [installpath] 1796# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1733# @DESCRIPTION: 1797# @DESCRIPTION:
1734# Create a shell wrapper script named wrapper in installpath 1798# Create a shell wrapper script named wrapper in installpath
1735# (defaults to the bindir) to execute target (default of wrapper) by 1799# (defaults to the bindir) to execute target (default of wrapper) by
1736# first optionally setting LD_LIBRARY_PATH to the colon-delimited 1800# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1737# libpaths followed by optionally changing directory to chdir. 1801# libpaths followed by optionally changing directory to chdir.
1760 ) || die 1824 ) || die
1761 else 1825 else
1762 newbin "${tmpwrapper}" "${wrapper}" || die 1826 newbin "${tmpwrapper}" "${wrapper}" || die
1763 fi 1827 fi
1764} 1828}
1829
1830# @FUNCTION: prepalldocs
1831# @USAGE:
1832# @DESCRIPTION:
1833# Compress files in /usr/share/doc which are not already
1834# compressed, excluding /usr/share/doc/${PF}/html.
1835# Uses the ecompressdir to do the compression.
1836# 2009-02-18 by betelgeuse:
1837# Commented because ecompressdir is even more internal to
1838# Portage than prepalldocs (it's not even mentioned in man 5
1839# ebuild). Please submit a better version for review to gentoo-dev
1840# if you want prepalldocs here.
1841#prepalldocs() {
1842# if [[ -n $1 ]] ; then
1843# ewarn "prepalldocs: invalid usage; takes no arguments"
1844# fi
1845
1846# cd "${D}"
1847# [[ -d usr/share/doc ]] || return 0
1848
1849# find usr/share/doc -exec gzip {} +
1850# ecompressdir --ignore /usr/share/doc/${PF}/html
1851# ecompressdir --queue /usr/share/doc
1852#}

Legend:
Removed from v.1.293  
changed lines
  Added in v.1.315

  ViewVC Help
Powered by ViewVC 1.1.20