Update koffice dependencies so that the new KDE 4 koffice doesn't satisfy it. Thanks to zlin for reporting the issue.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 x86_64

4 files changed, 13 insertions, 28 deletions

diff --git a/app-i18n/koffice-i18n/ChangeLog b/app-i18n/koffice-i18n/ChangeLog
index e60004fcdc3f..27b87bec9588 100644
--- a/app-i18n/koffice-i18n/ChangeLog
+++ b/app-i18n/koffice-i18n/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/koffice-i18n
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/koffice-i18n/ChangeLog,v 1.100 2008/02/19 01:21:17 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/koffice-i18n/ChangeLog,v 1.101 2008/09/13 14:44:34 jmbsvicetto Exp $
+
+  13 Sep 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  koffice-i18n-1.6.1.ebuild, koffice-i18n-1.6.3.ebuild:
+  Update koffice dependencies so that the new KDE 4 koffice doesn't satisfy
+  it. Thanks to zlin for reporting the issue.
 
   19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   koffice-i18n-1.6.1.ebuild, koffice-i18n-1.6.3.ebuild:
diff --git a/app-i18n/koffice-i18n/Manifest b/app-i18n/koffice-i18n/Manifest
index 6731b5fe93da..886cbac8af65 100644
--- a/app-i18n/koffice-i18n/Manifest
+++ b/app-i18n/koffice-i18n/Manifest
@@ -1,9 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-- -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX koffice-18n-1.6.1-es-fix.diff 1408 RMD160 a151f9fcd19924f300ce2c663760eba7f015eea9 SHA1 4786f51b0ff5bc4d9f350d5a12670d809c5d8f92 SHA256 bfa8a85c845dbd04391339b15a3b423f0ee7ba6d2ab730169eceff7540e07c55
 DIST koffice-l10n-bg-1.6.3.tar.bz2 376729 RMD160 d2993a221b1b8170c2c8990746650ab2a11f9f49 SHA1 72ba900a6ccb70c7ee2fa7aad7afae9a3eef0dd6 SHA256 6df7e61ab8d0acc9b745840119a8c3aa9276937b2ae40d804af50500a194e5cc
 DIST koffice-l10n-ca-1.6.1.tar.bz2 1410868 RMD160 644233848511ed8aa02dd9afb0ed272d905a459e SHA1 01bfe499dbf4796122b6d7e51f20ecba051a3838 SHA256 bfcd51cae7df0a9985e007a0f7a275b2d0e95a2c0d8f202888c90a8b49ed6346
@@ -75,21 +69,7 @@ DIST koffice-l10n-zh_CN-1.6.1.tar.bz2 359950 RMD160 b0eaeb16a8aecddbfdc427f6cdb5
 DIST koffice-l10n-zh_CN-1.6.3.tar.bz2 353668 RMD160 3b1de4c6ea31a07cb6c084a67957d17ab8294657 SHA1 72591c0fcb44cab321b4d1464de3ea8494f3de86 SHA256 c436c12c693e9b0c223413d869f1f1f5d84a1f12224de13772308c8fd3b9fa63
 DIST koffice-l10n-zh_TW-1.6.1.tar.bz2 370170 RMD160 9fbaf8093cf4a7ecf770930d4e9e916467a5001b SHA1 c304ae7256c38e970dad3f41e4c79225b32165a8 SHA256 8683281d2e6fc0610deaca00755d075384a8da78333261f3e614792410a05170
 DIST koffice-l10n-zh_TW-1.6.3.tar.bz2 365213 RMD160 b26513e8bcc69477ee456251d959f5cfc440521f SHA1 59b867d26d1018861814c38b19b9360afdfa21b0 SHA256 f4c3d16903a487ea4127d7deee62b16a7b648aee92338498734da0cff88fc248
-EBUILD koffice-i18n-1.6.1.ebuild 1569 RMD160 f3ed45ddca1d38d040a4935de24c73e41839cb6c SHA1 1009ac8df15e7838b6f93e67b01c1a9039d4b9ec SHA256 966eef985dade672738b584a0895d61293005a2e744bd17f74831298e09f0598
-EBUILD koffice-i18n-1.6.3.ebuild 1524 RMD160 81f949ce51754916a81295e9365556489850473b SHA1 cfec246636439bbecd9b76996328dccca16cfa72 SHA256 d07f9597a50a90689fc056cd888c0be3f13b3de7c699ba23277918a63877e8d1
-MISC ChangeLog 12956 RMD160 44043f27b0c0bd4a4f725f876ce8c721d8e52439 SHA1 07ab6ac27fdc384fd0ac4f212b49767ed49ba1d0 SHA256 e4bd126fe64e57dae43c52db21ffe59a6830654ffc4ecaf1317f02c801d988ec
+EBUILD koffice-i18n-1.6.1.ebuild 1572 RMD160 26708e392e20ec9a6e9b19f6074cebf9112b497d SHA1 c4ceadd31a9b907cea7f6c70f3f4c143b013653d SHA256 8b12b3ab491f24713c9e18a193ca6ba7a0e63c465e6aa81914419b960f1ea7a8
+EBUILD koffice-i18n-1.6.3.ebuild 1527 RMD160 46ed1c9d544c719c3a3f1244b608e73266529110 SHA1 ca7e01796c851f708263e52fb4f247109aa58595 SHA256 1eda58b6218d9bcbc5673515e26c8418ebdf2046a33bc73892b1ef035be2d2bf
+MISC ChangeLog 13207 RMD160 51b6e0cf49447cb86c4d595d93cb8f4aa1a1436f SHA1 fb20a5bcd0e43a43b5ba0b2842af42e1895b193b SHA256 33331504466f6731f17aa102b61e9e14279434b88088e87e1c153f791501507f
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
-- -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH7V8pfxJ68Jl1NeERAqmGAJ9uUirNOob0EtjXfKh//E5pN+EeCQCgwz3v
-tRKLgpfE5CIrXk4K2n8GLmU=
-=iJIu
-- -----END PGP SIGNATURE-----
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH7V/AfxJ68Jl1NeERAkF5AJ9xUQdTsrTqWLg3nF21geLIcCOFhwCgwVxi
-cI+TRWUUBkO41fqzRkTiJ/M=
-=ScHX
------END PGP SIGNATURE-----
diff --git a/app-i18n/koffice-i18n/koffice-i18n-1.6.1.ebuild b/app-i18n/koffice-i18n/koffice-i18n-1.6.1.ebuild
index 434bc9dad5af..54e975df89f0 100644
--- a/app-i18n/koffice-i18n/koffice-i18n-1.6.1.ebuild
+++ b/app-i18n/koffice-i18n/koffice-i18n-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/koffice-i18n/koffice-i18n-1.6.1.ebuild,v 1.10 2008/02/19 01:21:17 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/koffice-i18n/koffice-i18n-1.6.1.ebuild,v 1.11 2008/09/13 14:44:34 jmbsvicetto Exp $
 
 inherit kde
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
 IUSE=""
 
-RDEPEND="|| ( >=app-office/koffice-libs-${PV} >=app-office/koffice-${PV} )
+RDEPEND="|| ( ~app-office/koffice-libs-${PV} ~app-office/koffice-${PV} )
 	=kde-base/kde-i18n-3.5*"
 need-kde 3.5
 
diff --git a/app-i18n/koffice-i18n/koffice-i18n-1.6.3.ebuild b/app-i18n/koffice-i18n/koffice-i18n-1.6.3.ebuild
index 01d131c41c8c..740132fa2f17 100644
--- a/app-i18n/koffice-i18n/koffice-i18n-1.6.3.ebuild
+++ b/app-i18n/koffice-i18n/koffice-i18n-1.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/koffice-i18n/koffice-i18n-1.6.3.ebuild,v 1.8 2008/02/19 01:21:17 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/koffice-i18n/koffice-i18n-1.6.3.ebuild,v 1.9 2008/09/13 14:44:34 jmbsvicetto Exp $
 
 inherit kde
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="|| ( >=app-office/koffice-libs-${PV} >=app-office/koffice-${PV} )
+RDEPEND="|| ( ~app-office/koffice-libs-${PV} ~app-office/koffice-${PV} )
 	=kde-base/kde-i18n-3.5*"
 need-kde 3.5