--- cyrus-sasl-2.1.22.ebuild	2006-09-06 21:35:46.000000000 +0300
+++ cyrus-sasl-2.1.22.ebuild	2006-09-07 08:52:36.000000000 +0300
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22.ebuild,v 1.10 2006/09/06 18:31:07 tsunam Exp $
 
-inherit eutils gnuconfig flag-o-matic java-pkg multilib
+inherit eutils gnuconfig flag-o-matic java-pkg-opt-2 multilib
 
 ntlm_patch=${P}-ntlm_impl-spnego.patch.gz
 SASLAUTHD_CONF_VER=2.1.21
@@ -34,18 +34,19 @@ RDEPEND="virtual/libc
 			>=mail-mta/courier-0.46
 		)
 	)
-	java? ( =virtual/jdk-1.4* )
+	java? ( >=virtual/jre-1.4 )
 	ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 )"
 
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
 	>=sys-devel/autoconf-2.58
 	sys-devel/automake
-	sys-devel/libtool"
+	sys-devel/libtool
+	java? ( >=virtual/jdk-1.4 )"
 
 pkg_setup() {
 
-	use java && java-pkg_pkg_setup
+	use java && java-pkg-opt-2_pkg_setup
 
 	if use gdbm && use berkdb; then
 		echo