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

(Portage version: 2.1.4.4)

3 files changed, 35 insertions, 4 deletions

diff --git a/kde-base/qtjava/ChangeLog b/kde-base/qtjava/ChangeLog
index 8df6b21248bf..b5d5b9d6c31d 100644
--- 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/files/no-libhpi.so-check.patch b/kde-base/qtjava/files/no-libhpi.so-check.patch
new file mode 100644
index 000000000000..797815ceacc8
--- /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 cbb61f9e466e..18c77467ee00 100644
--- 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
 }