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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20