Another fix for building without java, closes bug #238642

(Portage version: 2.2_rc9/cvs/Linux 2.6.26-gentoo-r1 i686)

4 files changed, 53 insertions, 2 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index bf350172b4a8..be942d27cbfe 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.418 2008/09/23 21:41:07 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.419 2008/09/26 11:27:03 suka Exp $
+
+  26 Sep 2008; Andreas Proschofsky <suka@gentoo.org>
+  files/gentoo-3.0.0_rc2.diff, +files/stax-saxon-no-java.diff,
+  openoffice-3.0.0_rc2.ebuild:
+  Another fix for building without java, closes bug #238642
 
   23 Sep 2008; Andreas Proschofsky <suka@gentoo.org>
   openoffice-3.0.0_rc2.ebuild:
diff --git a/app-office/openoffice/files/gentoo-3.0.0_rc2.diff b/app-office/openoffice/files/gentoo-3.0.0_rc2.diff
index 4714b0abb0a2..9c11bd993f70 100644
--- a/app-office/openoffice/files/gentoo-3.0.0_rc2.diff
+++ b/app-office/openoffice/files/gentoo-3.0.0_rc2.diff
@@ -8,4 +8,15 @@
  $OOINSTBASE/program/soffice $2 "\$@"
  EOT
      chmod 755 $1
+--- patches/dev300/apply 
++++ patches/dev300/apply 
+@@ -1437,6 +1437,8 @@
+ #vcl_font-NO_LIST.diff
+ # linux-headers-2.6.22 issue?!
+ linux-headers.diff
++#fix build without java
++stax-saxon-no-java.diff
+ 
+ [ DebianBaseOnly ]
+ SectionOwner => rengelha
 
diff --git a/app-office/openoffice/files/stax-saxon-no-java.diff b/app-office/openoffice/files/stax-saxon-no-java.diff
new file mode 100644
index 000000000000..a47e5a728763
--- /dev/null
+++ b/app-office/openoffice/files/stax-saxon-no-java.diff
@@ -0,0 +1,32 @@
+? stax/unxlngx6.pro
+? saxon/unxlngx6.pro
+Index: stax/makefile.mk
+===================================================================
+RCS file: /cvs/external/stax/makefile.mk,v
+retrieving revision 1.4
+diff -u -r1.4 makefile.mk
+--- stax/makefile.mk	28 Jul 2008 11:59:31 -0000	1.4
++++ stax/makefile.mk	26 Sep 2008 09:32:56 -0000
+@@ -64,5 +64,7 @@
+ 
+ .INCLUDE : set_ext.mk
+ .INCLUDE : target.mk
++.IF "$(SOLAR_JAVA)" != ""
+ .INCLUDE : tg_ext.mk
++.ENDIF
+ 
+Index: saxon/makefile.mk
+===================================================================
+RCS file: /cvs/external/saxon/makefile.mk,v
+retrieving revision 1.1
+diff -u -r1.1 makefile.mk
+--- saxon/makefile.mk	14 Jul 2008 15:43:51 -0000	1.1
++++ saxon/makefile.mk	26 Sep 2008 09:32:56 -0000
+@@ -63,5 +63,7 @@
+ 
+ .INCLUDE : set_ext.mk
+ .INCLUDE : target.mk
++.IF "$(SOLAR_JAVA)" != ""
+ .INCLUDE : tg_ext.mk
++.ENDIF
+ 
diff --git a/app-office/openoffice/openoffice-3.0.0_rc2.ebuild b/app-office/openoffice/openoffice-3.0.0_rc2.ebuild
index a962b8f236a9..c06b9c3608f4 100644
--- a/app-office/openoffice/openoffice-3.0.0_rc2.ebuild
+++ b/app-office/openoffice/openoffice-3.0.0_rc2.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/app-office/openoffice/openoffice-3.0.0_rc2.ebuild,v 1.2 2008/09/23 21:41:07 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0_rc2.ebuild,v 1.3 2008/09/26 11:27:03 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -245,6 +245,8 @@ src_unpack() {
 	epatch "${FILESDIR}/gentoo-${PV}.diff"
 	epatch "${FILESDIR}/ooo-env_log.diff"
 
+	cp -f "${FILESDIR}/stax-saxon-no-java.diff" ${S}/patches/dev300/ || die
+
 	#Use flag checks
 	if use java ; then
 		echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE}
@@ -377,6 +379,7 @@ pkg_postinst() {
 	# Add available & useful jars to openoffice classpath
 	use java && /usr/$(get_libdir)/openoffice/basis3.0/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
 
+	elog
 	elog " Spell checking is provided through our own myspell-ebuilds, "
 	elog " if you want to use it, please install the correct myspell package "
 	elog " according to your language needs. "