Silent Update to ooo-build-2.0.4.2

(Portage version: 2.1.2_rc1-r3)

4 files changed, 12 insertions, 32 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 2bb2fff44b0c..a7d4a6a46528 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.268 2006/11/03 19:12:48 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.269 2006/11/06 08:30:35 suka Exp $
+
+  06 Nov 2006; Andreas Proschofsky <suka@gentoo.org>
+  -files/2.0.4/libgcc3_uno_noexecstack.diff, files/2.0.4/gentoo-2.0.4.diff,
+  -files/2.0.4/pyuno-objects-allocation.diff, openoffice-2.0.4.ebuild:
+  (Silent) Update to ooo-build-2.0.4.2, bunch of bugfixes, also obsoleting 
+  our owncurrent patches.
 
   03 Nov 2006; Andreas Proschofsky <suka@gentoo.org>
   +files/2.0.4/pyuno-objects-allocation.diff, files/2.0.4/gentoo-2.0.4.diff,
diff --git a/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff b/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff
index 0e6f1c65499b..a64755cbb2d1 100644
--- a/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff
+++ b/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff
@@ -20,27 +20,3 @@
  # And here we go.
  exec "$SystemInstallDir/program/$Binary", @ooo_argv
  
---- patches/src680/apply 
-+++ patches/src680/apply 
-@@ -243,6 +243,12 @@
- wizards-crasher-fix.diff, i#68079, michael
- # update pyuno docs from www.oo.o
- pyuno-update-docs.diff, i#63846, michael
-+# replace PyMem_DEL() with PyObject_Del() on object dealloc functions to free
-+# objects the right way (regcomp segfaulted on openSUSE-10.2)
-+# replace PyObject_NEW with PyObject_New because the macro version most
-+# probably does not preserve binary compatibility across Python versions
-+# and is therefore deprecated in extension modules.
-+pyuno-objects-allocation.diff, i#71078, pmladek
- # disable font management dialog in padmin
- padmin-nofontconfig.diff, michael
- # Improve the web bullet export / export to png not gif.
-@@ -1069,6 +1069,8 @@
- 64bit-jdk-server-paths.diff, i#65974, hmth
- # use IBM j9vm over IBM classic JVM
- ibm-j9vm.diff, hmth
-+# Fix for some execstacks in libgcc3_uno.so, i#70845, aprosky
-+libgcc3_uno_noexecstack.diff
- 
- [ DebianBaseOnly ]
- SectionOwner => rengelha
diff --git a/app-office/openoffice/files/digest-openoffice-2.0.4 b/app-office/openoffice/files/digest-openoffice-2.0.4
index a6b5a56c9b8a..8539485774d8 100644
--- a/app-office/openoffice/files/digest-openoffice-2.0.4
+++ b/app-office/openoffice/files/digest-openoffice-2.0.4
@@ -25,9 +25,9 @@ SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149 hunspell
 MD5 2ff7b4c52f9c3937ebe3002798fbc479 lp_solve_5.5.tar.gz 495452
 RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 lp_solve_5.5.tar.gz 495452
 SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1 lp_solve_5.5.tar.gz 495452
-MD5 38a82068e85ca4bc96d088f13e3bedc3 ooo-build-2.0.4.1.tar.gz 4453648
-RMD160 277d4fc0eeeb39b34253da86f0d4fd5c020e56ba ooo-build-2.0.4.1.tar.gz 4453648
-SHA256 7be9022682bc65f77f995f33c91938f2fd83f819377851f77a71790e243d1ae9 ooo-build-2.0.4.1.tar.gz 4453648
+MD5 7002c0390e8611788eacbb1166d7e826 ooo-build-2.0.4.2.tar.gz 4601992
+RMD160 ff788df2f23c05b2d82c7a245ecb369cf5861d42 ooo-build-2.0.4.2.tar.gz 4601992
+SHA256 a773895e0711d0efc7c95e6448b963960b2cbadd056517c5281a729c0421d952 ooo-build-2.0.4.2.tar.gz 4601992
 MD5 e3a0b76dcd876f3d721ee7183729153d unowinreg.dll 6144
 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 unowinreg.dll 6144
 SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c unowinreg.dll 6144
diff --git a/app-office/openoffice/openoffice-2.0.4.ebuild b/app-office/openoffice/openoffice-2.0.4.ebuild
index 536f3bb872db..e08357dca82a 100644
--- a/app-office/openoffice/openoffice-2.0.4.ebuild
+++ b/app-office/openoffice/openoffice-2.0.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4.ebuild,v 1.10 2006/11/03 19:12:48 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4.ebuild,v 1.11 2006/11/06 08:30:35 suka Exp $
 
 inherit check-reqs debug eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions multilib toolchain-funcs
 
 IUSE="binfilter branding cairo cups dbus eds firefox gnome gstreamer gtk kde ldap sound odk pam webdav"
 
-MY_PV="${PV}.1"
+MY_PV="${PV}.2"
 PATCHLEVEL="OOD680"
 SRC="OOO_2_0_4"
 S="${WORKDIR}/ooo"
@@ -175,8 +175,6 @@ src_unpack() {
 
 	#Some fixes for our patchset
 	cd ${S}
-	cp -a ${FILESDIR}/${PV}/libgcc3_uno_noexecstack.diff ${S}/patches/src680 || die
-	cp -a ${FILESDIR}/${PV}/pyuno-objects-allocation.diff ${S}/patches/src680 || die
 	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
 
 	#Use flag checks