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

Diff of /eclass/eutils.eclass

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

Revision 1.268 Revision 1.326
1# Copyright 1999-2006 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.268 2007/01/13 19:36:14 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.326 2010/01/10 05:53:36 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 22# @FUNCTION: epause
17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 23# @USAGE: [seconds]
18# outputting to a terminal, don't wait. For compatability purposes, the argument 24# @DESCRIPTION:
19# must be an integer greater than zero. 25# Sleep for the specified number of seconds (default of 5 seconds). Useful when
20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 26# printing a message the user should probably be reading and often used in
27# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set,
28# don't wait at all.
21epause() { 29epause() {
22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5} 30 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
23} 31}
24 32
25# Beep the specified number of times (defaults to five). If our output 33# @FUNCTION: ebeep
26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 34# @USAGE: [number of beeps]
35# @DESCRIPTION:
36# Issue the specified number of beeps (default of 5 beeps). Useful when
37# printing a message the user should probably be reading and often used in
38# conjunction with the epause function. If the EBEEP_IGNORE env var is set,
27# don't beep. 39# don't beep at all.
28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
29ebeep() { 40ebeep() {
30 local n 41 local n
31 if [[ -z ${EBEEP_IGNORE} ]] ; then 42 if [[ -z ${EBEEP_IGNORE} ]] ; then
32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 43 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
33 echo -ne "\a" 44 echo -ne "\a"
36 sleep 1 47 sleep 1
37 done 48 done
38 fi 49 fi
39} 50}
40 51
41# This function generate linker scripts in /usr/lib for dynamic 52# @FUNCTION: ecvs_clean
42# libs in /lib. This is to fix linking problems when you have 53# @USAGE: [list of dirs]
43# the .so in /lib, and the .a in /usr/lib. What happens is that 54# @DESCRIPTION:
44# in some cases when linking dynamic, the .a in /usr/lib is used 55# Remove CVS directories recursiveley. Useful when a source tarball contains
45# instead of the .so in /lib due to gcc/libtool tweaking ld's 56# internal CVS directories. Defaults to $PWD.
46# library search path. This cause many builds to fail. 57ecvs_clean() {
47# See bug #4411 for more info. 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.
48# 80#
49# To use, simply call: 81# A common example is to disable shell globbing so that special meaning/care
50# 82# may be used with variables/arguments to custom functions. That would be:
51# gen_usr_ldscript libfoo.so 83# @CODE
52# 84# eshopts_push -o noglob
53# Note that you should in general use the unversioned name of 85# for x in ${foo} ; do
54# the library, as ldconfig should usually update it correctly 86# if ...some check... ; then
55# to point to the latest version of the library present. 87# eshopts_pop
56#
57# <azarah@gentoo.org> (26 Oct 2002)
58#
59gen_usr_ldscript() {
60 if [[ $(type -t _tc_gen_usr_ldscript) == "function" ]] ; then
61 _tc_gen_usr_ldscript "$@"
62 return $? 88# return 0
63 fi 89# fi
64
65 ewarn "QA Notice: Please upgrade your ebuild to use toolchain-funcs"
66 ewarn "QA Notice: rather than gen_usr_ldscript() from eutils"
67
68 local lib libdir=$(get_libdir)
69 # Just make sure it exists
70 dodir /usr/${libdir}
71
72 for lib in "${@}" ; do
73 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
74 /* GNU ld script
75 Since Gentoo has critical dynamic libraries
76 in /lib, and the static versions in /usr/lib,
77 we need to have a "fake" dynamic lib in /usr/lib,
78 otherwise we run into linking problems.
79
80 See bug http://bugs.gentoo.org/4411 for more info.
81 */
82 GROUP ( /${libdir}/${lib} )
83 END_LDSCRIPT
84 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
85 done 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: $*"
86} 100}
87 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}
88 116
89# Default directory where patches are located 117# @VARIABLE: EPATCH_SOURCE
118# @DESCRIPTION:
119# Default directory to search for patches.
90EPATCH_SOURCE="${WORKDIR}/patch" 120EPATCH_SOURCE="${WORKDIR}/patch"
91# Default extension for patches 121# @VARIABLE: EPATCH_SUFFIX
122# @DESCRIPTION:
123# Default extension for patches (do not prefix the period yourself).
92EPATCH_SUFFIX="patch.bz2" 124EPATCH_SUFFIX="patch.bz2"
125# @VARIABLE: EPATCH_OPTS
126# @DESCRIPTION:
93# Default options for patch 127# Default options for patch:
128# @CODE
94# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 129# -g0 - keep RCS, ClearCase, Perforce and SCCS happy #24571
95# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 130# --no-backup-if-mismatch - do not leave .orig files behind
96# Set -E to automatically remove empty files. 131# -E - automatically remove empty files
132# @CODE
97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 133EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
134# @VARIABLE: EPATCH_EXCLUDE
135# @DESCRIPTION:
98# 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,
99# and not the full path .. 137# and not the full path. Globs accepted.
100EPATCH_EXCLUDE="" 138EPATCH_EXCLUDE=""
139# @VARIABLE: EPATCH_SINGLE_MSG
140# @DESCRIPTION:
101# Change the printed message for a single patch. 141# Change the printed message for a single patch.
102EPATCH_SINGLE_MSG="" 142EPATCH_SINGLE_MSG=""
143# @VARIABLE: EPATCH_MULTI_MSG
144# @DESCRIPTION:
103# Change the printed message for multiple patches. 145# Change the printed message for multiple patches.
104EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 146EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
105# Force applying bulk patches even if not following the style: 147# @VARIABLE: EPATCH_FORCE
106# 148# @DESCRIPTION:
107# ??_${ARCH}_foo.${EPATCH_SUFFIX} 149# Only require patches to match EPATCH_SUFFIX rather than the extended
108# 150# arch naming style.
109EPATCH_FORCE="no" 151EPATCH_FORCE="no"
110 152
111# This function is for bulk patching, or in theory for just one 153# @FUNCTION: epatch
112# 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.
113# 161#
114# 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
115# Currently all patches should be the same format. 163# specified by EPATCH_SOURCE.
116# 164#
117# You do not have to specify '-p' option to patch, as it will 165# When processing directories, epatch will apply all patches that match:
118# try with -p0 to -p5 until it succeed, or fail at -p5. 166# @CODE
119# 167# ${EPATCH_FORCE} == "yes"
120# Above EPATCH_* variables can be used to control various defaults,
121# bug they should be left as is to ensure an ebuild can rely on
122# them for.
123#
124# Patches are applied in current directory.
125#
126# Bulk Patches should preferibly have the form of:
127#
128# ??_${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.
129# 177#
130# For example: 178# If EPATCH_SUFFIX is empty, then no period before it is implied when searching
179# for patches to apply.
131# 180#
132# 01_all_misc-fix.patch.bz2 181# Refer to the other EPATCH_xxx variables for more customization of behavior.
133# 02_sparc_another-fix.patch.bz2
134#
135# This ensures that there are a set order, and you can have ARCH
136# specific patches.
137#
138# If you however give an argument to epatch(), it will treat it as a
139# single patch that need to be applied if its a file. If on the other
140# hand its a directory, it will set EPATCH_SOURCE to this.
141#
142# <azarah@gentoo.org> (10 Nov 2002)
143#
144epatch() { 182epatch() {
145 _epatch_draw_line() { 183 _epatch_draw_line() {
184 # create a line of same length as input string
146 [[ -z $1 ]] && set "$(printf "%65s" '')" 185 [[ -z $1 ]] && set "$(printf "%65s" '')"
147 echo "${1//?/=}" 186 echo "${1//?/=}"
148 } 187 }
149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
150 local PIPE_CMD=""
151 local STDERR_TARGET="${T}/$$.out"
152 local PATCH_TARGET="${T}/$$.patch"
153 local PATCH_SUFFIX=""
154 local SINGLE_PATCH="no"
155 local x=""
156 188
157 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 189 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
158 190
159 if [ "$#" -gt 1 ] 191 # Let the rest of the code process one user arg at a time --
160 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
161 local m="" 195 local m
162 for m in "$@" ; do 196 for m in "$@" ; do
163 epatch "${m}" 197 epatch "${m}"
164 done 198 done
165 return 0 199 return 0
166 fi 200 fi
167 201
168 if [ -n "$1" -a -f "$1" ] 202 local SINGLE_PATCH="no"
169 then 203 # no args means process ${EPATCH_SOURCE}
204 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
205
206 if [[ -f $1 ]] ; then
170 SINGLE_PATCH="yes" 207 SINGLE_PATCH="yes"
171 208 set -- "$1"
172 local EPATCH_SOURCE="$1" 209 # Use the suffix from the single patch (localize it); the code
210 # below will find the suffix for us
173 local EPATCH_SUFFIX="${1##*\.}" 211 local EPATCH_SUFFIX=$1
174 212
175 elif [ -n "$1" -a -d "$1" ] 213 elif [[ -d $1 ]] ; then
176 then 214 # Some people like to make dirs of patches w/out suffixes (vim)
177 # Allow no extension if EPATCH_FORCE=yes ... used by vim for example ... 215 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
178 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} ]]
179 then 259 then
180 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
181 else 282 else
182 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 283 einfo " ${patchname} ..."
183 fi 284 fi
184 else 285
185 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ] 286 # most of the time, there will only be one run per unique name,
186 then 287 # but if there are more, make sure we get unique log filenames
187 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 288 local STDERR_TARGET="${T}/${patchname}.out"
188 then 289 if [[ -e ${STDERR_TARGET} ]] ; then
189 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
190 fi 308 fi
309 else
310 PATCH_TARGET=${x}
311 fi
191 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} *****"
192 echo 328 echo
193 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} )"
194 eerror 366 eerror
195 eerror " ${EPATCH_SOURCE}" 367 eerror "Include in your bugreport the contents of:"
196 eerror " ( ${EPATCH_SOURCE##*/} )" 368 eerror
369 eerror " ${STDERR_TARGET}"
197 echo 370 echo
198 die "Cannot find \$EPATCH_SOURCE!"
199 fi
200
201 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
202 fi
203
204 case ${EPATCH_SUFFIX##*\.} in
205 bz2)
206 PIPE_CMD="bzip2 -dc"
207 PATCH_SUFFIX="bz2"
208 ;;
209 gz|Z|z)
210 PIPE_CMD="gzip -dc"
211 PATCH_SUFFIX="gz"
212 ;;
213 ZIP|zip)
214 PIPE_CMD="unzip -p"
215 PATCH_SUFFIX="zip"
216 ;;
217 *)
218 PIPE_CMD="cat"
219 PATCH_SUFFIX="patch"
220 ;;
221 esac
222
223 if [ "${SINGLE_PATCH}" = "no" ]
224 then
225 einfo "${EPATCH_MULTI_MSG}"
226 fi
227 for x in ${EPATCH_SOURCE}
228 do
229 # New ARCH dependant patch naming scheme ...
230 #
231 # ???_arch_foo.patch
232 #
233 if [ -f ${x} ] && \
234 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
235 [ "${EPATCH_FORCE}" = "yes" ])
236 then
237 local count=0
238 local popts="${EPATCH_OPTS}"
239 local patchname=${x##*/}
240
241 if [ -n "${EPATCH_EXCLUDE}" ]
242 then
243 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
244 then
245 continue
246 fi
247 fi
248
249 if [ "${SINGLE_PATCH}" = "yes" ]
250 then
251 if [ -n "${EPATCH_SINGLE_MSG}" ]
252 then
253 einfo "${EPATCH_SINGLE_MSG}"
254 else
255 einfo "Applying ${patchname} ..."
256 fi
257 else
258 einfo " ${patchname} ..."
259 fi
260
261 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
262 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
263
264 # Allow for prefix to differ ... im lazy, so shoot me :/
265 while [ "${count}" -lt 5 ]
266 do
267 # Generate some useful debug info ...
268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
270
271 if [ "${PATCH_SUFFIX}" != "patch" ]
272 then
273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 else
276 PATCH_TARGET="${x}"
277 fi
278
279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
280 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
281
282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
284
285 if [ "${PATCH_SUFFIX}" != "patch" ]
286 then
287 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
288 then
289 echo
290 eerror "Could not extract patch!"
291 #die "Could not extract patch!"
292 count=5
293 break
294 fi
295 fi
296
297 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
298 then
299 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
301 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
303 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
304
305 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
306 _epatch_assert
307
308 if [ "$?" -ne 0 ]
309 then
310 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
311 echo
312 eerror "A dry-run of patch command succeeded, but actually"
313 eerror "applying the patch failed!"
314 #die "Real world sux compared to the dreamworld!"
315 count=5
316 fi
317
318 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
319
320 break
321 fi
322
323 count=$((count + 1))
324 done
325
326 if [ "${PATCH_SUFFIX}" != "patch" ]
327 then
328 rm -f ${PATCH_TARGET}
329 fi
330
331 if [ "${count}" -eq 5 ]
332 then
333 echo
334 eerror "Failed Patch: ${patchname} !"
335 eerror " ( ${PATCH_TARGET} )"
336 eerror
337 eerror "Include in your bugreport the contents of:"
338 eerror
339 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
340 echo
341 die "Failed Patch: ${patchname}!" 371 die "Failed Patch: ${patchname}!"
342 fi 372 fi
343 373
344 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 374 # if everything worked, delete the patch log
345 375 rm -f "${STDERR_TARGET}"
346 eend 0 376 eend 0
347 fi
348 done 377 done
349 if [ "${SINGLE_PATCH}" = "no" ] 378
350 then 379 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
351 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
352 fi 398 fi
399 done
353} 400}
354 401
402# @FUNCTION: emktemp
403# @USAGE: [temp dir]
404# @DESCRIPTION:
355# Cheap replacement for when debianutils (and thus mktemp) 405# Cheap replacement for when debianutils (and thus mktemp)
356# does not exist on the users system 406# does not exist on the users system.
357# vapier@gentoo.org
358#
359# Takes just 1 optional parameter (the directory to create tmpfile in)
360emktemp() { 407emktemp() {
361 local exe="touch" 408 local exe="touch"
362 [[ $1 == -d ]] && exe="mkdir" && shift 409 [[ $1 == -d ]] && exe="mkdir" && shift
363 local topdir=$1 410 local topdir=$1
364 411
366 [[ -z ${T} ]] \ 413 [[ -z ${T} ]] \
367 && topdir="/tmp" \ 414 && topdir="/tmp" \
368 || topdir=${T} 415 || topdir=${T}
369 fi 416 fi
370 417
371 if [[ -z $(type -p mktemp) ]] ; then 418 if ! type -P mktemp > /dev/null ; then
419 # system lacks `mktemp` so we have to fake it
372 local tmp=/ 420 local tmp=/
373 while [[ -e ${tmp} ]] ; do 421 while [[ -e ${tmp} ]] ; do
374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 422 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
375 done 423 done
376 ${exe} "${tmp}" || ${exe} -p "${tmp}" 424 ${exe} "${tmp}" || ${exe} -p "${tmp}"
377 echo "${tmp}" 425 echo "${tmp}"
378 else 426 else
427 # the args here will give slightly wierd names on BSD,
428 # but should produce a usable file on all userlands
379 if [[ ${exe} == "touch" ]] ; then 429 if [[ ${exe} == "touch" ]] ; then
380 [[ ${USERLAND} == "GNU" ]] \
381 && mktemp -p "${topdir}" \
382 || TMPDIR="${topdir}" mktemp -t tmp 430 TMPDIR="${topdir}" mktemp -t tmp.XXXXXXXXXX
383 else 431 else
384 [[ ${USERLAND} == "GNU" ]] \
385 && mktemp -d "${topdir}" \
386 || TMPDIR="${topdir}" mktemp -dt tmp 432 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX
387 fi
388 fi 433 fi
434 fi
389} 435}
390 436
437# @FUNCTION: egetent
438# @USAGE: <database> <key>
439# @MAINTAINER:
440# base-system@gentoo.org (Linux)
441# Joe Jezak <josejx@gmail.com> (OS X)
442# usata@gentoo.org (OS X)
443# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
444# @DESCRIPTION:
391# 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),
392# and pw (FreeBSD) used in enewuser()/enewgroup() 447# and pw (FreeBSD) used in enewuser()/enewgroup()
393# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
394# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
395#
396# egetent(database, key)
397egetent() { 448egetent() {
398 case ${CHOST} in 449 case ${CHOST} in
399 *-darwin*) 450 *-darwin[678])
400 case "$2" in 451 case "$2" in
401 *[!0-9]*) # Non numeric 452 *[!0-9]*) # Non numeric
402 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 453 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
403 ;; 454 ;;
404 *) # Numeric 455 *) # Numeric
405 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
406 ;; 472 ;;
407 esac 473 esac
408 ;; 474 ;;
409 *-freebsd*|*-dragonfly*) 475 *-freebsd*|*-dragonfly*)
410 local opts action="user" 476 local opts action="user"
425 getent "$1" "$2" 491 getent "$1" "$2"
426 ;; 492 ;;
427 esac 493 esac
428} 494}
429 495
430# Simplify/standardize adding users to the system 496# @FUNCTION: enewuser
431# vapier@gentoo.org 497# @USAGE: <user> [uid] [shell] [homedir] [groups] [params]
432# 498# @DESCRIPTION:
433# enewuser(username, uid, shell, homedir, groups, extra options) 499# Same as enewgroup, you are not required to understand how to properly add
434# 500# a user to the system. The only required parameter is the username.
435# Default values if you do not specify any: 501# Default uid is (pass -1 for this) next available, default shell is
436# username: REQUIRED ! 502# /bin/false, default homedir is /dev/null, there are no default groups,
437# uid: next available (see useradd(8)) 503# and default params sets the comment as 'added by portage for ${PN}'.
438# note: pass -1 to get default behavior
439# shell: /bin/false
440# homedir: /dev/null
441# groups: none
442# extra: comment of 'added by portage for ${PN}'
443enewuser() { 504enewuser() {
444 case ${EBUILD_PHASE} in 505 case ${EBUILD_PHASE} in
445 unpack|compile|test|install) 506 unpack|compile|test|install)
446 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function." 507 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
447 eerror "Package fails at QA and at life. Please file a bug." 508 eerror "Package fails at QA and at life. Please file a bug."
615 fi 676 fi
616 ;; 677 ;;
617 678
618 *) 679 *)
619 if [[ -z $@ ]] ; then 680 if [[ -z $@ ]] ; then
620 useradd ${opts} ${euser} \ 681 useradd ${opts} \
621 -c "added by portage for ${PN}" \ 682 -c "added by portage for ${PN}" \
683 ${euser} \
622 || die "enewuser failed" 684 || die "enewuser failed"
623 else 685 else
624 einfo " - Extra: $@" 686 einfo " - Extra: $@"
625 useradd ${opts} ${euser} "$@" \ 687 useradd ${opts} "$@" \
688 ${euser} \
626 || die "enewuser failed" 689 || die "enewuser failed"
627 fi 690 fi
628 ;; 691 ;;
629 esac 692 esac
630 693
636 fi 699 fi
637 700
638 export SANDBOX_ON=${oldsandbox} 701 export SANDBOX_ON=${oldsandbox}
639} 702}
640 703
641# Simplify/standardize adding groups to the system 704# @FUNCTION: enewgroup
642# vapier@gentoo.org 705# @USAGE: <group> [gid]
643# 706# @DESCRIPTION:
644# enewgroup(group, gid) 707# This function does not require you to understand how to properly add a
645# 708# group to the system. Just give it a group name to add and enewgroup will
646# Default values if you do not specify any: 709# do the rest. You may specify the gid for the group or allow the group to
647# groupname: REQUIRED ! 710# allocate the next available one.
648# gid: next available (see groupadd(8))
649# extra: none
650enewgroup() { 711enewgroup() {
651 case ${EBUILD_PHASE} in 712 case ${EBUILD_PHASE} in
652 unpack|compile|test|install) 713 unpack|compile|test|install)
653 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function." 714 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
654 eerror "Package fails at QA and at life. Please file a bug." 715 eerror "Package fails at QA and at life. Please file a bug."
750 ;; 811 ;;
751 esac 812 esac
752 export SANDBOX_ON="${oldsandbox}" 813 export SANDBOX_ON="${oldsandbox}"
753} 814}
754 815
755# Simple script to replace 'dos2unix' binaries 816# @FUNCTION: edos2unix
756# vapier@gentoo.org 817# @USAGE: <file> [more files ...]
757# 818# @DESCRIPTION:
758# edos2unix(file, <more files> ...) 819# A handy replacement for dos2unix, recode, fixdos, etc... This allows you
820# to remove all of these text utilities from DEPEND variables because this
821# is a script based solution. Just give it a list of files to convert and
822# they will all be changed from the DOS CRLF format to the UNIX LF format.
759edos2unix() { 823edos2unix() {
760 echo "$@" | xargs sed -i 's/\r$//' 824 echo "$@" | xargs sed -i 's/\r$//'
761} 825}
762
763
764##############################################################
765# START: Handle .desktop files and menu entries #
766# maybe this should be separated into a new eclass some time #
767# lanius@gentoo.org #
768##############################################################
769 826
770# Make a desktop file ! 827# Make a desktop file !
771# Great for making those icons in kde/gnome startmenu ! 828# Great for making those icons in kde/gnome startmenu !
772# Amaze your friends ! Get the women ! Join today ! 829# Amaze your friends ! Get the women ! Join today !
773# 830#
777# name: the name that will show up in the menu 834# name: the name that will show up in the menu
778# icon: give your little like a pretty little icon ... 835# icon: give your little like a pretty little icon ...
779# this can be relative (to /usr/share/pixmaps) or 836# this can be relative (to /usr/share/pixmaps) or
780# a full path to an icon 837# a full path to an icon
781# type: what kind of application is this ? for categories: 838# type: what kind of application is this ? for categories:
782# http://www.freedesktop.org/Standards/desktop-entry-spec 839# http://standards.freedesktop.org/menu-spec/latest/apa.html
783# path: if your app needs to startup in a specific dir 840# path: if your app needs to startup in a specific dir
784make_desktop_entry() { 841make_desktop_entry() {
785 [[ -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
786 843
787 local exec=${1} 844 local exec=${1}
788 local name=${2:-${PN}} 845 local name=${2:-${PN}}
789 local icon=${3:-${PN}.png} 846 local icon=${3:-${PN}}
790 local type=${4} 847 local type=${4}
791 local path=${5} 848 local path=${5}
792 849
793 if [[ -z ${type} ]] ; then 850 if [[ -z ${type} ]] ; then
794 local catmaj=${CATEGORY%%-*} 851 local catmaj=${CATEGORY%%-*}
795 local catmin=${CATEGORY##*-} 852 local catmin=${CATEGORY##*-}
796 case ${catmaj} in 853 case ${catmaj} in
797 app) 854 app)
798 case ${catmin} in 855 case ${catmin} in
856 accessibility) type=Accessibility;;
799 admin) type=System;; 857 admin) type=System;;
858 antivirus) type=System;;
859 arch) type=Archiving;;
860 backup) type=Archiving;;
800 cdr) type=DiscBurning;; 861 cdr) type=DiscBurning;;
801 dicts) type=Dictionary;; 862 dicts) type=Dictionary;;
863 doc) type=Documentation;;
802 editors) type=TextEditor;; 864 editors) type=TextEditor;;
803 emacs) type=TextEditor;; 865 emacs) type=TextEditor;;
804 emulation) type=Emulator;; 866 emulation) type=Emulator;;
805 laptop) type=HardwareSettings;; 867 laptop) type=HardwareSettings;;
806 office) type=Office;; 868 office) type=Office;;
869 pda) type=PDA;;
807 vim) type=TextEditor;; 870 vim) type=TextEditor;;
808 xemacs) type=TextEditor;; 871 xemacs) type=TextEditor;;
809 *) type=;; 872 *) type=;;
810 esac 873 esac
811 ;; 874 ;;
817 games) 880 games)
818 case ${catmin} in 881 case ${catmin} in
819 action|fps) type=ActionGame;; 882 action|fps) type=ActionGame;;
820 arcade) type=ArcadeGame;; 883 arcade) type=ArcadeGame;;
821 board) type=BoardGame;; 884 board) type=BoardGame;;
885 emulation) type=Emulator;;
822 kids) type=KidsGame;; 886 kids) type=KidsGame;;
823 emulation) type=Emulator;;
824 puzzle) type=LogicGame;; 887 puzzle) type=LogicGame;;
888 roguelike) type=RolePlaying;;
825 rpg) type=RolePlaying;; 889 rpg) type=RolePlaying;;
826 roguelike) type=RolePlaying;;
827 simulation) type=Simulation;; 890 simulation) type=Simulation;;
828 sports) type=SportsGame;; 891 sports) type=SportsGame;;
829 strategy) type=StrategyGame;; 892 strategy) type=StrategyGame;;
830 *) type=;; 893 *) type=;;
831 esac 894 esac
832 type="Game;${type}" 895 type="Game;${type}"
896 ;;
897
898 gnome)
899 type="Gnome;GTK"
900 ;;
901
902 kde)
903 type="KDE;Qt"
833 ;; 904 ;;
834 905
835 mail) 906 mail)
836 type="Network;Email" 907 type="Network;Email"
837 ;; 908 ;;
863 type="Network;${type}" 934 type="Network;${type}"
864 ;; 935 ;;
865 936
866 sci) 937 sci)
867 case ${catmin} in 938 case ${catmin} in
868 astro*) type=Astronomy;; 939 astro*) type=Astronomy;;
869 bio*) type=Biology;; 940 bio*) type=Biology;;
870 calc*) type=Calculator;; 941 calc*) type=Calculator;;
871 chem*) type=Chemistry;; 942 chem*) type=Chemistry;;
943 elec*) type=Electronics;;
872 geo*) type=Geology;; 944 geo*) type=Geology;;
873 math*) type=Math;; 945 math*) type=Math;;
946 physics) type=Physics;;
947 visual*) type=DataVisualization;;
874 *) type=;; 948 *) type=;;
875 esac 949 esac
876 type="Science;${type}" 950 type="Science;${type}"
951 ;;
952
953 sys)
954 type="System"
877 ;; 955 ;;
878 956
879 www) 957 www)
880 case ${catmin} in 958 case ${catmin} in
881 client) type=WebBrowser;; 959 client) type=WebBrowser;;
892 if [ "${SLOT}" == "0" ] ; then 970 if [ "${SLOT}" == "0" ] ; then
893 local desktop_name="${PN}" 971 local desktop_name="${PN}"
894 else 972 else
895 local desktop_name="${PN}-${SLOT}" 973 local desktop_name="${PN}-${SLOT}"
896 fi 974 fi
897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 975 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
898# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 976 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
899 977
978 cat <<-EOF > "${desktop}"
900echo "[Desktop Entry] 979 [Desktop Entry]
901Encoding=UTF-8
902Version=0.9.2
903Name=${name} 980 Name=${name}
904Type=Application 981 Type=Application
905Comment=${DESCRIPTION} 982 Comment=${DESCRIPTION}
906Exec=${exec} 983 Exec=${exec}
907TryExec=${exec%% *} 984 TryExec=${exec%% *}
908Path=${path}
909Icon=${icon} 985 Icon=${icon}
910Categories=Application;${type};" > "${desktop}" 986 Categories=${type};
987 EOF
988
989 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}"
911 990
912 ( 991 (
913 # wrap the env here so that the 'insinto' call 992 # wrap the env here so that the 'insinto' call
914 # doesn't corrupt the env of the caller 993 # doesn't corrupt the env of the caller
915 insinto /usr/share/applications 994 insinto /usr/share/applications
916 doins "${desktop}" 995 doins "${desktop}"
917 ) 996 )
918} 997}
919 998
920# Make a GDM/KDM Session file 999# @FUNCTION: validate_desktop_entries
921# 1000# @USAGE: [directories]
922# make_session_desktop(<title>, <command>) 1001# @MAINTAINER:
923# title: File to execute to start the Window Manager 1002# Carsten Lohrke <carlo@gentoo.org>
924# command: Name of the Window Manager 1003# @DESCRIPTION:
1004# Validate desktop entries using desktop-file-utils
1005validate_desktop_entries() {
1006 if [[ -x /usr/bin/desktop-file-validate ]] ; then
1007 einfo "Checking desktop entry validity"
1008 local directories=""
1009 for d in /usr/share/applications $@ ; do
1010 [[ -d ${D}${d} ]] && directories="${directories} ${D}${d}"
1011 done
1012 if [[ -n ${directories} ]] ; then
1013 for FILE in $(find ${directories} -name "*\.desktop" \
1014 -not -path '*.hidden*' | sort -u 2>/dev/null)
1015 do
1016 local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \
1017 sed -e "s|error: ||" -e "s|${FILE}:|--|g" )
1018 [[ -n $temp ]] && elog ${temp/--/${FILE/${D}/}:}
1019 done
1020 fi
1021 echo ""
1022 else
1023 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
1024 fi
1025}
925 1026
1027# @FUNCTION: make_session_desktop
1028# @USAGE: <title> <command> [command args...]
1029# @DESCRIPTION:
1030# Make a GDM/KDM Session file. The title is the file to execute to start the
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.
926make_session_desktop() { 1034make_session_desktop() {
927 [[ -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
928 [[ -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
929 1037
930 local title=$1 1038 local title=$1
931 local command=$2 1039 local command=$2
932 local desktop=${T}/${wm}.desktop 1040 local desktop=${T}/${wm:-${PN}}.desktop
1041 shift 2
933 1042
1043 cat <<-EOF > "${desktop}"
934echo "[Desktop Entry] 1044 [Desktop Entry]
935Encoding=UTF-8
936Name=${title} 1045 Name=${title}
937Comment=This session logs you into ${title} 1046 Comment=This session logs you into ${title}
938Exec=${command} 1047 Exec=${command} $*
939TryExec=${command} 1048 TryExec=${command}
940Type=Application" > "${desktop}" 1049 Type=XSession
1050 EOF
941 1051
1052 (
1053 # wrap the env here so that the 'insinto' call
1054 # doesn't corrupt the env of the caller
942 insinto /usr/share/xsessions 1055 insinto /usr/share/xsessions
943 doins "${desktop}" 1056 doins "${desktop}"
1057 )
944} 1058}
945 1059
1060# @FUNCTION: domenu
1061# @USAGE: <menus>
1062# @DESCRIPTION:
1063# Install the list of .desktop menu files into the appropriate directory
1064# (/usr/share/applications).
946domenu() { 1065domenu() {
1066 (
1067 # wrap the env here so that the 'insinto' call
1068 # doesn't corrupt the env of the caller
947 local i j 1069 local i j ret=0
948 insinto /usr/share/applications 1070 insinto /usr/share/applications
949 for i in "$@" ; do 1071 for i in "$@" ; do
950 if [[ -f ${i} ]] ; then 1072 if [[ -f ${i} ]] ; then
951 doins "${i}" 1073 doins "${i}"
1074 ((ret+=$?))
952 elif [[ -d ${i} ]] ; then 1075 elif [[ -d ${i} ]] ; then
953 for j in "${i}"/*.desktop ; do 1076 for j in "${i}"/*.desktop ; do
954 doins "${j}" 1077 doins "${j}"
1078 ((ret+=$?))
955 done 1079 done
1080 else
1081 ((++ret))
956 fi 1082 fi
957 done 1083 done
1084 exit ${ret}
1085 )
958} 1086}
1087
1088# @FUNCTION: newmenu
1089# @USAGE: <menu> <newname>
1090# @DESCRIPTION:
1091# Like all other new* functions, install the specified menu as newname.
959newmenu() { 1092newmenu() {
1093 (
1094 # wrap the env here so that the 'insinto' call
1095 # doesn't corrupt the env of the caller
960 insinto /usr/share/applications 1096 insinto /usr/share/applications
961 newins "$1" "$2" 1097 newins "$@"
1098 )
962} 1099}
963 1100
1101# @FUNCTION: doicon
1102# @USAGE: <list of icons>
1103# @DESCRIPTION:
1104# Install the list of icons into the icon directory (/usr/share/pixmaps).
1105# This is useful in conjunction with creating desktop/menu files.
964doicon() { 1106doicon() {
1107 (
1108 # wrap the env here so that the 'insinto' call
1109 # doesn't corrupt the env of the caller
965 local i j 1110 local i j ret
966 insinto /usr/share/pixmaps 1111 insinto /usr/share/pixmaps
967 for i in "$@" ; do 1112 for i in "$@" ; do
968 if [[ -f ${i} ]] ; then 1113 if [[ -f ${i} ]] ; then
969 doins "${i}" 1114 doins "${i}"
1115 ((ret+=$?))
970 elif [[ -d ${i} ]] ; then 1116 elif [[ -d ${i} ]] ; then
971 for j in "${i}"/*.png ; do 1117 for j in "${i}"/*.png ; do
972 doins "${j}" 1118 doins "${j}"
1119 ((ret+=$?))
973 done 1120 done
1121 else
1122 ((++ret))
974 fi 1123 fi
975 done 1124 done
1125 exit ${ret}
1126 )
976} 1127}
1128
1129# @FUNCTION: newicon
1130# @USAGE: <icon> <newname>
1131# @DESCRIPTION:
1132# Like all other new* functions, install the specified icon as newname.
977newicon() { 1133newicon() {
1134 (
1135 # wrap the env here so that the 'insinto' call
1136 # doesn't corrupt the env of the caller
978 insinto /usr/share/pixmaps 1137 insinto /usr/share/pixmaps
979 newins "$1" "$2" 1138 newins "$@"
1139 )
980} 1140}
981
982##############################################################
983# END: Handle .desktop files and menu entries #
984##############################################################
985
986 1141
987# for internal use only (unpack_pdv and unpack_makeself) 1142# for internal use only (unpack_pdv and unpack_makeself)
988find_unpackable_file() { 1143find_unpackable_file() {
989 local src=$1 1144 local src=$1
990 if [[ -z ${src} ]] ; then 1145 if [[ -z ${src} ]] ; then
1000 fi 1155 fi
1001 [[ ! -e ${src} ]] && return 1 1156 [[ ! -e ${src} ]] && return 1
1002 echo "${src}" 1157 echo "${src}"
1003} 1158}
1004 1159
1160# @FUNCTION: unpack_pdv
1161# @USAGE: <file to unpack> <size of off_t>
1162# @DESCRIPTION:
1005# Unpack those pesky pdv generated files ... 1163# Unpack those pesky pdv generated files ...
1006# They're self-unpacking programs with the binary package stuffed in 1164# They're self-unpacking programs with the binary package stuffed in
1007# 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
1008# 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.
1009# 1167#
1010# Usage: unpack_pdv [file to unpack] [size of off_t]
1011# - 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
1012# information out of the binary executable myself. basically you pass in 1169# information out of the binary executable myself. Basically you pass in
1013# 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
1171# archive.
1172#
1014# archive. 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
1015# strings <pdv archive> | grep lseek 1176# strings <pdv archive> | grep lseek
1016# strace -elseek <pdv archive> 1177# strace -elseek <pdv archive>
1178# @CODE
1179#
1017# 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
1018# 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
1019# parameter. here is an example: 1182# parameter. Here is an example:
1183#
1184# @CODE
1020# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1185# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1021# lseek 1186# lseek
1022# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1187# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1023# lseek(3, -4, SEEK_END) = 2981250 1188# lseek(3, -4, SEEK_END) = 2981250
1189# @CODE
1190#
1024# 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.
1025unpack_pdv() { 1192unpack_pdv() {
1026 local src=$(find_unpackable_file $1) 1193 local src=$(find_unpackable_file "$1")
1027 local sizeoff_t=$2 1194 local sizeoff_t=$2
1028 1195
1029 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1196 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1030 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1197 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1031 1198
1032 local shrtsrc=$(basename "${src}") 1199 local shrtsrc=$(basename "${src}")
1033 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1200 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1034 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1201 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
1035 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1202 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
1036 1203
1037 # grab metadata for debug reasons 1204 # grab metadata for debug reasons
1038 local metafile="$(emktemp)" 1205 local metafile=$(emktemp)
1039 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1206 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1040 1207
1041 # rip out the final file name from the metadata 1208 # rip out the final file name from the metadata
1042 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1209 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1043 datafile="`basename ${datafile}`" 1210 datafile=$(basename "${datafile}")
1044 1211
1045 # now lets uncompress/untar the file if need be 1212 # now lets uncompress/untar the file if need be
1046 local tmpfile="$(emktemp)" 1213 local tmpfile=$(emktemp)
1047 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1214 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1048 1215
1049 local iscompressed="`file -b ${tmpfile}`" 1216 local iscompressed=$(file -b "${tmpfile}")
1050 if [ "${iscompressed:0:8}" == "compress" ] ; then 1217 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1051 iscompressed=1 1218 iscompressed=1
1052 mv ${tmpfile}{,.Z} 1219 mv ${tmpfile}{,.Z}
1053 gunzip ${tmpfile} 1220 gunzip ${tmpfile}
1054 else 1221 else
1055 iscompressed=0 1222 iscompressed=0
1056 fi 1223 fi
1057 local istar="`file -b ${tmpfile}`" 1224 local istar=$(file -b "${tmpfile}")
1058 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1225 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1059 istar=1 1226 istar=1
1060 else 1227 else
1061 istar=0 1228 istar=0
1062 fi 1229 fi
1063 1230
1091 true 1258 true
1092 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" 1259 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
1093 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" 1260 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
1094} 1261}
1095 1262
1263# @FUNCTION: unpack_makeself
1264# @USAGE: [file to unpack] [offset] [tail|dd]
1265# @DESCRIPTION:
1096# Unpack those pesky makeself generated files ... 1266# Unpack those pesky makeself generated files ...
1097# They're shell scripts with the binary package tagged onto 1267# They're shell scripts with the binary package tagged onto
1098# the end of the archive. Loki utilized the format as does 1268# the end of the archive. Loki utilized the format as does
1099# many other game companies. 1269# many other game companies.
1100# 1270#
1101# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1271# If the file is not specified, then ${A} is used. If the
1102# - If the file is not specified then unpack will utilize ${A}.
1103# - If the offset is not specified then we will attempt to extract 1272# offset is not specified then we will attempt to extract
1104# the proper offset from the script itself. 1273# the proper offset from the script itself.
1105unpack_makeself() { 1274unpack_makeself() {
1106 local src_input=${1:-${A}} 1275 local src_input=${1:-${A}}
1107 local src=$(find_unpackable_file "${src_input}") 1276 local src=$(find_unpackable_file "${src_input}")
1108 local skip=$2 1277 local skip=$2
1109 local exe=$3 1278 local exe=$3
1155 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1324 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1156 *) die "makeself cant handle exe '${exe}'" 1325 *) die "makeself cant handle exe '${exe}'"
1157 esac 1326 esac
1158 1327
1159 # lets grab the first few bytes of the file to figure out what kind of archive it is 1328 # lets grab the first few bytes of the file to figure out what kind of archive it is
1160 local tmpfile="$(emktemp)" 1329 local tmpfile=$(emktemp)
1161 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1330 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1162 local filetype="$(file -b "${tmpfile}")" 1331 local filetype=$(file -b "${tmpfile}")
1163 case ${filetype} in 1332 case ${filetype} in
1164 *tar\ archive*) 1333 *tar\ archive*)
1165 eval ${exe} | tar --no-same-owner -xf - 1334 eval ${exe} | tar --no-same-owner -xf -
1166 ;; 1335 ;;
1167 bzip2*) 1336 bzip2*)
1179 ;; 1348 ;;
1180 esac 1349 esac
1181 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})" 1350 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
1182} 1351}
1183 1352
1353# @FUNCTION: check_license
1354# @USAGE: [license]
1355# @DESCRIPTION:
1184# Display a license for user to accept. 1356# Display a license for user to accept. If no license is
1185#
1186# Usage: check_license [license]
1187# - If the file is not specified then ${LICENSE} is used. 1357# specified, then ${LICENSE} is used.
1188check_license() { 1358check_license() {
1189 local lic=$1 1359 local lic=$1
1190 if [ -z "${lic}" ] ; then 1360 if [ -z "${lic}" ] ; then
1191 lic="${PORTDIR}/licenses/${LICENSE}" 1361 lic="${PORTDIR}/licenses/${LICENSE}"
1192 else 1362 else
1196 lic="${PWD}/${lic}" 1366 lic="${PWD}/${lic}"
1197 elif [ -e "${lic}" ] ; then 1367 elif [ -e "${lic}" ] ; then
1198 lic="${lic}" 1368 lic="${lic}"
1199 fi 1369 fi
1200 fi 1370 fi
1201 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1202 local l="`basename ${lic}`" 1371 local l="`basename ${lic}`"
1203 1372
1204 # here is where we check for the licenses the user already 1373 # here is where we check for the licenses the user already
1205 # 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
1206 local shopts=$-
1207 local alic 1375 local alic
1208 set -o noglob #so that bash doesn't expand "*" 1376 eshopts_push -o noglob # so that bash doesn't expand "*"
1209 for alic in ${ACCEPT_LICENSE} ; do 1377 for alic in ${ACCEPT_LICENSE} ; do
1210 if [[ ${alic} == ${l} ]]; then 1378 if [[ ${alic} == ${l} ]]; then
1211 set +o noglob; set -${shopts} #reset old shell opts 1379 eshopts_pop
1212 return 0 1380 return 0
1213 fi 1381 fi
1214 done 1382 done
1215 set +o noglob; set -$shopts #reset old shell opts 1383 eshopts_pop
1384 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1216 1385
1217 local licmsg="$(emktemp)" 1386 local licmsg=$(emktemp)
1218 cat << EOF > ${licmsg} 1387 cat <<-EOF > ${licmsg}
1219********************************************************** 1388 **********************************************************
1220The following license outlines the terms of use of this 1389 The following license outlines the terms of use of this
1221package. You MUST accept this license for installation to 1390 package. You MUST accept this license for installation to
1222continue. When you are done viewing, hit 'q'. If you 1391 continue. When you are done viewing, hit 'q'. If you
1223CTRL+C out of this, the install will not run! 1392 CTRL+C out of this, the install will not run!
1224********************************************************** 1393 **********************************************************
1225 1394
1226EOF 1395 EOF
1227 cat ${lic} >> ${licmsg} 1396 cat ${lic} >> ${licmsg}
1228 ${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}"
1229 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] "
1230 read alic 1399 read alic
1231 case ${alic} in 1400 case ${alic} in
1238 die "Failed to accept license" 1407 die "Failed to accept license"
1239 ;; 1408 ;;
1240 esac 1409 esac
1241} 1410}
1242 1411
1412# @FUNCTION: cdrom_get_cds
1413# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...]
1414# @DESCRIPTION:
1243# 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
1244# the whole 'non-interactive' policy, but damnit I want CD support ! 1416# the whole 'non-interactive' policy, but damnit I want CD support !
1245# 1417#
1246# with these cdrom functions we handle all the user interaction and 1418# With these cdrom functions we handle all the user interaction and
1247# 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()
1248# 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
1249# found at CDROM_ROOT. 1421# found at CDROM_ROOT.
1250# 1422#
1423# The function will attempt to locate a cd based upon a file that is on
1424# the cd. The more files you give this function, the more cds
1425# the cdrom functions will handle.
1426#
1251# 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',
1252# 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
1253# the appropriate CDROM_NAME variable before calling cdrom_get_cds(). 1429# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1254# - CDROM_NAME="fooie cd" - for when you only want 1 cd 1430# Use CDROM_NAME for one cd, or CDROM_NAME_# for multiple cds. You can
1255# - CDROM_NAME_1="install cd" - for when you want more than 1 cd 1431# also use the CDROM_NAME_SET bash array.
1256# CDROM_NAME_2="data cd"
1257# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1258# 1432#
1259# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1433# For those multi cd ebuilds, see the cdrom_load_next_cd() function.
1260#
1261# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1262# - this will attempt to locate a cd based upon a file that is on
1263# the cd ... the more files you give this function, the more cds
1264# the cdrom functions will handle
1265cdrom_get_cds() { 1434cdrom_get_cds() {
1266 # 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
1267 # the # of files they gave us 1436 # the # of files they gave us
1268 local cdcnt=0 1437 local cdcnt=0
1269 local f= 1438 local f=
1355 export CDROM_SET="" 1524 export CDROM_SET=""
1356 export CDROM_CURRENT_CD=0 1525 export CDROM_CURRENT_CD=0
1357 cdrom_load_next_cd 1526 cdrom_load_next_cd
1358} 1527}
1359 1528
1360# this is only used when you need access to more than one cd. 1529# @FUNCTION: cdrom_load_next_cd
1361# when you have finished using the first cd, just call this function. 1530# @DESCRIPTION:
1362# when it returns, CDROM_ROOT will be pointing to the second cd. 1531# Some packages are so big they come on multiple CDs. When you're done reading
1363# remember, you can only go forward in the cd chain, you can't go back. 1532# files off a CD and want access to the next one, just call this function.
1533# Again, all the messy details of user interaction are taken care of for you.
1534# Once this returns, just read the variable CDROM_ROOT for the location of the
1535# mounted CD. Note that you can only go forward in the CD list, so make sure
1536# you only call this function when you're done using the current CD.
1364cdrom_load_next_cd() { 1537cdrom_load_next_cd() {
1365 local var 1538 local var
1366 ((++CDROM_CURRENT_CD)) 1539 ((++CDROM_CURRENT_CD))
1367 1540
1368 unset CDROM_ROOT 1541 unset CDROM_ROOT
1385# displayed and we'll hang out here until: 1558# displayed and we'll hang out here until:
1386# (1) the file is found on a mounted cdrom 1559# (1) the file is found on a mounted cdrom
1387# (2) the user hits CTRL+C 1560# (2) the user hits CTRL+C
1388_cdrom_locate_file_on_cd() { 1561_cdrom_locate_file_on_cd() {
1389 local mline="" 1562 local mline=""
1390 local showedmsg=0 1563 local showedmsg=0 showjolietmsg=0
1391 1564
1392 while [[ -z ${CDROM_ROOT} ]] ; do 1565 while [[ -z ${CDROM_ROOT} ]] ; do
1393 local i=0 1566 local i=0
1394 local -a cdset=(${*//:/ }) 1567 local -a cdset=(${*//:/ })
1395 if [[ -n ${CDROM_SET} ]] ; then 1568 if [[ -n ${CDROM_SET} ]] ; then
1400 local dir=$(dirname ${cdset[${i}]}) 1573 local dir=$(dirname ${cdset[${i}]})
1401 local file=$(basename ${cdset[${i}]}) 1574 local file=$(basename ${cdset[${i}]})
1402 1575
1403 local point= node= fs= foo= 1576 local point= node= fs= foo=
1404 while read point node fs foo ; do 1577 while read point node fs foo ; do
1405 [[ " cd9660 iso9660 " != *" ${fs} "* ]] && \ 1578 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1406 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \ 1579 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1407 && continue 1580 && continue
1408 point=${point//\040/ } 1581 point=${point//\040/ }
1582 [[ ! -d ${point}/${dir} ]] && continue
1409 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue 1583 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1410 export CDROM_ROOT=${point} 1584 export CDROM_ROOT=${point}
1411 export CDROM_SET=${i} 1585 export CDROM_SET=${i}
1412 export CDROM_MATCH=${cdset[${i}]} 1586 export CDROM_MATCH=${cdset[${i}]}
1413 return 1587 return
1435 showedmsg=1 1609 showedmsg=1
1436 fi 1610 fi
1437 einfo "Press return to scan for the cd again" 1611 einfo "Press return to scan for the cd again"
1438 einfo "or hit CTRL+C to abort the emerge." 1612 einfo "or hit CTRL+C to abort the emerge."
1439 echo 1613 echo
1614 if [[ ${showjolietmsg} -eq 0 ]] ; then
1615 showjolietmsg=1
1616 else
1440 einfo "If you are having trouble with the detection" 1617 ewarn "If you are having trouble with the detection"
1441 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"
1442 einfo "Joliet support enabled in your kernel. Please" 1619 ewarn "Joliet support enabled in your kernel. Please"
1443 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
1444 read || die "something is screwed with your system" 1623 read || die "something is screwed with your system"
1445 done 1624 done
1446} 1625}
1447 1626
1627# @FUNCTION: strip-linguas
1628# @USAGE: [<allow LINGUAS>|<-i|-u> <directories of .po files>]
1629# @DESCRIPTION:
1448# Make sure that LINGUAS only contains languages that 1630# Make sure that LINGUAS only contains languages that
1449# a package can support 1631# a package can support. The first form allows you to
1450# 1632# specify a list of LINGUAS. The -i builds a list of po
1451# usage: strip-linguas <allow LINGUAS> 1633# files found in all the directories and uses the
1452# strip-linguas -i <directories of .po files> 1634# intersection of the lists. The -u builds a list of po
1453# strip-linguas -u <directories of .po files> 1635# files found in all the directories and uses the union
1454# 1636# of the lists.
1455# The first form allows you to specify a list of LINGUAS.
1456# The -i builds a list of po files found in all the
1457# directories and uses the intersection of the lists.
1458# The -u builds a list of po files found in all the
1459# directories and uses the union of the lists.
1460strip-linguas() { 1637strip-linguas() {
1461 local ls newls nols 1638 local ls newls nols
1462 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1639 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1463 local op=$1; shift 1640 local op=$1; shift
1464 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1641 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1465 local d f 1642 local d f
1466 for d in "$@" ; do 1643 for d in "$@" ; do
1467 if [[ ${op} == "-u" ]] ; then 1644 if [[ ${op} == "-u" ]] ; then
1468 newls=${ls} 1645 newls=${ls}
1469 else 1646 else
1470 newls="" 1647 newls=""
1471 fi 1648 fi
1472 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do 1649 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1473 if [[ ${op} == "-i" ]] ; then 1650 if [[ ${op} == "-i" ]] ; then
1474 hasq ${f} ${ls} && newls="${newls} ${f}" 1651 hasq ${f} ${ls} && newls="${newls} ${f}"
1475 else 1652 else
1476 hasq ${f} ${ls} || newls="${newls} ${f}" 1653 hasq ${f} ${ls} || newls="${newls} ${f}"
1477 fi 1654 fi
1490 else 1667 else
1491 nols="${nols} ${f}" 1668 nols="${nols} ${f}"
1492 fi 1669 fi
1493 done 1670 done
1494 [[ -n ${nols} ]] \ 1671 [[ -n ${nols} ]] \
1495 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1672 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1496 export LINGUAS=${newls:1} 1673 export LINGUAS=${newls:1}
1497} 1674}
1498 1675
1499# moved from kernel.eclass since they are generally useful outside of 1676# @FUNCTION: preserve_old_lib
1500# kernel.eclass -iggy (20041002) 1677# @USAGE: <libs to preserve> [more libs]
1501 1678# @DESCRIPTION:
1502# the following functions are useful in kernel module ebuilds, etc.
1503# for an example see ivtv or drbd ebuilds
1504
1505# set's ARCH to match what the kernel expects
1506set_arch_to_kernel() {
1507 i=10
1508 while ((i--)) ; do
1509 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1510 done
1511 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1512 case ${ARCH} in
1513 x86) export ARCH="i386";;
1514 amd64) export ARCH="x86_64";;
1515 hppa) export ARCH="parisc";;
1516 mips) export ARCH="mips";;
1517 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!
1518 *) export ARCH="${ARCH}";;
1519 esac
1520}
1521
1522# set's ARCH back to what portage expects
1523set_arch_to_portage() {
1524 i=10
1525 while ((i--)) ; do
1526 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1527 done
1528 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1529}
1530
1531# Jeremy Huddleston <eradicator@gentoo.org>:
1532# preserve_old_lib /path/to/libblah.so.0
1533# preserve_old_lib_notify /path/to/libblah.so.0
1534#
1535# These functions are useful when a lib in your package changes --library. Such 1679# These functions are useful when a lib in your package changes ABI SONAME.
1536# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1680# An example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1537# would break packages that link against it. Most people get around this 1681# would break packages that link against it. Most people get around this
1538# by using the portage SLOT mechanism, but that is not always a relevant 1682# by using the portage SLOT mechanism, but that is not always a relevant
1539# solution, so instead you can add the following to your ebuilds: 1683# solution, so instead you can call this from pkg_preinst. See also the
1540# 1684# preserve_old_lib_notify function.
1541# pkg_preinst() {
1542# ...
1543# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1544# ...
1545# }
1546#
1547# pkg_postinst() {
1548# ...
1549# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1550# ...
1551# }
1552
1553preserve_old_lib() { 1685preserve_old_lib() {
1554 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then 1686 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1555 eerror "preserve_old_lib() must be called from pkg_preinst() only" 1687 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1556# die "Invalid preserve_old_lib() usage" 1688 die "Invalid preserve_old_lib() usage"
1557 fi 1689 fi
1558 [[ -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]"
1691
1692 # let portage worry about it
1693 has preserve-libs ${FEATURES} && return 0
1559 1694
1560 local lib dir 1695 local lib dir
1561 for lib in "$@" ; do 1696 for lib in "$@" ; do
1562 [[ -e ${ROOT}/${lib} ]] || continue 1697 [[ -e ${ROOT}/${lib} ]] || continue
1563 dir=${lib%/*} 1698 dir=${lib%/*}
1565 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed" 1700 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1566 touch "${D}"/${lib} 1701 touch "${D}"/${lib}
1567 done 1702 done
1568} 1703}
1569 1704
1705# @FUNCTION: preserve_old_lib_notify
1706# @USAGE: <libs to notify> [more libs]
1707# @DESCRIPTION:
1708# Spit helpful messages about the libraries preserved by preserve_old_lib.
1570preserve_old_lib_notify() { 1709preserve_old_lib_notify() {
1571 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then 1710 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1572 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"
1573# die "Invalid preserve_old_lib_notify() usage" 1712 die "Invalid preserve_old_lib_notify() usage"
1574 fi 1713 fi
1714
1715 # let portage worry about it
1716 has preserve-libs ${FEATURES} && return 0
1575 1717
1576 local lib notice=0 1718 local lib notice=0
1577 for lib in "$@" ; do 1719 for lib in "$@" ; do
1578 [[ -e ${ROOT}/${lib} ]] || continue 1720 [[ -e ${ROOT}/${lib} ]] || continue
1579 if [[ ${notice} -eq 0 ]] ; then 1721 if [[ ${notice} -eq 0 ]] ; then
1585 ewarn "helper program, simply emerge the 'gentoolkit' package." 1727 ewarn "helper program, simply emerge the 'gentoolkit' package."
1586 ewarn 1728 ewarn
1587 fi 1729 fi
1588 ewarn " # revdep-rebuild --library ${lib##*/}" 1730 ewarn " # revdep-rebuild --library ${lib##*/}"
1589 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
1590} 1740}
1591 1741
1592# Hack for people to figure out if a package was built with 1742# @FUNCTION: built_with_use
1593# certain USE flags 1743# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1744# @DESCRIPTION:
1745# A temporary hack until portage properly supports DEPENDing on USE
1746# flags being enabled in packages. This will check to see if the specified
1747# DEPEND atom was built with the specified list of USE flags. The
1748# --missing option controls the behavior if called on a package that does
1749# not actually support the defined USE flags (aka listed in IUSE).
1750# The default is to abort (call die). The -a and -o flags control
1751# the requirements of the USE flags. They correspond to "and" and "or"
1752# logic. So the -a flag means all listed USE flags must be enabled
1753# while the -o flag means at least one of the listed IUSE flags must be
1754# enabled. The --hidden option is really for internal use only as it
1755# means the USE flag we're checking is hidden expanded, so it won't be found
1756# in IUSE like normal USE flags.
1594# 1757#
1595# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1758# Remember that this function isn't terribly intelligent so order of optional
1596# ex: built_with_use xchat gtk2 1759# flags matter.
1597#
1598# Flags: -a all USE flags should be utilized
1599# -o at least one USE flag should be utilized
1600# Note: the default flag is '-a'
1601built_with_use() { 1760built_with_use() {
1761 local hidden="no"
1762 if [[ $1 == "--hidden" ]] ; then
1763 hidden="yes"
1764 shift
1765 fi
1766
1767 local missing_action="die"
1768 if [[ $1 == "--missing" ]] ; then
1769 missing_action=$2
1770 shift ; shift
1771 case ${missing_action} in
1772 true|false|die) ;;
1773 *) die "unknown action '${missing_action}'";;
1774 esac
1775 fi
1776
1602 local opt=$1 1777 local opt=$1
1603 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1778 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1604 1779
1605 local PKG=$(best_version $1) 1780 local PKG=$(best_version $1)
1606 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package" 1781 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1607 shift 1782 shift
1608 1783
1609 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE 1784 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1610 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE 1785 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1611 1786
1612 # if the USE file doesnt exist, assume the $PKG is either 1787 # if the IUSE file doesn't exist, the read will error out, we need to handle
1613 # injected or package.provided 1788 # this gracefully
1789 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1790 case ${missing_action} in
1791 true) return 0;;
1792 false) return 1;;
1614 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with" 1793 die) die "Unable to determine what USE flags $PKG was built with";;
1794 esac
1795 fi
1615 1796
1797 if [[ ${hidden} == "no" ]] ; then
1616 local IUSE_BUILT=$(<${IUSEFILE}) 1798 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1617 # Don't check USE_EXPAND #147237 1799 # Don't check USE_EXPAND #147237
1618 local expand 1800 local expand
1619 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1801 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1620 if [[ $1 == ${expand}_* ]] ; then 1802 if [[ $1 == ${expand}_* ]] ; then
1621 expand="" 1803 expand=""
1622 break 1804 break
1623 fi 1805 fi
1624 done 1806 done
1625 if [[ -n ${expand} ]] ; then 1807 if [[ -n ${expand} ]] ; then
1808 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1809 case ${missing_action} in
1810 true) return 0;;
1811 false) return 1;;
1626 has $1 ${IUSE_BUILT} || die "$PKG does not actually support the $1 USE flag!" 1812 die) die "$PKG does not actually support the $1 USE flag!";;
1813 esac
1814 fi
1815 fi
1627 fi 1816 fi
1628 1817
1629 local USE_BUILT=$(<${USEFILE}) 1818 local USE_BUILT=$(<${USEFILE})
1630 while [[ $# -gt 0 ]] ; do 1819 while [[ $# -gt 0 ]] ; do
1631 if [[ ${opt} = "-o" ]] ; then 1820 if [[ ${opt} = "-o" ]] ; then
1636 shift 1825 shift
1637 done 1826 done
1638 [[ ${opt} = "-a" ]] 1827 [[ ${opt} = "-a" ]]
1639} 1828}
1640 1829
1830# @FUNCTION: epunt_cxx
1831# @USAGE: [dir to scan]
1832# @DESCRIPTION:
1641# Many configure scripts wrongly bail when a C++ compiler 1833# Many configure scripts wrongly bail when a C++ compiler could not be
1642# could not be detected. #73450 1834# detected. If dir is not specified, then it defaults to ${S}.
1835#
1836# http://bugs.gentoo.org/73450
1643epunt_cxx() { 1837epunt_cxx() {
1644 local dir=$1 1838 local dir=$1
1645 [[ -z ${dir} ]] && dir=${S} 1839 [[ -z ${dir} ]] && dir=${S}
1646 ebegin "Removing useless C++ checks" 1840 ebegin "Removing useless C++ checks"
1647 local f 1841 local f
1648 for f in $(find ${dir} -name configure) ; do 1842 find "${dir}" -name configure | while read f ; do
1649 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
1650 done 1844 done
1651 eend 0 1845 eend 0
1652} 1846}
1653 1847
1654# make a wrapper script ... 1848# @FUNCTION: make_wrapper
1655# NOTE: this was originally games_make_wrapper, but I noticed other places where 1849# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1656# this could be used, so I have moved it here and made it not games-specific 1850# @DESCRIPTION:
1657# -- wolf31o2 1851# Create a shell wrapper script named wrapper in installpath
1658# $1 == wrapper name 1852# (defaults to the bindir) to execute target (default of wrapper) by
1659# $2 == binary to run 1853# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1660# $3 == directory to chdir before running binary 1854# libpaths followed by optionally changing directory to chdir.
1661# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1662# $5 == path for wrapper
1663make_wrapper() { 1855make_wrapper() {
1664 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1856 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1665 local tmpwrapper=$(emktemp) 1857 local tmpwrapper=$(emktemp)
1666 # We don't want to quote ${bin} so that people can pass complex 1858 # We don't want to quote ${bin} so that people can pass complex
1667 # things as $bin ... "./someprog --args" 1859 # things as $bin ... "./someprog --args"
1677fi 1869fi
1678exec ${bin} "\$@" 1870exec ${bin} "\$@"
1679EOF 1871EOF
1680 chmod go+rx "${tmpwrapper}" 1872 chmod go+rx "${tmpwrapper}"
1681 if [[ -n ${path} ]] ; then 1873 if [[ -n ${path} ]] ; then
1874 (
1682 exeinto "${path}" 1875 exeinto "${path}"
1683 newexe "${tmpwrapper}" "${wrapper}" 1876 newexe "${tmpwrapper}" "${wrapper}"
1877 ) || die
1684 else 1878 else
1685 newbin "${tmpwrapper}" "${wrapper}" 1879 newbin "${tmpwrapper}" "${wrapper}" || die
1880 fi
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"
1686 fi 1897# fi
1687} 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.268  
changed lines
  Added in v.1.326

  ViewVC Help
Powered by ViewVC 1.1.20