/[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.178
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.178 2005/05/26 22:09:26 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
12inherit multilib
12ECLASS=eutils 13ECLASS=eutils
13INHERITED="$INHERITED $ECLASS" 14INHERITED="$INHERITED $ECLASS"
14 15
15DEPEND="!bootstrap? ( sys-devel/patch )" 16DEPEND="!bootstrap? ( sys-devel/patch )"
16 17
41 sleep 1 42 sleep 1
42 done 43 done
43 fi 44 fi
44} 45}
45 46
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 47# This function generate linker scripts in /usr/lib for dynamic
110# libs in /lib. This is to fix linking problems when you have 48# 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 49# 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 50# 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 51# instead of the .so in /lib due to gcc/libtool tweaking ld's
127gen_usr_ldscript() { 65gen_usr_ldscript() {
128 local libdir="$(get_libdir)" 66 local libdir="$(get_libdir)"
129 # Just make sure it exists 67 # Just make sure it exists
130 dodir /usr/${libdir} 68 dodir /usr/${libdir}
131 69
70 for lib in "${@}" ; do
132 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
133/* GNU ld script 72 /* GNU ld script
134 Because Gentoo have critical dynamic libraries 73 Since Gentoo has critical dynamic libraries
135 in /lib, and the static versions in /usr/lib, we 74 in /lib, and the static versions in /usr/lib,
136 need to have a "fake" dynamic lib in /usr/lib, 75 we need to have a "fake" dynamic lib in /usr/lib,
137 otherwise we run into linking problems. 76 otherwise we run into linking problems.
138 See bug #4411 on http://bugs.gentoo.org/ for 77
139 more info. */ 78 See bug http://bugs.gentoo.org/4411 for more info.
79 */
140GROUP ( /${libdir}/${1} ) 80 GROUP ( /${libdir}/${lib} )
141END_LDSCRIPT 81 END_LDSCRIPT
142 fperms a+x "/usr/${libdir}/${1}" 82 fperms a+x "/usr/${libdir}/${lib}"
83 done
143} 84}
144 85
145# Simple function to draw a line consisting of '=' the same length as $* 86# Simple function to draw a line consisting of '=' the same length as $*
87# - only to be used by epatch()
146# 88#
147# <azarah@gentoo.org> (11 Nov 2002) 89# <azarah@gentoo.org> (11 Nov 2002)
148# 90#
149draw_line() { 91draw_line() {
150 local i=0 92 local i=0
176EPATCH_SOURCE="${WORKDIR}/patch" 118EPATCH_SOURCE="${WORKDIR}/patch"
177# Default extension for patches 119# Default extension for patches
178EPATCH_SUFFIX="patch.bz2" 120EPATCH_SUFFIX="patch.bz2"
179# Default options for patch 121# Default options for patch
180# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 122# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
181EPATCH_OPTS="-g0" 123# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
124EPATCH_OPTS="-g0 --no-backup-if-mismatch"
182# List of patches not to apply. Not this is only file names, 125# List of patches not to apply. Not this is only file names,
183# and not the full path .. 126# and not the full path ..
184EPATCH_EXCLUDE="" 127EPATCH_EXCLUDE=""
185# Change the printed message for a single patch. 128# Change the printed message for a single patch.
186EPATCH_SINGLE_MSG="" 129EPATCH_SINGLE_MSG=""
130# Change the printed message for multiple patches.
131EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
187# Force applying bulk patches even if not following the style: 132# Force applying bulk patches even if not following the style:
188# 133#
189# ??_${ARCH}_foo.${EPATCH_SUFFIX} 134# ??_${ARCH}_foo.${EPATCH_SUFFIX}
190# 135#
191EPATCH_FORCE="no" 136EPATCH_FORCE="no"
232 local x="" 177 local x=""
233 178
234 if [ "$#" -gt 1 ] 179 if [ "$#" -gt 1 ]
235 then 180 then
236 local m="" 181 local m=""
237 einfo "${#} patches to apply ..."
238 for m in "$@" ; do 182 for m in "$@" ; do
239 epatch "${m}" 183 epatch "${m}"
240 done 184 done
241 return 0 185 return 0
242 fi 186 fi
267 211
268 echo 212 echo
269 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 213 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
270 eerror 214 eerror
271 eerror " ${EPATCH_SOURCE}" 215 eerror " ${EPATCH_SOURCE}"
216 eerror " ( ${EPATCH_SOURCE##*/} )"
272 echo 217 echo
273 die "Cannot find \$EPATCH_SOURCE!" 218 die "Cannot find \$EPATCH_SOURCE!"
274 fi 219 fi
275 220
276 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 221 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
295 ;; 240 ;;
296 esac 241 esac
297 242
298 if [ "${SINGLE_PATCH}" = "no" ] 243 if [ "${SINGLE_PATCH}" = "no" ]
299 then 244 then
300 einfo "Applying various patches (bugfixes/updates) ..." 245 einfo "${EPATCH_MULTI_MSG}"
301 fi 246 fi
302 for x in ${EPATCH_SOURCE} 247 for x in ${EPATCH_SOURCE}
303 do 248 do
304 # New ARCH dependant patch naming scheme ... 249 # New ARCH dependant patch naming scheme ...
305 # 250 #
306 # ???_arch_foo.patch 251 # ???_arch_foo.patch
307 # 252 #
308 if [ -f ${x} ] && \ 253 if [ -f ${x} ] && \
309 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 254 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
310 [ "${EPATCH_FORCE}" = "yes" ]) 255 [ "${EPATCH_FORCE}" = "yes" ])
311 then 256 then
312 local count=0 257 local count=0
313 local popts="${EPATCH_OPTS}" 258 local popts="${EPATCH_OPTS}"
259 local patchname=${x##*/}
314 260
315 if [ -n "${EPATCH_EXCLUDE}" ] 261 if [ -n "${EPATCH_EXCLUDE}" ]
316 then 262 then
317 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 263 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
318 then 264 then
319 continue 265 continue
320 fi 266 fi
321 fi 267 fi
322 268
324 then 270 then
325 if [ -n "${EPATCH_SINGLE_MSG}" ] 271 if [ -n "${EPATCH_SINGLE_MSG}" ]
326 then 272 then
327 einfo "${EPATCH_SINGLE_MSG}" 273 einfo "${EPATCH_SINGLE_MSG}"
328 else 274 else
329 einfo "Applying ${x##*/} ..." 275 einfo "Applying ${patchname} ..."
330 fi 276 fi
331 else 277 else
332 einfo " ${x##*/} ..." 278 einfo " ${patchname} ..."
333 fi 279 fi
334 280
335 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 281 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
336 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 283
338 # Allow for prefix to differ ... im lazy, so shoot me :/ 284 # Allow for prefix to differ ... im lazy, so shoot me :/
339 while [ "${count}" -lt 5 ] 285 while [ "${count}" -lt 5 ]
340 do 286 do
341 # Generate some useful debug info ... 287 # Generate some useful debug info ...
342 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 288 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 289 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
344 290
345 if [ "${PATCH_SUFFIX}" != "patch" ] 291 if [ "${PATCH_SUFFIX}" != "patch" ]
346 then 292 then
347 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 293 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
348 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 294 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
349 else 295 else
350 PATCH_TARGET="${x}" 296 PATCH_TARGET="${x}"
351 fi 297 fi
352 298
353 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 299 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
354 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
355 301
356 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
357 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 303 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
358 304
359 if [ "${PATCH_SUFFIX}" != "patch" ] 305 if [ "${PATCH_SUFFIX}" != "patch" ]
360 then 306 then
361 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 307 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
362 then 308 then
363 echo 309 echo
364 eerror "Could not extract patch!" 310 eerror "Could not extract patch!"
365 #die "Could not extract patch!" 311 #die "Could not extract patch!"
366 count=5 312 count=5
367 break 313 break
368 fi 314 fi
369 fi 315 fi
370 316
371 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 317 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
372 then 318 then
373 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 319 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
374 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
375 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
376 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
377 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
378 324
379 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 325 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
380 326
381 if [ "$?" -ne 0 ] 327 if [ "$?" -ne 0 ]
382 then 328 then
383 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 329 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
384 echo 330 echo
385 eerror "A dry-run of patch command succeeded, but actually" 331 eerror "A dry-run of patch command succeeded, but actually"
386 eerror "applying the patch failed!" 332 eerror "applying the patch failed!"
387 #die "Real world sux compared to the dreamworld!" 333 #die "Real world sux compared to the dreamworld!"
388 count=5 334 count=5
389 fi 335 fi
390 336
391 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 337 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
392 338
393 break 339 break
394 fi 340 fi
395 341
396 count=$((count + 1)) 342 count=$((count + 1))
402 fi 348 fi
403 349
404 if [ "${count}" -eq 5 ] 350 if [ "${count}" -eq 5 ]
405 then 351 then
406 echo 352 echo
407 eerror "Failed Patch: ${x##*/}!" 353 eerror "Failed Patch: ${patchname} !"
354 eerror " ( ${PATCH_TARGET} )"
408 eerror 355 eerror
409 eerror "Include in your bugreport the contents of:" 356 eerror "Include in your bugreport the contents of:"
410 eerror 357 eerror
411 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 358 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
412 echo 359 echo
413 die "Failed Patch: ${x##*/}!" 360 die "Failed Patch: ${patchname}!"
414 fi 361 fi
415 362
416 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 363 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
417 364
418 eend 0 365 eend 0
419 fi 366 fi
420 done 367 done
421 if [ "${SINGLE_PATCH}" = "no" ] 368 if [ "${SINGLE_PATCH}" = "no" ]
422 then 369 then
423 einfo "Done with patching" 370 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 371 fi
551} 372}
552 373
553# Cheap replacement for when debianutils (and thus mktemp) 374# Cheap replacement for when debianutils (and thus mktemp)
554# does not exist on the users system 375# does not exist on the users system
698 einfo " - Shell: ${eshell}" 519 einfo " - Shell: ${eshell}"
699 opts="${opts} -s ${eshell}" 520 opts="${opts} -s ${eshell}"
700 521
701 # handle homedir 522 # handle homedir
702 local ehome="$1"; shift 523 local ehome="$1"; shift
703 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 524 if [ -z "${ehome}" ] || [ "${eshell}" == "-1" ]
704 then 525 then
705 ehome="/dev/null" 526 ehome="/dev/null"
706 fi 527 fi
707 einfo " - Home: ${ehome}" 528 einfo " - Home: ${ehome}"
708 opts="${opts} -d ${ehome}" 529 opts="${opts} -d ${ehome}"
906 cp "${f}" ${T}/edos2unix 727 cp "${f}" ${T}/edos2unix
907 sed 's/\r$//' ${T}/edos2unix > "${f}" 728 sed 's/\r$//' ${T}/edos2unix > "${f}"
908 done 729 done
909} 730}
910 731
732
733##############################################################
734# START: Handle .desktop files and menu entries #
735# maybe this should be separated into a new eclass some time #
736# lanius@gentoo.org #
737##############################################################
738
911# Make a desktop file ! 739# Make a desktop file !
912# Great for making those icons in kde/gnome startmenu ! 740# Great for making those icons in kde/gnome startmenu !
913# Amaze your friends ! Get the women ! Join today ! 741# Amaze your friends ! Get the women ! Join today !
914# 742#
915# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 743# make_desktop_entry(<binary>, [name], [icon], [type], [path])
918# name: the name that will show up in the menu 746# name: the name that will show up in the menu
919# icon: give your little like a pretty little icon ... 747# icon: give your little like a pretty little icon ...
920# this can be relative (to /usr/share/pixmaps) or 748# this can be relative (to /usr/share/pixmaps) or
921# a full path to an icon 749# a full path to an icon
922# type: what kind of application is this ? for categories: 750# type: what kind of application is this ? for categories:
923# http://www.freedesktop.org/standards/menu-spec/ 751# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
924# path: if your app needs to startup in a specific dir 752# path: if your app needs to startup in a specific dir
925make_desktop_entry() { 753make_desktop_entry() {
926 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 754 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
927 755
928 local exec="${1}" 756 local exec=${1}
929 local name="${2:-${PN}}" 757 local name=${2:-${PN}}
930 local icon="${3:-${PN}.png}" 758 local icon=${3:-${PN}.png}
931 local type="${4}" 759 local type=${4}
932 local subdir="${6}" 760 local path=${5}
933 local path="${5:-${GAMES_BINDIR}}" 761
934 if [ -z "${type}" ] 762 if [[ -z ${type} ]] ; then
935 then 763 local catmaj=${CATEGORY%%-*}
936 case ${CATEGORY} in 764 local catmin=${CATEGORY##*-}
937 "app-emulation") 765 case ${catmaj} in
938 type=Emulator 766 app)
939 subdir="Emulation" 767 case ${catmin} in
768 admin) type=System;;
769 cdr) type=DiscBurning;;
770 dicts) type=Dictionary;;
771 editors) type=TextEditor;;
772 emacs) type=TextEditor;;
773 emulation) type=Emulator;;
774 laptop) type=HardwareSettings;;
775 office) type=Office;;
776 vim) type=TextEditor;;
777 xemacs) type=TextEditor;;
778 *) type=;;
779 esac
940 ;; 780 ;;
941 "games-"*) 781
942 type=Game 782 dev)
943 subdir="Games" 783 type="Development"
944 ;; 784 ;;
945 "net-"*) 785
946 type=Network 786 games)
947 subdir="${type}" 787 [[ -z ${path} ]] && path=${GAMES_BINDIR}
788
789 case ${catmin} in
790 action) type=ActionGame;;
791 arcade) type=ArcadeGame;;
792 board) type=BoardGame;;
793 kid) type=KidsGame;;
794 emulation) type=Emulator;;
795 puzzle) type=LogicGame;;
796 rpg) type=RolePlaying;;
797 roguelike) type=RolePlaying;;
798 simulation) type=Simulation;;
799 sports) type=SportsGame;;
800 strategy) type=StrategyGame;;
801 *) type=;;
802 esac
803 type="Game;${type}"
948 ;; 804 ;;
805
806 mail)
807 type="Network;Email"
808 ;;
809
810 media)
811 case ${catmin} in
812 gfx) type=Graphics;;
813 radio) type=Tuner;;
814 sound) type=Audio;;
815 tv) type=TV;;
816 video) type=Video;;
817 *) type=;;
818 esac
819 type="AudioVideo;${type}"
820 ;;
821
822 net)
823 case ${catmin} in
824 dialup) type=Dialup;;
825 ftp) type=FileTransfer;;
826 im) type=InstantMessaging;;
827 irc) type=IRCClient;;
828 mail) type=Email;;
829 news) type=News;;
830 nntp) type=News;;
831 p2p) type=FileTransfer;;
832 *) type=;;
833 esac
834 type="Network;${type}"
835 ;;
836
837 sci)
838 case ${catmin} in
839 astro*) type=Astronomoy;;
840 bio*) type=Biology;;
841 calc*) type=Calculator;;
842 chem*) type=Chemistry;;
843 geo*) type=Geology;;
844 math*) type=Math;;
845 *) type=;;
846 esac
847 type="Science;${type}"
848 ;;
849
850 www)
851 case ${catmin} in
852 client) type=WebBrowser;;
853 *) type=;;
854 esac
855 type="Network"
856 ;;
857
949 *) 858 *)
950 type= 859 type=
951 subdir=
952 ;; 860 ;;
953 esac 861 esac
954 fi 862 fi
863 if [ "${SLOT}" == "0" ] ; then
864 local desktop_name="${PN}"
865 else
866 local desktop_name="${PN}-${SLOT}"
867 fi
955 local desktop="${T}/${exec}.desktop" 868 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
956 869
957echo "[Desktop Entry] 870echo "[Desktop Entry]
958Encoding=UTF-8 871Encoding=UTF-8
959Version=0.9.2 872Version=0.9.2
960Name=${name} 873Name=${name}
968 insinto /usr/share/applications 881 insinto /usr/share/applications
969 doins "${desktop}" 882 doins "${desktop}"
970 883
971 return 0 884 return 0
972} 885}
886
887# Make a GDM/KDM Session file
888#
889# make_desktop_entry(<title>, <command>)
890# title: File to execute to start the Window Manager
891# command: Name of the Window Manager
892
893make_session_desktop() {
894 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
895 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
896
897 local title=$1
898 local command=$2
899 local desktop=${T}/${wm}.desktop
900
901echo "[Desktop Entry]
902Encoding=UTF-8
903Name=${title}
904Comment=This session logs you into ${title}
905Exec=${command}
906TryExec=${command}
907Type=Application" > "${desktop}"
908
909 insinto /usr/share/xsessions
910 doins "${desktop}"
911}
912
913domenu() {
914 local i j
915 insinto /usr/share/applications
916 for i in "$@" ; do
917 if [[ -f ${i} ]] ; then
918 doins "${i}"
919 elif [[ -d ${i} ]] ; then
920 for j in "${i}"/*.desktop ; do
921 doins "${j}"
922 done
923 fi
924 done
925}
926newmenu() {
927 insinto /usr/share/applications
928 newins "$1" "$2"
929}
930
931doicon() {
932 local i j
933 insinto /usr/share/pixmaps
934 for i in "$@" ; do
935 if [[ -f ${i} ]] ; then
936 doins "${i}"
937 elif [[ -d ${i} ]] ; then
938 for j in "${i}"/*.png ; do
939 doins "${j}"
940 done
941 fi
942 done
943}
944newicon() {
945 insinto /usr/share/pixmaps
946 newins "$1" "$2"
947}
948
949##############################################################
950# END: Handle .desktop files and menu entries #
951##############################################################
952
973 953
974# for internal use only (unpack_pdv and unpack_makeself) 954# for internal use only (unpack_pdv and unpack_makeself)
975find_unpackable_file() { 955find_unpackable_file() {
976 local src="$1" 956 local src="$1"
977 if [ -z "${src}" ] 957 if [ -z "${src}" ]
1258 export CDROM_TOTAL_CDS=${cdcnt} 1238 export CDROM_TOTAL_CDS=${cdcnt}
1259 export CDROM_CURRENT_CD=1 1239 export CDROM_CURRENT_CD=1
1260 1240
1261 # now we see if the user gave use CD_ROOT ... 1241 # now we see if the user gave use CD_ROOT ...
1262 # if they did, let's just believe them that it's correct 1242 # if they did, let's just believe them that it's correct
1263 if [ ! -z "${CD_ROOT}" ] ; then 1243 if [[ ! -z ${CD_ROOT} ]] ; then
1264 export CDROM_ROOT="${CD_ROOT}" 1244 export CDROM_ROOT=${CD_ROOT}
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1245 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1266 return 1246 return
1267 fi 1247 fi
1268 # do the same for CD_ROOT_X 1248 # do the same for CD_ROOT_X
1269 if [ ! -z "${CD_ROOT_1}" ] ; then 1249 if [[ ! -z ${CD_ROOT_1} ]] ; then
1270 local var= 1250 local var=
1271 cdcnt=0 1251 cdcnt=0
1272 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1252 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1273 cdcnt=$((cdcnt + 1)) 1253 cdcnt=$((cdcnt + 1))
1274 var="CD_ROOT_${cdcnt}" 1254 var="CD_ROOT_${cdcnt}"
1275 if [ -z "${!var}" ] ; then 1255 if [[ -z ${!var} ]] ; then
1276 eerror "You must either use just the CD_ROOT" 1256 eerror "You must either use just the CD_ROOT"
1277 eerror "or specify ALL the CD_ROOT_X variables." 1257 eerror "or specify ALL the CD_ROOT_X variables."
1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1258 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1279 die "could not locate CD_ROOT_${cdcnt}" 1259 die "could not locate CD_ROOT_${cdcnt}"
1280 fi 1260 fi
1283 export CDROM_ROOT=${CDROM_ROOTS_1} 1263 export CDROM_ROOT=${CDROM_ROOTS_1}
1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1264 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 return 1265 return
1286 fi 1266 fi
1287 1267
1288 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1268 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1289 einfon "This ebuild will need the " 1269 einfon "This ebuild will need the "
1290 if [ -z "${CDROM_NAME}" ] ; then 1270 if [[ -z ${CDROM_NAME} ]] ; then
1291 echo "cdrom for ${PN}." 1271 echo "cdrom for ${PN}."
1292 else 1272 else
1293 echo "${CDROM_NAME}." 1273 echo "${CDROM_NAME}."
1294 fi 1274 fi
1295 echo 1275 echo
1296 einfo "If you do not have the CD, but have the data files" 1276 einfo "If you do not have the CD, but have the data files"
1297 einfo "mounted somewhere on your filesystem, just export" 1277 einfo "mounted somewhere on your filesystem, just export"
1298 einfo "the variable CD_ROOT so that it points to the" 1278 einfo "the variable CD_ROOT so that it points to the"
1299 einfo "directory containing the files." 1279 einfo "directory containing the files."
1300 echo 1280 echo
1281 einfo "For example:"
1282 einfo "export CD_ROOT=/mnt/cdrom"
1283 echo
1301 else 1284 else
1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1285 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303 cdcnt=0 1286 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1287 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1288 cdcnt=$((cdcnt + 1))
1306 var="CDROM_NAME_${cdcnt}" 1289 var="CDROM_NAME_${cdcnt}"
1307 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1290 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1308 done 1291 done
1309 echo 1292 echo
1310 einfo "If you do not have the CDs, but have the data files" 1293 einfo "If you do not have the CDs, but have the data files"
1311 einfo "mounted somewhere on your filesystem, just export" 1294 einfo "mounted somewhere on your filesystem, just export"
1312 einfo "the following variables so they point to the right place:" 1295 einfo "the following variables so they point to the right place:"
1313 einfon "" 1296 einfon ""
1314 cdcnt=0 1297 cdcnt=0
1315 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1298 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1316 cdcnt=$((cdcnt + 1)) 1299 cdcnt=$((cdcnt + 1))
1317 echo -n " CD_ROOT_${cdcnt}" 1300 echo -n " CD_ROOT_${cdcnt}"
1318 done 1301 done
1319 echo 1302 echo
1320 einfo "Or, if you have all the files in the same place, or" 1303 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" 1304 einfo "you only have one cdrom, you can export CD_ROOT"
1322 einfo "and that place will be used as the same data source" 1305 einfo "and that place will be used as the same data source"
1323 einfo "for all the CDs." 1306 einfo "for all the CDs."
1324 echo 1307 echo
1308 einfo "For example:"
1309 einfo "export CD_ROOT_1=/mnt/cdrom"
1310 echo
1325 fi 1311 fi
1326 export CDROM_CURRENT_CD=0 1312 export CDROM_CURRENT_CD=0
1327 cdrom_load_next_cd 1313 cdrom_load_next_cd
1328} 1314}
1329 1315
1333# remember, you can only go forward in the cd chain, you can't go back. 1319# remember, you can only go forward in the cd chain, you can't go back.
1334cdrom_load_next_cd() { 1320cdrom_load_next_cd() {
1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1321 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336 local var= 1322 local var=
1337 1323
1338 if [ ! -z "${CD_ROOT}" ] ; then 1324 if [[ ! -z ${CD_ROOT} ]] ; then
1339 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1325 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1340 return 1326 return
1341 fi 1327 fi
1342 1328
1343 unset CDROM_ROOT 1329 unset CDROM_ROOT
1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1330 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1345 if [ -z "${!var}" ] ; then 1331 if [[ -z ${!var} ]] ; then
1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1332 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347 cdrom_locate_file_on_cd ${!var} 1333 cdrom_locate_file_on_cd ${!var}
1348 else 1334 else
1349 export CDROM_ROOT="${!var}" 1335 export CDROM_ROOT=${!var}
1350 fi 1336 fi
1351 1337
1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1338 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1353} 1339}
1354 1340
1358# found, then a message asking for the user to insert the cdrom will be 1344# found, then a message asking for the user to insert the cdrom will be
1359# displayed and we'll hang out here until: 1345# displayed and we'll hang out here until:
1360# (1) the file is found on a mounted cdrom 1346# (1) the file is found on a mounted cdrom
1361# (2) the user hits CTRL+C 1347# (2) the user hits CTRL+C
1362cdrom_locate_file_on_cd() { 1348cdrom_locate_file_on_cd() {
1363 while [ -z "${CDROM_ROOT}" ] ; do 1349 while [[ -z ${CDROM_ROOT} ]] ; do
1364 local dir="$(dirname ${@})" 1350 local dir="$(dirname ${@})"
1365 local file="$(basename ${@})" 1351 local file="$(basename ${@})"
1366 local mline="" 1352 local mline=""
1367 local showedmsg=0 1353 local showedmsg=0
1368 1354
1369 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1355 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1370 [ -d "${mline}/${dir}" ] || continue 1356 [[ -d ${mline}/${dir} ]] || continue
1371 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1357 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1372 && export CDROM_ROOT=${mline} 1358 && export CDROM_ROOT=${mline}
1373 done 1359 done
1374 1360
1375 if [ -z "${CDROM_ROOT}" ] ; then 1361 if [[ -z ${CDROM_ROOT} ]] ; then
1376 echo 1362 echo
1377 if [ ${showedmsg} -eq 0 ] ; then 1363 if [[ ${showedmsg} -eq 0 ]] ; then
1378 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1364 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1379 if [ -z "${CDROM_NAME}" ] ; then 1365 if [[ -z ${CDROM_NAME} ]] ; then
1380 einfo "Please insert the cdrom for ${PN} now !" 1366 einfo "Please insert the cdrom for ${PN} now !"
1381 else 1367 else
1382 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1368 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383 fi 1369 fi
1384 else 1370 else
1385 if [ -z "${CDROM_NAME_1}" ] ; then 1371 if [[ -z ${CDROM_NAME_1} ]] ; then
1386 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1372 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1387 else 1373 else
1388 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1374 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1389 einfo "Please insert+mount the ${!var} cdrom now !" 1375 einfo "Please insert+mount the ${!var} cdrom now !"
1390 fi 1376 fi
1410# directories and uses the intersection of the lists. 1396# directories and uses the intersection of the lists.
1411# The -u builds a list of po files found in all the 1397# The -u builds a list of po files found in all the
1412# directories and uses the union of the lists. 1398# directories and uses the union of the lists.
1413strip-linguas() { 1399strip-linguas() {
1414 local ls newls 1400 local ls newls
1415 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1401 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1416 local op="$1"; shift 1402 local op=$1; shift
1417 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1403 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1418 local d f 1404 local d f
1419 for d in "$@" ; do 1405 for d in "$@" ; do
1420 if [ "${op}" == "-u" ] ; then 1406 if [[ ${op} == "-u" ]] ; then
1421 newls="${ls}" 1407 newls=${ls}
1422 else 1408 else
1423 newls="" 1409 newls=""
1424 fi 1410 fi
1425 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1411 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1426 if [ "${op}" == "-i" ] ; then 1412 if [[ ${op} == "-i" ]] ; then
1427 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1413 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1428 else 1414 else
1429 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1415 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1430 fi 1416 fi
1431 done 1417 done
1432 ls="${newls}" 1418 ls=${newls}
1433 done 1419 done
1434 ls="${ls//.po}" 1420 ls=${ls//.po}
1435 else 1421 else
1436 ls="$@" 1422 ls=$@
1437 fi 1423 fi
1438 1424
1439 ls=" ${ls} " 1425 ls=" ${ls} "
1440 newls="" 1426 newls=""
1441 for f in ${LINGUAS} ; do 1427 for f in ${LINGUAS} ; do
1442 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1428 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1443 newls="${newls} ${f}" 1429 newls="${newls} ${f}"
1444 else 1430 else
1445 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1431 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1446 fi 1432 fi
1447 done 1433 done
1448 if [ -z "${newls}" ] ; then 1434 if [[ -z ${newls} ]] ; then
1449 unset LINGUAS 1435 export LINGUAS=""
1450 else 1436 else
1451 export LINGUAS="${newls}" 1437 export LINGUAS=${newls:1}
1452 fi 1438 fi
1453} 1439}
1454 1440
1455# moved from kernel.eclass since they are generally useful outside of 1441# moved from kernel.eclass since they are generally useful outside of
1456# kernel.eclass -iggy (20041002) 1442# kernel.eclass -iggy (20041002)
1458# the following functions are useful in kernel module ebuilds, etc. 1444# the following functions are useful in kernel module ebuilds, etc.
1459# for an example see ivtv or drbd ebuilds 1445# for an example see ivtv or drbd ebuilds
1460 1446
1461# set's ARCH to match what the kernel expects 1447# set's ARCH to match what the kernel expects
1462set_arch_to_kernel() { 1448set_arch_to_kernel() {
1449 i=10
1450 while ((i--)) ; do
1451 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1452 done
1463 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1453 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1464 case ${ARCH} in 1454 case ${ARCH} in
1465 x86) export ARCH="i386";; 1455 x86) export ARCH="i386";;
1466 amd64) export ARCH="x86_64";; 1456 amd64) export ARCH="x86_64";;
1467 hppa) export ARCH="parisc";; 1457 hppa) export ARCH="parisc";;
1468 mips) export ARCH="mips";; 1458 mips) export ARCH="mips";;
1459 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}";; 1460 *) export ARCH="${ARCH}";;
1470 esac 1461 esac
1471} 1462}
1472 1463
1473# set's ARCH back to what portage expects 1464# set's ARCH back to what portage expects
1474set_arch_to_portage() { 1465set_arch_to_portage() {
1466 i=10
1467 while ((i--)) ; do
1468 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1469 done
1475 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1470 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1476} 1471}
1477 1472
1478# Jeremy Huddleston <eradicator@gentoo.org>: 1473# Jeremy Huddleston <eradicator@gentoo.org>:
1479# preserve_old_lib /path/to/libblah.so.0 1474# preserve_old_lib /path/to/libblah.so.0
1509 touch ${D}${LIB} 1504 touch ${D}${LIB}
1510 fi 1505 fi
1511} 1506}
1512 1507
1513preserve_old_lib_notify() { 1508preserve_old_lib_notify() {
1514 LIB=$1 1509 LIB=$1
1515 1510
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1511 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1517 SONAME=`basename ${LIB}` 1512 SONAME=`basename ${LIB}`
1518 1513
1519 einfo "An old version of an installed library was detected on your system." 1514 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" 1515 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," 1516 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:" 1517 einfo "you will need to execute the following command:"
1523 einfo " revdep-rebuild --soname ${SONAME}" 1518 einfo " revdep-rebuild --soname ${SONAME}"
1524 einfo 1519 einfo
1525 einfo "After doing that, you can safely remove ${LIB}" 1520 einfo "After doing that, you can safely remove ${LIB}"
1526 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1521 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1527 fi 1522 fi
1528} 1523}
1529 1524
1530# Hack for people to figure out if a package was built with 1525# Hack for people to figure out if a package was built with
1531# certain USE flags 1526# certain USE flags
1532# 1527#
1533# Usage: built_with_use <DEPEND ATOM> <List of USE flags> 1528# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1534# ex: built_with_use xchat gtk2 1529# ex: built_with_use xchat gtk2
1530#
1531# Flags: -a all USE flags should be utilized
1532# -o at least one USE flag should be utilized
1533# Note: the default flag is '-a'
1535built_with_use() { 1534built_with_use() {
1535 local opt=$1
1536 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1537
1536 local PKG=$(portageq best_version ${ROOT} $1) 1538 local PKG=$(best_version $1)
1539 shift
1540
1537 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1541 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1538 [[ ! -e ${USEFILE} ]] && return 1 1542 [[ ! -e ${USEFILE} ]] && return 1
1539 1543
1540 local USE_BUILT=$(<${USEFILE}) 1544 local USE_BUILT=$(<${USEFILE})
1541
1542 shift
1543 while [ $# -gt 0 ] ; do 1545 while [[ $# -gt 0 ]] ; do
1546 if [[ ${opt} = "-o" ]] ; then
1547 has $1 ${USE_BUILT} && return 0
1548 else
1544 has $1 ${USE_BUILT} || return 1 1549 has $1 ${USE_BUILT} || return 1
1550 fi
1545 shift 1551 shift
1546 done 1552 done
1547 return 0 1553 [[ ${opt} = "-a" ]]
1548} 1554}
1549 1555
1550# Many configure scripts wrongly bail when a C++ compiler 1556# Many configure scripts wrongly bail when a C++ compiler
1551# could not be detected. #73450 1557# could not be detected. #73450
1552epunt_cxx() { 1558epunt_cxx() {
1553 local dir=$1 1559 local dir=$1
1554 [[ -z ${dir} ]] && dir=${S} 1560 [[ -z ${dir} ]] && dir=${S}
1555 ebegin "Removing useless C++ checks" 1561 ebegin "Removing useless C++ checks"
1558 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1564 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1559 done 1565 done
1560 eend 0 1566 eend 0
1561} 1567}
1562 1568
1563# get_abi_var <VAR> [<ABI>] 1569# dopamd <file> [more files]
1564# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1565# 1570#
1566# This code is for testing purposes only with the sparc64-multilib ${PROFILE_ARCH} 1571# 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 1572dopamd() {
1568# it is subject to removal if a better way is worked out. 1573 [[ -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 1574
1596get_abi_CFLAGS() { get_abi_var CFLAGS $1; } 1575 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 1576
1577 INSDESTTREE=/etc/pam.d \
1578 doins "$@" || die "failed to install $@"
1579}
1580# newpamd <old name> <new name>
1581#
1582# Install pam file <old name> as <new name> in /etc/pam.d
1583newpamd() {
1584 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1585
1586 use pam || return 0
1587
1588 INSDESTTREE=/etc/pam.d \
1589 newins "$1" "$2" || die "failed to install $1 as $2"
1590}
1591
1592# make a wrapper script ...
1593# NOTE: this was originally games_make_wrapper, but I noticed other places where
1594# this could be used, so I have moved it here and made it not games-specific
1595# -- wolf31o2
1596# $1 == wrapper name
1597# $2 == binary to run
1598# $3 == directory to chdir before running binary
1599# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1600# $5 == path for wrapper
1601make_wrapper() {
1602 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1603 local tmpwrapper=$(emktemp)
1604 cat << EOF > "${tmpwrapper}"
1605#!/bin/sh
1606cd "${chdir}"
1607export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1608exec ${bin} "\$@"
1609EOF
1610 chmod go+rx "${tmpwrapper}"
1611 if [ -n "${5}" ]
1612 then
1613 exeinto ${5}
1614 newexe "${tmpwrapper}" "${wrapper}"
1615 else
1616 newbin "${tmpwrapper}" "${wrapper}"
1617 fi
1618}

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

  ViewVC Help
Powered by ViewVC 1.1.20