made dep on a monolithic kde-base package accept the equivalent -meta package from the split ebuilds as an alternative

4 files changed, 18 insertions, 21 deletions

diff --git a/sci-chemistry/kemistry/ChangeLog b/sci-chemistry/kemistry/ChangeLog
index 0f6713e7f7de..992792642d4a 100644
--- a/sci-chemistry/kemistry/ChangeLog
+++ b/sci-chemistry/kemistry/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/kemistry
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/kemistry/ChangeLog,v 1.2 2004/12/24 20:15:02 swegener Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/kemistry/ChangeLog,v 1.3 2005/01/15 00:14:49 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> kemistry-0.6.ebuild,
+  kemistry-0.7.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.
 
 *kemistry-0.6 (24 Dec 2004)
 
diff --git a/sci-chemistry/kemistry/Manifest b/sci-chemistry/kemistry/Manifest
index af4ba9fb06f2..b3102927760c 100644
--- a/sci-chemistry/kemistry/Manifest
+++ b/sci-chemistry/kemistry/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 06b30d0dfa0aa04e6b3c4248f6c6f223 kemistry-0.7.ebuild 643
-MD5 ffbf178107f79bcb92e64f1fce33d73d kemistry-0.6.ebuild 550
-MD5 dd2060085f21a6a2bc45291b2775dd0a ChangeLog 1999
+MD5 e206bfb978aa081fc9d31a178e2e9b5e kemistry-0.7.ebuild 671
+MD5 b160b1dcf62bcfd685a7393827124b8a kemistry-0.6.ebuild 578
+MD5 555de4654e3f1937c0c3f76eb6139c0f ChangeLog 2388
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 50e1d5c2a24f011bf95f4f52408c7ad1 files/kemistry-0.6-gcc3.2.patch 1736
 MD5 c3996b6e2fbc3c51e3cb7420a61cfed3 files/kemistry-0.7-gcc3.4.patch 2128
 MD5 228927d1d7c84e2f350740b3ed134944 files/kemistry-0.7-fPIC.patch 1966
 MD5 3f2cfa5242a8209eb005aa688f7e161b files/digest-kemistry-0.6 66
 MD5 ff459344a766830061d4245b51081a7c files/digest-kemistry-0.7 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBzHjLI1lqEGTUzyQRAirLAJ9PaYhxdV91ye/KeRqxNQfCI7SD5QCgv2uW
-EcVCqWwc0CznFEcmLoz6VrE=
-=Bw0M
------END PGP SIGNATURE-----
diff --git a/sci-chemistry/kemistry/kemistry-0.6.ebuild b/sci-chemistry/kemistry/kemistry-0.6.ebuild
index 2af057ddd1d9..b90ac23a3ed8 100644
--- a/sci-chemistry/kemistry/kemistry-0.6.ebuild
+++ b/sci-chemistry/kemistry/kemistry-0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/kemistry/kemistry-0.6.ebuild,v 1.1 2004/12/24 16:43:45 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/kemistry/kemistry-0.6.ebuild,v 1.2 2005/01/15 00:14:49 danarmak Exp $
 
 inherit kde
 
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86"
 IUSE=""
 
-DEPEND="kde-base/kdesdk"
+DEPEND="|| ( kde-base/kdesdk-meta kde-base/kdesdk )"
 need-kde 3
 
 PATCHES="${FILESDIR}/${P}-gcc3.2.patch"
\ No newline at end of file
diff --git a/sci-chemistry/kemistry/kemistry-0.7.ebuild b/sci-chemistry/kemistry/kemistry-0.7.ebuild
index bf114c48da49..4925525259ea 100644
--- a/sci-chemistry/kemistry/kemistry-0.7.ebuild
+++ b/sci-chemistry/kemistry/kemistry-0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/kemistry/kemistry-0.7.ebuild,v 1.1 2004/12/24 16:43:45 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/kemistry/kemistry-0.7.ebuild,v 1.2 2005/01/15 00:14:49 danarmak Exp $
 
 inherit kde eutils
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 sparc ~amd64"
 IUSE=""
 
-DEPEND="kde-base/kdesdk"
+DEPEND="|| ( kde-base/kdesdk-meta kde-base/kdesdk )"
 need-kde 3
 
 src_unpack() {