Bug #45398 + Cleanup

4 files changed, 7 insertions, 43 deletions

diff --git a/dev-java/commons-digester/ChangeLog b/dev-java/commons-digester/ChangeLog
index 7fdb76f43ec5..34fe2ab001e5 100644
--- a/dev-java/commons-digester/ChangeLog
+++ b/dev-java/commons-digester/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-digester
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/ChangeLog,v 1.8 2004/03/01 04:37:28 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/ChangeLog,v 1.9 2004/03/23 02:49:24 zx Exp $
+
+  22 Mar 2004; Chris Aniszczyk <zx@gentoo.org> commons-digester-1.4.1.ebuild,
+  commons-digester-1.5.ebuild:
+  Let ant die gracefully if there is a compilation error + clean up. Bug #45398
 
 *commons-digester-1.5 (29 Feb 2004)
 
diff --git a/dev-java/commons-digester/commons-digester-1.4.1.ebuild b/dev-java/commons-digester/commons-digester-1.4.1.ebuild
deleted file mode 100644
index af6e7fabbfd8..000000000000
--- a/dev-java/commons-digester/commons-digester-1.4.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-1.4.1.ebuild,v 1.5 2004/03/01 04:37:28 zx Exp $
-
-inherit jakarta-commons
-
-S=${WORKDIR}/${PN}-${PV}-src
-DESCRIPTION="The Jakarta Digester component reads XML configuration files to provide initialization of various Java objects within the system."
-HOMEPAGE="http://jakarta.apache.org/commons/digester.html"
-SRC_URI="mirror://apache/jakarta/commons/digester/source/${P}-src.tar.gz"
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-1.4
-	>=dev-java/commons-beanutils-1.5
-	>=dev-java/commons-collections-2.1
-	junit? ( >=dev-java/junit-3.7 )"
-RDEPEND=">=virtual/jdk-1.3
-	>=dev-java/commons-beanutils-1.5
-	>=dev-java/commons-collections-2.1
-	>=dev-java/commons-logging-1.0.2"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE="doc jikes junit"
-
-src_compile() {
-	cp LICENSE.txt ../LICENSE
-	echo "commons-collections.jar=`java-config --classpath=commons-collections`" > build.properties
-	echo "commons-beanutils.jar=`java-config --classpath=commons-beanutils`" >> build.properties
-	echo "commons-logging.jar=`java-config --classpath=commons-logging`" | sed s/\=.*:/\=/ >> build.properties
-	jakarta-commons_src_compile myconf make
-	use doc && jakarta-commons_src_compile makedoc
-	use doc && jakarta-commons_src_install html
-
-	# UGLY HACK
-	mv ${S}/target/conf/MANIFEST.MF ${S}/target/classes/
-	cd ${S}/target/classes
-	zip -r ../${PN}-${PV}.jar org
-}
diff --git a/dev-java/commons-digester/commons-digester-1.5.ebuild b/dev-java/commons-digester/commons-digester-1.5.ebuild
index ed144dbd90e1..253f2f841288 100644
--- a/dev-java/commons-digester/commons-digester-1.5.ebuild
+++ b/dev-java/commons-digester/commons-digester-1.5.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/dev-java/commons-digester/commons-digester-1.5.ebuild,v 1.1 2004/03/01 04:37:28 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-1.5.ebuild,v 1.2 2004/03/23 02:49:24 zx Exp $
 
 inherit jakarta-commons
 
@@ -32,7 +32,7 @@ src_compile() {
 	antflags="${antflags} -Dcommons-beanutils.jar=`java-config --classpath=commons-beanutils`"
 	antflags="${antflags} -Dcommons-collections.jar=`java-config --classpath=commons-collections`"
 	antflags="${antflags} -Dcommons-logging.jar=/usr/share/commons-logging/lib/commons-logging.jar"
-	ant ${antflags}
+	ant ${antflags} || die "compilation failed"
 }
 
 src_install() {
diff --git a/dev-java/commons-digester/files/digest-commons-digester-1.4.1 b/dev-java/commons-digester/files/digest-commons-digester-1.4.1
deleted file mode 100644
index e2f4d14d828e..000000000000
--- a/dev-java/commons-digester/files/digest-commons-digester-1.4.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ac13f9fe2b44c1bfdf455690c321ac18 /commons-digester-1.4.1.ebuild 1553
-MD5 a76169177e7a9b58118bcd993aff4a5e commons-digester-1.4.1-src.tar.gz 117330