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

Diff of /eclass/eutils.eclass

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

Revision 1.225 Revision 1.268
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.225 2006/02/18 10:50:10 flameeyes Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.268 2007/01/13 19:36:14 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
262 einfo "${EPATCH_SINGLE_MSG}" 253 einfo "${EPATCH_SINGLE_MSG}"
263 else 254 else
264 einfo "Applying ${patchname} ..." 255 einfo "Applying ${patchname} ..."
265 fi 256 fi
266 else 257 else
267 einfo " ${patchname} ..." 258 einfo " ${patchname} ..."
268 fi 259 fi
269 260
270 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 261 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
271 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 262 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
272 263
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
448# shell: /bin/false 439# shell: /bin/false
449# homedir: /dev/null 440# homedir: /dev/null
450# groups: none 441# groups: none
451# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
452enewuser() { 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
453 # get the username 451 # get the username
454 local euser=$1; shift 452 local euser=$1; shift
455 if [[ -z ${euser} ]] ; then 453 if [[ -z ${euser} ]] ; then
456 eerror "No username specified !" 454 eerror "No username specified !"
457 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
458 fi 456 fi
459 457
460 # lets see if the username already exists 458 # lets see if the username already exists
461 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
462 return 0 460 return 0
463 fi 461 fi
464 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
465 463
466 # options to pass to useradd 464 # options to pass to useradd
467 local opts= 465 local opts=
468 466
469 # handle uid 467 # handle uid
470 local euid=$1; shift 468 local euid=$1; shift
471 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
472 if [[ ${euid} -gt 0 ]] ; then 470 if [[ ${euid} -gt 0 ]] ; then
473 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
474 euid="next" 472 euid="next"
475 fi 473 fi
476 else 474 else
477 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
478 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
479 fi 477 fi
480 else 478 else
481 euid="next" 479 euid="next"
482 fi 480 fi
483 if [[ ${euid} == "next" ]] ; then 481 if [[ ${euid} == "next" ]] ; then
484 for euid in $(seq 101 999) ; do 482 for ((euid = 101; euid <= 999; euid++)); do
485 [[ -z $(egetent passwd ${euid}) ]] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
486 done 484 done
487 fi 485 fi
488 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
489 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
503 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
504 [[ -x ${ROOT}${shell} ]] && break 502 [[ -x ${ROOT}${shell} ]] && break
505 done 503 done
506 504
507 if [[ ${shell} == "/dev/null" ]] ; then 505 if [[ ${shell} == "/dev/null" ]] ; then
508 eerror "Unable to identify the shell to use" 506 eerror "Unable to identify the shell to use, proceeding with userland default."
509 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
510 fi 513 fi
511 514
512 eshell=${shell} 515 eshell=${shell}
513 fi 516 fi
514 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
643# Default values if you do not specify any: 646# Default values if you do not specify any:
644# groupname: REQUIRED ! 647# groupname: REQUIRED !
645# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
646# extra: none 649# extra: none
647enewgroup() { 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
648 # get the group 658 # get the group
649 local egroup="$1"; shift 659 local egroup="$1"; shift
650 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
651 then 661 then
652 eerror "No group specified !" 662 eerror "No group specified !"
653 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
654 fi 664 fi
655 665
656 # see if group already exists 666 # see if group already exists
657 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
658 then
659 return 0 668 return 0
660 fi 669 fi
661 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
662 671
663 # options to pass to useradd 672 # options to pass to useradd
706 fi 715 fi
707 716
708 # If we need the next available 717 # If we need the next available
709 case ${egid} in 718 case ${egid} in
710 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
711 for egid in $(seq 101 999); do 720 for ((egid = 101; egid <= 999; egid++)); do
712 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
713 done 722 done
714 esac 723 esac
715 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
716 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
717 ;; 726 ;;
718 727
719 *-freebsd*|*-dragonfly*) 728 *-freebsd*|*-dragonfly*)
720 case ${egid} in 729 case ${egid} in
721 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
722 for egid in $(seq 101 999); do 731 for ((egid = 101; egid <= 999; egid++)); do
723 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
724 done 733 done
725 esac 734 esac
726 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
727 ;; 736 ;;
728 737
729 *-netbsd*) 738 *-netbsd*)
730 case ${egid} in 739 case ${egid} in
731 *[!0-9]*) # Non numeric 740 *[!0-9]*) # Non numeric
732 for egid in $(seq 101 999); do 741 for ((egid = 101; egid <= 999; egid++)); do
733 [ -z "`egetent group ${egid}`" ] && break 742 [[ -z $(egetent group ${egid}) ]] && break
734 done 743 done
735 esac 744 esac
736 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
737 ;; 746 ;;
738 747
746# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
747# vapier@gentoo.org 756# vapier@gentoo.org
748# 757#
749# edos2unix(file, <more files> ...) 758# edos2unix(file, <more files> ...)
750edos2unix() { 759edos2unix() {
751 for f in "$@" 760 echo "$@" | xargs sed -i 's/\r$//'
752 do
753 cp "${f}" ${T}/edos2unix
754 sed 's/\r$//' ${T}/edos2unix > "${f}"
755 done
756} 761}
757 762
758 763
759############################################################## 764##############################################################
760# START: Handle .desktop files and menu entries # 765# START: Handle .desktop files and menu entries #
761# maybe this should be separated into a new eclass some time # 766# maybe this should be separated into a new eclass some time #
762# lanius@gentoo.org # 767# lanius@gentoo.org #
763############################################################## 768##############################################################
764 769
765# Make a desktop file ! 770# Make a desktop file !
766# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
767# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
768# 773#
769# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
770# 775#
771# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
772# name: the name that will show up in the menu 777# name: the name that will show up in the menu
773# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
774# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
775# a full path to an icon 780# a full path to an icon
776# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
777# http://www.freedesktop.org/Standards/desktop-entry-spec 782# http://www.freedesktop.org/Standards/desktop-entry-spec
778# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
779make_desktop_entry() { 784make_desktop_entry() {
780 [[ -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
781 786
789 local catmaj=${CATEGORY%%-*} 794 local catmaj=${CATEGORY%%-*}
790 local catmin=${CATEGORY##*-} 795 local catmin=${CATEGORY##*-}
791 case ${catmaj} in 796 case ${catmaj} in
792 app) 797 app)
793 case ${catmin} in 798 case ${catmin} in
794 admin) type=System;; 799 admin) type=System;;
795 cdr) type=DiscBurning;; 800 cdr) type=DiscBurning;;
796 dicts) type=Dictionary;; 801 dicts) type=Dictionary;;
797 editors) type=TextEditor;; 802 editors) type=TextEditor;;
798 emacs) type=TextEditor;; 803 emacs) type=TextEditor;;
799 emulation) type=Emulator;; 804 emulation) type=Emulator;;
800 laptop) type=HardwareSettings;; 805 laptop) type=HardwareSettings;;
801 office) type=Office;; 806 office) type=Office;;
802 vim) type=TextEditor;; 807 vim) type=TextEditor;;
803 xemacs) type=TextEditor;; 808 xemacs) type=TextEditor;;
804 *) type=;; 809 *) type=;;
805 esac 810 esac
806 ;; 811 ;;
807 812
808 dev) 813 dev)
809 type="Development" 814 type="Development"
810 ;; 815 ;;
811 816
812 games) 817 games)
813 case ${catmin} in 818 case ${catmin} in
814 action) type=ActionGame;; 819 action|fps) type=ActionGame;;
815 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
816 board) type=BoardGame;; 821 board) type=BoardGame;;
817 kid) type=KidsGame;; 822 kids) type=KidsGame;;
818 emulation) type=Emulator;; 823 emulation) type=Emulator;;
819 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
820 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
821 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
822 simulation) type=Simulation;; 827 simulation) type=Simulation;;
823 sports) type=SportsGame;; 828 sports) type=SportsGame;;
824 strategy) type=StrategyGame;; 829 strategy) type=StrategyGame;;
825 *) type=;; 830 *) type=;;
826 esac 831 esac
827 type="Game;${type}" 832 type="Game;${type}"
828 ;; 833 ;;
829 834
830 mail) 835 mail)
834 media) 839 media)
835 case ${catmin} in 840 case ${catmin} in
836 gfx) type=Graphics;; 841 gfx) type=Graphics;;
837 radio) type=Tuner;; 842 radio) type=Tuner;;
838 sound) type=Audio;; 843 sound) type=Audio;;
839 tv) type=TV;; 844 tv) type=TV;;
840 video) type=Video;; 845 video) type=Video;;
841 *) type=;; 846 *) type=;;
842 esac 847 esac
843 type="AudioVideo;${type}" 848 type="AudioVideo;${type}"
844 ;; 849 ;;
845 850
846 net) 851 net)
847 case ${catmin} in 852 case ${catmin} in
848 dialup) type=Dialup;; 853 dialup) type=Dialup;;
849 ftp) type=FileTransfer;; 854 ftp) type=FileTransfer;;
850 im) type=InstantMessaging;; 855 im) type=InstantMessaging;;
851 irc) type=IRCClient;; 856 irc) type=IRCClient;;
852 mail) type=Email;; 857 mail) type=Email;;
853 news) type=News;; 858 news) type=News;;
854 nntp) type=News;; 859 nntp) type=News;;
855 p2p) type=FileTransfer;; 860 p2p) type=FileTransfer;;
856 *) type=;; 861 *) type=;;
857 esac 862 esac
858 type="Network;${type}" 863 type="Network;${type}"
859 ;; 864 ;;
860 865
861 sci) 866 sci)
862 case ${catmin} in 867 case ${catmin} in
863 astro*) type=Astronomy;; 868 astro*) type=Astronomy;;
864 bio*) type=Biology;; 869 bio*) type=Biology;;
865 calc*) type=Calculator;; 870 calc*) type=Calculator;;
866 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
867 geo*) type=Geology;; 872 geo*) type=Geology;;
868 math*) type=Math;; 873 math*) type=Math;;
869 *) type=;; 874 *) type=;;
870 esac 875 esac
871 type="Science;${type}" 876 type="Science;${type}"
872 ;; 877 ;;
873 878
874 www) 879 www)
875 case ${catmin} in 880 case ${catmin} in
876 client) type=WebBrowser;; 881 client) type=WebBrowser;;
877 *) type=;; 882 *) type=;;
878 esac 883 esac
879 type="Network" 884 type="Network"
880 ;; 885 ;;
881 886
882 *) 887 *)
888 local desktop_name="${PN}" 893 local desktop_name="${PN}"
889 else 894 else
890 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
891 fi 896 fi
892 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
898# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
893 899
894echo "[Desktop Entry] 900echo "[Desktop Entry]
895Encoding=UTF-8 901Encoding=UTF-8
896Version=0.9.2 902Version=0.9.2
897Name=${name} 903Name=${name}
898Type=Application 904Type=Application
899Comment=${DESCRIPTION} 905Comment=${DESCRIPTION}
900Exec=${exec} 906Exec=${exec}
907TryExec=${exec%% *}
901Path=${path} 908Path=${path}
902Icon=${icon} 909Icon=${icon}
903Categories=Application;${type};" > "${desktop}" 910Categories=Application;${type};" > "${desktop}"
904 911
905 ( 912 (
910 ) 917 )
911} 918}
912 919
913# Make a GDM/KDM Session file 920# Make a GDM/KDM Session file
914# 921#
915# make_desktop_entry(<title>, <command>) 922# make_session_desktop(<title>, <command>)
916# title: File to execute to start the Window Manager 923# title: File to execute to start the Window Manager
917# command: Name of the Window Manager 924# command: Name of the Window Manager
918 925
919make_session_desktop() { 926make_session_desktop() {
920 [[ -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
971 insinto /usr/share/pixmaps 978 insinto /usr/share/pixmaps
972 newins "$1" "$2" 979 newins "$1" "$2"
973} 980}
974 981
975############################################################## 982##############################################################
976# END: Handle .desktop files and menu entries # 983# END: Handle .desktop files and menu entries #
977############################################################## 984##############################################################
978 985
979 986
980# for internal use only (unpack_pdv and unpack_makeself) 987# for internal use only (unpack_pdv and unpack_makeself)
981find_unpackable_file() { 988find_unpackable_file() {
1000# 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
1001# 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.
1002# 1009#
1003# Usage: unpack_pdv [file to unpack] [size of off_t] 1010# Usage: unpack_pdv [file to unpack] [size of off_t]
1004# - 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
1005# information out of the binary executable myself. basically you pass in 1012# information out of the binary executable myself. basically you pass in
1006# 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
1007# 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:
1008# strings <pdv archive> | grep lseek 1015# strings <pdv archive> | grep lseek
1009# strace -elseek <pdv archive> 1016# strace -elseek <pdv archive>
1010# 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
1011# 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
1012# parameter. here is an example: 1019# parameter. here is an example:
1013# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1020# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1014# lseek 1021# lseek
1015# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1022# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1016# lseek(3, -4, SEEK_END) = 2981250 1023# lseek(3, -4, SEEK_END) = 2981250
1017# 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.
1018unpack_pdv() { 1025unpack_pdv() {
1019 local src=$(find_unpackable_file $1) 1026 local src=$(find_unpackable_file $1)
1020 local sizeoff_t=$2 1027 local sizeoff_t=$2
1021 1028
1022 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1029 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1023 [[ -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 :("
1024 1031
1025 local shrtsrc=$(basename "${src}") 1032 local shrtsrc=$(basename "${src}")
1026 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1033 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1027 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1034 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1028 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\"`
1029 1036
1030 # grab metadata for debug reasons 1037 # grab metadata for debug reasons
1031 local metafile="$(emktemp)" 1038 local metafile="$(emktemp)"
1032 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1039 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
1033 1040
1092# many other game companies. 1099# many other game companies.
1093# 1100#
1094# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1101# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1095# - If the file is not specified then unpack will utilize ${A}. 1102# - If the file is not specified then unpack will utilize ${A}.
1096# - 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
1097# the proper offset from the script itself. 1104# the proper offset from the script itself.
1098unpack_makeself() { 1105unpack_makeself() {
1099 local src_input=${1:-${A}} 1106 local src_input=${1:-${A}}
1100 local src=$(find_unpackable_file "${src_input}") 1107 local src=$(find_unpackable_file "${src_input}")
1101 local skip=$2 1108 local skip=$2
1102 local exe=$3 1109 local exe=$3
1108 if [[ -z ${skip} ]] ; then 1115 if [[ -z ${skip} ]] ; then
1109 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1116 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1110 local skip=0 1117 local skip=0
1111 exe=tail 1118 exe=tail
1112 case ${ver} in 1119 case ${ver} in
1113 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
1114 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1121 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1115 ;; 1122 ;;
1116 2.0|2.0.1) 1123 2.0|2.0.1)
1117 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1124 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1118 ;; 1125 ;;
1152 # 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
1153 local tmpfile="$(emktemp)" 1160 local tmpfile="$(emktemp)"
1154 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1161 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1155 local filetype="$(file -b "${tmpfile}")" 1162 local filetype="$(file -b "${tmpfile}")"
1156 case ${filetype} in 1163 case ${filetype} in
1157 *tar\ archive) 1164 *tar\ archive*)
1158 eval ${exe} | tar --no-same-owner -xf - 1165 eval ${exe} | tar --no-same-owner -xf -
1159 ;; 1166 ;;
1160 bzip2*) 1167 bzip2*)
1161 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1168 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1162 ;; 1169 ;;
1198 # 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
1199 local shopts=$- 1206 local shopts=$-
1200 local alic 1207 local alic
1201 set -o noglob #so that bash doesn't expand "*" 1208 set -o noglob #so that bash doesn't expand "*"
1202 for alic in ${ACCEPT_LICENSE} ; do 1209 for alic in ${ACCEPT_LICENSE} ; do
1203 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1210 if [[ ${alic} == ${l} ]]; then
1204 set +o noglob; set -${shopts} #reset old shell opts 1211 set +o noglob; set -${shopts} #reset old shell opts
1205 return 0 1212 return 0
1206 fi 1213 fi
1207 done 1214 done
1208 set +o noglob; set -$shopts #reset old shell opts 1215 set +o noglob; set -$shopts #reset old shell opts
1210 local licmsg="$(emktemp)" 1217 local licmsg="$(emktemp)"
1211 cat << EOF > ${licmsg} 1218 cat << EOF > ${licmsg}
1212********************************************************** 1219**********************************************************
1213The following license outlines the terms of use of this 1220The following license outlines the terms of use of this
1214package. You MUST accept this license for installation to 1221package. You MUST accept this license for installation to
1215continue. When you are done viewing, hit 'q'. If you 1222continue. When you are done viewing, hit 'q'. If you
1216CTRL+C out of this, the install will not run! 1223CTRL+C out of this, the install will not run!
1217********************************************************** 1224**********************************************************
1218 1225
1219EOF 1226EOF
1220 cat ${lic} >> ${licmsg} 1227 cat ${lic} >> ${licmsg}
1241# 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
1242# found at CDROM_ROOT. 1249# found at CDROM_ROOT.
1243# 1250#
1244# 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',
1245# 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
1246# 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_#
1247# 1258#
1248# 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.
1249# 1260#
1250# 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] [...]
1251# - 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
1252# 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
1253# the cdrom functions will handle 1264# the cdrom functions will handle
1254cdrom_get_cds() { 1265cdrom_get_cds() {
1255 # 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
1256 # the # of files they gave us 1267 # the # of files they gave us
1257 local cdcnt=0 1268 local cdcnt=0
1258 local f= 1269 local f=
1302 echo 1313 echo
1303 einfo "For example:" 1314 einfo "For example:"
1304 einfo "export CD_ROOT=/mnt/cdrom" 1315 einfo "export CD_ROOT=/mnt/cdrom"
1305 echo 1316 echo
1306 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
1307 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1327 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1308 cdcnt=0 1328 cdcnt=0
1309 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1329 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1310 ((++cdcnt)) 1330 ((++cdcnt))
1311 var="CDROM_NAME_${cdcnt}" 1331 var="CDROM_NAME_${cdcnt}"
1378 1398
1379 while [[ -n ${cdset[${i}]} ]] ; do 1399 while [[ -n ${cdset[${i}]} ]] ; do
1380 local dir=$(dirname ${cdset[${i}]}) 1400 local dir=$(dirname ${cdset[${i}]})
1381 local file=$(basename ${cdset[${i}]}) 1401 local file=$(basename ${cdset[${i}]})
1382 1402
1383 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do 1403 local point= node= fs= foo=
1384 [[ -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/ }
1385 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then 1409 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1386 export CDROM_ROOT=${mline} 1410 export CDROM_ROOT=${point}
1387 export CDROM_SET=${i} 1411 export CDROM_SET=${i}
1388 export CDROM_MATCH=${cdset[${i}]} 1412 export CDROM_MATCH=${cdset[${i}]}
1389 return 1413 return
1390 fi 1414 done <<< "$(get_mounts)"
1391 done
1392 1415
1393 ((++i)) 1416 ((++i))
1394 done 1417 done
1395 1418
1396 echo 1419 echo
1424 1447
1425# Make sure that LINGUAS only contains languages that 1448# Make sure that LINGUAS only contains languages that
1426# a package can support 1449# a package can support
1427# 1450#
1428# usage: strip-linguas <allow LINGUAS> 1451# usage: strip-linguas <allow LINGUAS>
1429# strip-linguas -i <directories of .po files> 1452# strip-linguas -i <directories of .po files>
1430# strip-linguas -u <directories of .po files> 1453# strip-linguas -u <directories of .po files>
1431# 1454#
1432# The first form allows you to specify a list of LINGUAS. 1455# The first form allows you to specify a list of LINGUAS.
1433# 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
1434# directories and uses the intersection of the lists. 1457# directories and uses the intersection of the lists.
1435# 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
1436# directories and uses the union of the lists. 1459# directories and uses the union of the lists.
1437strip-linguas() { 1460strip-linguas() {
1438 local ls newls 1461 local ls newls nols
1439 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1462 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1440 local op=$1; shift 1463 local op=$1; shift
1441 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1464 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1442 local d f 1465 local d f
1443 for d in "$@" ; do 1466 for d in "$@" ; do
1444 if [[ ${op} == "-u" ]] ; then 1467 if [[ ${op} == "-u" ]] ; then
1445 newls=${ls} 1468 newls=${ls}
1446 else 1469 else
1447 newls="" 1470 newls=""
1448 fi 1471 fi
1449 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1472 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1450 if [[ ${op} == "-i" ]] ; then 1473 if [[ ${op} == "-i" ]] ; then
1451 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1474 hasq ${f} ${ls} && newls="${newls} ${f}"
1452 else 1475 else
1453 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1476 hasq ${f} ${ls} || newls="${newls} ${f}"
1454 fi 1477 fi
1455 done 1478 done
1456 ls=${newls} 1479 ls=${newls}
1457 done 1480 done
1458 ls=${ls//.po}
1459 else 1481 else
1460 ls=$@ 1482 ls="$@"
1461 fi 1483 fi
1462 1484
1463 ls=" ${ls} " 1485 nols=""
1464 newls="" 1486 newls=""
1465 for f in ${LINGUAS} ; do 1487 for f in ${LINGUAS} ; do
1466 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1488 if hasq ${f} ${ls} ; then
1467 newls="${newls} ${f}" 1489 newls="${newls} ${f}"
1468 else 1490 else
1469 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1491 nols="${nols} ${f}"
1470 fi 1492 fi
1471 done 1493 done
1472 if [[ -z ${newls} ]] ; then 1494 [[ -n ${nols} ]] \
1473 export LINGUAS="" 1495 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1474 else
1475 export LINGUAS=${newls:1} 1496 export LINGUAS=${newls:1}
1476 fi
1477} 1497}
1478 1498
1479# moved from kernel.eclass since they are generally useful outside of 1499# moved from kernel.eclass since they are generally useful outside of
1480# kernel.eclass -iggy (20041002) 1500# kernel.eclass -iggy (20041002)
1481 1501
1488 while ((i--)) ; do 1508 while ((i--)) ; do
1489 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1509 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1490 done 1510 done
1491 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1511 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1492 case ${ARCH} in 1512 case ${ARCH} in
1493 x86) export ARCH="i386";; 1513 x86) export ARCH="i386";;
1494 amd64) export ARCH="x86_64";; 1514 amd64) export ARCH="x86_64";;
1495 hppa) export ARCH="parisc";; 1515 hppa) export ARCH="parisc";;
1496 mips) export ARCH="mips";; 1516 mips) export ARCH="mips";;
1497 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!
1498 *) export ARCH="${ARCH}";; 1518 *) export ARCH="${ARCH}";;
1499 esac 1519 esac
1500} 1520}
1501 1521
1502# set's ARCH back to what portage expects 1522# set's ARCH back to what portage expects
1503set_arch_to_portage() { 1523set_arch_to_portage() {
1510 1530
1511# Jeremy Huddleston <eradicator@gentoo.org>: 1531# Jeremy Huddleston <eradicator@gentoo.org>:
1512# preserve_old_lib /path/to/libblah.so.0 1532# preserve_old_lib /path/to/libblah.so.0
1513# preserve_old_lib_notify /path/to/libblah.so.0 1533# preserve_old_lib_notify /path/to/libblah.so.0
1514# 1534#
1515# These functions are useful when a lib in your package changes --soname. Such 1535# These functions are useful when a lib in your package changes --library. Such
1516# 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
1517# 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
1518# 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
1519# solution, so instead you can add the following to your ebuilds: 1539# solution, so instead you can add the following to your ebuilds:
1520# 1540#
1521# src_install() { 1541# pkg_preinst() {
1522# ... 1542# ...
1523# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1543# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1524# ... 1544# ...
1525# } 1545# }
1526# 1546#
1529# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1549# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1530# ... 1550# ...
1531# } 1551# }
1532 1552
1533preserve_old_lib() { 1553preserve_old_lib() {
1534 LIB=$1 1554 if [[ ${EBUILD_PHASE} != "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]"
1535 1559
1536 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1560 local lib dir
1537 SONAME=`basename ${LIB}` 1561 for lib in "$@" ; do
1538 DIRNAME=`dirname ${LIB}` 1562 [[ -e ${ROOT}/${lib} ]] || continue
1539 1563 dir=${lib%/*}
1540 dodir ${DIRNAME} 1564 dodir ${dir} || die "dodir ${dir} failed"
1541 cp ${ROOT}${LIB} ${D}${DIRNAME} 1565 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1542 touch ${D}${LIB} 1566 touch "${D}"/${lib}
1543 fi 1567 done
1544} 1568}
1545 1569
1546preserve_old_lib_notify() { 1570preserve_old_lib_notify() {
1547 LIB=$1 1571 if [[ ${EBUILD_PHASE} != "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
1548 1575
1549 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1576 local lib notice=0
1550 SONAME=`basename ${LIB}` 1577 for lib in "$@" ; do
1551 1578 [[ -e ${ROOT}/${lib} ]] || continue
1579 if [[ ${notice} -eq 0 ]] ; then
1580 notice=1
1552 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."
1553 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,"
1554 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"
1555 ewarn "you will need to execute the following command:" 1584 ewarn "in order to remove these old dependencies. If you do not have this"
1556 ewarn " revdep-rebuild --soname ${SONAME}" 1585 ewarn "helper program, simply emerge the 'gentoolkit' package."
1557 ewarn 1586 ewarn
1558 ewarn "After doing that, you can safely remove ${LIB}"
1559 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1560 fi 1587 fi
1588 ewarn " # revdep-rebuild --library ${lib##*/}"
1589 done
1561} 1590}
1562 1591
1563# 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
1564# certain USE flags 1593# certain USE flags
1565# 1594#
1566# 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>
1567# ex: built_with_use xchat gtk2 1596# ex: built_with_use xchat gtk2
1568# 1597#
1569# Flags: -a all USE flags should be utilized 1598# Flags: -a all USE flags should be utilized
1570# -o at least one USE flag should be utilized 1599# -o at least one USE flag should be utilized
1571# Note: the default flag is '-a' 1600# Note: the default flag is '-a'
1572built_with_use() { 1601built_with_use() {
1573 local opt=$1 1602 local opt=$1
1574 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1603 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1575 1604
1576 local PKG=$(best_version $1) 1605 local PKG=$(best_version $1)
1606 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1577 shift 1607 shift
1578 1608
1579 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
1580 1611
1581 # if the USE file doesnt exist, assume the $PKG is either 1612 # if the USE file doesnt exist, assume the $PKG is either
1582 # injected or package.provided 1613 # injected or package.provided
1583 [[ ! -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
1584 1628
1585 local USE_BUILT=$(<${USEFILE}) 1629 local USE_BUILT=$(<${USEFILE})
1586 while [[ $# -gt 0 ]] ; do 1630 while [[ $# -gt 0 ]] ; do
1587 if [[ ${opt} = "-o" ]] ; then 1631 if [[ ${opt} = "-o" ]] ; then
1588 has $1 ${USE_BUILT} && return 0 1632 has $1 ${USE_BUILT} && return 0
1603 local f 1647 local f
1604 for f in $(find ${dir} -name configure) ; do 1648 for f in $(find ${dir} -name configure) ; do
1605 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
1606 done 1650 done
1607 eend 0 1651 eend 0
1608}
1609
1610# dopamd <file> [more files]
1611#
1612# Install pam auth config file in /etc/pam.d
1613dopamd() {
1614 [[ -z $1 ]] && die "dopamd requires at least one argument"
1615
1616 use pam || return 0
1617
1618 INSDESTTREE=/etc/pam.d \
1619 doins "$@" || die "failed to install $@"
1620}
1621# newpamd <old name> <new name>
1622#
1623# Install pam file <old name> as <new name> in /etc/pam.d
1624newpamd() {
1625 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1626
1627 use pam || return 0
1628
1629 INSDESTTREE=/etc/pam.d \
1630 newins "$1" "$2" || die "failed to install $1 as $2"
1631} 1652}
1632 1653
1633# make a wrapper script ... 1654# make a wrapper script ...
1634# 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
1635# 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.225  
changed lines
  Added in v.1.268

  ViewVC Help
Powered by ViewVC 1.1.20