Switch to java-pkg_dojavadoc.

Package-Manager: portage-2.1.2.4

diff --git a/dev-java/jaxme/ChangeLog b/dev-java/jaxme/ChangeLog
index 94458bbbd8f2cc2035844d182e642418b7000e29..78556dceaef362f25d1567ceef33c5acacaa1098 100644 (file)
--- a/dev-java/jaxme/ChangeLog
+++ b/dev-java/jaxme/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jaxme
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.18 2007/04/20 15:39:43 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.19 2007/04/20 15:43:03 betelgeuse Exp $
+
+  20 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> jaxme-0.3.1-r3.ebuild:
+  Switch to java-pkg_dojavadoc.
 
   20 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> jaxme-0.3.1-r3.ebuild:
   Add dev-java/ant-core to RDEPEND.

diff --git a/dev-java/jaxme/Manifest b/dev-java/jaxme/Manifest
index 43d744bbbe7f013efcf02107c8d0427045c57f4d..6118ec3f9403dbd4510c09a24f9d754d266f3001 100644 (file)
--- a/dev-java/jaxme/Manifest
+++ b/dev-java/jaxme/Manifest
@@ -10,18 +10,18 @@ MD5 8039a2f19bcc273d417ec48d00bbe87a files/jaxme-0.3.1-gentoo.patch 1771
 RMD160 2c4d51b162bb87599e7c50b28bfd99dee37e5d96 files/jaxme-0.3.1-gentoo.patch 1771
 SHA256 833974df6973940936e74919c9629bc17138805bf4dd54d53916334bb01c91fa files/jaxme-0.3.1-gentoo.patch 1771
 DIST ws-jaxme-0.3.1-src.tar.gz 3058903 RMD160 cd994b5fd9a15473ed7390b8911601b794f76cd0 SHA1 4ba5fd76cbda407c0b32af2e3235dab66a8b0a00 SHA256 9f02b233849ec10cda455c51d5bda46929f5fcbed237c5a5a760a19eb59e852c
-EBUILD jaxme-0.3.1-r3.ebuild 2177 RMD160 bebed1bec6d46688936b371023e0e182639890fa SHA1 6774484f69a3af0d8f5ddf6069d369c5bf0c6283 SHA256 9304e03d6b6d4468761fc570313cf315b31477a10870c6657296dd89fb0044f8
-MD5 641a174af4ff35d54d2b58d1115f769b jaxme-0.3.1-r3.ebuild 2177
-RMD160 bebed1bec6d46688936b371023e0e182639890fa jaxme-0.3.1-r3.ebuild 2177
-SHA256 9304e03d6b6d4468761fc570313cf315b31477a10870c6657296dd89fb0044f8 jaxme-0.3.1-r3.ebuild 2177
+EBUILD jaxme-0.3.1-r3.ebuild 2234 RMD160 6a6e6ee9705418fd94c643016ed0c5089a87ce63 SHA1 c077a0310e37270a4e68e8cc6937976a140b4e2c SHA256 3d0ace472d6e546f91bfccdbb0ca3e56371cd621751657994b6bb30072950c92
+MD5 50261e1b160828045164f46d651999b4 jaxme-0.3.1-r3.ebuild 2234
+RMD160 6a6e6ee9705418fd94c643016ed0c5089a87ce63 jaxme-0.3.1-r3.ebuild 2234
+SHA256 3d0ace472d6e546f91bfccdbb0ca3e56371cd621751657994b6bb30072950c92 jaxme-0.3.1-r3.ebuild 2234
 EBUILD jaxme-0.3.1.ebuild 1640 RMD160 e778a994c34befa27971d81e4e0ac21dd634b00a SHA1 fceed87b77634da590cd261b0042cf3631ce2cb9 SHA256 e57f8fec2ab685e715bc9d2a5bfc9e378eb99b25069357fd8623cae85bf4882e
 MD5 a27f1952629b11eac70c224ada458129 jaxme-0.3.1.ebuild 1640
 RMD160 e778a994c34befa27971d81e4e0ac21dd634b00a jaxme-0.3.1.ebuild 1640
 SHA256 e57f8fec2ab685e715bc9d2a5bfc9e378eb99b25069357fd8623cae85bf4882e jaxme-0.3.1.ebuild 1640
-MISC ChangeLog 2499 RMD160 145c968d6275dcef2d653dd7d92bff71d0e0d1cd SHA1 73567b5ab106018e99687409ac9b1c96225aeb94 SHA256 e4e584c0892241afd7911f8aae41c5955f5b0ec3bf6845e4a70e4616a2d887aa
-MD5 cc9ab706eae7aeb3ec07b0e9fe00d639 ChangeLog 2499
-RMD160 145c968d6275dcef2d653dd7d92bff71d0e0d1cd ChangeLog 2499
-SHA256 e4e584c0892241afd7911f8aae41c5955f5b0ec3bf6845e4a70e4616a2d887aa ChangeLog 2499
+MISC ChangeLog 2608 RMD160 a1eafbbd44973f4b082980d4ab88986fd467e7e1 SHA1 940f591916c17bf4f722b3756faa3c3d239f583a SHA256 7735d9e4246013af9c2e54789da576c29ea367408ce9c6400b95573ed6e0a1c3
+MD5 eda40a732643cdc2107f5d684b7d40b5 ChangeLog 2608
+RMD160 a1eafbbd44973f4b082980d4ab88986fd467e7e1 ChangeLog 2608
+SHA256 7735d9e4246013af9c2e54789da576c29ea367408ce9c6400b95573ed6e0a1c3 ChangeLog 2608
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -35,7 +35,7 @@ SHA256 0f7eb759824895c7f8af0a9f3e9f270b9849fb68689cc8f0b3eda15670eb8a5b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGKN7CcxLzpIGCsLQRAjWcAJ4vKJ113rG24/+cU7kuCB9rnNMHuwCbB7hh
-A68Q6OvkajeQIxGWK2EqDc0=
-=Hekk
+iD8DBQFGKN+LcxLzpIGCsLQRAh8YAJwJmEFPYm7MvKOsD1YHXPPGc8j7ygCffW2g
+O3J7Mo2QqP8lI7zVmHChpQ4=
+=/T7B
 -----END PGP SIGNATURE-----

diff --git a/dev-java/jaxme/jaxme-0.3.1-r3.ebuild b/dev-java/jaxme/jaxme-0.3.1-r3.ebuild
index 42c11355e84ecc72fba207b5d5a184a890fa39e0..15c4269685e7b9cc16e25a50c5e97d0a0e21c292 100644 (file)
--- a/dev-java/jaxme/jaxme-0.3.1-r3.ebuild
+++ b/dev-java/jaxme/jaxme-0.3.1-r3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.3.1-r3.ebuild,v 1.4 2007/04/20 15:39:43 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.3.1-r3.ebuild,v 1.5 2007/04/20 15:43:03 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -13,7 +15,7 @@ SRC_URI="http://mirrors.combose.com/apache/ws/jaxme/source/${MY_P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc source"
+IUSE=""
 
 COMMON_DEP="
        dev-db/hsqldb
@@ -40,7 +42,7 @@ JAVA_PKG_BSFIX="off"
 src_unpack() {
        unpack ${A}
 
-       cd ${S}
+       cd "${S}"
        # Fix the build.xml so we can build jars and javadoc easily
        epatch ${FILESDIR}/${P}-gentoo.patch
        # Use gnu-crypto instead of com.sun.* stuff
@@ -75,8 +77,11 @@ src_compile() {
 src_install() {
        java-pkg_dojar dist/*.jar
 
-       dodoc NOTICE
+       dodoc NOTICE || die
 
-       use doc && java-pkg_dohtml -r dist/doc/api src/documentation/manual
+       if use doc; then
+               java-pkg_dojavadoc dist/doc/api
+               java-pkg_dohtml src/documentation/manual
+       fi
        use source && java-pkg_dosrc src/*/*
 }