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

Diff of /eclass/eutils.eclass

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

Revision 1.228 Revision 1.267
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.228 2006/03/10 23:24:21 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.267 2007/01/09 15:47:47 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 # this func produces a lot of pointless noise when debugging is turned on ... 146 [[ -z $1 ]] && set "$(printf "%65s" '')"
143 local is_debug=0 147 echo "${1//?/=}"
144 [[ $- == *x* ]] && is_debug=1 && set +x
145
146 local i=0 str_length="" str_out=""
147
148 # Handle calls that do not have args, or wc not being installed ...
149 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
150 str_length=65
151 else
152 str_length=$(echo -n "$*" | wc -m)
153 fi
154
155 while ((i++ < ${str_length})) ; do
156 str_out="${str_out}="
157 done
158 echo ${str_out}
159
160 [[ ${is_debug} -eq 1 ]] && set -x
161 return 0
162 } 148 }
163 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; } 149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
164 local PIPE_CMD="" 150 local PIPE_CMD=""
165 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
166 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
240 fi 226 fi
241 for x in ${EPATCH_SOURCE} 227 for x in ${EPATCH_SOURCE}
242 do 228 do
243 # New ARCH dependant patch naming scheme ... 229 # New ARCH dependant patch naming scheme ...
244 # 230 #
245 # ???_arch_foo.patch 231 # ???_arch_foo.patch
246 # 232 #
247 if [ -f ${x} ] && \ 233 if [ -f ${x} ] && \
248 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \ 234 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
249 [ "${EPATCH_FORCE}" = "yes" ]) 235 [ "${EPATCH_FORCE}" = "yes" ])
250 then 236 then
251 local count=0 237 local count=0
252 local popts="${EPATCH_OPTS}" 238 local popts="${EPATCH_OPTS}"
253 local patchname=${x##*/} 239 local patchname=${x##*/}
254 240
267 einfo "${EPATCH_SINGLE_MSG}" 253 einfo "${EPATCH_SINGLE_MSG}"
268 else 254 else
269 einfo "Applying ${patchname} ..." 255 einfo "Applying ${patchname} ..."
270 fi 256 fi
271 else 257 else
272 einfo " ${patchname} ..." 258 einfo " ${patchname} ..."
273 fi 259 fi
274 260
275 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 261 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
276 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 262 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
277 263
282 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
284 270
285 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
286 then 272 then
287 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 else 275 else
290 PATCH_TARGET="${x}" 276 PATCH_TARGET="${x}"
291 fi 277 fi
292 278
293 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
294 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##*/}
295 281
296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
298 284
453# shell: /bin/false 439# shell: /bin/false
454# homedir: /dev/null 440# homedir: /dev/null
455# groups: none 441# groups: none
456# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
457enewuser() { 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
458 # get the username 451 # get the username
459 local euser=$1; shift 452 local euser=$1; shift
460 if [[ -z ${euser} ]] ; then 453 if [[ -z ${euser} ]] ; then
461 eerror "No username specified !" 454 eerror "No username specified !"
462 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
463 fi 456 fi
464 457
465 # lets see if the username already exists 458 # lets see if the username already exists
466 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
467 return 0 460 return 0
468 fi 461 fi
469 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
470 463
471 # options to pass to useradd 464 # options to pass to useradd
472 local opts= 465 local opts=
473 466
474 # handle uid 467 # handle uid
475 local euid=$1; shift 468 local euid=$1; shift
476 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
477 if [[ ${euid} -gt 0 ]] ; then 470 if [[ ${euid} -gt 0 ]] ; then
478 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
479 euid="next" 472 euid="next"
480 fi 473 fi
481 else 474 else
482 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
483 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
484 fi 477 fi
485 else 478 else
486 euid="next" 479 euid="next"
487 fi 480 fi
488 if [[ ${euid} == "next" ]] ; then 481 if [[ ${euid} == "next" ]] ; then
489 for euid in $(seq 101 999) ; do 482 for ((euid = 101; euid <= 999; euid++)); do
490 [[ -z $(egetent passwd ${euid}) ]] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
491 done 484 done
492 fi 485 fi
493 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
494 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
508 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
509 [[ -x ${ROOT}${shell} ]] && break 502 [[ -x ${ROOT}${shell} ]] && break
510 done 503 done
511 504
512 if [[ ${shell} == "/dev/null" ]] ; then 505 if [[ ${shell} == "/dev/null" ]] ; then
513 eerror "Unable to identify the shell to use" 506 eerror "Unable to identify the shell to use, proceeding with userland default."
514 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
515 fi 513 fi
516 514
517 eshell=${shell} 515 eshell=${shell}
518 fi 516 fi
519 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
648# Default values if you do not specify any: 646# Default values if you do not specify any:
649# groupname: REQUIRED ! 647# groupname: REQUIRED !
650# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
651# extra: none 649# extra: none
652enewgroup() { 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
653 # get the group 658 # get the group
654 local egroup="$1"; shift 659 local egroup="$1"; shift
655 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
656 then 661 then
657 eerror "No group specified !" 662 eerror "No group specified !"
658 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
659 fi 664 fi
660 665
661 # see if group already exists 666 # see if group already exists
662 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
663 then
664 return 0 668 return 0
665 fi 669 fi
666 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
667 671
668 # options to pass to useradd 672 # options to pass to useradd
711 fi 715 fi
712 716
713 # If we need the next available 717 # If we need the next available
714 case ${egid} in 718 case ${egid} in
715 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
716 for egid in $(seq 101 999); do 720 for ((egid = 101; egid <= 999; egid++)); do
717 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
718 done 722 done
719 esac 723 esac
720 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
721 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
722 ;; 726 ;;
723 727
724 *-freebsd*|*-dragonfly*) 728 *-freebsd*|*-dragonfly*)
725 case ${egid} in 729 case ${egid} in
726 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
727 for egid in $(seq 101 999); do 731 for ((egid = 101; egid <= 999; egid++)); do
728 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
729 done 733 done
730 esac 734 esac
731 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
732 ;; 736 ;;
733 737
734 *-netbsd*) 738 *-netbsd*)
735 case ${egid} in 739 case ${egid} in
736 *[!0-9]*) # Non numeric 740 *[!0-9]*) # Non numeric
737 for egid in $(seq 101 999); do 741 for ((egid = 101; egid <= 999; egid++)); do
738 [ -z "`egetent group ${egid}`" ] && break 742 [[ -z $(egetent group ${egid}) ]] && break
739 done 743 done
740 esac 744 esac
741 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
742 ;; 746 ;;
743 747
751# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
752# vapier@gentoo.org 756# vapier@gentoo.org
753# 757#
754# edos2unix(file, <more files> ...) 758# edos2unix(file, <more files> ...)
755edos2unix() { 759edos2unix() {
756 for f in "$@" 760 echo "$@" | xargs sed -i 's/\r$//'
757 do
758 cp "${f}" ${T}/edos2unix
759 sed 's/\r$//' ${T}/edos2unix > "${f}"
760 done
761} 761}
762 762
763 763
764############################################################## 764##############################################################
765# START: Handle .desktop files and menu entries # 765# START: Handle .desktop files and menu entries #
766# maybe this should be separated into a new eclass some time # 766# maybe this should be separated into a new eclass some time #
767# lanius@gentoo.org # 767# lanius@gentoo.org #
768############################################################## 768##############################################################
769 769
770# Make a desktop file ! 770# Make a desktop file !
771# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
772# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
773# 773#
774# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
775# 775#
776# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
777# name: the name that will show up in the menu 777# name: the name that will show up in the menu
778# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
779# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
780# a full path to an icon 780# a full path to an icon
781# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
782# http://www.freedesktop.org/Standards/desktop-entry-spec 782# http://www.freedesktop.org/Standards/desktop-entry-spec
783# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
784make_desktop_entry() { 784make_desktop_entry() {
785 [[ -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
786 786
794 local catmaj=${CATEGORY%%-*} 794 local catmaj=${CATEGORY%%-*}
795 local catmin=${CATEGORY##*-} 795 local catmin=${CATEGORY##*-}
796 case ${catmaj} in 796 case ${catmaj} in
797 app) 797 app)
798 case ${catmin} in 798 case ${catmin} in
799 admin) type=System;; 799 admin) type=System;;
800 cdr) type=DiscBurning;; 800 cdr) type=DiscBurning;;
801 dicts) type=Dictionary;; 801 dicts) type=Dictionary;;
802 editors) type=TextEditor;; 802 editors) type=TextEditor;;
803 emacs) type=TextEditor;; 803 emacs) type=TextEditor;;
804 emulation) type=Emulator;; 804 emulation) type=Emulator;;
805 laptop) type=HardwareSettings;; 805 laptop) type=HardwareSettings;;
806 office) type=Office;; 806 office) type=Office;;
807 vim) type=TextEditor;; 807 vim) type=TextEditor;;
808 xemacs) type=TextEditor;; 808 xemacs) type=TextEditor;;
809 *) type=;; 809 *) type=;;
810 esac 810 esac
811 ;; 811 ;;
812 812
813 dev) 813 dev)
814 type="Development" 814 type="Development"
815 ;; 815 ;;
816 816
817 games) 817 games)
818 case ${catmin} in 818 case ${catmin} in
819 action) type=ActionGame;; 819 action|fps) type=ActionGame;;
820 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
821 board) type=BoardGame;; 821 board) type=BoardGame;;
822 kid) type=KidsGame;; 822 kids) type=KidsGame;;
823 emulation) type=Emulator;; 823 emulation) type=Emulator;;
824 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
825 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
826 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
827 simulation) type=Simulation;; 827 simulation) type=Simulation;;
828 sports) type=SportsGame;; 828 sports) type=SportsGame;;
829 strategy) type=StrategyGame;; 829 strategy) type=StrategyGame;;
830 *) type=;; 830 *) type=;;
831 esac 831 esac
832 type="Game;${type}" 832 type="Game;${type}"
833 ;; 833 ;;
834 834
835 mail) 835 mail)
839 media) 839 media)
840 case ${catmin} in 840 case ${catmin} in
841 gfx) type=Graphics;; 841 gfx) type=Graphics;;
842 radio) type=Tuner;; 842 radio) type=Tuner;;
843 sound) type=Audio;; 843 sound) type=Audio;;
844 tv) type=TV;; 844 tv) type=TV;;
845 video) type=Video;; 845 video) type=Video;;
846 *) type=;; 846 *) type=;;
847 esac 847 esac
848 type="AudioVideo;${type}" 848 type="AudioVideo;${type}"
849 ;; 849 ;;
850 850
851 net) 851 net)
852 case ${catmin} in 852 case ${catmin} in
853 dialup) type=Dialup;; 853 dialup) type=Dialup;;
854 ftp) type=FileTransfer;; 854 ftp) type=FileTransfer;;
855 im) type=InstantMessaging;; 855 im) type=InstantMessaging;;
856 irc) type=IRCClient;; 856 irc) type=IRCClient;;
857 mail) type=Email;; 857 mail) type=Email;;
858 news) type=News;; 858 news) type=News;;
859 nntp) type=News;; 859 nntp) type=News;;
860 p2p) type=FileTransfer;; 860 p2p) type=FileTransfer;;
861 *) type=;; 861 *) type=;;
862 esac 862 esac
863 type="Network;${type}" 863 type="Network;${type}"
864 ;; 864 ;;
865 865
866 sci) 866 sci)
867 case ${catmin} in 867 case ${catmin} in
868 astro*) type=Astronomy;; 868 astro*) type=Astronomy;;
869 bio*) type=Biology;; 869 bio*) type=Biology;;
870 calc*) type=Calculator;; 870 calc*) type=Calculator;;
871 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
872 geo*) type=Geology;; 872 geo*) type=Geology;;
873 math*) type=Math;; 873 math*) type=Math;;
874 *) type=;; 874 *) type=;;
875 esac 875 esac
876 type="Science;${type}" 876 type="Science;${type}"
877 ;; 877 ;;
878 878
879 www) 879 www)
880 case ${catmin} in 880 case ${catmin} in
881 client) type=WebBrowser;; 881 client) type=WebBrowser;;
882 *) type=;; 882 *) type=;;
883 esac 883 esac
884 type="Network" 884 type="Network"
885 ;; 885 ;;
886 886
887 *) 887 *)
893 local desktop_name="${PN}" 893 local desktop_name="${PN}"
894 else 894 else
895 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
896 fi 896 fi
897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
898# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
898 899
899echo "[Desktop Entry] 900echo "[Desktop Entry]
900Encoding=UTF-8 901Encoding=UTF-8
901Version=0.9.2 902Version=0.9.2
902Name=${name} 903Name=${name}
903Type=Application 904Type=Application
904Comment=${DESCRIPTION} 905Comment=${DESCRIPTION}
905Exec=${exec} 906Exec=${exec}
907TryExec=${exec%% *}
906Path=${path} 908Path=${path}
907Icon=${icon} 909Icon=${icon}
908Categories=Application;${type};" > "${desktop}" 910Categories=Application;${type};" > "${desktop}"
909 911
910 ( 912 (
915 ) 917 )
916} 918}
917 919
918# Make a GDM/KDM Session file 920# Make a GDM/KDM Session file
919# 921#
920# make_desktop_entry(<title>, <command>) 922# make_session_desktop(<title>, <command>)
921# title: File to execute to start the Window Manager 923# title: File to execute to start the Window Manager
922# command: Name of the Window Manager 924# command: Name of the Window Manager
923 925
924make_session_desktop() { 926make_session_desktop() {
925 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 927 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
976 insinto /usr/share/pixmaps 978 insinto /usr/share/pixmaps
977 newins "$1" "$2" 979 newins "$1" "$2"
978} 980}
979 981
980############################################################## 982##############################################################
981# END: Handle .desktop files and menu entries # 983# END: Handle .desktop files and menu entries #
982############################################################## 984##############################################################
983 985
984 986
985# for internal use only (unpack_pdv and unpack_makeself) 987# for internal use only (unpack_pdv and unpack_makeself)
986find_unpackable_file() { 988find_unpackable_file() {
1005# the middle of the archive. Valve seems to use it a lot ... too bad 1007# the middle of the archive. Valve seems to use it a lot ... too bad
1006# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1008# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1007# 1009#
1008# Usage: unpack_pdv [file to unpack] [size of off_t] 1010# Usage: unpack_pdv [file to unpack] [size of off_t]
1009# - you have to specify the off_t size ... i have no idea how to extract that 1011# - you have to specify the off_t size ... i have no idea how to extract that
1010# information out of the binary executable myself. basically you pass in 1012# information out of the binary executable myself. basically you pass in
1011# the size of the off_t type (in bytes) on the machine that built the pdv 1013# the size of the off_t type (in bytes) on the machine that built the pdv
1012# archive. one way to determine this is by running the following commands: 1014# archive. one way to determine this is by running the following commands:
1013# strings <pdv archive> | grep lseek 1015# strings <pdv archive> | grep lseek
1014# strace -elseek <pdv archive> 1016# strace -elseek <pdv archive>
1015# basically look for the first lseek command (we do the strings/grep because 1017# basically look for the first lseek command (we do the strings/grep because
1016# sometimes the function call is _llseek or something) and steal the 2nd 1018# sometimes the function call is _llseek or something) and steal the 2nd
1017# parameter. here is an example: 1019# parameter. here is an example:
1018# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1020# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1019# lseek 1021# lseek
1020# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1022# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1021# lseek(3, -4, SEEK_END) = 2981250 1023# lseek(3, -4, SEEK_END) = 2981250
1022# thus we would pass in the value of '4' as the second parameter. 1024# thus we would pass in the value of '4' as the second parameter.
1023unpack_pdv() { 1025unpack_pdv() {
1024 local src=$(find_unpackable_file $1) 1026 local src=$(find_unpackable_file $1)
1025 local sizeoff_t=$2 1027 local sizeoff_t=$2
1026 1028
1027 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1029 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1028 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1030 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1029 1031
1030 local shrtsrc=$(basename "${src}") 1032 local shrtsrc=$(basename "${src}")
1031 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1033 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1032 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1034 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1033 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1035 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1034 1036
1035 # grab metadata for debug reasons 1037 # grab metadata for debug reasons
1036 local metafile="$(emktemp)" 1038 local metafile="$(emktemp)"
1037 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1039 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
1038 1040
1097# many other game companies. 1099# many other game companies.
1098# 1100#
1099# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1101# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1100# - If the file is not specified then unpack will utilize ${A}. 1102# - If the file is not specified then unpack will utilize ${A}.
1101# - If the offset is not specified then we will attempt to extract 1103# - If the offset is not specified then we will attempt to extract
1102# the proper offset from the script itself. 1104# the proper offset from the script itself.
1103unpack_makeself() { 1105unpack_makeself() {
1104 local src_input=${1:-${A}} 1106 local src_input=${1:-${A}}
1105 local src=$(find_unpackable_file "${src_input}") 1107 local src=$(find_unpackable_file "${src_input}")
1106 local skip=$2 1108 local skip=$2
1107 local exe=$3 1109 local exe=$3
1113 if [[ -z ${skip} ]] ; then 1115 if [[ -z ${skip} ]] ; then
1114 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1116 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1115 local skip=0 1117 local skip=0
1116 exe=tail 1118 exe=tail
1117 case ${ver} in 1119 case ${ver} in
1118 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1120 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1119 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1121 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1120 ;; 1122 ;;
1121 2.0|2.0.1) 1123 2.0|2.0.1)
1122 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1124 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1123 ;; 1125 ;;
1157 # lets grab the first few bytes of the file to figure out what kind of archive it is 1159 # lets grab the first few bytes of the file to figure out what kind of archive it is
1158 local tmpfile="$(emktemp)" 1160 local tmpfile="$(emktemp)"
1159 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1161 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1160 local filetype="$(file -b "${tmpfile}")" 1162 local filetype="$(file -b "${tmpfile}")"
1161 case ${filetype} in 1163 case ${filetype} in
1162 *tar\ archive) 1164 *tar\ archive*)
1163 eval ${exe} | tar --no-same-owner -xf - 1165 eval ${exe} | tar --no-same-owner -xf -
1164 ;; 1166 ;;
1165 bzip2*) 1167 bzip2*)
1166 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1168 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1167 ;; 1169 ;;
1203 # accepted ... if we don't find a match, we make the user accept 1205 # accepted ... if we don't find a match, we make the user accept
1204 local shopts=$- 1206 local shopts=$-
1205 local alic 1207 local alic
1206 set -o noglob #so that bash doesn't expand "*" 1208 set -o noglob #so that bash doesn't expand "*"
1207 for alic in ${ACCEPT_LICENSE} ; do 1209 for alic in ${ACCEPT_LICENSE} ; do
1208 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1210 if [[ ${alic} == ${l} ]]; then
1209 set +o noglob; set -${shopts} #reset old shell opts 1211 set +o noglob; set -${shopts} #reset old shell opts
1210 return 0 1212 return 0
1211 fi 1213 fi
1212 done 1214 done
1213 set +o noglob; set -$shopts #reset old shell opts 1215 set +o noglob; set -$shopts #reset old shell opts
1215 local licmsg="$(emktemp)" 1217 local licmsg="$(emktemp)"
1216 cat << EOF > ${licmsg} 1218 cat << EOF > ${licmsg}
1217********************************************************** 1219**********************************************************
1218The following license outlines the terms of use of this 1220The following license outlines the terms of use of this
1219package. You MUST accept this license for installation to 1221package. You MUST accept this license for installation to
1220continue. When you are done viewing, hit 'q'. If you 1222continue. When you are done viewing, hit 'q'. If you
1221CTRL+C out of this, the install will not run! 1223CTRL+C out of this, the install will not run!
1222********************************************************** 1224**********************************************************
1223 1225
1224EOF 1226EOF
1225 cat ${lic} >> ${licmsg} 1227 cat ${lic} >> ${licmsg}
1246# and when the function returns, you can assume that the cd has been 1248# and when the function returns, you can assume that the cd has been
1247# found at CDROM_ROOT. 1249# found at CDROM_ROOT.
1248# 1250#
1249# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1251# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1250# etc... if you want to give the cds better names, then just export 1252# etc... if you want to give the cds better names, then just export
1251# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1253# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1254# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1255# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1256# CDROM_NAME_2="data cd"
1257# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1252# 1258#
1253# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1259# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1254# 1260#
1255# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1261# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1256# - this will attempt to locate a cd based upon a file that is on 1262# - this will attempt to locate a cd based upon a file that is on
1257# the cd ... the more files you give this function, the more cds 1263# the cd ... the more files you give this function, the more cds
1258# the cdrom functions will handle 1264# the cdrom functions will handle
1259cdrom_get_cds() { 1265cdrom_get_cds() {
1260 # first we figure out how many cds we're dealing with by 1266 # first we figure out how many cds we're dealing with by
1261 # the # of files they gave us 1267 # the # of files they gave us
1262 local cdcnt=0 1268 local cdcnt=0
1263 local f= 1269 local f=
1307 echo 1313 echo
1308 einfo "For example:" 1314 einfo "For example:"
1309 einfo "export CD_ROOT=/mnt/cdrom" 1315 einfo "export CD_ROOT=/mnt/cdrom"
1310 echo 1316 echo
1311 else 1317 else
1318 if [[ -n ${CDROM_NAME_SET} ]] ; then
1319 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1320 cdcnt=0
1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1322 ((++cdcnt))
1323 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1324 done
1325 fi
1326
1312 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1327 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1313 cdcnt=0 1328 cdcnt=0
1314 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1329 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1315 ((++cdcnt)) 1330 ((++cdcnt))
1316 var="CDROM_NAME_${cdcnt}" 1331 var="CDROM_NAME_${cdcnt}"
1383 1398
1384 while [[ -n ${cdset[${i}]} ]] ; do 1399 while [[ -n ${cdset[${i}]} ]] ; do
1385 local dir=$(dirname ${cdset[${i}]}) 1400 local dir=$(dirname ${cdset[${i}]})
1386 local file=$(basename ${cdset[${i}]}) 1401 local file=$(basename ${cdset[${i}]})
1387 1402
1388 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do 1403 local point= node= fs= foo=
1389 [[ -d ${mline}/${dir} ]] || continue 1404 while read point node fs foo ; do
1405 [[ " cd9660 iso9660 " != *" ${fs} "* ]] && \
1406 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1407 && continue
1408 point=${point//\040/ }
1390 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then 1409 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1391 export CDROM_ROOT=${mline} 1410 export CDROM_ROOT=${point}
1392 export CDROM_SET=${i} 1411 export CDROM_SET=${i}
1393 export CDROM_MATCH=${cdset[${i}]} 1412 export CDROM_MATCH=${cdset[${i}]}
1394 return 1413 return
1395 fi 1414 done <<< "$(get_mounts)"
1396 done
1397 1415
1398 ((++i)) 1416 ((++i))
1399 done 1417 done
1400 1418
1401 echo 1419 echo
1429 1447
1430# Make sure that LINGUAS only contains languages that 1448# Make sure that LINGUAS only contains languages that
1431# a package can support 1449# a package can support
1432# 1450#
1433# usage: strip-linguas <allow LINGUAS> 1451# usage: strip-linguas <allow LINGUAS>
1434# strip-linguas -i <directories of .po files> 1452# strip-linguas -i <directories of .po files>
1435# strip-linguas -u <directories of .po files> 1453# strip-linguas -u <directories of .po files>
1436# 1454#
1437# The first form allows you to specify a list of LINGUAS. 1455# The first form allows you to specify a list of LINGUAS.
1438# The -i builds a list of po files found in all the 1456# The -i builds a list of po files found in all the
1439# directories and uses the intersection of the lists. 1457# directories and uses the intersection of the lists.
1440# The -u builds a list of po files found in all the 1458# The -u builds a list of po files found in all the
1441# directories and uses the union of the lists. 1459# directories and uses the union of the lists.
1442strip-linguas() { 1460strip-linguas() {
1443 local ls newls 1461 local ls newls nols
1444 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1462 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1445 local op=$1; shift 1463 local op=$1; shift
1446 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift 1464 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1447 local d f 1465 local d f
1448 for d in "$@" ; do 1466 for d in "$@" ; do
1449 if [[ ${op} == "-u" ]] ; then 1467 if [[ ${op} == "-u" ]] ; then
1450 newls=${ls} 1468 newls=${ls}
1451 else 1469 else
1452 newls="" 1470 newls=""
1453 fi 1471 fi
1454 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do 1472 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1455 if [[ ${op} == "-i" ]] ; then 1473 if [[ ${op} == "-i" ]] ; then
1456 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1474 hasq ${f} ${ls} && newls="${newls} ${f}"
1457 else 1475 else
1458 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1476 hasq ${f} ${ls} || newls="${newls} ${f}"
1459 fi 1477 fi
1460 done 1478 done
1461 ls=${newls} 1479 ls=${newls}
1462 done 1480 done
1463 ls=${ls//.po}
1464 else 1481 else
1465 ls=$@ 1482 ls="$@"
1466 fi 1483 fi
1467 1484
1468 ls=" ${ls} " 1485 nols=""
1469 newls="" 1486 newls=""
1470 for f in ${LINGUAS} ; do 1487 for f in ${LINGUAS} ; do
1471 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1488 if hasq ${f} ${ls} ; then
1472 newls="${newls} ${f}" 1489 newls="${newls} ${f}"
1473 else 1490 else
1474 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1491 nols="${nols} ${f}"
1475 fi 1492 fi
1476 done 1493 done
1477 if [[ -z ${newls} ]] ; then 1494 [[ -n ${nols} ]] \
1478 export LINGUAS="" 1495 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1479 else
1480 export LINGUAS=${newls:1} 1496 export LINGUAS=${newls:1}
1481 fi
1482} 1497}
1483 1498
1484# moved from kernel.eclass since they are generally useful outside of 1499# moved from kernel.eclass since they are generally useful outside of
1485# kernel.eclass -iggy (20041002) 1500# kernel.eclass -iggy (20041002)
1486 1501
1493 while ((i--)) ; do 1508 while ((i--)) ; do
1494 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1509 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1495 done 1510 done
1496 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1511 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1497 case ${ARCH} in 1512 case ${ARCH} in
1498 x86) export ARCH="i386";; 1513 x86) export ARCH="i386";;
1499 amd64) export ARCH="x86_64";; 1514 amd64) export ARCH="x86_64";;
1500 hppa) export ARCH="parisc";; 1515 hppa) export ARCH="parisc";;
1501 mips) export ARCH="mips";; 1516 mips) export ARCH="mips";;
1502 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! 1517 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!
1503 *) export ARCH="${ARCH}";; 1518 *) export ARCH="${ARCH}";;
1504 esac 1519 esac
1505} 1520}
1506 1521
1507# set's ARCH back to what portage expects 1522# set's ARCH back to what portage expects
1508set_arch_to_portage() { 1523set_arch_to_portage() {
1515 1530
1516# Jeremy Huddleston <eradicator@gentoo.org>: 1531# Jeremy Huddleston <eradicator@gentoo.org>:
1517# preserve_old_lib /path/to/libblah.so.0 1532# preserve_old_lib /path/to/libblah.so.0
1518# preserve_old_lib_notify /path/to/libblah.so.0 1533# preserve_old_lib_notify /path/to/libblah.so.0
1519# 1534#
1520# These functions are useful when a lib in your package changes --library. Such 1535# These functions are useful when a lib in your package changes --library. Such
1521# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1536# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1522# would break packages that link against it. Most people get around this 1537# would break packages that link against it. Most people get around this
1523# by using the portage SLOT mechanism, but that is not always a relevant 1538# by using the portage SLOT mechanism, but that is not always a relevant
1524# solution, so instead you can add the following to your ebuilds: 1539# solution, so instead you can add the following to your ebuilds:
1525# 1540#
1526# src_install() { 1541# pkg_preinst() {
1527# ... 1542# ...
1528# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1543# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1529# ... 1544# ...
1530# } 1545# }
1531# 1546#
1534# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1549# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1535# ... 1550# ...
1536# } 1551# }
1537 1552
1538preserve_old_lib() { 1553preserve_old_lib() {
1539 LIB=$1 1554 if [[ ${EBUILD_PHASE} != "pkg_preinst" ]] ; then
1555 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1556# die "Invalid preserve_old_lib() usage"
1557 fi
1558 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1540 1559
1541 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1560 local lib dir
1542 SONAME=`basename ${LIB}` 1561 for lib in "$@" ; do
1543 DIRNAME=`dirname ${LIB}` 1562 [[ -e ${ROOT}/${lib} ]] || continue
1544 1563 dir=${lib%/*}
1545 dodir ${DIRNAME} 1564 dodir ${dir} || die "dodir ${dir} failed"
1546 cp ${ROOT}${LIB} ${D}${DIRNAME} 1565 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1547 touch ${D}${LIB} 1566 touch "${D}"/${lib}
1548 fi 1567 done
1549} 1568}
1550 1569
1551preserve_old_lib_notify() { 1570preserve_old_lib_notify() {
1552 LIB=$1 1571 if [[ ${EBUILD_PHASE} != "pkg_postinst" ]] ; then
1572 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1573# die "Invalid preserve_old_lib_notify() usage"
1574 fi
1553 1575
1554 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1576 local lib notice=0
1555 SONAME=`basename ${LIB}` 1577 for lib in "$@" ; do
1556 1578 [[ -e ${ROOT}/${lib} ]] || continue
1579 if [[ ${notice} -eq 0 ]] ; then
1580 notice=1
1557 ewarn "An old version of an installed library was detected on your system." 1581 ewarn "Old versions of installed libraries were detected on your system."
1558 ewarn "In order to avoid breaking packages that link against it, this older version" 1582 ewarn "In order to avoid breaking packages that depend on these old libs,"
1559 ewarn "is not being removed. In order to make full use of this newer version," 1583 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1560 ewarn "you will need to execute the following command:" 1584 ewarn "in order to remove these old dependencies. If you do not have this"
1561 ewarn " revdep-rebuild --library ${SONAME}" 1585 ewarn "helper program, simply emerge the 'gentoolkit' package."
1562 ewarn 1586 ewarn
1563 ewarn "After doing that, you can safely remove ${LIB}"
1564 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1565 fi 1587 fi
1588 ewarn " # revdep-rebuild --library ${lib##*/}"
1589 done
1566} 1590}
1567 1591
1568# Hack for people to figure out if a package was built with 1592# Hack for people to figure out if a package was built with
1569# certain USE flags 1593# certain USE flags
1570# 1594#
1571# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1595# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1572# ex: built_with_use xchat gtk2 1596# ex: built_with_use xchat gtk2
1573# 1597#
1574# Flags: -a all USE flags should be utilized 1598# Flags: -a all USE flags should be utilized
1575# -o at least one USE flag should be utilized 1599# -o at least one USE flag should be utilized
1576# Note: the default flag is '-a' 1600# Note: the default flag is '-a'
1577built_with_use() { 1601built_with_use() {
1578 local opt=$1 1602 local opt=$1
1579 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1603 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1580 1604
1581 local PKG=$(best_version $1) 1605 local PKG=$(best_version $1)
1606 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1582 shift 1607 shift
1583 1608
1584 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE 1609 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1610 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1585 1611
1586 # if the USE file doesnt exist, assume the $PKG is either 1612 # if the USE file doesnt exist, assume the $PKG is either
1587 # injected or package.provided 1613 # injected or package.provided
1588 [[ ! -e ${USEFILE} ]] && return 0 1614 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1615
1616 local IUSE_BUILT=$(<${IUSEFILE})
1617 # Don't check USE_EXPAND #147237
1618 local expand
1619 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1620 if [[ $1 == ${expand}_* ]] ; then
1621 expand=""
1622 break
1623 fi
1624 done
1625 if [[ -n ${expand} ]] ; then
1626 has $1 ${IUSE_BUILT} || die "$PKG does not actually support the $1 USE flag!"
1627 fi
1589 1628
1590 local USE_BUILT=$(<${USEFILE}) 1629 local USE_BUILT=$(<${USEFILE})
1591 while [[ $# -gt 0 ]] ; do 1630 while [[ $# -gt 0 ]] ; do
1592 if [[ ${opt} = "-o" ]] ; then 1631 if [[ ${opt} = "-o" ]] ; then
1593 has $1 ${USE_BUILT} && return 0 1632 has $1 ${USE_BUILT} && return 0
1608 local f 1647 local f
1609 for f in $(find ${dir} -name configure) ; do 1648 for f in $(find ${dir} -name configure) ; do
1610 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1649 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1611 done 1650 done
1612 eend 0 1651 eend 0
1613}
1614
1615# dopamd <file> [more files]
1616#
1617# Install pam auth config file in /etc/pam.d
1618dopamd() {
1619 [[ -z $1 ]] && die "dopamd requires at least one argument"
1620
1621 use pam || return 0
1622
1623 INSDESTTREE=/etc/pam.d \
1624 doins "$@" || die "failed to install $@"
1625}
1626# newpamd <old name> <new name>
1627#
1628# Install pam file <old name> as <new name> in /etc/pam.d
1629newpamd() {
1630 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1631
1632 use pam || return 0
1633
1634 INSDESTTREE=/etc/pam.d \
1635 newins "$1" "$2" || die "failed to install $1 as $2"
1636} 1652}
1637 1653
1638# make a wrapper script ... 1654# make a wrapper script ...
1639# NOTE: this was originally games_make_wrapper, but I noticed other places where 1655# NOTE: this was originally games_make_wrapper, but I noticed other places where
1640# this could be used, so I have moved it here and made it not games-specific 1656# this could be used, so I have moved it here and made it not games-specific

Legend:
Removed from v.1.228  
changed lines
  Added in v.1.267

  ViewVC Help
Powered by ViewVC 1.1.20