Switch to java-pkg_dojavadoc.

Package-Manager: portage-2.1.2.7

4 files changed, 32 insertions, 28 deletions

diff --git a/dev-java/xml-commons/ChangeLog b/dev-java/xml-commons/ChangeLog
index a6e7a16284b4..4f40e4248be4 100644
--- a/dev-java/xml-commons/ChangeLog
+++ b/dev-java/xml-commons/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xml-commons
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons/ChangeLog,v 1.16 2007/05/23 17:14:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons/ChangeLog,v 1.17 2007/05/26 08:54:36 betelgeuse Exp $
+
+  26 May 2007; Petteri Räty <betelgeuse@gentoo.org>
+  xml-commons-1.0_beta2-r1.ebuild:
+  Switch to java-pkg_dojavadoc.
 
   23 May 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Add ~x86-fbsd keyword. Bug #176906.
diff --git a/dev-java/xml-commons/Manifest b/dev-java/xml-commons/Manifest
index 299cf91b4d62..616d9fbf4233 100644
--- a/dev-java/xml-commons/Manifest
+++ b/dev-java/xml-commons/Manifest
@@ -6,22 +6,22 @@ MD5 55bd514ef86d8fcec1e605bb9eddea1f files/1.0_beta2-jdk15.patch 1784
 RMD160 e49494d81da1b8bd8bc326026c5f4352e4af1204 files/1.0_beta2-jdk15.patch 1784
 SHA256 58d073abb93cf6676cb2d977f5d172ac9acd1ebf8e82c02d950b84e037a5dcfe files/1.0_beta2-jdk15.patch 1784
 DIST xml-commons-1.0.b2.tar.gz 1821110 RMD160 eef68ff81875db60993ee09a5c7c034075f75426 SHA1 12790dc0e7f19089d6c9e70c39018e2e20a19968 SHA256 22b9e53919e4aa15fdd074a515c8a8dc9823a91d72eb91fbb3e1bd8cfc488375
-EBUILD xml-commons-1.0_beta2-r1.ebuild 1464 RMD160 edfb61ee9720db2ad43983705efb52effddd8118 SHA1 f9c01510433df08c7b39157287e8820fb363858b SHA256 e9fe29c51dab0e27c58246d33dacc474b2e6181d7d06786f2f582c1a5e4ac40a
-MD5 5bb087ec8e2bae8d5eac079a0db648c1 xml-commons-1.0_beta2-r1.ebuild 1464
-RMD160 edfb61ee9720db2ad43983705efb52effddd8118 xml-commons-1.0_beta2-r1.ebuild 1464
-SHA256 e9fe29c51dab0e27c58246d33dacc474b2e6181d7d06786f2f582c1a5e4ac40a xml-commons-1.0_beta2-r1.ebuild 1464
+EBUILD xml-commons-1.0_beta2-r1.ebuild 1456 RMD160 e0ee757a302f21c0e976827b6d40386049d52637 SHA1 71d89c7c293b3a7908f35dceb319a73d8b139872 SHA256 808d3d7ab06bb6f04f7533d443b18a6623dafd3849c5dc598bf2ad0c535fdd80
+MD5 fd5257312f8fc59539c16e8f353f57dd xml-commons-1.0_beta2-r1.ebuild 1456
+RMD160 e0ee757a302f21c0e976827b6d40386049d52637 xml-commons-1.0_beta2-r1.ebuild 1456
+SHA256 808d3d7ab06bb6f04f7533d443b18a6623dafd3849c5dc598bf2ad0c535fdd80 xml-commons-1.0_beta2-r1.ebuild 1456
 EBUILD xml-commons-1.0_beta2.ebuild 1532 RMD160 b1a78fe0b896270e946ef17e7b0f3b8dd841bd62 SHA1 ff9bafb9eed6fc7114a86fe558cd0ffc7734df40 SHA256 92651058b79d340524058287662e81194ab9ded146f57c3a98fad7904afff01d
 MD5 51c2ba49663624768d7b6f2cf973a649 xml-commons-1.0_beta2.ebuild 1532
 RMD160 b1a78fe0b896270e946ef17e7b0f3b8dd841bd62 xml-commons-1.0_beta2.ebuild 1532
 SHA256 92651058b79d340524058287662e81194ab9ded146f57c3a98fad7904afff01d xml-commons-1.0_beta2.ebuild 1532
-MISC ChangeLog 2375 RMD160 a60576355c4c9a6a633e07ede5cba6cd23cb4cab SHA1 0c98312f52ecbf9230b4e6b5a4c444c06da44e4d SHA256 4cd6d6078e3e5ed399152ce59b4c46cb6e593599fbdad75eba84dc738934cd56
-MD5 a03b7aae33d94886fea18ec2771ebcb2 ChangeLog 2375
-RMD160 a60576355c4c9a6a633e07ede5cba6cd23cb4cab ChangeLog 2375
-SHA256 4cd6d6078e3e5ed399152ce59b4c46cb6e593599fbdad75eba84dc738934cd56 ChangeLog 2375
-MISC metadata.xml 577 RMD160 5180d1fa32b88386155a0f3aa075db62cc2fe4f1 SHA1 2d3409a2a8398992b768c5f7261a26ffffbdff30 SHA256 3dc17ff864a777ebfe8874b5b631a84565aae91567b1427286cc93a4a5a9d733
-MD5 6c508e5bd6d1f3926eef63565d0f2cef metadata.xml 577
-RMD160 5180d1fa32b88386155a0f3aa075db62cc2fe4f1 metadata.xml 577
-SHA256 3dc17ff864a777ebfe8874b5b631a84565aae91567b1427286cc93a4a5a9d733 metadata.xml 577
+MISC ChangeLog 2497 RMD160 deadd6c547925d8b20c30b6c74e6245a03907a00 SHA1 66ede7c67f98aa88d50f8e1ca233cc91a4103fdc SHA256 0b7a5f87fcbe099eec389191d1c518881046da0eb637f1642add69d446d26f5d
+MD5 0264659cfba5bf719928a81feea464cf ChangeLog 2497
+RMD160 deadd6c547925d8b20c30b6c74e6245a03907a00 ChangeLog 2497
+SHA256 0b7a5f87fcbe099eec389191d1c518881046da0eb637f1642add69d446d26f5d ChangeLog 2497
+MISC metadata.xml 575 RMD160 38de9644118229357c27e90325947e43d6838cd9 SHA1 e128596af886d6e390187527d202fb913447e9c8 SHA256 6096b9683a09544990cceb26dc95db2168eea0b35d659dca2ea13acf6bd1aebd
+MD5 644e22259d241716e49106d57c5b418d metadata.xml 575
+RMD160 38de9644118229357c27e90325947e43d6838cd9 metadata.xml 575
+SHA256 6096b9683a09544990cceb26dc95db2168eea0b35d659dca2ea13acf6bd1aebd metadata.xml 575
 MD5 5e344ad1d81a40d661f9f126218189cc files/digest-xml-commons-1.0_beta2 259
 RMD160 1b76bcd72e94d3988c14550ce03eb35b1c5ef761 files/digest-xml-commons-1.0_beta2 259
 SHA256 f00e782ed3561a694e91fe6c0b865e96a9812fcb3ef8828e527328874991ae24 files/digest-xml-commons-1.0_beta2 259
@@ -31,7 +31,7 @@ SHA256 f00e782ed3561a694e91fe6c0b865e96a9812fcb3ef8828e527328874991ae24 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGVHaMAiZjviIA2XgRAvHnAKCQgU921T/fkHm71WkFYrQM4XUgkQCgtRcT
-H2Bkzns1hTxcnRSVZ8bQBqs=
-=A0sJ
+iD8DBQFGV/XacxLzpIGCsLQRAn6DAJwN9leN+lXT7mKtxY2S03J5Qd96pACgkXtH
+EZ1Q6C03PSOn8KSFgQSzsFg=
+=M/+E
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xml-commons/metadata.xml b/dev-java/xml-commons/metadata.xml
index e70d196a1555..b910167b8e80 100644
--- a/dev-java/xml-commons/metadata.xml
+++ b/dev-java/xml-commons/metadata.xml
@@ -6,11 +6,11 @@
 
 <longdescription>
 
-These are some of the components that are provided by the Apache XML Commons 
+These are some of the components that are provided by the Apache XML Commons
 project.
 
  * Resolver - An XML Entity and URI Resolver donated by Norman Walsh.
- * Which - A simple environment checking utility for Apache projects by Shane 
+ * Which - A simple environment checking utility for Apache projects by Shane
    Curcuru
  * External Interfaces (xml-apis) - An Apache-hosted set of externally-defined
    standards interfaces, namely DOM, SAX, and JAXP.
diff --git a/dev-java/xml-commons/xml-commons-1.0_beta2-r1.ebuild b/dev-java/xml-commons/xml-commons-1.0_beta2-r1.ebuild
index 91405bd2e07b..bd341fd81eb2 100644
--- a/dev-java/xml-commons/xml-commons-1.0_beta2-r1.ebuild
+++ b/dev-java/xml-commons/xml-commons-1.0_beta2-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/xml-commons/xml-commons-1.0_beta2-r1.ebuild,v 1.3 2006/12/09 09:26:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons/xml-commons-1.0_beta2-r1.ebuild,v 1.4 2007/05/26 08:54:36 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -18,20 +20,18 @@ SRC_URI="mirror://apache/xml/commons/${MY_P}.tar.gz"
 LICENSE="Apache-1.1 public-domain W3C-document W3C"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc source"
+IUSE=""
 
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	source? ( app-arch/zip )"
+DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
 
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/${PV}-jdk15.patch
+	epatch "${FILESDIR}/${PV}-jdk15.patch"
 }
 
 src_compile() {
@@ -48,7 +48,7 @@ src_install() {
 	java-pkg_dojar java/build/resolver.jar
 	java-pkg_dojar java/external/build/xml-apis.jar
 
-	dodoc README.html
-	use doc && java-pkg_dohtml -r java/build/docs/*
+	dodoc README.html || die
+	use doc && java-pkg_dojavadoc java/build/docs/javadocs
 	use source && java-pkg_dosrc java/src/org
 }