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

Diff of /eclass/eutils.eclass

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

Revision 1.174 Revision 1.212
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.174 2005/05/24 05:10:19 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.212 2005/10/22 02:32:48 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 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}"
167# hand its a directory, it will set EPATCH_SOURCE to this. 166# hand its a directory, it will set EPATCH_SOURCE to this.
168# 167#
169# <azarah@gentoo.org> (10 Nov 2002) 168# <azarah@gentoo.org> (10 Nov 2002)
170# 169#
171epatch() { 170epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 172 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 173 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 174 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 175 local PATCH_SUFFIX=""
176 local SINGLE_PATCH="no" 176 local SINGLE_PATCH="no"
177 local x="" 177 local x=""
178
179 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
178 180
179 if [ "$#" -gt 1 ] 181 if [ "$#" -gt 1 ]
180 then 182 then
181 local m="" 183 local m=""
182 for m in "$@" ; do 184 for m in "$@" ; do
249 # New ARCH dependant patch naming scheme ... 251 # New ARCH dependant patch naming scheme ...
250 # 252 #
251 # ???_arch_foo.patch 253 # ???_arch_foo.patch
252 # 254 #
253 if [ -f ${x} ] && \ 255 if [ -f ${x} ] && \
254 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 256 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
255 [ "${EPATCH_FORCE}" = "yes" ]) 257 [ "${EPATCH_FORCE}" = "yes" ])
256 then 258 then
257 local count=0 259 local count=0
258 local popts="${EPATCH_OPTS}" 260 local popts="${EPATCH_OPTS}"
259 local patchname=${x##*/} 261 local patchname=${x##*/}
312 count=5 314 count=5
313 break 315 break
314 fi 316 fi
315 fi 317 fi
316 318
317 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
318 then 320 then
319 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 326
325 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert
326 329
327 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
328 then 331 then
329 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 332 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 echo 333 echo
376# vapier@gentoo.org 379# vapier@gentoo.org
377# 380#
378# Takes just 1 optional parameter (the directory to create tmpfile in) 381# Takes just 1 optional parameter (the directory to create tmpfile in)
379emktemp() { 382emktemp() {
380 local exe="touch" 383 local exe="touch"
381 [ "$1" == "-d" ] && exe="mkdir" && shift 384 [[ $1 == -d ]] && exe="mkdir" && shift
382 local topdir="$1" 385 local topdir=$1
383 386
384 if [ -z "${topdir}" ] 387 if [[ -z ${topdir} ]] ; then
385 then
386 [ -z "${T}" ] \ 388 [[ -z ${T} ]] \
387 && topdir="/tmp" \ 389 && topdir="/tmp" \
388 || topdir="${T}" 390 || topdir=${T}
389 fi 391 fi
390 392
391 if [ -z "$(type -p mktemp)" ] 393 if [[ -z $(type -p mktemp) ]] ; then
392 then
393 local tmp=/ 394 local tmp=/
394 while [ -e "${tmp}" ] ; do 395 while [[ -e ${tmp} ]] ; do
395 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
396 done 397 done
397 ${exe} "${tmp}" 398 ${exe} "${tmp}" || ${exe} -p "${tmp}"
398 echo "${tmp}" 399 echo "${tmp}"
399 else 400 else
400 [ "${exe}" == "touch" ] \ 401 [[ ${exe} == "touch" ]] \
401 && exe="-p" \ 402 && exe="-p" \
402 || exe="-d" 403 || exe="-d"
403 mktemp ${exe} "${topdir}" 404 mktemp ${exe} "${topdir}"
404 fi 405 fi
405} 406}
409# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
410# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
411# 412#
412# egetent(database, key) 413# egetent(database, key)
413egetent() { 414egetent() {
414 if useq ppc-macos ; then 415 case ${CHOST} in
416 *-darwin*)
415 case "$2" in 417 case "$2" in
416 *[!0-9]*) # Non numeric 418 *[!0-9]*) # Non numeric
417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
418 ;; 420 ;;
419 *) # Numeric 421 *) # Numeric
420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
421 ;; 423 ;;
422 esac 424 esac
423 elif useq x86-fbsd ; then 425 ;;
424 local action 426 *-freebsd*)
425 if [ "$1" == "passwd" ] 427 local opts action="user"
426 then 428 [[ $1 == "passwd" ]] || action="group"
427 action="user" 429
428 else 430 # lookup by uid/gid
429 action="group" 431 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
430 fi 433 fi
434
431 pw show "${action}" "$2" -q 435 pw show ${action} ${opts} "$2" -q
432 else 436 ;;
437 *-netbsd*)
438 grep "$2:\*:" /etc/$1
439 ;;
440 *)
433 which nscd >& /dev/null && nscd -i "$1" 441 type -p nscd >& /dev/null && nscd -i "$1"
434 getent "$1" "$2" 442 getent "$1" "$2"
435 fi 443 ;;
444 esac
436} 445}
437 446
438# Simplify/standardize adding users to the system 447# Simplify/standardize adding users to the system
439# vapier@gentoo.org 448# vapier@gentoo.org
440# 449#
448# homedir: /dev/null 457# homedir: /dev/null
449# groups: none 458# groups: none
450# extra: comment of 'added by portage for ${PN}' 459# extra: comment of 'added by portage for ${PN}'
451enewuser() { 460enewuser() {
452 # get the username 461 # get the username
453 local euser="$1"; shift 462 local euser=$1; shift
454 if [ -z "${euser}" ] 463 if [[ -z ${euser} ]] ; then
455 then
456 eerror "No username specified !" 464 eerror "No username specified !"
457 die "Cannot call enewuser without a username" 465 die "Cannot call enewuser without a username"
458 fi 466 fi
459 467
460 # lets see if the username already exists 468 # lets see if the username already exists
461 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
462 then
463 return 0 470 return 0
464 fi 471 fi
465 einfo "Adding user '${euser}' to your system ..." 472 einfo "Adding user '${euser}' to your system ..."
466 473
467 # options to pass to useradd 474 # options to pass to useradd
468 local opts= 475 local opts=
469 476
470 # handle uid 477 # handle uid
471 local euid="$1"; shift 478 local euid=$1; shift
472 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
473 then
474 if [ "${euid}" -gt 0 ] 480 if [[ ${euid} -gt 0 ]] ; then
475 then
476 if [ ! -z "`egetent passwd ${euid}`" ] 481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
477 then
478 euid="next" 482 euid="next"
479 fi 483 fi
480 else 484 else
481 eerror "Userid given but is not greater than 0 !" 485 eerror "Userid given but is not greater than 0 !"
482 die "${euid} is not a valid UID" 486 die "${euid} is not a valid UID"
483 fi 487 fi
484 else 488 else
485 euid="next" 489 euid="next"
486 fi 490 fi
487 if [ "${euid}" == "next" ] 491 if [[ ${euid} == "next" ]] ; then
488 then 492 for euid in $(seq 101 999) ; do
489 local pwrange
490 if [ "${USERLAND}" == "BSD" ] ; then
491 pwrange="`jot 898 101`"
492 else
493 pwrange="`seq 101 999`"
494 fi
495 for euid in ${pwrange} ; do
496 [ -z "`egetent passwd ${euid}`" ] && break 493 [[ -z $(egetent passwd ${euid}) ]] && break
497 done 494 done
498 fi 495 fi
499 opts="${opts} -u ${euid}" 496 opts="${opts} -u ${euid}"
500 einfo " - Userid: ${euid}" 497 einfo " - Userid: ${euid}"
501 498
502 # handle shell 499 # handle shell
503 local eshell="$1"; shift 500 local eshell=$1; shift
504 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
505 then
506 if [ ! -e "${eshell}" ] 502 if [[ ! -e ${eshell} ]] ; then
507 then
508 eerror "A shell was specified but it does not exist !" 503 eerror "A shell was specified but it does not exist !"
509 die "${eshell} does not exist" 504 die "${eshell} does not exist"
510 fi 505 fi
511 else 506 else
512 if [ "${USERLAND}" == "BSD" ] 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
513 then 508 [[ -x ${ROOT}${shell} ]] && break
514 eshell="/usr/bin/false" 509 done
515 else 510
516 eshell="/bin/false" 511 if [[ ${shell} == "/dev/null" ]] ; then
512 eerror "Unable to identify the shell to use"
513 die "Unable to identify the shell to use"
517 fi 514 fi
515
516 eshell=${shell}
518 fi 517 fi
519 einfo " - Shell: ${eshell}" 518 einfo " - Shell: ${eshell}"
520 opts="${opts} -s ${eshell}" 519 opts="${opts} -s ${eshell}"
521 520
522 # handle homedir 521 # handle homedir
523 local ehome="$1"; shift 522 local ehome=$1; shift
524 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 523 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
525 then
526 ehome="/dev/null" 524 ehome="/dev/null"
527 fi 525 fi
528 einfo " - Home: ${ehome}" 526 einfo " - Home: ${ehome}"
529 opts="${opts} -d ${ehome}" 527 opts="${opts} -d ${ehome}"
530 528
531 # handle groups 529 # handle groups
532 local egroups="$1"; shift 530 local egroups=$1; shift
533 if [ ! -z "${egroups}" ] 531 if [[ ! -z ${egroups} ]] ; then
534 then
535 local oldifs="${IFS}" 532 local oldifs=${IFS}
536 local defgroup="" exgroups="" 533 local defgroup="" exgroups=""
537 534
538 export IFS="," 535 export IFS=","
539 for g in ${egroups} 536 for g in ${egroups} ; do
540 do
541 export IFS="${oldifs}" 537 export IFS=${oldifs}
542 if [ -z "`egetent group \"${g}\"`" ] 538 if [[ -z $(egetent group "${g}") ]] ; then
543 then
544 eerror "You must add group ${g} to the system first" 539 eerror "You must add group ${g} to the system first"
545 die "${g} is not a valid GID" 540 die "${g} is not a valid GID"
546 fi 541 fi
547 if [ -z "${defgroup}" ] 542 if [[ -z ${defgroup} ]] ; then
548 then
549 defgroup="${g}" 543 defgroup=${g}
550 else 544 else
551 exgroups="${exgroups},${g}" 545 exgroups="${exgroups},${g}"
552 fi 546 fi
553 export IFS="," 547 export IFS=","
554 done 548 done
555 export IFS="${oldifs}" 549 export IFS=${oldifs}
556 550
557 opts="${opts} -g ${defgroup}" 551 opts="${opts} -g ${defgroup}"
558 if [ ! -z "${exgroups}" ] 552 if [[ ! -z ${exgroups} ]] ; then
559 then
560 opts="${opts} -G ${exgroups:1}" 553 opts="${opts} -G ${exgroups:1}"
561 fi 554 fi
562 else 555 else
563 egroups="(none)" 556 egroups="(none)"
564 fi 557 fi
565 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
566 559
567 # handle extra and add the user 560 # handle extra and add the user
568 local eextra="$@"
569 local oldsandbox="${SANDBOX_ON}" 561 local oldsandbox=${SANDBOX_ON}
570 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
571 if useq ppc-macos 563 case ${CHOST} in
572 then 564 *-darwin*)
573 ### Make the user 565 ### Make the user
574 if [ -z "${eextra}" ] 566 if [[ -z $@ ]] ; then
575 then
576 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
577 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
578 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
579 dscl . create /users/${euser} realname "added by portage for ${PN}" 570 dscl . create /users/${euser} realname "added by portage for ${PN}"
580 ### Add the user to the groups specified 571 ### Add the user to the groups specified
581 local oldifs="${IFS}" 572 local oldifs=${IFS}
582 export IFS="," 573 export IFS=","
583 for g in ${egroups} 574 for g in ${egroups} ; do
584 do
585 dscl . merge /groups/${g} users ${euser} 575 dscl . merge /groups/${g} users ${euser}
586 done 576 done
587 export IFS="${oldifs}" 577 export IFS=${oldifs}
588 else 578 else
589 einfo "Extra options are not supported on macos yet" 579 einfo "Extra options are not supported on Darwin yet"
590 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
591 einfo "eextra: ${eextra}" 581 einfo "eextra: $@"
592 die "Required function missing" 582 die "Required function missing"
593 fi 583 fi
594 elif use x86-fbsd ; then 584 ;;
595 if [ -z "${eextra}" ] 585 *-freebsd*)
596 then 586 if [[ -z $@ ]] ; then
597 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
598 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
599 die "enewuser failed" 589 die "enewuser failed"
600 else 590 else
601 einfo " - Extra: ${eextra}" 591 einfo " - Extra: $@"
602 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
603 -c ${eextra} || die "enewuser failed" 593 "$@" || die "enewuser failed"
604 fi 594 fi
595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
605 else 600 else
606 if [ -z "${eextra}" ] 601 einfo " - Extra: $@"
607 then 602 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi
604 ;;
605 *)
606 if [[ -z $@ ]] ; then
608 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
609 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
610 || die "enewuser failed" 609 || die "enewuser failed"
611 else 610 else
612 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
613 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
614 || die "enewuser failed" 613 || die "enewuser failed"
615 fi 614 fi
615 ;;
616 esac
617
618 if [[ ! -e ${ROOT}/${ehome} ]] ; then
619 einfo " - Creating ${ehome} in ${ROOT}"
620 mkdir -p "${ROOT}/${ehome}"
621 chown ${euser} "${ROOT}/${ehome}"
622 chmod 755 "${ROOT}/${ehome}"
616 fi 623 fi
624
617 export SANDBOX_ON="${oldsandbox}" 625 export SANDBOX_ON=${oldsandbox}
618
619 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
620 then
621 einfo " - Creating ${ehome} in ${D}"
622 dodir ${ehome}
623 fowners ${euser} ${ehome}
624 fperms 755 ${ehome}
625 fi
626} 626}
627 627
628# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
629# vapier@gentoo.org 629# vapier@gentoo.org
630# 630#
659 then 659 then
660 if [ "${egid}" -gt 0 ] 660 if [ "${egid}" -gt 0 ]
661 then 661 then
662 if [ -z "`egetent group ${egid}`" ] 662 if [ -z "`egetent group ${egid}`" ]
663 then 663 then
664 if useq ppc-macos ; then 664 if [[ "${CHOST}" == *-darwin* ]]; then
665 opts="${opts} ${egid}" 665 opts="${opts} ${egid}"
666 else 666 else
667 opts="${opts} -g ${egid}" 667 opts="${opts} -g ${egid}"
668 fi 668 fi
669 else 669 else
683 opts="${opts} ${eextra}" 683 opts="${opts} ${eextra}"
684 684
685 # add the group 685 # add the group
686 local oldsandbox="${SANDBOX_ON}" 686 local oldsandbox="${SANDBOX_ON}"
687 export SANDBOX_ON="0" 687 export SANDBOX_ON="0"
688 if useq ppc-macos ; then 688 case ${CHOST} in
689 *-darwin*)
689 if [ ! -z "${eextra}" ]; 690 if [ ! -z "${eextra}" ];
690 then 691 then
691 einfo "Extra options are not supported on macos yet" 692 einfo "Extra options are not supported on Darwin/OS X yet"
692 einfo "Please report the ebuild along with the info below" 693 einfo "Please report the ebuild along with the info below"
693 einfo "eextra: ${eextra}" 694 einfo "eextra: ${eextra}"
694 die "Required function missing" 695 die "Required function missing"
695 fi 696 fi
696 697
697 # If we need the next available 698 # If we need the next available
698 case ${egid} in 699 case ${egid} in
699 *[!0-9]*) # Non numeric 700 *[!0-9]*) # Non numeric
700 for egid in `jot 898 101`; do 701 for egid in $(seq 101 999); do
701 [ -z "`egetent group ${egid}`" ] && break 702 [ -z "`egetent group ${egid}`" ] && break
702 done 703 done
703 esac 704 esac
704 dscl . create /groups/${egroup} gid ${egid} 705 dscl . create /groups/${egroup} gid ${egid}
705 dscl . create /groups/${egroup} passwd '*' 706 dscl . create /groups/${egroup} passwd '*'
706 elif use x86-fbsd ; then 707 ;;
708
709 *-freebsd*)
707 case ${egid} in 710 case ${egid} in
708 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
709 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
710 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
711 done 714 done
712 esac 715 esac
713 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 716 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
714 else 717 ;;
718
719 *-netbsd*)
720 case ${egid} in
721 *[!0-9]*) # Non numeric
722 for egid in $(seq 101 999); do
723 [ -z "`egetent group ${egid}`" ] && break
724 done
725 esac
726 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
727 ;;
728
729 *)
715 groupadd ${opts} ${egroup} || die "enewgroup failed" 730 groupadd ${opts} ${egroup} || die "enewgroup failed"
716 fi 731 ;;
732 esac
717 export SANDBOX_ON="${oldsandbox}" 733 export SANDBOX_ON="${oldsandbox}"
718} 734}
719 735
720# Simple script to replace 'dos2unix' binaries 736# Simple script to replace 'dos2unix' binaries
721# vapier@gentoo.org 737# vapier@gentoo.org
746# name: the name that will show up in the menu 762# name: the name that will show up in the menu
747# icon: give your little like a pretty little icon ... 763# icon: give your little like a pretty little icon ...
748# this can be relative (to /usr/share/pixmaps) or 764# this can be relative (to /usr/share/pixmaps) or
749# a full path to an icon 765# a full path to an icon
750# type: what kind of application is this ? for categories: 766# type: what kind of application is this ? for categories:
751# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 767# http://www.freedesktop.org/Standards/desktop-entry-spec
752# path: if your app needs to startup in a specific dir 768# path: if your app needs to startup in a specific dir
753make_desktop_entry() { 769make_desktop_entry() {
754 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 770 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
755 771
756 local exec=${1} 772 local exec=${1}
782 dev) 798 dev)
783 type="Development" 799 type="Development"
784 ;; 800 ;;
785 801
786 games) 802 games)
787 [[ -z ${path} ]] && path=${GAMES_BINDIR}
788
789 case ${catmin} in 803 case ${catmin} in
790 action) type=ActionGame;; 804 action) type=ActionGame;;
791 arcade) type=ArcadeGame;; 805 arcade) type=ArcadeGame;;
792 board) type=BoardGame;; 806 board) type=BoardGame;;
793 kid) type=KidsGame;; 807 kid) type=KidsGame;;
858 *) 872 *)
859 type= 873 type=
860 ;; 874 ;;
861 esac 875 esac
862 fi 876 fi
863 877 if [ "${SLOT}" == "0" ] ; then
878 local desktop_name="${PN}"
879 else
880 local desktop_name="${PN}-${SLOT}"
881 fi
864 local desktop=${T}/${exec%% *}-${P}.desktop 882 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
865 883
866echo "[Desktop Entry] 884echo "[Desktop Entry]
867Encoding=UTF-8 885Encoding=UTF-8
868Version=0.9.2 886Version=0.9.2
869Name=${name} 887Name=${name}
872Exec=${exec} 890Exec=${exec}
873Path=${path} 891Path=${path}
874Icon=${icon} 892Icon=${icon}
875Categories=Application;${type};" > "${desktop}" 893Categories=Application;${type};" > "${desktop}"
876 894
895 (
896 # wrap the env here so that the 'insinto' call
897 # doesn't corrupt the env of the caller
877 insinto /usr/share/applications 898 insinto /usr/share/applications
878 doins "${desktop}" 899 doins "${desktop}"
879 900 )
880 return 0
881} 901}
882 902
883# Make a GDM/KDM Session file 903# Make a GDM/KDM Session file
884# 904#
885# make_desktop_entry(<title>, <command>) 905# make_desktop_entry(<title>, <command>)
914 doins "${i}" 934 doins "${i}"
915 elif [[ -d ${i} ]] ; then 935 elif [[ -d ${i} ]] ; then
916 for j in "${i}"/*.desktop ; do 936 for j in "${i}"/*.desktop ; do
917 doins "${j}" 937 doins "${j}"
918 done 938 done
919 fi 939 fi
920 done 940 done
921} 941}
922newmenu() { 942newmenu() {
923 insinto /usr/share/applications 943 insinto /usr/share/applications
924 newins "$1" "$2" 944 newins "$1" "$2"
932 doins "${i}" 952 doins "${i}"
933 elif [[ -d ${i} ]] ; then 953 elif [[ -d ${i} ]] ; then
934 for j in "${i}"/*.png ; do 954 for j in "${i}"/*.png ; do
935 doins "${j}" 955 doins "${j}"
936 done 956 done
937 fi 957 fi
938 done 958 done
939} 959}
940newicon() { 960newicon() {
941 insinto /usr/share/pixmaps 961 insinto /usr/share/pixmaps
942 newins "$1" "$2" 962 newins "$1" "$2"
947############################################################## 967##############################################################
948 968
949 969
950# for internal use only (unpack_pdv and unpack_makeself) 970# for internal use only (unpack_pdv and unpack_makeself)
951find_unpackable_file() { 971find_unpackable_file() {
952 local src="$1" 972 local src=$1
953 if [ -z "${src}" ] 973 if [[ -z ${src} ]] ; then
954 then
955 src="${DISTDIR}/${A}" 974 src=${DISTDIR}/${A}
956 else 975 else
957 if [ -e "${DISTDIR}/${src}" ] 976 if [[ -e ${DISTDIR}/${src} ]] ; then
958 then
959 src="${DISTDIR}/${src}" 977 src=${DISTDIR}/${src}
960 elif [ -e "${PWD}/${src}" ] 978 elif [[ -e ${PWD}/${src} ]] ; then
961 then
962 src="${PWD}/${src}" 979 src=${PWD}/${src}
963 elif [ -e "${src}" ] 980 elif [[ -e ${src} ]] ; then
964 then
965 src="${src}" 981 src=${src}
966 fi
967 fi 982 fi
968 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 983 fi
984 [[ ! -e ${src} ]] && return 1
969 echo "${src}" 985 echo "${src}"
970} 986}
971 987
972# Unpack those pesky pdv generated files ... 988# Unpack those pesky pdv generated files ...
973# They're self-unpacking programs with the binary package stuffed in 989# They're self-unpacking programs with the binary package stuffed in
988# lseek 1004# lseek
989# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1005# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
990# lseek(3, -4, SEEK_END) = 2981250 1006# lseek(3, -4, SEEK_END) = 2981250
991# thus we would pass in the value of '4' as the second parameter. 1007# thus we would pass in the value of '4' as the second parameter.
992unpack_pdv() { 1008unpack_pdv() {
993 local src="`find_unpackable_file $1`" 1009 local src=$(find_unpackable_file $1)
994 local sizeoff_t="$2" 1010 local sizeoff_t=$2
995 1011
1012 [[ -z ${src} ]] && die "Could not locate source for '$1'"
996 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1013 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
997 1014
998 local shrtsrc="`basename ${src}`" 1015 local shrtsrc=$(basename "${src}")
999 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1016 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1000 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1017 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1001 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1018 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1002 1019
1003 # grab metadata for debug reasons 1020 # grab metadata for debug reasons
1067# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1084# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1068# - If the file is not specified then unpack will utilize ${A}. 1085# - If the file is not specified then unpack will utilize ${A}.
1069# - If the offset is not specified then we will attempt to extract 1086# - If the offset is not specified then we will attempt to extract
1070# the proper offset from the script itself. 1087# the proper offset from the script itself.
1071unpack_makeself() { 1088unpack_makeself() {
1072 local src="$(find_unpackable_file "$1")" 1089 local src=$(find_unpackable_file "$1")
1073 local skip="$2" 1090 local skip=$2
1074 local exe="$3" 1091 local exe=$3
1075 1092
1093 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1094
1076 local shrtsrc="$(basename "${src}")" 1095 local shrtsrc=$(basename "${src}")
1077 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1096 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1078 if [ -z "${skip}" ] 1097 if [[ -z ${skip} ]] ; then
1079 then
1080 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1098 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1081 local skip=0 1099 local skip=0
1082 exe=tail 1100 exe=tail
1083 case ${ver} in 1101 case ${ver} in
1084 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1102 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1085 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1103 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1097 ;; 1115 ;;
1098 2.1.3) 1116 2.1.3)
1099 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1117 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1100 let skip="skip + 1" 1118 let skip="skip + 1"
1101 ;; 1119 ;;
1102 2.1.4) 1120 2.1.4|2.1.5)
1103 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1121 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1104 skip=$(head -n ${skip} "${src}" | wc -c) 1122 skip=$(head -n ${skip} "${src}" | wc -c)
1105 exe="dd" 1123 exe="dd"
1106 ;; 1124 ;;
1107 *) 1125 *)
1152check_license() { 1170check_license() {
1153 local lic=$1 1171 local lic=$1
1154 if [ -z "${lic}" ] ; then 1172 if [ -z "${lic}" ] ; then
1155 lic="${PORTDIR}/licenses/${LICENSE}" 1173 lic="${PORTDIR}/licenses/${LICENSE}"
1156 else 1174 else
1157 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1175 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1158 lic="${PORTDIR}/licenses/${src}" 1176 lic="${PORTDIR}/licenses/${lic}"
1159 elif [ -e "${PWD}/${src}" ] ; then 1177 elif [ -e "${PWD}/${lic}" ] ; then
1160 lic="${PWD}/${src}" 1178 lic="${PWD}/${lic}"
1161 elif [ -e "${src}" ] ; then 1179 elif [ -e "${lic}" ] ; then
1162 lic="${src}" 1180 lic="${lic}"
1163 fi
1164 fi 1181 fi
1182 fi
1165 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1183 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1166 local l="`basename ${lic}`" 1184 local l="`basename ${lic}`"
1167 1185
1168 # here is where we check for the licenses the user already 1186 # here is where we check for the licenses the user already
1169 # accepted ... if we don't find a match, we make the user accept 1187 # accepted ... if we don't find a match, we make the user accept
1170 local shopts=$- 1188 local shopts=$-
1341# displayed and we'll hang out here until: 1359# displayed and we'll hang out here until:
1342# (1) the file is found on a mounted cdrom 1360# (1) the file is found on a mounted cdrom
1343# (2) the user hits CTRL+C 1361# (2) the user hits CTRL+C
1344cdrom_locate_file_on_cd() { 1362cdrom_locate_file_on_cd() {
1345 while [[ -z ${CDROM_ROOT} ]] ; do 1363 while [[ -z ${CDROM_ROOT} ]] ; do
1346 local dir="$(dirname ${@})" 1364 local dir=$(dirname "$*")
1347 local file="$(basename ${@})" 1365 local file=$(basename "$*")
1348 local mline="" 1366 local mline=""
1349 local showedmsg=0 1367 local showedmsg=0
1350 1368
1351 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1369 for mline in $(mount | egrep -e '(iso|cdrom|fs=cdfss)' | awk '{print $3}') ; do
1352 [[ -d ${mline}/${dir} ]] || continue 1370 [[ -d ${mline}/${dir} ]] || continue
1353 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1371 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1354 && export CDROM_ROOT=${mline} 1372 && export CDROM_ROOT=${mline}
1355 done 1373 done
1356 1374
1373 fi 1391 fi
1374 showedmsg=1 1392 showedmsg=1
1375 fi 1393 fi
1376 einfo "Press return to scan for the cd again" 1394 einfo "Press return to scan for the cd again"
1377 einfo "or hit CTRL+C to abort the emerge." 1395 einfo "or hit CTRL+C to abort the emerge."
1396 echo
1397 einfo "If you are having trouble with the detection"
1398 einfo "of your CD, it is possible that you do not have"
1399 einfo "Joliet support enabled in your kernel. Please"
1400 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1378 read 1401 read
1379 fi 1402 fi
1380 done 1403 done
1381} 1404}
1382 1405
1446 while ((i--)) ; do 1469 while ((i--)) ; do
1447 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1470 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1448 done 1471 done
1449 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1472 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1450 case ${ARCH} in 1473 case ${ARCH} in
1451 x86) export ARCH="i386";; 1474 x86) export ARCH="i386";;
1452 amd64) export ARCH="x86_64";; 1475 amd64) export ARCH="x86_64";;
1453 hppa) export ARCH="parisc";; 1476 hppa) export ARCH="parisc";;
1454 mips) export ARCH="mips";; 1477 mips) export ARCH="mips";;
1455 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! 1478 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!
1456 *) export ARCH="${ARCH}";; 1479 *) export ARCH="${ARCH}";;
1457 esac 1480 esac
1458} 1481}
1459 1482
1460# set's ARCH back to what portage expects 1483# set's ARCH back to what portage expects
1461set_arch_to_portage() { 1484set_arch_to_portage() {
1505 LIB=$1 1528 LIB=$1
1506 1529
1507 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1530 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1508 SONAME=`basename ${LIB}` 1531 SONAME=`basename ${LIB}`
1509 1532
1510 einfo "An old version of an installed library was detected on your system." 1533 ewarn "An old version of an installed library was detected on your system."
1511 einfo "In order to avoid breaking packages that link against is, this older version" 1534 ewarn "In order to avoid breaking packages that link against it, this older version"
1512 einfo "is not being removed. In order to make full use of this newer version," 1535 ewarn "is not being removed. In order to make full use of this newer version,"
1513 einfo "you will need to execute the following command:" 1536 ewarn "you will need to execute the following command:"
1514 einfo " revdep-rebuild --soname ${SONAME}" 1537 ewarn " revdep-rebuild --soname ${SONAME}"
1515 einfo 1538 ewarn
1516 einfo "After doing that, you can safely remove ${LIB}" 1539 ewarn "After doing that, you can safely remove ${LIB}"
1517 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1540 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1518 fi 1541 fi
1519} 1542}
1520 1543
1521# Hack for people to figure out if a package was built with 1544# Hack for people to figure out if a package was built with
1522# certain USE flags 1545# certain USE flags
1595# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1618# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1596# $5 == path for wrapper 1619# $5 == path for wrapper
1597make_wrapper() { 1620make_wrapper() {
1598 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1621 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1599 local tmpwrapper=$(emktemp) 1622 local tmpwrapper=$(emktemp)
1623 # We don't want to quote ${bin} so that people can pass complex
1624 # things as $bin ... "./someprog --args"
1600 cat << EOF > "${tmpwrapper}" 1625 cat << EOF > "${tmpwrapper}"
1601#!/bin/sh 1626#!/bin/sh
1602cd "${chdir}" 1627cd "${chdir:-.}"
1628if [ -n "${libdir}" ] ; then
1629 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1603export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1630 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1631 else
1632 export LD_LIBRARY_PATH="${libdir}"
1633 fi
1634fi
1604exec ${bin} "\$@" 1635exec ${bin} "\$@"
1605EOF 1636EOF
1606 chmod go+rx "${tmpwrapper}" 1637 chmod go+rx "${tmpwrapper}"
1607 if [ -n "${5}" ] 1638 if [[ -n ${path} ]] ; then
1608 then
1609 exeinto ${5} 1639 exeinto "${path}"
1610 newexe "${tmpwrapper}" "${wrapper}" 1640 newexe "${tmpwrapper}" "${wrapper}"
1611 else 1641 else
1612 newbin "${tmpwrapper}" "${wrapper}" 1642 newbin "${tmpwrapper}" "${wrapper}"
1613 fi 1643 fi
1614} 1644}

Legend:
Removed from v.1.174  
changed lines
  Added in v.1.212

  ViewVC Help
Powered by ViewVC 1.1.20