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

5 files changed, 30 insertions, 16 deletions

diff --git a/x11-themes/qinx/ChangeLog b/x11-themes/qinx/ChangeLog
index f05b123e8269..7e6ee6fac2d7 100644
--- 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 3cb09cfe272b..64ef77a8604b 100644
--- 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 f52b5181c428..b06d7b15a5f0 100644
--- 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 beae292911d2..fffad659d580 100644
--- 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 50cee8033b47..96c4fa9d0534 100644
--- 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() {