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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20