Adding updated java herd pretty version for bug #114327. x86 stabled.

(all your kde-base are belong to us version: 2.0.51.22-r3)

8 files changed, 121 insertions, 38 deletions

diff --git a/kde-base/kdejava/ChangeLog b/kde-base/kdejava/ChangeLog
index 6b16fcfdb5d3..5eea7a6502bb 100644
--- a/kde-base/kdejava/ChangeLog
+++ b/kde-base/kdejava/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdejava
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/ChangeLog,v 1.26 2005/12/12 19:34:09 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/ChangeLog,v 1.27 2005/12/13 03:27:58 chriswhite Exp $
+
+*kdejava-3.4.3-r1 (13 Dec 2005)
+
+  13 Dec 2005; Chris White <chriswhite@gentoo.org> +kdejava-3.4.3-r1.ebuild:
+  Adding updated java herd pretty version for bug #114327. x86 stabled.
 
   12 Dec 2005; Joseph Jezak <josejx@gentoo.org> kdejava-3.5.0.ebuild:
   Marked ~ppc.
diff --git a/kde-base/kdejava/Manifest b/kde-base/kdejava/Manifest
index af8b41307cf8..232278f1d53f 100644
--- a/kde-base/kdejava/Manifest
+++ b/kde-base/kdejava/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 7c462b754eedd8375d47446b92733e51 kdejava-3.5.0.ebuild 1464
+MD5 7c88b2b69866d5b2fc9bc92d1a062981 kdejava-3.4.3.ebuild 1468
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 4df8ee4fd18333bd70eeac755f5ff53f ChangeLog 3830
+MD5 a0cbdd2cea95d5ccf2f9116e467fe3fa kdejava-3.4.1.ebuild 1458
+MD5 69c64c6f79476dd7ce80a587418211ff kdejava-3.4.3-r1.ebuild 1567
+MD5 e3ad32e72065b892d2fe02daebcf73d0 kdejava-3.3.1.ebuild 1537
 MD5 6830fc45ae55313b9f8515babcf58b79 files/digest-kdejava-3.3.1 71
-MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-kdejava-3.4.1 221
+MD5 f6bd746271de83bcbcacc04a445d590f files/digest-kdejava-3.4.3-r1 71
 MD5 f6bd746271de83bcbcacc04a445d590f files/digest-kdejava-3.4.3 71
-MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-kdejava-3.5.0 71
-MD5 9598e813037e1a6ea89142a23ac4018a files/kdejava-3.3.1-classpath.diff 460
-MD5 98aaced38286ff2403d813b121aa1380 files/kdejava-3.4.0_rc1-classpath.diff 471
+MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-kdejava-3.4.1 221
 MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
-MD5 e3ad32e72065b892d2fe02daebcf73d0 kdejava-3.3.1.ebuild 1537
-MD5 a0cbdd2cea95d5ccf2f9116e467fe3fa kdejava-3.4.1.ebuild 1458
-MD5 7c88b2b69866d5b2fc9bc92d1a062981 kdejava-3.4.3.ebuild 1468
-MD5 7c462b754eedd8375d47446b92733e51 kdejava-3.5.0.ebuild 1464
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDndC9csIHjyDViGQRAj0VAKCcZN9ixpEWuJ+1W9AGLuQjwViO7ACfaErU
-7UmdMtg13ojnMKRCK2fTejw=
-=u/HQ
------END PGP SIGNATURE-----
+MD5 98aaced38286ff2403d813b121aa1380 files/kdejava-3.4.0_rc1-classpath.diff 471
+MD5 9598e813037e1a6ea89142a23ac4018a files/kdejava-3.3.1-classpath.diff 460
+MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-kdejava-3.5.0 71
diff --git a/kde-base/kdejava/files/digest-kdejava-3.4.3-r1 b/kde-base/kdejava/files/digest-kdejava-3.4.3-r1
new file mode 100644
index 000000000000..9c261e1b4588
--- /dev/null
+++ b/kde-base/kdejava/files/digest-kdejava-3.4.3-r1
@@ -0,0 +1 @@
+MD5 0fb123df324b4d007351c89051532dee kdebindings-3.4.3.tar.bz2 7184410
diff --git a/kde-base/kdejava/kdejava-3.4.3-r1.ebuild b/kde-base/kdejava/kdejava-3.4.3-r1.ebuild
new file mode 100644
index 000000000000..16205c0d34de
--- /dev/null
+++ b/kde-base/kdejava/kdejava-3.4.3-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.4.3-r1.ebuild,v 1.1 2005/12/13 03:27:58 chriswhite Exp $
+
+KMNAME=kdebindings
+KMEXTRACTONLY=qtjava
+KMCOPYLIB="libqtjavasupport qtjava/javalib/qtjava"
+KM_MAKEFILESREV=1
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit java-pkg kde-meta
+
+DESCRIPTION="KDE java bindings"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
+IUSE=""
+COMMONDEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kwin)
+	$(deprange-dual $PV $MAXKDEVER kde-base/kcontrol)
+	$(deprange $PV $MAXKDEVER kde-base/qtjava)"
+DEPEND="virtual/jdk $COMMONDEPEND"
+RDEPEND="virtual/jre $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"
+
+
+# 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
+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
+		sed -i -e "s:_CLASSPATH_:$(java-config -p qtjava-3.4):" $x
+	done
+}
+
+src_compile() {
+	myconf="$myconf --with-java=`java-config --jdk-home`"
+	kde-meta_src_compile
+}
+
+src_install() {
+	kde-meta_src_install
+	rm -rf ${D}/usr/kde/3.4/lib/java
+	java-pkg_dojar ${S}/kdejava/koala/koala.jar
+}
diff --git a/kde-base/qtjava/ChangeLog b/kde-base/qtjava/ChangeLog
index 29fb46b69056..a8290b7f14b3 100644
--- a/kde-base/qtjava/ChangeLog
+++ b/kde-base/qtjava/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/qtjava
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/ChangeLog,v 1.23 2005/12/12 19:33:27 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/ChangeLog,v 1.24 2005/12/13 03:25:49 chriswhite Exp $
+
+*qtjava-3.4.3-r1 (13 Dec 2005)
+
+  13 Dec 2005; Chris White <chriswhite@gentoo.org> +qtjava-3.4.3-r1.ebuild:
+  Adding updated java herd pretty version for bug #114327. x86 stabled.
 
   12 Dec 2005; Joseph Jezak <josejx@gentoo.org> qtjava-3.5.0.ebuild:
   Marked ~ppc.
diff --git a/kde-base/qtjava/Manifest b/kde-base/qtjava/Manifest
index ecbf50b3415e..af106e033c37 100644
--- a/kde-base/qtjava/Manifest
+++ b/kde-base/qtjava/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9ffc739e6c6c188744efa2db9dae78aa ChangeLog 3465
-MD5 c4bcc944c1ceb822f4ecd9b288d77bef files/digest-qtjava-3.3.2 71
-MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-qtjava-3.4.1 221
-MD5 f6bd746271de83bcbcacc04a445d590f files/digest-qtjava-3.4.3 71
-MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-qtjava-3.5.0 71
-MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 be6ae9de13610751d4b751c0a6e438ba qtjava-3.3.2.ebuild 943
 MD5 38127ecd985ccba4d59543bea433a552 qtjava-3.4.1.ebuild 962
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 9ffc739e6c6c188744efa2db9dae78aa ChangeLog 3465
+MD5 a2ec452e8945b72480388c7b0f53a177 qtjava-3.4.3-r1.ebuild 862
 MD5 e8d07b5d639d3b12d60e43a972a09134 qtjava-3.4.3.ebuild 957
 MD5 fb5ef8d649748f39623fc5bb7307ed20 qtjava-3.5.0.ebuild 953
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDndCTcsIHjyDViGQRAmnrAKDXPgZEqHjzm5vfDtewi0m0HXSHcwCdFrzt
-5UMPNiV0vW/66wYVqj053uE=
-=KHyA
------END PGP SIGNATURE-----
+MD5 f6bd746271de83bcbcacc04a445d590f files/digest-qtjava-3.4.3-r1 71
+MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-qtjava-3.5.0 71
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
+MD5 c4bcc944c1ceb822f4ecd9b288d77bef files/digest-qtjava-3.3.2 71
+MD5 f6bd746271de83bcbcacc04a445d590f files/digest-qtjava-3.4.3 71
+MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-qtjava-3.4.1 221
diff --git a/kde-base/qtjava/files/digest-qtjava-3.4.3-r1 b/kde-base/qtjava/files/digest-qtjava-3.4.3-r1
new file mode 100644
index 000000000000..9c261e1b4588
--- /dev/null
+++ b/kde-base/qtjava/files/digest-qtjava-3.4.3-r1
@@ -0,0 +1 @@
+MD5 0fb123df324b4d007351c89051532dee kdebindings-3.4.3.tar.bz2 7184410
diff --git a/kde-base/qtjava/qtjava-3.4.3-r1.ebuild b/kde-base/qtjava/qtjava-3.4.3-r1.ebuild
new file mode 100644
index 000000000000..c027fbbb3363
--- /dev/null
+++ b/kde-base/qtjava/qtjava-3.4.3-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.4.3-r1.ebuild,v 1.1 2005/12/13 03:25:50 chriswhite Exp $
+
+KMNAME=kdebindings
+KM_MAKEFILESREV=1
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+
+# Order is IMPORTANT!
+inherit java-pkg kde-meta
+
+DESCRIPTION="Java bindings for QT"
+HOMEPAGE="http://developer.kde.org/language-bindings/java/qtjava.html"
+
+KEYWORDS="~amd64 ~ppc ~sparc x86"
+IUSE=""
+DEPEND="virtual/jdk"
+PATCHES="$FILESDIR/no-gtk-glib-check.diff"
+
+src_compile() {
+	myconf="$myconf --with-java=`java-config --jdk-home`"
+	kde-meta_src_compile
+}
+
+# Doesn't really need kde, only qt? But then, it installs by default into $KDEDIR/...
+
+src_install() {
+	kde-meta_src_install
+
+	# We dont want the installed location
+	# Is there a cleaner way?
+	rm -rf ${D}/usr/kde/3.4/lib/java
+
+	# Proper install of jar
+	java-pkg_dojar ${S}/qtjava/javalib/qtjava.jar
+}