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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.234  
changed lines
  Added in v.1.279

  ViewVC Help
Powered by ViewVC 1.1.20