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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.237  
changed lines
  Added in v.1.328

  ViewVC Help
Powered by ViewVC 1.1.20