IO-Compress provides Compress-Zlib and IO-Compress-Base

Package-Manager: portage-2.2_rc33/cvs/Linux i686

5 files changed, 25 insertions, 14 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index ca36201d5bde..5cae2b7a0195 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.468 2009/07/10 23:10:15 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.469 2009/07/19 17:29:08 tove Exp $
+
+  19 Jul 2009; Torsten Veller <tove@gentoo.org> openoffice-3.0.0.ebuild,
+  openoffice-3.0.1.ebuild, openoffice-3.1.0.ebuild:
+  IO-Compress provides Compress-Zlib and IO-Compress-Base
 
   10 Jul 2009; Gordon Malm <gengor@gentoo.org> openoffice-3.0.0.ebuild,
   openoffice-3.0.1.ebuild, openoffice-3.1.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index cf522de323ba..67d3beac0c9f 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX base64.diff 770 RMD160 acea95d2f4ac09ef6252eb9a0e22405858574d51 SHA1 4097bc9406ba568ef2dfe7d8a8bfd43ed153d44d SHA256 fd298c97fd28e765138a18d570a99613df3fa25076fa5d6243e86f9cbb750a03
 AUX buildfix-gcc44.diff 611 RMD160 31e7c33977941458b1472d92c645ed2b2ef64a82 SHA1 ed17195077f5212bfc6f546004f5e6f429b03c14 SHA256 dd66bbe257c9a88c757037d65f48ea4976d7cee8a38e96b6282611c1b70cecff
 AUX buildfix-mono-2-2.diff 523 RMD160 993dee1c2ab796980e7f04f8b9c0aeefc19743c7 SHA1 b2aee23fa2a7d6fb0b1a1d1ca97609bfaaa7f696 SHA256 5f807dd7b892dfa30c177ed20e69c19f50541bfec2f94a2ff1caaa5aa656a324
@@ -79,8 +82,15 @@ DIST ooo310-m11-ure.tar.bz2 5160732 RMD160 fd419b3a6a77dac2d95bc55afba5591bed093
 DIST ooo310-m11-writer.tar.bz2 8955758 RMD160 876e1ecbd0bf8e6dbf9eaa95155868e44c33823f SHA1 fc37627f0a8aab578a64818f713ac87a838c4709 SHA256 093f42b6f102f3f9c7f934bdc071680fa50487628b8107aa335f623f8a770694
 DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD openoffice-3.0.0.ebuild 12712 RMD160 04e5760f2b2d9dad2c2aa15443e35c42187fea0e SHA1 64c97928e4b326e1ee773229bbb0249d0eeacefe SHA256 5469a0cdb80f77ee6f2468cb88824ceeb71fec12c7dd64c8685b888ee3c34aeb
-EBUILD openoffice-3.0.1.ebuild 12242 RMD160 02d5f90be0c3f1963629d2cb8e3441e01cb4ee7c SHA1 2d24806b0d1b8c74d921f1196eba9bce49bfcadd SHA256 599d1c477b4adf36504c1689422c3b5ba1c6a7838167b31dc4afc9f46449c7cd
-EBUILD openoffice-3.1.0.ebuild 12927 RMD160 52b60794f9ba449935abf314dd0be949fb1ed220 SHA1 37f97493bfdaad1303bb1596162e88bda4880337 SHA256 b7b29b6329a09884c9006d9c4ee3ca24c05dfdabde9b412e13ec4838ffbd37e4
-MISC ChangeLog 97704 RMD160 816dcd149101c94b7948131c7d5562adc72e6dad SHA1 c9f50b1d4f9591b3373e616975c5a3065fe898c6 SHA256 c4bbec6512fea38ff2988fa666acf60ebea5ec61e475a933f61aa82c4534723a
+EBUILD openoffice-3.0.0.ebuild 12677 RMD160 7c042b815b207726078cce318b125e7c707d142b SHA1 52f523a4442377597e769be44b21716b8deef557 SHA256 3eca73a70d64aa72ee8668cec902d0f6931b0eaa37d28a7e511c5c250517df34
+EBUILD openoffice-3.0.1.ebuild 12207 RMD160 1392ad771f82c490ec79e32008a80de76758e67e SHA1 4a60380f8f414b54ea777db37e86ce329f5eeb9d SHA256 e8b75b0b8ff1d1e0f413750d7e506c278bdcedd6d36d6f8f6417ace6e9801436
+EBUILD openoffice-3.1.0.ebuild 12892 RMD160 ac7a9ec1485e96d73a36a19dc17bddb1d786b0a9 SHA1 b3e7a3116eae2159a457ee442d625acb78c59ec2 SHA256 71531cdb25d03220023d7f3d99c7234acb2f074f92a1bb62040a74d5b18f0035
+MISC ChangeLog 97886 RMD160 3b6e4aa6bc49a4cc236f7dd9cf3a3577e2506130 SHA1 be551094804d118269466648ffb1d3addd051ee2 SHA256 5fcb24ac3f0d8c70efd96d54fb32e0d4e0d2e85b22ac99c86e955b7430fe6672
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpjWDIACgkQV3J2n04EauxhggCfSy2TjVrRpygOoClaHqxxI/JI
+N0MAnR38vKwBVq5WZuHOsy62fmFP6zmO
+=Mnhb
+-----END PGP SIGNATURE-----
diff --git a/app-office/openoffice/openoffice-3.0.0.ebuild b/app-office/openoffice/openoffice-3.0.0.ebuild
index 0739c0182132..f2bef79e7045 100644
--- a/app-office/openoffice/openoffice-3.0.0.ebuild
+++ b/app-office/openoffice/openoffice-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.26 2009/07/10 23:10:15 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.27 2009/07/19 17:29:08 tove Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -118,9 +118,8 @@ DEPEND="${COMMON_DEPEND}
 	x11-proto/xineramaproto
 	>=sys-apps/findutils-4.1.20-r1
 	dev-perl/Archive-Zip
-	virtual/perl-Compress-Zlib
+	virtual/perl-IO-Compress
 	>=virtual/perl-Compress-Raw-Zlib-2.002
-	virtual/perl-IO-Compress-Base
 	dev-util/pkgconfig
 	dev-util/intltool
 	>=dev-libs/boost-1.33.1
diff --git a/app-office/openoffice/openoffice-3.0.1.ebuild b/app-office/openoffice/openoffice-3.0.1.ebuild
index 12182afb1ae4..f90a82bd495a 100644
--- a/app-office/openoffice/openoffice-3.0.1.ebuild
+++ b/app-office/openoffice/openoffice-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.1.ebuild,v 1.12 2009/07/10 23:10:15 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.1.ebuild,v 1.13 2009/07/19 17:29:08 tove Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -117,9 +117,8 @@ DEPEND="${COMMON_DEPEND}
 	x11-proto/xineramaproto
 	>=sys-apps/findutils-4.1.20-r1
 	dev-perl/Archive-Zip
-	virtual/perl-Compress-Zlib
+	virtual/perl-IO-Compress
 	>=virtual/perl-Compress-Raw-Zlib-2.002
-	virtual/perl-IO-Compress-Base
 	dev-util/pkgconfig
 	dev-util/intltool
 	>=dev-libs/boost-1.33.1
diff --git a/app-office/openoffice/openoffice-3.1.0.ebuild b/app-office/openoffice/openoffice-3.1.0.ebuild
index bbc740523f60..0093e8cec751 100644
--- a/app-office/openoffice/openoffice-3.1.0.ebuild
+++ b/app-office/openoffice/openoffice-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.0.ebuild,v 1.7 2009/07/10 23:10:15 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.0.ebuild,v 1.8 2009/07/19 17:29:08 tove Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -119,9 +119,8 @@ DEPEND="${COMMON_DEPEND}
 	x11-proto/xineramaproto
 	>=sys-apps/findutils-4.1.20-r1
 	dev-perl/Archive-Zip
-	virtual/perl-Compress-Zlib
+	virtual/perl-IO-Compress
 	>=virtual/perl-Compress-Raw-Zlib-2.002
-	virtual/perl-IO-Compress-Base
 	dev-util/pkgconfig
 	dev-util/intltool
 	>=dev-libs/boost-1.33.1