made dep on a monolithic kde-base package accept the equivalent -meta package from...

diff --git a/www-client/kita/ChangeLog b/www-client/kita/ChangeLog
index e4391f135030839fe774cbed43596a69d8af4b0a..58eafdfc182147f535d8686cbf1f8be11fecd1a6 100644 (file)
--- a/www-client/kita/ChangeLog
+++ b/www-client/kita/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/kita
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/kita/ChangeLog,v 1.7 2005/01/01 17:07:33 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/kita/ChangeLog,v 1.8 2005/01/15 00:17:47 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> kita-0.160.0.ebuild,
+  kita-0.172.0.ebuild:
+  Changed dep on a kde-base monolithic package to accept the equivalent split
+  or -meta package. KDE 3.4 has 'split' packages as well as monolithic, and
+  either alternative may provide the same files. This dep may have to be
+  narrowed down in the future to the precise split packages required.
 
 *kita-0.174.0 (02 Jan 2005)
 

diff --git a/www-client/kita/Manifest b/www-client/kita/Manifest
index a9838c72b4b01538c876446ba63e4736ec81b33e..42d4f04971eb2fe688af8d4d8cf05e82a123ee78 100644 (file)
--- a/www-client/kita/Manifest
+++ b/www-client/kita/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c1a581fbd7c5523e86d3f491c9b23f6c ChangeLog 6637
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 37b412029ff49d0de76309879deb57da kita-0.173.0.ebuild 973
-MD5 ca87a7f6c35bb4f5d5e3522158758664 kita-0.160.0.ebuild 1106
 MD5 c66c8be2ce90f01f8850e7e0461584a8 kita-0.174.0.ebuild 976
-MD5 56ab54888fbf6cb2a8c3ac14f42d2eae kita-0.172.0.ebuild 1113
-MD5 16a36a2e2262432651f506036f75f176 files/digest-kita-0.174.0 64
+MD5 8bc65d7e463db8225b63ac20b69ff1bf kita-0.160.0.ebuild 1138
+MD5 b72afacbbea42405f2cfc0842916d90d kita-0.172.0.ebuild 1145
+MD5 37b412029ff49d0de76309879deb57da kita-0.173.0.ebuild 973
+MD5 bda0b9d075fa21983b39a2714d732b50 ChangeLog 7029
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 0a8a7aad519b57d52f31769d89739e59 files/digest-kita-0.160.0 64
 MD5 080c86da7ca1362bbd0a6d2fd961eb39 files/digest-kita-0.172.0 64
 MD5 4d6c23d65ce12c502c5fbbdb6a5bb60a files/digest-kita-0.173.0 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB1tcEVWNWqTUmv+0RAjNdAJoDurgHMPe7SghAW9TYvH8cm0CgQQCeLntu
-eHRIQ9B7IKAczU0ZprpO88k=
-=/7Le
------END PGP SIGNATURE-----
+MD5 16a36a2e2262432651f506036f75f176 files/digest-kita-0.174.0 64

diff --git a/www-client/kita/kita-0.160.0.ebuild b/www-client/kita/kita-0.160.0.ebuild
index 4c9f5b2db318b4403012e105d7b24b79bc013a70..5456580ed2eaf10673ca07f6cb05c872901fba5c 100644 (file)
--- a/www-client/kita/kita-0.160.0.ebuild
+++ b/www-client/kita/kita-0.160.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/kita/kita-0.160.0.ebuild,v 1.3 2005/01/01 17:07:33 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/kita/kita-0.160.0.ebuild,v 1.4 2005/01/15 00:17:47 danarmak Exp $
 
 IUSE=""
 
@@ -14,7 +14,7 @@ KEYWORDS="x86 ppc64 ppc"
 
 RDEPEND="virtual/libc
        >=x11-libs/qt-3.1
-       >=kde-base/kdebase-3.1
+       || ( kde-base/kdebase-meta >=kde-base/kdebase-3.1 )
        >=kde-base/kdelibs-3.1
        >=kde-base/arts-1.1.4
        >=dev-libs/libpcre-4.2

diff --git a/www-client/kita/kita-0.172.0.ebuild b/www-client/kita/kita-0.172.0.ebuild
index bd69dda909d3fe7204fb5a5cb93406e72f67188a..523c9a656fa8ba070a1dcd56dd8085e16c71a343 100644 (file)
--- a/www-client/kita/kita-0.172.0.ebuild
+++ b/www-client/kita/kita-0.172.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/kita/kita-0.172.0.ebuild,v 1.4 2005/01/01 17:07:33 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/kita/kita-0.172.0.ebuild,v 1.5 2005/01/15 00:17:47 danarmak Exp $
 
 IUSE=""
 
@@ -14,7 +14,7 @@ KEYWORDS="x86 ppc ~ppc64 alpha"
 
 RDEPEND="virtual/libc
        >=x11-libs/qt-3.1
-       >=kde-base/kdebase-3.1
+       || ( kde-base/kdebase-meta >=kde-base/kdebase-3.1 )
        >=kde-base/kdelibs-3.1
        >=kde-base/arts-1.1.4
        >=dev-libs/libpcre-4.2