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

diff --git a/x11-themes/alloy/ChangeLog b/x11-themes/alloy/ChangeLog
index 07fa9ce31f44262d34014976b30168b50cfd0ae9..69ae1481331a2657c542c45383dcc6d78b521b82 100644 (file)
--- 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 745fe76bb0d42c3ff6652838af64ef8239647e7e..09d1f57a0a9c52ae6a74ec8f0c11877772942769 100644 (file)
--- 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 e04cba6a70365efcc6149e381d7a1be00dae7a2a..7d71012d0e440aaf6e101662c59d1eb7c159d260 100644 (file)
--- 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 dee8c7f674af25ca1bb9147139df9d730b08e27b..1d8ce28fb117599455cca3d0054e0dd6530ab58b 100644 (file)
--- 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 09a1f514c7c9634ff2e7aa58c7d0bc313ecb6aa8..f3daaf47b9248134552e474fce0b200a35a6e6f4 100644 (file)
--- 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 310cde28ee917619c04bcfff7b645a9ca0e6c33f..2eb6ca3223c0fd085016bc216890491953ff861b 100644 (file)
--- 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 d038e18a807f954e106fe4e2fb6bf1e568ee3590..b8745468269368e5c965ea1b7b2467d3c7c46a46 100644 (file)
--- 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 6ff02690a4274e46b11bdc82df07e5dcc509fe54..b4a2790a5997210dd27bb58ae9a5cc52bd18aeb9 100644 (file)
--- 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 d41b8a5bd380826da8c346ba5d74ced9c679bc94..c11c1deb5970da06faeaa0cf2d6535fa09c11beb 100644 (file)
--- 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 3458a3bf052b3cc5f3ddc7e8a1a72268bbe00f6e..b2d23aa5f0f5c3485edc4a2bdd431ea41860df49 100644 (file)
--- 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 27618f06902b5a203c941c88336be614564ea37a..889bb85827a0e93d27079db485e422dd69b348e1 100644 (file)
--- 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 bf8a06764041112ba2421e71a4e865f2d304b6a8..6bbd63e561ab46a03422da870f1b58908d71da3f 100644 (file)
--- 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

diff --git a/x11-themes/fusionx-aqua/ChangeLog b/x11-themes/fusionx-aqua/ChangeLog
index 764ceeed3e9852d619731097275035c863872eaf..deded5eb86b7861455cd54740b0d043c71e29fce 100644 (file)
--- a/x11-themes/fusionx-aqua/ChangeLog
+++ b/x11-themes/fusionx-aqua/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-themes/fusionx-aqua
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fusionx-aqua/ChangeLog,v 1.5 2004/07/03 20:11:39 carlo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fusionx-aqua/ChangeLog,v 1.6 2005/01/15 00:21:57 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> fusionx-aqua-1.1.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.
 
   03 Jul 2004; Carsten Lohrke <carlo@gentoo.org> fusionx-aqua-1.1.ebuild:
   QA: need-kde after R/DEPEND

diff --git a/x11-themes/fusionx-aqua/fusionx-aqua-1.1.ebuild b/x11-themes/fusionx-aqua/fusionx-aqua-1.1.ebuild
index 2a27ffee7fcb7ab00a435b9600afa0c73cf7385d..2680aa9f6979d353044bb3e05cb40bda4c2a10ff 100644 (file)
--- a/x11-themes/fusionx-aqua/fusionx-aqua-1.1.ebuild
+++ b/x11-themes/fusionx-aqua/fusionx-aqua-1.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/x11-themes/fusionx-aqua/fusionx-aqua-1.1.ebuild,v 1.10 2005/01/10 21:55:15 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fusionx-aqua/fusionx-aqua-1.1.ebuild,v 1.11 2005/01/15 00:21:57 danarmak Exp $
 
 inherit kde
 
@@ -16,7 +16,7 @@ KEYWORDS="x86 ppc ~sparc ~alpha amd64"
 LICENSE="GPL-2"
 IUSE=""
 
-DEPEND="kde-base/kdebase"
+DEPEND="|| ( kde-base/kdebase-meta kde-base/kdebase )"
 need-kde 3.1
 
 src_compile() {

diff --git a/x11-themes/liquid/ChangeLog b/x11-themes/liquid/ChangeLog
index 95b36e927d71ac73e3dddac41f6a6366941ee726..33e402ce4446c161e14f306758ca4d73f4529b5c 100644 (file)
--- a/x11-themes/liquid/ChangeLog
+++ b/x11-themes/liquid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-themes/liquid
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/liquid/ChangeLog,v 1.2 2004/10/11 23:26:20 carlo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/liquid/ChangeLog,v 1.3 2005/01/15 00:22:34 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> liquid-0.9.7.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.
 
   12 Oct 2004; Carsten Lohrke <carlo@gentoo.org> liquid-0.9.7.ebuild:
   stable on x86

diff --git a/x11-themes/liquid/liquid-0.9.7.ebuild b/x11-themes/liquid/liquid-0.9.7.ebuild
index 069e882abe52a5f560c4f0a4db8345bcaed6f149..036f018cc8c377cd2e6694dd1ee87fde6d645ab2 100644 (file)
--- a/x11-themes/liquid/liquid-0.9.7.ebuild
+++ b/x11-themes/liquid/liquid-0.9.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/x11-themes/liquid/liquid-0.9.7.ebuild,v 1.2 2004/10/11 23:26:20 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/liquid/liquid-0.9.7.ebuild,v 1.3 2005/01/15 00:22:34 danarmak Exp $
 
 inherit kde
 
@@ -13,6 +13,6 @@ LICENSE="BSD"
 KEYWORDS="x86"
 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/qinx/ChangeLog b/x11-themes/qinx/ChangeLog
index f05b123e82691b0c96e1f38636ff974d835f26cc..7e6ee6fac2d74ff7a46fe57b694090f3886b16c1 100644 (file)
--- a/x11-themes/qinx/ChangeLog
+++ b/x11-themes/qinx/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-themes/qinx
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qinx/ChangeLog,v 1.19 2004/12/16 11:20:56 motaboy Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qinx/ChangeLog,v 1.20 2005/01/15 00:26:50 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> qinx-1.0.ebuild,
+  qinx-1.1.ebuild, qinx-1.2.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.
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> qinx-1.0.ebuild,
+  qinx-1.1.ebuild, qinx-1.2.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.
 
   16 Dec 2004; Simone Gotti <motaboy@gentoo.org> qinx-1.2.ebuild:
   Stable on x86.

diff --git a/x11-themes/qinx/qinx-0.6.ebuild b/x11-themes/qinx/qinx-0.6.ebuild
index 3cb09cfe272b448e5204aef70cc0eed41c6cf680..64ef77a8604be758f2cb72e536e3eb497e0d4b7e 100644 (file)
--- a/x11-themes/qinx/qinx-0.6.ebuild
+++ b/x11-themes/qinx/qinx-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/qinx/qinx-0.6.ebuild,v 1.9 2004/07/07 15:12:32 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qinx/qinx-0.6.ebuild,v 1.10 2005/01/15 00:26:50 danarmak Exp $
 
 inherit kde
 

diff --git a/x11-themes/qinx/qinx-1.0.ebuild b/x11-themes/qinx/qinx-1.0.ebuild
index f52b5181c4286deb04b35de85b570b0a9c9c2374..b06d7b15a5f00d36db27f4e0d4af73403a7944c7 100644 (file)
--- a/x11-themes/qinx/qinx-1.0.ebuild
+++ b/x11-themes/qinx/qinx-1.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/x11-themes/qinx/qinx-1.0.ebuild,v 1.3 2004/07/18 08:29:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qinx/qinx-1.0.ebuild,v 1.4 2005/01/15 00:26:50 danarmak Exp $
 
 inherit kde
 
@@ -13,6 +13,6 @@ LICENSE="as-is"
 KEYWORDS="x86 ~alpha -ppc ~sparc"
 IUSE=""
 
-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.2

diff --git a/x11-themes/qinx/qinx-1.1.ebuild b/x11-themes/qinx/qinx-1.1.ebuild
index beae292911d22730c4098bdd097e1640c9285333..fffad659d580c53f0c38352ebf9fe4be5569209b 100644 (file)
--- a/x11-themes/qinx/qinx-1.1.ebuild
+++ b/x11-themes/qinx/qinx-1.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/qinx/qinx-1.1.ebuild,v 1.2 2004/08/17 19:49:53 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qinx/qinx-1.1.ebuild,v 1.3 2005/01/15 00:26:50 danarmak Exp $
 
 inherit kde
 
@@ -13,6 +13,6 @@ LICENSE="as-is"
 KEYWORDS="x86 ~alpha -ppc ~sparc"
 IUSE=""
 
-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.2

diff --git a/x11-themes/qinx/qinx-1.2.ebuild b/x11-themes/qinx/qinx-1.2.ebuild
index 50cee8033b47751dfe3bdeb3e2cd772530adee04..96c4fa9d0534f021d6b21d2e4c5e6d371d9d785c 100644 (file)
--- a/x11-themes/qinx/qinx-1.2.ebuild
+++ b/x11-themes/qinx/qinx-1.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/qinx/qinx-1.2.ebuild,v 1.2 2004/12/16 11:20:56 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qinx/qinx-1.2.ebuild,v 1.3 2005/01/15 00:26:50 danarmak Exp $
 
 inherit kde eutils
 
@@ -13,8 +13,8 @@ LICENSE="as-is"
 KEYWORDS="x86 ~alpha -ppc ~sparc"
 IUSE=""
 
-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.2
 
 src_unpack() {

diff --git a/x11-themes/redhat-artwork/ChangeLog b/x11-themes/redhat-artwork/ChangeLog
index 0b5a0204476e23062e5eb6c3fbd40cf83b24e90d..caa6d6dcb3db482482963ee93f5707de8c206af5 100644 (file)
--- a/x11-themes/redhat-artwork/ChangeLog
+++ b/x11-themes/redhat-artwork/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-themes/redhat-artwork
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.44 2004/12/28 22:35:35 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.45 2005/01/15 00:23:48 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org>
+  redhat-artwork-0.120.1.2.ebuild, redhat-artwork-0.120.ebuild,
+  redhat-artwork-0.73.ebuild, redhat-artwork-0.95.ebuild,
+  redhat-artwork-0.96.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.
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance

diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.120.1.2.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.120.1.2.ebuild
index 792f897d2ec7b8c477dd52118d748f1070a8b2d8..ee23f5b16eed6faa68618783c92074c8c6c96f3d 100644 (file)
--- a/x11-themes/redhat-artwork/redhat-artwork-0.120.1.2.ebuild
+++ b/x11-themes/redhat-artwork/redhat-artwork-0.120.1.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/redhat-artwork/redhat-artwork-0.120.1.2.ebuild,v 1.2 2004/12/28 11:24:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-0.120.1.2.ebuild,v 1.3 2005/01/15 00:23:48 danarmak Exp $
 
 inherit eutils rpm libtool versionator
 
@@ -22,7 +22,7 @@ DEPEND=">=sys-devel/autoconf-2.58
        gtk? (  >=media-libs/gdk-pixbuf-0.2.5
                        =x11-libs/gtk+-1.2* )
        kde? (  >=x11-libs/qt-3.0.5
-               >=kde-base/kdebase-3.0.2 )
+               || ( kde-base/kdebase-meta >=kde-base/kdebase-3.0.2 ) )
        gtk2? ( >=x11-libs/gtk+-2* )
        dev-util/intltool
        media-gfx/icon-slicer"

diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.120.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.120.ebuild
index 0bcb9e788c31eae1681f22b8126024b94cc03417..1e3ea4d6c206cdb3045b9cafaf5998afe7a6c974 100644 (file)
--- a/x11-themes/redhat-artwork/redhat-artwork-0.120.ebuild
+++ b/x11-themes/redhat-artwork/redhat-artwork-0.120.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/redhat-artwork/redhat-artwork-0.120.ebuild,v 1.1 2004/12/04 16:32:27 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-0.120.ebuild,v 1.2 2005/01/15 00:23:48 danarmak Exp $
 
 inherit eutils rpm
 
@@ -23,7 +23,7 @@ DEPEND=">=sys-devel/autoconf-2.58
        gtk? (  >=media-libs/gdk-pixbuf-0.2.5
                        =x11-libs/gtk+-1.2* )
        kde? (  >=x11-libs/qt-3.0.5
-               >=kde-base/kdebase-3.0.2 )
+               || ( kde-base/kdebase-meta >=kde-base/kdebase-3.0.2 ) )
        gtk2? ( >=x11-libs/gtk+-2* )
        dev-util/intltool
        media-gfx/icon-slicer"

diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.73.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.73.ebuild
index bcc55c6f7b4e3973cf863837636cac5b1f878c8c..359575eafecc71769416700973770b1c334b6524 100644 (file)
--- a/x11-themes/redhat-artwork/redhat-artwork-0.73.ebuild
+++ b/x11-themes/redhat-artwork/redhat-artwork-0.73.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/redhat-artwork/redhat-artwork-0.73.ebuild,v 1.17 2004/10/17 20:08:57 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-0.73.ebuild,v 1.18 2005/01/15 00:23:48 danarmak Exp $
 
 inherit eutils rpm
 
@@ -22,7 +22,7 @@ DEPEND=">=sys-devel/autoconf-2.58
        gtk? (  >=media-libs/gdk-pixbuf-0.2.5
                        =x11-libs/gtk+-1.2* )
        kde? (  >=x11-libs/qt-3.0.5
-               >=kde-base/kdebase-3.0.2 )
+               || ( kde-base/kdebase-meta >=kde-base/kdebase-3.0.2 ) )
        gtk2? ( >=x11-libs/gtk+-2* )"
 # Because one may only want to use the theme with kde OR gtk OR Metacity
 # OR gdm, we don't want either as run-time dependencies...

diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.95.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.95.ebuild
index 78a94260c9f4fe379442fa05f6c672922e4b55f6..39257b3c1dc6293950ae1ebffd59c1c1c92ee576 100644 (file)
--- a/x11-themes/redhat-artwork/redhat-artwork-0.95.ebuild
+++ b/x11-themes/redhat-artwork/redhat-artwork-0.95.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/redhat-artwork/redhat-artwork-0.95.ebuild,v 1.9 2004/10/04 05:51:36 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-0.95.ebuild,v 1.10 2005/01/15 00:23:48 danarmak Exp $
 
 inherit eutils rpm
 
@@ -23,7 +23,7 @@ DEPEND=">=sys-devel/autoconf-2.58
        gtk? (  >=media-libs/gdk-pixbuf-0.2.5
                        =x11-libs/gtk+-1.2* )
        kde? (  >=x11-libs/qt-3.0.5
-               >=kde-base/kdebase-3.0.2 )
+               || ( kde-base/kdebase-meta >=kde-base/kdebase-3.0.2 ) )
        gtk2? ( >=x11-libs/gtk+-2* )"
 # Because one may only want to use the theme with kde OR gtk OR Metacity
 # OR gdm, we don't want either as run-time dependencies...

diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.96.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.96.ebuild
index e7f7bba2e6de1ca68631ba77c3712e8b81de9d4d..2e17ed6da82a9f5cdff391be731b7cfd8b70f436 100644 (file)
--- a/x11-themes/redhat-artwork/redhat-artwork-0.96.ebuild
+++ b/x11-themes/redhat-artwork/redhat-artwork-0.96.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/redhat-artwork/redhat-artwork-0.96.ebuild,v 1.10 2004/12/28 11:24:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-0.96.ebuild,v 1.11 2005/01/15 00:23:48 danarmak Exp $
 
 inherit eutils rpm
 
@@ -23,7 +23,7 @@ DEPEND=">=sys-devel/autoconf-2.58
        gtk? (  >=media-libs/gdk-pixbuf-0.2.5
                        =x11-libs/gtk+-1.2* )
        kde? (  >=x11-libs/qt-3.0.5
-               >=kde-base/kdebase-3.0.2 )
+               || ( kde-base/kdebase-meta >=kde-base/kdebase-3.0.2 ) )
        gtk2? ( >=x11-libs/gtk+-2* )
        dev-util/intltool"
 # Because one may only want to use the theme with kde OR gtk OR Metacity