dep fixes, add source useflag

Package-Manager: portage-2.0.51.22-r1

3 files changed, 25 insertions, 10 deletions

diff --git a/dev-java/commons-fileupload/ChangeLog b/dev-java/commons-fileupload/ChangeLog
index c46389dfe99b..61cefb905c12 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.19 2005/05/29 15:41:05 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.20 2005/07/10 13:28:49 axxo Exp $
+
+  10 Jul 2005; Thomas Matthijs <axxo@gentoo.org>
+  commons-fileupload-1.0.ebuild:
+  dep fixes, add source useflag
 
   29 May 2005; Markus Rothe <corsair@gentoo.org>
   commons-fileupload-1.0.ebuild:
diff --git a/dev-java/commons-fileupload/Manifest b/dev-java/commons-fileupload/Manifest
index 75012e548969..55ff51d3163f 100644
--- a/dev-java/commons-fileupload/Manifest
+++ b/dev-java/commons-fileupload/Manifest
@@ -1,5 +1,15 @@
-MD5 fd8bbfff2087c4374601171622b1a22d ChangeLog 2502
-MD5 f7f82ed4eea023f767b0659bdefdc0d7 commons-fileupload-1.0.ebuild 1282
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9c1af341bc9c12c938153dcce0ce4eef commons-fileupload-1.0.ebuild 1324
+MD5 4cc32249bc32abe3234d6ed4257342ae ChangeLog 2614
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 050bb4de310d71a2a9800328eb66d272 files/build.xml.patch 10539
 MD5 aee8a592019aad96d13006121ef476dc files/digest-commons-fileupload-1.0 77
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0SKn/rLF9B432nYRAk0KAKCR33+QZSM175RowiLMroNI4qllFQCglBDr
+Wcatrj/G4McsgK6OeDMMJB0=
+=CFpk
+-----END PGP SIGNATURE-----
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild
index 2b3de5455477..f67d228fb59b 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-2005 Gentoo Foundation
 # 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.16 2005/05/29 15:41:05 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild,v 1.17 2005/07/10 13:28:49 axxo Exp $
 
 inherit eutils java-pkg
 
@@ -8,14 +8,15 @@ DESCRIPTION="The Commons FileUpload package makes it easy to add robust, high-pe
 HOMEPAGE="http://jakarta.apache.org/commons/fileupload/index.html"
 SRC_URI="mirror://apache/jakarta/commons/fileupload/source/${P}-src.tar.gz"
 DEPEND=">=virtual/jdk-1.3
-		>=dev-java/ant-1.5
-		>=dev-java/servletapi-2.4
+		>=dev-java/ant-core-1.5
+		=dev-java/servletapi-2.4*
+		source? ( app-arch/unzip )
 		jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3"
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="jikes doc"
+IUSE="jikes doc source"
 
 src_unpack() {
 	unpack ${A}
@@ -32,7 +33,7 @@ src_compile() {
 }
 
 src_install() {
-	mv ${S}/target/${P}.jar ${S}/target/${PN}.jar
-	java-pkg_dojar target/${PN}.jar
+	java-pkg_newjar target/${P}.jar ${PN}.jar
 	use doc && java-pkg_dohtml -r dist/docs/
+	use source && java-pkg_dosrc src/java/*
 }