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

12 files changed, 53 insertions, 37 deletions

diff --git a/x11-themes/alloy/ChangeLog b/x11-themes/alloy/ChangeLog
index 07fa9ce31f44..69ae1481331a 100644
--- a/x11-themes/alloy/ChangeLog
+++ b/x11-themes/alloy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-themes/alloy
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/alloy/ChangeLog,v 1.15 2004/10/12 03:03:20 weeve Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/alloy/ChangeLog,v 1.16 2005/01/15 00:20:39 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> alloy-0.3.ebuild,
+  alloy-0.4.1a.ebuild, alloy-0.5.1.ebuild, alloy-0.5.2.ebuild,
+  alloy-0.5.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.
 
   11 Oct 2004; Jason Wever <weeve@gentoo.org> alloy-0.5.2.ebuild:
   Added ~sparc keyword, resolves bug #67176.
diff --git a/x11-themes/alloy/alloy-0.3.ebuild b/x11-themes/alloy/alloy-0.3.ebuild
index 745fe76bb0d4..09d1f57a0a9c 100644
--- a/x11-themes/alloy/alloy-0.3.ebuild
+++ b/x11-themes/alloy/alloy-0.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/x11-themes/alloy/alloy-0.3.ebuild,v 1.10 2004/07/03 20:04:55 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/alloy/alloy-0.3.ebuild,v 1.11 2005/01/15 00:20:39 danarmak Exp $
 
 inherit kde
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ppc ~sparc ~alpha"
 IUSE=""
 
-DEPEND="kde-base/kdebase"
+DEPEND="|| ( kde-base/kdebase-meta kde-base/kdebase )"
 need-kde 3.1
 
 
diff --git a/x11-themes/alloy/alloy-0.4.1a.ebuild b/x11-themes/alloy/alloy-0.4.1a.ebuild
index e04cba6a7036..7d71012d0e44 100644
--- a/x11-themes/alloy/alloy-0.4.1a.ebuild
+++ b/x11-themes/alloy/alloy-0.4.1a.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/x11-themes/alloy/alloy-0.4.1a.ebuild,v 1.6 2004/07/03 20:04:55 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/alloy/alloy-0.4.1a.ebuild,v 1.7 2005/01/15 00:20:39 danarmak Exp $
 
 inherit kde
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ppc ~sparc ~alpha"
 IUSE=""
 
-DEPEND="kde-base/kdebase"
+DEPEND="|| ( kde-base/kdebase-meta kde-base/kdebase )"
 need-kde 3.1
 
 
diff --git a/x11-themes/alloy/alloy-0.5.1.ebuild b/x11-themes/alloy/alloy-0.5.1.ebuild
index dee8c7f674af..1d8ce28fb117 100644
--- a/x11-themes/alloy/alloy-0.5.1.ebuild
+++ b/x11-themes/alloy/alloy-0.5.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/x11-themes/alloy/alloy-0.5.1.ebuild,v 1.2 2004/08/30 19:44:41 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/alloy/alloy-0.5.1.ebuild,v 1.3 2005/01/15 00:20:39 danarmak Exp $
 
 inherit kde
 
@@ -13,6 +13,6 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ppc ~alpha ~amd64"
 IUSE=""
 
-DEPEND=">=kde-base/kdebase-3.2
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.2 )
 	>=x11-libs/qt-3.3.0"
 need-kde 3.2
diff --git a/x11-themes/alloy/alloy-0.5.2.ebuild b/x11-themes/alloy/alloy-0.5.2.ebuild
index 09a1f514c7c9..f3daaf47b924 100644
--- a/x11-themes/alloy/alloy-0.5.2.ebuild
+++ b/x11-themes/alloy/alloy-0.5.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/x11-themes/alloy/alloy-0.5.2.ebuild,v 1.5 2004/10/12 03:03:20 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/alloy/alloy-0.5.2.ebuild,v 1.6 2005/01/15 00:20:39 danarmak Exp $
 
 inherit kde eutils
 
@@ -13,9 +13,9 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ppc ~alpha ~amd64 ~sparc"
 IUSE=""
 
-DEPEND=">=kde-base/kdebase-3.2
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.2 )
 	>=x11-libs/qt-3.3.0"
-RDEPEND=">=kde-base/kdebase-3.2
+RDEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.2 )
 	>=x11-libs/qt-3.3.0"
 need-kde 3.2
 
diff --git a/x11-themes/alloy/alloy-0.5.ebuild b/x11-themes/alloy/alloy-0.5.ebuild
index 310cde28ee91..2eb6ca3223c0 100644
--- a/x11-themes/alloy/alloy-0.5.ebuild
+++ b/x11-themes/alloy/alloy-0.5.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/x11-themes/alloy/alloy-0.5.ebuild,v 1.8 2004/08/30 19:44:41 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/alloy/alloy-0.5.ebuild,v 1.9 2005/01/15 00:20:39 danarmak Exp $
 
 inherit kde
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ppc ~alpha ~amd64"
 IUSE=""
 
-DEPEND=">=kde-base/kdebase-3.2
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.2 )
 	>=x11-libs/qt-3.3.0"
 need-kde 3.2
 
diff --git a/x11-themes/baghira/ChangeLog b/x11-themes/baghira/ChangeLog
index d038e18a807f..b87454682693 100644
--- a/x11-themes/baghira/ChangeLog
+++ b/x11-themes/baghira/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-themes/baghira
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/ChangeLog,v 1.22 2005/01/10 14:01:37 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/ChangeLog,v 1.23 2005/01/15 00:21:19 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> baghira-0.5a.ebuild,
+  baghira-0.5h-r1.ebuild, baghira-0.5h.ebuild, baghira-0.6.ebuild,
+  baghira-0.6a.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.
 
 *baghira-0.6a (10 Jan 2005)
 
diff --git a/x11-themes/baghira/baghira-0.5a.ebuild b/x11-themes/baghira/baghira-0.5a.ebuild
index 6ff02690a427..b4a2790a5997 100644
--- a/x11-themes/baghira/baghira-0.5a.ebuild
+++ b/x11-themes/baghira/baghira-0.5a.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/x11-themes/baghira/baghira-0.5a.ebuild,v 1.3 2004/11/28 21:59:42 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/baghira-0.5a.ebuild,v 1.4 2005/01/15 00:21:19 danarmak Exp $
 
 inherit kde
 
@@ -13,6 +13,6 @@ LICENSE="BSD"
 KEYWORDS="x86 ~sparc ~amd64 ppc"
 IUSE=""
 
-DEPEND=">=kde-base/kdebase-3.2"
-RDEPEND=">=kde-base/kdebase-3.2"
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.2 )"
+RDEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.2 )"
 need-kde 3.2
diff --git a/x11-themes/baghira/baghira-0.5h-r1.ebuild b/x11-themes/baghira/baghira-0.5h-r1.ebuild
index d41b8a5bd380..c11c1deb5970 100644
--- a/x11-themes/baghira/baghira-0.5h-r1.ebuild
+++ b/x11-themes/baghira/baghira-0.5h-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/x11-themes/baghira/baghira-0.5h-r1.ebuild,v 1.3 2004/11/28 21:59:42 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/baghira-0.5h-r1.ebuild,v 1.4 2005/01/15 00:21:19 danarmak Exp $
 
 inherit kde eutils
 
@@ -13,8 +13,8 @@ LICENSE="BSD"
 KEYWORDS="x86 ~sparc ~amd64 ~ppc ~alpha"
 IUSE=""
 
-DEPEND=">=kde-base/kdebase-3.2"
-RDEPEND=">=kde-base/kdebase-3.2"
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.2 )"
+RDEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.2 )"
 need-kde 3.2
 
 src_unpack() {
diff --git a/x11-themes/baghira/baghira-0.5h.ebuild b/x11-themes/baghira/baghira-0.5h.ebuild
index 3458a3bf052b..b2d23aa5f0f5 100644
--- a/x11-themes/baghira/baghira-0.5h.ebuild
+++ b/x11-themes/baghira/baghira-0.5h.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/x11-themes/baghira/baghira-0.5h.ebuild,v 1.2 2004/11/28 21:59:42 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/baghira-0.5h.ebuild,v 1.3 2005/01/15 00:21:19 danarmak Exp $
 
 inherit kde
 
@@ -13,6 +13,6 @@ LICENSE="BSD"
 KEYWORDS="x86 ~sparc ~amd64 ~ppc"
 IUSE=""
 
-DEPEND=">=kde-base/kdebase-3.2"
-RDEPEND=">=kde-base/kdebase-3.2"
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.2 )"
+RDEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.2 )"
 need-kde 3.2
diff --git a/x11-themes/baghira/baghira-0.6.ebuild b/x11-themes/baghira/baghira-0.6.ebuild
index 27618f06902b..889bb85827a0 100644
--- a/x11-themes/baghira/baghira-0.6.ebuild
+++ b/x11-themes/baghira/baghira-0.6.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/x11-themes/baghira/baghira-0.6.ebuild,v 1.2 2004/12/08 23:36:04 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/baghira-0.6.ebuild,v 1.3 2005/01/15 00:21:19 danarmak Exp $
 
 inherit kde eutils
 
@@ -13,8 +13,8 @@ LICENSE="BSD"
 KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~alpha"
 IUSE=""
 
-DEPEND=">=kde-base/kdebase-3.2"
-RDEPEND=">=kde-base/kdebase-3.2"
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.2 )"
+RDEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.2 )"
 need-kde 3.2
 
 src_unpack() {
diff --git a/x11-themes/baghira/baghira-0.6a.ebuild b/x11-themes/baghira/baghira-0.6a.ebuild
index bf8a06764041..6bbd63e561ab 100644
--- a/x11-themes/baghira/baghira-0.6a.ebuild
+++ b/x11-themes/baghira/baghira-0.6a.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/x11-themes/baghira/baghira-0.6a.ebuild,v 1.1 2005/01/10 14:01:37 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/baghira/baghira-0.6a.ebuild,v 1.2 2005/01/15 00:21:19 danarmak Exp $
 
 inherit kde
 
@@ -13,5 +13,5 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~alpha"
 IUSE=""
 
-DEPEND=">=kde-base/kdebase-3.3"
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.3 )"
 need-kde 3.3