app-office/openoffice-infra: Fix dependency (virtual/perl-IO-Compress-Base and virtua...

svn path=/sunrise/; revision=8870

diff --git a/app-office/openoffice-infra/ChangeLog b/app-office/openoffice-infra/ChangeLog
index bd88731c7e4555a6d35db4514d6de4e064dae5af..71cd19c27fc49ed1050773004ca29d34ebadb8f6 100644 (file)
--- a/app-office/openoffice-infra/ChangeLog
+++ b/app-office/openoffice-infra/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Jul 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  openoffice-infra-3.0.1.ebuild, openoffice-infra-3.1.0.ebuild:
+  Fix dependency (virtual/perl-IO-Compress-Base and virtual/perl-Compress-Zlib
+  got masked)
+
   29 Jun 2009; Yar Odin (yarodin) <yarodin@gmail.com>
   +files/3.0.1/vba-basic-parallel-build.diff, openoffice-infra-3.0.1.ebuild,
   openoffice-infra-3.1.0.ebuild, files/3.1.0/gentoo-infra-gentoo.diff,

diff --git a/app-office/openoffice-infra/Manifest b/app-office/openoffice-infra/Manifest
index b4db18226c076a13af4e894109db3793062c40c3..1252cbe8103ea9366ffb40b1df555a389fb43d98 100644 (file)
--- a/app-office/openoffice-infra/Manifest
+++ b/app-office/openoffice-infra/Manifest
@@ -34,7 +34,7 @@ DIST OOo_3.1.0_src_system.tar.bz2 53314585 RMD160 9ffd6694d4cdd7d3f4f8fd6aaf1ffa
 DIST infra-ooo-files_3.0.1.tar.gz 20712561 RMD160 76be30a30f6cd859a2342018550fc48637518d06 SHA1 28a79a28769548d0bf39fdb8c1bfa2f14e97576b SHA256 2b4daca6b551f71a31c0746d5be63ce7a126b5d281041222f8c637b3b522d411
 DIST infra-ooo-files_3.1.0.tar.gz 14893448 RMD160 137a78f9c77bff141e6f8138c53a11d2217719d8 SHA1 9f86b12773ab781b8ea4c18261eccce850807c11 SHA256 e70ca0680388e1355e4ab9136888972724698fec1c9e9079d89509e91f09e0e0
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD openoffice-infra-3.0.1.ebuild 24299 RMD160 bf7774685a59c3808f0229edecf500d4c7eb58fc SHA1 1154b399c3559351288bd4c587f331be527334a7 SHA256 4ca4dd52198d116273b237d6fc9381fd39644e0809db822bf259ebe29edf2b1d
-EBUILD openoffice-infra-3.1.0.ebuild 23999 RMD160 d8815225798721a110644c08d8ae82480ccfaf52 SHA1 6de1ede4b0fc96e1a7f956dbc4afe66dab6867f0 SHA256 60a5d9a28d8794325212574d0463b0472ca87962790b2d800469e639919facb2
-MISC ChangeLog 7442 RMD160 8c2dc42c412a678587fe2edb69a6e5f91099200d SHA1 9b4bf69435f877cb0bd87b192f31f696a4d28b15 SHA256 f844cec0318660bb66716b6db57985e0641533130a8dbb3ef51bb5d7c6d6197f
+EBUILD openoffice-infra-3.0.1.ebuild 24226 RMD160 34073e3198d84c9ab287023577b069ceba420e86 SHA1 cf7947c128782515966cac14e8e35fa1ee4519fa SHA256 ed08d031ed6bccb3292fda935014268cc701304795d539e244108562c0770201
+EBUILD openoffice-infra-3.1.0.ebuild 23926 RMD160 f456db9a170bf54f688d767eb6d645442ecfcff0 SHA1 c2434f70268c4928ae0b48b8fd0f2e6eb7c8abb6 SHA256 5eb2a201497ca444577748393494c428e854b9161b94465e1ba57e4cfd7347fb
+MISC ChangeLog 7659 RMD160 25d5c51395ce825685acaf5339c6cdc5f737947e SHA1 492474c7200bb7319479ac0aee196ad0a9536df3 SHA256 c80e817161d773cccd64dd268a2b489b8ec84d2d3cbb57aa4f2095e53b772b30
 MISC metadata.xml 792 RMD160 49e85491fc9d94fe35bc920ce42fd8d50b9d3c83 SHA1 8dc753d1070e92d715be182de51d9168d13368c6 SHA256 a41c190a51e34cfa042f6aa1914dd646fa6ab47ad25a1bab4d011c33a5d4f154

diff --git a/app-office/openoffice-infra/openoffice-infra-3.0.1.ebuild b/app-office/openoffice-infra/openoffice-infra-3.0.1.ebuild
index c12dd07b2077e8d6727ab0308209369b644cb1b2..ec42b3aa6d0c1f4ea67a1a438287682f5d960240 100644 (file)
--- a/app-office/openoffice-infra/openoffice-infra-3.0.1.ebuild
+++ b/app-office/openoffice-infra/openoffice-infra-3.0.1.ebuild
@@ -97,9 +97,7 @@ DEPEND="${COMMON_DEPEND}
        x11-proto/xineramaproto
        >=sys-apps/findutils-4.1.20-r1
        dev-perl/Archive-Zip
-       virtual/perl-Compress-Zlib
-       >=virtual/perl-Compress-Raw-Zlib-2.002
-       virtual/perl-IO-Compress-Base
+       virtual/perl-IO-Compress
        dev-util/pkgconfig
        dev-util/intltool
        >=dev-libs/boost-1.33.1

diff --git a/app-office/openoffice-infra/openoffice-infra-3.1.0.ebuild b/app-office/openoffice-infra/openoffice-infra-3.1.0.ebuild
index 87681e5d787ddc673a32adda5941c3a1efa25224..730dd75707844c57f84df667cc724392c1aaebb0 100644 (file)
--- a/app-office/openoffice-infra/openoffice-infra-3.1.0.ebuild
+++ b/app-office/openoffice-infra/openoffice-infra-3.1.0.ebuild
@@ -98,9 +98,7 @@ DEPEND="${COMMON_DEPEND}
        x11-proto/xineramaproto
        >=sys-apps/findutils-4.1.20-r1
        dev-perl/Archive-Zip
-       virtual/perl-Compress-Zlib
-       >=virtual/perl-Compress-Raw-Zlib-2.002
-       virtual/perl-IO-Compress-Base
+       virtual/perl-IO-Compress
        dev-util/pkgconfig
        dev-util/intltool
        >=dev-libs/boost-1.33.1