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

Diff of /eclass/eutils.eclass

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

Revision 1.170 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.170 2005/05/06 04:14:17 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}"
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 return true if we are using the NPTL pthreads
373# implementation.
374#
375# <azarah@gentoo.org> (06 March 2003)
376#
377have_NPTL() {
378 cat > ${T}/test-nptl.c <<-"END"
379 #define _XOPEN_SOURCE
380 #include <unistd.h>
381 #include <stdio.h>
382
383 int main()
384 {
385 char buf[255];
386 char *str = buf;
387
388 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
389 if (NULL != str) {
390 printf("%s\n", str);
391 if (NULL != strstr(str, "NPTL"))
392 return 0;
393 }
394
395 return 1;
396 }
397 END
398
399 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
400 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
401 then
402 echo "yes"
403 einfon "Checking what PTHREADS implementation we have ..."
404 if ${T}/nptl
405 then
406 return 0
407 else
408 return 1
409 fi
410 else
411 echo "no"
412 fi
413
414 return 1
415}
416
417# This function check how many cpu's are present, and then set
418# -j in MAKEOPTS accordingly.
419#
420# Thanks to nall <nall@gentoo.org> for this.
421#
422get_number_of_jobs() {
423 local jobs=0
424
425 if [ ! -r /proc/cpuinfo ]
426 then
427 return 1
428 fi
429
430 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
431 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
432 then
433 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
434 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
435 ADMINPARAM="${ADMINPARAM/-j}"
436 fi
437
438 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
439
440 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
441 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
442 then
443 # these archs will always have "[Pp]rocessor"
444 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
445
446 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
447 then
448 # sparc always has "ncpus active"
449 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
450
451 elif [ "${ARCH}" = "alpha" ]
452 then
453 # alpha has "cpus active", but only when compiled with SMP
454 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
455 then
456 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
457 else
458 jobs=2
459 fi
460
461 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
462 then
463 # ppc has "processor", but only when compiled with SMP
464 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
465 then
466 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
467 else
468 jobs=2
469 fi
470 elif [ "${ARCH}" = "s390" ]
471 then
472 # s390 has "# processors : "
473 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
474 else
475 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
476 die "Unknown ARCH -- ${ARCH}!"
477 fi
478
479 # Make sure the number is valid ...
480 if [ "${jobs}" -lt 1 ]
481 then
482 jobs=1
483 fi
484
485 if [ -n "${ADMINPARAM}" ]
486 then
487 if [ "${jobs}" -gt "${ADMINPARAM}" ]
488 then
489 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
490 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
491 else
492 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
493 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
494 fi
495 fi
496}
497
498# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
499# does not exist on the users system 376# does not exist on the users system
500# vapier@gentoo.org 377# vapier@gentoo.org
501# 378#
502# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
503emktemp() { 380emktemp() {
504 local exe="touch" 381 local exe="touch"
505 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
506 local topdir="$1" 383 local topdir=$1
507 384
508 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
509 then
510 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
511 && topdir="/tmp" \ 387 && topdir="/tmp" \
512 || topdir="${T}" 388 || topdir=${T}
513 fi 389 fi
514 390
515 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
516 then
517 local tmp=/ 392 local tmp=/
518 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
519 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
520 done 395 done
521 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
522 echo "${tmp}" 397 echo "${tmp}"
523 else 398 else
524 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
525 && exe="-p" \ 400 && exe="-p" \
526 || exe="-d" 401 || exe="-d"
527 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
528 fi 403 fi
529} 404}
533# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
534# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
535# 410#
536# egetent(database, key) 411# egetent(database, key)
537egetent() { 412egetent() {
538 if useq ppc-macos ; then 413 case ${CHOST} in
414 *-darwin*)
539 case "$2" in 415 case "$2" in
540 *[!0-9]*) # Non numeric 416 *[!0-9]*) # Non numeric
541 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
542 ;; 418 ;;
543 *) # Numeric 419 *) # Numeric
544 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
545 ;; 421 ;;
546 esac 422 esac
547 elif useq x86-fbsd ; then 423 ;;
548 local action 424 *-freebsd*)
549 if [ "$1" == "passwd" ] 425 local opts action="user"
550 then 426 [[ $1 == "passwd" ]] || action="group"
551 action="user" 427
552 else 428 # lookup by uid/gid
553 action="group" 429 if [[ $2 == [[:digit:]]* ]] ; then
430 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
554 fi 431 fi
432
555 pw show "${action}" "$2" -q 433 pw show ${action} ${opts} "$2" -q
556 else 434 ;;
435 *-netbsd*)
436 grep "$2:\*:" /etc/$1
437 ;;
438 *)
557 which nscd >& /dev/null && nscd -i "$1" 439 type -p nscd >& /dev/null && nscd -i "$1"
558 getent "$1" "$2" 440 getent "$1" "$2"
559 fi 441 ;;
442 esac
560} 443}
561 444
562# Simplify/standardize adding users to the system 445# Simplify/standardize adding users to the system
563# vapier@gentoo.org 446# vapier@gentoo.org
564# 447#
572# homedir: /dev/null 455# homedir: /dev/null
573# groups: none 456# groups: none
574# extra: comment of 'added by portage for ${PN}' 457# extra: comment of 'added by portage for ${PN}'
575enewuser() { 458enewuser() {
576 # get the username 459 # get the username
577 local euser="$1"; shift 460 local euser=$1; shift
578 if [ -z "${euser}" ] 461 if [[ -z ${euser} ]] ; then
579 then
580 eerror "No username specified !" 462 eerror "No username specified !"
581 die "Cannot call enewuser without a username" 463 die "Cannot call enewuser without a username"
582 fi 464 fi
583 465
584 # lets see if the username already exists 466 # lets see if the username already exists
585 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 467 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
586 then
587 return 0 468 return 0
588 fi 469 fi
589 einfo "Adding user '${euser}' to your system ..." 470 einfo "Adding user '${euser}' to your system ..."
590 471
591 # options to pass to useradd 472 # options to pass to useradd
592 local opts= 473 local opts=
593 474
594 # handle uid 475 # handle uid
595 local euid="$1"; shift 476 local euid=$1; shift
596 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 477 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
597 then
598 if [ "${euid}" -gt 0 ] 478 if [[ ${euid} -gt 0 ]] ; then
599 then
600 if [ ! -z "`egetent passwd ${euid}`" ] 479 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
601 then
602 euid="next" 480 euid="next"
603 fi 481 fi
604 else 482 else
605 eerror "Userid given but is not greater than 0 !" 483 eerror "Userid given but is not greater than 0 !"
606 die "${euid} is not a valid UID" 484 die "${euid} is not a valid UID"
607 fi 485 fi
608 else 486 else
609 euid="next" 487 euid="next"
610 fi 488 fi
611 if [ "${euid}" == "next" ] 489 if [[ ${euid} == "next" ]] ; then
612 then 490 for euid in $(seq 101 999) ; do
613 local pwrange
614 if [ "${USERLAND}" == "BSD" ] ; then
615 pwrange="`jot 898 101`"
616 else
617 pwrange="`seq 101 999`"
618 fi
619 for euid in ${pwrange} ; do
620 [ -z "`egetent passwd ${euid}`" ] && break 491 [[ -z $(egetent passwd ${euid}) ]] && break
621 done 492 done
622 fi 493 fi
623 opts="${opts} -u ${euid}" 494 opts="${opts} -u ${euid}"
624 einfo " - Userid: ${euid}" 495 einfo " - Userid: ${euid}"
625 496
626 # handle shell 497 # handle shell
627 local eshell="$1"; shift 498 local eshell=$1; shift
628 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
629 then
630 if [ ! -e "${eshell}" ] 500 if [[ ! -e ${eshell} ]] ; then
631 then
632 eerror "A shell was specified but it does not exist !" 501 eerror "A shell was specified but it does not exist !"
633 die "${eshell} does not exist" 502 die "${eshell} does not exist"
634 fi 503 fi
635 else 504 else
636 if [ "${USERLAND}" == "BSD" ] 505 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
637 then 506 [[ -x ${ROOT}${shell} ]] && break
638 eshell="/usr/bin/false" 507 done
639 else 508
640 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"
641 fi 512 fi
513
514 eshell=${shell}
642 fi 515 fi
643 einfo " - Shell: ${eshell}" 516 einfo " - Shell: ${eshell}"
644 opts="${opts} -s ${eshell}" 517 opts="${opts} -s ${eshell}"
645 518
646 # handle homedir 519 # handle homedir
647 local ehome="$1"; shift 520 local ehome=$1; shift
648 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 521 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
649 then
650 ehome="/dev/null" 522 ehome="/dev/null"
651 fi 523 fi
652 einfo " - Home: ${ehome}" 524 einfo " - Home: ${ehome}"
653 opts="${opts} -d ${ehome}" 525 opts="${opts} -d ${ehome}"
654 526
655 # handle groups 527 # handle groups
656 local egroups="$1"; shift 528 local egroups=$1; shift
657 if [ ! -z "${egroups}" ] 529 if [[ ! -z ${egroups} ]] ; then
658 then
659 local oldifs="${IFS}" 530 local oldifs=${IFS}
660 local defgroup="" exgroups="" 531 local defgroup="" exgroups=""
661 532
662 export IFS="," 533 export IFS=","
663 for g in ${egroups} 534 for g in ${egroups} ; do
664 do
665 export IFS="${oldifs}" 535 export IFS=${oldifs}
666 if [ -z "`egetent group \"${g}\"`" ] 536 if [[ -z $(egetent group "${g}") ]] ; then
667 then
668 eerror "You must add group ${g} to the system first" 537 eerror "You must add group ${g} to the system first"
669 die "${g} is not a valid GID" 538 die "${g} is not a valid GID"
670 fi 539 fi
671 if [ -z "${defgroup}" ] 540 if [[ -z ${defgroup} ]] ; then
672 then
673 defgroup="${g}" 541 defgroup=${g}
674 else 542 else
675 exgroups="${exgroups},${g}" 543 exgroups="${exgroups},${g}"
676 fi 544 fi
677 export IFS="," 545 export IFS=","
678 done 546 done
679 export IFS="${oldifs}" 547 export IFS=${oldifs}
680 548
681 opts="${opts} -g ${defgroup}" 549 opts="${opts} -g ${defgroup}"
682 if [ ! -z "${exgroups}" ] 550 if [[ ! -z ${exgroups} ]] ; then
683 then
684 opts="${opts} -G ${exgroups:1}" 551 opts="${opts} -G ${exgroups:1}"
685 fi 552 fi
686 else 553 else
687 egroups="(none)" 554 egroups="(none)"
688 fi 555 fi
689 einfo " - Groups: ${egroups}" 556 einfo " - Groups: ${egroups}"
690 557
691 # handle extra and add the user 558 # handle extra and add the user
692 local eextra="$@"
693 local oldsandbox="${SANDBOX_ON}" 559 local oldsandbox=${SANDBOX_ON}
694 export SANDBOX_ON="0" 560 export SANDBOX_ON="0"
695 if useq ppc-macos 561 case ${CHOST} in
696 then 562 *-darwin*)
697 ### Make the user 563 ### Make the user
698 if [ -z "${eextra}" ] 564 if [[ -z $@ ]] ; then
699 then
700 dscl . create /users/${euser} uid ${euid} 565 dscl . create /users/${euser} uid ${euid}
701 dscl . create /users/${euser} shell ${eshell} 566 dscl . create /users/${euser} shell ${eshell}
702 dscl . create /users/${euser} home ${ehome} 567 dscl . create /users/${euser} home ${ehome}
703 dscl . create /users/${euser} realname "added by portage for ${PN}" 568 dscl . create /users/${euser} realname "added by portage for ${PN}"
704 ### Add the user to the groups specified 569 ### Add the user to the groups specified
705 local oldifs="${IFS}" 570 local oldifs=${IFS}
706 export IFS="," 571 export IFS=","
707 for g in ${egroups} 572 for g in ${egroups} ; do
708 do
709 dscl . merge /groups/${g} users ${euser} 573 dscl . merge /groups/${g} users ${euser}
710 done 574 done
711 export IFS="${oldifs}" 575 export IFS=${oldifs}
712 else 576 else
713 einfo "Extra options are not supported on macos yet" 577 einfo "Extra options are not supported on Darwin yet"
714 einfo "Please report the ebuild along with the info below" 578 einfo "Please report the ebuild along with the info below"
715 einfo "eextra: ${eextra}" 579 einfo "eextra: $@"
716 die "Required function missing" 580 die "Required function missing"
717 fi 581 fi
718 elif use x86-fbsd ; then 582 ;;
719 if [ -z "${eextra}" ] 583 *-freebsd*)
720 then 584 if [[ -z $@ ]] ; then
721 pw useradd ${euser} ${opts} \ 585 pw useradd ${euser} ${opts} \
722 -c "added by portage for ${PN}" \ 586 -c "added by portage for ${PN}" \
723 die "enewuser failed" 587 die "enewuser failed"
724 else 588 else
725 einfo " - Extra: ${eextra}" 589 einfo " - Extra: $@"
726 pw useradd ${euser} ${opts} \ 590 pw useradd ${euser} ${opts} \
727 -c ${eextra} || die "enewuser failed" 591 "$@" || die "enewuser failed"
728 fi 592 fi
729 else 593 ;;
730 if [ -z "${eextra}" ] 594 *)
731 then 595 if [[ -z $@ ]] ; then
732 useradd ${opts} ${euser} \ 596 useradd ${opts} ${euser} \
733 -c "added by portage for ${PN}" \ 597 -c "added by portage for ${PN}" \
734 || die "enewuser failed" 598 || die "enewuser failed"
735 else 599 else
736 einfo " - Extra: ${eextra}" 600 einfo " - Extra: $@"
737 useradd ${opts} ${euser} ${eextra} \ 601 useradd ${opts} ${euser} "$@" \
738 || die "enewuser failed" 602 || die "enewuser failed"
739 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}"
740 fi 612 fi
613
741 export SANDBOX_ON="${oldsandbox}" 614 export SANDBOX_ON=${oldsandbox}
742
743 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
744 then
745 einfo " - Creating ${ehome} in ${D}"
746 dodir ${ehome}
747 fowners ${euser} ${ehome}
748 fperms 755 ${ehome}
749 fi
750} 615}
751 616
752# Simplify/standardize adding groups to the system 617# Simplify/standardize adding groups to the system
753# vapier@gentoo.org 618# vapier@gentoo.org
754# 619#
783 then 648 then
784 if [ "${egid}" -gt 0 ] 649 if [ "${egid}" -gt 0 ]
785 then 650 then
786 if [ -z "`egetent group ${egid}`" ] 651 if [ -z "`egetent group ${egid}`" ]
787 then 652 then
788 if useq ppc-macos ; then 653 if [[ "${CHOST}" == *-darwin* ]]; then
789 opts="${opts} ${egid}" 654 opts="${opts} ${egid}"
790 else 655 else
791 opts="${opts} -g ${egid}" 656 opts="${opts} -g ${egid}"
792 fi 657 fi
793 else 658 else
807 opts="${opts} ${eextra}" 672 opts="${opts} ${eextra}"
808 673
809 # add the group 674 # add the group
810 local oldsandbox="${SANDBOX_ON}" 675 local oldsandbox="${SANDBOX_ON}"
811 export SANDBOX_ON="0" 676 export SANDBOX_ON="0"
812 if useq ppc-macos ; then 677 case ${CHOST} in
678 *-darwin*)
813 if [ ! -z "${eextra}" ]; 679 if [ ! -z "${eextra}" ];
814 then 680 then
815 einfo "Extra options are not supported on macos yet" 681 einfo "Extra options are not supported on Darwin/OS X yet"
816 einfo "Please report the ebuild along with the info below" 682 einfo "Please report the ebuild along with the info below"
817 einfo "eextra: ${eextra}" 683 einfo "eextra: ${eextra}"
818 die "Required function missing" 684 die "Required function missing"
819 fi 685 fi
820 686
821 # If we need the next available 687 # If we need the next available
822 case ${egid} in 688 case ${egid} in
823 *[!0-9]*) # Non numeric 689 *[!0-9]*) # Non numeric
824 for egid in `jot 898 101`; do 690 for egid in $(seq 101 999); do
825 [ -z "`egetent group ${egid}`" ] && break 691 [ -z "`egetent group ${egid}`" ] && break
826 done 692 done
827 esac 693 esac
828 dscl . create /groups/${egroup} gid ${egid} 694 dscl . create /groups/${egroup} gid ${egid}
829 dscl . create /groups/${egroup} passwd '*' 695 dscl . create /groups/${egroup} passwd '*'
830 elif use x86-fbsd ; then 696 ;;
697
698 *-freebsd*)
831 case ${egid} in 699 case ${egid} in
832 *[!0-9]*) # Non numeric 700 *[!0-9]*) # Non numeric
833 for egid in `jot 898 101`; do 701 for egid in $(seq 101 999); do
834 [ -z "`egetent group ${egid}`" ] && break 702 [ -z "`egetent group ${egid}`" ] && break
835 done 703 done
836 esac 704 esac
837 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 705 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
838 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 *)
839 groupadd ${opts} ${egroup} || die "enewgroup failed" 719 groupadd ${opts} ${egroup} || die "enewgroup failed"
840 fi 720 ;;
721 esac
841 export SANDBOX_ON="${oldsandbox}" 722 export SANDBOX_ON="${oldsandbox}"
842} 723}
843 724
844# Simple script to replace 'dos2unix' binaries 725# Simple script to replace 'dos2unix' binaries
845# vapier@gentoo.org 726# vapier@gentoo.org
870# name: the name that will show up in the menu 751# name: the name that will show up in the menu
871# icon: give your little like a pretty little icon ... 752# icon: give your little like a pretty little icon ...
872# this can be relative (to /usr/share/pixmaps) or 753# this can be relative (to /usr/share/pixmaps) or
873# a full path to an icon 754# a full path to an icon
874# type: what kind of application is this ? for categories: 755# type: what kind of application is this ? for categories:
875# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 756# http://www.freedesktop.org/Standards/desktop-entry-spec
876# path: if your app needs to startup in a specific dir 757# path: if your app needs to startup in a specific dir
877make_desktop_entry() { 758make_desktop_entry() {
878 [[ -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
879 760
880 local exec=${1} 761 local exec=${1}
906 dev) 787 dev)
907 type="Development" 788 type="Development"
908 ;; 789 ;;
909 790
910 games) 791 games)
911 [[ -z ${path} ]] && path=${GAMES_BINDIR}
912
913 case ${catmin} in 792 case ${catmin} in
914 action) type=ActionGame;; 793 action) type=ActionGame;;
915 arcade) type=ArcadeGame;; 794 arcade) type=ArcadeGame;;
916 board) type=BoardGame;; 795 board) type=BoardGame;;
917 kid) type=KidsGame;; 796 kid) type=KidsGame;;
982 *) 861 *)
983 type= 862 type=
984 ;; 863 ;;
985 esac 864 esac
986 fi 865 fi
987 866 if [ "${SLOT}" == "0" ] ; then
867 local desktop_name="${PN}"
868 else
869 local desktop_name="${PN}-${SLOT}"
870 fi
988 local desktop=${T}/${exec%% *}-${P}.desktop 871 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
989 872
990echo "[Desktop Entry] 873echo "[Desktop Entry]
991Encoding=UTF-8 874Encoding=UTF-8
992Version=0.9.2 875Version=0.9.2
993Name=${name} 876Name=${name}
996Exec=${exec} 879Exec=${exec}
997Path=${path} 880Path=${path}
998Icon=${icon} 881Icon=${icon}
999Categories=Application;${type};" > "${desktop}" 882Categories=Application;${type};" > "${desktop}"
1000 883
884 (
885 # wrap the env here so that the 'insinto' call
886 # doesn't corrupt the env of the caller
1001 insinto /usr/share/applications 887 insinto /usr/share/applications
1002 doins "${desktop}" 888 doins "${desktop}"
1003 889 )
1004 return 0
1005} 890}
1006 891
1007# Make a GDM/KDM Session file 892# Make a GDM/KDM Session file
1008# 893#
1009# make_desktop_entry(<title>, <command>) 894# make_desktop_entry(<title>, <command>)
1038 doins "${i}" 923 doins "${i}"
1039 elif [[ -d ${i} ]] ; then 924 elif [[ -d ${i} ]] ; then
1040 for j in "${i}"/*.desktop ; do 925 for j in "${i}"/*.desktop ; do
1041 doins "${j}" 926 doins "${j}"
1042 done 927 done
1043 fi 928 fi
1044 done 929 done
1045} 930}
1046newmenu() { 931newmenu() {
1047 insinto /usr/share/applications 932 insinto /usr/share/applications
1048 newins "$1" "$2" 933 newins "$1" "$2"
1056 doins "${i}" 941 doins "${i}"
1057 elif [[ -d ${i} ]] ; then 942 elif [[ -d ${i} ]] ; then
1058 for j in "${i}"/*.png ; do 943 for j in "${i}"/*.png ; do
1059 doins "${j}" 944 doins "${j}"
1060 done 945 done
1061 fi 946 fi
1062 done 947 done
1063} 948}
1064newicon() { 949newicon() {
1065 insinto /usr/share/pixmaps 950 insinto /usr/share/pixmaps
1066 newins "$1" "$2" 951 newins "$1" "$2"
1071############################################################## 956##############################################################
1072 957
1073 958
1074# for internal use only (unpack_pdv and unpack_makeself) 959# for internal use only (unpack_pdv and unpack_makeself)
1075find_unpackable_file() { 960find_unpackable_file() {
1076 local src="$1" 961 local src=$1
1077 if [ -z "${src}" ] 962 if [[ -z ${src} ]] ; then
1078 then
1079 src="${DISTDIR}/${A}" 963 src=${DISTDIR}/${A}
1080 else 964 else
1081 if [ -e "${DISTDIR}/${src}" ] 965 if [[ -e ${DISTDIR}/${src} ]] ; then
1082 then
1083 src="${DISTDIR}/${src}" 966 src=${DISTDIR}/${src}
1084 elif [ -e "${PWD}/${src}" ] 967 elif [[ -e ${PWD}/${src} ]] ; then
1085 then
1086 src="${PWD}/${src}" 968 src=${PWD}/${src}
1087 elif [ -e "${src}" ] 969 elif [[ -e ${src} ]] ; then
1088 then
1089 src="${src}" 970 src=${src}
1090 fi
1091 fi 971 fi
1092 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 972 fi
973 [[ ! -e ${src} ]] && return 1
1093 echo "${src}" 974 echo "${src}"
1094} 975}
1095 976
1096# Unpack those pesky pdv generated files ... 977# Unpack those pesky pdv generated files ...
1097# They're self-unpacking programs with the binary package stuffed in 978# They're self-unpacking programs with the binary package stuffed in
1112# lseek 993# lseek
1113# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 994# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1114# lseek(3, -4, SEEK_END) = 2981250 995# lseek(3, -4, SEEK_END) = 2981250
1115# 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.
1116unpack_pdv() { 997unpack_pdv() {
1117 local src="`find_unpackable_file $1`" 998 local src=$(find_unpackable_file $1)
1118 local sizeoff_t="$2" 999 local sizeoff_t=$2
1119 1000
1001 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1120 [ -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 :("
1121 1003
1122 local shrtsrc="`basename ${src}`" 1004 local shrtsrc="`basename ${src}`"
1123 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1005 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1124 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1006 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1125 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\"`
1191# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1073# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1192# - If the file is not specified then unpack will utilize ${A}. 1074# - If the file is not specified then unpack will utilize ${A}.
1193# - 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
1194# the proper offset from the script itself. 1076# the proper offset from the script itself.
1195unpack_makeself() { 1077unpack_makeself() {
1196 local src="$(find_unpackable_file "$1")" 1078 local src=$(find_unpackable_file "$1")
1197 local skip="$2" 1079 local skip=$2
1198 local exe="$3" 1080 local exe=$3
1199 1081
1082 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1083
1200 local shrtsrc="$(basename "${src}")" 1084 local shrtsrc=$(basename "${src}")
1201 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1085 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1202 if [ -z "${skip}" ] 1086 if [ -z "${skip}" ]
1203 then 1087 then
1204 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1088 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1205 local skip=0 1089 local skip=0
1276check_license() { 1160check_license() {
1277 local lic=$1 1161 local lic=$1
1278 if [ -z "${lic}" ] ; then 1162 if [ -z "${lic}" ] ; then
1279 lic="${PORTDIR}/licenses/${LICENSE}" 1163 lic="${PORTDIR}/licenses/${LICENSE}"
1280 else 1164 else
1281 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1165 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1282 lic="${PORTDIR}/licenses/${src}" 1166 lic="${PORTDIR}/licenses/${lic}"
1283 elif [ -e "${PWD}/${src}" ] ; then 1167 elif [ -e "${PWD}/${lic}" ] ; then
1284 lic="${PWD}/${src}" 1168 lic="${PWD}/${lic}"
1285 elif [ -e "${src}" ] ; then 1169 elif [ -e "${lic}" ] ; then
1286 lic="${src}" 1170 lic="${lic}"
1287 fi
1288 fi 1171 fi
1172 fi
1289 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1173 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1290 local l="`basename ${lic}`" 1174 local l="`basename ${lic}`"
1291 1175
1292 # here is where we check for the licenses the user already 1176 # here is where we check for the licenses the user already
1293 # 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
1294 local shopts=$- 1178 local shopts=$-
1465# displayed and we'll hang out here until: 1349# displayed and we'll hang out here until:
1466# (1) the file is found on a mounted cdrom 1350# (1) the file is found on a mounted cdrom
1467# (2) the user hits CTRL+C 1351# (2) the user hits CTRL+C
1468cdrom_locate_file_on_cd() { 1352cdrom_locate_file_on_cd() {
1469 while [[ -z ${CDROM_ROOT} ]] ; do 1353 while [[ -z ${CDROM_ROOT} ]] ; do
1470 local dir="$(dirname ${@})" 1354 local dir=$(dirname "$*")
1471 local file="$(basename ${@})" 1355 local file=$(basename "$*")
1472 local mline="" 1356 local mline=""
1473 local showedmsg=0 1357 local showedmsg=0
1474 1358
1475 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
1476 [[ -d ${mline}/${dir} ]] || continue 1360 [[ -d ${mline}/${dir} ]] || continue
1497 fi 1381 fi
1498 showedmsg=1 1382 showedmsg=1
1499 fi 1383 fi
1500 einfo "Press return to scan for the cd again" 1384 einfo "Press return to scan for the cd again"
1501 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."
1502 read 1391 read
1503 fi 1392 fi
1504 done 1393 done
1505} 1394}
1506 1395
1570 while ((i--)) ; do 1459 while ((i--)) ; do
1571 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1460 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1572 done 1461 done
1573 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1462 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1574 case ${ARCH} in 1463 case ${ARCH} in
1575 x86) export ARCH="i386";; 1464 x86) export ARCH="i386";;
1576 amd64) export ARCH="x86_64";; 1465 amd64) export ARCH="x86_64";;
1577 hppa) export ARCH="parisc";; 1466 hppa) export ARCH="parisc";;
1578 mips) export ARCH="mips";; 1467 mips) export ARCH="mips";;
1579 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!
1580 *) export ARCH="${ARCH}";; 1469 *) export ARCH="${ARCH}";;
1581 esac 1470 esac
1582} 1471}
1583 1472
1584# set's ARCH back to what portage expects 1473# set's ARCH back to what portage expects
1585set_arch_to_portage() { 1474set_arch_to_portage() {
1629 LIB=$1 1518 LIB=$1
1630 1519
1631 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1520 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1632 SONAME=`basename ${LIB}` 1521 SONAME=`basename ${LIB}`
1633 1522
1634 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."
1635 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"
1636 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,"
1637 einfo "you will need to execute the following command:" 1526 ewarn "you will need to execute the following command:"
1638 einfo " revdep-rebuild --soname ${SONAME}" 1527 ewarn " revdep-rebuild --soname ${SONAME}"
1639 einfo 1528 ewarn
1640 einfo "After doing that, you can safely remove ${LIB}" 1529 ewarn "After doing that, you can safely remove ${LIB}"
1641 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1530 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1642 fi 1531 fi
1643} 1532}
1644 1533
1645# 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
1646# certain USE flags 1535# certain USE flags
1692dopamd() { 1581dopamd() {
1693 [[ -z $1 ]] && die "dopamd requires at least one argument" 1582 [[ -z $1 ]] && die "dopamd requires at least one argument"
1694 1583
1695 use pam || return 0 1584 use pam || return 0
1696 1585
1697 insinto /etc/pam.d 1586 INSDESTTREE=/etc/pam.d \
1698 doins "$@" || die "failed to install $@" 1587 doins "$@" || die "failed to install $@"
1699} 1588}
1700# newpamd <old name> <new name> 1589# newpamd <old name> <new name>
1701# 1590#
1702# Install pam file <old name> as <new name> in /etc/pam.d 1591# Install pam file <old name> as <new name> in /etc/pam.d
1703newpamd() { 1592newpamd() {
1704 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1593 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1705 1594
1706 use pam || return 0 1595 use pam || return 0
1707 1596
1708 insinto /etc/pam.d 1597 INSDESTTREE=/etc/pam.d \
1709 newins "$1" "$2" || die "failed to install $1 as $2" 1598 newins "$1" "$2" || die "failed to install $1 as $2"
1710} 1599}
1711 1600
1712# make a wrapper script ... 1601# make a wrapper script ...
1713# NOTE: this was originally games_make_wrapper, but I noticed other places where 1602# NOTE: this was originally games_make_wrapper, but I noticed other places where
1719# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1608# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1720# $5 == path for wrapper 1609# $5 == path for wrapper
1721make_wrapper() { 1610make_wrapper() {
1722 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1611 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1723 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"
1724 cat << EOF > "${tmpwrapper}" 1615 cat << EOF > "${tmpwrapper}"
1725#!/bin/sh 1616#!/bin/sh
1726cd "${chdir}" 1617cd "${chdir:-.}"
1618if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then
1727export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1619 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1620fi
1728exec ${bin} "\$@" 1621exec ${bin} "\$@"
1729EOF 1622EOF
1730 chmod go+rx "${tmpwrapper}" 1623 chmod go+rx "${tmpwrapper}"
1731 if [ -n "${5}" ] 1624 if [[ -n ${path} ]] ; then
1732 then
1733 exeinto ${5} 1625 exeinto "${path}"
1734 newexe "${tmpwrapper}" "${wrapper}" 1626 newexe "${tmpwrapper}" "${wrapper}"
1735 else 1627 else
1736 newbin "${tmpwrapper}" "${wrapper}" 1628 newbin "${tmpwrapper}" "${wrapper}"
1737 fi 1629 fi
1738} 1630}

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

  ViewVC Help
Powered by ViewVC 1.1.20