Many cleanups.

Package-Manager: portage-2.1.1

5 files changed, 40 insertions, 43 deletions

diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog
index 0008da29ab8d..ec9e95822da4 100644
--- a/dev-java/antlr/ChangeLog
+++ b/dev-java/antlr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/antlr
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.42 2006/07/23 16:11:32 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.43 2006/09/13 22:30:15 nichoj Exp $
+
+  13 Sep 2006; Joshua Nichols <nichoj@gentoo.org> antlr-2.7.5-r2.ebuild,
+  antlr-2.7.5-r3.ebuild:
+  Many cleanups.
 
   23 Jul 2006; Joshua Nichols <jnichols@gentoo.org> antlr-2.7.5-r3.ebuild:
   Removed findutils dep as per bug #141423
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 7d234806f929..11c398f63e88 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -13,18 +13,18 @@ EBUILD antlr-2.7.4.ebuild 1019 RMD160 9cee4b374db955cc8bb81441d8c0819c54284965 S
 MD5 ee19998d8ed1a41fb4402d1d4aeecd9e antlr-2.7.4.ebuild 1019
 RMD160 9cee4b374db955cc8bb81441d8c0819c54284965 antlr-2.7.4.ebuild 1019
 SHA256 5e52a77e4762eb77bbdd28e553e4d2dccf5ce8c0f8efd9a33d6f82d2a74cf404 antlr-2.7.4.ebuild 1019
-EBUILD antlr-2.7.5-r2.ebuild 2755 RMD160 bde51d27a1c80093f48b48a4b033314b2d5d0f4d SHA1 49e43604df896fca0d80d9769f36d77b17b81378 SHA256 b2da99575005a4e734f5fbcd03b1dd611c533e8db77ec57de46e69c50cd68497
-MD5 2eb55354ce4cb8e13181f6dab8f9ff0c antlr-2.7.5-r2.ebuild 2755
-RMD160 bde51d27a1c80093f48b48a4b033314b2d5d0f4d antlr-2.7.5-r2.ebuild 2755
-SHA256 b2da99575005a4e734f5fbcd03b1dd611c533e8db77ec57de46e69c50cd68497 antlr-2.7.5-r2.ebuild 2755
-EBUILD antlr-2.7.5-r3.ebuild 2618 RMD160 5ee91a016e4326ed6668d73161fec6dd4c927986 SHA1 416425c1709d2f68b70303835ef16b30544782e1 SHA256 114931ee8280dce9cd1d0b97c671266ab71336d62353f1576ad9460cdf36d8e3
-MD5 d5a87f9530ce93e99512b94104613c3b antlr-2.7.5-r3.ebuild 2618
-RMD160 5ee91a016e4326ed6668d73161fec6dd4c927986 antlr-2.7.5-r3.ebuild 2618
-SHA256 114931ee8280dce9cd1d0b97c671266ab71336d62353f1576ad9460cdf36d8e3 antlr-2.7.5-r3.ebuild 2618
-MISC ChangeLog 6159 RMD160 5f24924c7813084b8d1e8f7e31af8e7b4245d3de SHA1 e9206c4418a6537b76241dce99921260605e9026 SHA256 82a853148c0f5a3ff103eaa679170b0fe00826e00cb3c78a95d9416a540c388e
-MD5 4009e8a48f1d02b3de552580f431d635 ChangeLog 6159
-RMD160 5f24924c7813084b8d1e8f7e31af8e7b4245d3de ChangeLog 6159
-SHA256 82a853148c0f5a3ff103eaa679170b0fe00826e00cb3c78a95d9416a540c388e ChangeLog 6159
+EBUILD antlr-2.7.5-r2.ebuild 2657 RMD160 f70d3c86732a8c4b02dc98614562801c66a18d74 SHA1 de7263b20db2b49294ee82565ea6eb53928c4818 SHA256 95e1194807ec03690f997510e9a3c27a2ee7de1a910564cbaf0c6198666e783d
+MD5 23e4e7ae1603d1840fc376a4790a65d5 antlr-2.7.5-r2.ebuild 2657
+RMD160 f70d3c86732a8c4b02dc98614562801c66a18d74 antlr-2.7.5-r2.ebuild 2657
+SHA256 95e1194807ec03690f997510e9a3c27a2ee7de1a910564cbaf0c6198666e783d antlr-2.7.5-r2.ebuild 2657
+EBUILD antlr-2.7.5-r3.ebuild 2560 RMD160 26a5947da2d372f833ca3ab97f463d8fac62be26 SHA1 92b92d750c242ac76b4dd50153c2e0c7eef8e561 SHA256 abdcde2dfaed7cadfa79e20dcefece691be87fa449e3138ed1a6213f6a11b5bd
+MD5 99153f4ab88d95252f3e98b1a780b6d8 antlr-2.7.5-r3.ebuild 2560
+RMD160 26a5947da2d372f833ca3ab97f463d8fac62be26 antlr-2.7.5-r3.ebuild 2560
+SHA256 abdcde2dfaed7cadfa79e20dcefece691be87fa449e3138ed1a6213f6a11b5bd antlr-2.7.5-r3.ebuild 2560
+MISC ChangeLog 6275 RMD160 876aac01c72674215252614db29e9832d4fb8856 SHA1 3186eeb34b0a9f3b4f2dc16ceb36750d7e520ad4 SHA256 77aa488ec26d30dd5b7e8d05d9a60e0afd131e206cf44adc0e064b09a6a4fe96
+MD5 a84abafef09cf99139afd112db2239d5 ChangeLog 6275
+RMD160 876aac01c72674215252614db29e9832d4fb8856 ChangeLog 6275
+SHA256 77aa488ec26d30dd5b7e8d05d9a60e0afd131e206cf44adc0e064b09a6a4fe96 ChangeLog 6275
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
diff --git a/dev-java/antlr/antlr-2.7.5-r2.ebuild b/dev-java/antlr/antlr-2.7.5-r2.ebuild
index 7d0f533fdd98..9b9bb569e206 100644
--- a/dev-java/antlr/antlr-2.7.5-r2.ebuild
+++ b/dev-java/antlr/antlr-2.7.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.5-r2.ebuild,v 1.8 2006/05/24 21:05:51 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.5-r2.ebuild,v 1.9 2006/09/13 22:30:15 nichoj Exp $
 
 inherit java-utils gnuconfig java-pkg mono distutils multilib
 
@@ -14,14 +14,11 @@ KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="doc debug examples mono nocxx nojava python script source"
 
 RDEPEND=">=virtual/jdk-1.2
-		 dev-java/java-config
-		 mono? ( dev-lang/mono dev-util/pkgconfig )
-		 python? ( dev-lang/python )"
+		mono? ( dev-lang/mono )
+		python? ( dev-lang/python )"
 DEPEND="${RDEPEND}
 		script? ( !dev-util/pccts )
-		>=sys-apps/sed-4
-		  sys-apps/findutils
-		 source? ( app-arch/zip )"
+		source? ( app-arch/zip )"
 
 src_compile() {
 	gnuconfig_update
@@ -41,11 +38,11 @@ src_compile() {
 	fi
 
 	econf $(use_enable python) \
-		  $(use_enable mono csharp) \
-		  $(use_enable debug) \
-		  $(use_enable examples) \
-		  ${myconf} \
-		  --enable-verbose || die "configure failed"
+		$(use_enable mono csharp) \
+		$(use_enable debug) \
+		$(use_enable examples) \
+		${myconf} \
+		--enable-verbose || die "configure failed"
 
 	emake || die "compile failed"
 
diff --git a/dev-java/antlr/antlr-2.7.5-r3.ebuild b/dev-java/antlr/antlr-2.7.5-r3.ebuild
index ae8ff9d9b82e..493be12bf17a 100644
--- a/dev-java/antlr/antlr-2.7.5-r3.ebuild
+++ b/dev-java/antlr/antlr-2.7.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.5-r3.ebuild,v 1.2 2006/07/23 16:11:32 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.5-r3.ebuild,v 1.3 2006/09/13 22:30:15 nichoj Exp $
 
 inherit gnuconfig java-pkg-2 mono distutils multilib
 
@@ -13,29 +13,24 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="doc debug examples mono nocxx nojava python script source"
 
+# TODO do we actually need jdk at runtime?
 RDEPEND=">=virtual/jdk-1.2
-	dev-java/java-config
-	mono? ( dev-lang/mono dev-util/pkgconfig )
+	mono? ( dev-lang/mono )
 	python? ( dev-lang/python )"
 DEPEND="${RDEPEND}
 	script? ( !dev-util/pccts )
-	>=sys-apps/sed-4
 	source? ( app-arch/zip )"
 
 src_compile() {
 	gnuconfig_update
 
-	export JAVAC=javac
-
-	export JAVACFLAGS="+ ${JAVACFLAGS}"
-
 	econf $(use_enable !nojava java) \
-		  $(use_enable python) \
-		  $(use_enable mono csharp) \
-		  $(use_enable debug) \
-		  $(use_enable examples) \
-		  $(use_enable !nocxx cxx) \
-		  --enable-verbose || die "configure failed"
+		$(use_enable python) \
+		$(use_enable mono csharp) \
+		$(use_enable debug) \
+		$(use_enable examples) \
+		$(use_enable !nocxx cxx) \
+		--enable-verbose || die "configure failed"
 
 	emake || die "compile failed"
 
@@ -46,6 +41,7 @@ src_compile() {
 		-e "s|@VERSION@|${PV}|" \
 		${FILESDIR}/antlr.pc.in > ${S}/antlr.pc
 
+	# TODO use launcher instead
 	if ! use nojava && use script ; then
 		cat > antlr.sh <<-EOF
 		#!/bin/sh
diff --git a/dev-java/aopalliance/Manifest b/dev-java/aopalliance/Manifest
index 414ac7efa03a..99570db1f92c 100644
--- a/dev-java/aopalliance/Manifest
+++ b/dev-java/aopalliance/Manifest
@@ -3,10 +3,10 @@ EBUILD aopalliance-1.0-r1.ebuild 1102 RMD160 75520c79238ebadab0a5ed59d8ab6edc28c
 MD5 15fc3956ae695d5bd97441d6ee791381 aopalliance-1.0-r1.ebuild 1102
 RMD160 75520c79238ebadab0a5ed59d8ab6edc28c62c84 aopalliance-1.0-r1.ebuild 1102
 SHA256 4aa616660cf10fb018353e64f4897e46c80e7f335dcd34e7adbc9bb4e131d496 aopalliance-1.0-r1.ebuild 1102
-EBUILD aopalliance-1.0.ebuild 1250 RMD160 689e69c4670f71e237631309b70cf69a22e9ade0 SHA1 6c6be6c8503abcd6473da9119a65fca6d165476c SHA256 b9a074c79cdaa85fd0e4f4182dece60318ec9615eb7f39eea476f976a0fe2b42
-MD5 9d51e214675de41ff31ea9478d299e0b aopalliance-1.0.ebuild 1250
-RMD160 689e69c4670f71e237631309b70cf69a22e9ade0 aopalliance-1.0.ebuild 1250
-SHA256 b9a074c79cdaa85fd0e4f4182dece60318ec9615eb7f39eea476f976a0fe2b42 aopalliance-1.0.ebuild 1250
+EBUILD aopalliance-1.0.ebuild 1245 RMD160 66593079d8036288e37ae4bffea0f321ff37c1d4 SHA1 da0dd61477f97491cd31ec0035623cdc18755714 SHA256 33114c4d6f75cfb33f1e46f958d7c9682d7b3762bac43af88477d55129155cb4
+MD5 f5f4f268e0c3b90d7ff8e9422b39d5a4 aopalliance-1.0.ebuild 1245
+RMD160 66593079d8036288e37ae4bffea0f321ff37c1d4 aopalliance-1.0.ebuild 1245
+SHA256 33114c4d6f75cfb33f1e46f958d7c9682d7b3762bac43af88477d55129155cb4 aopalliance-1.0.ebuild 1245
 MISC ChangeLog 1132 RMD160 1058d66b4d2eb06050f7b38ede431217dddb98e5 SHA1 5655060b4a949a89c92222b6d88ab3f9e47551cf SHA256 3e7ac20f580a2ed1729635ac507b45b3e09f82c020fc014714c9d8f6eb578979
 MD5 73b4cf3424ed0af1388024aa0fc70836 ChangeLog 1132
 RMD160 1058d66b4d2eb06050f7b38ede431217dddb98e5 ChangeLog 1132