Many cleanups.

(Portage version: 2.1.1)

3 files changed, 24 insertions, 27 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/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