Bug #45398 + Cleanup

8 files changed, 18 insertions, 58 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/Manifest b/dev-java/commons-digester/Manifest
index 6843b4d23720..110c4f2c8156 100644
--- a/dev-java/commons-digester/Manifest
+++ b/dev-java/commons-digester/Manifest
@@ -1,6 +1,4 @@
-MD5 afaffe68c2e9b7688ec3979bda3cd14e commons-digester-1.4.1.ebuild 1535
-MD5 88665e0959bb880f8f176ca45f346997 commons-digester-1.5.ebuild 1590
-MD5 d5c58694baff6f9af9a048e94a9665a3 ChangeLog 1557
+MD5 bc3263189165ade7df3bc642ab05030a commons-digester-1.5.ebuild 1618
+MD5 3731b4337532605aa2efa36044a624e4 ChangeLog 1747
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 4deda928e1e4b664deb7b526e48632d6 files/digest-commons-digester-1.5 76
-MD5 6056215091901299a56c98db7242a5e2 files/digest-commons-digester-1.4.1 151
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
diff --git a/dev-java/commons-fileupload/Manifest b/dev-java/commons-fileupload/Manifest
index f66949870545..d723744147c8 100644
--- a/dev-java/commons-fileupload/Manifest
+++ b/dev-java/commons-fileupload/Manifest
@@ -1,7 +1,5 @@
-MD5 0fc26d9e6042b5603f4903e77aa9f7f7 ChangeLog 916
-MD5 47cefd1e89cff0a421f35baca95c3b5d commons-fileupload-1.0_beta.ebuild 836
+MD5 d24830aabfc6dfb8ef8d629a1662fe49 commons-fileupload-1.0.ebuild 1139
+MD5 b69ee0e66897129cf938a42b73b9c791 ChangeLog 1071
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 a60c11dfee7a5bfb74637cf46d9e15ba commons-fileupload-1.0.ebuild 1122
-MD5 24a485cc04c188fe07cc4cdf98fbcece files/digest-commons-fileupload-1.0_beta 161
 MD5 1ab08806d26c8cd29147b1971335d43b files/build.xml.patch 10532
 MD5 aee8a592019aad96d13006121ef476dc files/digest-commons-fileupload-1.0 77
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index 0c0ce8512685..6e383668e52d 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,6 +1,6 @@
-MD5 37d76617bbe2fb66a5eaaf5c0ef8faab commons-httpclient-2.0-r1.ebuild 1261
+MD5 e6ea9796a2cb415f9dab6e07b23de4ac commons-httpclient-2.0-r1.ebuild 1289
 MD5 81679baea28d92fd5fbca71c2dfb6986 commons-httpclient-2.0.ebuild 981
-MD5 ae027e181eff85ecd742f10d483cd562 ChangeLog 900
+MD5 0af20cb368bec4da1de652149977bc18 ChangeLog 1021
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 70dbd7a345c0a9f6a17998de0191f13e files/digest-commons-httpclient-2.0 79
 MD5 35bcb566781a909ae25bac9979bf497c files/gentoo.diff 444
diff --git a/dev-java/servletapi/Manifest b/dev-java/servletapi/Manifest
index 4f7515f56042..5e39333f7b59 100644
--- a/dev-java/servletapi/Manifest
+++ b/dev-java/servletapi/Manifest
@@ -1,8 +1,8 @@
-MD5 594d5972a6d04f7d1b241c6a4c06faf9 ChangeLog 1606
+MD5 824668cc8b8f4cb3f3d61e59ea707157 servletapi-2.2-r1.ebuild 996
+MD5 7b888e8dd9f943c4486d34eae67cfe1c servletapi-2.4.ebuild 1259
+MD5 9e29375d984cbfb9702d7efb7653c2c2 ChangeLog 1697
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 3e217d9401ba44db2bdbeecfdb1f2bc0 servletapi-2.4.ebuild 1269
-MD5 97b98264074f2a62c68ca320d42f4467 servletapi-2.2-r1.ebuild 997
-MD5 5f71818fdf46f4ecf7050571c1a9fe2c servletapi-2.3-r1.ebuild 954
+MD5 558419f6ab5b00b649518e4f8bbf4803 servletapi-2.3-r1.ebuild 953
+MD5 b0c3c4a010bfa47361652ebf6d68ea77 files/digest-servletapi-2.4 78
 MD5 130423ce821911d5ddc38a30df67574b files/digest-servletapi-2.2-r1 74
 MD5 dcffc47728eefea370d29b3bf0d11158 files/digest-servletapi-2.3-r1 75
-MD5 b0c3c4a010bfa47361652ebf6d68ea77 files/digest-servletapi-2.4 78