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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.223  
changed lines
  Added in v.1.329

  ViewVC Help
Powered by ViewVC 1.1.20