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

Diff of /eclass/eutils.eclass

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

Revision 1.114 Revision 1.179
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.114 2004/10/06 04:21:08 usata Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.179 2005/05/28 05:50:29 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 "${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 parameter (the directory to create tmpfile in) 378# Takes just 1 optional parameter (the directory to create tmpfile in)
547mymktemp() { 379emktemp() {
380 local exe="touch"
381 [ "$1" == "-d" ] && exe="mkdir" && shift
548 local topdir="$1" 382 local topdir="$1"
549 383
550 [ -z "${topdir}" ] && topdir=/tmp 384 if [ -z "${topdir}" ]
551 if [ "`which mktemp 2>/dev/null`" ]
552 then 385 then
553 mktemp -p ${topdir} 386 [ -z "${T}" ] \
554 else 387 && topdir="/tmp" \
388 || topdir="${T}"
389 fi
390
391 if [ -z "$(type -p mktemp)" ]
392 then
393 local tmp=/
394 while [ -e "${tmp}" ] ; do
555 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 395 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
556 touch ${tmp} 396 done
397 ${exe} "${tmp}"
557 echo ${tmp} 398 echo "${tmp}"
399 else
400 [ "${exe}" == "touch" ] \
401 && exe="-p" \
402 || exe="-d"
403 mktemp ${exe} "${topdir}"
558 fi 404 fi
559} 405}
560 406
561# Small wrapper for getent (Linux), nidump (Mac OS X), 407# Small wrapper for getent (Linux), nidump (Mac OS X),
562# and pw (FreeBSD) used in enewuser()/enewgroup() 408# and pw (FreeBSD) used in enewuser()/enewgroup()
563# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 409# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
564# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 410# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
565# 411#
566# egetent(database, key) 412# egetent(database, key)
567egetent() { 413egetent() {
568 if useq macos || useq ppc-macos ; then 414 if [[ "${USERLAND}" == "Darwin" ]] ; then
569 case "$2" in 415 case "$2" in
570 *[!0-9]*) # Non numeric 416 *[!0-9]*) # Non numeric
571 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
572 ;; 418 ;;
573 *) # Numeric 419 *) # Numeric
574 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
575 ;; 421 ;;
576 esac 422 esac
577 elif useq x86-fbsd ; then 423 elif [[ "${USERLAND}" == "BSD" ]] ; then
578 local action 424 local action
579 if [ "$1" == "passwd" ] 425 if [ "$1" == "passwd" ]
580 then 426 then
581 action="user" 427 action="user"
582 else 428 else
661 then 507 then
662 eerror "A shell was specified but it does not exist !" 508 eerror "A shell was specified but it does not exist !"
663 die "${eshell} does not exist" 509 die "${eshell} does not exist"
664 fi 510 fi
665 else 511 else
666 if [ "${USERLAND}" == "BSD" ] 512 if [[ "${USERLAND}" == "Darwin" ]]; then
667 then
668 eshell="/usr/bin/false" 513 eshell="/usr/bin/false"
514 elif [[ "${USERLAND}" == "BSD" ]]; then
515 eshell="/usr/sbin/nologin"
669 else 516 else
670 eshell="/bin/false" 517 eshell="/bin/false"
671 fi 518 fi
672 fi 519 fi
673 einfo " - Shell: ${eshell}" 520 einfo " - Shell: ${eshell}"
674 opts="${opts} -s ${eshell}" 521 opts="${opts} -s ${eshell}"
675 522
676 # handle homedir 523 # handle homedir
677 local ehome="$1"; shift 524 local ehome="$1"; shift
678 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 525 if [ -z "${ehome}" ] || [ "${eshell}" == "-1" ]
679 then 526 then
680 ehome="/dev/null" 527 ehome="/dev/null"
681 fi 528 fi
682 einfo " - Home: ${ehome}" 529 einfo " - Home: ${ehome}"
683 opts="${opts} -d ${ehome}" 530 opts="${opts} -d ${ehome}"
690 local defgroup="" exgroups="" 537 local defgroup="" exgroups=""
691 538
692 export IFS="," 539 export IFS=","
693 for g in ${egroups} 540 for g in ${egroups}
694 do 541 do
542 export IFS="${oldifs}"
695 if [ -z "`egetent group \"${g}\"`" ] 543 if [ -z "`egetent group \"${g}\"`" ]
696 then 544 then
697 eerror "You must add group ${g} to the system first" 545 eerror "You must add group ${g} to the system first"
698 die "${g} is not a valid GID" 546 die "${g} is not a valid GID"
699 fi 547 fi
701 then 549 then
702 defgroup="${g}" 550 defgroup="${g}"
703 else 551 else
704 exgroups="${exgroups},${g}" 552 exgroups="${exgroups},${g}"
705 fi 553 fi
554 export IFS=","
706 done 555 done
707 export IFS="${oldifs}" 556 export IFS="${oldifs}"
708 557
709 opts="${opts} -g ${defgroup}" 558 opts="${opts} -g ${defgroup}"
710 if [ ! -z "${exgroups}" ] 559 if [ ! -z "${exgroups}" ]
718 567
719 # handle extra and add the user 568 # handle extra and add the user
720 local eextra="$@" 569 local eextra="$@"
721 local oldsandbox="${SANDBOX_ON}" 570 local oldsandbox="${SANDBOX_ON}"
722 export SANDBOX_ON="0" 571 export SANDBOX_ON="0"
723 if useq macos || useq ppc-macos ; 572 if [[ "${USERLAND}" == "Darwin" ]]
724 then 573 then
725 ### Make the user 574 ### Make the user
726 if [ -z "${eextra}" ] 575 if [ -z "${eextra}" ]
727 then 576 then
728 dscl . create /users/${euser} uid ${euid} 577 dscl . create /users/${euser} uid ${euid}
729 dscl . create /users/${euser} shell ${eshell} 578 dscl . create /users/${euser} shell ${eshell}
730 dscl . create /users/${euser} home ${ehome} 579 dscl . create /users/${euser} home ${ehome}
731 dscl . create /users/${euser} realname "added by portage for ${PN}" 580 dscl . create /users/${euser} realname "added by portage for ${PN}"
732 ### Add the user to the groups specified 581 ### Add the user to the groups specified
582 local oldifs="${IFS}"
583 export IFS=","
733 for g in ${egroups} 584 for g in ${egroups}
734 do 585 do
735 # $egroups is , delimited, not space
736 ewarn "This is code is wrong; someone on the OS X team should fix it"
737 dscl . merge /groups/${g} users ${euser} 586 dscl . merge /groups/${g} users ${euser}
738 done 587 done
588 export IFS="${oldifs}"
739 else 589 else
740 einfo "Extra options are not supported on macos yet" 590 einfo "Extra options are not supported on macos yet"
741 einfo "Please report the ebuild along with the info below" 591 einfo "Please report the ebuild along with the info below"
742 einfo "eextra: ${eextra}" 592 einfo "eextra: ${eextra}"
743 die "Required function missing" 593 die "Required function missing"
744 fi 594 fi
745 elif use x86-fbsd ; then 595 elif [[ "${USERLAND}" == "BSD" ]] ; then
746 if [ -z "${eextra}" ] 596 if [ -z "${eextra}" ]
747 then 597 then
748 pw useradd ${euser} ${opts} \ 598 pw useradd ${euser} ${opts} \
749 -c "added by portage for ${PN}" \ 599 -c "added by portage for ${PN}" \
750 die "enewuser failed" 600 die "enewuser failed"
810 then 660 then
811 if [ "${egid}" -gt 0 ] 661 if [ "${egid}" -gt 0 ]
812 then 662 then
813 if [ -z "`egetent group ${egid}`" ] 663 if [ -z "`egetent group ${egid}`" ]
814 then 664 then
815 if useq macos || useq ppc-macos ; then 665 if [[ "${USERLAND}" == "Darwin" ]]; then
816 opts="${opts} ${egid}" 666 opts="${opts} ${egid}"
817 else 667 else
818 opts="${opts} -g ${egid}" 668 opts="${opts} -g ${egid}"
819 fi 669 fi
820 else 670 else
834 opts="${opts} ${eextra}" 684 opts="${opts} ${eextra}"
835 685
836 # add the group 686 # add the group
837 local oldsandbox="${SANDBOX_ON}" 687 local oldsandbox="${SANDBOX_ON}"
838 export SANDBOX_ON="0" 688 export SANDBOX_ON="0"
839 if useq macos || useq ppc-macos ; 689 if [[ "${USERLAND}" == "Darwin" ]]; then
840 then
841 if [ ! -z "${eextra}" ]; 690 if [ ! -z "${eextra}" ];
842 then 691 then
843 einfo "Extra options are not supported on macos yet" 692 einfo "Extra options are not supported on Darwin/OS X yet"
844 einfo "Please report the ebuild along with the info below" 693 einfo "Please report the ebuild along with the info below"
845 einfo "eextra: ${eextra}" 694 einfo "eextra: ${eextra}"
846 die "Required function missing" 695 die "Required function missing"
847 fi 696 fi
848 697
853 [ -z "`egetent group ${egid}`" ] && break 702 [ -z "`egetent group ${egid}`" ] && break
854 done 703 done
855 esac 704 esac
856 dscl . create /groups/${egroup} gid ${egid} 705 dscl . create /groups/${egroup} gid ${egid}
857 dscl . create /groups/${egroup} passwd '*' 706 dscl . create /groups/${egroup} passwd '*'
858 elif use x86-fbsd ; then 707 elif [[ "${USERLAND}" == "BSD" ]] ; then
859 case ${egid} in 708 case ${egid} in
860 *[!0-9]*) # Non numeric 709 *[!0-9]*) # Non numeric
861 for egid in `jot 898 101`; do 710 for egid in `jot 898 101`; do
862 [ -z "`egetent group ${egid}`" ] && break 711 [ -z "`egetent group ${egid}`" ] && break
863 done 712 done
870} 719}
871 720
872# Simple script to replace 'dos2unix' binaries 721# Simple script to replace 'dos2unix' binaries
873# vapier@gentoo.org 722# vapier@gentoo.org
874# 723#
875# edos2unix(file, <more files>...) 724# edos2unix(file, <more files> ...)
876edos2unix() { 725edos2unix() {
877 for f in "$@" 726 for f in "$@"
878 do 727 do
879 cp "${f}" ${T}/edos2unix 728 cp "${f}" ${T}/edos2unix
880 sed 's/\r$//' ${T}/edos2unix > "${f}" 729 sed 's/\r$//' ${T}/edos2unix > "${f}"
881 done 730 done
882} 731}
883 732
733
734##############################################################
735# START: Handle .desktop files and menu entries #
736# maybe this should be separated into a new eclass some time #
737# lanius@gentoo.org #
738##############################################################
739
884# Make a desktop file ! 740# Make a desktop file !
885# Great for making those icons in kde/gnome startmenu ! 741# Great for making those icons in kde/gnome startmenu !
886# Amaze your friends ! Get the women ! Join today ! 742# Amaze your friends ! Get the women ! Join today !
887# gnome2 /usr/share/applications
888# gnome1 /usr/share/gnome/apps/
889# KDE ${KDEDIR}/share/applnk /usr/share/applnk
890# 743#
891# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 744# make_desktop_entry(<binary>, [name], [icon], [type], [path])
892# 745#
893# binary: what binary does the app run with ? 746# binary: what binary does the app run with ?
894# name: the name that will show up in the menu 747# name: the name that will show up in the menu
895# icon: give your little like a pretty little icon ... 748# icon: give your little like a pretty little icon ...
896# this can be relative (to /usr/share/pixmaps) or 749# this can be relative (to /usr/share/pixmaps) or
897# a full path to an icon 750# a full path to an icon
898# type: what kind of application is this ? for categories: 751# type: what kind of application is this ? for categories:
899# http://www.freedesktop.org/standards/menu-spec/ 752# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
900# path: if your app needs to startup in a specific dir 753# path: if your app needs to startup in a specific dir
901make_desktop_entry() { 754make_desktop_entry() {
902 [ -z "$1" ] && eerror "You must specify the executable" && return 1 755 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
903 756
904 local exec="${1}" 757 local exec=${1}
905 local name="${2:-${PN}}" 758 local name=${2:-${PN}}
906 local icon="${3:-${PN}.png}" 759 local icon=${3:-${PN}.png}
907 local type="${4}" 760 local type=${4}
908 local subdir="${6}" 761 local path=${5}
909 local path="${5:-${GAMES_BINDIR}}" 762
910 if [ -z "${type}" ] 763 if [[ -z ${type} ]] ; then
911 then 764 local catmaj=${CATEGORY%%-*}
912 case ${CATEGORY} in 765 local catmin=${CATEGORY##*-}
913 "app-emulation") 766 case ${catmaj} in
914 type=Emulator 767 app)
915 subdir="Emulation" 768 case ${catmin} in
769 admin) type=System;;
770 cdr) type=DiscBurning;;
771 dicts) type=Dictionary;;
772 editors) type=TextEditor;;
773 emacs) type=TextEditor;;
774 emulation) type=Emulator;;
775 laptop) type=HardwareSettings;;
776 office) type=Office;;
777 vim) type=TextEditor;;
778 xemacs) type=TextEditor;;
779 *) type=;;
780 esac
916 ;; 781 ;;
917 "games-"*) 782
918 type=Game 783 dev)
919 subdir="Games" 784 type="Development"
920 ;; 785 ;;
921 "net-"*) 786
922 type=Network 787 games)
923 subdir="${type}" 788 [[ -z ${path} ]] && path=${GAMES_BINDIR}
789
790 case ${catmin} in
791 action) type=ActionGame;;
792 arcade) type=ArcadeGame;;
793 board) type=BoardGame;;
794 kid) type=KidsGame;;
795 emulation) type=Emulator;;
796 puzzle) type=LogicGame;;
797 rpg) type=RolePlaying;;
798 roguelike) type=RolePlaying;;
799 simulation) type=Simulation;;
800 sports) type=SportsGame;;
801 strategy) type=StrategyGame;;
802 *) type=;;
803 esac
804 type="Game;${type}"
924 ;; 805 ;;
806
807 mail)
808 type="Network;Email"
809 ;;
810
811 media)
812 case ${catmin} in
813 gfx) type=Graphics;;
814 radio) type=Tuner;;
815 sound) type=Audio;;
816 tv) type=TV;;
817 video) type=Video;;
818 *) type=;;
819 esac
820 type="AudioVideo;${type}"
821 ;;
822
823 net)
824 case ${catmin} in
825 dialup) type=Dialup;;
826 ftp) type=FileTransfer;;
827 im) type=InstantMessaging;;
828 irc) type=IRCClient;;
829 mail) type=Email;;
830 news) type=News;;
831 nntp) type=News;;
832 p2p) type=FileTransfer;;
833 *) type=;;
834 esac
835 type="Network;${type}"
836 ;;
837
838 sci)
839 case ${catmin} in
840 astro*) type=Astronomoy;;
841 bio*) type=Biology;;
842 calc*) type=Calculator;;
843 chem*) type=Chemistry;;
844 geo*) type=Geology;;
845 math*) type=Math;;
846 *) type=;;
847 esac
848 type="Science;${type}"
849 ;;
850
851 www)
852 case ${catmin} in
853 client) type=WebBrowser;;
854 *) type=;;
855 esac
856 type="Network"
857 ;;
858
925 *) 859 *)
926 type= 860 type=
927 subdir=
928 ;; 861 ;;
929 esac 862 esac
930 fi 863 fi
864 if [ "${SLOT}" == "0" ] ; then
865 local desktop_name="${PN}"
866 else
867 local desktop_name="${PN}-${SLOT}"
868 fi
931 local desktop="${T}/${exec}.desktop" 869 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
932 870
933echo "[Desktop Entry] 871echo "[Desktop Entry]
934Encoding=UTF-8 872Encoding=UTF-8
935Version=0.9.2 873Version=0.9.2
936Name=${name} 874Name=${name}
939Exec=${exec} 877Exec=${exec}
940Path=${path} 878Path=${path}
941Icon=${icon} 879Icon=${icon}
942Categories=Application;${type};" > "${desktop}" 880Categories=Application;${type};" > "${desktop}"
943 881
944 if [ -d "/usr/share/applications" ]
945 then
946 insinto /usr/share/applications 882 insinto /usr/share/applications
947 doins "${desktop}" 883 doins "${desktop}"
948 fi
949
950 #if [ -d "/usr/share/gnome/apps" ]
951 #then
952 # insinto /usr/share/gnome/apps/Games
953 # doins ${desktop}
954 #fi
955
956 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ]
957 #then
958 # for ver in /usr/kde/*
959 # do
960 # insinto ${ver}/share/applnk/Games
961 # doins ${desktop}
962 # done
963 #fi
964
965 if [ -d "/usr/share/applnk" ]
966 then
967 insinto /usr/share/applnk/${subdir}
968 doins "${desktop}"
969 fi
970 884
971 return 0 885 return 0
972} 886}
887
888# Make a GDM/KDM Session file
889#
890# make_desktop_entry(<title>, <command>)
891# title: File to execute to start the Window Manager
892# command: Name of the Window Manager
893
894make_session_desktop() {
895 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
896 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
897
898 local title=$1
899 local command=$2
900 local desktop=${T}/${wm}.desktop
901
902echo "[Desktop Entry]
903Encoding=UTF-8
904Name=${title}
905Comment=This session logs you into ${title}
906Exec=${command}
907TryExec=${command}
908Type=Application" > "${desktop}"
909
910 insinto /usr/share/xsessions
911 doins "${desktop}"
912}
913
914domenu() {
915 local i j
916 insinto /usr/share/applications
917 for i in "$@" ; do
918 if [[ -f ${i} ]] ; then
919 doins "${i}"
920 elif [[ -d ${i} ]] ; then
921 for j in "${i}"/*.desktop ; do
922 doins "${j}"
923 done
924 fi
925 done
926}
927newmenu() {
928 insinto /usr/share/applications
929 newins "$1" "$2"
930}
931
932doicon() {
933 local i j
934 insinto /usr/share/pixmaps
935 for i in "$@" ; do
936 if [[ -f ${i} ]] ; then
937 doins "${i}"
938 elif [[ -d ${i} ]] ; then
939 for j in "${i}"/*.png ; do
940 doins "${j}"
941 done
942 fi
943 done
944}
945newicon() {
946 insinto /usr/share/pixmaps
947 newins "$1" "$2"
948}
949
950##############################################################
951# END: Handle .desktop files and menu entries #
952##############################################################
953
973 954
974# for internal use only (unpack_pdv and unpack_makeself) 955# for internal use only (unpack_pdv and unpack_makeself)
975find_unpackable_file() { 956find_unpackable_file() {
976 local src="$1" 957 local src="$1"
977 if [ -z "${src}" ] 958 if [ -z "${src}" ]
1023 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1004 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1024 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1005 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1025 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1006 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1026 1007
1027 # grab metadata for debug reasons 1008 # grab metadata for debug reasons
1028 local metafile="`mymktemp ${T}`" 1009 local metafile="$(emktemp)"
1029 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1010 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
1030 1011
1031 # rip out the final file name from the metadata 1012 # rip out the final file name from the metadata
1032 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1013 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
1033 datafile="`basename ${datafile}`" 1014 datafile="`basename ${datafile}`"
1034 1015
1035 # now lets uncompress/untar the file if need be 1016 # now lets uncompress/untar the file if need be
1036 local tmpfile="`mymktemp ${T}`" 1017 local tmpfile="$(emktemp)"
1037 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1018 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1038 1019
1039 local iscompressed="`file -b ${tmpfile}`" 1020 local iscompressed="`file -b ${tmpfile}`"
1040 if [ "${iscompressed:0:8}" == "compress" ] ; then 1021 if [ "${iscompressed:0:8}" == "compress" ] ; then
1041 iscompressed=1 1022 iscompressed=1
1143 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1124 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1144 *) die "makeself cant handle exe '${exe}'" 1125 *) die "makeself cant handle exe '${exe}'"
1145 esac 1126 esac
1146 1127
1147 # lets grab the first few bytes of the file to figure out what kind of archive it is 1128 # lets grab the first few bytes of the file to figure out what kind of archive it is
1148 local tmpfile="$(mymktemp "${T}")" 1129 local tmpfile="$(emktemp)"
1149 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1130 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1150 local filetype="$(file -b "${tmpfile}")" 1131 local filetype="$(file -b "${tmpfile}")"
1151 case ${filetype} in 1132 case ${filetype} in
1152 *tar\ archive) 1133 *tar\ archive)
1153 eval ${exe} | tar --no-same-owner -xf - 1134 eval ${exe} | tar --no-same-owner -xf -
1200 return 0 1181 return 0
1201 fi 1182 fi
1202 done 1183 done
1203 set +o noglob; set -$shopts #reset old shell opts 1184 set +o noglob; set -$shopts #reset old shell opts
1204 1185
1205 local licmsg="`mymktemp ${T}`" 1186 local licmsg="$(emktemp)"
1206 cat << EOF > ${licmsg} 1187 cat << EOF > ${licmsg}
1207********************************************************** 1188**********************************************************
1208The following license outlines the terms of use of this 1189The following license outlines the terms of use of this
1209package. You MUST accept this license for installation to 1190package. You MUST accept this license for installation to
1210continue. When you are done viewing, hit 'q'. If you 1191continue. When you are done viewing, hit 'q'. If you
1258 export CDROM_TOTAL_CDS=${cdcnt} 1239 export CDROM_TOTAL_CDS=${cdcnt}
1259 export CDROM_CURRENT_CD=1 1240 export CDROM_CURRENT_CD=1
1260 1241
1261 # now we see if the user gave use CD_ROOT ... 1242 # now we see if the user gave use CD_ROOT ...
1262 # if they did, let's just believe them that it's correct 1243 # if they did, let's just believe them that it's correct
1263 if [ ! -z "${CD_ROOT}" ] ; then 1244 if [[ ! -z ${CD_ROOT} ]] ; then
1264 export CDROM_ROOT="${CD_ROOT}" 1245 export CDROM_ROOT=${CD_ROOT}
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1246 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1266 return 1247 return
1267 fi 1248 fi
1268 # do the same for CD_ROOT_X 1249 # do the same for CD_ROOT_X
1269 if [ ! -z "${CD_ROOT_1}" ] ; then 1250 if [[ ! -z ${CD_ROOT_1} ]] ; then
1270 local var= 1251 local var=
1271 cdcnt=0 1252 cdcnt=0
1272 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1253 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1273 cdcnt=$((cdcnt + 1)) 1254 cdcnt=$((cdcnt + 1))
1274 var="CD_ROOT_${cdcnt}" 1255 var="CD_ROOT_${cdcnt}"
1275 if [ -z "${!var}" ] ; then 1256 if [[ -z ${!var} ]] ; then
1276 eerror "You must either use just the CD_ROOT" 1257 eerror "You must either use just the CD_ROOT"
1277 eerror "or specify ALL the CD_ROOT_X variables." 1258 eerror "or specify ALL the CD_ROOT_X variables."
1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1259 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1279 die "could not locate CD_ROOT_${cdcnt}" 1260 die "could not locate CD_ROOT_${cdcnt}"
1280 fi 1261 fi
1283 export CDROM_ROOT=${CDROM_ROOTS_1} 1264 export CDROM_ROOT=${CDROM_ROOTS_1}
1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 return 1266 return
1286 fi 1267 fi
1287 1268
1288 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1269 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1289 einfon "This ebuild will need the " 1270 einfon "This ebuild will need the "
1290 if [ -z "${CDROM_NAME}" ] ; then 1271 if [[ -z ${CDROM_NAME} ]] ; then
1291 echo "cdrom for ${PN}." 1272 echo "cdrom for ${PN}."
1292 else 1273 else
1293 echo "${CDROM_NAME}." 1274 echo "${CDROM_NAME}."
1294 fi 1275 fi
1295 echo 1276 echo
1296 einfo "If you do not have the CD, but have the data files" 1277 einfo "If you do not have the CD, but have the data files"
1297 einfo "mounted somewhere on your filesystem, just export" 1278 einfo "mounted somewhere on your filesystem, just export"
1298 einfo "the variable CD_ROOT so that it points to the" 1279 einfo "the variable CD_ROOT so that it points to the"
1299 einfo "directory containing the files." 1280 einfo "directory containing the files."
1300 echo 1281 echo
1282 einfo "For example:"
1283 einfo "export CD_ROOT=/mnt/cdrom"
1284 echo
1301 else 1285 else
1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1286 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303 cdcnt=0 1287 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1288 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1289 cdcnt=$((cdcnt + 1))
1306 var="CDROM_NAME_${cdcnt}" 1290 var="CDROM_NAME_${cdcnt}"
1307 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1291 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1308 done 1292 done
1309 echo 1293 echo
1310 einfo "If you do not have the CDs, but have the data files" 1294 einfo "If you do not have the CDs, but have the data files"
1311 einfo "mounted somewhere on your filesystem, just export" 1295 einfo "mounted somewhere on your filesystem, just export"
1312 einfo "the following variables so they point to the right place:" 1296 einfo "the following variables so they point to the right place:"
1313 einfon "" 1297 einfon ""
1314 cdcnt=0 1298 cdcnt=0
1315 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1299 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1316 cdcnt=$((cdcnt + 1)) 1300 cdcnt=$((cdcnt + 1))
1317 echo -n " CD_ROOT_${cdcnt}" 1301 echo -n " CD_ROOT_${cdcnt}"
1318 done 1302 done
1319 echo 1303 echo
1320 einfo "Or, if you have all the files in the same place, or" 1304 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" 1305 einfo "you only have one cdrom, you can export CD_ROOT"
1322 einfo "and that place will be used as the same data source" 1306 einfo "and that place will be used as the same data source"
1323 einfo "for all the CDs." 1307 einfo "for all the CDs."
1324 echo 1308 echo
1309 einfo "For example:"
1310 einfo "export CD_ROOT_1=/mnt/cdrom"
1311 echo
1325 fi 1312 fi
1326 export CDROM_CURRENT_CD=0 1313 export CDROM_CURRENT_CD=0
1327 cdrom_load_next_cd 1314 cdrom_load_next_cd
1328} 1315}
1329 1316
1333# remember, you can only go forward in the cd chain, you can't go back. 1320# remember, you can only go forward in the cd chain, you can't go back.
1334cdrom_load_next_cd() { 1321cdrom_load_next_cd() {
1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1322 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336 local var= 1323 local var=
1337 1324
1338 if [ ! -z "${CD_ROOT}" ] ; then 1325 if [[ ! -z ${CD_ROOT} ]] ; then
1339 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1326 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1340 return 1327 return
1341 fi 1328 fi
1342 1329
1343 unset CDROM_ROOT 1330 unset CDROM_ROOT
1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1331 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1345 if [ -z "${!var}" ] ; then 1332 if [[ -z ${!var} ]] ; then
1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1333 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347 cdrom_locate_file_on_cd ${!var} 1334 cdrom_locate_file_on_cd ${!var}
1348 else 1335 else
1349 export CDROM_ROOT="${!var}" 1336 export CDROM_ROOT=${!var}
1350 fi 1337 fi
1351 1338
1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1339 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1353} 1340}
1354 1341
1358# found, then a message asking for the user to insert the cdrom will be 1345# found, then a message asking for the user to insert the cdrom will be
1359# displayed and we'll hang out here until: 1346# displayed and we'll hang out here until:
1360# (1) the file is found on a mounted cdrom 1347# (1) the file is found on a mounted cdrom
1361# (2) the user hits CTRL+C 1348# (2) the user hits CTRL+C
1362cdrom_locate_file_on_cd() { 1349cdrom_locate_file_on_cd() {
1363 while [ -z "${CDROM_ROOT}" ] ; do 1350 while [[ -z ${CDROM_ROOT} ]] ; do
1364 local dir="$(dirname ${@})" 1351 local dir="$(dirname ${@})"
1365 local file="$(basename ${@})" 1352 local file="$(basename ${@})"
1366 local mline="" 1353 local mline=""
1367 local showedmsg=0 1354 local showedmsg=0
1368 1355
1369 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1356 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1370 [ -d "${mline}/${dir}" ] || continue 1357 [[ -d ${mline}/${dir} ]] || continue
1371 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1358 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1372 && export CDROM_ROOT=${mline} 1359 && export CDROM_ROOT=${mline}
1373 done 1360 done
1374 1361
1375 if [ -z "${CDROM_ROOT}" ] ; then 1362 if [[ -z ${CDROM_ROOT} ]] ; then
1376 echo 1363 echo
1377 if [ ${showedmsg} -eq 0 ] ; then 1364 if [[ ${showedmsg} -eq 0 ]] ; then
1378 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1365 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1379 if [ -z "${CDROM_NAME}" ] ; then 1366 if [[ -z ${CDROM_NAME} ]] ; then
1380 einfo "Please insert the cdrom for ${PN} now !" 1367 einfo "Please insert the cdrom for ${PN} now !"
1381 else 1368 else
1382 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1369 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383 fi 1370 fi
1384 else 1371 else
1385 if [ -z "${CDROM_NAME_1}" ] ; then 1372 if [[ -z ${CDROM_NAME_1} ]] ; then
1386 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1373 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1387 else 1374 else
1388 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1375 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1389 einfo "Please insert+mount the ${!var} cdrom now !" 1376 einfo "Please insert+mount the ${!var} cdrom now !"
1390 fi 1377 fi
1410# directories and uses the intersection of the lists. 1397# directories and uses the intersection of the lists.
1411# The -u builds a list of po files found in all the 1398# The -u builds a list of po files found in all the
1412# directories and uses the union of the lists. 1399# directories and uses the union of the lists.
1413strip-linguas() { 1400strip-linguas() {
1414 local ls newls 1401 local ls newls
1415 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1402 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1416 local op="$1"; shift 1403 local op=$1; shift
1417 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1404 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1418 local d f 1405 local d f
1419 for d in "$@" ; do 1406 for d in "$@" ; do
1420 if [ "${op}" == "-u" ] ; then 1407 if [[ ${op} == "-u" ]] ; then
1421 newls="${ls}" 1408 newls=${ls}
1422 else 1409 else
1423 newls="" 1410 newls=""
1424 fi 1411 fi
1425 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1412 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1426 if [ "${op}" == "-i" ] ; then 1413 if [[ ${op} == "-i" ]] ; then
1427 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1414 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1428 else 1415 else
1429 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1416 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1430 fi 1417 fi
1431 done 1418 done
1432 ls="${newls}" 1419 ls=${newls}
1433 done 1420 done
1434 ls="${ls//.po}" 1421 ls=${ls//.po}
1435 else 1422 else
1436 ls="$@" 1423 ls=$@
1437 fi 1424 fi
1438 1425
1439 ls=" ${ls} " 1426 ls=" ${ls} "
1440 newls="" 1427 newls=""
1441 for f in ${LINGUAS} ; do 1428 for f in ${LINGUAS} ; do
1442 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1429 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1443 nl="${newls} ${f}" 1430 newls="${newls} ${f}"
1444 else 1431 else
1445 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1432 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1446 fi 1433 fi
1447 done 1434 done
1448 if [ -z "${newls}" ] ; then 1435 if [[ -z ${newls} ]] ; then
1449 unset LINGUAS 1436 export LINGUAS=""
1450 else 1437 else
1451 export LINGUAS="${newls}" 1438 export LINGUAS=${newls:1}
1452 fi 1439 fi
1453} 1440}
1454 1441
1455# moved from kernel.eclass since they are generally useful outside of 1442# moved from kernel.eclass since they are generally useful outside of
1456# kernel.eclass -iggy (20041002) 1443# kernel.eclass -iggy (20041002)
1458# the following functions are useful in kernel module ebuilds, etc. 1445# the following functions are useful in kernel module ebuilds, etc.
1459# for an example see ivtv or drbd ebuilds 1446# for an example see ivtv or drbd ebuilds
1460 1447
1461# set's ARCH to match what the kernel expects 1448# set's ARCH to match what the kernel expects
1462set_arch_to_kernel() { 1449set_arch_to_kernel() {
1450 i=10
1451 while ((i--)) ; do
1452 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1453 done
1463 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1454 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1464 case ${ARCH} in 1455 case ${ARCH} in
1465 x86) export ARCH="i386";; 1456 x86) export ARCH="i386";;
1466 amd64) export ARCH="x86_64";; 1457 amd64) export ARCH="x86_64";;
1467 hppa) export ARCH="parisc";; 1458 hppa) export ARCH="parisc";;
1468 mips) export ARCH="mips";; 1459 mips) export ARCH="mips";;
1460 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}";; 1461 *) export ARCH="${ARCH}";;
1470 esac 1462 esac
1471} 1463}
1472 1464
1473# set's ARCH back to what portage expects 1465# set's ARCH back to what portage expects
1474set_arch_to_portage() { 1466set_arch_to_portage() {
1467 i=10
1468 while ((i--)) ; do
1469 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1470 done
1475 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1471 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1476} 1472}
1477 1473
1478# Jeremy Huddleston <eradicator@gentoo.org>: 1474# Jeremy Huddleston <eradicator@gentoo.org>:
1479# preserve_old_lib /path/to/libblah.so.0 1475# preserve_old_lib /path/to/libblah.so.0
1509 touch ${D}${LIB} 1505 touch ${D}${LIB}
1510 fi 1506 fi
1511} 1507}
1512 1508
1513preserve_old_lib_notify() { 1509preserve_old_lib_notify() {
1514 LIB=$1 1510 LIB=$1
1515 1511
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1512 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1517 SONAME=`basename ${LIB}` 1513 SONAME=`basename ${LIB}`
1518 1514
1519 einfo "An old version of an installed library was detected on your system." 1515 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" 1516 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," 1517 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:" 1518 einfo "you will need to execute the following command:"
1523 einfo " revdep-rebuild --soname ${SONAME}" 1519 einfo " revdep-rebuild --soname ${SONAME}"
1524 einfo 1520 einfo
1525 einfo "After doing that, you can safely remove ${LIB}" 1521 einfo "After doing that, you can safely remove ${LIB}"
1526 fi 1522 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1523 fi
1527} 1524}
1525
1526# Hack for people to figure out if a package was built with
1527# certain USE flags
1528#
1529# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1530# ex: built_with_use xchat gtk2
1531#
1532# Flags: -a all USE flags should be utilized
1533# -o at least one USE flag should be utilized
1534# Note: the default flag is '-a'
1535built_with_use() {
1536 local opt=$1
1537 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1538
1539 local PKG=$(best_version $1)
1540 shift
1541
1542 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1543 [[ ! -e ${USEFILE} ]] && return 1
1544
1545 local USE_BUILT=$(<${USEFILE})
1546 while [[ $# -gt 0 ]] ; do
1547 if [[ ${opt} = "-o" ]] ; then
1548 has $1 ${USE_BUILT} && return 0
1549 else
1550 has $1 ${USE_BUILT} || return 1
1551 fi
1552 shift
1553 done
1554 [[ ${opt} = "-a" ]]
1555}
1556
1557# Many configure scripts wrongly bail when a C++ compiler
1558# could not be detected. #73450
1559epunt_cxx() {
1560 local dir=$1
1561 [[ -z ${dir} ]] && dir=${S}
1562 ebegin "Removing useless C++ checks"
1563 local f
1564 for f in $(find ${dir} -name configure) ; do
1565 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1566 done
1567 eend 0
1568}
1569
1570# dopamd <file> [more files]
1571#
1572# Install pam auth config file in /etc/pam.d
1573dopamd() {
1574 [[ -z $1 ]] && die "dopamd requires at least one argument"
1575
1576 use pam || return 0
1577
1578 INSDESTTREE=/etc/pam.d \
1579 doins "$@" || die "failed to install $@"
1580}
1581# newpamd <old name> <new name>
1582#
1583# Install pam file <old name> as <new name> in /etc/pam.d
1584newpamd() {
1585 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1586
1587 use pam || return 0
1588
1589 INSDESTTREE=/etc/pam.d \
1590 newins "$1" "$2" || die "failed to install $1 as $2"
1591}
1592
1593# make a wrapper script ...
1594# NOTE: this was originally games_make_wrapper, but I noticed other places where
1595# this could be used, so I have moved it here and made it not games-specific
1596# -- wolf31o2
1597# $1 == wrapper name
1598# $2 == binary to run
1599# $3 == directory to chdir before running binary
1600# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1601# $5 == path for wrapper
1602make_wrapper() {
1603 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1604 local tmpwrapper=$(emktemp)
1605 cat << EOF > "${tmpwrapper}"
1606#!/bin/sh
1607cd "${chdir}"
1608export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1609exec ${bin} "\$@"
1610EOF
1611 chmod go+rx "${tmpwrapper}"
1612 if [ -n "${5}" ]
1613 then
1614 exeinto ${5}
1615 newexe "${tmpwrapper}" "${wrapper}"
1616 else
1617 newbin "${tmpwrapper}" "${wrapper}"
1618 fi
1619}

Legend:
Removed from v.1.114  
changed lines
  Added in v.1.179

  ViewVC Help
Powered by ViewVC 1.1.20