/[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.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.174 2005/05/24 05:10:19 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.206 2005/10/07 16:21:48 flameeyes Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
19 18
20# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
21# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
68 dodir /usr/${libdir} 67 dodir /usr/${libdir}
69 68
70 for lib in "${@}" ; do 69 for lib in "${@}" ; do
71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
72 /* GNU ld script 71 /* GNU ld script
73 Since Gentoo has critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
74 in /lib, and the static versions in /usr/lib, 73 in /lib, and the static versions in /usr/lib,
75 we need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
76 otherwise we run into linking problems. 75 otherwise we run into linking problems.
77 76
78 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
79 */ 78 */
80 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
81 END_LDSCRIPT 80 END_LDSCRIPT
82 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}"
173 local STDERR_TARGET="${T}/$$.out" 172 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
176 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
177 local x="" 176 local x=""
177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
178 179
179 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
180 then 181 then
181 local m="" 182 local m=""
182 for m in "$@" ; do 183 for m in "$@" ; do
249 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
250 # 251 #
251 # ???_arch_foo.patch 252 # ???_arch_foo.patch
252 # 253 #
253 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
254 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 255 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
255 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
256 then 257 then
257 local count=0 258 local count=0
258 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
259 local patchname=${x##*/} 260 local patchname=${x##*/}
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 case ${CHOST} in
414 *-darwin*)
415 case "$2" in 415 case "$2" in
416 *[!0-9]*) # Non numeric 416 *[!0-9]*) # Non numeric
417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
418 ;; 418 ;;
419 *) # Numeric 419 *) # Numeric
420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
421 ;; 421 ;;
422 esac 422 esac
423 elif useq x86-fbsd ; then 423 ;;
424 local action 424 *-freebsd*)
425 if [ "$1" == "passwd" ] 425 local opts action="user"
426 then 426 [[ $1 == "passwd" ]] || action="group"
427 action="user" 427
428 else 428 # lookup by uid/gid
429 action="group" 429 if [[ $2 == [[:digit:]]* ]] ; then
430 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
430 fi 431 fi
432
431 pw show "${action}" "$2" -q 433 pw show ${action} ${opts} "$2" -q
432 else 434 ;;
435 *-netbsd*)
436 grep "$2:\*:" /etc/$1
437 ;;
438 *)
433 which nscd >& /dev/null && nscd -i "$1" 439 type -p nscd >& /dev/null && nscd -i "$1"
434 getent "$1" "$2" 440 getent "$1" "$2"
435 fi 441 ;;
442 esac
436} 443}
437 444
438# Simplify/standardize adding users to the system 445# Simplify/standardize adding users to the system
439# vapier@gentoo.org 446# vapier@gentoo.org
440# 447#
448# homedir: /dev/null 455# homedir: /dev/null
449# groups: none 456# groups: none
450# extra: comment of 'added by portage for ${PN}' 457# extra: comment of 'added by portage for ${PN}'
451enewuser() { 458enewuser() {
452 # get the username 459 # get the username
453 local euser="$1"; shift 460 local euser=$1; shift
454 if [ -z "${euser}" ] 461 if [[ -z ${euser} ]] ; then
455 then
456 eerror "No username specified !" 462 eerror "No username specified !"
457 die "Cannot call enewuser without a username" 463 die "Cannot call enewuser without a username"
458 fi 464 fi
459 465
460 # lets see if the username already exists 466 # lets see if the username already exists
461 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 467 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
462 then
463 return 0 468 return 0
464 fi 469 fi
465 einfo "Adding user '${euser}' to your system ..." 470 einfo "Adding user '${euser}' to your system ..."
466 471
467 # options to pass to useradd 472 # options to pass to useradd
468 local opts= 473 local opts=
469 474
470 # handle uid 475 # handle uid
471 local euid="$1"; shift 476 local euid=$1; shift
472 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 477 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
473 then
474 if [ "${euid}" -gt 0 ] 478 if [[ ${euid} -gt 0 ]] ; then
475 then
476 if [ ! -z "`egetent passwd ${euid}`" ] 479 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
477 then
478 euid="next" 480 euid="next"
479 fi 481 fi
480 else 482 else
481 eerror "Userid given but is not greater than 0 !" 483 eerror "Userid given but is not greater than 0 !"
482 die "${euid} is not a valid UID" 484 die "${euid} is not a valid UID"
483 fi 485 fi
484 else 486 else
485 euid="next" 487 euid="next"
486 fi 488 fi
487 if [ "${euid}" == "next" ] 489 if [[ ${euid} == "next" ]] ; then
488 then 490 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 491 [[ -z $(egetent passwd ${euid}) ]] && break
497 done 492 done
498 fi 493 fi
499 opts="${opts} -u ${euid}" 494 opts="${opts} -u ${euid}"
500 einfo " - Userid: ${euid}" 495 einfo " - Userid: ${euid}"
501 496
502 # handle shell 497 # handle shell
503 local eshell="$1"; shift 498 local eshell=$1; shift
504 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
505 then
506 if [ ! -e "${eshell}" ] 500 if [[ ! -e ${eshell} ]] ; then
507 then
508 eerror "A shell was specified but it does not exist !" 501 eerror "A shell was specified but it does not exist !"
509 die "${eshell} does not exist" 502 die "${eshell} does not exist"
510 fi 503 fi
511 else 504 else
512 if [ "${USERLAND}" == "BSD" ] 505 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
513 then 506 [[ -x ${ROOT}${shell} ]] && break
514 eshell="/usr/bin/false" 507 done
515 else 508
516 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"
517 fi 512 fi
513
514 eshell=${shell}
518 fi 515 fi
519 einfo " - Shell: ${eshell}" 516 einfo " - Shell: ${eshell}"
520 opts="${opts} -s ${eshell}" 517 opts="${opts} -s ${eshell}"
521 518
522 # handle homedir 519 # handle homedir
523 local ehome="$1"; shift 520 local ehome=$1; shift
524 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 521 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
525 then
526 ehome="/dev/null" 522 ehome="/dev/null"
527 fi 523 fi
528 einfo " - Home: ${ehome}" 524 einfo " - Home: ${ehome}"
529 opts="${opts} -d ${ehome}" 525 opts="${opts} -d ${ehome}"
530 526
531 # handle groups 527 # handle groups
532 local egroups="$1"; shift 528 local egroups=$1; shift
533 if [ ! -z "${egroups}" ] 529 if [[ ! -z ${egroups} ]] ; then
534 then
535 local oldifs="${IFS}" 530 local oldifs=${IFS}
536 local defgroup="" exgroups="" 531 local defgroup="" exgroups=""
537 532
538 export IFS="," 533 export IFS=","
539 for g in ${egroups} 534 for g in ${egroups} ; do
540 do
541 export IFS="${oldifs}" 535 export IFS=${oldifs}
542 if [ -z "`egetent group \"${g}\"`" ] 536 if [[ -z $(egetent group "${g}") ]] ; then
543 then
544 eerror "You must add group ${g} to the system first" 537 eerror "You must add group ${g} to the system first"
545 die "${g} is not a valid GID" 538 die "${g} is not a valid GID"
546 fi 539 fi
547 if [ -z "${defgroup}" ] 540 if [[ -z ${defgroup} ]] ; then
548 then
549 defgroup="${g}" 541 defgroup=${g}
550 else 542 else
551 exgroups="${exgroups},${g}" 543 exgroups="${exgroups},${g}"
552 fi 544 fi
553 export IFS="," 545 export IFS=","
554 done 546 done
555 export IFS="${oldifs}" 547 export IFS=${oldifs}
556 548
557 opts="${opts} -g ${defgroup}" 549 opts="${opts} -g ${defgroup}"
558 if [ ! -z "${exgroups}" ] 550 if [[ ! -z ${exgroups} ]] ; then
559 then
560 opts="${opts} -G ${exgroups:1}" 551 opts="${opts} -G ${exgroups:1}"
561 fi 552 fi
562 else 553 else
563 egroups="(none)" 554 egroups="(none)"
564 fi 555 fi
565 einfo " - Groups: ${egroups}" 556 einfo " - Groups: ${egroups}"
566 557
567 # handle extra and add the user 558 # handle extra and add the user
568 local eextra="$@"
569 local oldsandbox="${SANDBOX_ON}" 559 local oldsandbox=${SANDBOX_ON}
570 export SANDBOX_ON="0" 560 export SANDBOX_ON="0"
571 if useq ppc-macos 561 case ${CHOST} in
572 then 562 *-darwin*)
573 ### Make the user 563 ### Make the user
574 if [ -z "${eextra}" ] 564 if [[ -z $@ ]] ; then
575 then
576 dscl . create /users/${euser} uid ${euid} 565 dscl . create /users/${euser} uid ${euid}
577 dscl . create /users/${euser} shell ${eshell} 566 dscl . create /users/${euser} shell ${eshell}
578 dscl . create /users/${euser} home ${ehome} 567 dscl . create /users/${euser} home ${ehome}
579 dscl . create /users/${euser} realname "added by portage for ${PN}" 568 dscl . create /users/${euser} realname "added by portage for ${PN}"
580 ### Add the user to the groups specified 569 ### Add the user to the groups specified
581 local oldifs="${IFS}" 570 local oldifs=${IFS}
582 export IFS="," 571 export IFS=","
583 for g in ${egroups} 572 for g in ${egroups} ; do
584 do
585 dscl . merge /groups/${g} users ${euser} 573 dscl . merge /groups/${g} users ${euser}
586 done 574 done
587 export IFS="${oldifs}" 575 export IFS=${oldifs}
588 else 576 else
589 einfo "Extra options are not supported on macos yet" 577 einfo "Extra options are not supported on Darwin yet"
590 einfo "Please report the ebuild along with the info below" 578 einfo "Please report the ebuild along with the info below"
591 einfo "eextra: ${eextra}" 579 einfo "eextra: $@"
592 die "Required function missing" 580 die "Required function missing"
593 fi 581 fi
594 elif use x86-fbsd ; then 582 ;;
595 if [ -z "${eextra}" ] 583 *-freebsd*)
596 then 584 if [[ -z $@ ]] ; then
597 pw useradd ${euser} ${opts} \ 585 pw useradd ${euser} ${opts} \
598 -c "added by portage for ${PN}" \ 586 -c "added by portage for ${PN}" \
599 die "enewuser failed" 587 die "enewuser failed"
600 else 588 else
601 einfo " - Extra: ${eextra}" 589 einfo " - Extra: $@"
602 pw useradd ${euser} ${opts} \ 590 pw useradd ${euser} ${opts} \
603 -c ${eextra} || die "enewuser failed" 591 "$@" || die "enewuser failed"
604 fi 592 fi
605 else 593 ;;
606 if [ -z "${eextra}" ] 594 *)
607 then 595 if [[ -z $@ ]] ; then
608 useradd ${opts} ${euser} \ 596 useradd ${opts} ${euser} \
609 -c "added by portage for ${PN}" \ 597 -c "added by portage for ${PN}" \
610 || die "enewuser failed" 598 || die "enewuser failed"
611 else 599 else
612 einfo " - Extra: ${eextra}" 600 einfo " - Extra: $@"
613 useradd ${opts} ${euser} ${eextra} \ 601 useradd ${opts} ${euser} "$@" \
614 || die "enewuser failed" 602 || die "enewuser failed"
615 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}"
616 fi 612 fi
613
617 export SANDBOX_ON="${oldsandbox}" 614 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} 615}
627 616
628# Simplify/standardize adding groups to the system 617# Simplify/standardize adding groups to the system
629# vapier@gentoo.org 618# vapier@gentoo.org
630# 619#
659 then 648 then
660 if [ "${egid}" -gt 0 ] 649 if [ "${egid}" -gt 0 ]
661 then 650 then
662 if [ -z "`egetent group ${egid}`" ] 651 if [ -z "`egetent group ${egid}`" ]
663 then 652 then
664 if useq ppc-macos ; then 653 if [[ "${CHOST}" == *-darwin* ]]; then
665 opts="${opts} ${egid}" 654 opts="${opts} ${egid}"
666 else 655 else
667 opts="${opts} -g ${egid}" 656 opts="${opts} -g ${egid}"
668 fi 657 fi
669 else 658 else
683 opts="${opts} ${eextra}" 672 opts="${opts} ${eextra}"
684 673
685 # add the group 674 # add the group
686 local oldsandbox="${SANDBOX_ON}" 675 local oldsandbox="${SANDBOX_ON}"
687 export SANDBOX_ON="0" 676 export SANDBOX_ON="0"
688 if useq ppc-macos ; then 677 case ${CHOST} in
678 *-darwin*)
689 if [ ! -z "${eextra}" ]; 679 if [ ! -z "${eextra}" ];
690 then 680 then
691 einfo "Extra options are not supported on macos yet" 681 einfo "Extra options are not supported on Darwin/OS X yet"
692 einfo "Please report the ebuild along with the info below" 682 einfo "Please report the ebuild along with the info below"
693 einfo "eextra: ${eextra}" 683 einfo "eextra: ${eextra}"
694 die "Required function missing" 684 die "Required function missing"
695 fi 685 fi
696 686
697 # If we need the next available 687 # If we need the next available
698 case ${egid} in 688 case ${egid} in
699 *[!0-9]*) # Non numeric 689 *[!0-9]*) # Non numeric
700 for egid in `jot 898 101`; do 690 for egid in $(seq 101 999); do
701 [ -z "`egetent group ${egid}`" ] && break 691 [ -z "`egetent group ${egid}`" ] && break
702 done 692 done
703 esac 693 esac
704 dscl . create /groups/${egroup} gid ${egid} 694 dscl . create /groups/${egroup} gid ${egid}
705 dscl . create /groups/${egroup} passwd '*' 695 dscl . create /groups/${egroup} passwd '*'
706 elif use x86-fbsd ; then 696 ;;
697
698 *-freebsd*)
707 case ${egid} in 699 case ${egid} in
708 *[!0-9]*) # Non numeric 700 *[!0-9]*) # Non numeric
709 for egid in `jot 898 101`; do 701 for egid in $(seq 101 999); do
710 [ -z "`egetent group ${egid}`" ] && break 702 [ -z "`egetent group ${egid}`" ] && break
711 done 703 done
712 esac 704 esac
713 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 705 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
714 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 *)
715 groupadd ${opts} ${egroup} || die "enewgroup failed" 719 groupadd ${opts} ${egroup} || die "enewgroup failed"
716 fi 720 ;;
721 esac
717 export SANDBOX_ON="${oldsandbox}" 722 export SANDBOX_ON="${oldsandbox}"
718} 723}
719 724
720# Simple script to replace 'dos2unix' binaries 725# Simple script to replace 'dos2unix' binaries
721# vapier@gentoo.org 726# vapier@gentoo.org
746# name: the name that will show up in the menu 751# name: the name that will show up in the menu
747# icon: give your little like a pretty little icon ... 752# icon: give your little like a pretty little icon ...
748# this can be relative (to /usr/share/pixmaps) or 753# this can be relative (to /usr/share/pixmaps) or
749# a full path to an icon 754# a full path to an icon
750# type: what kind of application is this ? for categories: 755# type: what kind of application is this ? for categories:
751# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 756# http://www.freedesktop.org/Standards/desktop-entry-spec
752# path: if your app needs to startup in a specific dir 757# path: if your app needs to startup in a specific dir
753make_desktop_entry() { 758make_desktop_entry() {
754 [[ -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
755 760
756 local exec=${1} 761 local exec=${1}
782 dev) 787 dev)
783 type="Development" 788 type="Development"
784 ;; 789 ;;
785 790
786 games) 791 games)
787 [[ -z ${path} ]] && path=${GAMES_BINDIR}
788
789 case ${catmin} in 792 case ${catmin} in
790 action) type=ActionGame;; 793 action) type=ActionGame;;
791 arcade) type=ArcadeGame;; 794 arcade) type=ArcadeGame;;
792 board) type=BoardGame;; 795 board) type=BoardGame;;
793 kid) type=KidsGame;; 796 kid) type=KidsGame;;
858 *) 861 *)
859 type= 862 type=
860 ;; 863 ;;
861 esac 864 esac
862 fi 865 fi
863 866 if [ "${SLOT}" == "0" ] ; then
867 local desktop_name="${PN}"
868 else
869 local desktop_name="${PN}-${SLOT}"
870 fi
864 local desktop=${T}/${exec%% *}-${P}.desktop 871 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
865 872
866echo "[Desktop Entry] 873echo "[Desktop Entry]
867Encoding=UTF-8 874Encoding=UTF-8
868Version=0.9.2 875Version=0.9.2
869Name=${name} 876Name=${name}
872Exec=${exec} 879Exec=${exec}
873Path=${path} 880Path=${path}
874Icon=${icon} 881Icon=${icon}
875Categories=Application;${type};" > "${desktop}" 882Categories=Application;${type};" > "${desktop}"
876 883
884 (
885 # wrap the env here so that the 'insinto' call
886 # doesn't corrupt the env of the caller
877 insinto /usr/share/applications 887 insinto /usr/share/applications
878 doins "${desktop}" 888 doins "${desktop}"
879 889 )
880 return 0
881} 890}
882 891
883# Make a GDM/KDM Session file 892# Make a GDM/KDM Session file
884# 893#
885# make_desktop_entry(<title>, <command>) 894# make_desktop_entry(<title>, <command>)
914 doins "${i}" 923 doins "${i}"
915 elif [[ -d ${i} ]] ; then 924 elif [[ -d ${i} ]] ; then
916 for j in "${i}"/*.desktop ; do 925 for j in "${i}"/*.desktop ; do
917 doins "${j}" 926 doins "${j}"
918 done 927 done
919 fi 928 fi
920 done 929 done
921} 930}
922newmenu() { 931newmenu() {
923 insinto /usr/share/applications 932 insinto /usr/share/applications
924 newins "$1" "$2" 933 newins "$1" "$2"
932 doins "${i}" 941 doins "${i}"
933 elif [[ -d ${i} ]] ; then 942 elif [[ -d ${i} ]] ; then
934 for j in "${i}"/*.png ; do 943 for j in "${i}"/*.png ; do
935 doins "${j}" 944 doins "${j}"
936 done 945 done
937 fi 946 fi
938 done 947 done
939} 948}
940newicon() { 949newicon() {
941 insinto /usr/share/pixmaps 950 insinto /usr/share/pixmaps
942 newins "$1" "$2" 951 newins "$1" "$2"
947############################################################## 956##############################################################
948 957
949 958
950# for internal use only (unpack_pdv and unpack_makeself) 959# for internal use only (unpack_pdv and unpack_makeself)
951find_unpackable_file() { 960find_unpackable_file() {
952 local src="$1" 961 local src=$1
953 if [ -z "${src}" ] 962 if [[ -z ${src} ]] ; then
954 then
955 src="${DISTDIR}/${A}" 963 src=${DISTDIR}/${A}
956 else 964 else
957 if [ -e "${DISTDIR}/${src}" ] 965 if [[ -e ${DISTDIR}/${src} ]] ; then
958 then
959 src="${DISTDIR}/${src}" 966 src=${DISTDIR}/${src}
960 elif [ -e "${PWD}/${src}" ] 967 elif [[ -e ${PWD}/${src} ]] ; then
961 then
962 src="${PWD}/${src}" 968 src=${PWD}/${src}
963 elif [ -e "${src}" ] 969 elif [[ -e ${src} ]] ; then
964 then
965 src="${src}" 970 src=${src}
966 fi
967 fi 971 fi
968 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 972 fi
973 [[ ! -e ${src} ]] && return 1
969 echo "${src}" 974 echo "${src}"
970} 975}
971 976
972# Unpack those pesky pdv generated files ... 977# Unpack those pesky pdv generated files ...
973# They're self-unpacking programs with the binary package stuffed in 978# They're self-unpacking programs with the binary package stuffed in
988# lseek 993# lseek
989# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 994# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
990# lseek(3, -4, SEEK_END) = 2981250 995# lseek(3, -4, SEEK_END) = 2981250
991# 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.
992unpack_pdv() { 997unpack_pdv() {
993 local src="`find_unpackable_file $1`" 998 local src=$(find_unpackable_file $1)
994 local sizeoff_t="$2" 999 local sizeoff_t=$2
995 1000
1001 [[ -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 :(" 1002 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
997 1003
998 local shrtsrc="`basename ${src}`" 1004 local shrtsrc="`basename ${src}`"
999 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1005 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1000 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1006 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\"` 1007 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1067# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1073# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1068# - If the file is not specified then unpack will utilize ${A}. 1074# - If the file is not specified then unpack will utilize ${A}.
1069# - 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
1070# the proper offset from the script itself. 1076# the proper offset from the script itself.
1071unpack_makeself() { 1077unpack_makeself() {
1072 local src="$(find_unpackable_file "$1")" 1078 local src=$(find_unpackable_file "$1")
1073 local skip="$2" 1079 local skip=$2
1074 local exe="$3" 1080 local exe=$3
1075 1081
1082 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1083
1076 local shrtsrc="$(basename "${src}")" 1084 local shrtsrc=$(basename "${src}")
1077 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1085 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1078 if [ -z "${skip}" ] 1086 if [ -z "${skip}" ]
1079 then 1087 then
1080 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1088 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1081 local skip=0 1089 local skip=0
1152check_license() { 1160check_license() {
1153 local lic=$1 1161 local lic=$1
1154 if [ -z "${lic}" ] ; then 1162 if [ -z "${lic}" ] ; then
1155 lic="${PORTDIR}/licenses/${LICENSE}" 1163 lic="${PORTDIR}/licenses/${LICENSE}"
1156 else 1164 else
1157 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1165 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1158 lic="${PORTDIR}/licenses/${src}" 1166 lic="${PORTDIR}/licenses/${lic}"
1159 elif [ -e "${PWD}/${src}" ] ; then 1167 elif [ -e "${PWD}/${lic}" ] ; then
1160 lic="${PWD}/${src}" 1168 lic="${PWD}/${lic}"
1161 elif [ -e "${src}" ] ; then 1169 elif [ -e "${lic}" ] ; then
1162 lic="${src}" 1170 lic="${lic}"
1163 fi
1164 fi 1171 fi
1172 fi
1165 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1173 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1166 local l="`basename ${lic}`" 1174 local l="`basename ${lic}`"
1167 1175
1168 # here is where we check for the licenses the user already 1176 # 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 1177 # accepted ... if we don't find a match, we make the user accept
1170 local shopts=$- 1178 local shopts=$-
1341# displayed and we'll hang out here until: 1349# displayed and we'll hang out here until:
1342# (1) the file is found on a mounted cdrom 1350# (1) the file is found on a mounted cdrom
1343# (2) the user hits CTRL+C 1351# (2) the user hits CTRL+C
1344cdrom_locate_file_on_cd() { 1352cdrom_locate_file_on_cd() {
1345 while [[ -z ${CDROM_ROOT} ]] ; do 1353 while [[ -z ${CDROM_ROOT} ]] ; do
1346 local dir="$(dirname ${@})" 1354 local dir=$(dirname "$*")
1347 local file="$(basename ${@})" 1355 local file=$(basename "$*")
1348 local mline="" 1356 local mline=""
1349 local showedmsg=0 1357 local showedmsg=0
1350 1358
1351 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
1352 [[ -d ${mline}/${dir} ]] || continue 1360 [[ -d ${mline}/${dir} ]] || continue
1373 fi 1381 fi
1374 showedmsg=1 1382 showedmsg=1
1375 fi 1383 fi
1376 einfo "Press return to scan for the cd again" 1384 einfo "Press return to scan for the cd again"
1377 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."
1378 read 1391 read
1379 fi 1392 fi
1380 done 1393 done
1381} 1394}
1382 1395
1446 while ((i--)) ; do 1459 while ((i--)) ; do
1447 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1460 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1448 done 1461 done
1449 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1462 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1450 case ${ARCH} in 1463 case ${ARCH} in
1451 x86) export ARCH="i386";; 1464 x86) export ARCH="i386";;
1452 amd64) export ARCH="x86_64";; 1465 amd64) export ARCH="x86_64";;
1453 hppa) export ARCH="parisc";; 1466 hppa) export ARCH="parisc";;
1454 mips) export ARCH="mips";; 1467 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! 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!
1456 *) export ARCH="${ARCH}";; 1469 *) export ARCH="${ARCH}";;
1457 esac 1470 esac
1458} 1471}
1459 1472
1460# set's ARCH back to what portage expects 1473# set's ARCH back to what portage expects
1461set_arch_to_portage() { 1474set_arch_to_portage() {
1505 LIB=$1 1518 LIB=$1
1506 1519
1507 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1520 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1508 SONAME=`basename ${LIB}` 1521 SONAME=`basename ${LIB}`
1509 1522
1510 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."
1511 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"
1512 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,"
1513 einfo "you will need to execute the following command:" 1526 ewarn "you will need to execute the following command:"
1514 einfo " revdep-rebuild --soname ${SONAME}" 1527 ewarn " revdep-rebuild --soname ${SONAME}"
1515 einfo 1528 ewarn
1516 einfo "After doing that, you can safely remove ${LIB}" 1529 ewarn "After doing that, you can safely remove ${LIB}"
1517 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1530 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1518 fi 1531 fi
1519} 1532}
1520 1533
1521# 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
1522# certain USE flags 1535# certain USE flags
1595# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1608# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1596# $5 == path for wrapper 1609# $5 == path for wrapper
1597make_wrapper() { 1610make_wrapper() {
1598 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1611 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1599 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"
1600 cat << EOF > "${tmpwrapper}" 1615 cat << EOF > "${tmpwrapper}"
1601#!/bin/sh 1616#!/bin/sh
1602cd "${chdir}" 1617cd "${chdir:-.}"
1618if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then
1603export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1619 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1620fi
1604exec ${bin} "\$@" 1621exec ${bin} "\$@"
1605EOF 1622EOF
1606 chmod go+rx "${tmpwrapper}" 1623 chmod go+rx "${tmpwrapper}"
1607 if [ -n "${5}" ] 1624 if [[ -n ${path} ]] ; then
1608 then
1609 exeinto ${5} 1625 exeinto "${path}"
1610 newexe "${tmpwrapper}" "${wrapper}" 1626 newexe "${tmpwrapper}" "${wrapper}"
1611 else 1627 else
1612 newbin "${tmpwrapper}" "${wrapper}" 1628 newbin "${tmpwrapper}" "${wrapper}"
1613 fi 1629 fi
1614} 1630}

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

  ViewVC Help
Powered by ViewVC 1.1.20