Buildfix for systems without java, see bug #125251

Package-Manager: portage-2.1_pre5-r4

5 files changed, 78 insertions, 12 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index eb07f1b2ae84..5ab2b303d22a 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.191 2006/03/04 22:08:52 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.192 2006/03/07 16:24:46 suka Exp $
+
+  07 Mar 2006; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.2/gentoo-2.0.2.diff, +files/2.0.2/buildfix-no-java.diff,
+  openoffice-2.0.2_rc4.ebuild:
+  Buildfix for systems without java, see bug #125251
 
   04 Mar 2006; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.2_rc4.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index a05e9f45b145..4bad7c550390 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,15 +1,18 @@
-MD5 c3cb9b47c6f78d779e8e9c920d0a1027 ChangeLog 41400
-RMD160 44dd532ca803422476a73b6fc20c3671775eb47b ChangeLog 41400
-SHA256 72621aa3ea188abed342f852918edf6bc60d4f9ad2a65d74d226ea7d43dcfade ChangeLog 41400
+MD5 e1d59065a9d703d82602bcd443e0e1b4 ChangeLog 41607
+RMD160 6ed0eacb55a3684c81166402b36f4e53cc477e13 ChangeLog 41607
+SHA256 4f98934df366ba0de1ec2fad54ea36e241b2e2709b6c220140c12253128e9483 ChangeLog 41607
 MD5 500f7e71be57d40b0a8042cab1484df9 files/2.0.1/alwayscrystal.diff 3222
 RMD160 6f563dccad523db881def1fdb711df3949c2a687 files/2.0.1/alwayscrystal.diff 3222
 SHA256 22af14b2c3bd7d796eeda2f4a423f4290e71d2f2790a82038b837c6219133ef1 files/2.0.1/alwayscrystal.diff 3222
+MD5 691fe6224585d044b00190a38e1fc01f files/2.0.2/buildfix-no-java.diff 1362
+RMD160 0035f96b522fbce18ad0fde9467547ad6414734a files/2.0.2/buildfix-no-java.diff 1362
+SHA256 ddc53ccb4a7303f29c6eb64f3f7330b4357412d86b3ae4a00f7eef8a555d2291 files/2.0.2/buildfix-no-java.diff 1362
 MD5 4f55a923f95c001976f2b8abaaad829a files/2.0.2/buildfix-without-mozilla.diff 4656
 RMD160 139421dcaafc8ac0cbd28b13d3e6f9206a83c924 files/2.0.2/buildfix-without-mozilla.diff 4656
 SHA256 f5d95319e0129d04185b427147c9df7a0c2a4f5624da08226e04951365797323 files/2.0.2/buildfix-without-mozilla.diff 4656
-MD5 4916780fb5333fc0f1e51869cd181d86 files/2.0.2/gentoo-2.0.2.diff 380
-RMD160 74a2824a50e991f64a5e446c9e146ac7c6d84ba5 files/2.0.2/gentoo-2.0.2.diff 380
-SHA256 b5b670cc52d171805b67911fab050c850f029bb8a4653f88b629e6e3ba9830df files/2.0.2/gentoo-2.0.2.diff 380
+MD5 9f159544d9421964200f7226443226b8 files/2.0.2/gentoo-2.0.2.diff 446
+RMD160 177ad35ca8ff9f382cb5085c151b6d30db7ede35 files/2.0.2/gentoo-2.0.2.diff 446
+SHA256 e1c2f2533b415c7cea29c39ed9be3de44c8b6b940aaf4abebc1a6e3b5eda3089 files/2.0.2/gentoo-2.0.2.diff 446
 MD5 d741869e1665d1423c2086f1723b93d7 files/2.0.2/removecrystalcheck.diff 572
 RMD160 5e7b6c92506bd7d3f4e09e3ee43656a6f4f8c30d files/2.0.2/removecrystalcheck.diff 572
 SHA256 06a05ee5a27ce6a1de1c9eeebe4e22b860d0a6292f778ec6c81aa2c28c1daa08 files/2.0.2/removecrystalcheck.diff 572
@@ -25,6 +28,6 @@ SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata
 MD5 e00605b0acc60de47e6eee98a5f32894 openoffice-2.0.1.ebuild 7274
 RMD160 ed88f0dc45b87c259271f83fa9d4fd8bb55fab93 openoffice-2.0.1.ebuild 7274
 SHA256 56a67a1cd040cd120cb5227ed0fa926fbf378c5ba46e267bc43a9b0218f87fa7 openoffice-2.0.1.ebuild 7274
-MD5 3cf44521738be450f36e462229a523f2 openoffice-2.0.2_rc4.ebuild 7778
-RMD160 5c20858fabeeebd7660e7b8df4198a7e9ddd92eb openoffice-2.0.2_rc4.ebuild 7778
-SHA256 14b981a38b977f243c2ade752394abee3fc3f6ab13cbe3bae5dc26a0a944a012 openoffice-2.0.2_rc4.ebuild 7778
+MD5 d69fcaebc79b4e1c0a6c143c84c1f840 openoffice-2.0.2_rc4.ebuild 7853
+RMD160 97b49281eca3bff7939f0fc45aba69e86a600f53 openoffice-2.0.2_rc4.ebuild 7853
+SHA256 dea1cdf3e7e78bd398a538042d5b9920a68161f4459787e770fa09551422e248 openoffice-2.0.2_rc4.ebuild 7853
diff --git a/app-office/openoffice/files/2.0.2/buildfix-no-java.diff b/app-office/openoffice/files/2.0.2/buildfix-no-java.diff
new file mode 100644
index 000000000000..49723889abe4
--- /dev/null
+++ b/app-office/openoffice/files/2.0.2/buildfix-no-java.diff
@@ -0,0 +1,55 @@
+--- solenv/inc/unxlngppc4.mk.old	2006-01-20 11:50:50.000000000 +0100
++++ solenv/inc/unxlngppc4.mk	2006-02-28 15:06:48.000000000 +0100
+@@ -36,7 +36,7 @@
+ ASM=
+ AFLAGS=
+ 
+-SOLAR_JAVA*=TRUE
++SOLAR_JAVA*=
+ JAVAFLAGSDEBUG=-g
+ 
+ # filter for supressing verbose messages from linker
+--- solenv/inc/unxlngi4.mk.old	2006-01-20 11:50:50.000000000 +0100
++++ solenv/inc/unxlngi4.mk	2006-02-28 15:06:48.000000000 +0100
+@@ -36,7 +36,7 @@
+ ASM=
+ AFLAGS=
+ 
+-SOLAR_JAVA*=TRUE
++SOLAR_JAVA*=
+ JAVAFLAGSDEBUG=-g
+ 
+ # filter for supressing verbose messages from linker
+--- solenv/inc/unxlngi6.mk.old	2006-01-20 11:50:50.000000000 +0100
++++ solenv/inc/unxlngi6.mk	2006-02-28 15:06:48.000000000 +0100
+@@ -36,7 +36,7 @@
+ ASM=
+ AFLAGS=
+ 
+-SOLAR_JAVA*=TRUE
++SOLAR_JAVA*=
+ JAVAFLAGSDEBUG=-g
+ 
+ # filter for supressing verbose messages from linker
+--- solenv/inc/unxlngx6.mk.old	2006-01-20 11:50:50.000000000 +0100
++++ solenv/inc/unxlngx6.mk	2006-02-28 15:06:48.000000000 +0100
+@@ -36,7 +36,7 @@
+ ASM=
+ AFLAGS=
+ 
+-SOLAR_JAVA*=TRUE
++SOLAR_JAVA*=
+ JAVAFLAGSDEBUG=-g
+ 
+ # filter for supressing verbose messages from linker
+--- solenv/inc/unxlngs.mk.old	2006-01-20 11:50:50.000000000 +0100
++++ solenv/inc/unxlngs.mk	2006-02-28 15:06:48.000000000 +0100
+@@ -36,7 +36,7 @@
+ ASM=
+ AFLAGS=
+ 
+-SOLAR_JAVA*=TRUE
++SOLAR_JAVA*=
+ JAVAFLAGSDEBUG=-g
+ 
+ # filter for supressing verbose messages from linker
diff --git a/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff b/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
index a6823f467255..c274955036a8 100644
--- a/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
+++ b/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
@@ -1,12 +1,14 @@
 --- patches/src680/apply 
 +++ patches/src680/apply 
-@@ -148,6 +148,9 @@
+@@ -148,6 +148,11 @@
  # add no-crashreporter sections to testtool default config;
  # also guess office path from testtool.bin path i#FIXME?
  testtool-more-defaults.diff
 +
 +# Build without mozilla is broken i#59729
 +buildfix-without-mozilla.diff
++# Fix build without java, again, i#62716
++buildfix-no-java.diff
  
  [ TemporaryHacks < oob680-m1 ]
  # fix for conflicting declaration NPP_GetValue()
diff --git a/app-office/openoffice/openoffice-2.0.2_rc4.ebuild b/app-office/openoffice/openoffice-2.0.2_rc4.ebuild
index 660221164b8a..428679ef2535 100644
--- a/app-office/openoffice/openoffice-2.0.2_rc4.ebuild
+++ b/app-office/openoffice/openoffice-2.0.2_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.2_rc4.ebuild,v 1.3 2006/03/04 22:08:52 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.2_rc4.ebuild,v 1.4 2006/03/07 16:24:46 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
@@ -144,6 +144,7 @@ src_unpack() {
 	#Some fixes for our patchset
 	cd ${S}
 	cp ${FILESDIR}/${MY_PV}/buildfix-without-mozilla.diff ${S}/patches/src680/ || die
+	cp ${FILESDIR}/${MY_PV}/buildfix-no-java.diff ${S}/patches/src680/ || die
 	epatch ${FILESDIR}/${MY_PV}/removecrystalcheck.diff
 	epatch ${FILESDIR}/${MY_PV}/gentoo-${MY_PV}.diff