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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20