Update to ooo-build-2.0.1.3

(Portage version: 2.1_pre4-r1)

5 files changed, 26 insertions, 51 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index cd5af5efbb4e..883b92bc9255 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.182 2006/01/29 12:12:41 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.183 2006/02/02 07:09:40 suka Exp $
+
+  02 Feb 2006; Andreas Proschofsky <suka@gentoo.org>
+  -files/2.0.1/gentoo-pax.diff, -files/2.0.1/gentoo-2.0.1.diff,
+  openoffice-2.0.1.ebuild:
+  Update to ooo-build-2.0.1.3, just a little maintenance release, some small
+  bug fixes
 
   29 Jan 2006; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.1.ebuild:
diff --git a/app-office/openoffice/files/2.0.1/gentoo-2.0.1.diff b/app-office/openoffice/files/2.0.1/gentoo-2.0.1.diff
deleted file mode 100644
index 38db0e432933..000000000000
--- a/app-office/openoffice/files/2.0.1/gentoo-2.0.1.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- patches/src680/apply
-+++ patches/src680/apply
-@@ -976,6 +976,8 @@
- stlport-ppc-buildfix.diff
- # Re-add DicOOo
- gentoo-dicooo.diff
-+# Allow build to proceed with PaX enabled
-+gentoo-pax.diff
- 
- #
- # NOTE: 64 bit OOo is work in progress!
diff --git a/app-office/openoffice/files/2.0.1/gentoo-pax.diff b/app-office/openoffice/files/2.0.1/gentoo-pax.diff
deleted file mode 100644
index e0b4700e6555..000000000000
--- a/app-office/openoffice/files/2.0.1/gentoo-pax.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- solenv/inc/unxlngi4.mk.orig	2005-10-29 17:09:48.000000000 +0200
-+++ solenv/inc/unxlngi4.mk	2005-10-29 17:18:46.000000000 +0200
-@@ -138,8 +138,8 @@
- LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
- 
- # linker flags for linking applications
--LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
--LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
- 
- # linker flags for linking shared libraries
- LINKFLAGSSHLGUI= -shared
---- solenv/inc/unxlngi6.mk.orig	2005-10-29 17:16:27.000000000 +0200
-+++ solenv/inc/unxlngi6.mk	2005-10-29 17:19:08.000000000 +0200
-@@ -147,8 +147,8 @@
- LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
- 
- # linker flags for linking applications
--LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
--LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
- 
- # linker flags for linking shared libraries
- LINKFLAGSSHLGUI= -shared
diff --git a/app-office/openoffice/files/digest-openoffice-2.0.1 b/app-office/openoffice/files/digest-openoffice-2.0.1
index 21cd90859ff1..5cc6218cb96d 100644
--- a/app-office/openoffice/files/digest-openoffice-2.0.1
+++ b/app-office/openoffice/files/digest-openoffice-2.0.1
@@ -1,8 +1,24 @@
 MD5 4e50fd0fb02155edc410e9fea01e5c59 OOO_2_0_1-binfilter.tar.bz2 18062219
+RMD160 2ff50011435543209c3d7956e43c239ac4551450 OOO_2_0_1-binfilter.tar.bz2 18062219
+SHA256 eb9418d43c23e85d4507de43a2b94287203f440a147b12ab9554a7ebd5722df8 OOO_2_0_1-binfilter.tar.bz2 18062219
 MD5 fc0a44c3344c2274b4ea2ee1a8501df5 OOO_2_0_1-core.tar.bz2 109793621
+RMD160 39af65ae67c6db30b39327da5821064af390a205 OOO_2_0_1-core.tar.bz2 109793621
+SHA256 a24c5021504fa930df563ed003776499579b925515a0b4a31c52fee895910ef3 OOO_2_0_1-core.tar.bz2 109793621
 MD5 694a196fbcc4f9eb0bdd84656b6b6b2d OOO_2_0_1-lang.tar.bz2 55193297
+RMD160 fad1e8181d9156decd9f34c10e1752c50ce5a41a OOO_2_0_1-lang.tar.bz2 55193297
+SHA256 75775d4dd704298e25c6235e9d110495a10982d4d96bd9cac9498b19d014d705 OOO_2_0_1-lang.tar.bz2 55193297
 MD5 642eaffe89f652358de8261618b3d016 OOO_2_0_1-system.tar.bz2 22499081
+RMD160 c234eb650b0ac66177a1182cea8048b65574f2ce OOO_2_0_1-system.tar.bz2 22499081
+SHA256 ba828b1e3fa7b0bc010e51e0927167ce2fb4dad00bc305d552b0e0403f651007 OOO_2_0_1-system.tar.bz2 22499081
 MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740
+RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd extras-2.tar.bz2 94740
+SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863 extras-2.tar.bz2 94740
 MD5 f34404f8dc6123aca156d203c37e3e5d libwpd-0.8.3.tar.gz 482757
-MD5 d1fa1071b3f2322d33216aaac65eb349 ooo-build-2.0.1.2.tar.gz 4459486
+RMD160 f8010300e50e1c43942e6a84a3b526738edb4ed5 libwpd-0.8.3.tar.gz 482757
+SHA256 2221aaa444d29f4a1eacea1a0a939012f02a8aa8e02c178788d68ccc0024170c libwpd-0.8.3.tar.gz 482757
+MD5 a80519e90879edd2f476dc9c46fdc05d ooo-build-2.0.1.3.tar.gz 4458527
+RMD160 e433e25d58ecb837a7730abf78869c1c27ce687c ooo-build-2.0.1.3.tar.gz 4458527
+SHA256 d56698ca4440b3bee2d144b93e742a3beeae045e303dcd6d02d49a696f9ddd28 ooo-build-2.0.1.3.tar.gz 4458527
 MD5 586d0f26b3f79d89bbb5b25b874e3df6 ooo_crystal_images-6.tar.bz2 1308872
+RMD160 4daa3f2139d479cdeb89f829c6d7089fadb59506 ooo_crystal_images-6.tar.bz2 1308872
+SHA256 3752d54470ace722b11ef6613694f15603295b9b9945d6033dd8eaf3bab921b7 ooo_crystal_images-6.tar.bz2 1308872
diff --git a/app-office/openoffice/openoffice-2.0.1.ebuild b/app-office/openoffice/openoffice-2.0.1.ebuild
index 57ba89561fbe..d10abde2255d 100644
--- a/app-office/openoffice/openoffice-2.0.1.ebuild
+++ b/app-office/openoffice/openoffice-2.0.1.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.1.ebuild,v 1.22 2006/01/29 12:12:41 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1.ebuild,v 1.23 2006/02/02 07:09:40 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
 IUSE="binfilter curl eds gnome gtk java kde ldap mozilla xml2"
 
-MY_PV="${PV}.2"
+MY_PV="${PV}.3"
 PATCHLEVEL="OOA680"
 SRC="OOO_2_0_1"
 S="${WORKDIR}/ooo-build-${MY_PV}"
@@ -140,8 +140,6 @@ src_unpack() {
 	#Some fixes for our patchset
 	cd ${S}
 	epatch ${FILESDIR}/${PV}/alwayscrystal.diff
-	cp ${FILESDIR}/${PV}/gentoo-pax.diff ${S}/patches/src680/ || die
-	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
 
 	#Use flag checks
 	use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} || echo "--without-java" >> ${CONFFILE}
@@ -158,14 +156,6 @@ src_unpack() {
 	echo "`use_enable gnome gnome-vfs`" >> ${CONFFILE}
 	echo "`use_enable gnome lockdown`" >> ${CONFFILE}
 
-	# Gentoo installs both static and dynamic libraries for Xinerama;
-	# Openoffice configure defaults to static if both are present,
-	# unless --with-dynamic-xinerama is specified.  Without this,
-	# libvclplug_gen680li.so links to the static library causing
-	# unnecessary TEXTRELs. This option only takes effect when
-	# both libraries are present so it's safe to enable always.
-	echo "--with-dynamic-xinerama" >> ${CONFFILE}
-
 }
 
 src_compile() {