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

Diff of /eclass/eutils.eclass

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

Revision 1.292 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.292 2007/10/14 21:55:35 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
… …
1456# displayed and we'll hang out here until: 1475# displayed and we'll hang out here until:
1457# (1) the file is found on a mounted cdrom 1476# (1) the file is found on a mounted cdrom
1458# (2) the user hits CTRL+C 1477# (2) the user hits CTRL+C
1459_cdrom_locate_file_on_cd() { 1478_cdrom_locate_file_on_cd() {
1460 local mline="" 1479 local mline=""
1461 local showedmsg=0 1480 local showedmsg=0 showjolietmsg=0
1462 1481
1463 while [[ -z ${CDROM_ROOT} ]] ; do 1482 while [[ -z ${CDROM_ROOT} ]] ; do
1464 local i=0 1483 local i=0
1465 local -a cdset=(${*//:/ }) 1484 local -a cdset=(${*//:/ })
1466 if [[ -n ${CDROM_SET} ]] ; then 1485 if [[ -n ${CDROM_SET} ]] ; then
… …
1507 showedmsg=1 1526 showedmsg=1
1508 fi 1527 fi
1509 einfo "Press return to scan for the cd again" 1528 einfo "Press return to scan for the cd again"
1510 einfo "or hit CTRL+C to abort the emerge." 1529 einfo "or hit CTRL+C to abort the emerge."
1511 echo 1530 echo
1531 if [[ ${showjolietmsg} -eq 0 ]] ; then
1532 showjolietmsg=1
1533 else
1512 einfo "If you are having trouble with the detection" 1534 ewarn "If you are having trouble with the detection"
1513 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"
1514 einfo "Joliet support enabled in your kernel. Please" 1536 ewarn "Joliet support enabled in your kernel. Please"
1515 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
1516 read || die "something is screwed with your system" 1540 read || die "something is screwed with your system"
1517 done 1541 done
1518} 1542}
1519 1543
1520# @FUNCTION: strip-linguas 1544# @FUNCTION: strip-linguas
… …
1580 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1604 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1581 die "Invalid preserve_old_lib() usage" 1605 die "Invalid preserve_old_lib() usage"
1582 fi 1606 fi
1583 [[ -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]"
1584 1608
1609 # let portage worry about it
1610 has preserve-libs ${FEATURES} && return 0
1611
1585 local lib dir 1612 local lib dir
1586 for lib in "$@" ; do 1613 for lib in "$@" ; do
1587 [[ -e ${ROOT}/${lib} ]] || continue 1614 [[ -e ${ROOT}/${lib} ]] || continue
1588 dir=${lib%/*} 1615 dir=${lib%/*}
1589 dodir ${dir} || die "dodir ${dir} failed" 1616 dodir ${dir} || die "dodir ${dir} failed"
… …
1599preserve_old_lib_notify() { 1626preserve_old_lib_notify() {
1600 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1627 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1601 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"
1602 die "Invalid preserve_old_lib_notify() usage" 1629 die "Invalid preserve_old_lib_notify() usage"
1603 fi 1630 fi
1631
1632 # let portage worry about it
1633 has preserve-libs ${FEATURES} && return 0
1604 1634
1605 local lib notice=0 1635 local lib notice=0
1606 for lib in "$@" ; do 1636 for lib in "$@" ; do
1607 [[ -e ${ROOT}/${lib} ]] || continue 1637 [[ -e ${ROOT}/${lib} ]] || continue
1608 if [[ ${notice} -eq 0 ]] ; then 1638 if [[ ${notice} -eq 0 ]] ; then
… …
1617 ewarn " # revdep-rebuild --library ${lib##*/}" 1647 ewarn " # revdep-rebuild --library ${lib##*/}"
1618 done 1648 done
1619 if [[ ${notice} -eq 1 ]] ; then 1649 if [[ ${notice} -eq 1 ]] ; then
1620 ewarn 1650 ewarn
1621 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1651 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1622 ewarn "delete the old libraries." 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
1623 fi 1656 fi
1624} 1657}
1625 1658
1626# @FUNCTION: built_with_use 1659# @FUNCTION: built_with_use
1627# @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>
… …
1632# --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
1633# not actually support the defined USE flags (aka listed in IUSE). 1666# not actually support the defined USE flags (aka listed in IUSE).
1634# 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
1635# 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"
1636# 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
1637# 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
1638# 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
1639# 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
1640# in IUSE like normal USE flags. 1673# in IUSE like normal USE flags.
1641# 1674#
1642# 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
… …
1677 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";;
1678 esac 1711 esac
1679 fi 1712 fi
1680 1713
1681 if [[ ${hidden} == "no" ]] ; then 1714 if [[ ${hidden} == "no" ]] ; then
1682 local IUSE_BUILT=$(<${IUSEFILE}) 1715 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1683 # Don't check USE_EXPAND #147237 1716 # Don't check USE_EXPAND #147237
1684 local expand 1717 local expand
1685 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1718 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1686 if [[ $1 == ${expand}_* ]] ; then 1719 if [[ $1 == ${expand}_* ]] ; then
1687 expand="" 1720 expand=""
1688 break 1721 break
1689 fi 1722 fi
1690 done 1723 done
1691 if [[ -n ${expand} ]] ; then 1724 if [[ -n ${expand} ]] ; then
1692 if ! has $1 ${IUSE_BUILT} ; then 1725 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1693 case ${missing_action} in 1726 case ${missing_action} in
1694 true) return 0;; 1727 true) return 0;;
1695 false) return 1;; 1728 false) return 1;;
1696 die) die "$PKG does not actually support the $1 USE flag!";; 1729 die) die "$PKG does not actually support the $1 USE flag!";;
1697 esac 1730 esac
… …
1721epunt_cxx() { 1754epunt_cxx() {
1722 local dir=$1 1755 local dir=$1
1723 [[ -z ${dir} ]] && dir=${S} 1756 [[ -z ${dir} ]] && dir=${S}
1724 ebegin "Removing useless C++ checks" 1757 ebegin "Removing useless C++ checks"
1725 local f 1758 local f
1726 for f in $(find ${dir} -name configure) ; do 1759 find "${dir}" -name configure | while read f ; do
1727 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
1728 done 1761 done
1729 eend 0 1762 eend 0
1730} 1763}
1731 1764
1732# @FUNCTION: make_wrapper 1765# @FUNCTION: make_wrapper
1733# @USAGE: <wrapper> <target> <chdir> [libpaths] [installpath] 1766# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1734# @DESCRIPTION: 1767# @DESCRIPTION:
1735# Create a shell wrapper script named wrapper in installpath 1768# Create a shell wrapper script named wrapper in installpath
1736# (defaults to the bindir) to execute target (default of wrapper) by 1769# (defaults to the bindir) to execute target (default of wrapper) by
1737# first optionally setting LD_LIBRARY_PATH to the colon-delimited 1770# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1738# libpaths followed by optionally changing directory to chdir. 1771# libpaths followed by optionally changing directory to chdir.
Legend:
Removed from v.1.292  
changed lines
  Added in v.1.304
  ViewVC Help
Powered by ViewVC 1.1.13