Bump to OpenOffice.org 3.1.1, mostly bugfixes, also adds KDE4 support

(Portage version: 2.2_rc40/cvs/Linux i686)

4 files changed, 27 insertions, 4 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index cfc2ab6ca4e0..6b2312046d0f 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.476 2009/08/20 10:30:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.477 2009/09/02 19:07:22 suka Exp $
+
+*openoffice-3.1.1 (02 Sep 2009)
+
+  02 Sep 2009; Andreas Proschofsky <suka@gentoo.org>
+  -openoffice-3.1.1_beta2.ebuild, +openoffice-3.1.1.ebuild,
+  -files/gentoo-3.1.1_beta2.diff, +files/gentoo-3.1.1.diff,
+  +files/gentoo-pythonpath.diff:
+  Bump to OpenOffice.org 3.1.1, mostly bugfixes, also adds KDE4 support
 
   20 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   openoffice-3.1.1_beta2.ebuild:
diff --git a/app-office/openoffice/files/gentoo-3.1.1.diff b/app-office/openoffice/files/gentoo-3.1.1.diff
new file mode 100644
index 000000000000..c220676b6de9
--- /dev/null
+++ b/app-office/openoffice/files/gentoo-3.1.1.diff
@@ -0,0 +1,14 @@
+--- patches/dev300/apply 
++++ patches/dev300/apply 
+@@ -452,10 +452,6 @@
+ 
+ # avoid error messages about missing directories with templates
+ sfx2-check-existing-template-dirs.diff, i#100518, pmladek
+-
+-[ FedoraLinuxOnlyFixes ]
+-# fix for new SQLLEN in unixodbc. Update internal headers.
+-new-SQLLEN.diff, i#104088
+ 
+ [ LinuxOnly ]
+ # fix that allows OOo to work with a standard (unpatched) libjpeg,
+
diff --git a/app-office/openoffice/files/gentoo-3.1.1_beta2.diff b/app-office/openoffice/files/gentoo-pythonpath.diff
index 4714b0abb0a2..4714b0abb0a2 100644
--- a/app-office/openoffice/files/gentoo-3.1.1_beta2.diff
+++ b/app-office/openoffice/files/gentoo-pythonpath.diff
diff --git a/app-office/openoffice/openoffice-3.1.1_beta2.ebuild b/app-office/openoffice/openoffice-3.1.1.ebuild
index 7cbbe59c888f..4feb3834c33d 100644
--- a/app-office/openoffice/openoffice-3.1.1_beta2.ebuild
+++ b/app-office/openoffice/openoffice-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1_beta2.ebuild,v 1.2 2009/08/20 10:30:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.1 2009/09/02 19:07:22 suka Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -11,10 +11,10 @@ inherit bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-
 
 IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates"
 
-MY_PV=3.1.0.99.2
+MY_PV=3.1.1.1
 PATCHLEVEL=OOO310
 SRC=OOo_${PV}_src
-MST=ooo310-m17
+MST=ooo310-m19
 DEVPATH=http://download.go-oo.org/${PATCHLEVEL}/${MST}
 S=${WORKDIR}/ooo
 S_OLD=${WORKDIR}/ooo-build-${MY_PV}
@@ -237,6 +237,7 @@ src_prepare() {
 	#Some fixes for our patchset
 	cd "${S}"
 	epatch "${FILESDIR}/gentoo-${PV}.diff"
+	epatch "${FILESDIR}/gentoo-pythonpath.diff"
 	epatch "${FILESDIR}/ooo-env_log.diff"
 	cp -f "${FILESDIR}/base64.diff" "${S}/patches/hotfixes" || die
 	cp -f "${FILESDIR}/xulrunner-1.9.1.diff" "${S}/patches/hotfixes" || die