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

Diff of /eclass/eutils.eclass

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

Revision 1.296 Revision 1.352
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2009 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.296 2008/02/13 20:50:06 wolf31o2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.352 2010/11/22 00:31:03 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
… …
17 17
18inherit multilib portability 18inherit multilib portability
19 19
20DESCRIPTION="Based on the ${ECLASS} eclass" 20DESCRIPTION="Based on the ${ECLASS} eclass"
21 21
22if has "${EAPI:-0}" 0 1 2; then
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 einfo for package managers that don't provide eqawarn and use the PM
70# implementation if available.
71if ! declare -F eqawarn >/dev/null ; then
72 eqawarn() {
73 einfo "$@"
74 }
75fi
76
77# @FUNCTION: ecvs_clean
78# @USAGE: [list of dirs]
79# @DESCRIPTION:
80# Remove CVS directories recursiveley. Useful when a source tarball contains
81# internal CVS directories. Defaults to $PWD.
82ecvs_clean() {
83 [[ -z $* ]] && set -- .
84 find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
85 find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
86}
87
88# @FUNCTION: esvn_clean
89# @USAGE: [list of dirs]
90# @DESCRIPTION:
91# Remove .svn directories recursiveley. Useful when a source tarball contains
92# internal Subversion directories. Defaults to $PWD.
93esvn_clean() {
94 [[ -z $* ]] && set -- .
95 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
96}
97
98# @FUNCTION: eshopts_push
99# @USAGE: [options to `set` or `shopt`]
100# @DESCRIPTION:
101# Often times code will want to enable a shell option to change code behavior.
102# Since changing shell options can easily break other pieces of code (which
103# assume the default state), eshopts_push is used to (1) push the current shell
104# options onto a stack and (2) pass the specified arguments to set.
105#
106# If the first argument is '-s' or '-u', we assume you want to call `shopt`
107# rather than `set` as there are some options only available via that.
108#
109# A common example is to disable shell globbing so that special meaning/care
110# may be used with variables/arguments to custom functions. That would be:
111# @CODE
112# eshopts_push -o noglob
113# for x in ${foo} ; do
114# if ...some check... ; then
115# eshopts_pop
116# return 0
117# fi
118# done
119# eshopts_pop
120# @CODE
121eshopts_push() {
122 # have to assume __ESHOPTS_SAVE__ isn't screwed with
123 # as a `declare -a` here will reset its value
124 local i=${#__ESHOPTS_SAVE__[@]}
125 if [[ $1 == -[su] ]] ; then
126 __ESHOPTS_SAVE__[$i]=$(shopt -p)
127 [[ $# -eq 0 ]] && return 0
128 shopt "$@" || die "eshopts_push: bad options to shopt: $*"
129 else
130 __ESHOPTS_SAVE__[$i]=$-
131 [[ $# -eq 0 ]] && return 0
132 set "$@" || die "eshopts_push: bad options to set: $*"
133 fi
134}
135
136# @FUNCTION: eshopts_pop
137# @USAGE:
138# @DESCRIPTION:
139# Restore the shell options to the state saved with the corresponding
140# eshopts_push call. See that function for more details.
141eshopts_pop() {
142 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
143 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
144 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
145 local s=${__ESHOPTS_SAVE__[$i]}
146 unset __ESHOPTS_SAVE__[$i]
147 if [[ ${s} == "shopt -"* ]] ; then
148 eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
149 else
150 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
151 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
152 fi
153}
154
155# @VARIABLE: EPATCH_SOURCE
156# @DESCRIPTION:
157# Default directory to search for patches.
53EPATCH_SOURCE="${WORKDIR}/patch" 158EPATCH_SOURCE="${WORKDIR}/patch"
54# Default extension for patches 159# @VARIABLE: EPATCH_SUFFIX
160# @DESCRIPTION:
161# Default extension for patches (do not prefix the period yourself).
55EPATCH_SUFFIX="patch.bz2" 162EPATCH_SUFFIX="patch.bz2"
163# @VARIABLE: EPATCH_OPTS
164# @DESCRIPTION:
56# Default options for patch 165# Default options for patch:
166# @CODE
57# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 167# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
58# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 168# --no-backup-if-mismatch - do not leave .orig files behind
59# Set -E to automatically remove empty files. 169# -E - automatically remove empty files
170# @CODE
60EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 171EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
172# @VARIABLE: EPATCH_EXCLUDE
173# @DESCRIPTION:
61# List of patches not to apply. Not this is only file names, 174# List of patches not to apply. Note this is only file names,
62# and not the full path .. 175# and not the full path. Globs accepted.
63EPATCH_EXCLUDE="" 176EPATCH_EXCLUDE=""
177# @VARIABLE: EPATCH_SINGLE_MSG
178# @DESCRIPTION:
64# Change the printed message for a single patch. 179# Change the printed message for a single patch.
65EPATCH_SINGLE_MSG="" 180EPATCH_SINGLE_MSG=""
181# @VARIABLE: EPATCH_MULTI_MSG
182# @DESCRIPTION:
66# Change the printed message for multiple patches. 183# Change the printed message for multiple patches.
67EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 184EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
68# Force applying bulk patches even if not following the style: 185# @VARIABLE: EPATCH_FORCE
69# 186# @DESCRIPTION:
70# ??_${ARCH}_foo.${EPATCH_SUFFIX} 187# Only require patches to match EPATCH_SUFFIX rather than the extended
71# 188# arch naming style.
72EPATCH_FORCE="no" 189EPATCH_FORCE="no"
73 190
74# This function is for bulk patching, or in theory for just one 191# @FUNCTION: epatch
75# or two patches. 192# @USAGE: [patches] [dirs of patches]
193# @DESCRIPTION:
194# epatch is designed to greatly simplify the application of patches. It can
195# process patch files directly, or directories of patches. The patches may be
196# compressed (bzip/gzip/etc...) or plain text. You generally need not specify
197# the -p option as epatch will automatically attempt -p0 to -p5 until things
198# apply successfully.
76# 199#
77# It should work with .bz2, .gz, .zip and plain text patches. 200# If you do not specify any options, then epatch will default to the directory
78# Currently all patches should be the same format. 201# specified by EPATCH_SOURCE.
79# 202#
80# You do not have to specify '-p' option to patch, as it will 203# When processing directories, epatch will apply all patches that match:
81# try with -p0 to -p5 until it succeed, or fail at -p5. 204# @CODE
82# 205# 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} 206# ??_${ARCH}_foo.${EPATCH_SUFFIX}
207# else
208# *.${EPATCH_SUFFIX}
209# @CODE
210# The leading ?? are typically numbers used to force consistent patch ordering.
211# The arch field is used to apply patches only for the host architecture with
212# the special value of "all" means apply for everyone. Note that using values
213# other than "all" is highly discouraged -- you should apply patches all the
214# time and let architecture details be detected at configure/compile time.
92# 215#
93# For example: 216# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
217# for patches to apply.
94# 218#
95# 01_all_misc-fix.patch.bz2 219# 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() { 220epatch() {
108 _epatch_draw_line() { 221 _epatch_draw_line() {
222 # create a line of same length as input string
109 [[ -z $1 ]] && set "$(printf "%65s" '')" 223 [[ -z $1 ]] && set "$(printf "%65s" '')"
110 echo "${1//?/=}" 224 echo "${1//?/=}"
111 } 225 }
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 226
120 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 227 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
121 228
122 if [ "$#" -gt 1 ] 229 # Let the rest of the code process one user arg at a time --
123 then 230 # each arg may expand into multiple patches, and each arg may
231 # need to start off with the default global EPATCH_xxx values
232 if [[ $# -gt 1 ]] ; then
124 local m="" 233 local m
125 for m in "$@" ; do 234 for m in "$@" ; do
126 epatch "${m}" 235 epatch "${m}"
127 done 236 done
128 return 0 237 return 0
129 fi 238 fi
130 239
131 if [ -n "$1" -a -f "$1" ] 240 local SINGLE_PATCH="no"
132 then 241 # no args means process ${EPATCH_SOURCE}
242 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
243
244 if [[ -f $1 ]] ; then
133 SINGLE_PATCH="yes" 245 SINGLE_PATCH="yes"
134 246 set -- "$1"
135 local EPATCH_SOURCE="$1" 247 # Use the suffix from the single patch (localize it); the code
248 # below will find the suffix for us
136 local EPATCH_SUFFIX="${1##*\.}" 249 local EPATCH_SUFFIX=$1
137 250
138 elif [ -n "$1" -a -d "$1" ] 251 elif [[ -d $1 ]] ; then
139 then 252 # 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 ... 253 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
141 if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] 254
255 else
256 # sanity check ... if it isn't a dir or file, wtf man ?
257 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
258 echo
259 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
260 eerror
261 eerror " ${EPATCH_SOURCE}"
262 eerror " ( ${EPATCH_SOURCE##*/} )"
263 echo
264 die "Cannot find \$EPATCH_SOURCE!"
265 fi
266
267 local PIPE_CMD
268 case ${EPATCH_SUFFIX##*\.} in
269 xz) PIPE_CMD="xz -dc" ;;
270 lzma) PIPE_CMD="lzma -dc" ;;
271 bz2) PIPE_CMD="bzip2 -dc" ;;
272 gz|Z|z) PIPE_CMD="gzip -dc" ;;
273 ZIP|zip) PIPE_CMD="unzip -p" ;;
274 *) ;;
275 esac
276
277 [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
278
279 local x
280 for x in "$@" ; do
281 # If the patch dir given contains subdirs, or our EPATCH_SUFFIX
282 # didn't match anything, ignore continue on
283 [[ ! -f ${x} ]] && continue
284
285 local patchname=${x##*/}
286
287 # Apply single patches, or forced sets of patches, or
288 # patches with ARCH dependant names.
289 # ???_arch_foo.patch
290 # Else, skip this input altogether
291 local a=${patchname#*_} # strip the ???_
292 a=${a%%_*} # strip the _foo.patch
293 if ! [[ ${SINGLE_PATCH} == "yes" || \
294 ${EPATCH_FORCE} == "yes" || \
295 ${a} == all || \
296 ${a} == ${ARCH} ]]
142 then 297 then
143 local EPATCH_SOURCE="$1/*" 298 continue
299 fi
300
301 # Let people filter things dynamically
302 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
303 # let people use globs in the exclude
304 eshopts_push -o noglob
305
306 local ex
307 for ex in ${EPATCH_EXCLUDE} ; do
308 if [[ ${patchname} == ${ex} ]] ; then
309 eshopts_pop
310 continue 2
311 fi
312 done
313
314 eshopts_pop
315 fi
316
317 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
318 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
319 einfo "${EPATCH_SINGLE_MSG}"
320 else
321 einfo "Applying ${patchname} ..."
322 fi
144 else 323 else
145 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 324 einfo " ${patchname} ..."
146 fi 325 fi
147 else 326
148 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then 327 # most of the time, there will only be one run per unique name,
149 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 328 # but if there are more, make sure we get unique log filenames
150 then 329 local STDERR_TARGET="${T}/${patchname}.out"
151 EPATCH_SOURCE="$1" 330 if [[ -e ${STDERR_TARGET} ]] ; then
331 STDERR_TARGET="${T}/${patchname}-$$.out"
332 fi
333
334 printf "***** %s *****\n\n" "${patchname}" > "${STDERR_TARGET}"
335
336 # Decompress the patch if need be
337 local count=0
338 local PATCH_TARGET
339 if [[ -n ${PIPE_CMD} ]] ; then
340 PATCH_TARGET="${T}/$$.patch"
341 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
342
343 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
344 echo
345 eerror "Could not extract patch!"
346 #die "Could not extract patch!"
347 count=5
348 break
152 fi 349 fi
350 else
351 PATCH_TARGET=${x}
352 fi
153 353
354 # Check for absolute paths in patches. If sandbox is disabled,
355 # people could (accidently) patch files in the root filesystem.
356 # Or trigger other unpleasantries #237667. So disallow -p0 on
357 # such patches.
358 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
359 if [[ -n ${abs_paths} ]] ; then
360 count=1
361 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
362 fi
363
364 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
365 while [[ ${count} -lt 5 ]] ; do
366 # Generate some useful debug info ...
367 (
368 _epatch_draw_line "***** ${patchname} *****"
154 echo 369 echo
155 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 370 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
371 echo
372 _epatch_draw_line "***** ${patchname} *****"
373 ) >> "${STDERR_TARGET}"
374
375 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
376 (
377 _epatch_draw_line "***** ${patchname} *****"
378 echo
379 echo "ACTUALLY APPLYING ${patchname} ..."
380 echo
381 _epatch_draw_line "***** ${patchname} *****"
382 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
383 ) >> "${STDERR_TARGET}"
384
385 if [ $? -ne 0 ] ; then
386 echo
387 eerror "A dry-run of patch command succeeded, but actually"
388 eerror "applying the patch failed!"
389 #die "Real world sux compared to the dreamworld!"
390 count=5
391 fi
392 break
393 fi
394
395 : $(( count++ ))
396 done
397
398 # if we had to decompress the patch, delete the temp one
399 if [[ -n ${PIPE_CMD} ]] ; then
400 rm -f "${PATCH_TARGET}"
401 fi
402
403 if [[ ${count} -ge 5 ]] ; then
404 echo
405 eerror "Failed Patch: ${patchname} !"
406 eerror " ( ${PATCH_TARGET} )"
156 eerror 407 eerror
157 eerror " ${EPATCH_SOURCE}" 408 eerror "Include in your bugreport the contents of:"
158 eerror " ( ${EPATCH_SOURCE##*/} )" 409 eerror
410 eerror " ${STDERR_TARGET}"
159 echo 411 echo
160 die "Cannot find \$EPATCH_SOURCE!"
161 fi
162
163 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
164 fi
165
166 case ${EPATCH_SUFFIX##*\.} in
167 bz2)
168 PIPE_CMD="bzip2 -dc"
169 PATCH_SUFFIX="bz2"
170 ;;
171 gz|Z|z)
172 PIPE_CMD="gzip -dc"
173 PATCH_SUFFIX="gz"
174 ;;
175 ZIP|zip)
176 PIPE_CMD="unzip -p"
177 PATCH_SUFFIX="zip"
178 ;;
179 *)
180 PIPE_CMD="cat"
181 PATCH_SUFFIX="patch"
182 ;;
183 esac
184
185 if [ "${SINGLE_PATCH}" = "no" ]
186 then
187 einfo "${EPATCH_MULTI_MSG}"
188 fi
189 for x in ${EPATCH_SOURCE}
190 do
191 # New ARCH dependant patch naming scheme ...
192 #
193 # ???_arch_foo.patch
194 #
195 if [ -f ${x} ] && \
196 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
197 [ "${EPATCH_FORCE}" = "yes" ])
198 then
199 local count=0
200 local popts="${EPATCH_OPTS}"
201 local patchname=${x##*/}
202
203 if [ -n "${EPATCH_EXCLUDE}" ]
204 then
205 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
206 then
207 continue
208 fi
209 fi
210
211 if [ "${SINGLE_PATCH}" = "yes" ]
212 then
213 if [ -n "${EPATCH_SINGLE_MSG}" ]
214 then
215 einfo "${EPATCH_SINGLE_MSG}"
216 else
217 einfo "Applying ${patchname} ..."
218 fi
219 else
220 einfo " ${patchname} ..."
221 fi
222
223 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
224 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
225
226 # Allow for prefix to differ ... im lazy, so shoot me :/
227 while [ "${count}" -lt 5 ]
228 do
229 # Generate some useful debug info ...
230 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
231 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
232
233 if [ "${PATCH_SUFFIX}" != "patch" ]
234 then
235 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
236 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
237 else
238 PATCH_TARGET="${x}"
239 fi
240
241 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
242 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
243
244 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
245 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
246
247 if [ "${PATCH_SUFFIX}" != "patch" ]
248 then
249 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
250 then
251 echo
252 eerror "Could not extract patch!"
253 #die "Could not extract patch!"
254 count=5
255 break
256 fi
257 fi
258
259 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
260 then
261 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
262 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
263 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
264 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
265 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
266
267 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
268 _epatch_assert
269
270 if [ "$?" -ne 0 ]
271 then
272 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
273 echo
274 eerror "A dry-run of patch command succeeded, but actually"
275 eerror "applying the patch failed!"
276 #die "Real world sux compared to the dreamworld!"
277 count=5
278 fi
279
280 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
281
282 break
283 fi
284
285 count=$((count + 1))
286 done
287
288 if [ "${PATCH_SUFFIX}" != "patch" ]
289 then
290 rm -f ${PATCH_TARGET}
291 fi
292
293 if [ "${count}" -eq 5 ]
294 then
295 echo
296 eerror "Failed Patch: ${patchname} !"
297 eerror " ( ${PATCH_TARGET} )"
298 eerror
299 eerror "Include in your bugreport the contents of:"
300 eerror
301 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
302 echo
303 die "Failed Patch: ${patchname}!" 412 die "Failed Patch: ${patchname}!"
304 fi 413 fi
305 414
306 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 415 # if everything worked, delete the patch log
307 416 rm -f "${STDERR_TARGET}"
308 eend 0 417 eend 0
309 fi
310 done 418 done
311 if [ "${SINGLE_PATCH}" = "no" ] 419
312 then 420 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
313 einfo "Done with patching" 421 : # everything worked
422}
423epatch_user() {
424 [[ $# -ne 0 ]] && die "epatch_user takes no options"
425
426 # don't clobber any EPATCH vars that the parent might want
427 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
428 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
429 EPATCH_SOURCE=${base}/${CTARGET}/${check}
430 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
431 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
432 if [[ -d ${EPATCH_SOURCE} ]] ; then
433 EPATCH_SOURCE=${EPATCH_SOURCE} \
434 EPATCH_SUFFIX="patch" \
435 EPATCH_FORCE="yes" \
436 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
437 epatch
438 return 0
314 fi 439 fi
440 done
441 return 1
315} 442}
316 443
317# @FUNCTION: emktemp 444# @FUNCTION: emktemp
318# @USAGE: [temp dir] 445# @USAGE: [temp dir]
319# @DESCRIPTION: 446# @DESCRIPTION:
… …
355# base-system@gentoo.org (Linux) 482# base-system@gentoo.org (Linux)
356# Joe Jezak <josejx@gmail.com> (OS X) 483# Joe Jezak <josejx@gmail.com> (OS X)
357# usata@gentoo.org (OS X) 484# usata@gentoo.org (OS X)
358# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 485# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
359# @DESCRIPTION: 486# @DESCRIPTION:
360# Small wrapper for getent (Linux), nidump (Mac OS X), 487# Small wrapper for getent (Linux),
488# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
361# and pw (FreeBSD) used in enewuser()/enewgroup() 489# and pw (FreeBSD) used in enewuser()/enewgroup()
362egetent() { 490egetent() {
363 case ${CHOST} in 491 case ${CHOST} in
364 *-darwin*) 492 *-darwin[678])
365 case "$2" in 493 case "$2" in
366 *[!0-9]*) # Non numeric 494 *[!0-9]*) # Non numeric
367 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 495 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
368 ;; 496 ;;
369 *) # Numeric 497 *) # Numeric
370 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 498 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
499 ;;
500 esac
501 ;;
502 *-darwin*)
503 local mytype=$1
504 [[ "passwd" == $mytype ]] && mytype="Users"
505 [[ "group" == $mytype ]] && mytype="Groups"
506 case "$2" in
507 *[!0-9]*) # Non numeric
508 dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
509 ;;
510 *) # Numeric
511 local mykey="UniqueID"
512 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
513 dscl . -search /$mytype $mykey $2 2>/dev/null
371 ;; 514 ;;
372 esac 515 esac
373 ;; 516 ;;
374 *-freebsd*|*-dragonfly*) 517 *-freebsd*|*-dragonfly*)
375 local opts action="user" 518 local opts action="user"
… …
575 fi 718 fi
576 ;; 719 ;;
577 720
578 *) 721 *)
579 if [[ -z $@ ]] ; then 722 if [[ -z $@ ]] ; then
580 useradd ${opts} ${euser} \ 723 useradd -r ${opts} \
581 -c "added by portage for ${PN}" \ 724 -c "added by portage for ${PN}" \
725 ${euser} \
582 || die "enewuser failed" 726 || die "enewuser failed"
583 else 727 else
584 einfo " - Extra: $@" 728 einfo " - Extra: $@"
585 useradd ${opts} ${euser} "$@" \ 729 useradd -r ${opts} "$@" \
730 ${euser} \
586 || die "enewuser failed" 731 || die "enewuser failed"
587 fi 732 fi
588 ;; 733 ;;
589 esac 734 esac
590 735
… …
702 esac 847 esac
703 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 848 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
704 ;; 849 ;;
705 850
706 *) 851 *)
852 # We specify -r so that we get a GID in the system range from login.defs
707 groupadd ${opts} ${egroup} || die "enewgroup failed" 853 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
708 ;; 854 ;;
709 esac 855 esac
710 export SANDBOX_ON="${oldsandbox}" 856 export SANDBOX_ON="${oldsandbox}"
711} 857}
712 858
… …
723 869
724# Make a desktop file ! 870# Make a desktop file !
725# Great for making those icons in kde/gnome startmenu ! 871# Great for making those icons in kde/gnome startmenu !
726# Amaze your friends ! Get the women ! Join today ! 872# Amaze your friends ! Get the women ! Join today !
727# 873#
728# make_desktop_entry(<command>, [name], [icon], [type], [path]) 874# make_desktop_entry(<command>, [name], [icon], [type], [fields])
729# 875#
730# binary: what command does the app run with ? 876# binary: what command does the app run with ?
731# name: the name that will show up in the menu 877# name: the name that will show up in the menu
732# icon: give your little like a pretty little icon ... 878# icon: give your little like a pretty little icon ...
733# this can be relative (to /usr/share/pixmaps) or 879# this can be relative (to /usr/share/pixmaps) or
734# a full path to an icon 880# a full path to an icon
735# type: what kind of application is this ? for categories: 881# type: what kind of application is this ? for categories:
736# http://standards.freedesktop.org/menu-spec/latest/apa.html 882# http://standards.freedesktop.org/menu-spec/latest/apa.html
737# path: if your app needs to startup in a specific dir 883# fields: extra fields to append to the desktop file; a printf string
738make_desktop_entry() { 884make_desktop_entry() {
739 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 885 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
740 886
741 local exec=${1} 887 local exec=${1}
742 local name=${2:-${PN}} 888 local name=${2:-${PN}}
743 local icon=${3:-${PN}} 889 local icon=${3:-${PN}}
744 local type=${4} 890 local type=${4}
745 local path=${5} 891 local fields=${5}
746 892
747 if [[ -z ${type} ]] ; then 893 if [[ -z ${type} ]] ; then
748 local catmaj=${CATEGORY%%-*} 894 local catmaj=${CATEGORY%%-*}
749 local catmin=${CATEGORY##*-} 895 local catmin=${CATEGORY##*-}
750 case ${catmaj} in 896 case ${catmaj} in
751 app) 897 app)
752 case ${catmin} in 898 case ${catmin} in
753 accessibility) type=Accessibility;; 899 accessibility) type=Accessibility;;
754 admin) type=System;; 900 admin) type=System;;
755 antivirus) type=System;; 901 antivirus) type=System;;
756 arch) type=Archiving;; 902 arch) type=Archiving;;
757 backup) type=Archiving;; 903 backup) type=Archiving;;
758 cdr) type=DiscBurning;; 904 cdr) type=DiscBurning;;
759 dicts) type=Dictionary;; 905 dicts) type=Dictionary;;
760 doc) type=Documentation;; 906 doc) type=Documentation;;
761 editors) type=TextEditor;; 907 editors) type=TextEditor;;
762 emacs) type=TextEditor;; 908 emacs) type=TextEditor;;
763 emulation) type=Emulator;; 909 emulation) type=Emulator;;
764 laptop) type=HardwareSettings;; 910 laptop) type=HardwareSettings;;
765 office) type=Office;; 911 office) type=Office;;
766 pda) type=PDA;; 912 pda) type=PDA;;
767 vim) type=TextEditor;; 913 vim) type=TextEditor;;
768 xemacs) type=TextEditor;; 914 xemacs) type=TextEditor;;
769 *) type=;;
770 esac 915 esac
771 ;; 916 ;;
772 917
773 dev) 918 dev)
774 type="Development" 919 type="Development"
775 ;; 920 ;;
776 921
777 games) 922 games)
778 case ${catmin} in 923 case ${catmin} in
779 action|fps) type=ActionGame;; 924 action|fps) type=ActionGame;;
780 arcade) type=ArcadeGame;; 925 arcade) type=ArcadeGame;;
781 board) type=BoardGame;; 926 board) type=BoardGame;;
782 emulation) type=Emulator;; 927 emulation) type=Emulator;;
783 kids) type=KidsGame;; 928 kids) type=KidsGame;;
784 puzzle) type=LogicGame;; 929 puzzle) type=LogicGame;;
785 roguelike) type=RolePlaying;; 930 roguelike) type=RolePlaying;;
786 rpg) type=RolePlaying;; 931 rpg) type=RolePlaying;;
787 simulation) type=Simulation;; 932 simulation) type=Simulation;;
788 sports) type=SportsGame;; 933 sports) type=SportsGame;;
789 strategy) type=StrategyGame;; 934 strategy) type=StrategyGame;;
790 *) type=;;
791 esac 935 esac
792 type="Game;${type}" 936 type="Game;${type}"
793 ;; 937 ;;
794 938
795 gnome) 939 gnome)
… …
804 type="Network;Email" 948 type="Network;Email"
805 ;; 949 ;;
806 950
807 media) 951 media)
808 case ${catmin} in 952 case ${catmin} in
953 gfx)
809 gfx) type=Graphics;; 954 type=Graphics
955 ;;
956 *)
957 case ${catmin} in
810 radio) type=Tuner;; 958 radio) type=Tuner;;
811 sound) type=Audio;; 959 sound) type=Audio;;
812 tv) type=TV;; 960 tv) type=TV;;
813 video) type=Video;; 961 video) type=Video;;
814 *) type=;; 962 esac
963 type="AudioVideo;${type}"
964 ;;
815 esac 965 esac
816 type="AudioVideo;${type}"
817 ;; 966 ;;
818 967
819 net) 968 net)
820 case ${catmin} in 969 case ${catmin} in
821 dialup) type=Dialup;; 970 dialup) type=Dialup;;
822 ftp) type=FileTransfer;; 971 ftp) type=FileTransfer;;
823 im) type=InstantMessaging;; 972 im) type=InstantMessaging;;
824 irc) type=IRCClient;; 973 irc) type=IRCClient;;
825 mail) type=Email;; 974 mail) type=Email;;
826 news) type=News;; 975 news) type=News;;
827 nntp) type=News;; 976 nntp) type=News;;
828 p2p) type=FileTransfer;; 977 p2p) type=FileTransfer;;
829 *) type=;; 978 voip) type=Telephony;;
830 esac 979 esac
831 type="Network;${type}" 980 type="Network;${type}"
832 ;; 981 ;;
833 982
834 sci) 983 sci)
835 case ${catmin} in 984 case ${catmin} in
836 astro*) type=Astronomy;; 985 astro*) type=Astronomy;;
837 bio*) type=Biology;; 986 bio*) type=Biology;;
838 calc*) type=Calculator;; 987 calc*) type=Calculator;;
839 chem*) type=Chemistry;; 988 chem*) type=Chemistry;;
840 elec*) type=Electronics;; 989 elec*) type=Electronics;;
841 geo*) type=Geology;; 990 geo*) type=Geology;;
842 math*) type=Math;; 991 math*) type=Math;;
843 physics) type=Physics;; 992 physics) type=Physics;;
844 visual*) type=DataVisualization;; 993 visual*) type=DataVisualization;;
845 *) type=;;
846 esac 994 esac
847 type="Science;${type}" 995 type="Education;Science;${type}"
848 ;; 996 ;;
849 997
850 sys) 998 sys)
851 type="System" 999 type="System"
852 ;; 1000 ;;
853 1001
854 www) 1002 www)
855 case ${catmin} in 1003 case ${catmin} in
856 client) type=WebBrowser;; 1004 client) type=WebBrowser;;
857 *) type=;;
858 esac 1005 esac
859 type="Network" 1006 type="Network;${type}"
860 ;; 1007 ;;
861 1008
862 *) 1009 *)
863 type= 1010 type=
864 ;; 1011 ;;
… …
870 local desktop_name="${PN}-${SLOT}" 1017 local desktop_name="${PN}-${SLOT}"
871 fi 1018 fi
872 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1019 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
873 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1020 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
874 1021
1022 # Don't append another ";" when a valid category value is provided.
1023 type=${type%;}${type:+;}
1024
1025 eshopts_push -s extglob
1026 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
1027 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1028 ewarn "allowed in .desktop files if the value is not an absolute path."
1029 icon=${icon%.@(xpm|png|svg)}
1030 fi
1031 eshopts_pop
1032
875 cat <<-EOF > "${desktop}" 1033 cat <<-EOF > "${desktop}"
876 [Desktop Entry] 1034 [Desktop Entry]
877 Version=1.0
878 Name=${name} 1035 Name=${name}
879 Type=Application 1036 Type=Application
880 Comment=${DESCRIPTION} 1037 Comment=${DESCRIPTION}
881 Exec=${exec} 1038 Exec=${exec}
882 TryExec=${exec%% *} 1039 TryExec=${exec%% *}
883 Icon=${icon} 1040 Icon=${icon}
884 Categories=${type}; 1041 Categories=${type}
885 EOF 1042 EOF
886 1043
887 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1044 if [[ ${fields:-=} != *=* ]] ; then
1045 # 5th arg used to be value to Path=
1046 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
1047 fields="Path=${fields}"
1048 fi
1049 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
888 1050
889 ( 1051 (
890 # wrap the env here so that the 'insinto' call 1052 # wrap the env here so that the 'insinto' call
891 # doesn't corrupt the env of the caller 1053 # doesn't corrupt the env of the caller
892 insinto /usr/share/applications 1054 insinto /usr/share/applications
893 doins "${desktop}" 1055 doins "${desktop}"
894 ) 1056 ) || die "installing desktop file failed"
895} 1057}
896 1058
897# @FUNCTION: validate_desktop_entries 1059# @FUNCTION: validate_desktop_entries
898# @USAGE: [directories] 1060# @USAGE: [directories]
899# @MAINTAINER: 1061# @MAINTAINER:
… …
921 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo." 1083 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
922 fi 1084 fi
923} 1085}
924 1086
925# @FUNCTION: make_session_desktop 1087# @FUNCTION: make_session_desktop
926# @USAGE: <title> <command> 1088# @USAGE: <title> <command> [command args...]
927# @DESCRIPTION: 1089# @DESCRIPTION:
928# Make a GDM/KDM Session file. The title is the file to execute to start the 1090# Make a GDM/KDM Session file. The title is the file to execute to start the
929# Window Manager. The command is the name of the Window Manager. 1091# Window Manager. The command is the name of the Window Manager.
1092#
1093# You can set the name of the file via the ${wm} variable.
930make_session_desktop() { 1094make_session_desktop() {
931 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 1095 [[ -z $1 ]] && eerror "$0: You must specify the title" && return 1
932 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1 1096 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
933 1097
934 local title=$1 1098 local title=$1
935 local command=$2 1099 local command=$2
936 local desktop=${T}/${wm}.desktop 1100 local desktop=${T}/${wm:-${PN}}.desktop
1101 shift 2
937 1102
938 cat <<-EOF > "${desktop}" 1103 cat <<-EOF > "${desktop}"
939 [Desktop Entry] 1104 [Desktop Entry]
940 Name=${title} 1105 Name=${title}
941 Comment=This session logs you into ${title} 1106 Comment=This session logs you into ${title}
942 Exec=${command} 1107 Exec=${command} $*
943 TryExec=${command} 1108 TryExec=${command}
944 Type=Application 1109 Type=XSession
945 EOF 1110 EOF
946 1111
947 ( 1112 (
948 # wrap the env here so that the 'insinto' call 1113 # wrap the env here so that the 'insinto' call
949 # doesn't corrupt the env of the caller 1114 # doesn't corrupt the env of the caller
… …
1175 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1340 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1176 1341
1177 local shrtsrc=$(basename "${src}") 1342 local shrtsrc=$(basename "${src}")
1178 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1343 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1179 if [[ -z ${skip} ]] ; then 1344 if [[ -z ${skip} ]] ; then
1180 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1345 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1181 local skip=0 1346 local skip=0
1182 exe=tail 1347 exe=tail
1183 case ${ver} in 1348 case ${ver} in
1184 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1349 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1185 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1350 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
… …
1187 2.0|2.0.1) 1352 2.0|2.0.1)
1188 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1353 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1189 ;; 1354 ;;
1190 2.1.1) 1355 2.1.1)
1191 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1356 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1192 let skip="skip + 1" 1357 (( skip++ ))
1193 ;; 1358 ;;
1194 2.1.2) 1359 2.1.2)
1195 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1360 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1196 let skip="skip + 1" 1361 (( skip++ ))
1197 ;; 1362 ;;
1198 2.1.3) 1363 2.1.3)
1199 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1364 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1200 let skip="skip + 1" 1365 (( skip++ ))
1201 ;; 1366 ;;
1202 2.1.4|2.1.5) 1367 2.1.4|2.1.5)
1203 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1368 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1204 skip=$(head -n ${skip} "${src}" | wc -c) 1369 skip=$(head -n ${skip} "${src}" | wc -c)
1205 exe="dd" 1370 exe="dd"
… …
1214 esac 1379 esac
1215 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1380 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1216 fi 1381 fi
1217 case ${exe} in 1382 case ${exe} in
1218 tail) exe="tail -n +${skip} '${src}'";; 1383 tail) exe="tail -n +${skip} '${src}'";;
1219 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1384 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1220 *) die "makeself cant handle exe '${exe}'" 1385 *) die "makeself cant handle exe '${exe}'"
1221 esac 1386 esac
1222 1387
1223 # lets grab the first few bytes of the file to figure out what kind of archive it is 1388 # lets grab the first few bytes of the file to figure out what kind of archive it is
1224 local tmpfile=$(emktemp) 1389 local tmpfile=$(emktemp)
… …
1261 lic="${PWD}/${lic}" 1426 lic="${PWD}/${lic}"
1262 elif [ -e "${lic}" ] ; then 1427 elif [ -e "${lic}" ] ; then
1263 lic="${lic}" 1428 lic="${lic}"
1264 fi 1429 fi
1265 fi 1430 fi
1266 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1267 local l="`basename ${lic}`" 1431 local l="`basename ${lic}`"
1268 1432
1269 # here is where we check for the licenses the user already 1433 # here is where we check for the licenses the user already
1270 # accepted ... if we don't find a match, we make the user accept 1434 # accepted ... if we don't find a match, we make the user accept
1271 local shopts=$-
1272 local alic 1435 local alic
1273 set -o noglob #so that bash doesn't expand "*" 1436 eshopts_push -o noglob # so that bash doesn't expand "*"
1274 for alic in ${ACCEPT_LICENSE} ; do 1437 for alic in ${ACCEPT_LICENSE} ; do
1275 if [[ ${alic} == ${l} ]]; then 1438 if [[ ${alic} == ${l} ]]; then
1276 set +o noglob; set -${shopts} #reset old shell opts 1439 eshopts_pop
1277 return 0 1440 return 0
1278 fi 1441 fi
1279 done 1442 done
1280 set +o noglob; set -$shopts #reset old shell opts 1443 eshopts_pop
1444 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1281 1445
1282 local licmsg=$(emktemp) 1446 local licmsg=$(emktemp)
1283 cat <<-EOF > ${licmsg} 1447 cat <<-EOF > ${licmsg}
1284 ********************************************************** 1448 **********************************************************
1285 The following license outlines the terms of use of this 1449 The following license outlines the terms of use of this
… …
1358 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1522 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1359 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1523 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1360 export CDROM_SET=-1 1524 export CDROM_SET=-1
1361 for f in ${CDROM_CHECK_1//:/ } ; do 1525 for f in ${CDROM_CHECK_1//:/ } ; do
1362 ((++CDROM_SET)) 1526 ((++CDROM_SET))
1363 [[ -e ${CD_ROOT}/${f} ]] && break 1527 [[ -e ${CDROM_ROOT}/${f} ]] && break
1364 done 1528 done
1365 export CDROM_MATCH=${f} 1529 export CDROM_MATCH=${f}
1366 return 1530 return
1367 fi 1531 fi
1368 1532
… …
1532# of the lists. 1696# of the lists.
1533strip-linguas() { 1697strip-linguas() {
1534 local ls newls nols 1698 local ls newls nols
1535 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1699 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1536 local op=$1; shift 1700 local op=$1; shift
1537 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1701 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1538 local d f 1702 local d f
1539 for d in "$@" ; do 1703 for d in "$@" ; do
1540 if [[ ${op} == "-u" ]] ; then 1704 if [[ ${op} == "-u" ]] ; then
1541 newls=${ls} 1705 newls=${ls}
1542 else 1706 else
1543 newls="" 1707 newls=""
1544 fi 1708 fi
1545 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1709 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1546 if [[ ${op} == "-i" ]] ; then 1710 if [[ ${op} == "-i" ]] ; then
1547 hasq ${f} ${ls} && newls="${newls} ${f}" 1711 hasq ${f} ${ls} && newls="${newls} ${f}"
1548 else 1712 else
1549 hasq ${f} ${ls} || newls="${newls} ${f}" 1713 hasq ${f} ${ls} || newls="${newls} ${f}"
1550 fi 1714 fi
… …
1563 else 1727 else
1564 nols="${nols} ${f}" 1728 nols="${nols} ${f}"
1565 fi 1729 fi
1566 done 1730 done
1567 [[ -n ${nols} ]] \ 1731 [[ -n ${nols} ]] \
1568 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1732 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1569 export LINGUAS=${newls:1} 1733 export LINGUAS=${newls:1}
1570} 1734}
1571 1735
1572# @FUNCTION: preserve_old_lib 1736# @FUNCTION: preserve_old_lib
1573# @USAGE: <libs to preserve> [more libs] 1737# @USAGE: <libs to preserve> [more libs]
… …
1583 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1747 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1584 die "Invalid preserve_old_lib() usage" 1748 die "Invalid preserve_old_lib() usage"
1585 fi 1749 fi
1586 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]" 1750 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1587 1751
1752 # let portage worry about it
1753 has preserve-libs ${FEATURES} && return 0
1754
1588 local lib dir 1755 local lib dir
1589 for lib in "$@" ; do 1756 for lib in "$@" ; do
1590 [[ -e ${ROOT}/${lib} ]] || continue 1757 [[ -e ${ROOT}/${lib} ]] || continue
1591 dir=${lib%/*} 1758 dir=${lib%/*}
1592 dodir ${dir} || die "dodir ${dir} failed" 1759 dodir ${dir} || die "dodir ${dir} failed"
… …
1602preserve_old_lib_notify() { 1769preserve_old_lib_notify() {
1603 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1770 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1604 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only" 1771 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1605 die "Invalid preserve_old_lib_notify() usage" 1772 die "Invalid preserve_old_lib_notify() usage"
1606 fi 1773 fi
1774
1775 # let portage worry about it
1776 has preserve-libs ${FEATURES} && return 0
1607 1777
1608 local lib notice=0 1778 local lib notice=0
1609 for lib in "$@" ; do 1779 for lib in "$@" ; do
1610 [[ -e ${ROOT}/${lib} ]] || continue 1780 [[ -e ${ROOT}/${lib} ]] || continue
1611 if [[ ${notice} -eq 0 ]] ; then 1781 if [[ ${notice} -eq 0 ]] ; then
… …
1615 ewarn "the libraries are not being removed. You need to run revdep-rebuild" 1785 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1616 ewarn "in order to remove these old dependencies. If you do not have this" 1786 ewarn "in order to remove these old dependencies. If you do not have this"
1617 ewarn "helper program, simply emerge the 'gentoolkit' package." 1787 ewarn "helper program, simply emerge the 'gentoolkit' package."
1618 ewarn 1788 ewarn
1619 fi 1789 fi
1620 ewarn " # revdep-rebuild --library ${lib##*/}" 1790 ewarn " # revdep-rebuild --library '${lib}'"
1621 done 1791 done
1622 if [[ ${notice} -eq 1 ]] ; then 1792 if [[ ${notice} -eq 1 ]] ; then
1623 ewarn 1793 ewarn
1624 ewarn "Once you've finished running revdep-rebuild, it should be safe to" 1794 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1625 ewarn "delete the old libraries." 1795 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1796 for lib in "$@" ; do
1797 ewarn " # rm '${lib}'"
1798 done
1626 fi 1799 fi
1627} 1800}
1628 1801
1629# @FUNCTION: built_with_use 1802# @FUNCTION: built_with_use
1630# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1803# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1631# @DESCRIPTION: 1804# @DESCRIPTION:
1805#
1806# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1807#
1632# A temporary hack until portage properly supports DEPENDing on USE 1808# A temporary hack until portage properly supports DEPENDing on USE
1633# flags being enabled in packages. This will check to see if the specified 1809# flags being enabled in packages. This will check to see if the specified
1634# DEPEND atom was built with the specified list of USE flags. The 1810# DEPEND atom was built with the specified list of USE flags. The
1635# --missing option controls the behavior if called on a package that does 1811# --missing option controls the behavior if called on a package that does
1636# not actually support the defined USE flags (aka listed in IUSE). 1812# not actually support the defined USE flags (aka listed in IUSE).
1637# The default is to abort (call die). The -a and -o flags control 1813# The default is to abort (call die). The -a and -o flags control
1638# the requirements of the USE flags. They correspond to "and" and "or" 1814# the requirements of the USE flags. They correspond to "and" and "or"
1639# logic. So the -a flag means all listed USE flags must be enabled 1815# logic. So the -a flag means all listed USE flags must be enabled
1640# while the -o flag means at least one of the listed fIUSE flags must be 1816# while the -o flag means at least one of the listed IUSE flags must be
1641# enabled. The --hidden option is really for internal use only as it 1817# enabled. The --hidden option is really for internal use only as it
1642# means the USE flag we're checking is hidden expanded, so it won't be found 1818# means the USE flag we're checking is hidden expanded, so it won't be found
1643# in IUSE like normal USE flags. 1819# in IUSE like normal USE flags.
1644# 1820#
1645# Remember that this function isn't terribly intelligent so order of optional 1821# Remember that this function isn't terribly intelligent so order of optional
… …
1680 die) die "Unable to determine what USE flags $PKG was built with";; 1856 die) die "Unable to determine what USE flags $PKG was built with";;
1681 esac 1857 esac
1682 fi 1858 fi
1683 1859
1684 if [[ ${hidden} == "no" ]] ; then 1860 if [[ ${hidden} == "no" ]] ; then
1685 local IUSE_BUILT=$(<${IUSEFILE}) 1861 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1686 # Don't check USE_EXPAND #147237 1862 # Don't check USE_EXPAND #147237
1687 local expand 1863 local expand
1688 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1864 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1689 if [[ $1 == ${expand}_* ]] ; then 1865 if [[ $1 == ${expand}_* ]] ; then
1690 expand="" 1866 expand=""
1691 break 1867 break
1692 fi 1868 fi
1693 done 1869 done
1694 if [[ -n ${expand} ]] ; then 1870 if [[ -n ${expand} ]] ; then
1695 if ! has $1 ${IUSE_BUILT} ; then 1871 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1696 case ${missing_action} in 1872 case ${missing_action} in
1697 true) return 0;; 1873 true) return 0;;
1698 false) return 1;; 1874 false) return 1;;
1699 die) die "$PKG does not actually support the $1 USE flag!";; 1875 die) die "$PKG does not actually support the $1 USE flag!";;
1700 esac 1876 esac
… …
1764 ) || die 1940 ) || die
1765 else 1941 else
1766 newbin "${tmpwrapper}" "${wrapper}" || die 1942 newbin "${tmpwrapper}" "${wrapper}" || die
1767 fi 1943 fi
1768} 1944}
1945
1946# @FUNCTION: prepalldocs
1947# @USAGE:
1948# @DESCRIPTION:
1949# Compress files in /usr/share/doc which are not already
1950# compressed, excluding /usr/share/doc/${PF}/html.
1951# Uses the ecompressdir to do the compression.
1952# 2009-02-18 by betelgeuse:
1953# Commented because ecompressdir is even more internal to
1954# Portage than prepalldocs (it's not even mentioned in man 5
1955# ebuild). Please submit a better version for review to gentoo-dev
1956# if you want prepalldocs here.
1957#prepalldocs() {
1958# if [[ -n $1 ]] ; then
1959# ewarn "prepalldocs: invalid usage; takes no arguments"
1960# fi
1961
1962# cd "${D}"
1963# [[ -d usr/share/doc ]] || return 0
1964
1965# find usr/share/doc -exec gzip {} +
1966# ecompressdir --ignore /usr/share/doc/${PF}/html
1967# ecompressdir --queue /usr/share/doc
1968#}
1969
1970# @FUNCTION: path_exists
1971# @USAGE: [-a|-o] <paths>
1972# @DESCRIPTION:
1973# Check if the specified paths exist. Works for all types of paths
1974# (files/dirs/etc...). The -a and -o flags control the requirements
1975# of the paths. They correspond to "and" and "or" logic. So the -a
1976# flag means all the paths must exist while the -o flag means at least
1977# one of the paths must exist. The default behavior is "and". If no
1978# paths are specified, then the return value is "false".
1979path_exists() {
1980 local opt=$1
1981 [[ ${opt} == -[ao] ]] && shift || opt="-a"
1982
1983 # no paths -> return false
1984 # same behavior as: [[ -e "" ]]
1985 [[ $# -eq 0 ]] && return 1
1986
1987 local p r=0
1988 for p in "$@" ; do
1989 [[ -e ${p} ]]
1990 : $(( r += $? ))
1991 done
1992
1993 case ${opt} in
1994 -a) return $(( r != 0 )) ;;
1995 -o) return $(( r == $# )) ;;
1996 esac
1997}
Legend:
Removed from v.1.296  
changed lines
  Added in v.1.352
  ViewVC Help
Powered by ViewVC 1.1.20