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

Diff of /eclass/eutils.eclass

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

Revision 1.315 Revision 1.369
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2011 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.315 2009/02/21 23:28:21 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.369 2011/12/02 03:27:37 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
13# home rather than having multiple ebuilds implementing the same thing. 13# home rather than having multiple ebuilds implementing the same thing.
14# 14#
15# Due to the nature of this eclass, some functions may have maintainers 15# Due to the nature of this eclass, some functions may have maintainers
16# different from the overall eclass! 16# different from the overall eclass!
17 17
18inherit multilib portability 18inherit multilib portability user
19 19
20DESCRIPTION="Based on the ${ECLASS} eclass" 20DESCRIPTION="Based on the ${ECLASS} eclass"
21
22if has "${EAPI:-0}" 0 1 2; then
21 23
22# @FUNCTION: epause 24# @FUNCTION: epause
23# @USAGE: [seconds] 25# @USAGE: [seconds]
24# @DESCRIPTION: 26# @DESCRIPTION:
25# Sleep for the specified number of seconds (default of 5 seconds). Useful when 27# Sleep for the specified number of seconds (default of 5 seconds). Useful when
26# printing a message the user should probably be reading and often used in 28# printing a message the user should probably be reading and often used in
27# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set, 29# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set,
28# don't wait at all. 30# don't wait at all. Defined in EAPIs 0 1 and 2.
29epause() { 31epause() {
30 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5} 32 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
31} 33}
32 34
33# @FUNCTION: ebeep 35# @FUNCTION: ebeep
34# @USAGE: [number of beeps] 36# @USAGE: [number of beeps]
35# @DESCRIPTION: 37# @DESCRIPTION:
36# Issue the specified number of beeps (default of 5 beeps). Useful when 38# Issue the specified number of beeps (default of 5 beeps). Useful when
37# printing a message the user should probably be reading and often used in 39# printing a message the user should probably be reading and often used in
38# conjunction with the epause function. If the EBEEP_IGNORE env var is set, 40# conjunction with the epause function. If the EBEEP_IGNORE env var is set,
39# don't beep at all. 41# don't beep at all. Defined in EAPIs 0 1 and 2.
40ebeep() { 42ebeep() {
41 local n 43 local n
42 if [[ -z ${EBEEP_IGNORE} ]] ; then 44 if [[ -z ${EBEEP_IGNORE} ]] ; then
43 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 45 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
44 echo -ne "\a" 46 echo -ne "\a"
47 sleep 1 49 sleep 1
48 done 50 done
49 fi 51 fi
50} 52}
51 53
54else
55
56ebeep() {
57 ewarn "QA Notice: ebeep is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
58}
59
60epause() {
61 ewarn "QA Notice: epause is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
62}
63
64fi
65
66# @FUNCTION: eqawarn
67# @USAGE: [message]
68# @DESCRIPTION:
69# Proxy to ewarn for package managers that don't provide eqawarn and use the PM
70# implementation if available. Reuses PORTAGE_ELOG_CLASSES as set by the dev
71# profile.
72if ! declare -F eqawarn >/dev/null ; then
73 eqawarn() {
74 has qa ${PORTAGE_ELOG_CLASSES} && ewarn "$@"
75 }
76fi
77
52# @FUNCTION: ecvs_clean 78# @FUNCTION: ecvs_clean
53# @USAGE: [list of dirs] 79# @USAGE: [list of dirs]
54# @DESCRIPTION: 80# @DESCRIPTION:
55# Remove CVS directories recursiveley. Useful when a source tarball contains 81# Remove CVS directories recursiveley. Useful when a source tarball contains
56# internal CVS directories. Defaults to $PWD. 82# internal CVS directories. Defaults to $PWD.
68esvn_clean() { 94esvn_clean() {
69 [[ -z $* ]] && set -- . 95 [[ -z $* ]] && set -- .
70 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf 96 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
71} 97}
72 98
73# Default directory where patches are located 99# @FUNCTION: eshopts_push
100# @USAGE: [options to `set` or `shopt`]
101# @DESCRIPTION:
102# Often times code will want to enable a shell option to change code behavior.
103# Since changing shell options can easily break other pieces of code (which
104# assume the default state), eshopts_push is used to (1) push the current shell
105# options onto a stack and (2) pass the specified arguments to set.
106#
107# If the first argument is '-s' or '-u', we assume you want to call `shopt`
108# rather than `set` as there are some options only available via that.
109#
110# A common example is to disable shell globbing so that special meaning/care
111# may be used with variables/arguments to custom functions. That would be:
112# @CODE
113# eshopts_push -o noglob
114# for x in ${foo} ; do
115# if ...some check... ; then
116# eshopts_pop
117# return 0
118# fi
119# done
120# eshopts_pop
121# @CODE
122eshopts_push() {
123 # have to assume __ESHOPTS_SAVE__ isn't screwed with
124 # as a `declare -a` here will reset its value
125 local i=${#__ESHOPTS_SAVE__[@]}
126 if [[ $1 == -[su] ]] ; then
127 __ESHOPTS_SAVE__[$i]=$(shopt -p)
128 [[ $# -eq 0 ]] && return 0
129 shopt "$@" || die "eshopts_push: bad options to shopt: $*"
130 else
131 __ESHOPTS_SAVE__[$i]=$-
132 [[ $# -eq 0 ]] && return 0
133 set "$@" || die "eshopts_push: bad options to set: $*"
134 fi
135}
136
137# @FUNCTION: eshopts_pop
138# @USAGE:
139# @DESCRIPTION:
140# Restore the shell options to the state saved with the corresponding
141# eshopts_push call. See that function for more details.
142eshopts_pop() {
143 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
144 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
145 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
146 local s=${__ESHOPTS_SAVE__[$i]}
147 unset __ESHOPTS_SAVE__[$i]
148 if [[ ${s} == "shopt -"* ]] ; then
149 eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
150 else
151 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
152 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
153 fi
154}
155
156# @VARIABLE: EPATCH_SOURCE
157# @DESCRIPTION:
158# Default directory to search for patches.
74EPATCH_SOURCE="${WORKDIR}/patch" 159EPATCH_SOURCE="${WORKDIR}/patch"
75# Default extension for patches 160# @VARIABLE: EPATCH_SUFFIX
161# @DESCRIPTION:
162# Default extension for patches (do not prefix the period yourself).
76EPATCH_SUFFIX="patch.bz2" 163EPATCH_SUFFIX="patch.bz2"
164# @VARIABLE: EPATCH_OPTS
165# @DESCRIPTION:
77# Default options for patch 166# Default options for patch:
167# @CODE
78# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 168# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
79# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 169# --no-backup-if-mismatch - do not leave .orig files behind
80# Set -E to automatically remove empty files. 170# -E - automatically remove empty files
171# @CODE
81EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 172EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
173# @VARIABLE: EPATCH_EXCLUDE
174# @DESCRIPTION:
82# List of patches not to apply. Note this is only file names, 175# List of patches not to apply. Note this is only file names,
83# and not the full path .. 176# and not the full path. Globs accepted.
84EPATCH_EXCLUDE="" 177EPATCH_EXCLUDE=""
178# @VARIABLE: EPATCH_SINGLE_MSG
179# @DESCRIPTION:
85# Change the printed message for a single patch. 180# Change the printed message for a single patch.
86EPATCH_SINGLE_MSG="" 181EPATCH_SINGLE_MSG=""
182# @VARIABLE: EPATCH_MULTI_MSG
183# @DESCRIPTION:
87# Change the printed message for multiple patches. 184# Change the printed message for multiple patches.
88EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 185EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
89# Force applying bulk patches even if not following the style: 186# @VARIABLE: EPATCH_FORCE
90# 187# @DESCRIPTION:
91# ??_${ARCH}_foo.${EPATCH_SUFFIX} 188# Only require patches to match EPATCH_SUFFIX rather than the extended
92# 189# arch naming style.
93EPATCH_FORCE="no" 190EPATCH_FORCE="no"
94 191
95# This function is for bulk patching, or in theory for just one 192# @FUNCTION: epatch
96# or two patches. 193# @USAGE: [patches] [dirs of patches]
194# @DESCRIPTION:
195# epatch is designed to greatly simplify the application of patches. It can
196# process patch files directly, or directories of patches. The patches may be
197# compressed (bzip/gzip/etc...) or plain text. You generally need not specify
198# the -p option as epatch will automatically attempt -p0 to -p5 until things
199# apply successfully.
97# 200#
98# It should work with .bz2, .gz, .zip and plain text patches. 201# If you do not specify any options, then epatch will default to the directory
99# Currently all patches should be the same format. 202# specified by EPATCH_SOURCE.
100# 203#
101# You do not have to specify '-p' option to patch, as it will 204# When processing directories, epatch will apply all patches that match:
102# try with -p0 to -p5 until it succeed, or fail at -p5. 205# @CODE
103# 206# if ${EPATCH_FORCE} != "yes"
104# Above EPATCH_* variables can be used to control various defaults,
105# bug they should be left as is to ensure an ebuild can rely on
106# them for.
107#
108# Patches are applied in current directory.
109#
110# Bulk Patches should preferably have the form of:
111#
112# ??_${ARCH}_foo.${EPATCH_SUFFIX} 207# ??_${ARCH}_foo.${EPATCH_SUFFIX}
208# else
209# *.${EPATCH_SUFFIX}
210# @CODE
211# The leading ?? are typically numbers used to force consistent patch ordering.
212# The arch field is used to apply patches only for the host architecture with
213# the special value of "all" means apply for everyone. Note that using values
214# other than "all" is highly discouraged -- you should apply patches all the
215# time and let architecture details be detected at configure/compile time.
113# 216#
114# For example: 217# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
218# for patches to apply.
115# 219#
116# 01_all_misc-fix.patch.bz2 220# Refer to the other EPATCH_xxx variables for more customization of behavior.
117# 02_sparc_another-fix.patch.bz2
118#
119# This ensures that there are a set order, and you can have ARCH
120# specific patches.
121#
122# If you however give an argument to epatch(), it will treat it as a
123# single patch that need to be applied if its a file. If on the other
124# hand its a directory, it will set EPATCH_SOURCE to this.
125#
126# <azarah@gentoo.org> (10 Nov 2002)
127#
128epatch() { 221epatch() {
129 _epatch_draw_line() { 222 _epatch_draw_line() {
223 # create a line of same length as input string
130 [[ -z $1 ]] && set "$(printf "%65s" '')" 224 [[ -z $1 ]] && set "$(printf "%65s" '')"
131 echo "${1//?/=}" 225 echo "${1//?/=}"
132 } 226 }
133 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
134 local PIPE_CMD=""
135 local STDERR_TARGET="${T}/$$.out"
136 local PATCH_TARGET="${T}/$$.patch"
137 local PATCH_SUFFIX=""
138 local SINGLE_PATCH="no"
139 local x=""
140 227
141 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 228 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
142 229
143 if [ "$#" -gt 1 ] 230 # Let the rest of the code process one user arg at a time --
144 then 231 # each arg may expand into multiple patches, and each arg may
232 # need to start off with the default global EPATCH_xxx values
233 if [[ $# -gt 1 ]] ; then
145 local m="" 234 local m
146 for m in "$@" ; do 235 for m in "$@" ; do
147 epatch "${m}" 236 epatch "${m}"
148 done 237 done
149 return 0 238 return 0
150 fi 239 fi
151 240
152 if [ -n "$1" -a -f "$1" ] 241 local SINGLE_PATCH="no"
153 then 242 # no args means process ${EPATCH_SOURCE}
243 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
244
245 if [[ -f $1 ]] ; then
154 SINGLE_PATCH="yes" 246 SINGLE_PATCH="yes"
155 247 set -- "$1"
156 local EPATCH_SOURCE="$1" 248 # Use the suffix from the single patch (localize it); the code
249 # below will find the suffix for us
157 local EPATCH_SUFFIX="${1##*\.}" 250 local EPATCH_SUFFIX=$1
158 251
159 elif [ -n "$1" -a -d "$1" ] 252 elif [[ -d $1 ]] ; then
160 then 253 # Some people like to make dirs of patches w/out suffixes (vim)
161 # Allow no extension if EPATCH_FORCE=yes ... used by vim for example ... 254 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
162 if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] 255
256 elif [[ -f ${EPATCH_SOURCE}/$1 ]] ; then
257 # Re-use EPATCH_SOURCE as a search dir
258 epatch "${EPATCH_SOURCE}/$1"
259 return $?
260
261 else
262 # sanity check ... if it isn't a dir or file, wtf man ?
263 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
264 echo
265 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
266 eerror
267 eerror " ${EPATCH_SOURCE}"
268 eerror " ( ${EPATCH_SOURCE##*/} )"
269 echo
270 die "Cannot find \$EPATCH_SOURCE!"
271 fi
272
273 local PIPE_CMD
274 case ${EPATCH_SUFFIX##*\.} in
275 xz) PIPE_CMD="xz -dc" ;;
276 lzma) PIPE_CMD="lzma -dc" ;;
277 bz2) PIPE_CMD="bzip2 -dc" ;;
278 gz|Z|z) PIPE_CMD="gzip -dc" ;;
279 ZIP|zip) PIPE_CMD="unzip -p" ;;
280 *) ;;
281 esac
282
283 [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
284
285 local x
286 for x in "$@" ; do
287 # If the patch dir given contains subdirs, or our EPATCH_SUFFIX
288 # didn't match anything, ignore continue on
289 [[ ! -f ${x} ]] && continue
290
291 local patchname=${x##*/}
292
293 # Apply single patches, or forced sets of patches, or
294 # patches with ARCH dependant names.
295 # ???_arch_foo.patch
296 # Else, skip this input altogether
297 local a=${patchname#*_} # strip the ???_
298 a=${a%%_*} # strip the _foo.patch
299 if ! [[ ${SINGLE_PATCH} == "yes" || \
300 ${EPATCH_FORCE} == "yes" || \
301 ${a} == all || \
302 ${a} == ${ARCH} ]]
163 then 303 then
164 local EPATCH_SOURCE="$1/*" 304 continue
305 fi
306
307 # Let people filter things dynamically
308 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
309 # let people use globs in the exclude
310 eshopts_push -o noglob
311
312 local ex
313 for ex in ${EPATCH_EXCLUDE} ; do
314 if [[ ${patchname} == ${ex} ]] ; then
315 eshopts_pop
316 continue 2
317 fi
318 done
319
320 eshopts_pop
321 fi
322
323 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
324 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
325 einfo "${EPATCH_SINGLE_MSG}"
326 else
327 einfo "Applying ${patchname} ..."
328 fi
165 else 329 else
166 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 330 einfo " ${patchname} ..."
167 fi 331 fi
168 else 332
169 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then 333 # most of the time, there will only be one run per unique name,
170 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 334 # but if there are more, make sure we get unique log filenames
171 then 335 local STDERR_TARGET="${T}/${patchname}.out"
172 EPATCH_SOURCE="$1" 336 if [[ -e ${STDERR_TARGET} ]] ; then
337 STDERR_TARGET="${T}/${patchname}-$$.out"
338 fi
339
340 printf "***** %s *****\nPWD: %s\n\n" "${patchname}" "${PWD}" > "${STDERR_TARGET}"
341
342 # Decompress the patch if need be
343 local count=0
344 local PATCH_TARGET
345 if [[ -n ${PIPE_CMD} ]] ; then
346 PATCH_TARGET="${T}/$$.patch"
347 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
348
349 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
350 echo
351 eerror "Could not extract patch!"
352 #die "Could not extract patch!"
353 count=5
354 break
173 fi 355 fi
356 else
357 PATCH_TARGET=${x}
358 fi
174 359
360 # Check for absolute paths in patches. If sandbox is disabled,
361 # people could (accidently) patch files in the root filesystem.
362 # Or trigger other unpleasantries #237667. So disallow -p0 on
363 # such patches.
364 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
365 if [[ -n ${abs_paths} ]] ; then
366 count=1
367 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
368 fi
369 # Similar reason, but with relative paths.
370 local rel_paths=$(egrep -n '^[-+]{3} [^ ]*[.][.]/' "${PATCH_TARGET}")
371 if [[ -n ${rel_paths} ]] ; then
372 eqawarn "QA Notice: Your patch uses relative paths '../'."
373 eqawarn " In the future this will cause a failure."
374 eqawarn "${rel_paths}"
375 fi
376
377 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
378 while [[ ${count} -lt 5 ]] ; do
379 # Generate some useful debug info ...
380 (
381 _epatch_draw_line "***** ${patchname} *****"
175 echo 382 echo
176 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 383 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
384 echo
385 _epatch_draw_line "***** ${patchname} *****"
386 patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}" 2>&1
387 ret=$?
388 echo
389 echo "patch program exited with status ${ret}"
390 exit ${ret}
391 ) >> "${STDERR_TARGET}"
392
393 if [ $? -eq 0 ] ; then
394 (
395 _epatch_draw_line "***** ${patchname} *****"
396 echo
397 echo "ACTUALLY APPLYING ${patchname} ..."
398 echo
399 _epatch_draw_line "***** ${patchname} *****"
400 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
401 ret=$?
402 echo
403 echo "patch program exited with status ${ret}"
404 exit ${ret}
405 ) >> "${STDERR_TARGET}"
406
407 if [ $? -ne 0 ] ; then
408 echo
409 eerror "A dry-run of patch command succeeded, but actually"
410 eerror "applying the patch failed!"
411 #die "Real world sux compared to the dreamworld!"
412 count=5
413 fi
414 break
415 fi
416
417 : $(( count++ ))
418 done
419
420 # if we had to decompress the patch, delete the temp one
421 if [[ -n ${PIPE_CMD} ]] ; then
422 rm -f "${PATCH_TARGET}"
423 fi
424
425 if [[ ${count} -ge 5 ]] ; then
426 echo
427 eerror "Failed Patch: ${patchname} !"
428 eerror " ( ${PATCH_TARGET} )"
177 eerror 429 eerror
178 eerror " ${EPATCH_SOURCE}" 430 eerror "Include in your bugreport the contents of:"
179 eerror " ( ${EPATCH_SOURCE##*/} )" 431 eerror
432 eerror " ${STDERR_TARGET}"
180 echo 433 echo
181 die "Cannot find \$EPATCH_SOURCE!"
182 fi
183
184 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
185 fi
186
187 case ${EPATCH_SUFFIX##*\.} in
188 lzma)
189 PIPE_CMD="lzma -dc"
190 PATCH_SUFFIX="lzma"
191 ;;
192 bz2)
193 PIPE_CMD="bzip2 -dc"
194 PATCH_SUFFIX="bz2"
195 ;;
196 gz|Z|z)
197 PIPE_CMD="gzip -dc"
198 PATCH_SUFFIX="gz"
199 ;;
200 ZIP|zip)
201 PIPE_CMD="unzip -p"
202 PATCH_SUFFIX="zip"
203 ;;
204 *)
205 PIPE_CMD="cat"
206 PATCH_SUFFIX="patch"
207 ;;
208 esac
209
210 if [ "${SINGLE_PATCH}" = "no" ]
211 then
212 einfo "${EPATCH_MULTI_MSG}"
213 fi
214 for x in ${EPATCH_SOURCE}
215 do
216 # New ARCH dependant patch naming scheme ...
217 #
218 # ???_arch_foo.patch
219 #
220 if [ -f ${x} ] && \
221 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
222 [ "${EPATCH_FORCE}" = "yes" ])
223 then
224 local count=0
225 local popts="${EPATCH_OPTS}"
226 local patchname=${x##*/}
227
228 if [ -n "${EPATCH_EXCLUDE}" ]
229 then
230 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
231 then
232 continue
233 fi
234 fi
235
236 if [ "${SINGLE_PATCH}" = "yes" ]
237 then
238 if [ -n "${EPATCH_SINGLE_MSG}" ]
239 then
240 einfo "${EPATCH_SINGLE_MSG}"
241 else
242 einfo "Applying ${patchname} ..."
243 fi
244 else
245 einfo " ${patchname} ..."
246 fi
247
248 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
249 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
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
278 # Allow for prefix to differ ... im lazy, so shoot me :/
279 while [ "${count}" -lt 5 ]
280 do
281 # Generate some useful debug info ...
282 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
284
285 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
286 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
287
288 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290
291 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
292 then
293 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
294 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
295 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
297 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
298
299 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
300 _epatch_assert
301
302 if [ "$?" -ne 0 ]
303 then
304 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 echo
306 eerror "A dry-run of patch command succeeded, but actually"
307 eerror "applying the patch failed!"
308 #die "Real world sux compared to the dreamworld!"
309 count=5
310 fi
311
312 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
313
314 break
315 fi
316
317 count=$((count + 1))
318 done
319
320 if [ "${PATCH_SUFFIX}" != "patch" ]
321 then
322 rm -f ${PATCH_TARGET}
323 fi
324
325 if [ "${count}" -eq 5 ]
326 then
327 echo
328 eerror "Failed Patch: ${patchname} !"
329 eerror " ( ${PATCH_TARGET} )"
330 eerror
331 eerror "Include in your bugreport the contents of:"
332 eerror
333 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
334 echo
335 die "Failed Patch: ${patchname}!" 434 die "Failed Patch: ${patchname}!"
336 fi 435 fi
337 436
338 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 437 # if everything worked, delete the patch log
339 438 rm -f "${STDERR_TARGET}"
340 eend 0 439 eend 0
341 fi
342 done 440 done
343 if [ "${SINGLE_PATCH}" = "no" ] 441
344 then 442 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
345 einfo "Done with patching" 443 : # everything worked
444}
445
446# @FUNCTION: epatch_user
447# @USAGE:
448# @DESCRIPTION:
449# Applies user-provided patches to the source tree. The patches are
450# taken from /etc/portage/patches/<CATEGORY>/<PF|P|PN>/, where the first
451# of these three directories to exist will be the one to use, ignoring
452# any more general directories which might exist as well.
453#
454# User patches are intended for quick testing of patches without ebuild
455# modifications, as well as for permanent customizations a user might
456# desire. Obviously, there can be no official support for arbitrarily
457# patched ebuilds. So whenever a build log in a bug report mentions that
458# user patches were applied, the user should be asked to reproduce the
459# problem without these.
460#
461# Not all ebuilds do call this function, so placing patches in the
462# stated directory might or might not work, depending on the package and
463# the eclasses it inherits and uses. It is safe to call the function
464# repeatedly, so it is always possible to add a call at the ebuild
465# level. The first call is the time when the patches will be
466# applied.
467#
468# Ideally, this function should be called after gentoo-specific patches
469# have been applied, so that their code can be modified as well, but
470# before calls to e.g. eautoreconf, as the user patches might affect
471# autotool input files as well.
472epatch_user() {
473 [[ $# -ne 0 ]] && die "epatch_user takes no options"
474
475 # Allow multiple calls to this function; ignore all but the first
476 local applied="${T}/epatch_user.applied"
477 [[ -e ${applied} ]] && return 2
478
479 # don't clobber any EPATCH vars that the parent might want
480 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
481 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
482 EPATCH_SOURCE=${base}/${CTARGET}/${check}
483 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
484 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
485 if [[ -d ${EPATCH_SOURCE} ]] ; then
486 EPATCH_SOURCE=${EPATCH_SOURCE} \
487 EPATCH_SUFFIX="patch" \
488 EPATCH_FORCE="yes" \
489 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
490 epatch
491 echo "${EPATCH_SOURCE}" > "${applied}"
492 return 0
346 fi 493 fi
494 done
495 echo "none" > "${applied}"
496 return 1
347} 497}
348 498
349# @FUNCTION: emktemp 499# @FUNCTION: emktemp
350# @USAGE: [temp dir] 500# @USAGE: [temp dir]
351# @DESCRIPTION: 501# @DESCRIPTION:
379 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX 529 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX
380 fi 530 fi
381 fi 531 fi
382} 532}
383 533
384# @FUNCTION: egetent
385# @USAGE: <database> <key>
386# @MAINTAINER:
387# base-system@gentoo.org (Linux)
388# Joe Jezak <josejx@gmail.com> (OS X)
389# usata@gentoo.org (OS X)
390# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
391# @DESCRIPTION:
392# Small wrapper for getent (Linux),
393# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
394# and pw (FreeBSD) used in enewuser()/enewgroup()
395egetent() {
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 ;;
412 *-darwin*)
413 case "$2" in
414 *[!0-9]*) # Non numeric
415 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
416 ;;
417 *) # Numeric
418 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
419 ;;
420 esac
421 ;;
422 *-freebsd*|*-dragonfly*)
423 local opts action="user"
424 [[ $1 == "passwd" ]] || action="group"
425
426 # lookup by uid/gid
427 if [[ $2 == [[:digit:]]* ]] ; then
428 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi
430
431 pw show ${action} ${opts} "$2" -q
432 ;;
433 *-netbsd*|*-openbsd*)
434 grep "$2:\*:" /etc/$1
435 ;;
436 *)
437 type -p nscd >& /dev/null && nscd -i "$1"
438 getent "$1" "$2"
439 ;;
440 esac
441}
442
443# @FUNCTION: enewuser
444# @USAGE: <user> [uid] [shell] [homedir] [groups] [params]
445# @DESCRIPTION:
446# Same as enewgroup, you are not required to understand how to properly add
447# a user to the system. The only required parameter is the username.
448# Default uid is (pass -1 for this) next available, default shell is
449# /bin/false, default homedir is /dev/null, there are no default groups,
450# and default params sets the comment as 'added by portage for ${PN}'.
451enewuser() {
452 case ${EBUILD_PHASE} in
453 unpack|compile|test|install)
454 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
455 eerror "Package fails at QA and at life. Please file a bug."
456 die "Bad package! enewuser is only for use in pkg_* functions!"
457 esac
458
459 # get the username
460 local euser=$1; shift
461 if [[ -z ${euser} ]] ; then
462 eerror "No username specified !"
463 die "Cannot call enewuser without a username"
464 fi
465
466 # lets see if the username already exists
467 if [[ -n $(egetent passwd "${euser}") ]] ; then
468 return 0
469 fi
470 einfo "Adding user '${euser}' to your system ..."
471
472 # options to pass to useradd
473 local opts=
474
475 # handle uid
476 local euid=$1; shift
477 if [[ -n ${euid} && ${euid} != -1 ]] ; then
478 if [[ ${euid} -gt 0 ]] ; then
479 if [[ -n $(egetent passwd ${euid}) ]] ; then
480 euid="next"
481 fi
482 else
483 eerror "Userid given but is not greater than 0 !"
484 die "${euid} is not a valid UID"
485 fi
486 else
487 euid="next"
488 fi
489 if [[ ${euid} == "next" ]] ; then
490 for ((euid = 101; euid <= 999; euid++)); do
491 [[ -z $(egetent passwd ${euid}) ]] && break
492 done
493 fi
494 opts="${opts} -u ${euid}"
495 einfo " - Userid: ${euid}"
496
497 # handle shell
498 local eshell=$1; shift
499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
500 if [[ ! -e ${ROOT}${eshell} ]] ; then
501 eerror "A shell was specified but it does not exist !"
502 die "${eshell} does not exist in ${ROOT}"
503 fi
504 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
505 eerror "Do not specify ${eshell} yourself, use -1"
506 die "Pass '-1' as the shell parameter"
507 fi
508 else
509 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
510 [[ -x ${ROOT}${shell} ]] && break
511 done
512
513 if [[ ${shell} == "/dev/null" ]] ; then
514 eerror "Unable to identify the shell to use, proceeding with userland default."
515 case ${USERLAND} in
516 GNU) shell="/bin/false" ;;
517 BSD) shell="/sbin/nologin" ;;
518 Darwin) shell="/usr/sbin/nologin" ;;
519 *) die "Unable to identify the default shell for userland ${USERLAND}"
520 esac
521 fi
522
523 eshell=${shell}
524 fi
525 einfo " - Shell: ${eshell}"
526 opts="${opts} -s ${eshell}"
527
528 # handle homedir
529 local ehome=$1; shift
530 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
531 ehome="/dev/null"
532 fi
533 einfo " - Home: ${ehome}"
534 opts="${opts} -d ${ehome}"
535
536 # handle groups
537 local egroups=$1; shift
538 if [[ ! -z ${egroups} ]] ; then
539 local oldifs=${IFS}
540 local defgroup="" exgroups=""
541
542 export IFS=","
543 for g in ${egroups} ; do
544 export IFS=${oldifs}
545 if [[ -z $(egetent group "${g}") ]] ; then
546 eerror "You must add group ${g} to the system first"
547 die "${g} is not a valid GID"
548 fi
549 if [[ -z ${defgroup} ]] ; then
550 defgroup=${g}
551 else
552 exgroups="${exgroups},${g}"
553 fi
554 export IFS=","
555 done
556 export IFS=${oldifs}
557
558 opts="${opts} -g ${defgroup}"
559 if [[ ! -z ${exgroups} ]] ; then
560 opts="${opts} -G ${exgroups:1}"
561 fi
562 else
563 egroups="(none)"
564 fi
565 einfo " - Groups: ${egroups}"
566
567 # handle extra and add the user
568 local oldsandbox=${SANDBOX_ON}
569 export SANDBOX_ON="0"
570 case ${CHOST} in
571 *-darwin*)
572 ### Make the user
573 if [[ -z $@ ]] ; then
574 dscl . create /users/${euser} uid ${euid}
575 dscl . create /users/${euser} shell ${eshell}
576 dscl . create /users/${euser} home ${ehome}
577 dscl . create /users/${euser} realname "added by portage for ${PN}"
578 ### Add the user to the groups specified
579 local oldifs=${IFS}
580 export IFS=","
581 for g in ${egroups} ; do
582 dscl . merge /groups/${g} users ${euser}
583 done
584 export IFS=${oldifs}
585 else
586 einfo "Extra options are not supported on Darwin yet"
587 einfo "Please report the ebuild along with the info below"
588 einfo "eextra: $@"
589 die "Required function missing"
590 fi
591 ;;
592 *-freebsd*|*-dragonfly*)
593 if [[ -z $@ ]] ; then
594 pw useradd ${euser} ${opts} \
595 -c "added by portage for ${PN}" \
596 die "enewuser failed"
597 else
598 einfo " - Extra: $@"
599 pw useradd ${euser} ${opts} \
600 "$@" || die "enewuser failed"
601 fi
602 ;;
603
604 *-netbsd*)
605 if [[ -z $@ ]] ; then
606 useradd ${opts} ${euser} || die "enewuser failed"
607 else
608 einfo " - Extra: $@"
609 useradd ${opts} ${euser} "$@" || die "enewuser failed"
610 fi
611 ;;
612
613 *-openbsd*)
614 if [[ -z $@ ]] ; then
615 useradd -u ${euid} -s ${eshell} \
616 -d ${ehome} -c "Added by portage for ${PN}" \
617 -g ${egroups} ${euser} || die "enewuser failed"
618 else
619 einfo " - Extra: $@"
620 useradd -u ${euid} -s ${eshell} \
621 -d ${ehome} -c "Added by portage for ${PN}" \
622 -g ${egroups} ${euser} "$@" || die "enewuser failed"
623 fi
624 ;;
625
626 *)
627 if [[ -z $@ ]] ; then
628 useradd ${opts} ${euser} \
629 -c "added by portage for ${PN}" \
630 || die "enewuser failed"
631 else
632 einfo " - Extra: $@"
633 useradd ${opts} ${euser} "$@" \
634 || die "enewuser failed"
635 fi
636 ;;
637 esac
638
639 if [[ ! -e ${ROOT}/${ehome} ]] ; then
640 einfo " - Creating ${ehome} in ${ROOT}"
641 mkdir -p "${ROOT}/${ehome}"
642 chown ${euser} "${ROOT}/${ehome}"
643 chmod 755 "${ROOT}/${ehome}"
644 fi
645
646 export SANDBOX_ON=${oldsandbox}
647}
648
649# @FUNCTION: enewgroup
650# @USAGE: <group> [gid]
651# @DESCRIPTION:
652# This function does not require you to understand how to properly add a
653# group to the system. Just give it a group name to add and enewgroup will
654# do the rest. You may specify the gid for the group or allow the group to
655# allocate the next available one.
656enewgroup() {
657 case ${EBUILD_PHASE} in
658 unpack|compile|test|install)
659 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
660 eerror "Package fails at QA and at life. Please file a bug."
661 die "Bad package! enewgroup is only for use in pkg_* functions!"
662 esac
663
664 # get the group
665 local egroup="$1"; shift
666 if [ -z "${egroup}" ]
667 then
668 eerror "No group specified !"
669 die "Cannot call enewgroup without a group"
670 fi
671
672 # see if group already exists
673 if [[ -n $(egetent group "${egroup}") ]]; then
674 return 0
675 fi
676 einfo "Adding group '${egroup}' to your system ..."
677
678 # options to pass to useradd
679 local opts=
680
681 # handle gid
682 local egid="$1"; shift
683 if [ ! -z "${egid}" ]
684 then
685 if [ "${egid}" -gt 0 ]
686 then
687 if [ -z "`egetent group ${egid}`" ]
688 then
689 if [[ "${CHOST}" == *-darwin* ]]; then
690 opts="${opts} ${egid}"
691 else
692 opts="${opts} -g ${egid}"
693 fi
694 else
695 egid="next available; requested gid taken"
696 fi
697 else
698 eerror "Groupid given but is not greater than 0 !"
699 die "${egid} is not a valid GID"
700 fi
701 else
702 egid="next available"
703 fi
704 einfo " - Groupid: ${egid}"
705
706 # handle extra
707 local eextra="$@"
708 opts="${opts} ${eextra}"
709
710 # add the group
711 local oldsandbox="${SANDBOX_ON}"
712 export SANDBOX_ON="0"
713 case ${CHOST} in
714 *-darwin*)
715 if [ ! -z "${eextra}" ];
716 then
717 einfo "Extra options are not supported on Darwin/OS X yet"
718 einfo "Please report the ebuild along with the info below"
719 einfo "eextra: ${eextra}"
720 die "Required function missing"
721 fi
722
723 # If we need the next available
724 case ${egid} in
725 *[!0-9]*) # Non numeric
726 for ((egid = 101; egid <= 999; egid++)); do
727 [[ -z $(egetent group ${egid}) ]] && break
728 done
729 esac
730 dscl . create /groups/${egroup} gid ${egid}
731 dscl . create /groups/${egroup} passwd '*'
732 ;;
733
734 *-freebsd*|*-dragonfly*)
735 case ${egid} in
736 *[!0-9]*) # Non numeric
737 for ((egid = 101; egid <= 999; egid++)); do
738 [[ -z $(egetent group ${egid}) ]] && break
739 done
740 esac
741 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
742 ;;
743
744 *-netbsd*)
745 case ${egid} in
746 *[!0-9]*) # Non numeric
747 for ((egid = 101; egid <= 999; egid++)); do
748 [[ -z $(egetent group ${egid}) ]] && break
749 done
750 esac
751 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
752 ;;
753
754 *)
755 groupadd ${opts} ${egroup} || die "enewgroup failed"
756 ;;
757 esac
758 export SANDBOX_ON="${oldsandbox}"
759}
760
761# @FUNCTION: edos2unix 534# @FUNCTION: edos2unix
762# @USAGE: <file> [more files ...] 535# @USAGE: <file> [more files ...]
763# @DESCRIPTION: 536# @DESCRIPTION:
764# A handy replacement for dos2unix, recode, fixdos, etc... This allows you 537# A handy replacement for dos2unix, recode, fixdos, etc... This allows you
765# to remove all of these text utilities from DEPEND variables because this 538# to remove all of these text utilities from DEPEND variables because this
766# is a script based solution. Just give it a list of files to convert and 539# is a script based solution. Just give it a list of files to convert and
767# they will all be changed from the DOS CRLF format to the UNIX LF format. 540# they will all be changed from the DOS CRLF format to the UNIX LF format.
768edos2unix() { 541edos2unix() {
769 echo "$@" | xargs sed -i 's/\r$//' 542 [[ $# -eq 0 ]] && return 0
543 sed -i 's/\r$//' -- "$@" || die
770} 544}
771 545
772# Make a desktop file ! 546# Make a desktop file !
773# Great for making those icons in kde/gnome startmenu ! 547# Great for making those icons in kde/gnome startmenu !
774# Amaze your friends ! Get the women ! Join today ! 548# Amaze your friends ! Get the women ! Join today !
775# 549#
776# make_desktop_entry(<command>, [name], [icon], [type], [path]) 550# make_desktop_entry(<command>, [name], [icon], [type], [fields])
777# 551#
778# binary: what command does the app run with ? 552# binary: what command does the app run with ?
779# name: the name that will show up in the menu 553# name: the name that will show up in the menu
780# icon: give your little like a pretty little icon ... 554# icon: give your little like a pretty little icon ...
781# this can be relative (to /usr/share/pixmaps) or 555# this can be relative (to /usr/share/pixmaps) or
782# a full path to an icon 556# a full path to an icon
783# type: what kind of application is this ? for categories: 557# type: what kind of application is this ? for categories:
784# http://standards.freedesktop.org/menu-spec/latest/apa.html 558# http://standards.freedesktop.org/menu-spec/latest/apa.html
785# path: if your app needs to startup in a specific dir 559# fields: extra fields to append to the desktop file; a printf string
786make_desktop_entry() { 560make_desktop_entry() {
787 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 561 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
788 562
789 local exec=${1} 563 local exec=${1}
790 local name=${2:-${PN}} 564 local name=${2:-${PN}}
791 local icon=${3:-${PN}} 565 local icon=${3:-${PN}}
792 local type=${4} 566 local type=${4}
793 local path=${5} 567 local fields=${5}
794 568
795 if [[ -z ${type} ]] ; then 569 if [[ -z ${type} ]] ; then
796 local catmaj=${CATEGORY%%-*} 570 local catmaj=${CATEGORY%%-*}
797 local catmin=${CATEGORY##*-} 571 local catmin=${CATEGORY##*-}
798 case ${catmaj} in 572 case ${catmaj} in
799 app) 573 app)
800 case ${catmin} in 574 case ${catmin} in
801 accessibility) type=Accessibility;; 575 accessibility) type=Accessibility;;
802 admin) type=System;; 576 admin) type=System;;
803 antivirus) type=System;; 577 antivirus) type=System;;
804 arch) type=Archiving;; 578 arch) type=Archiving;;
805 backup) type=Archiving;; 579 backup) type=Archiving;;
806 cdr) type=DiscBurning;; 580 cdr) type=DiscBurning;;
807 dicts) type=Dictionary;; 581 dicts) type=Dictionary;;
808 doc) type=Documentation;; 582 doc) type=Documentation;;
809 editors) type=TextEditor;; 583 editors) type=TextEditor;;
810 emacs) type=TextEditor;; 584 emacs) type=TextEditor;;
811 emulation) type=Emulator;; 585 emulation) type=Emulator;;
812 laptop) type=HardwareSettings;; 586 laptop) type=HardwareSettings;;
813 office) type=Office;; 587 office) type=Office;;
814 pda) type=PDA;; 588 pda) type=PDA;;
815 vim) type=TextEditor;; 589 vim) type=TextEditor;;
816 xemacs) type=TextEditor;; 590 xemacs) type=TextEditor;;
817 *) type=;;
818 esac 591 esac
819 ;; 592 ;;
820 593
821 dev) 594 dev)
822 type="Development" 595 type="Development"
823 ;; 596 ;;
824 597
825 games) 598 games)
826 case ${catmin} in 599 case ${catmin} in
827 action|fps) type=ActionGame;; 600 action|fps) type=ActionGame;;
828 arcade) type=ArcadeGame;; 601 arcade) type=ArcadeGame;;
829 board) type=BoardGame;; 602 board) type=BoardGame;;
830 emulation) type=Emulator;; 603 emulation) type=Emulator;;
831 kids) type=KidsGame;; 604 kids) type=KidsGame;;
832 puzzle) type=LogicGame;; 605 puzzle) type=LogicGame;;
833 roguelike) type=RolePlaying;; 606 roguelike) type=RolePlaying;;
834 rpg) type=RolePlaying;; 607 rpg) type=RolePlaying;;
835 simulation) type=Simulation;; 608 simulation) type=Simulation;;
836 sports) type=SportsGame;; 609 sports) type=SportsGame;;
837 strategy) type=StrategyGame;; 610 strategy) type=StrategyGame;;
838 *) type=;;
839 esac 611 esac
840 type="Game;${type}" 612 type="Game;${type}"
841 ;; 613 ;;
842 614
843 gnome) 615 gnome)
852 type="Network;Email" 624 type="Network;Email"
853 ;; 625 ;;
854 626
855 media) 627 media)
856 case ${catmin} in 628 case ${catmin} in
629 gfx)
857 gfx) type=Graphics;; 630 type=Graphics
631 ;;
632 *)
633 case ${catmin} in
858 radio) type=Tuner;; 634 radio) type=Tuner;;
859 sound) type=Audio;; 635 sound) type=Audio;;
860 tv) type=TV;; 636 tv) type=TV;;
861 video) type=Video;; 637 video) type=Video;;
862 *) type=;; 638 esac
639 type="AudioVideo;${type}"
640 ;;
863 esac 641 esac
864 type="AudioVideo;${type}"
865 ;; 642 ;;
866 643
867 net) 644 net)
868 case ${catmin} in 645 case ${catmin} in
869 dialup) type=Dialup;; 646 dialup) type=Dialup;;
870 ftp) type=FileTransfer;; 647 ftp) type=FileTransfer;;
871 im) type=InstantMessaging;; 648 im) type=InstantMessaging;;
872 irc) type=IRCClient;; 649 irc) type=IRCClient;;
873 mail) type=Email;; 650 mail) type=Email;;
874 news) type=News;; 651 news) type=News;;
875 nntp) type=News;; 652 nntp) type=News;;
876 p2p) type=FileTransfer;; 653 p2p) type=FileTransfer;;
877 *) type=;; 654 voip) type=Telephony;;
878 esac 655 esac
879 type="Network;${type}" 656 type="Network;${type}"
880 ;; 657 ;;
881 658
882 sci) 659 sci)
883 case ${catmin} in 660 case ${catmin} in
884 astro*) type=Astronomy;; 661 astro*) type=Astronomy;;
885 bio*) type=Biology;; 662 bio*) type=Biology;;
886 calc*) type=Calculator;; 663 calc*) type=Calculator;;
887 chem*) type=Chemistry;; 664 chem*) type=Chemistry;;
888 elec*) type=Electronics;; 665 elec*) type=Electronics;;
889 geo*) type=Geology;; 666 geo*) type=Geology;;
890 math*) type=Math;; 667 math*) type=Math;;
891 physics) type=Physics;; 668 physics) type=Physics;;
892 visual*) type=DataVisualization;; 669 visual*) type=DataVisualization;;
893 *) type=;;
894 esac 670 esac
895 type="Science;${type}" 671 type="Education;Science;${type}"
896 ;; 672 ;;
897 673
898 sys) 674 sys)
899 type="System" 675 type="System"
900 ;; 676 ;;
901 677
902 www) 678 www)
903 case ${catmin} in 679 case ${catmin} in
904 client) type=WebBrowser;; 680 client) type=WebBrowser;;
905 *) type=;;
906 esac 681 esac
907 type="Network" 682 type="Network;${type}"
908 ;; 683 ;;
909 684
910 *) 685 *)
911 type= 686 type=
912 ;; 687 ;;
918 local desktop_name="${PN}-${SLOT}" 693 local desktop_name="${PN}-${SLOT}"
919 fi 694 fi
920 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 695 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
921 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 696 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
922 697
698 # Don't append another ";" when a valid category value is provided.
699 type=${type%;}${type:+;}
700
701 eshopts_push -s extglob
702 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
703 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
704 ewarn "allowed in .desktop files if the value is not an absolute path."
705 icon=${icon%.@(xpm|png|svg)}
706 fi
707 eshopts_pop
708
923 cat <<-EOF > "${desktop}" 709 cat <<-EOF > "${desktop}"
924 [Desktop Entry] 710 [Desktop Entry]
925 Version=1.0
926 Name=${name} 711 Name=${name}
927 Type=Application 712 Type=Application
928 Comment=${DESCRIPTION} 713 Comment=${DESCRIPTION}
929 Exec=${exec} 714 Exec=${exec}
930 TryExec=${exec%% *} 715 TryExec=${exec%% *}
931 Icon=${icon} 716 Icon=${icon}
932 Categories=${type}; 717 Categories=${type}
933 EOF 718 EOF
934 719
935 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 720 if [[ ${fields:-=} != *=* ]] ; then
721 # 5th arg used to be value to Path=
722 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
723 fields="Path=${fields}"
724 fi
725 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
936 726
937 ( 727 (
938 # wrap the env here so that the 'insinto' call 728 # wrap the env here so that the 'insinto' call
939 # doesn't corrupt the env of the caller 729 # doesn't corrupt the env of the caller
940 insinto /usr/share/applications 730 insinto /usr/share/applications
941 doins "${desktop}" 731 doins "${desktop}"
942 ) 732 ) || die "installing desktop file failed"
943} 733}
944 734
945# @FUNCTION: validate_desktop_entries 735# @FUNCTION: validate_desktop_entries
946# @USAGE: [directories] 736# @USAGE: [directories]
947# @MAINTAINER: 737# @MAINTAINER:
1226 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1016 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1227 1017
1228 local shrtsrc=$(basename "${src}") 1018 local shrtsrc=$(basename "${src}")
1229 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1019 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1230 if [[ -z ${skip} ]] ; then 1020 if [[ -z ${skip} ]] ; then
1231 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1021 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1232 local skip=0 1022 local skip=0
1233 exe=tail 1023 exe=tail
1234 case ${ver} in 1024 case ${ver} in
1235 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1025 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1236 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1026 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1238 2.0|2.0.1) 1028 2.0|2.0.1)
1239 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1029 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1240 ;; 1030 ;;
1241 2.1.1) 1031 2.1.1)
1242 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1032 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1243 let skip="skip + 1" 1033 (( skip++ ))
1244 ;; 1034 ;;
1245 2.1.2) 1035 2.1.2)
1246 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1036 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1247 let skip="skip + 1" 1037 (( skip++ ))
1248 ;; 1038 ;;
1249 2.1.3) 1039 2.1.3)
1250 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1040 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1251 let skip="skip + 1" 1041 (( skip++ ))
1252 ;; 1042 ;;
1253 2.1.4|2.1.5) 1043 2.1.4|2.1.5)
1254 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1044 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1255 skip=$(head -n ${skip} "${src}" | wc -c) 1045 skip=$(head -n ${skip} "${src}" | wc -c)
1256 exe="dd" 1046 exe="dd"
1265 esac 1055 esac
1266 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1056 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1267 fi 1057 fi
1268 case ${exe} in 1058 case ${exe} in
1269 tail) exe="tail -n +${skip} '${src}'";; 1059 tail) exe="tail -n +${skip} '${src}'";;
1270 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1060 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1271 *) die "makeself cant handle exe '${exe}'" 1061 *) die "makeself cant handle exe '${exe}'"
1272 esac 1062 esac
1273 1063
1274 # lets grab the first few bytes of the file to figure out what kind of archive it is 1064 # lets grab the first few bytes of the file to figure out what kind of archive it is
1275 local tmpfile=$(emktemp) 1065 local filetype tmpfile=$(emktemp)
1276 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1066 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1277 local filetype=$(file -b "${tmpfile}") 1067 filetype=$(file -b "${tmpfile}") || die
1278 case ${filetype} in 1068 case ${filetype} in
1279 *tar\ archive*) 1069 *tar\ archive*)
1280 eval ${exe} | tar --no-same-owner -xf - 1070 eval ${exe} | tar --no-same-owner -xf -
1281 ;; 1071 ;;
1282 bzip2*) 1072 bzip2*)
1312 lic="${PWD}/${lic}" 1102 lic="${PWD}/${lic}"
1313 elif [ -e "${lic}" ] ; then 1103 elif [ -e "${lic}" ] ; then
1314 lic="${lic}" 1104 lic="${lic}"
1315 fi 1105 fi
1316 fi 1106 fi
1317 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1318 local l="`basename ${lic}`" 1107 local l="`basename ${lic}`"
1319 1108
1320 # here is where we check for the licenses the user already 1109 # here is where we check for the licenses the user already
1321 # accepted ... if we don't find a match, we make the user accept 1110 # accepted ... if we don't find a match, we make the user accept
1322 local shopts=$-
1323 local alic 1111 local alic
1324 set -o noglob #so that bash doesn't expand "*" 1112 eshopts_push -o noglob # so that bash doesn't expand "*"
1325 for alic in ${ACCEPT_LICENSE} ; do 1113 for alic in ${ACCEPT_LICENSE} ; do
1326 if [[ ${alic} == ${l} ]]; then 1114 if [[ ${alic} == ${l} ]]; then
1327 set +o noglob; set -${shopts} #reset old shell opts 1115 eshopts_pop
1328 return 0 1116 return 0
1329 fi 1117 fi
1330 done 1118 done
1331 set +o noglob; set -$shopts #reset old shell opts 1119 eshopts_pop
1120 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1332 1121
1333 local licmsg=$(emktemp) 1122 local licmsg=$(emktemp)
1334 cat <<-EOF > ${licmsg} 1123 cat <<-EOF > ${licmsg}
1335 ********************************************************** 1124 **********************************************************
1336 The following license outlines the terms of use of this 1125 The following license outlines the terms of use of this
1409 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1198 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1410 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1199 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1411 export CDROM_SET=-1 1200 export CDROM_SET=-1
1412 for f in ${CDROM_CHECK_1//:/ } ; do 1201 for f in ${CDROM_CHECK_1//:/ } ; do
1413 ((++CDROM_SET)) 1202 ((++CDROM_SET))
1414 [[ -e ${CD_ROOT}/${f} ]] && break 1203 [[ -e ${CDROM_ROOT}/${f} ]] && break
1415 done 1204 done
1416 export CDROM_MATCH=${f} 1205 export CDROM_MATCH=${f}
1417 return 1206 return
1418 fi 1207 fi
1419 1208
1593 else 1382 else
1594 newls="" 1383 newls=""
1595 fi 1384 fi
1596 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do 1385 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1597 if [[ ${op} == "-i" ]] ; then 1386 if [[ ${op} == "-i" ]] ; then
1598 hasq ${f} ${ls} && newls="${newls} ${f}" 1387 has ${f} ${ls} && newls="${newls} ${f}"
1599 else 1388 else
1600 hasq ${f} ${ls} || newls="${newls} ${f}" 1389 has ${f} ${ls} || newls="${newls} ${f}"
1601 fi 1390 fi
1602 done 1391 done
1603 ls=${newls} 1392 ls=${newls}
1604 done 1393 done
1605 else 1394 else
1607 fi 1396 fi
1608 1397
1609 nols="" 1398 nols=""
1610 newls="" 1399 newls=""
1611 for f in ${LINGUAS} ; do 1400 for f in ${LINGUAS} ; do
1612 if hasq ${f} ${ls} ; then 1401 if has ${f} ${ls} ; then
1613 newls="${newls} ${f}" 1402 newls="${newls} ${f}"
1614 else 1403 else
1615 nols="${nols} ${f}" 1404 nols="${nols} ${f}"
1616 fi 1405 fi
1617 done 1406 done
1618 [[ -n ${nols} ]] \ 1407 [[ -n ${nols} ]] \
1619 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1408 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1620 export LINGUAS=${newls:1} 1409 export LINGUAS=${newls:1}
1621} 1410}
1622 1411
1623# @FUNCTION: preserve_old_lib 1412# @FUNCTION: preserve_old_lib
1624# @USAGE: <libs to preserve> [more libs] 1413# @USAGE: <libs to preserve> [more libs]
1672 ewarn "the libraries are not being removed. You need to run revdep-rebuild" 1461 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1673 ewarn "in order to remove these old dependencies. If you do not have this" 1462 ewarn "in order to remove these old dependencies. If you do not have this"
1674 ewarn "helper program, simply emerge the 'gentoolkit' package." 1463 ewarn "helper program, simply emerge the 'gentoolkit' package."
1675 ewarn 1464 ewarn
1676 fi 1465 fi
1466 # temp hack for #348634 #357225
1467 [[ ${PN} == "mpfr" ]] && lib=${lib##*/}
1677 ewarn " # revdep-rebuild --library ${lib##*/}" 1468 ewarn " # revdep-rebuild --library '${lib}'"
1678 done 1469 done
1679 if [[ ${notice} -eq 1 ]] ; then 1470 if [[ ${notice} -eq 1 ]] ; then
1680 ewarn 1471 ewarn
1681 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1472 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1682 ewarn "delete the old libraries. Here is a copy & paste for the lazy:" 1473 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1687} 1478}
1688 1479
1689# @FUNCTION: built_with_use 1480# @FUNCTION: built_with_use
1690# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1481# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1691# @DESCRIPTION: 1482# @DESCRIPTION:
1483#
1484# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1485#
1692# A temporary hack until portage properly supports DEPENDing on USE 1486# A temporary hack until portage properly supports DEPENDing on USE
1693# flags being enabled in packages. This will check to see if the specified 1487# flags being enabled in packages. This will check to see if the specified
1694# DEPEND atom was built with the specified list of USE flags. The 1488# DEPEND atom was built with the specified list of USE flags. The
1695# --missing option controls the behavior if called on a package that does 1489# --missing option controls the behavior if called on a package that does
1696# not actually support the defined USE flags (aka listed in IUSE). 1490# not actually support the defined USE flags (aka listed in IUSE).
1825 else 1619 else
1826 newbin "${tmpwrapper}" "${wrapper}" || die 1620 newbin "${tmpwrapper}" "${wrapper}" || die
1827 fi 1621 fi
1828} 1622}
1829 1623
1830# @FUNCTION: prepalldocs 1624# @FUNCTION: path_exists
1831# @USAGE: 1625# @USAGE: [-a|-o] <paths>
1832# @DESCRIPTION: 1626# @DESCRIPTION:
1833# Compress files in /usr/share/doc which are not already 1627# Check if the specified paths exist. Works for all types of paths
1834# compressed, excluding /usr/share/doc/${PF}/html. 1628# (files/dirs/etc...). The -a and -o flags control the requirements
1835# Uses the ecompressdir to do the compression. 1629# of the paths. They correspond to "and" and "or" logic. So the -a
1836# 2009-02-18 by betelgeuse: 1630# flag means all the paths must exist while the -o flag means at least
1837# Commented because ecompressdir is even more internal to 1631# one of the paths must exist. The default behavior is "and". If no
1838# Portage than prepalldocs (it's not even mentioned in man 5 1632# paths are specified, then the return value is "false".
1839# ebuild). Please submit a better version for review to gentoo-dev 1633path_exists() {
1840# if you want prepalldocs here. 1634 local opt=$1
1841#prepalldocs() { 1635 [[ ${opt} == -[ao] ]] && shift || opt="-a"
1842# if [[ -n $1 ]] ; then
1843# ewarn "prepalldocs: invalid usage; takes no arguments"
1844# fi
1845 1636
1846# cd "${D}" 1637 # no paths -> return false
1847# [[ -d usr/share/doc ]] || return 0 1638 # same behavior as: [[ -e "" ]]
1639 [[ $# -eq 0 ]] && return 1
1848 1640
1849# find usr/share/doc -exec gzip {} + 1641 local p r=0
1850# ecompressdir --ignore /usr/share/doc/${PF}/html 1642 for p in "$@" ; do
1851# ecompressdir --queue /usr/share/doc 1643 [[ -e ${p} ]]
1852#} 1644 : $(( r += $? ))
1645 done
1646
1647 case ${opt} in
1648 -a) return $(( r != 0 )) ;;
1649 -o) return $(( r == $# )) ;;
1650 esac
1651}
1652
1653# @FUNCTION: in_iuse
1654# @USAGE: <flag>
1655# @DESCRIPTION:
1656# Determines whether the given flag is in IUSE. Strips IUSE default prefixes
1657# as necessary.
1658#
1659# Note that this function should not be used in the global scope.
1660in_iuse() {
1661 debug-print-function ${FUNCNAME} "${@}"
1662 [[ ${#} -eq 1 ]] || die "Invalid args to ${FUNCNAME}()"
1663
1664 local flag=${1}
1665 local liuse=( ${IUSE} )
1666
1667 has "${flag}" "${liuse[@]#[+-]}"
1668}
1669
1670# @FUNCTION: use_if_iuse
1671# @USAGE: <flag>
1672# @DESCRIPTION:
1673# Return true if the given flag is in USE and IUSE.
1674#
1675# Note that this function should not be used in the global scope.
1676use_if_iuse() {
1677 in_iuse $1 || return 1
1678 use $1
1679}
1680
1681# @FUNCTION: usex
1682# @USAGE: <USE flag> [true output] [false output] [true suffix] [false suffix]
1683# @DESCRIPTION:
1684# If USE flag is set, echo [true output][true suffix] (defaults to "yes"),
1685# otherwise echo [false output][false suffix] (defaults to "no").
1686usex() { use "$1" && echo "${2-yes}$4" || echo "${3-no}$5" ; } #382963

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

  ViewVC Help
Powered by ViewVC 1.1.20