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

Package-Manager: portage-2.1.2-r5

8 files changed, 151 insertions, 9 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/Manifest b/kde-base/qtjava/Manifest
index ca7a867f60fb..df51d2985759 100644
--- a/kde-base/qtjava/Manifest
+++ b/kde-base/qtjava/Manifest
@@ -2,27 +2,45 @@ AUX no-gtk-glib-check.diff 949 RMD160 6df47b78e158fb7e38a49c30627421186d83e3da S
 MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
 RMD160 6df47b78e158fb7e38a49c30627421186d83e3da files/no-gtk-glib-check.diff 949
 SHA256 f2721c8a1567ab9e259e216372a6552f8910fd33bc82390d8556aff00b0ba8df files/no-gtk-glib-check.diff 949
+AUX qtjava-3.5-javacflags.patch 483 RMD160 46183053d044bb5cf74275185c9c242cab319341 SHA1 f8d4e386201614ba0b9f59e9ab7a35569f34581e SHA256 e9ddce9f0f3cd0a8524b2595cc2956f13100c636112d4d9e189a9d3dc7961e31
+MD5 6e4e175d965a5ad1fea3dea5f2bfe00c files/qtjava-3.5-javacflags.patch 483
+RMD160 46183053d044bb5cf74275185c9c242cab319341 files/qtjava-3.5-javacflags.patch 483
+SHA256 e9ddce9f0f3cd0a8524b2595cc2956f13100c636112d4d9e189a9d3dc7961e31 files/qtjava-3.5-javacflags.patch 483
 DIST kdebindings-3.5.2.tar.bz2 5416964 RMD160 670891a4848bd18d9ce629f675d1d2550b45307c SHA1 f1b0180d8005b9497cd8549f260b30f43e08ed4b SHA256 71ca8bf60cc9eb232ddfe5d6522e0051931b2f498ee0066edcb6c4900784f1c9
 DIST kdebindings-3.5.6.tar.bz2 5421905 RMD160 3c6547c5eb4baa9efe0e94473d4daf4e14514f80 SHA1 e844ef929ecb9d6ccf2225c78f4b9f5867e6a384 SHA256 9fad26d5827d996cbd88d9267883b5bc444f228d9fc8e0312db56e5f6d7363d8
+EBUILD qtjava-3.5.2-r1.ebuild 1235 RMD160 303a03e3e1de70af9d8d0f6c247eb621893cf3e8 SHA1 7db1072821a74c719dcba0357b4108041634f04a SHA256 136c3f9267b432ebfd42d8930a4a4b915593aae332092132cad2bb5b2e112337
+MD5 f63f2a6a2dbd4980294265a983b0d8e7 qtjava-3.5.2-r1.ebuild 1235
+RMD160 303a03e3e1de70af9d8d0f6c247eb621893cf3e8 qtjava-3.5.2-r1.ebuild 1235
+SHA256 136c3f9267b432ebfd42d8930a4a4b915593aae332092132cad2bb5b2e112337 qtjava-3.5.2-r1.ebuild 1235
 EBUILD qtjava-3.5.2.ebuild 961 RMD160 22abdba12d388b9dd4bf74166c0cd39c49c5ee51 SHA1 e1bf36b431666578d794be3318a63f0f1f523e02 SHA256 a9100b8fc8ae9be3dc221fd6057bbec5ab845052e41c5b799605fae12acf870e
 MD5 add12d3bddd3f1c63b1951df63ee3af9 qtjava-3.5.2.ebuild 961
 RMD160 22abdba12d388b9dd4bf74166c0cd39c49c5ee51 qtjava-3.5.2.ebuild 961
 SHA256 a9100b8fc8ae9be3dc221fd6057bbec5ab845052e41c5b799605fae12acf870e qtjava-3.5.2.ebuild 961
+EBUILD qtjava-3.5.6-r1.ebuild 1233 RMD160 a9b632df458e2f3c6a9086715e4105de2ecc2bcf SHA1 940ed6277072a335ea530b32fa5976a28d56c20d SHA256 f2d0f5bcdb2afc761bd95bbdd0f85d97ec55e7a1c9f24e7f79ad99f9a65adfc3
+MD5 22cc8204e6ab896a9ce70b092944b322 qtjava-3.5.6-r1.ebuild 1233
+RMD160 a9b632df458e2f3c6a9086715e4105de2ecc2bcf qtjava-3.5.6-r1.ebuild 1233
+SHA256 f2d0f5bcdb2afc761bd95bbdd0f85d97ec55e7a1c9f24e7f79ad99f9a65adfc3 qtjava-3.5.6-r1.ebuild 1233
 EBUILD qtjava-3.5.6.ebuild 959 RMD160 3376687a524fdbfacc1b1eba5361aef8b7bf9761 SHA1 fc421bbb2bd17c398bf1598a96b7c6a64ec941f8 SHA256 cfc3e715450e5f4d1a603cf75f0cde08b774a9aa4462162fd122404c9c4fc970
 MD5 0ee2b7c1fadef948822fb2fb7ebdaf57 qtjava-3.5.6.ebuild 959
 RMD160 3376687a524fdbfacc1b1eba5361aef8b7bf9761 qtjava-3.5.6.ebuild 959
 SHA256 cfc3e715450e5f4d1a603cf75f0cde08b774a9aa4462162fd122404c9c4fc970 qtjava-3.5.6.ebuild 959
-MISC ChangeLog 5437 RMD160 ae6ce75b9f9a2ba6146b4927b0a18277d50723a5 SHA1 337f6eb0197a4eb1b87facae2f0acc45a3d9a1ef SHA256 b68954b8cec7c68167ee77b668a23bd36215a5fadba07bf882c83ac4c5ae2c25
-MD5 d88555a4446ced7c91dfadd59b45ab7c ChangeLog 5437
-RMD160 ae6ce75b9f9a2ba6146b4927b0a18277d50723a5 ChangeLog 5437
-SHA256 b68954b8cec7c68167ee77b668a23bd36215a5fadba07bf882c83ac4c5ae2c25 ChangeLog 5437
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
-SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
+MISC ChangeLog 5748 RMD160 f5addf76df0b1af9265ef4bbc74e80f0320c7af8 SHA1 0c07aad3db5685101831e379593e1636d4687ef9 SHA256 94ff6aaf5ea23a090ddbf90dcf2532f7029066566c9e5400cbac4f51bbd46d78
+MD5 94d38330bcb5926e55df5d57d472eaf7 ChangeLog 5748
+RMD160 f5addf76df0b1af9265ef4bbc74e80f0320c7af8 ChangeLog 5748
+SHA256 94ff6aaf5ea23a090ddbf90dcf2532f7029066566c9e5400cbac4f51bbd46d78 ChangeLog 5748
+MISC metadata.xml 174 RMD160 c2e418dc10e1431eec90cebd2bcd049ea84c164e SHA1 b29657b99bedc684ac7e40dfa561ef7da5fc4ad7 SHA256 9b93e47904abc783e4ed3714c950f453b6769b553b06fb1a0964b50beabf36e8
+MD5 76e6979e60db4af541cd6af21de010f7 metadata.xml 174
+RMD160 c2e418dc10e1431eec90cebd2bcd049ea84c164e metadata.xml 174
+SHA256 9b93e47904abc783e4ed3714c950f453b6769b553b06fb1a0964b50beabf36e8 metadata.xml 174
 MD5 4dffb3829fa1338d0c7213b9584b3981 files/digest-qtjava-3.5.2 259
 RMD160 7180a741592834c078039c8bf2fd0090ef02ed32 files/digest-qtjava-3.5.2 259
 SHA256 0ed7df165eb81c40fc0d314443c341edac8d4c000ddddad7229f8386696555ac files/digest-qtjava-3.5.2 259
+MD5 4dffb3829fa1338d0c7213b9584b3981 files/digest-qtjava-3.5.2-r1 259
+RMD160 7180a741592834c078039c8bf2fd0090ef02ed32 files/digest-qtjava-3.5.2-r1 259
+SHA256 0ed7df165eb81c40fc0d314443c341edac8d4c000ddddad7229f8386696555ac files/digest-qtjava-3.5.2-r1 259
 MD5 6931b79e7b3debd1a959ff1f9b4ba80f files/digest-qtjava-3.5.6 259
 RMD160 f30948060c4e7da061540353e486d5c0a7e94fa4 files/digest-qtjava-3.5.6 259
 SHA256 76651708f126d5371e659b269806fda4892d6f6c45a3e8580d099605cf5fd9ef files/digest-qtjava-3.5.6 259
+MD5 6931b79e7b3debd1a959ff1f9b4ba80f files/digest-qtjava-3.5.6-r1 259
+RMD160 f30948060c4e7da061540353e486d5c0a7e94fa4 files/digest-qtjava-3.5.6-r1 259
+SHA256 76651708f126d5371e659b269806fda4892d6f6c45a3e8580d099605cf5fd9ef files/digest-qtjava-3.5.6-r1 259
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
+}