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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20