Try to fix build without java, simplify nsplugin stuff an misc cleanups

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686

5 files changed, 75 insertions, 36 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index b00c6b28ad7f..61bcab64aad3 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,14 @@
 # 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.414 2008/09/19 08:57:01 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.415 2008/09/20 17:49:02 suka Exp $
+
+  20 Sep 2008; Andreas Proschofsky <suka@gentoo.org>
+  files/gentoo-3.0.0_rc1.diff, +files/lucene-no-java.diff,
+  openoffice-3.0.0_rc1.ebuild:
+  Further simplify browser plugin stuff, drop seamonkey use-flag as a
+  consequence. Disable binfilter stuff for now, no source package available
+  atm and add some more info messages. Also try to fix the build without
+  java.
 
   19 Sep 2008; Andreas Proschofsky <suka@gentoo.org>
   openoffice-3.0.0_rc1.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index cbf2b8439c72..2cbe6f982a47 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,5 +1,6 @@
 AUX gentoo-2.4.1.diff 572 RMD160 1107e41d7b19b1a71e501b4dfa6f8f204517ecdc SHA1 f68cb994ee45080f24c0c97b695cc1fb87e58157 SHA256 bbf60d7d89c3347d0aa10dfa9c9aa899c1ef8a97111584cf7ec3b8d1db30a9f7
-AUX gentoo-3.0.0_rc1.diff 1211 RMD160 82ee44ff3765eb1af0cecf9902e05f10680b2e5d SHA1 bebc825923c5dcc4fe3d3f4dd49d35aa2b857c1f SHA256 7d47e50d20498084b59d4cb1cf61caa0838d08ed2983e5f08e2fc9042d7aab36
+AUX gentoo-3.0.0_rc1.diff 1258 RMD160 342ba10982ca83fc9187afb0192cbc8570f88c39 SHA1 097ea3c84855132afaed2a64aea0a7262e486b2d SHA256 5525470f2e170f56885abbe530511b78aa28ded236d8eb8c7f2509b2c7bef06d
+AUX lucene-no-java.diff 817 RMD160 f46bd2dfd0aac03c78d37ac1bf1f019e691e3edc SHA1 132b5d98422b7086d0e0a8996885e9a955a8cc69 SHA256 a97d63a6cd0ed695f09c4d99c64090c26ad96141418ada74e8009b1955874603
 AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 DIST OOo_2.4.1_src_binfilter.tar.bz2 6674779 RMD160 04ffce167f94a250f94f05923a70af0b0744c417 SHA1 a50c7f317643b756c2b0e8937fa9d64b99f05ed9 SHA256 b40403f9adc395846e33f2fc02e0bff133976766988702ef8b13e83448fbd390
 DIST OOo_2.4.1_src_core.tar.bz2 153573457 RMD160 64f43d426005b6c5f464cf55e72df41fe833620b SHA1 170642263c32f614ee7e9439a8af30410e00d318 SHA256 abf576f3d451a981887c2a1985b2b72724af204491da6407a1c6e3b0baa10590
@@ -37,6 +38,6 @@ DIST scsolver.2008-09-08.tar.bz2 217228 RMD160 ce72548a6743a58d2306a3ae99443136d
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST writerfilter.2008-02-29.tar.bz2 745803 RMD160 5f1642ee32757bf235ab8ada9f88023608dbf0e6 SHA1 398ebd9a18af5ae4a08305443cd4b16036ad1a37 SHA256 be55befd2694a8f5871a96cf7d33919dece8b890a081d7da493c6889db27dd94
 EBUILD openoffice-2.4.1.ebuild 12597 RMD160 cfeb6649376b401d6a24d46c989526e042044b06 SHA1 7c88d424b6de8ef1d041b15df6b219cd017a4dd4 SHA256 402e684acf7565024b645c024f0cce4f8f56579f3fe50b9120fe7db0eccaa7a8
-EBUILD openoffice-3.0.0_rc1.ebuild 12173 RMD160 e4cf024305c2f746180bd9cd0a498152fc74d627 SHA1 c7d3b5976ad31deace0883318781ef5372b9cb2a SHA256 7e50b637fbb1d915f1b0ce288a0bea94f5ded162f9e51d385d992323090b3636
-MISC ChangeLog 86003 RMD160 b7b7d31c7d04aec05021cb9347d94af31aaf3761 SHA1 ce434a37f59d6e0ca2ba36caee5e7d91556b58b0 SHA256 b35db19e3306fa9d415cd35d2d294a7b1dd241aa16a366ff78f27215a52054b3
+EBUILD openoffice-3.0.0_rc1.ebuild 12323 RMD160 9f97904699bcd24ee24f79c3c9533787251300cf SHA1 90fbb7fb424aaf3aace1a2126d08d4b5a99dcb5a SHA256 7fb86f0bb67edc9f1765d43edc3094abb4b43b3571056cd2400358e1aee5a327
+MISC ChangeLog 86374 RMD160 19a60fd3cae133576b2c2c32bf37ff05b010e1d3 SHA1 4476437e72cab4fea53cfeb6d66ff976929d9bbd SHA256 fbadbcc212f084da9520b46a47b6a226ff9c3aef0cb46d0517d2b62e2efdca8e
 MISC metadata.xml 635 RMD160 b0b38a6072b2c813ab06e217cd7df90065bd9123 SHA1 8d0686f133cdb62b23b95e837c40b0dad12f5a41 SHA256 3415df8f17c3868078747c22ea1105bb0a2a1444d577214b81fd05cc2fac604f
diff --git a/app-office/openoffice/files/gentoo-3.0.0_rc1.diff b/app-office/openoffice/files/gentoo-3.0.0_rc1.diff
index 5d4d32b54601..170b52a6445a 100644
--- a/app-office/openoffice/files/gentoo-3.0.0_rc1.diff
+++ b/app-office/openoffice/files/gentoo-3.0.0_rc1.diff
@@ -10,10 +10,12 @@
      chmod 755 $1
 --- patches/dev300/apply 
 +++ patches/dev300/apply 
-@@ -1375,12 +1375,8 @@
+@@ -1375,12 +1375,10 @@
  system-db-check.diff, i#65979, hmth
  # User ~/.ooo3 as user dir
  scp2-user-config-ooo3.diff, pmladek
++#fix build without java
++lucene-no-java.diff
 -# unused java code
 -disable-parser-jaxp.diff
  # default inc/lib
diff --git a/app-office/openoffice/files/lucene-no-java.diff b/app-office/openoffice/files/lucene-no-java.diff
new file mode 100644
index 000000000000..4ea45874166b
--- /dev/null
+++ b/app-office/openoffice/files/lucene-no-java.diff
@@ -0,0 +1,31 @@
+Index: makefile.mk
+===================================================================
+RCS file: /cvs/external/lucene/makefile.mk,v
+retrieving revision 1.3.2.1
+diff -u -r1.3.2.1 makefile.mk
+--- lucene/makefile.mk	31 Jul 2008 20:07:34 -0000	1.3.2.1
++++ lucene/makefile.mk	19 Sep 2008 11:23:37 -0000
+@@ -41,6 +41,8 @@
+ .INCLUDE :	antsettings.mk
+ # --- Files --------------------------------------------------------
+ 
++.IF "$(SOLAR_JAVA)" != ""
++
+ LUCENE_MAJOR=2
+ LUCENE_MINOR=3
+ LUCENE_MICRO=2
+@@ -58,9 +60,13 @@
+ 
+ OUT2BIN=.$/build$/$(LUCENE_CORE_JAR) .$/build$/contrib$/analyzers$/$(LUCENE_ANALYZERS_JAR)
+ 
++.ENDIF
++
+ # --- Targets ------------------------------------------------------
+ 
+ .INCLUDE : set_ext.mk
+ .INCLUDE : target.mk
+-.INCLUDE : tg_ext.mk 
+ 
++.IF "$(SOLAR_JAVA)" != ""
++.INCLUDE : tg_ext.mk 
++.ENDIF
diff --git a/app-office/openoffice/openoffice-3.0.0_rc1.ebuild b/app-office/openoffice/openoffice-3.0.0_rc1.ebuild
index c76d3a822765..87989f8ca1b9 100644
--- a/app-office/openoffice/openoffice-3.0.0_rc1.ebuild
+++ b/app-office/openoffice/openoffice-3.0.0_rc1.ebuild
@@ -1,13 +1,13 @@
 # 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_rc1.ebuild,v 1.3 2008/09/19 08:57:01 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0_rc1.ebuild,v 1.4 2008/09/20 17:49:02 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
 
 inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib
 
-IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam seamonkey"
+IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam"
 
 MY_PV="3.0.0.3.1"
 PATCHLEVEL="OOO300"
@@ -139,10 +139,7 @@ DEPEND="${COMMON_DEPEND}
 	pam? ( sys-libs/pam )
 	!dev-util/dmake
 	>=dev-lang/python-2.3.4
-	!seamonkey? ( nsplugin? ( >=net-libs/xulrunner-1.8
-		>=dev-libs/nspr-4.6.6
-		>=dev-libs/nss-3.11-r1 ) )
-	seamonkey? ( =www-client/seamonkey-1*
+	nsplugin? ( || ( =net-libs/xulrunner-1.8 =net-libs/xulrunner-1.9 =www-client/seamonkey-1* )
 		>=dev-libs/nspr-4.6.6
 		>=dev-libs/nss-3.11-r1 )
 	java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
@@ -163,6 +160,9 @@ pkg_setup() {
 	ewarn " the minimum requirements. If you have less, use openoffice-bin "
 	ewarn " instead. "
 	ewarn
+	ewarn " Also if you experience a build break, please make sure to retry "
+	ewarn " with MAKEOPTS="-j1" before filing a bug. "
+	ewarn
 
 	# Check if we have enough RAM and free diskspace to build this beast
 	CHECKREQS_MEMORY="512"
@@ -183,7 +183,7 @@ pkg_setup() {
 
 	if use !java; then
 		ewarn " You are building with java-support disabled, this results in some "
-		ewarn " of the OpenOffice.org functionality (i.e. help) being disabled. "
+		ewarn " of the OpenOffice.org functionality being disabled. "
 		ewarn " If something you need does not work for you, rebuild with "
 		ewarn " java in your USE-flags. "
 		ewarn
@@ -206,13 +206,15 @@ pkg_setup() {
 		fi
 	fi
 
-	if use !seamonkey && use nsplugin; then
-		if pkg-config --exists xulrunner-xpcom; then
-			XULR="xulrunner"
-		elif pkg-config --exists libxul; then
-			XULR="libxul"
+	if use nsplugin; then
+		if pkg-config --exists libxul; then
+			BRWS="libxul"
+		elif pkg-config --exists xulrunner-xpcom; then
+			BRWS="xulrunner"
+		elif pkg-config --exists seamonkey-xpcom; then
+			BRWS="seamonkey"
 		else
-			die "USE flag [nsplugin] set but no installed xulrunner found!"
+			die "USE flag [nsplugin] set but no installed xulrunner or seamonkey found!"
 		fi
 	fi
 
@@ -241,6 +243,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/gentoo-${PV}.diff"
 	epatch "${FILESDIR}/ooo-env_log.diff"
+	cp -f "${FILESDIR}/lucene-no-java.diff" "${S}/patches/dev300/"
 
 	#Use flag checks
 	if use java ; then
@@ -262,19 +265,15 @@ src_unpack() {
 		echo "--with-rhino-jar=$(java-pkg_getjar rhino-1.5 js.jar)" >> ${CONFFILE}
 	fi
 
-	if use nsplugin || use seamonkey ; then
+	if use nsplugin ; then
 		echo "--enable-mozilla" >> ${CONFFILE}
-		local browser
-		use nsplugin && browser="${XULR}"
-		use seamonkey && browser="seamonkey"
-
-		echo "--with-system-mozilla=${browser}" >> ${CONFFILE}
+		echo "--with-system-mozilla=${BRWS}" >> ${CONFFILE}
 	else
 		echo "--disable-mozilla" >> ${CONFFILE}
 		echo "--without-system-mozilla" >> ${CONFFILE}
 	fi
 
-	echo "`use_enable binfilter`" >> ${CONFFILE}
+	echo "--disable-binfilter" >> ${CONFFILE}
 	echo "`use_enable cups`" >> ${CONFFILE}
 	echo "`use_enable dbus`" >> ${CONFFILE}
 	echo "`use_enable eds evolution2`" >> ${CONFFILE}
@@ -296,7 +295,7 @@ src_unpack() {
 
 src_compile() {
 
-	# Use multiprocessing by default now, it tested upstream
+	# Use multiprocessing by default now, it gets tested by upstream
 	export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`
 
 	# Compile problems with these ...
@@ -375,17 +374,15 @@ 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 " To start OpenOffice.org, run:"
-	elog
-	elog " $ ooffice"
-	elog
-	elog " Also, for individual components, you can use any of:"
-	elog
-	elog " oobase, oocalc, oodraw, oofromtemplate, ooimpress, oomath,"
-	elog " ooweb or oowriter"
-	elog
-	elog " Spell checking is now provided through our own myspell-ebuilds, "
+	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. "
+	elog
 
+	ewarn " Please note that this release of OpenOffice.org uses a "
+	ewarn " new user install dir. As a result you will have to redo "
+	ewarn " your settings. Alternatively you might copy the old one "
+	ewarn " over from ~/.ooo-2.0 to ~/.ooo3, but be warned that this "
+	ewarn " might break stuff. "
+	ewarn
 }