Fix RDEPEND and switch to java-pkg_dojavadoc.

Package-Manager: portage-2.1.2.4

3 files changed, 29 insertions, 23 deletions

diff --git a/dev-java/werken-xpath/ChangeLog b/dev-java/werken-xpath/ChangeLog
index ecbdfe49b1d2..f827fd01bdc6 100644
--- a/dev-java/werken-xpath/ChangeLog
+++ b/dev-java/werken-xpath/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/werken-xpath
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/werken-xpath/ChangeLog,v 1.6 2006/07/22 20:45:07 nelchael Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/werken-xpath/ChangeLog,v 1.7 2007/04/26 21:40:37 betelgeuse Exp $
+
+  26 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  werken-xpath-0.9.4_beta-r1.ebuild:
+  Fix RDEPEND and switch to java-pkg_dojavadoc.
 
   22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   werken-xpath-0.9.4_beta-r1.ebuild:
diff --git a/dev-java/werken-xpath/Manifest b/dev-java/werken-xpath/Manifest
index dbb20f53b6dc..b1be2e6bbff2 100644
--- a/dev-java/werken-xpath/Manifest
+++ b/dev-java/werken-xpath/Manifest
@@ -18,18 +18,18 @@ MD5 72e762a216369d14fcf180a0229e03a5 files/werken-xpath-0.9.4_beta-jpp-tests.pat
 RMD160 72f38c0930ada0363d206fa7b32db1f6d9f1d0d9 files/werken-xpath-0.9.4_beta-jpp-tests.patch 353
 SHA256 79297e31ea4b45ecdaa67df4bb8816b8dd416bc577c1f5406008954cab5e327c files/werken-xpath-0.9.4_beta-jpp-tests.patch 353
 DIST werken.xpath-0.9.4-beta-src.tar.gz 1652916 RMD160 fe2476c538e9e0a54cc40959c534c9267a953623 SHA1 7a0d22073c62a15cf92a3aad45e3ac663cdc837f SHA256 e0d649230f3fa07f0860a355adde20e1ee08ba1a7809f00cb938b9b0dc3f76f3
-EBUILD werken-xpath-0.9.4_beta-r1.ebuild 1831 RMD160 a1b1fccbd27ce72c8e47e5bcfde139a586e23ff9 SHA1 16e3c224ff0ecd6fe5cd282d06b43004ff7d71ca SHA256 5bebb19cc8e61f90f29fd4c69289ed8e32e0f76af4d747988bc5897ec167bb01
-MD5 042885ef070862a265a3bbbf086fc660 werken-xpath-0.9.4_beta-r1.ebuild 1831
-RMD160 a1b1fccbd27ce72c8e47e5bcfde139a586e23ff9 werken-xpath-0.9.4_beta-r1.ebuild 1831
-SHA256 5bebb19cc8e61f90f29fd4c69289ed8e32e0f76af4d747988bc5897ec167bb01 werken-xpath-0.9.4_beta-r1.ebuild 1831
+EBUILD werken-xpath-0.9.4_beta-r1.ebuild 1849 RMD160 6c55601640f7c520c466834c3fb284b27b5e1b47 SHA1 af3f3a399be59b92f1f798d8830332d7265b3895 SHA256 b20f28c9f2e4795c179e7d995f7805b9e31d0926af21f9eb9e2a3d178d47773f
+MD5 8badf50e92aa60f39c34d9c756bc9bb5 werken-xpath-0.9.4_beta-r1.ebuild 1849
+RMD160 6c55601640f7c520c466834c3fb284b27b5e1b47 werken-xpath-0.9.4_beta-r1.ebuild 1849
+SHA256 b20f28c9f2e4795c179e7d995f7805b9e31d0926af21f9eb9e2a3d178d47773f werken-xpath-0.9.4_beta-r1.ebuild 1849
 EBUILD werken-xpath-0.9.4_beta.ebuild 1902 RMD160 40fc6bd494bd6f891a324f89c842cc2d132ca7c4 SHA1 c67f7b7d06ec91e9b633b8a9fe26b32abdea945d SHA256 52c57381fc3754203d63720d9cefa3cfd2efa303ce0d21b608572f3ea12863af
 MD5 4a3f33848638ec06a0ad0440e4622441 werken-xpath-0.9.4_beta.ebuild 1902
 RMD160 40fc6bd494bd6f891a324f89c842cc2d132ca7c4 werken-xpath-0.9.4_beta.ebuild 1902
 SHA256 52c57381fc3754203d63720d9cefa3cfd2efa303ce0d21b608572f3ea12863af werken-xpath-0.9.4_beta.ebuild 1902
-MISC ChangeLog 1288 RMD160 4de8ccb407a87202326d270454445d3f58a3fb2a SHA1 2c76b5e5ab8a3199df4b12dba8f7dd3b5a98d27d SHA256 0403cdf48eed05500e6a788a9b00d00d026edad1a352f5b07430015749ecffd3
-MD5 79dd233d637fdd92a6577d79553d7c98 ChangeLog 1288
-RMD160 4de8ccb407a87202326d270454445d3f58a3fb2a ChangeLog 1288
-SHA256 0403cdf48eed05500e6a788a9b00d00d026edad1a352f5b07430015749ecffd3 ChangeLog 1288
+MISC ChangeLog 1429 RMD160 c5a606edc75fbbe5b826f16a46ed8adfb9852552 SHA1 b525f345ec5178d6b4a428bc40ac6fdefae3e3c7 SHA256 1c05923111ea313c5c1713d82fac0089b84a6ce27ebca38026426bd7eb430e61
+MD5 73c986ebfe136c13cc803727bcde7d2c ChangeLog 1429
+RMD160 c5a606edc75fbbe5b826f16a46ed8adfb9852552 ChangeLog 1429
+SHA256 1c05923111ea313c5c1713d82fac0089b84a6ce27ebca38026426bd7eb430e61 ChangeLog 1429
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -41,9 +41,9 @@ MD5 e91fcdc732f1948b50267af96892a16c files/digest-werken-xpath-0.9.4_beta-r1 286
 RMD160 d65a0aaa16fa3b7d313dcbc9db6b56e885907ce6 files/digest-werken-xpath-0.9.4_beta-r1 286
 SHA256 b4722775395d1474595d0229054dba8adbd711c05d424e4fe00fe0b8128daa91 files/digest-werken-xpath-0.9.4_beta-r1 286
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFEwo5cgo/w9rxVVVERAiXmAKCan+tR440uQAATMEpDk/RnM+Mf/gCgp/4b
-PqLDXuKKxGRGYK+kwjvFAv0=
-=870V
+iD8DBQFGMRxacxLzpIGCsLQRAomiAJ9EBm1nAKrW0vS4jJ9VxM9zqzOesgCaAwpK
+N5g0XjGNgTvXZ5OUNOuXwZ8=
+=4x/V
 -----END PGP SIGNATURE-----
diff --git a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r1.ebuild b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r1.ebuild
index 58803025a09c..6861983fe64d 100644
--- a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r1.ebuild
+++ b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-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/werken-xpath/werken-xpath-0.9.4_beta-r1.ebuild,v 1.2 2006/07/22 20:45:07 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r1.ebuild,v 1.3 2007/04/26 21:40:37 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2 eutils versionator
 
@@ -16,14 +18,14 @@ SRC_URI="mirror://gentoo/${MY_P}-src.tar.gz"
 LICENSE="werken.xpath"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc source"
 
+COMMON_DEP="
+	~dev-java/jdom-1.0_beta9
+	dev-java/antlr"
 DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	dev-java/antlr
-	source? ( app-arch/zip )"
+	${COMMON_DEP}"
 RDEPEND=">=virtual/jre-1.4
-	~dev-java/jdom-1.0_beta9"
+	${COMMON_DEP}"
 
 S="${WORKDIR}/${MY_PN}"
 
@@ -64,7 +66,7 @@ src_compile() {
 src_install() {
 	java-pkg_dojar build/${MY_PN}.jar
 
-	dodoc README TODO LIMITATIONS
-	use doc && java-pkg_dohtml -r build/api
+	dodoc README TODO LIMITATIONS || die
+	use doc && java-pkg_dojavadoc build/api
 	use source && java-pkg_dosrc src/*
 }