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

Diff of /eclass/eutils.eclass

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

Revision 1.128 Revision 1.181
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.128 2004/12/23 09:20:45 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.181 2005/06/09 15:25:56 azarah 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
12inherit multilib
12ECLASS=eutils 13ECLASS=eutils
13INHERITED="$INHERITED $ECLASS" 14INHERITED="$INHERITED $ECLASS"
14 15
15DEPEND="!bootstrap? ( sys-devel/patch )" 16DEPEND="!bootstrap? ( sys-devel/patch userland_GNU? ( sys-apps/shadow ) )"
17# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 18
17DESCRIPTION="Based on the ${ECLASS} eclass" 19DESCRIPTION="Based on the ${ECLASS} eclass"
18 20
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 21# 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 22# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
41 sleep 1 43 sleep 1
42 done 44 done
43 fi 45 fi
44} 46}
45 47
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)
53#
54# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004):
55# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set,
56# fall back on old behavior. Any profile that has these set should also
57# depend on a newer version of portage (not yet released) which uses these
58# over CONF_LIBDIR in econf, dolib, etc...
59#
60# For now, this is restricted to the sparc64-multilib ${PROFILE_ARCH} as it
61# is still in testing.
62get_libdir() {
63 LIBDIR_TEST=$(type econf)
64 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
65 # if there is an override, we want to use that... always.
66 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
67 # We don't need to know the verison of portage. We only need to know
68 # if there is support for CONF_LIBDIR in econf and co.
69 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
70 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
71 # # and if there isnt an override, and we're using a version of
72 # # portage without CONF_LIBDIR support, force the use of lib. dolib
73 # # and friends from portage 2.0.50 wont be too happy otherwise.
74 # CONF_LIBDIR="lib"
75 #fi
76 elif [ "${PROFILE_ARCH}" = "sparc64-multilib" ]; then # Using eradicator's LIBDIR_<abi> approach...
77 CONF_LIBDIR="$(get_abi_LIBDIR)"
78 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
79 # will be <portage-2.0.51_pre20
80 CONF_LIBDIR="lib"
81 fi
82 # and of course, default to lib if CONF_LIBDIR isnt set
83 echo ${CONF_LIBDIR:=lib}
84 unset LIBDIR_TEST
85}
86
87get_multilibdir() {
88 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_multilibdir called, but it shouldn't be needed on sparc64-multilib"
89 echo ${CONF_MULTILIBDIR:=lib32}
90}
91
92# Sometimes you need to override the value returned by get_libdir. A good
93# example of this is xorg-x11, where lib32 isnt a supported configuration,
94# and where lib64 -must- be used on amd64 (for applications that need lib
95# to be 32bit, such as adobe acrobat). Note that this override also bypasses
96# portage version sanity checking.
97# get_libdir_override expects one argument, the result get_libdir should
98# return:
99#
100# get_libdir_override lib64
101#
102# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
103get_libdir_override() {
104 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_libdir_override called, but it shouldn't be needed on sparc64-multilib..."
105 CONF_LIBDIR="$1"
106 CONF_LIBDIR_OVERRIDE="$1"
107}
108
109# This function generate linker scripts in /usr/lib for dynamic 48# This function generate linker scripts in /usr/lib for dynamic
110# libs in /lib. This is to fix linking problems when you have 49# libs in /lib. This is to fix linking problems when you have
111# the .so in /lib, and the .a in /usr/lib. What happens is that 50# the .so in /lib, and the .a in /usr/lib. What happens is that
112# in some cases when linking dynamic, the .a in /usr/lib is used 51# in some cases when linking dynamic, the .a in /usr/lib is used
113# instead of the .so in /lib due to gcc/libtool tweaking ld's 52# instead of the .so in /lib due to gcc/libtool tweaking ld's
127gen_usr_ldscript() { 66gen_usr_ldscript() {
128 local libdir="$(get_libdir)" 67 local libdir="$(get_libdir)"
129 # Just make sure it exists 68 # Just make sure it exists
130 dodir /usr/${libdir} 69 dodir /usr/${libdir}
131 70
71 for lib in "${@}" ; do
132 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 72 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
133/* GNU ld script 73 /* GNU ld script
134 Because Gentoo have critical dynamic libraries 74 Since Gentoo has critical dynamic libraries
135 in /lib, and the static versions in /usr/lib, we 75 in /lib, and the static versions in /usr/lib,
136 need to have a "fake" dynamic lib in /usr/lib, 76 we need to have a "fake" dynamic lib in /usr/lib,
137 otherwise we run into linking problems. 77 otherwise we run into linking problems.
138 See bug #4411 on http://bugs.gentoo.org/ for 78
139 more info. */ 79 See bug http://bugs.gentoo.org/4411 for more info.
80 */
140GROUP ( /${libdir}/${1} ) 81 GROUP ( /${libdir}/${lib} )
141END_LDSCRIPT 82 END_LDSCRIPT
142 fperms a+x "/usr/${libdir}/${1}" 83 fperms a+x "/usr/${libdir}/${lib}"
84 done
143} 85}
144 86
145# Simple function to draw a line consisting of '=' the same length as $* 87# Simple function to draw a line consisting of '=' the same length as $*
88# - only to be used by epatch()
146# 89#
147# <azarah@gentoo.org> (11 Nov 2002) 90# <azarah@gentoo.org> (11 Nov 2002)
148# 91#
149draw_line() { 92draw_line() {
150 local i=0 93 local i=0
176EPATCH_SOURCE="${WORKDIR}/patch" 119EPATCH_SOURCE="${WORKDIR}/patch"
177# Default extension for patches 120# Default extension for patches
178EPATCH_SUFFIX="patch.bz2" 121EPATCH_SUFFIX="patch.bz2"
179# Default options for patch 122# Default options for patch
180# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 123# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
181EPATCH_OPTS="-g0" 124# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
125EPATCH_OPTS="-g0 --no-backup-if-mismatch"
182# List of patches not to apply. Not this is only file names, 126# List of patches not to apply. Not this is only file names,
183# and not the full path .. 127# and not the full path ..
184EPATCH_EXCLUDE="" 128EPATCH_EXCLUDE=""
185# Change the printed message for a single patch. 129# Change the printed message for a single patch.
186EPATCH_SINGLE_MSG="" 130EPATCH_SINGLE_MSG=""
131# Change the printed message for multiple patches.
132EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
187# Force applying bulk patches even if not following the style: 133# Force applying bulk patches even if not following the style:
188# 134#
189# ??_${ARCH}_foo.${EPATCH_SUFFIX} 135# ??_${ARCH}_foo.${EPATCH_SUFFIX}
190# 136#
191EPATCH_FORCE="no" 137EPATCH_FORCE="no"
232 local x="" 178 local x=""
233 179
234 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
235 then 181 then
236 local m="" 182 local m=""
237 einfo "${#} patches to apply ..."
238 for m in "$@" ; do 183 for m in "$@" ; do
239 epatch "${m}" 184 epatch "${m}"
240 done 185 done
241 return 0 186 return 0
242 fi 187 fi
267 212
268 echo 213 echo
269 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 214 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
270 eerror 215 eerror
271 eerror " ${EPATCH_SOURCE}" 216 eerror " ${EPATCH_SOURCE}"
217 eerror " ( ${EPATCH_SOURCE##*/} )"
272 echo 218 echo
273 die "Cannot find \$EPATCH_SOURCE!" 219 die "Cannot find \$EPATCH_SOURCE!"
274 fi 220 fi
275 221
276 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 222 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
295 ;; 241 ;;
296 esac 242 esac
297 243
298 if [ "${SINGLE_PATCH}" = "no" ] 244 if [ "${SINGLE_PATCH}" = "no" ]
299 then 245 then
300 einfo "Applying various patches (bugfixes/updates) ..." 246 einfo "${EPATCH_MULTI_MSG}"
301 fi 247 fi
302 for x in ${EPATCH_SOURCE} 248 for x in ${EPATCH_SOURCE}
303 do 249 do
304 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
305 # 251 #
306 # ???_arch_foo.patch 252 # ???_arch_foo.patch
307 # 253 #
308 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
309 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 255 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
310 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
311 then 257 then
312 local count=0 258 local count=0
313 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
260 local patchname=${x##*/}
314 261
315 if [ -n "${EPATCH_EXCLUDE}" ] 262 if [ -n "${EPATCH_EXCLUDE}" ]
316 then 263 then
317 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 264 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
318 then 265 then
319 continue 266 continue
320 fi 267 fi
321 fi 268 fi
322 269
324 then 271 then
325 if [ -n "${EPATCH_SINGLE_MSG}" ] 272 if [ -n "${EPATCH_SINGLE_MSG}" ]
326 then 273 then
327 einfo "${EPATCH_SINGLE_MSG}" 274 einfo "${EPATCH_SINGLE_MSG}"
328 else 275 else
329 einfo "Applying ${x##*/} ..." 276 einfo "Applying ${patchname} ..."
330 fi 277 fi
331 else 278 else
332 einfo " ${x##*/} ..." 279 einfo " ${patchname} ..."
333 fi 280 fi
334 281
335 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
336 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 284
338 # Allow for prefix to differ ... im lazy, so shoot me :/ 285 # Allow for prefix to differ ... im lazy, so shoot me :/
339 while [ "${count}" -lt 5 ] 286 while [ "${count}" -lt 5 ]
340 do 287 do
341 # Generate some useful debug info ... 288 # Generate some useful debug info ...
342 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
344 291
345 if [ "${PATCH_SUFFIX}" != "patch" ] 292 if [ "${PATCH_SUFFIX}" != "patch" ]
346 then 293 then
347 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
348 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
349 else 296 else
350 PATCH_TARGET="${x}" 297 PATCH_TARGET="${x}"
351 fi 298 fi
352 299
353 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
354 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
355 302
356 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
357 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
358 305
359 if [ "${PATCH_SUFFIX}" != "patch" ] 306 if [ "${PATCH_SUFFIX}" != "patch" ]
360 then 307 then
361 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
362 then 309 then
363 echo 310 echo
364 eerror "Could not extract patch!" 311 eerror "Could not extract patch!"
365 #die "Could not extract patch!" 312 #die "Could not extract patch!"
366 count=5 313 count=5
367 break 314 break
368 fi 315 fi
369 fi 316 fi
370 317
371 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
372 then 319 then
373 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
374 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
375 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
376 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
377 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
378 325
379 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
380 327
381 if [ "$?" -ne 0 ] 328 if [ "$?" -ne 0 ]
382 then 329 then
383 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
384 echo 331 echo
385 eerror "A dry-run of patch command succeeded, but actually" 332 eerror "A dry-run of patch command succeeded, but actually"
386 eerror "applying the patch failed!" 333 eerror "applying the patch failed!"
387 #die "Real world sux compared to the dreamworld!" 334 #die "Real world sux compared to the dreamworld!"
388 count=5 335 count=5
389 fi 336 fi
390 337
391 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 338 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
392 339
393 break 340 break
394 fi 341 fi
395 342
396 count=$((count + 1)) 343 count=$((count + 1))
402 fi 349 fi
403 350
404 if [ "${count}" -eq 5 ] 351 if [ "${count}" -eq 5 ]
405 then 352 then
406 echo 353 echo
407 eerror "Failed Patch: ${x##*/}!" 354 eerror "Failed Patch: ${patchname} !"
355 eerror " ( ${PATCH_TARGET} )"
408 eerror 356 eerror
409 eerror "Include in your bugreport the contents of:" 357 eerror "Include in your bugreport the contents of:"
410 eerror 358 eerror
411 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 359 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
412 echo 360 echo
413 die "Failed Patch: ${x##*/}!" 361 die "Failed Patch: ${patchname}!"
414 fi 362 fi
415 363
416 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 364 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
417 365
418 eend 0 366 eend 0
419 fi 367 fi
420 done 368 done
421 if [ "${SINGLE_PATCH}" = "no" ] 369 if [ "${SINGLE_PATCH}" = "no" ]
422 then 370 then
423 einfo "Done with patching" 371 einfo "Done with patching"
424 fi
425}
426
427# This function return true if we are using the NPTL pthreads
428# implementation.
429#
430# <azarah@gentoo.org> (06 March 2003)
431#
432have_NPTL() {
433 cat > ${T}/test-nptl.c <<-"END"
434 #define _XOPEN_SOURCE
435 #include <unistd.h>
436 #include <stdio.h>
437
438 int main()
439 {
440 char buf[255];
441 char *str = buf;
442
443 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
444 if (NULL != str) {
445 printf("%s\n", str);
446 if (NULL != strstr(str, "NPTL"))
447 return 0;
448 }
449
450 return 1;
451 }
452 END
453
454 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
455 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
456 then
457 echo "yes"
458 einfon "Checking what PTHREADS implementation we have ..."
459 if ${T}/nptl
460 then
461 return 0
462 else
463 return 1
464 fi
465 else
466 echo "no"
467 fi
468
469 return 1
470}
471
472# This function check how many cpu's are present, and then set
473# -j in MAKEOPTS accordingly.
474#
475# Thanks to nall <nall@gentoo.org> for this.
476#
477get_number_of_jobs() {
478 local jobs=0
479
480 if [ ! -r /proc/cpuinfo ]
481 then
482 return 1
483 fi
484
485 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
486 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
487 then
488 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
489 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
490 ADMINPARAM="${ADMINPARAM/-j}"
491 fi
492
493 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
494
495 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
496 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
497 then
498 # these archs will always have "[Pp]rocessor"
499 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
500
501 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
502 then
503 # sparc always has "ncpus active"
504 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
505
506 elif [ "${ARCH}" = "alpha" ]
507 then
508 # alpha has "cpus active", but only when compiled with SMP
509 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
510 then
511 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
512 else
513 jobs=2
514 fi
515
516 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
517 then
518 # ppc has "processor", but only when compiled with SMP
519 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
520 then
521 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
522 else
523 jobs=2
524 fi
525 elif [ "${ARCH}" = "s390" ]
526 then
527 # s390 has "# processors : "
528 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
529 else
530 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
531 die "Unknown ARCH -- ${ARCH}!"
532 fi
533
534 # Make sure the number is valid ...
535 if [ "${jobs}" -lt 1 ]
536 then
537 jobs=1
538 fi
539
540 if [ -n "${ADMINPARAM}" ]
541 then
542 if [ "${jobs}" -gt "${ADMINPARAM}" ]
543 then
544 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
545 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
546 else
547 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
548 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
549 fi
550 fi 372 fi
551} 373}
552 374
553# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
554# does not exist on the users system 376# does not exist on the users system
588# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
589# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
590# 412#
591# egetent(database, key) 413# egetent(database, key)
592egetent() { 414egetent() {
593 if useq ppc-macos ; then 415 if [[ "${USERLAND}" == "Darwin" ]] ; then
594 case "$2" in 416 case "$2" in
595 *[!0-9]*) # Non numeric 417 *[!0-9]*) # Non numeric
596 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 418 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
597 ;; 419 ;;
598 *) # Numeric 420 *) # Numeric
599 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 421 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
600 ;; 422 ;;
601 esac 423 esac
602 elif useq x86-fbsd ; then 424 elif [[ "${USERLAND}" == "BSD" ]] ; then
603 local action 425 local action
604 if [ "$1" == "passwd" ] 426 if [ "$1" == "passwd" ]
605 then 427 then
606 action="user" 428 action="user"
607 else 429 else
686 then 508 then
687 eerror "A shell was specified but it does not exist !" 509 eerror "A shell was specified but it does not exist !"
688 die "${eshell} does not exist" 510 die "${eshell} does not exist"
689 fi 511 fi
690 else 512 else
691 if [ "${USERLAND}" == "BSD" ] 513 if [[ "${USERLAND}" == "Darwin" ]]; then
692 then
693 eshell="/usr/bin/false" 514 eshell="/usr/bin/false"
515 elif [[ "${USERLAND}" == "BSD" ]]; then
516 eshell="/usr/sbin/nologin"
694 else 517 else
695 eshell="/bin/false" 518 eshell="/bin/false"
696 fi 519 fi
697 fi 520 fi
698 einfo " - Shell: ${eshell}" 521 einfo " - Shell: ${eshell}"
699 opts="${opts} -s ${eshell}" 522 opts="${opts} -s ${eshell}"
700 523
701 # handle homedir 524 # handle homedir
702 local ehome="$1"; shift 525 local ehome="$1"; shift
703 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 526 if [ -z "${ehome}" ] || [ "${ehome}" == "-1" ]
704 then 527 then
705 ehome="/dev/null" 528 ehome="/dev/null"
706 fi 529 fi
707 einfo " - Home: ${ehome}" 530 einfo " - Home: ${ehome}"
708 opts="${opts} -d ${ehome}" 531 opts="${opts} -d ${ehome}"
745 568
746 # handle extra and add the user 569 # handle extra and add the user
747 local eextra="$@" 570 local eextra="$@"
748 local oldsandbox="${SANDBOX_ON}" 571 local oldsandbox="${SANDBOX_ON}"
749 export SANDBOX_ON="0" 572 export SANDBOX_ON="0"
750 if useq ppc-macos 573 if [[ "${USERLAND}" == "Darwin" ]]
751 then 574 then
752 ### Make the user 575 ### Make the user
753 if [ -z "${eextra}" ] 576 if [ -z "${eextra}" ]
754 then 577 then
755 dscl . create /users/${euser} uid ${euid} 578 dscl . create /users/${euser} uid ${euid}
768 einfo "Extra options are not supported on macos yet" 591 einfo "Extra options are not supported on macos yet"
769 einfo "Please report the ebuild along with the info below" 592 einfo "Please report the ebuild along with the info below"
770 einfo "eextra: ${eextra}" 593 einfo "eextra: ${eextra}"
771 die "Required function missing" 594 die "Required function missing"
772 fi 595 fi
773 elif use x86-fbsd ; then 596 elif [[ "${USERLAND}" == "BSD" ]] ; then
774 if [ -z "${eextra}" ] 597 if [ -z "${eextra}" ]
775 then 598 then
776 pw useradd ${euser} ${opts} \ 599 pw useradd ${euser} ${opts} \
777 -c "added by portage for ${PN}" \ 600 -c "added by portage for ${PN}" \
778 die "enewuser failed" 601 die "enewuser failed"
838 then 661 then
839 if [ "${egid}" -gt 0 ] 662 if [ "${egid}" -gt 0 ]
840 then 663 then
841 if [ -z "`egetent group ${egid}`" ] 664 if [ -z "`egetent group ${egid}`" ]
842 then 665 then
843 if useq ppc-macos ; then 666 if [[ "${USERLAND}" == "Darwin" ]]; then
844 opts="${opts} ${egid}" 667 opts="${opts} ${egid}"
845 else 668 else
846 opts="${opts} -g ${egid}" 669 opts="${opts} -g ${egid}"
847 fi 670 fi
848 else 671 else
862 opts="${opts} ${eextra}" 685 opts="${opts} ${eextra}"
863 686
864 # add the group 687 # add the group
865 local oldsandbox="${SANDBOX_ON}" 688 local oldsandbox="${SANDBOX_ON}"
866 export SANDBOX_ON="0" 689 export SANDBOX_ON="0"
867 if useq ppc-macos ; then 690 if [[ "${USERLAND}" == "Darwin" ]]; then
868 if [ ! -z "${eextra}" ]; 691 if [ ! -z "${eextra}" ];
869 then 692 then
870 einfo "Extra options are not supported on macos yet" 693 einfo "Extra options are not supported on Darwin/OS X yet"
871 einfo "Please report the ebuild along with the info below" 694 einfo "Please report the ebuild along with the info below"
872 einfo "eextra: ${eextra}" 695 einfo "eextra: ${eextra}"
873 die "Required function missing" 696 die "Required function missing"
874 fi 697 fi
875 698
880 [ -z "`egetent group ${egid}`" ] && break 703 [ -z "`egetent group ${egid}`" ] && break
881 done 704 done
882 esac 705 esac
883 dscl . create /groups/${egroup} gid ${egid} 706 dscl . create /groups/${egroup} gid ${egid}
884 dscl . create /groups/${egroup} passwd '*' 707 dscl . create /groups/${egroup} passwd '*'
885 elif use x86-fbsd ; then 708 elif [[ "${USERLAND}" == "BSD" ]] ; then
886 case ${egid} in 709 case ${egid} in
887 *[!0-9]*) # Non numeric 710 *[!0-9]*) # Non numeric
888 for egid in `jot 898 101`; do 711 for egid in `jot 898 101`; do
889 [ -z "`egetent group ${egid}`" ] && break 712 [ -z "`egetent group ${egid}`" ] && break
890 done 713 done
906 cp "${f}" ${T}/edos2unix 729 cp "${f}" ${T}/edos2unix
907 sed 's/\r$//' ${T}/edos2unix > "${f}" 730 sed 's/\r$//' ${T}/edos2unix > "${f}"
908 done 731 done
909} 732}
910 733
734
735##############################################################
736# START: Handle .desktop files and menu entries #
737# maybe this should be separated into a new eclass some time #
738# lanius@gentoo.org #
739##############################################################
740
911# Make a desktop file ! 741# Make a desktop file !
912# Great for making those icons in kde/gnome startmenu ! 742# Great for making those icons in kde/gnome startmenu !
913# Amaze your friends ! Get the women ! Join today ! 743# Amaze your friends ! Get the women ! Join today !
914# 744#
915# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 745# make_desktop_entry(<binary>, [name], [icon], [type], [path])
918# name: the name that will show up in the menu 748# name: the name that will show up in the menu
919# icon: give your little like a pretty little icon ... 749# icon: give your little like a pretty little icon ...
920# this can be relative (to /usr/share/pixmaps) or 750# this can be relative (to /usr/share/pixmaps) or
921# a full path to an icon 751# a full path to an icon
922# type: what kind of application is this ? for categories: 752# type: what kind of application is this ? for categories:
923# http://www.freedesktop.org/standards/menu-spec/ 753# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
924# path: if your app needs to startup in a specific dir 754# path: if your app needs to startup in a specific dir
925make_desktop_entry() { 755make_desktop_entry() {
926 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 756 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
927 757
928 local exec="${1}" 758 local exec=${1}
929 local name="${2:-${PN}}" 759 local name=${2:-${PN}}
930 local icon="${3:-${PN}.png}" 760 local icon=${3:-${PN}.png}
931 local type="${4}" 761 local type=${4}
932 local subdir="${6}" 762 local path=${5}
933 local path="${5:-${GAMES_BINDIR}}" 763
934 if [ -z "${type}" ] 764 if [[ -z ${type} ]] ; then
935 then 765 local catmaj=${CATEGORY%%-*}
936 case ${CATEGORY} in 766 local catmin=${CATEGORY##*-}
937 "app-emulation") 767 case ${catmaj} in
938 type=Emulator 768 app)
939 subdir="Emulation" 769 case ${catmin} in
770 admin) type=System;;
771 cdr) type=DiscBurning;;
772 dicts) type=Dictionary;;
773 editors) type=TextEditor;;
774 emacs) type=TextEditor;;
775 emulation) type=Emulator;;
776 laptop) type=HardwareSettings;;
777 office) type=Office;;
778 vim) type=TextEditor;;
779 xemacs) type=TextEditor;;
780 *) type=;;
781 esac
940 ;; 782 ;;
941 "games-"*) 783
942 type=Game 784 dev)
943 subdir="Games" 785 type="Development"
944 ;; 786 ;;
945 "net-"*) 787
946 type=Network 788 games)
947 subdir="${type}" 789 [[ -z ${path} ]] && path=${GAMES_BINDIR}
790
791 case ${catmin} in
792 action) type=ActionGame;;
793 arcade) type=ArcadeGame;;
794 board) type=BoardGame;;
795 kid) type=KidsGame;;
796 emulation) type=Emulator;;
797 puzzle) type=LogicGame;;
798 rpg) type=RolePlaying;;
799 roguelike) type=RolePlaying;;
800 simulation) type=Simulation;;
801 sports) type=SportsGame;;
802 strategy) type=StrategyGame;;
803 *) type=;;
804 esac
805 type="Game;${type}"
948 ;; 806 ;;
807
808 mail)
809 type="Network;Email"
810 ;;
811
812 media)
813 case ${catmin} in
814 gfx) type=Graphics;;
815 radio) type=Tuner;;
816 sound) type=Audio;;
817 tv) type=TV;;
818 video) type=Video;;
819 *) type=;;
820 esac
821 type="AudioVideo;${type}"
822 ;;
823
824 net)
825 case ${catmin} in
826 dialup) type=Dialup;;
827 ftp) type=FileTransfer;;
828 im) type=InstantMessaging;;
829 irc) type=IRCClient;;
830 mail) type=Email;;
831 news) type=News;;
832 nntp) type=News;;
833 p2p) type=FileTransfer;;
834 *) type=;;
835 esac
836 type="Network;${type}"
837 ;;
838
839 sci)
840 case ${catmin} in
841 astro*) type=Astronomoy;;
842 bio*) type=Biology;;
843 calc*) type=Calculator;;
844 chem*) type=Chemistry;;
845 geo*) type=Geology;;
846 math*) type=Math;;
847 *) type=;;
848 esac
849 type="Science;${type}"
850 ;;
851
852 www)
853 case ${catmin} in
854 client) type=WebBrowser;;
855 *) type=;;
856 esac
857 type="Network"
858 ;;
859
949 *) 860 *)
950 type= 861 type=
951 subdir=
952 ;; 862 ;;
953 esac 863 esac
954 fi 864 fi
865 if [ "${SLOT}" == "0" ] ; then
866 local desktop_name="${PN}"
867 else
868 local desktop_name="${PN}-${SLOT}"
869 fi
955 local desktop="${T}/${exec}.desktop" 870 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
956 871
957echo "[Desktop Entry] 872echo "[Desktop Entry]
958Encoding=UTF-8 873Encoding=UTF-8
959Version=0.9.2 874Version=0.9.2
960Name=${name} 875Name=${name}
968 insinto /usr/share/applications 883 insinto /usr/share/applications
969 doins "${desktop}" 884 doins "${desktop}"
970 885
971 return 0 886 return 0
972} 887}
888
889# Make a GDM/KDM Session file
890#
891# make_desktop_entry(<title>, <command>)
892# title: File to execute to start the Window Manager
893# command: Name of the Window Manager
894
895make_session_desktop() {
896 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
897 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
898
899 local title=$1
900 local command=$2
901 local desktop=${T}/${wm}.desktop
902
903echo "[Desktop Entry]
904Encoding=UTF-8
905Name=${title}
906Comment=This session logs you into ${title}
907Exec=${command}
908TryExec=${command}
909Type=Application" > "${desktop}"
910
911 insinto /usr/share/xsessions
912 doins "${desktop}"
913}
914
915domenu() {
916 local i j
917 insinto /usr/share/applications
918 for i in "$@" ; do
919 if [[ -f ${i} ]] ; then
920 doins "${i}"
921 elif [[ -d ${i} ]] ; then
922 for j in "${i}"/*.desktop ; do
923 doins "${j}"
924 done
925 fi
926 done
927}
928newmenu() {
929 insinto /usr/share/applications
930 newins "$1" "$2"
931}
932
933doicon() {
934 local i j
935 insinto /usr/share/pixmaps
936 for i in "$@" ; do
937 if [[ -f ${i} ]] ; then
938 doins "${i}"
939 elif [[ -d ${i} ]] ; then
940 for j in "${i}"/*.png ; do
941 doins "${j}"
942 done
943 fi
944 done
945}
946newicon() {
947 insinto /usr/share/pixmaps
948 newins "$1" "$2"
949}
950
951##############################################################
952# END: Handle .desktop files and menu entries #
953##############################################################
954
973 955
974# for internal use only (unpack_pdv and unpack_makeself) 956# for internal use only (unpack_pdv and unpack_makeself)
975find_unpackable_file() { 957find_unpackable_file() {
976 local src="$1" 958 local src="$1"
977 if [ -z "${src}" ] 959 if [ -z "${src}" ]
1258 export CDROM_TOTAL_CDS=${cdcnt} 1240 export CDROM_TOTAL_CDS=${cdcnt}
1259 export CDROM_CURRENT_CD=1 1241 export CDROM_CURRENT_CD=1
1260 1242
1261 # now we see if the user gave use CD_ROOT ... 1243 # now we see if the user gave use CD_ROOT ...
1262 # if they did, let's just believe them that it's correct 1244 # if they did, let's just believe them that it's correct
1263 if [ ! -z "${CD_ROOT}" ] ; then 1245 if [[ ! -z ${CD_ROOT} ]] ; then
1264 export CDROM_ROOT="${CD_ROOT}" 1246 export CDROM_ROOT=${CD_ROOT}
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1247 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1266 return 1248 return
1267 fi 1249 fi
1268 # do the same for CD_ROOT_X 1250 # do the same for CD_ROOT_X
1269 if [ ! -z "${CD_ROOT_1}" ] ; then 1251 if [[ ! -z ${CD_ROOT_1} ]] ; then
1270 local var= 1252 local var=
1271 cdcnt=0 1253 cdcnt=0
1272 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1254 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1273 cdcnt=$((cdcnt + 1)) 1255 cdcnt=$((cdcnt + 1))
1274 var="CD_ROOT_${cdcnt}" 1256 var="CD_ROOT_${cdcnt}"
1275 if [ -z "${!var}" ] ; then 1257 if [[ -z ${!var} ]] ; then
1276 eerror "You must either use just the CD_ROOT" 1258 eerror "You must either use just the CD_ROOT"
1277 eerror "or specify ALL the CD_ROOT_X variables." 1259 eerror "or specify ALL the CD_ROOT_X variables."
1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1260 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1279 die "could not locate CD_ROOT_${cdcnt}" 1261 die "could not locate CD_ROOT_${cdcnt}"
1280 fi 1262 fi
1283 export CDROM_ROOT=${CDROM_ROOTS_1} 1265 export CDROM_ROOT=${CDROM_ROOTS_1}
1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1266 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 return 1267 return
1286 fi 1268 fi
1287 1269
1288 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1270 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1289 einfon "This ebuild will need the " 1271 einfon "This ebuild will need the "
1290 if [ -z "${CDROM_NAME}" ] ; then 1272 if [[ -z ${CDROM_NAME} ]] ; then
1291 echo "cdrom for ${PN}." 1273 echo "cdrom for ${PN}."
1292 else 1274 else
1293 echo "${CDROM_NAME}." 1275 echo "${CDROM_NAME}."
1294 fi 1276 fi
1295 echo 1277 echo
1296 einfo "If you do not have the CD, but have the data files" 1278 einfo "If you do not have the CD, but have the data files"
1297 einfo "mounted somewhere on your filesystem, just export" 1279 einfo "mounted somewhere on your filesystem, just export"
1298 einfo "the variable CD_ROOT so that it points to the" 1280 einfo "the variable CD_ROOT so that it points to the"
1299 einfo "directory containing the files." 1281 einfo "directory containing the files."
1300 echo 1282 echo
1283 einfo "For example:"
1284 einfo "export CD_ROOT=/mnt/cdrom"
1285 echo
1301 else 1286 else
1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1287 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303 cdcnt=0 1288 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1289 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1290 cdcnt=$((cdcnt + 1))
1306 var="CDROM_NAME_${cdcnt}" 1291 var="CDROM_NAME_${cdcnt}"
1307 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1292 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1308 done 1293 done
1309 echo 1294 echo
1310 einfo "If you do not have the CDs, but have the data files" 1295 einfo "If you do not have the CDs, but have the data files"
1311 einfo "mounted somewhere on your filesystem, just export" 1296 einfo "mounted somewhere on your filesystem, just export"
1312 einfo "the following variables so they point to the right place:" 1297 einfo "the following variables so they point to the right place:"
1313 einfon "" 1298 einfon ""
1314 cdcnt=0 1299 cdcnt=0
1315 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1300 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1316 cdcnt=$((cdcnt + 1)) 1301 cdcnt=$((cdcnt + 1))
1317 echo -n " CD_ROOT_${cdcnt}" 1302 echo -n " CD_ROOT_${cdcnt}"
1318 done 1303 done
1319 echo 1304 echo
1320 einfo "Or, if you have all the files in the same place, or" 1305 einfo "Or, if you have all the files in the same place, or"
1321 einfo "you only have one cdrom, you can export CD_ROOT" 1306 einfo "you only have one cdrom, you can export CD_ROOT"
1322 einfo "and that place will be used as the same data source" 1307 einfo "and that place will be used as the same data source"
1323 einfo "for all the CDs." 1308 einfo "for all the CDs."
1324 echo 1309 echo
1310 einfo "For example:"
1311 einfo "export CD_ROOT_1=/mnt/cdrom"
1312 echo
1325 fi 1313 fi
1326 export CDROM_CURRENT_CD=0 1314 export CDROM_CURRENT_CD=0
1327 cdrom_load_next_cd 1315 cdrom_load_next_cd
1328} 1316}
1329 1317
1333# remember, you can only go forward in the cd chain, you can't go back. 1321# remember, you can only go forward in the cd chain, you can't go back.
1334cdrom_load_next_cd() { 1322cdrom_load_next_cd() {
1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1323 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336 local var= 1324 local var=
1337 1325
1338 if [ ! -z "${CD_ROOT}" ] ; then 1326 if [[ ! -z ${CD_ROOT} ]] ; then
1339 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1327 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1340 return 1328 return
1341 fi 1329 fi
1342 1330
1343 unset CDROM_ROOT 1331 unset CDROM_ROOT
1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1332 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1345 if [ -z "${!var}" ] ; then 1333 if [[ -z ${!var} ]] ; then
1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1334 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347 cdrom_locate_file_on_cd ${!var} 1335 cdrom_locate_file_on_cd ${!var}
1348 else 1336 else
1349 export CDROM_ROOT="${!var}" 1337 export CDROM_ROOT=${!var}
1350 fi 1338 fi
1351 1339
1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1340 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1353} 1341}
1354 1342
1358# found, then a message asking for the user to insert the cdrom will be 1346# found, then a message asking for the user to insert the cdrom will be
1359# displayed and we'll hang out here until: 1347# displayed and we'll hang out here until:
1360# (1) the file is found on a mounted cdrom 1348# (1) the file is found on a mounted cdrom
1361# (2) the user hits CTRL+C 1349# (2) the user hits CTRL+C
1362cdrom_locate_file_on_cd() { 1350cdrom_locate_file_on_cd() {
1363 while [ -z "${CDROM_ROOT}" ] ; do 1351 while [[ -z ${CDROM_ROOT} ]] ; do
1364 local dir="$(dirname ${@})" 1352 local dir="$(dirname ${@})"
1365 local file="$(basename ${@})" 1353 local file="$(basename ${@})"
1366 local mline="" 1354 local mline=""
1367 local showedmsg=0 1355 local showedmsg=0
1368 1356
1369 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1357 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1370 [ -d "${mline}/${dir}" ] || continue 1358 [[ -d ${mline}/${dir} ]] || continue
1371 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1359 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1372 && export CDROM_ROOT=${mline} 1360 && export CDROM_ROOT=${mline}
1373 done 1361 done
1374 1362
1375 if [ -z "${CDROM_ROOT}" ] ; then 1363 if [[ -z ${CDROM_ROOT} ]] ; then
1376 echo 1364 echo
1377 if [ ${showedmsg} -eq 0 ] ; then 1365 if [[ ${showedmsg} -eq 0 ]] ; then
1378 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1366 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1379 if [ -z "${CDROM_NAME}" ] ; then 1367 if [[ -z ${CDROM_NAME} ]] ; then
1380 einfo "Please insert the cdrom for ${PN} now !" 1368 einfo "Please insert the cdrom for ${PN} now !"
1381 else 1369 else
1382 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1370 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383 fi 1371 fi
1384 else 1372 else
1385 if [ -z "${CDROM_NAME_1}" ] ; then 1373 if [[ -z ${CDROM_NAME_1} ]] ; then
1386 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1374 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1387 else 1375 else
1388 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1376 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1389 einfo "Please insert+mount the ${!var} cdrom now !" 1377 einfo "Please insert+mount the ${!var} cdrom now !"
1390 fi 1378 fi
1410# directories and uses the intersection of the lists. 1398# directories and uses the intersection of the lists.
1411# The -u builds a list of po files found in all the 1399# The -u builds a list of po files found in all the
1412# directories and uses the union of the lists. 1400# directories and uses the union of the lists.
1413strip-linguas() { 1401strip-linguas() {
1414 local ls newls 1402 local ls newls
1415 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1403 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1416 local op="$1"; shift 1404 local op=$1; shift
1417 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1405 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1418 local d f 1406 local d f
1419 for d in "$@" ; do 1407 for d in "$@" ; do
1420 if [ "${op}" == "-u" ] ; then 1408 if [[ ${op} == "-u" ]] ; then
1421 newls="${ls}" 1409 newls=${ls}
1422 else 1410 else
1423 newls="" 1411 newls=""
1424 fi 1412 fi
1425 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1413 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1426 if [ "${op}" == "-i" ] ; then 1414 if [[ ${op} == "-i" ]] ; then
1427 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1415 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1428 else 1416 else
1429 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1417 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1430 fi 1418 fi
1431 done 1419 done
1432 ls="${newls}" 1420 ls=${newls}
1433 done 1421 done
1434 ls="${ls//.po}" 1422 ls=${ls//.po}
1435 else 1423 else
1436 ls="$@" 1424 ls=$@
1437 fi 1425 fi
1438 1426
1439 ls=" ${ls} " 1427 ls=" ${ls} "
1440 newls="" 1428 newls=""
1441 for f in ${LINGUAS} ; do 1429 for f in ${LINGUAS} ; do
1442 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1430 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1443 newls="${newls} ${f}" 1431 newls="${newls} ${f}"
1444 else 1432 else
1445 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1433 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1446 fi 1434 fi
1447 done 1435 done
1448 if [ -z "${newls}" ] ; then 1436 if [[ -z ${newls} ]] ; then
1449 unset LINGUAS 1437 export LINGUAS=""
1450 else 1438 else
1451 export LINGUAS="${newls}" 1439 export LINGUAS=${newls:1}
1452 fi 1440 fi
1453} 1441}
1454 1442
1455# moved from kernel.eclass since they are generally useful outside of 1443# moved from kernel.eclass since they are generally useful outside of
1456# kernel.eclass -iggy (20041002) 1444# kernel.eclass -iggy (20041002)
1458# the following functions are useful in kernel module ebuilds, etc. 1446# the following functions are useful in kernel module ebuilds, etc.
1459# for an example see ivtv or drbd ebuilds 1447# for an example see ivtv or drbd ebuilds
1460 1448
1461# set's ARCH to match what the kernel expects 1449# set's ARCH to match what the kernel expects
1462set_arch_to_kernel() { 1450set_arch_to_kernel() {
1451 i=10
1452 while ((i--)) ; do
1453 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1454 done
1463 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1455 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1464 case ${ARCH} in 1456 case ${ARCH} in
1465 x86) export ARCH="i386";; 1457 x86) export ARCH="i386";;
1466 amd64) export ARCH="x86_64";; 1458 amd64) export ARCH="x86_64";;
1467 hppa) export ARCH="parisc";; 1459 hppa) export ARCH="parisc";;
1468 mips) export ARCH="mips";; 1460 mips) export ARCH="mips";;
1461 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!
1469 *) export ARCH="${ARCH}";; 1462 *) export ARCH="${ARCH}";;
1470 esac 1463 esac
1471} 1464}
1472 1465
1473# set's ARCH back to what portage expects 1466# set's ARCH back to what portage expects
1474set_arch_to_portage() { 1467set_arch_to_portage() {
1468 i=10
1469 while ((i--)) ; do
1470 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1471 done
1475 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1472 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1476} 1473}
1477 1474
1478# Jeremy Huddleston <eradicator@gentoo.org>: 1475# Jeremy Huddleston <eradicator@gentoo.org>:
1479# preserve_old_lib /path/to/libblah.so.0 1476# preserve_old_lib /path/to/libblah.so.0
1509 touch ${D}${LIB} 1506 touch ${D}${LIB}
1510 fi 1507 fi
1511} 1508}
1512 1509
1513preserve_old_lib_notify() { 1510preserve_old_lib_notify() {
1514 LIB=$1 1511 LIB=$1
1515 1512
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1513 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1517 SONAME=`basename ${LIB}` 1514 SONAME=`basename ${LIB}`
1518 1515
1519 einfo "An old version of an installed library was detected on your system." 1516 einfo "An old version of an installed library was detected on your system."
1520 einfo "In order to avoid breaking packages that link against is, this older version" 1517 einfo "In order to avoid breaking packages that link against is, this older version"
1521 einfo "is not being removed. In order to make full use of this newer version," 1518 einfo "is not being removed. In order to make full use of this newer version,"
1522 einfo "you will need to execute the following command:" 1519 einfo "you will need to execute the following command:"
1523 einfo " revdep-rebuild --soname ${SONAME}" 1520 einfo " revdep-rebuild --soname ${SONAME}"
1524 einfo 1521 einfo
1525 einfo "After doing that, you can safely remove ${LIB}" 1522 einfo "After doing that, you can safely remove ${LIB}"
1526 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1523 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1527 fi 1524 fi
1528} 1525}
1529 1526
1530# Hack for people to figure out if a package was built with 1527# Hack for people to figure out if a package was built with
1531# certain USE flags 1528# certain USE flags
1532# 1529#
1533# Usage: built_with_use <DEPEND ATOM> <List of USE flags> 1530# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1534# ex: built_with_use xchat gtk2 1531# ex: built_with_use xchat gtk2
1532#
1533# Flags: -a all USE flags should be utilized
1534# -o at least one USE flag should be utilized
1535# Note: the default flag is '-a'
1535built_with_use() { 1536built_with_use() {
1537 local opt=$1
1538 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1539
1536 local PKG=$(portageq best_version ${ROOT} $1) 1540 local PKG=$(best_version $1)
1541 shift
1542
1537 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1543 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1538 [[ ! -e ${USEFILE} ]] && return 1 1544 [[ ! -e ${USEFILE} ]] && return 1
1539 1545
1540 local USE_BUILT=$(<${USEFILE}) 1546 local USE_BUILT=$(<${USEFILE})
1541
1542 shift
1543 while [ $# -gt 0 ] ; do 1547 while [[ $# -gt 0 ]] ; do
1548 if [[ ${opt} = "-o" ]] ; then
1549 has $1 ${USE_BUILT} && return 0
1550 else
1544 has $1 ${USE_BUILT} || return 1 1551 has $1 ${USE_BUILT} || return 1
1552 fi
1545 shift 1553 shift
1546 done 1554 done
1547 return 0 1555 [[ ${opt} = "-a" ]]
1548} 1556}
1549 1557
1550# Many configure scripts wrongly bail when a C++ compiler 1558# Many configure scripts wrongly bail when a C++ compiler
1551# could not be detected. #73450 1559# could not be detected. #73450
1552epunt_cxx() { 1560epunt_cxx() {
1553 local dir=$1 1561 local dir=$1
1554 [[ -z ${dir} ]] && dir=${S} 1562 [[ -z ${dir} ]] && dir=${S}
1555 ebegin "Removing useless C++ checks" 1563 ebegin "Removing useless C++ checks"
1558 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1566 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1559 done 1567 done
1560 eend 0 1568 eend 0
1561} 1569}
1562 1570
1563# get_abi_var <VAR> [<ABI>] 1571# dopamd <file> [more files]
1564# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1565# 1572#
1566# This code is for testing purposes only with the sparc64-multilib ${PROFILE_ARCH} 1573# Install pam auth config file in /etc/pam.d
1567# and getting a more multilib-aware portage layout. It may end up being used, but for now 1574dopamd() {
1568# it is subject to removal if a better way is worked out. 1575 [[ -z $1 ]] && die "dopamd requires at least one argument"
1569#
1570# ex:
1571# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
1572#
1573# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
1574# This will hopefully be added to portage soon...
1575#
1576# If <ABI> is not specified, ${ABI} is used.
1577# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
1578# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
1579#
1580# Jeremy Huddleston <eradicator@gentoo.org>
1581get_abi_var() {
1582 local flag=$1
1583 local abi
1584 if [ $# -gt 1 ]; then
1585 abi=$1
1586 elif [ -n "${ABI}" ]; then
1587 abi=${ABI}
1588 elif [ -n "${DEFAULT_ABI}" ]; then
1589 abi=${DEFAULT_ABI}
1590 else
1591 return ""
1592 fi
1593 eval echo \${${flag}_${abi}}
1594}
1595 1576
1596get_abi_CFLAGS() { get_abi_var CFLAGS $1; } 1577 use pam || return 0
1597get_abi_CXXFLAGS() { get_abi_var CXXFLAGS $1; }
1598get_abi_ASFLAGS() { get_abi_var ASFLAGS $1; }
1599get_abi_LIBDIR() { get_abi_var LIBDIR $1; }
1600 1578
1579 INSDESTTREE=/etc/pam.d \
1580 doins "$@" || die "failed to install $@"
1581}
1582# newpamd <old name> <new name>
1583#
1584# Install pam file <old name> as <new name> in /etc/pam.d
1585newpamd() {
1586 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1587
1588 use pam || return 0
1589
1590 INSDESTTREE=/etc/pam.d \
1591 newins "$1" "$2" || die "failed to install $1 as $2"
1592}
1593
1594# make a wrapper script ...
1595# NOTE: this was originally games_make_wrapper, but I noticed other places where
1596# this could be used, so I have moved it here and made it not games-specific
1597# -- wolf31o2
1598# $1 == wrapper name
1599# $2 == binary to run
1600# $3 == directory to chdir before running binary
1601# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1602# $5 == path for wrapper
1603make_wrapper() {
1604 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1605 local tmpwrapper=$(emktemp)
1606 cat << EOF > "${tmpwrapper}"
1607#!/bin/sh
1608cd "${chdir}"
1609export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1610exec ${bin} "\$@"
1611EOF
1612 chmod go+rx "${tmpwrapper}"
1613 if [ -n "${5}" ]
1614 then
1615 exeinto ${5}
1616 newexe "${tmpwrapper}" "${wrapper}"
1617 else
1618 newbin "${tmpwrapper}" "${wrapper}"
1619 fi
1620}

Legend:
Removed from v.1.128  
changed lines
  Added in v.1.181

  ViewVC Help
Powered by ViewVC 1.1.20