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

Diff of /eclass/eutils.eclass

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

Revision 1.231 Revision 1.279
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2006 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.231 2006/03/18 18:38:11 swegener Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.279 2007/04/25 09:14:35 carlo Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 11
12inherit multilib portability 12inherit multilib portability
13
14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 13
17DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
18 15
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 16# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
21# outputting to a terminal, don't wait. For compatability purposes, the argument 18# outputting to a terminal, don't wait. For compatability purposes, the argument
22# must be an integer greater than zero. 19# must be an integer greater than zero.
23# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
24epause() { 21epause() {
25 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
26 sleep ${1:-5}
27 fi
28} 23}
29 24
30# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
31# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
32# don't beep. 27# don't beep.
33# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
34ebeep() { 29ebeep() {
35 local n 30 local n
36 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
37 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
38 echo -ne "\a" 33 echo -ne "\a"
39 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
40 echo -ne "\a" 35 echo -ne "\a"
41 sleep 1 36 sleep 1
42 done 37 done
43 fi 38 fi
44} 39}
45 40
46# This function generate linker scripts in /usr/lib for dynamic 41# This function generate linker scripts in /usr/lib for dynamic
47# libs in /lib. This is to fix linking problems when you have 42# libs in /lib. This is to fix linking problems when you have
48# the .so in /lib, and the .a in /usr/lib. What happens is that 43# the .so in /lib, and the .a in /usr/lib. What happens is that
49# in some cases when linking dynamic, the .a in /usr/lib is used 44# in some cases when linking dynamic, the .a in /usr/lib is used
50# instead of the .so in /lib due to gcc/libtool tweaking ld's 45# instead of the .so in /lib due to gcc/libtool tweaking ld's
51# library search path. This cause many builds to fail. 46# library search path. This cause many builds to fail.
52# See bug #4411 for more info. 47# See bug #4411 for more info.
53# 48#
54# To use, simply call: 49# To use, simply call:
55# 50#
56# gen_usr_ldscript libfoo.so 51# gen_usr_ldscript libfoo.so
57# 52#
58# Note that you should in general use the unversioned name of 53# Note that you should in general use the unversioned name of
59# the library, as ldconfig should usually update it correctly 54# the library, as ldconfig should usually update it correctly
60# to point to the latest version of the library present. 55# to point to the latest version of the library present.
61# 56#
62# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
63# 58#
64gen_usr_ldscript() { 59gen_usr_ldscript() {
60 if [[ $(type -t _tc_gen_usr_ldscript) == "function" ]] ; then
61 _tc_gen_usr_ldscript "$@"
62 return $?
63 fi
64
65 ewarn "QA Notice: Please upgrade your ebuild to use toolchain-funcs"
66 ewarn "QA Notice: rather than gen_usr_ldscript() from eutils"
67
65 local lib libdir=$(get_libdir) 68 local lib libdir=$(get_libdir)
66 # Just make sure it exists 69 # Just make sure it exists
67 dodir /usr/${libdir} 70 dodir /usr/${libdir}
68 71
69 for lib in "${@}" ; do 72 for lib in "${@}" ; do
90# Default options for patch 93# Default options for patch
91# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 94# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
92# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 95# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
93# Set -E to automatically remove empty files. 96# Set -E to automatically remove empty files.
94EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
95# List of patches not to apply. Not this is only file names, 98# List of patches not to apply. Not this is only file names,
96# and not the full path .. 99# and not the full path ..
97EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
98# Change the printed message for a single patch. 101# Change the printed message for a single patch.
99EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
100# Change the printed message for multiple patches. 103# Change the printed message for multiple patches.
101EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 104EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
102# Force applying bulk patches even if not following the style: 105# Force applying bulk patches even if not following the style:
103# 106#
104# ??_${ARCH}_foo.${EPATCH_SUFFIX} 107# ??_${ARCH}_foo.${EPATCH_SUFFIX}
105# 108#
106EPATCH_FORCE="no" 109EPATCH_FORCE="no"
107 110
108# This function is for bulk patching, or in theory for just one 111# This function is for bulk patching, or in theory for just one
109# or two patches. 112# or two patches.
120# 123#
121# Patches are applied in current directory. 124# Patches are applied in current directory.
122# 125#
123# Bulk Patches should preferibly have the form of: 126# Bulk Patches should preferibly have the form of:
124# 127#
125# ??_${ARCH}_foo.${EPATCH_SUFFIX} 128# ??_${ARCH}_foo.${EPATCH_SUFFIX}
126# 129#
127# For example: 130# For example:
128# 131#
129# 01_all_misc-fix.patch.bz2 132# 01_all_misc-fix.patch.bz2
130# 02_sparc_another-fix.patch.bz2 133# 02_sparc_another-fix.patch.bz2
131# 134#
132# This ensures that there are a set order, and you can have ARCH 135# This ensures that there are a set order, and you can have ARCH
133# specific patches. 136# specific patches.
134# 137#
135# If you however give an argument to epatch(), it will treat it as a 138# If you however give an argument to epatch(), it will treat it as a
223 fi 226 fi
224 for x in ${EPATCH_SOURCE} 227 for x in ${EPATCH_SOURCE}
225 do 228 do
226 # New ARCH dependant patch naming scheme ... 229 # New ARCH dependant patch naming scheme ...
227 # 230 #
228 # ???_arch_foo.patch 231 # ???_arch_foo.patch
229 # 232 #
230 if [ -f ${x} ] && \ 233 if [ -f ${x} ] && \
231 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \ 234 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
232 [ "${EPATCH_FORCE}" = "yes" ]) 235 [ "${EPATCH_FORCE}" = "yes" ])
233 then 236 then
234 local count=0 237 local count=0
235 local popts="${EPATCH_OPTS}" 238 local popts="${EPATCH_OPTS}"
236 local patchname=${x##*/} 239 local patchname=${x##*/}
237 240
265 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
266 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
267 270
268 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
269 then 272 then
270 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
271 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
272 else 275 else
273 PATCH_TARGET="${x}" 276 PATCH_TARGET="${x}"
274 fi 277 fi
275 278
276 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
277 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 280 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
278 281
279 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
280 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
281 284
436# shell: /bin/false 439# shell: /bin/false
437# homedir: /dev/null 440# homedir: /dev/null
438# groups: none 441# groups: none
439# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
440enewuser() { 443enewuser() {
444 case ${EBUILD_PHASE} in
445 unpack|compile|test|install)
446 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
447 eerror "Package fails at QA and at life. Please file a bug."
448 die "Bad package! enewuser is only for use in pkg_* functions!"
449 esac
450
441 # get the username 451 # get the username
442 local euser=$1; shift 452 local euser=$1; shift
443 if [[ -z ${euser} ]] ; then 453 if [[ -z ${euser} ]] ; then
444 eerror "No username specified !" 454 eerror "No username specified !"
445 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
446 fi 456 fi
447 457
448 # lets see if the username already exists 458 # lets see if the username already exists
449 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
450 return 0 460 return 0
451 fi 461 fi
452 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
453 463
454 # options to pass to useradd 464 # options to pass to useradd
455 local opts= 465 local opts=
456 466
457 # handle uid 467 # handle uid
458 local euid=$1; shift 468 local euid=$1; shift
459 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
460 if [[ ${euid} -gt 0 ]] ; then 470 if [[ ${euid} -gt 0 ]] ; then
461 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
462 euid="next" 472 euid="next"
463 fi 473 fi
464 else 474 else
465 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
466 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
467 fi 477 fi
468 else 478 else
469 euid="next" 479 euid="next"
470 fi 480 fi
471 if [[ ${euid} == "next" ]] ; then 481 if [[ ${euid} == "next" ]] ; then
472 for euid in $(seq 101 999) ; do 482 for ((euid = 101; euid <= 999; euid++)); do
473 [[ -z $(egetent passwd ${euid}) ]] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
474 done 484 done
475 fi 485 fi
476 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
477 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
491 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do 501 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
492 [[ -x ${ROOT}${shell} ]] && break 502 [[ -x ${ROOT}${shell} ]] && break
493 done 503 done
494 504
495 if [[ ${shell} == "/dev/null" ]] ; then 505 if [[ ${shell} == "/dev/null" ]] ; then
496 eerror "Unable to identify the shell to use" 506 eerror "Unable to identify the shell to use, proceeding with userland default."
497 die "Unable to identify the shell to use" 507 case ${USERLAND} in
508 GNU) shell="/bin/false" ;;
509 BSD) shell="/sbin/nologin" ;;
510 Darwin) shell="/usr/sbin/nologin" ;;
511 *) die "Unable to identify the default shell for userland ${USERLAND}"
512 esac
498 fi 513 fi
499 514
500 eshell=${shell} 515 eshell=${shell}
501 fi 516 fi
502 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
631# Default values if you do not specify any: 646# Default values if you do not specify any:
632# groupname: REQUIRED ! 647# groupname: REQUIRED !
633# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
634# extra: none 649# extra: none
635enewgroup() { 650enewgroup() {
651 case ${EBUILD_PHASE} in
652 unpack|compile|test|install)
653 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
654 eerror "Package fails at QA and at life. Please file a bug."
655 die "Bad package! enewgroup is only for use in pkg_* functions!"
656 esac
657
636 # get the group 658 # get the group
637 local egroup="$1"; shift 659 local egroup="$1"; shift
638 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
639 then 661 then
640 eerror "No group specified !" 662 eerror "No group specified !"
641 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
642 fi 664 fi
643 665
644 # see if group already exists 666 # see if group already exists
645 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
646 then
647 return 0 668 return 0
648 fi 669 fi
649 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
650 671
651 # options to pass to useradd 672 # options to pass to useradd
694 fi 715 fi
695 716
696 # If we need the next available 717 # If we need the next available
697 case ${egid} in 718 case ${egid} in
698 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
699 for egid in $(seq 101 999); do 720 for ((egid = 101; egid <= 999; egid++)); do
700 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
701 done 722 done
702 esac 723 esac
703 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
704 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
705 ;; 726 ;;
706 727
707 *-freebsd*|*-dragonfly*) 728 *-freebsd*|*-dragonfly*)
708 case ${egid} in 729 case ${egid} in
709 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
710 for egid in $(seq 101 999); do 731 for ((egid = 101; egid <= 999; egid++)); do
711 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
712 done 733 done
713 esac 734 esac
714 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
715 ;; 736 ;;
716 737
717 *-netbsd*) 738 *-netbsd*)
718 case ${egid} in 739 case ${egid} in
719 *[!0-9]*) # Non numeric 740 *[!0-9]*) # Non numeric
720 for egid in $(seq 101 999); do 741 for ((egid = 101; egid <= 999; egid++)); do
721 [ -z "`egetent group ${egid}`" ] && break 742 [[ -z $(egetent group ${egid}) ]] && break
722 done 743 done
723 esac 744 esac
724 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
725 ;; 746 ;;
726 747
734# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
735# vapier@gentoo.org 756# vapier@gentoo.org
736# 757#
737# edos2unix(file, <more files> ...) 758# edos2unix(file, <more files> ...)
738edos2unix() { 759edos2unix() {
739 for f in "$@" 760 echo "$@" | xargs sed -i 's/\r$//'
740 do
741 cp "${f}" ${T}/edos2unix
742 sed 's/\r$//' ${T}/edos2unix > "${f}"
743 done
744} 761}
745 762
746 763
747############################################################## 764##############################################################
748# START: Handle .desktop files and menu entries # 765# START: Handle .desktop files and menu entries #
749# maybe this should be separated into a new eclass some time # 766# maybe this should be separated into a new eclass some time #
750# lanius@gentoo.org # 767# lanius@gentoo.org #
751############################################################## 768##############################################################
752 769
753# Make a desktop file ! 770# Make a desktop file !
754# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
755# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
756# 773#
757# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
758# 775#
759# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
760# name: the name that will show up in the menu 777# name: the name that will show up in the menu
761# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
762# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
763# a full path to an icon 780# a full path to an icon
764# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
765# http://www.freedesktop.org/Standards/desktop-entry-spec 782# http://www.freedesktop.org/Standards/desktop-entry-spec
766# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
767make_desktop_entry() { 784make_desktop_entry() {
768 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 785 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
769 786
777 local catmaj=${CATEGORY%%-*} 794 local catmaj=${CATEGORY%%-*}
778 local catmin=${CATEGORY##*-} 795 local catmin=${CATEGORY##*-}
779 case ${catmaj} in 796 case ${catmaj} in
780 app) 797 app)
781 case ${catmin} in 798 case ${catmin} in
782 admin) type=System;; 799 admin) type=System;;
783 cdr) type=DiscBurning;; 800 cdr) type=DiscBurning;;
784 dicts) type=Dictionary;; 801 dicts) type=Dictionary;;
785 editors) type=TextEditor;; 802 editors) type=TextEditor;;
786 emacs) type=TextEditor;; 803 emacs) type=TextEditor;;
787 emulation) type=Emulator;; 804 emulation) type=Emulator;;
788 laptop) type=HardwareSettings;; 805 laptop) type=HardwareSettings;;
789 office) type=Office;; 806 office) type=Office;;
790 vim) type=TextEditor;; 807 vim) type=TextEditor;;
791 xemacs) type=TextEditor;; 808 xemacs) type=TextEditor;;
792 *) type=;; 809 *) type=;;
793 esac 810 esac
794 ;; 811 ;;
795 812
796 dev) 813 dev)
797 type="Development" 814 type="Development"
798 ;; 815 ;;
799 816
800 games) 817 games)
801 case ${catmin} in 818 case ${catmin} in
802 action) type=ActionGame;; 819 action|fps) type=ActionGame;;
803 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
804 board) type=BoardGame;; 821 board) type=BoardGame;;
805 kid) type=KidsGame;; 822 kids) type=KidsGame;;
806 emulation) type=Emulator;; 823 emulation) type=Emulator;;
807 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
808 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
809 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
810 simulation) type=Simulation;; 827 simulation) type=Simulation;;
811 sports) type=SportsGame;; 828 sports) type=SportsGame;;
812 strategy) type=StrategyGame;; 829 strategy) type=StrategyGame;;
813 *) type=;; 830 *) type=;;
814 esac 831 esac
815 type="Game;${type}" 832 type="Game;${type}"
816 ;; 833 ;;
817 834
818 mail) 835 mail)
822 media) 839 media)
823 case ${catmin} in 840 case ${catmin} in
824 gfx) type=Graphics;; 841 gfx) type=Graphics;;
825 radio) type=Tuner;; 842 radio) type=Tuner;;
826 sound) type=Audio;; 843 sound) type=Audio;;
827 tv) type=TV;; 844 tv) type=TV;;
828 video) type=Video;; 845 video) type=Video;;
829 *) type=;; 846 *) type=;;
830 esac 847 esac
831 type="AudioVideo;${type}" 848 type="AudioVideo;${type}"
832 ;; 849 ;;
833 850
834 net) 851 net)
835 case ${catmin} in 852 case ${catmin} in
836 dialup) type=Dialup;; 853 dialup) type=Dialup;;
837 ftp) type=FileTransfer;; 854 ftp) type=FileTransfer;;
838 im) type=InstantMessaging;; 855 im) type=InstantMessaging;;
839 irc) type=IRCClient;; 856 irc) type=IRCClient;;
840 mail) type=Email;; 857 mail) type=Email;;
841 news) type=News;; 858 news) type=News;;
842 nntp) type=News;; 859 nntp) type=News;;
843 p2p) type=FileTransfer;; 860 p2p) type=FileTransfer;;
844 *) type=;; 861 *) type=;;
845 esac 862 esac
846 type="Network;${type}" 863 type="Network;${type}"
847 ;; 864 ;;
848 865
849 sci) 866 sci)
850 case ${catmin} in 867 case ${catmin} in
851 astro*) type=Astronomy;; 868 astro*) type=Astronomy;;
852 bio*) type=Biology;; 869 bio*) type=Biology;;
853 calc*) type=Calculator;; 870 calc*) type=Calculator;;
854 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
855 geo*) type=Geology;; 872 geo*) type=Geology;;
856 math*) type=Math;; 873 math*) type=Math;;
857 *) type=;; 874 *) type=;;
858 esac 875 esac
859 type="Science;${type}" 876 type="Science;${type}"
860 ;; 877 ;;
861 878
862 www) 879 www)
863 case ${catmin} in 880 case ${catmin} in
864 client) type=WebBrowser;; 881 client) type=WebBrowser;;
865 *) type=;; 882 *) type=;;
866 esac 883 esac
867 type="Network" 884 type="Network"
868 ;; 885 ;;
869 886
870 *) 887 *)
875 if [ "${SLOT}" == "0" ] ; then 892 if [ "${SLOT}" == "0" ] ; then
876 local desktop_name="${PN}" 893 local desktop_name="${PN}"
877 else 894 else
878 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
879 fi 896 fi
897 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
880 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 898 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
881 899
900 cat <<-EOF > "${desktop}"
882echo "[Desktop Entry] 901 [Desktop Entry]
883Encoding=UTF-8 902 Encoding=UTF-8
884Version=0.9.2 903 Version=0.9.2
885Name=${name} 904 Name=${name}
886Type=Application 905 Type=Application
887Comment=${DESCRIPTION} 906 Comment=${DESCRIPTION}
888Exec=${exec} 907 Exec=${exec}
908 TryExec=${exec%% *}
889Path=${path} 909 Path=${path}
890Icon=${icon} 910 Icon=${icon}
891Categories=Application;${type};" > "${desktop}" 911 Categories=Application;${type};
912 EOF
892 913
893 ( 914 (
894 # wrap the env here so that the 'insinto' call 915 # wrap the env here so that the 'insinto' call
895 # doesn't corrupt the env of the caller 916 # doesn't corrupt the env of the caller
896 insinto /usr/share/applications 917 insinto /usr/share/applications
897 doins "${desktop}" 918 doins "${desktop}"
898 ) 919 )
899} 920}
900 921
922
923# Validate desktop entries using desktop-file-utils
924# Carsten Lohrke <carlo@gentoo.org>
925#
926# Usage: validate_desktop_entries [directory ...]
927
928validate_desktop_entries() {
929 if [[ -x /usr/bin/desktop-file-validate ]] ; then
930 einfo "Checking desktop entry validity"
931 local directories=""
932 for d in /usr/share/applications $@ ; do
933 [[ -d ${D}${d} ]] && directories="${directories} ${D}${d}"
934 done
935 if [[ -n ${directories} ]] ; then
936 for FILE in $(find ${directories} -name "*\.desktop" \
937 -not -path '*.hidden*' | sort -u 2>/dev/null)
938 do
939 local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \
940 sed -e "s|error: ||" -e "s|${FILE}:|--|g" )
941 [[ -n $temp ]] && elog ${temp/--/${FILE/${D}/}:}
942 done
943 fi
944 echo ""
945 else
946 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
947 fi
948}
949
950
901# Make a GDM/KDM Session file 951# Make a GDM/KDM Session file
902# 952#
903# make_desktop_entry(<title>, <command>) 953# make_session_desktop(<title>, <command>)
904# title: File to execute to start the Window Manager 954# title: File to execute to start the Window Manager
905# command: Name of the Window Manager 955# command: Name of the Window Manager
906 956
907make_session_desktop() { 957make_session_desktop() {
908 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 958 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
910 960
911 local title=$1 961 local title=$1
912 local command=$2 962 local command=$2
913 local desktop=${T}/${wm}.desktop 963 local desktop=${T}/${wm}.desktop
914 964
965 cat <<-EOF > "${desktop}"
915echo "[Desktop Entry] 966 [Desktop Entry]
916Encoding=UTF-8 967 Encoding=UTF-8
917Name=${title} 968 Name=${title}
918Comment=This session logs you into ${title} 969 Comment=This session logs you into ${title}
919Exec=${command} 970 Exec=${command}
920TryExec=${command} 971 TryExec=${command}
921Type=Application" > "${desktop}" 972 Type=Application
973 EOF
922 974
975 (
976 # wrap the env here so that the 'insinto' call
977 # doesn't corrupt the env of the caller
923 insinto /usr/share/xsessions 978 insinto /usr/share/xsessions
924 doins "${desktop}" 979 doins "${desktop}"
980 )
925} 981}
926 982
927domenu() { 983domenu() {
984 (
985 # wrap the env here so that the 'insinto' call
986 # doesn't corrupt the env of the caller
928 local i j 987 local i j ret=0
929 insinto /usr/share/applications 988 insinto /usr/share/applications
930 for i in "$@" ; do 989 for i in "$@" ; do
931 if [[ -f ${i} ]] ; then 990 if [[ -f ${i} ]] ; then
932 doins "${i}" 991 doins "${i}"
992 ((ret+=$?))
933 elif [[ -d ${i} ]] ; then 993 elif [[ -d ${i} ]] ; then
934 for j in "${i}"/*.desktop ; do 994 for j in "${i}"/*.desktop ; do
935 doins "${j}" 995 doins "${j}"
996 ((ret+=$?))
936 done 997 done
937 fi 998 fi
938 done 999 done
1000 exit ${ret}
1001 )
939} 1002}
940newmenu() { 1003newmenu() {
1004 (
1005 # wrap the env here so that the 'insinto' call
1006 # doesn't corrupt the env of the caller
941 insinto /usr/share/applications 1007 insinto /usr/share/applications
942 newins "$1" "$2" 1008 newins "$@"
1009 )
943} 1010}
944 1011
945doicon() { 1012doicon() {
1013 (
1014 # wrap the env here so that the 'insinto' call
1015 # doesn't corrupt the env of the caller
946 local i j 1016 local i j ret
947 insinto /usr/share/pixmaps 1017 insinto /usr/share/pixmaps
948 for i in "$@" ; do 1018 for i in "$@" ; do
949 if [[ -f ${i} ]] ; then 1019 if [[ -f ${i} ]] ; then
950 doins "${i}" 1020 doins "${i}"
1021 ((ret+=$?))
951 elif [[ -d ${i} ]] ; then 1022 elif [[ -d ${i} ]] ; then
952 for j in "${i}"/*.png ; do 1023 for j in "${i}"/*.png ; do
953 doins "${j}" 1024 doins "${j}"
1025 ((ret+=$?))
954 done 1026 done
955 fi 1027 fi
956 done 1028 done
1029 exit ${ret}
1030 )
957} 1031}
958newicon() { 1032newicon() {
1033 (
1034 # wrap the env here so that the 'insinto' call
1035 # doesn't corrupt the env of the caller
959 insinto /usr/share/pixmaps 1036 insinto /usr/share/pixmaps
960 newins "$1" "$2" 1037 newins "$@"
1038 )
961} 1039}
962 1040
963############################################################## 1041##############################################################
964# END: Handle .desktop files and menu entries # 1042# END: Handle .desktop files and menu entries #
965############################################################## 1043##############################################################
966 1044
967 1045
968# for internal use only (unpack_pdv and unpack_makeself) 1046# for internal use only (unpack_pdv and unpack_makeself)
969find_unpackable_file() { 1047find_unpackable_file() {
988# the middle of the archive. Valve seems to use it a lot ... too bad 1066# the middle of the archive. Valve seems to use it a lot ... too bad
989# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1067# it seems to like to segfault a lot :(. So lets take it apart ourselves.
990# 1068#
991# Usage: unpack_pdv [file to unpack] [size of off_t] 1069# Usage: unpack_pdv [file to unpack] [size of off_t]
992# - you have to specify the off_t size ... i have no idea how to extract that 1070# - you have to specify the off_t size ... i have no idea how to extract that
993# information out of the binary executable myself. basically you pass in 1071# information out of the binary executable myself. basically you pass in
994# the size of the off_t type (in bytes) on the machine that built the pdv 1072# the size of the off_t type (in bytes) on the machine that built the pdv
995# archive. one way to determine this is by running the following commands: 1073# archive. one way to determine this is by running the following commands:
996# strings <pdv archive> | grep lseek 1074# strings <pdv archive> | grep lseek
997# strace -elseek <pdv archive> 1075# strace -elseek <pdv archive>
998# basically look for the first lseek command (we do the strings/grep because 1076# basically look for the first lseek command (we do the strings/grep because
999# sometimes the function call is _llseek or something) and steal the 2nd 1077# sometimes the function call is _llseek or something) and steal the 2nd
1000# parameter. here is an example: 1078# parameter. here is an example:
1001# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1079# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1002# lseek 1080# lseek
1003# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1081# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1004# lseek(3, -4, SEEK_END) = 2981250 1082# lseek(3, -4, SEEK_END) = 2981250
1005# thus we would pass in the value of '4' as the second parameter. 1083# thus we would pass in the value of '4' as the second parameter.
1006unpack_pdv() { 1084unpack_pdv() {
1007 local src=$(find_unpackable_file $1) 1085 local src=$(find_unpackable_file "$1")
1008 local sizeoff_t=$2 1086 local sizeoff_t=$2
1009 1087
1010 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1088 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1011 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1089 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1012 1090
1013 local shrtsrc=$(basename "${src}") 1091 local shrtsrc=$(basename "${src}")
1014 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1092 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1015 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1093 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
1016 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1094 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
1017 1095
1018 # grab metadata for debug reasons 1096 # grab metadata for debug reasons
1019 local metafile="$(emktemp)" 1097 local metafile=$(emktemp)
1020 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1098 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1021 1099
1022 # rip out the final file name from the metadata 1100 # rip out the final file name from the metadata
1023 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1101 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1024 datafile="`basename ${datafile}`" 1102 datafile=$(basename "${datafile}")
1025 1103
1026 # now lets uncompress/untar the file if need be 1104 # now lets uncompress/untar the file if need be
1027 local tmpfile="$(emktemp)" 1105 local tmpfile=$(emktemp)
1028 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1106 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1029 1107
1030 local iscompressed="`file -b ${tmpfile}`" 1108 local iscompressed=$(file -b "${tmpfile}")
1031 if [ "${iscompressed:0:8}" == "compress" ] ; then 1109 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1032 iscompressed=1 1110 iscompressed=1
1033 mv ${tmpfile}{,.Z} 1111 mv ${tmpfile}{,.Z}
1034 gunzip ${tmpfile} 1112 gunzip ${tmpfile}
1035 else 1113 else
1036 iscompressed=0 1114 iscompressed=0
1037 fi 1115 fi
1038 local istar="`file -b ${tmpfile}`" 1116 local istar=$(file -b "${tmpfile}")
1039 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1117 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1040 istar=1 1118 istar=1
1041 else 1119 else
1042 istar=0 1120 istar=0
1043 fi 1121 fi
1044 1122
1080# many other game companies. 1158# many other game companies.
1081# 1159#
1082# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1160# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1083# - If the file is not specified then unpack will utilize ${A}. 1161# - If the file is not specified then unpack will utilize ${A}.
1084# - If the offset is not specified then we will attempt to extract 1162# - If the offset is not specified then we will attempt to extract
1085# the proper offset from the script itself. 1163# the proper offset from the script itself.
1086unpack_makeself() { 1164unpack_makeself() {
1087 local src_input=${1:-${A}} 1165 local src_input=${1:-${A}}
1088 local src=$(find_unpackable_file "${src_input}") 1166 local src=$(find_unpackable_file "${src_input}")
1089 local skip=$2 1167 local skip=$2
1090 local exe=$3 1168 local exe=$3
1096 if [[ -z ${skip} ]] ; then 1174 if [[ -z ${skip} ]] ; then
1097 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1175 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1098 local skip=0 1176 local skip=0
1099 exe=tail 1177 exe=tail
1100 case ${ver} in 1178 case ${ver} in
1101 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1179 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1102 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1180 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1103 ;; 1181 ;;
1104 2.0|2.0.1) 1182 2.0|2.0.1)
1105 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1183 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1106 ;; 1184 ;;
1136 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1214 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1137 *) die "makeself cant handle exe '${exe}'" 1215 *) die "makeself cant handle exe '${exe}'"
1138 esac 1216 esac
1139 1217
1140 # lets grab the first few bytes of the file to figure out what kind of archive it is 1218 # lets grab the first few bytes of the file to figure out what kind of archive it is
1141 local tmpfile="$(emktemp)" 1219 local tmpfile=$(emktemp)
1142 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1220 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1143 local filetype="$(file -b "${tmpfile}")" 1221 local filetype=$(file -b "${tmpfile}")
1144 case ${filetype} in 1222 case ${filetype} in
1145 *tar\ archive) 1223 *tar\ archive*)
1146 eval ${exe} | tar --no-same-owner -xf - 1224 eval ${exe} | tar --no-same-owner -xf -
1147 ;; 1225 ;;
1148 bzip2*) 1226 bzip2*)
1149 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1227 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1150 ;; 1228 ;;
1186 # accepted ... if we don't find a match, we make the user accept 1264 # accepted ... if we don't find a match, we make the user accept
1187 local shopts=$- 1265 local shopts=$-
1188 local alic 1266 local alic
1189 set -o noglob #so that bash doesn't expand "*" 1267 set -o noglob #so that bash doesn't expand "*"
1190 for alic in ${ACCEPT_LICENSE} ; do 1268 for alic in ${ACCEPT_LICENSE} ; do
1191 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1269 if [[ ${alic} == ${l} ]]; then
1192 set +o noglob; set -${shopts} #reset old shell opts 1270 set +o noglob; set -${shopts} #reset old shell opts
1193 return 0 1271 return 0
1194 fi 1272 fi
1195 done 1273 done
1196 set +o noglob; set -$shopts #reset old shell opts 1274 set +o noglob; set -$shopts #reset old shell opts
1197 1275
1198 local licmsg="$(emktemp)" 1276 local licmsg=$(emktemp)
1199 cat << EOF > ${licmsg} 1277 cat <<-EOF > ${licmsg}
1200********************************************************** 1278 **********************************************************
1201The following license outlines the terms of use of this 1279 The following license outlines the terms of use of this
1202package. You MUST accept this license for installation to 1280 package. You MUST accept this license for installation to
1203continue. When you are done viewing, hit 'q'. If you 1281 continue. When you are done viewing, hit 'q'. If you
1204CTRL+C out of this, the install will not run! 1282 CTRL+C out of this, the install will not run!
1205********************************************************** 1283 **********************************************************
1206 1284
1207EOF 1285 EOF
1208 cat ${lic} >> ${licmsg} 1286 cat ${lic} >> ${licmsg}
1209 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1287 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1210 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1288 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1211 read alic 1289 read alic
1212 case ${alic} in 1290 case ${alic} in
1229# and when the function returns, you can assume that the cd has been 1307# and when the function returns, you can assume that the cd has been
1230# found at CDROM_ROOT. 1308# found at CDROM_ROOT.
1231# 1309#
1232# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1310# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1233# etc... if you want to give the cds better names, then just export 1311# etc... if you want to give the cds better names, then just export
1234# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1312# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1313# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1314# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1315# CDROM_NAME_2="data cd"
1316# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1235# 1317#
1236# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1318# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1237# 1319#
1238# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1320# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1239# - this will attempt to locate a cd based upon a file that is on 1321# - this will attempt to locate a cd based upon a file that is on
1240# the cd ... the more files you give this function, the more cds 1322# the cd ... the more files you give this function, the more cds
1241# the cdrom functions will handle 1323# the cdrom functions will handle
1242cdrom_get_cds() { 1324cdrom_get_cds() {
1243 # first we figure out how many cds we're dealing with by 1325 # first we figure out how many cds we're dealing with by
1244 # the # of files they gave us 1326 # the # of files they gave us
1245 local cdcnt=0 1327 local cdcnt=0
1246 local f= 1328 local f=
1290 echo 1372 echo
1291 einfo "For example:" 1373 einfo "For example:"
1292 einfo "export CD_ROOT=/mnt/cdrom" 1374 einfo "export CD_ROOT=/mnt/cdrom"
1293 echo 1375 echo
1294 else 1376 else
1377 if [[ -n ${CDROM_NAME_SET} ]] ; then
1378 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1379 cdcnt=0
1380 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1381 ((++cdcnt))
1382 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1383 done
1384 fi
1385
1295 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1386 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1296 cdcnt=0 1387 cdcnt=0
1297 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1388 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1298 ((++cdcnt)) 1389 ((++cdcnt))
1299 var="CDROM_NAME_${cdcnt}" 1390 var="CDROM_NAME_${cdcnt}"
1366 1457
1367 while [[ -n ${cdset[${i}]} ]] ; do 1458 while [[ -n ${cdset[${i}]} ]] ; do
1368 local dir=$(dirname ${cdset[${i}]}) 1459 local dir=$(dirname ${cdset[${i}]})
1369 local file=$(basename ${cdset[${i}]}) 1460 local file=$(basename ${cdset[${i}]})
1370 1461
1371 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do 1462 local point= node= fs= foo=
1372 [[ -d ${mline}/${dir} ]] || continue 1463 while read point node fs foo ; do
1464 [[ " cd9660 iso9660 " != *" ${fs} "* ]] && \
1465 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1466 && continue
1467 point=${point//\040/ }
1373 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then 1468 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1374 export CDROM_ROOT=${mline} 1469 export CDROM_ROOT=${point}
1375 export CDROM_SET=${i} 1470 export CDROM_SET=${i}
1376 export CDROM_MATCH=${cdset[${i}]} 1471 export CDROM_MATCH=${cdset[${i}]}
1377 return 1472 return
1378 fi 1473 done <<< "$(get_mounts)"
1379 done
1380 1474
1381 ((++i)) 1475 ((++i))
1382 done 1476 done
1383 1477
1384 echo 1478 echo
1412 1506
1413# Make sure that LINGUAS only contains languages that 1507# Make sure that LINGUAS only contains languages that
1414# a package can support 1508# a package can support
1415# 1509#
1416# usage: strip-linguas <allow LINGUAS> 1510# usage: strip-linguas <allow LINGUAS>
1417# strip-linguas -i <directories of .po files> 1511# strip-linguas -i <directories of .po files>
1418# strip-linguas -u <directories of .po files> 1512# strip-linguas -u <directories of .po files>
1419# 1513#
1420# The first form allows you to specify a list of LINGUAS. 1514# The first form allows you to specify a list of LINGUAS.
1421# The -i builds a list of po files found in all the 1515# The -i builds a list of po files found in all the
1422# directories and uses the intersection of the lists. 1516# directories and uses the intersection of the lists.
1423# The -u builds a list of po files found in all the 1517# The -u builds a list of po files found in all the
1424# directories and uses the union of the lists. 1518# directories and uses the union of the lists.
1425strip-linguas() { 1519strip-linguas() {
1426 local ls newls 1520 local ls newls nols
1427 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1521 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1428 local op=$1; shift 1522 local op=$1; shift
1429 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift 1523 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1430 local d f 1524 local d f
1431 for d in "$@" ; do 1525 for d in "$@" ; do
1432 if [[ ${op} == "-u" ]] ; then 1526 if [[ ${op} == "-u" ]] ; then
1433 newls=${ls} 1527 newls=${ls}
1434 else 1528 else
1435 newls="" 1529 newls=""
1436 fi 1530 fi
1437 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do 1531 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1438 if [[ ${op} == "-i" ]] ; then 1532 if [[ ${op} == "-i" ]] ; then
1439 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1533 hasq ${f} ${ls} && newls="${newls} ${f}"
1440 else 1534 else
1441 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1535 hasq ${f} ${ls} || newls="${newls} ${f}"
1442 fi 1536 fi
1443 done 1537 done
1444 ls=${newls} 1538 ls=${newls}
1445 done 1539 done
1446 ls=${ls//.po}
1447 else 1540 else
1448 ls=$@ 1541 ls="$@"
1449 fi 1542 fi
1450 1543
1451 ls=" ${ls} " 1544 nols=""
1452 newls="" 1545 newls=""
1453 for f in ${LINGUAS} ; do 1546 for f in ${LINGUAS} ; do
1454 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1547 if hasq ${f} ${ls} ; then
1455 newls="${newls} ${f}" 1548 newls="${newls} ${f}"
1456 else 1549 else
1457 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1550 nols="${nols} ${f}"
1458 fi 1551 fi
1459 done 1552 done
1460 if [[ -z ${newls} ]] ; then 1553 [[ -n ${nols} ]] \
1461 export LINGUAS="" 1554 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1462 else
1463 export LINGUAS=${newls:1} 1555 export LINGUAS=${newls:1}
1464 fi
1465} 1556}
1466 1557
1467# moved from kernel.eclass since they are generally useful outside of 1558# moved from kernel.eclass since they are generally useful outside of
1468# kernel.eclass -iggy (20041002) 1559# kernel.eclass -iggy (20041002)
1469 1560
1476 while ((i--)) ; do 1567 while ((i--)) ; do
1477 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1568 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1478 done 1569 done
1479 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1570 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1480 case ${ARCH} in 1571 case ${ARCH} in
1481 x86) export ARCH="i386";; 1572 x86) export ARCH="i386";;
1482 amd64) export ARCH="x86_64";; 1573 amd64) export ARCH="x86_64";;
1483 hppa) export ARCH="parisc";; 1574 hppa) export ARCH="parisc";;
1484 mips) export ARCH="mips";; 1575 mips) export ARCH="mips";;
1485 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! 1576 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!
1486 *) export ARCH="${ARCH}";; 1577 *) export ARCH="${ARCH}";;
1487 esac 1578 esac
1488} 1579}
1489 1580
1490# set's ARCH back to what portage expects 1581# set's ARCH back to what portage expects
1491set_arch_to_portage() { 1582set_arch_to_portage() {
1498 1589
1499# Jeremy Huddleston <eradicator@gentoo.org>: 1590# Jeremy Huddleston <eradicator@gentoo.org>:
1500# preserve_old_lib /path/to/libblah.so.0 1591# preserve_old_lib /path/to/libblah.so.0
1501# preserve_old_lib_notify /path/to/libblah.so.0 1592# preserve_old_lib_notify /path/to/libblah.so.0
1502# 1593#
1503# These functions are useful when a lib in your package changes --library. Such 1594# These functions are useful when a lib in your package changes --library. Such
1504# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1595# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1505# would break packages that link against it. Most people get around this 1596# would break packages that link against it. Most people get around this
1506# by using the portage SLOT mechanism, but that is not always a relevant 1597# by using the portage SLOT mechanism, but that is not always a relevant
1507# solution, so instead you can add the following to your ebuilds: 1598# solution, so instead you can add the following to your ebuilds:
1508# 1599#
1509# src_install() { 1600# pkg_preinst() {
1510# ... 1601# ...
1511# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1602# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1512# ... 1603# ...
1513# } 1604# }
1514# 1605#
1517# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1608# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1518# ... 1609# ...
1519# } 1610# }
1520 1611
1521preserve_old_lib() { 1612preserve_old_lib() {
1522 LIB=$1 1613 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1614 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1615 die "Invalid preserve_old_lib() usage"
1616 fi
1617 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1523 1618
1524 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1619 local lib dir
1525 SONAME=`basename ${LIB}` 1620 for lib in "$@" ; do
1526 DIRNAME=`dirname ${LIB}` 1621 [[ -e ${ROOT}/${lib} ]] || continue
1527 1622 dir=${lib%/*}
1528 dodir ${DIRNAME} 1623 dodir ${dir} || die "dodir ${dir} failed"
1529 cp ${ROOT}${LIB} ${D}${DIRNAME} 1624 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1530 touch ${D}${LIB} 1625 touch "${D}"/${lib}
1531 fi 1626 done
1532} 1627}
1533 1628
1534preserve_old_lib_notify() { 1629preserve_old_lib_notify() {
1535 LIB=$1 1630 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1631 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1632 die "Invalid preserve_old_lib_notify() usage"
1633 fi
1536 1634
1537 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1635 local lib notice=0
1538 SONAME=`basename ${LIB}` 1636 for lib in "$@" ; do
1539 1637 [[ -e ${ROOT}/${lib} ]] || continue
1638 if [[ ${notice} -eq 0 ]] ; then
1639 notice=1
1540 ewarn "An old version of an installed library was detected on your system." 1640 ewarn "Old versions of installed libraries were detected on your system."
1541 ewarn "In order to avoid breaking packages that link against it, this older version" 1641 ewarn "In order to avoid breaking packages that depend on these old libs,"
1542 ewarn "is not being removed. In order to make full use of this newer version," 1642 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1543 ewarn "you will need to execute the following command:" 1643 ewarn "in order to remove these old dependencies. If you do not have this"
1544 ewarn " revdep-rebuild --library ${SONAME}" 1644 ewarn "helper program, simply emerge the 'gentoolkit' package."
1545 ewarn 1645 ewarn
1546 ewarn "After doing that, you can safely remove ${LIB}"
1547 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1548 fi 1646 fi
1647 ewarn " # revdep-rebuild --library ${lib##*/}"
1648 done
1549} 1649}
1550 1650
1551# Hack for people to figure out if a package was built with 1651# Hack for people to figure out if a package was built with
1552# certain USE flags 1652# certain USE flags
1553# 1653#
1554# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1654# Usage: built_with_use [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1555# ex: built_with_use xchat gtk2 1655# ex: built_with_use xchat gtk2
1556# 1656#
1557# Flags: -a all USE flags should be utilized 1657# Flags: -a all USE flags should be utilized
1558# -o at least one USE flag should be utilized 1658# -o at least one USE flag should be utilized
1659# --missing peform the specified action if the flag is not in IUSE (true/false/die)
1660# --hidden USE flag we're checking is hidden expanded so it isnt in IUSE
1559# Note: the default flag is '-a' 1661# Note: the default flag is '-a'
1560built_with_use() { 1662built_with_use() {
1663 local hidden="no"
1664 if [[ $1 == "--hidden" ]] ; then
1665 hidden="yes"
1666 shift
1667 fi
1668
1669 local missing_action="die"
1670 if [[ $1 == "--missing" ]] ; then
1671 missing_action=$2
1672 shift ; shift
1673 case ${missing_action} in
1674 true|false|die) ;;
1675 *) die "unknown action '${missing_action}'";;
1676 esac
1677 fi
1678
1561 local opt=$1 1679 local opt=$1
1562 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1680 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1563 1681
1564 local PKG=$(best_version $1) 1682 local PKG=$(best_version $1)
1683 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1565 shift 1684 shift
1566 1685
1567 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE 1686 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1687 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1568 1688
1569 # if the USE file doesnt exist, assume the $PKG is either 1689 # if the IUSE file doesn't exist, the read will error out, we need to handle
1570 # injected or package.provided 1690 # this gracefully
1571 [[ ! -e ${USEFILE} ]] && return 0 1691 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1692 case ${missing_action} in
1693 true) return 0;;
1694 false) return 1;;
1695 die) die "Unable to determine what USE flags $PKG was built with";;
1696 esac
1697 fi
1698
1699 if [[ ${hidden} == "no" ]] ; then
1700 local IUSE_BUILT=$(<${IUSEFILE})
1701 # Don't check USE_EXPAND #147237
1702 local expand
1703 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1704 if [[ $1 == ${expand}_* ]] ; then
1705 expand=""
1706 break
1707 fi
1708 done
1709 if [[ -n ${expand} ]] ; then
1710 if ! has $1 ${IUSE_BUILT} ; then
1711 case ${missing_action} in
1712 true) return 0;;
1713 false) return 1;;
1714 die) die "$PKG does not actually support the $1 USE flag!";;
1715 esac
1716 fi
1717 fi
1718 fi
1572 1719
1573 local USE_BUILT=$(<${USEFILE}) 1720 local USE_BUILT=$(<${USEFILE})
1574 while [[ $# -gt 0 ]] ; do 1721 while [[ $# -gt 0 ]] ; do
1575 if [[ ${opt} = "-o" ]] ; then 1722 if [[ ${opt} = "-o" ]] ; then
1576 has $1 ${USE_BUILT} && return 0 1723 has $1 ${USE_BUILT} && return 0
1591 local f 1738 local f
1592 for f in $(find ${dir} -name configure) ; do 1739 for f in $(find ${dir} -name configure) ; do
1593 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1740 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1594 done 1741 done
1595 eend 0 1742 eend 0
1596}
1597
1598# dopamd <file> [more files]
1599#
1600# Install pam auth config file in /etc/pam.d
1601dopamd() {
1602 [[ -z $1 ]] && die "dopamd requires at least one argument"
1603
1604 use pam || return 0
1605
1606 INSDESTTREE=/etc/pam.d \
1607 doins "$@" || die "failed to install $@"
1608}
1609# newpamd <old name> <new name>
1610#
1611# Install pam file <old name> as <new name> in /etc/pam.d
1612newpamd() {
1613 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1614
1615 use pam || return 0
1616
1617 INSDESTTREE=/etc/pam.d \
1618 newins "$1" "$2" || die "failed to install $1 as $2"
1619} 1743}
1620 1744
1621# make a wrapper script ... 1745# make a wrapper script ...
1622# NOTE: this was originally games_make_wrapper, but I noticed other places where 1746# NOTE: this was originally games_make_wrapper, but I noticed other places where
1623# this could be used, so I have moved it here and made it not games-specific 1747# this could be used, so I have moved it here and made it not games-specific

Legend:
Removed from v.1.231  
changed lines
  Added in v.1.279

  ViewVC Help
Powered by ViewVC 1.1.20