--- kdejava-3.5.5.ebuild	2006-12-04 00:33:13.000000000 +0100
+++ kdejava-3.5.5-r1.ebuild	2007-01-31 17:36:00.000000000 +0100
@@ -8,39 +8,51 @@
 KM_MAKEFILESREV=1
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta
+inherit java-pkg-2 kde-meta
 
 DESCRIPTION="KDE java bindings"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 COMMONDEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kwin)
 	$(deprange-dual $PV $MAXKDEVER kde-base/kcontrol)
 	$(deprange 3.5.2 $MAXKDEVER kde-base/qtjava)"
-DEPEND="virtual/jdk $COMMONDEPEND"
-RDEPEND="virtual/jre $COMMONDEPEND"
+DEPEND=">=virtual/jdk-1.4 $COMMONDEPEND"
+RDEPEND=">=virtual/jre-1.4 $COMMONDEPEND"
 OLDDEPEND="~kde-base/kwin-$PV ~kde-base/kcontrol-$PV ~kde-base/qtjava-$PV virtual/jdk"
 
-PATCHES="$FILESDIR/no-gtk-glib-check.diff $FILESDIR/kdejava-3.4.0_rc1-classpath.diff"
-
+PATCHES="${FILESDIR}/no-gtk-glib-check.diff
+	${FILESDIR}/${PN}-${SLOT}-javacflags.patch"
 
 # Probably missing other kdebase, kdepim etc deps
 # Needs to be compiled with just kdelibs installed to make sure
 
-# Someone who knows about java-in-gentoo should look at this and the
-# other java kdebindings, and fix the stupid thing
+# both eclasses define pkg_setup
+pkg_setup() {
+	kde_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
 src_unpack() {
 	kde-meta_src_unpack
 
-	# $PREFIX-dependant, so don't go into the makefile tarballs
-	cd $S/kdejava/koala/org/kde/koala
-	for x in Makefile.am Makefile.in; do
-		mv $x $x.orig
-		sed -e "s:_CLASSPATH_:$(java-config -p qtjava):" $x.orig > $x
-		rm $x.orig
-	done
+	local cp="$(java-pkg_getjars qtjava-${SLOT})"
+	local mf="${S}/kdejava/koala/org/kde/koala/Makefile.am"
+	sed -i -e "s#_CLASSPATH_#${cp}#" "${mf}" \
+		|| die "sed CLASSPATH failed"
+	sed -i -e "s#_JAVACFLAGS_#${JAVACFLAGS}#" "${mf}" \
+		|| die "sed JAVACFLAGS failed"
 }
 
 src_compile() {
-	myconf="$myconf --with-java=`java-config --jdk-home`"
+	myconf="${myconf} --with-java=${JDK_HOME}"
 	kde-meta_src_compile
 }
+
+src_install() {
+	kde-meta_src_install
+
+	rm -rf ${D}/usr/kde/${SLOT}/lib/java
+
+	java-pkg_dojar ${S}/${PN}/koala/koala.jar
+	java-pkg_regso "${D}/usr/kde/${SLOT}"/lib/*.so
+}