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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.143  
changed lines
  Added in v.1.337

  ViewVC Help
Powered by ViewVC 1.1.20