use java-pkg_getjar to get the servlet jar

5 files changed, 21 insertions, 18 deletions

diff --git a/dev-java/commons-fileupload/ChangeLog b/dev-java/commons-fileupload/ChangeLog
index 24c9bb0c4f04..fcfffd9cabaf 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 Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.13 2004/10/16 17:06:30 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.14 2004/10/17 18:35:17 axxo Exp $
+
+  17 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  commons-fileupload-1.0.ebuild:
+  use java-pkg_getjar to get the servlet jar
 
   16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
   commons-fileupload-1.0.ebuild:
diff --git a/dev-java/commons-fileupload/Manifest b/dev-java/commons-fileupload/Manifest
index 237b355b597d..b93ab27da82f 100644
--- a/dev-java/commons-fileupload/Manifest
+++ b/dev-java/commons-fileupload/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e63c295c7a129b5e3868a05836d3bbe1 commons-fileupload-1.0.ebuild 1275
-MD5 292187df05381ec5c033721dde28017f ChangeLog 1955
+MD5 2bd4bedab59cadba2d91f0d631988e3a commons-fileupload-1.0.ebuild 1267
+MD5 0ca96904a2652c3697d15c9fbc550288 ChangeLog 2083
 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.2.6 (GNU/Linux)
 
-iD8DBQFBcVUf/rLF9B432nYRAn1VAKDMH16jOB78OWUktXY1x4U1arnC1ACfSwND
-HPgo5nzMyZwHOZi/yXAciIs=
-=eeQ/
+iD8DBQFBcrt2/rLF9B432nYRArI+AKC0D27NdqdJbjNJm56Vd39mDkKwLACgkYAH
+ocKn5ytrwXCLVWBoccI21IU=
+=daN5
 -----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 a35e7011c593..49305de61021 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 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.10 2004/10/16 17:06:30 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild,v 1.11 2004/10/17 18:35:17 axxo Exp $
 
 inherit eutils java-pkg
 
@@ -21,8 +21,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/build.xml.patch
-	local SAPI="`java-config -p servletapi-2.4`"
-	echo "servlet-api.jar = ${SAPI/*:/}" >> build.properties
+	echo "servlet-api.jar = $(java-pkg_getjar servletapi-2.4 servlet-api.jar)" >> build.properties
 }
 
 src_compile() {
diff --git a/dev-java/jai-bin/Manifest b/dev-java/jai-bin/Manifest
index f9237002c61e..1651cc9b2c6c 100644
--- a/dev-java/jai-bin/Manifest
+++ b/dev-java/jai-bin/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 eb2a84b6375462fd525760c1a71c230c jai-bin-1.1.2.01.ebuild 1036
+MD5 e0fc6d38c90de2c1a872a9029a1a7927 jai-bin-1.1.2.01.ebuild 1046
 MD5 6081e52ab487a765c5f650366720aca2 jai-bin-1.1.2-r2.ebuild 1340
-MD5 9f561ef92ab2a4ba010a7d6f2dd60fdf ChangeLog 1685
+MD5 42966c789b1233024f32b17bed6c07f9 ChangeLog 1775
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 ceb09b46ab90e2f589d62c1d6d29672e jai-bin-1.1.2-r3.ebuild 1072
 MD5 ae1dceadf570ee0f12c1122ed3d9c4b5 files/digest-jai-bin-1.1.2.01 80
@@ -12,7 +12,7 @@ MD5 e60e96e8d350d2e30cf45902dd277268 files/digest-jai-bin-1.1.2-r3 78
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBckyR/rLF9B432nYRAhL+AJ4+D4HxAEqia/jTYYrWcts0Hjbw6gCfat9Z
-68zSAcSmyNkZpJsc3/IvChk=
-=SVLo
+iD8DBQFBcru3/rLF9B432nYRAmjpAJ9V8JXJUKNZgZw3FQs6j+zLJgoRhgCeKR4d
+IVrxwECmRe9eMXvxkYJQ/bk=
+=T9xe
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jimi/Manifest b/dev-java/jimi/Manifest
index d05acede4047..37812cde7a85 100644
--- a/dev-java/jimi/Manifest
+++ b/dev-java/jimi/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 58e5ed993a097670980e2db13000e7d8 jimi-1.0.ebuild 1417
+MD5 0d7e977fb031e201ea0ff6b367d34d09 jimi-1.0.ebuild 1423
 MD5 37c6883665f34d4ebd3069f097714024 ChangeLog 871
 MD5 4dad079a28768d183022cff420f01281 metadata.xml 220
 MD5 8ec838971f780c36dfcd2850a7276f7d files/digest-jimi-1.0 57
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBclK9/rLF9B432nYRAvAzAJ9Cz9LyajfxO0q3gktqJlWAemWdEwCgqWJW
-f3yKzvtjn7BKq6kRgayp7qA=
-=9zNW
+iD8DBQFBcrwO/rLF9B432nYRAvnmAKC8qFV109Eruydnf4vMqJ7GVxTdJQCeIfFB
+Y1F+TyClUwciLugHrHkYWgI=
+=R4AS
 -----END PGP SIGNATURE-----