From bdd150391428d209f053abde7e005048b44b35b3 Mon Sep 17 00:00:00 2001
From: Chris Aniszczyk <zx@gentoo.org>
Date: Tue, 23 Mar 2004 02:52:52 +0000
Subject: Stable on x86, clean up, removing ~ppc due to bad dep.

---
 dev-java/commons-fileupload/ChangeLog              |  6 +++++-
 .../commons-fileupload-1.0.ebuild                  |  6 +++---
 .../commons-fileupload-1.0_beta.ebuild             | 23 ----------------------
 .../files/digest-commons-fileupload-1.0_beta       |  2 --
 4 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 dev-java/commons-fileupload/commons-fileupload-1.0_beta.ebuild
 delete mode 100644 dev-java/commons-fileupload/files/digest-commons-fileupload-1.0_beta

(limited to 'dev-java')

diff --git a/dev-java/commons-fileupload/ChangeLog b/dev-java/commons-fileupload/ChangeLog
index 0b0867c7066e..cefbd50a22b3 100644
--- a/dev-java/commons-fileupload/ChangeLog
+++ b/dev-java/commons-fileupload/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-fileupload
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.5 2004/03/22 20:03:00 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.6 2004/03/23 02:52:52 zx Exp $
+
+  22 Mar 2004; Chris Aniszczyk <zx@gentoo.org> commons-fileupload-1.0.ebuild,
+  commons-fileupload-1.0_beta.ebuild:
+  Clean and fixes according to Bug #45398
 
   18 Mar 2004; David Holm <dholm@gentoo.org> commons-fileupload-1.0.ebuild:
   Added to ~ppc.
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild
index c8c903e34f12..d62e28ccf79f 100644
--- a/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild
+++ b/dev-java/commons-fileupload/commons-fileupload-1.0.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-fileupload/commons-fileupload-1.0.ebuild,v 1.2 2004/03/22 20:03:00 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild,v 1.3 2004/03/23 02:52:52 zx Exp $
 
 inherit eutils java-pkg
 
@@ -14,7 +14,7 @@ DEPEND=">=virtual/jdk-1.3
 RDEPEND=">=virtual/jdk-1.3"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="x86 ~sparc"
 IUSE="jikes"
 
 src_unpack() {
@@ -28,7 +28,7 @@ src_unpack() {
 src_compile() {
 	local antflags="jar"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags}
+	ant ${antflags} || die "compilation error"
 }
 
 src_install() {
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.0_beta.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.0_beta.ebuild
deleted file mode 100644
index e42be92a14be..000000000000
--- a/dev-java/commons-fileupload/commons-fileupload-1.0_beta.ebuild
+++ /dev/null
@@ -1,23 +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-fileupload/commons-fileupload-1.0_beta.ebuild,v 1.5 2004/02/22 07:40:43 zx Exp $
-
-inherit jakarta-commons
-
-MY_PV=${PV/_/-}-1
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-DESCRIPTION="The Commons FileUpload package makes it easy to add robust, high-performance, file upload capability to your servlets and web applications."
-HOMEPAGE="http://jakarta.apache.org/commons/fileupload/index.html"
-SRC_URI="mirror://apache/jakarta/commons/fileupload/source/${PN}-${MY_PV}-src.tar.gz"
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-1.4"
-RDEPEND=">=virtual/jdk-1.3"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
-IUSE="jikes"
-
-src_compile() {
-	jakarta-commons_src_compile myconf make
-}
diff --git a/dev-java/commons-fileupload/files/digest-commons-fileupload-1.0_beta b/dev-java/commons-fileupload/files/digest-commons-fileupload-1.0_beta
deleted file mode 100644
index 096485d585ca..000000000000
--- a/dev-java/commons-fileupload/files/digest-commons-fileupload-1.0_beta
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 667ee870d3501768eea5b7cbfbceffb2 /commons-fileupload-1.0_beta.ebuild 854
-MD5 f96027de8897a904584e608a4587d51d commons-fileupload-1.0-beta-1-src.tar.gz 20952
-- 
cgit v1.2.3-65-gdbad