Remove the emacs site-lisp stuff, if emacs is not in USE. Closes bug #47854 by Andrew Kirilenko <icedank@gmx.net>. Eric Brown <bigwhitecow@hotmail.com> did the actual patch to the gettext ebuild.

4 files changed, 26 insertions, 8 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index d8d46d2d9ae5..c9d226f7d44f 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.41 2004/06/02 04:19:56 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.42 2004/06/02 19:42:56 seemant Exp $
+
+  02 Jun 2004; Seemant Kulleen <seemant@gentoo.org> gettext-0.12.1-r1.ebuild,
+  gettext-0.12.1.ebuild:
+  Remove the emacs site-lisp stuff, if emacs is not in USE. Closes bug #47854 by
+  Andrew Kirilenko <icedank@gmx.net>. Eric Brown <bigwhitecow@hotmail.com> did
+  the actual patch to the gettext ebuild.
 
   02 Jun 2004; Travis Tilley <lv@gentoo.org> gettext-0.12.1-r1.ebuild:
   stable on amd64
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index f0a3f2745a24..794caffd5a0b 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,8 +1,8 @@
-MD5 e334d419657d5d479c23fff26e4584b5 gettext-0.12.1-r1.ebuild 2060
-MD5 b7148e3c97f527ed464b17c6fd0b8723 gettext-0.12.1.ebuild 1872
+MD5 c2337c77e7d88b79d57a42f9fbf8ca28 gettext-0.12.1-r1.ebuild 2195
+MD5 55a49e088d6035eca4341222b794e955 gettext-0.12.1.ebuild 2004
 MD5 04ef1cbaadfb6775e64538fe1b9f9808 gettext-0.11.5.ebuild 1460
 MD5 c551f1a0496168682b6d3fb8fcb380e6 gettext-0.11.5-r1.ebuild 1902
-MD5 0e6d073af35022935fa21f594242896d ChangeLog 5915
+MD5 4c57a838d22df1c5eaf201834dd80463 ChangeLog 6226
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 e846923f9b90ce853b73bfd6756a7cab files/gettext-0.12.1-bootstrap.patch 51612
 MD5 3b9aefbb552545fdf0836f56121c9ae5 files/gettext-0.12.1-without_java.patch 2743
diff --git a/sys-devel/gettext/gettext-0.12.1-r1.ebuild b/sys-devel/gettext/gettext-0.12.1-r1.ebuild
index 1ae94ae72d19..7fbe8cc10f1f 100644
--- a/sys-devel/gettext/gettext-0.12.1-r1.ebuild
+++ b/sys-devel/gettext/gettext-0.12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.12.1-r1.ebuild,v 1.9 2004/06/02 04:19:56 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.12.1-r1.ebuild,v 1.10 2004/06/02 19:42:56 seemant Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm hppa amd64 ~ia64 s390"
-IUSE="nls"
+IUSE="nls emacs"
 
 DEPEND="virtual/glibc"
 
@@ -73,5 +73,11 @@ src_install() {
 		rm -rf ${D}/usr/doc
 	fi
 
+	# Remove emacs site-lisp stuff if 'emacs' is not in USE
+	if [ -z "`use emacs`" ]
+	then
+		rm -rf ${D}/usr/share/emacs
+	fi
+
 	dodoc AUTHORS BUGS ChangeLog DISCLAIM NEWS README* THANKS TODO
 }
diff --git a/sys-devel/gettext/gettext-0.12.1.ebuild b/sys-devel/gettext/gettext-0.12.1.ebuild
index 99a611b2e936..19fd0f29cc9d 100644
--- a/sys-devel/gettext/gettext-0.12.1.ebuild
+++ b/sys-devel/gettext/gettext-0.12.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.12.1.ebuild,v 1.15 2004/02/23 00:21:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.12.1.ebuild,v 1.16 2004/06/02 19:42:56 seemant Exp $
 
 inherit eutils
 
-IUSE="nls"
+IUSE="nls emacs"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU locale utilities"
@@ -73,6 +73,12 @@ src_install() {
 		rm -rf ${D}/usr/doc
 	fi
 
+	# Remove the emacs site-lisp stuff if 'emacs' is not in USE
+	if [ -z "`use emacs`" ]
+	then
+		rm -rf ${D}/usr/share/emacs
+	fi
+
 	dodoc AUTHORS BUGS COPYING ChangeLog DISCLAIM NEWS README* THANKS TODO
 }