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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.228  
changed lines
  Added in v.1.344

  ViewVC Help
Powered by ViewVC 1.1.20