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

Diff of /eclass/eutils.eclass

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

Revision 1.157 Revision 1.324
1# Copyright 1999-2005 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.157 2005/03/07 17:45:07 carlo 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# ecpu_check 22# @FUNCTION: epause
21# Usage: 23# @USAGE: [seconds]
22# 24# @DESCRIPTION:
23# ecpu_check array_of_cpu_flags 25# Sleep for the specified number of seconds (default of 5 seconds). Useful when
24# 26# printing a message the user should probably be reading and often used in
25# array_of_cpu_flags - An array of cpu flags to check against USE flags 27# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set,
26# 28# don't wait at all.
27# Checks user USE related cpu flags against /proc/cpuinfo. If user enables a
28# cpu flag that is not supported in their processor flags, it will warn the
29# user if CROSSCOMPILE is not set to 1 ( because cross compile users are
30# obviously using different cpu flags than their own cpu ). Examples:
31#
32# CPU_FLAGS=(mmx mmx2 sse sse2)
33# ecpu_check CPU_FLAGS
34# Chris White <chriswhite@gentoo.org> (03 Feb 2005)
35
36ecpu_check() {
37 # Think about changing below to: if [ "${CROSSCOMPILE}" -ne 1 -a -e "/proc/cpuinfo" ]
38 # and dropping the else if you do not plan on adding anything to that
39 # empty block ....
40 # PS: also try to add some quoting, and consider rather using ${foo} than $foo ...
41 if [ "${CROSSCOMPILE}" != "1" -a -e "/proc/cpuinfo" ]
42 then
43 CPU_FLAGS=${1}
44 USER_CPU=`grep "flags" /proc/cpuinfo`
45
46 for flags in `seq 1 ${#CPU_FLAGS[@]}`
47 do
48 if has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && ! has ${CPU_FLAGS[${flags} - 1]} ${USE}
49 then
50 ewarn "Your system is ${CPU_FLAGS[${flags} - 1]} capable but you don't have it enabled!"
51 ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
52 fi
53
54 if ! has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && has ${CPU_FLAGS[${flags} -1]} ${USE}
55 then
56 ewarn "You have ${CPU_FLAGS[${flags} - 1]} support enabled but your processor doesn't"
57 ewarn "Seem to support it! You might be cross compiling or do not have /proc filesystem"
58 ewarn "enabled. If either is the case, set CROSSCOMPILE to 1 to disable this warning."
59 fi
60 done
61 fi
62}
63
64# Wait for the supplied number of seconds. If no argument is supplied, defaults
65# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
66# outputting to a terminal, don't wait. For compatability purposes, the argument
67# must be an integer greater than zero.
68# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
69epause() { 29epause() {
70 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 30 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
71 sleep ${1:-5}
72 fi
73} 31}
74 32
75# Beep the specified number of times (defaults to five). If our output 33# @FUNCTION: ebeep
76# 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,
77# don't beep. 39# don't beep at all.
78# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
79ebeep() { 40ebeep() {
80 local n 41 local n
81 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 42 if [[ -z ${EBEEP_IGNORE} ]] ; then
82 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 43 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
83 echo -ne "\a" 44 echo -ne "\a"
84 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 45 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
85 echo -ne "\a" 46 echo -ne "\a"
86 sleep 1 47 sleep 1
87 done 48 done
88 fi 49 fi
89} 50}
90 51
91# This function generate linker scripts in /usr/lib for dynamic 52# @FUNCTION: ecvs_clean
92# libs in /lib. This is to fix linking problems when you have 53# @USAGE: [list of dirs]
93# the .so in /lib, and the .a in /usr/lib. What happens is that 54# @DESCRIPTION:
94# in some cases when linking dynamic, the .a in /usr/lib is used 55# Remove CVS directories recursiveley. Useful when a source tarball contains
95# instead of the .so in /lib due to gcc/libtool tweaking ld's 56# internal CVS directories. Defaults to $PWD.
96# library search path. This cause many builds to fail. 57ecvs_clean() {
97# See bug #4411 for more info. 58 [[ -z $* ]] && set -- .
98# 59 find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
99# To use, simply call: 60 find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
100#
101# gen_usr_ldscript libfoo.so
102#
103# Note that you should in general use the unversioned name of
104# the library, as ldconfig should usually update it correctly
105# to point to the latest version of the library present.
106#
107# <azarah@gentoo.org> (26 Oct 2002)
108#
109gen_usr_ldscript() {
110 local libdir="$(get_libdir)"
111 # Just make sure it exists
112 dodir /usr/${libdir}
113
114 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT
115/* GNU ld script
116 Because Gentoo have critical dynamic libraries
117 in /lib, and the static versions in /usr/lib, we
118 need to have a "fake" dynamic lib in /usr/lib,
119 otherwise we run into linking problems.
120 See bug #4411 on http://bugs.gentoo.org/ for
121 more info. */
122GROUP ( /${libdir}/${1} )
123END_LDSCRIPT
124 fperms a+x "/usr/${libdir}/${1}"
125} 61}
126 62
127# Simple function to draw a line consisting of '=' the same length as $* 63# @FUNCTION: esvn_clean
128# 64# @USAGE: [list of dirs]
129# <azarah@gentoo.org> (11 Nov 2002) 65# @DESCRIPTION:
130# 66# Remove .svn directories recursiveley. Useful when a source tarball contains
131draw_line() { 67# internal Subversion directories. Defaults to $PWD.
132 local i=0 68esvn_clean() {
133 local str_length="" 69 [[ -z $* ]] && set -- .
70 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
71}
134 72
135 # Handle calls that do not have args, or wc not being installed ... 73# @FUNCTION: eshopts_push
136 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ] 74# @USAGE: [options to `set`]
137 then 75# @DESCRIPTION:
138 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
139 return 0 88# return 0
140 fi 89# fi
141
142 # Get the length of $*
143 str_length="$(echo -n "$*" | wc -m)"
144
145 while [ "$i" -lt "${str_length}" ]
146 do
147 echo -n "="
148
149 i=$((i + 1))
150 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}
151 101
152 echo 102# @FUNCTION: eshopts_pop
153 103# @USAGE:
154 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}"
155} 115}
156 116
157# Default directory where patches are located 117# Default directory where patches are located
158EPATCH_SOURCE="${WORKDIR}/patch" 118EPATCH_SOURCE="${WORKDIR}/patch"
159# Default extension for patches 119# Default extension for patches
160EPATCH_SUFFIX="patch.bz2" 120EPATCH_SUFFIX="patch.bz2"
161# Default options for patch 121# Default options for patch
162# 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
163EPATCH_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"
164# 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,
165# and not the full path .. 127# and not the full path ..
166EPATCH_EXCLUDE="" 128EPATCH_EXCLUDE=""
167# Change the printed message for a single patch. 129# Change the printed message for a single patch.
168EPATCH_SINGLE_MSG="" 130EPATCH_SINGLE_MSG=""
131# Change the printed message for multiple patches.
132EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
169# Force applying bulk patches even if not following the style: 133# Force applying bulk patches even if not following the style:
170# 134#
171# ??_${ARCH}_foo.${EPATCH_SUFFIX} 135# ??_${ARCH}_foo.${EPATCH_SUFFIX}
172# 136#
173EPATCH_FORCE="no" 137EPATCH_FORCE="no"
174 138
175# 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
176# or two patches. 140# or two patches.
185# 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
186# them for. 150# them for.
187# 151#
188# Patches are applied in current directory. 152# Patches are applied in current directory.
189# 153#
190# Bulk Patches should preferibly have the form of: 154# Bulk Patches should preferably have the form of:
191# 155#
192# ??_${ARCH}_foo.${EPATCH_SUFFIX} 156# ??_${ARCH}_foo.${EPATCH_SUFFIX}
193# 157#
194# For example: 158# For example:
195# 159#
196# 01_all_misc-fix.patch.bz2 160# 01_all_misc-fix.patch.bz2
197# 02_sparc_another-fix.patch.bz2 161# 02_sparc_another-fix.patch.bz2
198# 162#
199# 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
200# specific patches. 164# specific patches.
201# 165#
202# 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
204# hand its a directory, it will set EPATCH_SOURCE to this. 168# hand its a directory, it will set EPATCH_SOURCE to this.
205# 169#
206# <azarah@gentoo.org> (10 Nov 2002) 170# <azarah@gentoo.org> (10 Nov 2002)
207# 171#
208epatch() { 172epatch() {
173 _epatch_draw_line() {
174 [[ -z $1 ]] && set "$(printf "%65s" '')"
175 echo "${1//?/=}"
176 }
177 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
209 local PIPE_CMD="" 178 local PIPE_CMD=""
210 local STDERR_TARGET="${T}/$$.out" 179 local STDERR_TARGET="${T}/$$.out"
211 local PATCH_TARGET="${T}/$$.patch" 180 local PATCH_TARGET="${T}/$$.patch"
212 local PATCH_SUFFIX="" 181 local PATCH_SUFFIX=""
213 local SINGLE_PATCH="no" 182 local SINGLE_PATCH="no"
214 local x="" 183 local x=""
215 184
185 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
186
216 if [ "$#" -gt 1 ] 187 if [ "$#" -gt 1 ]
217 then 188 then
218 local m="" 189 local m=""
219 einfo "${#} patches to apply ..."
220 for m in "$@" ; do 190 for m in "$@" ; do
221 epatch "${m}" 191 epatch "${m}"
222 done 192 done
223 return 0 193 return 0
224 fi 194 fi
238 local EPATCH_SOURCE="$1/*" 208 local EPATCH_SOURCE="$1/*"
239 else 209 else
240 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 210 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
241 fi 211 fi
242 else 212 else
243 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ] 213 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then
244 then
245 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 214 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
246 then 215 then
247 EPATCH_SOURCE="$1" 216 EPATCH_SOURCE="$1"
248 fi 217 fi
249 218
258 227
259 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 228 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
260 fi 229 fi
261 230
262 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 ;;
263 bz2) 240 bz2)
264 PIPE_CMD="bzip2 -dc" 241 PIPE_CMD="bzip2 -dc"
265 PATCH_SUFFIX="bz2" 242 PATCH_SUFFIX="bz2"
266 ;; 243 ;;
267 gz|Z|z) 244 gz|Z|z)
278 ;; 255 ;;
279 esac 256 esac
280 257
281 if [ "${SINGLE_PATCH}" = "no" ] 258 if [ "${SINGLE_PATCH}" = "no" ]
282 then 259 then
283 einfo "Applying various patches (bugfixes/updates) ..." 260 einfo "${EPATCH_MULTI_MSG}"
284 fi 261 fi
285 for x in ${EPATCH_SOURCE} 262 for x in ${EPATCH_SOURCE}
286 do 263 do
287 # New ARCH dependant patch naming scheme ... 264 # New ARCH dependant patch naming scheme ...
288 # 265 #
289 # ???_arch_foo.patch 266 # ???_arch_foo.patch
290 # 267 #
291 if [ -f ${x} ] && \ 268 if [ -f ${x} ] && \
292 ([ "${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}" ] || \
293 [ "${EPATCH_FORCE}" = "yes" ]) 270 [ "${EPATCH_FORCE}" = "yes" ])
294 then 271 then
295 local count=0 272 local count=0
296 local popts="${EPATCH_OPTS}" 273 local popts="${EPATCH_OPTS}"
297 local patchname=${x##*/} 274 local patchname=${x##*/}
298 275
317 fi 294 fi
318 295
319 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 296 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 297 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
321 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
325
322 # Allow for prefix to differ ... im lazy, so shoot me :/ 326 # Allow for prefix to differ ... im lazy, so shoot me :/
323 while [ "${count}" -lt 5 ] 327 while [ "${count}" -lt 5 ]
324 do 328 do
325 # Generate some useful debug info ... 329 # Generate some useful debug info ...
326 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 330 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
327 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 331 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
328 332
329 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
330 then 340 then
331 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
332 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 else
334 PATCH_TARGET="${x}"
335 fi
336
337 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
339
340 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
341 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
342
343 if [ "${PATCH_SUFFIX}" != "patch" ]
344 then
345 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
346 then
347 echo
348 eerror "Could not extract patch!"
349 #die "Could not extract patch!"
350 count=5
351 break
352 fi
353 fi
354
355 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
356 then
357 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 341 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
358 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 342 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
359 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 343 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
360 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 344 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
361 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 345 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
362 346
363 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 347 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
348 _epatch_assert
364 349
365 if [ "$?" -ne 0 ] 350 if [ "$?" -ne 0 ]
366 then 351 then
367 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 352 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
368 echo 353 echo
386 fi 371 fi
387 372
388 if [ "${count}" -eq 5 ] 373 if [ "${count}" -eq 5 ]
389 then 374 then
390 echo 375 echo
391 eerror "Failed Patch: ${patchname}!" 376 eerror "Failed Patch: ${patchname} !"
377 eerror " ( ${PATCH_TARGET} )"
392 eerror 378 eerror
393 eerror "Include in your bugreport the contents of:" 379 eerror "Include in your bugreport the contents of:"
394 eerror 380 eerror
395 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}" 381 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
396 echo 382 echo
405 if [ "${SINGLE_PATCH}" = "no" ] 391 if [ "${SINGLE_PATCH}" = "no" ]
406 then 392 then
407 einfo "Done with patching" 393 einfo "Done with patching"
408 fi 394 fi
409} 395}
396epatch_user() {
397 [[ $# -ne 0 ]] && die "epatch_user takes no options"
410 398
411# This function return true if we are using the NPTL pthreads 399 # don't clobber any EPATCH vars that the parent might want
412# implementation. 400 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
413# 401 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
414# <azarah@gentoo.org> (06 March 2003) 402 EPATCH_SOURCE=${base}/${CTARGET}/${check}
415# 403 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
416have_NPTL() { 404 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
417 cat > ${T}/test-nptl.c <<-"END" 405 if [[ -d ${EPATCH_SOURCE} ]] ; then
418 #define _XOPEN_SOURCE 406 EPATCH_SOURCE=${EPATCH_SOURCE} \
419 #include <unistd.h> 407 EPATCH_SUFFIX="patch" \
420 #include <stdio.h> 408 EPATCH_FORCE="yes" \
421 409 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
422 int main() 410 epatch
423 { 411 break
424 char buf[255];
425 char *str = buf;
426
427 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
428 if (NULL != str) {
429 printf("%s\n", str);
430 if (NULL != strstr(str, "NPTL"))
431 return 0;
432 }
433
434 return 1;
435 }
436 END
437
438 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
439 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
440 then
441 echo "yes"
442 einfon "Checking what PTHREADS implementation we have ..."
443 if ${T}/nptl
444 then
445 return 0
446 else
447 return 1
448 fi
449 else
450 echo "no"
451 fi 412 fi
452 413 done
453 return 1
454} 414}
455 415
456# This function check how many cpu's are present, and then set 416# @FUNCTION: emktemp
457# -j in MAKEOPTS accordingly. 417# @USAGE: [temp dir]
458# 418# @DESCRIPTION:
459# Thanks to nall <nall@gentoo.org> for this.
460#
461get_number_of_jobs() {
462 local jobs=0
463
464 if [ ! -r /proc/cpuinfo ]
465 then
466 return 1
467 fi
468
469 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
470 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
471 then
472 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
473 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
474 ADMINPARAM="${ADMINPARAM/-j}"
475 fi
476
477 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
478
479 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
480 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
481 then
482 # these archs will always have "[Pp]rocessor"
483 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
484
485 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
486 then
487 # sparc always has "ncpus active"
488 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
489
490 elif [ "${ARCH}" = "alpha" ]
491 then
492 # alpha has "cpus active", but only when compiled with SMP
493 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
494 then
495 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
496 else
497 jobs=2
498 fi
499
500 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
501 then
502 # ppc has "processor", but only when compiled with SMP
503 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
504 then
505 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
506 else
507 jobs=2
508 fi
509 elif [ "${ARCH}" = "s390" ]
510 then
511 # s390 has "# processors : "
512 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
513 else
514 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
515 die "Unknown ARCH -- ${ARCH}!"
516 fi
517
518 # Make sure the number is valid ...
519 if [ "${jobs}" -lt 1 ]
520 then
521 jobs=1
522 fi
523
524 if [ -n "${ADMINPARAM}" ]
525 then
526 if [ "${jobs}" -gt "${ADMINPARAM}" ]
527 then
528 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
529 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
530 else
531 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
532 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
533 fi
534 fi
535}
536
537# Cheap replacement for when debianutils (and thus mktemp) 419# Cheap replacement for when debianutils (and thus mktemp)
538# does not exist on the users system 420# does not exist on the users system.
539# vapier@gentoo.org
540#
541# Takes just 1 optional parameter (the directory to create tmpfile in)
542emktemp() { 421emktemp() {
543 local exe="touch" 422 local exe="touch"
544 [ "$1" == "-d" ] && exe="mkdir" && shift 423 [[ $1 == -d ]] && exe="mkdir" && shift
545 local topdir="$1" 424 local topdir=$1
546 425
547 if [ -z "${topdir}" ] 426 if [[ -z ${topdir} ]] ; then
548 then
549 [ -z "${T}" ] \ 427 [[ -z ${T} ]] \
550 && topdir="/tmp" \ 428 && topdir="/tmp" \
551 || topdir="${T}" 429 || topdir=${T}
552 fi 430 fi
553 431
554 if [ -z "$(type -p mktemp)" ] 432 if ! type -P mktemp > /dev/null ; then
555 then 433 # system lacks `mktemp` so we have to fake it
556 local tmp=/ 434 local tmp=/
557 while [ -e "${tmp}" ] ; do 435 while [[ -e ${tmp} ]] ; do
558 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 436 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
559 done 437 done
560 ${exe} "${tmp}" 438 ${exe} "${tmp}" || ${exe} -p "${tmp}"
561 echo "${tmp}" 439 echo "${tmp}"
562 else 440 else
563 [ "${exe}" == "touch" ] \ 441 # the args here will give slightly wierd names on BSD,
564 && exe="-p" \ 442 # but should produce a usable file on all userlands
565 || exe="-d" 443 if [[ ${exe} == "touch" ]] ; then
566 mktemp ${exe} "${topdir}" 444 TMPDIR="${topdir}" mktemp -t tmp.XXXXXXXXXX
445 else
446 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX
567 fi 447 fi
448 fi
568} 449}
569 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:
570# 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),
571# and pw (FreeBSD) used in enewuser()/enewgroup() 461# and pw (FreeBSD) used in enewuser()/enewgroup()
572# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
573# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
574#
575# egetent(database, key)
576egetent() { 462egetent() {
577 if useq ppc-macos ; then 463 case ${CHOST} in
464 *-darwin[678])
578 case "$2" in 465 case "$2" in
579 *[!0-9]*) # Non numeric 466 *[!0-9]*) # Non numeric
580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 467 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
581 ;; 468 ;;
582 *) # Numeric 469 *) # Numeric
583 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 470 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
584 ;; 471 ;;
585 esac 472 esac
586 elif useq x86-fbsd ; then 473 ;;
587 local action 474 *-darwin*)
588 if [ "$1" == "passwd" ] 475 local mytype=$1
589 then 476 [[ "passwd" == $mytype ]] && mytype="Users"
590 action="user" 477 [[ "group" == $mytype ]] && mytype="Groups"
591 else 478 case "$2" in
592 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"
593 fi 496 fi
497
594 pw show "${action}" "$2" -q 498 pw show ${action} ${opts} "$2" -q
595 else 499 ;;
500 *-netbsd*|*-openbsd*)
501 grep "$2:\*:" /etc/$1
502 ;;
503 *)
596 which nscd >& /dev/null && nscd -i "$1" 504 type -p nscd >& /dev/null && nscd -i "$1"
597 getent "$1" "$2" 505 getent "$1" "$2"
598 fi 506 ;;
507 esac
599} 508}
600 509
601# Simplify/standardize adding users to the system 510# @FUNCTION: enewuser
602# vapier@gentoo.org 511# @USAGE: <user> [uid] [shell] [homedir] [groups] [params]
603# 512# @DESCRIPTION:
604# enewuser(username, uid, shell, homedir, groups, extra options) 513# Same as enewgroup, you are not required to understand how to properly add
605# 514# a user to the system. The only required parameter is the username.
606# Default values if you do not specify any: 515# Default uid is (pass -1 for this) next available, default shell is
607# username: REQUIRED ! 516# /bin/false, default homedir is /dev/null, there are no default groups,
608# uid: next available (see useradd(8)) 517# and default params sets the comment as 'added by portage for ${PN}'.
609# note: pass -1 to get default behavior
610# shell: /bin/false
611# homedir: /dev/null
612# groups: none
613# extra: comment of 'added by portage for ${PN}'
614enewuser() { 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
615 # get the username 526 # get the username
616 local euser="$1"; shift 527 local euser=$1; shift
617 if [ -z "${euser}" ] 528 if [[ -z ${euser} ]] ; then
618 then
619 eerror "No username specified !" 529 eerror "No username specified !"
620 die "Cannot call enewuser without a username" 530 die "Cannot call enewuser without a username"
621 fi 531 fi
622 532
623 # lets see if the username already exists 533 # lets see if the username already exists
624 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 534 if [[ -n $(egetent passwd "${euser}") ]] ; then
625 then
626 return 0 535 return 0
627 fi 536 fi
628 einfo "Adding user '${euser}' to your system ..." 537 einfo "Adding user '${euser}' to your system ..."
629 538
630 # options to pass to useradd 539 # options to pass to useradd
631 local opts= 540 local opts=
632 541
633 # handle uid 542 # handle uid
634 local euid="$1"; shift 543 local euid=$1; shift
635 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 544 if [[ -n ${euid} && ${euid} != -1 ]] ; then
636 then
637 if [ "${euid}" -gt 0 ] 545 if [[ ${euid} -gt 0 ]] ; then
638 then
639 if [ ! -z "`egetent passwd ${euid}`" ] 546 if [[ -n $(egetent passwd ${euid}) ]] ; then
640 then
641 euid="next" 547 euid="next"
642 fi 548 fi
643 else 549 else
644 eerror "Userid given but is not greater than 0 !" 550 eerror "Userid given but is not greater than 0 !"
645 die "${euid} is not a valid UID" 551 die "${euid} is not a valid UID"
646 fi 552 fi
647 else 553 else
648 euid="next" 554 euid="next"
649 fi 555 fi
650 if [ "${euid}" == "next" ] 556 if [[ ${euid} == "next" ]] ; then
651 then 557 for ((euid = 101; euid <= 999; euid++)); do
652 local pwrange
653 if [ "${USERLAND}" == "BSD" ] ; then
654 pwrange="`jot 898 101`"
655 else
656 pwrange="`seq 101 999`"
657 fi
658 for euid in ${pwrange} ; do
659 [ -z "`egetent passwd ${euid}`" ] && break 558 [[ -z $(egetent passwd ${euid}) ]] && break
660 done 559 done
661 fi 560 fi
662 opts="${opts} -u ${euid}" 561 opts="${opts} -u ${euid}"
663 einfo " - Userid: ${euid}" 562 einfo " - Userid: ${euid}"
664 563
665 # handle shell 564 # handle shell
666 local eshell="$1"; shift 565 local eshell=$1; shift
667 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 566 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
668 then 567 if [[ ! -e ${ROOT}${eshell} ]] ; then
669 if [ ! -e "${eshell}" ]
670 then
671 eerror "A shell was specified but it does not exist !" 568 eerror "A shell was specified but it does not exist !"
672 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"
673 fi 574 fi
674 else 575 else
675 if [ "${USERLAND}" == "BSD" ] 576 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
676 then 577 [[ -x ${ROOT}${shell} ]] && break
677 eshell="/usr/bin/false" 578 done
678 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
679 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
680 fi 588 fi
589
590 eshell=${shell}
681 fi 591 fi
682 einfo " - Shell: ${eshell}" 592 einfo " - Shell: ${eshell}"
683 opts="${opts} -s ${eshell}" 593 opts="${opts} -s ${eshell}"
684 594
685 # handle homedir 595 # handle homedir
686 local ehome="$1"; shift 596 local ehome=$1; shift
687 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 597 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
688 then
689 ehome="/dev/null" 598 ehome="/dev/null"
690 fi 599 fi
691 einfo " - Home: ${ehome}" 600 einfo " - Home: ${ehome}"
692 opts="${opts} -d ${ehome}" 601 opts="${opts} -d ${ehome}"
693 602
694 # handle groups 603 # handle groups
695 local egroups="$1"; shift 604 local egroups=$1; shift
696 if [ ! -z "${egroups}" ] 605 if [[ ! -z ${egroups} ]] ; then
697 then
698 local oldifs="${IFS}" 606 local oldifs=${IFS}
699 local defgroup="" exgroups="" 607 local defgroup="" exgroups=""
700 608
701 export IFS="," 609 export IFS=","
702 for g in ${egroups} 610 for g in ${egroups} ; do
703 do
704 export IFS="${oldifs}" 611 export IFS=${oldifs}
705 if [ -z "`egetent group \"${g}\"`" ] 612 if [[ -z $(egetent group "${g}") ]] ; then
706 then
707 eerror "You must add group ${g} to the system first" 613 eerror "You must add group ${g} to the system first"
708 die "${g} is not a valid GID" 614 die "${g} is not a valid GID"
709 fi 615 fi
710 if [ -z "${defgroup}" ] 616 if [[ -z ${defgroup} ]] ; then
711 then
712 defgroup="${g}" 617 defgroup=${g}
713 else 618 else
714 exgroups="${exgroups},${g}" 619 exgroups="${exgroups},${g}"
715 fi 620 fi
716 export IFS="," 621 export IFS=","
717 done 622 done
718 export IFS="${oldifs}" 623 export IFS=${oldifs}
719 624
720 opts="${opts} -g ${defgroup}" 625 opts="${opts} -g ${defgroup}"
721 if [ ! -z "${exgroups}" ] 626 if [[ ! -z ${exgroups} ]] ; then
722 then
723 opts="${opts} -G ${exgroups:1}" 627 opts="${opts} -G ${exgroups:1}"
724 fi 628 fi
725 else 629 else
726 egroups="(none)" 630 egroups="(none)"
727 fi 631 fi
728 einfo " - Groups: ${egroups}" 632 einfo " - Groups: ${egroups}"
729 633
730 # handle extra and add the user 634 # handle extra and add the user
731 local eextra="$@"
732 local oldsandbox="${SANDBOX_ON}" 635 local oldsandbox=${SANDBOX_ON}
733 export SANDBOX_ON="0" 636 export SANDBOX_ON="0"
734 if useq ppc-macos 637 case ${CHOST} in
735 then 638 *-darwin*)
736 ### Make the user 639 ### Make the user
737 if [ -z "${eextra}" ] 640 if [[ -z $@ ]] ; then
738 then
739 dscl . create /users/${euser} uid ${euid} 641 dscl . create /users/${euser} uid ${euid}
740 dscl . create /users/${euser} shell ${eshell} 642 dscl . create /users/${euser} shell ${eshell}
741 dscl . create /users/${euser} home ${ehome} 643 dscl . create /users/${euser} home ${ehome}
742 dscl . create /users/${euser} realname "added by portage for ${PN}" 644 dscl . create /users/${euser} realname "added by portage for ${PN}"
743 ### Add the user to the groups specified 645 ### Add the user to the groups specified
744 local oldifs="${IFS}" 646 local oldifs=${IFS}
745 export IFS="," 647 export IFS=","
746 for g in ${egroups} 648 for g in ${egroups} ; do
747 do
748 dscl . merge /groups/${g} users ${euser} 649 dscl . merge /groups/${g} users ${euser}
749 done 650 done
750 export IFS="${oldifs}" 651 export IFS=${oldifs}
751 else 652 else
752 einfo "Extra options are not supported on macos yet" 653 einfo "Extra options are not supported on Darwin yet"
753 einfo "Please report the ebuild along with the info below" 654 einfo "Please report the ebuild along with the info below"
754 einfo "eextra: ${eextra}" 655 einfo "eextra: $@"
755 die "Required function missing" 656 die "Required function missing"
756 fi 657 fi
757 elif use x86-fbsd ; then 658 ;;
758 if [ -z "${eextra}" ] 659 *-freebsd*|*-dragonfly*)
759 then 660 if [[ -z $@ ]] ; then
760 pw useradd ${euser} ${opts} \ 661 pw useradd ${euser} ${opts} \
761 -c "added by portage for ${PN}" \ 662 -c "added by portage for ${PN}" \
762 die "enewuser failed" 663 die "enewuser failed"
763 else 664 else
764 einfo " - Extra: ${eextra}" 665 einfo " - Extra: $@"
765 pw useradd ${euser} ${opts} \ 666 pw useradd ${euser} ${opts} \
766 -c ${eextra} || die "enewuser failed" 667 "$@" || die "enewuser failed"
767 fi 668 fi
669 ;;
670
671 *-netbsd*)
672 if [[ -z $@ ]] ; then
673 useradd ${opts} ${euser} || die "enewuser failed"
768 else 674 else
769 if [ -z "${eextra}" ] 675 einfo " - Extra: $@"
770 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
771 useradd ${opts} ${euser} \ 695 useradd ${opts} \
772 -c "added by portage for ${PN}" \ 696 -c "added by portage for ${PN}" \
697 ${euser} \
773 || die "enewuser failed" 698 || die "enewuser failed"
774 else 699 else
775 einfo " - Extra: ${eextra}" 700 einfo " - Extra: $@"
776 useradd ${opts} ${euser} ${eextra} \ 701 useradd ${opts} "$@" \
702 ${euser} \
777 || die "enewuser failed" 703 || die "enewuser failed"
778 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}"
779 fi 713 fi
714
780 export SANDBOX_ON="${oldsandbox}" 715 export SANDBOX_ON=${oldsandbox}
781
782 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
783 then
784 einfo " - Creating ${ehome} in ${D}"
785 dodir ${ehome}
786 fowners ${euser} ${ehome}
787 fperms 755 ${ehome}
788 fi
789} 716}
790 717
791# Simplify/standardize adding groups to the system 718# @FUNCTION: enewgroup
792# vapier@gentoo.org 719# @USAGE: <group> [gid]
793# 720# @DESCRIPTION:
794# enewgroup(group, gid) 721# This function does not require you to understand how to properly add a
795# 722# group to the system. Just give it a group name to add and enewgroup will
796# 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
797# groupname: REQUIRED ! 724# allocate the next available one.
798# gid: next available (see groupadd(8))
799# extra: none
800enewgroup() { 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
801 # get the group 733 # get the group
802 local egroup="$1"; shift 734 local egroup="$1"; shift
803 if [ -z "${egroup}" ] 735 if [ -z "${egroup}" ]
804 then 736 then
805 eerror "No group specified !" 737 eerror "No group specified !"
806 die "Cannot call enewgroup without a group" 738 die "Cannot call enewgroup without a group"
807 fi 739 fi
808 740
809 # see if group already exists 741 # see if group already exists
810 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 742 if [[ -n $(egetent group "${egroup}") ]]; then
811 then
812 return 0 743 return 0
813 fi 744 fi
814 einfo "Adding group '${egroup}' to your system ..." 745 einfo "Adding group '${egroup}' to your system ..."
815 746
816 # options to pass to useradd 747 # options to pass to useradd
822 then 753 then
823 if [ "${egid}" -gt 0 ] 754 if [ "${egid}" -gt 0 ]
824 then 755 then
825 if [ -z "`egetent group ${egid}`" ] 756 if [ -z "`egetent group ${egid}`" ]
826 then 757 then
827 if useq ppc-macos ; then 758 if [[ "${CHOST}" == *-darwin* ]]; then
828 opts="${opts} ${egid}" 759 opts="${opts} ${egid}"
829 else 760 else
830 opts="${opts} -g ${egid}" 761 opts="${opts} -g ${egid}"
831 fi 762 fi
832 else 763 else
846 opts="${opts} ${eextra}" 777 opts="${opts} ${eextra}"
847 778
848 # add the group 779 # add the group
849 local oldsandbox="${SANDBOX_ON}" 780 local oldsandbox="${SANDBOX_ON}"
850 export SANDBOX_ON="0" 781 export SANDBOX_ON="0"
851 if useq ppc-macos ; then 782 case ${CHOST} in
783 *-darwin*)
852 if [ ! -z "${eextra}" ]; 784 if [ ! -z "${eextra}" ];
853 then 785 then
854 einfo "Extra options are not supported on macos yet" 786 einfo "Extra options are not supported on Darwin/OS X yet"
855 einfo "Please report the ebuild along with the info below" 787 einfo "Please report the ebuild along with the info below"
856 einfo "eextra: ${eextra}" 788 einfo "eextra: ${eextra}"
857 die "Required function missing" 789 die "Required function missing"
858 fi 790 fi
859 791
860 # If we need the next available 792 # If we need the next available
861 case ${egid} in 793 case ${egid} in
862 *[!0-9]*) # Non numeric 794 *[!0-9]*) # Non numeric
863 for egid in `jot 898 101`; do 795 for ((egid = 101; egid <= 999; egid++)); do
864 [ -z "`egetent group ${egid}`" ] && break 796 [[ -z $(egetent group ${egid}) ]] && break
865 done 797 done
866 esac 798 esac
867 dscl . create /groups/${egroup} gid ${egid} 799 dscl . create /groups/${egroup} gid ${egid}
868 dscl . create /groups/${egroup} passwd '*' 800 dscl . create /groups/${egroup} passwd '*'
869 elif use x86-fbsd ; then 801 ;;
802
803 *-freebsd*|*-dragonfly*)
870 case ${egid} in 804 case ${egid} in
871 *[!0-9]*) # Non numeric 805 *[!0-9]*) # Non numeric
872 for egid in `jot 898 101`; do 806 for ((egid = 101; egid <= 999; egid++)); do
873 [ -z "`egetent group ${egid}`" ] && break 807 [[ -z $(egetent group ${egid}) ]] && break
874 done 808 done
875 esac 809 esac
876 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 810 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
877 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 *)
878 groupadd ${opts} ${egroup} || die "enewgroup failed" 824 groupadd ${opts} ${egroup} || die "enewgroup failed"
879 fi 825 ;;
826 esac
880 export SANDBOX_ON="${oldsandbox}" 827 export SANDBOX_ON="${oldsandbox}"
881} 828}
882 829
883# Simple script to replace 'dos2unix' binaries 830# @FUNCTION: edos2unix
884# vapier@gentoo.org 831# @USAGE: <file> [more files ...]
885# 832# @DESCRIPTION:
886# 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.
887edos2unix() { 837edos2unix() {
888 for f in "$@" 838 echo "$@" | xargs sed -i 's/\r$//'
889 do
890 cp "${f}" ${T}/edos2unix
891 sed 's/\r$//' ${T}/edos2unix > "${f}"
892 done
893} 839}
894
895
896##############################################################
897# START: Handle .desktop files and menu entries #
898# maybe this should be separated into a new eclass some time #
899# lanius@gentoo.org #
900##############################################################
901 840
902# Make a desktop file ! 841# Make a desktop file !
903# Great for making those icons in kde/gnome startmenu ! 842# Great for making those icons in kde/gnome startmenu !
904# Amaze your friends ! Get the women ! Join today ! 843# Amaze your friends ! Get the women ! Join today !
905# 844#
906# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 845# make_desktop_entry(<command>, [name], [icon], [type], [path])
907# 846#
908# binary: what binary does the app run with ? 847# binary: what command does the app run with ?
909# name: the name that will show up in the menu 848# name: the name that will show up in the menu
910# icon: give your little like a pretty little icon ... 849# icon: give your little like a pretty little icon ...
911# this can be relative (to /usr/share/pixmaps) or 850# this can be relative (to /usr/share/pixmaps) or
912# a full path to an icon 851# a full path to an icon
913# type: what kind of application is this ? for categories: 852# type: what kind of application is this ? for categories:
914# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 853# http://standards.freedesktop.org/menu-spec/latest/apa.html
915# path: if your app needs to startup in a specific dir 854# path: if your app needs to startup in a specific dir
916make_desktop_entry() { 855make_desktop_entry() {
917 [ -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
918 857
919 local exec="${1}" 858 local exec=${1}
920 local name="${2:-${PN}}" 859 local name=${2:-${PN}}
921 local icon="${3:-${PN}.png}" 860 local icon=${3:-${PN}}
922 local type="${4}" 861 local type=${4}
923 local subdir="${6}" 862 local path=${5}
924 local path="${5:-${GAMES_BINDIR}}" 863
925 if [ -z "${type}" ] 864 if [[ -z ${type} ]] ; then
926 then 865 local catmaj=${CATEGORY%%-*}
927 case ${CATEGORY} in 866 local catmin=${CATEGORY##*-}
928 "app-emulation") 867 case ${catmaj} in
929 type=Emulator 868 app)
930 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
931 ;; 888 ;;
932 "games-"*) 889
933 type=Game 890 dev)
934 subdir="Games" 891 type="Development"
935 ;; 892 ;;
936 "net-"*) 893
937 type=Network 894 games)
938 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}"
939 ;; 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
940 *) 979 *)
941 type= 980 type=
942 subdir=
943 ;; 981 ;;
944 esac 982 esac
945 fi 983 fi
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"
946 local desktop="${T}/${exec%% *}-${P}.desktop" 990 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
947 991
992 cat <<-EOF > "${desktop}"
948echo "[Desktop Entry] 993 [Desktop Entry]
949Encoding=UTF-8
950Version=0.9.2
951Name=${name} 994 Name=${name}
952Type=Application 995 Type=Application
953Comment=${DESCRIPTION} 996 Comment=${DESCRIPTION}
954Exec=${exec} 997 Exec=${exec}
955Path=${path} 998 TryExec=${exec%% *}
956Icon=${icon} 999 Icon=${icon}
957Categories=Application;${type};" > "${desktop}" 1000 Categories=${type};
1001 EOF
958 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
959 insinto /usr/share/applications 1008 insinto /usr/share/applications
960 doins "${desktop}" 1009 doins "${desktop}"
961 1010 )
962 return 0
963} 1011}
964 1012
965# Make a GDM/KDM Session file 1013# @FUNCTION: validate_desktop_entries
966# 1014# @USAGE: [directories]
967# make_desktop_entry(<title>, <command>) 1015# @MAINTAINER:
968# title: File to execute to start the Window Manager 1016# Carsten Lohrke <carlo@gentoo.org>
969# 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}
970 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.
971make_session_desktop() { 1048make_session_desktop() {
972
973 [ -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
974 [ -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
975 1051
976 local title="${1}" 1052 local title=$1
977 local command="${2}" 1053 local command=$2
978 local desktop="${T}/${wm}.desktop" 1054 local desktop=${T}/${wm:-${PN}}.desktop
1055 shift 2
979 1056
1057 cat <<-EOF > "${desktop}"
980echo "[Desktop Entry] 1058 [Desktop Entry]
981Encoding=UTF-8
982Name=${title} 1059 Name=${title}
983Comment=This session logs you into ${title} 1060 Comment=This session logs you into ${title}
984Exec=${command} 1061 Exec=${command} $*
985TryExec=${command} 1062 TryExec=${command}
986Type=Application" > "${desktop}" 1063 Type=XSession
1064 EOF
987 1065
1066 (
1067 # wrap the env here so that the 'insinto' call
1068 # doesn't corrupt the env of the caller
988 insinto /usr/share/xsessions 1069 insinto /usr/share/xsessions
989 doins "${desktop}" 1070 doins "${desktop}"
990 1071 )
991 return 0
992} 1072}
993 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).
994domenu() { 1079domenu() {
995 local i 1080 (
996 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
997 insinto /usr/share/applications 1084 insinto /usr/share/applications
998 for i in ${@} 1085 for i in "$@" ; do
999 do
1000 if [ -f "${i}" ]; 1086 if [[ -f ${i} ]] ; then
1001 then
1002 doins ${i} 1087 doins "${i}"
1088 ((ret+=$?))
1003 elif [ -d "${i}" ]; 1089 elif [[ -d ${i} ]] ; then
1004 then
1005 for j in ${i}/*.desktop 1090 for j in "${i}"/*.desktop ; do
1006 do
1007 doins ${j} 1091 doins "${j}"
1092 ((ret+=$?))
1008 done 1093 done
1094 else
1095 ((++ret))
1009 fi 1096 fi
1010 done 1097 done
1098 exit ${ret}
1099 )
1011} 1100}
1012 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.
1013doicon() { 1120doicon() {
1014 local i 1121 (
1015 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
1016 insinto /usr/share/pixmaps 1125 insinto /usr/share/pixmaps
1017 for i in ${@} 1126 for i in "$@" ; do
1018 do
1019 if [ -f "${i}" ]; 1127 if [[ -f ${i} ]] ; then
1020 then
1021 doins ${i} 1128 doins "${i}"
1129 ((ret+=$?))
1022 elif [ -d "${i}" ]; 1130 elif [[ -d ${i} ]] ; then
1023 then
1024 for j in ${i}/*.png 1131 for j in "${i}"/*.png ; do
1025 do
1026 doins ${j} 1132 doins "${j}"
1133 ((ret+=$?))
1027 done 1134 done
1135 else
1136 ((++ret))
1028 fi 1137 fi
1029 done 1138 done
1139 exit ${ret}
1140 )
1030} 1141}
1031 1142
1032############################################################## 1143# @FUNCTION: newicon
1033# END: Handle .desktop files and menu entries # 1144# @USAGE: <icon> <newname>
1034############################################################## 1145# @DESCRIPTION:
1035 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}
1036 1155
1037# for internal use only (unpack_pdv and unpack_makeself) 1156# for internal use only (unpack_pdv and unpack_makeself)
1038find_unpackable_file() { 1157find_unpackable_file() {
1039 local src="$1" 1158 local src=$1
1040 if [ -z "${src}" ] 1159 if [[ -z ${src} ]] ; then
1041 then
1042 src="${DISTDIR}/${A}" 1160 src=${DISTDIR}/${A}
1043 else 1161 else
1044 if [ -e "${DISTDIR}/${src}" ] 1162 if [[ -e ${DISTDIR}/${src} ]] ; then
1045 then
1046 src="${DISTDIR}/${src}" 1163 src=${DISTDIR}/${src}
1047 elif [ -e "${PWD}/${src}" ] 1164 elif [[ -e ${PWD}/${src} ]] ; then
1048 then
1049 src="${PWD}/${src}" 1165 src=${PWD}/${src}
1050 elif [ -e "${src}" ] 1166 elif [[ -e ${src} ]] ; then
1051 then
1052 src="${src}" 1167 src=${src}
1053 fi
1054 fi 1168 fi
1055 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 1169 fi
1170 [[ ! -e ${src} ]] && return 1
1056 echo "${src}" 1171 echo "${src}"
1057} 1172}
1058 1173
1174# @FUNCTION: unpack_pdv
1175# @USAGE: <file to unpack> <size of off_t>
1176# @DESCRIPTION:
1059# Unpack those pesky pdv generated files ... 1177# Unpack those pesky pdv generated files ...
1060# They're self-unpacking programs with the binary package stuffed in 1178# They're self-unpacking programs with the binary package stuffed in
1061# 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
1062# 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.
1063# 1181#
1064# Usage: unpack_pdv [file to unpack] [size of off_t]
1065# - 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
1066# information out of the binary executable myself. basically you pass in 1183# information out of the binary executable myself. Basically you pass in
1067# 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#
1068# 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
1069# strings <pdv archive> | grep lseek 1190# strings <pdv archive> | grep lseek
1070# strace -elseek <pdv archive> 1191# strace -elseek <pdv archive>
1192# @CODE
1193#
1071# 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
1072# 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
1073# parameter. here is an example: 1196# parameter. Here is an example:
1197#
1198# @CODE
1074# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1199# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1075# lseek 1200# lseek
1076# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1201# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1077# lseek(3, -4, SEEK_END) = 2981250 1202# lseek(3, -4, SEEK_END) = 2981250
1203# @CODE
1204#
1078# 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.
1079unpack_pdv() { 1206unpack_pdv() {
1080 local src="`find_unpackable_file $1`" 1207 local src=$(find_unpackable_file "$1")
1081 local sizeoff_t="$2" 1208 local sizeoff_t=$2
1082 1209
1210 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1083 [ -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 :("
1084 1212
1085 local shrtsrc="`basename ${src}`" 1213 local shrtsrc=$(basename "${src}")
1086 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1214 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1087 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1215 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
1088 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\")
1089 1217
1090 # grab metadata for debug reasons 1218 # grab metadata for debug reasons
1091 local metafile="$(emktemp)" 1219 local metafile=$(emktemp)
1092 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1220 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1093 1221
1094 # rip out the final file name from the metadata 1222 # rip out the final file name from the metadata
1095 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1223 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1096 datafile="`basename ${datafile}`" 1224 datafile=$(basename "${datafile}")
1097 1225
1098 # now lets uncompress/untar the file if need be 1226 # now lets uncompress/untar the file if need be
1099 local tmpfile="$(emktemp)" 1227 local tmpfile=$(emktemp)
1100 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}
1101 1229
1102 local iscompressed="`file -b ${tmpfile}`" 1230 local iscompressed=$(file -b "${tmpfile}")
1103 if [ "${iscompressed:0:8}" == "compress" ] ; then 1231 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1104 iscompressed=1 1232 iscompressed=1
1105 mv ${tmpfile}{,.Z} 1233 mv ${tmpfile}{,.Z}
1106 gunzip ${tmpfile} 1234 gunzip ${tmpfile}
1107 else 1235 else
1108 iscompressed=0 1236 iscompressed=0
1109 fi 1237 fi
1110 local istar="`file -b ${tmpfile}`" 1238 local istar=$(file -b "${tmpfile}")
1111 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1239 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1112 istar=1 1240 istar=1
1113 else 1241 else
1114 istar=0 1242 istar=0
1115 fi 1243 fi
1116 1244
1144 true 1272 true
1145 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" 1273 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
1146 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" 1274 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
1147} 1275}
1148 1276
1277# @FUNCTION: unpack_makeself
1278# @USAGE: [file to unpack] [offset] [tail|dd]
1279# @DESCRIPTION:
1149# Unpack those pesky makeself generated files ... 1280# Unpack those pesky makeself generated files ...
1150# They're shell scripts with the binary package tagged onto 1281# They're shell scripts with the binary package tagged onto
1151# the end of the archive. Loki utilized the format as does 1282# the end of the archive. Loki utilized the format as does
1152# many other game companies. 1283# many other game companies.
1153# 1284#
1154# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1285# If the file is not specified, then ${A} is used. If the
1155# - If the file is not specified then unpack will utilize ${A}.
1156# - If the offset is not specified then we will attempt to extract 1286# offset is not specified then we will attempt to extract
1157# the proper offset from the script itself. 1287# the proper offset from the script itself.
1158unpack_makeself() { 1288unpack_makeself() {
1289 local src_input=${1:-${A}}
1159 local src="$(find_unpackable_file "$1")" 1290 local src=$(find_unpackable_file "${src_input}")
1160 local skip="$2" 1291 local skip=$2
1161 local exe="$3" 1292 local exe=$3
1162 1293
1294 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1295
1163 local shrtsrc="$(basename "${src}")" 1296 local shrtsrc=$(basename "${src}")
1164 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1297 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1165 if [ -z "${skip}" ] 1298 if [[ -z ${skip} ]] ; then
1166 then
1167 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1299 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1168 local skip=0 1300 local skip=0
1169 exe=tail 1301 exe=tail
1170 case ${ver} in 1302 case ${ver} in
1171 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
1172 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1304 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1173 ;; 1305 ;;
1174 2.0|2.0.1) 1306 2.0|2.0.1)
1175 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1307 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1176 ;; 1308 ;;
1184 ;; 1316 ;;
1185 2.1.3) 1317 2.1.3)
1186 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1318 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1187 let skip="skip + 1" 1319 let skip="skip + 1"
1188 ;; 1320 ;;
1189 2.1.4) 1321 2.1.4|2.1.5)
1190 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)
1191 skip=$(head -n ${skip} "${src}" | wc -c) 1323 skip=$(head -n ${skip} "${src}" | wc -c)
1192 exe="dd" 1324 exe="dd"
1193 ;; 1325 ;;
1194 *) 1326 *)
1206 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}'";;
1207 *) die "makeself cant handle exe '${exe}'" 1339 *) die "makeself cant handle exe '${exe}'"
1208 esac 1340 esac
1209 1341
1210 # 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
1211 local tmpfile="$(emktemp)" 1343 local tmpfile=$(emktemp)
1212 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1344 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1213 local filetype="$(file -b "${tmpfile}")" 1345 local filetype=$(file -b "${tmpfile}")
1214 case ${filetype} in 1346 case ${filetype} in
1215 *tar\ archive) 1347 *tar\ archive*)
1216 eval ${exe} | tar --no-same-owner -xf - 1348 eval ${exe} | tar --no-same-owner -xf -
1217 ;; 1349 ;;
1218 bzip2*) 1350 bzip2*)
1219 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1351 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1220 ;; 1352 ;;
1230 ;; 1362 ;;
1231 esac 1363 esac
1232 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})" 1364 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
1233} 1365}
1234 1366
1367# @FUNCTION: check_license
1368# @USAGE: [license]
1369# @DESCRIPTION:
1235# Display a license for user to accept. 1370# Display a license for user to accept. If no license is
1236#
1237# Usage: check_license [license]
1238# - If the file is not specified then ${LICENSE} is used. 1371# specified, then ${LICENSE} is used.
1239check_license() { 1372check_license() {
1240 local lic=$1 1373 local lic=$1
1241 if [ -z "${lic}" ] ; then 1374 if [ -z "${lic}" ] ; then
1242 lic="${PORTDIR}/licenses/${LICENSE}" 1375 lic="${PORTDIR}/licenses/${LICENSE}"
1243 else 1376 else
1244 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1377 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1245 lic="${PORTDIR}/licenses/${src}" 1378 lic="${PORTDIR}/licenses/${lic}"
1246 elif [ -e "${PWD}/${src}" ] ; then 1379 elif [ -e "${PWD}/${lic}" ] ; then
1247 lic="${PWD}/${src}" 1380 lic="${PWD}/${lic}"
1248 elif [ -e "${src}" ] ; then 1381 elif [ -e "${lic}" ] ; then
1249 lic="${src}" 1382 lic="${lic}"
1250 fi
1251 fi 1383 fi
1252 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1384 fi
1253 local l="`basename ${lic}`" 1385 local l="`basename ${lic}`"
1254 1386
1255 # here is where we check for the licenses the user already 1387 # here is where we check for the licenses the user already
1256 # 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
1257 local shopts=$-
1258 local alic 1389 local alic
1259 set -o noglob #so that bash doesn't expand "*" 1390 eshopts_push -o noglob # so that bash doesn't expand "*"
1260 for alic in ${ACCEPT_LICENSE} ; do 1391 for alic in ${ACCEPT_LICENSE} ; do
1261 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1392 if [[ ${alic} == ${l} ]]; then
1262 set +o noglob; set -${shopts} #reset old shell opts 1393 eshopts_pop
1263 return 0 1394 return 0
1264 fi 1395 fi
1265 done 1396 done
1266 set +o noglob; set -$shopts #reset old shell opts 1397 eshopts_pop
1398 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1267 1399
1268 local licmsg="$(emktemp)" 1400 local licmsg=$(emktemp)
1269 cat << EOF > ${licmsg} 1401 cat <<-EOF > ${licmsg}
1270********************************************************** 1402 **********************************************************
1271The following license outlines the terms of use of this 1403 The following license outlines the terms of use of this
1272package. You MUST accept this license for installation to 1404 package. You MUST accept this license for installation to
1273continue. When you are done viewing, hit 'q'. If you 1405 continue. When you are done viewing, hit 'q'. If you
1274CTRL+C out of this, the install will not run! 1406 CTRL+C out of this, the install will not run!
1275********************************************************** 1407 **********************************************************
1276 1408
1277EOF 1409 EOF
1278 cat ${lic} >> ${licmsg} 1410 cat ${lic} >> ${licmsg}
1279 ${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}"
1280 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] "
1281 read alic 1413 read alic
1282 case ${alic} in 1414 case ${alic} in
1289 die "Failed to accept license" 1421 die "Failed to accept license"
1290 ;; 1422 ;;
1291 esac 1423 esac
1292} 1424}
1293 1425
1426# @FUNCTION: cdrom_get_cds
1427# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...]
1428# @DESCRIPTION:
1294# 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
1295# the whole 'non-interactive' policy, but damnit I want CD support ! 1430# the whole 'non-interactive' policy, but damnit I want CD support !
1296# 1431#
1297# with these cdrom functions we handle all the user interaction and 1432# With these cdrom functions we handle all the user interaction and
1298# 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()
1299# 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
1300# found at CDROM_ROOT. 1435# found at CDROM_ROOT.
1301# 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#
1302# 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',
1303# 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
1304# 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.
1305# 1446#
1306# 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.
1307#
1308# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1309# - this will attempt to locate a cd based upon a file that is on
1310# the cd ... the more files you give this function, the more cds
1311# the cdrom functions will handle
1312cdrom_get_cds() { 1448cdrom_get_cds() {
1313 # 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
1314 # the # of files they gave us 1450 # the # of files they gave us
1315 local cdcnt=0 1451 local cdcnt=0
1316 local f= 1452 local f=
1317 for f in "$@" ; do 1453 for f in "$@" ; do
1318 cdcnt=$((cdcnt + 1)) 1454 ((++cdcnt))
1319 export CDROM_CHECK_${cdcnt}="$f" 1455 export CDROM_CHECK_${cdcnt}="$f"
1320 done 1456 done
1321 export CDROM_TOTAL_CDS=${cdcnt} 1457 export CDROM_TOTAL_CDS=${cdcnt}
1322 export CDROM_CURRENT_CD=1 1458 export CDROM_CURRENT_CD=1
1323 1459
1324 # now we see if the user gave use CD_ROOT ... 1460 # now we see if the user gave use CD_ROOT ...
1325 # 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
1326 if [[ ! -z ${CD_ROOT} ]] ; then
1327 export CDROM_ROOT=${CD_ROOT}
1328 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1329 return
1330 fi
1331 # do the same for CD_ROOT_X
1332 if [[ ! -z ${CD_ROOT_1} ]] ; then 1462 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1333 local var= 1463 local var=
1334 cdcnt=0 1464 cdcnt=0
1335 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1465 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1336 cdcnt=$((cdcnt + 1)) 1466 ((++cdcnt))
1337 var="CD_ROOT_${cdcnt}" 1467 var="CD_ROOT_${cdcnt}"
1468 [[ -z ${!var} ]] && var="CD_ROOT"
1338 if [[ -z ${!var} ]] ; then 1469 if [[ -z ${!var} ]] ; then
1339 eerror "You must either use just the CD_ROOT" 1470 eerror "You must either use just the CD_ROOT"
1340 eerror "or specify ALL the CD_ROOT_X variables." 1471 eerror "or specify ALL the CD_ROOT_X variables."
1341 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."
1342 die "could not locate CD_ROOT_${cdcnt}" 1473 die "could not locate CD_ROOT_${cdcnt}"
1343 fi 1474 fi
1344 export CDROM_ROOTS_${cdcnt}="${!var}"
1345 done 1475 done
1346 export CDROM_ROOT=${CDROM_ROOTS_1} 1476 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1347 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}
1348 return 1484 return
1349 fi 1485 fi
1350 1486
1487 # User didn't help us out so lets make sure they know they can
1488 # simplify the whole process ...
1351 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1489 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1352 einfon "This ebuild will need the " 1490 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1353 if [[ -z ${CDROM_NAME} ]] ; then
1354 echo "cdrom for ${PN}."
1355 else
1356 echo "${CDROM_NAME}."
1357 fi
1358 echo 1491 echo
1359 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"
1360 einfo "mounted somewhere on your filesystem, just export" 1493 einfo "mounted somewhere on your filesystem, just export"
1361 einfo "the variable CD_ROOT so that it points to the" 1494 einfo "the variable CD_ROOT so that it points to the"
1362 einfo "directory containing the files." 1495 einfo "directory containing the files."
1363 echo 1496 echo
1364 einfo "For example:" 1497 einfo "For example:"
1365 einfo "export CD_ROOT=/mnt/cdrom" 1498 einfo "export CD_ROOT=/mnt/cdrom"
1366 echo 1499 echo
1367 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
1368 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1510 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1369 cdcnt=0 1511 cdcnt=0
1370 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1512 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1371 cdcnt=$((cdcnt + 1)) 1513 ((++cdcnt))
1372 var="CDROM_NAME_${cdcnt}" 1514 var="CDROM_NAME_${cdcnt}"
1373 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1515 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1374 done 1516 done
1375 echo 1517 echo
1376 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"
1377 einfo "mounted somewhere on your filesystem, just export" 1519 einfo "mounted somewhere on your filesystem, just export"
1378 einfo "the following variables so they point to the right place:" 1520 einfo "the following variables so they point to the right place:"
1379 einfon "" 1521 einfon ""
1380 cdcnt=0 1522 cdcnt=0
1381 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1523 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1382 cdcnt=$((cdcnt + 1)) 1524 ((++cdcnt))
1383 echo -n " CD_ROOT_${cdcnt}" 1525 echo -n " CD_ROOT_${cdcnt}"
1384 done 1526 done
1385 echo 1527 echo
1386 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"
1387 einfo "you only have one cdrom, you can export CD_ROOT" 1529 einfo "you only have one cdrom, you can export CD_ROOT"
1390 echo 1532 echo
1391 einfo "For example:" 1533 einfo "For example:"
1392 einfo "export CD_ROOT_1=/mnt/cdrom" 1534 einfo "export CD_ROOT_1=/mnt/cdrom"
1393 echo 1535 echo
1394 fi 1536 fi
1537
1538 export CDROM_SET=""
1395 export CDROM_CURRENT_CD=0 1539 export CDROM_CURRENT_CD=0
1396 cdrom_load_next_cd 1540 cdrom_load_next_cd
1397} 1541}
1398 1542
1399# this is only used when you need access to more than one cd. 1543# @FUNCTION: cdrom_load_next_cd
1400# when you have finished using the first cd, just call this function. 1544# @DESCRIPTION:
1401# 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
1402# 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.
1403cdrom_load_next_cd() { 1551cdrom_load_next_cd() {
1404 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1405 local var= 1552 local var
1406 1553 ((++CDROM_CURRENT_CD))
1407 if [[ ! -z ${CD_ROOT} ]] ; then
1408 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1409 return
1410 fi
1411 1554
1412 unset CDROM_ROOT 1555 unset CDROM_ROOT
1413 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1556 var=CD_ROOT_${CDROM_CURRENT_CD}
1557 [[ -z ${!var} ]] && var="CD_ROOT"
1414 if [[ -z ${!var} ]] ; then 1558 if [[ -z ${!var} ]] ; then
1415 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1559 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1416 cdrom_locate_file_on_cd ${!var} 1560 _cdrom_locate_file_on_cd ${!var}
1417 else 1561 else
1418 export CDROM_ROOT=${!var} 1562 export CDROM_ROOT=${!var}
1419 fi 1563 fi
1420 1564
1421 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1565 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1426# 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
1427# 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
1428# displayed and we'll hang out here until: 1572# displayed and we'll hang out here until:
1429# (1) the file is found on a mounted cdrom 1573# (1) the file is found on a mounted cdrom
1430# (2) the user hits CTRL+C 1574# (2) the user hits CTRL+C
1431cdrom_locate_file_on_cd() { 1575_cdrom_locate_file_on_cd() {
1576 local mline=""
1577 local showedmsg=0 showjolietmsg=0
1578
1432 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
1433 local dir="$(dirname ${@})" 1587 local dir=$(dirname ${cdset[${i}]})
1434 local file="$(basename ${@})" 1588 local file=$(basename ${cdset[${i}]})
1435 local mline=""
1436 local showedmsg=0
1437 1589
1438 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/ }
1439 [[ -d ${mline}/${dir} ]] || continue 1596 [[ ! -d ${point}/${dir} ]] && continue
1440 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1597 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1441 && 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))
1442 done 1605 done
1443 1606
1444 if [[ -z ${CDROM_ROOT} ]] ; then
1445 echo 1607 echo
1446 if [[ ${showedmsg} -eq 0 ]] ; then 1608 if [[ ${showedmsg} -eq 0 ]] ; then
1447 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1609 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1448 if [[ -z ${CDROM_NAME} ]] ; then 1610 if [[ -z ${CDROM_NAME} ]] ; then
1449 einfo "Please insert the cdrom for ${PN} now !" 1611 einfo "Please insert+mount the cdrom for ${PN} now !"
1450 else
1451 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1452 fi
1453 else 1612 else
1454 if [[ -z ${CDROM_NAME_1} ]] ; then
1455 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1456 else
1457 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1458 einfo "Please insert+mount the ${!var} cdrom now !" 1613 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1459 fi
1460 fi 1614 fi
1461 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
1462 fi 1622 fi
1623 showedmsg=1
1624 fi
1463 einfo "Press return to scan for the cd again" 1625 einfo "Press return to scan for the cd again"
1464 einfo "or hit CTRL+C to abort the emerge." 1626 einfo "or hit CTRL+C to abort the emerge."
1465 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
1466 fi 1636 fi
1637 read || die "something is screwed with your system"
1467 done 1638 done
1468} 1639}
1469 1640
1641# @FUNCTION: strip-linguas
1642# @USAGE: [<allow LINGUAS>|<-i|-u> <directories of .po files>]
1643# @DESCRIPTION:
1470# Make sure that LINGUAS only contains languages that 1644# Make sure that LINGUAS only contains languages that
1471# a package can support 1645# a package can support. The first form allows you to
1472# 1646# specify a list of LINGUAS. The -i builds a list of po
1473# usage: strip-linguas <allow LINGUAS> 1647# files found in all the directories and uses the
1474# strip-linguas -i <directories of .po files> 1648# intersection of the lists. The -u builds a list of po
1475# strip-linguas -u <directories of .po files> 1649# files found in all the directories and uses the union
1476# 1650# of the lists.
1477# The first form allows you to specify a list of LINGUAS.
1478# The -i builds a list of po files found in all the
1479# directories and uses the intersection of the lists.
1480# The -u builds a list of po files found in all the
1481# directories and uses the union of the lists.
1482strip-linguas() { 1651strip-linguas() {
1483 local ls newls 1652 local ls newls nols
1484 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1653 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1485 local op=$1; shift 1654 local op=$1; shift
1486 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1655 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1487 local d f 1656 local d f
1488 for d in "$@" ; do 1657 for d in "$@" ; do
1489 if [[ ${op} == "-u" ]] ; then 1658 if [[ ${op} == "-u" ]] ; then
1490 newls=${ls} 1659 newls=${ls}
1491 else 1660 else
1492 newls="" 1661 newls=""
1493 fi 1662 fi
1494 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1663 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1495 if [[ ${op} == "-i" ]] ; then 1664 if [[ ${op} == "-i" ]] ; then
1496 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1665 hasq ${f} ${ls} && newls="${newls} ${f}"
1497 else 1666 else
1498 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1667 hasq ${f} ${ls} || newls="${newls} ${f}"
1499 fi 1668 fi
1500 done 1669 done
1501 ls=${newls} 1670 ls=${newls}
1502 done 1671 done
1503 ls=${ls//.po}
1504 else 1672 else
1505 ls=$@ 1673 ls="$@"
1506 fi 1674 fi
1507 1675
1508 ls=" ${ls} " 1676 nols=""
1509 newls="" 1677 newls=""
1510 for f in ${LINGUAS} ; do 1678 for f in ${LINGUAS} ; do
1511 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1679 if hasq ${f} ${ls} ; then
1512 newls="${newls} ${f}" 1680 newls="${newls} ${f}"
1513 else 1681 else
1514 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1682 nols="${nols} ${f}"
1515 fi 1683 fi
1516 done 1684 done
1517 if [[ -z ${newls} ]] ; then 1685 [[ -n ${nols} ]] \
1518 unset LINGUAS 1686 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1519 else
1520 export LINGUAS=${newls:1} 1687 export LINGUAS=${newls:1}
1521 fi
1522} 1688}
1523 1689
1524# moved from kernel.eclass since they are generally useful outside of 1690# @FUNCTION: preserve_old_lib
1525# kernel.eclass -iggy (20041002) 1691# @USAGE: <libs to preserve> [more libs]
1526 1692# @DESCRIPTION:
1527# the following functions are useful in kernel module ebuilds, etc.
1528# for an example see ivtv or drbd ebuilds
1529
1530# set's ARCH to match what the kernel expects
1531set_arch_to_kernel() {
1532 i=10
1533 while ((i--)) ; do
1534 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1535 done
1536 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1537 case ${ARCH} in
1538 x86) export ARCH="i386";;
1539 amd64) export ARCH="x86_64";;
1540 hppa) export ARCH="parisc";;
1541 mips) export ARCH="mips";;
1542 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!
1543 *) export ARCH="${ARCH}";;
1544 esac
1545}
1546
1547# set's ARCH back to what portage expects
1548set_arch_to_portage() {
1549 i=10
1550 while ((i--)) ; do
1551 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1552 done
1553 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1554}
1555
1556# Jeremy Huddleston <eradicator@gentoo.org>:
1557# preserve_old_lib /path/to/libblah.so.0
1558# preserve_old_lib_notify /path/to/libblah.so.0
1559#
1560# 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.
1561# 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
1562# 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
1563# 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
1564# 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
1565# 1698# preserve_old_lib_notify function.
1566# src_install() {
1567# ...
1568# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1569# ...
1570# }
1571#
1572# pkg_postinst() {
1573# ...
1574# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1575# ...
1576# }
1577
1578preserve_old_lib() { 1699preserve_old_lib() {
1579 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]"
1580 1705
1581 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1706 # let portage worry about it
1582 SONAME=`basename ${LIB}` 1707 has preserve-libs ${FEATURES} && return 0
1583 DIRNAME=`dirname ${LIB}`
1584 1708
1585 dodir ${DIRNAME} 1709 local lib dir
1586 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"
1587 touch ${D}${LIB} 1715 touch "${D}"/${lib}
1588 fi 1716 done
1589} 1717}
1590 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.
1591preserve_old_lib_notify() { 1723preserve_old_lib_notify() {
1592 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
1593 1728
1594 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1729 # let portage worry about it
1595 SONAME=`basename ${LIB}` 1730 has preserve-libs ${FEATURES} && return 0
1596 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
1597 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."
1598 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,"
1599 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"
1600 einfo "you will need to execute the following command:" 1740 ewarn "in order to remove these old dependencies. If you do not have this"
1601 einfo " revdep-rebuild --soname ${SONAME}" 1741 ewarn "helper program, simply emerge the 'gentoolkit' package."
1602 einfo 1742 ewarn
1603 einfo "After doing that, you can safely remove ${LIB}"
1604 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1605 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
1606} 1754}
1607 1755
1608# Hack for people to figure out if a package was built with 1756# @FUNCTION: built_with_use
1609# 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.
1610# 1771#
1611# 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
1612# ex: built_with_use xchat gtk2 1773# flags matter.
1613#
1614# Flags: -a all USE flags should be utilized
1615# -o at least one USE flag should be utilized
1616# Note: the default flag is '-a'
1617built_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
1618 local opt=$1 1791 local opt=$1
1619 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1792 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1620 1793
1621 local PKG=$(best_version $1) 1794 local PKG=$(best_version $1)
1795 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1622 shift 1796 shift
1623 1797
1624 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1798 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1625 [[ ! -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
1626 1831
1627 local USE_BUILT=$(<${USEFILE}) 1832 local USE_BUILT=$(<${USEFILE})
1628 while [[ $# -gt 0 ]] ; do 1833 while [[ $# -gt 0 ]] ; do
1629 if [[ ${opt} = "-o" ]] ; then 1834 if [[ ${opt} = "-o" ]] ; then
1630 has $1 ${USE_BUILT} && return 0 1835 has $1 ${USE_BUILT} && return 0
1634 shift 1839 shift
1635 done 1840 done
1636 [[ ${opt} = "-a" ]] 1841 [[ ${opt} = "-a" ]]
1637} 1842}
1638 1843
1844# @FUNCTION: epunt_cxx
1845# @USAGE: [dir to scan]
1846# @DESCRIPTION:
1639# Many configure scripts wrongly bail when a C++ compiler 1847# Many configure scripts wrongly bail when a C++ compiler could not be
1640# could not be detected. #73450 1848# detected. If dir is not specified, then it defaults to ${S}.
1849#
1850# http://bugs.gentoo.org/73450
1641epunt_cxx() { 1851epunt_cxx() {
1642 local dir=$1 1852 local dir=$1
1643 [[ -z ${dir} ]] && dir=${S} 1853 [[ -z ${dir} ]] && dir=${S}
1644 ebegin "Removing useless C++ checks" 1854 ebegin "Removing useless C++ checks"
1645 local f 1855 local f
1646 for f in $(find ${dir} -name configure) ; do 1856 find "${dir}" -name configure | while read f ; do
1647 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
1648 done 1858 done
1649 eend 0 1859 eend 0
1650} 1860}
1651 1861
1652# dopamd <file> [more files] 1862# @FUNCTION: make_wrapper
1653# 1863# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1654# Install pam auth config file in /etc/pam.d 1864# @DESCRIPTION:
1655dopamd() { 1865# Create a shell wrapper script named wrapper in installpath
1656 [[ -z $1 ]] && die "dopamd requires at least one argument" 1866# (defaults to the bindir) to execute target (default of wrapper) by
1657 1867# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1658 use pam || return 0 1868# libpaths followed by optionally changing directory to chdir.
1659 1869make_wrapper() {
1660 insinto /etc/pam.d 1870 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1661 # these are the default doins options, but be explicit just in case 1871 local tmpwrapper=$(emktemp)
1662 insopts -m 0644 -o root -g root 1872 # We don't want to quote ${bin} so that people can pass complex
1663 doins "$@" || die "failed to install $@" 1873 # things as $bin ... "./someprog --args"
1874 cat << EOF > "${tmpwrapper}"
1875#!/bin/sh
1876cd "${chdir:-.}"
1877if [ -n "${libdir}" ] ; then
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
1664} 1895}
1665# newpamd <old name> <new name>
1666#
1667# Install pam file <old name> as <new name> in /etc/pam.d
1668newpamd() {
1669 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1670 1896
1671 use pam || return 0 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
1672 1912
1673 insinto /etc/pam.d 1913# cd "${D}"
1674 # these are the default doins options, but be explicit just in case 1914# [[ -d usr/share/doc ]] || return 0
1675 insopts -m 0644 -o root -g root 1915
1676 newins "$1" "$2" || die "failed to install $1 as $2" 1916# find usr/share/doc -exec gzip {} +
1677} 1917# ecompressdir --ignore /usr/share/doc/${PF}/html
1918# ecompressdir --queue /usr/share/doc
1919#}

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

  ViewVC Help
Powered by ViewVC 1.1.20