Fix for build breakage on systems without gtk+ see bug #132801

Package-Manager: portage-2.1_pre10-r5

4 files changed, 23 insertions, 18 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 807749a9803d..5e4f17fd8850 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # 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.213 2006/05/06 14:27:53 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.214 2006/05/10 08:49:45 suka Exp $
+
+  10 May 2006; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.2-r1.ebuild:
+  Fix for build breakage on systems without gtk+ see bug #132801, also sync
+  2.0.2-r1 to the latest patchset too
 
   06 May 2006; Andreas Proschofsky <suka@gentoo.org>
   files/2.0.2/gentoo-2.0.2.diff:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 8122186ae848..267cd14940f8 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -20,7 +20,6 @@ DIST extras-2.tar.bz2 94740 RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd SHA2
 DIST hunspell_UNO_1.1.tar.gz 13774 RMD160 9c0c31220d63894c9060a05fd136083b0b017b94 SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149 size 13774
 DIST libwpd-0.8.3.tar.gz 482757 RMD160 f8010300e50e1c43942e6a84a3b526738edb4ed5 SHA256 2221aaa444d29f4a1eacea1a0a939012f02a8aa8e02c178788d68ccc0024170c size 482757
 DIST ooo-build-2.0.1.3.tar.gz 4458527 RMD160 e433e25d58ecb837a7730abf78869c1c27ce687c SHA256 d56698ca4440b3bee2d144b93e742a3beeae045e303dcd6d02d49a696f9ddd28 size 4458527
-DIST ooo-build-2.0.2.8.tar.gz 5245801 RMD160 d5647e9666dd22aaeb264732ac7d6b21f2336d99 SHA256 3b375b23cccdd2bb2aa770376e4b3cb1604e12a7f745a1426e1302582253750b size 5245801
 DIST ooo-build-2.0.2.9.tar.gz 5264791 RMD160 85bbcaf8202be2976a309758a9fffd992a60328c SHA256 b2554e8ae2593079caa193e022e774fe34cee2be7630b0321b35348a65f16649 size 5264791
 DIST ooo_crystal_images-6.tar.bz2 1308872 RMD160 4daa3f2139d479cdeb89f829c6d7089fadb59506 SHA256 3752d54470ace722b11ef6613694f15603295b9b9945d6033dd8eaf3bab921b7 size 1308872
 DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e size 423516
@@ -28,18 +27,18 @@ EBUILD openoffice-2.0.1-r1.ebuild 7334 RMD160 5965630887a411c39608b82352c69b4ab9
 MD5 4036291770fc77e15ca28b0136d44805 openoffice-2.0.1-r1.ebuild 7334
 RMD160 5965630887a411c39608b82352c69b4ab9277194 openoffice-2.0.1-r1.ebuild 7334
 SHA256 7c132d2d10f51786bbd5342aa7bf9777975f6ff378528b7254f04e894cdc37dc openoffice-2.0.1-r1.ebuild 7334
-EBUILD openoffice-2.0.2-r1.ebuild 7836 RMD160 55e30a7f395ec00e5946f0844d415a0ff828f5d7 SHA1 572b8d3d2dcd885daaab989e831d000ff1b7f7b7 SHA256 1320171010179c229d063bd6b35d547ba327a094c4078482d9d936ce5bdd10b7 size 7836
-MD5 e9066e8af898d07905a7b9d8611358f9 openoffice-2.0.2-r1.ebuild 7836
-RMD160 55e30a7f395ec00e5946f0844d415a0ff828f5d7 openoffice-2.0.2-r1.ebuild 7836
-SHA256 1320171010179c229d063bd6b35d547ba327a094c4078482d9d936ce5bdd10b7 openoffice-2.0.2-r1.ebuild 7836
+EBUILD openoffice-2.0.2-r1.ebuild 7852 RMD160 b0774e6fa4fed3dfb225655055dd24e3262c20fb SHA1 085bf84227a9591a4703ed54dad5d12c58c629e0 SHA256 fdf2f30778c37a3f5865ba38f614049155a574bc21a298c6cd3e0364484f5aaf size 7852
+MD5 065bd9a42d4cdffe72778ad43bdd642b openoffice-2.0.2-r1.ebuild 7852
+RMD160 b0774e6fa4fed3dfb225655055dd24e3262c20fb openoffice-2.0.2-r1.ebuild 7852
+SHA256 fdf2f30778c37a3f5865ba38f614049155a574bc21a298c6cd3e0364484f5aaf openoffice-2.0.2-r1.ebuild 7852
 EBUILD openoffice-2.0.2-r2.ebuild 7960 RMD160 7ec289691e402ab2ebecd78fab6d51cd18e9c0b5 SHA1 b87f4c0618232b52f5787e8f1451c26bfb899e97 SHA256 decbd4a0c1b3329e5d0fe28dc047df2a8c7de277276826b4a92e59cf751caf60 size 7960
 MD5 b1f45b263a538dc8f8d51499e3aed5f2 openoffice-2.0.2-r2.ebuild 7960
 RMD160 7ec289691e402ab2ebecd78fab6d51cd18e9c0b5 openoffice-2.0.2-r2.ebuild 7960
 SHA256 decbd4a0c1b3329e5d0fe28dc047df2a8c7de277276826b4a92e59cf751caf60 openoffice-2.0.2-r2.ebuild 7960
-MISC ChangeLog 45697 RMD160 2fb194e835a02c009b6b70a36826fd137dacacfa SHA1 f816ab9568324db160066f01253a6bd78317e53d SHA256 54833566ee2e7995392da90582f613a3c3fc576c2e0abd72bc06f729d2059ed2 size 45697
-MD5 858fbadd797ea8338afa003e9f4d0197 ChangeLog 45697
-RMD160 2fb194e835a02c009b6b70a36826fd137dacacfa ChangeLog 45697
-SHA256 54833566ee2e7995392da90582f613a3c3fc576c2e0abd72bc06f729d2059ed2 ChangeLog 45697
+MISC ChangeLog 45895 RMD160 380eb42a50bd53d2f9c2cc6760f1dacdd573d17f SHA1 ccc3eda95f5d9462e819c95564115a4bda436793 SHA256 2a51ce9b8c61f63ee4ab3d1ddb10361eeddae60031032f71f6b085acf39884ac size 45895
+MD5 d913fc4aea589938bd0363339f790562 ChangeLog 45895
+RMD160 380eb42a50bd53d2f9c2cc6760f1dacdd573d17f ChangeLog 45895
+SHA256 2a51ce9b8c61f63ee4ab3d1ddb10361eeddae60031032f71f6b085acf39884ac ChangeLog 45895
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 size 461
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
@@ -47,9 +46,9 @@ SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata
 MD5 9017e3971f27ac77833ae962069feccf files/digest-openoffice-2.0.1-r1 2024
 RMD160 94f476c151e7c42212f2d6dd05b48443ca784e1e files/digest-openoffice-2.0.1-r1 2024
 SHA256 ac0d68a776f61080710f7f031ed79457a1f1a30bc24abcc85a563ce1df2d9d46 files/digest-openoffice-2.0.1-r1 2024
-MD5 66e16028af37883ac05e4fd449b34470 files/digest-openoffice-2.0.2-r1 2726
-RMD160 2831719f70db4c2cb4fc63046f4d716b229599b2 files/digest-openoffice-2.0.2-r1 2726
-SHA256 24d5e8a0668ca26fc6f5581df38f221abeb0b10836cfec45dc3b5ee92a3dbf76 files/digest-openoffice-2.0.2-r1 2726
+MD5 6bcbe1ca58070e6f6cd1a08d1be6383b files/digest-openoffice-2.0.2-r1 2726
+RMD160 3be6f0c09b95f16ce8c1729d3fcb126e8fa95cf2 files/digest-openoffice-2.0.2-r1 2726
+SHA256 6a7747e57ed4e4280416af3b022935a8ce9a0be7aca75cec66e082796e128d8d files/digest-openoffice-2.0.2-r1 2726
 MD5 6bcbe1ca58070e6f6cd1a08d1be6383b files/digest-openoffice-2.0.2-r2 2726
 RMD160 3be6f0c09b95f16ce8c1729d3fcb126e8fa95cf2 files/digest-openoffice-2.0.2-r2 2726
 SHA256 6a7747e57ed4e4280416af3b022935a8ce9a0be7aca75cec66e082796e128d8d files/digest-openoffice-2.0.2-r2 2726
diff --git a/app-office/openoffice/files/digest-openoffice-2.0.2-r1 b/app-office/openoffice/files/digest-openoffice-2.0.2-r1
index be2c97d33a15..a429b0501bb5 100644
--- a/app-office/openoffice/files/digest-openoffice-2.0.2-r1
+++ b/app-office/openoffice/files/digest-openoffice-2.0.2-r1
@@ -25,9 +25,9 @@ SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149 hunspell
 MD5 f34404f8dc6123aca156d203c37e3e5d libwpd-0.8.3.tar.gz 482757
 RMD160 f8010300e50e1c43942e6a84a3b526738edb4ed5 libwpd-0.8.3.tar.gz 482757
 SHA256 2221aaa444d29f4a1eacea1a0a939012f02a8aa8e02c178788d68ccc0024170c libwpd-0.8.3.tar.gz 482757
-MD5 6d251634bb4b73e10cc4940362468ef2 ooo-build-2.0.2.8.tar.gz 5245801
-RMD160 d5647e9666dd22aaeb264732ac7d6b21f2336d99 ooo-build-2.0.2.8.tar.gz 5245801
-SHA256 3b375b23cccdd2bb2aa770376e4b3cb1604e12a7f745a1426e1302582253750b ooo-build-2.0.2.8.tar.gz 5245801
+MD5 1e2a57fc285e5b58473d68045eaa89b9 ooo-build-2.0.2.9.tar.gz 5264791
+RMD160 85bbcaf8202be2976a309758a9fffd992a60328c ooo-build-2.0.2.9.tar.gz 5264791
+SHA256 b2554e8ae2593079caa193e022e774fe34cee2be7630b0321b35348a65f16649 ooo-build-2.0.2.9.tar.gz 5264791
 MD5 0395e6e7da27c1cea7e1852286f6ccf9 xt-20051206-src-only.zip 423516
 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d xt-20051206-src-only.zip 423516
 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e xt-20051206-src-only.zip 423516
diff --git a/app-office/openoffice/openoffice-2.0.2-r1.ebuild b/app-office/openoffice/openoffice-2.0.2-r1.ebuild
index b4b4a7a72815..e7f57db1cda7 100644
--- a/app-office/openoffice/openoffice-2.0.2-r1.ebuild
+++ b/app-office/openoffice/openoffice-2.0.2-r1.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.2-r1.ebuild,v 1.4 2006/05/03 19:42:10 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.2-r1.ebuild,v 1.5 2006/05/10 08:49:45 suka Exp $
 
 inherit check-reqs eutils fdo-mime flag-o-matic kde-functions mono toolchain-funcs
 
 IUSE="binfilter cairo eds gnome gtk java kde ldap mono mozilla xml"
 
-MY_PV="${PV}.8"
+MY_PV="${PV}.9"
 PATCHLEVEL="OOB680"
 SRC="OOO_2_0_2"
 S="${WORKDIR}/ooo-build-${MY_PV}"
@@ -81,6 +81,7 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	>=net-misc/curl-7.9.8
 	sys-libs/zlib
+	sys-apps/coreutils
 	sys-libs/pam
 	!dev-util/dmake
 	>=dev-lang/python-2.3.4