--- /usr/portage/app-cdr/webcdwriter/webcdwriter-2.8.0.ebuild	2007-04-29 20:33:08.000000000 +1200
+++ webcdwriter-2.8.0-r1.ebuild	2007-04-30 21:51:53.000000000 +1200
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/webcdwriter-2.8.0.ebuild,v 1.4 2007/04/28 21:38:23 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/webcdwriter-2.8.0.ebuild,v 1.3 2007/01/24 02:33:21 genone Exp $
 
-inherit eutils java-pkg
+inherit eutils java-pkg-2
 
 MY_P="${P/cd/CD}"
 DESCRIPTION="Make CD-writer(s) available to all users in your network"
@@ -12,7 +12,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="java pam mp3 sox vorbis"
+IUSE="pam mp3 sox vorbis"
 
 RDEPEND="
 	app-cdr/cdrdao
@@ -20,26 +20,30 @@
 	mp3? ( media-sound/mpg123 )
 	sox? ( media-sound/sox )
 	vorbis? ( media-sound/vorbis-tools )
-	java? ( >=virtual/jre-1.4 )"
-DEPEND="java? ( >=virtual/jdk-1.4 )
+	>=virtual/jre-1.4 
+	dev-java/openjnlp"
+DEPEND=">=virtual/jdk-1.4
 	${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
 src_compile() {
-	epatch ${FILESDIR}/configure.patch
+	epatch "${FILESDIR}/configure.patch" "${FILESDIR}/${PN}-fix-java.patch"
 
 	local myconf
 
+	#CLASSPATH=".:$(java-pkg_getjars openjnlp)"
+	local java_conf="$(java-pkg_javac-args) -classpath $(java-pkg_getjar openjnlp jnlp.jar)"
 	use pam || myconf="--pam"
 	myconf="${myconf} --user=root --group=root"
-	./configure ${myconf} || die "configure failed"
+	./configure ${myconf} --javac-flags="${java_conf}" || die "configure failed"
 	make || die "make failed"
 }
 
 src_install() {
 
-	newinitd ${FILESDIR}/${PN}.rc CDWserver
+	exeinto /etc/init.d/
+	newexe ${FILESDIR}/${PN}.rc CDWserver
 
 	diropts -m700
 	dodir /etc/CDWserver