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

5 files changed, 16 insertions, 10 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 845efa39aa2a..3c6e693a9215 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.42 2005/01/12 12:10:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.43 2005/01/14 23:53:32 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> amarok-1.0.2.ebuild,
+  amarok-1.1.1.ebuild, amarok-1.2_beta2.ebuild, amarok-1.2_beta3.ebuild:
+  Changed deps on kdebase, kdemultimedia to accept kdebase-meta and
+  kdemultimedia-meta, the split 'meta' packages. This dep will be narrowed
+  down in the future to the precise split packages required.
 
 *amarok-1.2_beta3 (11 Jan 2005)
 
diff --git a/media-sound/amarok/amarok-1.0.2.ebuild b/media-sound/amarok/amarok-1.0.2.ebuild
index f09e828200dc..35705e7fefda 100644
--- a/media-sound/amarok/amarok-1.0.2.ebuild
+++ b/media-sound/amarok/amarok-1.0.2.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/media-sound/amarok/amarok-1.0.2.ebuild,v 1.3 2005/01/04 12:43:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.0.2.ebuild,v 1.4 2005/01/14 23:53:32 danarmak Exp $
 
 inherit kde eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="x86 ~ppc amd64"
 IUSE="cjk gstreamer xmms arts opengl xine"
 
-DEPEND=">=kde-base/kdemultimedia-3.2
+DEPEND="|| ( kde-base/kdemultimedia-meta >=kde-base/kdemultimedia-3.2 )
 	arts? ( >=kde-base/arts-1.2 )
 	gstreamer? ( >=media-libs/gst-plugins-0.8.1 )
 	opengl? ( virtual/opengl )
diff --git a/media-sound/amarok/amarok-1.1.1.ebuild b/media-sound/amarok/amarok-1.1.1.ebuild
index 5c6c42df9f5a..a998a802a2b7 100644
--- a/media-sound/amarok/amarok-1.1.1.ebuild
+++ b/media-sound/amarok/amarok-1.1.1.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/media-sound/amarok/amarok-1.1.1.ebuild,v 1.13 2005/01/04 12:43:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.1.1.ebuild,v 1.14 2005/01/14 23:53:32 danarmak Exp $
 
 IUSE="noamazon cjk xmms opengl xine arts gstreamer"
 
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc -sparc ~x86"
 
 DEPEND="=media-libs/libvisual-0.1.6
-	>=kde-base/kdemultimedia-3.2
+	|| ( kde-base/kdemultimedia-meta >=kde-base/kdemultimedia-3.2 )
 	arts? ( >=kde-base/arts-1.2 )
 	opengl? ( virtual/opengl )
 	xmms? ( >=media-sound/xmms-1.2 )
diff --git a/media-sound/amarok/amarok-1.2_beta2.ebuild b/media-sound/amarok/amarok-1.2_beta2.ebuild
index 52131c9d0dbd..586a46479a4c 100644
--- a/media-sound/amarok/amarok-1.2_beta2.ebuild
+++ b/media-sound/amarok/amarok-1.2_beta2.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/media-sound/amarok/amarok-1.2_beta2.ebuild,v 1.3 2005/01/04 12:43:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2_beta2.ebuild,v 1.4 2005/01/14 23:53:32 danarmak Exp $
 
 IUSE="noamazon cjk xmms opengl xine arts gstreamer mysql"
 
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~ppc -sparc ~x86"
 
 #	Not yet released:
 #	">=media-libs/libvisual-0.2.0
-DEPEND=">=kde-base/kdemultimedia-3.2
+DEPEND="|| ( kde-base/kdemultimedia-meta >=kde-base/kdemultimedia-3.2 )
 	arts? ( >=kde-base/arts-1.2 )
 	opengl? ( virtual/opengl )
 	xmms? ( >=media-sound/xmms-1.2 )
diff --git a/media-sound/amarok/amarok-1.2_beta3.ebuild b/media-sound/amarok/amarok-1.2_beta3.ebuild
index aa147a1569d9..3361c47548d1 100644
--- a/media-sound/amarok/amarok-1.2_beta3.ebuild
+++ b/media-sound/amarok/amarok-1.2_beta3.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/media-sound/amarok/amarok-1.2_beta3.ebuild,v 1.2 2005/01/13 18:02:41 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2_beta3.ebuild,v 1.3 2005/01/14 23:53:32 danarmak Exp $
 
 inherit kde eutils
 
@@ -21,8 +21,8 @@ KEYWORDS="~amd64 ~ppc -sparc ~x86"
 
 #	Not yet released:
 #	">=media-libs/libvisual-0.2.0
-DEPEND="kde? ( >=kde-base/kdebase-3.2 )
-	arts? ( >=kde-base/kdemultimedia-3.2
+DEPEND="kde? ( || ( kde-base/kdemultimedia-meta >=kde-base/kdebase-3.2 ) )
+	arts? ( || ( kde-base/kdemultimedia-meta >=kde-base/kdemultimedia-3.2 )
 		>=kde-base/arts-1.2 )
 	opengl? ( virtual/opengl )
 	xmms? ( >=media-sound/xmms-1.2 )