Bump to OOo 3.0 RC3, lots of bugfixes, now migrates user-settings from OOo 2.x

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

3 files changed, 46 insertions, 54 deletions

diff --git a/app-office/openoffice/files/gentoo-3.0.0_rc2.diff b/app-office/openoffice/files/gentoo-3.0.0_rc2.diff
deleted file mode 100644
index 9c11bd993f70..000000000000
--- a/app-office/openoffice/files/gentoo-3.0.0_rc2.diff
+++ /dev/null
@@ -1,22 +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 
-@@ -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/gentoo-3.0.0_rc3.diff b/app-office/openoffice/files/gentoo-3.0.0_rc3.diff
new file mode 100644
index 000000000000..6d371cadb979
--- /dev/null
+++ b/app-office/openoffice/files/gentoo-3.0.0_rc3.diff
@@ -0,0 +1,46 @@
+--- 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
+--- distro-configs/Gentoo.conf.in 
++++ distro-configs/Gentoo.conf.in 
+@@ -1,10 +1,7 @@
+ --disable-fontooo
+ --disable-qadevooo
+---enable-libsn
+ --enable-neon
+---enable-ogltrans
+---enable-xsltproc
+---with-dynamic-xinerama
++--enable-xrender-link
+ --with-external-dict-dir=/usr/share/myspell
+ --with-external-hyph-dir=/usr/share/myspell
+ --with-external-thes-dir=/usr/share/myspell
+@@ -19,9 +16,7 @@
+ --with-system-neon
+ --with-system-openssl
+ --with-system-vigra
+---with-system-xmlsec
+ --with-system-xrender-headers
+---without-nas
+ --without-myspell-dicts
+ --without-stlport
+ --with-vendor=\"Gentoo Foundation\"
+--- patches/dev300/apply 
++++ patches/dev300/apply 
+@@ -1425,7 +1425,7 @@
+ SectionOwner => aprosky
+ 
+ # system lucene classpath
+-gentoo-system-lucene.diff
++#gentoo-system-lucene.diff
+ # Allow build to proceed with PaX enabled
+ gentoo-pax-fix.diff, aprosky
+ # support server-only versions of 64bit JDKs
+
diff --git a/app-office/openoffice/files/stax-saxon-no-java.diff b/app-office/openoffice/files/stax-saxon-no-java.diff
deleted file mode 100644
index a47e5a728763..000000000000
--- a/app-office/openoffice/files/stax-saxon-no-java.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-? 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
-