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

Diff of /eclass/eutils.eclass

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

Revision 1.223 Revision 1.345
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.223 2006/02/15 23:40:16 flameeyes Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.345 2010/06/23 21:24:50 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# 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 local i=0 str_length="" str_out="" 211 # create a line of same length as input string
143 212 [[ -z $1 ]] && set "$(printf "%65s" '')"
144 # Handle calls that do not have args, or wc not being installed ... 213 echo "${1//?/=}"
145 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
146 str_length=65
147 else
148 str_length=$(echo -n "$*" | wc -m)
149 fi
150
151 while ((i++ < ${str_length})) ; do
152 str_out="${str_out}="
153 done
154 echo ${str_out}
155
156 return 0
157 } 214 }
158 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
159 local PIPE_CMD=""
160 local STDERR_TARGET="${T}/$$.out"
161 local PATCH_TARGET="${T}/$$.patch"
162 local PATCH_SUFFIX=""
163 local SINGLE_PATCH="no"
164 local x=""
165 215
166 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402 216 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
167 217
168 if [ "$#" -gt 1 ] 218 # Let the rest of the code process one user arg at a time --
169 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
170 local m="" 222 local m
171 for m in "$@" ; do 223 for m in "$@" ; do
172 epatch "${m}" 224 epatch "${m}"
173 done 225 done
174 return 0 226 return 0
175 fi 227 fi
176 228
177 if [ -n "$1" -a -f "$1" ] 229 local SINGLE_PATCH="no"
178 then 230 # no args means process ${EPATCH_SOURCE}
231 [[ $# -eq 0 ]] && set -- "${EPATCH_SOURCE}"
232
233 if [[ -f $1 ]] ; then
179 SINGLE_PATCH="yes" 234 SINGLE_PATCH="yes"
180 235 set -- "$1"
181 local EPATCH_SOURCE="$1" 236 # Use the suffix from the single patch (localize it); the code
237 # below will find the suffix for us
182 local EPATCH_SUFFIX="${1##*\.}" 238 local EPATCH_SUFFIX=$1
183 239
184 elif [ -n "$1" -a -d "$1" ] 240 elif [[ -d $1 ]] ; then
185 then 241 # Some people like to make dirs of patches w/out suffixes (vim)
186 # Allow no extension if EPATCH_FORCE=yes ... used by vim for example ... 242 set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
187 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} ]]
188 then 286 then
189 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
190 else 312 else
191 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 313 einfo " ${patchname} ..."
192 fi 314 fi
193 else 315
194 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ] 316 # most of the time, there will only be one run per unique name,
195 then 317 # but if there are more, make sure we get unique log filenames
196 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 318 local STDERR_TARGET="${T}/${patchname}.out"
197 then 319 if [[ -e ${STDERR_TARGET} ]] ; then
198 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
199 fi 338 fi
339 else
340 PATCH_TARGET=${x}
341 fi
200 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} *****"
201 echo 358 echo
202 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} )"
203 eerror 396 eerror
204 eerror " ${EPATCH_SOURCE}" 397 eerror "Include in your bugreport the contents of:"
205 eerror " ( ${EPATCH_SOURCE##*/} )" 398 eerror
399 eerror " ${STDERR_TARGET}"
206 echo 400 echo
207 die "Cannot find \$EPATCH_SOURCE!"
208 fi
209
210 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
211 fi
212
213 case ${EPATCH_SUFFIX##*\.} in
214 bz2)
215 PIPE_CMD="bzip2 -dc"
216 PATCH_SUFFIX="bz2"
217 ;;
218 gz|Z|z)
219 PIPE_CMD="gzip -dc"
220 PATCH_SUFFIX="gz"
221 ;;
222 ZIP|zip)
223 PIPE_CMD="unzip -p"
224 PATCH_SUFFIX="zip"
225 ;;
226 *)
227 PIPE_CMD="cat"
228 PATCH_SUFFIX="patch"
229 ;;
230 esac
231
232 if [ "${SINGLE_PATCH}" = "no" ]
233 then
234 einfo "${EPATCH_MULTI_MSG}"
235 fi
236 for x in ${EPATCH_SOURCE}
237 do
238 # New ARCH dependant patch naming scheme ...
239 #
240 # ???_arch_foo.patch
241 #
242 if [ -f ${x} ] && \
243 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
244 [ "${EPATCH_FORCE}" = "yes" ])
245 then
246 local count=0
247 local popts="${EPATCH_OPTS}"
248 local patchname=${x##*/}
249
250 if [ -n "${EPATCH_EXCLUDE}" ]
251 then
252 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
253 then
254 continue
255 fi
256 fi
257
258 if [ "${SINGLE_PATCH}" = "yes" ]
259 then
260 if [ -n "${EPATCH_SINGLE_MSG}" ]
261 then
262 einfo "${EPATCH_SINGLE_MSG}"
263 else
264 einfo "Applying ${patchname} ..."
265 fi
266 else
267 einfo " ${patchname} ..."
268 fi
269
270 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
271 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
272
273 # Allow for prefix to differ ... im lazy, so shoot me :/
274 while [ "${count}" -lt 5 ]
275 do
276 # Generate some useful debug info ...
277 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
279
280 if [ "${PATCH_SUFFIX}" != "patch" ]
281 then
282 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
283 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
284 else
285 PATCH_TARGET="${x}"
286 fi
287
288 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290
291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
292 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
293
294 if [ "${PATCH_SUFFIX}" != "patch" ]
295 then
296 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
297 then
298 echo
299 eerror "Could not extract patch!"
300 #die "Could not extract patch!"
301 count=5
302 break
303 fi
304 fi
305
306 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
307 then
308 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
309 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
310 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
311 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
312 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
313
314 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
315 _epatch_assert
316
317 if [ "$?" -ne 0 ]
318 then
319 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
320 echo
321 eerror "A dry-run of patch command succeeded, but actually"
322 eerror "applying the patch failed!"
323 #die "Real world sux compared to the dreamworld!"
324 count=5
325 fi
326
327 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
328
329 break
330 fi
331
332 count=$((count + 1))
333 done
334
335 if [ "${PATCH_SUFFIX}" != "patch" ]
336 then
337 rm -f ${PATCH_TARGET}
338 fi
339
340 if [ "${count}" -eq 5 ]
341 then
342 echo
343 eerror "Failed Patch: ${patchname} !"
344 eerror " ( ${PATCH_TARGET} )"
345 eerror
346 eerror "Include in your bugreport the contents of:"
347 eerror
348 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
349 echo
350 die "Failed Patch: ${patchname}!" 401 die "Failed Patch: ${patchname}!"
351 fi 402 fi
352 403
353 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 404 # if everything worked, delete the patch log
354 405 rm -f "${STDERR_TARGET}"
355 eend 0 406 eend 0
356 fi
357 done 407 done
358 if [ "${SINGLE_PATCH}" = "no" ] 408
359 then 409 [[ ${SINGLE_PATCH} == "no" ]] && einfo "Done with patching"
360 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
361 fi 428 fi
429 done
362} 430}
363 431
432# @FUNCTION: emktemp
433# @USAGE: [temp dir]
434# @DESCRIPTION:
364# Cheap replacement for when debianutils (and thus mktemp) 435# Cheap replacement for when debianutils (and thus mktemp)
365# does not exist on the users system 436# does not exist on the users system.
366# vapier@gentoo.org
367#
368# Takes just 1 optional parameter (the directory to create tmpfile in)
369emktemp() { 437emktemp() {
370 local exe="touch" 438 local exe="touch"
371 [[ $1 == -d ]] && exe="mkdir" && shift 439 [[ $1 == -d ]] && exe="mkdir" && shift
372 local topdir=$1 440 local topdir=$1
373 441
375 [[ -z ${T} ]] \ 443 [[ -z ${T} ]] \
376 && topdir="/tmp" \ 444 && topdir="/tmp" \
377 || topdir=${T} 445 || topdir=${T}
378 fi 446 fi
379 447
380 if [[ -z $(type -p mktemp) ]] ; then 448 if ! type -P mktemp > /dev/null ; then
449 # system lacks `mktemp` so we have to fake it
381 local tmp=/ 450 local tmp=/
382 while [[ -e ${tmp} ]] ; do 451 while [[ -e ${tmp} ]] ; do
383 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 452 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
384 done 453 done
385 ${exe} "${tmp}" || ${exe} -p "${tmp}" 454 ${exe} "${tmp}" || ${exe} -p "${tmp}"
386 echo "${tmp}" 455 echo "${tmp}"
387 else 456 else
457 # the args here will give slightly wierd names on BSD,
458 # but should produce a usable file on all userlands
388 if [[ ${exe} == "touch" ]] ; then 459 if [[ ${exe} == "touch" ]] ; then
389 [[ ${USERLAND} == "GNU" ]] \ 460 TMPDIR="${topdir}" mktemp -t tmp.XXXXXXXXXX
390 && exe="-p" \
391 || exe="-t"
392 else 461 else
393 [[ ${USERLAND} == "GNU" ]] \
394 && exe="-d" \
395 || exe="-dt"
396 fi
397 TMPDIR="${topdir}" mktemp ${exe} tmp 462 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX
398 fi 463 fi
464 fi
399} 465}
400 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:
401# 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),
402# and pw (FreeBSD) used in enewuser()/enewgroup() 477# and pw (FreeBSD) used in enewuser()/enewgroup()
403# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
404# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
405#
406# egetent(database, key)
407egetent() { 478egetent() {
408 case ${CHOST} in 479 case ${CHOST} in
409 *-darwin*) 480 *-darwin[678])
410 case "$2" in 481 case "$2" in
411 *[!0-9]*) # Non numeric 482 *[!0-9]*) # Non numeric
412 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 483 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
413 ;; 484 ;;
414 *) # Numeric 485 *) # Numeric
415 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
416 ;; 502 ;;
417 esac 503 esac
418 ;; 504 ;;
419 *-freebsd*|*-dragonfly*) 505 *-freebsd*|*-dragonfly*)
420 local opts action="user" 506 local opts action="user"
435 getent "$1" "$2" 521 getent "$1" "$2"
436 ;; 522 ;;
437 esac 523 esac
438} 524}
439 525
440# Simplify/standardize adding users to the system 526# @FUNCTION: enewuser
441# vapier@gentoo.org 527# @USAGE: <user> [uid] [shell] [homedir] [groups] [params]
442# 528# @DESCRIPTION:
443# enewuser(username, uid, shell, homedir, groups, extra options) 529# Same as enewgroup, you are not required to understand how to properly add
444# 530# a user to the system. The only required parameter is the username.
445# Default values if you do not specify any: 531# Default uid is (pass -1 for this) next available, default shell is
446# username: REQUIRED ! 532# /bin/false, default homedir is /dev/null, there are no default groups,
447# uid: next available (see useradd(8)) 533# and default params sets the comment as 'added by portage for ${PN}'.
448# note: pass -1 to get default behavior
449# shell: /bin/false
450# homedir: /dev/null
451# groups: none
452# extra: comment of 'added by portage for ${PN}'
453enewuser() { 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
454 # get the username 542 # get the username
455 local euser=$1; shift 543 local euser=$1; shift
456 if [[ -z ${euser} ]] ; then 544 if [[ -z ${euser} ]] ; then
457 eerror "No username specified !" 545 eerror "No username specified !"
458 die "Cannot call enewuser without a username" 546 die "Cannot call enewuser without a username"
459 fi 547 fi
460 548
461 # lets see if the username already exists 549 # lets see if the username already exists
462 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 550 if [[ -n $(egetent passwd "${euser}") ]] ; then
463 return 0 551 return 0
464 fi 552 fi
465 einfo "Adding user '${euser}' to your system ..." 553 einfo "Adding user '${euser}' to your system ..."
466 554
467 # options to pass to useradd 555 # options to pass to useradd
468 local opts= 556 local opts=
469 557
470 # handle uid 558 # handle uid
471 local euid=$1; shift 559 local euid=$1; shift
472 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 560 if [[ -n ${euid} && ${euid} != -1 ]] ; then
473 if [[ ${euid} -gt 0 ]] ; then 561 if [[ ${euid} -gt 0 ]] ; then
474 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 562 if [[ -n $(egetent passwd ${euid}) ]] ; then
475 euid="next" 563 euid="next"
476 fi 564 fi
477 else 565 else
478 eerror "Userid given but is not greater than 0 !" 566 eerror "Userid given but is not greater than 0 !"
479 die "${euid} is not a valid UID" 567 die "${euid} is not a valid UID"
480 fi 568 fi
481 else 569 else
482 euid="next" 570 euid="next"
483 fi 571 fi
484 if [[ ${euid} == "next" ]] ; then 572 if [[ ${euid} == "next" ]] ; then
485 for euid in $(seq 101 999) ; do 573 for ((euid = 101; euid <= 999; euid++)); do
486 [[ -z $(egetent passwd ${euid}) ]] && break 574 [[ -z $(egetent passwd ${euid}) ]] && break
487 done 575 done
488 fi 576 fi
489 opts="${opts} -u ${euid}" 577 opts="${opts} -u ${euid}"
490 einfo " - Userid: ${euid}" 578 einfo " - Userid: ${euid}"
504 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
505 [[ -x ${ROOT}${shell} ]] && break 593 [[ -x ${ROOT}${shell} ]] && break
506 done 594 done
507 595
508 if [[ ${shell} == "/dev/null" ]] ; then 596 if [[ ${shell} == "/dev/null" ]] ; then
509 eerror "Unable to identify the shell to use" 597 eerror "Unable to identify the shell to use, proceeding with userland default."
510 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
511 fi 604 fi
512 605
513 eshell=${shell} 606 eshell=${shell}
514 fi 607 fi
515 einfo " - Shell: ${eshell}" 608 einfo " - Shell: ${eshell}"
613 fi 706 fi
614 ;; 707 ;;
615 708
616 *) 709 *)
617 if [[ -z $@ ]] ; then 710 if [[ -z $@ ]] ; then
618 useradd ${opts} ${euser} \ 711 useradd -r ${opts} \
619 -c "added by portage for ${PN}" \ 712 -c "added by portage for ${PN}" \
713 ${euser} \
620 || die "enewuser failed" 714 || die "enewuser failed"
621 else 715 else
622 einfo " - Extra: $@" 716 einfo " - Extra: $@"
623 useradd ${opts} ${euser} "$@" \ 717 useradd -r ${opts} "$@" \
718 ${euser} \
624 || die "enewuser failed" 719 || die "enewuser failed"
625 fi 720 fi
626 ;; 721 ;;
627 esac 722 esac
628 723
634 fi 729 fi
635 730
636 export SANDBOX_ON=${oldsandbox} 731 export SANDBOX_ON=${oldsandbox}
637} 732}
638 733
639# Simplify/standardize adding groups to the system 734# @FUNCTION: enewgroup
640# vapier@gentoo.org 735# @USAGE: <group> [gid]
641# 736# @DESCRIPTION:
642# enewgroup(group, gid) 737# This function does not require you to understand how to properly add a
643# 738# group to the system. Just give it a group name to add and enewgroup will
644# 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
645# groupname: REQUIRED ! 740# allocate the next available one.
646# gid: next available (see groupadd(8))
647# extra: none
648enewgroup() { 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
649 # get the group 749 # get the group
650 local egroup="$1"; shift 750 local egroup="$1"; shift
651 if [ -z "${egroup}" ] 751 if [ -z "${egroup}" ]
652 then 752 then
653 eerror "No group specified !" 753 eerror "No group specified !"
654 die "Cannot call enewgroup without a group" 754 die "Cannot call enewgroup without a group"
655 fi 755 fi
656 756
657 # see if group already exists 757 # see if group already exists
658 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 758 if [[ -n $(egetent group "${egroup}") ]]; then
659 then
660 return 0 759 return 0
661 fi 760 fi
662 einfo "Adding group '${egroup}' to your system ..." 761 einfo "Adding group '${egroup}' to your system ..."
663 762
664 # options to pass to useradd 763 # options to pass to useradd
707 fi 806 fi
708 807
709 # If we need the next available 808 # If we need the next available
710 case ${egid} in 809 case ${egid} in
711 *[!0-9]*) # Non numeric 810 *[!0-9]*) # Non numeric
712 for egid in $(seq 101 999); do 811 for ((egid = 101; egid <= 999; egid++)); do
713 [ -z "`egetent group ${egid}`" ] && break 812 [[ -z $(egetent group ${egid}) ]] && break
714 done 813 done
715 esac 814 esac
716 dscl . create /groups/${egroup} gid ${egid} 815 dscl . create /groups/${egroup} gid ${egid}
717 dscl . create /groups/${egroup} passwd '*' 816 dscl . create /groups/${egroup} passwd '*'
718 ;; 817 ;;
719 818
720 *-freebsd*|*-dragonfly*) 819 *-freebsd*|*-dragonfly*)
721 case ${egid} in 820 case ${egid} in
722 *[!0-9]*) # Non numeric 821 *[!0-9]*) # Non numeric
723 for egid in $(seq 101 999); do 822 for ((egid = 101; egid <= 999; egid++)); do
724 [ -z "`egetent group ${egid}`" ] && break 823 [[ -z $(egetent group ${egid}) ]] && break
725 done 824 done
726 esac 825 esac
727 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 826 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
728 ;; 827 ;;
729 828
730 *-netbsd*) 829 *-netbsd*)
731 case ${egid} in 830 case ${egid} in
732 *[!0-9]*) # Non numeric 831 *[!0-9]*) # Non numeric
733 for egid in $(seq 101 999); do 832 for ((egid = 101; egid <= 999; egid++)); do
734 [ -z "`egetent group ${egid}`" ] && break 833 [[ -z $(egetent group ${egid}) ]] && break
735 done 834 done
736 esac 835 esac
737 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 836 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
738 ;; 837 ;;
739 838
740 *) 839 *)
840 # We specify -r so that we get a GID in the system range from login.defs
741 groupadd ${opts} ${egroup} || die "enewgroup failed" 841 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
742 ;; 842 ;;
743 esac 843 esac
744 export SANDBOX_ON="${oldsandbox}" 844 export SANDBOX_ON="${oldsandbox}"
745} 845}
746 846
747# Simple script to replace 'dos2unix' binaries 847# @FUNCTION: edos2unix
748# vapier@gentoo.org 848# @USAGE: <file> [more files ...]
749# 849# @DESCRIPTION:
750# 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.
751edos2unix() { 854edos2unix() {
752 for f in "$@" 855 echo "$@" | xargs sed -i 's/\r$//'
753 do
754 cp "${f}" ${T}/edos2unix
755 sed 's/\r$//' ${T}/edos2unix > "${f}"
756 done
757} 856}
758
759
760##############################################################
761# START: Handle .desktop files and menu entries #
762# maybe this should be separated into a new eclass some time #
763# lanius@gentoo.org #
764##############################################################
765 857
766# Make a desktop file ! 858# Make a desktop file !
767# Great for making those icons in kde/gnome startmenu ! 859# Great for making those icons in kde/gnome startmenu !
768# Amaze your friends ! Get the women ! Join today ! 860# Amaze your friends ! Get the women ! Join today !
769# 861#
770# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 862# make_desktop_entry(<command>, [name], [icon], [type], [fields])
771# 863#
772# binary: what binary does the app run with ? 864# binary: what command does the app run with ?
773# name: the name that will show up in the menu 865# name: the name that will show up in the menu
774# icon: give your little like a pretty little icon ... 866# icon: give your little like a pretty little icon ...
775# this can be relative (to /usr/share/pixmaps) or 867# this can be relative (to /usr/share/pixmaps) or
776# a full path to an icon 868# a full path to an icon
777# type: what kind of application is this ? for categories: 869# type: what kind of application is this ? for categories:
778# http://www.freedesktop.org/Standards/desktop-entry-spec 870# http://standards.freedesktop.org/menu-spec/latest/apa.html
779# path: if your app needs to startup in a specific dir 871# fields: extra fields to append to the desktop file; a printf string
780make_desktop_entry() { 872make_desktop_entry() {
781 [[ -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"
782 874
783 local exec=${1} 875 local exec=${1}
784 local name=${2:-${PN}} 876 local name=${2:-${PN}}
785 local icon=${3:-${PN}.png} 877 local icon=${3:-${PN}}
786 local type=${4} 878 local type=${4}
787 local path=${5} 879 local fields=${5}
788 880
789 if [[ -z ${type} ]] ; then 881 if [[ -z ${type} ]] ; then
790 local catmaj=${CATEGORY%%-*} 882 local catmaj=${CATEGORY%%-*}
791 local catmin=${CATEGORY##*-} 883 local catmin=${CATEGORY##*-}
792 case ${catmaj} in 884 case ${catmaj} in
793 app) 885 app)
794 case ${catmin} in 886 case ${catmin} in
887 accessibility) type=Accessibility;;
795 admin) type=System;; 888 admin) type=System;;
889 antivirus) type=System;;
890 arch) type=Archiving;;
891 backup) type=Archiving;;
796 cdr) type=DiscBurning;; 892 cdr) type=DiscBurning;;
797 dicts) type=Dictionary;; 893 dicts) type=Dictionary;;
894 doc) type=Documentation;;
798 editors) type=TextEditor;; 895 editors) type=TextEditor;;
799 emacs) type=TextEditor;; 896 emacs) type=TextEditor;;
800 emulation) type=Emulator;; 897 emulation) type=Emulator;;
801 laptop) type=HardwareSettings;; 898 laptop) type=HardwareSettings;;
802 office) type=Office;; 899 office) type=Office;;
900 pda) type=PDA;;
803 vim) type=TextEditor;; 901 vim) type=TextEditor;;
804 xemacs) type=TextEditor;; 902 xemacs) type=TextEditor;;
805 *) type=;;
806 esac 903 esac
807 ;; 904 ;;
808 905
809 dev) 906 dev)
810 type="Development" 907 type="Development"
811 ;; 908 ;;
812 909
813 games) 910 games)
814 case ${catmin} in 911 case ${catmin} in
815 action) type=ActionGame;; 912 action|fps) type=ActionGame;;
816 arcade) type=ArcadeGame;; 913 arcade) type=ArcadeGame;;
817 board) type=BoardGame;; 914 board) type=BoardGame;;
818 kid) type=KidsGame;;
819 emulation) type=Emulator;; 915 emulation) type=Emulator;;
916 kids) type=KidsGame;;
820 puzzle) type=LogicGame;; 917 puzzle) type=LogicGame;;
918 roguelike) type=RolePlaying;;
821 rpg) type=RolePlaying;; 919 rpg) type=RolePlaying;;
822 roguelike) type=RolePlaying;;
823 simulation) type=Simulation;; 920 simulation) type=Simulation;;
824 sports) type=SportsGame;; 921 sports) type=SportsGame;;
825 strategy) type=StrategyGame;; 922 strategy) type=StrategyGame;;
826 *) type=;;
827 esac 923 esac
828 type="Game;${type}" 924 type="Game;${type}"
829 ;; 925 ;;
830 926
927 gnome)
928 type="Gnome;GTK"
929 ;;
930
931 kde)
932 type="KDE;Qt"
933 ;;
934
831 mail) 935 mail)
832 type="Network;Email" 936 type="Network;Email"
833 ;; 937 ;;
834 938
835 media) 939 media)
836 case ${catmin} in 940 case ${catmin} in
941 gfx)
837 gfx) type=Graphics;; 942 type=Graphics
943 ;;
944 *)
945 case ${catmin} in
838 radio) type=Tuner;; 946 radio) type=Tuner;;
839 sound) type=Audio;; 947 sound) type=Audio;;
840 tv) type=TV;; 948 tv) type=TV;;
841 video) type=Video;; 949 video) type=Video;;
842 *) type=;; 950 esac
951 type="AudioVideo;${type}"
952 ;;
843 esac 953 esac
844 type="AudioVideo;${type}"
845 ;; 954 ;;
846 955
847 net) 956 net)
848 case ${catmin} in 957 case ${catmin} in
849 dialup) type=Dialup;; 958 dialup) type=Dialup;;
852 irc) type=IRCClient;; 961 irc) type=IRCClient;;
853 mail) type=Email;; 962 mail) type=Email;;
854 news) type=News;; 963 news) type=News;;
855 nntp) type=News;; 964 nntp) type=News;;
856 p2p) type=FileTransfer;; 965 p2p) type=FileTransfer;;
857 *) type=;; 966 voip) type=Telephony;;
858 esac 967 esac
859 type="Network;${type}" 968 type="Network;${type}"
860 ;; 969 ;;
861 970
862 sci) 971 sci)
863 case ${catmin} in 972 case ${catmin} in
864 astro*) type=Astronomy;; 973 astro*) type=Astronomy;;
865 bio*) type=Biology;; 974 bio*) type=Biology;;
866 calc*) type=Calculator;; 975 calc*) type=Calculator;;
867 chem*) type=Chemistry;; 976 chem*) type=Chemistry;;
977 elec*) type=Electronics;;
868 geo*) type=Geology;; 978 geo*) type=Geology;;
869 math*) type=Math;; 979 math*) type=Math;;
870 *) type=;; 980 physics) type=Physics;;
981 visual*) type=DataVisualization;;
871 esac 982 esac
872 type="Science;${type}" 983 type="Education;Science;${type}"
984 ;;
985
986 sys)
987 type="System"
873 ;; 988 ;;
874 989
875 www) 990 www)
876 case ${catmin} in 991 case ${catmin} in
877 client) type=WebBrowser;; 992 client) type=WebBrowser;;
878 *) type=;;
879 esac 993 esac
880 type="Network" 994 type="Network;${type}"
881 ;; 995 ;;
882 996
883 *) 997 *)
884 type= 998 type=
885 ;; 999 ;;
888 if [ "${SLOT}" == "0" ] ; then 1002 if [ "${SLOT}" == "0" ] ; then
889 local desktop_name="${PN}" 1003 local desktop_name="${PN}"
890 else 1004 else
891 local desktop_name="${PN}-${SLOT}" 1005 local desktop_name="${PN}-${SLOT}"
892 fi 1006 fi
1007 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
893 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 1008 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
894 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}"
895echo "[Desktop Entry] 1022 [Desktop Entry]
896Encoding=UTF-8
897Version=0.9.2
898Name=${name} 1023 Name=${name}
899Type=Application 1024 Type=Application
900Comment=${DESCRIPTION} 1025 Comment=${DESCRIPTION}
901Exec=${exec} 1026 Exec=${exec}
902Path=${path} 1027 TryExec=${exec%% *}
903Icon=${icon} 1028 Icon=${icon}
904Categories=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}"
905 1038
906 ( 1039 (
907 # wrap the env here so that the 'insinto' call 1040 # wrap the env here so that the 'insinto' call
908 # doesn't corrupt the env of the caller 1041 # doesn't corrupt the env of the caller
909 insinto /usr/share/applications 1042 insinto /usr/share/applications
910 doins "${desktop}" 1043 doins "${desktop}"
911 ) 1044 ) || die "installing desktop file failed"
912} 1045}
913 1046
914# Make a GDM/KDM Session file 1047# @FUNCTION: validate_desktop_entries
915# 1048# @USAGE: [directories]
916# make_desktop_entry(<title>, <command>) 1049# @MAINTAINER:
917# title: File to execute to start the Window Manager 1050# Carsten Lohrke <carlo@gentoo.org>
918# 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}
919 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.
920make_session_desktop() { 1082make_session_desktop() {
921 [[ -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
922 [[ -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
923 1085
924 local title=$1 1086 local title=$1
925 local command=$2 1087 local command=$2
926 local desktop=${T}/${wm}.desktop 1088 local desktop=${T}/${wm:-${PN}}.desktop
1089 shift 2
927 1090
1091 cat <<-EOF > "${desktop}"
928echo "[Desktop Entry] 1092 [Desktop Entry]
929Encoding=UTF-8
930Name=${title} 1093 Name=${title}
931Comment=This session logs you into ${title} 1094 Comment=This session logs you into ${title}
932Exec=${command} 1095 Exec=${command} $*
933TryExec=${command} 1096 TryExec=${command}
934Type=Application" > "${desktop}" 1097 Type=XSession
1098 EOF
935 1099
1100 (
1101 # wrap the env here so that the 'insinto' call
1102 # doesn't corrupt the env of the caller
936 insinto /usr/share/xsessions 1103 insinto /usr/share/xsessions
937 doins "${desktop}" 1104 doins "${desktop}"
1105 )
938} 1106}
939 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).
940domenu() { 1113domenu() {
1114 (
1115 # wrap the env here so that the 'insinto' call
1116 # doesn't corrupt the env of the caller
941 local i j 1117 local i j ret=0
942 insinto /usr/share/applications 1118 insinto /usr/share/applications
943 for i in "$@" ; do 1119 for i in "$@" ; do
944 if [[ -f ${i} ]] ; then 1120 if [[ -f ${i} ]] ; then
945 doins "${i}" 1121 doins "${i}"
1122 ((ret+=$?))
946 elif [[ -d ${i} ]] ; then 1123 elif [[ -d ${i} ]] ; then
947 for j in "${i}"/*.desktop ; do 1124 for j in "${i}"/*.desktop ; do
948 doins "${j}" 1125 doins "${j}"
1126 ((ret+=$?))
949 done 1127 done
1128 else
1129 ((++ret))
950 fi 1130 fi
951 done 1131 done
1132 exit ${ret}
1133 )
952} 1134}
1135
1136# @FUNCTION: newmenu
1137# @USAGE: <menu> <newname>
1138# @DESCRIPTION:
1139# Like all other new* functions, install the specified menu as newname.
953newmenu() { 1140newmenu() {
1141 (
1142 # wrap the env here so that the 'insinto' call
1143 # doesn't corrupt the env of the caller
954 insinto /usr/share/applications 1144 insinto /usr/share/applications
955 newins "$1" "$2" 1145 newins "$@"
1146 )
956} 1147}
957 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.
958doicon() { 1154doicon() {
1155 (
1156 # wrap the env here so that the 'insinto' call
1157 # doesn't corrupt the env of the caller
959 local i j 1158 local i j ret
960 insinto /usr/share/pixmaps 1159 insinto /usr/share/pixmaps
961 for i in "$@" ; do 1160 for i in "$@" ; do
962 if [[ -f ${i} ]] ; then 1161 if [[ -f ${i} ]] ; then
963 doins "${i}" 1162 doins "${i}"
1163 ((ret+=$?))
964 elif [[ -d ${i} ]] ; then 1164 elif [[ -d ${i} ]] ; then
965 for j in "${i}"/*.png ; do 1165 for j in "${i}"/*.png ; do
966 doins "${j}" 1166 doins "${j}"
1167 ((ret+=$?))
967 done 1168 done
1169 else
1170 ((++ret))
968 fi 1171 fi
969 done 1172 done
1173 exit ${ret}
1174 )
970} 1175}
1176
1177# @FUNCTION: newicon
1178# @USAGE: <icon> <newname>
1179# @DESCRIPTION:
1180# Like all other new* functions, install the specified icon as newname.
971newicon() { 1181newicon() {
1182 (
1183 # wrap the env here so that the 'insinto' call
1184 # doesn't corrupt the env of the caller
972 insinto /usr/share/pixmaps 1185 insinto /usr/share/pixmaps
973 newins "$1" "$2" 1186 newins "$@"
1187 )
974} 1188}
975
976##############################################################
977# END: Handle .desktop files and menu entries #
978##############################################################
979
980 1189
981# for internal use only (unpack_pdv and unpack_makeself) 1190# for internal use only (unpack_pdv and unpack_makeself)
982find_unpackable_file() { 1191find_unpackable_file() {
983 local src=$1 1192 local src=$1
984 if [[ -z ${src} ]] ; then 1193 if [[ -z ${src} ]] ; then
994 fi 1203 fi
995 [[ ! -e ${src} ]] && return 1 1204 [[ ! -e ${src} ]] && return 1
996 echo "${src}" 1205 echo "${src}"
997} 1206}
998 1207
1208# @FUNCTION: unpack_pdv
1209# @USAGE: <file to unpack> <size of off_t>
1210# @DESCRIPTION:
999# Unpack those pesky pdv generated files ... 1211# Unpack those pesky pdv generated files ...
1000# They're self-unpacking programs with the binary package stuffed in 1212# They're self-unpacking programs with the binary package stuffed in
1001# 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
1002# 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.
1003# 1215#
1004# Usage: unpack_pdv [file to unpack] [size of off_t]
1005# - 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
1006# information out of the binary executable myself. basically you pass in 1217# information out of the binary executable myself. Basically you pass in
1007# 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#
1008# 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
1009# strings <pdv archive> | grep lseek 1224# strings <pdv archive> | grep lseek
1010# strace -elseek <pdv archive> 1225# strace -elseek <pdv archive>
1226# @CODE
1227#
1011# 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
1012# 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
1013# parameter. here is an example: 1230# parameter. Here is an example:
1231#
1232# @CODE
1014# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1233# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1015# lseek 1234# lseek
1016# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1235# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1017# lseek(3, -4, SEEK_END) = 2981250 1236# lseek(3, -4, SEEK_END) = 2981250
1237# @CODE
1238#
1018# 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.
1019unpack_pdv() { 1240unpack_pdv() {
1020 local src=$(find_unpackable_file $1) 1241 local src=$(find_unpackable_file "$1")
1021 local sizeoff_t=$2 1242 local sizeoff_t=$2
1022 1243
1023 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1244 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1024 [[ -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 :("
1025 1246
1026 local shrtsrc=$(basename "${src}") 1247 local shrtsrc=$(basename "${src}")
1027 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1248 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1028 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1249 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
1029 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\")
1030 1251
1031 # grab metadata for debug reasons 1252 # grab metadata for debug reasons
1032 local metafile="$(emktemp)" 1253 local metafile=$(emktemp)
1033 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1254 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1034 1255
1035 # rip out the final file name from the metadata 1256 # rip out the final file name from the metadata
1036 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1257 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1037 datafile="`basename ${datafile}`" 1258 datafile=$(basename "${datafile}")
1038 1259
1039 # now lets uncompress/untar the file if need be 1260 # now lets uncompress/untar the file if need be
1040 local tmpfile="$(emktemp)" 1261 local tmpfile=$(emktemp)
1041 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}
1042 1263
1043 local iscompressed="`file -b ${tmpfile}`" 1264 local iscompressed=$(file -b "${tmpfile}")
1044 if [ "${iscompressed:0:8}" == "compress" ] ; then 1265 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1045 iscompressed=1 1266 iscompressed=1
1046 mv ${tmpfile}{,.Z} 1267 mv ${tmpfile}{,.Z}
1047 gunzip ${tmpfile} 1268 gunzip ${tmpfile}
1048 else 1269 else
1049 iscompressed=0 1270 iscompressed=0
1050 fi 1271 fi
1051 local istar="`file -b ${tmpfile}`" 1272 local istar=$(file -b "${tmpfile}")
1052 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1273 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1053 istar=1 1274 istar=1
1054 else 1275 else
1055 istar=0 1276 istar=0
1056 fi 1277 fi
1057 1278
1085 true 1306 true
1086 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" 1307 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
1087 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" 1308 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
1088} 1309}
1089 1310
1311# @FUNCTION: unpack_makeself
1312# @USAGE: [file to unpack] [offset] [tail|dd]
1313# @DESCRIPTION:
1090# Unpack those pesky makeself generated files ... 1314# Unpack those pesky makeself generated files ...
1091# They're shell scripts with the binary package tagged onto 1315# They're shell scripts with the binary package tagged onto
1092# the end of the archive. Loki utilized the format as does 1316# the end of the archive. Loki utilized the format as does
1093# many other game companies. 1317# many other game companies.
1094# 1318#
1095# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1319# If the file is not specified, then ${A} is used. If the
1096# - If the file is not specified then unpack will utilize ${A}.
1097# - If the offset is not specified then we will attempt to extract 1320# offset is not specified then we will attempt to extract
1098# the proper offset from the script itself. 1321# the proper offset from the script itself.
1099unpack_makeself() { 1322unpack_makeself() {
1100 local src_input=${1:-${A}} 1323 local src_input=${1:-${A}}
1101 local src=$(find_unpackable_file "${src_input}") 1324 local src=$(find_unpackable_file "${src_input}")
1102 local skip=$2 1325 local skip=$2
1103 local exe=$3 1326 local exe=$3
1105 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1328 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1106 1329
1107 local shrtsrc=$(basename "${src}") 1330 local shrtsrc=$(basename "${src}")
1108 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1331 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1109 if [[ -z ${skip} ]] ; then 1332 if [[ -z ${skip} ]] ; then
1110 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1333 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1111 local skip=0 1334 local skip=0
1112 exe=tail 1335 exe=tail
1113 case ${ver} in 1336 case ${ver} in
1114 1.5.*) # 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
1115 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1338 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1116 ;; 1339 ;;
1117 2.0|2.0.1) 1340 2.0|2.0.1)
1118 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1341 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1119 ;; 1342 ;;
1120 2.1.1) 1343 2.1.1)
1121 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1344 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1122 let skip="skip + 1" 1345 (( skip++ ))
1123 ;; 1346 ;;
1124 2.1.2) 1347 2.1.2)
1125 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1348 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1126 let skip="skip + 1" 1349 (( skip++ ))
1127 ;; 1350 ;;
1128 2.1.3) 1351 2.1.3)
1129 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1352 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1130 let skip="skip + 1" 1353 (( skip++ ))
1131 ;; 1354 ;;
1132 2.1.4|2.1.5) 1355 2.1.4|2.1.5)
1133 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)
1134 skip=$(head -n ${skip} "${src}" | wc -c) 1357 skip=$(head -n ${skip} "${src}" | wc -c)
1135 exe="dd" 1358 exe="dd"
1144 esac 1367 esac
1145 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1368 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1146 fi 1369 fi
1147 case ${exe} in 1370 case ${exe} in
1148 tail) exe="tail -n +${skip} '${src}'";; 1371 tail) exe="tail -n +${skip} '${src}'";;
1149 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1372 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1150 *) die "makeself cant handle exe '${exe}'" 1373 *) die "makeself cant handle exe '${exe}'"
1151 esac 1374 esac
1152 1375
1153 # 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
1154 local tmpfile="$(emktemp)" 1377 local tmpfile=$(emktemp)
1155 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1378 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1156 local filetype="$(file -b "${tmpfile}")" 1379 local filetype=$(file -b "${tmpfile}")
1157 case ${filetype} in 1380 case ${filetype} in
1158 *tar\ archive) 1381 *tar\ archive*)
1159 eval ${exe} | tar --no-same-owner -xf - 1382 eval ${exe} | tar --no-same-owner -xf -
1160 ;; 1383 ;;
1161 bzip2*) 1384 bzip2*)
1162 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1385 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1163 ;; 1386 ;;
1173 ;; 1396 ;;
1174 esac 1397 esac
1175 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})" 1398 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
1176} 1399}
1177 1400
1401# @FUNCTION: check_license
1402# @USAGE: [license]
1403# @DESCRIPTION:
1178# Display a license for user to accept. 1404# Display a license for user to accept. If no license is
1179#
1180# Usage: check_license [license]
1181# - If the file is not specified then ${LICENSE} is used. 1405# specified, then ${LICENSE} is used.
1182check_license() { 1406check_license() {
1183 local lic=$1 1407 local lic=$1
1184 if [ -z "${lic}" ] ; then 1408 if [ -z "${lic}" ] ; then
1185 lic="${PORTDIR}/licenses/${LICENSE}" 1409 lic="${PORTDIR}/licenses/${LICENSE}"
1186 else 1410 else
1190 lic="${PWD}/${lic}" 1414 lic="${PWD}/${lic}"
1191 elif [ -e "${lic}" ] ; then 1415 elif [ -e "${lic}" ] ; then
1192 lic="${lic}" 1416 lic="${lic}"
1193 fi 1417 fi
1194 fi 1418 fi
1195 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1196 local l="`basename ${lic}`" 1419 local l="`basename ${lic}`"
1197 1420
1198 # here is where we check for the licenses the user already 1421 # here is where we check for the licenses the user already
1199 # 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
1200 local shopts=$-
1201 local alic 1423 local alic
1202 set -o noglob #so that bash doesn't expand "*" 1424 eshopts_push -o noglob # so that bash doesn't expand "*"
1203 for alic in ${ACCEPT_LICENSE} ; do 1425 for alic in ${ACCEPT_LICENSE} ; do
1204 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1426 if [[ ${alic} == ${l} ]]; then
1205 set +o noglob; set -${shopts} #reset old shell opts 1427 eshopts_pop
1206 return 0 1428 return 0
1207 fi 1429 fi
1208 done 1430 done
1209 set +o noglob; set -$shopts #reset old shell opts 1431 eshopts_pop
1432 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1210 1433
1211 local licmsg="$(emktemp)" 1434 local licmsg=$(emktemp)
1212 cat << EOF > ${licmsg} 1435 cat <<-EOF > ${licmsg}
1213********************************************************** 1436 **********************************************************
1214The following license outlines the terms of use of this 1437 The following license outlines the terms of use of this
1215package. You MUST accept this license for installation to 1438 package. You MUST accept this license for installation to
1216continue. When you are done viewing, hit 'q'. If you 1439 continue. When you are done viewing, hit 'q'. If you
1217CTRL+C out of this, the install will not run! 1440 CTRL+C out of this, the install will not run!
1218********************************************************** 1441 **********************************************************
1219 1442
1220EOF 1443 EOF
1221 cat ${lic} >> ${licmsg} 1444 cat ${lic} >> ${licmsg}
1222 ${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}"
1223 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] "
1224 read alic 1447 read alic
1225 case ${alic} in 1448 case ${alic} in
1232 die "Failed to accept license" 1455 die "Failed to accept license"
1233 ;; 1456 ;;
1234 esac 1457 esac
1235} 1458}
1236 1459
1460# @FUNCTION: cdrom_get_cds
1461# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...]
1462# @DESCRIPTION:
1237# 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
1238# the whole 'non-interactive' policy, but damnit I want CD support ! 1464# the whole 'non-interactive' policy, but damnit I want CD support !
1239# 1465#
1240# with these cdrom functions we handle all the user interaction and 1466# With these cdrom functions we handle all the user interaction and
1241# 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()
1242# 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
1243# found at CDROM_ROOT. 1469# found at CDROM_ROOT.
1244# 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#
1245# 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',
1246# 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
1247# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1477# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1478# Use CDROM_NAME for one cd, or CDROM_NAME_# for multiple cds. You can
1479# also use the CDROM_NAME_SET bash array.
1248# 1480#
1249# 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.
1250#
1251# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1252# - this will attempt to locate a cd based upon a file that is on
1253# the cd ... the more files you give this function, the more cds
1254# the cdrom functions will handle
1255cdrom_get_cds() { 1482cdrom_get_cds() {
1256 # 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
1257 # the # of files they gave us 1484 # the # of files they gave us
1258 local cdcnt=0 1485 local cdcnt=0
1259 local f= 1486 local f=
1303 echo 1530 echo
1304 einfo "For example:" 1531 einfo "For example:"
1305 einfo "export CD_ROOT=/mnt/cdrom" 1532 einfo "export CD_ROOT=/mnt/cdrom"
1306 echo 1533 echo
1307 else 1534 else
1535 if [[ -n ${CDROM_NAME_SET} ]] ; then
1536 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1537 cdcnt=0
1538 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1539 ((++cdcnt))
1540 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1541 done
1542 fi
1543
1308 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1544 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1309 cdcnt=0 1545 cdcnt=0
1310 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1546 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1311 ((++cdcnt)) 1547 ((++cdcnt))
1312 var="CDROM_NAME_${cdcnt}" 1548 var="CDROM_NAME_${cdcnt}"
1336 export CDROM_SET="" 1572 export CDROM_SET=""
1337 export CDROM_CURRENT_CD=0 1573 export CDROM_CURRENT_CD=0
1338 cdrom_load_next_cd 1574 cdrom_load_next_cd
1339} 1575}
1340 1576
1341# this is only used when you need access to more than one cd. 1577# @FUNCTION: cdrom_load_next_cd
1342# when you have finished using the first cd, just call this function. 1578# @DESCRIPTION:
1343# 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
1344# 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.
1345cdrom_load_next_cd() { 1585cdrom_load_next_cd() {
1346 local var 1586 local var
1347 ((++CDROM_CURRENT_CD)) 1587 ((++CDROM_CURRENT_CD))
1348 1588
1349 unset CDROM_ROOT 1589 unset CDROM_ROOT
1366# displayed and we'll hang out here until: 1606# displayed and we'll hang out here until:
1367# (1) the file is found on a mounted cdrom 1607# (1) the file is found on a mounted cdrom
1368# (2) the user hits CTRL+C 1608# (2) the user hits CTRL+C
1369_cdrom_locate_file_on_cd() { 1609_cdrom_locate_file_on_cd() {
1370 local mline="" 1610 local mline=""
1371 local showedmsg=0 1611 local showedmsg=0 showjolietmsg=0
1372 1612
1373 while [[ -z ${CDROM_ROOT} ]] ; do 1613 while [[ -z ${CDROM_ROOT} ]] ; do
1374 local i=0 1614 local i=0
1375 local -a cdset=(${*//:/ }) 1615 local -a cdset=(${*//:/ })
1376 if [[ -n ${CDROM_SET} ]] ; then 1616 if [[ -n ${CDROM_SET} ]] ; then
1379 1619
1380 while [[ -n ${cdset[${i}]} ]] ; do 1620 while [[ -n ${cdset[${i}]} ]] ; do
1381 local dir=$(dirname ${cdset[${i}]}) 1621 local dir=$(dirname ${cdset[${i}]})
1382 local file=$(basename ${cdset[${i}]}) 1622 local file=$(basename ${cdset[${i}]})
1383 1623
1384 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/ }
1385 [[ -d ${mline}/${dir} ]] || continue 1630 [[ ! -d ${point}/${dir} ]] && continue
1386 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then 1631 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1387 export CDROM_ROOT=${mline} 1632 export CDROM_ROOT=${point}
1388 export CDROM_SET=${i} 1633 export CDROM_SET=${i}
1389 export CDROM_MATCH=${cdset[${i}]} 1634 export CDROM_MATCH=${cdset[${i}]}
1390 return 1635 return
1391 fi 1636 done <<< "$(get_mounts)"
1392 done
1393 1637
1394 ((++i)) 1638 ((++i))
1395 done 1639 done
1396 1640
1397 echo 1641 echo
1413 showedmsg=1 1657 showedmsg=1
1414 fi 1658 fi
1415 einfo "Press return to scan for the cd again" 1659 einfo "Press return to scan for the cd again"
1416 einfo "or hit CTRL+C to abort the emerge." 1660 einfo "or hit CTRL+C to abort the emerge."
1417 echo 1661 echo
1662 if [[ ${showjolietmsg} -eq 0 ]] ; then
1663 showjolietmsg=1
1664 else
1418 einfo "If you are having trouble with the detection" 1665 ewarn "If you are having trouble with the detection"
1419 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"
1420 einfo "Joliet support enabled in your kernel. Please" 1667 ewarn "Joliet support enabled in your kernel. Please"
1421 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
1422 read || die "something is screwed with your system" 1671 read || die "something is screwed with your system"
1423 done 1672 done
1424} 1673}
1425 1674
1675# @FUNCTION: strip-linguas
1676# @USAGE: [<allow LINGUAS>|<-i|-u> <directories of .po files>]
1677# @DESCRIPTION:
1426# Make sure that LINGUAS only contains languages that 1678# Make sure that LINGUAS only contains languages that
1427# a package can support 1679# a package can support. The first form allows you to
1428# 1680# specify a list of LINGUAS. The -i builds a list of po
1429# usage: strip-linguas <allow LINGUAS> 1681# files found in all the directories and uses the
1430# strip-linguas -i <directories of .po files> 1682# intersection of the lists. The -u builds a list of po
1431# strip-linguas -u <directories of .po files> 1683# files found in all the directories and uses the union
1432# 1684# of the lists.
1433# The first form allows you to specify a list of LINGUAS.
1434# The -i builds a list of po files found in all the
1435# directories and uses the intersection of the lists.
1436# The -u builds a list of po files found in all the
1437# directories and uses the union of the lists.
1438strip-linguas() { 1685strip-linguas() {
1439 local ls newls 1686 local ls newls nols
1440 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1687 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1441 local op=$1; shift 1688 local op=$1; shift
1442 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1689 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1443 local d f 1690 local d f
1444 for d in "$@" ; do 1691 for d in "$@" ; do
1445 if [[ ${op} == "-u" ]] ; then 1692 if [[ ${op} == "-u" ]] ; then
1446 newls=${ls} 1693 newls=${ls}
1447 else 1694 else
1448 newls="" 1695 newls=""
1449 fi 1696 fi
1450 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1697 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1451 if [[ ${op} == "-i" ]] ; then 1698 if [[ ${op} == "-i" ]] ; then
1452 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1699 hasq ${f} ${ls} && newls="${newls} ${f}"
1453 else 1700 else
1454 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1701 hasq ${f} ${ls} || newls="${newls} ${f}"
1455 fi 1702 fi
1456 done 1703 done
1457 ls=${newls} 1704 ls=${newls}
1458 done 1705 done
1459 ls=${ls//.po}
1460 else 1706 else
1461 ls=$@ 1707 ls="$@"
1462 fi 1708 fi
1463 1709
1464 ls=" ${ls} " 1710 nols=""
1465 newls="" 1711 newls=""
1466 for f in ${LINGUAS} ; do 1712 for f in ${LINGUAS} ; do
1467 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1713 if hasq ${f} ${ls} ; then
1468 newls="${newls} ${f}" 1714 newls="${newls} ${f}"
1469 else 1715 else
1470 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1716 nols="${nols} ${f}"
1471 fi 1717 fi
1472 done 1718 done
1473 if [[ -z ${newls} ]] ; then 1719 [[ -n ${nols} ]] \
1474 export LINGUAS="" 1720 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1475 else
1476 export LINGUAS=${newls:1} 1721 export LINGUAS=${newls:1}
1477 fi
1478} 1722}
1479 1723
1480# moved from kernel.eclass since they are generally useful outside of 1724# @FUNCTION: preserve_old_lib
1481# kernel.eclass -iggy (20041002) 1725# @USAGE: <libs to preserve> [more libs]
1482 1726# @DESCRIPTION:
1483# the following functions are useful in kernel module ebuilds, etc.
1484# for an example see ivtv or drbd ebuilds
1485
1486# set's ARCH to match what the kernel expects
1487set_arch_to_kernel() {
1488 i=10
1489 while ((i--)) ; do
1490 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1491 done
1492 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1493 case ${ARCH} in
1494 x86) export ARCH="i386";;
1495 amd64) export ARCH="x86_64";;
1496 hppa) export ARCH="parisc";;
1497 mips) export ARCH="mips";;
1498 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!
1499 *) export ARCH="${ARCH}";;
1500 esac
1501}
1502
1503# set's ARCH back to what portage expects
1504set_arch_to_portage() {
1505 i=10
1506 while ((i--)) ; do
1507 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1508 done
1509 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1510}
1511
1512# Jeremy Huddleston <eradicator@gentoo.org>:
1513# preserve_old_lib /path/to/libblah.so.0
1514# preserve_old_lib_notify /path/to/libblah.so.0
1515#
1516# These functions are useful when a lib in your package changes --soname. Such 1727# These functions are useful when a lib in your package changes ABI SONAME.
1517# 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
1518# 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
1519# 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
1520# 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
1521# 1732# preserve_old_lib_notify function.
1522# src_install() {
1523# ...
1524# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1525# ...
1526# }
1527#
1528# pkg_postinst() {
1529# ...
1530# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1531# ...
1532# }
1533
1534preserve_old_lib() { 1733preserve_old_lib() {
1535 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]"
1536 1739
1537 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1740 # let portage worry about it
1538 SONAME=`basename ${LIB}` 1741 has preserve-libs ${FEATURES} && return 0
1539 DIRNAME=`dirname ${LIB}`
1540 1742
1541 dodir ${DIRNAME} 1743 local lib dir
1542 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"
1543 touch ${D}${LIB} 1749 touch "${D}"/${lib}
1544 fi 1750 done
1545} 1751}
1546 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.
1547preserve_old_lib_notify() { 1757preserve_old_lib_notify() {
1548 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
1549 1762
1550 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1763 # let portage worry about it
1551 SONAME=`basename ${LIB}` 1764 has preserve-libs ${FEATURES} && return 0
1552 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
1553 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."
1554 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,"
1555 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"
1556 ewarn "you will need to execute the following command:" 1774 ewarn "in order to remove these old dependencies. If you do not have this"
1557 ewarn " revdep-rebuild --soname ${SONAME}" 1775 ewarn "helper program, simply emerge the 'gentoolkit' package."
1776 ewarn
1777 fi
1778 ewarn " # revdep-rebuild --library ${lib##*/}"
1779 done
1780 if [[ ${notice} -eq 1 ]] ; then
1558 ewarn 1781 ewarn
1559 ewarn "After doing that, you can safely remove ${LIB}" 1782 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1560 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
1561 fi 1787 fi
1562} 1788}
1563 1789
1564# Hack for people to figure out if a package was built with 1790# @FUNCTION: built_with_use
1565# certain USE flags 1791# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1792# @DESCRIPTION:
1566# 1793#
1567# 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.
1568# ex: built_with_use xchat gtk2
1569# 1795#
1570# Flags: -a all USE flags should be utilized 1796# A temporary hack until portage properly supports DEPENDing on USE
1571# -o at least one USE flag should be utilized 1797# flags being enabled in packages. This will check to see if the specified
1572# 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.
1573built_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
1574 local opt=$1 1828 local opt=$1
1575 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1829 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1576 1830
1577 local PKG=$(best_version $1) 1831 local PKG=$(best_version $1)
1832 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1578 shift 1833 shift
1579 1834
1580 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
1581 1837
1582 # 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
1583 # injected or package.provided 1839 # this gracefully
1584 [[ ! -e ${USEFILE} ]] && return 0 1840 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1841 case ${missing_action} in
1842 true) return 0;;
1843 false) return 1;;
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
1585 1868
1586 local USE_BUILT=$(<${USEFILE}) 1869 local USE_BUILT=$(<${USEFILE})
1587 while [[ $# -gt 0 ]] ; do 1870 while [[ $# -gt 0 ]] ; do
1588 if [[ ${opt} = "-o" ]] ; then 1871 if [[ ${opt} = "-o" ]] ; then
1589 has $1 ${USE_BUILT} && return 0 1872 has $1 ${USE_BUILT} && return 0
1593 shift 1876 shift
1594 done 1877 done
1595 [[ ${opt} = "-a" ]] 1878 [[ ${opt} = "-a" ]]
1596} 1879}
1597 1880
1881# @FUNCTION: epunt_cxx
1882# @USAGE: [dir to scan]
1883# @DESCRIPTION:
1598# Many configure scripts wrongly bail when a C++ compiler 1884# Many configure scripts wrongly bail when a C++ compiler could not be
1599# could not be detected. #73450 1885# detected. If dir is not specified, then it defaults to ${S}.
1886#
1887# http://bugs.gentoo.org/73450
1600epunt_cxx() { 1888epunt_cxx() {
1601 local dir=$1 1889 local dir=$1
1602 [[ -z ${dir} ]] && dir=${S} 1890 [[ -z ${dir} ]] && dir=${S}
1603 ebegin "Removing useless C++ checks" 1891 ebegin "Removing useless C++ checks"
1604 local f 1892 local f
1605 for f in $(find ${dir} -name configure) ; do 1893 find "${dir}" -name configure | while read f ; do
1606 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
1607 done 1895 done
1608 eend 0 1896 eend 0
1609} 1897}
1610 1898
1611# dopamd <file> [more files] 1899# @FUNCTION: make_wrapper
1612# 1900# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1613# Install pam auth config file in /etc/pam.d 1901# @DESCRIPTION:
1614dopamd() { 1902# Create a shell wrapper script named wrapper in installpath
1615 [[ -z $1 ]] && die "dopamd requires at least one argument" 1903# (defaults to the bindir) to execute target (default of wrapper) by
1616 1904# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1617 use pam || return 0 1905# libpaths followed by optionally changing directory to chdir.
1618
1619 INSDESTTREE=/etc/pam.d \
1620 doins "$@" || die "failed to install $@"
1621}
1622# newpamd <old name> <new name>
1623#
1624# Install pam file <old name> as <new name> in /etc/pam.d
1625newpamd() {
1626 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1627
1628 use pam || return 0
1629
1630 INSDESTTREE=/etc/pam.d \
1631 newins "$1" "$2" || die "failed to install $1 as $2"
1632}
1633
1634# make a wrapper script ...
1635# NOTE: this was originally games_make_wrapper, but I noticed other places where
1636# this could be used, so I have moved it here and made it not games-specific
1637# -- wolf31o2
1638# $1 == wrapper name
1639# $2 == binary to run
1640# $3 == directory to chdir before running binary
1641# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1642# $5 == path for wrapper
1643make_wrapper() { 1906make_wrapper() {
1644 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1907 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1645 local tmpwrapper=$(emktemp) 1908 local tmpwrapper=$(emktemp)
1646 # 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
1647 # things as $bin ... "./someprog --args" 1910 # things as $bin ... "./someprog --args"
1657fi 1920fi
1658exec ${bin} "\$@" 1921exec ${bin} "\$@"
1659EOF 1922EOF
1660 chmod go+rx "${tmpwrapper}" 1923 chmod go+rx "${tmpwrapper}"
1661 if [[ -n ${path} ]] ; then 1924 if [[ -n ${path} ]] ; then
1925 (
1662 exeinto "${path}" 1926 exeinto "${path}"
1663 newexe "${tmpwrapper}" "${wrapper}" 1927 newexe "${tmpwrapper}" "${wrapper}"
1928 ) || die
1664 else 1929 else
1665 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"
1666 fi 1948# fi
1667} 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.223  
changed lines
  Added in v.1.345

  ViewVC Help
Powered by ViewVC 1.1.20