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

Diff of /eclass/eutils.eclass

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

Revision 1.233 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.233 2006/04/19 03:53:19 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 )"
15RDEPEND=""
16# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 13
18DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
19 15
20# 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
21# 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
22# 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
23# must be an integer greater than zero. 19# must be an integer greater than zero.
24# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
25epause() { 21epause() {
26 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
27 sleep ${1:-5}
28 fi
29} 23}
30 24
31# 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
32# 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,
33# don't beep. 27# don't beep.
34# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
35ebeep() { 29ebeep() {
36 local n 30 local n
37 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
38 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
39 echo -ne "\a" 33 echo -ne "\a"
40 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
41 echo -ne "\a" 35 echo -ne "\a"
42 sleep 1 36 sleep 1
43 done 37 done
44 fi 38 fi
45} 39}
46 40
47# This function generate linker scripts in /usr/lib for dynamic 41# This function generate linker scripts in /usr/lib for dynamic
48# 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
49# 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
50# 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
51# 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
52# library search path. This cause many builds to fail. 46# library search path. This cause many builds to fail.
53# See bug #4411 for more info. 47# See bug #4411 for more info.
54# 48#
55# To use, simply call: 49# To use, simply call:
56# 50#
57# gen_usr_ldscript libfoo.so 51# gen_usr_ldscript libfoo.so
58# 52#
59# Note that you should in general use the unversioned name of 53# Note that you should in general use the unversioned name of
60# the library, as ldconfig should usually update it correctly 54# the library, as ldconfig should usually update it correctly
61# to point to the latest version of the library present. 55# to point to the latest version of the library present.
62# 56#
63# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
64# 58#
65gen_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
66 local lib libdir=$(get_libdir) 68 local lib libdir=$(get_libdir)
67 # Just make sure it exists 69 # Just make sure it exists
68 dodir /usr/${libdir} 70 dodir /usr/${libdir}
69 71
70 for lib in "${@}" ; do 72 for lib in "${@}" ; do
91# Default options for patch 93# Default options for patch
92# 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
93# 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.
94# Set -E to automatically remove empty files. 96# Set -E to automatically remove empty files.
95EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
96# 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,
97# and not the full path .. 99# and not the full path ..
98EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
99# Change the printed message for a single patch. 101# Change the printed message for a single patch.
100EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
101# Change the printed message for multiple patches. 103# Change the printed message for multiple patches.
102EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 104EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
103# Force applying bulk patches even if not following the style: 105# Force applying bulk patches even if not following the style:
104# 106#
105# ??_${ARCH}_foo.${EPATCH_SUFFIX} 107# ??_${ARCH}_foo.${EPATCH_SUFFIX}
106# 108#
107EPATCH_FORCE="no" 109EPATCH_FORCE="no"
108 110
109# 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
110# or two patches. 112# or two patches.
121# 123#
122# Patches are applied in current directory. 124# Patches are applied in current directory.
123# 125#
124# Bulk Patches should preferibly have the form of: 126# Bulk Patches should preferibly have the form of:
125# 127#
126# ??_${ARCH}_foo.${EPATCH_SUFFIX} 128# ??_${ARCH}_foo.${EPATCH_SUFFIX}
127# 129#
128# For example: 130# For example:
129# 131#
130# 01_all_misc-fix.patch.bz2 132# 01_all_misc-fix.patch.bz2
131# 02_sparc_another-fix.patch.bz2 133# 02_sparc_another-fix.patch.bz2
132# 134#
133# 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
134# specific patches. 136# specific patches.
135# 137#
136# 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
224 fi 226 fi
225 for x in ${EPATCH_SOURCE} 227 for x in ${EPATCH_SOURCE}
226 do 228 do
227 # New ARCH dependant patch naming scheme ... 229 # New ARCH dependant patch naming scheme ...
228 # 230 #
229 # ???_arch_foo.patch 231 # ???_arch_foo.patch
230 # 232 #
231 if [ -f ${x} ] && \ 233 if [ -f ${x} ] && \
232 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \ 234 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
233 [ "${EPATCH_FORCE}" = "yes" ]) 235 [ "${EPATCH_FORCE}" = "yes" ])
234 then 236 then
235 local count=0 237 local count=0
236 local popts="${EPATCH_OPTS}" 238 local popts="${EPATCH_OPTS}"
237 local patchname=${x##*/} 239 local patchname=${x##*/}
238 240
251 einfo "${EPATCH_SINGLE_MSG}" 253 einfo "${EPATCH_SINGLE_MSG}"
252 else 254 else
253 einfo "Applying ${patchname} ..." 255 einfo "Applying ${patchname} ..."
254 fi 256 fi
255 else 257 else
256 einfo " ${patchname} ..." 258 einfo " ${patchname} ..."
257 fi 259 fi
258 260
259 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 261 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
260 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 262 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
261 263
266 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
267 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
268 270
269 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
270 then 272 then
271 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
272 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
273 else 275 else
274 PATCH_TARGET="${x}" 276 PATCH_TARGET="${x}"
275 fi 277 fi
276 278
277 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
278 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##*/}
279 281
280 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
281 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
282 284
452 eerror "No username specified !" 454 eerror "No username specified !"
453 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
454 fi 456 fi
455 457
456 # lets see if the username already exists 458 # lets see if the username already exists
457 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
458 return 0 460 return 0
459 fi 461 fi
460 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
461 463
462 # options to pass to useradd 464 # options to pass to useradd
463 local opts= 465 local opts=
464 466
465 # handle uid 467 # handle uid
466 local euid=$1; shift 468 local euid=$1; shift
467 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
468 if [[ ${euid} -gt 0 ]] ; then 470 if [[ ${euid} -gt 0 ]] ; then
469 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
470 euid="next" 472 euid="next"
471 fi 473 fi
472 else 474 else
473 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
474 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
475 fi 477 fi
476 else 478 else
477 euid="next" 479 euid="next"
478 fi 480 fi
479 if [[ ${euid} == "next" ]] ; then 481 if [[ ${euid} == "next" ]] ; then
480 for euid in $(seq 101 999) ; do 482 for ((euid = 101; euid <= 999; euid++)); do
481 [[ -z $(egetent passwd ${euid}) ]] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
482 done 484 done
483 fi 485 fi
484 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
485 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
499 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
500 [[ -x ${ROOT}${shell} ]] && break 502 [[ -x ${ROOT}${shell} ]] && break
501 done 503 done
502 504
503 if [[ ${shell} == "/dev/null" ]] ; then 505 if [[ ${shell} == "/dev/null" ]] ; then
504 eerror "Unable to identify the shell to use" 506 eerror "Unable to identify the shell to use, proceeding with userland default."
505 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
506 fi 513 fi
507 514
508 eshell=${shell} 515 eshell=${shell}
509 fi 516 fi
510 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
655 eerror "No group specified !" 662 eerror "No group specified !"
656 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
657 fi 664 fi
658 665
659 # see if group already exists 666 # see if group already exists
660 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
661 then
662 return 0 668 return 0
663 fi 669 fi
664 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
665 671
666 # options to pass to useradd 672 # options to pass to useradd
709 fi 715 fi
710 716
711 # If we need the next available 717 # If we need the next available
712 case ${egid} in 718 case ${egid} in
713 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
714 for egid in $(seq 101 999); do 720 for ((egid = 101; egid <= 999; egid++)); do
715 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
716 done 722 done
717 esac 723 esac
718 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
719 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
720 ;; 726 ;;
721 727
722 *-freebsd*|*-dragonfly*) 728 *-freebsd*|*-dragonfly*)
723 case ${egid} in 729 case ${egid} in
724 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
725 for egid in $(seq 101 999); do 731 for ((egid = 101; egid <= 999; egid++)); do
726 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
727 done 733 done
728 esac 734 esac
729 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
730 ;; 736 ;;
731 737
732 *-netbsd*) 738 *-netbsd*)
733 case ${egid} in 739 case ${egid} in
734 *[!0-9]*) # Non numeric 740 *[!0-9]*) # Non numeric
735 for egid in $(seq 101 999); do 741 for ((egid = 101; egid <= 999; egid++)); do
736 [ -z "`egetent group ${egid}`" ] && break 742 [[ -z $(egetent group ${egid}) ]] && break
737 done 743 done
738 esac 744 esac
739 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
740 ;; 746 ;;
741 747
749# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
750# vapier@gentoo.org 756# vapier@gentoo.org
751# 757#
752# edos2unix(file, <more files> ...) 758# edos2unix(file, <more files> ...)
753edos2unix() { 759edos2unix() {
754 for f in "$@" 760 echo "$@" | xargs sed -i 's/\r$//'
755 do
756 cp "${f}" ${T}/edos2unix
757 sed 's/\r$//' ${T}/edos2unix > "${f}"
758 done
759} 761}
760 762
761 763
762############################################################## 764##############################################################
763# START: Handle .desktop files and menu entries # 765# START: Handle .desktop files and menu entries #
764# maybe this should be separated into a new eclass some time # 766# maybe this should be separated into a new eclass some time #
765# lanius@gentoo.org # 767# lanius@gentoo.org #
766############################################################## 768##############################################################
767 769
768# Make a desktop file ! 770# Make a desktop file !
769# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
770# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
771# 773#
772# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
773# 775#
774# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
775# name: the name that will show up in the menu 777# name: the name that will show up in the menu
776# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
777# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
778# a full path to an icon 780# a full path to an icon
779# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
780# http://www.freedesktop.org/Standards/desktop-entry-spec 782# http://www.freedesktop.org/Standards/desktop-entry-spec
781# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
782make_desktop_entry() { 784make_desktop_entry() {
783 [[ -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
784 786
792 local catmaj=${CATEGORY%%-*} 794 local catmaj=${CATEGORY%%-*}
793 local catmin=${CATEGORY##*-} 795 local catmin=${CATEGORY##*-}
794 case ${catmaj} in 796 case ${catmaj} in
795 app) 797 app)
796 case ${catmin} in 798 case ${catmin} in
797 admin) type=System;; 799 admin) type=System;;
798 cdr) type=DiscBurning;; 800 cdr) type=DiscBurning;;
799 dicts) type=Dictionary;; 801 dicts) type=Dictionary;;
800 editors) type=TextEditor;; 802 editors) type=TextEditor;;
801 emacs) type=TextEditor;; 803 emacs) type=TextEditor;;
802 emulation) type=Emulator;; 804 emulation) type=Emulator;;
803 laptop) type=HardwareSettings;; 805 laptop) type=HardwareSettings;;
804 office) type=Office;; 806 office) type=Office;;
805 vim) type=TextEditor;; 807 vim) type=TextEditor;;
806 xemacs) type=TextEditor;; 808 xemacs) type=TextEditor;;
807 *) type=;; 809 *) type=;;
808 esac 810 esac
809 ;; 811 ;;
810 812
811 dev) 813 dev)
812 type="Development" 814 type="Development"
813 ;; 815 ;;
814 816
815 games) 817 games)
816 case ${catmin} in 818 case ${catmin} in
817 action) type=ActionGame;; 819 action|fps) type=ActionGame;;
818 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
819 board) type=BoardGame;; 821 board) type=BoardGame;;
820 kid) type=KidsGame;; 822 kids) type=KidsGame;;
821 emulation) type=Emulator;; 823 emulation) type=Emulator;;
822 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
823 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
824 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
825 simulation) type=Simulation;; 827 simulation) type=Simulation;;
826 sports) type=SportsGame;; 828 sports) type=SportsGame;;
827 strategy) type=StrategyGame;; 829 strategy) type=StrategyGame;;
828 *) type=;; 830 *) type=;;
829 esac 831 esac
830 type="Game;${type}" 832 type="Game;${type}"
831 ;; 833 ;;
832 834
833 mail) 835 mail)
837 media) 839 media)
838 case ${catmin} in 840 case ${catmin} in
839 gfx) type=Graphics;; 841 gfx) type=Graphics;;
840 radio) type=Tuner;; 842 radio) type=Tuner;;
841 sound) type=Audio;; 843 sound) type=Audio;;
842 tv) type=TV;; 844 tv) type=TV;;
843 video) type=Video;; 845 video) type=Video;;
844 *) type=;; 846 *) type=;;
845 esac 847 esac
846 type="AudioVideo;${type}" 848 type="AudioVideo;${type}"
847 ;; 849 ;;
848 850
849 net) 851 net)
850 case ${catmin} in 852 case ${catmin} in
851 dialup) type=Dialup;; 853 dialup) type=Dialup;;
852 ftp) type=FileTransfer;; 854 ftp) type=FileTransfer;;
853 im) type=InstantMessaging;; 855 im) type=InstantMessaging;;
854 irc) type=IRCClient;; 856 irc) type=IRCClient;;
855 mail) type=Email;; 857 mail) type=Email;;
856 news) type=News;; 858 news) type=News;;
857 nntp) type=News;; 859 nntp) type=News;;
858 p2p) type=FileTransfer;; 860 p2p) type=FileTransfer;;
859 *) type=;; 861 *) type=;;
860 esac 862 esac
861 type="Network;${type}" 863 type="Network;${type}"
862 ;; 864 ;;
863 865
864 sci) 866 sci)
865 case ${catmin} in 867 case ${catmin} in
866 astro*) type=Astronomy;; 868 astro*) type=Astronomy;;
867 bio*) type=Biology;; 869 bio*) type=Biology;;
868 calc*) type=Calculator;; 870 calc*) type=Calculator;;
869 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
870 geo*) type=Geology;; 872 geo*) type=Geology;;
871 math*) type=Math;; 873 math*) type=Math;;
872 *) type=;; 874 *) type=;;
873 esac 875 esac
874 type="Science;${type}" 876 type="Science;${type}"
875 ;; 877 ;;
876 878
877 www) 879 www)
878 case ${catmin} in 880 case ${catmin} in
879 client) type=WebBrowser;; 881 client) type=WebBrowser;;
880 *) type=;; 882 *) type=;;
881 esac 883 esac
882 type="Network" 884 type="Network"
883 ;; 885 ;;
884 886
885 *) 887 *)
891 local desktop_name="${PN}" 893 local desktop_name="${PN}"
892 else 894 else
893 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
894 fi 896 fi
895 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
898# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
896 899
897echo "[Desktop Entry] 900echo "[Desktop Entry]
898Encoding=UTF-8 901Encoding=UTF-8
899Version=0.9.2 902Version=0.9.2
900Name=${name} 903Name=${name}
901Type=Application 904Type=Application
902Comment=${DESCRIPTION} 905Comment=${DESCRIPTION}
903Exec=${exec} 906Exec=${exec}
907TryExec=${exec%% *}
904Path=${path} 908Path=${path}
905Icon=${icon} 909Icon=${icon}
906Categories=Application;${type};" > "${desktop}" 910Categories=Application;${type};" > "${desktop}"
907 911
908 ( 912 (
913 ) 917 )
914} 918}
915 919
916# Make a GDM/KDM Session file 920# Make a GDM/KDM Session file
917# 921#
918# make_desktop_entry(<title>, <command>) 922# make_session_desktop(<title>, <command>)
919# title: File to execute to start the Window Manager 923# title: File to execute to start the Window Manager
920# command: Name of the Window Manager 924# command: Name of the Window Manager
921 925
922make_session_desktop() { 926make_session_desktop() {
923 [[ -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
974 insinto /usr/share/pixmaps 978 insinto /usr/share/pixmaps
975 newins "$1" "$2" 979 newins "$1" "$2"
976} 980}
977 981
978############################################################## 982##############################################################
979# END: Handle .desktop files and menu entries # 983# END: Handle .desktop files and menu entries #
980############################################################## 984##############################################################
981 985
982 986
983# for internal use only (unpack_pdv and unpack_makeself) 987# for internal use only (unpack_pdv and unpack_makeself)
984find_unpackable_file() { 988find_unpackable_file() {
1003# 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
1004# 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.
1005# 1009#
1006# Usage: unpack_pdv [file to unpack] [size of off_t] 1010# Usage: unpack_pdv [file to unpack] [size of off_t]
1007# - 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
1008# information out of the binary executable myself. basically you pass in 1012# information out of the binary executable myself. basically you pass in
1009# 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
1010# 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:
1011# strings <pdv archive> | grep lseek 1015# strings <pdv archive> | grep lseek
1012# strace -elseek <pdv archive> 1016# strace -elseek <pdv archive>
1013# 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
1014# 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
1015# parameter. here is an example: 1019# parameter. here is an example:
1016# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1020# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1017# lseek 1021# lseek
1018# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1022# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1019# lseek(3, -4, SEEK_END) = 2981250 1023# lseek(3, -4, SEEK_END) = 2981250
1020# 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.
1021unpack_pdv() { 1025unpack_pdv() {
1022 local src=$(find_unpackable_file $1) 1026 local src=$(find_unpackable_file $1)
1023 local sizeoff_t=$2 1027 local sizeoff_t=$2
1024 1028
1025 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1029 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1026 [[ -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 :("
1027 1031
1028 local shrtsrc=$(basename "${src}") 1032 local shrtsrc=$(basename "${src}")
1029 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1033 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1030 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1034 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1031 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\"`
1032 1036
1033 # grab metadata for debug reasons 1037 # grab metadata for debug reasons
1034 local metafile="$(emktemp)" 1038 local metafile="$(emktemp)"
1035 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1039 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
1036 1040
1095# many other game companies. 1099# many other game companies.
1096# 1100#
1097# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1101# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1098# - If the file is not specified then unpack will utilize ${A}. 1102# - If the file is not specified then unpack will utilize ${A}.
1099# - 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
1100# the proper offset from the script itself. 1104# the proper offset from the script itself.
1101unpack_makeself() { 1105unpack_makeself() {
1102 local src_input=${1:-${A}} 1106 local src_input=${1:-${A}}
1103 local src=$(find_unpackable_file "${src_input}") 1107 local src=$(find_unpackable_file "${src_input}")
1104 local skip=$2 1108 local skip=$2
1105 local exe=$3 1109 local exe=$3
1111 if [[ -z ${skip} ]] ; then 1115 if [[ -z ${skip} ]] ; then
1112 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1116 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1113 local skip=0 1117 local skip=0
1114 exe=tail 1118 exe=tail
1115 case ${ver} in 1119 case ${ver} in
1116 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
1117 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1121 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1118 ;; 1122 ;;
1119 2.0|2.0.1) 1123 2.0|2.0.1)
1120 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1124 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1121 ;; 1125 ;;
1155 # 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
1156 local tmpfile="$(emktemp)" 1160 local tmpfile="$(emktemp)"
1157 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1161 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1158 local filetype="$(file -b "${tmpfile}")" 1162 local filetype="$(file -b "${tmpfile}")"
1159 case ${filetype} in 1163 case ${filetype} in
1160 *tar\ archive) 1164 *tar\ archive*)
1161 eval ${exe} | tar --no-same-owner -xf - 1165 eval ${exe} | tar --no-same-owner -xf -
1162 ;; 1166 ;;
1163 bzip2*) 1167 bzip2*)
1164 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1168 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1165 ;; 1169 ;;
1201 # 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
1202 local shopts=$- 1206 local shopts=$-
1203 local alic 1207 local alic
1204 set -o noglob #so that bash doesn't expand "*" 1208 set -o noglob #so that bash doesn't expand "*"
1205 for alic in ${ACCEPT_LICENSE} ; do 1209 for alic in ${ACCEPT_LICENSE} ; do
1206 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1210 if [[ ${alic} == ${l} ]]; then
1207 set +o noglob; set -${shopts} #reset old shell opts 1211 set +o noglob; set -${shopts} #reset old shell opts
1208 return 0 1212 return 0
1209 fi 1213 fi
1210 done 1214 done
1211 set +o noglob; set -$shopts #reset old shell opts 1215 set +o noglob; set -$shopts #reset old shell opts
1213 local licmsg="$(emktemp)" 1217 local licmsg="$(emktemp)"
1214 cat << EOF > ${licmsg} 1218 cat << EOF > ${licmsg}
1215********************************************************** 1219**********************************************************
1216The following license outlines the terms of use of this 1220The following license outlines the terms of use of this
1217package. You MUST accept this license for installation to 1221package. You MUST accept this license for installation to
1218continue. When you are done viewing, hit 'q'. If you 1222continue. When you are done viewing, hit 'q'. If you
1219CTRL+C out of this, the install will not run! 1223CTRL+C out of this, the install will not run!
1220********************************************************** 1224**********************************************************
1221 1225
1222EOF 1226EOF
1223 cat ${lic} >> ${licmsg} 1227 cat ${lic} >> ${licmsg}
1244# 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
1245# found at CDROM_ROOT. 1249# found at CDROM_ROOT.
1246# 1250#
1247# 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',
1248# 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
1249# 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_#
1250# 1258#
1251# 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.
1252# 1260#
1253# 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] [...]
1254# - 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
1255# 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
1256# the cdrom functions will handle 1264# the cdrom functions will handle
1257cdrom_get_cds() { 1265cdrom_get_cds() {
1258 # 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
1259 # the # of files they gave us 1267 # the # of files they gave us
1260 local cdcnt=0 1268 local cdcnt=0
1261 local f= 1269 local f=
1305 echo 1313 echo
1306 einfo "For example:" 1314 einfo "For example:"
1307 einfo "export CD_ROOT=/mnt/cdrom" 1315 einfo "export CD_ROOT=/mnt/cdrom"
1308 echo 1316 echo
1309 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
1310 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1327 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1311 cdcnt=0 1328 cdcnt=0
1312 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1329 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1313 ((++cdcnt)) 1330 ((++cdcnt))
1314 var="CDROM_NAME_${cdcnt}" 1331 var="CDROM_NAME_${cdcnt}"
1381 1398
1382 while [[ -n ${cdset[${i}]} ]] ; do 1399 while [[ -n ${cdset[${i}]} ]] ; do
1383 local dir=$(dirname ${cdset[${i}]}) 1400 local dir=$(dirname ${cdset[${i}]})
1384 local file=$(basename ${cdset[${i}]}) 1401 local file=$(basename ${cdset[${i}]})
1385 1402
1386 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do 1403 local point= node= fs= foo=
1387 [[ -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/ }
1388 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then 1409 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1389 export CDROM_ROOT=${mline} 1410 export CDROM_ROOT=${point}
1390 export CDROM_SET=${i} 1411 export CDROM_SET=${i}
1391 export CDROM_MATCH=${cdset[${i}]} 1412 export CDROM_MATCH=${cdset[${i}]}
1392 return 1413 return
1393 fi 1414 done <<< "$(get_mounts)"
1394 done
1395 1415
1396 ((++i)) 1416 ((++i))
1397 done 1417 done
1398 1418
1399 echo 1419 echo
1427 1447
1428# Make sure that LINGUAS only contains languages that 1448# Make sure that LINGUAS only contains languages that
1429# a package can support 1449# a package can support
1430# 1450#
1431# usage: strip-linguas <allow LINGUAS> 1451# usage: strip-linguas <allow LINGUAS>
1432# strip-linguas -i <directories of .po files> 1452# strip-linguas -i <directories of .po files>
1433# strip-linguas -u <directories of .po files> 1453# strip-linguas -u <directories of .po files>
1434# 1454#
1435# The first form allows you to specify a list of LINGUAS. 1455# The first form allows you to specify a list of LINGUAS.
1436# 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
1437# directories and uses the intersection of the lists. 1457# directories and uses the intersection of the lists.
1438# 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
1439# directories and uses the union of the lists. 1459# directories and uses the union of the lists.
1440strip-linguas() { 1460strip-linguas() {
1441 local ls newls 1461 local ls newls nols
1442 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1462 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1443 local op=$1; shift 1463 local op=$1; shift
1444 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift 1464 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1445 local d f 1465 local d f
1446 for d in "$@" ; do 1466 for d in "$@" ; do
1447 if [[ ${op} == "-u" ]] ; then 1467 if [[ ${op} == "-u" ]] ; then
1448 newls=${ls} 1468 newls=${ls}
1449 else 1469 else
1450 newls="" 1470 newls=""
1451 fi 1471 fi
1452 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do 1472 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1453 if [[ ${op} == "-i" ]] ; then 1473 if [[ ${op} == "-i" ]] ; then
1454 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1474 hasq ${f} ${ls} && newls="${newls} ${f}"
1455 else 1475 else
1456 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1476 hasq ${f} ${ls} || newls="${newls} ${f}"
1457 fi 1477 fi
1458 done 1478 done
1459 ls=${newls} 1479 ls=${newls}
1460 done 1480 done
1461 ls=${ls//.po}
1462 else 1481 else
1463 ls=$@ 1482 ls="$@"
1464 fi 1483 fi
1465 1484
1466 ls=" ${ls} " 1485 nols=""
1467 newls="" 1486 newls=""
1468 for f in ${LINGUAS} ; do 1487 for f in ${LINGUAS} ; do
1469 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1488 if hasq ${f} ${ls} ; then
1470 newls="${newls} ${f}" 1489 newls="${newls} ${f}"
1471 else 1490 else
1472 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1491 nols="${nols} ${f}"
1473 fi 1492 fi
1474 done 1493 done
1475 if [[ -z ${newls} ]] ; then 1494 [[ -n ${nols} ]] \
1476 export LINGUAS="" 1495 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1477 else
1478 export LINGUAS=${newls:1} 1496 export LINGUAS=${newls:1}
1479 fi
1480} 1497}
1481 1498
1482# moved from kernel.eclass since they are generally useful outside of 1499# moved from kernel.eclass since they are generally useful outside of
1483# kernel.eclass -iggy (20041002) 1500# kernel.eclass -iggy (20041002)
1484 1501
1491 while ((i--)) ; do 1508 while ((i--)) ; do
1492 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1509 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1493 done 1510 done
1494 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1511 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1495 case ${ARCH} in 1512 case ${ARCH} in
1496 x86) export ARCH="i386";; 1513 x86) export ARCH="i386";;
1497 amd64) export ARCH="x86_64";; 1514 amd64) export ARCH="x86_64";;
1498 hppa) export ARCH="parisc";; 1515 hppa) export ARCH="parisc";;
1499 mips) export ARCH="mips";; 1516 mips) export ARCH="mips";;
1500 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!
1501 *) export ARCH="${ARCH}";; 1518 *) export ARCH="${ARCH}";;
1502 esac 1519 esac
1503} 1520}
1504 1521
1505# set's ARCH back to what portage expects 1522# set's ARCH back to what portage expects
1506set_arch_to_portage() { 1523set_arch_to_portage() {
1513 1530
1514# Jeremy Huddleston <eradicator@gentoo.org>: 1531# Jeremy Huddleston <eradicator@gentoo.org>:
1515# preserve_old_lib /path/to/libblah.so.0 1532# preserve_old_lib /path/to/libblah.so.0
1516# preserve_old_lib_notify /path/to/libblah.so.0 1533# preserve_old_lib_notify /path/to/libblah.so.0
1517# 1534#
1518# 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
1519# 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
1520# 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
1521# 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
1522# solution, so instead you can add the following to your ebuilds: 1539# solution, so instead you can add the following to your ebuilds:
1523# 1540#
1524# src_install() { 1541# pkg_preinst() {
1525# ... 1542# ...
1526# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1543# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1527# ... 1544# ...
1528# } 1545# }
1529# 1546#
1532# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1549# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1533# ... 1550# ...
1534# } 1551# }
1535 1552
1536preserve_old_lib() { 1553preserve_old_lib() {
1537 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]"
1538 1559
1539 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1560 local lib dir
1540 SONAME=`basename ${LIB}` 1561 for lib in "$@" ; do
1541 DIRNAME=`dirname ${LIB}` 1562 [[ -e ${ROOT}/${lib} ]] || continue
1542 1563 dir=${lib%/*}
1543 dodir ${DIRNAME} 1564 dodir ${dir} || die "dodir ${dir} failed"
1544 cp ${ROOT}${LIB} ${D}${DIRNAME} 1565 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1545 touch ${D}${LIB} 1566 touch "${D}"/${lib}
1546 fi 1567 done
1547} 1568}
1548 1569
1549preserve_old_lib_notify() { 1570preserve_old_lib_notify() {
1550 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
1551 1575
1552 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1576 local lib notice=0
1553 SONAME=`basename ${LIB}` 1577 for lib in "$@" ; do
1554 1578 [[ -e ${ROOT}/${lib} ]] || continue
1579 if [[ ${notice} -eq 0 ]] ; then
1580 notice=1
1555 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."
1556 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,"
1557 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"
1558 ewarn "you will need to execute the following command:" 1584 ewarn "in order to remove these old dependencies. If you do not have this"
1559 ewarn " revdep-rebuild --library ${SONAME}" 1585 ewarn "helper program, simply emerge the 'gentoolkit' package."
1560 ewarn 1586 ewarn
1561 ewarn "After doing that, you can safely remove ${LIB}"
1562 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1563 fi 1587 fi
1588 ewarn " # revdep-rebuild --library ${lib##*/}"
1589 done
1564} 1590}
1565 1591
1566# 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
1567# certain USE flags 1593# certain USE flags
1568# 1594#
1569# 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>
1570# ex: built_with_use xchat gtk2 1596# ex: built_with_use xchat gtk2
1571# 1597#
1572# Flags: -a all USE flags should be utilized 1598# Flags: -a all USE flags should be utilized
1573# -o at least one USE flag should be utilized 1599# -o at least one USE flag should be utilized
1574# Note: the default flag is '-a' 1600# Note: the default flag is '-a'
1575built_with_use() { 1601built_with_use() {
1576 local opt=$1 1602 local opt=$1
1577 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1603 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1578 1604
1579 local PKG=$(best_version $1) 1605 local PKG=$(best_version $1)
1606 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1580 shift 1607 shift
1581 1608
1582 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
1583 1611
1584 # if the USE file doesnt exist, assume the $PKG is either 1612 # if the USE file doesnt exist, assume the $PKG is either
1585 # injected or package.provided 1613 # injected or package.provided
1586 [[ ! -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
1587 1628
1588 local USE_BUILT=$(<${USEFILE}) 1629 local USE_BUILT=$(<${USEFILE})
1589 while [[ $# -gt 0 ]] ; do 1630 while [[ $# -gt 0 ]] ; do
1590 if [[ ${opt} = "-o" ]] ; then 1631 if [[ ${opt} = "-o" ]] ; then
1591 has $1 ${USE_BUILT} && return 0 1632 has $1 ${USE_BUILT} && return 0
1606 local f 1647 local f
1607 for f in $(find ${dir} -name configure) ; do 1648 for f in $(find ${dir} -name configure) ; do
1608 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
1609 done 1650 done
1610 eend 0 1651 eend 0
1611}
1612
1613# dopamd <file> [more files]
1614#
1615# Install pam auth config file in /etc/pam.d
1616dopamd() {
1617 [[ -z $1 ]] && die "dopamd requires at least one argument"
1618
1619 use pam || return 0
1620
1621 INSDESTTREE=/etc/pam.d \
1622 doins "$@" || die "failed to install $@"
1623}
1624# newpamd <old name> <new name>
1625#
1626# Install pam file <old name> as <new name> in /etc/pam.d
1627newpamd() {
1628 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1629
1630 use pam || return 0
1631
1632 INSDESTTREE=/etc/pam.d \
1633 newins "$1" "$2" || die "failed to install $1 as $2"
1634} 1652}
1635 1653
1636# make a wrapper script ... 1654# make a wrapper script ...
1637# 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
1638# 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.233  
changed lines
  Added in v.1.268

  ViewVC Help
Powered by ViewVC 1.1.20