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

7 files changed, 31 insertions, 19 deletions

diff --git a/kde-misc/ksensors/ChangeLog b/kde-misc/ksensors/ChangeLog
index 0d0f5d5f794b..e077ab90232c 100644
--- a/kde-misc/ksensors/ChangeLog
+++ b/kde-misc/ksensors/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-misc/ksensors
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksensors/ChangeLog,v 1.4 2004/12/18 11:05:20 hansmi Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksensors/ChangeLog,v 1.5 2005/01/14 23:39:13 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> ksensors-0.7.2-r1.ebuild,
+  ksensors-0.7.2.ebuild, ksensors-0.7.3.ebuild:
+  Changed dep on kdebase to accept kdebase-meta, the split 'meta' package.
+  This dep will be narrowed down in the future to the precise split packages
+  required.
 
   18 Dec 2004; Michael Hanselmann <hansmi@gentoo.org>
   ksensors-0.7.2-r1.ebuild:
diff --git a/kde-misc/ksensors/ksensors-0.7.2-r1.ebuild b/kde-misc/ksensors/ksensors-0.7.2-r1.ebuild
index 63bc9b1b944c..63328f8147f2 100644
--- a/kde-misc/ksensors/ksensors-0.7.2-r1.ebuild
+++ b/kde-misc/ksensors/ksensors-0.7.2-r1.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/kde-misc/ksensors/ksensors-0.7.2-r1.ebuild,v 1.2 2004/12/18 11:05:20 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksensors/ksensors-0.7.2-r1.ebuild,v 1.3 2005/01/14 23:39:13 danarmak Exp $
 
 inherit kde eutils
 
@@ -15,7 +15,7 @@ IUSE=""
 SLOT="0"
 
 DEPEND=">=sys-apps/lm-sensors-2.6.3
-	>=kde-base/kdebase-3.0"
+	|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.0 )"
 
 need-kde 3.0
 
diff --git a/kde-misc/ksensors/ksensors-0.7.2.ebuild b/kde-misc/ksensors/ksensors-0.7.2.ebuild
index ad0d77141d4f..082d4b6dfdb0 100644
--- a/kde-misc/ksensors/ksensors-0.7.2.ebuild
+++ b/kde-misc/ksensors/ksensors-0.7.2.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/kde-misc/ksensors/ksensors-0.7.2.ebuild,v 1.1 2004/10/30 17:26:28 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksensors/ksensors-0.7.2.ebuild,v 1.2 2005/01/14 23:39:13 danarmak Exp $
 
 inherit kde
 
@@ -15,7 +15,7 @@ IUSE=""
 SLOT="0"
 
 DEPEND=">=sys-apps/lm-sensors-2.6.3
-	>=kde-base/kdebase-3.0"
+	|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.0 )"
 
 need-kde 3.0
 
diff --git a/kde-misc/ksensors/ksensors-0.7.3.ebuild b/kde-misc/ksensors/ksensors-0.7.3.ebuild
index 85fee516879c..86ee681bdf85 100644
--- a/kde-misc/ksensors/ksensors-0.7.3.ebuild
+++ b/kde-misc/ksensors/ksensors-0.7.3.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/kde-misc/ksensors/ksensors-0.7.3.ebuild,v 1.2 2004/12/07 20:29:58 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksensors/ksensors-0.7.3.ebuild,v 1.3 2005/01/14 23:39:13 danarmak Exp $
 
 inherit kde
 
@@ -15,7 +15,7 @@ IUSE=""
 SLOT="0"
 
 DEPEND=">=sys-apps/lm-sensors-2.6.3
-	>=kde-base/kdebase-3.0"
+	|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.0 )"
 
 need-kde 3.0
 
diff --git a/kde-misc/tellico/ChangeLog b/kde-misc/tellico/ChangeLog
index 71cf07a329b4..83b2fc1475a4 100644
--- a/kde-misc/tellico/ChangeLog
+++ b/kde-misc/tellico/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-misc/tellico
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/ChangeLog,v 1.6 2004/12/12 20:37:23 carlo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/ChangeLog,v 1.7 2005/01/14 23:40:54 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> tellico-0.12.ebuild,
+  tellico-0.13.1.ebuild:
+  Changed dep on kdemultimedia to accept kdemultimedia-meta, the split 'meta'
+  package. This dep will be narrowed down in the future to the precise split
+  packages required.
 
 *tellico-0.13.1 (12 Dec 2004)
 
diff --git a/kde-misc/tellico/tellico-0.12.ebuild b/kde-misc/tellico/tellico-0.12.ebuild
index f8262598d940..b8256899d6f1 100644
--- a/kde-misc/tellico/tellico-0.12.ebuild
+++ b/kde-misc/tellico/tellico-0.12.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/kde-misc/tellico/tellico-0.12.ebuild,v 1.4 2004/11/30 14:14:21 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/tellico-0.12.ebuild,v 1.5 2005/01/14 23:40:54 danarmak Exp $
 
 inherit kde
 
@@ -16,7 +16,7 @@ SLOT="0"
 
 DEPEND=">=dev-libs/libxml2-2.4.23
 	>=dev-libs/libxslt-1.0.19
-	kde-base/kdemultimedia
+	|| ( kde-base/kdemultimedia-meta kde-base/kdemultimedia )
 	media-sound/cdparanoia"
 
 need-kde 3.2
diff --git a/kde-misc/tellico/tellico-0.13.1.ebuild b/kde-misc/tellico/tellico-0.13.1.ebuild
index 61f6ef454664..87382ae8de89 100644
--- a/kde-misc/tellico/tellico-0.13.1.ebuild
+++ b/kde-misc/tellico/tellico-0.13.1.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/kde-misc/tellico/tellico-0.13.1.ebuild,v 1.1 2004/12/12 20:37:23 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/tellico-0.13.1.ebuild,v 1.2 2005/01/14 23:40:54 danarmak Exp $
 
 inherit kde
 
@@ -16,6 +16,6 @@ SLOT="0"
 
 DEPEND=">=dev-libs/libxml2-2.4.23
 	>=dev-libs/libxslt-1.0.19
-	kde-base/kdemultimedia"
+	|| ( kde-base/kdemultimedia-meta kde-base/kdemultimedia )"
 
 need-kde 3.2