--- kdejava-3.5.2.ebuild	2006-07-25 07:05:54.000000000 +0200
+++ kdejava-3.5.2-r1.ebuild	2006-09-04 20:30:25.000000000 +0200
@@ -8,10 +8,10 @@
 KM_MAKEFILESREV=1
 MAXKDEVER=3.5.4
 KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta
+inherit java-pkg kde-meta
 
 DESCRIPTION="KDE java bindings"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 COMMONDEPEND="$(deprange-dual $PV 3.5.4 kde-base/kwin)
 	$(deprange-dual $PV 3.5.4 kde-base/kcontrol)
@@ -31,16 +31,22 @@
 src_unpack() {
 	kde-meta_src_unpack
 
+	local cp="$(java-pkg_getjar qtjava-${SLOT} qtjava.jar)"
+
 	# $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
+		sed -i -e "s#_CLASSPATH_#${cp}#" $x || die "sed ${x} failed"
 	done
 }
 
 src_compile() {
-	myconf="$myconf --with-java=`java-config --jdk-home`"
+	myconf="${myconf} --with-java=$(java-config --jdk-home)"
 	kde-meta_src_compile
 }
+
+src_install() {
+	kde-meta_src_install
+	rm -rf ${D}/usr/kde/${SLOT}/lib/java
+	java-pkg_dojar ${S}/kdejava/koala/koala.jar
+}