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

Diff of /eclass/eutils.eclass

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

Revision 1.303 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.303 2008/09/20 18:32:35 vapier 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
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#
246 fi 246 fi
247 247
248 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 248 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
249 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 249 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
250 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
251 # Allow for prefix to differ ... im lazy, so shoot me :/ 278 # Allow for prefix to differ ... im lazy, so shoot me :/
252 while [ "${count}" -lt 5 ] 279 while [ "${count}" -lt 5 ]
253 do 280 do
254 # Generate some useful debug info ... 281 # Generate some useful debug info ...
255 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
256 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
257 284
258 if [ "${PATCH_SUFFIX}" != "patch" ]
259 then
260 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
261 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
262 else
263 PATCH_TARGET="${x}"
264 fi
265
266 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 285 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
267 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##*/}
268 287
269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 288 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
270 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 289 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
271
272 if [ "${PATCH_SUFFIX}" != "patch" ]
273 then
274 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
275 then
276 echo
277 eerror "Could not extract patch!"
278 #die "Could not extract patch!"
279 count=5
280 break
281 fi
282 fi
283 290
284 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
285 then 292 then
286 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 293 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
287 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 294 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
380# base-system@gentoo.org (Linux) 387# base-system@gentoo.org (Linux)
381# Joe Jezak <josejx@gmail.com> (OS X) 388# Joe Jezak <josejx@gmail.com> (OS X)
382# usata@gentoo.org (OS X) 389# usata@gentoo.org (OS X)
383# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 390# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
384# @DESCRIPTION: 391# @DESCRIPTION:
385# 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),
386# and pw (FreeBSD) used in enewuser()/enewgroup() 394# and pw (FreeBSD) used in enewuser()/enewgroup()
387egetent() { 395egetent() {
388 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 ;;
389 *-darwin*) 412 *-darwin*)
390 case "$2" in 413 case "$2" in
391 *[!0-9]*) # Non numeric 414 *[!0-9]*) # Non numeric
392 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 415 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
393 ;; 416 ;;
946 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."
947 fi 970 fi
948} 971}
949 972
950# @FUNCTION: make_session_desktop 973# @FUNCTION: make_session_desktop
951# @USAGE: <title> <command> 974# @USAGE: <title> <command> [command args...]
952# @DESCRIPTION: 975# @DESCRIPTION:
953# 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
954# 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.
955make_session_desktop() { 980make_session_desktop() {
956 [[ -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
957 [[ -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
958 983
959 local title=$1 984 local title=$1
960 local command=$2 985 local command=$2
961 local desktop=${T}/${wm}.desktop 986 local desktop=${T}/${wm:-${PN}}.desktop
987 shift 2
962 988
963 cat <<-EOF > "${desktop}" 989 cat <<-EOF > "${desktop}"
964 [Desktop Entry] 990 [Desktop Entry]
965 Name=${title} 991 Name=${title}
966 Comment=This session logs you into ${title} 992 Comment=This session logs you into ${title}
967 Exec=${command} 993 Exec=${command} $*
968 TryExec=${command} 994 TryExec=${command}
969 Type=Application 995 Type=XSession
970 EOF 996 EOF
971 997
972 ( 998 (
973 # wrap the env here so that the 'insinto' call 999 # wrap the env here so that the 'insinto' call
974 # doesn't corrupt the env of the caller 1000 # doesn't corrupt the env of the caller
1557# of the lists. 1583# of the lists.
1558strip-linguas() { 1584strip-linguas() {
1559 local ls newls nols 1585 local ls newls nols
1560 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1586 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1561 local op=$1; shift 1587 local op=$1; shift
1562 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1588 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1563 local d f 1589 local d f
1564 for d in "$@" ; do 1590 for d in "$@" ; do
1565 if [[ ${op} == "-u" ]] ; then 1591 if [[ ${op} == "-u" ]] ; then
1566 newls=${ls} 1592 newls=${ls}
1567 else 1593 else
1568 newls="" 1594 newls=""
1569 fi 1595 fi
1570 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1596 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1571 if [[ ${op} == "-i" ]] ; then 1597 if [[ ${op} == "-i" ]] ; then
1572 hasq ${f} ${ls} && newls="${newls} ${f}" 1598 hasq ${f} ${ls} && newls="${newls} ${f}"
1573 else 1599 else
1574 hasq ${f} ${ls} || newls="${newls} ${f}" 1600 hasq ${f} ${ls} || newls="${newls} ${f}"
1575 fi 1601 fi
1798 ) || die 1824 ) || die
1799 else 1825 else
1800 newbin "${tmpwrapper}" "${wrapper}" || die 1826 newbin "${tmpwrapper}" "${wrapper}" || die
1801 fi 1827 fi
1802} 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.303  
changed lines
  Added in v.1.315

  ViewVC Help
Powered by ViewVC 1.1.20