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

Diff of /eclass/eutils.eclass

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

Revision 1.118 Revision 1.174
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.118 2004/10/13 14:33:01 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.174 2005/05/24 05:10:19 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)
53get_libdir() {
54 LIBDIR_TEST=$(type econf)
55 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
56 # if there is an override, we want to use that... always.
57 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
58 # We don't need to know the verison of portage. We only need to know
59 # if there is support for CONF_LIBDIR in econf and co.
60 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
61 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
62 # # and if there isnt an override, and we're using a version of
63 # # portage without CONF_LIBDIR support, force the use of lib. dolib
64 # # and friends from portage 2.0.50 wont be too happy otherwise.
65 # CONF_LIBDIR="lib"
66 #fi
67 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
68 # will be <portage-2.0.51_pre20
69 CONF_LIBDIR="lib"
70 fi
71 # and of course, default to lib if CONF_LIBDIR isnt set
72 echo ${CONF_LIBDIR:=lib}
73 unset LIBDIR_TEST
74}
75
76
77get_multilibdir() {
78 echo ${CONF_MULTILIBDIR:=lib32}
79}
80
81
82# Sometimes you need to override the value returned by get_libdir. A good
83# example of this is xorg-x11, where lib32 isnt a supported configuration,
84# and where lib64 -must- be used on amd64 (for applications that need lib
85# to be 32bit, such as adobe acrobat). Note that this override also bypasses
86# portage version sanity checking.
87# get_libdir_override expects one argument, the result get_libdir should
88# return:
89#
90# get_libdir_override lib64
91#
92# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
93get_libdir_override() {
94 CONF_LIBDIR="$1"
95 CONF_LIBDIR_OVERRIDE="$1"
96}
97
98# This function generate linker scripts in /usr/lib for dynamic 47# This function generate linker scripts in /usr/lib for dynamic
99# 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
100# 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
101# 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
102# 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
116gen_usr_ldscript() { 65gen_usr_ldscript() {
117 local libdir="$(get_libdir)" 66 local libdir="$(get_libdir)"
118 # Just make sure it exists 67 # Just make sure it exists
119 dodir /usr/${libdir} 68 dodir /usr/${libdir}
120 69
70 for lib in "${@}" ; do
121 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
122/* GNU ld script 72 /* GNU ld script
123 Because Gentoo have critical dynamic libraries 73 Since Gentoo has critical dynamic libraries
124 in /lib, and the static versions in /usr/lib, we 74 in /lib, and the static versions in /usr/lib,
125 need to have a "fake" dynamic lib in /usr/lib, 75 we need to have a "fake" dynamic lib in /usr/lib,
126 otherwise we run into linking problems. 76 otherwise we run into linking problems.
127 See bug #4411 on http://bugs.gentoo.org/ for 77
128 more info. */ 78 See bug http://bugs.gentoo.org/4411 for more info.
79 */
129GROUP ( /${libdir}/${1} ) 80 GROUP ( /${libdir}/${lib} )
130END_LDSCRIPT 81 END_LDSCRIPT
131 fperms a+x "/usr/${libdir}/${1}" 82 fperms a+x "/usr/${libdir}/${lib}"
83 done
132} 84}
133 85
134# 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()
135# 88#
136# <azarah@gentoo.org> (11 Nov 2002) 89# <azarah@gentoo.org> (11 Nov 2002)
137# 90#
138draw_line() { 91draw_line() {
139 local i=0 92 local i=0
165EPATCH_SOURCE="${WORKDIR}/patch" 118EPATCH_SOURCE="${WORKDIR}/patch"
166# Default extension for patches 119# Default extension for patches
167EPATCH_SUFFIX="patch.bz2" 120EPATCH_SUFFIX="patch.bz2"
168# Default options for patch 121# Default options for patch
169# 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
170EPATCH_OPTS="-g0" 123# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
124EPATCH_OPTS="-g0 --no-backup-if-mismatch"
171# 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,
172# and not the full path .. 126# and not the full path ..
173EPATCH_EXCLUDE="" 127EPATCH_EXCLUDE=""
174# Change the printed message for a single patch. 128# Change the printed message for a single patch.
175EPATCH_SINGLE_MSG="" 129EPATCH_SINGLE_MSG=""
130# Change the printed message for multiple patches.
131EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
176# Force applying bulk patches even if not following the style: 132# Force applying bulk patches even if not following the style:
177# 133#
178# ??_${ARCH}_foo.${EPATCH_SUFFIX} 134# ??_${ARCH}_foo.${EPATCH_SUFFIX}
179# 135#
180EPATCH_FORCE="no" 136EPATCH_FORCE="no"
221 local x="" 177 local x=""
222 178
223 if [ "$#" -gt 1 ] 179 if [ "$#" -gt 1 ]
224 then 180 then
225 local m="" 181 local m=""
226 einfo "${#} patches to apply..."
227 for m in "$@" ; do 182 for m in "$@" ; do
228 epatch "${m}" 183 epatch "${m}"
229 done 184 done
230 return 0 185 return 0
231 fi 186 fi
245 local EPATCH_SOURCE="$1/*" 200 local EPATCH_SOURCE="$1/*"
246 else 201 else
247 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 202 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
248 fi 203 fi
249 else 204 else
250 if [ ! -d ${EPATCH_SOURCE} ] 205 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
251 then 206 then
252 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 207 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
253 then 208 then
254 EPATCH_SOURCE="$1" 209 EPATCH_SOURCE="$1"
255 fi 210 fi
256 211
257 echo 212 echo
258 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 213 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
259 eerror 214 eerror
260 eerror " ${EPATCH_SOURCE}" 215 eerror " ${EPATCH_SOURCE}"
216 eerror " ( ${EPATCH_SOURCE##*/} )"
261 echo 217 echo
262 die "Cannot find \$EPATCH_SOURCE!" 218 die "Cannot find \$EPATCH_SOURCE!"
263 fi 219 fi
264 220
265 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 221 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
284 ;; 240 ;;
285 esac 241 esac
286 242
287 if [ "${SINGLE_PATCH}" = "no" ] 243 if [ "${SINGLE_PATCH}" = "no" ]
288 then 244 then
289 einfo "Applying various patches (bugfixes/updates)..." 245 einfo "${EPATCH_MULTI_MSG}"
290 fi 246 fi
291 for x in ${EPATCH_SOURCE} 247 for x in ${EPATCH_SOURCE}
292 do 248 do
293 # New ARCH dependant patch naming scheme... 249 # New ARCH dependant patch naming scheme ...
294 # 250 #
295 # ???_arch_foo.patch 251 # ???_arch_foo.patch
296 # 252 #
297 if [ -f ${x} ] && \ 253 if [ -f ${x} ] && \
298 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 254 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \
299 [ "${EPATCH_FORCE}" = "yes" ]) 255 [ "${EPATCH_FORCE}" = "yes" ])
300 then 256 then
301 local count=0 257 local count=0
302 local popts="${EPATCH_OPTS}" 258 local popts="${EPATCH_OPTS}"
259 local patchname=${x##*/}
303 260
304 if [ -n "${EPATCH_EXCLUDE}" ] 261 if [ -n "${EPATCH_EXCLUDE}" ]
305 then 262 then
306 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 263 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
307 then 264 then
308 continue 265 continue
309 fi 266 fi
310 fi 267 fi
311 268
313 then 270 then
314 if [ -n "${EPATCH_SINGLE_MSG}" ] 271 if [ -n "${EPATCH_SINGLE_MSG}" ]
315 then 272 then
316 einfo "${EPATCH_SINGLE_MSG}" 273 einfo "${EPATCH_SINGLE_MSG}"
317 else 274 else
318 einfo "Applying ${x##*/}..." 275 einfo "Applying ${patchname} ..."
319 fi 276 fi
320 else 277 else
321 einfo " ${x##*/}..." 278 einfo " ${patchname} ..."
322 fi 279 fi
323 280
324 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 281 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
325 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
326 283
327 # Allow for prefix to differ ... im lazy, so shoot me :/ 284 # Allow for prefix to differ ... im lazy, so shoot me :/
328 while [ "${count}" -lt 5 ] 285 while [ "${count}" -lt 5 ]
329 do 286 do
330 # Generate some useful debug info ... 287 # Generate some useful debug info ...
331 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 288 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
332 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 289 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 290
334 if [ "${PATCH_SUFFIX}" != "patch" ] 291 if [ "${PATCH_SUFFIX}" != "patch" ]
335 then 292 then
336 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 293 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 294 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 else 295 else
339 PATCH_TARGET="${x}" 296 PATCH_TARGET="${x}"
340 fi 297 fi
341 298
342 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 299 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 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##*/}
344 301
345 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
346 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 303 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
347 304
348 if [ "${PATCH_SUFFIX}" != "patch" ] 305 if [ "${PATCH_SUFFIX}" != "patch" ]
349 then 306 then
350 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
351 then 308 then
352 echo 309 echo
353 eerror "Could not extract patch!" 310 eerror "Could not extract patch!"
354 #die "Could not extract patch!" 311 #die "Could not extract patch!"
355 count=5 312 count=5
356 break 313 break
357 fi 314 fi
358 fi 315 fi
359 316
360 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
361 then 318 then
362 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 319 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
363 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
364 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
365 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
366 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
367 324
368 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
369 326
370 if [ "$?" -ne 0 ] 327 if [ "$?" -ne 0 ]
371 then 328 then
372 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##*/}
373 echo 330 echo
374 eerror "A dry-run of patch command succeeded, but actually" 331 eerror "A dry-run of patch command succeeded, but actually"
375 eerror "applying the patch failed!" 332 eerror "applying the patch failed!"
376 #die "Real world sux compared to the dreamworld!" 333 #die "Real world sux compared to the dreamworld!"
377 count=5 334 count=5
378 fi 335 fi
379 336
380 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 337 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
381 338
382 break 339 break
383 fi 340 fi
384 341
385 count=$((count + 1)) 342 count=$((count + 1))
391 fi 348 fi
392 349
393 if [ "${count}" -eq 5 ] 350 if [ "${count}" -eq 5 ]
394 then 351 then
395 echo 352 echo
396 eerror "Failed Patch: ${x##*/}!" 353 eerror "Failed Patch: ${patchname} !"
354 eerror " ( ${PATCH_TARGET} )"
397 eerror 355 eerror
398 eerror "Include in your bugreport the contents of:" 356 eerror "Include in your bugreport the contents of:"
399 eerror 357 eerror
400 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 358 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
401 echo 359 echo
402 die "Failed Patch: ${x##*/}!" 360 die "Failed Patch: ${patchname}!"
403 fi 361 fi
404 362
405 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 363 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
406 364
407 eend 0 365 eend 0
408 fi 366 fi
409 done 367 done
410 if [ "${SINGLE_PATCH}" = "no" ] 368 if [ "${SINGLE_PATCH}" = "no" ]
411 then 369 then
412 einfo "Done with patching" 370 einfo "Done with patching"
413 fi
414}
415
416# This function return true if we are using the NPTL pthreads
417# implementation.
418#
419# <azarah@gentoo.org> (06 March 2003)
420#
421have_NPTL() {
422 cat > ${T}/test-nptl.c <<-"END"
423 #define _XOPEN_SOURCE
424 #include <unistd.h>
425 #include <stdio.h>
426
427 int main()
428 {
429 char buf[255];
430 char *str = buf;
431
432 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
433 if (NULL != str) {
434 printf("%s\n", str);
435 if (NULL != strstr(str, "NPTL"))
436 return 0;
437 }
438
439 return 1;
440 }
441 END
442
443 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... "
444 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
445 then
446 echo "yes"
447 einfon "Checking what PTHREADS implementation we have ... "
448 if ${T}/nptl
449 then
450 return 0
451 else
452 return 1
453 fi
454 else
455 echo "no"
456 fi
457
458 return 1
459}
460
461# This function check how many cpu's are present, and then set
462# -j in MAKEOPTS accordingly.
463#
464# Thanks to nall <nall@gentoo.org> for this.
465#
466get_number_of_jobs() {
467 local jobs=0
468
469 if [ ! -r /proc/cpuinfo ]
470 then
471 return 1
472 fi
473
474 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
475 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
476 then
477 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
478 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
479 ADMINPARAM="${ADMINPARAM/-j}"
480 fi
481
482 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
483
484 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
485 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
486 then
487 # these archs will always have "[Pp]rocessor"
488 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
489
490 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
491 then
492 # sparc always has "ncpus active"
493 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
494
495 elif [ "${ARCH}" = "alpha" ]
496 then
497 # alpha has "cpus active", but only when compiled with SMP
498 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
499 then
500 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
501 else
502 jobs=2
503 fi
504
505 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
506 then
507 # ppc has "processor", but only when compiled with SMP
508 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
509 then
510 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
511 else
512 jobs=2
513 fi
514 elif [ "${ARCH}" = "s390" ]
515 then
516 # s390 has "# processors : "
517 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
518 else
519 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
520 die "Unknown ARCH -- ${ARCH}!"
521 fi
522
523 # Make sure the number is valid ...
524 if [ "${jobs}" -lt 1 ]
525 then
526 jobs=1
527 fi
528
529 if [ -n "${ADMINPARAM}" ]
530 then
531 if [ "${jobs}" -gt "${ADMINPARAM}" ]
532 then
533 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..."
534 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
535 else
536 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..."
537 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
538 fi
539 fi 371 fi
540} 372}
541 373
542# Cheap replacement for when debianutils (and thus mktemp) 374# Cheap replacement for when debianutils (and thus mktemp)
543# does not exist on the users system 375# does not exist on the users system
544# vapier@gentoo.org 376# vapier@gentoo.org
545# 377#
546# Takes just 1 optional parameter (the directory to create tmpfile in) 378# Takes just 1 optional parameter (the directory to create tmpfile in)
547emktemp() { 379emktemp() {
380 local exe="touch"
381 [ "$1" == "-d" ] && exe="mkdir" && shift
548 local topdir="$1" 382 local topdir="$1"
549 383
550 if [ -z "${topdir}" ] 384 if [ -z "${topdir}" ]
551 then 385 then
552 [ -z "${T}" ] \ 386 [ -z "${T}" ] \
558 then 392 then
559 local tmp=/ 393 local tmp=/
560 while [ -e "${tmp}" ] ; do 394 while [ -e "${tmp}" ] ; do
561 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 395 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
562 done 396 done
563 touch "${tmp}" 397 ${exe} "${tmp}"
564 echo "${tmp}" 398 echo "${tmp}"
565 else 399 else
400 [ "${exe}" == "touch" ] \
401 && exe="-p" \
402 || exe="-d"
566 mktemp -p "${topdir}" 403 mktemp ${exe} "${topdir}"
567 fi 404 fi
568} 405}
569 406
570# Small wrapper for getent (Linux), nidump (Mac OS X), 407# Small wrapper for getent (Linux), nidump (Mac OS X),
571# and pw (FreeBSD) used in enewuser()/enewgroup() 408# and pw (FreeBSD) used in enewuser()/enewgroup()
572# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 409# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
573# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 410# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
574# 411#
575# egetent(database, key) 412# egetent(database, key)
576egetent() { 413egetent() {
577 if useq macos || useq ppc-macos ; then 414 if useq ppc-macos ; then
578 case "$2" in 415 case "$2" in
579 *[!0-9]*) # Non numeric 416 *[!0-9]*) # Non numeric
580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
581 ;; 418 ;;
582 *) # Numeric 419 *) # Numeric
729 566
730 # handle extra and add the user 567 # handle extra and add the user
731 local eextra="$@" 568 local eextra="$@"
732 local oldsandbox="${SANDBOX_ON}" 569 local oldsandbox="${SANDBOX_ON}"
733 export SANDBOX_ON="0" 570 export SANDBOX_ON="0"
734 if useq macos || useq ppc-macos ; 571 if useq ppc-macos
735 then 572 then
736 ### Make the user 573 ### Make the user
737 if [ -z "${eextra}" ] 574 if [ -z "${eextra}" ]
738 then 575 then
739 dscl . create /users/${euser} uid ${euid} 576 dscl . create /users/${euser} uid ${euid}
822 then 659 then
823 if [ "${egid}" -gt 0 ] 660 if [ "${egid}" -gt 0 ]
824 then 661 then
825 if [ -z "`egetent group ${egid}`" ] 662 if [ -z "`egetent group ${egid}`" ]
826 then 663 then
827 if useq macos || useq ppc-macos ; then 664 if useq ppc-macos ; then
828 opts="${opts} ${egid}" 665 opts="${opts} ${egid}"
829 else 666 else
830 opts="${opts} -g ${egid}" 667 opts="${opts} -g ${egid}"
831 fi 668 fi
832 else 669 else
846 opts="${opts} ${eextra}" 683 opts="${opts} ${eextra}"
847 684
848 # add the group 685 # add the group
849 local oldsandbox="${SANDBOX_ON}" 686 local oldsandbox="${SANDBOX_ON}"
850 export SANDBOX_ON="0" 687 export SANDBOX_ON="0"
851 if useq macos || useq ppc-macos ; 688 if useq ppc-macos ; then
852 then
853 if [ ! -z "${eextra}" ]; 689 if [ ! -z "${eextra}" ];
854 then 690 then
855 einfo "Extra options are not supported on macos yet" 691 einfo "Extra options are not supported on macos yet"
856 einfo "Please report the ebuild along with the info below" 692 einfo "Please report the ebuild along with the info below"
857 einfo "eextra: ${eextra}" 693 einfo "eextra: ${eextra}"
882} 718}
883 719
884# Simple script to replace 'dos2unix' binaries 720# Simple script to replace 'dos2unix' binaries
885# vapier@gentoo.org 721# vapier@gentoo.org
886# 722#
887# edos2unix(file, <more files>...) 723# edos2unix(file, <more files> ...)
888edos2unix() { 724edos2unix() {
889 for f in "$@" 725 for f in "$@"
890 do 726 do
891 cp "${f}" ${T}/edos2unix 727 cp "${f}" ${T}/edos2unix
892 sed 's/\r$//' ${T}/edos2unix > "${f}" 728 sed 's/\r$//' ${T}/edos2unix > "${f}"
893 done 729 done
894} 730}
895 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
896# Make a desktop file ! 739# Make a desktop file !
897# Great for making those icons in kde/gnome startmenu ! 740# Great for making those icons in kde/gnome startmenu !
898# Amaze your friends ! Get the women ! Join today ! 741# Amaze your friends ! Get the women ! Join today !
899# 742#
900# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 743# make_desktop_entry(<binary>, [name], [icon], [type], [path])
903# name: the name that will show up in the menu 746# name: the name that will show up in the menu
904# icon: give your little like a pretty little icon ... 747# icon: give your little like a pretty little icon ...
905# this can be relative (to /usr/share/pixmaps) or 748# this can be relative (to /usr/share/pixmaps) or
906# a full path to an icon 749# a full path to an icon
907# type: what kind of application is this ? for categories: 750# type: what kind of application is this ? for categories:
908# http://www.freedesktop.org/standards/menu-spec/ 751# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
909# path: if your app needs to startup in a specific dir 752# path: if your app needs to startup in a specific dir
910make_desktop_entry() { 753make_desktop_entry() {
911 [ -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
912 755
913 local exec="${1}" 756 local exec=${1}
914 local name="${2:-${PN}}" 757 local name=${2:-${PN}}
915 local icon="${3:-${PN}.png}" 758 local icon=${3:-${PN}.png}
916 local type="${4}" 759 local type=${4}
917 local subdir="${6}" 760 local path=${5}
918 local path="${5:-${GAMES_BINDIR}}" 761
919 if [ -z "${type}" ] 762 if [[ -z ${type} ]] ; then
920 then 763 local catmaj=${CATEGORY%%-*}
921 case ${CATEGORY} in 764 local catmin=${CATEGORY##*-}
922 "app-emulation") 765 case ${catmaj} in
923 type=Emulator 766 app)
924 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
925 ;; 780 ;;
926 "games-"*) 781
927 type=Game 782 dev)
928 subdir="Games" 783 type="Development"
929 ;; 784 ;;
930 "net-"*) 785
931 type=Network 786 games)
932 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}"
933 ;; 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
934 *) 858 *)
935 type= 859 type=
936 subdir=
937 ;; 860 ;;
938 esac 861 esac
939 fi 862 fi
863
940 local desktop="${T}/${exec}.desktop" 864 local desktop=${T}/${exec%% *}-${P}.desktop
941 865
942echo "[Desktop Entry] 866echo "[Desktop Entry]
943Encoding=UTF-8 867Encoding=UTF-8
944Version=0.9.2 868Version=0.9.2
945Name=${name} 869Name=${name}
953 insinto /usr/share/applications 877 insinto /usr/share/applications
954 doins "${desktop}" 878 doins "${desktop}"
955 879
956 return 0 880 return 0
957} 881}
882
883# Make a GDM/KDM Session file
884#
885# make_desktop_entry(<title>, <command>)
886# title: File to execute to start the Window Manager
887# command: Name of the Window Manager
888
889make_session_desktop() {
890 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
891 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
892
893 local title=$1
894 local command=$2
895 local desktop=${T}/${wm}.desktop
896
897echo "[Desktop Entry]
898Encoding=UTF-8
899Name=${title}
900Comment=This session logs you into ${title}
901Exec=${command}
902TryExec=${command}
903Type=Application" > "${desktop}"
904
905 insinto /usr/share/xsessions
906 doins "${desktop}"
907}
908
909domenu() {
910 local i j
911 insinto /usr/share/applications
912 for i in "$@" ; do
913 if [[ -f ${i} ]] ; then
914 doins "${i}"
915 elif [[ -d ${i} ]] ; then
916 for j in "${i}"/*.desktop ; do
917 doins "${j}"
918 done
919 fi
920 done
921}
922newmenu() {
923 insinto /usr/share/applications
924 newins "$1" "$2"
925}
926
927doicon() {
928 local i j
929 insinto /usr/share/pixmaps
930 for i in "$@" ; do
931 if [[ -f ${i} ]] ; then
932 doins "${i}"
933 elif [[ -d ${i} ]] ; then
934 for j in "${i}"/*.png ; do
935 doins "${j}"
936 done
937 fi
938 done
939}
940newicon() {
941 insinto /usr/share/pixmaps
942 newins "$1" "$2"
943}
944
945##############################################################
946# END: Handle .desktop files and menu entries #
947##############################################################
948
958 949
959# for internal use only (unpack_pdv and unpack_makeself) 950# for internal use only (unpack_pdv and unpack_makeself)
960find_unpackable_file() { 951find_unpackable_file() {
961 local src="$1" 952 local src="$1"
962 if [ -z "${src}" ] 953 if [ -z "${src}" ]
1243 export CDROM_TOTAL_CDS=${cdcnt} 1234 export CDROM_TOTAL_CDS=${cdcnt}
1244 export CDROM_CURRENT_CD=1 1235 export CDROM_CURRENT_CD=1
1245 1236
1246 # now we see if the user gave use CD_ROOT ... 1237 # now we see if the user gave use CD_ROOT ...
1247 # if they did, let's just believe them that it's correct 1238 # if they did, let's just believe them that it's correct
1248 if [ ! -z "${CD_ROOT}" ] ; then 1239 if [[ ! -z ${CD_ROOT} ]] ; then
1249 export CDROM_ROOT="${CD_ROOT}" 1240 export CDROM_ROOT=${CD_ROOT}
1250 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1241 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1251 return 1242 return
1252 fi 1243 fi
1253 # do the same for CD_ROOT_X 1244 # do the same for CD_ROOT_X
1254 if [ ! -z "${CD_ROOT_1}" ] ; then 1245 if [[ ! -z ${CD_ROOT_1} ]] ; then
1255 local var= 1246 local var=
1256 cdcnt=0 1247 cdcnt=0
1257 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1248 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1258 cdcnt=$((cdcnt + 1)) 1249 cdcnt=$((cdcnt + 1))
1259 var="CD_ROOT_${cdcnt}" 1250 var="CD_ROOT_${cdcnt}"
1260 if [ -z "${!var}" ] ; then 1251 if [[ -z ${!var} ]] ; then
1261 eerror "You must either use just the CD_ROOT" 1252 eerror "You must either use just the CD_ROOT"
1262 eerror "or specify ALL the CD_ROOT_X variables." 1253 eerror "or specify ALL the CD_ROOT_X variables."
1263 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1254 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1264 die "could not locate CD_ROOT_${cdcnt}" 1255 die "could not locate CD_ROOT_${cdcnt}"
1265 fi 1256 fi
1268 export CDROM_ROOT=${CDROM_ROOTS_1} 1259 export CDROM_ROOT=${CDROM_ROOTS_1}
1269 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1260 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1270 return 1261 return
1271 fi 1262 fi
1272 1263
1273 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1264 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1274 einfon "This ebuild will need the " 1265 einfon "This ebuild will need the "
1275 if [ -z "${CDROM_NAME}" ] ; then 1266 if [[ -z ${CDROM_NAME} ]] ; then
1276 echo "cdrom for ${PN}." 1267 echo "cdrom for ${PN}."
1277 else 1268 else
1278 echo "${CDROM_NAME}." 1269 echo "${CDROM_NAME}."
1279 fi 1270 fi
1280 echo 1271 echo
1281 einfo "If you do not have the CD, but have the data files" 1272 einfo "If you do not have the CD, but have the data files"
1282 einfo "mounted somewhere on your filesystem, just export" 1273 einfo "mounted somewhere on your filesystem, just export"
1283 einfo "the variable CD_ROOT so that it points to the" 1274 einfo "the variable CD_ROOT so that it points to the"
1284 einfo "directory containing the files." 1275 einfo "directory containing the files."
1285 echo 1276 echo
1277 einfo "For example:"
1278 einfo "export CD_ROOT=/mnt/cdrom"
1279 echo
1286 else 1280 else
1287 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1281 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1288 cdcnt=0 1282 cdcnt=0
1289 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1283 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1290 cdcnt=$((cdcnt + 1)) 1284 cdcnt=$((cdcnt + 1))
1291 var="CDROM_NAME_${cdcnt}" 1285 var="CDROM_NAME_${cdcnt}"
1292 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1286 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1293 done 1287 done
1294 echo 1288 echo
1295 einfo "If you do not have the CDs, but have the data files" 1289 einfo "If you do not have the CDs, but have the data files"
1296 einfo "mounted somewhere on your filesystem, just export" 1290 einfo "mounted somewhere on your filesystem, just export"
1297 einfo "the following variables so they point to the right place:" 1291 einfo "the following variables so they point to the right place:"
1298 einfon "" 1292 einfon ""
1299 cdcnt=0 1293 cdcnt=0
1300 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1294 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1301 cdcnt=$((cdcnt + 1)) 1295 cdcnt=$((cdcnt + 1))
1302 echo -n " CD_ROOT_${cdcnt}" 1296 echo -n " CD_ROOT_${cdcnt}"
1303 done 1297 done
1304 echo 1298 echo
1305 einfo "Or, if you have all the files in the same place, or" 1299 einfo "Or, if you have all the files in the same place, or"
1306 einfo "you only have one cdrom, you can export CD_ROOT" 1300 einfo "you only have one cdrom, you can export CD_ROOT"
1307 einfo "and that place will be used as the same data source" 1301 einfo "and that place will be used as the same data source"
1308 einfo "for all the CDs." 1302 einfo "for all the CDs."
1309 echo 1303 echo
1304 einfo "For example:"
1305 einfo "export CD_ROOT_1=/mnt/cdrom"
1306 echo
1310 fi 1307 fi
1311 export CDROM_CURRENT_CD=0 1308 export CDROM_CURRENT_CD=0
1312 cdrom_load_next_cd 1309 cdrom_load_next_cd
1313} 1310}
1314 1311
1318# remember, you can only go forward in the cd chain, you can't go back. 1315# remember, you can only go forward in the cd chain, you can't go back.
1319cdrom_load_next_cd() { 1316cdrom_load_next_cd() {
1320 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1317 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1321 local var= 1318 local var=
1322 1319
1323 if [ ! -z "${CD_ROOT}" ] ; then 1320 if [[ ! -z ${CD_ROOT} ]] ; then
1324 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1321 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1325 return 1322 return
1326 fi 1323 fi
1327 1324
1328 unset CDROM_ROOT 1325 unset CDROM_ROOT
1329 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1326 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1330 if [ -z "${!var}" ] ; then 1327 if [[ -z ${!var} ]] ; then
1331 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1328 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1332 cdrom_locate_file_on_cd ${!var} 1329 cdrom_locate_file_on_cd ${!var}
1333 else 1330 else
1334 export CDROM_ROOT="${!var}" 1331 export CDROM_ROOT=${!var}
1335 fi 1332 fi
1336 1333
1337 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1334 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1338} 1335}
1339 1336
1343# found, then a message asking for the user to insert the cdrom will be 1340# found, then a message asking for the user to insert the cdrom will be
1344# displayed and we'll hang out here until: 1341# displayed and we'll hang out here until:
1345# (1) the file is found on a mounted cdrom 1342# (1) the file is found on a mounted cdrom
1346# (2) the user hits CTRL+C 1343# (2) the user hits CTRL+C
1347cdrom_locate_file_on_cd() { 1344cdrom_locate_file_on_cd() {
1348 while [ -z "${CDROM_ROOT}" ] ; do 1345 while [[ -z ${CDROM_ROOT} ]] ; do
1349 local dir="$(dirname ${@})" 1346 local dir="$(dirname ${@})"
1350 local file="$(basename ${@})" 1347 local file="$(basename ${@})"
1351 local mline="" 1348 local mline=""
1352 local showedmsg=0 1349 local showedmsg=0
1353 1350
1354 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1351 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1355 [ -d "${mline}/${dir}" ] || continue 1352 [[ -d ${mline}/${dir} ]] || continue
1356 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1353 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1357 && export CDROM_ROOT=${mline} 1354 && export CDROM_ROOT=${mline}
1358 done 1355 done
1359 1356
1360 if [ -z "${CDROM_ROOT}" ] ; then 1357 if [[ -z ${CDROM_ROOT} ]] ; then
1361 echo 1358 echo
1362 if [ ${showedmsg} -eq 0 ] ; then 1359 if [[ ${showedmsg} -eq 0 ]] ; then
1363 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1360 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1364 if [ -z "${CDROM_NAME}" ] ; then 1361 if [[ -z ${CDROM_NAME} ]] ; then
1365 einfo "Please insert the cdrom for ${PN} now !" 1362 einfo "Please insert the cdrom for ${PN} now !"
1366 else 1363 else
1367 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1364 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1368 fi 1365 fi
1369 else 1366 else
1370 if [ -z "${CDROM_NAME_1}" ] ; then 1367 if [[ -z ${CDROM_NAME_1} ]] ; then
1371 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1368 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1372 else 1369 else
1373 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1370 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1374 einfo "Please insert+mount the ${!var} cdrom now !" 1371 einfo "Please insert+mount the ${!var} cdrom now !"
1375 fi 1372 fi
1395# directories and uses the intersection of the lists. 1392# directories and uses the intersection of the lists.
1396# The -u builds a list of po files found in all the 1393# The -u builds a list of po files found in all the
1397# directories and uses the union of the lists. 1394# directories and uses the union of the lists.
1398strip-linguas() { 1395strip-linguas() {
1399 local ls newls 1396 local ls newls
1400 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1397 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1401 local op="$1"; shift 1398 local op=$1; shift
1402 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1399 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1403 local d f 1400 local d f
1404 for d in "$@" ; do 1401 for d in "$@" ; do
1405 if [ "${op}" == "-u" ] ; then 1402 if [[ ${op} == "-u" ]] ; then
1406 newls="${ls}" 1403 newls=${ls}
1407 else 1404 else
1408 newls="" 1405 newls=""
1409 fi 1406 fi
1410 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1407 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1411 if [ "${op}" == "-i" ] ; then 1408 if [[ ${op} == "-i" ]] ; then
1412 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1409 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1413 else 1410 else
1414 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1411 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1415 fi 1412 fi
1416 done 1413 done
1417 ls="${newls}" 1414 ls=${newls}
1418 done 1415 done
1419 ls="${ls//.po}" 1416 ls=${ls//.po}
1420 else 1417 else
1421 ls="$@" 1418 ls=$@
1422 fi 1419 fi
1423 1420
1424 ls=" ${ls} " 1421 ls=" ${ls} "
1425 newls="" 1422 newls=""
1426 for f in ${LINGUAS} ; do 1423 for f in ${LINGUAS} ; do
1427 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1424 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1428 nl="${newls} ${f}" 1425 newls="${newls} ${f}"
1429 else 1426 else
1430 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1427 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1431 fi 1428 fi
1432 done 1429 done
1433 if [ -z "${newls}" ] ; then 1430 if [[ -z ${newls} ]] ; then
1434 unset LINGUAS 1431 export LINGUAS=""
1435 else 1432 else
1436 export LINGUAS="${newls}" 1433 export LINGUAS=${newls:1}
1437 fi 1434 fi
1438} 1435}
1439 1436
1440# moved from kernel.eclass since they are generally useful outside of 1437# moved from kernel.eclass since they are generally useful outside of
1441# kernel.eclass -iggy (20041002) 1438# kernel.eclass -iggy (20041002)
1443# the following functions are useful in kernel module ebuilds, etc. 1440# the following functions are useful in kernel module ebuilds, etc.
1444# for an example see ivtv or drbd ebuilds 1441# for an example see ivtv or drbd ebuilds
1445 1442
1446# set's ARCH to match what the kernel expects 1443# set's ARCH to match what the kernel expects
1447set_arch_to_kernel() { 1444set_arch_to_kernel() {
1445 i=10
1446 while ((i--)) ; do
1447 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1448 done
1448 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1449 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1449 case ${ARCH} in 1450 case ${ARCH} in
1450 x86) export ARCH="i386";; 1451 x86) export ARCH="i386";;
1451 amd64) export ARCH="x86_64";; 1452 amd64) export ARCH="x86_64";;
1452 hppa) export ARCH="parisc";; 1453 hppa) export ARCH="parisc";;
1453 mips) export ARCH="mips";; 1454 mips) export ARCH="mips";;
1455 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!
1454 *) export ARCH="${ARCH}";; 1456 *) export ARCH="${ARCH}";;
1455 esac 1457 esac
1456} 1458}
1457 1459
1458# set's ARCH back to what portage expects 1460# set's ARCH back to what portage expects
1459set_arch_to_portage() { 1461set_arch_to_portage() {
1462 i=10
1463 while ((i--)) ; do
1464 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1465 done
1460 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1466 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1461} 1467}
1462 1468
1463# Jeremy Huddleston <eradicator@gentoo.org>: 1469# Jeremy Huddleston <eradicator@gentoo.org>:
1464# preserve_old_lib /path/to/libblah.so.0 1470# preserve_old_lib /path/to/libblah.so.0
1494 touch ${D}${LIB} 1500 touch ${D}${LIB}
1495 fi 1501 fi
1496} 1502}
1497 1503
1498preserve_old_lib_notify() { 1504preserve_old_lib_notify() {
1499 LIB=$1 1505 LIB=$1
1500 1506
1501 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1507 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1502 SONAME=`basename ${LIB}` 1508 SONAME=`basename ${LIB}`
1503 1509
1504 einfo "An old version of an installed library was detected on your system." 1510 einfo "An old version of an installed library was detected on your system."
1505 einfo "In order to avoid breaking packages that link against is, this older version" 1511 einfo "In order to avoid breaking packages that link against is, this older version"
1506 einfo "is not being removed. In order to make full use of this newer version," 1512 einfo "is not being removed. In order to make full use of this newer version,"
1507 einfo "you will need to execute the following command:" 1513 einfo "you will need to execute the following command:"
1508 einfo " revdep-rebuild --soname ${SONAME}" 1514 einfo " revdep-rebuild --soname ${SONAME}"
1509 einfo 1515 einfo
1510 einfo "After doing that, you can safely remove ${LIB}" 1516 einfo "After doing that, you can safely remove ${LIB}"
1511 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1517 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1512 fi 1518 fi
1513} 1519}
1520
1521# Hack for people to figure out if a package was built with
1522# certain USE flags
1523#
1524# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1525# ex: built_with_use xchat gtk2
1526#
1527# Flags: -a all USE flags should be utilized
1528# -o at least one USE flag should be utilized
1529# Note: the default flag is '-a'
1530built_with_use() {
1531 local opt=$1
1532 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1533
1534 local PKG=$(best_version $1)
1535 shift
1536
1537 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1538 [[ ! -e ${USEFILE} ]] && return 1
1539
1540 local USE_BUILT=$(<${USEFILE})
1541 while [[ $# -gt 0 ]] ; do
1542 if [[ ${opt} = "-o" ]] ; then
1543 has $1 ${USE_BUILT} && return 0
1544 else
1545 has $1 ${USE_BUILT} || return 1
1546 fi
1547 shift
1548 done
1549 [[ ${opt} = "-a" ]]
1550}
1551
1552# Many configure scripts wrongly bail when a C++ compiler
1553# could not be detected. #73450
1554epunt_cxx() {
1555 local dir=$1
1556 [[ -z ${dir} ]] && dir=${S}
1557 ebegin "Removing useless C++ checks"
1558 local f
1559 for f in $(find ${dir} -name configure) ; do
1560 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1561 done
1562 eend 0
1563}
1564
1565# dopamd <file> [more files]
1566#
1567# Install pam auth config file in /etc/pam.d
1568dopamd() {
1569 [[ -z $1 ]] && die "dopamd requires at least one argument"
1570
1571 use pam || return 0
1572
1573 INSDESTTREE=/etc/pam.d \
1574 doins "$@" || die "failed to install $@"
1575}
1576# newpamd <old name> <new name>
1577#
1578# Install pam file <old name> as <new name> in /etc/pam.d
1579newpamd() {
1580 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1581
1582 use pam || return 0
1583
1584 INSDESTTREE=/etc/pam.d \
1585 newins "$1" "$2" || die "failed to install $1 as $2"
1586}
1587
1588# make a wrapper script ...
1589# NOTE: this was originally games_make_wrapper, but I noticed other places where
1590# this could be used, so I have moved it here and made it not games-specific
1591# -- wolf31o2
1592# $1 == wrapper name
1593# $2 == binary to run
1594# $3 == directory to chdir before running binary
1595# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1596# $5 == path for wrapper
1597make_wrapper() {
1598 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1599 local tmpwrapper=$(emktemp)
1600 cat << EOF > "${tmpwrapper}"
1601#!/bin/sh
1602cd "${chdir}"
1603export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1604exec ${bin} "\$@"
1605EOF
1606 chmod go+rx "${tmpwrapper}"
1607 if [ -n "${5}" ]
1608 then
1609 exeinto ${5}
1610 newexe "${tmpwrapper}" "${wrapper}"
1611 else
1612 newbin "${tmpwrapper}" "${wrapper}"
1613 fi
1614}

Legend:
Removed from v.1.118  
changed lines
  Added in v.1.174

  ViewVC Help
Powered by ViewVC 1.1.20