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

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

  ViewVC Help
Powered by ViewVC 1.1.20