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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20