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

diff --git a/net-misc/kluje/ChangeLog b/net-misc/kluje/ChangeLog
index b4b7b8500965ef2cc19640d9ccc5756ac526fc6f..19d36f4b606467c6d7ab80a8a05741dc69b6e6f8 100644 (file)
--- 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 b6acbe66ed3e70b7745570ae669453754a48918d..7c9779c06ad52c49f54eb24826f0f36508acb989 100644 (file)
--- 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 183271e19936a448118f453259a0c40fbc38a331..ce6c284ff30f2e3755bc31c7c1cf0c749090d8d8 100644 (file)
--- 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 4d8f9ae219ae2303fccf7a39568490809ff5d4c6..59df9cf184c0c4d2252224b07bd9aad66cac5047 100644 (file)
--- 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
 

diff --git a/net-misc/ksambaplugin/ChangeLog b/net-misc/ksambaplugin/ChangeLog
index 8c0dcf722b4c0462fcab919f053c0f9ce6003b56..b6e28446b20f0fe640a43bcd6a76cee12fa0934c 100644 (file)
--- a/net-misc/ksambaplugin/ChangeLog
+++ b/net-misc/ksambaplugin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/ksambaplugin
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ksambaplugin/ChangeLog,v 1.15 2004/08/30 19:38:07 carlo Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ksambaplugin/ChangeLog,v 1.16 2005/01/15 00:10:45 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> ksambaplugin-0.5f.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.
 
   30 Aug 2004; Carsten Lohrke <carlo@gentoo.org> ksambaplugin-0.5f.ebuild:
   block >=kde-base/kdenetwork-3.3.0

diff --git a/net-misc/ksambaplugin/ksambaplugin-0.5f.ebuild b/net-misc/ksambaplugin/ksambaplugin-0.5f.ebuild
index a40400924e37f5935d1ea290345a2ea8844b8267..46a9124b1b123b2a8242b27127df22ae248ceb2e 100644 (file)
--- a/net-misc/ksambaplugin/ksambaplugin-0.5f.ebuild
+++ b/net-misc/ksambaplugin/ksambaplugin-0.5f.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/ksambaplugin/ksambaplugin-0.5f.ebuild,v 1.7 2004/08/30 19:38:07 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ksambaplugin/ksambaplugin-0.5f.ebuild,v 1.8 2005/01/15 00:10:45 danarmak Exp $
 
 inherit kde eutils gcc
 
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc"
 IUSE="debug"
 
-DEPEND=">=kde-base/kdebase-3
+DEPEND="|| ( kde-base/kdebase-meta >=kde-base/kdebase-3 )
        !>=kde-base/kdenetwork-3.3.0"
 RDEPEND="${DEPEND}
        >=net-fs/samba-2.2.7"