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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20