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

Diff of /eclass/eutils.eclass

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

Revision 1.172 Revision 1.200
1# Copyright 1999-2005 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.172 2005/05/20 02:09:19 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.200 2005/09/23 20:44:26 wolf31o2 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 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
19 18
20# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
21# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
68 dodir /usr/${libdir} 67 dodir /usr/${libdir}
69 68
70 for lib in "${@}" ; do 69 for lib in "${@}" ; do
71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
72 /* GNU ld script 71 /* GNU ld script
73 Since Gentoo has critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
74 in /lib, and the static versions in /usr/lib, 73 in /lib, and the static versions in /usr/lib,
75 we need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
76 otherwise we run into linking problems. 75 otherwise we run into linking problems.
77 76
78 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
79 */ 78 */
80 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
81 END_LDSCRIPT 80 END_LDSCRIPT
82 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}"
125# List of patches not to apply. Not this is only file names, 124# List of patches not to apply. Not this is only file names,
126# and not the full path .. 125# and not the full path ..
127EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
128# Change the printed message for a single patch. 127# Change the printed message for a single patch.
129EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
130# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
131# 132#
132# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
133# 134#
134EPATCH_FORCE="no" 135EPATCH_FORCE="no"
171 local STDERR_TARGET="${T}/$$.out" 172 local STDERR_TARGET="${T}/$$.out"
172 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
173 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
174 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
175 local x="" 176 local x=""
177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
176 179
177 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
178 then 181 then
179 local m="" 182 local m=""
180 for m in "$@" ; do 183 for m in "$@" ; do
238 ;; 241 ;;
239 esac 242 esac
240 243
241 if [ "${SINGLE_PATCH}" = "no" ] 244 if [ "${SINGLE_PATCH}" = "no" ]
242 then 245 then
243 einfo "Applying various patches (bugfixes/updates) ..." 246 einfo "${EPATCH_MULTI_MSG}"
244 fi 247 fi
245 for x in ${EPATCH_SOURCE} 248 for x in ${EPATCH_SOURCE}
246 do 249 do
247 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
248 # 251 #
249 # ???_arch_foo.patch 252 # ???_arch_foo.patch
250 # 253 #
251 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
252 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 255 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
253 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
254 then 257 then
255 local count=0 258 local count=0
256 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
257 local patchname=${x##*/} 260 local patchname=${x##*/}
367 then 370 then
368 einfo "Done with patching" 371 einfo "Done with patching"
369 fi 372 fi
370} 373}
371 374
372# This function check how many cpu's are present, and then set
373# -j in MAKEOPTS accordingly.
374#
375# Thanks to nall <nall@gentoo.org> for this.
376#
377get_number_of_jobs() {
378 local jobs=0
379
380 if [ ! -r /proc/cpuinfo ]
381 then
382 return 1
383 fi
384
385 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
386 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
387 then
388 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
389 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
390 ADMINPARAM="${ADMINPARAM/-j}"
391 fi
392
393 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
394
395 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
396 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
397 then
398 # these archs will always have "[Pp]rocessor"
399 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
400
401 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
402 then
403 # sparc always has "ncpus active"
404 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
405
406 elif [ "${ARCH}" = "alpha" ]
407 then
408 # alpha has "cpus active", but only when compiled with SMP
409 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
410 then
411 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
412 else
413 jobs=2
414 fi
415
416 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
417 then
418 # ppc has "processor", but only when compiled with SMP
419 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
420 then
421 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
422 else
423 jobs=2
424 fi
425 elif [ "${ARCH}" = "s390" ]
426 then
427 # s390 has "# processors : "
428 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
429 else
430 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
431 die "Unknown ARCH -- ${ARCH}!"
432 fi
433
434 # Make sure the number is valid ...
435 if [ "${jobs}" -lt 1 ]
436 then
437 jobs=1
438 fi
439
440 if [ -n "${ADMINPARAM}" ]
441 then
442 if [ "${jobs}" -gt "${ADMINPARAM}" ]
443 then
444 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
445 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
446 else
447 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
448 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
449 fi
450 fi
451}
452
453# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
454# does not exist on the users system 376# does not exist on the users system
455# vapier@gentoo.org 377# vapier@gentoo.org
456# 378#
457# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
458emktemp() { 380emktemp() {
459 local exe="touch" 381 local exe="touch"
460 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
461 local topdir="$1" 383 local topdir=$1
462 384
463 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
464 then
465 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
466 && topdir="/tmp" \ 387 && topdir="/tmp" \
467 || topdir="${T}" 388 || topdir=${T}
468 fi 389 fi
469 390
470 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
471 then
472 local tmp=/ 392 local tmp=/
473 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
474 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
475 done 395 done
476 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
477 echo "${tmp}" 397 echo "${tmp}"
478 else 398 else
479 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
480 && exe="-p" \ 400 && exe="-p" \
481 || exe="-d" 401 || exe="-d"
482 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
483 fi 403 fi
484} 404}
488# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
489# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
490# 410#
491# egetent(database, key) 411# egetent(database, key)
492egetent() { 412egetent() {
493 if useq ppc-macos ; then 413 if [[ "${USERLAND}" == "Darwin" ]] ; then
494 case "$2" in 414 case "$2" in
495 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
496 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
497 ;; 417 ;;
498 *) # Numeric 418 *) # Numeric
499 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
500 ;; 420 ;;
501 esac 421 esac
502 elif useq x86-fbsd ; then 422 elif [[ "${USERLAND}" == "BSD" ]] ; then
503 local action 423 local action
504 if [ "$1" == "passwd" ] 424 if [ "$1" == "passwd" ]
505 then 425 then
506 action="user" 426 action="user"
507 else 427 else
527# homedir: /dev/null 447# homedir: /dev/null
528# groups: none 448# groups: none
529# extra: comment of 'added by portage for ${PN}' 449# extra: comment of 'added by portage for ${PN}'
530enewuser() { 450enewuser() {
531 # get the username 451 # get the username
532 local euser="$1"; shift 452 local euser=$1; shift
533 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
534 then
535 eerror "No username specified !" 454 eerror "No username specified !"
536 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
537 fi 456 fi
538 457
539 # lets see if the username already exists 458 # lets see if the username already exists
540 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
541 then
542 return 0 460 return 0
543 fi 461 fi
544 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
545 463
546 # options to pass to useradd 464 # options to pass to useradd
547 local opts= 465 local opts=
548 466
549 # handle uid 467 # handle uid
550 local euid="$1"; shift 468 local euid=$1; shift
551 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
552 then
553 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
554 then
555 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
556 then
557 euid="next" 472 euid="next"
558 fi 473 fi
559 else 474 else
560 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
561 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
562 fi 477 fi
563 else 478 else
564 euid="next" 479 euid="next"
565 fi 480 fi
566 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
567 then 482 for euid in $(seq 101 999) ; do
568 local pwrange
569 if [ "${USERLAND}" == "BSD" ] ; then
570 pwrange="`jot 898 101`"
571 else
572 pwrange="`seq 101 999`"
573 fi
574 for euid in ${pwrange} ; do
575 [ -z "`egetent passwd ${euid}`" ] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
576 done 484 done
577 fi 485 fi
578 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
579 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
580 488
581 # handle shell 489 # handle shell
582 local eshell="$1"; shift 490 local eshell=$1; shift
583 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
584 then
585 if [ ! -e "${eshell}" ] 492 if [[ ! -e ${eshell} ]] ; then
586 then
587 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
588 die "${eshell} does not exist" 494 die "${eshell} does not exist"
589 fi 495 fi
590 else 496 else
591 if [ "${USERLAND}" == "BSD" ] 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null; do
592 then 498 [[ -x ${ROOT}${shell} ]] && break;
593 eshell="/usr/bin/false" 499 done
594 else 500
595 eshell="/bin/false" 501 if [[ ${shell} == "/dev/null" ]]; then
502 eerror "Unable to identify the shell to use"
503 die "Unable to identify the shell to use"
596 fi 504 fi
505
506 eshell=${shell}
597 fi 507 fi
598 einfo " - Shell: ${eshell}" 508 einfo " - Shell: ${eshell}"
599 opts="${opts} -s ${eshell}" 509 opts="${opts} -s ${eshell}"
600 510
601 # handle homedir 511 # handle homedir
602 local ehome="$1"; shift 512 local ehome=$1; shift
603 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 513 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
604 then
605 ehome="/dev/null" 514 ehome="/dev/null"
606 fi 515 fi
607 einfo " - Home: ${ehome}" 516 einfo " - Home: ${ehome}"
608 opts="${opts} -d ${ehome}" 517 opts="${opts} -d ${ehome}"
609 518
610 # handle groups 519 # handle groups
611 local egroups="$1"; shift 520 local egroups=$1; shift
612 if [ ! -z "${egroups}" ] 521 if [[ ! -z ${egroups} ]] ; then
613 then
614 local oldifs="${IFS}" 522 local oldifs=${IFS}
615 local defgroup="" exgroups="" 523 local defgroup="" exgroups=""
616 524
617 export IFS="," 525 export IFS=","
618 for g in ${egroups} 526 for g in ${egroups} ; do
619 do
620 export IFS="${oldifs}" 527 export IFS=${oldifs}
621 if [ -z "`egetent group \"${g}\"`" ] 528 if [[ -z $(egetent group "${g}") ]] ; then
622 then
623 eerror "You must add group ${g} to the system first" 529 eerror "You must add group ${g} to the system first"
624 die "${g} is not a valid GID" 530 die "${g} is not a valid GID"
625 fi 531 fi
626 if [ -z "${defgroup}" ] 532 if [[ -z ${defgroup} ]] ; then
627 then
628 defgroup="${g}" 533 defgroup=${g}
629 else 534 else
630 exgroups="${exgroups},${g}" 535 exgroups="${exgroups},${g}"
631 fi 536 fi
632 export IFS="," 537 export IFS=","
633 done 538 done
634 export IFS="${oldifs}" 539 export IFS=${oldifs}
635 540
636 opts="${opts} -g ${defgroup}" 541 opts="${opts} -g ${defgroup}"
637 if [ ! -z "${exgroups}" ] 542 if [[ ! -z ${exgroups} ]] ; then
638 then
639 opts="${opts} -G ${exgroups:1}" 543 opts="${opts} -G ${exgroups:1}"
640 fi 544 fi
641 else 545 else
642 egroups="(none)" 546 egroups="(none)"
643 fi 547 fi
644 einfo " - Groups: ${egroups}" 548 einfo " - Groups: ${egroups}"
645 549
646 # handle extra and add the user 550 # handle extra and add the user
647 local eextra="$@"
648 local oldsandbox="${SANDBOX_ON}" 551 local oldsandbox=${SANDBOX_ON}
649 export SANDBOX_ON="0" 552 export SANDBOX_ON="0"
650 if useq ppc-macos 553 case ${USERLAND} in
651 then 554 Darwin)
652 ### Make the user 555 ### Make the user
653 if [ -z "${eextra}" ] 556 if [[ -z $@ ]] ; then
654 then
655 dscl . create /users/${euser} uid ${euid} 557 dscl . create /users/${euser} uid ${euid}
656 dscl . create /users/${euser} shell ${eshell} 558 dscl . create /users/${euser} shell ${eshell}
657 dscl . create /users/${euser} home ${ehome} 559 dscl . create /users/${euser} home ${ehome}
658 dscl . create /users/${euser} realname "added by portage for ${PN}" 560 dscl . create /users/${euser} realname "added by portage for ${PN}"
659 ### Add the user to the groups specified 561 ### Add the user to the groups specified
660 local oldifs="${IFS}" 562 local oldifs=${IFS}
661 export IFS="," 563 export IFS=","
662 for g in ${egroups} 564 for g in ${egroups} ; do
663 do
664 dscl . merge /groups/${g} users ${euser} 565 dscl . merge /groups/${g} users ${euser}
665 done 566 done
666 export IFS="${oldifs}" 567 export IFS=${oldifs}
667 else 568 else
668 einfo "Extra options are not supported on macos yet" 569 einfo "Extra options are not supported on Darwin yet"
669 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
670 einfo "eextra: ${eextra}" 571 einfo "eextra: $@"
671 die "Required function missing" 572 die "Required function missing"
672 fi 573 fi
673 elif use x86-fbsd ; then 574 ;;
674 if [ -z "${eextra}" ] 575 BSD)
675 then 576 if [[ -z $@ ]] ; then
676 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
677 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
678 die "enewuser failed" 579 die "enewuser failed"
679 else 580 else
680 einfo " - Extra: ${eextra}" 581 einfo " - Extra: $@"
681 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
682 -c ${eextra} || die "enewuser failed" 583 "$@" || die "enewuser failed"
683 fi 584 fi
684 else 585 ;;
685 if [ -z "${eextra}" ] 586 *)
686 then 587 if [[ -z $@ ]] ; then
687 useradd ${opts} ${euser} \ 588 useradd ${opts} ${euser} \
688 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
689 || die "enewuser failed" 590 || die "enewuser failed"
690 else 591 else
691 einfo " - Extra: ${eextra}" 592 einfo " - Extra: $@"
692 useradd ${opts} ${euser} ${eextra} \ 593 useradd ${opts} ${euser} "$@" \
693 || die "enewuser failed" 594 || die "enewuser failed"
694 fi 595 fi
596 ;;
597 esac
598
599 if [[ ! -e ${ROOT}/${ehome} ]] ; then
600 einfo " - Creating ${ehome} in ${ROOT}"
601 mkdir -p "${ROOT}/${ehome}"
602 chown ${euser} "${ROOT}/${ehome}"
603 chmod 755 "${ROOT}/${ehome}"
695 fi 604 fi
605
696 export SANDBOX_ON="${oldsandbox}" 606 export SANDBOX_ON=${oldsandbox}
697
698 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
699 then
700 einfo " - Creating ${ehome} in ${D}"
701 dodir ${ehome}
702 fowners ${euser} ${ehome}
703 fperms 755 ${ehome}
704 fi
705} 607}
706 608
707# Simplify/standardize adding groups to the system 609# Simplify/standardize adding groups to the system
708# vapier@gentoo.org 610# vapier@gentoo.org
709# 611#
738 then 640 then
739 if [ "${egid}" -gt 0 ] 641 if [ "${egid}" -gt 0 ]
740 then 642 then
741 if [ -z "`egetent group ${egid}`" ] 643 if [ -z "`egetent group ${egid}`" ]
742 then 644 then
743 if useq ppc-macos ; then 645 if [[ "${USERLAND}" == "Darwin" ]]; then
744 opts="${opts} ${egid}" 646 opts="${opts} ${egid}"
745 else 647 else
746 opts="${opts} -g ${egid}" 648 opts="${opts} -g ${egid}"
747 fi 649 fi
748 else 650 else
762 opts="${opts} ${eextra}" 664 opts="${opts} ${eextra}"
763 665
764 # add the group 666 # add the group
765 local oldsandbox="${SANDBOX_ON}" 667 local oldsandbox="${SANDBOX_ON}"
766 export SANDBOX_ON="0" 668 export SANDBOX_ON="0"
767 if useq ppc-macos ; then 669 if [[ "${USERLAND}" == "Darwin" ]]; then
768 if [ ! -z "${eextra}" ]; 670 if [ ! -z "${eextra}" ];
769 then 671 then
770 einfo "Extra options are not supported on macos yet" 672 einfo "Extra options are not supported on Darwin/OS X yet"
771 einfo "Please report the ebuild along with the info below" 673 einfo "Please report the ebuild along with the info below"
772 einfo "eextra: ${eextra}" 674 einfo "eextra: ${eextra}"
773 die "Required function missing" 675 die "Required function missing"
774 fi 676 fi
775 677
776 # If we need the next available 678 # If we need the next available
777 case ${egid} in 679 case ${egid} in
778 *[!0-9]*) # Non numeric 680 *[!0-9]*) # Non numeric
779 for egid in `jot 898 101`; do 681 for egid in $(seq 101 999); do
780 [ -z "`egetent group ${egid}`" ] && break 682 [ -z "`egetent group ${egid}`" ] && break
781 done 683 done
782 esac 684 esac
783 dscl . create /groups/${egroup} gid ${egid} 685 dscl . create /groups/${egroup} gid ${egid}
784 dscl . create /groups/${egroup} passwd '*' 686 dscl . create /groups/${egroup} passwd '*'
785 elif use x86-fbsd ; then 687 elif [[ "${USERLAND}" == "BSD" ]] ; then
786 case ${egid} in 688 case ${egid} in
787 *[!0-9]*) # Non numeric 689 *[!0-9]*) # Non numeric
788 for egid in `jot 898 101`; do 690 for egid in $(seq 101 999); do
789 [ -z "`egetent group ${egid}`" ] && break 691 [ -z "`egetent group ${egid}`" ] && break
790 done 692 done
791 esac 693 esac
792 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
793 else 695 else
825# name: the name that will show up in the menu 727# name: the name that will show up in the menu
826# icon: give your little like a pretty little icon ... 728# icon: give your little like a pretty little icon ...
827# this can be relative (to /usr/share/pixmaps) or 729# this can be relative (to /usr/share/pixmaps) or
828# a full path to an icon 730# a full path to an icon
829# type: what kind of application is this ? for categories: 731# type: what kind of application is this ? for categories:
830# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 732# http://www.freedesktop.org/Standards/desktop-entry-spec
831# path: if your app needs to startup in a specific dir 733# path: if your app needs to startup in a specific dir
832make_desktop_entry() { 734make_desktop_entry() {
833 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 735 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
834 736
835 local exec=${1} 737 local exec=${1}
861 dev) 763 dev)
862 type="Development" 764 type="Development"
863 ;; 765 ;;
864 766
865 games) 767 games)
866 [[ -z ${path} ]] && path=${GAMES_BINDIR}
867
868 case ${catmin} in 768 case ${catmin} in
869 action) type=ActionGame;; 769 action) type=ActionGame;;
870 arcade) type=ArcadeGame;; 770 arcade) type=ArcadeGame;;
871 board) type=BoardGame;; 771 board) type=BoardGame;;
872 kid) type=KidsGame;; 772 kid) type=KidsGame;;
937 *) 837 *)
938 type= 838 type=
939 ;; 839 ;;
940 esac 840 esac
941 fi 841 fi
942 842 if [ "${SLOT}" == "0" ] ; then
843 local desktop_name="${PN}"
844 else
845 local desktop_name="${PN}-${SLOT}"
846 fi
943 local desktop=${T}/${exec%% *}-${P}.desktop 847 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
944 848
945echo "[Desktop Entry] 849echo "[Desktop Entry]
946Encoding=UTF-8 850Encoding=UTF-8
947Version=0.9.2 851Version=0.9.2
948Name=${name} 852Name=${name}
993 doins "${i}" 897 doins "${i}"
994 elif [[ -d ${i} ]] ; then 898 elif [[ -d ${i} ]] ; then
995 for j in "${i}"/*.desktop ; do 899 for j in "${i}"/*.desktop ; do
996 doins "${j}" 900 doins "${j}"
997 done 901 done
998 fi 902 fi
999 done 903 done
1000} 904}
1001newmenu() { 905newmenu() {
1002 insinto /usr/share/applications 906 insinto /usr/share/applications
1003 newins "$1" "$2" 907 newins "$1" "$2"
1011 doins "${i}" 915 doins "${i}"
1012 elif [[ -d ${i} ]] ; then 916 elif [[ -d ${i} ]] ; then
1013 for j in "${i}"/*.png ; do 917 for j in "${i}"/*.png ; do
1014 doins "${j}" 918 doins "${j}"
1015 done 919 done
1016 fi 920 fi
1017 done 921 done
1018} 922}
1019newicon() { 923newicon() {
1020 insinto /usr/share/pixmaps 924 insinto /usr/share/pixmaps
1021 newins "$1" "$2" 925 newins "$1" "$2"
1026############################################################## 930##############################################################
1027 931
1028 932
1029# for internal use only (unpack_pdv and unpack_makeself) 933# for internal use only (unpack_pdv and unpack_makeself)
1030find_unpackable_file() { 934find_unpackable_file() {
1031 local src="$1" 935 local src=$1
1032 if [ -z "${src}" ] 936 if [[ -z ${src} ]] ; then
1033 then
1034 src="${DISTDIR}/${A}" 937 src=${DISTDIR}/${A}
1035 else 938 else
1036 if [ -e "${DISTDIR}/${src}" ] 939 if [[ -e ${DISTDIR}/${src} ]] ; then
1037 then
1038 src="${DISTDIR}/${src}" 940 src=${DISTDIR}/${src}
1039 elif [ -e "${PWD}/${src}" ] 941 elif [[ -e ${PWD}/${src} ]] ; then
1040 then
1041 src="${PWD}/${src}" 942 src=${PWD}/${src}
1042 elif [ -e "${src}" ] 943 elif [[ -e ${src} ]] ; then
1043 then
1044 src="${src}" 944 src=${src}
1045 fi
1046 fi 945 fi
1047 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 946 fi
947 [[ ! -e ${src} ]] && return 1
1048 echo "${src}" 948 echo "${src}"
1049} 949}
1050 950
1051# Unpack those pesky pdv generated files ... 951# Unpack those pesky pdv generated files ...
1052# They're self-unpacking programs with the binary package stuffed in 952# They're self-unpacking programs with the binary package stuffed in
1067# lseek 967# lseek
1068# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 968# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1069# lseek(3, -4, SEEK_END) = 2981250 969# lseek(3, -4, SEEK_END) = 2981250
1070# thus we would pass in the value of '4' as the second parameter. 970# thus we would pass in the value of '4' as the second parameter.
1071unpack_pdv() { 971unpack_pdv() {
1072 local src="`find_unpackable_file $1`" 972 local src=$(find_unpackable_file $1)
1073 local sizeoff_t="$2" 973 local sizeoff_t=$2
1074 974
975 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1075 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 976 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1076 977
1077 local shrtsrc="`basename ${src}`" 978 local shrtsrc="`basename ${src}`"
1078 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 979 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1079 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 980 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1080 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 981 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1146# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1147# - If the file is not specified then unpack will utilize ${A}. 1048# - If the file is not specified then unpack will utilize ${A}.
1148# - If the offset is not specified then we will attempt to extract 1049# - If the offset is not specified then we will attempt to extract
1149# the proper offset from the script itself. 1050# the proper offset from the script itself.
1150unpack_makeself() { 1051unpack_makeself() {
1151 local src="$(find_unpackable_file "$1")" 1052 local src=$(find_unpackable_file "$1")
1152 local skip="$2" 1053 local skip=$2
1153 local exe="$3" 1054 local exe=$3
1154 1055
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1057
1155 local shrtsrc="$(basename "${src}")" 1058 local shrtsrc=$(basename "${src}")
1156 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1157 if [ -z "${skip}" ] 1060 if [ -z "${skip}" ]
1158 then 1061 then
1159 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1160 local skip=0 1063 local skip=0
1231check_license() { 1134check_license() {
1232 local lic=$1 1135 local lic=$1
1233 if [ -z "${lic}" ] ; then 1136 if [ -z "${lic}" ] ; then
1234 lic="${PORTDIR}/licenses/${LICENSE}" 1137 lic="${PORTDIR}/licenses/${LICENSE}"
1235 else 1138 else
1236 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1139 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1237 lic="${PORTDIR}/licenses/${src}" 1140 lic="${PORTDIR}/licenses/${lic}"
1238 elif [ -e "${PWD}/${src}" ] ; then 1141 elif [ -e "${PWD}/${lic}" ] ; then
1239 lic="${PWD}/${src}" 1142 lic="${PWD}/${lic}"
1240 elif [ -e "${src}" ] ; then 1143 elif [ -e "${lic}" ] ; then
1241 lic="${src}" 1144 lic="${lic}"
1242 fi
1243 fi 1145 fi
1146 fi
1244 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1147 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1245 local l="`basename ${lic}`" 1148 local l="`basename ${lic}`"
1246 1149
1247 # here is where we check for the licenses the user already 1150 # here is where we check for the licenses the user already
1248 # accepted ... if we don't find a match, we make the user accept 1151 # accepted ... if we don't find a match, we make the user accept
1249 local shopts=$- 1152 local shopts=$-
1420# displayed and we'll hang out here until: 1323# displayed and we'll hang out here until:
1421# (1) the file is found on a mounted cdrom 1324# (1) the file is found on a mounted cdrom
1422# (2) the user hits CTRL+C 1325# (2) the user hits CTRL+C
1423cdrom_locate_file_on_cd() { 1326cdrom_locate_file_on_cd() {
1424 while [[ -z ${CDROM_ROOT} ]] ; do 1327 while [[ -z ${CDROM_ROOT} ]] ; do
1425 local dir="$(dirname ${@})" 1328 local dir=$(dirname "$*")
1426 local file="$(basename ${@})" 1329 local file=$(basename "$*")
1427 local mline="" 1330 local mline=""
1428 local showedmsg=0 1331 local showedmsg=0
1429 1332
1430 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1333 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1431 [[ -d ${mline}/${dir} ]] || continue 1334 [[ -d ${mline}/${dir} ]] || continue
1452 fi 1355 fi
1453 showedmsg=1 1356 showedmsg=1
1454 fi 1357 fi
1455 einfo "Press return to scan for the cd again" 1358 einfo "Press return to scan for the cd again"
1456 einfo "or hit CTRL+C to abort the emerge." 1359 einfo "or hit CTRL+C to abort the emerge."
1360 echo
1361 einfo "If you are having trouble with the detection"
1362 einfo "of your CD, it is possible that you do not have"
1363 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1457 read 1365 read
1458 fi 1366 fi
1459 done 1367 done
1460} 1368}
1461 1369
1525 while ((i--)) ; do 1433 while ((i--)) ; do
1526 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1434 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1527 done 1435 done
1528 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1436 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1529 case ${ARCH} in 1437 case ${ARCH} in
1530 x86) export ARCH="i386";; 1438 x86) export ARCH="i386";;
1531 amd64) export ARCH="x86_64";; 1439 amd64) export ARCH="x86_64";;
1532 hppa) export ARCH="parisc";; 1440 hppa) export ARCH="parisc";;
1533 mips) export ARCH="mips";; 1441 mips) export ARCH="mips";;
1534 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! 1442 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!
1535 *) export ARCH="${ARCH}";; 1443 *) export ARCH="${ARCH}";;
1536 esac 1444 esac
1537} 1445}
1538 1446
1539# set's ARCH back to what portage expects 1447# set's ARCH back to what portage expects
1540set_arch_to_portage() { 1448set_arch_to_portage() {
1584 LIB=$1 1492 LIB=$1
1585 1493
1586 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1494 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1587 SONAME=`basename ${LIB}` 1495 SONAME=`basename ${LIB}`
1588 1496
1589 einfo "An old version of an installed library was detected on your system." 1497 ewarn "An old version of an installed library was detected on your system."
1590 einfo "In order to avoid breaking packages that link against is, this older version" 1498 ewarn "In order to avoid breaking packages that link against it, this older version"
1591 einfo "is not being removed. In order to make full use of this newer version," 1499 ewarn "is not being removed. In order to make full use of this newer version,"
1592 einfo "you will need to execute the following command:" 1500 ewarn "you will need to execute the following command:"
1593 einfo " revdep-rebuild --soname ${SONAME}" 1501 ewarn " revdep-rebuild --soname ${SONAME}"
1594 einfo 1502 ewarn
1595 einfo "After doing that, you can safely remove ${LIB}" 1503 ewarn "After doing that, you can safely remove ${LIB}"
1596 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1597 fi 1505 fi
1598} 1506}
1599 1507
1600# Hack for people to figure out if a package was built with 1508# Hack for people to figure out if a package was built with
1601# certain USE flags 1509# certain USE flags

Legend:
Removed from v.1.172  
changed lines
  Added in v.1.200

  ViewVC Help
Powered by ViewVC 1.1.20