Bump to RC2 of OpenOffice.org 3.0

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

5 files changed, 29 insertions, 96 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 50e913e7f389..59431ab1dcf7 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.416 2008/09/22 07:02:00 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.417 2008/09/23 12:58:35 suka Exp $
+
+*openoffice-3.0.0_rc2 (23 Sep 2008)
+
+  23 Sep 2008; Andreas Proschofsky <suka@gentoo.org>
+  -files/gentoo-3.0.0_rc1.diff, +files/gentoo-3.0.0_rc2.diff,
+  -files/lucene-no-java.diff, -openoffice-3.0.0_rc1.ebuild,
+  +openoffice-3.0.0_rc2.ebuild:
+  Bump to RC2 of OpenOffice.org 3.0
 
   22 Sep 2008; Andreas Proschofsky <suka@gentoo.org>
   openoffice-3.0.0_rc1.ebuild:
diff --git a/app-office/openoffice/files/gentoo-3.0.0_rc1.diff b/app-office/openoffice/files/gentoo-3.0.0_rc1.diff
deleted file mode 100644
index 170b52a6445a..000000000000
--- a/app-office/openoffice/files/gentoo-3.0.0_rc1.diff
+++ /dev/null
@@ -1,54 +0,0 @@
---- bin/package-ooo 
-+++ bin/package-ooo 
-@@ -33,6 +33,7 @@
- {
-     cat <<EOT >$1
- #!/bin/sh
-+unset PYTHONPATH
- $OOINSTBASE/program/soffice $2 "\$@"
- EOT
-     chmod 755 $1
---- patches/dev300/apply 
-+++ patches/dev300/apply 
-@@ -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
- config_office-XINC-XLIB-defaults.diff, i#65976
--# gdi/font.cxx: stl list error
--vcl_font-NO_LIST.diff
- # linux-headers-2.6.22 issue?!
- linux-headers.diff
-
---- distro-configs/Gentoo.conf.in 
-+++ distro-configs/Gentoo.conf.in 
-@@ -1,15 +1,23 @@
- --disable-fontooo
- --disable-qadevooo
- --enable-libsn
-+--enable-neon
- --enable-ogltrans
- --enable-xsltproc
- --with-dynamic-xinerama
-+--with-external-dict-dir=/usr/share/myspell
-+--with-external-hyph-dir=/usr/share/myspell
-+--with-external-thes-dir=/usr/share/myspell
- --with-system-boost
- --with-system-curl
- --with-system-db
-+--with-system-dicts
- --with-system-expat
-+--with-system-hunspell
- --with-system-icu
- --with-system-libxslt
-+--with-system-neon
-+--with-system-openssl
- --with-system-vigra
- --with-system-xmlsec
- --with-system-xrender-headers
-
diff --git a/app-office/openoffice/files/gentoo-3.0.0_rc2.diff b/app-office/openoffice/files/gentoo-3.0.0_rc2.diff
new file mode 100644
index 000000000000..4714b0abb0a2
--- /dev/null
+++ b/app-office/openoffice/files/gentoo-3.0.0_rc2.diff
@@ -0,0 +1,11 @@
+--- bin/package-ooo 
++++ bin/package-ooo 
+@@ -33,6 +33,7 @@
+ {
+     cat <<EOT >$1
+ #!/bin/sh
++unset PYTHONPATH
+ $OOINSTBASE/program/soffice $2 "\$@"
+ EOT
+     chmod 755 $1
+
diff --git a/app-office/openoffice/files/lucene-no-java.diff b/app-office/openoffice/files/lucene-no-java.diff
deleted file mode 100644
index 4ea45874166b..000000000000
--- a/app-office/openoffice/files/lucene-no-java.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-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_rc2.ebuild
index 9cf80535680b..e65b6d13e94c 100644
--- a/app-office/openoffice/openoffice-3.0.0_rc1.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_rc1.ebuild,v 1.5 2008/09/22 07:02:00 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0_rc2.ebuild,v 1.1 2008/09/23 12:58:35 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -10,10 +10,10 @@ inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2
 
 IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam"
 
-MY_PV="3.0.0.3.1"
+MY_PV="3.0.0.3.2"
 PATCHLEVEL="OOO300"
 SRC="OOo_${PV}_src"
-MST="ooo300-m5"
+MST="ooo300-m7"
 DEVPATH="http://download.go-oo.org/${PATCHLEVEL}/${MST}"
 S="${WORKDIR}/ooo"
 S_OLD="${WORKDIR}/ooo-build-${MY_PV}"
@@ -25,6 +25,7 @@ SRC_URI="${DEVPATH}-artwork.tar.bz2
 	${DEVPATH}-bootstrap.tar.bz2
 	${DEVPATH}-calc.tar.bz2
 	${DEVPATH}-components.tar.bz2
+	${DEVPATH}-extensions.tar.bz2
 	${DEVPATH}-filters.tar.bz2
 	${DEVPATH}-impress.tar.bz2
 	${DEVPATH}-l10n.tar.bz2
@@ -34,13 +35,12 @@ SRC_URI="${DEVPATH}-artwork.tar.bz2
 	${DEVPATH}-libs_gui.tar.bz2
 	${DEVPATH}-postprocess.tar.bz2
 	${DEVPATH}-sdk.tar.bz2
-	${DEVPATH}-swext.tar.bz2
 	${DEVPATH}-testing.tar.bz2
 	${DEVPATH}-ure.tar.bz2
 	${DEVPATH}-writer.tar.bz2
 	http://download.go-oo.org/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
 	odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
-	http://download.go-oo.org/SRC680/extras-2.tar.bz2
+	http://download.go-oo.org/SRC680/extras-3.tar.bz2
 	http://download.go-oo.org/SRC680/biblio.tar.bz2
 	http://download.go-oo.org/SRC680/lp_solve_5.5.0.12_source.tar.gz
 	http://download.go-oo.org/DEV300/scsolver.2008-09-08.tar.bz2
@@ -244,7 +244,6 @@ 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
@@ -252,18 +251,18 @@ src_unpack() {
 		echo "--with-jdk-home=$(java-config --jdk-home 2>/dev/null)" >> ${CONFFILE}
 		echo "--with-java-target-version=$(java-pkg_get-target)" >> ${CONFFILE}
 		echo "--with-system-beanshell" >> ${CONFFILE}
+		echo "--with-system-hsqldb" >> ${CONFFILE}
+		echo "--with-system-rhino" >> ${CONFFILE}
 		echo "--with-system-xalan" >> ${CONFFILE}
 		echo "--with-system-xerces" >> ${CONFFILE}
 		echo "--with-system-xml-apis" >> ${CONFFILE}
-		echo "--with-system-hsqldb" >> ${CONFFILE}
-		echo "--with-system-rhino" >> ${CONFFILE}
 		echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
+		echo "--with-hsqldb-jar=$(java-pkg_getjar hsqldb hsqldb.jar)" >> ${CONFFILE}
+		echo "--with-rhino-jar=$(java-pkg_getjar rhino-1.5 js.jar)" >> ${CONFFILE}
 		echo "--with-serializer-jar=$(java-pkg_getjar xalan-serializer serializer.jar)" >> ${CONFFILE}
 		echo "--with-xalan-jar=$(java-pkg_getjar xalan xalan.jar)" >> ${CONFFILE}
 		echo "--with-xerces-jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)" >> ${CONFFILE}
 		echo "--with-xml-apis-jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)" >> ${CONFFILE}
-		echo "--with-hsqldb-jar=$(java-pkg_getjar hsqldb hsqldb.jar)" >> ${CONFFILE}
-		echo "--with-rhino-jar=$(java-pkg_getjar rhino-1.5 js.jar)" >> ${CONFFILE}
 	fi
 
 	if use nsplugin ; then