made dep on a monolithic kde-base package accept the equivalent -meta package from...

diff --git a/media-gfx/kst/ChangeLog b/media-gfx/kst/ChangeLog
index f96933258bc7474195dea915653f55de29ee3cf8..a5fc227a1417be39f4a7055421566c1bf69e0010 100644 (file)
--- 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 5eff5b66735f44403634228d3819b0b1a06f5893..cd7cf9e881413837bfdaf81fa16e63e51a838528 100644 (file)
--- 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 083294fd888c9663c09629418d050982b5fbd241..5bf72e6deb3f344363ef4a3c77852db636a0bb26 100644 (file)
--- 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 b067312b59c4556b341bbc0037ba0efbc17d3d0c..05e91c5207cb640ca7826c0bf84f0dd24bb2bda2 100644 (file)
--- 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 83c8710ff6d7078bfeef52737d2126075da543b4..ac24e6f10b58276b50a96d68aa1eeb4c5a546cf5 100644 (file)
--- 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 385d7d5ded2144374058f3538ea0fe675e587ff4..d21f5cf2d7c0f47b462a7dc8e0523ec4352dcbd9 100644 (file)
--- 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 d3aff0174e701d30e9a73b8bf470fa0497cb59e6..c09c13e3a61e250c1b527b5e7e158006be9487bd 100644 (file)
--- 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 073a59b9b321935e25f8e96a0a5094c309999ee3..6cb9edf5312d9d9f952774f5e3ea2b721e3ecaed 100644 (file)
--- 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