Fix building with IBM jdk's. Patch by Alex V. Fansky <damwihu@gmail.com> bug #208631.

Package-Manager: portage-2.1.4.4

diff --git a/kde-base/qtjava/ChangeLog b/kde-base/qtjava/ChangeLog
index 8df6b21248bfe27ee7431a057f364d984d632dd9..b5d5b9d6c31da1f18bcb8f57fdded100fc8dd239 100644 (file)
--- a/kde-base/qtjava/ChangeLog
+++ b/kde-base/qtjava/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/qtjava
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/ChangeLog,v 1.59 2008/02/17 02:30:16 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/ChangeLog,v 1.60 2008/02/19 15:53:22 caster Exp $
+
+  19 Feb 2008; Vlastimil Babka <caster@gentoo.org>
+  +files/no-libhpi.so-check.patch, qtjava-3.5.8.ebuild:
+  Fix building with IBM jdk's. Patch by Alex V. Fansky <damwihu@gmail.com> bug
+  #208631.
 
   16 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> -qtjava-3.5.2.ebuild,
   -qtjava-3.5.2-r1.ebuild, -qtjava-3.5.6-r1.ebuild, -qtjava-3.5.7.ebuild:

diff --git a/kde-base/qtjava/Manifest b/kde-base/qtjava/Manifest
index 126a3c55c320c954d84e02cd7b12f7e332226dea..8374c8a4870c616c694f8602334e755f87f9df51 100644 (file)
--- a/kde-base/qtjava/Manifest
+++ b/kde-base/qtjava/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX no-gtk-glib-check.diff 949 RMD160 6df47b78e158fb7e38a49c30627421186d83e3da SHA1 234a650d3b629e41b2249ae99e6f7b0ee44fcf63 SHA256 f2721c8a1567ab9e259e216372a6552f8910fd33bc82390d8556aff00b0ba8df
+AUX no-libhpi.so-check.patch 1094 RMD160 e68eb3bcc1626056f2b1ae1edc87cbef2fa61f14 SHA1 77b567790c3a601412ec289332ff3421cbb33f40 SHA256 1111790213a8cf3c888d3444984cee824bcbe55b3b80043d2c01231b00b00b62
 AUX qtjava-3.5-javacflags.patch 483 RMD160 46183053d044bb5cf74275185c9c242cab319341 SHA1 f8d4e386201614ba0b9f59e9ab7a35569f34581e SHA256 e9ddce9f0f3cd0a8524b2595cc2956f13100c636112d4d9e189a9d3dc7961e31
 DIST kdebindings-3.5.8.tar.bz2 5724504 RMD160 2a8b335f4a70b35550e214607e62d7adfbec45ed SHA1 9e84a47cb5ce7b16f485f51996b12d8dd50898ad SHA256 ee6b6cc43c3e645e3b0d6a9fa239c5b725f66aee1d11fccc1cb4fc5e494d9e8a
-EBUILD qtjava-3.5.8.ebuild 1424 RMD160 13d38c89f073b7ae1640697bf409b3840be1d261 SHA1 52df0b59a333f1c5d68888ac81764427e0724c51 SHA256 f8e5f8f6f76b8c3e9ae142379dea5da09adcc7c1c2159fbf031afa86d7ad81f0
-MISC ChangeLog 7802 RMD160 385cc5de844488269dcfb0e5af9c7f37ccb421e6 SHA1 d960a36d94af51c2507231fe0624548eb3e8cb56 SHA256 fa054ca1c445f97dc7daf94bba728f4af0d5d5bfa8d61465dc0481aae6c87a25
+EBUILD qtjava-3.5.8.ebuild 1487 RMD160 ed9344560d3996c1fe438e26425233a4ef7475cf SHA1 dc698068f8ec92530420940a9f7c178f7fb18373 SHA256 cd19a22d87a1f444267d685ea6217f85d58e492b3110bd9a0dd0e6254a7fd472
+MISC ChangeLog 8000 RMD160 d79b0dcafbd94643fa841a3a4885c49033471b37 SHA1 c13c5d4e204e4a2b9637554168913ed271937e54 SHA256 1af38034f8eec728ef4eb781ed62be1440b69474ea1bc32e9380825a4293261f
 MISC metadata.xml 174 RMD160 c2e418dc10e1431eec90cebd2bcd049ea84c164e SHA1 b29657b99bedc684ac7e40dfa561ef7da5fc4ad7 SHA256 9b93e47904abc783e4ed3714c950f453b6769b553b06fb1a0964b50beabf36e8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHt5wdB18eXLOpYdkRAnpfAJ0a7Bp3IA9MQzhoNZiirzfqrd4xQwCfZ5JJ
-E6cpuf+dCLz23d/wtSBk24w=
-=eS9H
------END PGP SIGNATURE-----

diff --git a/kde-base/qtjava/files/no-libhpi.so-check.patch b/kde-base/qtjava/files/no-libhpi.so-check.patch
new file mode 100644 (file)
index 0000000..797815c
--- /dev/null
+++ b/kde-base/qtjava/files/no-libhpi.so-check.patch
@@ -0,0 +1,25 @@
+diff -ur ./admin/acinclude.m4.in ../kdebindings-3.5.8/admin/acinclude.m4.in
+--- ./admin/acinclude.m4.in    2008-02-12 01:42:21.000000000 +0200
++++ ../kdebindings-3.5.8/admin/acinclude.m4.in 2008-02-17 21:01:17.000000000 +0200
+@@ -5263,8 +5263,6 @@
+   kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
+   dnl Look for libgcj.so
+   kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1`
+-  dnl Look for libhpi.so and avoid green threads
+-  kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1`
+ 
+   dnl Now check everything's fine under there
+   dnl the include dir is our flag for having the JDK
+@@ -5315,12 +5313,6 @@
+ 
+   dnl not needed for gcj compile
+ 
+-  if test "x$kde_java_libgcjdir" = "x"; then 
+-      if test ! -r "$kde_java_libhpidir/libhpi.so"; then
+-        AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
+-      fi
+-  fi
+-
+   if test -n "$jni_includes"; then
+     dnl Check for JNI version
+     AC_LANG_SAVE

diff --git a/kde-base/qtjava/qtjava-3.5.8.ebuild b/kde-base/qtjava/qtjava-3.5.8.ebuild
index cbb61f9e466e16e0a5a3eb49f33f0a8d5e03af15..18c77467ee005df5c89c34cd2d38c510be76ab81 100644 (file)
--- a/kde-base/qtjava/qtjava-3.5.8.ebuild
+++ b/kde-base/qtjava/qtjava-3.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.5.8.ebuild,v 1.5 2008/01/31 15:30:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.5.8.ebuild,v 1.6 2008/02/19 15:53:22 caster Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
@@ -15,15 +15,16 @@ KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
+# libhpi for bug #208631
 PATCHES="${FILESDIR}/no-gtk-glib-check.diff
-               ${FILESDIR}/${PN}-${SLOT}-javacflags.patch"
+               ${FILESDIR}/${PN}-${SLOT}-javacflags.patch
+               ${FILESDIR}/no-libhpi.so-check.patch"
 
 pkg_setup() {
        if ! built_with_use =x11-libs/qt-3* opengl ; then
                eerror "${CATEGORY}/${PN} needs Qt 3 built with OpenGL support."
                die "Please reemerge =x11-libs/qt-3* with USE=\"opengl\"."
        fi
-
        kde_pkg_setup
        java-pkg-2_pkg_setup
 }