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

Diff of /eclass/eutils.eclass

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

Revision 1.177 Revision 1.200
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.177 2005/05/26 15:13:36 carlo Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.200 2005/09/23 20:44:26 wolf31o2 Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
19 18
20# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
21# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
… …
68 dodir /usr/${libdir} 67 dodir /usr/${libdir}
69 68
70 for lib in "${@}" ; do 69 for lib in "${@}" ; do
71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
72 /* GNU ld script 71 /* GNU ld script
73 Since Gentoo has critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
74 in /lib, and the static versions in /usr/lib, 73 in /lib, and the static versions in /usr/lib,
75 we need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
76 otherwise we run into linking problems. 75 otherwise we run into linking problems.
77 76
78 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
79 */ 78 */
80 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
81 END_LDSCRIPT 80 END_LDSCRIPT
82 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}"
… …
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##*/}
… …
376# vapier@gentoo.org 377# vapier@gentoo.org
377# 378#
378# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
379emktemp() { 380emktemp() {
380 local exe="touch" 381 local exe="touch"
381 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
382 local topdir="$1" 383 local topdir=$1
383 384
384 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
385 then
386 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
387 && topdir="/tmp" \ 387 && topdir="/tmp" \
388 || topdir="${T}" 388 || topdir=${T}
389 fi 389 fi
390 390
391 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
392 then
393 local tmp=/ 392 local tmp=/
394 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
395 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
396 done 395 done
397 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
398 echo "${tmp}" 397 echo "${tmp}"
399 else 398 else
400 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
401 && exe="-p" \ 400 && exe="-p" \
402 || exe="-d" 401 || exe="-d"
403 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
404 fi 403 fi
405} 404}
… …
409# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
410# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
411# 410#
412# egetent(database, key) 411# egetent(database, key)
413egetent() { 412egetent() {
414 if useq ppc-macos ; then 413 if [[ "${USERLAND}" == "Darwin" ]] ; then
415 case "$2" in 414 case "$2" in
416 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
418 ;; 417 ;;
419 *) # Numeric 418 *) # Numeric
420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
421 ;; 420 ;;
422 esac 421 esac
423 elif useq x86-fbsd ; then 422 elif [[ "${USERLAND}" == "BSD" ]] ; then
424 local action 423 local action
425 if [ "$1" == "passwd" ] 424 if [ "$1" == "passwd" ]
426 then 425 then
427 action="user" 426 action="user"
428 else 427 else
… …
448# homedir: /dev/null 447# homedir: /dev/null
449# groups: none 448# groups: none
450# extra: comment of 'added by portage for ${PN}' 449# extra: comment of 'added by portage for ${PN}'
451enewuser() { 450enewuser() {
452 # get the username 451 # get the username
453 local euser="$1"; shift 452 local euser=$1; shift
454 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
455 then
456 eerror "No username specified !" 454 eerror "No username specified !"
457 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
458 fi 456 fi
459 457
460 # lets see if the username already exists 458 # lets see if the username already exists
461 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
462 then
463 return 0 460 return 0
464 fi 461 fi
465 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
466 463
467 # options to pass to useradd 464 # options to pass to useradd
468 local opts= 465 local opts=
469 466
470 # handle uid 467 # handle uid
471 local euid="$1"; shift 468 local euid=$1; shift
472 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
473 then
474 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
475 then
476 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
477 then
478 euid="next" 472 euid="next"
479 fi 473 fi
480 else 474 else
481 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
482 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
483 fi 477 fi
484 else 478 else
485 euid="next" 479 euid="next"
486 fi 480 fi
487 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
488 then 482 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 483 [[ -z $(egetent passwd ${euid}) ]] && break
497 done 484 done
498 fi 485 fi
499 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
500 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
501 488
502 # handle shell 489 # handle shell
503 local eshell="$1"; shift 490 local eshell=$1; shift
504 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
505 then
506 if [ ! -e "${eshell}" ] 492 if [[ ! -e ${eshell} ]] ; then
507 then
508 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
509 die "${eshell} does not exist" 494 die "${eshell} does not exist"
510 fi 495 fi
511 else 496 else
512 if [ "${USERLAND}" == "BSD" ] 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null; do
513 then 498 [[ -x ${ROOT}${shell} ]] && break;
514 eshell="/usr/bin/false" 499 done
515 else 500
516 eshell="/bin/false" 501 if [[ ${shell} == "/dev/null" ]]; then
502 eerror "Unable to identify the shell to use"
503 die "Unable to identify the shell to use"
517 fi 504 fi
505
506 eshell=${shell}
518 fi 507 fi
519 einfo " - Shell: ${eshell}" 508 einfo " - Shell: ${eshell}"
520 opts="${opts} -s ${eshell}" 509 opts="${opts} -s ${eshell}"
521 510
522 # handle homedir 511 # handle homedir
523 local ehome="$1"; shift 512 local ehome=$1; shift
524 if [ -z "${ehome}" ] || [ "${eshell}" == "-1" ] 513 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
525 then
526 ehome="/dev/null" 514 ehome="/dev/null"
527 fi 515 fi
528 einfo " - Home: ${ehome}" 516 einfo " - Home: ${ehome}"
529 opts="${opts} -d ${ehome}" 517 opts="${opts} -d ${ehome}"
530 518
531 # handle groups 519 # handle groups
532 local egroups="$1"; shift 520 local egroups=$1; shift
533 if [ ! -z "${egroups}" ] 521 if [[ ! -z ${egroups} ]] ; then
534 then
535 local oldifs="${IFS}" 522 local oldifs=${IFS}
536 local defgroup="" exgroups="" 523 local defgroup="" exgroups=""
537 524
538 export IFS="," 525 export IFS=","
539 for g in ${egroups} 526 for g in ${egroups} ; do
540 do
541 export IFS="${oldifs}" 527 export IFS=${oldifs}
542 if [ -z "`egetent group \"${g}\"`" ] 528 if [[ -z $(egetent group "${g}") ]] ; then
543 then
544 eerror "You must add group ${g} to the system first" 529 eerror "You must add group ${g} to the system first"
545 die "${g} is not a valid GID" 530 die "${g} is not a valid GID"
546 fi 531 fi
547 if [ -z "${defgroup}" ] 532 if [[ -z ${defgroup} ]] ; then
548 then
549 defgroup="${g}" 533 defgroup=${g}
550 else 534 else
551 exgroups="${exgroups},${g}" 535 exgroups="${exgroups},${g}"
552 fi 536 fi
553 export IFS="," 537 export IFS=","
554 done 538 done
555 export IFS="${oldifs}" 539 export IFS=${oldifs}
556 540
557 opts="${opts} -g ${defgroup}" 541 opts="${opts} -g ${defgroup}"
558 if [ ! -z "${exgroups}" ] 542 if [[ ! -z ${exgroups} ]] ; then
559 then
560 opts="${opts} -G ${exgroups:1}" 543 opts="${opts} -G ${exgroups:1}"
561 fi 544 fi
562 else 545 else
563 egroups="(none)" 546 egroups="(none)"
564 fi 547 fi
565 einfo " - Groups: ${egroups}" 548 einfo " - Groups: ${egroups}"
566 549
567 # handle extra and add the user 550 # handle extra and add the user
568 local eextra="$@"
569 local oldsandbox="${SANDBOX_ON}" 551 local oldsandbox=${SANDBOX_ON}
570 export SANDBOX_ON="0" 552 export SANDBOX_ON="0"
571 if useq ppc-macos 553 case ${USERLAND} in
572 then 554 Darwin)
573 ### Make the user 555 ### Make the user
574 if [ -z "${eextra}" ] 556 if [[ -z $@ ]] ; then
575 then
576 dscl . create /users/${euser} uid ${euid} 557 dscl . create /users/${euser} uid ${euid}
577 dscl . create /users/${euser} shell ${eshell} 558 dscl . create /users/${euser} shell ${eshell}
578 dscl . create /users/${euser} home ${ehome} 559 dscl . create /users/${euser} home ${ehome}
579 dscl . create /users/${euser} realname "added by portage for ${PN}" 560 dscl . create /users/${euser} realname "added by portage for ${PN}"
580 ### Add the user to the groups specified 561 ### Add the user to the groups specified
581 local oldifs="${IFS}" 562 local oldifs=${IFS}
582 export IFS="," 563 export IFS=","
583 for g in ${egroups} 564 for g in ${egroups} ; do
584 do
585 dscl . merge /groups/${g} users ${euser} 565 dscl . merge /groups/${g} users ${euser}
586 done 566 done
587 export IFS="${oldifs}" 567 export IFS=${oldifs}
588 else 568 else
589 einfo "Extra options are not supported on macos yet" 569 einfo "Extra options are not supported on Darwin yet"
590 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
591 einfo "eextra: ${eextra}" 571 einfo "eextra: $@"
592 die "Required function missing" 572 die "Required function missing"
593 fi 573 fi
594 elif use x86-fbsd ; then 574 ;;
595 if [ -z "${eextra}" ] 575 BSD)
596 then 576 if [[ -z $@ ]] ; then
597 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
598 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
599 die "enewuser failed" 579 die "enewuser failed"
600 else 580 else
601 einfo " - Extra: ${eextra}" 581 einfo " - Extra: $@"
602 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
603 -c ${eextra} || die "enewuser failed" 583 "$@" || die "enewuser failed"
604 fi 584 fi
605 else 585 ;;
606 if [ -z "${eextra}" ] 586 *)
607 then 587 if [[ -z $@ ]] ; then
608 useradd ${opts} ${euser} \ 588 useradd ${opts} ${euser} \
609 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
610 || die "enewuser failed" 590 || die "enewuser failed"
611 else 591 else
612 einfo " - Extra: ${eextra}" 592 einfo " - Extra: $@"
613 useradd ${opts} ${euser} ${eextra} \ 593 useradd ${opts} ${euser} "$@" \
614 || die "enewuser failed" 594 || die "enewuser failed"
615 fi 595 fi
596 ;;
597 esac
598
599 if [[ ! -e ${ROOT}/${ehome} ]] ; then
600 einfo " - Creating ${ehome} in ${ROOT}"
601 mkdir -p "${ROOT}/${ehome}"
602 chown ${euser} "${ROOT}/${ehome}"
603 chmod 755 "${ROOT}/${ehome}"
616 fi 604 fi
605
617 export SANDBOX_ON="${oldsandbox}" 606 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} 607}
627 608
628# Simplify/standardize adding groups to the system 609# Simplify/standardize adding groups to the system
629# vapier@gentoo.org 610# vapier@gentoo.org
630# 611#
… …
659 then 640 then
660 if [ "${egid}" -gt 0 ] 641 if [ "${egid}" -gt 0 ]
661 then 642 then
662 if [ -z "`egetent group ${egid}`" ] 643 if [ -z "`egetent group ${egid}`" ]
663 then 644 then
664 if useq ppc-macos ; then 645 if [[ "${USERLAND}" == "Darwin" ]]; then
665 opts="${opts} ${egid}" 646 opts="${opts} ${egid}"
666 else 647 else
667 opts="${opts} -g ${egid}" 648 opts="${opts} -g ${egid}"
668 fi 649 fi
669 else 650 else
… …
683 opts="${opts} ${eextra}" 664 opts="${opts} ${eextra}"
684 665
685 # add the group 666 # add the group
686 local oldsandbox="${SANDBOX_ON}" 667 local oldsandbox="${SANDBOX_ON}"
687 export SANDBOX_ON="0" 668 export SANDBOX_ON="0"
688 if useq ppc-macos ; then 669 if [[ "${USERLAND}" == "Darwin" ]]; then
689 if [ ! -z "${eextra}" ]; 670 if [ ! -z "${eextra}" ];
690 then 671 then
691 einfo "Extra options are not supported on macos yet" 672 einfo "Extra options are not supported on Darwin/OS X yet"
692 einfo "Please report the ebuild along with the info below" 673 einfo "Please report the ebuild along with the info below"
693 einfo "eextra: ${eextra}" 674 einfo "eextra: ${eextra}"
694 die "Required function missing" 675 die "Required function missing"
695 fi 676 fi
696 677
697 # If we need the next available 678 # If we need the next available
698 case ${egid} in 679 case ${egid} in
699 *[!0-9]*) # Non numeric 680 *[!0-9]*) # Non numeric
700 for egid in `jot 898 101`; do 681 for egid in $(seq 101 999); do
701 [ -z "`egetent group ${egid}`" ] && break 682 [ -z "`egetent group ${egid}`" ] && break
702 done 683 done
703 esac 684 esac
704 dscl . create /groups/${egroup} gid ${egid} 685 dscl . create /groups/${egroup} gid ${egid}
705 dscl . create /groups/${egroup} passwd '*' 686 dscl . create /groups/${egroup} passwd '*'
706 elif use x86-fbsd ; then 687 elif [[ "${USERLAND}" == "BSD" ]] ; then
707 case ${egid} in 688 case ${egid} in
708 *[!0-9]*) # Non numeric 689 *[!0-9]*) # Non numeric
709 for egid in `jot 898 101`; do 690 for egid in $(seq 101 999); do
710 [ -z "`egetent group ${egid}`" ] && break 691 [ -z "`egetent group ${egid}`" ] && break
711 done 692 done
712 esac 693 esac
713 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
714 else 695 else
… …
746# name: the name that will show up in the menu 727# name: the name that will show up in the menu
747# icon: give your little like a pretty little icon ... 728# icon: give your little like a pretty little icon ...
748# this can be relative (to /usr/share/pixmaps) or 729# this can be relative (to /usr/share/pixmaps) or
749# a full path to an icon 730# a full path to an icon
750# type: what kind of application is this ? for categories: 731# type: what kind of application is this ? for categories:
751# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 732# http://www.freedesktop.org/Standards/desktop-entry-spec
752# path: if your app needs to startup in a specific dir 733# path: if your app needs to startup in a specific dir
753make_desktop_entry() { 734make_desktop_entry() {
754 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 735 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
755 736
756 local exec=${1} 737 local exec=${1}
… …
782 dev) 763 dev)
783 type="Development" 764 type="Development"
784 ;; 765 ;;
785 766
786 games) 767 games)
787 [[ -z ${path} ]] && path=${GAMES_BINDIR}
788
789 case ${catmin} in 768 case ${catmin} in
790 action) type=ActionGame;; 769 action) type=ActionGame;;
791 arcade) type=ArcadeGame;; 770 arcade) type=ArcadeGame;;
792 board) type=BoardGame;; 771 board) type=BoardGame;;
793 kid) type=KidsGame;; 772 kid) type=KidsGame;;
… …
918 doins "${i}" 897 doins "${i}"
919 elif [[ -d ${i} ]] ; then 898 elif [[ -d ${i} ]] ; then
920 for j in "${i}"/*.desktop ; do 899 for j in "${i}"/*.desktop ; do
921 doins "${j}" 900 doins "${j}"
922 done 901 done
923 fi 902 fi
924 done 903 done
925} 904}
926newmenu() { 905newmenu() {
927 insinto /usr/share/applications 906 insinto /usr/share/applications
928 newins "$1" "$2" 907 newins "$1" "$2"
… …
936 doins "${i}" 915 doins "${i}"
937 elif [[ -d ${i} ]] ; then 916 elif [[ -d ${i} ]] ; then
938 for j in "${i}"/*.png ; do 917 for j in "${i}"/*.png ; do
939 doins "${j}" 918 doins "${j}"
940 done 919 done
941 fi 920 fi
942 done 921 done
943} 922}
944newicon() { 923newicon() {
945 insinto /usr/share/pixmaps 924 insinto /usr/share/pixmaps
946 newins "$1" "$2" 925 newins "$1" "$2"
… …
951############################################################## 930##############################################################
952 931
953 932
954# for internal use only (unpack_pdv and unpack_makeself) 933# for internal use only (unpack_pdv and unpack_makeself)
955find_unpackable_file() { 934find_unpackable_file() {
956 local src="$1" 935 local src=$1
957 if [ -z "${src}" ] 936 if [[ -z ${src} ]] ; then
958 then
959 src="${DISTDIR}/${A}" 937 src=${DISTDIR}/${A}
960 else 938 else
961 if [ -e "${DISTDIR}/${src}" ] 939 if [[ -e ${DISTDIR}/${src} ]] ; then
962 then
963 src="${DISTDIR}/${src}" 940 src=${DISTDIR}/${src}
964 elif [ -e "${PWD}/${src}" ] 941 elif [[ -e ${PWD}/${src} ]] ; then
965 then
966 src="${PWD}/${src}" 942 src=${PWD}/${src}
967 elif [ -e "${src}" ] 943 elif [[ -e ${src} ]] ; then
968 then
969 src="${src}" 944 src=${src}
970 fi
971 fi 945 fi
972 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 946 fi
947 [[ ! -e ${src} ]] && return 1
973 echo "${src}" 948 echo "${src}"
974} 949}
975 950
976# Unpack those pesky pdv generated files ... 951# Unpack those pesky pdv generated files ...
977# They're self-unpacking programs with the binary package stuffed in 952# They're self-unpacking programs with the binary package stuffed in
… …
992# lseek 967# lseek
993# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 968# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
994# lseek(3, -4, SEEK_END) = 2981250 969# lseek(3, -4, SEEK_END) = 2981250
995# thus we would pass in the value of '4' as the second parameter. 970# thus we would pass in the value of '4' as the second parameter.
996unpack_pdv() { 971unpack_pdv() {
997 local src="`find_unpackable_file $1`" 972 local src=$(find_unpackable_file $1)
998 local sizeoff_t="$2" 973 local sizeoff_t=$2
999 974
975 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1000 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 976 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1001 977
1002 local shrtsrc="`basename ${src}`" 978 local shrtsrc="`basename ${src}`"
1003 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 979 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1004 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 980 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1005 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 981 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
… …
1071# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1072# - If the file is not specified then unpack will utilize ${A}. 1048# - If the file is not specified then unpack will utilize ${A}.
1073# - If the offset is not specified then we will attempt to extract 1049# - If the offset is not specified then we will attempt to extract
1074# the proper offset from the script itself. 1050# the proper offset from the script itself.
1075unpack_makeself() { 1051unpack_makeself() {
1076 local src="$(find_unpackable_file "$1")" 1052 local src=$(find_unpackable_file "$1")
1077 local skip="$2" 1053 local skip=$2
1078 local exe="$3" 1054 local exe=$3
1079 1055
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1057
1080 local shrtsrc="$(basename "${src}")" 1058 local shrtsrc=$(basename "${src}")
1081 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1082 if [ -z "${skip}" ] 1060 if [ -z "${skip}" ]
1083 then 1061 then
1084 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1085 local skip=0 1063 local skip=0
… …
1156check_license() { 1134check_license() {
1157 local lic=$1 1135 local lic=$1
1158 if [ -z "${lic}" ] ; then 1136 if [ -z "${lic}" ] ; then
1159 lic="${PORTDIR}/licenses/${LICENSE}" 1137 lic="${PORTDIR}/licenses/${LICENSE}"
1160 else 1138 else
1161 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1139 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1162 lic="${PORTDIR}/licenses/${src}" 1140 lic="${PORTDIR}/licenses/${lic}"
1163 elif [ -e "${PWD}/${src}" ] ; then 1141 elif [ -e "${PWD}/${lic}" ] ; then
1164 lic="${PWD}/${src}" 1142 lic="${PWD}/${lic}"
1165 elif [ -e "${src}" ] ; then 1143 elif [ -e "${lic}" ] ; then
1166 lic="${src}" 1144 lic="${lic}"
1167 fi
1168 fi 1145 fi
1146 fi
1169 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1147 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1170 local l="`basename ${lic}`" 1148 local l="`basename ${lic}`"
1171 1149
1172 # here is where we check for the licenses the user already 1150 # here is where we check for the licenses the user already
1173 # accepted ... if we don't find a match, we make the user accept 1151 # accepted ... if we don't find a match, we make the user accept
1174 local shopts=$- 1152 local shopts=$-
… …
1345# displayed and we'll hang out here until: 1323# displayed and we'll hang out here until:
1346# (1) the file is found on a mounted cdrom 1324# (1) the file is found on a mounted cdrom
1347# (2) the user hits CTRL+C 1325# (2) the user hits CTRL+C
1348cdrom_locate_file_on_cd() { 1326cdrom_locate_file_on_cd() {
1349 while [[ -z ${CDROM_ROOT} ]] ; do 1327 while [[ -z ${CDROM_ROOT} ]] ; do
1350 local dir="$(dirname ${@})" 1328 local dir=$(dirname "$*")
1351 local file="$(basename ${@})" 1329 local file=$(basename "$*")
1352 local mline="" 1330 local mline=""
1353 local showedmsg=0 1331 local showedmsg=0
1354 1332
1355 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1333 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1356 [[ -d ${mline}/${dir} ]] || continue 1334 [[ -d ${mline}/${dir} ]] || continue
… …
1377 fi 1355 fi
1378 showedmsg=1 1356 showedmsg=1
1379 fi 1357 fi
1380 einfo "Press return to scan for the cd again" 1358 einfo "Press return to scan for the cd again"
1381 einfo "or hit CTRL+C to abort the emerge." 1359 einfo "or hit CTRL+C to abort the emerge."
1360 echo
1361 einfo "If you are having trouble with the detection"
1362 einfo "of your CD, it is possible that you do not have"
1363 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1382 read 1365 read
1383 fi 1366 fi
1384 done 1367 done
1385} 1368}
1386 1369
… …
1450 while ((i--)) ; do 1433 while ((i--)) ; do
1451 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1434 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1452 done 1435 done
1453 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1436 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1454 case ${ARCH} in 1437 case ${ARCH} in
1455 x86) export ARCH="i386";; 1438 x86) export ARCH="i386";;
1456 amd64) export ARCH="x86_64";; 1439 amd64) export ARCH="x86_64";;
1457 hppa) export ARCH="parisc";; 1440 hppa) export ARCH="parisc";;
1458 mips) export ARCH="mips";; 1441 mips) export ARCH="mips";;
1459 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one! 1442 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1460 *) export ARCH="${ARCH}";; 1443 *) export ARCH="${ARCH}";;
1461 esac 1444 esac
1462} 1445}
1463 1446
1464# set's ARCH back to what portage expects 1447# set's ARCH back to what portage expects
1465set_arch_to_portage() { 1448set_arch_to_portage() {
… …
1509 LIB=$1 1492 LIB=$1
1510 1493
1511 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1494 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1512 SONAME=`basename ${LIB}` 1495 SONAME=`basename ${LIB}`
1513 1496
1514 einfo "An old version of an installed library was detected on your system." 1497 ewarn "An old version of an installed library was detected on your system."
1515 einfo "In order to avoid breaking packages that link against is, this older version" 1498 ewarn "In order to avoid breaking packages that link against it, this older version"
1516 einfo "is not being removed. In order to make full use of this newer version," 1499 ewarn "is not being removed. In order to make full use of this newer version,"
1517 einfo "you will need to execute the following command:" 1500 ewarn "you will need to execute the following command:"
1518 einfo " revdep-rebuild --soname ${SONAME}" 1501 ewarn " revdep-rebuild --soname ${SONAME}"
1519 einfo 1502 ewarn
1520 einfo "After doing that, you can safely remove ${LIB}" 1503 ewarn "After doing that, you can safely remove ${LIB}"
1521 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1522 fi 1505 fi
1523} 1506}
1524 1507
1525# Hack for people to figure out if a package was built with 1508# Hack for people to figure out if a package was built with
1526# certain USE flags 1509# certain USE flags
Legend:
Removed from v.1.177  
changed lines
  Added in v.1.200
  ViewVC Help
Powered by ViewVC 1.1.20