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

Diff of /eclass/eutils.eclass

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

Revision 1.302 Revision 1.320
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.302 2008/08/17 22:21:52 opfer Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.320 2009/09/24 02:49:32 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
77# Default options for patch 77# Default options for patch
78# 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
79# 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.
80# Set -E to automatically remove empty files. 80# Set -E to automatically remove empty files.
81EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 81EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
82# 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,
83# and not the full path .. 83# and not the full path ..
84EPATCH_EXCLUDE="" 84EPATCH_EXCLUDE=""
85# Change the printed message for a single patch. 85# Change the printed message for a single patch.
86EPATCH_SINGLE_MSG="" 86EPATCH_SINGLE_MSG=""
87# Change the printed message for multiple patches. 87# Change the printed message for multiple patches.
105# 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
106# them for. 106# them for.
107# 107#
108# Patches are applied in current directory. 108# Patches are applied in current directory.
109# 109#
110# Bulk Patches should preferibly have the form of: 110# Bulk Patches should preferably have the form of:
111# 111#
112# ??_${ARCH}_foo.${EPATCH_SUFFIX} 112# ??_${ARCH}_foo.${EPATCH_SUFFIX}
113# 113#
114# For example: 114# For example:
115# 115#
183 183
184 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 184 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
185 fi 185 fi
186 186
187 case ${EPATCH_SUFFIX##*\.} in 187 case ${EPATCH_SUFFIX##*\.} in
188 xz)
189 PIPE_CMD="xz -dc"
190 PATCH_SUFFIX="xz"
191 ;;
192 lzma)
193 PIPE_CMD="lzma -dc"
194 PATCH_SUFFIX="lzma"
195 ;;
188 bz2) 196 bz2)
189 PIPE_CMD="bzip2 -dc" 197 PIPE_CMD="bzip2 -dc"
190 PATCH_SUFFIX="bz2" 198 PATCH_SUFFIX="bz2"
191 ;; 199 ;;
192 gz|Z|z) 200 gz|Z|z)
242 fi 250 fi
243 251
244 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 252 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
245 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 253 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
246 254
255 # Decompress the patch if need be
256 if [[ ${PATCH_SUFFIX} != "patch" ]] ; then
257 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
258 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
259
260 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 ; then
261 echo
262 eerror "Could not extract patch!"
263 #die "Could not extract patch!"
264 count=5
265 break
266 fi
267 else
268 PATCH_TARGET="${x}"
269 fi
270
271 # Check for absolute paths in patches. If sandbox is disabled,
272 # people could (accidently) patch files in the root filesystem.
273 # Or trigger other unpleasantries #237667. So disallow -p0 on
274 # such patches.
275 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
276 if [[ -n ${abs_paths} ]] ; then
277 count=1
278 echo "NOTE: skipping -p0 due to absolute paths in patch:" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
279 echo "${abs_paths}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
280 fi
281
247 # Allow for prefix to differ ... im lazy, so shoot me :/ 282 # Allow for prefix to differ ... im lazy, so shoot me :/
248 while [ "${count}" -lt 5 ] 283 while [ "${count}" -lt 5 ]
249 do 284 do
250 # Generate some useful debug info ... 285 # Generate some useful debug info ...
251 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 286 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
252 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 287 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
253 288
254 if [ "${PATCH_SUFFIX}" != "patch" ]
255 then
256 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
257 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
258 else
259 PATCH_TARGET="${x}"
260 fi
261
262 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 289 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
263 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 290 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
264 291
265 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 292 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
266 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 293 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
267
268 if [ "${PATCH_SUFFIX}" != "patch" ]
269 then
270 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
271 then
272 echo
273 eerror "Could not extract patch!"
274 #die "Could not extract patch!"
275 count=5
276 break
277 fi
278 fi
279 294
280 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 295 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
281 then 296 then
282 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 297 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 298 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
331 done 346 done
332 if [ "${SINGLE_PATCH}" = "no" ] 347 if [ "${SINGLE_PATCH}" = "no" ]
333 then 348 then
334 einfo "Done with patching" 349 einfo "Done with patching"
335 fi 350 fi
351}
352epatch_user() {
353 [[ $# -ne 0 ]] && die "epatch_user takes no options"
354
355 # don't clobber any EPATCH vars that the parent might want
356 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT}/etc/portage/patches
357 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
358 EPATCH_SOURCE=${base}/${CTARGET}/${check}
359 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
360 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
361 if [[ -d ${EPATCH_SOURCE} ]] ; then
362 EPATCH_SOURCE=${EPATCH_SOURCE} \
363 EPATCH_SUFFIX="patch" \
364 EPATCH_FORCE="yes" \
365 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
366 epatch
367 break
368 fi
369 done
336} 370}
337 371
338# @FUNCTION: emktemp 372# @FUNCTION: emktemp
339# @USAGE: [temp dir] 373# @USAGE: [temp dir]
340# @DESCRIPTION: 374# @DESCRIPTION:
376# base-system@gentoo.org (Linux) 410# base-system@gentoo.org (Linux)
377# Joe Jezak <josejx@gmail.com> (OS X) 411# Joe Jezak <josejx@gmail.com> (OS X)
378# usata@gentoo.org (OS X) 412# usata@gentoo.org (OS X)
379# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 413# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
380# @DESCRIPTION: 414# @DESCRIPTION:
381# Small wrapper for getent (Linux), nidump (Mac OS X), 415# Small wrapper for getent (Linux),
416# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
382# and pw (FreeBSD) used in enewuser()/enewgroup() 417# and pw (FreeBSD) used in enewuser()/enewgroup()
383egetent() { 418egetent() {
384 case ${CHOST} in 419 case ${CHOST} in
385 *-darwin*) 420 *-darwin[678])
386 case "$2" in 421 case "$2" in
387 *[!0-9]*) # Non numeric 422 *[!0-9]*) # Non numeric
388 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 423 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
389 ;; 424 ;;
390 *) # Numeric 425 *) # Numeric
391 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 426 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
427 ;;
428 esac
429 ;;
430 *-darwin*)
431 local mytype=$1
432 [[ "passwd" == $mytype ]] && mytype="Users"
433 [[ "group" == $mytype ]] && mytype="Groups"
434 case "$2" in
435 *[!0-9]*) # Non numeric
436 dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
437 ;;
438 *) # Numeric
439 local mykey="UniqueID"
440 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
441 dscl . -search /$mytype $mykey $2 2>/dev/null
392 ;; 442 ;;
393 esac 443 esac
394 ;; 444 ;;
395 *-freebsd*|*-dragonfly*) 445 *-freebsd*|*-dragonfly*)
396 local opts action="user" 446 local opts action="user"
893 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 943 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
894 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 944 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
895 945
896 cat <<-EOF > "${desktop}" 946 cat <<-EOF > "${desktop}"
897 [Desktop Entry] 947 [Desktop Entry]
898 Version=1.0
899 Name=${name} 948 Name=${name}
900 Type=Application 949 Type=Application
901 Comment=${DESCRIPTION} 950 Comment=${DESCRIPTION}
902 Exec=${exec} 951 Exec=${exec}
903 TryExec=${exec%% *} 952 TryExec=${exec%% *}
942 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo." 991 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
943 fi 992 fi
944} 993}
945 994
946# @FUNCTION: make_session_desktop 995# @FUNCTION: make_session_desktop
947# @USAGE: <title> <command> 996# @USAGE: <title> <command> [command args...]
948# @DESCRIPTION: 997# @DESCRIPTION:
949# Make a GDM/KDM Session file. The title is the file to execute to start the 998# Make a GDM/KDM Session file. The title is the file to execute to start the
950# Window Manager. The command is the name of the Window Manager. 999# Window Manager. The command is the name of the Window Manager.
1000#
1001# You can set the name of the file via the ${wm} variable.
951make_session_desktop() { 1002make_session_desktop() {
952 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 1003 [[ -z $1 ]] && eerror "$0: You must specify the title" && return 1
953 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1 1004 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
954 1005
955 local title=$1 1006 local title=$1
956 local command=$2 1007 local command=$2
957 local desktop=${T}/${wm}.desktop 1008 local desktop=${T}/${wm:-${PN}}.desktop
1009 shift 2
958 1010
959 cat <<-EOF > "${desktop}" 1011 cat <<-EOF > "${desktop}"
960 [Desktop Entry] 1012 [Desktop Entry]
961 Name=${title} 1013 Name=${title}
962 Comment=This session logs you into ${title} 1014 Comment=This session logs you into ${title}
963 Exec=${command} 1015 Exec=${command} $*
964 TryExec=${command} 1016 TryExec=${command}
965 Type=Application 1017 Type=XSession
966 EOF 1018 EOF
967 1019
968 ( 1020 (
969 # wrap the env here so that the 'insinto' call 1021 # wrap the env here so that the 'insinto' call
970 # doesn't corrupt the env of the caller 1022 # doesn't corrupt the env of the caller
1553# of the lists. 1605# of the lists.
1554strip-linguas() { 1606strip-linguas() {
1555 local ls newls nols 1607 local ls newls nols
1556 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1608 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1557 local op=$1; shift 1609 local op=$1; shift
1558 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1610 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1559 local d f 1611 local d f
1560 for d in "$@" ; do 1612 for d in "$@" ; do
1561 if [[ ${op} == "-u" ]] ; then 1613 if [[ ${op} == "-u" ]] ; then
1562 newls=${ls} 1614 newls=${ls}
1563 else 1615 else
1564 newls="" 1616 newls=""
1565 fi 1617 fi
1566 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1618 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1567 if [[ ${op} == "-i" ]] ; then 1619 if [[ ${op} == "-i" ]] ; then
1568 hasq ${f} ${ls} && newls="${newls} ${f}" 1620 hasq ${f} ${ls} && newls="${newls} ${f}"
1569 else 1621 else
1570 hasq ${f} ${ls} || newls="${newls} ${f}" 1622 hasq ${f} ${ls} || newls="${newls} ${f}"
1571 fi 1623 fi
1584 else 1636 else
1585 nols="${nols} ${f}" 1637 nols="${nols} ${f}"
1586 fi 1638 fi
1587 done 1639 done
1588 [[ -n ${nols} ]] \ 1640 [[ -n ${nols} ]] \
1589 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1641 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1590 export LINGUAS=${newls:1} 1642 export LINGUAS=${newls:1}
1591} 1643}
1592 1644
1593# @FUNCTION: preserve_old_lib 1645# @FUNCTION: preserve_old_lib
1594# @USAGE: <libs to preserve> [more libs] 1646# @USAGE: <libs to preserve> [more libs]
1794 ) || die 1846 ) || die
1795 else 1847 else
1796 newbin "${tmpwrapper}" "${wrapper}" || die 1848 newbin "${tmpwrapper}" "${wrapper}" || die
1797 fi 1849 fi
1798} 1850}
1851
1852# @FUNCTION: prepalldocs
1853# @USAGE:
1854# @DESCRIPTION:
1855# Compress files in /usr/share/doc which are not already
1856# compressed, excluding /usr/share/doc/${PF}/html.
1857# Uses the ecompressdir to do the compression.
1858# 2009-02-18 by betelgeuse:
1859# Commented because ecompressdir is even more internal to
1860# Portage than prepalldocs (it's not even mentioned in man 5
1861# ebuild). Please submit a better version for review to gentoo-dev
1862# if you want prepalldocs here.
1863#prepalldocs() {
1864# if [[ -n $1 ]] ; then
1865# ewarn "prepalldocs: invalid usage; takes no arguments"
1866# fi
1867
1868# cd "${D}"
1869# [[ -d usr/share/doc ]] || return 0
1870
1871# find usr/share/doc -exec gzip {} +
1872# ecompressdir --ignore /usr/share/doc/${PF}/html
1873# ecompressdir --queue /usr/share/doc
1874#}

Legend:
Removed from v.1.302  
changed lines
  Added in v.1.320

  ViewVC Help
Powered by ViewVC 1.1.20