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

Diff of /eclass/eutils.eclass

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

Revision 1.173 Revision 1.206
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.173 2005/05/24 03:17:19 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.206 2005/10/07 16:21:48 flameeyes 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}"
173 local STDERR_TARGET="${T}/$$.out" 172 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
176 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
177 local x="" 176 local x=""
177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
178 179
179 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
180 then 181 then
181 local m="" 182 local m=""
182 for m in "$@" ; do 183 for m in "$@" ; do
249 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
250 # 251 #
251 # ???_arch_foo.patch 252 # ???_arch_foo.patch
252 # 253 #
253 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
254 ([ "${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}" ] || \
255 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
256 then 257 then
257 local count=0 258 local count=0
258 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
259 local patchname=${x##*/} 260 local patchname=${x##*/}
369 then 370 then
370 einfo "Done with patching" 371 einfo "Done with patching"
371 fi 372 fi
372} 373}
373 374
374# This function check how many cpu's are present, and then set
375# -j in MAKEOPTS accordingly.
376#
377# Thanks to nall <nall@gentoo.org> for this.
378#
379get_number_of_jobs() {
380 local jobs=0
381
382 if [ ! -r /proc/cpuinfo ]
383 then
384 return 1
385 fi
386
387 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
388 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
389 then
390 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
391 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
392 ADMINPARAM="${ADMINPARAM/-j}"
393 fi
394
395 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
396
397 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
398 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
399 then
400 # these archs will always have "[Pp]rocessor"
401 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
402
403 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
404 then
405 # sparc always has "ncpus active"
406 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
407
408 elif [ "${ARCH}" = "alpha" ]
409 then
410 # alpha has "cpus active", but only when compiled with SMP
411 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
412 then
413 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
414 else
415 jobs=2
416 fi
417
418 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
419 then
420 # ppc has "processor", but only when compiled with SMP
421 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
422 then
423 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
424 else
425 jobs=2
426 fi
427 elif [ "${ARCH}" = "s390" ]
428 then
429 # s390 has "# processors : "
430 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
431 else
432 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
433 die "Unknown ARCH -- ${ARCH}!"
434 fi
435
436 # Make sure the number is valid ...
437 if [ "${jobs}" -lt 1 ]
438 then
439 jobs=1
440 fi
441
442 if [ -n "${ADMINPARAM}" ]
443 then
444 if [ "${jobs}" -gt "${ADMINPARAM}" ]
445 then
446 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
447 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
448 else
449 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
450 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
451 fi
452 fi
453}
454
455# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
456# does not exist on the users system 376# does not exist on the users system
457# vapier@gentoo.org 377# vapier@gentoo.org
458# 378#
459# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
460emktemp() { 380emktemp() {
461 local exe="touch" 381 local exe="touch"
462 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
463 local topdir="$1" 383 local topdir=$1
464 384
465 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
466 then
467 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
468 && topdir="/tmp" \ 387 && topdir="/tmp" \
469 || topdir="${T}" 388 || topdir=${T}
470 fi 389 fi
471 390
472 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
473 then
474 local tmp=/ 392 local tmp=/
475 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
476 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
477 done 395 done
478 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
479 echo "${tmp}" 397 echo "${tmp}"
480 else 398 else
481 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
482 && exe="-p" \ 400 && exe="-p" \
483 || exe="-d" 401 || exe="-d"
484 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
485 fi 403 fi
486} 404}
490# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
491# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
492# 410#
493# egetent(database, key) 411# egetent(database, key)
494egetent() { 412egetent() {
495 if useq ppc-macos ; then 413 case ${CHOST} in
414 *-darwin*)
496 case "$2" in 415 case "$2" in
497 *[!0-9]*) # Non numeric 416 *[!0-9]*) # Non numeric
498 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
499 ;; 418 ;;
500 *) # Numeric 419 *) # Numeric
501 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
502 ;; 421 ;;
503 esac 422 esac
504 elif useq x86-fbsd ; then 423 ;;
505 local action 424 *-freebsd*)
506 if [ "$1" == "passwd" ] 425 local opts action="user"
507 then 426 [[ $1 == "passwd" ]] || action="group"
508 action="user" 427
509 else 428 # lookup by uid/gid
510 action="group" 429 if [[ $2 == [[:digit:]]* ]] ; then
430 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
511 fi 431 fi
432
512 pw show "${action}" "$2" -q 433 pw show ${action} ${opts} "$2" -q
513 else 434 ;;
435 *-netbsd*)
436 grep "$2:\*:" /etc/$1
437 ;;
438 *)
514 which nscd >& /dev/null && nscd -i "$1" 439 type -p nscd >& /dev/null && nscd -i "$1"
515 getent "$1" "$2" 440 getent "$1" "$2"
516 fi 441 ;;
442 esac
517} 443}
518 444
519# Simplify/standardize adding users to the system 445# Simplify/standardize adding users to the system
520# vapier@gentoo.org 446# vapier@gentoo.org
521# 447#
529# homedir: /dev/null 455# homedir: /dev/null
530# groups: none 456# groups: none
531# extra: comment of 'added by portage for ${PN}' 457# extra: comment of 'added by portage for ${PN}'
532enewuser() { 458enewuser() {
533 # get the username 459 # get the username
534 local euser="$1"; shift 460 local euser=$1; shift
535 if [ -z "${euser}" ] 461 if [[ -z ${euser} ]] ; then
536 then
537 eerror "No username specified !" 462 eerror "No username specified !"
538 die "Cannot call enewuser without a username" 463 die "Cannot call enewuser without a username"
539 fi 464 fi
540 465
541 # lets see if the username already exists 466 # lets see if the username already exists
542 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 467 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
543 then
544 return 0 468 return 0
545 fi 469 fi
546 einfo "Adding user '${euser}' to your system ..." 470 einfo "Adding user '${euser}' to your system ..."
547 471
548 # options to pass to useradd 472 # options to pass to useradd
549 local opts= 473 local opts=
550 474
551 # handle uid 475 # handle uid
552 local euid="$1"; shift 476 local euid=$1; shift
553 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 477 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
554 then
555 if [ "${euid}" -gt 0 ] 478 if [[ ${euid} -gt 0 ]] ; then
556 then
557 if [ ! -z "`egetent passwd ${euid}`" ] 479 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
558 then
559 euid="next" 480 euid="next"
560 fi 481 fi
561 else 482 else
562 eerror "Userid given but is not greater than 0 !" 483 eerror "Userid given but is not greater than 0 !"
563 die "${euid} is not a valid UID" 484 die "${euid} is not a valid UID"
564 fi 485 fi
565 else 486 else
566 euid="next" 487 euid="next"
567 fi 488 fi
568 if [ "${euid}" == "next" ] 489 if [[ ${euid} == "next" ]] ; then
569 then 490 for euid in $(seq 101 999) ; do
570 local pwrange
571 if [ "${USERLAND}" == "BSD" ] ; then
572 pwrange="`jot 898 101`"
573 else
574 pwrange="`seq 101 999`"
575 fi
576 for euid in ${pwrange} ; do
577 [ -z "`egetent passwd ${euid}`" ] && break 491 [[ -z $(egetent passwd ${euid}) ]] && break
578 done 492 done
579 fi 493 fi
580 opts="${opts} -u ${euid}" 494 opts="${opts} -u ${euid}"
581 einfo " - Userid: ${euid}" 495 einfo " - Userid: ${euid}"
582 496
583 # handle shell 497 # handle shell
584 local eshell="$1"; shift 498 local eshell=$1; shift
585 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
586 then
587 if [ ! -e "${eshell}" ] 500 if [[ ! -e ${eshell} ]] ; then
588 then
589 eerror "A shell was specified but it does not exist !" 501 eerror "A shell was specified but it does not exist !"
590 die "${eshell} does not exist" 502 die "${eshell} does not exist"
591 fi 503 fi
592 else 504 else
593 if [ "${USERLAND}" == "BSD" ] 505 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
594 then 506 [[ -x ${ROOT}${shell} ]] && break
595 eshell="/usr/bin/false" 507 done
596 else 508
597 eshell="/bin/false" 509 if [[ ${shell} == "/dev/null" ]] ; then
510 eerror "Unable to identify the shell to use"
511 die "Unable to identify the shell to use"
598 fi 512 fi
513
514 eshell=${shell}
599 fi 515 fi
600 einfo " - Shell: ${eshell}" 516 einfo " - Shell: ${eshell}"
601 opts="${opts} -s ${eshell}" 517 opts="${opts} -s ${eshell}"
602 518
603 # handle homedir 519 # handle homedir
604 local ehome="$1"; shift 520 local ehome=$1; shift
605 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 521 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
606 then
607 ehome="/dev/null" 522 ehome="/dev/null"
608 fi 523 fi
609 einfo " - Home: ${ehome}" 524 einfo " - Home: ${ehome}"
610 opts="${opts} -d ${ehome}" 525 opts="${opts} -d ${ehome}"
611 526
612 # handle groups 527 # handle groups
613 local egroups="$1"; shift 528 local egroups=$1; shift
614 if [ ! -z "${egroups}" ] 529 if [[ ! -z ${egroups} ]] ; then
615 then
616 local oldifs="${IFS}" 530 local oldifs=${IFS}
617 local defgroup="" exgroups="" 531 local defgroup="" exgroups=""
618 532
619 export IFS="," 533 export IFS=","
620 for g in ${egroups} 534 for g in ${egroups} ; do
621 do
622 export IFS="${oldifs}" 535 export IFS=${oldifs}
623 if [ -z "`egetent group \"${g}\"`" ] 536 if [[ -z $(egetent group "${g}") ]] ; then
624 then
625 eerror "You must add group ${g} to the system first" 537 eerror "You must add group ${g} to the system first"
626 die "${g} is not a valid GID" 538 die "${g} is not a valid GID"
627 fi 539 fi
628 if [ -z "${defgroup}" ] 540 if [[ -z ${defgroup} ]] ; then
629 then
630 defgroup="${g}" 541 defgroup=${g}
631 else 542 else
632 exgroups="${exgroups},${g}" 543 exgroups="${exgroups},${g}"
633 fi 544 fi
634 export IFS="," 545 export IFS=","
635 done 546 done
636 export IFS="${oldifs}" 547 export IFS=${oldifs}
637 548
638 opts="${opts} -g ${defgroup}" 549 opts="${opts} -g ${defgroup}"
639 if [ ! -z "${exgroups}" ] 550 if [[ ! -z ${exgroups} ]] ; then
640 then
641 opts="${opts} -G ${exgroups:1}" 551 opts="${opts} -G ${exgroups:1}"
642 fi 552 fi
643 else 553 else
644 egroups="(none)" 554 egroups="(none)"
645 fi 555 fi
646 einfo " - Groups: ${egroups}" 556 einfo " - Groups: ${egroups}"
647 557
648 # handle extra and add the user 558 # handle extra and add the user
649 local eextra="$@"
650 local oldsandbox="${SANDBOX_ON}" 559 local oldsandbox=${SANDBOX_ON}
651 export SANDBOX_ON="0" 560 export SANDBOX_ON="0"
652 if useq ppc-macos 561 case ${CHOST} in
653 then 562 *-darwin*)
654 ### Make the user 563 ### Make the user
655 if [ -z "${eextra}" ] 564 if [[ -z $@ ]] ; then
656 then
657 dscl . create /users/${euser} uid ${euid} 565 dscl . create /users/${euser} uid ${euid}
658 dscl . create /users/${euser} shell ${eshell} 566 dscl . create /users/${euser} shell ${eshell}
659 dscl . create /users/${euser} home ${ehome} 567 dscl . create /users/${euser} home ${ehome}
660 dscl . create /users/${euser} realname "added by portage for ${PN}" 568 dscl . create /users/${euser} realname "added by portage for ${PN}"
661 ### Add the user to the groups specified 569 ### Add the user to the groups specified
662 local oldifs="${IFS}" 570 local oldifs=${IFS}
663 export IFS="," 571 export IFS=","
664 for g in ${egroups} 572 for g in ${egroups} ; do
665 do
666 dscl . merge /groups/${g} users ${euser} 573 dscl . merge /groups/${g} users ${euser}
667 done 574 done
668 export IFS="${oldifs}" 575 export IFS=${oldifs}
669 else 576 else
670 einfo "Extra options are not supported on macos yet" 577 einfo "Extra options are not supported on Darwin yet"
671 einfo "Please report the ebuild along with the info below" 578 einfo "Please report the ebuild along with the info below"
672 einfo "eextra: ${eextra}" 579 einfo "eextra: $@"
673 die "Required function missing" 580 die "Required function missing"
674 fi 581 fi
675 elif use x86-fbsd ; then 582 ;;
676 if [ -z "${eextra}" ] 583 *-freebsd*)
677 then 584 if [[ -z $@ ]] ; then
678 pw useradd ${euser} ${opts} \ 585 pw useradd ${euser} ${opts} \
679 -c "added by portage for ${PN}" \ 586 -c "added by portage for ${PN}" \
680 die "enewuser failed" 587 die "enewuser failed"
681 else 588 else
682 einfo " - Extra: ${eextra}" 589 einfo " - Extra: $@"
683 pw useradd ${euser} ${opts} \ 590 pw useradd ${euser} ${opts} \
684 -c ${eextra} || die "enewuser failed" 591 "$@" || die "enewuser failed"
685 fi 592 fi
686 else 593 ;;
687 if [ -z "${eextra}" ] 594 *)
688 then 595 if [[ -z $@ ]] ; then
689 useradd ${opts} ${euser} \ 596 useradd ${opts} ${euser} \
690 -c "added by portage for ${PN}" \ 597 -c "added by portage for ${PN}" \
691 || die "enewuser failed" 598 || die "enewuser failed"
692 else 599 else
693 einfo " - Extra: ${eextra}" 600 einfo " - Extra: $@"
694 useradd ${opts} ${euser} ${eextra} \ 601 useradd ${opts} ${euser} "$@" \
695 || die "enewuser failed" 602 || die "enewuser failed"
696 fi 603 fi
604 ;;
605 esac
606
607 if [[ ! -e ${ROOT}/${ehome} ]] ; then
608 einfo " - Creating ${ehome} in ${ROOT}"
609 mkdir -p "${ROOT}/${ehome}"
610 chown ${euser} "${ROOT}/${ehome}"
611 chmod 755 "${ROOT}/${ehome}"
697 fi 612 fi
613
698 export SANDBOX_ON="${oldsandbox}" 614 export SANDBOX_ON=${oldsandbox}
699
700 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
701 then
702 einfo " - Creating ${ehome} in ${D}"
703 dodir ${ehome}
704 fowners ${euser} ${ehome}
705 fperms 755 ${ehome}
706 fi
707} 615}
708 616
709# Simplify/standardize adding groups to the system 617# Simplify/standardize adding groups to the system
710# vapier@gentoo.org 618# vapier@gentoo.org
711# 619#
740 then 648 then
741 if [ "${egid}" -gt 0 ] 649 if [ "${egid}" -gt 0 ]
742 then 650 then
743 if [ -z "`egetent group ${egid}`" ] 651 if [ -z "`egetent group ${egid}`" ]
744 then 652 then
745 if useq ppc-macos ; then 653 if [[ "${CHOST}" == *-darwin* ]]; then
746 opts="${opts} ${egid}" 654 opts="${opts} ${egid}"
747 else 655 else
748 opts="${opts} -g ${egid}" 656 opts="${opts} -g ${egid}"
749 fi 657 fi
750 else 658 else
764 opts="${opts} ${eextra}" 672 opts="${opts} ${eextra}"
765 673
766 # add the group 674 # add the group
767 local oldsandbox="${SANDBOX_ON}" 675 local oldsandbox="${SANDBOX_ON}"
768 export SANDBOX_ON="0" 676 export SANDBOX_ON="0"
769 if useq ppc-macos ; then 677 case ${CHOST} in
678 *-darwin*)
770 if [ ! -z "${eextra}" ]; 679 if [ ! -z "${eextra}" ];
771 then 680 then
772 einfo "Extra options are not supported on macos yet" 681 einfo "Extra options are not supported on Darwin/OS X yet"
773 einfo "Please report the ebuild along with the info below" 682 einfo "Please report the ebuild along with the info below"
774 einfo "eextra: ${eextra}" 683 einfo "eextra: ${eextra}"
775 die "Required function missing" 684 die "Required function missing"
776 fi 685 fi
777 686
778 # If we need the next available 687 # If we need the next available
779 case ${egid} in 688 case ${egid} in
780 *[!0-9]*) # Non numeric 689 *[!0-9]*) # Non numeric
781 for egid in `jot 898 101`; do 690 for egid in $(seq 101 999); do
782 [ -z "`egetent group ${egid}`" ] && break 691 [ -z "`egetent group ${egid}`" ] && break
783 done 692 done
784 esac 693 esac
785 dscl . create /groups/${egroup} gid ${egid} 694 dscl . create /groups/${egroup} gid ${egid}
786 dscl . create /groups/${egroup} passwd '*' 695 dscl . create /groups/${egroup} passwd '*'
787 elif use x86-fbsd ; then 696 ;;
697
698 *-freebsd*)
788 case ${egid} in 699 case ${egid} in
789 *[!0-9]*) # Non numeric 700 *[!0-9]*) # Non numeric
790 for egid in `jot 898 101`; do 701 for egid in $(seq 101 999); do
791 [ -z "`egetent group ${egid}`" ] && break 702 [ -z "`egetent group ${egid}`" ] && break
792 done 703 done
793 esac 704 esac
794 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 705 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
795 else 706 ;;
707
708 *-netbsd*)
709 case ${egid} in
710 *[!0-9]*) # Non numeric
711 for egid in $(seq 101 999); do
712 [ -z "`egetent group ${egid}`" ] && break
713 done
714 esac
715 groupadd ${egroup} -g ${egid} || die "enewgroup failed"
716 ;;
717
718 *)
796 groupadd ${opts} ${egroup} || die "enewgroup failed" 719 groupadd ${opts} ${egroup} || die "enewgroup failed"
797 fi 720 ;;
721 esac
798 export SANDBOX_ON="${oldsandbox}" 722 export SANDBOX_ON="${oldsandbox}"
799} 723}
800 724
801# Simple script to replace 'dos2unix' binaries 725# Simple script to replace 'dos2unix' binaries
802# vapier@gentoo.org 726# vapier@gentoo.org
827# name: the name that will show up in the menu 751# name: the name that will show up in the menu
828# icon: give your little like a pretty little icon ... 752# icon: give your little like a pretty little icon ...
829# this can be relative (to /usr/share/pixmaps) or 753# this can be relative (to /usr/share/pixmaps) or
830# a full path to an icon 754# a full path to an icon
831# type: what kind of application is this ? for categories: 755# type: what kind of application is this ? for categories:
832# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 756# http://www.freedesktop.org/Standards/desktop-entry-spec
833# path: if your app needs to startup in a specific dir 757# path: if your app needs to startup in a specific dir
834make_desktop_entry() { 758make_desktop_entry() {
835 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 759 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
836 760
837 local exec=${1} 761 local exec=${1}
863 dev) 787 dev)
864 type="Development" 788 type="Development"
865 ;; 789 ;;
866 790
867 games) 791 games)
868 [[ -z ${path} ]] && path=${GAMES_BINDIR}
869
870 case ${catmin} in 792 case ${catmin} in
871 action) type=ActionGame;; 793 action) type=ActionGame;;
872 arcade) type=ArcadeGame;; 794 arcade) type=ArcadeGame;;
873 board) type=BoardGame;; 795 board) type=BoardGame;;
874 kid) type=KidsGame;; 796 kid) type=KidsGame;;
939 *) 861 *)
940 type= 862 type=
941 ;; 863 ;;
942 esac 864 esac
943 fi 865 fi
944 866 if [ "${SLOT}" == "0" ] ; then
867 local desktop_name="${PN}"
868 else
869 local desktop_name="${PN}-${SLOT}"
870 fi
945 local desktop=${T}/${exec%% *}-${P}.desktop 871 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
946 872
947echo "[Desktop Entry] 873echo "[Desktop Entry]
948Encoding=UTF-8 874Encoding=UTF-8
949Version=0.9.2 875Version=0.9.2
950Name=${name} 876Name=${name}
953Exec=${exec} 879Exec=${exec}
954Path=${path} 880Path=${path}
955Icon=${icon} 881Icon=${icon}
956Categories=Application;${type};" > "${desktop}" 882Categories=Application;${type};" > "${desktop}"
957 883
884 (
885 # wrap the env here so that the 'insinto' call
886 # doesn't corrupt the env of the caller
958 insinto /usr/share/applications 887 insinto /usr/share/applications
959 doins "${desktop}" 888 doins "${desktop}"
960 889 )
961 return 0
962} 890}
963 891
964# Make a GDM/KDM Session file 892# Make a GDM/KDM Session file
965# 893#
966# make_desktop_entry(<title>, <command>) 894# make_desktop_entry(<title>, <command>)
995 doins "${i}" 923 doins "${i}"
996 elif [[ -d ${i} ]] ; then 924 elif [[ -d ${i} ]] ; then
997 for j in "${i}"/*.desktop ; do 925 for j in "${i}"/*.desktop ; do
998 doins "${j}" 926 doins "${j}"
999 done 927 done
1000 fi 928 fi
1001 done 929 done
1002} 930}
1003newmenu() { 931newmenu() {
1004 insinto /usr/share/applications 932 insinto /usr/share/applications
1005 newins "$1" "$2" 933 newins "$1" "$2"
1013 doins "${i}" 941 doins "${i}"
1014 elif [[ -d ${i} ]] ; then 942 elif [[ -d ${i} ]] ; then
1015 for j in "${i}"/*.png ; do 943 for j in "${i}"/*.png ; do
1016 doins "${j}" 944 doins "${j}"
1017 done 945 done
1018 fi 946 fi
1019 done 947 done
1020} 948}
1021newicon() { 949newicon() {
1022 insinto /usr/share/pixmaps 950 insinto /usr/share/pixmaps
1023 newins "$1" "$2" 951 newins "$1" "$2"
1028############################################################## 956##############################################################
1029 957
1030 958
1031# for internal use only (unpack_pdv and unpack_makeself) 959# for internal use only (unpack_pdv and unpack_makeself)
1032find_unpackable_file() { 960find_unpackable_file() {
1033 local src="$1" 961 local src=$1
1034 if [ -z "${src}" ] 962 if [[ -z ${src} ]] ; then
1035 then
1036 src="${DISTDIR}/${A}" 963 src=${DISTDIR}/${A}
1037 else 964 else
1038 if [ -e "${DISTDIR}/${src}" ] 965 if [[ -e ${DISTDIR}/${src} ]] ; then
1039 then
1040 src="${DISTDIR}/${src}" 966 src=${DISTDIR}/${src}
1041 elif [ -e "${PWD}/${src}" ] 967 elif [[ -e ${PWD}/${src} ]] ; then
1042 then
1043 src="${PWD}/${src}" 968 src=${PWD}/${src}
1044 elif [ -e "${src}" ] 969 elif [[ -e ${src} ]] ; then
1045 then
1046 src="${src}" 970 src=${src}
1047 fi
1048 fi 971 fi
1049 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 972 fi
973 [[ ! -e ${src} ]] && return 1
1050 echo "${src}" 974 echo "${src}"
1051} 975}
1052 976
1053# Unpack those pesky pdv generated files ... 977# Unpack those pesky pdv generated files ...
1054# They're self-unpacking programs with the binary package stuffed in 978# They're self-unpacking programs with the binary package stuffed in
1069# lseek 993# lseek
1070# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 994# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1071# lseek(3, -4, SEEK_END) = 2981250 995# lseek(3, -4, SEEK_END) = 2981250
1072# thus we would pass in the value of '4' as the second parameter. 996# thus we would pass in the value of '4' as the second parameter.
1073unpack_pdv() { 997unpack_pdv() {
1074 local src="`find_unpackable_file $1`" 998 local src=$(find_unpackable_file $1)
1075 local sizeoff_t="$2" 999 local sizeoff_t=$2
1076 1000
1001 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1077 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1002 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1078 1003
1079 local shrtsrc="`basename ${src}`" 1004 local shrtsrc="`basename ${src}`"
1080 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1005 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1081 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1006 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1082 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1007 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1148# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1073# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1149# - If the file is not specified then unpack will utilize ${A}. 1074# - If the file is not specified then unpack will utilize ${A}.
1150# - If the offset is not specified then we will attempt to extract 1075# - If the offset is not specified then we will attempt to extract
1151# the proper offset from the script itself. 1076# the proper offset from the script itself.
1152unpack_makeself() { 1077unpack_makeself() {
1153 local src="$(find_unpackable_file "$1")" 1078 local src=$(find_unpackable_file "$1")
1154 local skip="$2" 1079 local skip=$2
1155 local exe="$3" 1080 local exe=$3
1156 1081
1082 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1083
1157 local shrtsrc="$(basename "${src}")" 1084 local shrtsrc=$(basename "${src}")
1158 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1085 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1159 if [ -z "${skip}" ] 1086 if [ -z "${skip}" ]
1160 then 1087 then
1161 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1088 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1162 local skip=0 1089 local skip=0
1233check_license() { 1160check_license() {
1234 local lic=$1 1161 local lic=$1
1235 if [ -z "${lic}" ] ; then 1162 if [ -z "${lic}" ] ; then
1236 lic="${PORTDIR}/licenses/${LICENSE}" 1163 lic="${PORTDIR}/licenses/${LICENSE}"
1237 else 1164 else
1238 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1165 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1239 lic="${PORTDIR}/licenses/${src}" 1166 lic="${PORTDIR}/licenses/${lic}"
1240 elif [ -e "${PWD}/${src}" ] ; then 1167 elif [ -e "${PWD}/${lic}" ] ; then
1241 lic="${PWD}/${src}" 1168 lic="${PWD}/${lic}"
1242 elif [ -e "${src}" ] ; then 1169 elif [ -e "${lic}" ] ; then
1243 lic="${src}" 1170 lic="${lic}"
1244 fi
1245 fi 1171 fi
1172 fi
1246 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1173 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1247 local l="`basename ${lic}`" 1174 local l="`basename ${lic}`"
1248 1175
1249 # here is where we check for the licenses the user already 1176 # here is where we check for the licenses the user already
1250 # accepted ... if we don't find a match, we make the user accept 1177 # accepted ... if we don't find a match, we make the user accept
1251 local shopts=$- 1178 local shopts=$-
1422# displayed and we'll hang out here until: 1349# displayed and we'll hang out here until:
1423# (1) the file is found on a mounted cdrom 1350# (1) the file is found on a mounted cdrom
1424# (2) the user hits CTRL+C 1351# (2) the user hits CTRL+C
1425cdrom_locate_file_on_cd() { 1352cdrom_locate_file_on_cd() {
1426 while [[ -z ${CDROM_ROOT} ]] ; do 1353 while [[ -z ${CDROM_ROOT} ]] ; do
1427 local dir="$(dirname ${@})" 1354 local dir=$(dirname "$*")
1428 local file="$(basename ${@})" 1355 local file=$(basename "$*")
1429 local mline="" 1356 local mline=""
1430 local showedmsg=0 1357 local showedmsg=0
1431 1358
1432 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1359 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1433 [[ -d ${mline}/${dir} ]] || continue 1360 [[ -d ${mline}/${dir} ]] || continue
1454 fi 1381 fi
1455 showedmsg=1 1382 showedmsg=1
1456 fi 1383 fi
1457 einfo "Press return to scan for the cd again" 1384 einfo "Press return to scan for the cd again"
1458 einfo "or hit CTRL+C to abort the emerge." 1385 einfo "or hit CTRL+C to abort the emerge."
1386 echo
1387 einfo "If you are having trouble with the detection"
1388 einfo "of your CD, it is possible that you do not have"
1389 einfo "Joliet support enabled in your kernel. Please"
1390 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1459 read 1391 read
1460 fi 1392 fi
1461 done 1393 done
1462} 1394}
1463 1395
1527 while ((i--)) ; do 1459 while ((i--)) ; do
1528 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1460 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1529 done 1461 done
1530 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1462 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1531 case ${ARCH} in 1463 case ${ARCH} in
1532 x86) export ARCH="i386";; 1464 x86) export ARCH="i386";;
1533 amd64) export ARCH="x86_64";; 1465 amd64) export ARCH="x86_64";;
1534 hppa) export ARCH="parisc";; 1466 hppa) export ARCH="parisc";;
1535 mips) export ARCH="mips";; 1467 mips) export ARCH="mips";;
1536 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! 1468 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!
1537 *) export ARCH="${ARCH}";; 1469 *) export ARCH="${ARCH}";;
1538 esac 1470 esac
1539} 1471}
1540 1472
1541# set's ARCH back to what portage expects 1473# set's ARCH back to what portage expects
1542set_arch_to_portage() { 1474set_arch_to_portage() {
1586 LIB=$1 1518 LIB=$1
1587 1519
1588 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1520 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1589 SONAME=`basename ${LIB}` 1521 SONAME=`basename ${LIB}`
1590 1522
1591 einfo "An old version of an installed library was detected on your system." 1523 ewarn "An old version of an installed library was detected on your system."
1592 einfo "In order to avoid breaking packages that link against is, this older version" 1524 ewarn "In order to avoid breaking packages that link against it, this older version"
1593 einfo "is not being removed. In order to make full use of this newer version," 1525 ewarn "is not being removed. In order to make full use of this newer version,"
1594 einfo "you will need to execute the following command:" 1526 ewarn "you will need to execute the following command:"
1595 einfo " revdep-rebuild --soname ${SONAME}" 1527 ewarn " revdep-rebuild --soname ${SONAME}"
1596 einfo 1528 ewarn
1597 einfo "After doing that, you can safely remove ${LIB}" 1529 ewarn "After doing that, you can safely remove ${LIB}"
1598 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1530 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1599 fi 1531 fi
1600} 1532}
1601 1533
1602# Hack for people to figure out if a package was built with 1534# Hack for people to figure out if a package was built with
1603# certain USE flags 1535# certain USE flags
1676# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1608# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1677# $5 == path for wrapper 1609# $5 == path for wrapper
1678make_wrapper() { 1610make_wrapper() {
1679 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1611 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1680 local tmpwrapper=$(emktemp) 1612 local tmpwrapper=$(emktemp)
1613 # We don't want to quote ${bin} so that people can pass complex
1614 # things as $bin ... "./someprog --args"
1681 cat << EOF > "${tmpwrapper}" 1615 cat << EOF > "${tmpwrapper}"
1682#!/bin/sh 1616#!/bin/sh
1683cd "${chdir}" 1617cd "${chdir:-.}"
1618if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then
1684export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1619 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1620fi
1685exec ${bin} "\$@" 1621exec ${bin} "\$@"
1686EOF 1622EOF
1687 chmod go+rx "${tmpwrapper}" 1623 chmod go+rx "${tmpwrapper}"
1688 if [ -n "${5}" ] 1624 if [[ -n ${path} ]] ; then
1689 then
1690 exeinto ${5} 1625 exeinto "${path}"
1691 newexe "${tmpwrapper}" "${wrapper}" 1626 newexe "${tmpwrapper}" "${wrapper}"
1692 else 1627 else
1693 newbin "${tmpwrapper}" "${wrapper}" 1628 newbin "${tmpwrapper}" "${wrapper}"
1694 fi 1629 fi
1695} 1630}

Legend:
Removed from v.1.173  
changed lines
  Added in v.1.206

  ViewVC Help
Powered by ViewVC 1.1.20