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

17 files changed, 67 insertions, 38 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 )
diff --git a/media-sound/musicman/ChangeLog b/media-sound/musicman/ChangeLog
index 32556c475949..4f63d43ebcd6 100644
--- a/media-sound/musicman/ChangeLog
+++ b/media-sound/musicman/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/musicman
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musicman/ChangeLog,v 1.7 2004/12/19 06:12:16 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musicman/ChangeLog,v 1.8 2005/01/14 23:55:59 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> musicman-0.11-r1.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; Jeremy Huddleston <eradicator@gentoo.org>
   musicman-0.11-r1.ebuild:
diff --git a/media-sound/musicman/musicman-0.11-r1.ebuild b/media-sound/musicman/musicman-0.11-r1.ebuild
index 7f8a836dcf8c..b2aae0082e7b 100644
--- a/media-sound/musicman/musicman-0.11-r1.ebuild
+++ b/media-sound/musicman/musicman-0.11-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/media-sound/musicman/musicman-0.11-r1.ebuild,v 1.6 2004/12/19 06:12:16 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musicman/musicman-0.11-r1.ebuild,v 1.7 2005/01/14 23:55:59 danarmak Exp $
 
 IUSE=""
 
@@ -16,7 +16,7 @@ LICENSE="GPL-1"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
 
-DEPEND=">=kde-base/kdebase-3.2.1
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.2.1 )
 	kde-base/arts
 	>=media-libs/jpeg-6b-r3
 	virtual/fam
diff --git a/media-sound/noteedit/ChangeLog b/media-sound/noteedit/ChangeLog
index 65a60959f282..13365eb7e436 100644
--- a/media-sound/noteedit/ChangeLog
+++ b/media-sound/noteedit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/noteedit
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/noteedit/ChangeLog,v 1.12 2004/10/15 09:16:55 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/noteedit/ChangeLog,v 1.13 2005/01/14 23:57:13 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> noteedit-2.6.2.ebuild:
+  Changed dep on kdemultimedia to accept kdemultimedia-meta, the split 'meta'
+  packages. This dep will be narrowed down in the future to the precise split
+  packages required.
 
   15 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
   -noteedit-2.5.3.ebuild, noteedit-2.6.2.ebuild:
diff --git a/media-sound/noteedit/noteedit-2.6.2.ebuild b/media-sound/noteedit/noteedit-2.6.2.ebuild
index d19989e1ebd7..38c3b409b2ec 100644
--- a/media-sound/noteedit/noteedit-2.6.2.ebuild
+++ b/media-sound/noteedit/noteedit-2.6.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/media-sound/noteedit/noteedit-2.6.2.ebuild,v 1.6 2004/10/15 09:16:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/noteedit/noteedit-2.6.2.ebuild,v 1.7 2005/01/14 23:57:13 danarmak Exp $
 
 IUSE=""
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc sparc amd64"
 
-DEPEND="kde-base/kdemultimedia
+DEPEND="|| ( kde-base/kdemultimedia-meta kde-base/kdemultimedia )
 	kde-base/arts
 	media-libs/tse3"
 
diff --git a/media-sound/rosegarden/ChangeLog b/media-sound/rosegarden/ChangeLog
index 1e5c4018245d..1bc04949e7bb 100644
--- a/media-sound/rosegarden/ChangeLog
+++ b/media-sound/rosegarden/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/rosegarden
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.23 2005/01/11 14:14:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.24 2005/01/14 23:59:24 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> rosegarden-4.0.9.8.ebuild,
+  rosegarden-4.0.9.91.ebuild, rosegarden-4.0.9.91_rc2.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.
 
 *rosegarden-4.0.9.91 (11 Jan 2005)
 
diff --git a/media-sound/rosegarden/rosegarden-4.0.9.8.ebuild b/media-sound/rosegarden/rosegarden-4.0.9.8.ebuild
index 5519d73ed892..bad5c3a9c815 100644
--- a/media-sound/rosegarden/rosegarden-4.0.9.8.ebuild
+++ b/media-sound/rosegarden/rosegarden-4.0.9.8.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/rosegarden/rosegarden-4.0.9.8.ebuild,v 1.6 2005/01/11 14:14:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-4.0.9.8.ebuild,v 1.7 2005/01/14 23:59:24 danarmak Exp $
 
 MY_PV="${PV/./-}"
 MY_P="${PN}-${MY_PV}"
@@ -17,7 +17,7 @@ KEYWORDS="x86 ~ppc amd64"
 IUSE="jack"
 
 DEPEND=">=kde-base/kdelibs-3.0
-	kde-base/kdemultimedia
+	|| ( kde-base/kdemultimedia-meta kde-base/kdemultimedia )
 	>=x11-libs/qt-3
 	virtual/alsa
 	jack? ( media-sound/jack-audio-connection-kit )
diff --git a/media-sound/rosegarden/rosegarden-4.0.9.91.ebuild b/media-sound/rosegarden/rosegarden-4.0.9.91.ebuild
index dcc3e97d8a25..da85d1bc272e 100644
--- a/media-sound/rosegarden/rosegarden-4.0.9.91.ebuild
+++ b/media-sound/rosegarden/rosegarden-4.0.9.91.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/rosegarden/rosegarden-4.0.9.91.ebuild,v 1.1 2005/01/11 14:14:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-4.0.9.91.ebuild,v 1.2 2005/01/14 23:59:24 danarmak Exp $
 
 IUSE="alsa arts jack"
 
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DEPEND=">=kde-base/kdelibs-3.0
-	kde-base/kdemultimedia
+	|| ( kde-base/kdemultimedia-meta kde-base/kdemultimedia )
 	>=x11-libs/qt-3
 	!arts? ( media-libs/alsa-lib )
 	alsa? ( media-libs/alsa-lib )
diff --git a/media-sound/rosegarden/rosegarden-4.0.9.91_rc2.ebuild b/media-sound/rosegarden/rosegarden-4.0.9.91_rc2.ebuild
index dfe4cceeb6c6..f8c8d65e121b 100644
--- a/media-sound/rosegarden/rosegarden-4.0.9.91_rc2.ebuild
+++ b/media-sound/rosegarden/rosegarden-4.0.9.91_rc2.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/rosegarden/rosegarden-4.0.9.91_rc2.ebuild,v 1.4 2005/01/11 14:14:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-4.0.9.91_rc2.ebuild,v 1.5 2005/01/14 23:59:24 danarmak Exp $
 
 IUSE="alsa arts jack"
 
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DEPEND=">=kde-base/kdelibs-3.0
-	kde-base/kdemultimedia
+	|| ( kde-base/kdemultimedia-meta kde-base/kdemultimedia )
 	>=x11-libs/qt-3
 	!arts? ( media-libs/alsa-lib )
 	alsa? ( media-libs/alsa-lib )
diff --git a/media-sound/yammi/ChangeLog b/media-sound/yammi/ChangeLog
index 4f59b88e59a2..2db6285f3861 100644
--- a/media-sound/yammi/ChangeLog
+++ b/media-sound/yammi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/yammi
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.19 2004/09/03 21:08:30 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.20 2005/01/15 00:01:22 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> yammi-0.8.2.ebuild,
+  yammi-1.0-r1.ebuild, yammi-1.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.
 
   03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> yammi-1.0-r1.ebuild:
   Stable amd64, sparc, x86.
diff --git a/media-sound/yammi/yammi-0.8.2.ebuild b/media-sound/yammi/yammi-0.8.2.ebuild
index 1de3de83ea4b..4ba327859983 100644
--- a/media-sound/yammi/yammi-0.8.2.ebuild
+++ b/media-sound/yammi/yammi-0.8.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/media-sound/yammi/yammi-0.8.2.ebuild,v 1.15 2004/06/25 00:30:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-0.8.2.ebuild,v 1.16 2005/01/15 00:01:22 danarmak Exp $
 
 inherit flag-o-matic eutils
 
@@ -23,7 +23,7 @@ DEPEND=">=x11-libs/qt-3.1.0-r1
 	cdr? ( >=app-cdr/cdlabelgen-2.4.0 >=app-cdr/mp3burn-0.1 )
 	xmms? ( >=media-sound/xmms-1.2.7-r18 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0-r1 >=media-sound/vorbis-tools-1.0-r1 )
-	kde? ( >=kde-base/kdebase-3.0.4 )"
+	kde? ( || ( kde-base/kdebase-meta >=kde-base/kdebase-3.0.4 ) )"
 
 src_unpack() {
 	unpack ${P}fixed.tar.gz
diff --git a/media-sound/yammi/yammi-1.0-r1.ebuild b/media-sound/yammi/yammi-1.0-r1.ebuild
index 51e9ea908a91..94e5b811c3c9 100644
--- a/media-sound/yammi/yammi-1.0-r1.ebuild
+++ b/media-sound/yammi/yammi-1.0-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/media-sound/yammi/yammi-1.0-r1.ebuild,v 1.3 2004/09/03 21:08:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.0-r1.ebuild,v 1.4 2005/01/15 00:01:22 danarmak Exp $
 
 inherit flag-o-matic eutils
 
@@ -22,7 +22,7 @@ DEPEND=">=x11-libs/qt-3.1.0-r1
 	cdr? ( >=app-cdr/cdlabelgen-2.4.0 >=app-cdr/mp3burn-0.1 )
 	xmms? ( >=media-sound/xmms-1.2.7-r18 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0-r1 >=media-sound/vorbis-tools-1.0-r1 )
-	kde? ( >=kde-base/kdebase-3.0.4 )"
+	kde? ( || ( kde-base/kdebase-meta >=kde-base/kdebase-3.0.4 ) )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-sound/yammi/yammi-1.0.ebuild b/media-sound/yammi/yammi-1.0.ebuild
index a8e9a7f08728..eb3643786ab9 100644
--- a/media-sound/yammi/yammi-1.0.ebuild
+++ b/media-sound/yammi/yammi-1.0.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/media-sound/yammi/yammi-1.0.ebuild,v 1.9 2004/07/07 11:19:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.0.ebuild,v 1.10 2005/01/15 00:01:22 danarmak Exp $
 
 inherit flag-o-matic eutils
 
@@ -22,7 +22,7 @@ DEPEND=">=x11-libs/qt-3.1.0-r1
 	cdr? ( >=app-cdr/cdlabelgen-2.4.0 >=app-cdr/mp3burn-0.1 )
 	xmms? ( >=media-sound/xmms-1.2.7-r18 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0-r1 >=media-sound/vorbis-tools-1.0-r1 )
-	kde? ( >=kde-base/kdebase-3.0.4 )"
+	kde? ( || ( kde-base/kdebase-meta >=kde-base/kdebase-3.0.4 ) )"
 
 src_unpack() {
 	unpack ${A}