/[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.327
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.284 2007/06/21 04:44:45 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.327 2010/01/10 15:49:01 scarabeus 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
19 19
47 sleep 1 47 sleep 1
48 done 48 done
49 fi 49 fi
50} 50}
51 51
52# Default directory where patches are located 52# @FUNCTION: ecvs_clean
53# @USAGE: [list of dirs]
54# @DESCRIPTION:
55# Remove CVS directories recursiveley. Useful when a source tarball contains
56# internal CVS directories. Defaults to $PWD.
57ecvs_clean() {
58 [[ -z $* ]] && set -- .
59 find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
60 find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
61}
62
63# @FUNCTION: esvn_clean
64# @USAGE: [list of dirs]
65# @DESCRIPTION:
66# Remove .svn directories recursiveley. Useful when a source tarball contains
67# internal Subversion directories. Defaults to $PWD.
68esvn_clean() {
69 [[ -z $* ]] && set -- .
70 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
71}
72
73# @FUNCTION: eshopts_push
74# @USAGE: [options to `set`]
75# @DESCRIPTION:
76# Often times code will want to enable a shell option to change code behavior.
77# Since changing shell options can easily break other pieces of code (which
78# assume the default state), eshopts_push is used to (1) push the current shell
79# options onto a stack and (2) pass the specified arguments to set.
80#
81# A common example is to disable shell globbing so that special meaning/care
82# may be used with variables/arguments to custom functions. That would be:
83# @CODE
84# eshopts_push -o noglob
85# for x in ${foo} ; do
86# if ...some check... ; then
87# eshopts_pop
88# return 0
89# fi
90# done
91# eshopts_pop
92# @CODE
93eshopts_push() {
94 # have to assume __ESHOPTS_SAVE__ isn't screwed with
95 # as a `declare -a` here will reset its value
96 local i=${#__ESHOPTS_SAVE__[@]}
97 __ESHOPTS_SAVE__[$i]=$-
98 [[ $# -eq 0 ]] && return 0
99 set "$@" || die "eshopts_push: bad options to set: $*"
100}
101
102# @FUNCTION: eshopts_pop
103# @USAGE:
104# @DESCRIPTION:
105# Restore the shell options to the state saved with the corresponding
106# eshopts_push call. See that function for more details.
107eshopts_pop() {
108 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
109 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
110 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
111 local s=${__ESHOPTS_SAVE__[$i]}
112 unset __ESHOPTS_SAVE__[$i]
113 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
114 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
115}
116
117# @VARIABLE: EPATCH_SOURCE
118# @DESCRIPTION:
119# Default directory to search for patches.
53EPATCH_SOURCE="${WORKDIR}/patch" 120EPATCH_SOURCE="${WORKDIR}/patch"
54# Default extension for patches 121# @VARIABLE: EPATCH_SUFFIX
122# @DESCRIPTION:
123# Default extension for patches (do not prefix the period yourself).
55EPATCH_SUFFIX="patch.bz2" 124EPATCH_SUFFIX="patch.bz2"
125# @VARIABLE: EPATCH_OPTS
126# @DESCRIPTION:
56# Default options for patch 127# Default options for patch:
128# @CODE
57# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 129# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
58# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 130# --no-backup-if-mismatch - do not leave .orig files behind
59# Set -E to automatically remove empty files. 131# -E - automatically remove empty files
132# @CODE
60EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 133EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
134# @VARIABLE: EPATCH_EXCLUDE
135# @DESCRIPTION:
61# List of patches not to apply. Not this is only file names, 136# List of patches not to apply. Note this is only file names,
62# and not the full path .. 137# and not the full path. Globs accepted.
63EPATCH_EXCLUDE="" 138EPATCH_EXCLUDE=""
139# @VARIABLE: EPATCH_SINGLE_MSG
140# @DESCRIPTION:
64# Change the printed message for a single patch. 141# Change the printed message for a single patch.
65EPATCH_SINGLE_MSG="" 142EPATCH_SINGLE_MSG=""
143# @VARIABLE: EPATCH_MULTI_MSG
144# @DESCRIPTION:
66# Change the printed message for multiple patches. 145# Change the printed message for multiple patches.
67EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 146EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
68# Force applying bulk patches even if not following the style: 147# @VARIABLE: EPATCH_FORCE
69# 148# @DESCRIPTION:
70# ??_${ARCH}_foo.${EPATCH_SUFFIX} 149# Only require patches to match EPATCH_SUFFIX rather than the extended
71# 150# arch naming style.
72EPATCH_FORCE="no" 151EPATCH_FORCE="no"
73 152
74# This function is for bulk patching, or in theory for just one 153# @FUNCTION: epatch
75# or two patches. 154# @USAGE: [patches] [dirs of patches]
155# @DESCRIPTION:
156# epatch is designed to greatly simplify the application of patches. It can
157# process patch files directly, or directories of patches. The patches may be
158# compressed (bzip/gzip/etc...) or plain text. You generally need not specify
159# the -p option as epatch will automatically attempt -p0 to -p5 until things
160# apply successfully.
76# 161#
77# It should work with .bz2, .gz, .zip and plain text patches. 162# If you do not specify any options, then epatch will default to the directory
78# Currently all patches should be the same format. 163# specified by EPATCH_SOURCE.
79# 164#
80# You do not have to specify '-p' option to patch, as it will 165# When processing directories, epatch will apply all patches that match:
81# try with -p0 to -p5 until it succeed, or fail at -p5. 166# @CODE
82# 167# ${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} 168# ??_${ARCH}_foo.${EPATCH_SUFFIX}
169# else
170# *.${EPATCH_SUFFIX}
171# @CODE
172# The leading ?? are typically numbers used to force consistent patch ordering.
173# The arch field is used to apply patches only for the host architecture with
174# the special value of "all" means apply for everyone. Note that using values
175# other than "all" is highly discouraged -- you should apply patches all the
176# time and let architecture details be detected at configure/compile time.
92# 177#
93# For example: 178# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
179# for patches to apply.
94# 180#
95# 01_all_misc-fix.patch.bz2 181# 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() { 182epatch() {
108 _epatch_draw_line() { 183 _epatch_draw_line() {
184 # create a line of same length as input string
109 [[ -z $1 ]] && set "$(printf "%65s" '')" 185 [[ -z $1 ]] && set "$(printf "%65s" '')"
110 echo "${1//?/=}" 186 echo "${1//?/=}"
111 } 187 }
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 188
120 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 189 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
121 190
122 if [ "$#" -gt 1 ] 191 # Let the rest of the code process one user arg at a time --
123 then 192 # each arg may expand into multiple patches, and each arg may
193 # need to start off with the default global EPATCH_xxx values
194 if [[ $# -gt 1 ]] ; then
124 local m="" 195 local m
125 for m in "$@" ; do 196 for m in "$@" ; do
126 epatch "${m}" 197 epatch "${m}"
127 done 198 done
128 return 0 199 return 0
129 fi 200 fi
130 201
131 if [ -n "$1" -a -f "$1" ] 202 local SINGLE_PATCH="no"
132 then 203 # no args means process ${EPATCH_SOURCE}
204 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
205
206 if [[ -f $1 ]] ; then
133 SINGLE_PATCH="yes" 207 SINGLE_PATCH="yes"
134 208 set -- "$1"
135 local EPATCH_SOURCE="$1" 209 # Use the suffix from the single patch (localize it); the code
210 # below will find the suffix for us
136 local EPATCH_SUFFIX="${1##*\.}" 211 local EPATCH_SUFFIX=$1
137 212
138 elif [ -n "$1" -a -d "$1" ] 213 elif [[ -d $1 ]] ; then
139 then 214 # 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 ... 215 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
141 if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] 216
217 else
218 # sanity check ... if it isn't a dir or file, wtf man ?
219 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
220 echo
221 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
222 eerror
223 eerror " ${EPATCH_SOURCE}"
224 eerror " ( ${EPATCH_SOURCE##*/} )"
225 echo
226 die "Cannot find \$EPATCH_SOURCE!"
227 fi
228
229 local PIPE_CMD
230 case ${EPATCH_SUFFIX##*\.} in
231 xz) PIPE_CMD="xz -dc" ;;
232 lzma) PIPE_CMD="lzma -dc" ;;
233 bz2) PIPE_CMD="bzip2 -dc" ;;
234 gz|Z|z) PIPE_CMD="gzip -dc" ;;
235 ZIP|zip) PIPE_CMD="unzip -p" ;;
236 *) ;;
237 esac
238
239 [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
240
241 local x
242 for x in "$@" ; do
243 # If the patch dir given contains subdirs, or our EPATCH_SUFFIX
244 # didn't match anything, ignore continue on
245 [[ ! -f ${x} ]] && continue
246
247 local patchname=${x##*/}
248
249 # Apply single patches, or forced sets of patches, or
250 # patches with ARCH dependant names.
251 # ???_arch_foo.patch
252 # Else, skip this input altogether
253 local a=${patchname#*_} # strip the ???_
254 a=${a%%_*} # strip the _foo.patch
255 if ! [[ ${SINGLE_PATCH} == "yes" || \
256 ${EPATCH_FORCE} == "yes" || \
257 ${a} == all || \
258 ${a} == ${ARCH} ]]
142 then 259 then
143 local EPATCH_SOURCE="$1/*" 260 continue
261 fi
262
263 # Let people filter things dynamically
264 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
265 # let people use globs in the exclude
266 eshopts_push -o noglob
267
268 local ex skip
269 for ex in ${EPATCH_EXCLUDE} ; do
270 [[ ${patchname} == ${ex} ]] && skip=1
271 done
272
273 eshopts_pop
274
275 [[ ${skip} = 1 ]] && continue
276 fi
277
278 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
279 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
280 einfo "${EPATCH_SINGLE_MSG}"
281 else
282 einfo "Applying ${patchname} ..."
283 fi
144 else 284 else
145 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 285 einfo " ${patchname} ..."
146 fi 286 fi
147 else 287
148 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ] 288 # most of the time, there will only be one run per unique name,
149 then 289 # but if there are more, make sure we get unique log filenames
150 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 290 local STDERR_TARGET="${T}/${patchname}.out"
151 then 291 if [[ -e ${STDERR_TARGET} ]] ; then
152 EPATCH_SOURCE="$1" 292 STDERR_TARGET="${T}/${patchname}-$$.out"
293 fi
294
295 printf "***** %s *****\n\n" "${patchname}" > "${STDERR_TARGET}"
296
297 # Decompress the patch if need be
298 local count=0
299 local PATCH_TARGET
300 if [[ -n ${PIPE_CMD} ]] ; then
301 PATCH_TARGET="${T}/$$.patch"
302 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
303
304 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
305 echo
306 eerror "Could not extract patch!"
307 #die "Could not extract patch!"
308 count=5
309 break
153 fi 310 fi
311 else
312 PATCH_TARGET=${x}
313 fi
154 314
315 # Check for absolute paths in patches. If sandbox is disabled,
316 # people could (accidently) patch files in the root filesystem.
317 # Or trigger other unpleasantries #237667. So disallow -p0 on
318 # such patches.
319 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
320 if [[ -n ${abs_paths} ]] ; then
321 count=1
322 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
323 fi
324
325 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
326 while [[ ${count} -lt 5 ]] ; do
327 # Generate some useful debug info ...
328 (
329 _epatch_draw_line "***** ${patchname} *****"
155 echo 330 echo
156 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 331 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
332 echo
333 _epatch_draw_line "***** ${patchname} *****"
334 ) >> "${STDERR_TARGET}"
335
336 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
337 (
338 _epatch_draw_line "***** ${patchname} *****"
339 echo
340 echo "ACTUALLY APPLYING ${patchname} ..."
341 echo
342 _epatch_draw_line "***** ${patchname} *****"
343 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
344 ) >> "${STDERR_TARGET}"
345
346 if [ $? -ne 0 ] ; then
347 echo
348 eerror "A dry-run of patch command succeeded, but actually"
349 eerror "applying the patch failed!"
350 #die "Real world sux compared to the dreamworld!"
351 count=5
352 fi
353 break
354 fi
355
356 : $(( count++ ))
357 done
358
359 # if we had to decompress the patch, delete the temp one
360 if [[ -n ${PIPE_CMD} ]] ; then
361 rm -f "${PATCH_TARGET}"
362 fi
363
364 if [[ ${count} -ge 5 ]] ; then
365 echo
366 eerror "Failed Patch: ${patchname} !"
367 eerror " ( ${PATCH_TARGET} )"
157 eerror 368 eerror
158 eerror " ${EPATCH_SOURCE}" 369 eerror "Include in your bugreport the contents of:"
159 eerror " ( ${EPATCH_SOURCE##*/} )" 370 eerror
371 eerror " ${STDERR_TARGET}"
160 echo 372 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}!" 373 die "Failed Patch: ${patchname}!"
305 fi 374 fi
306 375
307 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 376 # if everything worked, delete the patch log
308 377 rm -f "${STDERR_TARGET}"
309 eend 0 378 eend 0
310 fi
311 done 379 done
312 if [ "${SINGLE_PATCH}" = "no" ] 380
313 then 381 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
314 einfo "Done with patching" 382 : # everything worked
383}
384epatch_user() {
385 [[ $# -ne 0 ]] && die "epatch_user takes no options"
386
387 # don't clobber any EPATCH vars that the parent might want
388 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
389 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
390 EPATCH_SOURCE=${base}/${CTARGET}/${check}
391 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
392 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
393 if [[ -d ${EPATCH_SOURCE} ]] ; then
394 EPATCH_SOURCE=${EPATCH_SOURCE} \
395 EPATCH_SUFFIX="patch" \
396 EPATCH_FORCE="yes" \
397 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
398 epatch
399 break
315 fi 400 fi
401 done
316} 402}
317 403
318# @FUNCTION: emktemp 404# @FUNCTION: emktemp
319# @USAGE: [temp dir] 405# @USAGE: [temp dir]
320# @DESCRIPTION: 406# @DESCRIPTION:
356# base-system@gentoo.org (Linux) 442# base-system@gentoo.org (Linux)
357# Joe Jezak <josejx@gmail.com> (OS X) 443# Joe Jezak <josejx@gmail.com> (OS X)
358# usata@gentoo.org (OS X) 444# usata@gentoo.org (OS X)
359# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 445# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
360# @DESCRIPTION: 446# @DESCRIPTION:
361# Small wrapper for getent (Linux), nidump (Mac OS X), 447# Small wrapper for getent (Linux),
448# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
362# and pw (FreeBSD) used in enewuser()/enewgroup() 449# and pw (FreeBSD) used in enewuser()/enewgroup()
363egetent() { 450egetent() {
364 case ${CHOST} in 451 case ${CHOST} in
365 *-darwin*) 452 *-darwin[678])
366 case "$2" in 453 case "$2" in
367 *[!0-9]*) # Non numeric 454 *[!0-9]*) # Non numeric
368 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 455 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
369 ;; 456 ;;
370 *) # Numeric 457 *) # Numeric
371 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 458 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
459 ;;
460 esac
461 ;;
462 *-darwin*)
463 local mytype=$1
464 [[ "passwd" == $mytype ]] && mytype="Users"
465 [[ "group" == $mytype ]] && mytype="Groups"
466 case "$2" in
467 *[!0-9]*) # Non numeric
468 dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
469 ;;
470 *) # Numeric
471 local mykey="UniqueID"
472 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
473 dscl . -search /$mytype $mykey $2 2>/dev/null
372 ;; 474 ;;
373 esac 475 esac
374 ;; 476 ;;
375 *-freebsd*|*-dragonfly*) 477 *-freebsd*|*-dragonfly*)
376 local opts action="user" 478 local opts action="user"
576 fi 678 fi
577 ;; 679 ;;
578 680
579 *) 681 *)
580 if [[ -z $@ ]] ; then 682 if [[ -z $@ ]] ; then
581 useradd ${opts} ${euser} \ 683 useradd ${opts} \
582 -c "added by portage for ${PN}" \ 684 -c "added by portage for ${PN}" \
685 ${euser} \
583 || die "enewuser failed" 686 || die "enewuser failed"
584 else 687 else
585 einfo " - Extra: $@" 688 einfo " - Extra: $@"
586 useradd ${opts} ${euser} "$@" \ 689 useradd ${opts} "$@" \
690 ${euser} \
587 || die "enewuser failed" 691 || die "enewuser failed"
588 fi 692 fi
589 ;; 693 ;;
590 esac 694 esac
591 695
739make_desktop_entry() { 843make_desktop_entry() {
740 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 844 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
741 845
742 local exec=${1} 846 local exec=${1}
743 local name=${2:-${PN}} 847 local name=${2:-${PN}}
744 local icon=${3:-${PN}.png} 848 local icon=${3:-${PN}}
745 local type=${4} 849 local type=${4}
746 local path=${5} 850 local path=${5}
747 851
748 if [[ -z ${type} ]] ; then 852 if [[ -z ${type} ]] ; then
749 local catmaj=${CATEGORY%%-*} 853 local catmaj=${CATEGORY%%-*}
873 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 977 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
874 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 978 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
875 979
876 cat <<-EOF > "${desktop}" 980 cat <<-EOF > "${desktop}"
877 [Desktop Entry] 981 [Desktop Entry]
878 Encoding=UTF-8
879 Version=1.0
880 Name=${name} 982 Name=${name}
881 Type=Application 983 Type=Application
882 Comment=${DESCRIPTION} 984 Comment=${DESCRIPTION}
883 Exec=${exec} 985 Exec=${exec}
884 TryExec=${exec%% *} 986 TryExec=${exec%% *}
885 Path=${path}
886 Icon=${icon} 987 Icon=${icon}
887 Categories=${type}; 988 Categories=${type};
888 EOF 989 EOF
990
991 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}"
889 992
890 ( 993 (
891 # wrap the env here so that the 'insinto' call 994 # wrap the env here so that the 'insinto' call
892 # doesn't corrupt the env of the caller 995 # doesn't corrupt the env of the caller
893 insinto /usr/share/applications 996 insinto /usr/share/applications
922 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo." 1025 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
923 fi 1026 fi
924} 1027}
925 1028
926# @FUNCTION: make_session_desktop 1029# @FUNCTION: make_session_desktop
927# @USAGE: <title> <command> 1030# @USAGE: <title> <command> [command args...]
928# @DESCRIPTION: 1031# @DESCRIPTION:
929# Make a GDM/KDM Session file. The title is the file to execute to start the 1032# 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. 1033# Window Manager. The command is the name of the Window Manager.
1034#
1035# You can set the name of the file via the ${wm} variable.
931make_session_desktop() { 1036make_session_desktop() {
932 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 1037 [[ -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 1038 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
934 1039
935 local title=$1 1040 local title=$1
936 local command=$2 1041 local command=$2
937 local desktop=${T}/${wm}.desktop 1042 local desktop=${T}/${wm:-${PN}}.desktop
1043 shift 2
938 1044
939 cat <<-EOF > "${desktop}" 1045 cat <<-EOF > "${desktop}"
940 [Desktop Entry] 1046 [Desktop Entry]
941 Encoding=UTF-8
942 Name=${title} 1047 Name=${title}
943 Comment=This session logs you into ${title} 1048 Comment=This session logs you into ${title}
944 Exec=${command} 1049 Exec=${command} $*
945 TryExec=${command} 1050 TryExec=${command}
946 Type=Application 1051 Type=XSession
947 EOF 1052 EOF
948 1053
949 ( 1054 (
950 # wrap the env here so that the 'insinto' call 1055 # wrap the env here so that the 'insinto' call
951 # doesn't corrupt the env of the caller 1056 # doesn't corrupt the env of the caller
972 elif [[ -d ${i} ]] ; then 1077 elif [[ -d ${i} ]] ; then
973 for j in "${i}"/*.desktop ; do 1078 for j in "${i}"/*.desktop ; do
974 doins "${j}" 1079 doins "${j}"
975 ((ret+=$?)) 1080 ((ret+=$?))
976 done 1081 done
1082 else
1083 ((++ret))
977 fi 1084 fi
978 done 1085 done
979 exit ${ret} 1086 exit ${ret}
980 ) 1087 )
981} 1088}
1011 elif [[ -d ${i} ]] ; then 1118 elif [[ -d ${i} ]] ; then
1012 for j in "${i}"/*.png ; do 1119 for j in "${i}"/*.png ; do
1013 doins "${j}" 1120 doins "${j}"
1014 ((ret+=$?)) 1121 ((ret+=$?))
1015 done 1122 done
1123 else
1124 ((++ret))
1016 fi 1125 fi
1017 done 1126 done
1018 exit ${ret} 1127 exit ${ret}
1019 ) 1128 )
1020} 1129}
1055# @DESCRIPTION: 1164# @DESCRIPTION:
1056# Unpack those pesky pdv generated files ... 1165# Unpack those pesky pdv generated files ...
1057# They're self-unpacking programs with the binary package stuffed in 1166# 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 1167# 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. 1168# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1060# 1169#
1061# You have to specify the off_t size ... I have no idea how to extract that 1170# 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 1171# 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 1172# the size of the off_t type (in bytes) on the machine that built the pdv
1064# archive. 1173# archive.
1065# 1174#
1066# One way to determine this is by running the following commands: 1175# One way to determine this is by running the following commands:
1176#
1177# @CODE
1067# strings <pdv archive> | grep lseek 1178# strings <pdv archive> | grep lseek
1068# strace -elseek <pdv archive> 1179# strace -elseek <pdv archive>
1180# @CODE
1181#
1069# Basically look for the first lseek command (we do the strings/grep because 1182# 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 1183# sometimes the function call is _llseek or something) and steal the 2nd
1071# parameter. Here is an example: 1184# parameter. Here is an example:
1185#
1186# @CODE
1072# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1187# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1073# lseek 1188# lseek
1074# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1189# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1075# lseek(3, -4, SEEK_END) = 2981250 1190# lseek(3, -4, SEEK_END) = 2981250
1191# @CODE
1192#
1076# Thus we would pass in the value of '4' as the second parameter. 1193# Thus we would pass in the value of '4' as the second parameter.
1077unpack_pdv() { 1194unpack_pdv() {
1078 local src=$(find_unpackable_file "$1") 1195 local src=$(find_unpackable_file "$1")
1079 local sizeoff_t=$2 1196 local sizeoff_t=$2
1080 1197
1150# @DESCRIPTION: 1267# @DESCRIPTION:
1151# Unpack those pesky makeself generated files ... 1268# Unpack those pesky makeself generated files ...
1152# They're shell scripts with the binary package tagged onto 1269# They're shell scripts with the binary package tagged onto
1153# the end of the archive. Loki utilized the format as does 1270# the end of the archive. Loki utilized the format as does
1154# many other game companies. 1271# many other game companies.
1155# 1272#
1156# If the file is not specified, then ${A} is used. If the 1273# If the file is not specified, then ${A} is used. If the
1157# offset is not specified then we will attempt to extract 1274# offset is not specified then we will attempt to extract
1158# the proper offset from the script itself. 1275# the proper offset from the script itself.
1159unpack_makeself() { 1276unpack_makeself() {
1160 local src_input=${1:-${A}} 1277 local src_input=${1:-${A}}
1251 lic="${PWD}/${lic}" 1368 lic="${PWD}/${lic}"
1252 elif [ -e "${lic}" ] ; then 1369 elif [ -e "${lic}" ] ; then
1253 lic="${lic}" 1370 lic="${lic}"
1254 fi 1371 fi
1255 fi 1372 fi
1256 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1257 local l="`basename ${lic}`" 1373 local l="`basename ${lic}`"
1258 1374
1259 # here is where we check for the licenses the user already 1375 # 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 1376 # accepted ... if we don't find a match, we make the user accept
1261 local shopts=$-
1262 local alic 1377 local alic
1263 set -o noglob #so that bash doesn't expand "*" 1378 eshopts_push -o noglob # so that bash doesn't expand "*"
1264 for alic in ${ACCEPT_LICENSE} ; do 1379 for alic in ${ACCEPT_LICENSE} ; do
1265 if [[ ${alic} == ${l} ]]; then 1380 if [[ ${alic} == ${l} ]]; then
1266 set +o noglob; set -${shopts} #reset old shell opts 1381 eshopts_pop
1267 return 0 1382 return 0
1268 fi 1383 fi
1269 done 1384 done
1270 set +o noglob; set -$shopts #reset old shell opts 1385 eshopts_pop
1386 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1271 1387
1272 local licmsg=$(emktemp) 1388 local licmsg=$(emktemp)
1273 cat <<-EOF > ${licmsg} 1389 cat <<-EOF > ${licmsg}
1274 ********************************************************** 1390 **********************************************************
1275 The following license outlines the terms of use of this 1391 The following license outlines the terms of use of this
1276 package. You MUST accept this license for installation to 1392 package. You MUST accept this license for installation to
1277 continue. When you are done viewing, hit 'q'. If you 1393 continue. When you are done viewing, hit 'q'. If you
1278 CTRL+C out of this, the install will not run! 1394 CTRL+C out of this, the install will not run!
1279 ********************************************************** 1395 **********************************************************
1280 1396
1281 EOF 1397 EOF
1282 cat ${lic} >> ${licmsg} 1398 cat ${lic} >> ${licmsg}
1283 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1399 ${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] " 1400 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1285 read alic 1401 read alic
1298# @FUNCTION: cdrom_get_cds 1414# @FUNCTION: cdrom_get_cds
1299# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...] 1415# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...]
1300# @DESCRIPTION: 1416# @DESCRIPTION:
1301# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates 1417# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates
1302# the whole 'non-interactive' policy, but damnit I want CD support ! 1418# the whole 'non-interactive' policy, but damnit I want CD support !
1303# 1419#
1304# With these cdrom functions we handle all the user interaction and 1420# With these cdrom functions we handle all the user interaction and
1305# standardize everything. All you have to do is call cdrom_get_cds() 1421# 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 1422# and when the function returns, you can assume that the cd has been
1307# found at CDROM_ROOT. 1423# found at CDROM_ROOT.
1308# 1424#
1309# The function will attempt to locate a cd based upon a file that is on 1425# 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 1426# the cd. The more files you give this function, the more cds
1311# the cdrom functions will handle. 1427# the cdrom functions will handle.
1312# 1428#
1313# Normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1429# 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 1430# etc... If you want to give the cds better names, then just export
1315# the appropriate CDROM_NAME variable before calling cdrom_get_cds(). 1431# 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 1432# Use CDROM_NAME for one cd, or CDROM_NAME_# for multiple cds. You can
1317# also use the CDROM_NAME_SET bash array. 1433# also use the CDROM_NAME_SET bash array.
1318# 1434#
1319# For those multi cd ebuilds, see the cdrom_load_next_cd() function. 1435# For those multi cd ebuilds, see the cdrom_load_next_cd() function.
1320cdrom_get_cds() { 1436cdrom_get_cds() {
1321 # first we figure out how many cds we're dealing with by 1437 # first we figure out how many cds we're dealing with by
1322 # the # of files they gave us 1438 # the # of files they gave us
1323 local cdcnt=0 1439 local cdcnt=0
1444# displayed and we'll hang out here until: 1560# displayed and we'll hang out here until:
1445# (1) the file is found on a mounted cdrom 1561# (1) the file is found on a mounted cdrom
1446# (2) the user hits CTRL+C 1562# (2) the user hits CTRL+C
1447_cdrom_locate_file_on_cd() { 1563_cdrom_locate_file_on_cd() {
1448 local mline="" 1564 local mline=""
1449 local showedmsg=0 1565 local showedmsg=0 showjolietmsg=0
1450 1566
1451 while [[ -z ${CDROM_ROOT} ]] ; do 1567 while [[ -z ${CDROM_ROOT} ]] ; do
1452 local i=0 1568 local i=0
1453 local -a cdset=(${*//:/ }) 1569 local -a cdset=(${*//:/ })
1454 if [[ -n ${CDROM_SET} ]] ; then 1570 if [[ -n ${CDROM_SET} ]] ; then
1463 while read point node fs foo ; do 1579 while read point node fs foo ; do
1464 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \ 1580 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1465 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \ 1581 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1466 && continue 1582 && continue
1467 point=${point//\040/ } 1583 point=${point//\040/ }
1584 [[ ! -d ${point}/${dir} ]] && continue
1468 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue 1585 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1469 export CDROM_ROOT=${point} 1586 export CDROM_ROOT=${point}
1470 export CDROM_SET=${i} 1587 export CDROM_SET=${i}
1471 export CDROM_MATCH=${cdset[${i}]} 1588 export CDROM_MATCH=${cdset[${i}]}
1472 return 1589 return
1494 showedmsg=1 1611 showedmsg=1
1495 fi 1612 fi
1496 einfo "Press return to scan for the cd again" 1613 einfo "Press return to scan for the cd again"
1497 einfo "or hit CTRL+C to abort the emerge." 1614 einfo "or hit CTRL+C to abort the emerge."
1498 echo 1615 echo
1616 if [[ ${showjolietmsg} -eq 0 ]] ; then
1617 showjolietmsg=1
1618 else
1499 einfo "If you are having trouble with the detection" 1619 ewarn "If you are having trouble with the detection"
1500 einfo "of your CD, it is possible that you do not have" 1620 ewarn "of your CD, it is possible that you do not have"
1501 einfo "Joliet support enabled in your kernel. Please" 1621 ewarn "Joliet support enabled in your kernel. Please"
1502 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1622 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1623 ebeep 5
1624 fi
1503 read || die "something is screwed with your system" 1625 read || die "something is screwed with your system"
1504 done 1626 done
1505} 1627}
1506 1628
1629# @FUNCTION: strip-linguas
1630# @USAGE: [<allow LINGUAS>|<-i|-u> <directories of .po files>]
1631# @DESCRIPTION:
1507# Make sure that LINGUAS only contains languages that 1632# Make sure that LINGUAS only contains languages that
1508# a package can support 1633# a package can support. The first form allows you to
1509# 1634# specify a list of LINGUAS. The -i builds a list of po
1510# usage: strip-linguas <allow LINGUAS> 1635# files found in all the directories and uses the
1511# strip-linguas -i <directories of .po files> 1636# intersection of the lists. The -u builds a list of po
1512# strip-linguas -u <directories of .po files> 1637# files found in all the directories and uses the union
1513# 1638# 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() { 1639strip-linguas() {
1520 local ls newls nols 1640 local ls newls nols
1521 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1641 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1522 local op=$1; shift 1642 local op=$1; shift
1523 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1643 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1524 local d f 1644 local d f
1525 for d in "$@" ; do 1645 for d in "$@" ; do
1526 if [[ ${op} == "-u" ]] ; then 1646 if [[ ${op} == "-u" ]] ; then
1527 newls=${ls} 1647 newls=${ls}
1528 else 1648 else
1529 newls="" 1649 newls=""
1530 fi 1650 fi
1531 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1651 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1532 if [[ ${op} == "-i" ]] ; then 1652 if [[ ${op} == "-i" ]] ; then
1533 hasq ${f} ${ls} && newls="${newls} ${f}" 1653 hasq ${f} ${ls} && newls="${newls} ${f}"
1534 else 1654 else
1535 hasq ${f} ${ls} || newls="${newls} ${f}" 1655 hasq ${f} ${ls} || newls="${newls} ${f}"
1536 fi 1656 fi
1549 else 1669 else
1550 nols="${nols} ${f}" 1670 nols="${nols} ${f}"
1551 fi 1671 fi
1552 done 1672 done
1553 [[ -n ${nols} ]] \ 1673 [[ -n ${nols} ]] \
1554 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1674 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1555 export LINGUAS=${newls:1} 1675 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} 1676}
1587 1677
1588# @FUNCTION: preserve_old_lib 1678# @FUNCTION: preserve_old_lib
1589# @USAGE: <libs to preserve> [more libs] 1679# @USAGE: <libs to preserve> [more libs]
1590# @DESCRIPTION: 1680# @DESCRIPTION:
1599 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1689 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1600 die "Invalid preserve_old_lib() usage" 1690 die "Invalid preserve_old_lib() usage"
1601 fi 1691 fi
1602 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]" 1692 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1603 1693
1694 # let portage worry about it
1695 has preserve-libs ${FEATURES} && return 0
1696
1604 local lib dir 1697 local lib dir
1605 for lib in "$@" ; do 1698 for lib in "$@" ; do
1606 [[ -e ${ROOT}/${lib} ]] || continue 1699 [[ -e ${ROOT}/${lib} ]] || continue
1607 dir=${lib%/*} 1700 dir=${lib%/*}
1608 dodir ${dir} || die "dodir ${dir} failed" 1701 dodir ${dir} || die "dodir ${dir} failed"
1618preserve_old_lib_notify() { 1711preserve_old_lib_notify() {
1619 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1712 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1620 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only" 1713 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1621 die "Invalid preserve_old_lib_notify() usage" 1714 die "Invalid preserve_old_lib_notify() usage"
1622 fi 1715 fi
1716
1717 # let portage worry about it
1718 has preserve-libs ${FEATURES} && return 0
1623 1719
1624 local lib notice=0 1720 local lib notice=0
1625 for lib in "$@" ; do 1721 for lib in "$@" ; do
1626 [[ -e ${ROOT}/${lib} ]] || continue 1722 [[ -e ${ROOT}/${lib} ]] || continue
1627 if [[ ${notice} -eq 0 ]] ; then 1723 if [[ ${notice} -eq 0 ]] ; then
1633 ewarn "helper program, simply emerge the 'gentoolkit' package." 1729 ewarn "helper program, simply emerge the 'gentoolkit' package."
1634 ewarn 1730 ewarn
1635 fi 1731 fi
1636 ewarn " # revdep-rebuild --library ${lib##*/}" 1732 ewarn " # revdep-rebuild --library ${lib##*/}"
1637 done 1733 done
1734 if [[ ${notice} -eq 1 ]] ; then
1735 ewarn
1736 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1737 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1738 for lib in "$@" ; do
1739 ewarn " # rm '${lib}'"
1740 done
1741 fi
1638} 1742}
1639 1743
1640# @FUNCTION: built_with_use 1744# @FUNCTION: built_with_use
1641# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1745# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1642# @DESCRIPTION: 1746# @DESCRIPTION:
1646# --missing option controls the behavior if called on a package that does 1750# --missing option controls the behavior if called on a package that does
1647# not actually support the defined USE flags (aka listed in IUSE). 1751# 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 1752# 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" 1753# 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 1754# 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 1755# 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 1756# 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 1757# means the USE flag we're checking is hidden expanded, so it won't be found
1654# in IUSE like normal USE flags. 1758# in IUSE like normal USE flags.
1655# 1759#
1656# Remember that this function isn't terribly intelligent so order of optional 1760# Remember that this function isn't terribly intelligent so order of optional
1657# flags matter. 1761# flags matter.
1658built_with_use() { 1762built_with_use() {
1659 local hidden="no" 1763 local hidden="no"
1660 if [[ $1 == "--hidden" ]] ; then 1764 if [[ $1 == "--hidden" ]] ; then
1691 die) die "Unable to determine what USE flags $PKG was built with";; 1795 die) die "Unable to determine what USE flags $PKG was built with";;
1692 esac 1796 esac
1693 fi 1797 fi
1694 1798
1695 if [[ ${hidden} == "no" ]] ; then 1799 if [[ ${hidden} == "no" ]] ; then
1696 local IUSE_BUILT=$(<${IUSEFILE}) 1800 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1697 # Don't check USE_EXPAND #147237 1801 # Don't check USE_EXPAND #147237
1698 local expand 1802 local expand
1699 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1803 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1700 if [[ $1 == ${expand}_* ]] ; then 1804 if [[ $1 == ${expand}_* ]] ; then
1701 expand="" 1805 expand=""
1702 break 1806 break
1703 fi 1807 fi
1704 done 1808 done
1705 if [[ -n ${expand} ]] ; then 1809 if [[ -n ${expand} ]] ; then
1706 if ! has $1 ${IUSE_BUILT} ; then 1810 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1707 case ${missing_action} in 1811 case ${missing_action} in
1708 true) return 0;; 1812 true) return 0;;
1709 false) return 1;; 1813 false) return 1;;
1710 die) die "$PKG does not actually support the $1 USE flag!";; 1814 die) die "$PKG does not actually support the $1 USE flag!";;
1711 esac 1815 esac
1723 shift 1827 shift
1724 done 1828 done
1725 [[ ${opt} = "-a" ]] 1829 [[ ${opt} = "-a" ]]
1726} 1830}
1727 1831
1728# @DESCRIPTION: epunt_cxx 1832# @FUNCTION: epunt_cxx
1729# @USAGE: [dir to scan] 1833# @USAGE: [dir to scan]
1730# @DESCRIPTION: 1834# @DESCRIPTION:
1731# Many configure scripts wrongly bail when a C++ compiler could not be 1835# Many configure scripts wrongly bail when a C++ compiler could not be
1732# detected. If dir is not specified, then it defaults to ${S}. 1836# detected. If dir is not specified, then it defaults to ${S}.
1733# 1837#
1735epunt_cxx() { 1839epunt_cxx() {
1736 local dir=$1 1840 local dir=$1
1737 [[ -z ${dir} ]] && dir=${S} 1841 [[ -z ${dir} ]] && dir=${S}
1738 ebegin "Removing useless C++ checks" 1842 ebegin "Removing useless C++ checks"
1739 local f 1843 local f
1740 for f in $(find ${dir} -name configure) ; do 1844 find "${dir}" -name configure | while read f ; do
1741 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1845 patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1742 done 1846 done
1743 eend 0 1847 eend 0
1744} 1848}
1745 1849
1746# @FUNCTION: make_wrapper 1850# @FUNCTION: make_wrapper
1747# @USAGE: <wrapper> <target> <chdir> [libpaths] [installpath] 1851# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1748# @DESCRIPTION: 1852# @DESCRIPTION:
1749# Create a shell wrapper script named wrapper in installpath 1853# Create a shell wrapper script named wrapper in installpath
1750# (defaults to the bindir) to execute target (default of wrapper) by 1854# (defaults to the bindir) to execute target (default of wrapper) by
1751# first optionally setting LD_LIBRARY_PATH to the colon-delimited 1855# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1752# libpaths followed by optionally changing directory to chdir. 1856# libpaths followed by optionally changing directory to chdir.
1775 ) || die 1879 ) || die
1776 else 1880 else
1777 newbin "${tmpwrapper}" "${wrapper}" || die 1881 newbin "${tmpwrapper}" "${wrapper}" || die
1778 fi 1882 fi
1779} 1883}
1884
1885# @FUNCTION: prepalldocs
1886# @USAGE:
1887# @DESCRIPTION:
1888# Compress files in /usr/share/doc which are not already
1889# compressed, excluding /usr/share/doc/${PF}/html.
1890# Uses the ecompressdir to do the compression.
1891# 2009-02-18 by betelgeuse:
1892# Commented because ecompressdir is even more internal to
1893# Portage than prepalldocs (it's not even mentioned in man 5
1894# ebuild). Please submit a better version for review to gentoo-dev
1895# if you want prepalldocs here.
1896#prepalldocs() {
1897# if [[ -n $1 ]] ; then
1898# ewarn "prepalldocs: invalid usage; takes no arguments"
1899# fi
1900
1901# cd "${D}"
1902# [[ -d usr/share/doc ]] || return 0
1903
1904# find usr/share/doc -exec gzip {} +
1905# ecompressdir --ignore /usr/share/doc/${PF}/html
1906# ecompressdir --queue /usr/share/doc
1907#}

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

  ViewVC Help
Powered by ViewVC 1.1.20