--- qtjava-3.5.2.ebuild	2006-10-04 00:42:53.000000000 +0200
+++ qtjava-3.5.2-r1.ebuild	2007-01-31 17:27:21.000000000 +0100
@@ -6,31 +6,43 @@
 KM_MAKEFILESREV=1
 MAXKDEVER=3.5.5
 KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta
+inherit java-pkg-2 kde-meta
 
 DESCRIPTION="Java bindings for QT"
 HOMEPAGE="http://developer.kde.org/language-bindings/java/qtjava.html"
 
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
-DEPEND="virtual/jdk"
-PATCHES="$FILESDIR/no-gtk-glib-check.diff"
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+PATCHES="${FILESDIR}/no-gtk-glib-check.diff
+	${FILESDIR}/${PN}-${SLOT}-javacflags.patch"
+
+# both eclasses define pkg_setup
+pkg_setup() {
+	kde_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	kde-meta_src_unpack
+
+	sed -i -e "s#_JAVACFLAGS_#${JAVACFLAGS}#" \
+		${S}/qtjava/javalib/org/kde/qt/Makefile.am || die "sed failed"
+}
 
 src_compile() {
-	myconf="$myconf --with-java=`java-config --jdk-home`"
+	myconf="${myconf} --with-java=${JDK_HOME}"
 	kde-meta_src_compile
 }
 
 # Doesn't really need kde, only qt? But then, it installs by default into $KDEDIR/...
-
-# Someone who's into java should look over this...
-
 src_install() {
 	kde-meta_src_install
 
-	mkdir -p $D/usr/share/qtjava
-	cat > $D/usr/share/qtjava/package.env << EOF
-DESCRIPTION=Java bindings for QT
-CLASSPATH=:$PREFIX/lib/java/qtjava.jar:
-EOF
+	# Is there a cleaner way?
+	rm -rf ${D}/usr/kde/${SLOT}/lib/java
+	
+	java-pkg_dojar ${S}/${PN}/javalib/${PN}.jar
+	java-pkg_regso "${D}/usr/kde/${SLOT}"/lib/*.so
 }