Update to newer ooo-build-snapshot

(Portage version: 2.1.3.9)

4 files changed, 23 insertions, 82 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 4ef394b74b84..054caecfcbdb 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.337 2007/09/18 07:27:55 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.338 2007/09/18 11:23:58 suka Exp $
+
+  18 Sep 2007; Andreas Proschofsky <suka@gentoo.org>
+  files/2.3.0/gentoo-2.3.0.diff, openoffice-2.3.0.ebuild:
+  Update to newer ooo-build-snapshot. This fixes the problem of the wrong
+  version number on the splash, but mostly brings a few patches upstream.
 
 *openoffice-2.3.0 (18 Sep 2007)
 
diff --git a/app-office/openoffice/files/2.3.0/gentoo-2.3.0.diff b/app-office/openoffice/files/2.3.0/gentoo-2.3.0.diff
index 3c1c5420d81c..fbb5bb759d5b 100644
--- a/app-office/openoffice/files/2.3.0/gentoo-2.3.0.diff
+++ b/app-office/openoffice/files/2.3.0/gentoo-2.3.0.diff
@@ -8,68 +8,6 @@
  EOT
      chmod 755 $1
  }
---- patches/src680/apply 
-+++ patches/src680/apply 
-@@ -80,8 +80,8 @@
- Frugalware: LinuxCommon, GnomeVFS, GlobalDesktopFiles, NonArkCommon, NoRpath, NovellOnly, NovellOnlyUnix, NotDebian, FrugalwareOnly, CalcSolver, OOXML
- QiLinux: LinuxCommon, GlobalDesktopFiles
- #Gentoo
--GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, CairoFonts, BerkeleyDB43, STLport5
--GentooUnstable: GentooBase, GentooExperimental, OOXML, OOXSTLport5
-+GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, CairoFonts, BerkeleyDB43, STLport5, OOXML, OOXSTLport5
-+GentooUnstable: GentooBase, GentooExperimental
- Gentoo : GentooBase
- Gentoo64: GentooBase
- # rPath Linux
-@@ -719,6 +719,10 @@
- 
- # fixes linking dependency in the reportdesign module
- buildfix-reportdesign-util-dep.diff, i#81550, pmladek
-+
-+# don't define -DCURL_NO_OLDIES, breaks with curl 7.17.0
-+# Debian #442338, Debian #442368
-+ucb-no-CURL_NO_OLDIES.diff
- 
- [ NovellOnlyWin32 ]
- SectionOwner => tml
-@@ -1055,18 +1055,8 @@
- [ GentooExperimental ]
- SectionOwner => hmth
- 
--# deliver - sshhhh....
--silent_deliver-i79798.diff, i#79798
- # Gnu JRE paths.
- gentooexperimental-gnujre.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
- 
- [ GentooOnly ]
- SectionOwner => aprosky
-@@ -1081,6 +1071,17 @@
- system-db-check.diff, i#65979, hmth
- # User ~/.ooo-2.0 as user dir
- scp2-user-config-ooo-2.0.diff, pmladek
-+# deliver - sshhhh....
-+silent_deliver-i79798.diff, i#79798
-+# 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
-+
- 
- [ DebianBaseOnly ]
- SectionOwner => rengelha
-
 --- distro-configs/Gentoo.conf.in 
 +++ distro-configs/Gentoo.conf.in 
 @@ -3,7 +3,6 @@
@@ -80,15 +18,15 @@
  --with-system-boost
  --with-system-curl
  --with-system-db
---- configure.in 
-+++ configure.in 
-@@ -1024,7 +1024,7 @@
- UPSTREAM_NAME=
- UPSTREAM_SOURCE=
- UPSTREAM_URI=
--if test "$with_tag" = "OOG680_m3" ; then # more milestones to come...
-+if test "$with_tag" = "OOG680_m5" ; then # more milestones to come...
-    UPSTREAM_NAME="OOo_2.3.0_src"
-    if test "z$with_mirror" != "z" ; then
-       UPSTREAM_SOURCE="MIRROR"
+--- patches/src680/apply 
++++ patches/src680/apply 
+@@ -145,7 +145,7 @@
+ # crashes with undo/redo
+ 
+ #realize a new feature named as Show Data Form in OpenOffice
+-sc-dataform.diff, Amelia Wang
++#sc-dataform.diff, Amelia Wang
+ 
+ #First work on field enhancements...
+ sw-field-patch.diff, flr, n#248354
 
diff --git a/app-office/openoffice/files/digest-openoffice-2.3.0 b/app-office/openoffice/files/digest-openoffice-2.3.0
index 8dc6e7f7ab04..7a8ca443d153 100644
--- a/app-office/openoffice/files/digest-openoffice-2.3.0
+++ b/app-office/openoffice/files/digest-openoffice-2.3.0
@@ -25,9 +25,9 @@ SHA256 c3c4e0a63b0d1e2a3063172b44c722dde84608c3675fb124bb6f7e00f270379e libwps-0
 MD5 26b3e95ddf3d9c077c480ea45874b3b8 lp_solve_5.5.0.10_source.tar.gz 769268
 RMD160 17e16c6c9fe9807e148d0b96bd8a3b41953681f6 lp_solve_5.5.0.10_source.tar.gz 769268
 SHA256 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695 lp_solve_5.5.0.10_source.tar.gz 769268
-MD5 b3d2f355af570accb8b2ac61cdba261e ooo-build-2.3.0.1.2.tar.gz 6103972
-RMD160 7359a6269662baa8f63853b2597438eeac1f7284 ooo-build-2.3.0.1.2.tar.gz 6103972
-SHA256 f7f4342b470e249e0353789e92aa4704bc26624841bb2a1ca4e4d19c198beac3 ooo-build-2.3.0.1.2.tar.gz 6103972
+MD5 ec8f1c58be702c4e7729d7a0d1830800 ooo-build-2.3.0.1.90.tar.gz 7849585
+RMD160 f9a2a2256b413c5fe5bd40b27c465318bff8a890 ooo-build-2.3.0.1.90.tar.gz 7849585
+SHA256 2ea74f0b3d2030bd4194490bf69aec198072c2674d1ca3726184c7c1ff0797b6 ooo-build-2.3.0.1.90.tar.gz 7849585
 MD5 42aceb3508ff8b5ed04d0451b30f6ccf oox.2007-09-05.tar.bz2 357665
 RMD160 7c098136d35b4e6bc9ffa6c26ed0aa7cbd9fef13 oox.2007-09-05.tar.bz2 357665
 SHA256 29014ae9c3a69161933dae63133568d5b34d3d7ce734673a63c8c01c70d14769 oox.2007-09-05.tar.bz2 357665
diff --git a/app-office/openoffice/openoffice-2.3.0.ebuild b/app-office/openoffice/openoffice-2.3.0.ebuild
index d9eeaf9ec89a..623e958a4f43 100644
--- a/app-office/openoffice/openoffice-2.3.0.ebuild
+++ b/app-office/openoffice/openoffice-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.0.ebuild,v 1.1 2007/09/18 07:27:55 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.0.ebuild,v 1.2 2007/09/18 11:23:58 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -9,7 +9,7 @@ inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2
 
 IUSE="binfilter cairo cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono sound odk pam seamonkey webdav xulrunner"
 
-MY_PV="2.3.0.1.2"
+MY_PV="2.3.0.1.90"
 PATCHLEVEL="OOG680"
 SRC="OOo_${PV}_src"
 S="${WORKDIR}/ooo"
@@ -19,7 +19,7 @@ DESCRIPTION="OpenOffice.org, a full office productivity suite."
 
 SRC_URI="mirror://openoffice/stable/${PV}/${SRC}_core.tar.bz2
 	binfilter? ( mirror://openoffice/stable/${PV}/${SRC}_binfilter.tar.bz2 )
-	http://go-oo.org/packages/OOG680/ooo-build-${MY_PV}.tar.gz
+	mirror://gentoo/ooo-build-${MY_PV}.tar.gz
 	odk? ( mirror://openoffice/stable/${PV}/${SRC}_sdk.tar.bz2
 		java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
 	http://go-oo.org/packages/SRC680/extras-2.tar.bz2
@@ -200,8 +200,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
 	epatch ${FILESDIR}/${PV}/ooo-env_log.diff
 
-	cp -f ${FILESDIR}/${PV}/ucb-no-CURL_NO_OLDIES.diff ${S}/patches/src680 || die
-
 	if use ppc ; then
 		cp -f ${FILESDIR}/${PV}/disable-regcomp-java.diff ${S}/patches/src680 || die
 		cp -f ${FILESDIR}/${PV}/disable-regcomp-python.diff ${S}/patches/src680 || die