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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.252  
changed lines
  Added in v.1.333

  ViewVC Help
Powered by ViewVC 1.1.20