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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.143  
changed lines
  Added in v.1.324

  ViewVC Help
Powered by ViewVC 1.1.20