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

Diff of /eclass/eutils.eclass

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

Revision 1.287 Revision 1.304
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.287 2007/07/26 05:43:12 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.304 2008/09/20 18:45:26 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
45 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 45 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
46 echo -ne "\a" 46 echo -ne "\a"
47 sleep 1 47 sleep 1
48 done 48 done
49 fi 49 fi
50}
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
50} 71}
51 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
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
227 # Allow for prefix to differ ... im lazy, so shoot me :/ 267 # Allow for prefix to differ ... im lazy, so shoot me :/
228 while [ "${count}" -lt 5 ] 268 while [ "${count}" -lt 5 ]
229 do 269 do
230 # Generate some useful debug info ... 270 # Generate some useful debug info ...
231 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 271 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
232 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 272 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
233 273
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##*/} 274 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
243 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 275 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
244 276
245 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 277 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
246 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 _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 279
260 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 280 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
261 then 281 then
262 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 282 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
263 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
739make_desktop_entry() { 759make_desktop_entry() {
740 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 760 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
741 761
742 local exec=${1} 762 local exec=${1}
743 local name=${2:-${PN}} 763 local name=${2:-${PN}}
744 local icon=${3:-${PN}.png} 764 local icon=${3:-${PN}}
745 local type=${4} 765 local type=${4}
746 local path=${5} 766 local path=${5}
747 767
748 if [[ -z ${type} ]] ; then 768 if [[ -z ${type} ]] ; then
749 local catmaj=${CATEGORY%%-*} 769 local catmaj=${CATEGORY%%-*}
873 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 893 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
874 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 894 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
875 895
876 cat <<-EOF > "${desktop}" 896 cat <<-EOF > "${desktop}"
877 [Desktop Entry] 897 [Desktop Entry]
878 Encoding=UTF-8
879 Version=1.0 898 Version=1.0
880 Name=${name} 899 Name=${name}
881 Type=Application 900 Type=Application
882 Comment=${DESCRIPTION} 901 Comment=${DESCRIPTION}
883 Exec=${exec} 902 Exec=${exec}
884 TryExec=${exec%% *} 903 TryExec=${exec%% *}
885 Path=${path}
886 Icon=${icon} 904 Icon=${icon}
887 Categories=${type}; 905 Categories=${type};
888 EOF 906 EOF
907
908 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}"
889 909
890 ( 910 (
891 # wrap the env here so that the 'insinto' call 911 # wrap the env here so that the 'insinto' call
892 # doesn't corrupt the env of the caller 912 # doesn't corrupt the env of the caller
893 insinto /usr/share/applications 913 insinto /usr/share/applications
936 local command=$2 956 local command=$2
937 local desktop=${T}/${wm}.desktop 957 local desktop=${T}/${wm}.desktop
938 958
939 cat <<-EOF > "${desktop}" 959 cat <<-EOF > "${desktop}"
940 [Desktop Entry] 960 [Desktop Entry]
941 Encoding=UTF-8
942 Name=${title} 961 Name=${title}
943 Comment=This session logs you into ${title} 962 Comment=This session logs you into ${title}
944 Exec=${command} 963 Exec=${command}
945 TryExec=${command} 964 TryExec=${command}
946 Type=Application 965 Type=Application
1066# information out of the binary executable myself. Basically you pass in 1085# information out of the binary executable myself. Basically you pass in
1067# the size of the off_t type (in bytes) on the machine that built the pdv 1086# the size of the off_t type (in bytes) on the machine that built the pdv
1068# archive. 1087# archive.
1069# 1088#
1070# One way to determine this is by running the following commands: 1089# One way to determine this is by running the following commands:
1090#
1091# @CODE
1071# strings <pdv archive> | grep lseek 1092# strings <pdv archive> | grep lseek
1072# strace -elseek <pdv archive> 1093# strace -elseek <pdv archive>
1094# @CODE
1095#
1073# Basically look for the first lseek command (we do the strings/grep because 1096# Basically look for the first lseek command (we do the strings/grep because
1074# sometimes the function call is _llseek or something) and steal the 2nd 1097# sometimes the function call is _llseek or something) and steal the 2nd
1075# parameter. Here is an example: 1098# parameter. Here is an example:
1099#
1100# @CODE
1076# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1101# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1077# lseek 1102# lseek
1078# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1103# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1079# lseek(3, -4, SEEK_END) = 2981250 1104# lseek(3, -4, SEEK_END) = 2981250
1105# @CODE
1106#
1080# Thus we would pass in the value of '4' as the second parameter. 1107# Thus we would pass in the value of '4' as the second parameter.
1081unpack_pdv() { 1108unpack_pdv() {
1082 local src=$(find_unpackable_file "$1") 1109 local src=$(find_unpackable_file "$1")
1083 local sizeoff_t=$2 1110 local sizeoff_t=$2
1084 1111
1448# displayed and we'll hang out here until: 1475# displayed and we'll hang out here until:
1449# (1) the file is found on a mounted cdrom 1476# (1) the file is found on a mounted cdrom
1450# (2) the user hits CTRL+C 1477# (2) the user hits CTRL+C
1451_cdrom_locate_file_on_cd() { 1478_cdrom_locate_file_on_cd() {
1452 local mline="" 1479 local mline=""
1453 local showedmsg=0 1480 local showedmsg=0 showjolietmsg=0
1454 1481
1455 while [[ -z ${CDROM_ROOT} ]] ; do 1482 while [[ -z ${CDROM_ROOT} ]] ; do
1456 local i=0 1483 local i=0
1457 local -a cdset=(${*//:/ }) 1484 local -a cdset=(${*//:/ })
1458 if [[ -n ${CDROM_SET} ]] ; then 1485 if [[ -n ${CDROM_SET} ]] ; then
1467 while read point node fs foo ; do 1494 while read point node fs foo ; do
1468 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \ 1495 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1469 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \ 1496 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1470 && continue 1497 && continue
1471 point=${point//\040/ } 1498 point=${point//\040/ }
1499 [[ ! -d ${point}/${dir} ]] && continue
1472 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue 1500 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1473 export CDROM_ROOT=${point} 1501 export CDROM_ROOT=${point}
1474 export CDROM_SET=${i} 1502 export CDROM_SET=${i}
1475 export CDROM_MATCH=${cdset[${i}]} 1503 export CDROM_MATCH=${cdset[${i}]}
1476 return 1504 return
1498 showedmsg=1 1526 showedmsg=1
1499 fi 1527 fi
1500 einfo "Press return to scan for the cd again" 1528 einfo "Press return to scan for the cd again"
1501 einfo "or hit CTRL+C to abort the emerge." 1529 einfo "or hit CTRL+C to abort the emerge."
1502 echo 1530 echo
1531 if [[ ${showjolietmsg} -eq 0 ]] ; then
1532 showjolietmsg=1
1533 else
1503 einfo "If you are having trouble with the detection" 1534 ewarn "If you are having trouble with the detection"
1504 einfo "of your CD, it is possible that you do not have" 1535 ewarn "of your CD, it is possible that you do not have"
1505 einfo "Joliet support enabled in your kernel. Please" 1536 ewarn "Joliet support enabled in your kernel. Please"
1506 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1537 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1538 ebeep 5
1539 fi
1507 read || die "something is screwed with your system" 1540 read || die "something is screwed with your system"
1508 done 1541 done
1509} 1542}
1510 1543
1511# @FUNCTION: strip-linguas 1544# @FUNCTION: strip-linguas
1555 [[ -n ${nols} ]] \ 1588 [[ -n ${nols} ]] \
1556 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1589 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1557 export LINGUAS=${newls:1} 1590 export LINGUAS=${newls:1}
1558} 1591}
1559 1592
1560# @FUNCTION: set_arch_to_kernel
1561# @DESCRIPTION:
1562# Set the env ARCH to match what the kernel expects.
1563set_arch_to_kernel() {
1564 i=10
1565 while ((i--)) ; do
1566 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1567 done
1568 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1569 case ${ARCH} in
1570 x86) export ARCH="i386";;
1571 amd64) export ARCH="x86_64";;
1572 hppa) export ARCH="parisc";;
1573 mips) export ARCH="mips";;
1574 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1575 *) export ARCH="${ARCH}";;
1576 esac
1577}
1578
1579# @FUNCTION: set_arch_to_portage
1580# @DESCRIPTION:
1581# Set the env ARCH to match what portage expects.
1582set_arch_to_portage() {
1583 i=10
1584 while ((i--)) ; do
1585 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1586 done
1587 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1588}
1589
1590# @FUNCTION: preserve_old_lib 1593# @FUNCTION: preserve_old_lib
1591# @USAGE: <libs to preserve> [more libs] 1594# @USAGE: <libs to preserve> [more libs]
1592# @DESCRIPTION: 1595# @DESCRIPTION:
1593# These functions are useful when a lib in your package changes ABI SONAME. 1596# These functions are useful when a lib in your package changes ABI SONAME.
1594# An example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1597# An example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1601 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1604 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1602 die "Invalid preserve_old_lib() usage" 1605 die "Invalid preserve_old_lib() usage"
1603 fi 1606 fi
1604 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]" 1607 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1605 1608
1609 # let portage worry about it
1610 has preserve-libs ${FEATURES} && return 0
1611
1606 local lib dir 1612 local lib dir
1607 for lib in "$@" ; do 1613 for lib in "$@" ; do
1608 [[ -e ${ROOT}/${lib} ]] || continue 1614 [[ -e ${ROOT}/${lib} ]] || continue
1609 dir=${lib%/*} 1615 dir=${lib%/*}
1610 dodir ${dir} || die "dodir ${dir} failed" 1616 dodir ${dir} || die "dodir ${dir} failed"
1620preserve_old_lib_notify() { 1626preserve_old_lib_notify() {
1621 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1627 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1622 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only" 1628 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1623 die "Invalid preserve_old_lib_notify() usage" 1629 die "Invalid preserve_old_lib_notify() usage"
1624 fi 1630 fi
1631
1632 # let portage worry about it
1633 has preserve-libs ${FEATURES} && return 0
1625 1634
1626 local lib notice=0 1635 local lib notice=0
1627 for lib in "$@" ; do 1636 for lib in "$@" ; do
1628 [[ -e ${ROOT}/${lib} ]] || continue 1637 [[ -e ${ROOT}/${lib} ]] || continue
1629 if [[ ${notice} -eq 0 ]] ; then 1638 if [[ ${notice} -eq 0 ]] ; then
1635 ewarn "helper program, simply emerge the 'gentoolkit' package." 1644 ewarn "helper program, simply emerge the 'gentoolkit' package."
1636 ewarn 1645 ewarn
1637 fi 1646 fi
1638 ewarn " # revdep-rebuild --library ${lib##*/}" 1647 ewarn " # revdep-rebuild --library ${lib##*/}"
1639 done 1648 done
1649 if [[ ${notice} -eq 1 ]] ; then
1650 ewarn
1651 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1652 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1653 for lib in "$@" ; do
1654 ewarn " # rm '${lib}'"
1655 done
1656 fi
1640} 1657}
1641 1658
1642# @FUNCTION: built_with_use 1659# @FUNCTION: built_with_use
1643# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1660# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1644# @DESCRIPTION: 1661# @DESCRIPTION:
1648# --missing option controls the behavior if called on a package that does 1665# --missing option controls the behavior if called on a package that does
1649# not actually support the defined USE flags (aka listed in IUSE). 1666# not actually support the defined USE flags (aka listed in IUSE).
1650# The default is to abort (call die). The -a and -o flags control 1667# The default is to abort (call die). The -a and -o flags control
1651# the requirements of the USE flags. They correspond to "and" and "or" 1668# the requirements of the USE flags. They correspond to "and" and "or"
1652# logic. So the -a flag means all listed USE flags must be enabled 1669# logic. So the -a flag means all listed USE flags must be enabled
1653# while the -o flag means at least one of the listed fIUSE flags must be 1670# while the -o flag means at least one of the listed IUSE flags must be
1654# enabled. The --hidden option is really for internal use only as it 1671# enabled. The --hidden option is really for internal use only as it
1655# means the USE flag we're checking is hidden expanded, so it won't be found 1672# means the USE flag we're checking is hidden expanded, so it won't be found
1656# in IUSE like normal USE flags. 1673# in IUSE like normal USE flags.
1657# 1674#
1658# Remember that this function isn't terribly intelligent so order of optional 1675# Remember that this function isn't terribly intelligent so order of optional
1693 die) die "Unable to determine what USE flags $PKG was built with";; 1710 die) die "Unable to determine what USE flags $PKG was built with";;
1694 esac 1711 esac
1695 fi 1712 fi
1696 1713
1697 if [[ ${hidden} == "no" ]] ; then 1714 if [[ ${hidden} == "no" ]] ; then
1698 local IUSE_BUILT=$(<${IUSEFILE}) 1715 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1699 # Don't check USE_EXPAND #147237 1716 # Don't check USE_EXPAND #147237
1700 local expand 1717 local expand
1701 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1718 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1702 if [[ $1 == ${expand}_* ]] ; then 1719 if [[ $1 == ${expand}_* ]] ; then
1703 expand="" 1720 expand=""
1704 break 1721 break
1705 fi 1722 fi
1706 done 1723 done
1707 if [[ -n ${expand} ]] ; then 1724 if [[ -n ${expand} ]] ; then
1708 if ! has $1 ${IUSE_BUILT} ; then 1725 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1709 case ${missing_action} in 1726 case ${missing_action} in
1710 true) return 0;; 1727 true) return 0;;
1711 false) return 1;; 1728 false) return 1;;
1712 die) die "$PKG does not actually support the $1 USE flag!";; 1729 die) die "$PKG does not actually support the $1 USE flag!";;
1713 esac 1730 esac
1725 shift 1742 shift
1726 done 1743 done
1727 [[ ${opt} = "-a" ]] 1744 [[ ${opt} = "-a" ]]
1728} 1745}
1729 1746
1730# @DESCRIPTION: epunt_cxx 1747# @FUNCTION: epunt_cxx
1731# @USAGE: [dir to scan] 1748# @USAGE: [dir to scan]
1732# @DESCRIPTION: 1749# @DESCRIPTION:
1733# Many configure scripts wrongly bail when a C++ compiler could not be 1750# Many configure scripts wrongly bail when a C++ compiler could not be
1734# detected. If dir is not specified, then it defaults to ${S}. 1751# detected. If dir is not specified, then it defaults to ${S}.
1735# 1752#
1737epunt_cxx() { 1754epunt_cxx() {
1738 local dir=$1 1755 local dir=$1
1739 [[ -z ${dir} ]] && dir=${S} 1756 [[ -z ${dir} ]] && dir=${S}
1740 ebegin "Removing useless C++ checks" 1757 ebegin "Removing useless C++ checks"
1741 local f 1758 local f
1742 for f in $(find ${dir} -name configure) ; do 1759 find "${dir}" -name configure | while read f ; do
1743 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1760 patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1744 done 1761 done
1745 eend 0 1762 eend 0
1746} 1763}
1747 1764
1748# @FUNCTION: make_wrapper 1765# @FUNCTION: make_wrapper
1749# @USAGE: <wrapper> <target> <chdir> [libpaths] [installpath] 1766# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1750# @DESCRIPTION: 1767# @DESCRIPTION:
1751# Create a shell wrapper script named wrapper in installpath 1768# Create a shell wrapper script named wrapper in installpath
1752# (defaults to the bindir) to execute target (default of wrapper) by 1769# (defaults to the bindir) to execute target (default of wrapper) by
1753# first optionally setting LD_LIBRARY_PATH to the colon-delimited 1770# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1754# libpaths followed by optionally changing directory to chdir. 1771# libpaths followed by optionally changing directory to chdir.

Legend:
Removed from v.1.287  
changed lines
  Added in v.1.304

  ViewVC Help
Powered by ViewVC 1.1.20