Javadoc in sun-jdk-1.6 starting with u2 works fine so removing the work around from DEPEND.

(Portage version: 2.1.3_rc8)

2 files changed, 14 insertions, 15 deletions

diff --git a/dev-java/jdbm/ChangeLog b/dev-java/jdbm/ChangeLog
index b28df9f3e76d..a8ed546e9f32 100644
--- a/dev-java/jdbm/ChangeLog
+++ b/dev-java/jdbm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jdbm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbm/ChangeLog,v 1.8 2007/02/04 00:24:42 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbm/ChangeLog,v 1.9 2007/07/12 22:35:40 betelgeuse Exp $
+
+  12 Jul 2007; Petteri Räty <betelgeuse@gentoo.org> jdbm-0.12-r1.ebuild:
+  Javadoc in sun-jdk-1.6 starting with u2 works fine so removing the work
+  around from DEPEND.
 
   04 Feb 2007; Vlastimil Babka <caster@gentoo.org> -jdbm-0.12.ebuild:
   Cleanup.
diff --git a/dev-java/jdbm/jdbm-0.12-r1.ebuild b/dev-java/jdbm/jdbm-0.12-r1.ebuild
index b9829d1b8d4e..0db3d9eb9988 100644
--- a/dev-java/jdbm/jdbm-0.12-r1.ebuild
+++ b/dev-java/jdbm/jdbm-0.12-r1.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/jdbm/jdbm-0.12-r1.ebuild,v 1.3 2007/02/03 13:48:48 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbm/jdbm-0.12-r1.ebuild,v 1.4 2007/07/12 22:35:40 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -11,7 +13,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 LICENSE="BSD"
 SLOT="1"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="doc source"
 
 COMMON_DEP="dev-java/jta
 	=dev-java/xerces-1.3*"
@@ -21,30 +22,24 @@ COMMON_DEP="dev-java/jta
 RDEPEND=">=virtual/jre-1.3
 	${COMMON_DEP}"
 
-# javadoc -source 1.3 is broken with 1.6
-# http://bugs.gentoo.org/show_bug.cgi?id=158720
-# conditional depends need a new java-config
-DEPEND="!doc? ( >=virtual/jdk-1.3 )
-	doc? ( || ( =virtual/jdk-1.3* =virtual/jdk-1.4* =virtual/jdk-1.5* ) )
+DEPEND=">=virtual/jdk-1.3
 	${COMMON_DEP}
-	dev-java/ant-core
-	app-arch/unzip
-	>=dev-java/java-config-2.0.31"
+	app-arch/unzip"
 
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}/src
-	epatch ${FILESDIR}/${P}-buildfile.patch
+	cd "${S}/src"
+	epatch "${FILESDIR}/${P}-buildfile.patch"
 
-	cd ${S}/lib
+	cd "${S}/lib"
 	rm -v *.jar || die
 	java-pkg_jar-from jta
 	java-pkg_jar-from xerces-2
 }
 
 src_compile() {
-	cd ${S}/src
+	cd "${S}/src"
 	java-pkg-2_src_compile
 }