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

4 files changed, 18 insertions, 11 deletions

diff --git a/net-misc/kluje/ChangeLog b/net-misc/kluje/ChangeLog
index b4b7b8500965..19d36f4b6064 100644
--- a/net-misc/kluje/ChangeLog
+++ b/net-misc/kluje/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/kluje
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kluje/ChangeLog,v 1.13 2004/06/24 23:51:37 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kluje/ChangeLog,v 1.14 2005/01/15 00:09:54 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> kluje-0.5.ebuild,
+  kluje-0.6.ebuild, kluje-0.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.
 
   19 Mar 2004; Jason Wever <weeve@gentoo.org> kluje-0.7.ebuild:
   Marked stable on sparc.
diff --git a/net-misc/kluje/kluje-0.5.ebuild b/net-misc/kluje/kluje-0.5.ebuild
index b6acbe66ed3e..7c9779c06ad5 100644
--- a/net-misc/kluje/kluje-0.5.ebuild
+++ b/net-misc/kluje/kluje-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/net-misc/kluje/kluje-0.5.ebuild,v 1.11 2004/07/15 02:55:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kluje/kluje-0.5.ebuild,v 1.12 2005/01/15 00:09:54 danarmak Exp $
 
 inherit kde
 
@@ -11,6 +11,6 @@ SRC_URI="mirror://sourceforge/kluje/${P}.tar.gz"
 HOMEPAGE="http://kluje.sourceforge.net/"
 KEYWORDS="x86 sparc "
 IUSE=""
-DEPEND=">=kde-base/kdebase-3.0"
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.0 )"
 
 need-kde 3
diff --git a/net-misc/kluje/kluje-0.6.ebuild b/net-misc/kluje/kluje-0.6.ebuild
index 183271e19936..ce6c284ff30f 100644
--- a/net-misc/kluje/kluje-0.6.ebuild
+++ b/net-misc/kluje/kluje-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/net-misc/kluje/kluje-0.6.ebuild,v 1.9 2004/07/15 02:55:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kluje/kluje-0.6.ebuild,v 1.10 2005/01/15 00:09:54 danarmak Exp $
 
 inherit kde
 
@@ -11,6 +11,6 @@ SRC_URI="mirror://sourceforge/kluje/${P}.tar.gz"
 HOMEPAGE="http://kluje.sourceforge.net/"
 KEYWORDS="x86 sparc "
 IUSE=""
-DEPEND=">=kde-base/kdebase-3.0"
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.0 )"
 
 need-kde 3
diff --git a/net-misc/kluje/kluje-0.7.ebuild b/net-misc/kluje/kluje-0.7.ebuild
index 4d8f9ae219ae..59df9cf184c0 100644
--- a/net-misc/kluje/kluje-0.7.ebuild
+++ b/net-misc/kluje/kluje-0.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/net-misc/kluje/kluje-0.7.ebuild,v 1.9 2004/07/15 02:55:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kluje/kluje-0.7.ebuild,v 1.10 2005/01/15 00:09:54 danarmak Exp $
 
 inherit kde
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/kluje/${P}.tar.gz"
 HOMEPAGE="http://kluje.sourceforge.net/"
 KEYWORDS="x86 sparc"
 IUSE=""
-DEPEND=">=kde-base/kdebase-3.0"
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3.0 )"
 
 need-kde 3