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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20