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

Diff of /eclass/eutils.eclass

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

Revision 1.221 Revision 1.275
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.221 2005/12/31 14:11:39 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.275 2007/02/17 00:17:39 vapier 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
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 local i=0 str_length="" str_out="" 146 [[ -z $1 ]] && set "$(printf "%65s" '')"
143 147 echo "${1//?/=}"
144 # Handle calls that do not have args, or wc not being installed ...
145 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
146 str_length=65
147 else
148 str_length=$(echo -n "$*" | wc -m)
149 fi
150
151 while ((i++ < ${str_length})) ; do
152 str_out="${str_out}="
153 done
154 echo ${str_out}
155
156 return 0
157 } 148 }
158 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; } 149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
159 local PIPE_CMD="" 150 local PIPE_CMD=""
160 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
161 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
235 fi 226 fi
236 for x in ${EPATCH_SOURCE} 227 for x in ${EPATCH_SOURCE}
237 do 228 do
238 # New ARCH dependant patch naming scheme ... 229 # New ARCH dependant patch naming scheme ...
239 # 230 #
240 # ???_arch_foo.patch 231 # ???_arch_foo.patch
241 # 232 #
242 if [ -f ${x} ] && \ 233 if [ -f ${x} ] && \
243 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \ 234 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
244 [ "${EPATCH_FORCE}" = "yes" ]) 235 [ "${EPATCH_FORCE}" = "yes" ])
245 then 236 then
246 local count=0 237 local count=0
247 local popts="${EPATCH_OPTS}" 238 local popts="${EPATCH_OPTS}"
248 local patchname=${x##*/} 239 local patchname=${x##*/}
249 240
277 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
279 270
280 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
281 then 272 then
282 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
283 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
284 else 275 else
285 PATCH_TARGET="${x}" 276 PATCH_TARGET="${x}"
286 fi 277 fi
287 278
288 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 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##*/}
290 281
291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
292 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
293 284
383 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
384 done 375 done
385 ${exe} "${tmp}" || ${exe} -p "${tmp}" 376 ${exe} "${tmp}" || ${exe} -p "${tmp}"
386 echo "${tmp}" 377 echo "${tmp}"
387 else 378 else
388 [[ ${exe} == "touch" ]] \ 379 if [[ ${exe} == "touch" ]] ; then
389 && exe="-p" \ 380 [[ ${USERLAND} == "GNU" ]] \
390 || exe="-d" 381 && mktemp -p "${topdir}" \
391 mktemp ${exe} "${topdir}" 382 || TMPDIR="${topdir}" mktemp -t tmp
383 else
384 [[ ${USERLAND} == "GNU" ]] \
385 && mktemp -d "${topdir}" \
386 || TMPDIR="${topdir}" mktemp -dt tmp
387 fi
392 fi 388 fi
393} 389}
394 390
395# Small wrapper for getent (Linux), nidump (Mac OS X), 391# Small wrapper for getent (Linux), nidump (Mac OS X),
396# and pw (FreeBSD) used in enewuser()/enewgroup() 392# and pw (FreeBSD) used in enewuser()/enewgroup()
443# shell: /bin/false 439# shell: /bin/false
444# homedir: /dev/null 440# homedir: /dev/null
445# groups: none 441# groups: none
446# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
447enewuser() { 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
448 # get the username 451 # get the username
449 local euser=$1; shift 452 local euser=$1; shift
450 if [[ -z ${euser} ]] ; then 453 if [[ -z ${euser} ]] ; then
451 eerror "No username specified !" 454 eerror "No username specified !"
452 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
453 fi 456 fi
454 457
455 # lets see if the username already exists 458 # lets see if the username already exists
456 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
457 return 0 460 return 0
458 fi 461 fi
459 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
460 463
461 # options to pass to useradd 464 # options to pass to useradd
462 local opts= 465 local opts=
463 466
464 # handle uid 467 # handle uid
465 local euid=$1; shift 468 local euid=$1; shift
466 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
467 if [[ ${euid} -gt 0 ]] ; then 470 if [[ ${euid} -gt 0 ]] ; then
468 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
469 euid="next" 472 euid="next"
470 fi 473 fi
471 else 474 else
472 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
473 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
474 fi 477 fi
475 else 478 else
476 euid="next" 479 euid="next"
477 fi 480 fi
478 if [[ ${euid} == "next" ]] ; then 481 if [[ ${euid} == "next" ]] ; then
479 for euid in $(seq 101 999) ; do 482 for ((euid = 101; euid <= 999; euid++)); do
480 [[ -z $(egetent passwd ${euid}) ]] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
481 done 484 done
482 fi 485 fi
483 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
484 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
498 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
499 [[ -x ${ROOT}${shell} ]] && break 502 [[ -x ${ROOT}${shell} ]] && break
500 done 503 done
501 504
502 if [[ ${shell} == "/dev/null" ]] ; then 505 if [[ ${shell} == "/dev/null" ]] ; then
503 eerror "Unable to identify the shell to use" 506 eerror "Unable to identify the shell to use, proceeding with userland default."
504 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
505 fi 513 fi
506 514
507 eshell=${shell} 515 eshell=${shell}
508 fi 516 fi
509 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
638# Default values if you do not specify any: 646# Default values if you do not specify any:
639# groupname: REQUIRED ! 647# groupname: REQUIRED !
640# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
641# extra: none 649# extra: none
642enewgroup() { 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
643 # get the group 658 # get the group
644 local egroup="$1"; shift 659 local egroup="$1"; shift
645 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
646 then 661 then
647 eerror "No group specified !" 662 eerror "No group specified !"
648 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
649 fi 664 fi
650 665
651 # see if group already exists 666 # see if group already exists
652 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
653 then
654 return 0 668 return 0
655 fi 669 fi
656 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
657 671
658 # options to pass to useradd 672 # options to pass to useradd
701 fi 715 fi
702 716
703 # If we need the next available 717 # If we need the next available
704 case ${egid} in 718 case ${egid} in
705 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
706 for egid in $(seq 101 999); do 720 for ((egid = 101; egid <= 999; egid++)); do
707 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
708 done 722 done
709 esac 723 esac
710 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
711 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
712 ;; 726 ;;
713 727
714 *-freebsd*|*-dragonfly*) 728 *-freebsd*|*-dragonfly*)
715 case ${egid} in 729 case ${egid} in
716 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
717 for egid in $(seq 101 999); do 731 for ((egid = 101; egid <= 999; egid++)); do
718 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
719 done 733 done
720 esac 734 esac
721 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
722 ;; 736 ;;
723 737
724 *-netbsd*) 738 *-netbsd*)
725 case ${egid} in 739 case ${egid} in
726 *[!0-9]*) # Non numeric 740 *[!0-9]*) # Non numeric
727 for egid in $(seq 101 999); do 741 for ((egid = 101; egid <= 999; egid++)); do
728 [ -z "`egetent group ${egid}`" ] && break 742 [[ -z $(egetent group ${egid}) ]] && break
729 done 743 done
730 esac 744 esac
731 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
732 ;; 746 ;;
733 747
741# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
742# vapier@gentoo.org 756# vapier@gentoo.org
743# 757#
744# edos2unix(file, <more files> ...) 758# edos2unix(file, <more files> ...)
745edos2unix() { 759edos2unix() {
746 for f in "$@" 760 echo "$@" | xargs sed -i 's/\r$//'
747 do
748 cp "${f}" ${T}/edos2unix
749 sed 's/\r$//' ${T}/edos2unix > "${f}"
750 done
751} 761}
752 762
753 763
754############################################################## 764##############################################################
755# START: Handle .desktop files and menu entries # 765# START: Handle .desktop files and menu entries #
756# maybe this should be separated into a new eclass some time # 766# maybe this should be separated into a new eclass some time #
757# lanius@gentoo.org # 767# lanius@gentoo.org #
758############################################################## 768##############################################################
759 769
760# Make a desktop file ! 770# Make a desktop file !
761# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
762# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
763# 773#
764# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
765# 775#
766# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
767# name: the name that will show up in the menu 777# name: the name that will show up in the menu
768# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
769# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
770# a full path to an icon 780# a full path to an icon
771# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
772# http://www.freedesktop.org/Standards/desktop-entry-spec 782# http://www.freedesktop.org/Standards/desktop-entry-spec
773# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
774make_desktop_entry() { 784make_desktop_entry() {
775 [[ -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
776 786
784 local catmaj=${CATEGORY%%-*} 794 local catmaj=${CATEGORY%%-*}
785 local catmin=${CATEGORY##*-} 795 local catmin=${CATEGORY##*-}
786 case ${catmaj} in 796 case ${catmaj} in
787 app) 797 app)
788 case ${catmin} in 798 case ${catmin} in
789 admin) type=System;; 799 admin) type=System;;
790 cdr) type=DiscBurning;; 800 cdr) type=DiscBurning;;
791 dicts) type=Dictionary;; 801 dicts) type=Dictionary;;
792 editors) type=TextEditor;; 802 editors) type=TextEditor;;
793 emacs) type=TextEditor;; 803 emacs) type=TextEditor;;
794 emulation) type=Emulator;; 804 emulation) type=Emulator;;
795 laptop) type=HardwareSettings;; 805 laptop) type=HardwareSettings;;
796 office) type=Office;; 806 office) type=Office;;
797 vim) type=TextEditor;; 807 vim) type=TextEditor;;
798 xemacs) type=TextEditor;; 808 xemacs) type=TextEditor;;
799 *) type=;; 809 *) type=;;
800 esac 810 esac
801 ;; 811 ;;
802 812
803 dev) 813 dev)
804 type="Development" 814 type="Development"
805 ;; 815 ;;
806 816
807 games) 817 games)
808 case ${catmin} in 818 case ${catmin} in
809 action) type=ActionGame;; 819 action|fps) type=ActionGame;;
810 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
811 board) type=BoardGame;; 821 board) type=BoardGame;;
812 kid) type=KidsGame;; 822 kids) type=KidsGame;;
813 emulation) type=Emulator;; 823 emulation) type=Emulator;;
814 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
815 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
816 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
817 simulation) type=Simulation;; 827 simulation) type=Simulation;;
818 sports) type=SportsGame;; 828 sports) type=SportsGame;;
819 strategy) type=StrategyGame;; 829 strategy) type=StrategyGame;;
820 *) type=;; 830 *) type=;;
821 esac 831 esac
822 type="Game;${type}" 832 type="Game;${type}"
823 ;; 833 ;;
824 834
825 mail) 835 mail)
829 media) 839 media)
830 case ${catmin} in 840 case ${catmin} in
831 gfx) type=Graphics;; 841 gfx) type=Graphics;;
832 radio) type=Tuner;; 842 radio) type=Tuner;;
833 sound) type=Audio;; 843 sound) type=Audio;;
834 tv) type=TV;; 844 tv) type=TV;;
835 video) type=Video;; 845 video) type=Video;;
836 *) type=;; 846 *) type=;;
837 esac 847 esac
838 type="AudioVideo;${type}" 848 type="AudioVideo;${type}"
839 ;; 849 ;;
840 850
841 net) 851 net)
842 case ${catmin} in 852 case ${catmin} in
843 dialup) type=Dialup;; 853 dialup) type=Dialup;;
844 ftp) type=FileTransfer;; 854 ftp) type=FileTransfer;;
845 im) type=InstantMessaging;; 855 im) type=InstantMessaging;;
846 irc) type=IRCClient;; 856 irc) type=IRCClient;;
847 mail) type=Email;; 857 mail) type=Email;;
848 news) type=News;; 858 news) type=News;;
849 nntp) type=News;; 859 nntp) type=News;;
850 p2p) type=FileTransfer;; 860 p2p) type=FileTransfer;;
851 *) type=;; 861 *) type=;;
852 esac 862 esac
853 type="Network;${type}" 863 type="Network;${type}"
854 ;; 864 ;;
855 865
856 sci) 866 sci)
857 case ${catmin} in 867 case ${catmin} in
858 astro*) type=Astronomy;; 868 astro*) type=Astronomy;;
859 bio*) type=Biology;; 869 bio*) type=Biology;;
860 calc*) type=Calculator;; 870 calc*) type=Calculator;;
861 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
862 geo*) type=Geology;; 872 geo*) type=Geology;;
863 math*) type=Math;; 873 math*) type=Math;;
864 *) type=;; 874 *) type=;;
865 esac 875 esac
866 type="Science;${type}" 876 type="Science;${type}"
867 ;; 877 ;;
868 878
869 www) 879 www)
870 case ${catmin} in 880 case ${catmin} in
871 client) type=WebBrowser;; 881 client) type=WebBrowser;;
872 *) type=;; 882 *) type=;;
873 esac 883 esac
874 type="Network" 884 type="Network"
875 ;; 885 ;;
876 886
877 *) 887 *)
882 if [ "${SLOT}" == "0" ] ; then 892 if [ "${SLOT}" == "0" ] ; then
883 local desktop_name="${PN}" 893 local desktop_name="${PN}"
884 else 894 else
885 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
886 fi 896 fi
897 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
887 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 898 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
888 899
900 cat <<-EOF > "${desktop}"
889echo "[Desktop Entry] 901 [Desktop Entry]
890Encoding=UTF-8 902 Encoding=UTF-8
891Version=0.9.2 903 Version=0.9.2
892Name=${name} 904 Name=${name}
893Type=Application 905 Type=Application
894Comment=${DESCRIPTION} 906 Comment=${DESCRIPTION}
895Exec=${exec} 907 Exec=${exec}
908 TryExec=${exec%% *}
896Path=${path} 909 Path=${path}
897Icon=${icon} 910 Icon=${icon}
898Categories=Application;${type};" > "${desktop}" 911 Categories=Application;${type};
912 EOF
899 913
900 ( 914 (
901 # wrap the env here so that the 'insinto' call 915 # wrap the env here so that the 'insinto' call
902 # doesn't corrupt the env of the caller 916 # doesn't corrupt the env of the caller
903 insinto /usr/share/applications 917 insinto /usr/share/applications
905 ) 919 )
906} 920}
907 921
908# Make a GDM/KDM Session file 922# Make a GDM/KDM Session file
909# 923#
910# make_desktop_entry(<title>, <command>) 924# make_session_desktop(<title>, <command>)
911# title: File to execute to start the Window Manager 925# title: File to execute to start the Window Manager
912# command: Name of the Window Manager 926# command: Name of the Window Manager
913 927
914make_session_desktop() { 928make_session_desktop() {
915 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 929 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
917 931
918 local title=$1 932 local title=$1
919 local command=$2 933 local command=$2
920 local desktop=${T}/${wm}.desktop 934 local desktop=${T}/${wm}.desktop
921 935
936 cat <<-EOF > "${desktop}"
922echo "[Desktop Entry] 937 [Desktop Entry]
923Encoding=UTF-8 938 Encoding=UTF-8
924Name=${title} 939 Name=${title}
925Comment=This session logs you into ${title} 940 Comment=This session logs you into ${title}
926Exec=${command} 941 Exec=${command}
927TryExec=${command} 942 TryExec=${command}
928Type=Application" > "${desktop}" 943 Type=Application
944 EOF
929 945
946 (
947 # wrap the env here so that the 'insinto' call
948 # doesn't corrupt the env of the caller
930 insinto /usr/share/xsessions 949 insinto /usr/share/xsessions
931 doins "${desktop}" 950 doins "${desktop}"
951 )
932} 952}
933 953
934domenu() { 954domenu() {
955 (
956 # wrap the env here so that the 'insinto' call
957 # doesn't corrupt the env of the caller
935 local i j 958 local i j ret=0
936 insinto /usr/share/applications 959 insinto /usr/share/applications
937 for i in "$@" ; do 960 for i in "$@" ; do
938 if [[ -f ${i} ]] ; then 961 if [[ -f ${i} ]] ; then
939 doins "${i}" 962 doins "${i}"
963 ((ret+=$?))
940 elif [[ -d ${i} ]] ; then 964 elif [[ -d ${i} ]] ; then
941 for j in "${i}"/*.desktop ; do 965 for j in "${i}"/*.desktop ; do
942 doins "${j}" 966 doins "${j}"
967 ((ret+=$?))
943 done 968 done
944 fi 969 fi
945 done 970 done
971 exit ${ret}
972 )
946} 973}
947newmenu() { 974newmenu() {
975 (
976 # wrap the env here so that the 'insinto' call
977 # doesn't corrupt the env of the caller
948 insinto /usr/share/applications 978 insinto /usr/share/applications
949 newins "$1" "$2" 979 newins "$@"
980 )
950} 981}
951 982
952doicon() { 983doicon() {
984 (
985 # wrap the env here so that the 'insinto' call
986 # doesn't corrupt the env of the caller
953 local i j 987 local i j ret
954 insinto /usr/share/pixmaps 988 insinto /usr/share/pixmaps
955 for i in "$@" ; do 989 for i in "$@" ; do
956 if [[ -f ${i} ]] ; then 990 if [[ -f ${i} ]] ; then
957 doins "${i}" 991 doins "${i}"
992 ((ret+=$?))
958 elif [[ -d ${i} ]] ; then 993 elif [[ -d ${i} ]] ; then
959 for j in "${i}"/*.png ; do 994 for j in "${i}"/*.png ; do
960 doins "${j}" 995 doins "${j}"
996 ((ret+=$?))
961 done 997 done
962 fi 998 fi
963 done 999 done
1000 exit ${ret}
1001 )
964} 1002}
965newicon() { 1003newicon() {
1004 (
1005 # wrap the env here so that the 'insinto' call
1006 # doesn't corrupt the env of the caller
966 insinto /usr/share/pixmaps 1007 insinto /usr/share/pixmaps
967 newins "$1" "$2" 1008 newins "$@"
1009 )
968} 1010}
969 1011
970############################################################## 1012##############################################################
971# END: Handle .desktop files and menu entries # 1013# END: Handle .desktop files and menu entries #
972############################################################## 1014##############################################################
973 1015
974 1016
975# for internal use only (unpack_pdv and unpack_makeself) 1017# for internal use only (unpack_pdv and unpack_makeself)
976find_unpackable_file() { 1018find_unpackable_file() {
995# the middle of the archive. Valve seems to use it a lot ... too bad 1037# the middle of the archive. Valve seems to use it a lot ... too bad
996# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1038# it seems to like to segfault a lot :(. So lets take it apart ourselves.
997# 1039#
998# Usage: unpack_pdv [file to unpack] [size of off_t] 1040# Usage: unpack_pdv [file to unpack] [size of off_t]
999# - you have to specify the off_t size ... i have no idea how to extract that 1041# - you have to specify the off_t size ... i have no idea how to extract that
1000# information out of the binary executable myself. basically you pass in 1042# information out of the binary executable myself. basically you pass in
1001# the size of the off_t type (in bytes) on the machine that built the pdv 1043# the size of the off_t type (in bytes) on the machine that built the pdv
1002# archive. one way to determine this is by running the following commands: 1044# archive. one way to determine this is by running the following commands:
1003# strings <pdv archive> | grep lseek 1045# strings <pdv archive> | grep lseek
1004# strace -elseek <pdv archive> 1046# strace -elseek <pdv archive>
1005# basically look for the first lseek command (we do the strings/grep because 1047# basically look for the first lseek command (we do the strings/grep because
1006# sometimes the function call is _llseek or something) and steal the 2nd 1048# sometimes the function call is _llseek or something) and steal the 2nd
1007# parameter. here is an example: 1049# parameter. here is an example:
1008# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1050# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1009# lseek 1051# lseek
1010# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1052# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1011# lseek(3, -4, SEEK_END) = 2981250 1053# lseek(3, -4, SEEK_END) = 2981250
1012# thus we would pass in the value of '4' as the second parameter. 1054# thus we would pass in the value of '4' as the second parameter.
1013unpack_pdv() { 1055unpack_pdv() {
1014 local src=$(find_unpackable_file $1) 1056 local src=$(find_unpackable_file "$1")
1015 local sizeoff_t=$2 1057 local sizeoff_t=$2
1016 1058
1017 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1059 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1018 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1060 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1019 1061
1020 local shrtsrc=$(basename "${src}") 1062 local shrtsrc=$(basename "${src}")
1021 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1063 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1022 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1064 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
1023 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1065 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
1024 1066
1025 # grab metadata for debug reasons 1067 # grab metadata for debug reasons
1026 local metafile="$(emktemp)" 1068 local metafile=$(emktemp)
1027 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1069 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1028 1070
1029 # rip out the final file name from the metadata 1071 # rip out the final file name from the metadata
1030 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1072 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1031 datafile="`basename ${datafile}`" 1073 datafile=$(basename "${datafile}")
1032 1074
1033 # now lets uncompress/untar the file if need be 1075 # now lets uncompress/untar the file if need be
1034 local tmpfile="$(emktemp)" 1076 local tmpfile=$(emktemp)
1035 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1077 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1036 1078
1037 local iscompressed="`file -b ${tmpfile}`" 1079 local iscompressed=$(file -b "${tmpfile}")
1038 if [ "${iscompressed:0:8}" == "compress" ] ; then 1080 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1039 iscompressed=1 1081 iscompressed=1
1040 mv ${tmpfile}{,.Z} 1082 mv ${tmpfile}{,.Z}
1041 gunzip ${tmpfile} 1083 gunzip ${tmpfile}
1042 else 1084 else
1043 iscompressed=0 1085 iscompressed=0
1044 fi 1086 fi
1045 local istar="`file -b ${tmpfile}`" 1087 local istar=$(file -b "${tmpfile}")
1046 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1088 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1047 istar=1 1089 istar=1
1048 else 1090 else
1049 istar=0 1091 istar=0
1050 fi 1092 fi
1051 1093
1087# many other game companies. 1129# many other game companies.
1088# 1130#
1089# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1131# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1090# - If the file is not specified then unpack will utilize ${A}. 1132# - If the file is not specified then unpack will utilize ${A}.
1091# - If the offset is not specified then we will attempt to extract 1133# - If the offset is not specified then we will attempt to extract
1092# the proper offset from the script itself. 1134# the proper offset from the script itself.
1093unpack_makeself() { 1135unpack_makeself() {
1094 local src_input=${1:-${A}} 1136 local src_input=${1:-${A}}
1095 local src=$(find_unpackable_file "${src_input}") 1137 local src=$(find_unpackable_file "${src_input}")
1096 local skip=$2 1138 local skip=$2
1097 local exe=$3 1139 local exe=$3
1103 if [[ -z ${skip} ]] ; then 1145 if [[ -z ${skip} ]] ; then
1104 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1146 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1105 local skip=0 1147 local skip=0
1106 exe=tail 1148 exe=tail
1107 case ${ver} in 1149 case ${ver} in
1108 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1150 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1109 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1151 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1110 ;; 1152 ;;
1111 2.0|2.0.1) 1153 2.0|2.0.1)
1112 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1154 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1113 ;; 1155 ;;
1143 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1185 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1144 *) die "makeself cant handle exe '${exe}'" 1186 *) die "makeself cant handle exe '${exe}'"
1145 esac 1187 esac
1146 1188
1147 # lets grab the first few bytes of the file to figure out what kind of archive it is 1189 # lets grab the first few bytes of the file to figure out what kind of archive it is
1148 local tmpfile="$(emktemp)" 1190 local tmpfile=$(emktemp)
1149 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1191 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1150 local filetype="$(file -b "${tmpfile}")" 1192 local filetype=$(file -b "${tmpfile}")
1151 case ${filetype} in 1193 case ${filetype} in
1152 *tar\ archive) 1194 *tar\ archive*)
1153 eval ${exe} | tar --no-same-owner -xf - 1195 eval ${exe} | tar --no-same-owner -xf -
1154 ;; 1196 ;;
1155 bzip2*) 1197 bzip2*)
1156 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1198 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1157 ;; 1199 ;;
1193 # accepted ... if we don't find a match, we make the user accept 1235 # accepted ... if we don't find a match, we make the user accept
1194 local shopts=$- 1236 local shopts=$-
1195 local alic 1237 local alic
1196 set -o noglob #so that bash doesn't expand "*" 1238 set -o noglob #so that bash doesn't expand "*"
1197 for alic in ${ACCEPT_LICENSE} ; do 1239 for alic in ${ACCEPT_LICENSE} ; do
1198 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1240 if [[ ${alic} == ${l} ]]; then
1199 set +o noglob; set -${shopts} #reset old shell opts 1241 set +o noglob; set -${shopts} #reset old shell opts
1200 return 0 1242 return 0
1201 fi 1243 fi
1202 done 1244 done
1203 set +o noglob; set -$shopts #reset old shell opts 1245 set +o noglob; set -$shopts #reset old shell opts
1204 1246
1205 local licmsg="$(emktemp)" 1247 local licmsg=$(emktemp)
1206 cat << EOF > ${licmsg} 1248 cat <<-EOF > ${licmsg}
1207********************************************************** 1249 **********************************************************
1208The following license outlines the terms of use of this 1250 The following license outlines the terms of use of this
1209package. You MUST accept this license for installation to 1251 package. You MUST accept this license for installation to
1210continue. When you are done viewing, hit 'q'. If you 1252 continue. When you are done viewing, hit 'q'. If you
1211CTRL+C out of this, the install will not run! 1253 CTRL+C out of this, the install will not run!
1212********************************************************** 1254 **********************************************************
1213 1255
1214EOF 1256 EOF
1215 cat ${lic} >> ${licmsg} 1257 cat ${lic} >> ${licmsg}
1216 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1258 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1217 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1259 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1218 read alic 1260 read alic
1219 case ${alic} in 1261 case ${alic} in
1236# and when the function returns, you can assume that the cd has been 1278# and when the function returns, you can assume that the cd has been
1237# found at CDROM_ROOT. 1279# found at CDROM_ROOT.
1238# 1280#
1239# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1281# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1240# etc... if you want to give the cds better names, then just export 1282# etc... if you want to give the cds better names, then just export
1241# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1283# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1284# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1285# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1286# CDROM_NAME_2="data cd"
1287# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1242# 1288#
1243# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1289# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1244# 1290#
1245# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1291# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1246# - this will attempt to locate a cd based upon a file that is on 1292# - this will attempt to locate a cd based upon a file that is on
1247# the cd ... the more files you give this function, the more cds 1293# the cd ... the more files you give this function, the more cds
1248# the cdrom functions will handle 1294# the cdrom functions will handle
1249cdrom_get_cds() { 1295cdrom_get_cds() {
1250 # first we figure out how many cds we're dealing with by 1296 # first we figure out how many cds we're dealing with by
1251 # the # of files they gave us 1297 # the # of files they gave us
1252 local cdcnt=0 1298 local cdcnt=0
1253 local f= 1299 local f=
1297 echo 1343 echo
1298 einfo "For example:" 1344 einfo "For example:"
1299 einfo "export CD_ROOT=/mnt/cdrom" 1345 einfo "export CD_ROOT=/mnt/cdrom"
1300 echo 1346 echo
1301 else 1347 else
1348 if [[ -n ${CDROM_NAME_SET} ]] ; then
1349 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1350 cdcnt=0
1351 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1352 ((++cdcnt))
1353 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1354 done
1355 fi
1356
1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1357 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303 cdcnt=0 1358 cdcnt=0
1304 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1359 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 ((++cdcnt)) 1360 ((++cdcnt))
1306 var="CDROM_NAME_${cdcnt}" 1361 var="CDROM_NAME_${cdcnt}"
1373 1428
1374 while [[ -n ${cdset[${i}]} ]] ; do 1429 while [[ -n ${cdset[${i}]} ]] ; do
1375 local dir=$(dirname ${cdset[${i}]}) 1430 local dir=$(dirname ${cdset[${i}]})
1376 local file=$(basename ${cdset[${i}]}) 1431 local file=$(basename ${cdset[${i}]})
1377 1432
1378 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do 1433 local point= node= fs= foo=
1379 [[ -d ${mline}/${dir} ]] || continue 1434 while read point node fs foo ; do
1435 [[ " cd9660 iso9660 " != *" ${fs} "* ]] && \
1436 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1437 && continue
1438 point=${point//\040/ }
1380 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then 1439 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1381 export CDROM_ROOT=${mline} 1440 export CDROM_ROOT=${point}
1382 export CDROM_SET=${i} 1441 export CDROM_SET=${i}
1383 export CDROM_MATCH=${cdset[${i}]} 1442 export CDROM_MATCH=${cdset[${i}]}
1384 return 1443 return
1385 fi 1444 done <<< "$(get_mounts)"
1386 done
1387 1445
1388 ((++i)) 1446 ((++i))
1389 done 1447 done
1390 1448
1391 echo 1449 echo
1411 echo 1469 echo
1412 einfo "If you are having trouble with the detection" 1470 einfo "If you are having trouble with the detection"
1413 einfo "of your CD, it is possible that you do not have" 1471 einfo "of your CD, it is possible that you do not have"
1414 einfo "Joliet support enabled in your kernel. Please" 1472 einfo "Joliet support enabled in your kernel. Please"
1415 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1473 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1416 read 1474 read || die "something is screwed with your system"
1417 done 1475 done
1418} 1476}
1419 1477
1420# Make sure that LINGUAS only contains languages that 1478# Make sure that LINGUAS only contains languages that
1421# a package can support 1479# a package can support
1422# 1480#
1423# usage: strip-linguas <allow LINGUAS> 1481# usage: strip-linguas <allow LINGUAS>
1424# strip-linguas -i <directories of .po files> 1482# strip-linguas -i <directories of .po files>
1425# strip-linguas -u <directories of .po files> 1483# strip-linguas -u <directories of .po files>
1426# 1484#
1427# The first form allows you to specify a list of LINGUAS. 1485# The first form allows you to specify a list of LINGUAS.
1428# The -i builds a list of po files found in all the 1486# The -i builds a list of po files found in all the
1429# directories and uses the intersection of the lists. 1487# directories and uses the intersection of the lists.
1430# The -u builds a list of po files found in all the 1488# The -u builds a list of po files found in all the
1431# directories and uses the union of the lists. 1489# directories and uses the union of the lists.
1432strip-linguas() { 1490strip-linguas() {
1433 local ls newls 1491 local ls newls nols
1434 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1492 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1435 local op=$1; shift 1493 local op=$1; shift
1436 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1494 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1437 local d f 1495 local d f
1438 for d in "$@" ; do 1496 for d in "$@" ; do
1439 if [[ ${op} == "-u" ]] ; then 1497 if [[ ${op} == "-u" ]] ; then
1440 newls=${ls} 1498 newls=${ls}
1441 else 1499 else
1442 newls="" 1500 newls=""
1443 fi 1501 fi
1444 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1502 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1445 if [[ ${op} == "-i" ]] ; then 1503 if [[ ${op} == "-i" ]] ; then
1446 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1504 hasq ${f} ${ls} && newls="${newls} ${f}"
1447 else 1505 else
1448 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1506 hasq ${f} ${ls} || newls="${newls} ${f}"
1449 fi 1507 fi
1450 done 1508 done
1451 ls=${newls} 1509 ls=${newls}
1452 done 1510 done
1453 ls=${ls//.po}
1454 else 1511 else
1455 ls=$@ 1512 ls="$@"
1456 fi 1513 fi
1457 1514
1458 ls=" ${ls} " 1515 nols=""
1459 newls="" 1516 newls=""
1460 for f in ${LINGUAS} ; do 1517 for f in ${LINGUAS} ; do
1461 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1518 if hasq ${f} ${ls} ; then
1462 newls="${newls} ${f}" 1519 newls="${newls} ${f}"
1463 else 1520 else
1464 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1521 nols="${nols} ${f}"
1465 fi 1522 fi
1466 done 1523 done
1467 if [[ -z ${newls} ]] ; then 1524 [[ -n ${nols} ]] \
1468 export LINGUAS="" 1525 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1469 else
1470 export LINGUAS=${newls:1} 1526 export LINGUAS=${newls:1}
1471 fi
1472} 1527}
1473 1528
1474# moved from kernel.eclass since they are generally useful outside of 1529# moved from kernel.eclass since they are generally useful outside of
1475# kernel.eclass -iggy (20041002) 1530# kernel.eclass -iggy (20041002)
1476 1531
1483 while ((i--)) ; do 1538 while ((i--)) ; do
1484 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1539 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1485 done 1540 done
1486 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1541 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1487 case ${ARCH} in 1542 case ${ARCH} in
1488 x86) export ARCH="i386";; 1543 x86) export ARCH="i386";;
1489 amd64) export ARCH="x86_64";; 1544 amd64) export ARCH="x86_64";;
1490 hppa) export ARCH="parisc";; 1545 hppa) export ARCH="parisc";;
1491 mips) export ARCH="mips";; 1546 mips) export ARCH="mips";;
1492 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! 1547 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!
1493 *) export ARCH="${ARCH}";; 1548 *) export ARCH="${ARCH}";;
1494 esac 1549 esac
1495} 1550}
1496 1551
1497# set's ARCH back to what portage expects 1552# set's ARCH back to what portage expects
1498set_arch_to_portage() { 1553set_arch_to_portage() {
1505 1560
1506# Jeremy Huddleston <eradicator@gentoo.org>: 1561# Jeremy Huddleston <eradicator@gentoo.org>:
1507# preserve_old_lib /path/to/libblah.so.0 1562# preserve_old_lib /path/to/libblah.so.0
1508# preserve_old_lib_notify /path/to/libblah.so.0 1563# preserve_old_lib_notify /path/to/libblah.so.0
1509# 1564#
1510# These functions are useful when a lib in your package changes --soname. Such 1565# These functions are useful when a lib in your package changes --library. Such
1511# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1566# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1512# would break packages that link against it. Most people get around this 1567# would break packages that link against it. Most people get around this
1513# by using the portage SLOT mechanism, but that is not always a relevant 1568# by using the portage SLOT mechanism, but that is not always a relevant
1514# solution, so instead you can add the following to your ebuilds: 1569# solution, so instead you can add the following to your ebuilds:
1515# 1570#
1516# src_install() { 1571# pkg_preinst() {
1517# ... 1572# ...
1518# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1573# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1519# ... 1574# ...
1520# } 1575# }
1521# 1576#
1524# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1579# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1525# ... 1580# ...
1526# } 1581# }
1527 1582
1528preserve_old_lib() { 1583preserve_old_lib() {
1529 LIB=$1 1584 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1585 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1586# die "Invalid preserve_old_lib() usage"
1587 fi
1588 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1530 1589
1531 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1590 local lib dir
1532 SONAME=`basename ${LIB}` 1591 for lib in "$@" ; do
1533 DIRNAME=`dirname ${LIB}` 1592 [[ -e ${ROOT}/${lib} ]] || continue
1534 1593 dir=${lib%/*}
1535 dodir ${DIRNAME} 1594 dodir ${dir} || die "dodir ${dir} failed"
1536 cp ${ROOT}${LIB} ${D}${DIRNAME} 1595 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1537 touch ${D}${LIB} 1596 touch "${D}"/${lib}
1538 fi 1597 done
1539} 1598}
1540 1599
1541preserve_old_lib_notify() { 1600preserve_old_lib_notify() {
1542 LIB=$1 1601 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1602 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1603# die "Invalid preserve_old_lib_notify() usage"
1604 fi
1543 1605
1544 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1606 local lib notice=0
1545 SONAME=`basename ${LIB}` 1607 for lib in "$@" ; do
1546 1608 [[ -e ${ROOT}/${lib} ]] || continue
1609 if [[ ${notice} -eq 0 ]] ; then
1610 notice=1
1547 ewarn "An old version of an installed library was detected on your system." 1611 ewarn "Old versions of installed libraries were detected on your system."
1548 ewarn "In order to avoid breaking packages that link against it, this older version" 1612 ewarn "In order to avoid breaking packages that depend on these old libs,"
1549 ewarn "is not being removed. In order to make full use of this newer version," 1613 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1550 ewarn "you will need to execute the following command:" 1614 ewarn "in order to remove these old dependencies. If you do not have this"
1551 ewarn " revdep-rebuild --soname ${SONAME}" 1615 ewarn "helper program, simply emerge the 'gentoolkit' package."
1552 ewarn 1616 ewarn
1553 ewarn "After doing that, you can safely remove ${LIB}"
1554 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1555 fi 1617 fi
1618 ewarn " # revdep-rebuild --library ${lib##*/}"
1619 done
1556} 1620}
1557 1621
1558# Hack for people to figure out if a package was built with 1622# Hack for people to figure out if a package was built with
1559# certain USE flags 1623# certain USE flags
1560# 1624#
1561# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1625# Usage: built_with_use [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1562# ex: built_with_use xchat gtk2 1626# ex: built_with_use xchat gtk2
1563# 1627#
1564# Flags: -a all USE flags should be utilized 1628# Flags: -a all USE flags should be utilized
1565# -o at least one USE flag should be utilized 1629# -o at least one USE flag should be utilized
1630# --missing peform the specified action if the flag is not in IUSE (true/false/die)
1631# --hidden USE flag we're checking is hidden expanded so it isnt in IUSE
1566# Note: the default flag is '-a' 1632# Note: the default flag is '-a'
1567built_with_use() { 1633built_with_use() {
1634 local hidden="no"
1635 if [[ $1 == "--hidden" ]] ; then
1636 hidden="yes"
1637 shift
1638 fi
1639
1640 local missing_action="die"
1641 if [[ $1 == "--missing" ]] ; then
1642 missing_action=$2
1643 shift ; shift
1644 case ${missing_action} in
1645 true|false|die) ;;
1646 *) die "unknown action '${missing_action}'";;
1647 esac
1648 fi
1649
1568 local opt=$1 1650 local opt=$1
1569 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1651 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1570 1652
1571 local PKG=$(best_version $1) 1653 local PKG=$(best_version $1)
1654 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1572 shift 1655 shift
1573 1656
1574 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE 1657 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1658 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1575 1659
1576 # if the USE file doesnt exist, assume the $PKG is either 1660 # if the IUSE file doesn't exist, the read will error out, we need to handle
1577 # injected or package.provided 1661 # this gracefully
1578 [[ ! -e ${USEFILE} ]] && return 0 1662 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1663 case ${missing_action} in
1664 true) return 0;;
1665 false) return 1;;
1666 die) die "Unable to determine what USE flags $PKG was built with";;
1667 esac
1668 fi
1669
1670 if [[ ${hidden} == "no" ]] ; then
1671 local IUSE_BUILT=$(<${IUSEFILE})
1672 # Don't check USE_EXPAND #147237
1673 local expand
1674 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1675 if [[ $1 == ${expand}_* ]] ; then
1676 expand=""
1677 break
1678 fi
1679 done
1680 if [[ -n ${expand} ]] ; then
1681 if ! has $1 ${IUSE_BUILT} ; then
1682 case ${missing_action} in
1683 true) return 0;;
1684 false) return 1;;
1685 die) die "$PKG does not actually support the $1 USE flag!";;
1686 esac
1687 fi
1688 fi
1689 fi
1579 1690
1580 local USE_BUILT=$(<${USEFILE}) 1691 local USE_BUILT=$(<${USEFILE})
1581 while [[ $# -gt 0 ]] ; do 1692 while [[ $# -gt 0 ]] ; do
1582 if [[ ${opt} = "-o" ]] ; then 1693 if [[ ${opt} = "-o" ]] ; then
1583 has $1 ${USE_BUILT} && return 0 1694 has $1 ${USE_BUILT} && return 0
1598 local f 1709 local f
1599 for f in $(find ${dir} -name configure) ; do 1710 for f in $(find ${dir} -name configure) ; do
1600 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1711 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1601 done 1712 done
1602 eend 0 1713 eend 0
1603}
1604
1605# dopamd <file> [more files]
1606#
1607# Install pam auth config file in /etc/pam.d
1608dopamd() {
1609 [[ -z $1 ]] && die "dopamd requires at least one argument"
1610
1611 use pam || return 0
1612
1613 INSDESTTREE=/etc/pam.d \
1614 doins "$@" || die "failed to install $@"
1615}
1616# newpamd <old name> <new name>
1617#
1618# Install pam file <old name> as <new name> in /etc/pam.d
1619newpamd() {
1620 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1621
1622 use pam || return 0
1623
1624 INSDESTTREE=/etc/pam.d \
1625 newins "$1" "$2" || die "failed to install $1 as $2"
1626} 1714}
1627 1715
1628# make a wrapper script ... 1716# make a wrapper script ...
1629# NOTE: this was originally games_make_wrapper, but I noticed other places where 1717# NOTE: this was originally games_make_wrapper, but I noticed other places where
1630# this could be used, so I have moved it here and made it not games-specific 1718# this could be used, so I have moved it here and made it not games-specific

Legend:
Removed from v.1.221  
changed lines
  Added in v.1.275

  ViewVC Help
Powered by ViewVC 1.1.20