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

Diff of /eclass/eutils.eclass

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

Revision 1.284 Revision 1.370
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.284 2007/06/21 04:44:45 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.370 2011/12/02 10:22:41 ferringb 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
9# @DESCRIPTION: 9# @DESCRIPTION:
10# The eutils eclass contains a suite of functions that complement 10# The eutils eclass contains a suite of functions that complement
11# the ones that ebuild.sh already contain. The idea is that the functions 11# the ones that ebuild.sh already contain. The idea is that the functions
12# are not required in all ebuilds but enough utilize them to have a common 12# are not required in all ebuilds but enough utilize them to have a common
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
52# Default directory where patches are located 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 :
76 }
77fi
78
79# @FUNCTION: ecvs_clean
80# @USAGE: [list of dirs]
81# @DESCRIPTION:
82# Remove CVS directories recursiveley. Useful when a source tarball contains
83# internal CVS directories. Defaults to $PWD.
84ecvs_clean() {
85 [[ -z $* ]] && set -- .
86 find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
87 find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
88}
89
90# @FUNCTION: esvn_clean
91# @USAGE: [list of dirs]
92# @DESCRIPTION:
93# Remove .svn directories recursiveley. Useful when a source tarball contains
94# internal Subversion directories. Defaults to $PWD.
95esvn_clean() {
96 [[ -z $* ]] && set -- .
97 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
98}
99
100# @FUNCTION: eshopts_push
101# @USAGE: [options to `set` or `shopt`]
102# @DESCRIPTION:
103# Often times code will want to enable a shell option to change code behavior.
104# Since changing shell options can easily break other pieces of code (which
105# assume the default state), eshopts_push is used to (1) push the current shell
106# options onto a stack and (2) pass the specified arguments to set.
107#
108# If the first argument is '-s' or '-u', we assume you want to call `shopt`
109# rather than `set` as there are some options only available via that.
110#
111# A common example is to disable shell globbing so that special meaning/care
112# may be used with variables/arguments to custom functions. That would be:
113# @CODE
114# eshopts_push -o noglob
115# for x in ${foo} ; do
116# if ...some check... ; then
117# eshopts_pop
118# return 0
119# fi
120# done
121# eshopts_pop
122# @CODE
123eshopts_push() {
124 # have to assume __ESHOPTS_SAVE__ isn't screwed with
125 # as a `declare -a` here will reset its value
126 local i=${#__ESHOPTS_SAVE__[@]}
127 if [[ $1 == -[su] ]] ; then
128 __ESHOPTS_SAVE__[$i]=$(shopt -p)
129 [[ $# -eq 0 ]] && return 0
130 shopt "$@" || die "eshopts_push: bad options to shopt: $*"
131 else
132 __ESHOPTS_SAVE__[$i]=$-
133 [[ $# -eq 0 ]] && return 0
134 set "$@" || die "eshopts_push: bad options to set: $*"
135 fi
136}
137
138# @FUNCTION: eshopts_pop
139# @USAGE:
140# @DESCRIPTION:
141# Restore the shell options to the state saved with the corresponding
142# eshopts_push call. See that function for more details.
143eshopts_pop() {
144 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
145 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
146 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
147 local s=${__ESHOPTS_SAVE__[$i]}
148 unset __ESHOPTS_SAVE__[$i]
149 if [[ ${s} == "shopt -"* ]] ; then
150 eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
151 else
152 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
153 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
154 fi
155}
156
157# @VARIABLE: EPATCH_SOURCE
158# @DESCRIPTION:
159# Default directory to search for patches.
53EPATCH_SOURCE="${WORKDIR}/patch" 160EPATCH_SOURCE="${WORKDIR}/patch"
54# Default extension for patches 161# @VARIABLE: EPATCH_SUFFIX
162# @DESCRIPTION:
163# Default extension for patches (do not prefix the period yourself).
55EPATCH_SUFFIX="patch.bz2" 164EPATCH_SUFFIX="patch.bz2"
165# @VARIABLE: EPATCH_OPTS
166# @DESCRIPTION:
56# Default options for patch 167# Default options for patch:
168# @CODE
57# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 169# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
58# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 170# --no-backup-if-mismatch - do not leave .orig files behind
59# Set -E to automatically remove empty files. 171# -E - automatically remove empty files
172# @CODE
60EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 173EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
174# @VARIABLE: EPATCH_EXCLUDE
175# @DESCRIPTION:
61# List of patches not to apply. Not this is only file names, 176# List of patches not to apply. Note this is only file names,
62# and not the full path .. 177# and not the full path. Globs accepted.
63EPATCH_EXCLUDE="" 178EPATCH_EXCLUDE=""
179# @VARIABLE: EPATCH_SINGLE_MSG
180# @DESCRIPTION:
64# Change the printed message for a single patch. 181# Change the printed message for a single patch.
65EPATCH_SINGLE_MSG="" 182EPATCH_SINGLE_MSG=""
183# @VARIABLE: EPATCH_MULTI_MSG
184# @DESCRIPTION:
66# Change the printed message for multiple patches. 185# Change the printed message for multiple patches.
67EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 186EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
68# Force applying bulk patches even if not following the style: 187# @VARIABLE: EPATCH_FORCE
69# 188# @DESCRIPTION:
70# ??_${ARCH}_foo.${EPATCH_SUFFIX} 189# Only require patches to match EPATCH_SUFFIX rather than the extended
71# 190# arch naming style.
72EPATCH_FORCE="no" 191EPATCH_FORCE="no"
73 192
74# This function is for bulk patching, or in theory for just one 193# @FUNCTION: epatch
75# or two patches. 194# @USAGE: [patches] [dirs of patches]
195# @DESCRIPTION:
196# epatch is designed to greatly simplify the application of patches. It can
197# process patch files directly, or directories of patches. The patches may be
198# compressed (bzip/gzip/etc...) or plain text. You generally need not specify
199# the -p option as epatch will automatically attempt -p0 to -p5 until things
200# apply successfully.
76# 201#
77# It should work with .bz2, .gz, .zip and plain text patches. 202# If you do not specify any options, then epatch will default to the directory
78# Currently all patches should be the same format. 203# specified by EPATCH_SOURCE.
79# 204#
80# You do not have to specify '-p' option to patch, as it will 205# When processing directories, epatch will apply all patches that match:
81# try with -p0 to -p5 until it succeed, or fail at -p5. 206# @CODE
82# 207# if ${EPATCH_FORCE} != "yes"
83# Above EPATCH_* variables can be used to control various defaults,
84# bug they should be left as is to ensure an ebuild can rely on
85# them for.
86#
87# Patches are applied in current directory.
88#
89# Bulk Patches should preferibly have the form of:
90#
91# ??_${ARCH}_foo.${EPATCH_SUFFIX} 208# ??_${ARCH}_foo.${EPATCH_SUFFIX}
209# else
210# *.${EPATCH_SUFFIX}
211# @CODE
212# The leading ?? are typically numbers used to force consistent patch ordering.
213# The arch field is used to apply patches only for the host architecture with
214# the special value of "all" means apply for everyone. Note that using values
215# other than "all" is highly discouraged -- you should apply patches all the
216# time and let architecture details be detected at configure/compile time.
92# 217#
93# For example: 218# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
219# for patches to apply.
94# 220#
95# 01_all_misc-fix.patch.bz2 221# Refer to the other EPATCH_xxx variables for more customization of behavior.
96# 02_sparc_another-fix.patch.bz2
97#
98# This ensures that there are a set order, and you can have ARCH
99# specific patches.
100#
101# If you however give an argument to epatch(), it will treat it as a
102# single patch that need to be applied if its a file. If on the other
103# hand its a directory, it will set EPATCH_SOURCE to this.
104#
105# <azarah@gentoo.org> (10 Nov 2002)
106#
107epatch() { 222epatch() {
108 _epatch_draw_line() { 223 _epatch_draw_line() {
224 # create a line of same length as input string
109 [[ -z $1 ]] && set "$(printf "%65s" '')" 225 [[ -z $1 ]] && set "$(printf "%65s" '')"
110 echo "${1//?/=}" 226 echo "${1//?/=}"
111 } 227 }
112 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
113 local PIPE_CMD=""
114 local STDERR_TARGET="${T}/$$.out"
115 local PATCH_TARGET="${T}/$$.patch"
116 local PATCH_SUFFIX=""
117 local SINGLE_PATCH="no"
118 local x=""
119 228
120 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 229 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
121 230
122 if [ "$#" -gt 1 ] 231 # Let the rest of the code process one user arg at a time --
123 then 232 # each arg may expand into multiple patches, and each arg may
233 # need to start off with the default global EPATCH_xxx values
234 if [[ $# -gt 1 ]] ; then
124 local m="" 235 local m
125 for m in "$@" ; do 236 for m in "$@" ; do
126 epatch "${m}" 237 epatch "${m}"
127 done 238 done
128 return 0 239 return 0
129 fi 240 fi
130 241
131 if [ -n "$1" -a -f "$1" ] 242 local SINGLE_PATCH="no"
132 then 243 # no args means process ${EPATCH_SOURCE}
244 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
245
246 if [[ -f $1 ]] ; then
133 SINGLE_PATCH="yes" 247 SINGLE_PATCH="yes"
134 248 set -- "$1"
135 local EPATCH_SOURCE="$1" 249 # Use the suffix from the single patch (localize it); the code
250 # below will find the suffix for us
136 local EPATCH_SUFFIX="${1##*\.}" 251 local EPATCH_SUFFIX=$1
137 252
138 elif [ -n "$1" -a -d "$1" ] 253 elif [[ -d $1 ]] ; then
139 then 254 # Some people like to make dirs of patches w/out suffixes (vim)
140 # Allow no extension if EPATCH_FORCE=yes ... used by vim for example ... 255 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
141 if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] 256
257 elif [[ -f ${EPATCH_SOURCE}/$1 ]] ; then
258 # Re-use EPATCH_SOURCE as a search dir
259 epatch "${EPATCH_SOURCE}/$1"
260 return $?
261
262 else
263 # sanity check ... if it isn't a dir or file, wtf man ?
264 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
265 echo
266 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
267 eerror
268 eerror " ${EPATCH_SOURCE}"
269 eerror " ( ${EPATCH_SOURCE##*/} )"
270 echo
271 die "Cannot find \$EPATCH_SOURCE!"
272 fi
273
274 local PIPE_CMD
275 case ${EPATCH_SUFFIX##*\.} in
276 xz) PIPE_CMD="xz -dc" ;;
277 lzma) PIPE_CMD="lzma -dc" ;;
278 bz2) PIPE_CMD="bzip2 -dc" ;;
279 gz|Z|z) PIPE_CMD="gzip -dc" ;;
280 ZIP|zip) PIPE_CMD="unzip -p" ;;
281 *) ;;
282 esac
283
284 [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
285
286 local x
287 for x in "$@" ; do
288 # If the patch dir given contains subdirs, or our EPATCH_SUFFIX
289 # didn't match anything, ignore continue on
290 [[ ! -f ${x} ]] && continue
291
292 local patchname=${x##*/}
293
294 # Apply single patches, or forced sets of patches, or
295 # patches with ARCH dependant names.
296 # ???_arch_foo.patch
297 # Else, skip this input altogether
298 local a=${patchname#*_} # strip the ???_
299 a=${a%%_*} # strip the _foo.patch
300 if ! [[ ${SINGLE_PATCH} == "yes" || \
301 ${EPATCH_FORCE} == "yes" || \
302 ${a} == all || \
303 ${a} == ${ARCH} ]]
142 then 304 then
143 local EPATCH_SOURCE="$1/*" 305 continue
306 fi
307
308 # Let people filter things dynamically
309 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
310 # let people use globs in the exclude
311 eshopts_push -o noglob
312
313 local ex
314 for ex in ${EPATCH_EXCLUDE} ; do
315 if [[ ${patchname} == ${ex} ]] ; then
316 eshopts_pop
317 continue 2
318 fi
319 done
320
321 eshopts_pop
322 fi
323
324 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
325 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
326 einfo "${EPATCH_SINGLE_MSG}"
327 else
328 einfo "Applying ${patchname} ..."
329 fi
144 else 330 else
145 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 331 einfo " ${patchname} ..."
146 fi 332 fi
147 else 333
148 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ] 334 # most of the time, there will only be one run per unique name,
149 then 335 # but if there are more, make sure we get unique log filenames
150 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 336 local STDERR_TARGET="${T}/${patchname}.out"
151 then 337 if [[ -e ${STDERR_TARGET} ]] ; then
152 EPATCH_SOURCE="$1" 338 STDERR_TARGET="${T}/${patchname}-$$.out"
339 fi
340
341 printf "***** %s *****\nPWD: %s\n\n" "${patchname}" "${PWD}" > "${STDERR_TARGET}"
342
343 # Decompress the patch if need be
344 local count=0
345 local PATCH_TARGET
346 if [[ -n ${PIPE_CMD} ]] ; then
347 PATCH_TARGET="${T}/$$.patch"
348 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
349
350 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
351 echo
352 eerror "Could not extract patch!"
353 #die "Could not extract patch!"
354 count=5
355 break
153 fi 356 fi
357 else
358 PATCH_TARGET=${x}
359 fi
154 360
361 # Check for absolute paths in patches. If sandbox is disabled,
362 # people could (accidently) patch files in the root filesystem.
363 # Or trigger other unpleasantries #237667. So disallow -p0 on
364 # such patches.
365 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
366 if [[ -n ${abs_paths} ]] ; then
367 count=1
368 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
369 fi
370 # Similar reason, but with relative paths.
371 local rel_paths=$(egrep -n '^[-+]{3} [^ ]*[.][.]/' "${PATCH_TARGET}")
372 if [[ -n ${rel_paths} ]] ; then
373 eqawarn "QA Notice: Your patch uses relative paths '../'."
374 eqawarn " In the future this will cause a failure."
375 eqawarn "${rel_paths}"
376 fi
377
378 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
379 while [[ ${count} -lt 5 ]] ; do
380 # Generate some useful debug info ...
381 (
382 _epatch_draw_line "***** ${patchname} *****"
155 echo 383 echo
156 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 384 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
385 echo
386 _epatch_draw_line "***** ${patchname} *****"
387 patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}" 2>&1
388 ret=$?
389 echo
390 echo "patch program exited with status ${ret}"
391 exit ${ret}
392 ) >> "${STDERR_TARGET}"
393
394 if [ $? -eq 0 ] ; then
395 (
396 _epatch_draw_line "***** ${patchname} *****"
397 echo
398 echo "ACTUALLY APPLYING ${patchname} ..."
399 echo
400 _epatch_draw_line "***** ${patchname} *****"
401 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
402 ret=$?
403 echo
404 echo "patch program exited with status ${ret}"
405 exit ${ret}
406 ) >> "${STDERR_TARGET}"
407
408 if [ $? -ne 0 ] ; then
409 echo
410 eerror "A dry-run of patch command succeeded, but actually"
411 eerror "applying the patch failed!"
412 #die "Real world sux compared to the dreamworld!"
413 count=5
414 fi
415 break
416 fi
417
418 : $(( count++ ))
419 done
420
421 # if we had to decompress the patch, delete the temp one
422 if [[ -n ${PIPE_CMD} ]] ; then
423 rm -f "${PATCH_TARGET}"
424 fi
425
426 if [[ ${count} -ge 5 ]] ; then
427 echo
428 eerror "Failed Patch: ${patchname} !"
429 eerror " ( ${PATCH_TARGET} )"
157 eerror 430 eerror
158 eerror " ${EPATCH_SOURCE}" 431 eerror "Include in your bugreport the contents of:"
159 eerror " ( ${EPATCH_SOURCE##*/} )" 432 eerror
433 eerror " ${STDERR_TARGET}"
160 echo 434 echo
161 die "Cannot find \$EPATCH_SOURCE!"
162 fi
163
164 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
165 fi
166
167 case ${EPATCH_SUFFIX##*\.} in
168 bz2)
169 PIPE_CMD="bzip2 -dc"
170 PATCH_SUFFIX="bz2"
171 ;;
172 gz|Z|z)
173 PIPE_CMD="gzip -dc"
174 PATCH_SUFFIX="gz"
175 ;;
176 ZIP|zip)
177 PIPE_CMD="unzip -p"
178 PATCH_SUFFIX="zip"
179 ;;
180 *)
181 PIPE_CMD="cat"
182 PATCH_SUFFIX="patch"
183 ;;
184 esac
185
186 if [ "${SINGLE_PATCH}" = "no" ]
187 then
188 einfo "${EPATCH_MULTI_MSG}"
189 fi
190 for x in ${EPATCH_SOURCE}
191 do
192 # New ARCH dependant patch naming scheme ...
193 #
194 # ???_arch_foo.patch
195 #
196 if [ -f ${x} ] && \
197 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
198 [ "${EPATCH_FORCE}" = "yes" ])
199 then
200 local count=0
201 local popts="${EPATCH_OPTS}"
202 local patchname=${x##*/}
203
204 if [ -n "${EPATCH_EXCLUDE}" ]
205 then
206 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
207 then
208 continue
209 fi
210 fi
211
212 if [ "${SINGLE_PATCH}" = "yes" ]
213 then
214 if [ -n "${EPATCH_SINGLE_MSG}" ]
215 then
216 einfo "${EPATCH_SINGLE_MSG}"
217 else
218 einfo "Applying ${patchname} ..."
219 fi
220 else
221 einfo " ${patchname} ..."
222 fi
223
224 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
225 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
226
227 # Allow for prefix to differ ... im lazy, so shoot me :/
228 while [ "${count}" -lt 5 ]
229 do
230 # Generate some useful debug info ...
231 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
232 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
233
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##*/}
243 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
244
245 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
246 _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
260 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
261 then
262 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
263 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
264 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
265 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
266 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
267
268 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
269 _epatch_assert
270
271 if [ "$?" -ne 0 ]
272 then
273 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
274 echo
275 eerror "A dry-run of patch command succeeded, but actually"
276 eerror "applying the patch failed!"
277 #die "Real world sux compared to the dreamworld!"
278 count=5
279 fi
280
281 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
282
283 break
284 fi
285
286 count=$((count + 1))
287 done
288
289 if [ "${PATCH_SUFFIX}" != "patch" ]
290 then
291 rm -f ${PATCH_TARGET}
292 fi
293
294 if [ "${count}" -eq 5 ]
295 then
296 echo
297 eerror "Failed Patch: ${patchname} !"
298 eerror " ( ${PATCH_TARGET} )"
299 eerror
300 eerror "Include in your bugreport the contents of:"
301 eerror
302 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
303 echo
304 die "Failed Patch: ${patchname}!" 435 die "Failed Patch: ${patchname}!"
305 fi 436 fi
306 437
307 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 438 # if everything worked, delete the patch log
308 439 rm -f "${STDERR_TARGET}"
309 eend 0 440 eend 0
310 fi
311 done 441 done
312 if [ "${SINGLE_PATCH}" = "no" ] 442
313 then 443 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
314 einfo "Done with patching" 444 : # everything worked
445}
446
447# @FUNCTION: epatch_user
448# @USAGE:
449# @DESCRIPTION:
450# Applies user-provided patches to the source tree. The patches are
451# taken from /etc/portage/patches/<CATEGORY>/<PF|P|PN>/, where the first
452# of these three directories to exist will be the one to use, ignoring
453# any more general directories which might exist as well.
454#
455# User patches are intended for quick testing of patches without ebuild
456# modifications, as well as for permanent customizations a user might
457# desire. Obviously, there can be no official support for arbitrarily
458# patched ebuilds. So whenever a build log in a bug report mentions that
459# user patches were applied, the user should be asked to reproduce the
460# problem without these.
461#
462# Not all ebuilds do call this function, so placing patches in the
463# stated directory might or might not work, depending on the package and
464# the eclasses it inherits and uses. It is safe to call the function
465# repeatedly, so it is always possible to add a call at the ebuild
466# level. The first call is the time when the patches will be
467# applied.
468#
469# Ideally, this function should be called after gentoo-specific patches
470# have been applied, so that their code can be modified as well, but
471# before calls to e.g. eautoreconf, as the user patches might affect
472# autotool input files as well.
473epatch_user() {
474 [[ $# -ne 0 ]] && die "epatch_user takes no options"
475
476 # Allow multiple calls to this function; ignore all but the first
477 local applied="${T}/epatch_user.applied"
478 [[ -e ${applied} ]] && return 2
479
480 # don't clobber any EPATCH vars that the parent might want
481 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
482 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
483 EPATCH_SOURCE=${base}/${CTARGET}/${check}
484 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
485 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
486 if [[ -d ${EPATCH_SOURCE} ]] ; then
487 EPATCH_SOURCE=${EPATCH_SOURCE} \
488 EPATCH_SUFFIX="patch" \
489 EPATCH_FORCE="yes" \
490 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
491 epatch
492 echo "${EPATCH_SOURCE}" > "${applied}"
493 return 0
315 fi 494 fi
495 done
496 echo "none" > "${applied}"
497 return 1
316} 498}
317 499
318# @FUNCTION: emktemp 500# @FUNCTION: emktemp
319# @USAGE: [temp dir] 501# @USAGE: [temp dir]
320# @DESCRIPTION: 502# @DESCRIPTION:
348 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX 530 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX
349 fi 531 fi
350 fi 532 fi
351} 533}
352 534
353# @FUNCTION: egetent
354# @USAGE: <database> <key>
355# @MAINTAINER:
356# base-system@gentoo.org (Linux)
357# Joe Jezak <josejx@gmail.com> (OS X)
358# usata@gentoo.org (OS X)
359# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
360# @DESCRIPTION:
361# Small wrapper for getent (Linux), nidump (Mac OS X),
362# and pw (FreeBSD) used in enewuser()/enewgroup()
363egetent() {
364 case ${CHOST} in
365 *-darwin*)
366 case "$2" in
367 *[!0-9]*) # Non numeric
368 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
369 ;;
370 *) # Numeric
371 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
372 ;;
373 esac
374 ;;
375 *-freebsd*|*-dragonfly*)
376 local opts action="user"
377 [[ $1 == "passwd" ]] || action="group"
378
379 # lookup by uid/gid
380 if [[ $2 == [[:digit:]]* ]] ; then
381 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
382 fi
383
384 pw show ${action} ${opts} "$2" -q
385 ;;
386 *-netbsd*|*-openbsd*)
387 grep "$2:\*:" /etc/$1
388 ;;
389 *)
390 type -p nscd >& /dev/null && nscd -i "$1"
391 getent "$1" "$2"
392 ;;
393 esac
394}
395
396# @FUNCTION: enewuser
397# @USAGE: <user> [uid] [shell] [homedir] [groups] [params]
398# @DESCRIPTION:
399# Same as enewgroup, you are not required to understand how to properly add
400# a user to the system. The only required parameter is the username.
401# Default uid is (pass -1 for this) next available, default shell is
402# /bin/false, default homedir is /dev/null, there are no default groups,
403# and default params sets the comment as 'added by portage for ${PN}'.
404enewuser() {
405 case ${EBUILD_PHASE} in
406 unpack|compile|test|install)
407 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
408 eerror "Package fails at QA and at life. Please file a bug."
409 die "Bad package! enewuser is only for use in pkg_* functions!"
410 esac
411
412 # get the username
413 local euser=$1; shift
414 if [[ -z ${euser} ]] ; then
415 eerror "No username specified !"
416 die "Cannot call enewuser without a username"
417 fi
418
419 # lets see if the username already exists
420 if [[ -n $(egetent passwd "${euser}") ]] ; then
421 return 0
422 fi
423 einfo "Adding user '${euser}' to your system ..."
424
425 # options to pass to useradd
426 local opts=
427
428 # handle uid
429 local euid=$1; shift
430 if [[ -n ${euid} && ${euid} != -1 ]] ; then
431 if [[ ${euid} -gt 0 ]] ; then
432 if [[ -n $(egetent passwd ${euid}) ]] ; then
433 euid="next"
434 fi
435 else
436 eerror "Userid given but is not greater than 0 !"
437 die "${euid} is not a valid UID"
438 fi
439 else
440 euid="next"
441 fi
442 if [[ ${euid} == "next" ]] ; then
443 for ((euid = 101; euid <= 999; euid++)); do
444 [[ -z $(egetent passwd ${euid}) ]] && break
445 done
446 fi
447 opts="${opts} -u ${euid}"
448 einfo " - Userid: ${euid}"
449
450 # handle shell
451 local eshell=$1; shift
452 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
453 if [[ ! -e ${ROOT}${eshell} ]] ; then
454 eerror "A shell was specified but it does not exist !"
455 die "${eshell} does not exist in ${ROOT}"
456 fi
457 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
458 eerror "Do not specify ${eshell} yourself, use -1"
459 die "Pass '-1' as the shell parameter"
460 fi
461 else
462 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
463 [[ -x ${ROOT}${shell} ]] && break
464 done
465
466 if [[ ${shell} == "/dev/null" ]] ; then
467 eerror "Unable to identify the shell to use, proceeding with userland default."
468 case ${USERLAND} in
469 GNU) shell="/bin/false" ;;
470 BSD) shell="/sbin/nologin" ;;
471 Darwin) shell="/usr/sbin/nologin" ;;
472 *) die "Unable to identify the default shell for userland ${USERLAND}"
473 esac
474 fi
475
476 eshell=${shell}
477 fi
478 einfo " - Shell: ${eshell}"
479 opts="${opts} -s ${eshell}"
480
481 # handle homedir
482 local ehome=$1; shift
483 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
484 ehome="/dev/null"
485 fi
486 einfo " - Home: ${ehome}"
487 opts="${opts} -d ${ehome}"
488
489 # handle groups
490 local egroups=$1; shift
491 if [[ ! -z ${egroups} ]] ; then
492 local oldifs=${IFS}
493 local defgroup="" exgroups=""
494
495 export IFS=","
496 for g in ${egroups} ; do
497 export IFS=${oldifs}
498 if [[ -z $(egetent group "${g}") ]] ; then
499 eerror "You must add group ${g} to the system first"
500 die "${g} is not a valid GID"
501 fi
502 if [[ -z ${defgroup} ]] ; then
503 defgroup=${g}
504 else
505 exgroups="${exgroups},${g}"
506 fi
507 export IFS=","
508 done
509 export IFS=${oldifs}
510
511 opts="${opts} -g ${defgroup}"
512 if [[ ! -z ${exgroups} ]] ; then
513 opts="${opts} -G ${exgroups:1}"
514 fi
515 else
516 egroups="(none)"
517 fi
518 einfo " - Groups: ${egroups}"
519
520 # handle extra and add the user
521 local oldsandbox=${SANDBOX_ON}
522 export SANDBOX_ON="0"
523 case ${CHOST} in
524 *-darwin*)
525 ### Make the user
526 if [[ -z $@ ]] ; then
527 dscl . create /users/${euser} uid ${euid}
528 dscl . create /users/${euser} shell ${eshell}
529 dscl . create /users/${euser} home ${ehome}
530 dscl . create /users/${euser} realname "added by portage for ${PN}"
531 ### Add the user to the groups specified
532 local oldifs=${IFS}
533 export IFS=","
534 for g in ${egroups} ; do
535 dscl . merge /groups/${g} users ${euser}
536 done
537 export IFS=${oldifs}
538 else
539 einfo "Extra options are not supported on Darwin yet"
540 einfo "Please report the ebuild along with the info below"
541 einfo "eextra: $@"
542 die "Required function missing"
543 fi
544 ;;
545 *-freebsd*|*-dragonfly*)
546 if [[ -z $@ ]] ; then
547 pw useradd ${euser} ${opts} \
548 -c "added by portage for ${PN}" \
549 die "enewuser failed"
550 else
551 einfo " - Extra: $@"
552 pw useradd ${euser} ${opts} \
553 "$@" || die "enewuser failed"
554 fi
555 ;;
556
557 *-netbsd*)
558 if [[ -z $@ ]] ; then
559 useradd ${opts} ${euser} || die "enewuser failed"
560 else
561 einfo " - Extra: $@"
562 useradd ${opts} ${euser} "$@" || die "enewuser failed"
563 fi
564 ;;
565
566 *-openbsd*)
567 if [[ -z $@ ]] ; then
568 useradd -u ${euid} -s ${eshell} \
569 -d ${ehome} -c "Added by portage for ${PN}" \
570 -g ${egroups} ${euser} || die "enewuser failed"
571 else
572 einfo " - Extra: $@"
573 useradd -u ${euid} -s ${eshell} \
574 -d ${ehome} -c "Added by portage for ${PN}" \
575 -g ${egroups} ${euser} "$@" || die "enewuser failed"
576 fi
577 ;;
578
579 *)
580 if [[ -z $@ ]] ; then
581 useradd ${opts} ${euser} \
582 -c "added by portage for ${PN}" \
583 || die "enewuser failed"
584 else
585 einfo " - Extra: $@"
586 useradd ${opts} ${euser} "$@" \
587 || die "enewuser failed"
588 fi
589 ;;
590 esac
591
592 if [[ ! -e ${ROOT}/${ehome} ]] ; then
593 einfo " - Creating ${ehome} in ${ROOT}"
594 mkdir -p "${ROOT}/${ehome}"
595 chown ${euser} "${ROOT}/${ehome}"
596 chmod 755 "${ROOT}/${ehome}"
597 fi
598
599 export SANDBOX_ON=${oldsandbox}
600}
601
602# @FUNCTION: enewgroup
603# @USAGE: <group> [gid]
604# @DESCRIPTION:
605# This function does not require you to understand how to properly add a
606# group to the system. Just give it a group name to add and enewgroup will
607# do the rest. You may specify the gid for the group or allow the group to
608# allocate the next available one.
609enewgroup() {
610 case ${EBUILD_PHASE} in
611 unpack|compile|test|install)
612 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
613 eerror "Package fails at QA and at life. Please file a bug."
614 die "Bad package! enewgroup is only for use in pkg_* functions!"
615 esac
616
617 # get the group
618 local egroup="$1"; shift
619 if [ -z "${egroup}" ]
620 then
621 eerror "No group specified !"
622 die "Cannot call enewgroup without a group"
623 fi
624
625 # see if group already exists
626 if [[ -n $(egetent group "${egroup}") ]]; then
627 return 0
628 fi
629 einfo "Adding group '${egroup}' to your system ..."
630
631 # options to pass to useradd
632 local opts=
633
634 # handle gid
635 local egid="$1"; shift
636 if [ ! -z "${egid}" ]
637 then
638 if [ "${egid}" -gt 0 ]
639 then
640 if [ -z "`egetent group ${egid}`" ]
641 then
642 if [[ "${CHOST}" == *-darwin* ]]; then
643 opts="${opts} ${egid}"
644 else
645 opts="${opts} -g ${egid}"
646 fi
647 else
648 egid="next available; requested gid taken"
649 fi
650 else
651 eerror "Groupid given but is not greater than 0 !"
652 die "${egid} is not a valid GID"
653 fi
654 else
655 egid="next available"
656 fi
657 einfo " - Groupid: ${egid}"
658
659 # handle extra
660 local eextra="$@"
661 opts="${opts} ${eextra}"
662
663 # add the group
664 local oldsandbox="${SANDBOX_ON}"
665 export SANDBOX_ON="0"
666 case ${CHOST} in
667 *-darwin*)
668 if [ ! -z "${eextra}" ];
669 then
670 einfo "Extra options are not supported on Darwin/OS X yet"
671 einfo "Please report the ebuild along with the info below"
672 einfo "eextra: ${eextra}"
673 die "Required function missing"
674 fi
675
676 # If we need the next available
677 case ${egid} in
678 *[!0-9]*) # Non numeric
679 for ((egid = 101; egid <= 999; egid++)); do
680 [[ -z $(egetent group ${egid}) ]] && break
681 done
682 esac
683 dscl . create /groups/${egroup} gid ${egid}
684 dscl . create /groups/${egroup} passwd '*'
685 ;;
686
687 *-freebsd*|*-dragonfly*)
688 case ${egid} in
689 *[!0-9]*) # Non numeric
690 for ((egid = 101; egid <= 999; egid++)); do
691 [[ -z $(egetent group ${egid}) ]] && break
692 done
693 esac
694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
695 ;;
696
697 *-netbsd*)
698 case ${egid} in
699 *[!0-9]*) # Non numeric
700 for ((egid = 101; egid <= 999; egid++)); do
701 [[ -z $(egetent group ${egid}) ]] && break
702 done
703 esac
704 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
705 ;;
706
707 *)
708 groupadd ${opts} ${egroup} || die "enewgroup failed"
709 ;;
710 esac
711 export SANDBOX_ON="${oldsandbox}"
712}
713
714# @FUNCTION: edos2unix 535# @FUNCTION: edos2unix
715# @USAGE: <file> [more files ...] 536# @USAGE: <file> [more files ...]
716# @DESCRIPTION: 537# @DESCRIPTION:
717# A handy replacement for dos2unix, recode, fixdos, etc... This allows you 538# A handy replacement for dos2unix, recode, fixdos, etc... This allows you
718# to remove all of these text utilities from DEPEND variables because this 539# to remove all of these text utilities from DEPEND variables because this
719# is a script based solution. Just give it a list of files to convert and 540# is a script based solution. Just give it a list of files to convert and
720# they will all be changed from the DOS CRLF format to the UNIX LF format. 541# they will all be changed from the DOS CRLF format to the UNIX LF format.
721edos2unix() { 542edos2unix() {
722 echo "$@" | xargs sed -i 's/\r$//' 543 [[ $# -eq 0 ]] && return 0
544 sed -i 's/\r$//' -- "$@" || die
723} 545}
724 546
725# Make a desktop file ! 547# Make a desktop file !
726# Great for making those icons in kde/gnome startmenu ! 548# Great for making those icons in kde/gnome startmenu !
727# Amaze your friends ! Get the women ! Join today ! 549# Amaze your friends ! Get the women ! Join today !
728# 550#
729# make_desktop_entry(<command>, [name], [icon], [type], [path]) 551# make_desktop_entry(<command>, [name], [icon], [type], [fields])
730# 552#
731# binary: what command does the app run with ? 553# binary: what command does the app run with ?
732# name: the name that will show up in the menu 554# name: the name that will show up in the menu
733# icon: give your little like a pretty little icon ... 555# icon: give your little like a pretty little icon ...
734# this can be relative (to /usr/share/pixmaps) or 556# this can be relative (to /usr/share/pixmaps) or
735# a full path to an icon 557# a full path to an icon
736# type: what kind of application is this ? for categories: 558# type: what kind of application is this ? for categories:
737# http://standards.freedesktop.org/menu-spec/latest/apa.html 559# http://standards.freedesktop.org/menu-spec/latest/apa.html
738# path: if your app needs to startup in a specific dir 560# fields: extra fields to append to the desktop file; a printf string
739make_desktop_entry() { 561make_desktop_entry() {
740 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 562 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
741 563
742 local exec=${1} 564 local exec=${1}
743 local name=${2:-${PN}} 565 local name=${2:-${PN}}
744 local icon=${3:-${PN}.png} 566 local icon=${3:-${PN}}
745 local type=${4} 567 local type=${4}
746 local path=${5} 568 local fields=${5}
747 569
748 if [[ -z ${type} ]] ; then 570 if [[ -z ${type} ]] ; then
749 local catmaj=${CATEGORY%%-*} 571 local catmaj=${CATEGORY%%-*}
750 local catmin=${CATEGORY##*-} 572 local catmin=${CATEGORY##*-}
751 case ${catmaj} in 573 case ${catmaj} in
752 app) 574 app)
753 case ${catmin} in 575 case ${catmin} in
754 accessibility) type=Accessibility;; 576 accessibility) type=Accessibility;;
755 admin) type=System;; 577 admin) type=System;;
756 antivirus) type=System;; 578 antivirus) type=System;;
757 arch) type=Archiving;; 579 arch) type=Archiving;;
758 backup) type=Archiving;; 580 backup) type=Archiving;;
759 cdr) type=DiscBurning;; 581 cdr) type=DiscBurning;;
760 dicts) type=Dictionary;; 582 dicts) type=Dictionary;;
761 doc) type=Documentation;; 583 doc) type=Documentation;;
762 editors) type=TextEditor;; 584 editors) type=TextEditor;;
763 emacs) type=TextEditor;; 585 emacs) type=TextEditor;;
764 emulation) type=Emulator;; 586 emulation) type=Emulator;;
765 laptop) type=HardwareSettings;; 587 laptop) type=HardwareSettings;;
766 office) type=Office;; 588 office) type=Office;;
767 pda) type=PDA;; 589 pda) type=PDA;;
768 vim) type=TextEditor;; 590 vim) type=TextEditor;;
769 xemacs) type=TextEditor;; 591 xemacs) type=TextEditor;;
770 *) type=;;
771 esac 592 esac
772 ;; 593 ;;
773 594
774 dev) 595 dev)
775 type="Development" 596 type="Development"
776 ;; 597 ;;
777 598
778 games) 599 games)
779 case ${catmin} in 600 case ${catmin} in
780 action|fps) type=ActionGame;; 601 action|fps) type=ActionGame;;
781 arcade) type=ArcadeGame;; 602 arcade) type=ArcadeGame;;
782 board) type=BoardGame;; 603 board) type=BoardGame;;
783 emulation) type=Emulator;; 604 emulation) type=Emulator;;
784 kids) type=KidsGame;; 605 kids) type=KidsGame;;
785 puzzle) type=LogicGame;; 606 puzzle) type=LogicGame;;
786 roguelike) type=RolePlaying;; 607 roguelike) type=RolePlaying;;
787 rpg) type=RolePlaying;; 608 rpg) type=RolePlaying;;
788 simulation) type=Simulation;; 609 simulation) type=Simulation;;
789 sports) type=SportsGame;; 610 sports) type=SportsGame;;
790 strategy) type=StrategyGame;; 611 strategy) type=StrategyGame;;
791 *) type=;;
792 esac 612 esac
793 type="Game;${type}" 613 type="Game;${type}"
794 ;; 614 ;;
795 615
796 gnome) 616 gnome)
805 type="Network;Email" 625 type="Network;Email"
806 ;; 626 ;;
807 627
808 media) 628 media)
809 case ${catmin} in 629 case ${catmin} in
630 gfx)
810 gfx) type=Graphics;; 631 type=Graphics
632 ;;
633 *)
634 case ${catmin} in
811 radio) type=Tuner;; 635 radio) type=Tuner;;
812 sound) type=Audio;; 636 sound) type=Audio;;
813 tv) type=TV;; 637 tv) type=TV;;
814 video) type=Video;; 638 video) type=Video;;
815 *) type=;; 639 esac
640 type="AudioVideo;${type}"
641 ;;
816 esac 642 esac
817 type="AudioVideo;${type}"
818 ;; 643 ;;
819 644
820 net) 645 net)
821 case ${catmin} in 646 case ${catmin} in
822 dialup) type=Dialup;; 647 dialup) type=Dialup;;
823 ftp) type=FileTransfer;; 648 ftp) type=FileTransfer;;
824 im) type=InstantMessaging;; 649 im) type=InstantMessaging;;
825 irc) type=IRCClient;; 650 irc) type=IRCClient;;
826 mail) type=Email;; 651 mail) type=Email;;
827 news) type=News;; 652 news) type=News;;
828 nntp) type=News;; 653 nntp) type=News;;
829 p2p) type=FileTransfer;; 654 p2p) type=FileTransfer;;
830 *) type=;; 655 voip) type=Telephony;;
831 esac 656 esac
832 type="Network;${type}" 657 type="Network;${type}"
833 ;; 658 ;;
834 659
835 sci) 660 sci)
836 case ${catmin} in 661 case ${catmin} in
837 astro*) type=Astronomy;; 662 astro*) type=Astronomy;;
838 bio*) type=Biology;; 663 bio*) type=Biology;;
839 calc*) type=Calculator;; 664 calc*) type=Calculator;;
840 chem*) type=Chemistry;; 665 chem*) type=Chemistry;;
841 elec*) type=Electronics;; 666 elec*) type=Electronics;;
842 geo*) type=Geology;; 667 geo*) type=Geology;;
843 math*) type=Math;; 668 math*) type=Math;;
844 physics) type=Physics;; 669 physics) type=Physics;;
845 visual*) type=DataVisualization;; 670 visual*) type=DataVisualization;;
846 *) type=;;
847 esac 671 esac
848 type="Science;${type}" 672 type="Education;Science;${type}"
849 ;; 673 ;;
850 674
851 sys) 675 sys)
852 type="System" 676 type="System"
853 ;; 677 ;;
854 678
855 www) 679 www)
856 case ${catmin} in 680 case ${catmin} in
857 client) type=WebBrowser;; 681 client) type=WebBrowser;;
858 *) type=;;
859 esac 682 esac
860 type="Network" 683 type="Network;${type}"
861 ;; 684 ;;
862 685
863 *) 686 *)
864 type= 687 type=
865 ;; 688 ;;
871 local desktop_name="${PN}-${SLOT}" 694 local desktop_name="${PN}-${SLOT}"
872 fi 695 fi
873 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 696 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
874 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 697 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
875 698
699 # Don't append another ";" when a valid category value is provided.
700 type=${type%;}${type:+;}
701
702 eshopts_push -s extglob
703 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
704 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
705 ewarn "allowed in .desktop files if the value is not an absolute path."
706 icon=${icon%.@(xpm|png|svg)}
707 fi
708 eshopts_pop
709
876 cat <<-EOF > "${desktop}" 710 cat <<-EOF > "${desktop}"
877 [Desktop Entry] 711 [Desktop Entry]
878 Encoding=UTF-8
879 Version=1.0
880 Name=${name} 712 Name=${name}
881 Type=Application 713 Type=Application
882 Comment=${DESCRIPTION} 714 Comment=${DESCRIPTION}
883 Exec=${exec} 715 Exec=${exec}
884 TryExec=${exec%% *} 716 TryExec=${exec%% *}
885 Path=${path}
886 Icon=${icon} 717 Icon=${icon}
887 Categories=${type}; 718 Categories=${type}
888 EOF 719 EOF
720
721 if [[ ${fields:-=} != *=* ]] ; then
722 # 5th arg used to be value to Path=
723 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
724 fields="Path=${fields}"
725 fi
726 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
889 727
890 ( 728 (
891 # wrap the env here so that the 'insinto' call 729 # wrap the env here so that the 'insinto' call
892 # doesn't corrupt the env of the caller 730 # doesn't corrupt the env of the caller
893 insinto /usr/share/applications 731 insinto /usr/share/applications
894 doins "${desktop}" 732 doins "${desktop}"
895 ) 733 ) || die "installing desktop file failed"
896} 734}
897 735
898# @FUNCTION: validate_desktop_entries 736# @FUNCTION: validate_desktop_entries
899# @USAGE: [directories] 737# @USAGE: [directories]
900# @MAINTAINER: 738# @MAINTAINER:
922 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo." 760 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
923 fi 761 fi
924} 762}
925 763
926# @FUNCTION: make_session_desktop 764# @FUNCTION: make_session_desktop
927# @USAGE: <title> <command> 765# @USAGE: <title> <command> [command args...]
928# @DESCRIPTION: 766# @DESCRIPTION:
929# Make a GDM/KDM Session file. The title is the file to execute to start the 767# Make a GDM/KDM Session file. The title is the file to execute to start the
930# Window Manager. The command is the name of the Window Manager. 768# Window Manager. The command is the name of the Window Manager.
769#
770# You can set the name of the file via the ${wm} variable.
931make_session_desktop() { 771make_session_desktop() {
932 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 772 [[ -z $1 ]] && eerror "$0: You must specify the title" && return 1
933 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1 773 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
934 774
935 local title=$1 775 local title=$1
936 local command=$2 776 local command=$2
937 local desktop=${T}/${wm}.desktop 777 local desktop=${T}/${wm:-${PN}}.desktop
778 shift 2
938 779
939 cat <<-EOF > "${desktop}" 780 cat <<-EOF > "${desktop}"
940 [Desktop Entry] 781 [Desktop Entry]
941 Encoding=UTF-8
942 Name=${title} 782 Name=${title}
943 Comment=This session logs you into ${title} 783 Comment=This session logs you into ${title}
944 Exec=${command} 784 Exec=${command} $*
945 TryExec=${command} 785 TryExec=${command}
946 Type=Application 786 Type=XSession
947 EOF 787 EOF
948 788
949 ( 789 (
950 # wrap the env here so that the 'insinto' call 790 # wrap the env here so that the 'insinto' call
951 # doesn't corrupt the env of the caller 791 # doesn't corrupt the env of the caller
972 elif [[ -d ${i} ]] ; then 812 elif [[ -d ${i} ]] ; then
973 for j in "${i}"/*.desktop ; do 813 for j in "${i}"/*.desktop ; do
974 doins "${j}" 814 doins "${j}"
975 ((ret+=$?)) 815 ((ret+=$?))
976 done 816 done
817 else
818 ((++ret))
977 fi 819 fi
978 done 820 done
979 exit ${ret} 821 exit ${ret}
980 ) 822 )
981} 823}
1011 elif [[ -d ${i} ]] ; then 853 elif [[ -d ${i} ]] ; then
1012 for j in "${i}"/*.png ; do 854 for j in "${i}"/*.png ; do
1013 doins "${j}" 855 doins "${j}"
1014 ((ret+=$?)) 856 ((ret+=$?))
1015 done 857 done
858 else
859 ((++ret))
1016 fi 860 fi
1017 done 861 done
1018 exit ${ret} 862 exit ${ret}
1019 ) 863 )
1020} 864}
1055# @DESCRIPTION: 899# @DESCRIPTION:
1056# Unpack those pesky pdv generated files ... 900# Unpack those pesky pdv generated files ...
1057# They're self-unpacking programs with the binary package stuffed in 901# They're self-unpacking programs with the binary package stuffed in
1058# the middle of the archive. Valve seems to use it a lot ... too bad 902# the middle of the archive. Valve seems to use it a lot ... too bad
1059# it seems to like to segfault a lot :(. So lets take it apart ourselves. 903# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1060# 904#
1061# You have to specify the off_t size ... I have no idea how to extract that 905# You have to specify the off_t size ... I have no idea how to extract that
1062# information out of the binary executable myself. Basically you pass in 906# information out of the binary executable myself. Basically you pass in
1063# the size of the off_t type (in bytes) on the machine that built the pdv 907# the size of the off_t type (in bytes) on the machine that built the pdv
1064# archive. 908# archive.
1065# 909#
1066# One way to determine this is by running the following commands: 910# One way to determine this is by running the following commands:
911#
912# @CODE
1067# strings <pdv archive> | grep lseek 913# strings <pdv archive> | grep lseek
1068# strace -elseek <pdv archive> 914# strace -elseek <pdv archive>
915# @CODE
916#
1069# Basically look for the first lseek command (we do the strings/grep because 917# Basically look for the first lseek command (we do the strings/grep because
1070# sometimes the function call is _llseek or something) and steal the 2nd 918# sometimes the function call is _llseek or something) and steal the 2nd
1071# parameter. Here is an example: 919# parameter. Here is an example:
920#
921# @CODE
1072# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 922# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1073# lseek 923# lseek
1074# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 924# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1075# lseek(3, -4, SEEK_END) = 2981250 925# lseek(3, -4, SEEK_END) = 2981250
926# @CODE
927#
1076# Thus we would pass in the value of '4' as the second parameter. 928# Thus we would pass in the value of '4' as the second parameter.
1077unpack_pdv() { 929unpack_pdv() {
1078 local src=$(find_unpackable_file "$1") 930 local src=$(find_unpackable_file "$1")
1079 local sizeoff_t=$2 931 local sizeoff_t=$2
1080 932
1150# @DESCRIPTION: 1002# @DESCRIPTION:
1151# Unpack those pesky makeself generated files ... 1003# Unpack those pesky makeself generated files ...
1152# They're shell scripts with the binary package tagged onto 1004# They're shell scripts with the binary package tagged onto
1153# the end of the archive. Loki utilized the format as does 1005# the end of the archive. Loki utilized the format as does
1154# many other game companies. 1006# many other game companies.
1155# 1007#
1156# If the file is not specified, then ${A} is used. If the 1008# If the file is not specified, then ${A} is used. If the
1157# offset is not specified then we will attempt to extract 1009# offset is not specified then we will attempt to extract
1158# the proper offset from the script itself. 1010# the proper offset from the script itself.
1159unpack_makeself() { 1011unpack_makeself() {
1160 local src_input=${1:-${A}} 1012 local src_input=${1:-${A}}
1165 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1017 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1166 1018
1167 local shrtsrc=$(basename "${src}") 1019 local shrtsrc=$(basename "${src}")
1168 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1020 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1169 if [[ -z ${skip} ]] ; then 1021 if [[ -z ${skip} ]] ; then
1170 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1022 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1171 local skip=0 1023 local skip=0
1172 exe=tail 1024 exe=tail
1173 case ${ver} in 1025 case ${ver} in
1174 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1026 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1175 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1027 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1177 2.0|2.0.1) 1029 2.0|2.0.1)
1178 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1030 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1179 ;; 1031 ;;
1180 2.1.1) 1032 2.1.1)
1181 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1033 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1182 let skip="skip + 1" 1034 (( skip++ ))
1183 ;; 1035 ;;
1184 2.1.2) 1036 2.1.2)
1185 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1037 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1186 let skip="skip + 1" 1038 (( skip++ ))
1187 ;; 1039 ;;
1188 2.1.3) 1040 2.1.3)
1189 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1041 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1190 let skip="skip + 1" 1042 (( skip++ ))
1191 ;; 1043 ;;
1192 2.1.4|2.1.5) 1044 2.1.4|2.1.5)
1193 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1045 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1194 skip=$(head -n ${skip} "${src}" | wc -c) 1046 skip=$(head -n ${skip} "${src}" | wc -c)
1195 exe="dd" 1047 exe="dd"
1204 esac 1056 esac
1205 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1057 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1206 fi 1058 fi
1207 case ${exe} in 1059 case ${exe} in
1208 tail) exe="tail -n +${skip} '${src}'";; 1060 tail) exe="tail -n +${skip} '${src}'";;
1209 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1061 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1210 *) die "makeself cant handle exe '${exe}'" 1062 *) die "makeself cant handle exe '${exe}'"
1211 esac 1063 esac
1212 1064
1213 # lets grab the first few bytes of the file to figure out what kind of archive it is 1065 # lets grab the first few bytes of the file to figure out what kind of archive it is
1214 local tmpfile=$(emktemp) 1066 local filetype tmpfile=$(emktemp)
1215 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1067 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1216 local filetype=$(file -b "${tmpfile}") 1068 filetype=$(file -b "${tmpfile}") || die
1217 case ${filetype} in 1069 case ${filetype} in
1218 *tar\ archive*) 1070 *tar\ archive*)
1219 eval ${exe} | tar --no-same-owner -xf - 1071 eval ${exe} | tar --no-same-owner -xf -
1220 ;; 1072 ;;
1221 bzip2*) 1073 bzip2*)
1251 lic="${PWD}/${lic}" 1103 lic="${PWD}/${lic}"
1252 elif [ -e "${lic}" ] ; then 1104 elif [ -e "${lic}" ] ; then
1253 lic="${lic}" 1105 lic="${lic}"
1254 fi 1106 fi
1255 fi 1107 fi
1256 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1257 local l="`basename ${lic}`" 1108 local l="`basename ${lic}`"
1258 1109
1259 # here is where we check for the licenses the user already 1110 # here is where we check for the licenses the user already
1260 # accepted ... if we don't find a match, we make the user accept 1111 # accepted ... if we don't find a match, we make the user accept
1261 local shopts=$-
1262 local alic 1112 local alic
1263 set -o noglob #so that bash doesn't expand "*" 1113 eshopts_push -o noglob # so that bash doesn't expand "*"
1264 for alic in ${ACCEPT_LICENSE} ; do 1114 for alic in ${ACCEPT_LICENSE} ; do
1265 if [[ ${alic} == ${l} ]]; then 1115 if [[ ${alic} == ${l} ]]; then
1266 set +o noglob; set -${shopts} #reset old shell opts 1116 eshopts_pop
1267 return 0 1117 return 0
1268 fi 1118 fi
1269 done 1119 done
1270 set +o noglob; set -$shopts #reset old shell opts 1120 eshopts_pop
1121 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1271 1122
1272 local licmsg=$(emktemp) 1123 local licmsg=$(emktemp)
1273 cat <<-EOF > ${licmsg} 1124 cat <<-EOF > ${licmsg}
1274 ********************************************************** 1125 **********************************************************
1275 The following license outlines the terms of use of this 1126 The following license outlines the terms of use of this
1276 package. You MUST accept this license for installation to 1127 package. You MUST accept this license for installation to
1277 continue. When you are done viewing, hit 'q'. If you 1128 continue. When you are done viewing, hit 'q'. If you
1278 CTRL+C out of this, the install will not run! 1129 CTRL+C out of this, the install will not run!
1279 ********************************************************** 1130 **********************************************************
1280 1131
1281 EOF 1132 EOF
1282 cat ${lic} >> ${licmsg} 1133 cat ${lic} >> ${licmsg}
1283 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1134 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1284 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1135 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1285 read alic 1136 read alic
1298# @FUNCTION: cdrom_get_cds 1149# @FUNCTION: cdrom_get_cds
1299# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...] 1150# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...]
1300# @DESCRIPTION: 1151# @DESCRIPTION:
1301# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates 1152# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates
1302# the whole 'non-interactive' policy, but damnit I want CD support ! 1153# the whole 'non-interactive' policy, but damnit I want CD support !
1303# 1154#
1304# With these cdrom functions we handle all the user interaction and 1155# With these cdrom functions we handle all the user interaction and
1305# standardize everything. All you have to do is call cdrom_get_cds() 1156# standardize everything. All you have to do is call cdrom_get_cds()
1306# and when the function returns, you can assume that the cd has been 1157# and when the function returns, you can assume that the cd has been
1307# found at CDROM_ROOT. 1158# found at CDROM_ROOT.
1308# 1159#
1309# The function will attempt to locate a cd based upon a file that is on 1160# The function will attempt to locate a cd based upon a file that is on
1310# the cd. The more files you give this function, the more cds 1161# the cd. The more files you give this function, the more cds
1311# the cdrom functions will handle. 1162# the cdrom functions will handle.
1312# 1163#
1313# Normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1164# Normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1314# etc... If you want to give the cds better names, then just export 1165# etc... If you want to give the cds better names, then just export
1315# the appropriate CDROM_NAME variable before calling cdrom_get_cds(). 1166# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1316# Use CDROM_NAME for one cd, or CDROM_NAME_# for multiple cds. You can 1167# Use CDROM_NAME for one cd, or CDROM_NAME_# for multiple cds. You can
1317# also use the CDROM_NAME_SET bash array. 1168# also use the CDROM_NAME_SET bash array.
1318# 1169#
1319# For those multi cd ebuilds, see the cdrom_load_next_cd() function. 1170# For those multi cd ebuilds, see the cdrom_load_next_cd() function.
1320cdrom_get_cds() { 1171cdrom_get_cds() {
1321 # first we figure out how many cds we're dealing with by 1172 # first we figure out how many cds we're dealing with by
1322 # the # of files they gave us 1173 # the # of files they gave us
1323 local cdcnt=0 1174 local cdcnt=0
1348 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1199 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1349 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1200 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1350 export CDROM_SET=-1 1201 export CDROM_SET=-1
1351 for f in ${CDROM_CHECK_1//:/ } ; do 1202 for f in ${CDROM_CHECK_1//:/ } ; do
1352 ((++CDROM_SET)) 1203 ((++CDROM_SET))
1353 [[ -e ${CD_ROOT}/${f} ]] && break 1204 [[ -e ${CDROM_ROOT}/${f} ]] && break
1354 done 1205 done
1355 export CDROM_MATCH=${f} 1206 export CDROM_MATCH=${f}
1356 return 1207 return
1357 fi 1208 fi
1358 1209
1444# displayed and we'll hang out here until: 1295# displayed and we'll hang out here until:
1445# (1) the file is found on a mounted cdrom 1296# (1) the file is found on a mounted cdrom
1446# (2) the user hits CTRL+C 1297# (2) the user hits CTRL+C
1447_cdrom_locate_file_on_cd() { 1298_cdrom_locate_file_on_cd() {
1448 local mline="" 1299 local mline=""
1449 local showedmsg=0 1300 local showedmsg=0 showjolietmsg=0
1450 1301
1451 while [[ -z ${CDROM_ROOT} ]] ; do 1302 while [[ -z ${CDROM_ROOT} ]] ; do
1452 local i=0 1303 local i=0
1453 local -a cdset=(${*//:/ }) 1304 local -a cdset=(${*//:/ })
1454 if [[ -n ${CDROM_SET} ]] ; then 1305 if [[ -n ${CDROM_SET} ]] ; then
1463 while read point node fs foo ; do 1314 while read point node fs foo ; do
1464 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \ 1315 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1465 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \ 1316 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1466 && continue 1317 && continue
1467 point=${point//\040/ } 1318 point=${point//\040/ }
1319 [[ ! -d ${point}/${dir} ]] && continue
1468 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue 1320 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1469 export CDROM_ROOT=${point} 1321 export CDROM_ROOT=${point}
1470 export CDROM_SET=${i} 1322 export CDROM_SET=${i}
1471 export CDROM_MATCH=${cdset[${i}]} 1323 export CDROM_MATCH=${cdset[${i}]}
1472 return 1324 return
1494 showedmsg=1 1346 showedmsg=1
1495 fi 1347 fi
1496 einfo "Press return to scan for the cd again" 1348 einfo "Press return to scan for the cd again"
1497 einfo "or hit CTRL+C to abort the emerge." 1349 einfo "or hit CTRL+C to abort the emerge."
1498 echo 1350 echo
1351 if [[ ${showjolietmsg} -eq 0 ]] ; then
1352 showjolietmsg=1
1353 else
1499 einfo "If you are having trouble with the detection" 1354 ewarn "If you are having trouble with the detection"
1500 einfo "of your CD, it is possible that you do not have" 1355 ewarn "of your CD, it is possible that you do not have"
1501 einfo "Joliet support enabled in your kernel. Please" 1356 ewarn "Joliet support enabled in your kernel. Please"
1502 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1357 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1358 ebeep 5
1359 fi
1503 read || die "something is screwed with your system" 1360 read || die "something is screwed with your system"
1504 done 1361 done
1505} 1362}
1506 1363
1364# @FUNCTION: strip-linguas
1365# @USAGE: [<allow LINGUAS>|<-i|-u> <directories of .po files>]
1366# @DESCRIPTION:
1507# Make sure that LINGUAS only contains languages that 1367# Make sure that LINGUAS only contains languages that
1508# a package can support 1368# a package can support. The first form allows you to
1509# 1369# specify a list of LINGUAS. The -i builds a list of po
1510# usage: strip-linguas <allow LINGUAS> 1370# files found in all the directories and uses the
1511# strip-linguas -i <directories of .po files> 1371# intersection of the lists. The -u builds a list of po
1512# strip-linguas -u <directories of .po files> 1372# files found in all the directories and uses the union
1513# 1373# of the lists.
1514# The first form allows you to specify a list of LINGUAS.
1515# The -i builds a list of po files found in all the
1516# directories and uses the intersection of the lists.
1517# The -u builds a list of po files found in all the
1518# directories and uses the union of the lists.
1519strip-linguas() { 1374strip-linguas() {
1520 local ls newls nols 1375 local ls newls nols
1521 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1376 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1522 local op=$1; shift 1377 local op=$1; shift
1523 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1378 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1524 local d f 1379 local d f
1525 for d in "$@" ; do 1380 for d in "$@" ; do
1526 if [[ ${op} == "-u" ]] ; then 1381 if [[ ${op} == "-u" ]] ; then
1527 newls=${ls} 1382 newls=${ls}
1528 else 1383 else
1529 newls="" 1384 newls=""
1530 fi 1385 fi
1531 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1386 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1532 if [[ ${op} == "-i" ]] ; then 1387 if [[ ${op} == "-i" ]] ; then
1533 hasq ${f} ${ls} && newls="${newls} ${f}" 1388 has ${f} ${ls} && newls="${newls} ${f}"
1534 else 1389 else
1535 hasq ${f} ${ls} || newls="${newls} ${f}" 1390 has ${f} ${ls} || newls="${newls} ${f}"
1536 fi 1391 fi
1537 done 1392 done
1538 ls=${newls} 1393 ls=${newls}
1539 done 1394 done
1540 else 1395 else
1542 fi 1397 fi
1543 1398
1544 nols="" 1399 nols=""
1545 newls="" 1400 newls=""
1546 for f in ${LINGUAS} ; do 1401 for f in ${LINGUAS} ; do
1547 if hasq ${f} ${ls} ; then 1402 if has ${f} ${ls} ; then
1548 newls="${newls} ${f}" 1403 newls="${newls} ${f}"
1549 else 1404 else
1550 nols="${nols} ${f}" 1405 nols="${nols} ${f}"
1551 fi 1406 fi
1552 done 1407 done
1553 [[ -n ${nols} ]] \ 1408 [[ -n ${nols} ]] \
1554 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1409 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1555 export LINGUAS=${newls:1} 1410 export LINGUAS=${newls:1}
1556}
1557
1558# @FUNCTION: set_arch_to_kernel
1559# @DESCRIPTION:
1560# Set the env ARCH to match what the kernel expects.
1561set_arch_to_kernel() {
1562 i=10
1563 while ((i--)) ; do
1564 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1565 done
1566 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1567 case ${ARCH} in
1568 x86) export ARCH="i386";;
1569 amd64) export ARCH="x86_64";;
1570 hppa) export ARCH="parisc";;
1571 mips) export ARCH="mips";;
1572 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1573 *) export ARCH="${ARCH}";;
1574 esac
1575}
1576
1577# @FUNCTION: set_arch_to_portage
1578# @DESCRIPTION:
1579# Set the env ARCH to match what portage expects.
1580set_arch_to_portage() {
1581 i=10
1582 while ((i--)) ; do
1583 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1584 done
1585 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1586} 1411}
1587 1412
1588# @FUNCTION: preserve_old_lib 1413# @FUNCTION: preserve_old_lib
1589# @USAGE: <libs to preserve> [more libs] 1414# @USAGE: <libs to preserve> [more libs]
1590# @DESCRIPTION: 1415# @DESCRIPTION:
1599 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1424 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1600 die "Invalid preserve_old_lib() usage" 1425 die "Invalid preserve_old_lib() usage"
1601 fi 1426 fi
1602 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]" 1427 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1603 1428
1429 # let portage worry about it
1430 has preserve-libs ${FEATURES} && return 0
1431
1604 local lib dir 1432 local lib dir
1605 for lib in "$@" ; do 1433 for lib in "$@" ; do
1606 [[ -e ${ROOT}/${lib} ]] || continue 1434 [[ -e ${ROOT}/${lib} ]] || continue
1607 dir=${lib%/*} 1435 dir=${lib%/*}
1608 dodir ${dir} || die "dodir ${dir} failed" 1436 dodir ${dir} || die "dodir ${dir} failed"
1618preserve_old_lib_notify() { 1446preserve_old_lib_notify() {
1619 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1447 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1620 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only" 1448 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1621 die "Invalid preserve_old_lib_notify() usage" 1449 die "Invalid preserve_old_lib_notify() usage"
1622 fi 1450 fi
1451
1452 # let portage worry about it
1453 has preserve-libs ${FEATURES} && return 0
1623 1454
1624 local lib notice=0 1455 local lib notice=0
1625 for lib in "$@" ; do 1456 for lib in "$@" ; do
1626 [[ -e ${ROOT}/${lib} ]] || continue 1457 [[ -e ${ROOT}/${lib} ]] || continue
1627 if [[ ${notice} -eq 0 ]] ; then 1458 if [[ ${notice} -eq 0 ]] ; then
1631 ewarn "the libraries are not being removed. You need to run revdep-rebuild" 1462 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1632 ewarn "in order to remove these old dependencies. If you do not have this" 1463 ewarn "in order to remove these old dependencies. If you do not have this"
1633 ewarn "helper program, simply emerge the 'gentoolkit' package." 1464 ewarn "helper program, simply emerge the 'gentoolkit' package."
1634 ewarn 1465 ewarn
1635 fi 1466 fi
1467 # temp hack for #348634 #357225
1468 [[ ${PN} == "mpfr" ]] && lib=${lib##*/}
1636 ewarn " # revdep-rebuild --library ${lib##*/}" 1469 ewarn " # revdep-rebuild --library '${lib}'"
1637 done 1470 done
1471 if [[ ${notice} -eq 1 ]] ; then
1472 ewarn
1473 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1474 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1475 for lib in "$@" ; do
1476 ewarn " # rm '${lib}'"
1477 done
1478 fi
1638} 1479}
1639 1480
1640# @FUNCTION: built_with_use 1481# @FUNCTION: built_with_use
1641# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1482# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1642# @DESCRIPTION: 1483# @DESCRIPTION:
1484#
1485# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1486#
1643# A temporary hack until portage properly supports DEPENDing on USE 1487# A temporary hack until portage properly supports DEPENDing on USE
1644# flags being enabled in packages. This will check to see if the specified 1488# flags being enabled in packages. This will check to see if the specified
1645# DEPEND atom was built with the specified list of USE flags. The 1489# DEPEND atom was built with the specified list of USE flags. The
1646# --missing option controls the behavior if called on a package that does 1490# --missing option controls the behavior if called on a package that does
1647# not actually support the defined USE flags (aka listed in IUSE). 1491# not actually support the defined USE flags (aka listed in IUSE).
1648# The default is to abort (call die). The -a and -o flags control 1492# The default is to abort (call die). The -a and -o flags control
1649# the requirements of the USE flags. They correspond to "and" and "or" 1493# the requirements of the USE flags. They correspond to "and" and "or"
1650# logic. So the -a flag means all listed USE flags must be enabled 1494# logic. So the -a flag means all listed USE flags must be enabled
1651# while the -o flag means at least one of the listed fIUSE flags must be 1495# while the -o flag means at least one of the listed IUSE flags must be
1652# enabled. The --hidden option is really for internal use only as it 1496# enabled. The --hidden option is really for internal use only as it
1653# means the USE flag we're checking is hidden expanded, so it won't be found 1497# means the USE flag we're checking is hidden expanded, so it won't be found
1654# in IUSE like normal USE flags. 1498# in IUSE like normal USE flags.
1655# 1499#
1656# Remember that this function isn't terribly intelligent so order of optional 1500# Remember that this function isn't terribly intelligent so order of optional
1657# flags matter. 1501# flags matter.
1658built_with_use() { 1502built_with_use() {
1659 local hidden="no" 1503 local hidden="no"
1660 if [[ $1 == "--hidden" ]] ; then 1504 if [[ $1 == "--hidden" ]] ; then
1691 die) die "Unable to determine what USE flags $PKG was built with";; 1535 die) die "Unable to determine what USE flags $PKG was built with";;
1692 esac 1536 esac
1693 fi 1537 fi
1694 1538
1695 if [[ ${hidden} == "no" ]] ; then 1539 if [[ ${hidden} == "no" ]] ; then
1696 local IUSE_BUILT=$(<${IUSEFILE}) 1540 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1697 # Don't check USE_EXPAND #147237 1541 # Don't check USE_EXPAND #147237
1698 local expand 1542 local expand
1699 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1543 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1700 if [[ $1 == ${expand}_* ]] ; then 1544 if [[ $1 == ${expand}_* ]] ; then
1701 expand="" 1545 expand=""
1702 break 1546 break
1703 fi 1547 fi
1704 done 1548 done
1705 if [[ -n ${expand} ]] ; then 1549 if [[ -n ${expand} ]] ; then
1706 if ! has $1 ${IUSE_BUILT} ; then 1550 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1707 case ${missing_action} in 1551 case ${missing_action} in
1708 true) return 0;; 1552 true) return 0;;
1709 false) return 1;; 1553 false) return 1;;
1710 die) die "$PKG does not actually support the $1 USE flag!";; 1554 die) die "$PKG does not actually support the $1 USE flag!";;
1711 esac 1555 esac
1723 shift 1567 shift
1724 done 1568 done
1725 [[ ${opt} = "-a" ]] 1569 [[ ${opt} = "-a" ]]
1726} 1570}
1727 1571
1728# @DESCRIPTION: epunt_cxx 1572# @FUNCTION: epunt_cxx
1729# @USAGE: [dir to scan] 1573# @USAGE: [dir to scan]
1730# @DESCRIPTION: 1574# @DESCRIPTION:
1731# Many configure scripts wrongly bail when a C++ compiler could not be 1575# Many configure scripts wrongly bail when a C++ compiler could not be
1732# detected. If dir is not specified, then it defaults to ${S}. 1576# detected. If dir is not specified, then it defaults to ${S}.
1733# 1577#
1735epunt_cxx() { 1579epunt_cxx() {
1736 local dir=$1 1580 local dir=$1
1737 [[ -z ${dir} ]] && dir=${S} 1581 [[ -z ${dir} ]] && dir=${S}
1738 ebegin "Removing useless C++ checks" 1582 ebegin "Removing useless C++ checks"
1739 local f 1583 local f
1740 for f in $(find ${dir} -name configure) ; do 1584 find "${dir}" -name configure | while read f ; do
1741 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1585 patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1742 done 1586 done
1743 eend 0 1587 eend 0
1744} 1588}
1745 1589
1746# @FUNCTION: make_wrapper 1590# @FUNCTION: make_wrapper
1747# @USAGE: <wrapper> <target> <chdir> [libpaths] [installpath] 1591# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1748# @DESCRIPTION: 1592# @DESCRIPTION:
1749# Create a shell wrapper script named wrapper in installpath 1593# Create a shell wrapper script named wrapper in installpath
1750# (defaults to the bindir) to execute target (default of wrapper) by 1594# (defaults to the bindir) to execute target (default of wrapper) by
1751# first optionally setting LD_LIBRARY_PATH to the colon-delimited 1595# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1752# libpaths followed by optionally changing directory to chdir. 1596# libpaths followed by optionally changing directory to chdir.
1775 ) || die 1619 ) || die
1776 else 1620 else
1777 newbin "${tmpwrapper}" "${wrapper}" || die 1621 newbin "${tmpwrapper}" "${wrapper}" || die
1778 fi 1622 fi
1779} 1623}
1624
1625# @FUNCTION: path_exists
1626# @USAGE: [-a|-o] <paths>
1627# @DESCRIPTION:
1628# Check if the specified paths exist. Works for all types of paths
1629# (files/dirs/etc...). The -a and -o flags control the requirements
1630# of the paths. They correspond to "and" and "or" logic. So the -a
1631# flag means all the paths must exist while the -o flag means at least
1632# one of the paths must exist. The default behavior is "and". If no
1633# paths are specified, then the return value is "false".
1634path_exists() {
1635 local opt=$1
1636 [[ ${opt} == -[ao] ]] && shift || opt="-a"
1637
1638 # no paths -> return false
1639 # same behavior as: [[ -e "" ]]
1640 [[ $# -eq 0 ]] && return 1
1641
1642 local p r=0
1643 for p in "$@" ; do
1644 [[ -e ${p} ]]
1645 : $(( r += $? ))
1646 done
1647
1648 case ${opt} in
1649 -a) return $(( r != 0 )) ;;
1650 -o) return $(( r == $# )) ;;
1651 esac
1652}
1653
1654# @FUNCTION: in_iuse
1655# @USAGE: <flag>
1656# @DESCRIPTION:
1657# Determines whether the given flag is in IUSE. Strips IUSE default prefixes
1658# as necessary.
1659#
1660# Note that this function should not be used in the global scope.
1661in_iuse() {
1662 debug-print-function ${FUNCNAME} "${@}"
1663 [[ ${#} -eq 1 ]] || die "Invalid args to ${FUNCNAME}()"
1664
1665 local flag=${1}
1666 local liuse=( ${IUSE} )
1667
1668 has "${flag}" "${liuse[@]#[+-]}"
1669}
1670
1671# @FUNCTION: use_if_iuse
1672# @USAGE: <flag>
1673# @DESCRIPTION:
1674# Return true if the given flag is in USE and IUSE.
1675#
1676# Note that this function should not be used in the global scope.
1677use_if_iuse() {
1678 in_iuse $1 || return 1
1679 use $1
1680}
1681
1682# @FUNCTION: usex
1683# @USAGE: <USE flag> [true output] [false output] [true suffix] [false suffix]
1684# @DESCRIPTION:
1685# If USE flag is set, echo [true output][true suffix] (defaults to "yes"),
1686# otherwise echo [false output][false suffix] (defaults to "no").
1687usex() { use "$1" && echo "${2-yes}$4" || echo "${3-no}$5" ; } #382963

Legend:
Removed from v.1.284  
changed lines
  Added in v.1.370

  ViewVC Help
Powered by ViewVC 1.1.20