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

11 files changed, 40 insertions, 18 deletions

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"
diff --git a/app-editors/kile/ChangeLog b/app-editors/kile/ChangeLog
index 914cd15fb86d..19f12147c033 100644
--- a/app-editors/kile/ChangeLog
+++ b/app-editors/kile/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/kile
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/kile/ChangeLog,v 1.48 2005/01/11 19:00:05 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/kile/ChangeLog,v 1.49 2005/01/14 23:32:33 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> kile-1.6.3.ebuild,
+  kile-1.7.1.ebuild:
+  Changed dep on kdegraphics to accept kdegraphics-meta, the split 'meta'
+  package. This dep will be narrowed down in the future to the precise split
+  packages required.
 
   11 Jan 2005; Sven Wegener <swegener@gentoo.org> :
   Added missing digest entries.
diff --git a/app-editors/kile/kile-1.6.3.ebuild b/app-editors/kile/kile-1.6.3.ebuild
index 9adb6af2984c..ed783f9f96fd 100644
--- a/app-editors/kile/kile-1.6.3.ebuild
+++ b/app-editors/kile/kile-1.6.3.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-editors/kile/kile-1.6.3.ebuild,v 1.11 2005/01/01 13:29:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/kile/kile-1.6.3.ebuild,v 1.12 2005/01/14 23:32:33 danarmak Exp $
 
 inherit kde
 
@@ -16,5 +16,5 @@ LICENSE="GPL-2"
 
 DEPEND="dev-lang/perl"
 RDEPEND="virtual/tetex
-	kde? ( kde-base/kdegraphics )"
+	kde? ( || ( kde-base/kdegraphics-meta kde-base/kdegraphics ) )"
 need-kde 3.1
diff --git a/app-editors/kile/kile-1.7.1.ebuild b/app-editors/kile/kile-1.7.1.ebuild
index 4642434db813..e9a8da1faab7 100644
--- a/app-editors/kile/kile-1.7.1.ebuild
+++ b/app-editors/kile/kile-1.7.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/app-editors/kile/kile-1.7.1.ebuild,v 1.8 2005/01/11 14:52:50 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/kile/kile-1.7.1.ebuild,v 1.9 2005/01/14 23:32:33 danarmak Exp $
 
 inherit kde
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 
 DEPEND="dev-lang/perl"
 RDEPEND="virtual/tetex
-	kde? ( kde-base/kdegraphics )"
+	kde? ( || ( kde-base/kdegraphics-meta kde-base/kdegraphics ) )"
 need-kde 3.2
 
 I18N="${PN}-i18n-${PV%.*}"
diff --git a/app-i18n/uim-svn/ChangeLog b/app-i18n/uim-svn/ChangeLog
index 2297929423f3..172215043025 100644
--- a/app-i18n/uim-svn/ChangeLog
+++ b/app-i18n/uim-svn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/uim-svn
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/ChangeLog,v 1.13 2005/01/01 14:43:14 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/ChangeLog,v 1.14 2005/01/14 23:34:14 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> uim-svn-20040709.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.
 
   06 Nov 2004; Akinori Hattori <hattya@gentoo.org> uim-svn-20040709.ebuild:
   s/qtkde-helper/uim-kdehelper/
diff --git a/app-i18n/uim-svn/uim-svn-20040709.ebuild b/app-i18n/uim-svn/uim-svn-20040709.ebuild
index eae02956e767..4bf18e10df3c 100644
--- a/app-i18n/uim-svn/uim-svn-20040709.ebuild
+++ b/app-i18n/uim-svn/uim-svn-20040709.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-i18n/uim-svn/uim-svn-20040709.ebuild,v 1.6 2005/01/01 14:43:14 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/uim-svn-20040709.ebuild,v 1.7 2005/01/14 23:34:14 danarmak Exp $
 
 inherit subversion flag-o-matic
 
@@ -27,7 +27,7 @@ RDEPEND="!app-i18n/uim
 	gtk? ( >=x11-libs/gtk+-2 )
 	kde? (
 		=x11-libs/qt-3*
-		=kde-base/kdebase-3*
+		|| ( kde-base/kdebase-meta =kde-base/kdebase-3* )
 		=kde-base/kdelibs-3*
 	)
 	m17n-lib? ( dev-libs/m17n-lib )"
diff --git a/app-office/kletterwizard/ChangeLog b/app-office/kletterwizard/ChangeLog
index b2f43946b452..850ca72cafe8 100644
--- a/app-office/kletterwizard/ChangeLog
+++ b/app-office/kletterwizard/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/kletterwizard
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/ChangeLog,v 1.10 2005/01/01 15:35:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/ChangeLog,v 1.11 2005/01/14 23:35:16 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> kletterwizard-0.9.2.ebuild,
+  kletterwizard-0.9.4.ebuild, kletterwizard-0.9.6.ebuild:
+  Changed dep on kdegraphics to accept kdegraphics-meta, the split 'meta'
+  package. This dep will be narrowed down in the future to the precise split
+  packages required.
 
   30 Dec 2004; Jason Wever <weeve@gentoo.org> kletterwizard-0.9.6.ebuild:
   Added ~sparc keyword.
diff --git a/app-office/kletterwizard/kletterwizard-0.9.2.ebuild b/app-office/kletterwizard/kletterwizard-0.9.2.ebuild
index 4b6c10f356d7..86eaa5a15adf 100644
--- a/app-office/kletterwizard/kletterwizard-0.9.2.ebuild
+++ b/app-office/kletterwizard/kletterwizard-0.9.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/app-office/kletterwizard/kletterwizard-0.9.2.ebuild,v 1.6 2005/01/01 15:35:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/kletterwizard-0.9.2.ebuild,v 1.7 2005/01/14 23:35:16 danarmak Exp $
 
 inherit kde
 
@@ -15,5 +15,5 @@ IUSE=""
 
 DEPEND="virtual/tetex
 		>=dev-tex/g-brief-4.0.1
-		>=kde-base/kdegraphics-3.2.0"
+		|| ( kde-base/kdegraphics-meta >=kde-base/kdegraphics-3.2.0 )"
 need-kde 3
diff --git a/app-office/kletterwizard/kletterwizard-0.9.4.ebuild b/app-office/kletterwizard/kletterwizard-0.9.4.ebuild
index c7b08837512c..acc9914aa1ac 100644
--- a/app-office/kletterwizard/kletterwizard-0.9.4.ebuild
+++ b/app-office/kletterwizard/kletterwizard-0.9.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-office/kletterwizard/kletterwizard-0.9.4.ebuild,v 1.4 2005/01/01 15:35:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/kletterwizard-0.9.4.ebuild,v 1.5 2005/01/14 23:35:16 danarmak Exp $
 
 inherit kde
 
@@ -15,5 +15,5 @@ IUSE=""
 
 DEPEND="virtual/tetex
 		>=dev-tex/g-brief-4.0.1
-		>=kde-base/kdegraphics-3.2.0"
+		|| ( kde-base/kdegraphics-meta >=kde-base/kdegraphics-3.2.0 )"
 need-kde 3
diff --git a/app-office/kletterwizard/kletterwizard-0.9.6.ebuild b/app-office/kletterwizard/kletterwizard-0.9.6.ebuild
index a3a8ba34de97..49a452b067ad 100644
--- a/app-office/kletterwizard/kletterwizard-0.9.6.ebuild
+++ b/app-office/kletterwizard/kletterwizard-0.9.6.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-office/kletterwizard/kletterwizard-0.9.6.ebuild,v 1.5 2005/01/01 15:35:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/kletterwizard-0.9.6.ebuild,v 1.6 2005/01/14 23:35:16 danarmak Exp $
 
 inherit kde
 
@@ -15,7 +15,7 @@ IUSE=""
 
 DEPEND="virtual/tetex
 		>=dev-tex/g-brief-4.0.1
-		>=kde-base/kdegraphics-3.2.0"
+		|| ( kde-base/kdegraphics-meta >=kde-base/kdegraphics-3.2.0 )"
 need-kde 3
 
 src_unpack() {