/[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.326
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.326 2010/01/10 05:53:36 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
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
269 for ex in ${EPATCH_EXCLUDE} ; do
270 [[ ${patchname} == ${ex} ]] && continue
271 done
272
273 eshopts_pop
274 fi
275
276 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
277 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
278 einfo "${EPATCH_SINGLE_MSG}"
279 else
280 einfo "Applying ${patchname} ..."
281 fi
144 else 282 else
145 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 283 einfo " ${patchname} ..."
146 fi 284 fi
147 else 285
148 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ] 286 # most of the time, there will only be one run per unique name,
149 then 287 # but if there are more, make sure we get unique log filenames
150 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 288 local STDERR_TARGET="${T}/${patchname}.out"
151 then 289 if [[ -e ${STDERR_TARGET} ]] ; then
152 EPATCH_SOURCE="$1" 290 STDERR_TARGET="${T}/${patchname}-$$.out"
291 fi
292
293 printf "***** %s *****\n\n" "${patchname}" > "${STDERR_TARGET}"
294
295 # Decompress the patch if need be
296 local count=0
297 local PATCH_TARGET
298 if [[ -n ${PIPE_CMD} ]] ; then
299 PATCH_TARGET="${T}/$$.patch"
300 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
301
302 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
303 echo
304 eerror "Could not extract patch!"
305 #die "Could not extract patch!"
306 count=5
307 break
153 fi 308 fi
309 else
310 PATCH_TARGET=${x}
311 fi
154 312
313 # Check for absolute paths in patches. If sandbox is disabled,
314 # people could (accidently) patch files in the root filesystem.
315 # Or trigger other unpleasantries #237667. So disallow -p0 on
316 # such patches.
317 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
318 if [[ -n ${abs_paths} ]] ; then
319 count=1
320 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
321 fi
322
323 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
324 while [[ ${count} -lt 5 ]] ; do
325 # Generate some useful debug info ...
326 (
327 _epatch_draw_line "***** ${patchname} *****"
155 echo 328 echo
156 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 329 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
330 echo
331 _epatch_draw_line "***** ${patchname} *****"
332 ) >> "${STDERR_TARGET}"
333
334 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
335 (
336 _epatch_draw_line "***** ${patchname} *****"
337 echo
338 echo "ACTUALLY APPLYING ${patchname} ..."
339 echo
340 _epatch_draw_line "***** ${patchname} *****"
341 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
342 ) >> "${STDERR_TARGET}"
343
344 if [ $? -ne 0 ] ; then
345 echo
346 eerror "A dry-run of patch command succeeded, but actually"
347 eerror "applying the patch failed!"
348 #die "Real world sux compared to the dreamworld!"
349 count=5
350 fi
351 break
352 fi
353
354 : $(( count++ ))
355 done
356
357 # if we had to decompress the patch, delete the temp one
358 if [[ -n ${PIPE_CMD} ]] ; then
359 rm -f "${PATCH_TARGET}"
360 fi
361
362 if [[ ${count} -ge 5 ]] ; then
363 echo
364 eerror "Failed Patch: ${patchname} !"
365 eerror " ( ${PATCH_TARGET} )"
157 eerror 366 eerror
158 eerror " ${EPATCH_SOURCE}" 367 eerror "Include in your bugreport the contents of:"
159 eerror " ( ${EPATCH_SOURCE##*/} )" 368 eerror
369 eerror " ${STDERR_TARGET}"
160 echo 370 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}!" 371 die "Failed Patch: ${patchname}!"
305 fi 372 fi
306 373
307 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 374 # if everything worked, delete the patch log
308 375 rm -f "${STDERR_TARGET}"
309 eend 0 376 eend 0
310 fi
311 done 377 done
312 if [ "${SINGLE_PATCH}" = "no" ] 378
313 then 379 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
314 einfo "Done with patching" 380 : # everything worked
381}
382epatch_user() {
383 [[ $# -ne 0 ]] && die "epatch_user takes no options"
384
385 # don't clobber any EPATCH vars that the parent might want
386 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
387 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
388 EPATCH_SOURCE=${base}/${CTARGET}/${check}
389 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
390 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
391 if [[ -d ${EPATCH_SOURCE} ]] ; then
392 EPATCH_SOURCE=${EPATCH_SOURCE} \
393 EPATCH_SUFFIX="patch" \
394 EPATCH_FORCE="yes" \
395 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
396 epatch
397 break
315 fi 398 fi
399 done
316} 400}
317 401
318# @FUNCTION: emktemp 402# @FUNCTION: emktemp
319# @USAGE: [temp dir] 403# @USAGE: [temp dir]
320# @DESCRIPTION: 404# @DESCRIPTION:
356# base-system@gentoo.org (Linux) 440# base-system@gentoo.org (Linux)
357# Joe Jezak <josejx@gmail.com> (OS X) 441# Joe Jezak <josejx@gmail.com> (OS X)
358# usata@gentoo.org (OS X) 442# usata@gentoo.org (OS X)
359# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) 443# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
360# @DESCRIPTION: 444# @DESCRIPTION:
361# Small wrapper for getent (Linux), nidump (Mac OS X), 445# Small wrapper for getent (Linux),
446# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
362# and pw (FreeBSD) used in enewuser()/enewgroup() 447# and pw (FreeBSD) used in enewuser()/enewgroup()
363egetent() { 448egetent() {
364 case ${CHOST} in 449 case ${CHOST} in
365 *-darwin*) 450 *-darwin[678])
366 case "$2" in 451 case "$2" in
367 *[!0-9]*) # Non numeric 452 *[!0-9]*) # Non numeric
368 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 453 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
369 ;; 454 ;;
370 *) # Numeric 455 *) # Numeric
371 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 456 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
457 ;;
458 esac
459 ;;
460 *-darwin*)
461 local mytype=$1
462 [[ "passwd" == $mytype ]] && mytype="Users"
463 [[ "group" == $mytype ]] && mytype="Groups"
464 case "$2" in
465 *[!0-9]*) # Non numeric
466 dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
467 ;;
468 *) # Numeric
469 local mykey="UniqueID"
470 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
471 dscl . -search /$mytype $mykey $2 2>/dev/null
372 ;; 472 ;;
373 esac 473 esac
374 ;; 474 ;;
375 *-freebsd*|*-dragonfly*) 475 *-freebsd*|*-dragonfly*)
376 local opts action="user" 476 local opts action="user"
576 fi 676 fi
577 ;; 677 ;;
578 678
579 *) 679 *)
580 if [[ -z $@ ]] ; then 680 if [[ -z $@ ]] ; then
581 useradd ${opts} ${euser} \ 681 useradd ${opts} \
582 -c "added by portage for ${PN}" \ 682 -c "added by portage for ${PN}" \
683 ${euser} \
583 || die "enewuser failed" 684 || die "enewuser failed"
584 else 685 else
585 einfo " - Extra: $@" 686 einfo " - Extra: $@"
586 useradd ${opts} ${euser} "$@" \ 687 useradd ${opts} "$@" \
688 ${euser} \
587 || die "enewuser failed" 689 || die "enewuser failed"
588 fi 690 fi
589 ;; 691 ;;
590 esac 692 esac
591 693
739make_desktop_entry() { 841make_desktop_entry() {
740 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 842 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
741 843
742 local exec=${1} 844 local exec=${1}
743 local name=${2:-${PN}} 845 local name=${2:-${PN}}
744 local icon=${3:-${PN}.png} 846 local icon=${3:-${PN}}
745 local type=${4} 847 local type=${4}
746 local path=${5} 848 local path=${5}
747 849
748 if [[ -z ${type} ]] ; then 850 if [[ -z ${type} ]] ; then
749 local catmaj=${CATEGORY%%-*} 851 local catmaj=${CATEGORY%%-*}
873 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 975 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
874 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 976 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
875 977
876 cat <<-EOF > "${desktop}" 978 cat <<-EOF > "${desktop}"
877 [Desktop Entry] 979 [Desktop Entry]
878 Encoding=UTF-8
879 Version=1.0
880 Name=${name} 980 Name=${name}
881 Type=Application 981 Type=Application
882 Comment=${DESCRIPTION} 982 Comment=${DESCRIPTION}
883 Exec=${exec} 983 Exec=${exec}
884 TryExec=${exec%% *} 984 TryExec=${exec%% *}
885 Path=${path}
886 Icon=${icon} 985 Icon=${icon}
887 Categories=${type}; 986 Categories=${type};
888 EOF 987 EOF
988
989 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}"
889 990
890 ( 991 (
891 # wrap the env here so that the 'insinto' call 992 # wrap the env here so that the 'insinto' call
892 # doesn't corrupt the env of the caller 993 # doesn't corrupt the env of the caller
893 insinto /usr/share/applications 994 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." 1023 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
923 fi 1024 fi
924} 1025}
925 1026
926# @FUNCTION: make_session_desktop 1027# @FUNCTION: make_session_desktop
927# @USAGE: <title> <command> 1028# @USAGE: <title> <command> [command args...]
928# @DESCRIPTION: 1029# @DESCRIPTION:
929# Make a GDM/KDM Session file. The title is the file to execute to start the 1030# 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. 1031# Window Manager. The command is the name of the Window Manager.
1032#
1033# You can set the name of the file via the ${wm} variable.
931make_session_desktop() { 1034make_session_desktop() {
932 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 1035 [[ -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 1036 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
934 1037
935 local title=$1 1038 local title=$1
936 local command=$2 1039 local command=$2
937 local desktop=${T}/${wm}.desktop 1040 local desktop=${T}/${wm:-${PN}}.desktop
1041 shift 2
938 1042
939 cat <<-EOF > "${desktop}" 1043 cat <<-EOF > "${desktop}"
940 [Desktop Entry] 1044 [Desktop Entry]
941 Encoding=UTF-8
942 Name=${title} 1045 Name=${title}
943 Comment=This session logs you into ${title} 1046 Comment=This session logs you into ${title}
944 Exec=${command} 1047 Exec=${command} $*
945 TryExec=${command} 1048 TryExec=${command}
946 Type=Application 1049 Type=XSession
947 EOF 1050 EOF
948 1051
949 ( 1052 (
950 # wrap the env here so that the 'insinto' call 1053 # wrap the env here so that the 'insinto' call
951 # doesn't corrupt the env of the caller 1054 # doesn't corrupt the env of the caller
972 elif [[ -d ${i} ]] ; then 1075 elif [[ -d ${i} ]] ; then
973 for j in "${i}"/*.desktop ; do 1076 for j in "${i}"/*.desktop ; do
974 doins "${j}" 1077 doins "${j}"
975 ((ret+=$?)) 1078 ((ret+=$?))
976 done 1079 done
1080 else
1081 ((++ret))
977 fi 1082 fi
978 done 1083 done
979 exit ${ret} 1084 exit ${ret}
980 ) 1085 )
981} 1086}
1011 elif [[ -d ${i} ]] ; then 1116 elif [[ -d ${i} ]] ; then
1012 for j in "${i}"/*.png ; do 1117 for j in "${i}"/*.png ; do
1013 doins "${j}" 1118 doins "${j}"
1014 ((ret+=$?)) 1119 ((ret+=$?))
1015 done 1120 done
1121 else
1122 ((++ret))
1016 fi 1123 fi
1017 done 1124 done
1018 exit ${ret} 1125 exit ${ret}
1019 ) 1126 )
1020} 1127}
1055# @DESCRIPTION: 1162# @DESCRIPTION:
1056# Unpack those pesky pdv generated files ... 1163# Unpack those pesky pdv generated files ...
1057# They're self-unpacking programs with the binary package stuffed in 1164# 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 1165# 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. 1166# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1060# 1167#
1061# You have to specify the off_t size ... I have no idea how to extract that 1168# 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 1169# 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 1170# the size of the off_t type (in bytes) on the machine that built the pdv
1064# archive. 1171# archive.
1065# 1172#
1066# One way to determine this is by running the following commands: 1173# One way to determine this is by running the following commands:
1174#
1175# @CODE
1067# strings <pdv archive> | grep lseek 1176# strings <pdv archive> | grep lseek
1068# strace -elseek <pdv archive> 1177# strace -elseek <pdv archive>
1178# @CODE
1179#
1069# Basically look for the first lseek command (we do the strings/grep because 1180# 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 1181# sometimes the function call is _llseek or something) and steal the 2nd
1071# parameter. Here is an example: 1182# parameter. Here is an example:
1183#
1184# @CODE
1072# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1185# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1073# lseek 1186# lseek
1074# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1187# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1075# lseek(3, -4, SEEK_END) = 2981250 1188# lseek(3, -4, SEEK_END) = 2981250
1189# @CODE
1190#
1076# Thus we would pass in the value of '4' as the second parameter. 1191# Thus we would pass in the value of '4' as the second parameter.
1077unpack_pdv() { 1192unpack_pdv() {
1078 local src=$(find_unpackable_file "$1") 1193 local src=$(find_unpackable_file "$1")
1079 local sizeoff_t=$2 1194 local sizeoff_t=$2
1080 1195
1150# @DESCRIPTION: 1265# @DESCRIPTION:
1151# Unpack those pesky makeself generated files ... 1266# Unpack those pesky makeself generated files ...
1152# They're shell scripts with the binary package tagged onto 1267# They're shell scripts with the binary package tagged onto
1153# the end of the archive. Loki utilized the format as does 1268# the end of the archive. Loki utilized the format as does
1154# many other game companies. 1269# many other game companies.
1155# 1270#
1156# If the file is not specified, then ${A} is used. If the 1271# If the file is not specified, then ${A} is used. If the
1157# offset is not specified then we will attempt to extract 1272# offset is not specified then we will attempt to extract
1158# the proper offset from the script itself. 1273# the proper offset from the script itself.
1159unpack_makeself() { 1274unpack_makeself() {
1160 local src_input=${1:-${A}} 1275 local src_input=${1:-${A}}
1251 lic="${PWD}/${lic}" 1366 lic="${PWD}/${lic}"
1252 elif [ -e "${lic}" ] ; then 1367 elif [ -e "${lic}" ] ; then
1253 lic="${lic}" 1368 lic="${lic}"
1254 fi 1369 fi
1255 fi 1370 fi
1256 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1257 local l="`basename ${lic}`" 1371 local l="`basename ${lic}`"
1258 1372
1259 # here is where we check for the licenses the user already 1373 # 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 1374 # accepted ... if we don't find a match, we make the user accept
1261 local shopts=$-
1262 local alic 1375 local alic
1263 set -o noglob #so that bash doesn't expand "*" 1376 eshopts_push -o noglob # so that bash doesn't expand "*"
1264 for alic in ${ACCEPT_LICENSE} ; do 1377 for alic in ${ACCEPT_LICENSE} ; do
1265 if [[ ${alic} == ${l} ]]; then 1378 if [[ ${alic} == ${l} ]]; then
1266 set +o noglob; set -${shopts} #reset old shell opts 1379 eshopts_pop
1267 return 0 1380 return 0
1268 fi 1381 fi
1269 done 1382 done
1270 set +o noglob; set -$shopts #reset old shell opts 1383 eshopts_pop
1384 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1271 1385
1272 local licmsg=$(emktemp) 1386 local licmsg=$(emktemp)
1273 cat <<-EOF > ${licmsg} 1387 cat <<-EOF > ${licmsg}
1274 ********************************************************** 1388 **********************************************************
1275 The following license outlines the terms of use of this 1389 The following license outlines the terms of use of this
1276 package. You MUST accept this license for installation to 1390 package. You MUST accept this license for installation to
1277 continue. When you are done viewing, hit 'q'. If you 1391 continue. When you are done viewing, hit 'q'. If you
1278 CTRL+C out of this, the install will not run! 1392 CTRL+C out of this, the install will not run!
1279 ********************************************************** 1393 **********************************************************
1280 1394
1281 EOF 1395 EOF
1282 cat ${lic} >> ${licmsg} 1396 cat ${lic} >> ${licmsg}
1283 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1397 ${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] " 1398 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1285 read alic 1399 read alic
1298# @FUNCTION: cdrom_get_cds 1412# @FUNCTION: cdrom_get_cds
1299# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...] 1413# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...]
1300# @DESCRIPTION: 1414# @DESCRIPTION:
1301# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates 1415# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates
1302# the whole 'non-interactive' policy, but damnit I want CD support ! 1416# the whole 'non-interactive' policy, but damnit I want CD support !
1303# 1417#
1304# With these cdrom functions we handle all the user interaction and 1418# With these cdrom functions we handle all the user interaction and
1305# standardize everything. All you have to do is call cdrom_get_cds() 1419# 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 1420# and when the function returns, you can assume that the cd has been
1307# found at CDROM_ROOT. 1421# found at CDROM_ROOT.
1308# 1422#
1309# The function will attempt to locate a cd based upon a file that is on 1423# 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 1424# the cd. The more files you give this function, the more cds
1311# the cdrom functions will handle. 1425# the cdrom functions will handle.
1312# 1426#
1313# Normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1427# 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 1428# etc... If you want to give the cds better names, then just export
1315# the appropriate CDROM_NAME variable before calling cdrom_get_cds(). 1429# 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 1430# Use CDROM_NAME for one cd, or CDROM_NAME_# for multiple cds. You can
1317# also use the CDROM_NAME_SET bash array. 1431# also use the CDROM_NAME_SET bash array.
1318# 1432#
1319# For those multi cd ebuilds, see the cdrom_load_next_cd() function. 1433# For those multi cd ebuilds, see the cdrom_load_next_cd() function.
1320cdrom_get_cds() { 1434cdrom_get_cds() {
1321 # first we figure out how many cds we're dealing with by 1435 # first we figure out how many cds we're dealing with by
1322 # the # of files they gave us 1436 # the # of files they gave us
1323 local cdcnt=0 1437 local cdcnt=0
1444# displayed and we'll hang out here until: 1558# displayed and we'll hang out here until:
1445# (1) the file is found on a mounted cdrom 1559# (1) the file is found on a mounted cdrom
1446# (2) the user hits CTRL+C 1560# (2) the user hits CTRL+C
1447_cdrom_locate_file_on_cd() { 1561_cdrom_locate_file_on_cd() {
1448 local mline="" 1562 local mline=""
1449 local showedmsg=0 1563 local showedmsg=0 showjolietmsg=0
1450 1564
1451 while [[ -z ${CDROM_ROOT} ]] ; do 1565 while [[ -z ${CDROM_ROOT} ]] ; do
1452 local i=0 1566 local i=0
1453 local -a cdset=(${*//:/ }) 1567 local -a cdset=(${*//:/ })
1454 if [[ -n ${CDROM_SET} ]] ; then 1568 if [[ -n ${CDROM_SET} ]] ; then
1463 while read point node fs foo ; do 1577 while read point node fs foo ; do
1464 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \ 1578 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1465 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \ 1579 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1466 && continue 1580 && continue
1467 point=${point//\040/ } 1581 point=${point//\040/ }
1582 [[ ! -d ${point}/${dir} ]] && continue
1468 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue 1583 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1469 export CDROM_ROOT=${point} 1584 export CDROM_ROOT=${point}
1470 export CDROM_SET=${i} 1585 export CDROM_SET=${i}
1471 export CDROM_MATCH=${cdset[${i}]} 1586 export CDROM_MATCH=${cdset[${i}]}
1472 return 1587 return
1494 showedmsg=1 1609 showedmsg=1
1495 fi 1610 fi
1496 einfo "Press return to scan for the cd again" 1611 einfo "Press return to scan for the cd again"
1497 einfo "or hit CTRL+C to abort the emerge." 1612 einfo "or hit CTRL+C to abort the emerge."
1498 echo 1613 echo
1614 if [[ ${showjolietmsg} -eq 0 ]] ; then
1615 showjolietmsg=1
1616 else
1499 einfo "If you are having trouble with the detection" 1617 ewarn "If you are having trouble with the detection"
1500 einfo "of your CD, it is possible that you do not have" 1618 ewarn "of your CD, it is possible that you do not have"
1501 einfo "Joliet support enabled in your kernel. Please" 1619 ewarn "Joliet support enabled in your kernel. Please"
1502 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1620 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1621 ebeep 5
1622 fi
1503 read || die "something is screwed with your system" 1623 read || die "something is screwed with your system"
1504 done 1624 done
1505} 1625}
1506 1626
1627# @FUNCTION: strip-linguas
1628# @USAGE: [<allow LINGUAS>|<-i|-u> <directories of .po files>]
1629# @DESCRIPTION:
1507# Make sure that LINGUAS only contains languages that 1630# Make sure that LINGUAS only contains languages that
1508# a package can support 1631# a package can support. The first form allows you to
1509# 1632# specify a list of LINGUAS. The -i builds a list of po
1510# usage: strip-linguas <allow LINGUAS> 1633# files found in all the directories and uses the
1511# strip-linguas -i <directories of .po files> 1634# intersection of the lists. The -u builds a list of po
1512# strip-linguas -u <directories of .po files> 1635# files found in all the directories and uses the union
1513# 1636# 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() { 1637strip-linguas() {
1520 local ls newls nols 1638 local ls newls nols
1521 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1639 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1522 local op=$1; shift 1640 local op=$1; shift
1523 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1641 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1524 local d f 1642 local d f
1525 for d in "$@" ; do 1643 for d in "$@" ; do
1526 if [[ ${op} == "-u" ]] ; then 1644 if [[ ${op} == "-u" ]] ; then
1527 newls=${ls} 1645 newls=${ls}
1528 else 1646 else
1529 newls="" 1647 newls=""
1530 fi 1648 fi
1531 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1649 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1532 if [[ ${op} == "-i" ]] ; then 1650 if [[ ${op} == "-i" ]] ; then
1533 hasq ${f} ${ls} && newls="${newls} ${f}" 1651 hasq ${f} ${ls} && newls="${newls} ${f}"
1534 else 1652 else
1535 hasq ${f} ${ls} || newls="${newls} ${f}" 1653 hasq ${f} ${ls} || newls="${newls} ${f}"
1536 fi 1654 fi
1549 else 1667 else
1550 nols="${nols} ${f}" 1668 nols="${nols} ${f}"
1551 fi 1669 fi
1552 done 1670 done
1553 [[ -n ${nols} ]] \ 1671 [[ -n ${nols} ]] \
1554 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1672 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1555 export LINGUAS=${newls:1} 1673 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} 1674}
1587 1675
1588# @FUNCTION: preserve_old_lib 1676# @FUNCTION: preserve_old_lib
1589# @USAGE: <libs to preserve> [more libs] 1677# @USAGE: <libs to preserve> [more libs]
1590# @DESCRIPTION: 1678# @DESCRIPTION:
1599 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1687 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1600 die "Invalid preserve_old_lib() usage" 1688 die "Invalid preserve_old_lib() usage"
1601 fi 1689 fi
1602 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]" 1690 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1603 1691
1692 # let portage worry about it
1693 has preserve-libs ${FEATURES} && return 0
1694
1604 local lib dir 1695 local lib dir
1605 for lib in "$@" ; do 1696 for lib in "$@" ; do
1606 [[ -e ${ROOT}/${lib} ]] || continue 1697 [[ -e ${ROOT}/${lib} ]] || continue
1607 dir=${lib%/*} 1698 dir=${lib%/*}
1608 dodir ${dir} || die "dodir ${dir} failed" 1699 dodir ${dir} || die "dodir ${dir} failed"
1618preserve_old_lib_notify() { 1709preserve_old_lib_notify() {
1619 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1710 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1620 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only" 1711 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1621 die "Invalid preserve_old_lib_notify() usage" 1712 die "Invalid preserve_old_lib_notify() usage"
1622 fi 1713 fi
1714
1715 # let portage worry about it
1716 has preserve-libs ${FEATURES} && return 0
1623 1717
1624 local lib notice=0 1718 local lib notice=0
1625 for lib in "$@" ; do 1719 for lib in "$@" ; do
1626 [[ -e ${ROOT}/${lib} ]] || continue 1720 [[ -e ${ROOT}/${lib} ]] || continue
1627 if [[ ${notice} -eq 0 ]] ; then 1721 if [[ ${notice} -eq 0 ]] ; then
1633 ewarn "helper program, simply emerge the 'gentoolkit' package." 1727 ewarn "helper program, simply emerge the 'gentoolkit' package."
1634 ewarn 1728 ewarn
1635 fi 1729 fi
1636 ewarn " # revdep-rebuild --library ${lib##*/}" 1730 ewarn " # revdep-rebuild --library ${lib##*/}"
1637 done 1731 done
1732 if [[ ${notice} -eq 1 ]] ; then
1733 ewarn
1734 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1735 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1736 for lib in "$@" ; do
1737 ewarn " # rm '${lib}'"
1738 done
1739 fi
1638} 1740}
1639 1741
1640# @FUNCTION: built_with_use 1742# @FUNCTION: built_with_use
1641# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1743# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1642# @DESCRIPTION: 1744# @DESCRIPTION:
1646# --missing option controls the behavior if called on a package that does 1748# --missing option controls the behavior if called on a package that does
1647# not actually support the defined USE flags (aka listed in IUSE). 1749# 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 1750# 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" 1751# 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 1752# 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 1753# 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 1754# 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 1755# means the USE flag we're checking is hidden expanded, so it won't be found
1654# in IUSE like normal USE flags. 1756# in IUSE like normal USE flags.
1655# 1757#
1656# Remember that this function isn't terribly intelligent so order of optional 1758# Remember that this function isn't terribly intelligent so order of optional
1657# flags matter. 1759# flags matter.
1658built_with_use() { 1760built_with_use() {
1659 local hidden="no" 1761 local hidden="no"
1660 if [[ $1 == "--hidden" ]] ; then 1762 if [[ $1 == "--hidden" ]] ; then
1691 die) die "Unable to determine what USE flags $PKG was built with";; 1793 die) die "Unable to determine what USE flags $PKG was built with";;
1692 esac 1794 esac
1693 fi 1795 fi
1694 1796
1695 if [[ ${hidden} == "no" ]] ; then 1797 if [[ ${hidden} == "no" ]] ; then
1696 local IUSE_BUILT=$(<${IUSEFILE}) 1798 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1697 # Don't check USE_EXPAND #147237 1799 # Don't check USE_EXPAND #147237
1698 local expand 1800 local expand
1699 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1801 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1700 if [[ $1 == ${expand}_* ]] ; then 1802 if [[ $1 == ${expand}_* ]] ; then
1701 expand="" 1803 expand=""
1702 break 1804 break
1703 fi 1805 fi
1704 done 1806 done
1705 if [[ -n ${expand} ]] ; then 1807 if [[ -n ${expand} ]] ; then
1706 if ! has $1 ${IUSE_BUILT} ; then 1808 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1707 case ${missing_action} in 1809 case ${missing_action} in
1708 true) return 0;; 1810 true) return 0;;
1709 false) return 1;; 1811 false) return 1;;
1710 die) die "$PKG does not actually support the $1 USE flag!";; 1812 die) die "$PKG does not actually support the $1 USE flag!";;
1711 esac 1813 esac
1723 shift 1825 shift
1724 done 1826 done
1725 [[ ${opt} = "-a" ]] 1827 [[ ${opt} = "-a" ]]
1726} 1828}
1727 1829
1728# @DESCRIPTION: epunt_cxx 1830# @FUNCTION: epunt_cxx
1729# @USAGE: [dir to scan] 1831# @USAGE: [dir to scan]
1730# @DESCRIPTION: 1832# @DESCRIPTION:
1731# Many configure scripts wrongly bail when a C++ compiler could not be 1833# Many configure scripts wrongly bail when a C++ compiler could not be
1732# detected. If dir is not specified, then it defaults to ${S}. 1834# detected. If dir is not specified, then it defaults to ${S}.
1733# 1835#
1735epunt_cxx() { 1837epunt_cxx() {
1736 local dir=$1 1838 local dir=$1
1737 [[ -z ${dir} ]] && dir=${S} 1839 [[ -z ${dir} ]] && dir=${S}
1738 ebegin "Removing useless C++ checks" 1840 ebegin "Removing useless C++ checks"
1739 local f 1841 local f
1740 for f in $(find ${dir} -name configure) ; do 1842 find "${dir}" -name configure | while read f ; do
1741 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1843 patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1742 done 1844 done
1743 eend 0 1845 eend 0
1744} 1846}
1745 1847
1746# @FUNCTION: make_wrapper 1848# @FUNCTION: make_wrapper
1747# @USAGE: <wrapper> <target> <chdir> [libpaths] [installpath] 1849# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1748# @DESCRIPTION: 1850# @DESCRIPTION:
1749# Create a shell wrapper script named wrapper in installpath 1851# Create a shell wrapper script named wrapper in installpath
1750# (defaults to the bindir) to execute target (default of wrapper) by 1852# (defaults to the bindir) to execute target (default of wrapper) by
1751# first optionally setting LD_LIBRARY_PATH to the colon-delimited 1853# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1752# libpaths followed by optionally changing directory to chdir. 1854# libpaths followed by optionally changing directory to chdir.
1775 ) || die 1877 ) || die
1776 else 1878 else
1777 newbin "${tmpwrapper}" "${wrapper}" || die 1879 newbin "${tmpwrapper}" "${wrapper}" || die
1778 fi 1880 fi
1779} 1881}
1882
1883# @FUNCTION: prepalldocs
1884# @USAGE:
1885# @DESCRIPTION:
1886# Compress files in /usr/share/doc which are not already
1887# compressed, excluding /usr/share/doc/${PF}/html.
1888# Uses the ecompressdir to do the compression.
1889# 2009-02-18 by betelgeuse:
1890# Commented because ecompressdir is even more internal to
1891# Portage than prepalldocs (it's not even mentioned in man 5
1892# ebuild). Please submit a better version for review to gentoo-dev
1893# if you want prepalldocs here.
1894#prepalldocs() {
1895# if [[ -n $1 ]] ; then
1896# ewarn "prepalldocs: invalid usage; takes no arguments"
1897# fi
1898
1899# cd "${D}"
1900# [[ -d usr/share/doc ]] || return 0
1901
1902# find usr/share/doc -exec gzip {} +
1903# ecompressdir --ignore /usr/share/doc/${PF}/html
1904# ecompressdir --queue /usr/share/doc
1905#}

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

  ViewVC Help
Powered by ViewVC 1.1.20