Buildfix for systems without java, see bug #125251

(Portage version: 2.1_pre5-r4)

4 files changed, 66 insertions, 3 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/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