Use java-pkg_dojavadoc, add src_test and general ebuild cleanup.

Package-Manager: portage-2.1.2.7

3 files changed, 35 insertions, 20 deletions

diff --git a/dev-java/wsdl4j/ChangeLog b/dev-java/wsdl4j/ChangeLog
index 2099ea033f1f..6960440dc0e5 100644
--- a/dev-java/wsdl4j/ChangeLog
+++ b/dev-java/wsdl4j/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/wsdl4j
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/wsdl4j/ChangeLog,v 1.10 2007/02/21 23:46:03 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/wsdl4j/ChangeLog,v 1.11 2007/06/08 20:38:47 betelgeuse Exp $
+
+  08 Jun 2007; Petteri Räty <betelgeuse@gentoo.org> wsdl4j-1.5.1-r1.ebuild:
+  Use java-pkg_dojavadoc, add src_test and general ebuild cleanup.
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/dev-java/wsdl4j/Manifest b/dev-java/wsdl4j/Manifest
index 57c3c96d102d..3b0d8fb2908e 100644
--- a/dev-java/wsdl4j/Manifest
+++ b/dev-java/wsdl4j/Manifest
@@ -1,21 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST wsdl4j-1.4-gentoo.tar.gz 2649972 RMD160 f147e171b1495d0755076b55cad0c45e64acef22 SHA1 c94170257680465b288e6f9296a1fddc117fc966 SHA256 a992ace0ef9c3daa08237153b2154844732936a4f5159ae6ad3db729a86dd545
 DIST wsdl4j-1.5.1-gentoo.tar.bz2 355619 RMD160 eefd9f280e870016176db50e6c0aa2710eab594d SHA1 467f0802149e56d46ebe66cbc0b8742a2f9aa5be SHA256 c8d14c919234a06375beddb8d456863105077b16832d9e71129bcd3d1c619a48
 EBUILD wsdl4j-1.4.ebuild 1094 RMD160 8efac1a746005609084fc40665601389660f71ed SHA1 dd29dbb81d0dff1ae6898dcff29bb1e7b606a8f1 SHA256 0498bfd7356565c300dcbf45e1da8519dd343f249bd1e9c3876517990f0f3ccd
 MD5 c42395b43ca5400f72ed0716daaa1e25 wsdl4j-1.4.ebuild 1094
 RMD160 8efac1a746005609084fc40665601389660f71ed wsdl4j-1.4.ebuild 1094
 SHA256 0498bfd7356565c300dcbf45e1da8519dd343f249bd1e9c3876517990f0f3ccd wsdl4j-1.4.ebuild 1094
-EBUILD wsdl4j-1.5.1-r1.ebuild 820 RMD160 180db2650aa69490df4b53c944dda075ec96b193 SHA1 c5ce066c19e098e18068c6f93da9d70d5b0d6ee3 SHA256 6a354ff907b81df130a8876de432549904f0be04af01b0b7e9ccb00664c380cd
-MD5 d59df7d4767b96bd4545cceee37db5a4 wsdl4j-1.5.1-r1.ebuild 820
-RMD160 180db2650aa69490df4b53c944dda075ec96b193 wsdl4j-1.5.1-r1.ebuild 820
-SHA256 6a354ff907b81df130a8876de432549904f0be04af01b0b7e9ccb00664c380cd wsdl4j-1.5.1-r1.ebuild 820
+EBUILD wsdl4j-1.5.1-r1.ebuild 849 RMD160 cf38a7323a6045790c2e02457c4ac63c12e344e1 SHA1 c2ccf484e7f610baa115261dc62b3c6fa0aa1384 SHA256 8de0407fbc9d107332e6c8045c3ddd7a2b9a5d151236deaa9744969dff65b967
+MD5 693cf6435732f0bd25f4bea24c868667 wsdl4j-1.5.1-r1.ebuild 849
+RMD160 cf38a7323a6045790c2e02457c4ac63c12e344e1 wsdl4j-1.5.1-r1.ebuild 849
+SHA256 8de0407fbc9d107332e6c8045c3ddd7a2b9a5d151236deaa9744969dff65b967 wsdl4j-1.5.1-r1.ebuild 849
 EBUILD wsdl4j-1.5.1.ebuild 1013 RMD160 cf653a9ebd8eec4c0e45d144244bcbce14e65e8c SHA1 da4adf6ee26f1f7410a50cf570750a62e7409432 SHA256 39773e29bc98b9264800874b3930781fd814c9110d71d77eadd4ee792b359acf
 MD5 10d8881f6d86d389292377b003128b1e wsdl4j-1.5.1.ebuild 1013
 RMD160 cf653a9ebd8eec4c0e45d144244bcbce14e65e8c wsdl4j-1.5.1.ebuild 1013
 SHA256 39773e29bc98b9264800874b3930781fd814c9110d71d77eadd4ee792b359acf wsdl4j-1.5.1.ebuild 1013
-MISC ChangeLog 1759 RMD160 8019e85aaf7b4c9b0d6e0d26f8114d53f7dfad52 SHA1 2b5d51f2177b866178e596dee255c13e11d52253 SHA256 d407315b615319bfad2726a4360d121ec73a4877dda8b0b06e2660704ed095a3
-MD5 357f16eb2b0e9130d34a79a95cf92d0c ChangeLog 1759
-RMD160 8019e85aaf7b4c9b0d6e0d26f8114d53f7dfad52 ChangeLog 1759
-SHA256 d407315b615319bfad2726a4360d121ec73a4877dda8b0b06e2660704ed095a3 ChangeLog 1759
+MISC ChangeLog 1909 RMD160 e4287735d639d17d30a45cebfcac5f2fb75e9ee6 SHA1 436271a30b59a806f3dbbe3aa7de0feb1433fe4c SHA256 5b759dbec5288419a3b1b68361359d8f47629ffd845235d440b75c40a673ba80
+MD5 77dd478ca203ba5d8db66550e8d97606 ChangeLog 1909
+RMD160 e4287735d639d17d30a45cebfcac5f2fb75e9ee6 ChangeLog 1909
+SHA256 5b759dbec5288419a3b1b68361359d8f47629ffd845235d440b75c40a673ba80 ChangeLog 1909
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -29,3 +32,10 @@ SHA256 44df2f517ad36146511f2026f7129e2a1d014640952e74f4d7224c1f7c739f30 files/di
 MD5 1357a0c6dcd5854e751139d0396052b0 files/digest-wsdl4j-1.5.1-r1 262
 RMD160 32d45707248f59cb7b1cc77085f8d06e443be84a files/digest-wsdl4j-1.5.1-r1 262
 SHA256 44df2f517ad36146511f2026f7129e2a1d014640952e74f4d7224c1f7c739f30 files/digest-wsdl4j-1.5.1-r1 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGab5bcxLzpIGCsLQRAhMhAJ9pqC/uAXkE+9+r2m9js4L1cqFyUgCdHjWc
+lZbXOHyXVpCFJB1oN/YZRWM=
+=VKI3
+-----END PGP SIGNATURE-----
diff --git a/dev-java/wsdl4j/wsdl4j-1.5.1-r1.ebuild b/dev-java/wsdl4j/wsdl4j-1.5.1-r1.ebuild
index d13631dc6b9d..e256a30fc232 100644
--- a/dev-java/wsdl4j/wsdl4j-1.5.1-r1.ebuild
+++ b/dev-java/wsdl4j/wsdl4j-1.5.1-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/wsdl4j/wsdl4j-1.5.1-r1.ebuild,v 1.1 2006/09/17 20:13:13 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/wsdl4j/wsdl4j-1.5.1-r1.ebuild,v 1.2 2007/06/08 20:38:47 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -11,23 +13,23 @@ SRC_URI="mirror://gentoo/${P}-gentoo.tar.bz2"
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc source"
 
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.4
-	source? ( app-arch/zip )"
+DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
 
-src_compile() {
-	eant compile $(use_doc javadocs)
+EANT_BUILD_TARGET="compile"
+EANT_DOC_TARGET="javadocs"
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test
 }
 
 src_install() {
 	java-pkg_dojar build/lib/*.jar
 
-	dohtml doc/*.html
-	dodoc doc/spec/*
+	dohtml doc/*.html || die
+	dodoc doc/spec/* || die
 
-	use doc && java-pkg_dohtml -r build/javadocs/
+	use doc && java-pkg_dojavadoc build/javadocs/
 	use source && java-pkg_dosrc src/*
 }