/[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.152
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2004 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.152 2005/02/18 18:04:42 azarah Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib
12ECLASS=eutils 13ECLASS=eutils
13INHERITED="$INHERITED $ECLASS" 14INHERITED="$INHERITED $ECLASS"
14 15
15DEPEND="!bootstrap? ( sys-devel/patch )" 16DEPEND="!bootstrap? ( sys-devel/patch )"
16 17
17DESCRIPTION="Based on the ${ECLASS} eclass" 18DESCRIPTION="Based on the ${ECLASS} eclass"
19
20# ecpu_check
21# Usage:
22#
23# ecpu_check array_of_cpu_flags
24#
25# array_of_cpu_flags - An array of cpu flags to check against USE flags
26#
27# Checks user USE related cpu flags against /proc/cpuinfo. If user enables a
28# cpu flag that is not supported in their processor flags, it will warn the
29# user if CROSSCOMPILE is not set to 1 ( because cross compile users are
30# obviously using different cpu flags than their own cpu ). Examples:
31#
32# CPU_FLAGS=(mmx mmx2 sse sse2)
33# ecpu_check CPU_FLAGS
34# Chris White <chriswhite@gentoo.org> (03 Feb 2005)
35
36ecpu_check() {
37 # Think about changing below to: if [ "${CROSSCOMPILE}" -ne 1 -a -e "/proc/cpuinfo" ]
38 # and dropping the else if you do not plan on adding anything to that
39 # empty block ....
40 # PS: also try to add some quoting, and consider rather using ${foo} than $foo ...
41 if [ "${CROSSCOMPILE}" != "1" -a -e "/proc/cpuinfo" ]
42 then
43 CPU_FLAGS=${1}
44 USER_CPU=`grep "flags" /proc/cpuinfo`
45
46 for flags in `seq 1 ${#CPU_FLAGS[@]}`
47 do
48 if has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && ! has ${CPU_FLAGS[${flags} - 1]} ${USE}
49 then
50 ewarn "Your system is ${CPU_FLAGS[${flags} - 1]} capable but you don't have it enabled!"
51 ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
52 fi
53
54 if ! has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && has ${CPU_FLAGS[${flags} -1]} ${USE}
55 then
56 ewarn "You have ${CPU_FLAGS[${flags} - 1]} support enabled but your processor doesn't"
57 ewarn "Seem to support it! You might be cross compiling or do not have /proc filesystem"
58 ewarn "enabled. If either is the case, set CROSSCOMPILE to 1 to disable this warning."
59 fi
60 done
61 fi
62}
18 63
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 64# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 65# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
21# outputting to a terminal, don't wait. For compatability purposes, the argument 66# outputting to a terminal, don't wait. For compatability purposes, the argument
22# must be an integer greater than zero. 67# must be an integer greater than zero.
41 sleep 1 86 sleep 1
42 done 87 done
43 fi 88 fi
44} 89}
45 90
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 91# This function generate linker scripts in /usr/lib for dynamic
99# libs in /lib. This is to fix linking problems when you have 92# 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 93# 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 94# 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 95# instead of the .so in /lib due to gcc/libtool tweaking ld's
221 local x="" 214 local x=""
222 215
223 if [ "$#" -gt 1 ] 216 if [ "$#" -gt 1 ]
224 then 217 then
225 local m="" 218 local m=""
226 einfo "${#} patches to apply..." 219 einfo "${#} patches to apply ..."
227 for m in "$@" ; do 220 for m in "$@" ; do
228 epatch "${m}" 221 epatch "${m}"
229 done 222 done
230 return 0 223 return 0
231 fi 224 fi
245 local EPATCH_SOURCE="$1/*" 238 local EPATCH_SOURCE="$1/*"
246 else 239 else
247 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 240 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
248 fi 241 fi
249 else 242 else
250 if [ ! -d ${EPATCH_SOURCE} ] 243 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
251 then 244 then
252 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 245 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
253 then 246 then
254 EPATCH_SOURCE="$1" 247 EPATCH_SOURCE="$1"
255 fi 248 fi
256 249
257 echo 250 echo
258 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 251 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
259 eerror 252 eerror
260 eerror " ${EPATCH_SOURCE}" 253 eerror " ${EPATCH_SOURCE}"
254 eerror " ( ${EPATCH_SOURCE##*/} )"
261 echo 255 echo
262 die "Cannot find \$EPATCH_SOURCE!" 256 die "Cannot find \$EPATCH_SOURCE!"
263 fi 257 fi
264 258
265 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 259 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
284 ;; 278 ;;
285 esac 279 esac
286 280
287 if [ "${SINGLE_PATCH}" = "no" ] 281 if [ "${SINGLE_PATCH}" = "no" ]
288 then 282 then
289 einfo "Applying various patches (bugfixes/updates)..." 283 einfo "Applying various patches (bugfixes/updates) ..."
290 fi 284 fi
291 for x in ${EPATCH_SOURCE} 285 for x in ${EPATCH_SOURCE}
292 do 286 do
293 # New ARCH dependant patch naming scheme... 287 # New ARCH dependant patch naming scheme ...
294 # 288 #
295 # ???_arch_foo.patch 289 # ???_arch_foo.patch
296 # 290 #
297 if [ -f ${x} ] && \ 291 if [ -f ${x} ] && \
298 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 292 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \
299 [ "${EPATCH_FORCE}" = "yes" ]) 293 [ "${EPATCH_FORCE}" = "yes" ])
300 then 294 then
301 local count=0 295 local count=0
302 local popts="${EPATCH_OPTS}" 296 local popts="${EPATCH_OPTS}"
297 local patchname=${x##*/}
303 298
304 if [ -n "${EPATCH_EXCLUDE}" ] 299 if [ -n "${EPATCH_EXCLUDE}" ]
305 then 300 then
306 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 301 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
307 then 302 then
308 continue 303 continue
309 fi 304 fi
310 fi 305 fi
311 306
313 then 308 then
314 if [ -n "${EPATCH_SINGLE_MSG}" ] 309 if [ -n "${EPATCH_SINGLE_MSG}" ]
315 then 310 then
316 einfo "${EPATCH_SINGLE_MSG}" 311 einfo "${EPATCH_SINGLE_MSG}"
317 else 312 else
318 einfo "Applying ${x##*/}..." 313 einfo "Applying ${patchname} ..."
319 fi 314 fi
320 else 315 else
321 einfo " ${x##*/}..." 316 einfo " ${patchname} ..."
322 fi 317 fi
323 318
324 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 319 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
325 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
326 321
327 # Allow for prefix to differ ... im lazy, so shoot me :/ 322 # Allow for prefix to differ ... im lazy, so shoot me :/
328 while [ "${count}" -lt 5 ] 323 while [ "${count}" -lt 5 ]
329 do 324 do
330 # Generate some useful debug info ... 325 # Generate some useful debug info ...
331 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 326 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
332 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 327 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 328
334 if [ "${PATCH_SUFFIX}" != "patch" ] 329 if [ "${PATCH_SUFFIX}" != "patch" ]
335 then 330 then
336 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 331 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 332 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 else 333 else
339 PATCH_TARGET="${x}" 334 PATCH_TARGET="${x}"
340 fi 335 fi
341 336
342 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 337 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 338 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
344 339
345 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 340 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
346 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 341 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
347 342
348 if [ "${PATCH_SUFFIX}" != "patch" ] 343 if [ "${PATCH_SUFFIX}" != "patch" ]
349 then 344 then
350 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 345 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
351 then 346 then
352 echo 347 echo
353 eerror "Could not extract patch!" 348 eerror "Could not extract patch!"
354 #die "Could not extract patch!" 349 #die "Could not extract patch!"
355 count=5 350 count=5
356 break 351 break
357 fi 352 fi
358 fi 353 fi
359 354
360 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 355 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
361 then 356 then
362 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 357 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
363 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 358 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
364 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 359 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
365 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 360 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
366 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 361 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
367 362
368 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 363 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
369 364
370 if [ "$?" -ne 0 ] 365 if [ "$?" -ne 0 ]
371 then 366 then
372 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 367 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
373 echo 368 echo
374 eerror "A dry-run of patch command succeeded, but actually" 369 eerror "A dry-run of patch command succeeded, but actually"
375 eerror "applying the patch failed!" 370 eerror "applying the patch failed!"
376 #die "Real world sux compared to the dreamworld!" 371 #die "Real world sux compared to the dreamworld!"
377 count=5 372 count=5
378 fi 373 fi
379 374
380 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 375 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
381 376
382 break 377 break
383 fi 378 fi
384 379
385 count=$((count + 1)) 380 count=$((count + 1))
391 fi 386 fi
392 387
393 if [ "${count}" -eq 5 ] 388 if [ "${count}" -eq 5 ]
394 then 389 then
395 echo 390 echo
396 eerror "Failed Patch: ${x##*/}!" 391 eerror "Failed Patch: ${patchname}!"
397 eerror 392 eerror
398 eerror "Include in your bugreport the contents of:" 393 eerror "Include in your bugreport the contents of:"
399 eerror 394 eerror
400 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 395 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
401 echo 396 echo
402 die "Failed Patch: ${x##*/}!" 397 die "Failed Patch: ${patchname}!"
403 fi 398 fi
404 399
405 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 400 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
406 401
407 eend 0 402 eend 0
408 fi 403 fi
409 done 404 done
410 if [ "${SINGLE_PATCH}" = "no" ] 405 if [ "${SINGLE_PATCH}" = "no" ]
438 433
439 return 1; 434 return 1;
440 } 435 }
441 END 436 END
442 437
443 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... " 438 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
444 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null 439 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
445 then 440 then
446 echo "yes" 441 echo "yes"
447 einfon "Checking what PTHREADS implementation we have ... " 442 einfon "Checking what PTHREADS implementation we have ..."
448 if ${T}/nptl 443 if ${T}/nptl
449 then 444 then
450 return 0 445 return 0
451 else 446 else
452 return 1 447 return 1
463# 458#
464# Thanks to nall <nall@gentoo.org> for this. 459# Thanks to nall <nall@gentoo.org> for this.
465# 460#
466get_number_of_jobs() { 461get_number_of_jobs() {
467 local jobs=0 462 local jobs=0
463
464 return 0
468 465
469 if [ ! -r /proc/cpuinfo ] 466 if [ ! -r /proc/cpuinfo ]
470 then 467 then
471 return 1 468 return 1
472 fi 469 fi
528 525
529 if [ -n "${ADMINPARAM}" ] 526 if [ -n "${ADMINPARAM}" ]
530 then 527 then
531 if [ "${jobs}" -gt "${ADMINPARAM}" ] 528 if [ "${jobs}" -gt "${ADMINPARAM}" ]
532 then 529 then
533 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..." 530 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
534 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}" 531 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
535 else 532 else
536 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..." 533 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
537 export MAKEOPTS="${MAKEOPTS} -j${jobs}" 534 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
538 fi 535 fi
539 fi 536 fi
540} 537}
541 538
542# Cheap replacement for when debianutils (and thus mktemp) 539# Cheap replacement for when debianutils (and thus mktemp)
543# does not exist on the users system 540# does not exist on the users system
544# vapier@gentoo.org 541# vapier@gentoo.org
545# 542#
546# Takes just 1 parameter (the directory to create tmpfile in) 543# Takes just 1 optional parameter (the directory to create tmpfile in)
547mymktemp() { 544emktemp() {
545 local exe="touch"
546 [ "$1" == "-d" ] && exe="mkdir" && shift
548 local topdir="$1" 547 local topdir="$1"
549 548
550 [ -z "${topdir}" ] && topdir=/tmp 549 if [ -z "${topdir}" ]
551 if [ "`which mktemp 2>/dev/null`" ]
552 then 550 then
553 mktemp -p ${topdir} 551 [ -z "${T}" ] \
554 else 552 && topdir="/tmp" \
553 || topdir="${T}"
554 fi
555
556 if [ -z "$(type -p mktemp)" ]
557 then
558 local tmp=/
559 while [ -e "${tmp}" ] ; do
555 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 560 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
556 touch ${tmp} 561 done
562 ${exe} "${tmp}"
557 echo ${tmp} 563 echo "${tmp}"
564 else
565 [ "${exe}" == "touch" ] \
566 && exe="-p" \
567 || exe="-d"
568 mktemp ${exe} "${topdir}"
558 fi 569 fi
559} 570}
560 571
561# Small wrapper for getent (Linux), nidump (Mac OS X), 572# Small wrapper for getent (Linux), nidump (Mac OS X),
562# and pw (FreeBSD) used in enewuser()/enewgroup() 573# and pw (FreeBSD) used in enewuser()/enewgroup()
563# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 574# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
564# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 575# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
565# 576#
566# egetent(database, key) 577# egetent(database, key)
567egetent() { 578egetent() {
568 if useq macos || useq ppc-macos ; then 579 if useq ppc-macos ; then
569 case "$2" in 580 case "$2" in
570 *[!0-9]*) # Non numeric 581 *[!0-9]*) # Non numeric
571 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 582 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
572 ;; 583 ;;
573 *) # Numeric 584 *) # Numeric
690 local defgroup="" exgroups="" 701 local defgroup="" exgroups=""
691 702
692 export IFS="," 703 export IFS=","
693 for g in ${egroups} 704 for g in ${egroups}
694 do 705 do
706 export IFS="${oldifs}"
695 if [ -z "`egetent group \"${g}\"`" ] 707 if [ -z "`egetent group \"${g}\"`" ]
696 then 708 then
697 eerror "You must add group ${g} to the system first" 709 eerror "You must add group ${g} to the system first"
698 die "${g} is not a valid GID" 710 die "${g} is not a valid GID"
699 fi 711 fi
701 then 713 then
702 defgroup="${g}" 714 defgroup="${g}"
703 else 715 else
704 exgroups="${exgroups},${g}" 716 exgroups="${exgroups},${g}"
705 fi 717 fi
718 export IFS=","
706 done 719 done
707 export IFS="${oldifs}" 720 export IFS="${oldifs}"
708 721
709 opts="${opts} -g ${defgroup}" 722 opts="${opts} -g ${defgroup}"
710 if [ ! -z "${exgroups}" ] 723 if [ ! -z "${exgroups}" ]
718 731
719 # handle extra and add the user 732 # handle extra and add the user
720 local eextra="$@" 733 local eextra="$@"
721 local oldsandbox="${SANDBOX_ON}" 734 local oldsandbox="${SANDBOX_ON}"
722 export SANDBOX_ON="0" 735 export SANDBOX_ON="0"
723 if useq macos || useq ppc-macos ; 736 if useq ppc-macos
724 then 737 then
725 ### Make the user 738 ### Make the user
726 if [ -z "${eextra}" ] 739 if [ -z "${eextra}" ]
727 then 740 then
728 dscl . create /users/${euser} uid ${euid} 741 dscl . create /users/${euser} uid ${euid}
729 dscl . create /users/${euser} shell ${eshell} 742 dscl . create /users/${euser} shell ${eshell}
730 dscl . create /users/${euser} home ${ehome} 743 dscl . create /users/${euser} home ${ehome}
731 dscl . create /users/${euser} realname "added by portage for ${PN}" 744 dscl . create /users/${euser} realname "added by portage for ${PN}"
732 ### Add the user to the groups specified 745 ### Add the user to the groups specified
746 local oldifs="${IFS}"
747 export IFS=","
733 for g in ${egroups} 748 for g in ${egroups}
734 do 749 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} 750 dscl . merge /groups/${g} users ${euser}
738 done 751 done
752 export IFS="${oldifs}"
739 else 753 else
740 einfo "Extra options are not supported on macos yet" 754 einfo "Extra options are not supported on macos yet"
741 einfo "Please report the ebuild along with the info below" 755 einfo "Please report the ebuild along with the info below"
742 einfo "eextra: ${eextra}" 756 einfo "eextra: ${eextra}"
743 die "Required function missing" 757 die "Required function missing"
810 then 824 then
811 if [ "${egid}" -gt 0 ] 825 if [ "${egid}" -gt 0 ]
812 then 826 then
813 if [ -z "`egetent group ${egid}`" ] 827 if [ -z "`egetent group ${egid}`" ]
814 then 828 then
815 if useq macos || useq ppc-macos ; then 829 if useq ppc-macos ; then
816 opts="${opts} ${egid}" 830 opts="${opts} ${egid}"
817 else 831 else
818 opts="${opts} -g ${egid}" 832 opts="${opts} -g ${egid}"
819 fi 833 fi
820 else 834 else
834 opts="${opts} ${eextra}" 848 opts="${opts} ${eextra}"
835 849
836 # add the group 850 # add the group
837 local oldsandbox="${SANDBOX_ON}" 851 local oldsandbox="${SANDBOX_ON}"
838 export SANDBOX_ON="0" 852 export SANDBOX_ON="0"
839 if useq macos || useq ppc-macos ; 853 if useq ppc-macos ; then
840 then
841 if [ ! -z "${eextra}" ]; 854 if [ ! -z "${eextra}" ];
842 then 855 then
843 einfo "Extra options are not supported on macos yet" 856 einfo "Extra options are not supported on macos yet"
844 einfo "Please report the ebuild along with the info below" 857 einfo "Please report the ebuild along with the info below"
845 einfo "eextra: ${eextra}" 858 einfo "eextra: ${eextra}"
870} 883}
871 884
872# Simple script to replace 'dos2unix' binaries 885# Simple script to replace 'dos2unix' binaries
873# vapier@gentoo.org 886# vapier@gentoo.org
874# 887#
875# edos2unix(file, <more files>...) 888# edos2unix(file, <more files> ...)
876edos2unix() { 889edos2unix() {
877 for f in "$@" 890 for f in "$@"
878 do 891 do
879 cp "${f}" ${T}/edos2unix 892 cp "${f}" ${T}/edos2unix
880 sed 's/\r$//' ${T}/edos2unix > "${f}" 893 sed 's/\r$//' ${T}/edos2unix > "${f}"
881 done 894 done
882} 895}
883 896
897
898##############################################################
899# START: Handle .desktop files and menu entries #
900# maybe this should be separated into a new eclass some time #
901# lanius@gentoo.org #
902##############################################################
903
884# Make a desktop file ! 904# Make a desktop file !
885# Great for making those icons in kde/gnome startmenu ! 905# Great for making those icons in kde/gnome startmenu !
886# Amaze your friends ! Get the women ! Join today ! 906# 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# 907#
891# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 908# make_desktop_entry(<binary>, [name], [icon], [type], [path])
892# 909#
893# binary: what binary does the app run with ? 910# binary: what binary does the app run with ?
894# name: the name that will show up in the menu 911# name: the name that will show up in the menu
895# icon: give your little like a pretty little icon ... 912# icon: give your little like a pretty little icon ...
896# this can be relative (to /usr/share/pixmaps) or 913# this can be relative (to /usr/share/pixmaps) or
897# a full path to an icon 914# a full path to an icon
898# type: what kind of application is this ? for categories: 915# type: what kind of application is this ? for categories:
899# http://www.freedesktop.org/standards/menu-spec/ 916# http://www.freedesktop.org/standards/menu-spec/
900# path: if your app needs to startup in a specific dir 917# path: if your app needs to startup in a specific dir
901make_desktop_entry() { 918make_desktop_entry() {
902 [ -z "$1" ] && eerror "You must specify the executable" && return 1 919 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1
903 920
904 local exec="${1}" 921 local exec="${1}"
905 local name="${2:-${PN}}" 922 local name="${2:-${PN}}"
906 local icon="${3:-${PN}.png}" 923 local icon="${3:-${PN}.png}"
907 local type="${4}" 924 local type="${4}"
939Exec=${exec} 956Exec=${exec}
940Path=${path} 957Path=${path}
941Icon=${icon} 958Icon=${icon}
942Categories=Application;${type};" > "${desktop}" 959Categories=Application;${type};" > "${desktop}"
943 960
944 if [ -d "/usr/share/applications" ]
945 then
946 insinto /usr/share/applications 961 insinto /usr/share/applications
947 doins "${desktop}" 962 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 963
971 return 0 964 return 0
972} 965}
966
967# Make a GDM/KDM Session file
968#
969# make_desktop_entry(<title>, <command>)
970# title: File to execute to start the Window Manager
971# command: Name of the Window Manager
972
973make_session_desktop() {
974
975 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1
976 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1
977
978 local title="${1}"
979 local command="${2}"
980 local desktop="${T}/${wm}.desktop"
981
982echo "[Desktop Entry]
983Encoding=UTF-8
984Name=${title}
985Comment=This session logs you into ${title}
986Exec=${command}
987TryExec=${command}
988Type=Application" > "${desktop}"
989
990 insinto /usr/share/xsessions
991 doins "${desktop}"
992
993 return 0
994}
995
996domenu() {
997 local i
998 local j
999 insinto /usr/share/applications
1000 for i in ${@}
1001 do
1002 if [ -f "${i}" ];
1003 then
1004 doins ${i}
1005 elif [ -d "${i}" ];
1006 then
1007 for j in ${i}/*.desktop
1008 do
1009 doins ${j}
1010 done
1011 fi
1012 done
1013}
1014
1015doicon() {
1016 local i
1017 local j
1018 insinto /usr/share/pixmaps
1019 for i in ${@}
1020 do
1021 if [ -f "${i}" ];
1022 then
1023 doins ${i}
1024 elif [ -d "${i}" ];
1025 then
1026 for j in ${i}/*.png
1027 do
1028 doins ${j}
1029 done
1030 fi
1031 done
1032}
1033
1034##############################################################
1035# END: Handle .desktop files and menu entries #
1036##############################################################
1037
973 1038
974# for internal use only (unpack_pdv and unpack_makeself) 1039# for internal use only (unpack_pdv and unpack_makeself)
975find_unpackable_file() { 1040find_unpackable_file() {
976 local src="$1" 1041 local src="$1"
977 if [ -z "${src}" ] 1042 if [ -z "${src}" ]
1023 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1088 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1024 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1089 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\"` 1090 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1026 1091
1027 # grab metadata for debug reasons 1092 # grab metadata for debug reasons
1028 local metafile="`mymktemp ${T}`" 1093 local metafile="$(emktemp)"
1029 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1094 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
1030 1095
1031 # rip out the final file name from the metadata 1096 # rip out the final file name from the metadata
1032 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1097 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
1033 datafile="`basename ${datafile}`" 1098 datafile="`basename ${datafile}`"
1034 1099
1035 # now lets uncompress/untar the file if need be 1100 # now lets uncompress/untar the file if need be
1036 local tmpfile="`mymktemp ${T}`" 1101 local tmpfile="$(emktemp)"
1037 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1102 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1038 1103
1039 local iscompressed="`file -b ${tmpfile}`" 1104 local iscompressed="`file -b ${tmpfile}`"
1040 if [ "${iscompressed:0:8}" == "compress" ] ; then 1105 if [ "${iscompressed:0:8}" == "compress" ] ; then
1041 iscompressed=1 1106 iscompressed=1
1143 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1208 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1144 *) die "makeself cant handle exe '${exe}'" 1209 *) die "makeself cant handle exe '${exe}'"
1145 esac 1210 esac
1146 1211
1147 # lets grab the first few bytes of the file to figure out what kind of archive it is 1212 # lets grab the first few bytes of the file to figure out what kind of archive it is
1148 local tmpfile="$(mymktemp "${T}")" 1213 local tmpfile="$(emktemp)"
1149 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1214 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1150 local filetype="$(file -b "${tmpfile}")" 1215 local filetype="$(file -b "${tmpfile}")"
1151 case ${filetype} in 1216 case ${filetype} in
1152 *tar\ archive) 1217 *tar\ archive)
1153 eval ${exe} | tar --no-same-owner -xf - 1218 eval ${exe} | tar --no-same-owner -xf -
1200 return 0 1265 return 0
1201 fi 1266 fi
1202 done 1267 done
1203 set +o noglob; set -$shopts #reset old shell opts 1268 set +o noglob; set -$shopts #reset old shell opts
1204 1269
1205 local licmsg="`mymktemp ${T}`" 1270 local licmsg="$(emktemp)"
1206 cat << EOF > ${licmsg} 1271 cat << EOF > ${licmsg}
1207********************************************************** 1272**********************************************************
1208The following license outlines the terms of use of this 1273The following license outlines the terms of use of this
1209package. You MUST accept this license for installation to 1274package. You MUST accept this license for installation to
1210continue. When you are done viewing, hit 'q'. If you 1275continue. When you are done viewing, hit 'q'. If you
1258 export CDROM_TOTAL_CDS=${cdcnt} 1323 export CDROM_TOTAL_CDS=${cdcnt}
1259 export CDROM_CURRENT_CD=1 1324 export CDROM_CURRENT_CD=1
1260 1325
1261 # now we see if the user gave use CD_ROOT ... 1326 # now we see if the user gave use CD_ROOT ...
1262 # if they did, let's just believe them that it's correct 1327 # if they did, let's just believe them that it's correct
1263 if [ ! -z "${CD_ROOT}" ] ; then 1328 if [[ ! -z ${CD_ROOT} ]] ; then
1264 export CDROM_ROOT="${CD_ROOT}" 1329 export CDROM_ROOT=${CD_ROOT}
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1330 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1266 return 1331 return
1267 fi 1332 fi
1268 # do the same for CD_ROOT_X 1333 # do the same for CD_ROOT_X
1269 if [ ! -z "${CD_ROOT_1}" ] ; then 1334 if [[ ! -z ${CD_ROOT_1} ]] ; then
1270 local var= 1335 local var=
1271 cdcnt=0 1336 cdcnt=0
1272 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1337 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1273 cdcnt=$((cdcnt + 1)) 1338 cdcnt=$((cdcnt + 1))
1274 var="CD_ROOT_${cdcnt}" 1339 var="CD_ROOT_${cdcnt}"
1275 if [ -z "${!var}" ] ; then 1340 if [[ -z ${!var} ]] ; then
1276 eerror "You must either use just the CD_ROOT" 1341 eerror "You must either use just the CD_ROOT"
1277 eerror "or specify ALL the CD_ROOT_X variables." 1342 eerror "or specify ALL the CD_ROOT_X variables."
1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1343 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1279 die "could not locate CD_ROOT_${cdcnt}" 1344 die "could not locate CD_ROOT_${cdcnt}"
1280 fi 1345 fi
1283 export CDROM_ROOT=${CDROM_ROOTS_1} 1348 export CDROM_ROOT=${CDROM_ROOTS_1}
1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1349 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 return 1350 return
1286 fi 1351 fi
1287 1352
1288 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1353 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1289 einfon "This ebuild will need the " 1354 einfon "This ebuild will need the "
1290 if [ -z "${CDROM_NAME}" ] ; then 1355 if [[ -z ${CDROM_NAME} ]] ; then
1291 echo "cdrom for ${PN}." 1356 echo "cdrom for ${PN}."
1292 else 1357 else
1293 echo "${CDROM_NAME}." 1358 echo "${CDROM_NAME}."
1294 fi 1359 fi
1295 echo 1360 echo
1296 einfo "If you do not have the CD, but have the data files" 1361 einfo "If you do not have the CD, but have the data files"
1297 einfo "mounted somewhere on your filesystem, just export" 1362 einfo "mounted somewhere on your filesystem, just export"
1298 einfo "the variable CD_ROOT so that it points to the" 1363 einfo "the variable CD_ROOT so that it points to the"
1299 einfo "directory containing the files." 1364 einfo "directory containing the files."
1300 echo 1365 echo
1366 einfo "For example:"
1367 einfo "export CD_ROOT=/mnt/cdrom"
1368 echo
1301 else 1369 else
1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1370 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303 cdcnt=0 1371 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1372 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1373 cdcnt=$((cdcnt + 1))
1306 var="CDROM_NAME_${cdcnt}" 1374 var="CDROM_NAME_${cdcnt}"
1307 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1375 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1308 done 1376 done
1309 echo 1377 echo
1310 einfo "If you do not have the CDs, but have the data files" 1378 einfo "If you do not have the CDs, but have the data files"
1311 einfo "mounted somewhere on your filesystem, just export" 1379 einfo "mounted somewhere on your filesystem, just export"
1312 einfo "the following variables so they point to the right place:" 1380 einfo "the following variables so they point to the right place:"
1313 einfon "" 1381 einfon ""
1314 cdcnt=0 1382 cdcnt=0
1315 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1383 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1316 cdcnt=$((cdcnt + 1)) 1384 cdcnt=$((cdcnt + 1))
1317 echo -n " CD_ROOT_${cdcnt}" 1385 echo -n " CD_ROOT_${cdcnt}"
1318 done 1386 done
1319 echo 1387 echo
1320 einfo "Or, if you have all the files in the same place, or" 1388 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" 1389 einfo "you only have one cdrom, you can export CD_ROOT"
1322 einfo "and that place will be used as the same data source" 1390 einfo "and that place will be used as the same data source"
1323 einfo "for all the CDs." 1391 einfo "for all the CDs."
1324 echo 1392 echo
1393 einfo "For example:"
1394 einfo "export CD_ROOT_1=/mnt/cdrom"
1395 echo
1325 fi 1396 fi
1326 export CDROM_CURRENT_CD=0 1397 export CDROM_CURRENT_CD=0
1327 cdrom_load_next_cd 1398 cdrom_load_next_cd
1328} 1399}
1329 1400
1333# remember, you can only go forward in the cd chain, you can't go back. 1404# remember, you can only go forward in the cd chain, you can't go back.
1334cdrom_load_next_cd() { 1405cdrom_load_next_cd() {
1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1406 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336 local var= 1407 local var=
1337 1408
1338 if [ ! -z "${CD_ROOT}" ] ; then 1409 if [[ ! -z ${CD_ROOT} ]] ; then
1339 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1410 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1340 return 1411 return
1341 fi 1412 fi
1342 1413
1343 unset CDROM_ROOT 1414 unset CDROM_ROOT
1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1415 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1345 if [ -z "${!var}" ] ; then 1416 if [[ -z ${!var} ]] ; then
1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1417 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347 cdrom_locate_file_on_cd ${!var} 1418 cdrom_locate_file_on_cd ${!var}
1348 else 1419 else
1349 export CDROM_ROOT="${!var}" 1420 export CDROM_ROOT=${!var}
1350 fi 1421 fi
1351 1422
1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1423 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1353} 1424}
1354 1425
1358# found, then a message asking for the user to insert the cdrom will be 1429# found, then a message asking for the user to insert the cdrom will be
1359# displayed and we'll hang out here until: 1430# displayed and we'll hang out here until:
1360# (1) the file is found on a mounted cdrom 1431# (1) the file is found on a mounted cdrom
1361# (2) the user hits CTRL+C 1432# (2) the user hits CTRL+C
1362cdrom_locate_file_on_cd() { 1433cdrom_locate_file_on_cd() {
1363 while [ -z "${CDROM_ROOT}" ] ; do 1434 while [[ -z ${CDROM_ROOT} ]] ; do
1364 local dir="$(dirname ${@})" 1435 local dir="$(dirname ${@})"
1365 local file="$(basename ${@})" 1436 local file="$(basename ${@})"
1366 local mline="" 1437 local mline=""
1367 local showedmsg=0 1438 local showedmsg=0
1368 1439
1369 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1440 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1370 [ -d "${mline}/${dir}" ] || continue 1441 [[ -d ${mline}/${dir} ]] || continue
1371 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1442 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \
1372 && export CDROM_ROOT=${mline} 1443 && export CDROM_ROOT=${mline}
1373 done 1444 done
1374 1445
1375 if [ -z "${CDROM_ROOT}" ] ; then 1446 if [[ -z ${CDROM_ROOT} ]] ; then
1376 echo 1447 echo
1377 if [ ${showedmsg} -eq 0 ] ; then 1448 if [[ ${showedmsg} -eq 0 ]] ; then
1378 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1449 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1379 if [ -z "${CDROM_NAME}" ] ; then 1450 if [[ -z ${CDROM_NAME} ]] ; then
1380 einfo "Please insert the cdrom for ${PN} now !" 1451 einfo "Please insert the cdrom for ${PN} now !"
1381 else 1452 else
1382 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1453 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383 fi 1454 fi
1384 else 1455 else
1385 if [ -z "${CDROM_NAME_1}" ] ; then 1456 if [[ -z ${CDROM_NAME_1} ]] ; then
1386 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1457 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1387 else 1458 else
1388 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1459 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1389 einfo "Please insert+mount the ${!var} cdrom now !" 1460 einfo "Please insert+mount the ${!var} cdrom now !"
1390 fi 1461 fi
1438 1509
1439 ls=" ${ls} " 1510 ls=" ${ls} "
1440 newls="" 1511 newls=""
1441 for f in ${LINGUAS} ; do 1512 for f in ${LINGUAS} ; do
1442 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1513 if [ "${ls/ ${f} /}" != "${ls}" ] ; then
1443 nl="${newls} ${f}" 1514 newls="${newls} ${f}"
1444 else 1515 else
1445 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1516 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1446 fi 1517 fi
1447 done 1518 done
1448 if [ -z "${newls}" ] ; then 1519 if [ -z "${newls}" ] ; then
1458# the following functions are useful in kernel module ebuilds, etc. 1529# the following functions are useful in kernel module ebuilds, etc.
1459# for an example see ivtv or drbd ebuilds 1530# for an example see ivtv or drbd ebuilds
1460 1531
1461# set's ARCH to match what the kernel expects 1532# set's ARCH to match what the kernel expects
1462set_arch_to_kernel() { 1533set_arch_to_kernel() {
1534 i=10
1535 while ((i--)) ; do
1536 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1537 done
1463 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1538 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1464 case ${ARCH} in 1539 case ${ARCH} in
1465 x86) export ARCH="i386";; 1540 x86) export ARCH="i386";;
1466 amd64) export ARCH="x86_64";; 1541 amd64) export ARCH="x86_64";;
1467 hppa) export ARCH="parisc";; 1542 hppa) export ARCH="parisc";;
1468 mips) export ARCH="mips";; 1543 mips) export ARCH="mips";;
1544 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}";; 1545 *) export ARCH="${ARCH}";;
1470 esac 1546 esac
1471} 1547}
1472 1548
1473# set's ARCH back to what portage expects 1549# set's ARCH back to what portage expects
1474set_arch_to_portage() { 1550set_arch_to_portage() {
1551 i=10
1552 while ((i--)) ; do
1553 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1554 done
1475 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1555 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1476} 1556}
1477 1557
1478# Jeremy Huddleston <eradicator@gentoo.org>: 1558# Jeremy Huddleston <eradicator@gentoo.org>:
1479# preserve_old_lib /path/to/libblah.so.0 1559# preserve_old_lib /path/to/libblah.so.0
1509 touch ${D}${LIB} 1589 touch ${D}${LIB}
1510 fi 1590 fi
1511} 1591}
1512 1592
1513preserve_old_lib_notify() { 1593preserve_old_lib_notify() {
1514 LIB=$1 1594 LIB=$1
1515 1595
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1596 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1517 SONAME=`basename ${LIB}` 1597 SONAME=`basename ${LIB}`
1518 1598
1519 einfo "An old version of an installed library was detected on your system." 1599 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" 1600 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," 1601 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:" 1602 einfo "you will need to execute the following command:"
1523 einfo " revdep-rebuild --soname ${SONAME}" 1603 einfo " revdep-rebuild --soname ${SONAME}"
1524 einfo 1604 einfo
1525 einfo "After doing that, you can safely remove ${LIB}" 1605 einfo "After doing that, you can safely remove ${LIB}"
1526 fi 1606 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1607 fi
1527} 1608}
1609
1610# Hack for people to figure out if a package was built with
1611# certain USE flags
1612#
1613# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1614# ex: built_with_use xchat gtk2
1615#
1616# Flags: -a all USE flags should be utilized
1617# -o at least one USE flag should be utilized
1618# Note: the default flag is '-a'
1619built_with_use() {
1620 local opt=$1
1621 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1622
1623 local PKG=$(best_version $1)
1624 shift
1625
1626 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1627 [[ ! -e ${USEFILE} ]] && return 1
1628
1629 local USE_BUILT=$(<${USEFILE})
1630 while [[ $# -gt 0 ]] ; do
1631 if [[ ${opt} = "-o" ]] ; then
1632 has $1 ${USE_BUILT} && return 0
1633 else
1634 has $1 ${USE_BUILT} || return 1
1635 fi
1636 shift
1637 done
1638 [[ ${opt} = "-a" ]]
1639}
1640
1641# Many configure scripts wrongly bail when a C++ compiler
1642# could not be detected. #73450
1643epunt_cxx() {
1644 local dir=$1
1645 [[ -z ${dir} ]] && dir=${S}
1646 ebegin "Removing useless C++ checks"
1647 local f
1648 for f in $(find ${dir} -name configure) ; do
1649 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1650 done
1651 eend 0
1652}
1653
1654# dopamd <file> [more files]
1655#
1656# Install pam auth config file in /etc/pam.d
1657dopamd() {
1658 [[ -z $1 ]] && die "dopamd requires at least one argument"
1659
1660 use pam || return 0
1661
1662 insinto /etc/pam.d
1663 # these are the default doins options, but be explicit just in case
1664 insopts -m 0644 -o root -g root
1665 doins "$@" || die "failed to install $@"
1666}
1667# newpamd <old name> <new name>
1668#
1669# Install pam file <old name> as <new name> in /etc/pam.d
1670newpamd() {
1671 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1672
1673 use pam || return 0
1674
1675 insinto /etc/pam.d
1676 # these are the default doins options, but be explicit just in case
1677 insopts -m 0644 -o root -g root
1678 newins "$1" "$2" || die "failed to install $1 as $2"
1679}

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

  ViewVC Help
Powered by ViewVC 1.1.20