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

Diff of /eclass/eutils.eclass

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

Revision 1.116 Revision 1.245
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2006 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.116 2004/10/07 06:02:39 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.245 2006/07/15 19:26:55 vapier Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 11
12ECLASS=eutils 12inherit multilib portability
13INHERITED="$INHERITED $ECLASS"
14
15DEPEND="!bootstrap? ( sys-devel/patch )"
16 13
17DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
18 15
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 16# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
21# outputting to a terminal, don't wait. For compatability purposes, the argument 18# outputting to a terminal, don't wait. For compatability purposes, the argument
22# must be an integer greater than zero. 19# must be an integer greater than zero.
23# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
24epause() { 21epause() {
25 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
26 sleep ${1:-5}
27 fi
28} 23}
29 24
30# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
31# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
32# don't beep. 27# don't beep.
33# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
34ebeep() { 29ebeep() {
35 local n 30 local n
36 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
37 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
38 echo -ne "\a" 33 echo -ne "\a"
39 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
40 echo -ne "\a" 35 echo -ne "\a"
41 sleep 1 36 sleep 1
42 done 37 done
43 fi 38 fi
44}
45
46# This function simply returns the desired lib directory. With portage
47# 2.0.51, we now have support for installing libraries to lib32/lib64
48# to accomidate the needs of multilib systems. It's no longer a good idea
49# to assume all libraries will end up in lib. Replace any (sane) instances
50# where lib is named directly with $(get_libdir) if possible.
51#
52# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
53get_libdir() {
54 LIBDIR_TEST=$(type econf)
55 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
56 # if there is an override, we want to use that... always.
57 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
58 # We don't need to know the verison of portage. We only need to know
59 # if there is support for CONF_LIBDIR in econf and co.
60 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
61 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
62 # # and if there isnt an override, and we're using a version of
63 # # portage without CONF_LIBDIR support, force the use of lib. dolib
64 # # and friends from portage 2.0.50 wont be too happy otherwise.
65 # CONF_LIBDIR="lib"
66 #fi
67 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
68 # will be <portage-2.0.51_pre20
69 CONF_LIBDIR="lib"
70 fi
71 # and of course, default to lib if CONF_LIBDIR isnt set
72 echo ${CONF_LIBDIR:=lib}
73 unset LIBDIR_TEST
74}
75
76
77get_multilibdir() {
78 echo ${CONF_MULTILIBDIR:=lib32}
79}
80
81
82# Sometimes you need to override the value returned by get_libdir. A good
83# example of this is xorg-x11, where lib32 isnt a supported configuration,
84# and where lib64 -must- be used on amd64 (for applications that need lib
85# to be 32bit, such as adobe acrobat). Note that this override also bypasses
86# portage version sanity checking.
87# get_libdir_override expects one argument, the result get_libdir should
88# return:
89#
90# get_libdir_override lib64
91#
92# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
93get_libdir_override() {
94 CONF_LIBDIR="$1"
95 CONF_LIBDIR_OVERRIDE="$1"
96} 39}
97 40
98# This function generate linker scripts in /usr/lib for dynamic 41# This function generate linker scripts in /usr/lib for dynamic
99# libs in /lib. This is to fix linking problems when you have 42# libs in /lib. This is to fix linking problems when you have
100# the .so in /lib, and the .a in /usr/lib. What happens is that 43# the .so in /lib, and the .a in /usr/lib. What happens is that
112# to point to the latest version of the library present. 55# to point to the latest version of the library present.
113# 56#
114# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
115# 58#
116gen_usr_ldscript() { 59gen_usr_ldscript() {
117 local libdir="$(get_libdir)" 60 local lib libdir=$(get_libdir)
118 # Just make sure it exists 61 # Just make sure it exists
119 dodir /usr/${libdir} 62 dodir /usr/${libdir}
120 63
64 for lib in "${@}" ; do
121 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 65 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
122/* GNU ld script 66 /* GNU ld script
123 Because Gentoo have critical dynamic libraries 67 Since Gentoo has critical dynamic libraries
124 in /lib, and the static versions in /usr/lib, we 68 in /lib, and the static versions in /usr/lib,
125 need to have a "fake" dynamic lib in /usr/lib, 69 we need to have a "fake" dynamic lib in /usr/lib,
126 otherwise we run into linking problems. 70 otherwise we run into linking problems.
127 See bug #4411 on http://bugs.gentoo.org/ for 71
128 more info. */ 72 See bug http://bugs.gentoo.org/4411 for more info.
73 */
129GROUP ( /${libdir}/${1} ) 74 GROUP ( /${libdir}/${lib} )
130END_LDSCRIPT 75 END_LDSCRIPT
131 fperms a+x "/usr/${libdir}/${1}" 76 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
132}
133
134# Simple function to draw a line consisting of '=' the same length as $*
135#
136# <azarah@gentoo.org> (11 Nov 2002)
137#
138draw_line() {
139 local i=0
140 local str_length=""
141
142 # Handle calls that do not have args, or wc not being installed ...
143 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
144 then
145 echo "==============================================================="
146 return 0
147 fi
148
149 # Get the length of $*
150 str_length="$(echo -n "$*" | wc -m)"
151
152 while [ "$i" -lt "${str_length}" ]
153 do
154 echo -n "="
155
156 i=$((i + 1))
157 done 77 done
158
159 echo
160
161 return 0
162} 78}
79
163 80
164# Default directory where patches are located 81# Default directory where patches are located
165EPATCH_SOURCE="${WORKDIR}/patch" 82EPATCH_SOURCE="${WORKDIR}/patch"
166# Default extension for patches 83# Default extension for patches
167EPATCH_SUFFIX="patch.bz2" 84EPATCH_SUFFIX="patch.bz2"
168# Default options for patch 85# Default options for patch
169# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 86# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
170EPATCH_OPTS="-g0" 87# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
88# Set -E to automatically remove empty files.
89EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
171# List of patches not to apply. Not this is only file names, 90# List of patches not to apply. Not this is only file names,
172# and not the full path .. 91# and not the full path ..
173EPATCH_EXCLUDE="" 92EPATCH_EXCLUDE=""
174# Change the printed message for a single patch. 93# Change the printed message for a single patch.
175EPATCH_SINGLE_MSG="" 94EPATCH_SINGLE_MSG=""
95# Change the printed message for multiple patches.
96EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
176# Force applying bulk patches even if not following the style: 97# Force applying bulk patches even if not following the style:
177# 98#
178# ??_${ARCH}_foo.${EPATCH_SUFFIX} 99# ??_${ARCH}_foo.${EPATCH_SUFFIX}
179# 100#
180EPATCH_FORCE="no" 101EPATCH_FORCE="no"
211# hand its a directory, it will set EPATCH_SOURCE to this. 132# hand its a directory, it will set EPATCH_SOURCE to this.
212# 133#
213# <azarah@gentoo.org> (10 Nov 2002) 134# <azarah@gentoo.org> (10 Nov 2002)
214# 135#
215epatch() { 136epatch() {
137 _epatch_draw_line() {
138 [[ -z $1 ]] && set "$(printf "%65s" '')"
139 echo "${1//?/=}"
140 }
141 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
216 local PIPE_CMD="" 142 local PIPE_CMD=""
217 local STDERR_TARGET="${T}/$$.out" 143 local STDERR_TARGET="${T}/$$.out"
218 local PATCH_TARGET="${T}/$$.patch" 144 local PATCH_TARGET="${T}/$$.patch"
219 local PATCH_SUFFIX="" 145 local PATCH_SUFFIX=""
220 local SINGLE_PATCH="no" 146 local SINGLE_PATCH="no"
221 local x="" 147 local x=""
222 148
149 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
150
223 if [ "$#" -gt 1 ] 151 if [ "$#" -gt 1 ]
224 then 152 then
225 local m="" 153 local m=""
226 einfo "${#} patches to apply..."
227 for m in "$@" ; do 154 for m in "$@" ; do
228 epatch "${m}" 155 epatch "${m}"
229 done 156 done
230 return 0 157 return 0
231 fi 158 fi
245 local EPATCH_SOURCE="$1/*" 172 local EPATCH_SOURCE="$1/*"
246 else 173 else
247 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 174 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
248 fi 175 fi
249 else 176 else
250 if [ ! -d ${EPATCH_SOURCE} ] 177 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
251 then 178 then
252 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 179 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
253 then 180 then
254 EPATCH_SOURCE="$1" 181 EPATCH_SOURCE="$1"
255 fi 182 fi
256 183
257 echo 184 echo
258 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 185 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
259 eerror 186 eerror
260 eerror " ${EPATCH_SOURCE}" 187 eerror " ${EPATCH_SOURCE}"
188 eerror " ( ${EPATCH_SOURCE##*/} )"
261 echo 189 echo
262 die "Cannot find \$EPATCH_SOURCE!" 190 die "Cannot find \$EPATCH_SOURCE!"
263 fi 191 fi
264 192
265 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 193 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
284 ;; 212 ;;
285 esac 213 esac
286 214
287 if [ "${SINGLE_PATCH}" = "no" ] 215 if [ "${SINGLE_PATCH}" = "no" ]
288 then 216 then
289 einfo "Applying various patches (bugfixes/updates)..." 217 einfo "${EPATCH_MULTI_MSG}"
290 fi 218 fi
291 for x in ${EPATCH_SOURCE} 219 for x in ${EPATCH_SOURCE}
292 do 220 do
293 # New ARCH dependant patch naming scheme... 221 # New ARCH dependant patch naming scheme ...
294 # 222 #
295 # ???_arch_foo.patch 223 # ???_arch_foo.patch
296 # 224 #
297 if [ -f ${x} ] && \ 225 if [ -f ${x} ] && \
298 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 226 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
299 [ "${EPATCH_FORCE}" = "yes" ]) 227 [ "${EPATCH_FORCE}" = "yes" ])
300 then 228 then
301 local count=0 229 local count=0
302 local popts="${EPATCH_OPTS}" 230 local popts="${EPATCH_OPTS}"
231 local patchname=${x##*/}
303 232
304 if [ -n "${EPATCH_EXCLUDE}" ] 233 if [ -n "${EPATCH_EXCLUDE}" ]
305 then 234 then
306 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 235 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
307 then 236 then
308 continue 237 continue
309 fi 238 fi
310 fi 239 fi
311 240
313 then 242 then
314 if [ -n "${EPATCH_SINGLE_MSG}" ] 243 if [ -n "${EPATCH_SINGLE_MSG}" ]
315 then 244 then
316 einfo "${EPATCH_SINGLE_MSG}" 245 einfo "${EPATCH_SINGLE_MSG}"
317 else 246 else
318 einfo "Applying ${x##*/}..." 247 einfo "Applying ${patchname} ..."
319 fi 248 fi
320 else 249 else
321 einfo " ${x##*/}..." 250 einfo " ${patchname} ..."
322 fi 251 fi
323 252
324 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 253 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
325 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 254 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
326 255
327 # Allow for prefix to differ ... im lazy, so shoot me :/ 256 # Allow for prefix to differ ... im lazy, so shoot me :/
328 while [ "${count}" -lt 5 ] 257 while [ "${count}" -lt 5 ]
329 do 258 do
330 # Generate some useful debug info ... 259 # Generate some useful debug info ...
331 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 260 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
332 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 261 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 262
334 if [ "${PATCH_SUFFIX}" != "patch" ] 263 if [ "${PATCH_SUFFIX}" != "patch" ]
335 then 264 then
336 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 265 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 266 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 else 267 else
339 PATCH_TARGET="${x}" 268 PATCH_TARGET="${x}"
340 fi 269 fi
341 270
342 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 271 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 272 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
344 273
345 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 274 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
346 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 275 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
347 276
348 if [ "${PATCH_SUFFIX}" != "patch" ] 277 if [ "${PATCH_SUFFIX}" != "patch" ]
349 then 278 then
350 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 279 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
351 then 280 then
352 echo 281 echo
353 eerror "Could not extract patch!" 282 eerror "Could not extract patch!"
354 #die "Could not extract patch!" 283 #die "Could not extract patch!"
355 count=5 284 count=5
356 break 285 break
357 fi 286 fi
358 fi 287 fi
359 288
360 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 289 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
361 then 290 then
362 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 291 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
363 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 292 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
364 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 293 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
365 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 294 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
366 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
367 296
368 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 297 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
298 _epatch_assert
369 299
370 if [ "$?" -ne 0 ] 300 if [ "$?" -ne 0 ]
371 then 301 then
372 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 302 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
373 echo 303 echo
374 eerror "A dry-run of patch command succeeded, but actually" 304 eerror "A dry-run of patch command succeeded, but actually"
375 eerror "applying the patch failed!" 305 eerror "applying the patch failed!"
376 #die "Real world sux compared to the dreamworld!" 306 #die "Real world sux compared to the dreamworld!"
377 count=5 307 count=5
378 fi 308 fi
379 309
380 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 310 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
381 311
382 break 312 break
383 fi 313 fi
384 314
385 count=$((count + 1)) 315 count=$((count + 1))
391 fi 321 fi
392 322
393 if [ "${count}" -eq 5 ] 323 if [ "${count}" -eq 5 ]
394 then 324 then
395 echo 325 echo
396 eerror "Failed Patch: ${x##*/}!" 326 eerror "Failed Patch: ${patchname} !"
327 eerror " ( ${PATCH_TARGET} )"
397 eerror 328 eerror
398 eerror "Include in your bugreport the contents of:" 329 eerror "Include in your bugreport the contents of:"
399 eerror 330 eerror
400 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 331 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
401 echo 332 echo
402 die "Failed Patch: ${x##*/}!" 333 die "Failed Patch: ${patchname}!"
403 fi 334 fi
404 335
405 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 336 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
406 337
407 eend 0 338 eend 0
408 fi 339 fi
409 done 340 done
410 if [ "${SINGLE_PATCH}" = "no" ] 341 if [ "${SINGLE_PATCH}" = "no" ]
411 then 342 then
412 einfo "Done with patching" 343 einfo "Done with patching"
413 fi 344 fi
414} 345}
415 346
416# This function return true if we are using the NPTL pthreads
417# implementation.
418#
419# <azarah@gentoo.org> (06 March 2003)
420#
421have_NPTL() {
422 cat > ${T}/test-nptl.c <<-"END"
423 #define _XOPEN_SOURCE
424 #include <unistd.h>
425 #include <stdio.h>
426
427 int main()
428 {
429 char buf[255];
430 char *str = buf;
431
432 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
433 if (NULL != str) {
434 printf("%s\n", str);
435 if (NULL != strstr(str, "NPTL"))
436 return 0;
437 }
438
439 return 1;
440 }
441 END
442
443 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... "
444 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
445 then
446 echo "yes"
447 einfon "Checking what PTHREADS implementation we have ... "
448 if ${T}/nptl
449 then
450 return 0
451 else
452 return 1
453 fi
454 else
455 echo "no"
456 fi
457
458 return 1
459}
460
461# This function check how many cpu's are present, and then set
462# -j in MAKEOPTS accordingly.
463#
464# Thanks to nall <nall@gentoo.org> for this.
465#
466get_number_of_jobs() {
467 local jobs=0
468
469 if [ ! -r /proc/cpuinfo ]
470 then
471 return 1
472 fi
473
474 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
475 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
476 then
477 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
478 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
479 ADMINPARAM="${ADMINPARAM/-j}"
480 fi
481
482 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
483
484 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
485 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
486 then
487 # these archs will always have "[Pp]rocessor"
488 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
489
490 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
491 then
492 # sparc always has "ncpus active"
493 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
494
495 elif [ "${ARCH}" = "alpha" ]
496 then
497 # alpha has "cpus active", but only when compiled with SMP
498 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
499 then
500 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
501 else
502 jobs=2
503 fi
504
505 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
506 then
507 # ppc has "processor", but only when compiled with SMP
508 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
509 then
510 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
511 else
512 jobs=2
513 fi
514 elif [ "${ARCH}" = "s390" ]
515 then
516 # s390 has "# processors : "
517 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
518 else
519 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
520 die "Unknown ARCH -- ${ARCH}!"
521 fi
522
523 # Make sure the number is valid ...
524 if [ "${jobs}" -lt 1 ]
525 then
526 jobs=1
527 fi
528
529 if [ -n "${ADMINPARAM}" ]
530 then
531 if [ "${jobs}" -gt "${ADMINPARAM}" ]
532 then
533 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..."
534 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
535 else
536 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..."
537 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
538 fi
539 fi
540}
541
542# Cheap replacement for when debianutils (and thus mktemp) 347# Cheap replacement for when debianutils (and thus mktemp)
543# does not exist on the users system 348# does not exist on the users system
544# vapier@gentoo.org 349# vapier@gentoo.org
545# 350#
546# Takes just 1 parameter (the directory to create tmpfile in) 351# Takes just 1 optional parameter (the directory to create tmpfile in)
547mymktemp() { 352emktemp() {
353 local exe="touch"
354 [[ $1 == -d ]] && exe="mkdir" && shift
548 local topdir="$1" 355 local topdir=$1
549 356
550 [ -z "${topdir}" ] && topdir=/tmp 357 if [[ -z ${topdir} ]] ; then
551 if [ "`which mktemp 2>/dev/null`" ] 358 [[ -z ${T} ]] \
552 then 359 && topdir="/tmp" \
553 mktemp -p ${topdir} 360 || topdir=${T}
361 fi
362
363 if [[ -z $(type -p mktemp) ]] ; then
364 local tmp=/
365 while [[ -e ${tmp} ]] ; do
366 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
367 done
368 ${exe} "${tmp}" || ${exe} -p "${tmp}"
369 echo "${tmp}"
554 else 370 else
555 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 371 if [[ ${exe} == "touch" ]] ; then
556 touch ${tmp} 372 [[ ${USERLAND} == "GNU" ]] \
557 echo ${tmp} 373 && mktemp -p "${topdir}" \
374 || TMPDIR="${topdir}" mktemp -t tmp
375 else
376 [[ ${USERLAND} == "GNU" ]] \
377 && mktemp -d "${topdir}" \
378 || TMPDIR="${topdir}" mktemp -dt tmp
379 fi
558 fi 380 fi
559} 381}
560 382
561# Small wrapper for getent (Linux), nidump (Mac OS X), 383# Small wrapper for getent (Linux), nidump (Mac OS X),
562# and pw (FreeBSD) used in enewuser()/enewgroup() 384# and pw (FreeBSD) used in enewuser()/enewgroup()
563# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 385# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
564# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 386# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
565# 387#
566# egetent(database, key) 388# egetent(database, key)
567egetent() { 389egetent() {
568 if useq macos || useq ppc-macos ; then 390 case ${CHOST} in
391 *-darwin*)
569 case "$2" in 392 case "$2" in
570 *[!0-9]*) # Non numeric 393 *[!0-9]*) # Non numeric
571 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 394 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
572 ;; 395 ;;
573 *) # Numeric 396 *) # Numeric
574 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 397 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
575 ;; 398 ;;
576 esac 399 esac
577 elif useq x86-fbsd ; then 400 ;;
578 local action 401 *-freebsd*|*-dragonfly*)
579 if [ "$1" == "passwd" ] 402 local opts action="user"
580 then 403 [[ $1 == "passwd" ]] || action="group"
581 action="user" 404
582 else 405 # lookup by uid/gid
583 action="group" 406 if [[ $2 == [[:digit:]]* ]] ; then
407 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
584 fi 408 fi
409
585 pw show "${action}" "$2" -q 410 pw show ${action} ${opts} "$2" -q
586 else 411 ;;
412 *-netbsd*|*-openbsd*)
413 grep "$2:\*:" /etc/$1
414 ;;
415 *)
587 which nscd >& /dev/null && nscd -i "$1" 416 type -p nscd >& /dev/null && nscd -i "$1"
588 getent "$1" "$2" 417 getent "$1" "$2"
589 fi 418 ;;
419 esac
590} 420}
591 421
592# Simplify/standardize adding users to the system 422# Simplify/standardize adding users to the system
593# vapier@gentoo.org 423# vapier@gentoo.org
594# 424#
601# shell: /bin/false 431# shell: /bin/false
602# homedir: /dev/null 432# homedir: /dev/null
603# groups: none 433# groups: none
604# extra: comment of 'added by portage for ${PN}' 434# extra: comment of 'added by portage for ${PN}'
605enewuser() { 435enewuser() {
436 case ${EBUILD_PHASE} in
437 unpack|compile|test|install)
438 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
439 eerror "Package fails at QA and at life. Please file a bug."
440 die "Bad package! enewuser is only for use in pkg_* functions!"
441 esac
442
606 # get the username 443 # get the username
607 local euser="$1"; shift 444 local euser=$1; shift
608 if [ -z "${euser}" ] 445 if [[ -z ${euser} ]] ; then
609 then
610 eerror "No username specified !" 446 eerror "No username specified !"
611 die "Cannot call enewuser without a username" 447 die "Cannot call enewuser without a username"
612 fi 448 fi
613 449
614 # lets see if the username already exists 450 # lets see if the username already exists
615 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 451 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
616 then
617 return 0 452 return 0
618 fi 453 fi
619 einfo "Adding user '${euser}' to your system ..." 454 einfo "Adding user '${euser}' to your system ..."
620 455
621 # options to pass to useradd 456 # options to pass to useradd
622 local opts= 457 local opts=
623 458
624 # handle uid 459 # handle uid
625 local euid="$1"; shift 460 local euid=$1; shift
626 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 461 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
627 then
628 if [ "${euid}" -gt 0 ] 462 if [[ ${euid} -gt 0 ]] ; then
629 then
630 if [ ! -z "`egetent passwd ${euid}`" ] 463 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
631 then
632 euid="next" 464 euid="next"
633 fi 465 fi
634 else 466 else
635 eerror "Userid given but is not greater than 0 !" 467 eerror "Userid given but is not greater than 0 !"
636 die "${euid} is not a valid UID" 468 die "${euid} is not a valid UID"
637 fi 469 fi
638 else 470 else
639 euid="next" 471 euid="next"
640 fi 472 fi
641 if [ "${euid}" == "next" ] 473 if [[ ${euid} == "next" ]] ; then
642 then 474 for euid in $(seq 101 999) ; do
643 local pwrange
644 if [ "${USERLAND}" == "BSD" ] ; then
645 pwrange="`jot 898 101`"
646 else
647 pwrange="`seq 101 999`"
648 fi
649 for euid in ${pwrange} ; do
650 [ -z "`egetent passwd ${euid}`" ] && break 475 [[ -z $(egetent passwd ${euid}) ]] && break
651 done 476 done
652 fi 477 fi
653 opts="${opts} -u ${euid}" 478 opts="${opts} -u ${euid}"
654 einfo " - Userid: ${euid}" 479 einfo " - Userid: ${euid}"
655 480
656 # handle shell 481 # handle shell
657 local eshell="$1"; shift 482 local eshell=$1; shift
658 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 483 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
659 then 484 if [[ ! -e ${ROOT}${eshell} ]] ; then
660 if [ ! -e "${eshell}" ]
661 then
662 eerror "A shell was specified but it does not exist !" 485 eerror "A shell was specified but it does not exist !"
663 die "${eshell} does not exist" 486 die "${eshell} does not exist in ${ROOT}"
487 fi
488 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
489 eerror "Do not specify ${eshell} yourself, use -1"
490 die "Pass '-1' as the shell parameter"
664 fi 491 fi
665 else 492 else
666 if [ "${USERLAND}" == "BSD" ] 493 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
667 then 494 [[ -x ${ROOT}${shell} ]] && break
668 eshell="/usr/bin/false" 495 done
669 else 496
670 eshell="/bin/false" 497 if [[ ${shell} == "/dev/null" ]] ; then
498 eerror "Unable to identify the shell to use"
499 die "Unable to identify the shell to use"
671 fi 500 fi
501
502 eshell=${shell}
672 fi 503 fi
673 einfo " - Shell: ${eshell}" 504 einfo " - Shell: ${eshell}"
674 opts="${opts} -s ${eshell}" 505 opts="${opts} -s ${eshell}"
675 506
676 # handle homedir 507 # handle homedir
677 local ehome="$1"; shift 508 local ehome=$1; shift
678 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 509 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
679 then
680 ehome="/dev/null" 510 ehome="/dev/null"
681 fi 511 fi
682 einfo " - Home: ${ehome}" 512 einfo " - Home: ${ehome}"
683 opts="${opts} -d ${ehome}" 513 opts="${opts} -d ${ehome}"
684 514
685 # handle groups 515 # handle groups
686 local egroups="$1"; shift 516 local egroups=$1; shift
687 if [ ! -z "${egroups}" ] 517 if [[ ! -z ${egroups} ]] ; then
688 then
689 local oldifs="${IFS}" 518 local oldifs=${IFS}
690 local defgroup="" exgroups="" 519 local defgroup="" exgroups=""
691 520
692 export IFS="," 521 export IFS=","
693 for g in ${egroups} 522 for g in ${egroups} ; do
694 do
695 export IFS="${oldifs}" 523 export IFS=${oldifs}
696 if [ -z "`egetent group \"${g}\"`" ] 524 if [[ -z $(egetent group "${g}") ]] ; then
697 then
698 eerror "You must add group ${g} to the system first" 525 eerror "You must add group ${g} to the system first"
699 die "${g} is not a valid GID" 526 die "${g} is not a valid GID"
700 fi 527 fi
701 if [ -z "${defgroup}" ] 528 if [[ -z ${defgroup} ]] ; then
702 then
703 defgroup="${g}" 529 defgroup=${g}
704 else 530 else
705 exgroups="${exgroups},${g}" 531 exgroups="${exgroups},${g}"
706 fi 532 fi
707 export IFS="," 533 export IFS=","
708 done 534 done
709 export IFS="${oldifs}" 535 export IFS=${oldifs}
710 536
711 opts="${opts} -g ${defgroup}" 537 opts="${opts} -g ${defgroup}"
712 if [ ! -z "${exgroups}" ] 538 if [[ ! -z ${exgroups} ]] ; then
713 then
714 opts="${opts} -G ${exgroups:1}" 539 opts="${opts} -G ${exgroups:1}"
715 fi 540 fi
716 else 541 else
717 egroups="(none)" 542 egroups="(none)"
718 fi 543 fi
719 einfo " - Groups: ${egroups}" 544 einfo " - Groups: ${egroups}"
720 545
721 # handle extra and add the user 546 # handle extra and add the user
722 local eextra="$@"
723 local oldsandbox="${SANDBOX_ON}" 547 local oldsandbox=${SANDBOX_ON}
724 export SANDBOX_ON="0" 548 export SANDBOX_ON="0"
725 if useq macos || useq ppc-macos ; 549 case ${CHOST} in
726 then 550 *-darwin*)
727 ### Make the user 551 ### Make the user
728 if [ -z "${eextra}" ] 552 if [[ -z $@ ]] ; then
729 then
730 dscl . create /users/${euser} uid ${euid} 553 dscl . create /users/${euser} uid ${euid}
731 dscl . create /users/${euser} shell ${eshell} 554 dscl . create /users/${euser} shell ${eshell}
732 dscl . create /users/${euser} home ${ehome} 555 dscl . create /users/${euser} home ${ehome}
733 dscl . create /users/${euser} realname "added by portage for ${PN}" 556 dscl . create /users/${euser} realname "added by portage for ${PN}"
734 ### Add the user to the groups specified 557 ### Add the user to the groups specified
735 local oldifs="${IFS}" 558 local oldifs=${IFS}
736 export IFS="," 559 export IFS=","
737 for g in ${egroups} 560 for g in ${egroups} ; do
738 do
739 dscl . merge /groups/${g} users ${euser} 561 dscl . merge /groups/${g} users ${euser}
740 done 562 done
741 export IFS="${oldifs}" 563 export IFS=${oldifs}
742 else 564 else
743 einfo "Extra options are not supported on macos yet" 565 einfo "Extra options are not supported on Darwin yet"
744 einfo "Please report the ebuild along with the info below" 566 einfo "Please report the ebuild along with the info below"
745 einfo "eextra: ${eextra}" 567 einfo "eextra: $@"
746 die "Required function missing" 568 die "Required function missing"
747 fi 569 fi
748 elif use x86-fbsd ; then 570 ;;
749 if [ -z "${eextra}" ] 571 *-freebsd*|*-dragonfly*)
750 then 572 if [[ -z $@ ]] ; then
751 pw useradd ${euser} ${opts} \ 573 pw useradd ${euser} ${opts} \
752 -c "added by portage for ${PN}" \ 574 -c "added by portage for ${PN}" \
753 die "enewuser failed" 575 die "enewuser failed"
754 else 576 else
755 einfo " - Extra: ${eextra}" 577 einfo " - Extra: $@"
756 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
757 -c ${eextra} || die "enewuser failed" 579 "$@" || die "enewuser failed"
758 fi 580 fi
581 ;;
582
583 *-netbsd*)
584 if [[ -z $@ ]] ; then
585 useradd ${opts} ${euser} || die "enewuser failed"
759 else 586 else
760 if [ -z "${eextra}" ] 587 einfo " - Extra: $@"
761 then 588 useradd ${opts} ${euser} "$@" || die "enewuser failed"
589 fi
590 ;;
591
592 *-openbsd*)
593 if [[ -z $@ ]] ; then
594 useradd -u ${euid} -s ${eshell} \
595 -d ${ehome} -c "Added by portage for ${PN}" \
596 -g ${egroups} ${euser} || die "enewuser failed"
597 else
598 einfo " - Extra: $@"
599 useradd -u ${euid} -s ${eshell} \
600 -d ${ehome} -c "Added by portage for ${PN}" \
601 -g ${egroups} ${euser} "$@" || die "enewuser failed"
602 fi
603 ;;
604
605 *)
606 if [[ -z $@ ]] ; then
762 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
763 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
764 || die "enewuser failed" 609 || die "enewuser failed"
765 else 610 else
766 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
767 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
768 || die "enewuser failed" 613 || die "enewuser failed"
769 fi 614 fi
615 ;;
616 esac
617
618 if [[ ! -e ${ROOT}/${ehome} ]] ; then
619 einfo " - Creating ${ehome} in ${ROOT}"
620 mkdir -p "${ROOT}/${ehome}"
621 chown ${euser} "${ROOT}/${ehome}"
622 chmod 755 "${ROOT}/${ehome}"
770 fi 623 fi
624
771 export SANDBOX_ON="${oldsandbox}" 625 export SANDBOX_ON=${oldsandbox}
772
773 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
774 then
775 einfo " - Creating ${ehome} in ${D}"
776 dodir ${ehome}
777 fowners ${euser} ${ehome}
778 fperms 755 ${ehome}
779 fi
780} 626}
781 627
782# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
783# vapier@gentoo.org 629# vapier@gentoo.org
784# 630#
787# Default values if you do not specify any: 633# Default values if you do not specify any:
788# groupname: REQUIRED ! 634# groupname: REQUIRED !
789# gid: next available (see groupadd(8)) 635# gid: next available (see groupadd(8))
790# extra: none 636# extra: none
791enewgroup() { 637enewgroup() {
638 case ${EBUILD_PHASE} in
639 unpack|compile|test|install)
640 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
641 eerror "Package fails at QA and at life. Please file a bug."
642 die "Bad package! enewgroup is only for use in pkg_* functions!"
643 esac
644
792 # get the group 645 # get the group
793 local egroup="$1"; shift 646 local egroup="$1"; shift
794 if [ -z "${egroup}" ] 647 if [ -z "${egroup}" ]
795 then 648 then
796 eerror "No group specified !" 649 eerror "No group specified !"
813 then 666 then
814 if [ "${egid}" -gt 0 ] 667 if [ "${egid}" -gt 0 ]
815 then 668 then
816 if [ -z "`egetent group ${egid}`" ] 669 if [ -z "`egetent group ${egid}`" ]
817 then 670 then
818 if useq macos || useq ppc-macos ; then 671 if [[ "${CHOST}" == *-darwin* ]]; then
819 opts="${opts} ${egid}" 672 opts="${opts} ${egid}"
820 else 673 else
821 opts="${opts} -g ${egid}" 674 opts="${opts} -g ${egid}"
822 fi 675 fi
823 else 676 else
837 opts="${opts} ${eextra}" 690 opts="${opts} ${eextra}"
838 691
839 # add the group 692 # add the group
840 local oldsandbox="${SANDBOX_ON}" 693 local oldsandbox="${SANDBOX_ON}"
841 export SANDBOX_ON="0" 694 export SANDBOX_ON="0"
842 if useq macos || useq ppc-macos ; 695 case ${CHOST} in
843 then 696 *-darwin*)
844 if [ ! -z "${eextra}" ]; 697 if [ ! -z "${eextra}" ];
845 then 698 then
846 einfo "Extra options are not supported on macos yet" 699 einfo "Extra options are not supported on Darwin/OS X yet"
847 einfo "Please report the ebuild along with the info below" 700 einfo "Please report the ebuild along with the info below"
848 einfo "eextra: ${eextra}" 701 einfo "eextra: ${eextra}"
849 die "Required function missing" 702 die "Required function missing"
850 fi 703 fi
851 704
852 # If we need the next available 705 # If we need the next available
853 case ${egid} in 706 case ${egid} in
854 *[!0-9]*) # Non numeric 707 *[!0-9]*) # Non numeric
855 for egid in `jot 898 101`; do 708 for egid in $(seq 101 999); do
856 [ -z "`egetent group ${egid}`" ] && break 709 [ -z "`egetent group ${egid}`" ] && break
857 done 710 done
858 esac 711 esac
859 dscl . create /groups/${egroup} gid ${egid} 712 dscl . create /groups/${egroup} gid ${egid}
860 dscl . create /groups/${egroup} passwd '*' 713 dscl . create /groups/${egroup} passwd '*'
861 elif use x86-fbsd ; then 714 ;;
715
716 *-freebsd*|*-dragonfly*)
862 case ${egid} in 717 case ${egid} in
863 *[!0-9]*) # Non numeric 718 *[!0-9]*) # Non numeric
864 for egid in `jot 898 101`; do 719 for egid in $(seq 101 999); do
865 [ -z "`egetent group ${egid}`" ] && break 720 [ -z "`egetent group ${egid}`" ] && break
866 done 721 done
867 esac 722 esac
868 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 723 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
869 else 724 ;;
725
726 *-netbsd*)
727 case ${egid} in
728 *[!0-9]*) # Non numeric
729 for egid in $(seq 101 999); do
730 [ -z "`egetent group ${egid}`" ] && break
731 done
732 esac
733 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
734 ;;
735
736 *)
870 groupadd ${opts} ${egroup} || die "enewgroup failed" 737 groupadd ${opts} ${egroup} || die "enewgroup failed"
871 fi 738 ;;
739 esac
872 export SANDBOX_ON="${oldsandbox}" 740 export SANDBOX_ON="${oldsandbox}"
873} 741}
874 742
875# Simple script to replace 'dos2unix' binaries 743# Simple script to replace 'dos2unix' binaries
876# vapier@gentoo.org 744# vapier@gentoo.org
877# 745#
878# edos2unix(file, <more files>...) 746# edos2unix(file, <more files> ...)
879edos2unix() { 747edos2unix() {
880 for f in "$@" 748 for f in "$@"
881 do 749 do
882 cp "${f}" ${T}/edos2unix 750 cp "${f}" ${T}/edos2unix
883 sed 's/\r$//' ${T}/edos2unix > "${f}" 751 sed 's/\r$//' ${T}/edos2unix > "${f}"
884 done 752 done
885} 753}
886 754
755
756##############################################################
757# START: Handle .desktop files and menu entries #
758# maybe this should be separated into a new eclass some time #
759# lanius@gentoo.org #
760##############################################################
761
887# Make a desktop file ! 762# Make a desktop file !
888# Great for making those icons in kde/gnome startmenu ! 763# Great for making those icons in kde/gnome startmenu !
889# Amaze your friends ! Get the women ! Join today ! 764# Amaze your friends ! Get the women ! Join today !
890# gnome2 /usr/share/applications
891# gnome1 /usr/share/gnome/apps/
892# KDE ${KDEDIR}/share/applnk /usr/share/applnk
893# 765#
894# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 766# make_desktop_entry(<command>, [name], [icon], [type], [path])
895# 767#
896# binary: what binary does the app run with ? 768# binary: what command does the app run with ?
897# name: the name that will show up in the menu 769# name: the name that will show up in the menu
898# icon: give your little like a pretty little icon ... 770# icon: give your little like a pretty little icon ...
899# this can be relative (to /usr/share/pixmaps) or 771# this can be relative (to /usr/share/pixmaps) or
900# a full path to an icon 772# a full path to an icon
901# type: what kind of application is this ? for categories: 773# type: what kind of application is this ? for categories:
902# http://www.freedesktop.org/standards/menu-spec/ 774# http://www.freedesktop.org/Standards/desktop-entry-spec
903# path: if your app needs to startup in a specific dir 775# path: if your app needs to startup in a specific dir
904make_desktop_entry() { 776make_desktop_entry() {
905 [ -z "$1" ] && eerror "You must specify the executable" && return 1 777 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
906 778
907 local exec="${1}" 779 local exec=${1}
908 local name="${2:-${PN}}" 780 local name=${2:-${PN}}
909 local icon="${3:-${PN}.png}" 781 local icon=${3:-${PN}.png}
910 local type="${4}" 782 local type=${4}
911 local subdir="${6}" 783 local path=${5}
912 local path="${5:-${GAMES_BINDIR}}" 784
913 if [ -z "${type}" ] 785 if [[ -z ${type} ]] ; then
914 then 786 local catmaj=${CATEGORY%%-*}
915 case ${CATEGORY} in 787 local catmin=${CATEGORY##*-}
916 "app-emulation") 788 case ${catmaj} in
917 type=Emulator 789 app)
918 subdir="Emulation" 790 case ${catmin} in
791 admin) type=System;;
792 cdr) type=DiscBurning;;
793 dicts) type=Dictionary;;
794 editors) type=TextEditor;;
795 emacs) type=TextEditor;;
796 emulation) type=Emulator;;
797 laptop) type=HardwareSettings;;
798 office) type=Office;;
799 vim) type=TextEditor;;
800 xemacs) type=TextEditor;;
801 *) type=;;
802 esac
919 ;; 803 ;;
920 "games-"*) 804
921 type=Game 805 dev)
922 subdir="Games" 806 type="Development"
923 ;; 807 ;;
924 "net-"*) 808
925 type=Network 809 games)
926 subdir="${type}" 810 case ${catmin} in
811 action) type=ActionGame;;
812 arcade) type=ArcadeGame;;
813 board) type=BoardGame;;
814 kid) type=KidsGame;;
815 emulation) type=Emulator;;
816 puzzle) type=LogicGame;;
817 rpg) type=RolePlaying;;
818 roguelike) type=RolePlaying;;
819 simulation) type=Simulation;;
820 sports) type=SportsGame;;
821 strategy) type=StrategyGame;;
822 *) type=;;
823 esac
824 type="Game;${type}"
927 ;; 825 ;;
826
827 mail)
828 type="Network;Email"
829 ;;
830
831 media)
832 case ${catmin} in
833 gfx) type=Graphics;;
834 radio) type=Tuner;;
835 sound) type=Audio;;
836 tv) type=TV;;
837 video) type=Video;;
838 *) type=;;
839 esac
840 type="AudioVideo;${type}"
841 ;;
842
843 net)
844 case ${catmin} in
845 dialup) type=Dialup;;
846 ftp) type=FileTransfer;;
847 im) type=InstantMessaging;;
848 irc) type=IRCClient;;
849 mail) type=Email;;
850 news) type=News;;
851 nntp) type=News;;
852 p2p) type=FileTransfer;;
853 *) type=;;
854 esac
855 type="Network;${type}"
856 ;;
857
858 sci)
859 case ${catmin} in
860 astro*) type=Astronomy;;
861 bio*) type=Biology;;
862 calc*) type=Calculator;;
863 chem*) type=Chemistry;;
864 geo*) type=Geology;;
865 math*) type=Math;;
866 *) type=;;
867 esac
868 type="Science;${type}"
869 ;;
870
871 www)
872 case ${catmin} in
873 client) type=WebBrowser;;
874 *) type=;;
875 esac
876 type="Network"
877 ;;
878
928 *) 879 *)
929 type= 880 type=
930 subdir=
931 ;; 881 ;;
932 esac 882 esac
933 fi 883 fi
884 if [ "${SLOT}" == "0" ] ; then
885 local desktop_name="${PN}"
886 else
887 local desktop_name="${PN}-${SLOT}"
888 fi
934 local desktop="${T}/${exec}.desktop" 889 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
890# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
935 891
936echo "[Desktop Entry] 892echo "[Desktop Entry]
937Encoding=UTF-8 893Encoding=UTF-8
938Version=0.9.2 894Version=0.9.2
939Name=${name} 895Name=${name}
940Type=Application 896Type=Application
941Comment=${DESCRIPTION} 897Comment=${DESCRIPTION}
942Exec=${exec} 898Exec=${exec}
899TryExec=${exec%% *}
943Path=${path} 900Path=${path}
944Icon=${icon} 901Icon=${icon}
945Categories=Application;${type};" > "${desktop}" 902Categories=Application;${type};" > "${desktop}"
946 903
947 if [ -d "/usr/share/applications" ] 904 (
948 then 905 # wrap the env here so that the 'insinto' call
906 # doesn't corrupt the env of the caller
949 insinto /usr/share/applications 907 insinto /usr/share/applications
950 doins "${desktop}" 908 doins "${desktop}"
951 fi 909 )
910}
952 911
953 #if [ -d "/usr/share/gnome/apps" ] 912# Make a GDM/KDM Session file
954 #then 913#
955 # insinto /usr/share/gnome/apps/Games 914# make_desktop_entry(<title>, <command>)
956 # doins ${desktop} 915# title: File to execute to start the Window Manager
957 #fi 916# command: Name of the Window Manager
958 917
959 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ] 918make_session_desktop() {
960 #then 919 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
961 # for ver in /usr/kde/* 920 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
962 # do
963 # insinto ${ver}/share/applnk/Games
964 # doins ${desktop}
965 # done
966 #fi
967 921
968 if [ -d "/usr/share/applnk" ] 922 local title=$1
969 then 923 local command=$2
970 insinto /usr/share/applnk/${subdir} 924 local desktop=${T}/${wm}.desktop
925
926echo "[Desktop Entry]
927Encoding=UTF-8
928Name=${title}
929Comment=This session logs you into ${title}
930Exec=${command}
931TryExec=${command}
932Type=Application" > "${desktop}"
933
934 insinto /usr/share/xsessions
971 doins "${desktop}" 935 doins "${desktop}"
936}
937
938domenu() {
939 local i j
940 insinto /usr/share/applications
941 for i in "$@" ; do
942 if [[ -f ${i} ]] ; then
943 doins "${i}"
944 elif [[ -d ${i} ]] ; then
945 for j in "${i}"/*.desktop ; do
946 doins "${j}"
947 done
972 fi 948 fi
973 949 done
974 return 0
975} 950}
951newmenu() {
952 insinto /usr/share/applications
953 newins "$1" "$2"
954}
955
956doicon() {
957 local i j
958 insinto /usr/share/pixmaps
959 for i in "$@" ; do
960 if [[ -f ${i} ]] ; then
961 doins "${i}"
962 elif [[ -d ${i} ]] ; then
963 for j in "${i}"/*.png ; do
964 doins "${j}"
965 done
966 fi
967 done
968}
969newicon() {
970 insinto /usr/share/pixmaps
971 newins "$1" "$2"
972}
973
974##############################################################
975# END: Handle .desktop files and menu entries #
976##############################################################
977
976 978
977# for internal use only (unpack_pdv and unpack_makeself) 979# for internal use only (unpack_pdv and unpack_makeself)
978find_unpackable_file() { 980find_unpackable_file() {
979 local src="$1" 981 local src=$1
980 if [ -z "${src}" ] 982 if [[ -z ${src} ]] ; then
981 then
982 src="${DISTDIR}/${A}" 983 src=${DISTDIR}/${A}
983 else 984 else
984 if [ -e "${DISTDIR}/${src}" ] 985 if [[ -e ${DISTDIR}/${src} ]] ; then
985 then
986 src="${DISTDIR}/${src}" 986 src=${DISTDIR}/${src}
987 elif [ -e "${PWD}/${src}" ] 987 elif [[ -e ${PWD}/${src} ]] ; then
988 then
989 src="${PWD}/${src}" 988 src=${PWD}/${src}
990 elif [ -e "${src}" ] 989 elif [[ -e ${src} ]] ; then
991 then
992 src="${src}" 990 src=${src}
993 fi
994 fi 991 fi
995 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 992 fi
993 [[ ! -e ${src} ]] && return 1
996 echo "${src}" 994 echo "${src}"
997} 995}
998 996
999# Unpack those pesky pdv generated files ... 997# Unpack those pesky pdv generated files ...
1000# They're self-unpacking programs with the binary package stuffed in 998# They're self-unpacking programs with the binary package stuffed in
1015# lseek 1013# lseek
1016# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1014# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1017# lseek(3, -4, SEEK_END) = 2981250 1015# lseek(3, -4, SEEK_END) = 2981250
1018# thus we would pass in the value of '4' as the second parameter. 1016# thus we would pass in the value of '4' as the second parameter.
1019unpack_pdv() { 1017unpack_pdv() {
1020 local src="`find_unpackable_file $1`" 1018 local src=$(find_unpackable_file $1)
1021 local sizeoff_t="$2" 1019 local sizeoff_t=$2
1022 1020
1021 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1023 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1022 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1024 1023
1025 local shrtsrc="`basename ${src}`" 1024 local shrtsrc=$(basename "${src}")
1026 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1025 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1027 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1026 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1028 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1027 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1029 1028
1030 # grab metadata for debug reasons 1029 # grab metadata for debug reasons
1031 local metafile="`mymktemp ${T}`" 1030 local metafile="$(emktemp)"
1032 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1031 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
1033 1032
1034 # rip out the final file name from the metadata 1033 # rip out the final file name from the metadata
1035 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1034 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
1036 datafile="`basename ${datafile}`" 1035 datafile="`basename ${datafile}`"
1037 1036
1038 # now lets uncompress/untar the file if need be 1037 # now lets uncompress/untar the file if need be
1039 local tmpfile="`mymktemp ${T}`" 1038 local tmpfile="$(emktemp)"
1040 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1039 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1041 1040
1042 local iscompressed="`file -b ${tmpfile}`" 1041 local iscompressed="`file -b ${tmpfile}`"
1043 if [ "${iscompressed:0:8}" == "compress" ] ; then 1042 if [ "${iscompressed:0:8}" == "compress" ] ; then
1044 iscompressed=1 1043 iscompressed=1
1094# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1093# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1095# - If the file is not specified then unpack will utilize ${A}. 1094# - If the file is not specified then unpack will utilize ${A}.
1096# - If the offset is not specified then we will attempt to extract 1095# - If the offset is not specified then we will attempt to extract
1097# the proper offset from the script itself. 1096# the proper offset from the script itself.
1098unpack_makeself() { 1097unpack_makeself() {
1098 local src_input=${1:-${A}}
1099 local src="$(find_unpackable_file "$1")" 1099 local src=$(find_unpackable_file "${src_input}")
1100 local skip="$2" 1100 local skip=$2
1101 local exe="$3" 1101 local exe=$3
1102 1102
1103 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1104
1103 local shrtsrc="$(basename "${src}")" 1105 local shrtsrc=$(basename "${src}")
1104 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1106 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1105 if [ -z "${skip}" ] 1107 if [[ -z ${skip} ]] ; then
1106 then
1107 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1108 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1108 local skip=0 1109 local skip=0
1109 exe=tail 1110 exe=tail
1110 case ${ver} in 1111 case ${ver} in
1111 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1112 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1112 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1113 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1113 ;; 1114 ;;
1114 2.0|2.0.1) 1115 2.0|2.0.1)
1115 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1116 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1116 ;; 1117 ;;
1124 ;; 1125 ;;
1125 2.1.3) 1126 2.1.3)
1126 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1127 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1127 let skip="skip + 1" 1128 let skip="skip + 1"
1128 ;; 1129 ;;
1129 2.1.4) 1130 2.1.4|2.1.5)
1130 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1131 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1131 skip=$(head -n ${skip} "${src}" | wc -c) 1132 skip=$(head -n ${skip} "${src}" | wc -c)
1132 exe="dd" 1133 exe="dd"
1133 ;; 1134 ;;
1134 *) 1135 *)
1146 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1147 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1147 *) die "makeself cant handle exe '${exe}'" 1148 *) die "makeself cant handle exe '${exe}'"
1148 esac 1149 esac
1149 1150
1150 # lets grab the first few bytes of the file to figure out what kind of archive it is 1151 # lets grab the first few bytes of the file to figure out what kind of archive it is
1151 local tmpfile="$(mymktemp "${T}")" 1152 local tmpfile="$(emktemp)"
1152 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1153 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1153 local filetype="$(file -b "${tmpfile}")" 1154 local filetype="$(file -b "${tmpfile}")"
1154 case ${filetype} in 1155 case ${filetype} in
1155 *tar\ archive) 1156 *tar\ archive)
1156 eval ${exe} | tar --no-same-owner -xf - 1157 eval ${exe} | tar --no-same-owner -xf -
1179check_license() { 1180check_license() {
1180 local lic=$1 1181 local lic=$1
1181 if [ -z "${lic}" ] ; then 1182 if [ -z "${lic}" ] ; then
1182 lic="${PORTDIR}/licenses/${LICENSE}" 1183 lic="${PORTDIR}/licenses/${LICENSE}"
1183 else 1184 else
1184 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1185 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1185 lic="${PORTDIR}/licenses/${src}" 1186 lic="${PORTDIR}/licenses/${lic}"
1186 elif [ -e "${PWD}/${src}" ] ; then 1187 elif [ -e "${PWD}/${lic}" ] ; then
1187 lic="${PWD}/${src}" 1188 lic="${PWD}/${lic}"
1188 elif [ -e "${src}" ] ; then 1189 elif [ -e "${lic}" ] ; then
1189 lic="${src}" 1190 lic="${lic}"
1190 fi
1191 fi 1191 fi
1192 fi
1192 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1193 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1193 local l="`basename ${lic}`" 1194 local l="`basename ${lic}`"
1194 1195
1195 # here is where we check for the licenses the user already 1196 # here is where we check for the licenses the user already
1196 # accepted ... if we don't find a match, we make the user accept 1197 # accepted ... if we don't find a match, we make the user accept
1197 local shopts=$- 1198 local shopts=$-
1203 return 0 1204 return 0
1204 fi 1205 fi
1205 done 1206 done
1206 set +o noglob; set -$shopts #reset old shell opts 1207 set +o noglob; set -$shopts #reset old shell opts
1207 1208
1208 local licmsg="`mymktemp ${T}`" 1209 local licmsg="$(emktemp)"
1209 cat << EOF > ${licmsg} 1210 cat << EOF > ${licmsg}
1210********************************************************** 1211**********************************************************
1211The following license outlines the terms of use of this 1212The following license outlines the terms of use of this
1212package. You MUST accept this license for installation to 1213package. You MUST accept this license for installation to
1213continue. When you are done viewing, hit 'q'. If you 1214continue. When you are done viewing, hit 'q'. If you
1239# and when the function returns, you can assume that the cd has been 1240# and when the function returns, you can assume that the cd has been
1240# found at CDROM_ROOT. 1241# found at CDROM_ROOT.
1241# 1242#
1242# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1243# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1243# etc... if you want to give the cds better names, then just export 1244# etc... if you want to give the cds better names, then just export
1244# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1245# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1246# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1247# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1248# CDROM_NAME_2="data cd"
1249# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1245# 1250#
1246# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1251# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1247# 1252#
1248# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1253# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1249# - this will attempt to locate a cd based upon a file that is on 1254# - this will attempt to locate a cd based upon a file that is on
1253 # first we figure out how many cds we're dealing with by 1258 # first we figure out how many cds we're dealing with by
1254 # the # of files they gave us 1259 # the # of files they gave us
1255 local cdcnt=0 1260 local cdcnt=0
1256 local f= 1261 local f=
1257 for f in "$@" ; do 1262 for f in "$@" ; do
1258 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1259 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1260 done 1265 done
1261 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1262 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1263 1268
1264 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1265 # if they did, let's just believe them that it's correct 1270 # if they did, let's just believe them that it's correct
1266 if [ ! -z "${CD_ROOT}" ] ; then 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1267 export CDROM_ROOT="${CD_ROOT}"
1268 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1269 return
1270 fi
1271 # do the same for CD_ROOT_X
1272 if [ ! -z "${CD_ROOT_1}" ] ; then
1273 local var= 1272 local var=
1274 cdcnt=0 1273 cdcnt=0
1275 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1276 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1277 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1278 if [ -z "${!var}" ] ; then 1278 if [[ -z ${!var} ]] ; then
1279 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1280 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1281 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1281 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1282 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1283 fi 1283 fi
1284 export CDROM_ROOTS_${cdcnt}="${!var}"
1285 done 1284 done
1286 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1287 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1286 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1287 export CDROM_SET=-1
1288 for f in ${CDROM_CHECK_1//:/ } ; do
1289 ((++CDROM_SET))
1290 [[ -e ${CD_ROOT}/${f} ]] && break
1291 done
1292 export CDROM_MATCH=${f}
1288 return 1293 return
1289 fi 1294 fi
1290 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1291 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1292 einfon "This ebuild will need the " 1299 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1293 if [ -z "${CDROM_NAME}" ] ; then
1294 echo "cdrom for ${PN}."
1295 else
1296 echo "${CDROM_NAME}."
1297 fi
1298 echo 1300 echo
1299 einfo "If you do not have the CD, but have the data files" 1301 einfo "If you do not have the CD, but have the data files"
1300 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1301 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1302 einfo "directory containing the files." 1304 einfo "directory containing the files."
1303 echo 1305 echo
1306 einfo "For example:"
1307 einfo "export CD_ROOT=/mnt/cdrom"
1308 echo
1304 else 1309 else
1310 if [[ -n ${CDROM_NAME_SET} ]] ; then
1311 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1312 cdcnt=0
1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1314 ((++cdcnt))
1315 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1316 done
1317 fi
1318
1305 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1319 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1306 cdcnt=0 1320 cdcnt=0
1307 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1308 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1309 var="CDROM_NAME_${cdcnt}" 1323 var="CDROM_NAME_${cdcnt}"
1310 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1324 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1311 done 1325 done
1312 echo 1326 echo
1313 einfo "If you do not have the CDs, but have the data files" 1327 einfo "If you do not have the CDs, but have the data files"
1314 einfo "mounted somewhere on your filesystem, just export" 1328 einfo "mounted somewhere on your filesystem, just export"
1315 einfo "the following variables so they point to the right place:" 1329 einfo "the following variables so they point to the right place:"
1316 einfon "" 1330 einfon ""
1317 cdcnt=0 1331 cdcnt=0
1318 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1332 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1319 cdcnt=$((cdcnt + 1)) 1333 ((++cdcnt))
1320 echo -n " CD_ROOT_${cdcnt}" 1334 echo -n " CD_ROOT_${cdcnt}"
1321 done 1335 done
1322 echo 1336 echo
1323 einfo "Or, if you have all the files in the same place, or" 1337 einfo "Or, if you have all the files in the same place, or"
1324 einfo "you only have one cdrom, you can export CD_ROOT" 1338 einfo "you only have one cdrom, you can export CD_ROOT"
1325 einfo "and that place will be used as the same data source" 1339 einfo "and that place will be used as the same data source"
1326 einfo "for all the CDs." 1340 einfo "for all the CDs."
1327 echo 1341 echo
1342 einfo "For example:"
1343 einfo "export CD_ROOT_1=/mnt/cdrom"
1344 echo
1328 fi 1345 fi
1346
1347 export CDROM_SET=""
1329 export CDROM_CURRENT_CD=0 1348 export CDROM_CURRENT_CD=0
1330 cdrom_load_next_cd 1349 cdrom_load_next_cd
1331} 1350}
1332 1351
1333# this is only used when you need access to more than one cd. 1352# this is only used when you need access to more than one cd.
1334# when you have finished using the first cd, just call this function. 1353# when you have finished using the first cd, just call this function.
1335# when it returns, CDROM_ROOT will be pointing to the second cd. 1354# when it returns, CDROM_ROOT will be pointing to the second cd.
1336# remember, you can only go forward in the cd chain, you can't go back. 1355# remember, you can only go forward in the cd chain, you can't go back.
1337cdrom_load_next_cd() { 1356cdrom_load_next_cd() {
1338 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1339 local var= 1357 local var
1340 1358 ((++CDROM_CURRENT_CD))
1341 if [ ! -z "${CD_ROOT}" ] ; then
1342 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1343 return
1344 fi
1345 1359
1346 unset CDROM_ROOT 1360 unset CDROM_ROOT
1347 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1361 var=CD_ROOT_${CDROM_CURRENT_CD}
1362 [[ -z ${!var} ]] && var="CD_ROOT"
1348 if [ -z "${!var}" ] ; then 1363 if [[ -z ${!var} ]] ; then
1349 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1364 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1350 cdrom_locate_file_on_cd ${!var} 1365 _cdrom_locate_file_on_cd ${!var}
1351 else 1366 else
1352 export CDROM_ROOT="${!var}" 1367 export CDROM_ROOT=${!var}
1353 fi 1368 fi
1354 1369
1355 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1370 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1356} 1371}
1357 1372
1360# all it does is try to locate a give file on a cd ... if the cd isn't 1375# all it does is try to locate a give file on a cd ... if the cd isn't
1361# found, then a message asking for the user to insert the cdrom will be 1376# found, then a message asking for the user to insert the cdrom will be
1362# displayed and we'll hang out here until: 1377# displayed and we'll hang out here until:
1363# (1) the file is found on a mounted cdrom 1378# (1) the file is found on a mounted cdrom
1364# (2) the user hits CTRL+C 1379# (2) the user hits CTRL+C
1365cdrom_locate_file_on_cd() { 1380_cdrom_locate_file_on_cd() {
1366 while [ -z "${CDROM_ROOT}" ] ; do
1367 local dir="$(dirname ${@})"
1368 local file="$(basename ${@})"
1369 local mline="" 1381 local mline=""
1370 local showedmsg=0 1382 local showedmsg=0
1371 1383
1372 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1384 while [[ -z ${CDROM_ROOT} ]] ; do
1385 local i=0
1386 local -a cdset=(${*//:/ })
1387 if [[ -n ${CDROM_SET} ]] ; then
1388 cdset=(${cdset[${CDROM_SET}]})
1389 fi
1390
1391 while [[ -n ${cdset[${i}]} ]] ; do
1392 local dir=$(dirname ${cdset[${i}]})
1393 local file=$(basename ${cdset[${i}]})
1394
1395 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1373 [ -d "${mline}/${dir}" ] || continue 1396 [[ -d ${mline}/${dir} ]] || continue
1374 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1397 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1375 && export CDROM_ROOT=${mline} 1398 export CDROM_ROOT=${mline}
1399 export CDROM_SET=${i}
1400 export CDROM_MATCH=${cdset[${i}]}
1401 return
1402 fi
1403 done
1404
1405 ((++i))
1376 done 1406 done
1377 1407
1378 if [ -z "${CDROM_ROOT}" ] ; then
1379 echo 1408 echo
1380 if [ ${showedmsg} -eq 0 ] ; then 1409 if [[ ${showedmsg} -eq 0 ]] ; then
1381 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1410 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1382 if [ -z "${CDROM_NAME}" ] ; then 1411 if [[ -z ${CDROM_NAME} ]] ; then
1383 einfo "Please insert the cdrom for ${PN} now !" 1412 einfo "Please insert+mount the cdrom for ${PN} now !"
1384 else
1385 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1386 fi
1387 else 1413 else
1388 if [ -z "${CDROM_NAME_1}" ] ; then
1389 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1390 else
1391 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1392 einfo "Please insert+mount the ${!var} cdrom now !" 1414 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1393 fi
1394 fi 1415 fi
1395 showedmsg=1 1416 else
1417 if [[ -z ${CDROM_NAME_1} ]] ; then
1418 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1419 else
1420 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1421 einfo "Please insert+mount the ${!var} cdrom now !"
1422 fi
1396 fi 1423 fi
1424 showedmsg=1
1425 fi
1397 einfo "Press return to scan for the cd again" 1426 einfo "Press return to scan for the cd again"
1398 einfo "or hit CTRL+C to abort the emerge." 1427 einfo "or hit CTRL+C to abort the emerge."
1399 read 1428 echo
1400 fi 1429 einfo "If you are having trouble with the detection"
1430 einfo "of your CD, it is possible that you do not have"
1431 einfo "Joliet support enabled in your kernel. Please"
1432 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1433 read || die "something is screwed with your system"
1401 done 1434 done
1402} 1435}
1403 1436
1404# Make sure that LINGUAS only contains languages that 1437# Make sure that LINGUAS only contains languages that
1405# a package can support 1438# a package can support
1412# The -i builds a list of po files found in all the 1445# The -i builds a list of po files found in all the
1413# directories and uses the intersection of the lists. 1446# directories and uses the intersection of the lists.
1414# The -u builds a list of po files found in all the 1447# The -u builds a list of po files found in all the
1415# directories and uses the union of the lists. 1448# directories and uses the union of the lists.
1416strip-linguas() { 1449strip-linguas() {
1417 local ls newls 1450 local ls newls nols
1418 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1451 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1419 local op="$1"; shift 1452 local op=$1; shift
1420 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1453 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1421 local d f 1454 local d f
1422 for d in "$@" ; do 1455 for d in "$@" ; do
1423 if [ "${op}" == "-u" ] ; then 1456 if [[ ${op} == "-u" ]] ; then
1424 newls="${ls}" 1457 newls=${ls}
1425 else 1458 else
1426 newls="" 1459 newls=""
1427 fi 1460 fi
1428 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1461 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1429 if [ "${op}" == "-i" ] ; then 1462 if [[ ${op} == "-i" ]] ; then
1430 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1463 hasq ${f} ${ls} && newls="${newls} ${f}"
1431 else 1464 else
1432 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1465 hasq ${f} ${ls} || newls="${newls} ${f}"
1433 fi 1466 fi
1434 done 1467 done
1435 ls="${newls}" 1468 ls=${newls}
1436 done 1469 done
1437 ls="${ls//.po}"
1438 else 1470 else
1439 ls="$@" 1471 ls="$@"
1440 fi 1472 fi
1441 1473
1442 ls=" ${ls} " 1474 nols=""
1443 newls="" 1475 newls=""
1444 for f in ${LINGUAS} ; do 1476 for f in ${LINGUAS} ; do
1445 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1477 if hasq ${f} ${ls} ; then
1446 nl="${newls} ${f}" 1478 newls="${newls} ${f}"
1447 else 1479 else
1448 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1480 nols="${nols} ${f}"
1449 fi 1481 fi
1450 done 1482 done
1451 if [ -z "${newls}" ] ; then 1483 [[ -n ${nols} ]] \
1452 unset LINGUAS 1484 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1453 else
1454 export LINGUAS="${newls}" 1485 export LINGUAS=${newls:1}
1455 fi
1456} 1486}
1457 1487
1458# moved from kernel.eclass since they are generally useful outside of 1488# moved from kernel.eclass since they are generally useful outside of
1459# kernel.eclass -iggy (20041002) 1489# kernel.eclass -iggy (20041002)
1460 1490
1461# the following functions are useful in kernel module ebuilds, etc. 1491# the following functions are useful in kernel module ebuilds, etc.
1462# for an example see ivtv or drbd ebuilds 1492# for an example see ivtv or drbd ebuilds
1463 1493
1464# set's ARCH to match what the kernel expects 1494# set's ARCH to match what the kernel expects
1465set_arch_to_kernel() { 1495set_arch_to_kernel() {
1496 i=10
1497 while ((i--)) ; do
1498 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1499 done
1466 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1500 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1467 case ${ARCH} in 1501 case ${ARCH} in
1468 x86) export ARCH="i386";; 1502 x86) export ARCH="i386";;
1469 amd64) export ARCH="x86_64";; 1503 amd64) export ARCH="x86_64";;
1470 hppa) export ARCH="parisc";; 1504 hppa) export ARCH="parisc";;
1471 mips) export ARCH="mips";; 1505 mips) export ARCH="mips";;
1506 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1472 *) export ARCH="${ARCH}";; 1507 *) export ARCH="${ARCH}";;
1473 esac 1508 esac
1474} 1509}
1475 1510
1476# set's ARCH back to what portage expects 1511# set's ARCH back to what portage expects
1477set_arch_to_portage() { 1512set_arch_to_portage() {
1513 i=10
1514 while ((i--)) ; do
1515 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1516 done
1478 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1517 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1479} 1518}
1480 1519
1481# Jeremy Huddleston <eradicator@gentoo.org>: 1520# Jeremy Huddleston <eradicator@gentoo.org>:
1482# preserve_old_lib /path/to/libblah.so.0 1521# preserve_old_lib /path/to/libblah.so.0
1483# preserve_old_lib_notify /path/to/libblah.so.0 1522# preserve_old_lib_notify /path/to/libblah.so.0
1484# 1523#
1485# These functions are useful when a lib in your package changes --soname. Such 1524# These functions are useful when a lib in your package changes --library. Such
1486# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1525# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1487# would break packages that link against it. Most people get around this 1526# would break packages that link against it. Most people get around this
1488# by using the portage SLOT mechanism, but that is not always a relevant 1527# by using the portage SLOT mechanism, but that is not always a relevant
1489# solution, so instead you can add the following to your ebuilds: 1528# solution, so instead you can add the following to your ebuilds:
1490# 1529#
1512 touch ${D}${LIB} 1551 touch ${D}${LIB}
1513 fi 1552 fi
1514} 1553}
1515 1554
1516preserve_old_lib_notify() { 1555preserve_old_lib_notify() {
1517 LIB=$1 1556 LIB=$1
1518 1557
1519 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1558 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1520 SONAME=`basename ${LIB}` 1559 SONAME=`basename ${LIB}`
1521 1560
1522 einfo "An old version of an installed library was detected on your system." 1561 ewarn "An old version of an installed library was detected on your system."
1523 einfo "In order to avoid breaking packages that link against is, this older version" 1562 ewarn "In order to avoid breaking packages that link against it, this older version"
1524 einfo "is not being removed. In order to make full use of this newer version," 1563 ewarn "is not being removed. In order to make full use of this newer version,"
1525 einfo "you will need to execute the following command:" 1564 ewarn "you will need to execute the following command:"
1526 einfo " revdep-rebuild --soname ${SONAME}" 1565 ewarn " revdep-rebuild --library ${SONAME}"
1527 einfo 1566 ewarn
1528 einfo "After doing that, you can safely remove ${LIB}" 1567 ewarn "After doing that, you can safely remove ${LIB}"
1529 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1568 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1530 fi 1569 fi
1531} 1570}
1571
1572# Hack for people to figure out if a package was built with
1573# certain USE flags
1574#
1575# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1576# ex: built_with_use xchat gtk2
1577#
1578# Flags: -a all USE flags should be utilized
1579# -o at least one USE flag should be utilized
1580# Note: the default flag is '-a'
1581built_with_use() {
1582 local opt=$1
1583 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1584
1585 local PKG=$(best_version $1)
1586 shift
1587
1588 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1589
1590 # if the USE file doesnt exist, assume the $PKG is either
1591 # injected or package.provided
1592 [[ ! -e ${USEFILE} ]] && return 0
1593
1594 local USE_BUILT=$(<${USEFILE})
1595 while [[ $# -gt 0 ]] ; do
1596 if [[ ${opt} = "-o" ]] ; then
1597 has $1 ${USE_BUILT} && return 0
1598 else
1599 has $1 ${USE_BUILT} || return 1
1600 fi
1601 shift
1602 done
1603 [[ ${opt} = "-a" ]]
1604}
1605
1606# Many configure scripts wrongly bail when a C++ compiler
1607# could not be detected. #73450
1608epunt_cxx() {
1609 local dir=$1
1610 [[ -z ${dir} ]] && dir=${S}
1611 ebegin "Removing useless C++ checks"
1612 local f
1613 for f in $(find ${dir} -name configure) ; do
1614 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1615 done
1616 eend 0
1617}
1618
1619# dopamd <file> [more files]
1620#
1621# Install pam auth config file in /etc/pam.d
1622dopamd() {
1623 [[ -z $1 ]] && die "dopamd requires at least one argument"
1624
1625 use pam || return 0
1626
1627 INSDESTTREE=/etc/pam.d \
1628 doins "$@" || die "failed to install $@"
1629}
1630# newpamd <old name> <new name>
1631#
1632# Install pam file <old name> as <new name> in /etc/pam.d
1633newpamd() {
1634 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1635
1636 use pam || return 0
1637
1638 INSDESTTREE=/etc/pam.d \
1639 newins "$1" "$2" || die "failed to install $1 as $2"
1640}
1641
1642# make a wrapper script ...
1643# NOTE: this was originally games_make_wrapper, but I noticed other places where
1644# this could be used, so I have moved it here and made it not games-specific
1645# -- wolf31o2
1646# $1 == wrapper name
1647# $2 == binary to run
1648# $3 == directory to chdir before running binary
1649# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1650# $5 == path for wrapper
1651make_wrapper() {
1652 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1653 local tmpwrapper=$(emktemp)
1654 # We don't want to quote ${bin} so that people can pass complex
1655 # things as $bin ... "./someprog --args"
1656 cat << EOF > "${tmpwrapper}"
1657#!/bin/sh
1658cd "${chdir:-.}"
1659if [ -n "${libdir}" ] ; then
1660 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1661 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1662 else
1663 export LD_LIBRARY_PATH="${libdir}"
1664 fi
1665fi
1666exec ${bin} "\$@"
1667EOF
1668 chmod go+rx "${tmpwrapper}"
1669 if [[ -n ${path} ]] ; then
1670 exeinto "${path}"
1671 newexe "${tmpwrapper}" "${wrapper}"
1672 else
1673 newbin "${tmpwrapper}" "${wrapper}"
1674 fi
1675}

Legend:
Removed from v.1.116  
changed lines
  Added in v.1.245

  ViewVC Help
Powered by ViewVC 1.1.20