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

9 files changed, 36 insertions, 22 deletions

diff --git a/net-im/kmess/ChangeLog b/net-im/kmess/ChangeLog
index e0d8616e3a16..5ac6f6376b0e 100644
--- a/net-im/kmess/ChangeLog
+++ b/net-im/kmess/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/kmess
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/ChangeLog,v 1.17 2004/11/24 23:35:59 motaboy Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/ChangeLog,v 1.18 2005/01/15 00:06:07 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> kmess-1.2.1.ebuild,
+  kmess-1.3.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.
 
   25 Nov 2004; Simone Gotti <motaboy@gentoo.org> +metadata.xml,
   +files/kmess-1.3-compilation-fix.patch, kmess-1.3.ebuild:
diff --git a/net-im/kmess/kmess-1.2.1.ebuild b/net-im/kmess/kmess-1.2.1.ebuild
index 02f71617fdc9..193366f8cae6 100644
--- a/net-im/kmess/kmess-1.2.1.ebuild
+++ b/net-im/kmess/kmess-1.2.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/net-im/kmess/kmess-1.2.1.ebuild,v 1.7 2004/06/28 20:36:44 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/kmess-1.2.1.ebuild,v 1.8 2005/01/15 00:06:07 danarmak Exp $
 
 inherit kde
 
@@ -14,5 +14,5 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ~sparc"
 IUSE=""
 
-DEPEND="kde-base/kdenetwork"
+DEPEND="|| ( kde-base/kdenetwork-meta kde-base/kdenetwork )"
 need-kde 3
\ No newline at end of file
diff --git a/net-im/kmess/kmess-1.3.ebuild b/net-im/kmess/kmess-1.3.ebuild
index 00cf57e25cb9..06e7ee95d2dc 100644
--- a/net-im/kmess/kmess-1.3.ebuild
+++ b/net-im/kmess/kmess-1.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/net-im/kmess/kmess-1.3.ebuild,v 1.7 2004/11/24 23:35:59 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/kmess-1.3.ebuild,v 1.8 2005/01/15 00:06:07 danarmak Exp $
 
 inherit kde
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ~sparc ~ppc"
 IUSE=""
 
-DEPEND="kde-base/kdenetwork"
+DEPEND="|| ( kde-base/kdenetwork-meta kde-base/kdenetwork )"
 need-kde 3
 
 src_unpack() {
diff --git a/net-im/sim/ChangeLog b/net-im/sim/ChangeLog
index 15b07fd4bfb1..377447d6b4c2 100644
--- a/net-im/sim/ChangeLog
+++ b/net-im/sim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/sim
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.42 2004/10/19 12:23:45 absinthe Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.43 2005/01/15 00:07:07 danarmak Exp $
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> sim-0.9.3-r2.ebuild,
+  sim-0.9.3-r3.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.
 
 *sim-0.9.3-r3 (19 Oct 2004)
 
diff --git a/net-im/sim/sim-0.8.3.ebuild b/net-im/sim/sim-0.8.3.ebuild
index 141e5b90925f..73cf3129897a 100644
--- a/net-im/sim/sim-0.8.3.ebuild
+++ b/net-im/sim/sim-0.8.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/net-im/sim/sim-0.8.3.ebuild,v 1.14 2004/06/28 21:47:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.8.3.ebuild,v 1.15 2005/01/15 00:07:07 danarmak Exp $
 
 inherit eutils
 
diff --git a/net-im/sim/sim-0.9.2.ebuild b/net-im/sim/sim-0.9.2.ebuild
index 38beb55b7df2..b2a5137481cb 100644
--- a/net-im/sim/sim-0.9.2.ebuild
+++ b/net-im/sim/sim-0.9.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/net-im/sim/sim-0.9.2.ebuild,v 1.11 2004/06/28 21:47:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.2.ebuild,v 1.12 2005/01/15 00:07:07 danarmak Exp $
 
 if use kde; then
 	inherit kde-base eutils
diff --git a/net-im/sim/sim-0.9.3-r1.ebuild b/net-im/sim/sim-0.9.3-r1.ebuild
index 61111ae60fa1..f1a665564e6b 100644
--- a/net-im/sim/sim-0.9.3-r1.ebuild
+++ b/net-im/sim/sim-0.9.3-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/net-im/sim/sim-0.9.3-r1.ebuild,v 1.3 2004/06/28 21:47:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.3-r1.ebuild,v 1.4 2005/01/15 00:07:07 danarmak Exp $
 
 if use kde; then
 	inherit kde-base eutils
diff --git a/net-im/sim/sim-0.9.3-r2.ebuild b/net-im/sim/sim-0.9.3-r2.ebuild
index 03b1ad71e506..55a6d3b71327 100644
--- a/net-im/sim/sim-0.9.3-r2.ebuild
+++ b/net-im/sim/sim-0.9.3-r2.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-im/sim/sim-0.9.3-r2.ebuild,v 1.8 2004/10/19 12:23:45 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.3-r2.ebuild,v 1.9 2005/01/15 00:07:07 danarmak Exp $
 
 LICENSE="GPL-2"
 DESCRIPTION="An ICQ v8 Client. Supports File Transfer, Chat, Server-Side Contactlist, ..."
@@ -12,7 +12,7 @@ SLOT="0"
 IUSE="ssl kde debug"
 
 RDEPEND="ssl? ( dev-libs/openssl )
-	kde? ( kde-base/kdebase )
+	kde? ( || ( kde-base/kdebase-meta kde-base/kdebase ) )
 	!kde? ( x11-libs/qt )
 	app-text/sablotron
 	sys-devel/flex
diff --git a/net-im/sim/sim-0.9.3-r3.ebuild b/net-im/sim/sim-0.9.3-r3.ebuild
index 7743985abc1e..04c61fff4925 100644
--- a/net-im/sim/sim-0.9.3-r3.ebuild
+++ b/net-im/sim/sim-0.9.3-r3.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-im/sim/sim-0.9.3-r3.ebuild,v 1.1 2004/10/19 12:23:45 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.3-r3.ebuild,v 1.2 2005/01/15 00:07:07 danarmak Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE="ssl kde debug"
 
 RDEPEND="ssl? ( dev-libs/openssl )
-	kde? ( kde-base/kdebase )
+	kde? ( || ( kde-base/kdebase-meta kde-base/kdebase ) )
 	!kde? ( x11-libs/qt )
 	app-text/sablotron
 	sys-devel/flex