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

Diff of /eclass/eutils.eclass

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

Revision 1.126 Revision 1.192
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2005 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.126 2004/12/08 01:31:38 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.192 2005/07/15 22:16:49 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12ECLASS=eutils 12inherit multilib
13INHERITED="$INHERITED $ECLASS"
14 13
15DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
18 18
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# 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 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
41 sleep 1 41 sleep 1
42 done 42 done
43 fi 43 fi
44} 44}
45 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}
97
98# This function generate linker scripts in /usr/lib for dynamic 46# This function generate linker scripts in /usr/lib for dynamic
99# libs in /lib. This is to fix linking problems when you have 47# 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 48# the .so in /lib, and the .a in /usr/lib. What happens is that
101# in some cases when linking dynamic, the .a in /usr/lib is used 49# in some cases when linking dynamic, the .a in /usr/lib is used
102# instead of the .so in /lib due to gcc/libtool tweaking ld's 50# instead of the .so in /lib due to gcc/libtool tweaking ld's
116gen_usr_ldscript() { 64gen_usr_ldscript() {
117 local libdir="$(get_libdir)" 65 local libdir="$(get_libdir)"
118 # Just make sure it exists 66 # Just make sure it exists
119 dodir /usr/${libdir} 67 dodir /usr/${libdir}
120 68
69 for lib in "${@}" ; do
121 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
122/* GNU ld script 71 /* GNU ld script
123 Because Gentoo have critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
124 in /lib, and the static versions in /usr/lib, we 73 in /lib, and the static versions in /usr/lib,
125 need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
126 otherwise we run into linking problems. 75 otherwise we run into linking problems.
127 See bug #4411 on http://bugs.gentoo.org/ for 76
128 more info. */ 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
129GROUP ( /${libdir}/${1} ) 79 GROUP ( /${libdir}/${lib} )
130END_LDSCRIPT 80 END_LDSCRIPT
131 fperms a+x "/usr/${libdir}/${1}" 81 fperms a+x "/usr/${libdir}/${lib}"
82 done
132} 83}
133 84
134# Simple function to draw a line consisting of '=' the same length as $* 85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
135# 87#
136# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
137# 89#
138draw_line() { 90draw_line() {
139 local i=0 91 local i=0
165EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
166# Default extension for patches 118# Default extension for patches
167EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
168# Default options for patch 120# Default options for patch
169# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
170EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
171# List of patches not to apply. Not this is only file names, 124# List of patches not to apply. Not this is only file names,
172# and not the full path .. 125# and not the full path ..
173EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
174# Change the printed message for a single patch. 127# Change the printed message for a single patch.
175EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
176# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
177# 132#
178# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
179# 134#
180EPATCH_FORCE="no" 135EPATCH_FORCE="no"
221 local x="" 176 local x=""
222 177
223 if [ "$#" -gt 1 ] 178 if [ "$#" -gt 1 ]
224 then 179 then
225 local m="" 180 local m=""
226 einfo "${#} patches to apply ..."
227 for m in "$@" ; do 181 for m in "$@" ; do
228 epatch "${m}" 182 epatch "${m}"
229 done 183 done
230 return 0 184 return 0
231 fi 185 fi
256 210
257 echo 211 echo
258 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 212 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
259 eerror 213 eerror
260 eerror " ${EPATCH_SOURCE}" 214 eerror " ${EPATCH_SOURCE}"
215 eerror " ( ${EPATCH_SOURCE##*/} )"
261 echo 216 echo
262 die "Cannot find \$EPATCH_SOURCE!" 217 die "Cannot find \$EPATCH_SOURCE!"
263 fi 218 fi
264 219
265 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 220 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
284 ;; 239 ;;
285 esac 240 esac
286 241
287 if [ "${SINGLE_PATCH}" = "no" ] 242 if [ "${SINGLE_PATCH}" = "no" ]
288 then 243 then
289 einfo "Applying various patches (bugfixes/updates) ..." 244 einfo "${EPATCH_MULTI_MSG}"
290 fi 245 fi
291 for x in ${EPATCH_SOURCE} 246 for x in ${EPATCH_SOURCE}
292 do 247 do
293 # New ARCH dependant patch naming scheme ... 248 # New ARCH dependant patch naming scheme ...
294 # 249 #
295 # ???_arch_foo.patch 250 # ???_arch_foo.patch
296 # 251 #
297 if [ -f ${x} ] && \ 252 if [ -f ${x} ] && \
298 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 253 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
299 [ "${EPATCH_FORCE}" = "yes" ]) 254 [ "${EPATCH_FORCE}" = "yes" ])
300 then 255 then
301 local count=0 256 local count=0
302 local popts="${EPATCH_OPTS}" 257 local popts="${EPATCH_OPTS}"
258 local patchname=${x##*/}
303 259
304 if [ -n "${EPATCH_EXCLUDE}" ] 260 if [ -n "${EPATCH_EXCLUDE}" ]
305 then 261 then
306 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 262 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
307 then 263 then
308 continue 264 continue
309 fi 265 fi
310 fi 266 fi
311 267
313 then 269 then
314 if [ -n "${EPATCH_SINGLE_MSG}" ] 270 if [ -n "${EPATCH_SINGLE_MSG}" ]
315 then 271 then
316 einfo "${EPATCH_SINGLE_MSG}" 272 einfo "${EPATCH_SINGLE_MSG}"
317 else 273 else
318 einfo "Applying ${x##*/} ..." 274 einfo "Applying ${patchname} ..."
319 fi 275 fi
320 else 276 else
321 einfo " ${x##*/} ..." 277 einfo " ${patchname} ..."
322 fi 278 fi
323 279
324 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 280 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
325 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 281 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
326 282
327 # Allow for prefix to differ ... im lazy, so shoot me :/ 283 # Allow for prefix to differ ... im lazy, so shoot me :/
328 while [ "${count}" -lt 5 ] 284 while [ "${count}" -lt 5 ]
329 do 285 do
330 # Generate some useful debug info ... 286 # Generate some useful debug info ...
331 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 287 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
332 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 288 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 289
334 if [ "${PATCH_SUFFIX}" != "patch" ] 290 if [ "${PATCH_SUFFIX}" != "patch" ]
335 then 291 then
336 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 292 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 293 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 else 294 else
339 PATCH_TARGET="${x}" 295 PATCH_TARGET="${x}"
340 fi 296 fi
341 297
342 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 298 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 299 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
344 300
345 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 301 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
346 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 302 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
347 303
348 if [ "${PATCH_SUFFIX}" != "patch" ] 304 if [ "${PATCH_SUFFIX}" != "patch" ]
349 then 305 then
350 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 306 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
351 then 307 then
352 echo 308 echo
353 eerror "Could not extract patch!" 309 eerror "Could not extract patch!"
354 #die "Could not extract patch!" 310 #die "Could not extract patch!"
355 count=5 311 count=5
356 break 312 break
357 fi 313 fi
358 fi 314 fi
359 315
360 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 316 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
361 then 317 then
362 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 318 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
363 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 319 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
364 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
365 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
366 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
367 323
368 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 324 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
369 325
370 if [ "$?" -ne 0 ] 326 if [ "$?" -ne 0 ]
371 then 327 then
372 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 328 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
373 echo 329 echo
374 eerror "A dry-run of patch command succeeded, but actually" 330 eerror "A dry-run of patch command succeeded, but actually"
375 eerror "applying the patch failed!" 331 eerror "applying the patch failed!"
376 #die "Real world sux compared to the dreamworld!" 332 #die "Real world sux compared to the dreamworld!"
377 count=5 333 count=5
378 fi 334 fi
379 335
380 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 336 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
381 337
382 break 338 break
383 fi 339 fi
384 340
385 count=$((count + 1)) 341 count=$((count + 1))
391 fi 347 fi
392 348
393 if [ "${count}" -eq 5 ] 349 if [ "${count}" -eq 5 ]
394 then 350 then
395 echo 351 echo
396 eerror "Failed Patch: ${x##*/}!" 352 eerror "Failed Patch: ${patchname} !"
353 eerror " ( ${PATCH_TARGET} )"
397 eerror 354 eerror
398 eerror "Include in your bugreport the contents of:" 355 eerror "Include in your bugreport the contents of:"
399 eerror 356 eerror
400 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 357 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
401 echo 358 echo
402 die "Failed Patch: ${x##*/}!" 359 die "Failed Patch: ${patchname}!"
403 fi 360 fi
404 361
405 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 362 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
406 363
407 eend 0 364 eend 0
408 fi 365 fi
409 done 366 done
410 if [ "${SINGLE_PATCH}" = "no" ] 367 if [ "${SINGLE_PATCH}" = "no" ]
411 then 368 then
412 einfo "Done with patching" 369 einfo "Done with patching"
413 fi
414}
415
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 370 fi
540} 371}
541 372
542# Cheap replacement for when debianutils (and thus mktemp) 373# Cheap replacement for when debianutils (and thus mktemp)
543# does not exist on the users system 374# does not exist on the users system
577# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
578# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
579# 410#
580# egetent(database, key) 411# egetent(database, key)
581egetent() { 412egetent() {
582 if useq ppc-macos ; then 413 if [[ "${USERLAND}" == "Darwin" ]] ; then
583 case "$2" in 414 case "$2" in
584 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
585 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
586 ;; 417 ;;
587 *) # Numeric 418 *) # Numeric
588 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
589 ;; 420 ;;
590 esac 421 esac
591 elif useq x86-fbsd ; then 422 elif [[ "${USERLAND}" == "BSD" ]] ; then
592 local action 423 local action
593 if [ "$1" == "passwd" ] 424 if [ "$1" == "passwd" ]
594 then 425 then
595 action="user" 426 action="user"
596 else 427 else
616# homedir: /dev/null 447# homedir: /dev/null
617# groups: none 448# groups: none
618# extra: comment of 'added by portage for ${PN}' 449# extra: comment of 'added by portage for ${PN}'
619enewuser() { 450enewuser() {
620 # get the username 451 # get the username
621 local euser="$1"; shift 452 local euser=$1; shift
622 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
623 then
624 eerror "No username specified !" 454 eerror "No username specified !"
625 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
626 fi 456 fi
627 457
628 # lets see if the username already exists 458 # lets see if the username already exists
629 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
630 then
631 return 0 460 return 0
632 fi 461 fi
633 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
634 463
635 # options to pass to useradd 464 # options to pass to useradd
636 local opts= 465 local opts=
637 466
638 # handle uid 467 # handle uid
639 local euid="$1"; shift 468 local euid=$1; shift
640 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
641 then
642 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
643 then
644 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
645 then
646 euid="next" 472 euid="next"
647 fi 473 fi
648 else 474 else
649 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
650 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
651 fi 477 fi
652 else 478 else
653 euid="next" 479 euid="next"
654 fi 480 fi
655 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
656 then
657 local pwrange 482 local pwrange
658 if [ "${USERLAND}" == "BSD" ] ; then 483 if [[ ${USERLAND} == "BSD" ]] ; then
659 pwrange="`jot 898 101`" 484 pwrange=$(jot 898 101)
660 else 485 else
661 pwrange="`seq 101 999`" 486 pwrange=$(seq 101 999)
662 fi 487 fi
663 for euid in ${pwrange} ; do 488 for euid in ${pwrange} ; do
664 [ -z "`egetent passwd ${euid}`" ] && break 489 [[ -z $(egetent passwd ${euid}) ]] && break
665 done 490 done
666 fi 491 fi
667 opts="${opts} -u ${euid}" 492 opts="${opts} -u ${euid}"
668 einfo " - Userid: ${euid}" 493 einfo " - Userid: ${euid}"
669 494
670 # handle shell 495 # handle shell
671 local eshell="$1"; shift 496 local eshell=$1; shift
672 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 497 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
673 then
674 if [ ! -e "${eshell}" ] 498 if [[ ! -e ${eshell} ]] ; then
675 then
676 eerror "A shell was specified but it does not exist !" 499 eerror "A shell was specified but it does not exist !"
677 die "${eshell} does not exist" 500 die "${eshell} does not exist"
678 fi 501 fi
679 else 502 else
680 if [ "${USERLAND}" == "BSD" ] 503 case ${USERLAND} in
681 then
682 eshell="/usr/bin/false" 504 Darwin) eshell="/usr/bin/false";;
683 else 505 BSD) eshell="/usr/sbin/nologin";;
684 eshell="/bin/false" 506 *) eshell="/bin/false";;
685 fi 507 esac
686 fi 508 fi
687 einfo " - Shell: ${eshell}" 509 einfo " - Shell: ${eshell}"
688 opts="${opts} -s ${eshell}" 510 opts="${opts} -s ${eshell}"
689 511
690 # handle homedir 512 # handle homedir
691 local ehome="$1"; shift 513 local ehome=$1; shift
692 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 514 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
693 then
694 ehome="/dev/null" 515 ehome="/dev/null"
695 fi 516 fi
696 einfo " - Home: ${ehome}" 517 einfo " - Home: ${ehome}"
697 opts="${opts} -d ${ehome}" 518 opts="${opts} -d ${ehome}"
698 519
699 # handle groups 520 # handle groups
700 local egroups="$1"; shift 521 local egroups=$1; shift
701 if [ ! -z "${egroups}" ] 522 if [[ ! -z ${egroups} ]] ; then
702 then
703 local oldifs="${IFS}" 523 local oldifs=${IFS}
704 local defgroup="" exgroups="" 524 local defgroup="" exgroups=""
705 525
706 export IFS="," 526 export IFS=","
707 for g in ${egroups} 527 for g in ${egroups} ; do
708 do
709 export IFS="${oldifs}" 528 export IFS=${oldifs}
710 if [ -z "`egetent group \"${g}\"`" ] 529 if [[ -z $(egetent group "${g}") ]] ; then
711 then
712 eerror "You must add group ${g} to the system first" 530 eerror "You must add group ${g} to the system first"
713 die "${g} is not a valid GID" 531 die "${g} is not a valid GID"
714 fi 532 fi
715 if [ -z "${defgroup}" ] 533 if [[ -z ${defgroup} ]] ; then
716 then
717 defgroup="${g}" 534 defgroup=${g}
718 else 535 else
719 exgroups="${exgroups},${g}" 536 exgroups="${exgroups},${g}"
720 fi 537 fi
721 export IFS="," 538 export IFS=","
722 done 539 done
723 export IFS="${oldifs}" 540 export IFS=${oldifs}
724 541
725 opts="${opts} -g ${defgroup}" 542 opts="${opts} -g ${defgroup}"
726 if [ ! -z "${exgroups}" ] 543 if [[ ! -z ${exgroups} ]] ; then
727 then
728 opts="${opts} -G ${exgroups:1}" 544 opts="${opts} -G ${exgroups:1}"
729 fi 545 fi
730 else 546 else
731 egroups="(none)" 547 egroups="(none)"
732 fi 548 fi
733 einfo " - Groups: ${egroups}" 549 einfo " - Groups: ${egroups}"
734 550
735 # handle extra and add the user 551 # handle extra and add the user
736 local eextra="$@"
737 local oldsandbox="${SANDBOX_ON}" 552 local oldsandbox=${SANDBOX_ON}
738 export SANDBOX_ON="0" 553 export SANDBOX_ON="0"
739 if useq ppc-macos 554 case ${USERLAND} in
740 then 555 Darwin)
741 ### Make the user 556 ### Make the user
742 if [ -z "${eextra}" ] 557 if [[ -z $@ ]] ; then
743 then
744 dscl . create /users/${euser} uid ${euid} 558 dscl . create /users/${euser} uid ${euid}
745 dscl . create /users/${euser} shell ${eshell} 559 dscl . create /users/${euser} shell ${eshell}
746 dscl . create /users/${euser} home ${ehome} 560 dscl . create /users/${euser} home ${ehome}
747 dscl . create /users/${euser} realname "added by portage for ${PN}" 561 dscl . create /users/${euser} realname "added by portage for ${PN}"
748 ### Add the user to the groups specified 562 ### Add the user to the groups specified
749 local oldifs="${IFS}" 563 local oldifs=${IFS}
750 export IFS="," 564 export IFS=","
751 for g in ${egroups} 565 for g in ${egroups} ; do
752 do
753 dscl . merge /groups/${g} users ${euser} 566 dscl . merge /groups/${g} users ${euser}
754 done 567 done
755 export IFS="${oldifs}" 568 export IFS=${oldifs}
756 else 569 else
757 einfo "Extra options are not supported on macos yet" 570 einfo "Extra options are not supported on Darwin yet"
758 einfo "Please report the ebuild along with the info below" 571 einfo "Please report the ebuild along with the info below"
759 einfo "eextra: ${eextra}" 572 einfo "eextra: $@"
760 die "Required function missing" 573 die "Required function missing"
761 fi 574 fi
762 elif use x86-fbsd ; then 575 ;;
763 if [ -z "${eextra}" ] 576 BSD)
764 then 577 if [[ -z $@ ]] ; then
765 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
766 -c "added by portage for ${PN}" \ 579 -c "added by portage for ${PN}" \
767 die "enewuser failed" 580 die "enewuser failed"
768 else 581 else
769 einfo " - Extra: ${eextra}" 582 einfo " - Extra: $@"
770 pw useradd ${euser} ${opts} \ 583 pw useradd ${euser} ${opts} \
771 -c ${eextra} || die "enewuser failed" 584 "$@" || die "enewuser failed"
772 fi 585 fi
773 else 586 ;;
774 if [ -z "${eextra}" ] 587 *)
775 then 588 if [[ -z $@ ]] ; then
776 useradd ${opts} ${euser} \ 589 useradd ${opts} ${euser} \
777 -c "added by portage for ${PN}" \ 590 -c "added by portage for ${PN}" \
778 || die "enewuser failed" 591 || die "enewuser failed"
779 else 592 else
780 einfo " - Extra: ${eextra}" 593 einfo " - Extra: $@"
781 useradd ${opts} ${euser} ${eextra} \ 594 useradd ${opts} ${euser} "$@" \
782 || die "enewuser failed" 595 || die "enewuser failed"
783 fi 596 fi
784 fi 597 ;;
598 esac
785 export SANDBOX_ON="${oldsandbox}" 599 export SANDBOX_ON=${oldsandbox}
786 600
787 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 601 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
788 then 602 then
789 einfo " - Creating ${ehome} in ${D}" 603 einfo " - Creating ${ehome} in ${D}"
790 dodir ${ehome} 604 dodir ${ehome}
827 then 641 then
828 if [ "${egid}" -gt 0 ] 642 if [ "${egid}" -gt 0 ]
829 then 643 then
830 if [ -z "`egetent group ${egid}`" ] 644 if [ -z "`egetent group ${egid}`" ]
831 then 645 then
832 if useq ppc-macos ; then 646 if [[ "${USERLAND}" == "Darwin" ]]; then
833 opts="${opts} ${egid}" 647 opts="${opts} ${egid}"
834 else 648 else
835 opts="${opts} -g ${egid}" 649 opts="${opts} -g ${egid}"
836 fi 650 fi
837 else 651 else
851 opts="${opts} ${eextra}" 665 opts="${opts} ${eextra}"
852 666
853 # add the group 667 # add the group
854 local oldsandbox="${SANDBOX_ON}" 668 local oldsandbox="${SANDBOX_ON}"
855 export SANDBOX_ON="0" 669 export SANDBOX_ON="0"
856 if useq ppc-macos ; then 670 if [[ "${USERLAND}" == "Darwin" ]]; then
857 if [ ! -z "${eextra}" ]; 671 if [ ! -z "${eextra}" ];
858 then 672 then
859 einfo "Extra options are not supported on macos yet" 673 einfo "Extra options are not supported on Darwin/OS X yet"
860 einfo "Please report the ebuild along with the info below" 674 einfo "Please report the ebuild along with the info below"
861 einfo "eextra: ${eextra}" 675 einfo "eextra: ${eextra}"
862 die "Required function missing" 676 die "Required function missing"
863 fi 677 fi
864 678
869 [ -z "`egetent group ${egid}`" ] && break 683 [ -z "`egetent group ${egid}`" ] && break
870 done 684 done
871 esac 685 esac
872 dscl . create /groups/${egroup} gid ${egid} 686 dscl . create /groups/${egroup} gid ${egid}
873 dscl . create /groups/${egroup} passwd '*' 687 dscl . create /groups/${egroup} passwd '*'
874 elif use x86-fbsd ; then 688 elif [[ "${USERLAND}" == "BSD" ]] ; then
875 case ${egid} in 689 case ${egid} in
876 *[!0-9]*) # Non numeric 690 *[!0-9]*) # Non numeric
877 for egid in `jot 898 101`; do 691 for egid in `jot 898 101`; do
878 [ -z "`egetent group ${egid}`" ] && break 692 [ -z "`egetent group ${egid}`" ] && break
879 done 693 done
895 cp "${f}" ${T}/edos2unix 709 cp "${f}" ${T}/edos2unix
896 sed 's/\r$//' ${T}/edos2unix > "${f}" 710 sed 's/\r$//' ${T}/edos2unix > "${f}"
897 done 711 done
898} 712}
899 713
714
715##############################################################
716# START: Handle .desktop files and menu entries #
717# maybe this should be separated into a new eclass some time #
718# lanius@gentoo.org #
719##############################################################
720
900# Make a desktop file ! 721# Make a desktop file !
901# Great for making those icons in kde/gnome startmenu ! 722# Great for making those icons in kde/gnome startmenu !
902# Amaze your friends ! Get the women ! Join today ! 723# Amaze your friends ! Get the women ! Join today !
903# 724#
904# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 725# make_desktop_entry(<binary>, [name], [icon], [type], [path])
907# name: the name that will show up in the menu 728# name: the name that will show up in the menu
908# icon: give your little like a pretty little icon ... 729# icon: give your little like a pretty little icon ...
909# this can be relative (to /usr/share/pixmaps) or 730# this can be relative (to /usr/share/pixmaps) or
910# a full path to an icon 731# a full path to an icon
911# type: what kind of application is this ? for categories: 732# type: what kind of application is this ? for categories:
912# http://www.freedesktop.org/standards/menu-spec/ 733# http://www.freedesktop.org/Standards/desktop-entry-spec
913# path: if your app needs to startup in a specific dir 734# path: if your app needs to startup in a specific dir
914make_desktop_entry() { 735make_desktop_entry() {
915 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 736 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
916 737
917 local exec="${1}" 738 local exec=${1}
918 local name="${2:-${PN}}" 739 local name=${2:-${PN}}
919 local icon="${3:-${PN}.png}" 740 local icon=${3:-${PN}.png}
920 local type="${4}" 741 local type=${4}
921 local subdir="${6}" 742 local path=${5}
922 local path="${5:-${GAMES_BINDIR}}" 743
923 if [ -z "${type}" ] 744 if [[ -z ${type} ]] ; then
924 then 745 local catmaj=${CATEGORY%%-*}
925 case ${CATEGORY} in 746 local catmin=${CATEGORY##*-}
926 "app-emulation") 747 case ${catmaj} in
927 type=Emulator 748 app)
928 subdir="Emulation" 749 case ${catmin} in
750 admin) type=System;;
751 cdr) type=DiscBurning;;
752 dicts) type=Dictionary;;
753 editors) type=TextEditor;;
754 emacs) type=TextEditor;;
755 emulation) type=Emulator;;
756 laptop) type=HardwareSettings;;
757 office) type=Office;;
758 vim) type=TextEditor;;
759 xemacs) type=TextEditor;;
760 *) type=;;
761 esac
929 ;; 762 ;;
930 "games-"*) 763
931 type=Game 764 dev)
932 subdir="Games" 765 type="Development"
933 ;; 766 ;;
934 "net-"*) 767
935 type=Network 768 games)
936 subdir="${type}" 769 case ${catmin} in
770 action) type=ActionGame;;
771 arcade) type=ArcadeGame;;
772 board) type=BoardGame;;
773 kid) type=KidsGame;;
774 emulation) type=Emulator;;
775 puzzle) type=LogicGame;;
776 rpg) type=RolePlaying;;
777 roguelike) type=RolePlaying;;
778 simulation) type=Simulation;;
779 sports) type=SportsGame;;
780 strategy) type=StrategyGame;;
781 *) type=;;
782 esac
783 type="Game;${type}"
937 ;; 784 ;;
785
786 mail)
787 type="Network;Email"
788 ;;
789
790 media)
791 case ${catmin} in
792 gfx) type=Graphics;;
793 radio) type=Tuner;;
794 sound) type=Audio;;
795 tv) type=TV;;
796 video) type=Video;;
797 *) type=;;
798 esac
799 type="AudioVideo;${type}"
800 ;;
801
802 net)
803 case ${catmin} in
804 dialup) type=Dialup;;
805 ftp) type=FileTransfer;;
806 im) type=InstantMessaging;;
807 irc) type=IRCClient;;
808 mail) type=Email;;
809 news) type=News;;
810 nntp) type=News;;
811 p2p) type=FileTransfer;;
812 *) type=;;
813 esac
814 type="Network;${type}"
815 ;;
816
817 sci)
818 case ${catmin} in
819 astro*) type=Astronomoy;;
820 bio*) type=Biology;;
821 calc*) type=Calculator;;
822 chem*) type=Chemistry;;
823 geo*) type=Geology;;
824 math*) type=Math;;
825 *) type=;;
826 esac
827 type="Science;${type}"
828 ;;
829
830 www)
831 case ${catmin} in
832 client) type=WebBrowser;;
833 *) type=;;
834 esac
835 type="Network"
836 ;;
837
938 *) 838 *)
939 type= 839 type=
940 subdir=
941 ;; 840 ;;
942 esac 841 esac
943 fi 842 fi
843 if [ "${SLOT}" == "0" ] ; then
844 local desktop_name="${PN}"
845 else
846 local desktop_name="${PN}-${SLOT}"
847 fi
944 local desktop="${T}/${exec}.desktop" 848 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
945 849
946echo "[Desktop Entry] 850echo "[Desktop Entry]
947Encoding=UTF-8 851Encoding=UTF-8
948Version=0.9.2 852Version=0.9.2
949Name=${name} 853Name=${name}
957 insinto /usr/share/applications 861 insinto /usr/share/applications
958 doins "${desktop}" 862 doins "${desktop}"
959 863
960 return 0 864 return 0
961} 865}
866
867# Make a GDM/KDM Session file
868#
869# make_desktop_entry(<title>, <command>)
870# title: File to execute to start the Window Manager
871# command: Name of the Window Manager
872
873make_session_desktop() {
874 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
875 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
876
877 local title=$1
878 local command=$2
879 local desktop=${T}/${wm}.desktop
880
881echo "[Desktop Entry]
882Encoding=UTF-8
883Name=${title}
884Comment=This session logs you into ${title}
885Exec=${command}
886TryExec=${command}
887Type=Application" > "${desktop}"
888
889 insinto /usr/share/xsessions
890 doins "${desktop}"
891}
892
893domenu() {
894 local i j
895 insinto /usr/share/applications
896 for i in "$@" ; do
897 if [[ -f ${i} ]] ; then
898 doins "${i}"
899 elif [[ -d ${i} ]] ; then
900 for j in "${i}"/*.desktop ; do
901 doins "${j}"
902 done
903 fi
904 done
905}
906newmenu() {
907 insinto /usr/share/applications
908 newins "$1" "$2"
909}
910
911doicon() {
912 local i j
913 insinto /usr/share/pixmaps
914 for i in "$@" ; do
915 if [[ -f ${i} ]] ; then
916 doins "${i}"
917 elif [[ -d ${i} ]] ; then
918 for j in "${i}"/*.png ; do
919 doins "${j}"
920 done
921 fi
922 done
923}
924newicon() {
925 insinto /usr/share/pixmaps
926 newins "$1" "$2"
927}
928
929##############################################################
930# END: Handle .desktop files and menu entries #
931##############################################################
932
962 933
963# for internal use only (unpack_pdv and unpack_makeself) 934# for internal use only (unpack_pdv and unpack_makeself)
964find_unpackable_file() { 935find_unpackable_file() {
965 local src="$1" 936 local src="$1"
966 if [ -z "${src}" ] 937 if [ -z "${src}" ]
1247 export CDROM_TOTAL_CDS=${cdcnt} 1218 export CDROM_TOTAL_CDS=${cdcnt}
1248 export CDROM_CURRENT_CD=1 1219 export CDROM_CURRENT_CD=1
1249 1220
1250 # now we see if the user gave use CD_ROOT ... 1221 # now we see if the user gave use CD_ROOT ...
1251 # if they did, let's just believe them that it's correct 1222 # if they did, let's just believe them that it's correct
1252 if [ ! -z "${CD_ROOT}" ] ; then 1223 if [[ ! -z ${CD_ROOT} ]] ; then
1253 export CDROM_ROOT="${CD_ROOT}" 1224 export CDROM_ROOT=${CD_ROOT}
1254 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1225 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1255 return 1226 return
1256 fi 1227 fi
1257 # do the same for CD_ROOT_X 1228 # do the same for CD_ROOT_X
1258 if [ ! -z "${CD_ROOT_1}" ] ; then 1229 if [[ ! -z ${CD_ROOT_1} ]] ; then
1259 local var= 1230 local var=
1260 cdcnt=0 1231 cdcnt=0
1261 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1232 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1262 cdcnt=$((cdcnt + 1)) 1233 cdcnt=$((cdcnt + 1))
1263 var="CD_ROOT_${cdcnt}" 1234 var="CD_ROOT_${cdcnt}"
1264 if [ -z "${!var}" ] ; then 1235 if [[ -z ${!var} ]] ; then
1265 eerror "You must either use just the CD_ROOT" 1236 eerror "You must either use just the CD_ROOT"
1266 eerror "or specify ALL the CD_ROOT_X variables." 1237 eerror "or specify ALL the CD_ROOT_X variables."
1267 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1238 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1268 die "could not locate CD_ROOT_${cdcnt}" 1239 die "could not locate CD_ROOT_${cdcnt}"
1269 fi 1240 fi
1272 export CDROM_ROOT=${CDROM_ROOTS_1} 1243 export CDROM_ROOT=${CDROM_ROOTS_1}
1273 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1244 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1274 return 1245 return
1275 fi 1246 fi
1276 1247
1277 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1248 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1278 einfon "This ebuild will need the " 1249 einfon "This ebuild will need the "
1279 if [ -z "${CDROM_NAME}" ] ; then 1250 if [[ -z ${CDROM_NAME} ]] ; then
1280 echo "cdrom for ${PN}." 1251 echo "cdrom for ${PN}."
1281 else 1252 else
1282 echo "${CDROM_NAME}." 1253 echo "${CDROM_NAME}."
1283 fi 1254 fi
1284 echo 1255 echo
1285 einfo "If you do not have the CD, but have the data files" 1256 einfo "If you do not have the CD, but have the data files"
1286 einfo "mounted somewhere on your filesystem, just export" 1257 einfo "mounted somewhere on your filesystem, just export"
1287 einfo "the variable CD_ROOT so that it points to the" 1258 einfo "the variable CD_ROOT so that it points to the"
1288 einfo "directory containing the files." 1259 einfo "directory containing the files."
1289 echo 1260 echo
1261 einfo "For example:"
1262 einfo "export CD_ROOT=/mnt/cdrom"
1263 echo
1290 else 1264 else
1291 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1265 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1292 cdcnt=0 1266 cdcnt=0
1293 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1267 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1294 cdcnt=$((cdcnt + 1)) 1268 cdcnt=$((cdcnt + 1))
1295 var="CDROM_NAME_${cdcnt}" 1269 var="CDROM_NAME_${cdcnt}"
1296 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1270 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1297 done 1271 done
1298 echo 1272 echo
1299 einfo "If you do not have the CDs, but have the data files" 1273 einfo "If you do not have the CDs, but have the data files"
1300 einfo "mounted somewhere on your filesystem, just export" 1274 einfo "mounted somewhere on your filesystem, just export"
1301 einfo "the following variables so they point to the right place:" 1275 einfo "the following variables so they point to the right place:"
1302 einfon "" 1276 einfon ""
1303 cdcnt=0 1277 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1278 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1279 cdcnt=$((cdcnt + 1))
1306 echo -n " CD_ROOT_${cdcnt}" 1280 echo -n " CD_ROOT_${cdcnt}"
1307 done 1281 done
1308 echo 1282 echo
1309 einfo "Or, if you have all the files in the same place, or" 1283 einfo "Or, if you have all the files in the same place, or"
1310 einfo "you only have one cdrom, you can export CD_ROOT" 1284 einfo "you only have one cdrom, you can export CD_ROOT"
1311 einfo "and that place will be used as the same data source" 1285 einfo "and that place will be used as the same data source"
1312 einfo "for all the CDs." 1286 einfo "for all the CDs."
1313 echo 1287 echo
1288 einfo "For example:"
1289 einfo "export CD_ROOT_1=/mnt/cdrom"
1290 echo
1314 fi 1291 fi
1315 export CDROM_CURRENT_CD=0 1292 export CDROM_CURRENT_CD=0
1316 cdrom_load_next_cd 1293 cdrom_load_next_cd
1317} 1294}
1318 1295
1322# remember, you can only go forward in the cd chain, you can't go back. 1299# remember, you can only go forward in the cd chain, you can't go back.
1323cdrom_load_next_cd() { 1300cdrom_load_next_cd() {
1324 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1301 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1325 local var= 1302 local var=
1326 1303
1327 if [ ! -z "${CD_ROOT}" ] ; then 1304 if [[ ! -z ${CD_ROOT} ]] ; then
1328 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1305 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1329 return 1306 return
1330 fi 1307 fi
1331 1308
1332 unset CDROM_ROOT 1309 unset CDROM_ROOT
1333 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1310 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1334 if [ -z "${!var}" ] ; then 1311 if [[ -z ${!var} ]] ; then
1335 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1312 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1336 cdrom_locate_file_on_cd ${!var} 1313 cdrom_locate_file_on_cd ${!var}
1337 else 1314 else
1338 export CDROM_ROOT="${!var}" 1315 export CDROM_ROOT=${!var}
1339 fi 1316 fi
1340 1317
1341 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1318 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1342} 1319}
1343 1320
1347# found, then a message asking for the user to insert the cdrom will be 1324# found, then a message asking for the user to insert the cdrom will be
1348# displayed and we'll hang out here until: 1325# displayed and we'll hang out here until:
1349# (1) the file is found on a mounted cdrom 1326# (1) the file is found on a mounted cdrom
1350# (2) the user hits CTRL+C 1327# (2) the user hits CTRL+C
1351cdrom_locate_file_on_cd() { 1328cdrom_locate_file_on_cd() {
1352 while [ -z "${CDROM_ROOT}" ] ; do 1329 while [[ -z ${CDROM_ROOT} ]] ; do
1353 local dir="$(dirname ${@})" 1330 local dir=$(dirname "$*")
1354 local file="$(basename ${@})" 1331 local file=$(basename "$*")
1355 local mline="" 1332 local mline=""
1356 local showedmsg=0 1333 local showedmsg=0
1357 1334
1358 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1335 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1359 [ -d "${mline}/${dir}" ] || continue 1336 [[ -d ${mline}/${dir} ]] || continue
1360 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1337 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1361 && export CDROM_ROOT=${mline} 1338 && export CDROM_ROOT=${mline}
1362 done 1339 done
1363 1340
1364 if [ -z "${CDROM_ROOT}" ] ; then 1341 if [[ -z ${CDROM_ROOT} ]] ; then
1365 echo 1342 echo
1366 if [ ${showedmsg} -eq 0 ] ; then 1343 if [[ ${showedmsg} -eq 0 ]] ; then
1367 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1344 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1368 if [ -z "${CDROM_NAME}" ] ; then 1345 if [[ -z ${CDROM_NAME} ]] ; then
1369 einfo "Please insert the cdrom for ${PN} now !" 1346 einfo "Please insert the cdrom for ${PN} now !"
1370 else 1347 else
1371 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1348 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1372 fi 1349 fi
1373 else 1350 else
1374 if [ -z "${CDROM_NAME_1}" ] ; then 1351 if [[ -z ${CDROM_NAME_1} ]] ; then
1375 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1352 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1376 else 1353 else
1377 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1354 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1378 einfo "Please insert+mount the ${!var} cdrom now !" 1355 einfo "Please insert+mount the ${!var} cdrom now !"
1379 fi 1356 fi
1380 fi 1357 fi
1381 showedmsg=1 1358 showedmsg=1
1382 fi 1359 fi
1383 einfo "Press return to scan for the cd again" 1360 einfo "Press return to scan for the cd again"
1384 einfo "or hit CTRL+C to abort the emerge." 1361 einfo "or hit CTRL+C to abort the emerge."
1362 echo
1363 einfo "If you are having trouble with the detection"
1364 einfo "of your CD, it is possible that you do not have"
1365 einfo "Joliet support enabled in your kernel. Please"
1366 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1385 read 1367 read
1386 fi 1368 fi
1387 done 1369 done
1388} 1370}
1389 1371
1399# directories and uses the intersection of the lists. 1381# directories and uses the intersection of the lists.
1400# The -u builds a list of po files found in all the 1382# The -u builds a list of po files found in all the
1401# directories and uses the union of the lists. 1383# directories and uses the union of the lists.
1402strip-linguas() { 1384strip-linguas() {
1403 local ls newls 1385 local ls newls
1404 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1386 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1405 local op="$1"; shift 1387 local op=$1; shift
1406 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1388 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1407 local d f 1389 local d f
1408 for d in "$@" ; do 1390 for d in "$@" ; do
1409 if [ "${op}" == "-u" ] ; then 1391 if [[ ${op} == "-u" ]] ; then
1410 newls="${ls}" 1392 newls=${ls}
1411 else 1393 else
1412 newls="" 1394 newls=""
1413 fi 1395 fi
1414 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1396 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1415 if [ "${op}" == "-i" ] ; then 1397 if [[ ${op} == "-i" ]] ; then
1416 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1398 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1417 else 1399 else
1418 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1400 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1419 fi 1401 fi
1420 done 1402 done
1421 ls="${newls}" 1403 ls=${newls}
1422 done 1404 done
1423 ls="${ls//.po}" 1405 ls=${ls//.po}
1424 else 1406 else
1425 ls="$@" 1407 ls=$@
1426 fi 1408 fi
1427 1409
1428 ls=" ${ls} " 1410 ls=" ${ls} "
1429 newls="" 1411 newls=""
1430 for f in ${LINGUAS} ; do 1412 for f in ${LINGUAS} ; do
1431 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1413 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1432 newls="${newls} ${f}" 1414 newls="${newls} ${f}"
1433 else 1415 else
1434 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1416 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1435 fi 1417 fi
1436 done 1418 done
1437 if [ -z "${newls}" ] ; then 1419 if [[ -z ${newls} ]] ; then
1438 unset LINGUAS 1420 export LINGUAS=""
1439 else 1421 else
1440 export LINGUAS="${newls}" 1422 export LINGUAS=${newls:1}
1441 fi 1423 fi
1442} 1424}
1443 1425
1444# moved from kernel.eclass since they are generally useful outside of 1426# moved from kernel.eclass since they are generally useful outside of
1445# kernel.eclass -iggy (20041002) 1427# kernel.eclass -iggy (20041002)
1447# the following functions are useful in kernel module ebuilds, etc. 1429# the following functions are useful in kernel module ebuilds, etc.
1448# for an example see ivtv or drbd ebuilds 1430# for an example see ivtv or drbd ebuilds
1449 1431
1450# set's ARCH to match what the kernel expects 1432# set's ARCH to match what the kernel expects
1451set_arch_to_kernel() { 1433set_arch_to_kernel() {
1434 i=10
1435 while ((i--)) ; do
1436 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1437 done
1452 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1438 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1453 case ${ARCH} in 1439 case ${ARCH} in
1454 x86) export ARCH="i386";; 1440 x86) export ARCH="i386";;
1455 amd64) export ARCH="x86_64";; 1441 amd64) export ARCH="x86_64";;
1456 hppa) export ARCH="parisc";; 1442 hppa) export ARCH="parisc";;
1457 mips) export ARCH="mips";; 1443 mips) export ARCH="mips";;
1444 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!
1458 *) export ARCH="${ARCH}";; 1445 *) export ARCH="${ARCH}";;
1459 esac 1446 esac
1460} 1447}
1461 1448
1462# set's ARCH back to what portage expects 1449# set's ARCH back to what portage expects
1463set_arch_to_portage() { 1450set_arch_to_portage() {
1451 i=10
1452 while ((i--)) ; do
1453 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1454 done
1464 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1455 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1465} 1456}
1466 1457
1467# Jeremy Huddleston <eradicator@gentoo.org>: 1458# Jeremy Huddleston <eradicator@gentoo.org>:
1468# preserve_old_lib /path/to/libblah.so.0 1459# preserve_old_lib /path/to/libblah.so.0
1498 touch ${D}${LIB} 1489 touch ${D}${LIB}
1499 fi 1490 fi
1500} 1491}
1501 1492
1502preserve_old_lib_notify() { 1493preserve_old_lib_notify() {
1503 LIB=$1 1494 LIB=$1
1504 1495
1505 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1496 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1506 SONAME=`basename ${LIB}` 1497 SONAME=`basename ${LIB}`
1507 1498
1508 einfo "An old version of an installed library was detected on your system." 1499 ewarn "An old version of an installed library was detected on your system."
1509 einfo "In order to avoid breaking packages that link against is, this older version" 1500 ewarn "In order to avoid breaking packages that link against it, this older version"
1510 einfo "is not being removed. In order to make full use of this newer version," 1501 ewarn "is not being removed. In order to make full use of this newer version,"
1511 einfo "you will need to execute the following command:" 1502 ewarn "you will need to execute the following command:"
1512 einfo " revdep-rebuild --soname ${SONAME}" 1503 ewarn " revdep-rebuild --soname ${SONAME}"
1513 einfo 1504 ewarn
1514 einfo "After doing that, you can safely remove ${LIB}" 1505 ewarn "After doing that, you can safely remove ${LIB}"
1515 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1506 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1516 fi 1507 fi
1517} 1508}
1518 1509
1519# Hack for people to figure out if a package was built with 1510# Hack for people to figure out if a package was built with
1520# certain USE flags 1511# certain USE flags
1521# 1512#
1522# Usage: built_with_use <DEPEND ATOM> <List of USE flags> 1513# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1523# ex: built_with_use xchat gtk2 1514# ex: built_with_use xchat gtk2
1515#
1516# Flags: -a all USE flags should be utilized
1517# -o at least one USE flag should be utilized
1518# Note: the default flag is '-a'
1524built_with_use() { 1519built_with_use() {
1520 local opt=$1
1521 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1522
1525 local PKG=$(portageq best_version ${ROOT} $1) 1523 local PKG=$(best_version $1)
1524 shift
1525
1526 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1526 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1527 [[ ! -e ${USEFILE} ]] && return 1 1527 [[ ! -e ${USEFILE} ]] && return 1
1528 1528
1529 local USE_BUILT=$(<${USEFILE}) 1529 local USE_BUILT=$(<${USEFILE})
1530
1531 shift
1532 while [ $# -gt 0 ] ; do 1530 while [[ $# -gt 0 ]] ; do
1531 if [[ ${opt} = "-o" ]] ; then
1532 has $1 ${USE_BUILT} && return 0
1533 else
1533 has $1 ${USE_BUILT} || return 1 1534 has $1 ${USE_BUILT} || return 1
1535 fi
1534 shift 1536 shift
1535 done 1537 done
1536 return 0 1538 [[ ${opt} = "-a" ]]
1537} 1539}
1538 1540
1539# Many configure scripts wrongly bail when a C++ compiler 1541# Many configure scripts wrongly bail when a C++ compiler
1540# could not be detected. #73450 1542# could not be detected. #73450
1541epunt_cxx() { 1543epunt_cxx() {
1542 EPATCH_SINGLE_MSG="Removing useless C++ checks ..." \ 1544 local dir=$1
1545 [[ -z ${dir} ]] && dir=${S}
1546 ebegin "Removing useless C++ checks"
1547 local f
1548 for f in $(find ${dir} -name configure) ; do
1543 epatch "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" 1549 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1550 done
1551 eend 0
1544} 1552}
1553
1554# dopamd <file> [more files]
1555#
1556# Install pam auth config file in /etc/pam.d
1557dopamd() {
1558 [[ -z $1 ]] && die "dopamd requires at least one argument"
1559
1560 use pam || return 0
1561
1562 INSDESTTREE=/etc/pam.d \
1563 doins "$@" || die "failed to install $@"
1564}
1565# newpamd <old name> <new name>
1566#
1567# Install pam file <old name> as <new name> in /etc/pam.d
1568newpamd() {
1569 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1570
1571 use pam || return 0
1572
1573 INSDESTTREE=/etc/pam.d \
1574 newins "$1" "$2" || die "failed to install $1 as $2"
1575}
1576
1577# make a wrapper script ...
1578# NOTE: this was originally games_make_wrapper, but I noticed other places where
1579# this could be used, so I have moved it here and made it not games-specific
1580# -- wolf31o2
1581# $1 == wrapper name
1582# $2 == binary to run
1583# $3 == directory to chdir before running binary
1584# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1585# $5 == path for wrapper
1586make_wrapper() {
1587 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1588 local tmpwrapper=$(emktemp)
1589 cat << EOF > "${tmpwrapper}"
1590#!/bin/sh
1591cd "${chdir}"
1592export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1593exec ${bin} "\$@"
1594EOF
1595 chmod go+rx "${tmpwrapper}"
1596 if [ -n "${5}" ]
1597 then
1598 exeinto ${5}
1599 newexe "${tmpwrapper}" "${wrapper}"
1600 else
1601 newbin "${tmpwrapper}" "${wrapper}"
1602 fi
1603}

Legend:
Removed from v.1.126  
changed lines
  Added in v.1.192

  ViewVC Help
Powered by ViewVC 1.1.20