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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.247  
changed lines
  Added in v.1.346

  ViewVC Help
Powered by ViewVC 1.1.20