Newer beta-release for OOo 3.1

4 files changed, 24 insertions, 60 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index cd0e798cf7c9..2de863f78e02 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/openoffice
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.458 2009/04/25 11:56:53 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.459 2009/05/01 09:10:55 suka Exp $
+
+*openoffice-3.1.0_beta7 (01 May 2009)
+
+  01 May 2009; Andreas Proschofsky <suka@gentoo.org>
+  -openoffice-3.1.0_beta6.ebuild, +openoffice-3.1.0_beta7.ebuild,
+  -files/gentoo-3.1.0_beta6.diff, +files/gentoo-3.1.0_beta7.diff:
+  Newer beta-release for OOo 3.1
 
   25 Apr 2009; Brent Baude <ranger@gentoo.org> openoffice-3.0.1.ebuild:
   Marking openoffice-3.0.1 ~ppc64 for bug 244467
diff --git a/app-office/openoffice/files/gentoo-3.1.0_beta6.diff b/app-office/openoffice/files/gentoo-3.1.0_beta6.diff
deleted file mode 100644
index 7e47734a9536..000000000000
--- a/app-office/openoffice/files/gentoo-3.1.0_beta6.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 
-@@ -97,7 +97,7 @@
- # openmamba
- openmamba: LinuxCommon, GlobalDesktopFiles
- #Gentoo
--GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CairoFonts, BerkeleyDB43, Gcc43, IntegrateExtensions
-+GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CairoFonts, BerkeleyDB43, Gcc43, IntegrateExtensions, OOXMLExport
- GentooUnstable: GentooBase, GentooExperimental
- Gentoo : GentooBase
- Gentoo64: GentooBase
-@@ -1460,10 +1460,6 @@
- 
- # jemalloc, FreeBSD 7 allocator
- jemalloc.diff
--# Sandbox problem with wrong path
--gentoo-sandbox.diff
--# specific JVM search path
--jvm-search-path.diff
- 
- [ GentooOnly ]
- SectionOwner => aprosky
-@@ -1482,6 +1478,10 @@
- config_office-XINC-XLIB-defaults.diff, i#65976
- # linux-headers-2.6.22 issue?!
- linux-headers.diff
-+# Sandbox problem with wrong path
-+gentoo-sandbox.diff
-+# specific JVM search path
-+jvm-search-path.diff
- 
- [ DebianBaseOnly ]
- SectionOwner => rengelha
-@@ -1527,6 +1527,9 @@
- mono-climaker-config.diff
- mono-climaker-bridgetest.diff
- 
-+# Buildfix with Mono 2.2, aprosky
-+buildfix-mono-2-2.diff
-+
- [ VBAObjects ]
- SectionOwner => noelpwer
- 
-
diff --git a/app-office/openoffice/files/gentoo-3.1.0_beta7.diff b/app-office/openoffice/files/gentoo-3.1.0_beta7.diff
new file mode 100644
index 000000000000..4714b0abb0a2
--- /dev/null
+++ b/app-office/openoffice/files/gentoo-3.1.0_beta7.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/openoffice-3.1.0_beta6.ebuild b/app-office/openoffice/openoffice-3.1.0_beta7.ebuild
index 0be315243546..bcbefc488f39 100644
--- a/app-office/openoffice/openoffice-3.1.0_beta6.ebuild
+++ b/app-office/openoffice/openoffice-3.1.0_beta7.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.0_beta6.ebuild,v 1.2 2009/04/25 11:49:54 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.0_beta7.ebuild,v 1.1 2009/05/01 09:10:55 suka Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -9,10 +9,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.0.99.6
+MY_PV=3.0.99.7
 PATCHLEVEL=OOO310
 SRC=OOo_${PV}_src
-MST=ooo310-m10
+MST=ooo310-m11
 DEVPATH=http://download.go-oo.org/${PATCHLEVEL}/${MST}
 S=${WORKDIR}/ooo
 S_OLD=${WORKDIR}/ooo-build-${MY_PV}
@@ -227,7 +227,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/gentoo-${PV}.diff"
 	epatch "${FILESDIR}/ooo-env_log.diff"
-	cp -f "${FILESDIR}/buildfix-mono-2-2.diff" "${S}/patches/dev300" || die
+#	cp -f "${FILESDIR}/buildfix-mono-2-2.diff" "${S}/patches/hotfixes" || die
 	cp -f "${FILESDIR}/base64.diff" "${S}/patches/hotfixes" || die
 
 	#Use flag checks