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

Diff of /eclass/eutils.eclass

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

Revision 1.282 Revision 1.349
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.282 2007/06/16 07:11:43 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.349 2010/08/19 21:32:26 vapier Exp $
4
5# @ECLASS: eutils.eclass
6# @MAINTAINER:
7# base-system@gentoo.org
8# @BLURB: many extra (but common) functions that are used in ebuilds
9# @DESCRIPTION:
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
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.
4# 14#
5# This eclass is for general purpose functions that most ebuilds 15# Due to the nature of this eclass, some functions may have maintainers
6# have to implement themselves. 16# different from the overall eclass!
7#
8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 17
12inherit multilib portability 18inherit multilib portability
13 19
14DESCRIPTION="Based on the ${ECLASS} eclass" 20DESCRIPTION="Based on the ${ECLASS} eclass"
15 21
16# Wait for the supplied number of seconds. If no argument is supplied, defaults 22if has "${EAPI:-0}" 0 1 2; then
17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 23
18# outputting to a terminal, don't wait. For compatability purposes, the argument 24# @FUNCTION: epause
19# must be an integer greater than zero. 25# @USAGE: [seconds]
20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 26# @DESCRIPTION:
27# Sleep for the specified number of seconds (default of 5 seconds). Useful when
28# printing a message the user should probably be reading and often used in
29# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set,
30# don't wait at all. Defined in EAPIs 0 1 and 2.
21epause() { 31epause() {
22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5} 32 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
23} 33}
24 34
25# Beep the specified number of times (defaults to five). If our output 35# @FUNCTION: ebeep
26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 36# @USAGE: [number of beeps]
27# don't beep. 37# @DESCRIPTION:
28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 38# Issue the specified number of beeps (default of 5 beeps). Useful when
39# printing a message the user should probably be reading and often used in
40# conjunction with the epause function. If the EBEEP_IGNORE env var is set,
41# don't beep at all. Defined in EAPIs 0 1 and 2.
29ebeep() { 42ebeep() {
30 local n 43 local n
31 if [[ -z ${EBEEP_IGNORE} ]] ; then 44 if [[ -z ${EBEEP_IGNORE} ]] ; then
32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 45 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
33 echo -ne "\a" 46 echo -ne "\a"
36 sleep 1 49 sleep 1
37 done 50 done
38 fi 51 fi
39} 52}
40 53
41# Default directory where patches are located 54else
55
56ebeep() {
57 ewarn "QA Notice: ebeep is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
58}
59
60epause() {
61 ewarn "QA Notice: epause is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
62}
63
64fi
65
66# @FUNCTION: eqawarn
67# @USAGE: [message]
68# @DESCRIPTION:
69# Proxy to einfo for package managers that don't provide eqawarn and use the PM
70# implementation if available.
71if ! declare -F eqawarn >/dev/null ; then
72 eqawarn() {
73 einfo "$@"
74 }
75fi
76
77# @FUNCTION: ecvs_clean
78# @USAGE: [list of dirs]
79# @DESCRIPTION:
80# Remove CVS directories recursiveley. Useful when a source tarball contains
81# internal CVS directories. Defaults to $PWD.
82ecvs_clean() {
83 [[ -z $* ]] && set -- .
84 find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
85 find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
86}
87
88# @FUNCTION: esvn_clean
89# @USAGE: [list of dirs]
90# @DESCRIPTION:
91# Remove .svn directories recursiveley. Useful when a source tarball contains
92# internal Subversion directories. Defaults to $PWD.
93esvn_clean() {
94 [[ -z $* ]] && set -- .
95 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
96}
97
98# @FUNCTION: eshopts_push
99# @USAGE: [options to `set` or `shopt`]
100# @DESCRIPTION:
101# Often times code will want to enable a shell option to change code behavior.
102# Since changing shell options can easily break other pieces of code (which
103# assume the default state), eshopts_push is used to (1) push the current shell
104# options onto a stack and (2) pass the specified arguments to set.
105#
106# If the first argument is '-s' or '-u', we assume you want to call `shopt`
107# rather than `set` as there are some options only available via that.
108#
109# A common example is to disable shell globbing so that special meaning/care
110# may be used with variables/arguments to custom functions. That would be:
111# @CODE
112# eshopts_push -o noglob
113# for x in ${foo} ; do
114# if ...some check... ; then
115# eshopts_pop
116# return 0
117# fi
118# done
119# eshopts_pop
120# @CODE
121eshopts_push() {
122 # have to assume __ESHOPTS_SAVE__ isn't screwed with
123 # as a `declare -a` here will reset its value
124 local i=${#__ESHOPTS_SAVE__[@]}
125 if [[ $1 == -[su] ]] ; then
126 __ESHOPTS_SAVE__[$i]=$(shopt -p)
127 [[ $# -eq 0 ]] && return 0
128 shopt "$@" || die "eshopts_push: bad options to shopt: $*"
129 else
130 __ESHOPTS_SAVE__[$i]=$-
131 [[ $# -eq 0 ]] && return 0
132 set "$@" || die "eshopts_push: bad options to set: $*"
133 fi
134}
135
136# @FUNCTION: eshopts_pop
137# @USAGE:
138# @DESCRIPTION:
139# Restore the shell options to the state saved with the corresponding
140# eshopts_push call. See that function for more details.
141eshopts_pop() {
142 [[ $# -ne 0 ]] && die "eshopts_pop takes no arguments"
143 local i=$(( ${#__ESHOPTS_SAVE__[@]} - 1 ))
144 [[ ${i} -eq -1 ]] && die "eshopts_{push,pop}: unbalanced pair"
145 local s=${__ESHOPTS_SAVE__[$i]}
146 unset __ESHOPTS_SAVE__[$i]
147 if [[ ${s} == "shopt -"* ]] ; then
148 eval "${s}" || die "eshopts_pop: sanity: invalid shopt options: ${s}"
149 else
150 set +$- || die "eshopts_pop: sanity: invalid shell settings: $-"
151 set -${s} || die "eshopts_pop: sanity: unable to restore saved shell settings: ${s}"
152 fi
153}
154
155# @VARIABLE: EPATCH_SOURCE
156# @DESCRIPTION:
157# Default directory to search for patches.
42EPATCH_SOURCE="${WORKDIR}/patch" 158EPATCH_SOURCE="${WORKDIR}/patch"
43# Default extension for patches 159# @VARIABLE: EPATCH_SUFFIX
160# @DESCRIPTION:
161# Default extension for patches (do not prefix the period yourself).
44EPATCH_SUFFIX="patch.bz2" 162EPATCH_SUFFIX="patch.bz2"
163# @VARIABLE: EPATCH_OPTS
164# @DESCRIPTION:
45# Default options for patch 165# Default options for patch:
166# @CODE
46# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 167# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
47# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 168# --no-backup-if-mismatch - do not leave .orig files behind
48# Set -E to automatically remove empty files. 169# -E - automatically remove empty files
170# @CODE
49EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 171EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
172# @VARIABLE: EPATCH_EXCLUDE
173# @DESCRIPTION:
50# List of patches not to apply. Not this is only file names, 174# List of patches not to apply. Note this is only file names,
51# and not the full path .. 175# and not the full path. Globs accepted.
52EPATCH_EXCLUDE="" 176EPATCH_EXCLUDE=""
177# @VARIABLE: EPATCH_SINGLE_MSG
178# @DESCRIPTION:
53# Change the printed message for a single patch. 179# Change the printed message for a single patch.
54EPATCH_SINGLE_MSG="" 180EPATCH_SINGLE_MSG=""
181# @VARIABLE: EPATCH_MULTI_MSG
182# @DESCRIPTION:
55# Change the printed message for multiple patches. 183# Change the printed message for multiple patches.
56EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 184EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
57# Force applying bulk patches even if not following the style: 185# @VARIABLE: EPATCH_FORCE
58# 186# @DESCRIPTION:
59# ??_${ARCH}_foo.${EPATCH_SUFFIX} 187# Only require patches to match EPATCH_SUFFIX rather than the extended
60# 188# arch naming style.
61EPATCH_FORCE="no" 189EPATCH_FORCE="no"
62 190
63# This function is for bulk patching, or in theory for just one 191# @FUNCTION: epatch
64# or two patches. 192# @USAGE: [patches] [dirs of patches]
193# @DESCRIPTION:
194# epatch is designed to greatly simplify the application of patches. It can
195# process patch files directly, or directories of patches. The patches may be
196# compressed (bzip/gzip/etc...) or plain text. You generally need not specify
197# the -p option as epatch will automatically attempt -p0 to -p5 until things
198# apply successfully.
65# 199#
66# It should work with .bz2, .gz, .zip and plain text patches. 200# If you do not specify any options, then epatch will default to the directory
67# Currently all patches should be the same format. 201# specified by EPATCH_SOURCE.
68# 202#
69# You do not have to specify '-p' option to patch, as it will 203# When processing directories, epatch will apply all patches that match:
70# try with -p0 to -p5 until it succeed, or fail at -p5. 204# @CODE
71# 205# ${EPATCH_FORCE} == "yes"
72# Above EPATCH_* variables can be used to control various defaults,
73# bug they should be left as is to ensure an ebuild can rely on
74# them for.
75#
76# Patches are applied in current directory.
77#
78# Bulk Patches should preferibly have the form of:
79#
80# ??_${ARCH}_foo.${EPATCH_SUFFIX} 206# ??_${ARCH}_foo.${EPATCH_SUFFIX}
207# else
208# *.${EPATCH_SUFFIX}
209# @CODE
210# The leading ?? are typically numbers used to force consistent patch ordering.
211# The arch field is used to apply patches only for the host architecture with
212# the special value of "all" means apply for everyone. Note that using values
213# other than "all" is highly discouraged -- you should apply patches all the
214# time and let architecture details be detected at configure/compile time.
81# 215#
82# For example: 216# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
217# for patches to apply.
83# 218#
84# 01_all_misc-fix.patch.bz2 219# Refer to the other EPATCH_xxx variables for more customization of behavior.
85# 02_sparc_another-fix.patch.bz2
86#
87# This ensures that there are a set order, and you can have ARCH
88# specific patches.
89#
90# If you however give an argument to epatch(), it will treat it as a
91# single patch that need to be applied if its a file. If on the other
92# hand its a directory, it will set EPATCH_SOURCE to this.
93#
94# <azarah@gentoo.org> (10 Nov 2002)
95#
96epatch() { 220epatch() {
97 _epatch_draw_line() { 221 _epatch_draw_line() {
222 # create a line of same length as input string
98 [[ -z $1 ]] && set "$(printf "%65s" '')" 223 [[ -z $1 ]] && set "$(printf "%65s" '')"
99 echo "${1//?/=}" 224 echo "${1//?/=}"
100 } 225 }
101 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
102 local PIPE_CMD=""
103 local STDERR_TARGET="${T}/$$.out"
104 local PATCH_TARGET="${T}/$$.patch"
105 local PATCH_SUFFIX=""
106 local SINGLE_PATCH="no"
107 local x=""
108 226
109 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 227 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
110 228
111 if [ "$#" -gt 1 ] 229 # Let the rest of the code process one user arg at a time --
112 then 230 # each arg may expand into multiple patches, and each arg may
231 # need to start off with the default global EPATCH_xxx values
232 if [[ $# -gt 1 ]] ; then
113 local m="" 233 local m
114 for m in "$@" ; do 234 for m in "$@" ; do
115 epatch "${m}" 235 epatch "${m}"
116 done 236 done
117 return 0 237 return 0
118 fi 238 fi
119 239
120 if [ -n "$1" -a -f "$1" ] 240 local SINGLE_PATCH="no"
121 then 241 # no args means process ${EPATCH_SOURCE}
242 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
243
244 if [[ -f $1 ]] ; then
122 SINGLE_PATCH="yes" 245 SINGLE_PATCH="yes"
123 246 set -- "$1"
124 local EPATCH_SOURCE="$1" 247 # Use the suffix from the single patch (localize it); the code
248 # below will find the suffix for us
125 local EPATCH_SUFFIX="${1##*\.}" 249 local EPATCH_SUFFIX=$1
126 250
127 elif [ -n "$1" -a -d "$1" ] 251 elif [[ -d $1 ]] ; then
128 then 252 # Some people like to make dirs of patches w/out suffixes (vim)
129 # Allow no extension if EPATCH_FORCE=yes ... used by vim for example ... 253 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
130 if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] 254
255 else
256 # sanity check ... if it isn't a dir or file, wtf man ?
257 [[ $# -ne 0 ]] && EPATCH_SOURCE=$1
258 echo
259 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
260 eerror
261 eerror " ${EPATCH_SOURCE}"
262 eerror " ( ${EPATCH_SOURCE##*/} )"
263 echo
264 die "Cannot find \$EPATCH_SOURCE!"
265 fi
266
267 local PIPE_CMD
268 case ${EPATCH_SUFFIX##*\.} in
269 xz) PIPE_CMD="xz -dc" ;;
270 lzma) PIPE_CMD="lzma -dc" ;;
271 bz2) PIPE_CMD="bzip2 -dc" ;;
272 gz|Z|z) PIPE_CMD="gzip -dc" ;;
273 ZIP|zip) PIPE_CMD="unzip -p" ;;
274 *) ;;
275 esac
276
277 [[ ${SINGLE_PATCH} == "no" ]] && einfo "${EPATCH_MULTI_MSG}"
278
279 local x
280 for x in "$@" ; do
281 # If the patch dir given contains subdirs, or our EPATCH_SUFFIX
282 # didn't match anything, ignore continue on
283 [[ ! -f ${x} ]] && continue
284
285 local patchname=${x##*/}
286
287 # Apply single patches, or forced sets of patches, or
288 # patches with ARCH dependant names.
289 # ???_arch_foo.patch
290 # Else, skip this input altogether
291 local a=${patchname#*_} # strip the ???_
292 a=${a%%_*} # strip the _foo.patch
293 if ! [[ ${SINGLE_PATCH} == "yes" || \
294 ${EPATCH_FORCE} == "yes" || \
295 ${a} == all || \
296 ${a} == ${ARCH} ]]
131 then 297 then
132 local EPATCH_SOURCE="$1/*" 298 continue
299 fi
300
301 # Let people filter things dynamically
302 if [[ -n ${EPATCH_EXCLUDE} ]] ; then
303 # let people use globs in the exclude
304 eshopts_push -o noglob
305
306 local ex
307 for ex in ${EPATCH_EXCLUDE} ; do
308 if [[ ${patchname} == ${ex} ]] ; then
309 eshopts_pop
310 continue 2
311 fi
312 done
313
314 eshopts_pop
315 fi
316
317 if [[ ${SINGLE_PATCH} == "yes" ]] ; then
318 if [[ -n ${EPATCH_SINGLE_MSG} ]] ; then
319 einfo "${EPATCH_SINGLE_MSG}"
320 else
321 einfo "Applying ${patchname} ..."
322 fi
133 else 323 else
134 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 324 einfo " ${patchname} ..."
135 fi 325 fi
136 else 326
137 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ] 327 # most of the time, there will only be one run per unique name,
138 then 328 # but if there are more, make sure we get unique log filenames
139 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 329 local STDERR_TARGET="${T}/${patchname}.out"
140 then 330 if [[ -e ${STDERR_TARGET} ]] ; then
141 EPATCH_SOURCE="$1" 331 STDERR_TARGET="${T}/${patchname}-$$.out"
332 fi
333
334 printf "***** %s *****\n\n" "${patchname}" > "${STDERR_TARGET}"
335
336 # Decompress the patch if need be
337 local count=0
338 local PATCH_TARGET
339 if [[ -n ${PIPE_CMD} ]] ; then
340 PATCH_TARGET="${T}/$$.patch"
341 echo "PIPE_COMMAND: ${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> "${STDERR_TARGET}"
342
343 if ! (${PIPE_CMD} "${x}" > "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
344 echo
345 eerror "Could not extract patch!"
346 #die "Could not extract patch!"
347 count=5
348 break
142 fi 349 fi
350 else
351 PATCH_TARGET=${x}
352 fi
143 353
354 # Check for absolute paths in patches. If sandbox is disabled,
355 # people could (accidently) patch files in the root filesystem.
356 # Or trigger other unpleasantries #237667. So disallow -p0 on
357 # such patches.
358 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
359 if [[ -n ${abs_paths} ]] ; then
360 count=1
361 printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
362 fi
363
364 # Dynamically detect the correct -p# ... i'm lazy, so shoot me :/
365 while [[ ${count} -lt 5 ]] ; do
366 # Generate some useful debug info ...
367 (
368 _epatch_draw_line "***** ${patchname} *****"
144 echo 369 echo
145 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 370 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
371 echo
372 _epatch_draw_line "***** ${patchname} *****"
373 ) >> "${STDERR_TARGET}"
374
375 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then
376 (
377 _epatch_draw_line "***** ${patchname} *****"
378 echo
379 echo "ACTUALLY APPLYING ${patchname} ..."
380 echo
381 _epatch_draw_line "***** ${patchname} *****"
382 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
383 ) >> "${STDERR_TARGET}"
384
385 if [ $? -ne 0 ] ; then
386 echo
387 eerror "A dry-run of patch command succeeded, but actually"
388 eerror "applying the patch failed!"
389 #die "Real world sux compared to the dreamworld!"
390 count=5
391 fi
392 break
393 fi
394
395 : $(( count++ ))
396 done
397
398 # if we had to decompress the patch, delete the temp one
399 if [[ -n ${PIPE_CMD} ]] ; then
400 rm -f "${PATCH_TARGET}"
401 fi
402
403 if [[ ${count} -ge 5 ]] ; then
404 echo
405 eerror "Failed Patch: ${patchname} !"
406 eerror " ( ${PATCH_TARGET} )"
146 eerror 407 eerror
147 eerror " ${EPATCH_SOURCE}" 408 eerror "Include in your bugreport the contents of:"
148 eerror " ( ${EPATCH_SOURCE##*/} )" 409 eerror
410 eerror " ${STDERR_TARGET}"
149 echo 411 echo
150 die "Cannot find \$EPATCH_SOURCE!"
151 fi
152
153 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
154 fi
155
156 case ${EPATCH_SUFFIX##*\.} in
157 bz2)
158 PIPE_CMD="bzip2 -dc"
159 PATCH_SUFFIX="bz2"
160 ;;
161 gz|Z|z)
162 PIPE_CMD="gzip -dc"
163 PATCH_SUFFIX="gz"
164 ;;
165 ZIP|zip)
166 PIPE_CMD="unzip -p"
167 PATCH_SUFFIX="zip"
168 ;;
169 *)
170 PIPE_CMD="cat"
171 PATCH_SUFFIX="patch"
172 ;;
173 esac
174
175 if [ "${SINGLE_PATCH}" = "no" ]
176 then
177 einfo "${EPATCH_MULTI_MSG}"
178 fi
179 for x in ${EPATCH_SOURCE}
180 do
181 # New ARCH dependant patch naming scheme ...
182 #
183 # ???_arch_foo.patch
184 #
185 if [ -f ${x} ] && \
186 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
187 [ "${EPATCH_FORCE}" = "yes" ])
188 then
189 local count=0
190 local popts="${EPATCH_OPTS}"
191 local patchname=${x##*/}
192
193 if [ -n "${EPATCH_EXCLUDE}" ]
194 then
195 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
196 then
197 continue
198 fi
199 fi
200
201 if [ "${SINGLE_PATCH}" = "yes" ]
202 then
203 if [ -n "${EPATCH_SINGLE_MSG}" ]
204 then
205 einfo "${EPATCH_SINGLE_MSG}"
206 else
207 einfo "Applying ${patchname} ..."
208 fi
209 else
210 einfo " ${patchname} ..."
211 fi
212
213 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
214 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
215
216 # Allow for prefix to differ ... im lazy, so shoot me :/
217 while [ "${count}" -lt 5 ]
218 do
219 # Generate some useful debug info ...
220 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
221 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
222
223 if [ "${PATCH_SUFFIX}" != "patch" ]
224 then
225 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
226 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
227 else
228 PATCH_TARGET="${x}"
229 fi
230
231 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
232 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
233
234 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
235 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
236
237 if [ "${PATCH_SUFFIX}" != "patch" ]
238 then
239 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
240 then
241 echo
242 eerror "Could not extract patch!"
243 #die "Could not extract patch!"
244 count=5
245 break
246 fi
247 fi
248
249 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
250 then
251 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
252 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
253 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
254 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
255 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
256
257 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
258 _epatch_assert
259
260 if [ "$?" -ne 0 ]
261 then
262 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
263 echo
264 eerror "A dry-run of patch command succeeded, but actually"
265 eerror "applying the patch failed!"
266 #die "Real world sux compared to the dreamworld!"
267 count=5
268 fi
269
270 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
271
272 break
273 fi
274
275 count=$((count + 1))
276 done
277
278 if [ "${PATCH_SUFFIX}" != "patch" ]
279 then
280 rm -f ${PATCH_TARGET}
281 fi
282
283 if [ "${count}" -eq 5 ]
284 then
285 echo
286 eerror "Failed Patch: ${patchname} !"
287 eerror " ( ${PATCH_TARGET} )"
288 eerror
289 eerror "Include in your bugreport the contents of:"
290 eerror
291 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
292 echo
293 die "Failed Patch: ${patchname}!" 412 die "Failed Patch: ${patchname}!"
294 fi 413 fi
295 414
296 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 415 # if everything worked, delete the patch log
297 416 rm -f "${STDERR_TARGET}"
298 eend 0 417 eend 0
299 fi
300 done 418 done
301 if [ "${SINGLE_PATCH}" = "no" ] 419
302 then 420 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
303 einfo "Done with patching" 421 : # everything worked
422}
423epatch_user() {
424 [[ $# -ne 0 ]] && die "epatch_user takes no options"
425
426 # don't clobber any EPATCH vars that the parent might want
427 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
428 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
429 EPATCH_SOURCE=${base}/${CTARGET}/${check}
430 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
431 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
432 if [[ -d ${EPATCH_SOURCE} ]] ; then
433 EPATCH_SOURCE=${EPATCH_SOURCE} \
434 EPATCH_SUFFIX="patch" \
435 EPATCH_FORCE="yes" \
436 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
437 epatch
438 return 0
304 fi 439 fi
440 done
441 return 1
305} 442}
306 443
444# @FUNCTION: emktemp
445# @USAGE: [temp dir]
446# @DESCRIPTION:
307# Cheap replacement for when debianutils (and thus mktemp) 447# Cheap replacement for when debianutils (and thus mktemp)
308# does not exist on the users system 448# does not exist on the users system.
309# vapier@gentoo.org
310#
311# Takes just 1 optional parameter (the directory to create tmpfile in)
312emktemp() { 449emktemp() {
313 local exe="touch" 450 local exe="touch"
314 [[ $1 == -d ]] && exe="mkdir" && shift 451 [[ $1 == -d ]] && exe="mkdir" && shift
315 local topdir=$1 452 local topdir=$1
316 453
337 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX 474 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX
338 fi 475 fi
339 fi 476 fi
340} 477}
341 478
479# @FUNCTION: egetent
480# @USAGE: <database> <key>
481# @MAINTAINER:
482# base-system@gentoo.org (Linux)
483# Joe Jezak <josejx@gmail.com> (OS X)
484# usata@gentoo.org (OS X)
485# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
486# @DESCRIPTION:
342# Small wrapper for getent (Linux), nidump (Mac OS X), 487# Small wrapper for getent (Linux),
488# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
343# and pw (FreeBSD) used in enewuser()/enewgroup() 489# and pw (FreeBSD) used in enewuser()/enewgroup()
344# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
345# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
346#
347# egetent(database, key)
348egetent() { 490egetent() {
349 case ${CHOST} in 491 case ${CHOST} in
350 *-darwin*) 492 *-darwin[678])
351 case "$2" in 493 case "$2" in
352 *[!0-9]*) # Non numeric 494 *[!0-9]*) # Non numeric
353 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 495 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
354 ;; 496 ;;
355 *) # Numeric 497 *) # Numeric
356 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 498 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
499 ;;
500 esac
501 ;;
502 *-darwin*)
503 local mytype=$1
504 [[ "passwd" == $mytype ]] && mytype="Users"
505 [[ "group" == $mytype ]] && mytype="Groups"
506 case "$2" in
507 *[!0-9]*) # Non numeric
508 dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
509 ;;
510 *) # Numeric
511 local mykey="UniqueID"
512 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
513 dscl . -search /$mytype $mykey $2 2>/dev/null
357 ;; 514 ;;
358 esac 515 esac
359 ;; 516 ;;
360 *-freebsd*|*-dragonfly*) 517 *-freebsd*|*-dragonfly*)
361 local opts action="user" 518 local opts action="user"
376 getent "$1" "$2" 533 getent "$1" "$2"
377 ;; 534 ;;
378 esac 535 esac
379} 536}
380 537
381# Simplify/standardize adding users to the system 538# @FUNCTION: enewuser
382# vapier@gentoo.org 539# @USAGE: <user> [uid] [shell] [homedir] [groups] [params]
383# 540# @DESCRIPTION:
384# enewuser(username, uid, shell, homedir, groups, extra options) 541# Same as enewgroup, you are not required to understand how to properly add
385# 542# a user to the system. The only required parameter is the username.
386# Default values if you do not specify any: 543# Default uid is (pass -1 for this) next available, default shell is
387# username: REQUIRED ! 544# /bin/false, default homedir is /dev/null, there are no default groups,
388# uid: next available (see useradd(8)) 545# and default params sets the comment as 'added by portage for ${PN}'.
389# note: pass -1 to get default behavior
390# shell: /bin/false
391# homedir: /dev/null
392# groups: none
393# extra: comment of 'added by portage for ${PN}'
394enewuser() { 546enewuser() {
395 case ${EBUILD_PHASE} in 547 case ${EBUILD_PHASE} in
396 unpack|compile|test|install) 548 unpack|compile|test|install)
397 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function." 549 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
398 eerror "Package fails at QA and at life. Please file a bug." 550 eerror "Package fails at QA and at life. Please file a bug."
566 fi 718 fi
567 ;; 719 ;;
568 720
569 *) 721 *)
570 if [[ -z $@ ]] ; then 722 if [[ -z $@ ]] ; then
571 useradd ${opts} ${euser} \ 723 useradd -r ${opts} \
572 -c "added by portage for ${PN}" \ 724 -c "added by portage for ${PN}" \
725 ${euser} \
573 || die "enewuser failed" 726 || die "enewuser failed"
574 else 727 else
575 einfo " - Extra: $@" 728 einfo " - Extra: $@"
576 useradd ${opts} ${euser} "$@" \ 729 useradd -r ${opts} "$@" \
730 ${euser} \
577 || die "enewuser failed" 731 || die "enewuser failed"
578 fi 732 fi
579 ;; 733 ;;
580 esac 734 esac
581 735
587 fi 741 fi
588 742
589 export SANDBOX_ON=${oldsandbox} 743 export SANDBOX_ON=${oldsandbox}
590} 744}
591 745
592# Simplify/standardize adding groups to the system 746# @FUNCTION: enewgroup
593# vapier@gentoo.org 747# @USAGE: <group> [gid]
594# 748# @DESCRIPTION:
595# enewgroup(group, gid) 749# This function does not require you to understand how to properly add a
596# 750# group to the system. Just give it a group name to add and enewgroup will
597# Default values if you do not specify any: 751# do the rest. You may specify the gid for the group or allow the group to
598# groupname: REQUIRED ! 752# allocate the next available one.
599# gid: next available (see groupadd(8))
600# extra: none
601enewgroup() { 753enewgroup() {
602 case ${EBUILD_PHASE} in 754 case ${EBUILD_PHASE} in
603 unpack|compile|test|install) 755 unpack|compile|test|install)
604 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function." 756 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
605 eerror "Package fails at QA and at life. Please file a bug." 757 eerror "Package fails at QA and at life. Please file a bug."
695 esac 847 esac
696 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 848 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
697 ;; 849 ;;
698 850
699 *) 851 *)
852 # We specify -r so that we get a GID in the system range from login.defs
700 groupadd ${opts} ${egroup} || die "enewgroup failed" 853 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
701 ;; 854 ;;
702 esac 855 esac
703 export SANDBOX_ON="${oldsandbox}" 856 export SANDBOX_ON="${oldsandbox}"
704} 857}
705 858
706# Simple script to replace 'dos2unix' binaries 859# @FUNCTION: edos2unix
707# vapier@gentoo.org 860# @USAGE: <file> [more files ...]
708# 861# @DESCRIPTION:
709# edos2unix(file, <more files> ...) 862# A handy replacement for dos2unix, recode, fixdos, etc... This allows you
863# to remove all of these text utilities from DEPEND variables because this
864# is a script based solution. Just give it a list of files to convert and
865# they will all be changed from the DOS CRLF format to the UNIX LF format.
710edos2unix() { 866edos2unix() {
711 echo "$@" | xargs sed -i 's/\r$//' 867 echo "$@" | xargs sed -i 's/\r$//'
712} 868}
713
714
715##############################################################
716# START: Handle .desktop files and menu entries #
717# maybe this should be separated into a new eclass some time #
718# lanius@gentoo.org #
719##############################################################
720 869
721# Make a desktop file ! 870# Make a desktop file !
722# Great for making those icons in kde/gnome startmenu ! 871# Great for making those icons in kde/gnome startmenu !
723# Amaze your friends ! Get the women ! Join today ! 872# Amaze your friends ! Get the women ! Join today !
724# 873#
725# make_desktop_entry(<command>, [name], [icon], [type], [path]) 874# make_desktop_entry(<command>, [name], [icon], [type], [fields])
726# 875#
727# binary: what command does the app run with ? 876# binary: what command does the app run with ?
728# name: the name that will show up in the menu 877# name: the name that will show up in the menu
729# icon: give your little like a pretty little icon ... 878# icon: give your little like a pretty little icon ...
730# this can be relative (to /usr/share/pixmaps) or 879# this can be relative (to /usr/share/pixmaps) or
731# a full path to an icon 880# a full path to an icon
732# type: what kind of application is this ? for categories: 881# type: what kind of application is this ? for categories:
733# http://www.freedesktop.org/Standards/desktop-entry-spec 882# http://standards.freedesktop.org/menu-spec/latest/apa.html
734# path: if your app needs to startup in a specific dir 883# fields: extra fields to append to the desktop file; a printf string
735make_desktop_entry() { 884make_desktop_entry() {
736 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 885 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
737 886
738 local exec=${1} 887 local exec=${1}
739 local name=${2:-${PN}} 888 local name=${2:-${PN}}
740 local icon=${3:-${PN}.png} 889 local icon=${3:-${PN}}
741 local type=${4} 890 local type=${4}
742 local path=${5} 891 local fields=${5}
743 892
744 if [[ -z ${type} ]] ; then 893 if [[ -z ${type} ]] ; then
745 local catmaj=${CATEGORY%%-*} 894 local catmaj=${CATEGORY%%-*}
746 local catmin=${CATEGORY##*-} 895 local catmin=${CATEGORY##*-}
747 case ${catmaj} in 896 case ${catmaj} in
748 app) 897 app)
749 case ${catmin} in 898 case ${catmin} in
899 accessibility) type=Accessibility;;
750 admin) type=System;; 900 admin) type=System;;
901 antivirus) type=System;;
902 arch) type=Archiving;;
903 backup) type=Archiving;;
751 cdr) type=DiscBurning;; 904 cdr) type=DiscBurning;;
752 dicts) type=Dictionary;; 905 dicts) type=Dictionary;;
906 doc) type=Documentation;;
753 editors) type=TextEditor;; 907 editors) type=TextEditor;;
754 emacs) type=TextEditor;; 908 emacs) type=TextEditor;;
755 emulation) type=Emulator;; 909 emulation) type=Emulator;;
756 laptop) type=HardwareSettings;; 910 laptop) type=HardwareSettings;;
757 office) type=Office;; 911 office) type=Office;;
912 pda) type=PDA;;
758 vim) type=TextEditor;; 913 vim) type=TextEditor;;
759 xemacs) type=TextEditor;; 914 xemacs) type=TextEditor;;
760 *) type=;;
761 esac 915 esac
762 ;; 916 ;;
763 917
764 dev) 918 dev)
765 type="Development" 919 type="Development"
766 ;; 920 ;;
767 921
768 games) 922 games)
769 case ${catmin} in 923 case ${catmin} in
770 action|fps) type=ActionGame;; 924 action|fps) type=ActionGame;;
771 arcade) type=ArcadeGame;; 925 arcade) type=ArcadeGame;;
772 board) type=BoardGame;; 926 board) type=BoardGame;;
773 kids) type=KidsGame;;
774 emulation) type=Emulator;; 927 emulation) type=Emulator;;
928 kids) type=KidsGame;;
775 puzzle) type=LogicGame;; 929 puzzle) type=LogicGame;;
776 rpg) type=RolePlaying;;
777 roguelike) type=RolePlaying;; 930 roguelike) type=RolePlaying;;
931 rpg) type=RolePlaying;;
778 simulation) type=Simulation;; 932 simulation) type=Simulation;;
779 sports) type=SportsGame;; 933 sports) type=SportsGame;;
780 strategy) type=StrategyGame;; 934 strategy) type=StrategyGame;;
781 *) type=;;
782 esac 935 esac
783 type="Game;${type}" 936 type="Game;${type}"
784 ;; 937 ;;
785 938
939 gnome)
940 type="Gnome;GTK"
941 ;;
942
943 kde)
944 type="KDE;Qt"
945 ;;
946
786 mail) 947 mail)
787 type="Network;Email" 948 type="Network;Email"
788 ;; 949 ;;
789 950
790 media) 951 media)
791 case ${catmin} in 952 case ${catmin} in
953 gfx)
792 gfx) type=Graphics;; 954 type=Graphics
955 ;;
956 *)
957 case ${catmin} in
793 radio) type=Tuner;; 958 radio) type=Tuner;;
794 sound) type=Audio;; 959 sound) type=Audio;;
795 tv) type=TV;; 960 tv) type=TV;;
796 video) type=Video;; 961 video) type=Video;;
797 *) type=;; 962 esac
963 type="AudioVideo;${type}"
964 ;;
798 esac 965 esac
799 type="AudioVideo;${type}"
800 ;; 966 ;;
801 967
802 net) 968 net)
803 case ${catmin} in 969 case ${catmin} in
804 dialup) type=Dialup;; 970 dialup) type=Dialup;;
805 ftp) type=FileTransfer;; 971 ftp) type=FileTransfer;;
806 im) type=InstantMessaging;; 972 im) type=InstantMessaging;;
807 irc) type=IRCClient;; 973 irc) type=IRCClient;;
808 mail) type=Email;; 974 mail) type=Email;;
809 news) type=News;; 975 news) type=News;;
810 nntp) type=News;; 976 nntp) type=News;;
811 p2p) type=FileTransfer;; 977 p2p) type=FileTransfer;;
812 *) type=;; 978 voip) type=Telephony;;
813 esac 979 esac
814 type="Network;${type}" 980 type="Network;${type}"
815 ;; 981 ;;
816 982
817 sci) 983 sci)
818 case ${catmin} in 984 case ${catmin} in
819 astro*) type=Astronomy;; 985 astro*) type=Astronomy;;
820 bio*) type=Biology;; 986 bio*) type=Biology;;
821 calc*) type=Calculator;; 987 calc*) type=Calculator;;
822 chem*) type=Chemistry;; 988 chem*) type=Chemistry;;
989 elec*) type=Electronics;;
823 geo*) type=Geology;; 990 geo*) type=Geology;;
824 math*) type=Math;; 991 math*) type=Math;;
825 *) type=;; 992 physics) type=Physics;;
993 visual*) type=DataVisualization;;
826 esac 994 esac
827 type="Science;${type}" 995 type="Education;Science;${type}"
996 ;;
997
998 sys)
999 type="System"
828 ;; 1000 ;;
829 1001
830 www) 1002 www)
831 case ${catmin} in 1003 case ${catmin} in
832 client) type=WebBrowser;; 1004 client) type=WebBrowser;;
833 *) type=;;
834 esac 1005 esac
835 type="Network" 1006 type="Network;${type}"
836 ;; 1007 ;;
837 1008
838 *) 1009 *)
839 type= 1010 type=
840 ;; 1011 ;;
846 local desktop_name="${PN}-${SLOT}" 1017 local desktop_name="${PN}-${SLOT}"
847 fi 1018 fi
848 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1019 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
849 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1020 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
850 1021
1022 # Don't append another ";" when a valid category value is provided.
1023 type=${type%;}${type:+;}
1024
1025 eshopts_push -s extglob
1026 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
1027 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1028 ewarn "allowed in .desktop files if the value is not an absolute path."
1029 icon=${icon%.@(xpm|png|svg)}
1030 fi
1031 eshopts_pop
1032
851 cat <<-EOF > "${desktop}" 1033 cat <<-EOF > "${desktop}"
852 [Desktop Entry] 1034 [Desktop Entry]
853 Encoding=UTF-8
854 Version=0.9.2
855 Name=${name} 1035 Name=${name}
856 Type=Application 1036 Type=Application
857 Comment=${DESCRIPTION} 1037 Comment=${DESCRIPTION}
858 Exec=${exec} 1038 Exec=${exec}
859 TryExec=${exec%% *} 1039 TryExec=${exec%% *}
860 Path=${path}
861 Icon=${icon} 1040 Icon=${icon}
862 Categories=Application;${type}; 1041 Categories=${type}
863 EOF 1042 EOF
1043
1044 if [[ ${fields:-=} != *=* ]] ; then
1045 # 5th arg used to be value to Path=
1046 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
1047 fields="Path=${fields}"
1048 fi
1049 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
864 1050
865 ( 1051 (
866 # wrap the env here so that the 'insinto' call 1052 # wrap the env here so that the 'insinto' call
867 # doesn't corrupt the env of the caller 1053 # doesn't corrupt the env of the caller
868 insinto /usr/share/applications 1054 insinto /usr/share/applications
869 doins "${desktop}" 1055 doins "${desktop}"
870 ) 1056 ) || die "installing desktop file failed"
871} 1057}
872 1058
873 1059# @FUNCTION: validate_desktop_entries
1060# @USAGE: [directories]
1061# @MAINTAINER:
1062# Carsten Lohrke <carlo@gentoo.org>
1063# @DESCRIPTION:
874# Validate desktop entries using desktop-file-utils 1064# Validate desktop entries using desktop-file-utils
875# Carsten Lohrke <carlo@gentoo.org>
876#
877# Usage: validate_desktop_entries [directory ...]
878
879validate_desktop_entries() { 1065validate_desktop_entries() {
880 if [[ -x /usr/bin/desktop-file-validate ]] ; then 1066 if [[ -x /usr/bin/desktop-file-validate ]] ; then
881 einfo "Checking desktop entry validity" 1067 einfo "Checking desktop entry validity"
882 local directories="" 1068 local directories=""
883 for d in /usr/share/applications $@ ; do 1069 for d in /usr/share/applications $@ ; do
896 else 1082 else
897 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo." 1083 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
898 fi 1084 fi
899} 1085}
900 1086
901 1087# @FUNCTION: make_session_desktop
902# Make a GDM/KDM Session file 1088# @USAGE: <title> <command> [command args...]
1089# @DESCRIPTION:
1090# Make a GDM/KDM Session file. The title is the file to execute to start the
1091# Window Manager. The command is the name of the Window Manager.
903# 1092#
904# make_session_desktop(<title>, <command>) 1093# You can set the name of the file via the ${wm} variable.
905# title: File to execute to start the Window Manager
906# command: Name of the Window Manager
907
908make_session_desktop() { 1094make_session_desktop() {
909 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 1095 [[ -z $1 ]] && eerror "$0: You must specify the title" && return 1
910 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1 1096 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
911 1097
912 local title=$1 1098 local title=$1
913 local command=$2 1099 local command=$2
914 local desktop=${T}/${wm}.desktop 1100 local desktop=${T}/${wm:-${PN}}.desktop
1101 shift 2
915 1102
916 cat <<-EOF > "${desktop}" 1103 cat <<-EOF > "${desktop}"
917 [Desktop Entry] 1104 [Desktop Entry]
918 Encoding=UTF-8
919 Name=${title} 1105 Name=${title}
920 Comment=This session logs you into ${title} 1106 Comment=This session logs you into ${title}
921 Exec=${command} 1107 Exec=${command} $*
922 TryExec=${command} 1108 TryExec=${command}
923 Type=Application 1109 Type=XSession
924 EOF 1110 EOF
925 1111
926 ( 1112 (
927 # wrap the env here so that the 'insinto' call 1113 # wrap the env here so that the 'insinto' call
928 # doesn't corrupt the env of the caller 1114 # doesn't corrupt the env of the caller
929 insinto /usr/share/xsessions 1115 insinto /usr/share/xsessions
930 doins "${desktop}" 1116 doins "${desktop}"
931 ) 1117 )
932} 1118}
933 1119
1120# @FUNCTION: domenu
1121# @USAGE: <menus>
1122# @DESCRIPTION:
1123# Install the list of .desktop menu files into the appropriate directory
1124# (/usr/share/applications).
934domenu() { 1125domenu() {
935 ( 1126 (
936 # wrap the env here so that the 'insinto' call 1127 # wrap the env here so that the 'insinto' call
937 # doesn't corrupt the env of the caller 1128 # doesn't corrupt the env of the caller
938 local i j ret=0 1129 local i j ret=0
944 elif [[ -d ${i} ]] ; then 1135 elif [[ -d ${i} ]] ; then
945 for j in "${i}"/*.desktop ; do 1136 for j in "${i}"/*.desktop ; do
946 doins "${j}" 1137 doins "${j}"
947 ((ret+=$?)) 1138 ((ret+=$?))
948 done 1139 done
1140 else
1141 ((++ret))
949 fi 1142 fi
950 done 1143 done
951 exit ${ret} 1144 exit ${ret}
952 ) 1145 )
953} 1146}
1147
1148# @FUNCTION: newmenu
1149# @USAGE: <menu> <newname>
1150# @DESCRIPTION:
1151# Like all other new* functions, install the specified menu as newname.
954newmenu() { 1152newmenu() {
955 ( 1153 (
956 # wrap the env here so that the 'insinto' call 1154 # wrap the env here so that the 'insinto' call
957 # doesn't corrupt the env of the caller 1155 # doesn't corrupt the env of the caller
958 insinto /usr/share/applications 1156 insinto /usr/share/applications
959 newins "$@" 1157 newins "$@"
960 ) 1158 )
961} 1159}
962 1160
1161# @FUNCTION: doicon
1162# @USAGE: <list of icons>
1163# @DESCRIPTION:
1164# Install the list of icons into the icon directory (/usr/share/pixmaps).
1165# This is useful in conjunction with creating desktop/menu files.
963doicon() { 1166doicon() {
964 ( 1167 (
965 # wrap the env here so that the 'insinto' call 1168 # wrap the env here so that the 'insinto' call
966 # doesn't corrupt the env of the caller 1169 # doesn't corrupt the env of the caller
967 local i j ret 1170 local i j ret
973 elif [[ -d ${i} ]] ; then 1176 elif [[ -d ${i} ]] ; then
974 for j in "${i}"/*.png ; do 1177 for j in "${i}"/*.png ; do
975 doins "${j}" 1178 doins "${j}"
976 ((ret+=$?)) 1179 ((ret+=$?))
977 done 1180 done
1181 else
1182 ((++ret))
978 fi 1183 fi
979 done 1184 done
980 exit ${ret} 1185 exit ${ret}
981 ) 1186 )
982} 1187}
1188
1189# @FUNCTION: newicon
1190# @USAGE: <icon> <newname>
1191# @DESCRIPTION:
1192# Like all other new* functions, install the specified icon as newname.
983newicon() { 1193newicon() {
984 ( 1194 (
985 # wrap the env here so that the 'insinto' call 1195 # wrap the env here so that the 'insinto' call
986 # doesn't corrupt the env of the caller 1196 # doesn't corrupt the env of the caller
987 insinto /usr/share/pixmaps 1197 insinto /usr/share/pixmaps
988 newins "$@" 1198 newins "$@"
989 ) 1199 )
990} 1200}
991
992##############################################################
993# END: Handle .desktop files and menu entries #
994##############################################################
995
996 1201
997# for internal use only (unpack_pdv and unpack_makeself) 1202# for internal use only (unpack_pdv and unpack_makeself)
998find_unpackable_file() { 1203find_unpackable_file() {
999 local src=$1 1204 local src=$1
1000 if [[ -z ${src} ]] ; then 1205 if [[ -z ${src} ]] ; then
1010 fi 1215 fi
1011 [[ ! -e ${src} ]] && return 1 1216 [[ ! -e ${src} ]] && return 1
1012 echo "${src}" 1217 echo "${src}"
1013} 1218}
1014 1219
1220# @FUNCTION: unpack_pdv
1221# @USAGE: <file to unpack> <size of off_t>
1222# @DESCRIPTION:
1015# Unpack those pesky pdv generated files ... 1223# Unpack those pesky pdv generated files ...
1016# They're self-unpacking programs with the binary package stuffed in 1224# They're self-unpacking programs with the binary package stuffed in
1017# the middle of the archive. Valve seems to use it a lot ... too bad 1225# the middle of the archive. Valve seems to use it a lot ... too bad
1018# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1226# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1019# 1227#
1020# Usage: unpack_pdv [file to unpack] [size of off_t]
1021# - you have to specify the off_t size ... i have no idea how to extract that 1228# You have to specify the off_t size ... I have no idea how to extract that
1022# information out of the binary executable myself. basically you pass in 1229# information out of the binary executable myself. Basically you pass in
1023# the size of the off_t type (in bytes) on the machine that built the pdv 1230# the size of the off_t type (in bytes) on the machine that built the pdv
1231# archive.
1232#
1024# archive. one way to determine this is by running the following commands: 1233# One way to determine this is by running the following commands:
1234#
1235# @CODE
1025# strings <pdv archive> | grep lseek 1236# strings <pdv archive> | grep lseek
1026# strace -elseek <pdv archive> 1237# strace -elseek <pdv archive>
1238# @CODE
1239#
1027# basically look for the first lseek command (we do the strings/grep because 1240# Basically look for the first lseek command (we do the strings/grep because
1028# sometimes the function call is _llseek or something) and steal the 2nd 1241# sometimes the function call is _llseek or something) and steal the 2nd
1029# parameter. here is an example: 1242# parameter. Here is an example:
1243#
1244# @CODE
1030# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1245# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1031# lseek 1246# lseek
1032# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1247# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1033# lseek(3, -4, SEEK_END) = 2981250 1248# lseek(3, -4, SEEK_END) = 2981250
1249# @CODE
1250#
1034# thus we would pass in the value of '4' as the second parameter. 1251# Thus we would pass in the value of '4' as the second parameter.
1035unpack_pdv() { 1252unpack_pdv() {
1036 local src=$(find_unpackable_file "$1") 1253 local src=$(find_unpackable_file "$1")
1037 local sizeoff_t=$2 1254 local sizeoff_t=$2
1038 1255
1039 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1256 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1101 true 1318 true
1102 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" 1319 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
1103 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" 1320 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
1104} 1321}
1105 1322
1323# @FUNCTION: unpack_makeself
1324# @USAGE: [file to unpack] [offset] [tail|dd]
1325# @DESCRIPTION:
1106# Unpack those pesky makeself generated files ... 1326# Unpack those pesky makeself generated files ...
1107# They're shell scripts with the binary package tagged onto 1327# They're shell scripts with the binary package tagged onto
1108# the end of the archive. Loki utilized the format as does 1328# the end of the archive. Loki utilized the format as does
1109# many other game companies. 1329# many other game companies.
1110# 1330#
1111# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1331# If the file is not specified, then ${A} is used. If the
1112# - If the file is not specified then unpack will utilize ${A}.
1113# - If the offset is not specified then we will attempt to extract 1332# offset is not specified then we will attempt to extract
1114# the proper offset from the script itself. 1333# the proper offset from the script itself.
1115unpack_makeself() { 1334unpack_makeself() {
1116 local src_input=${1:-${A}} 1335 local src_input=${1:-${A}}
1117 local src=$(find_unpackable_file "${src_input}") 1336 local src=$(find_unpackable_file "${src_input}")
1118 local skip=$2 1337 local skip=$2
1119 local exe=$3 1338 local exe=$3
1121 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1340 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1122 1341
1123 local shrtsrc=$(basename "${src}") 1342 local shrtsrc=$(basename "${src}")
1124 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1343 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1125 if [[ -z ${skip} ]] ; then 1344 if [[ -z ${skip} ]] ; then
1126 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1345 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1127 local skip=0 1346 local skip=0
1128 exe=tail 1347 exe=tail
1129 case ${ver} in 1348 case ${ver} in
1130 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1349 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1131 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1350 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1133 2.0|2.0.1) 1352 2.0|2.0.1)
1134 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1353 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1135 ;; 1354 ;;
1136 2.1.1) 1355 2.1.1)
1137 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1356 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1138 let skip="skip + 1" 1357 (( skip++ ))
1139 ;; 1358 ;;
1140 2.1.2) 1359 2.1.2)
1141 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1360 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1142 let skip="skip + 1" 1361 (( skip++ ))
1143 ;; 1362 ;;
1144 2.1.3) 1363 2.1.3)
1145 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1364 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1146 let skip="skip + 1" 1365 (( skip++ ))
1147 ;; 1366 ;;
1148 2.1.4|2.1.5) 1367 2.1.4|2.1.5)
1149 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1368 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1150 skip=$(head -n ${skip} "${src}" | wc -c) 1369 skip=$(head -n ${skip} "${src}" | wc -c)
1151 exe="dd" 1370 exe="dd"
1160 esac 1379 esac
1161 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1380 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1162 fi 1381 fi
1163 case ${exe} in 1382 case ${exe} in
1164 tail) exe="tail -n +${skip} '${src}'";; 1383 tail) exe="tail -n +${skip} '${src}'";;
1165 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1384 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1166 *) die "makeself cant handle exe '${exe}'" 1385 *) die "makeself cant handle exe '${exe}'"
1167 esac 1386 esac
1168 1387
1169 # lets grab the first few bytes of the file to figure out what kind of archive it is 1388 # lets grab the first few bytes of the file to figure out what kind of archive it is
1170 local tmpfile=$(emktemp) 1389 local tmpfile=$(emktemp)
1189 ;; 1408 ;;
1190 esac 1409 esac
1191 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})" 1410 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
1192} 1411}
1193 1412
1413# @FUNCTION: check_license
1414# @USAGE: [license]
1415# @DESCRIPTION:
1194# Display a license for user to accept. 1416# Display a license for user to accept. If no license is
1195#
1196# Usage: check_license [license]
1197# - If the file is not specified then ${LICENSE} is used. 1417# specified, then ${LICENSE} is used.
1198check_license() { 1418check_license() {
1199 local lic=$1 1419 local lic=$1
1200 if [ -z "${lic}" ] ; then 1420 if [ -z "${lic}" ] ; then
1201 lic="${PORTDIR}/licenses/${LICENSE}" 1421 lic="${PORTDIR}/licenses/${LICENSE}"
1202 else 1422 else
1206 lic="${PWD}/${lic}" 1426 lic="${PWD}/${lic}"
1207 elif [ -e "${lic}" ] ; then 1427 elif [ -e "${lic}" ] ; then
1208 lic="${lic}" 1428 lic="${lic}"
1209 fi 1429 fi
1210 fi 1430 fi
1211 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1212 local l="`basename ${lic}`" 1431 local l="`basename ${lic}`"
1213 1432
1214 # here is where we check for the licenses the user already 1433 # here is where we check for the licenses the user already
1215 # accepted ... if we don't find a match, we make the user accept 1434 # accepted ... if we don't find a match, we make the user accept
1216 local shopts=$-
1217 local alic 1435 local alic
1218 set -o noglob #so that bash doesn't expand "*" 1436 eshopts_push -o noglob # so that bash doesn't expand "*"
1219 for alic in ${ACCEPT_LICENSE} ; do 1437 for alic in ${ACCEPT_LICENSE} ; do
1220 if [[ ${alic} == ${l} ]]; then 1438 if [[ ${alic} == ${l} ]]; then
1221 set +o noglob; set -${shopts} #reset old shell opts 1439 eshopts_pop
1222 return 0 1440 return 0
1223 fi 1441 fi
1224 done 1442 done
1225 set +o noglob; set -$shopts #reset old shell opts 1443 eshopts_pop
1444 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1226 1445
1227 local licmsg=$(emktemp) 1446 local licmsg=$(emktemp)
1228 cat <<-EOF > ${licmsg} 1447 cat <<-EOF > ${licmsg}
1229 ********************************************************** 1448 **********************************************************
1230 The following license outlines the terms of use of this 1449 The following license outlines the terms of use of this
1231 package. You MUST accept this license for installation to 1450 package. You MUST accept this license for installation to
1232 continue. When you are done viewing, hit 'q'. If you 1451 continue. When you are done viewing, hit 'q'. If you
1233 CTRL+C out of this, the install will not run! 1452 CTRL+C out of this, the install will not run!
1234 ********************************************************** 1453 **********************************************************
1235 1454
1236 EOF 1455 EOF
1237 cat ${lic} >> ${licmsg} 1456 cat ${lic} >> ${licmsg}
1238 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1457 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1239 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1458 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1240 read alic 1459 read alic
1248 die "Failed to accept license" 1467 die "Failed to accept license"
1249 ;; 1468 ;;
1250 esac 1469 esac
1251} 1470}
1252 1471
1472# @FUNCTION: cdrom_get_cds
1473# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...]
1474# @DESCRIPTION:
1253# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates 1475# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates
1254# the whole 'non-interactive' policy, but damnit I want CD support ! 1476# the whole 'non-interactive' policy, but damnit I want CD support !
1255# 1477#
1256# with these cdrom functions we handle all the user interaction and 1478# With these cdrom functions we handle all the user interaction and
1257# standardize everything. all you have to do is call cdrom_get_cds() 1479# standardize everything. All you have to do is call cdrom_get_cds()
1258# and when the function returns, you can assume that the cd has been 1480# and when the function returns, you can assume that the cd has been
1259# found at CDROM_ROOT. 1481# found at CDROM_ROOT.
1260# 1482#
1483# The function will attempt to locate a cd based upon a file that is on
1484# the cd. The more files you give this function, the more cds
1485# the cdrom functions will handle.
1486#
1261# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1487# Normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1262# etc... if you want to give the cds better names, then just export 1488# etc... If you want to give the cds better names, then just export
1263# the appropriate CDROM_NAME variable before calling cdrom_get_cds(). 1489# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1264# - CDROM_NAME="fooie cd" - for when you only want 1 cd 1490# Use CDROM_NAME for one cd, or CDROM_NAME_# for multiple cds. You can
1265# - CDROM_NAME_1="install cd" - for when you want more than 1 cd 1491# also use the CDROM_NAME_SET bash array.
1266# CDROM_NAME_2="data cd"
1267# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1268# 1492#
1269# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1493# For those multi cd ebuilds, see the cdrom_load_next_cd() function.
1270#
1271# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1272# - this will attempt to locate a cd based upon a file that is on
1273# the cd ... the more files you give this function, the more cds
1274# the cdrom functions will handle
1275cdrom_get_cds() { 1494cdrom_get_cds() {
1276 # first we figure out how many cds we're dealing with by 1495 # first we figure out how many cds we're dealing with by
1277 # the # of files they gave us 1496 # the # of files they gave us
1278 local cdcnt=0 1497 local cdcnt=0
1279 local f= 1498 local f=
1303 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1522 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1304 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1523 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1305 export CDROM_SET=-1 1524 export CDROM_SET=-1
1306 for f in ${CDROM_CHECK_1//:/ } ; do 1525 for f in ${CDROM_CHECK_1//:/ } ; do
1307 ((++CDROM_SET)) 1526 ((++CDROM_SET))
1308 [[ -e ${CD_ROOT}/${f} ]] && break 1527 [[ -e ${CDROM_ROOT}/${f} ]] && break
1309 done 1528 done
1310 export CDROM_MATCH=${f} 1529 export CDROM_MATCH=${f}
1311 return 1530 return
1312 fi 1531 fi
1313 1532
1365 export CDROM_SET="" 1584 export CDROM_SET=""
1366 export CDROM_CURRENT_CD=0 1585 export CDROM_CURRENT_CD=0
1367 cdrom_load_next_cd 1586 cdrom_load_next_cd
1368} 1587}
1369 1588
1370# this is only used when you need access to more than one cd. 1589# @FUNCTION: cdrom_load_next_cd
1371# when you have finished using the first cd, just call this function. 1590# @DESCRIPTION:
1372# when it returns, CDROM_ROOT will be pointing to the second cd. 1591# Some packages are so big they come on multiple CDs. When you're done reading
1373# remember, you can only go forward in the cd chain, you can't go back. 1592# files off a CD and want access to the next one, just call this function.
1593# Again, all the messy details of user interaction are taken care of for you.
1594# Once this returns, just read the variable CDROM_ROOT for the location of the
1595# mounted CD. Note that you can only go forward in the CD list, so make sure
1596# you only call this function when you're done using the current CD.
1374cdrom_load_next_cd() { 1597cdrom_load_next_cd() {
1375 local var 1598 local var
1376 ((++CDROM_CURRENT_CD)) 1599 ((++CDROM_CURRENT_CD))
1377 1600
1378 unset CDROM_ROOT 1601 unset CDROM_ROOT
1395# displayed and we'll hang out here until: 1618# displayed and we'll hang out here until:
1396# (1) the file is found on a mounted cdrom 1619# (1) the file is found on a mounted cdrom
1397# (2) the user hits CTRL+C 1620# (2) the user hits CTRL+C
1398_cdrom_locate_file_on_cd() { 1621_cdrom_locate_file_on_cd() {
1399 local mline="" 1622 local mline=""
1400 local showedmsg=0 1623 local showedmsg=0 showjolietmsg=0
1401 1624
1402 while [[ -z ${CDROM_ROOT} ]] ; do 1625 while [[ -z ${CDROM_ROOT} ]] ; do
1403 local i=0 1626 local i=0
1404 local -a cdset=(${*//:/ }) 1627 local -a cdset=(${*//:/ })
1405 if [[ -n ${CDROM_SET} ]] ; then 1628 if [[ -n ${CDROM_SET} ]] ; then
1414 while read point node fs foo ; do 1637 while read point node fs foo ; do
1415 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \ 1638 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1416 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \ 1639 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1417 && continue 1640 && continue
1418 point=${point//\040/ } 1641 point=${point//\040/ }
1642 [[ ! -d ${point}/${dir} ]] && continue
1419 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue 1643 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1420 export CDROM_ROOT=${point} 1644 export CDROM_ROOT=${point}
1421 export CDROM_SET=${i} 1645 export CDROM_SET=${i}
1422 export CDROM_MATCH=${cdset[${i}]} 1646 export CDROM_MATCH=${cdset[${i}]}
1423 return 1647 return
1445 showedmsg=1 1669 showedmsg=1
1446 fi 1670 fi
1447 einfo "Press return to scan for the cd again" 1671 einfo "Press return to scan for the cd again"
1448 einfo "or hit CTRL+C to abort the emerge." 1672 einfo "or hit CTRL+C to abort the emerge."
1449 echo 1673 echo
1674 if [[ ${showjolietmsg} -eq 0 ]] ; then
1675 showjolietmsg=1
1676 else
1450 einfo "If you are having trouble with the detection" 1677 ewarn "If you are having trouble with the detection"
1451 einfo "of your CD, it is possible that you do not have" 1678 ewarn "of your CD, it is possible that you do not have"
1452 einfo "Joliet support enabled in your kernel. Please" 1679 ewarn "Joliet support enabled in your kernel. Please"
1453 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1680 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1681 ebeep 5
1682 fi
1454 read || die "something is screwed with your system" 1683 read || die "something is screwed with your system"
1455 done 1684 done
1456} 1685}
1457 1686
1687# @FUNCTION: strip-linguas
1688# @USAGE: [<allow LINGUAS>|<-i|-u> <directories of .po files>]
1689# @DESCRIPTION:
1458# Make sure that LINGUAS only contains languages that 1690# Make sure that LINGUAS only contains languages that
1459# a package can support 1691# a package can support. The first form allows you to
1460# 1692# specify a list of LINGUAS. The -i builds a list of po
1461# usage: strip-linguas <allow LINGUAS> 1693# files found in all the directories and uses the
1462# strip-linguas -i <directories of .po files> 1694# intersection of the lists. The -u builds a list of po
1463# strip-linguas -u <directories of .po files> 1695# files found in all the directories and uses the union
1464# 1696# of the lists.
1465# The first form allows you to specify a list of LINGUAS.
1466# The -i builds a list of po files found in all the
1467# directories and uses the intersection of the lists.
1468# The -u builds a list of po files found in all the
1469# directories and uses the union of the lists.
1470strip-linguas() { 1697strip-linguas() {
1471 local ls newls nols 1698 local ls newls nols
1472 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1699 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1473 local op=$1; shift 1700 local op=$1; shift
1474 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1701 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1475 local d f 1702 local d f
1476 for d in "$@" ; do 1703 for d in "$@" ; do
1477 if [[ ${op} == "-u" ]] ; then 1704 if [[ ${op} == "-u" ]] ; then
1478 newls=${ls} 1705 newls=${ls}
1479 else 1706 else
1480 newls="" 1707 newls=""
1481 fi 1708 fi
1482 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1709 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1483 if [[ ${op} == "-i" ]] ; then 1710 if [[ ${op} == "-i" ]] ; then
1484 hasq ${f} ${ls} && newls="${newls} ${f}" 1711 hasq ${f} ${ls} && newls="${newls} ${f}"
1485 else 1712 else
1486 hasq ${f} ${ls} || newls="${newls} ${f}" 1713 hasq ${f} ${ls} || newls="${newls} ${f}"
1487 fi 1714 fi
1500 else 1727 else
1501 nols="${nols} ${f}" 1728 nols="${nols} ${f}"
1502 fi 1729 fi
1503 done 1730 done
1504 [[ -n ${nols} ]] \ 1731 [[ -n ${nols} ]] \
1505 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1732 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1506 export LINGUAS=${newls:1} 1733 export LINGUAS=${newls:1}
1507} 1734}
1508 1735
1509# moved from kernel.eclass since they are generally useful outside of 1736# @FUNCTION: preserve_old_lib
1510# kernel.eclass -iggy (20041002) 1737# @USAGE: <libs to preserve> [more libs]
1511 1738# @DESCRIPTION:
1512# the following functions are useful in kernel module ebuilds, etc.
1513# for an example see ivtv or drbd ebuilds
1514
1515# set's ARCH to match what the kernel expects
1516set_arch_to_kernel() {
1517 i=10
1518 while ((i--)) ; do
1519 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1520 done
1521 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1522 case ${ARCH} in
1523 x86) export ARCH="i386";;
1524 amd64) export ARCH="x86_64";;
1525 hppa) export ARCH="parisc";;
1526 mips) export ARCH="mips";;
1527 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!
1528 *) export ARCH="${ARCH}";;
1529 esac
1530}
1531
1532# set's ARCH back to what portage expects
1533set_arch_to_portage() {
1534 i=10
1535 while ((i--)) ; do
1536 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1537 done
1538 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1539}
1540
1541# Jeremy Huddleston <eradicator@gentoo.org>:
1542# preserve_old_lib /path/to/libblah.so.0
1543# preserve_old_lib_notify /path/to/libblah.so.0
1544#
1545# These functions are useful when a lib in your package changes --library. Such 1739# These functions are useful when a lib in your package changes ABI SONAME.
1546# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1740# An example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1547# would break packages that link against it. Most people get around this 1741# would break packages that link against it. Most people get around this
1548# by using the portage SLOT mechanism, but that is not always a relevant 1742# by using the portage SLOT mechanism, but that is not always a relevant
1549# solution, so instead you can add the following to your ebuilds: 1743# solution, so instead you can call this from pkg_preinst. See also the
1550# 1744# preserve_old_lib_notify function.
1551# pkg_preinst() {
1552# ...
1553# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1554# ...
1555# }
1556#
1557# pkg_postinst() {
1558# ...
1559# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1560# ...
1561# }
1562
1563preserve_old_lib() { 1745preserve_old_lib() {
1564 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then 1746 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1565 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1747 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1566 die "Invalid preserve_old_lib() usage" 1748 die "Invalid preserve_old_lib() usage"
1567 fi 1749 fi
1568 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]" 1750 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1751
1752 # let portage worry about it
1753 has preserve-libs ${FEATURES} && return 0
1569 1754
1570 local lib dir 1755 local lib dir
1571 for lib in "$@" ; do 1756 for lib in "$@" ; do
1572 [[ -e ${ROOT}/${lib} ]] || continue 1757 [[ -e ${ROOT}/${lib} ]] || continue
1573 dir=${lib%/*} 1758 dir=${lib%/*}
1575 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed" 1760 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1576 touch "${D}"/${lib} 1761 touch "${D}"/${lib}
1577 done 1762 done
1578} 1763}
1579 1764
1765# @FUNCTION: preserve_old_lib_notify
1766# @USAGE: <libs to notify> [more libs]
1767# @DESCRIPTION:
1768# Spit helpful messages about the libraries preserved by preserve_old_lib.
1580preserve_old_lib_notify() { 1769preserve_old_lib_notify() {
1581 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1770 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1582 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only" 1771 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1583 die "Invalid preserve_old_lib_notify() usage" 1772 die "Invalid preserve_old_lib_notify() usage"
1584 fi 1773 fi
1774
1775 # let portage worry about it
1776 has preserve-libs ${FEATURES} && return 0
1585 1777
1586 local lib notice=0 1778 local lib notice=0
1587 for lib in "$@" ; do 1779 for lib in "$@" ; do
1588 [[ -e ${ROOT}/${lib} ]] || continue 1780 [[ -e ${ROOT}/${lib} ]] || continue
1589 if [[ ${notice} -eq 0 ]] ; then 1781 if [[ ${notice} -eq 0 ]] ; then
1595 ewarn "helper program, simply emerge the 'gentoolkit' package." 1787 ewarn "helper program, simply emerge the 'gentoolkit' package."
1596 ewarn 1788 ewarn
1597 fi 1789 fi
1598 ewarn " # revdep-rebuild --library ${lib##*/}" 1790 ewarn " # revdep-rebuild --library ${lib##*/}"
1599 done 1791 done
1792 if [[ ${notice} -eq 1 ]] ; then
1793 ewarn
1794 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1795 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1796 for lib in "$@" ; do
1797 ewarn " # rm '${lib}'"
1798 done
1799 fi
1600} 1800}
1601 1801
1602# Hack for people to figure out if a package was built with 1802# @FUNCTION: built_with_use
1603# certain USE flags
1604#
1605# Usage: built_with_use [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> 1803# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1606# ex: built_with_use xchat gtk2 1804# @DESCRIPTION:
1607# 1805#
1608# Flags: -a all USE flags should be utilized 1806# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls.
1609# -o at least one USE flag should be utilized 1807#
1610# --missing peform the specified action if the flag is not in IUSE (true/false/die) 1808# A temporary hack until portage properly supports DEPENDing on USE
1611# --hidden USE flag we're checking is hidden expanded so it isnt in IUSE 1809# flags being enabled in packages. This will check to see if the specified
1612# Note: the default flag is '-a' 1810# DEPEND atom was built with the specified list of USE flags. The
1811# --missing option controls the behavior if called on a package that does
1812# not actually support the defined USE flags (aka listed in IUSE).
1813# The default is to abort (call die). The -a and -o flags control
1814# the requirements of the USE flags. They correspond to "and" and "or"
1815# logic. So the -a flag means all listed USE flags must be enabled
1816# while the -o flag means at least one of the listed IUSE flags must be
1817# enabled. The --hidden option is really for internal use only as it
1818# means the USE flag we're checking is hidden expanded, so it won't be found
1819# in IUSE like normal USE flags.
1820#
1821# Remember that this function isn't terribly intelligent so order of optional
1822# flags matter.
1613built_with_use() { 1823built_with_use() {
1614 local hidden="no" 1824 local hidden="no"
1615 if [[ $1 == "--hidden" ]] ; then 1825 if [[ $1 == "--hidden" ]] ; then
1616 hidden="yes" 1826 hidden="yes"
1617 shift 1827 shift
1646 die) die "Unable to determine what USE flags $PKG was built with";; 1856 die) die "Unable to determine what USE flags $PKG was built with";;
1647 esac 1857 esac
1648 fi 1858 fi
1649 1859
1650 if [[ ${hidden} == "no" ]] ; then 1860 if [[ ${hidden} == "no" ]] ; then
1651 local IUSE_BUILT=$(<${IUSEFILE}) 1861 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1652 # Don't check USE_EXPAND #147237 1862 # Don't check USE_EXPAND #147237
1653 local expand 1863 local expand
1654 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1864 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1655 if [[ $1 == ${expand}_* ]] ; then 1865 if [[ $1 == ${expand}_* ]] ; then
1656 expand="" 1866 expand=""
1657 break 1867 break
1658 fi 1868 fi
1659 done 1869 done
1660 if [[ -n ${expand} ]] ; then 1870 if [[ -n ${expand} ]] ; then
1661 if ! has $1 ${IUSE_BUILT} ; then 1871 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1662 case ${missing_action} in 1872 case ${missing_action} in
1663 true) return 0;; 1873 true) return 0;;
1664 false) return 1;; 1874 false) return 1;;
1665 die) die "$PKG does not actually support the $1 USE flag!";; 1875 die) die "$PKG does not actually support the $1 USE flag!";;
1666 esac 1876 esac
1678 shift 1888 shift
1679 done 1889 done
1680 [[ ${opt} = "-a" ]] 1890 [[ ${opt} = "-a" ]]
1681} 1891}
1682 1892
1893# @FUNCTION: epunt_cxx
1894# @USAGE: [dir to scan]
1895# @DESCRIPTION:
1683# Many configure scripts wrongly bail when a C++ compiler 1896# Many configure scripts wrongly bail when a C++ compiler could not be
1684# could not be detected. #73450 1897# detected. If dir is not specified, then it defaults to ${S}.
1898#
1899# http://bugs.gentoo.org/73450
1685epunt_cxx() { 1900epunt_cxx() {
1686 local dir=$1 1901 local dir=$1
1687 [[ -z ${dir} ]] && dir=${S} 1902 [[ -z ${dir} ]] && dir=${S}
1688 ebegin "Removing useless C++ checks" 1903 ebegin "Removing useless C++ checks"
1689 local f 1904 local f
1690 for f in $(find ${dir} -name configure) ; do 1905 find "${dir}" -name configure | while read f ; do
1691 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1906 patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1692 done 1907 done
1693 eend 0 1908 eend 0
1694} 1909}
1695 1910
1696# make a wrapper script ... 1911# @FUNCTION: make_wrapper
1697# NOTE: this was originally games_make_wrapper, but I noticed other places where 1912# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1698# this could be used, so I have moved it here and made it not games-specific 1913# @DESCRIPTION:
1699# -- wolf31o2 1914# Create a shell wrapper script named wrapper in installpath
1700# $1 == wrapper name 1915# (defaults to the bindir) to execute target (default of wrapper) by
1701# $2 == binary to run 1916# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1702# $3 == directory to chdir before running binary 1917# libpaths followed by optionally changing directory to chdir.
1703# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1704# $5 == path for wrapper
1705make_wrapper() { 1918make_wrapper() {
1706 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1919 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1707 local tmpwrapper=$(emktemp) 1920 local tmpwrapper=$(emktemp)
1708 # We don't want to quote ${bin} so that people can pass complex 1921 # We don't want to quote ${bin} so that people can pass complex
1709 # things as $bin ... "./someprog --args" 1922 # things as $bin ... "./someprog --args"
1719fi 1932fi
1720exec ${bin} "\$@" 1933exec ${bin} "\$@"
1721EOF 1934EOF
1722 chmod go+rx "${tmpwrapper}" 1935 chmod go+rx "${tmpwrapper}"
1723 if [[ -n ${path} ]] ; then 1936 if [[ -n ${path} ]] ; then
1937 (
1724 exeinto "${path}" 1938 exeinto "${path}"
1725 newexe "${tmpwrapper}" "${wrapper}" 1939 newexe "${tmpwrapper}" "${wrapper}"
1940 ) || die
1726 else 1941 else
1727 newbin "${tmpwrapper}" "${wrapper}" 1942 newbin "${tmpwrapper}" "${wrapper}" || die
1943 fi
1944}
1945
1946# @FUNCTION: prepalldocs
1947# @USAGE:
1948# @DESCRIPTION:
1949# Compress files in /usr/share/doc which are not already
1950# compressed, excluding /usr/share/doc/${PF}/html.
1951# Uses the ecompressdir to do the compression.
1952# 2009-02-18 by betelgeuse:
1953# Commented because ecompressdir is even more internal to
1954# Portage than prepalldocs (it's not even mentioned in man 5
1955# ebuild). Please submit a better version for review to gentoo-dev
1956# if you want prepalldocs here.
1957#prepalldocs() {
1958# if [[ -n $1 ]] ; then
1959# ewarn "prepalldocs: invalid usage; takes no arguments"
1728 fi 1960# fi
1729} 1961
1962# cd "${D}"
1963# [[ -d usr/share/doc ]] || return 0
1964
1965# find usr/share/doc -exec gzip {} +
1966# ecompressdir --ignore /usr/share/doc/${PF}/html
1967# ecompressdir --queue /usr/share/doc
1968#}

Legend:
Removed from v.1.282  
changed lines
  Added in v.1.349

  ViewVC Help
Powered by ViewVC 1.1.20