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

12 files changed, 50 insertions, 32 deletions

diff --git a/mail-client/kbiff/ChangeLog b/mail-client/kbiff/ChangeLog
index 613beac1f375..9dc3b00f961f 100644
--- a/mail-client/kbiff/ChangeLog
+++ b/mail-client/kbiff/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/kbiff
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/kbiff/ChangeLog,v 1.12 2004/12/16 11:25:27 motaboy Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/kbiff/ChangeLog,v 1.13 2005/01/14 23:42:07 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> kbiff-3.6.3.ebuild,
+  kbiff-3.7.1.ebuild, kbiff-3.7.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.
 
   16 Dec 2004; Simone Gotti <motaboy@gentoo.org> kbiff-3.7.1.ebuild:
   Stable on x86.
diff --git a/mail-client/kbiff/kbiff-3.6.3.ebuild b/mail-client/kbiff/kbiff-3.6.3.ebuild
index 536d5c9643bd..648da12e6ed2 100644
--- a/mail-client/kbiff/kbiff-3.6.3.ebuild
+++ b/mail-client/kbiff/kbiff-3.6.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/mail-client/kbiff/kbiff-3.6.3.ebuild,v 1.3 2004/06/28 23:56:28 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/kbiff/kbiff-3.6.3.ebuild,v 1.4 2005/01/14 23:42:07 danarmak Exp $
 
 inherit kde
 
@@ -13,5 +13,5 @@ LICENSE="GPL-2"
 KEYWORDS="x86 sparc"
 IUSE=""
 
-DEPEND=">=kde-base/kdebase-3"
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3 )"
 need-kde 3
\ No newline at end of file
diff --git a/mail-client/kbiff/kbiff-3.7.1.ebuild b/mail-client/kbiff/kbiff-3.7.1.ebuild
index 6cbafece2889..035a8bff384a 100644
--- a/mail-client/kbiff/kbiff-3.7.1.ebuild
+++ b/mail-client/kbiff/kbiff-3.7.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/mail-client/kbiff/kbiff-3.7.1.ebuild,v 1.3 2004/12/16 11:25:27 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/kbiff/kbiff-3.7.1.ebuild,v 1.4 2005/01/14 23:42:07 danarmak Exp $
 
 inherit kde eutils
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ~sparc ~ppc ~amd64"
 IUSE=""
 
-DEPEND=">=kde-base/kdebase-3"
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3 )"
 need-kde 3
 
 src_unpack() {
diff --git a/mail-client/kbiff/kbiff-3.7.ebuild b/mail-client/kbiff/kbiff-3.7.ebuild
index ab13695eaaa7..9af857783ca0 100644
--- a/mail-client/kbiff/kbiff-3.7.ebuild
+++ b/mail-client/kbiff/kbiff-3.7.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/mail-client/kbiff/kbiff-3.7.ebuild,v 1.9 2004/12/06 15:15:59 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/kbiff/kbiff-3.7.ebuild,v 1.10 2005/01/14 23:42:07 danarmak Exp $
 
 inherit kde eutils
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 sparc ~ppc ~amd64"
 IUSE=""
 
-DEPEND=">=kde-base/kdebase-3"
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3 )"
 need-kde 3
 
 src_unpack() {
diff --git a/media-gfx/kst/ChangeLog b/media-gfx/kst/ChangeLog
index f96933258bc7..a5fc227a1417 100644
--- a/media-gfx/kst/ChangeLog
+++ b/media-gfx/kst/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/kst
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/ChangeLog,v 1.4 2004/12/28 20:30:19 ribosome Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/ChangeLog,v 1.5 2005/01/14 23:45:37 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> kst-0.94.ebuild,
+  kst-0.97.ebuild, kst-0.99.ebuild, kst-1.0.0.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.
 
   28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> kst-0.99.ebuild:
   Dependency update: dev-libs/gsl -> sci-libs/gsl.
diff --git a/media-gfx/kst/kst-0.94.ebuild b/media-gfx/kst/kst-0.94.ebuild
index 5eff5b66735f..cd7cf9e88141 100644
--- a/media-gfx/kst/kst-0.94.ebuild
+++ b/media-gfx/kst/kst-0.94.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-gfx/kst/kst-0.94.ebuild,v 1.1 2004/12/24 01:34:30 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/kst-0.94.ebuild,v 1.2 2005/01/14 23:45:37 danarmak Exp $
 
 inherit kde
 
@@ -14,5 +14,5 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-DEPEND=">=kde-base/kdebase-3.1"
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.1 )"
 need-kde 3.1
\ No newline at end of file
diff --git a/media-gfx/kst/kst-0.97.ebuild b/media-gfx/kst/kst-0.97.ebuild
index 083294fd888c..5bf72e6deb3f 100644
--- a/media-gfx/kst/kst-0.97.ebuild
+++ b/media-gfx/kst/kst-0.97.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-gfx/kst/kst-0.97.ebuild,v 1.1 2004/12/24 01:34:30 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/kst-0.97.ebuild,v 1.2 2005/01/14 23:45:37 danarmak Exp $
 
 inherit kde
 
@@ -14,5 +14,5 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-DEPEND=">=kde-base/kdebase-3.1"
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.1 )"
 need-kde 3.1
diff --git a/media-gfx/kst/kst-0.99.ebuild b/media-gfx/kst/kst-0.99.ebuild
index b067312b59c4..05e91c5207cb 100644
--- a/media-gfx/kst/kst-0.99.ebuild
+++ b/media-gfx/kst/kst-0.99.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-gfx/kst/kst-0.99.ebuild,v 1.2 2004/12/28 20:30:19 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/kst-0.99.ebuild,v 1.3 2005/01/14 23:45:37 danarmak Exp $
 
 inherit kde
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-DEPEND=">=kde-base/kdebase-3.1"
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.1 )"
 RDEPEND="$DEPEND
 	sci-libs/gsl"
 need-kde 3.1
diff --git a/media-gfx/kst/kst-1.0.0.ebuild b/media-gfx/kst/kst-1.0.0.ebuild
index 83c8710ff6d7..ac24e6f10b58 100644
--- a/media-gfx/kst/kst-1.0.0.ebuild
+++ b/media-gfx/kst/kst-1.0.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-gfx/kst/kst-1.0.0.ebuild,v 1.2 2004/12/28 20:29:58 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/kst-1.0.0.ebuild,v 1.3 2005/01/14 23:45:37 danarmak Exp $
 
 inherit kde
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-DEPEND=">=kde-base/kdebase-3.1"
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.1 )"
 RDEPEND="$DEPEND
 	sci-libs/gsl"
 need-kde 3.1
diff --git a/media-gfx/showimg/ChangeLog b/media-gfx/showimg/ChangeLog
index 385d7d5ded21..d21f5cf2d7c0 100644
--- a/media-gfx/showimg/ChangeLog
+++ b/media-gfx/showimg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/showimg
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/ChangeLog,v 1.24 2005/01/05 02:23:54 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/ChangeLog,v 1.25 2005/01/14 23:47:00 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> showimg-0.9.3.ebuild,
+  showimg-0.9.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 Jan 2005; Marcus Hanwell <cryos@gentoo.org> showimg-0.9.4.ebuild:
   Marked ~amd64 as requested in bug 72943.
diff --git a/media-gfx/showimg/showimg-0.9.3.ebuild b/media-gfx/showimg/showimg-0.9.3.ebuild
index d3aff0174e70..c09c13e3a61e 100644
--- a/media-gfx/showimg/showimg-0.9.3.ebuild
+++ b/media-gfx/showimg/showimg-0.9.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/media-gfx/showimg/showimg-0.9.3.ebuild,v 1.4 2005/01/03 06:34:38 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/showimg-0.9.3.ebuild,v 1.5 2005/01/14 23:47:00 danarmak Exp $
 
 inherit kde
 
@@ -14,6 +14,6 @@ KEYWORDS="x86 amd64 ~ppc"
 IUSE=""
 SLOT="0"
 
-DEPEND="kde-base/kdebase"
-RDEPEND="kde-base/kdebase"
+DEPEND="|| ( kde-base/kdebase-meta kde-base/kdebase )"
+RDEPEND="|| ( kde-base/kdebase-meta kde-base/kdebase )"
 need-kde 3.1
diff --git a/media-gfx/showimg/showimg-0.9.4.ebuild b/media-gfx/showimg/showimg-0.9.4.ebuild
index 073a59b9b321..6cb9edf5312d 100644
--- a/media-gfx/showimg/showimg-0.9.4.ebuild
+++ b/media-gfx/showimg/showimg-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/media-gfx/showimg/showimg-0.9.4.ebuild,v 1.5 2005/01/05 02:23:54 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/showimg-0.9.4.ebuild,v 1.6 2005/01/14 23:47:00 danarmak Exp $
 
 inherit kde
 
@@ -14,9 +14,9 @@ KEYWORDS="~x86 ~sparc ~ppc ~amd64"
 IUSE=""
 SLOT="0"
 
-DEPEND="kde-base/kdebase
+DEPEND="|| ( kde-base/kdebase-meta kde-base/kdebase )
 	media-plugins/kipi-plugins"
-RDEPEND="kde-base/kdebase
+RDEPEND="|| ( kde-base/kdebase-meta kde-base/kdebase )
 	media-plugins/kipi-plugins"
 need-kde 3.1