Javadoc in sun-jdk-1.6 starting with u2 works fine so removing the work around from DEPEND. Also DEPEND on dev-java/ant-junit only for src_test as it's stable now.

Package-Manager: portage-2.1.3_rc8

3 files changed, 28 insertions, 13 deletions

diff --git a/dev-java/spice-jndikit/ChangeLog b/dev-java/spice-jndikit/ChangeLog
index e7b0a101fe9d..c6c3328e328a 100644
--- a/dev-java/spice-jndikit/ChangeLog
+++ b/dev-java/spice-jndikit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/spice-jndikit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/spice-jndikit/ChangeLog,v 1.2 2007/04/02 21:57:23 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/spice-jndikit/ChangeLog,v 1.3 2007/07/12 22:38:02 betelgeuse Exp $
+
+  12 Jul 2007; Petteri Räty <betelgeuse@gentoo.org>
+  spice-jndikit-1.2.ebuild:
+  Javadoc in sun-jdk-1.6 starting with u2 works fine so removing the work
+  around from DEPEND. Also DEPEND on dev-java/ant-junit only for src_test as
+  it's stable now.
 
   02 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
   spice-jndikit-1.2.ebuild:
diff --git a/dev-java/spice-jndikit/Manifest b/dev-java/spice-jndikit/Manifest
index c0518bbc4865..f5e48db0b687 100644
--- a/dev-java/spice-jndikit/Manifest
+++ b/dev-java/spice-jndikit/Manifest
@@ -1,12 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST spice-jndikit-1.2-src.tar.gz 23084 RMD160 b920bb4df8f3bd2b0a368d9faac0d232b0355970 SHA1 7b9741ff3db4f4a2f5a9981ea4d818abf76fa78d SHA256 3001e72223786e25a132ce8c41ff5e1d9fd8826e98122d5b73517aefd908e11a
-EBUILD spice-jndikit-1.2.ebuild 1322 RMD160 a95b1eac9084df0e962bf5328bb9747edca68638 SHA1 d10d2c85e68efdad6931d6ac3644f849b21b661e SHA256 2e97ac14d21f0bd3015be2cfb06b7d64265ec4bff6638f0ec73ac7f4368203e6
-MD5 0ae684bdafc37e7e2ecc4af88e93638a spice-jndikit-1.2.ebuild 1322
-RMD160 a95b1eac9084df0e962bf5328bb9747edca68638 spice-jndikit-1.2.ebuild 1322
-SHA256 2e97ac14d21f0bd3015be2cfb06b7d64265ec4bff6638f0ec73ac7f4368203e6 spice-jndikit-1.2.ebuild 1322
-MISC ChangeLog 520 RMD160 4e60967357abe127e60c64953b4eb5597d5f7377 SHA1 7fb168377be9bfd7ee9f44bb2098bbe1b5e01c0e SHA256 ad671393a40b093bf819fa7e2e0cf65015f62459d039dc68fac4778e601d7ac5
-MD5 2d3c3ec7b8a3f8e27c08caa751cdcc9b ChangeLog 520
-RMD160 4e60967357abe127e60c64953b4eb5597d5f7377 ChangeLog 520
-SHA256 ad671393a40b093bf819fa7e2e0cf65015f62459d039dc68fac4778e601d7ac5 ChangeLog 520
+EBUILD spice-jndikit-1.2.ebuild 1231 RMD160 6346f87d251b40c416ec92b7badb6564e5fa7d28 SHA1 87a4ffc5e25416cf1a042fc7e78dc0605dd6877d SHA256 8608e7f8f4925d2f112dd205f7594ba034b0517468175e3c1756158a917cadf1
+MD5 d29b93e5042076a1981dc85f9a0aa4db spice-jndikit-1.2.ebuild 1231
+RMD160 6346f87d251b40c416ec92b7badb6564e5fa7d28 spice-jndikit-1.2.ebuild 1231
+SHA256 8608e7f8f4925d2f112dd205f7594ba034b0517468175e3c1756158a917cadf1 spice-jndikit-1.2.ebuild 1231
+MISC ChangeLog 772 RMD160 9fadc21a0d92f0f0e14ca515ee923eb01bc3aeef SHA1 0aeab9f2ff160dff239111eb8cef84eda28070c1 SHA256 cc2c9cbda6ff22bde2217a194f4e34f6802c0f26fe840579b01871a25678b00b
+MD5 1eabc0468a3c15bb16c3d47c5f2c349e ChangeLog 772
+RMD160 9fadc21a0d92f0f0e14ca515ee923eb01bc3aeef ChangeLog 772
+SHA256 cc2c9cbda6ff22bde2217a194f4e34f6802c0f26fe840579b01871a25678b00b ChangeLog 772
 MISC metadata.xml 388 RMD160 d8bef82a52318949d0ca495ce201e41db3031749 SHA1 b6db9d02f95ffdcd5e6de9b2807342db55f9e6db SHA256 b03e7f90f36646c45007c3d5976f55850f026632f8a4feb5409198d92ad213a6
 MD5 17092269fcc08822ecebc387dafda468 metadata.xml 388
 RMD160 d8bef82a52318949d0ca495ce201e41db3031749 metadata.xml 388
@@ -14,3 +17,10 @@ SHA256 b03e7f90f36646c45007c3d5976f55850f026632f8a4feb5409198d92ad213a6 metadata
 MD5 a5c50cc7d90c06f74d9d5c0dd8f0fabc files/digest-spice-jndikit-1.2 262
 RMD160 485c9336eb42df63fcfa635370d4cb43ee3598bf files/digest-spice-jndikit-1.2 262
 SHA256 f4a8af238d7f38c6c2f347282618cf734462b336d997bcab4eaa44aa3e84e3d8 files/digest-spice-jndikit-1.2 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGlq1LcxLzpIGCsLQRAiKMAJ9yP07iqnMQHK3kFd/CGMGacgtiFQCgiuhL
+ioyE0pBCsbE6aDjyOjM4BoA=
+=2goS
+-----END PGP SIGNATURE-----
diff --git a/dev-java/spice-jndikit/spice-jndikit-1.2.ebuild b/dev-java/spice-jndikit/spice-jndikit-1.2.ebuild
index 3eee3e39218c..9a596661bcd4 100644
--- a/dev-java/spice-jndikit/spice-jndikit-1.2.ebuild
+++ b/dev-java/spice-jndikit/spice-jndikit-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/spice-jndikit/spice-jndikit-1.2.ebuild,v 1.3 2007/04/03 02:03:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/spice-jndikit/spice-jndikit-1.2.ebuild,v 1.4 2007/07/12 22:38:02 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -15,9 +15,8 @@ KEYWORDS="~x86"
 
 RDEPEND=">=virtual/jre-1.4"
 DEPEND="
-		!doc? ( >=virtual/jdk-1.4 )
-		doc? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) )
-		test? ( || ( dev-java/ant-junit dev-java/ant-tasks ) )"
+	>=virtual/jdk-1.4
+	test? ( dev-java/ant-junit )"
 
 src_unpack() {
 	unpack ${A}