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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20