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

Package-Manager: portage-2.1.4.4

4 files changed, 38 insertions, 15 deletions

diff --git a/kde-base/kdejava/ChangeLog b/kde-base/kdejava/ChangeLog
index bfddd411f66f..e97713381602 100644
--- a/kde-base/kdejava/ChangeLog
+++ b/kde-base/kdejava/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdejava
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/ChangeLog,v 1.67 2008/02/17 03:15:34 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/ChangeLog,v 1.68 2008/02/19 17:02:20 caster Exp $
+
+  19 Feb 2008; Vlastimil Babka <caster@gentoo.org>
+  +files/no-libhpi.so-check.patch, kdejava-3.5.8.ebuild:
+  Fix building with IBM jdk's. Patch by Alex V. Fansky <damwihu@gmail.com> bug
+  #208631.
 
   17 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   -files/kdejava-3.4.0_rc1-classpath.diff, -kdejava-3.5.5.ebuild,
diff --git a/kde-base/kdejava/Manifest b/kde-base/kdejava/Manifest
index 18f885d27231..4bd6c692ecff 100644
--- a/kde-base/kdejava/Manifest
+++ b/kde-base/kdejava/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kdejava-3.5-javacflags.patch 484 RMD160 d859c947892def01ce3d0981848988022c15cf95 SHA1 2e61da24cacc6d88cc3d8bd31bf864d9d4c145ff SHA256 d237e52cac8fa4c730066bbe442faed972d496466ef5af0ef44ac1bffc4cff2d
 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
 DIST kdebindings-3.5.8.tar.bz2 5724504 RMD160 2a8b335f4a70b35550e214607e62d7adfbec45ed SHA1 9e84a47cb5ce7b16f485f51996b12d8dd50898ad SHA256 ee6b6cc43c3e645e3b0d6a9fa239c5b725f66aee1d11fccc1cb4fc5e494d9e8a
-EBUILD kdejava-3.5.8.ebuild 1683 RMD160 f8e95eec36b3e5d75310def67fcfc979297f89c3 SHA1 574d4722da498799c965b350cb00762321829386 SHA256 224508676e55b3f5228baf1bebaf8340d7a54226152e9238732c4b4aa064f07f
-MISC ChangeLog 8956 RMD160 9f3989b11f29cb407eee310f50fdcd60090b6d3a SHA1 adbe654566a9a91933adc725fde04c09f863642d SHA256 e9ed41612d582fe76e128ec79c9d5547414ff490ed18e780ac5a88ee370d5938
+EBUILD kdejava-3.5.8.ebuild 1747 RMD160 2b6027f59c5eaa8e9fc446bd81ca029c855b092d SHA1 1da07a4c84af5730d210f1631bf2d11850089656 SHA256 df134415bf86b44cdc7c96b197104315fb130d21710dc918b8055ce73fc5de91
+MISC ChangeLog 9155 RMD160 5f9e80cc93e241bd8c721d701356f8aacce6d063 SHA1 fe397a079f9e58afcc967f6852d2fe906881d528 SHA256 638b7c65c8ca892166124f35e7c181e95aab794641fbf537c1609261b530f9b7
 MISC metadata.xml 174 RMD160 c2e418dc10e1431eec90cebd2bcd049ea84c164e SHA1 b29657b99bedc684ac7e40dfa561ef7da5fc4ad7 SHA256 9b93e47904abc783e4ed3714c950f453b6769b553b06fb1a0964b50beabf36e8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHt6a7B18eXLOpYdkRAsMMAKCKnF14QuQUfwlFZ1SNZrh2TAT/ugCZAXnD
-US+tLrXJ/j391rk0vcK65ZM=
-=FtJy
------END PGP SIGNATURE-----
diff --git a/kde-base/kdejava/files/no-libhpi.so-check.patch b/kde-base/kdejava/files/no-libhpi.so-check.patch
new file mode 100644
index 000000000000..797815ceacc8
--- /dev/null
+++ b/kde-base/kdejava/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/kdejava/kdejava-3.5.8.ebuild b/kde-base/kdejava/kdejava-3.5.8.ebuild
index d9c77bddffe4..df6d6685d94f 100644
--- a/kde-base/kdejava/kdejava-3.5.8.ebuild
+++ b/kde-base/kdejava/kdejava-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/kdejava/kdejava-3.5.8.ebuild,v 1.5 2008/01/31 15:30:02 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.5.8.ebuild,v 1.6 2008/02/19 17:02:20 caster Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY=qtjava
@@ -20,8 +20,10 @@ DEPEND=">=virtual/jdk-1.4 $COMMONDEPEND"
 RDEPEND=">=virtual/jre-1.4 $COMMONDEPEND"
 OLDDEPEND="~kde-base/kwin-$PV ~kde-base/kcontrol-$PV ~kde-base/qtjava-$PV virtual/jdk"
 
+# libhpi for bug #209631
 PATCHES="${FILESDIR}/no-gtk-glib-check.diff
-		${FILESDIR}/${PN}-${SLOT}-javacflags.patch"
+		${FILESDIR}/${PN}-${SLOT}-javacflags.patch
+		${FILESDIR}/no-libhpi.so-check.patch"
 
 # Probably missing other kdebase, kdepim etc deps
 # Needs to be compiled with just kdelibs installed to make sure