Migrated to generation-2 java eclasses, bug #114327. This should also fix bug #164547.

(Portage version: 2.1.2-r5)

7 files changed, 125 insertions, 1 deletions

diff --git a/kde-base/qtjava/ChangeLog b/kde-base/qtjava/ChangeLog
index d2d821978ed9..839ec0028660 100644
--- a/kde-base/qtjava/ChangeLog
+++ b/kde-base/qtjava/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/qtjava
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/ChangeLog,v 1.40 2007/01/20 00:39:33 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/ChangeLog,v 1.41 2007/02/01 00:44:11 caster Exp $
+
+*qtjava-3.5.6-r1 (31 Jan 2007)
+*qtjava-3.5.2-r1 (31 Jan 2007)
+
+  31 Jan 2007; Vlastimil Babka <caster@gentoo.org>
+  +files/qtjava-3.5-javacflags.patch, metadata.xml, +qtjava-3.5.2-r1.ebuild,
+  +qtjava-3.5.6-r1.ebuild:
+  Migrated to generation-2 java eclasses, bug #114327. This should also fix
+  bug #164547.
 
   20 Jan 2007; Carsten Lohrke <carlo@gentoo.org> qtjava-3.5.6.ebuild:
   Correct MAXKDEVER.
diff --git a/kde-base/qtjava/files/digest-qtjava-3.5.2-r1 b/kde-base/qtjava/files/digest-qtjava-3.5.2-r1
new file mode 100644
index 000000000000..87cc72c5a065
--- /dev/null
+++ b/kde-base/qtjava/files/digest-qtjava-3.5.2-r1
@@ -0,0 +1,3 @@
+MD5 cb26ce2e4efc35ca2c9c7a47807d679a kdebindings-3.5.2.tar.bz2 5416964
+RMD160 670891a4848bd18d9ce629f675d1d2550b45307c kdebindings-3.5.2.tar.bz2 5416964
+SHA256 71ca8bf60cc9eb232ddfe5d6522e0051931b2f498ee0066edcb6c4900784f1c9 kdebindings-3.5.2.tar.bz2 5416964
diff --git a/kde-base/qtjava/files/digest-qtjava-3.5.6-r1 b/kde-base/qtjava/files/digest-qtjava-3.5.6-r1
new file mode 100644
index 000000000000..68a27e497ff5
--- /dev/null
+++ b/kde-base/qtjava/files/digest-qtjava-3.5.6-r1
@@ -0,0 +1,3 @@
+MD5 d26b5f54f062b765a949d66657c2ab3c kdebindings-3.5.6.tar.bz2 5421905
+RMD160 3c6547c5eb4baa9efe0e94473d4daf4e14514f80 kdebindings-3.5.6.tar.bz2 5421905
+SHA256 9fad26d5827d996cbd88d9267883b5bc444f228d9fc8e0312db56e5f6d7363d8 kdebindings-3.5.6.tar.bz2 5421905
diff --git a/kde-base/qtjava/files/qtjava-3.5-javacflags.patch b/kde-base/qtjava/files/qtjava-3.5-javacflags.patch
new file mode 100644
index 000000000000..dc64f8ecdf21
--- /dev/null
+++ b/kde-base/qtjava/files/qtjava-3.5-javacflags.patch
@@ -0,0 +1,12 @@
+diff --git a/qtjava/javalib/org/kde/qt/Makefile.am b/qtjava/javalib/org/kde/qt/Makefile.am
+index c05e600..b2f5e47 100644
+--- a/qtjava/javalib/org/kde/qt/Makefile.am
++++ b/qtjava/javalib/org/kde/qt/Makefile.am
+@@ -12,6 +12,6 @@ noinst_JAVA = $(EXTRA_DIST)
+ 
+ JAVAROOT = ../../..
+ CLASSPATH = $(srcdir)/../../..
+-JAVACFLAGS = -classpath $(CLASSPATH)
++JAVACFLAGS = -classpath $(CLASSPATH) _JAVACFLAGS_
+ # Prevent stupid automake from putting JAVAC=javac in Makefile.in
+ JAVAC = @JAVAC@
diff --git a/kde-base/qtjava/metadata.xml b/kde-base/qtjava/metadata.xml
index 8d1e86a9cefb..37e870b6f2f9 100644
--- a/kde-base/qtjava/metadata.xml
+++ b/kde-base/qtjava/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>kde</herd>
+<herd>java</herd>
 </pkgmetadata>
diff --git a/kde-base/qtjava/qtjava-3.5.2-r1.ebuild b/kde-base/qtjava/qtjava-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..2567b67f416b
--- /dev/null
+++ b/kde-base/qtjava/qtjava-3.5.2-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.5.2-r1.ebuild,v 1.1 2007/02/01 00:44:11 caster Exp $
+
+KMNAME=kdebindings
+KM_MAKEFILESREV=1
+MAXKDEVER=3.5.5
+KM_DEPRANGE="$PV $MAXKDEVER"
+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"
+IUSE=""
+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=${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
+
+	# 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
+}
diff --git a/kde-base/qtjava/qtjava-3.5.6-r1.ebuild b/kde-base/qtjava/qtjava-3.5.6-r1.ebuild
new file mode 100644
index 000000000000..6aa05a8c259a
--- /dev/null
+++ b/kde-base/qtjava/qtjava-3.5.6-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.5.6-r1.ebuild,v 1.1 2007/02/01 00:44:11 caster Exp $
+
+KMNAME=kdebindings
+KM_MAKEFILESREV=1
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+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"
+IUSE=""
+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=${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
+
+	# 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
+}