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

6 files changed, 22 insertions, 11 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 1ae7fd8646a2..a0406cfb336b 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.87 2005/01/13 13:29:32 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.88 2005/01/14 23:28:58 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> k3b-0.11.17.ebuild,
+  k3b-0.11.18-r1.ebuild, k3b-0.11.18.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.
 
 *k3b-0.11.18-r1 (13 Jan 2005)
 
diff --git a/app-cdr/k3b/k3b-0.11.17.ebuild b/app-cdr/k3b/k3b-0.11.17.ebuild
index d22a892b173a..3bef1b7c09ba 100644
--- a/app-cdr/k3b/k3b-0.11.17.ebuild
+++ b/app-cdr/k3b/k3b-0.11.17.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/app-cdr/k3b/k3b-0.11.17.ebuild,v 1.10 2005/01/07 23:11:45 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.17.ebuild,v 1.11 2005/01/14 23:28:58 danarmak Exp $
 
 inherit kde eutils
 
@@ -12,14 +12,14 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ppc ~sparc amd64"
 IUSE="arts dvdr kde oggvorbis mad flac encode"
 
-DEPEND="kde? ( >=kde-base/kdebase-3.1 )
+DEPEND="kde? ( || ( kdebase/kdebase-meta >=kde-base/kdebase-3.1 ) )
 	>=media-sound/cdparanoia-3.9.8
 	>=media-libs/id3lib-3.8.0_pre2
 	flac? ( media-libs/flac )
 	mad? ( >=media-sound/madplay-0.14.2b )
 	oggvorbis? ( media-libs/libvorbis )
 	arts? ( kde-base/arts )"
-RDEPEND="kde? ( >=kde-base/kdebase-3.1 )
+RDEPEND="kde? ( || ( kdebase/kdebase-meta >=kde-base/kdebase-3.1 ) )
 	>=media-sound/cdparanoia-3.9.8
 	>=media-libs/id3lib-3.8.0_pre2
 	flac? ( media-libs/flac )
diff --git a/app-cdr/k3b/k3b-0.11.18-r1.ebuild b/app-cdr/k3b/k3b-0.11.18-r1.ebuild
index 8bcdfce752e7..15de3956f11e 100644
--- a/app-cdr/k3b/k3b-0.11.18-r1.ebuild
+++ b/app-cdr/k3b/k3b-0.11.18-r1.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/app-cdr/k3b/k3b-0.11.18-r1.ebuild,v 1.1 2005/01/13 13:29:32 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.18-r1.ebuild,v 1.2 2005/01/14 23:28:58 danarmak Exp $
 
 inherit kde eutils
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 IUSE="arts dvdr kde oggvorbis mad flac encode"
 
-DEPEND="kde? ( >=kde-base/kdebase-3.1 )
+DEPEND="kde? ( || ( kde-base/kdebase-meta >=kde-base/kdebase-3.1 ) )
 	>=media-sound/cdparanoia-3.9.8
 	>=media-libs/id3lib-3.8.0_pre2
 	flac? ( media-libs/flac )
diff --git a/app-cdr/k3b/k3b-0.11.18.ebuild b/app-cdr/k3b/k3b-0.11.18.ebuild
index 1640a6972039..d8f7a6f30463 100644
--- a/app-cdr/k3b/k3b-0.11.18.ebuild
+++ b/app-cdr/k3b/k3b-0.11.18.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/app-cdr/k3b/k3b-0.11.18.ebuild,v 1.4 2005/01/11 21:58:44 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.18.ebuild,v 1.5 2005/01/14 23:28:58 danarmak Exp $
 
 inherit kde eutils
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc ~sparc ~amd64"
 IUSE="arts dvdr kde oggvorbis mad flac encode"
 
-DEPEND="kde? ( >=kde-base/kdebase-3.1 )
+DEPEND="kde? ( || ( kde-base/kdebase-meta >=kde-base/kdebase-3.1 ) )
 	>=media-sound/cdparanoia-3.9.8
 	>=media-libs/id3lib-3.8.0_pre2
 	flac? ( media-libs/flac )
diff --git a/app-cdr/kio_burn/ChangeLog b/app-cdr/kio_burn/ChangeLog
index 2ccd5d2ca04b..9ff31e919423 100644
--- a/app-cdr/kio_burn/ChangeLog
+++ b/app-cdr/kio_burn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/kio_burn
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/kio_burn/ChangeLog,v 1.6 2005/01/01 12:16:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/kio_burn/ChangeLog,v 1.7 2005/01/14 23:30:57 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> kio_burn-0.4.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.
 
   05 Dec 2004; Simone Gotti <motaboy@gentoo.org> kio_burn-0.4.ebuild:
   Stable on x86.
diff --git a/app-cdr/kio_burn/kio_burn-0.4.ebuild b/app-cdr/kio_burn/kio_burn-0.4.ebuild
index 3d1a04aa2847..5fb54412d70f 100644
--- a/app-cdr/kio_burn/kio_burn-0.4.ebuild
+++ b/app-cdr/kio_burn/kio_burn-0.4.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/app-cdr/kio_burn/kio_burn-0.4.ebuild,v 1.6 2005/01/01 12:16:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/kio_burn/kio_burn-0.4.ebuild,v 1.7 2005/01/14 23:30:57 danarmak Exp $
 
 inherit kde eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE=""
 
-DEPEND=">=kde-base/kdebase-3.2.0
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.2.0 )
 	virtual/cdrtools
 	media-libs/libvorbis
 	media-libs/audiofile"