Update to new ooo-build-2.0.1.1 release, mostly containing bugfixes

Package-Manager: portage-2.1_pre3-r1

5 files changed, 14 insertions, 32 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 370c09104cb4..acf6ca9aeaa9 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # 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.169 2006/01/17 18:59:22 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.170 2006/01/18 12:02:06 suka Exp $
+
+  18 Jan 2006; Andreas Proschofsky <suka@gentoo.org>
+  -files/2.0.1/noquickstarter.diff, openoffice-2.0.1.ebuild:
+  Update to new ooo-build-2.0.1.1 release, mostly containing bugfixes
 
   17 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   openoffice-2.0.0.ebuild, openoffice-2.0.1.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 2c695fa68f66..b9b1d26b9936 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 41dd69d751733142b8eb06a7f6c88e12 ChangeLog 36761
+MD5 084af5031ea70400399d02db5c5d8a9a ChangeLog 36942
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.4/build-new-xslt.diff 650
 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598
@@ -37,21 +34,13 @@ MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.5/pthreadlink-fix.patch 1133
 MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475
 MD5 500f7e71be57d40b0a8042cab1484df9 files/2.0.1/alwayscrystal.diff 3222
 MD5 e990584aa63a1636aa84ba22c568383b files/2.0.1/gentoo-gcc-version.diff 361
-MD5 88bf8cd578cde25c883e4fd2f9f0ea89 files/2.0.1/noquickstarter.diff 495
 MD5 22c906b692d3cd8ac18549d2a82285e3 files/2.0.1/ooo-build-gentoo-gcc-version.diff 315
 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325
 MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322
 MD5 f43c98cba404ee89be6bed4f785dfd00 files/digest-openoffice-2.0.0 478
-MD5 0130abb512287d7604fd27cfd3839dc8 files/digest-openoffice-2.0.1 550
+MD5 5cba4a6aa38cbfc6b9b91671aa500dd6 files/digest-openoffice-2.0.1 552
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 eae9be6a4eb2de3c689d24cb348d0b9c openoffice-1.1.4-r1.ebuild 16659
 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
 MD5 ece6469b501209c7971a74c4dd0fbae8 openoffice-2.0.0.ebuild 7072
-MD5 eb1c990ff0821383a1b8dc77bbdb87da openoffice-2.0.1.ebuild 7598
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDzT6aKRy60XGEcJIRAhT1AJwNxcKS/EtrVP1S4j0Cl1tw/XHVwACgj92h
-SWezdrF4ibOdXnez3tG4R7E=
-=DSP7
------END PGP SIGNATURE-----
+MD5 f908949613e9781cf1ebfd054e289628 openoffice-2.0.1.ebuild 7547
diff --git a/app-office/openoffice/files/2.0.1/noquickstarter.diff b/app-office/openoffice/files/2.0.1/noquickstarter.diff
deleted file mode 100644
index 60ac1eca9cfd..000000000000
--- a/app-office/openoffice/files/2.0.1/noquickstarter.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- patches/src680/apply
-+++ patches/src680/apply
-@@ -14,7 +14,7 @@
- Safe64bit : 64bitForUpstream, NumberFormat, Trivial
- LinuxCommon : Common, LinuxOnly, SystemBits, CWSBackports, GCJ, \
- 	      QPro, Lwp, cairocanvas, VBAObjects, msaccess, \
--	      FPickers, Mono, AddressBooks, QuickStarter
-+	      FPickers, Mono, AddressBooks
- Win32Common : Common, NotDebian
- 64bit : Safe64bit, 64bitPatches, 64bitUnsorted
- # Binfilter patches: a special distro; applied only when building with binfilter
diff --git a/app-office/openoffice/files/digest-openoffice-2.0.1 b/app-office/openoffice/files/digest-openoffice-2.0.1
index 176bb4d8c5b2..dedd0ce572af 100644
--- a/app-office/openoffice/files/digest-openoffice-2.0.1
+++ b/app-office/openoffice/files/digest-openoffice-2.0.1
@@ -4,5 +4,5 @@ MD5 694a196fbcc4f9eb0bdd84656b6b6b2d OOO_2_0_1-lang.tar.bz2 55193297
 MD5 642eaffe89f652358de8261618b3d016 OOO_2_0_1-system.tar.bz2 22499081
 MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740
 MD5 f34404f8dc6123aca156d203c37e3e5d libwpd-0.8.3.tar.gz 482757
-MD5 efa2962487704143767bab8fa08b9477 ooo-build-2.0.1.tar.gz 4327625
+MD5 724851d5b18c2cbab365f547d3ebd9c1 ooo-build-2.0.1.1.tar.gz 4466618
 MD5 586d0f26b3f79d89bbb5b25b874e3df6 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 0c936c8d8cf6..629e39bed3d0 100644
--- a/app-office/openoffice/openoffice-2.0.1.ebuild
+++ b/app-office/openoffice/openoffice-2.0.1.ebuild
@@ -1,14 +1,15 @@
 # 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.10 2006/01/17 18:59:22 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1.ebuild,v 1.11 2006/01/18 12:02:06 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
 IUSE="binfilter curl eds gnome gtk java kde ldap mozilla zlib xml2"
 
+MY_PV="${PV}.1"
 PATCHLEVEL="OOA680"
 SRC="OOO_2_0_1"
-S="${WORKDIR}/ooo-build-${PV}"
+S="${WORKDIR}/ooo-build-${MY_PV}"
 CONFFILE="${S}/distro-configs/Gentoo.conf.in"
 DESCRIPTION="OpenOffice.org, a full office productivity suite."
 
@@ -16,7 +17,7 @@ SRC_URI="http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-core.tar.bz2
 	http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-system.tar.bz2
 	http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-lang.tar.bz2
 	binfilter? ( http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-binfilter.tar.bz2 )
-	http://go-oo.org/packages/${PATCHLEVEL}/ooo-build-${PV}.tar.gz
+	http://go-oo.org/packages/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
 	http://go-ooo.org/packages/libwpd/libwpd-0.8.3.tar.gz
 	http://go-oo.org/packages/SRC680/ooo_crystal_images-6.tar.bz2
 	http://go-oo.org/packages/SRC680/extras-2.tar.bz2"
@@ -133,11 +134,10 @@ pkg_setup() {
 
 src_unpack() {
 
-	unpack ooo-build-${PV}.tar.gz
+	unpack ooo-build-${MY_PV}.tar.gz
 
 	#Some fixes for our patchset
 	cd ${S}
-	use !gnome && use !gtk && epatch ${FILESDIR}/${PV}/noquickstarter.diff
 	epatch ${FILESDIR}/${PV}/alwayscrystal.diff
 	cp ${FILESDIR}/${PV}/gentoo-gcc-version.diff ${S}/patches/src680/ || die
 	epatch ${FILESDIR}/${PV}/ooo-build-gentoo-gcc-version.diff