--- cyrus-sasl-2.1.22.ebuild	2006-09-19 00:13:40.000000000 +0200
+++ cyrus-sasl-2.1.22-r1.ebuild	2006-09-20 22:08:45.000000000 +0200
@@ -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.12 2006/09/16 21:07:59 vapier Exp $
 
-inherit eutils gnuconfig flag-o-matic java-pkg multilib
+inherit eutils gnuconfig flag-o-matic multilib java-pkg-opt-2
 
 ntlm_patch=${P}-ntlm_impl-spnego.patch.gz
 SASLAUTHD_CONF_VER=2.1.21
@@ -16,7 +16,7 @@
 SLOT="2"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 # Removed 'static' USE flag because it is broken upstream, Bug #94137
-IUSE="berkdb crypt gdbm ldap mysql postgres kerberos ssl java pam authdaemond sample urandom srp ntlm_unsupported_patch"
+IUSE="berkdb crypt gdbm ldap mysql postgres kerberos ssl pam authdaemond sample urandom srp ntlm_unsupported_patch"
 
 RDEPEND="berkdb? ( >=sys-libs/db-3.2 )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
@@ -32,18 +32,16 @@
 			>=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
-
 	if use gdbm && use berkdb; then
 		echo
 		ewarn "You have both \"gdbm\" and \"berkdb\" in your USE flags."
@@ -67,7 +65,6 @@
 src_unpack() {
 	unpack ${A} && cd "${S}"
 
-
 	# Fix default port name for rimap auth mechanism.
 	sed -e '/define DEFAULT_REMOTE_SERVICE/s:imap:imap2:' \
 		-i saslauthd/auth_rimap.c || die "sed failed"
@@ -115,6 +112,8 @@
 }
 
 src_compile() {
+	use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
+
 	local myconf="--enable-login --enable-ntlm --enable-auth-sasldb --disable-krb4 --disable-otp"
 #	myconf="${myconf} `use_enable static`" -- doesn't work upstream Bug #94137
 	myconf="${myconf} `use_with ssl openssl`"
@@ -217,10 +216,10 @@
 		rm -rf "${D}/usr/$(get_libdir)/java"
 		docinto java
 		dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-		mkdir "${D}/usr/share/doc/${PF}/java/Test/" \
-			|| die "failed to create ${D}/usr/share/doc/${PF}/java/Test/"
+		dodir /usr/share/doc/${PF}/java/Test
 		cp "${S}"/java/Test/*.java "${D}/usr/share/doc/${PF}/java/Test/" \
 			|| die "failed to copy java files to ${D}/usr/share/doc/${PF}/java/Test/"
+		java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
 	fi
 
 	docinto ""