inherit java-ant-2 and use java-pkg_dojavadoc.

Package-Manager: portage-2.1.2.3

diff --git a/dev-java/jdictrayapi/ChangeLog b/dev-java/jdictrayapi/ChangeLog
index d878c4a936bb2494397ca37bb4dd1a2744b6d4bb..50867f89db927af548e73c8475901a52640f6a33 100644 (file)
--- a/dev-java/jdictrayapi/ChangeLog
+++ b/dev-java/jdictrayapi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jdictrayapi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdictrayapi/ChangeLog,v 1.10 2007/02/18 18:15:49 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdictrayapi/ChangeLog,v 1.11 2007/04/11 14:59:31 betelgeuse Exp $
+
+  11 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  jdictrayapi-0.9.1-r2.ebuild:
+  inherit java-ant-2 and use java-pkg_dojavadoc.
 
   18 Feb 2007; Petteri Räty <betelgeuse@gentoo.org>
   -jdictrayapi-0.9.1.ebuild, -jdictrayapi-0.9.1-r1.ebuild:

diff --git a/dev-java/jdictrayapi/Manifest b/dev-java/jdictrayapi/Manifest
index 2583ab57d98f41160fdde881173ece28fa144a46..b843aed0d02d398c9dbcb5d034730d6f2d9b991e 100644 (file)
--- a/dev-java/jdictrayapi/Manifest
+++ b/dev-java/jdictrayapi/Manifest
@@ -11,14 +11,14 @@ EBUILD jdictrayapi-0.8.7.ebuild 1337 RMD160 81a8aa2bed3abbcb041e9ce3763902187db2
 MD5 907547ad547fa10e7e0ff404c03b120d jdictrayapi-0.8.7.ebuild 1337
 RMD160 81a8aa2bed3abbcb041e9ce3763902187db204c8 jdictrayapi-0.8.7.ebuild 1337
 SHA256 74ce705f72e345d0ba293bf81fb9d39d396987195d67da04ad98659f120920b9 jdictrayapi-0.8.7.ebuild 1337
-EBUILD jdictrayapi-0.9.1-r2.ebuild 1269 RMD160 3155262a965393aed937f83e74970d9f54de9460 SHA1 833e37624d3a7d8d880d42361e929ea55c0e5286 SHA256 af7b3a19f1137512c2a7bedf84616539605efd9a0e4368b2273fe05565546f8d
-MD5 38028f7eedd77a0b38eedd8550e8b659 jdictrayapi-0.9.1-r2.ebuild 1269
-RMD160 3155262a965393aed937f83e74970d9f54de9460 jdictrayapi-0.9.1-r2.ebuild 1269
-SHA256 af7b3a19f1137512c2a7bedf84616539605efd9a0e4368b2273fe05565546f8d jdictrayapi-0.9.1-r2.ebuild 1269
-MISC ChangeLog 1834 RMD160 03f0b55551cf8e92beb1f1321e07f367fc9ac1ab SHA1 566934d0efcd99e1fa2fe68cb1f84d32066d148a SHA256 3cb442f99916fe6be0be689cad5e95ad40b97f0055df0b213ee5d35ddf0fba77
-MD5 ef29ba0d35f80ead503451b2fbe524e2 ChangeLog 1834
-RMD160 03f0b55551cf8e92beb1f1321e07f367fc9ac1ab ChangeLog 1834
-SHA256 3cb442f99916fe6be0be689cad5e95ad40b97f0055df0b213ee5d35ddf0fba77 ChangeLog 1834
+EBUILD jdictrayapi-0.9.1-r2.ebuild 1302 RMD160 4e1a1a0bc3bcd521dc7806348fac557afd9978e8 SHA1 5bf0ab44f8c8b4ca61a9cb3dd86797c4f2b92d22 SHA256 81a91f32fc809d84894969ab1c4a0cf63a116a9df5dab7bc2b24398aa32b767b
+MD5 e4bffcfb3622c4ec101e5b8f466181eb jdictrayapi-0.9.1-r2.ebuild 1302
+RMD160 4e1a1a0bc3bcd521dc7806348fac557afd9978e8 jdictrayapi-0.9.1-r2.ebuild 1302
+SHA256 81a91f32fc809d84894969ab1c4a0cf63a116a9df5dab7bc2b24398aa32b767b jdictrayapi-0.9.1-r2.ebuild 1302
+MISC ChangeLog 1968 RMD160 0df9be56b7006961d5ba2c601ee9ac122e050c2d SHA1 9f00a8a350f8576c1bedcd73802678610d7a06f8 SHA256 158e18c4e049b4d7255c9587592cc7d4c92b4bb483e68464c70e4186bbc51173
+MD5 4da15a172905ec3cd7075db3d84f8203 ChangeLog 1968
+RMD160 0df9be56b7006961d5ba2c601ee9ac122e050c2d ChangeLog 1968
+SHA256 158e18c4e049b4d7255c9587592cc7d4c92b4bb483e68464c70e4186bbc51173 ChangeLog 1968
 MISC metadata.xml 833 RMD160 e1762152ea2d4b27aacd22b0a51cc3ce9f9f205f SHA1 6e054486ce1f41f12a917a1eb56da718408fd4c6 SHA256 4fb15e73dcab0cb963533ef65ab1823b93d152ee40a8995e2ded27d73a8bfc5e
 MD5 d00bbcdfd833eef89c766b9c8cecba16 metadata.xml 833
 RMD160 e1762152ea2d4b27aacd22b0a51cc3ce9f9f205f metadata.xml 833
@@ -30,9 +30,9 @@ MD5 b9b3c3d056ba6ce249c40e50e5d780c9 files/digest-jdictrayapi-0.9.1-r2 235
 RMD160 3a915566cfaba80d3061607509950b91264f4410 files/digest-jdictrayapi-0.9.1-r2 235
 SHA256 5b0eeaaa5a5c815b9144d89af11359f140e3fea42f8d2774906351af08623133 files/digest-jdictrayapi-0.9.1-r2 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF2JdacxLzpIGCsLQRAoM0AJ0d8XxeDnrrLcjnxcAQ/pJQyDbvNgCfeVI5
-qCdgwOeGYgcH/1i0jD4RmO8=
-=1Lya
+iD8DBQFGHPfdcxLzpIGCsLQRAlAnAJwOB+gM38kQXpZDekTBbecL+62BWwCeIoog
+l/EVeyFnPhFVzLk1G0xYhLY=
+=PUO2
 -----END PGP SIGNATURE-----

diff --git a/dev-java/jdictrayapi/jdictrayapi-0.9.1-r2.ebuild b/dev-java/jdictrayapi/jdictrayapi-0.9.1-r2.ebuild
index 9a98d851144e2aa32cd62ad547fcb32759f4738a..0d1ab08876322adaf651bd5d31cfd7d36e4f4234 100644 (file)
--- a/dev-java/jdictrayapi/jdictrayapi-0.9.1-r2.ebuild
+++ b/dev-java/jdictrayapi/jdictrayapi-0.9.1-r2.ebuild
@@ -1,8 +1,10 @@
-# 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/jdictrayapi/jdictrayapi-0.9.1-r2.ebuild,v 1.1 2006/08/04 03:52:50 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdictrayapi/jdictrayapi-0.9.1-r2.ebuild,v 1.2 2007/04/11 14:59:31 betelgeuse Exp $
 
-inherit eutils java-pkg-2
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
 
 MY_PN="jdic"
 MY_P=${MY_PN}-${PV}
@@ -13,21 +15,22 @@ SRC_URI="https://jdic.dev.java.net/files/documents/880/16466/${MY_P}-src.zip"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc examples source"
+IUSE="examples"
 
 DEPEND=">=virtual/jdk-1.4
-               dev-java/ant-core
-               app-arch/unzip
-               source? ( app-arch/zip )"
+               app-arch/unzip"
 RDEPEND=">=virtual/jre-1.4"
 
 S="${WORKDIR}/${MY_P}-src/${MY_PN}"
 
+#Patch takes care of it
+JAVA_PKG_BSFIX="off"
+
 src_unpack() {
        unpack ${A}
-       cd ${S}
+       cd "${S}"
 
-       epatch ${FILESDIR}/0.8.7-gentoo.patch
+       epatch "${FILESDIR}/0.8.7-gentoo.patch"
        find -type d -name CVS -exec rm -r {} \; >/dev/null 2>&1
 }
 
@@ -39,7 +42,7 @@ src_install() {
        cd ${S}/dist/linux
        java-pkg_dojar jdic.jar
        java-pkg_doso libtray.so
-       use doc && java-pkg_dohtml -r ${S}/../docs/*
+       use doc && java-pkg_dojavadoc ${S}/../docs
        use source && java-pkg_dosrc ${S}/src/share/classes/* ${S}/src/unix/classes/*
        if use examples; then
                dodir /usr/share/doc/${PF}/examples