Remove traces of monolithic KDE 4.

Package-Manager: portage-2.1.4.4

66 files changed, 252 insertions, 171 deletions

diff --git a/kde-base/ark/ChangeLog b/kde-base/ark/ChangeLog
index 5c2ab8b43512..d935500e9f7e 100644
--- a/kde-base/ark/ChangeLog
+++ b/kde-base/ark/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/ark
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ChangeLog,v 1.80 2008/02/20 22:29:16 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ChangeLog,v 1.81 2008/02/23 17:35:18 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> ark-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *ark-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/ark/ark-4.0.1.ebuild b/kde-base/ark/ark-4.0.1.ebuild
index 83c48525e135..b91784a32703 100644
--- a/kde-base/ark/ark-4.0.1.ebuild
+++ b/kde-base/ark/ark-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-4.0.1.ebuild,v 1.1 2008/02/07 00:11:48 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-4.0.1.ebuild,v 1.2 2008/02/23 17:35:18 ingmar Exp $
 
 EAPI="1"
 
@@ -11,10 +11,9 @@ DESCRIPTION="KDE Archiving tool"
 KEYWORDS="~amd64 ~x86"
 IUSE="archive debug htmlhandbook zip"
 
-COMMONDEPEND="archive? ( app-arch/libarchive )
+DEPEND="archive? ( app-arch/libarchive )
 	zip? ( >=dev-libs/libzip-0.8 )"
-DEPEND="${DEPEND} ${COMMONDEPEND}"
-RDEPEND="${RDEPEND} ${COMMONDEPEND}"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	mycmakeargs="${mycmakeargs}
diff --git a/kde-base/blinken/ChangeLog b/kde-base/blinken/ChangeLog
index 6484c9410e77..943da598b95d 100644
--- a/kde-base/blinken/ChangeLog
+++ b/kde-base/blinken/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/blinken
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/ChangeLog,v 1.55 2008/02/20 22:31:10 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/ChangeLog,v 1.56 2008/02/23 17:35:39 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> blinken-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *blinken-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/blinken/blinken-4.0.1.ebuild b/kde-base/blinken/blinken-4.0.1.ebuild
index b7157d46c0fb..e81caeda85d5 100644
--- a/kde-base/blinken/blinken-4.0.1.ebuild
+++ b/kde-base/blinken/blinken-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/blinken-4.0.1.ebuild,v 1.1 2008/02/07 00:11:54 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/blinken-4.0.1.ebuild,v 1.2 2008/02/23 17:35:39 ingmar Exp $
 
 EAPI="1"
 
@@ -12,9 +12,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook"
 
 COMMONDEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}"
-DEPEND="${DEPEND} ${COMMONDEPEND}"
-RDEPEND="${RDEPEND} ${COMMONDEPEND}
-	|| ( >=kde-base/knotify-${PV}:${SLOT}
-		>=kde-base/kdebase-${PV}:${SLOT} )"
+DEPEND="${COMMONDEPEND}"
+RDEPEND="${COMMONDEPEND}
+	>=kde-base/knotify-${PV}:${SLOT}"
 
 KMEXTRACTONLY=libkdeedu/kdeeduui
diff --git a/kde-base/kanagram/ChangeLog b/kde-base/kanagram/ChangeLog
index 1cf7408e806a..cd8084863c1c 100644
--- a/kde-base/kanagram/ChangeLog
+++ b/kde-base/kanagram/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kanagram
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/ChangeLog,v 1.55 2008/02/20 22:35:13 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/ChangeLog,v 1.56 2008/02/23 17:36:01 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kanagram-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *kanagram-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kanagram/kanagram-4.0.1.ebuild b/kde-base/kanagram/kanagram-4.0.1.ebuild
index 6e5c3f30cef0..5031a4f488b4 100644
--- a/kde-base/kanagram/kanagram-4.0.1.ebuild
+++ b/kde-base/kanagram/kanagram-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/kanagram-4.0.1.ebuild,v 1.1 2008/02/07 00:12:49 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/kanagram-4.0.1.ebuild,v 1.2 2008/02/23 17:36:01 ingmar Exp $
 
 EAPI="1"
 
@@ -11,10 +11,8 @@ DESCRIPTION="KDE: letter order game."
 KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook"
 
-COMMONDEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}"
-DEPEND="${DEPEND} ${COMMONDEPEND}"
-RDEPEND="${RDEPEND} ${COMMONDEPEND}
-	|| ( >=kde-base/phonon-${PV}:${SLOT}
-		>=kde-base/kdebase-${PV}:${SLOT} )"
+DEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}"
+RDEPEND="${DEPEND}
+	>=kde-base/phonon-${PV}:${SLOT}"
 
 KMEXTRACTONLY="libkdeedu/kdeeduui libkdeedu/keduvocdocument"
diff --git a/kde-base/kate/ChangeLog b/kde-base/kate/ChangeLog
index 35b156057d09..a7ed419cee03 100644
--- a/kde-base/kate/ChangeLog
+++ b/kde-base/kate/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kate
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/ChangeLog,v 1.98 2008/02/20 22:36:30 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/ChangeLog,v 1.99 2008/02/23 17:36:25 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kate-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *kate-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kate/kate-4.0.1.ebuild b/kde-base/kate/kate-4.0.1.ebuild
index a565e992f96b..42d869ccdf87 100644
--- a/kde-base/kate/kate-4.0.1.ebuild
+++ b/kde-base/kate/kate-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-4.0.1.ebuild,v 1.1 2008/02/07 00:10:39 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-4.0.1.ebuild,v 1.2 2008/02/23 17:36:25 ingmar Exp $
 
 EAPI="1"
 
@@ -12,8 +12,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook"
 
 DEPEND="${DEPEND}
-	|| ( >=kde-base/plasma-${PV}:${SLOT}
-		>=kde-base/kdebase-${PV}:${SLOT} )"
+	>=kde-base/plasma-${PV}:${SLOT}"
 RDEPEND="${DEPEND}
 	dev-libs/libxml2
 	dev-libs/libxslt"
diff --git a/kde-base/kcalc/ChangeLog b/kde-base/kcalc/ChangeLog
index 5bd647fec309..082aeaa4864d 100644
--- a/kde-base/kcalc/ChangeLog
+++ b/kde-base/kcalc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kcalc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/ChangeLog,v 1.80 2008/02/20 22:39:16 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/ChangeLog,v 1.81 2008/02/23 17:36:42 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kcalc-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *kcalc-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kcalc/kcalc-4.0.1.ebuild b/kde-base/kcalc/kcalc-4.0.1.ebuild
index ba9d8c07f2d8..dfb7cab16203 100644
--- a/kde-base/kcalc/kcalc-4.0.1.ebuild
+++ b/kde-base/kcalc/kcalc-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-4.0.1.ebuild,v 1.1 2008/02/07 00:11:19 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-4.0.1.ebuild,v 1.2 2008/02/23 17:36:42 ingmar Exp $
 
 EAPI="1"
 
@@ -11,9 +11,8 @@ DESCRIPTION="KDE calculator"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook test"
 
-COMMONDEPEND="dev-libs/gmp"
-DEPEND="${DEPEND} ${COMMONDEPEND}"
-RDEPEND="${RDEPEND} ${COMMONDEPEND}"
+DEPEND="dev-libs/gmp"
+RDEPEND="${DEPEND}"
 
 src_test() {
 	pushd "${WORKDIR}"/${PN}_build/kcalc/knumber/tests > /dev/null
diff --git a/kde-base/kcheckpass/ChangeLog b/kde-base/kcheckpass/ChangeLog
index 8d5c22dee382..62d809ee9f0a 100644
--- a/kde-base/kcheckpass/ChangeLog
+++ b/kde-base/kcheckpass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kcheckpass
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.82 2008/02/20 22:39:42 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.83 2008/02/23 17:37:01 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kcheckpass-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *kcheckpass-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kcheckpass/kcheckpass-4.0.1.ebuild b/kde-base/kcheckpass/kcheckpass-4.0.1.ebuild
index 699d5f9d3d5e..4a520a48763e 100644
--- a/kde-base/kcheckpass/kcheckpass-4.0.1.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-4.0.1.ebuild,v 1.1 2008/02/07 00:11:22 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-4.0.1.ebuild,v 1.2 2008/02/23 17:37:01 ingmar Exp $
 
 EAPI="1"
 
@@ -11,7 +11,8 @@ DESCRIPTION="A simple password checker, used by any software in need of user aut
 KEYWORDS="~amd64 ~x86"
 IUSE="pam"
 
-DEPEND="pam? ( >=kde-base/kdebase-pam-7
+DEPEND="
+	pam? ( >=kde-base/kdebase-pam-7
 		sys-libs/pam )"
 RDEPEND="${DEPEND}"
 
diff --git a/kde-base/kcron/ChangeLog b/kde-base/kcron/ChangeLog
index b8215f601fc7..a2896105939c 100644
--- a/kde-base/kcron/ChangeLog
+++ b/kde-base/kcron/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kcron
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/ChangeLog,v 1.76 2008/02/20 22:40:40 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/ChangeLog,v 1.77 2008/02/23 17:37:21 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kcron-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *kcron-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kcron/kcron-4.0.1.ebuild b/kde-base/kcron/kcron-4.0.1.ebuild
index eeafbb320a9f..f0bceb34895d 100644
--- a/kde-base/kcron/kcron-4.0.1.ebuild
+++ b/kde-base/kcron/kcron-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/kcron-4.0.1.ebuild,v 1.1 2008/02/07 00:11:16 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/kcron-4.0.1.ebuild,v 1.2 2008/02/23 17:37:21 ingmar Exp $
 
 EAPI="1"
 
@@ -12,5 +12,4 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook"
 
 RDEPEND="virtual/cron
-	|| ( >=kde-base/knotify-${PV}:${SLOT}
-		>=kde-base/kdebase-${PV}:${SLOT} )"
+	>=kde-base/knotify-${PV}:${SLOT}"
diff --git a/kde-base/kdeartwork-kscreensaver/ChangeLog b/kde-base/kdeartwork-kscreensaver/ChangeLog
index 2340855c8721..c2e98520b705 100644
--- a/kde-base/kdeartwork-kscreensaver/ChangeLog
+++ b/kde-base/kdeartwork-kscreensaver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeartwork-kscreensaver
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.86 2008/02/20 22:45:10 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.87 2008/02/23 17:37:43 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  kdeartwork-kscreensaver-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *kdeartwork-kscreensaver-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.0.1.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.0.1.ebuild
index 06e1b3205ac6..454eae16e3c4 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.0.1.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.0.1.ebuild,v 1.1 2008/02/07 00:12:59 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.0.1.ebuild,v 1.2 2008/02/23 17:37:43 ingmar Exp $
 
 EAPI="1"
 
@@ -13,8 +13,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug opengl xscreensaver"
 
 DEPEND="${DEPEND}
-	|| ( >=kde-base/kscreensaver-${PV}:${SLOT}
-		>=kde-base/kdebase-${PV}:${SLOT} )
+	>=kde-base/kscreensaver-${PV}:${SLOT}
 	media-libs/libart_lgpl
 	opengl? ( virtual/opengl )
 	xscreensaver? ( x11-misc/xscreensaver )"
diff --git a/kde-base/kdebase-meta/ChangeLog b/kde-base/kdebase-meta/ChangeLog
index 62fffc6e82a6..f1e9145b3525 100644
--- a/kde-base/kdebase-meta/ChangeLog
+++ b/kde-base/kdebase-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-meta
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/ChangeLog,v 1.90 2008/02/20 22:47:33 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/ChangeLog,v 1.91 2008/02/23 17:38:49 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  kdebase-meta-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *kdebase-meta-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kdebase-meta/kdebase-meta-4.0.1.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.0.1.ebuild
index dd6917f95134..03c8dbd34046 100644
--- a/kde-base/kdebase-meta/kdebase-meta-4.0.1.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/kdebase-meta-4.0.1.ebuild,v 1.1 2008/02/07 00:12:31 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/kdebase-meta-4.0.1.ebuild,v 1.2 2008/02/23 17:38:49 ingmar Exp $
 
 EAPI="1"
 
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="!kde-base/kdebase-runtime-meta
-!kde-base/kdebase-workspace-meta"
+	!kde-base/kdebase-workspace-meta"
 RDEPEND="${DEPEND}
 	>=kde-base/dolphin-${PV}:${SLOT}
 	>=kde-base/drkonqi-${PV}:${SLOT}
diff --git a/kde-base/kdegames-meta/ChangeLog b/kde-base/kdegames-meta/ChangeLog
index 541bac2e733b..53b4766f956a 100644
--- a/kde-base/kdegames-meta/ChangeLog
+++ b/kde-base/kdegames-meta/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdegames-meta
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/ChangeLog,v 1.84 2008/02/20 22:49:21 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/ChangeLog,v 1.85 2008/02/23 17:39:51 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  kdegames-meta-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *kdegames-meta-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kdegames-meta/kdegames-meta-4.0.1.ebuild b/kde-base/kdegames-meta/kdegames-meta-4.0.1.ebuild
index a1914488ac88..78d2dec393ed 100644
--- a/kde-base/kdegames-meta/kdegames-meta-4.0.1.ebuild
+++ b/kde-base/kdegames-meta/kdegames-meta-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/kdegames-meta-4.0.1.ebuild,v 1.1 2008/02/07 00:12:46 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/kdegames-meta-4.0.1.ebuild,v 1.2 2008/02/23 17:39:51 ingmar Exp $
 
 EAPI="1"
 
@@ -15,28 +15,28 @@ KEYWORDS="~amd64 ~x86"
 IUSE="opengl"
 
 RDEPEND="
->=kde-base/bovo-${PV}:${SLOT}
->=kde-base/katomic-${PV}:${SLOT}
->=kde-base/kbattleship-${PV}:${SLOT}
->=kde-base/kblackbox-${PV}:${SLOT}
->=kde-base/kbounce-${PV}:${SLOT}
->=kde-base/kfourinline-${PV}:${SLOT}
->=kde-base/kgoldrunner-${PV}:${SLOT}
->=kde-base/kiriki-${PV}:${SLOT}
->=kde-base/kjumpingcube-${PV}:${SLOT}
->=kde-base/klines-${PV}:${SLOT}
->=kde-base/kmahjongg-${PV}:${SLOT}
->=kde-base/kmines-${PV}:${SLOT}
->=kde-base/knetwalk-${PV}:${SLOT}
->=kde-base/kolf-${PV}:${SLOT}
->=kde-base/konquest-${PV}:${SLOT}
->=kde-base/kpat-${PV}:${SLOT}
->=kde-base/kreversi-${PV}:${SLOT}
->=kde-base/ksame-${PV}:${SLOT}
->=kde-base/kshisen-${PV}:${SLOT}
->=kde-base/kspaceduel-${PV}:${SLOT}
->=kde-base/ksquares-${PV}:${SLOT}
->=kde-base/ktuberling-${PV}:${SLOT}
->=kde-base/lskat-${PV}:${SLOT}
-opengl? ( >=kde-base/ksudoku-${PV}:${SLOT} )
+	>=kde-base/bovo-${PV}:${SLOT}
+	>=kde-base/katomic-${PV}:${SLOT}
+	>=kde-base/kbattleship-${PV}:${SLOT}
+	>=kde-base/kblackbox-${PV}:${SLOT}
+	>=kde-base/kbounce-${PV}:${SLOT}
+	>=kde-base/kfourinline-${PV}:${SLOT}
+	>=kde-base/kgoldrunner-${PV}:${SLOT}
+	>=kde-base/kiriki-${PV}:${SLOT}
+	>=kde-base/kjumpingcube-${PV}:${SLOT}
+	>=kde-base/klines-${PV}:${SLOT}
+	>=kde-base/kmahjongg-${PV}:${SLOT}
+	>=kde-base/kmines-${PV}:${SLOT}
+	>=kde-base/knetwalk-${PV}:${SLOT}
+	>=kde-base/kolf-${PV}:${SLOT}
+	>=kde-base/konquest-${PV}:${SLOT}
+	>=kde-base/kpat-${PV}:${SLOT}
+	>=kde-base/kreversi-${PV}:${SLOT}
+	>=kde-base/ksame-${PV}:${SLOT}
+	>=kde-base/kshisen-${PV}:${SLOT}
+	>=kde-base/kspaceduel-${PV}:${SLOT}
+	>=kde-base/ksquares-${PV}:${SLOT}
+	>=kde-base/ktuberling-${PV}:${SLOT}
+	>=kde-base/lskat-${PV}:${SLOT}
+	opengl? ( >=kde-base/ksudoku-${PV}:${SLOT} )
 "
diff --git a/kde-base/kdesdk-kioslaves/ChangeLog b/kde-base/kdesdk-kioslaves/ChangeLog
index 5177340156c7..4b774278931a 100644
--- a/kde-base/kdesdk-kioslaves/ChangeLog
+++ b/kde-base/kdesdk-kioslaves/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdesdk-kioslaves
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.76 2008/02/20 22:54:31 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.77 2008/02/23 17:40:08 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  kdesdk-kioslaves-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *kdesdk-kioslaves-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.0.1.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.0.1.ebuild
index 20487403ee4b..d72b66582fa7 100644
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.0.1.ebuild
+++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.0.1.ebuild,v 1.1 2008/02/07 00:12:40 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.0.1.ebuild,v 1.2 2008/02/23 17:40:08 ingmar Exp $
 
 EAPI="1"
 
@@ -12,10 +12,9 @@ DESCRIPTION="kioslaves from kdesdk package: the subversion kioslave"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-COMMONDEPEND="dev-libs/apr
+DEPEND="dev-libs/apr
 		dev-util/subversion"
-DEPEND="${DEPEND} ${COMMONDEPEND}"
-RDEPEND="${RDEPEND} ${COMMONDEPEND}"
+RDEPEND="${RDEPEND}"
 
 pkg_setup() {
 	if ldd /usr/bin/svn | grep -q libapr-0 \
diff --git a/kde-base/kdessh/ChangeLog b/kde-base/kdessh/ChangeLog
index d33fbbedc734..1b4986e98c0e 100644
--- a/kde-base/kdessh/ChangeLog
+++ b/kde-base/kdessh/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdessh
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdessh/ChangeLog,v 1.3 2008/02/17 02:26:27 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdessh/ChangeLog,v 1.4 2008/02/23 17:40:23 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kdessh-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
   16 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> -kdessh-4.0.0.ebuild:
   Spring cleaning
diff --git a/kde-base/kdessh/kdessh-4.0.1.ebuild b/kde-base/kdessh/kdessh-4.0.1.ebuild
index 0ac60a8f6501..79e4c807ef93 100644
--- a/kde-base/kdessh/kdessh-4.0.1.ebuild
+++ b/kde-base/kdessh/kdessh-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdessh/kdessh-4.0.1.ebuild,v 1.1 2008/02/07 00:11:28 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdessh/kdessh-4.0.1.ebuild,v 1.2 2008/02/23 17:40:23 ingmar Exp $
 
 EAPI="1"
 
@@ -11,4 +11,4 @@ DESCRIPTION="KDE frontend to ssh"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-RDEPEND="${RDEPEND} virtual/ssh"
+RDEPEND="virtual/ssh"
diff --git a/kde-base/kget/ChangeLog b/kde-base/kget/ChangeLog
index 655d6f008942..a0df7eec491e 100644
--- a/kde-base/kget/ChangeLog
+++ b/kde-base/kget/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kget
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v 1.80 2008/02/20 23:00:29 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v 1.81 2008/02/23 17:40:41 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kget-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *kget-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kget/kget-4.0.1.ebuild b/kde-base/kget/kget-4.0.1.ebuild
index 5ecbe061bce9..7f4d73cad587 100644
--- a/kde-base/kget/kget-4.0.1.ebuild
+++ b/kde-base/kget/kget-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-4.0.1.ebuild,v 1.1 2008/02/07 00:12:47 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-4.0.1.ebuild,v 1.2 2008/02/23 17:40:41 ingmar Exp $
 
 EAPI="1"
 
@@ -13,10 +13,7 @@ IUSE="debug htmlhandbook +plasma"
 
 DEPEND="
 	dev-libs/libpcre
-	plasma? (
-		|| ( >=kde-base/plasma-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
-		)"
-
+	plasma? ( >=kde-base/plasma-${PV}:${SLOT} )"
 RDEPEND="${DEPEND}"
 
 src_compile() {
diff --git a/kde-base/kgpg/ChangeLog b/kde-base/kgpg/ChangeLog
index a109e0fe2862..08d5e16cef6f 100644
--- a/kde-base/kgpg/ChangeLog
+++ b/kde-base/kgpg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kgpg
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/ChangeLog,v 1.82 2008/02/20 23:01:07 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/ChangeLog,v 1.83 2008/02/23 17:40:57 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kgpg-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *kgpg-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kgpg/kgpg-4.0.1.ebuild b/kde-base/kgpg/kgpg-4.0.1.ebuild
index f2406eeb59dc..d2051bb328bf 100644
--- a/kde-base/kgpg/kgpg-4.0.1.ebuild
+++ b/kde-base/kgpg/kgpg-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-4.0.1.ebuild,v 1.1 2008/02/07 00:10:40 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-4.0.1.ebuild,v 1.2 2008/02/23 17:40:57 ingmar Exp $
 
 EAPI="1"
 
@@ -11,4 +11,4 @@ DESCRIPTION="KDE gpg keyring manager"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook"
 
-RDEPEND="${RDEPEND} app-crypt/gnupg"
+RDEPEND="app-crypt/gnupg"
diff --git a/kde-base/khangman/ChangeLog b/kde-base/khangman/ChangeLog
index 59c99b776987..7b9b2ccab9c0 100644
--- a/kde-base/khangman/ChangeLog
+++ b/kde-base/khangman/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/khangman
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/ChangeLog,v 1.82 2008/02/20 23:01:21 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/ChangeLog,v 1.83 2008/02/23 17:41:19 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> khangman-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *khangman-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/khangman/khangman-4.0.1.ebuild b/kde-base/khangman/khangman-4.0.1.ebuild
index a398267a5d16..5057d3bb8ed9 100644
--- a/kde-base/khangman/khangman-4.0.1.ebuild
+++ b/kde-base/khangman/khangman-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-4.0.1.ebuild,v 1.1 2008/02/07 00:12:02 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-4.0.1.ebuild,v 1.2 2008/02/23 17:41:19 ingmar Exp $
 
 EAPI="1"
 
@@ -11,8 +11,7 @@ DESCRIPTION="Classical hangman game for KDE"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook"
 
-COMMONDEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}"
-DEPEND="${DEPEND} ${COMMONDEPEND}"
-RDEPEND="${RDEPEND} ${COMMONDEPEND}"
+DEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}"
+RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY="libkdeedu/keduvocdocument"
diff --git a/kde-base/kig/ChangeLog b/kde-base/kig/ChangeLog
index 2f008fdd3090..dc2d05c37110 100644
--- a/kde-base/kig/ChangeLog
+++ b/kde-base/kig/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kig
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/ChangeLog,v 1.86 2008/02/20 23:02:59 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/ChangeLog,v 1.87 2008/02/23 17:41:41 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kig-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *kig-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kig/kig-4.0.1.ebuild b/kde-base/kig/kig-4.0.1.ebuild
index d411d0f1fdb0..45c7668f5ece 100644
--- a/kde-base/kig/kig-4.0.1.ebuild
+++ b/kde-base/kig/kig-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-4.0.1.ebuild,v 1.1 2008/02/07 00:12:10 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-4.0.1.ebuild,v 1.2 2008/02/23 17:41:41 ingmar Exp $
 
 EAPI="1"
 
@@ -11,9 +11,8 @@ DESCRIPTION="KDE Interactive Geometry tool"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook kig-scripting"
 
-COMMONDEPEND="kig-scripting? ( >=dev-libs/boost-1.32 )"
-DEPEND="${DEPEND} ${COMMONDEPEND}"
-RDEPEND="${RDEPEND} ${COMMONDEPEND}"
+DEPEND="kig-scripting? ( >=dev-libs/boost-1.32 )"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	mycmakeargs="${mycmakeargs}
diff --git a/kde-base/klettres/ChangeLog b/kde-base/klettres/ChangeLog
index 4ef86b846ede..4a3a7ebfb7c7 100644
--- a/kde-base/klettres/ChangeLog
+++ b/kde-base/klettres/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/klettres
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/ChangeLog,v 1.81 2008/02/20 23:05:01 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/ChangeLog,v 1.82 2008/02/23 17:42:03 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> klettres-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *klettres-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/klettres/klettres-4.0.1.ebuild b/kde-base/klettres/klettres-4.0.1.ebuild
index fe59e4c5d557..fed9d8b8972d 100644
--- a/kde-base/klettres/klettres-4.0.1.ebuild
+++ b/kde-base/klettres/klettres-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-4.0.1.ebuild,v 1.1 2008/02/07 00:12:24 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-4.0.1.ebuild,v 1.2 2008/02/23 17:42:03 ingmar Exp $
 
 EAPI="1"
 
@@ -11,5 +11,4 @@ DESCRIPTION="KDE: KLettres helps a very young child or an adult learning "
 KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook"
 
-RDEPEND="|| ( >=kde-base/knotify-${PV}:${SLOT}
-		>=kde-base/kdebase-${PV}:${SLOT} )"
+RDEPEND=">=kde-base/knotify-${PV}:${SLOT}"
diff --git a/kde-base/kmousetool/ChangeLog b/kde-base/kmousetool/ChangeLog
index 829bb127ed09..b479df2d1071 100644
--- a/kde-base/kmousetool/ChangeLog
+++ b/kde-base/kmousetool/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kmousetool
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/ChangeLog,v 1.78 2008/02/20 23:08:12 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/ChangeLog,v 1.79 2008/02/23 17:42:23 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kmousetool-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *kmousetool-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kmousetool/kmousetool-4.0.1.ebuild b/kde-base/kmousetool/kmousetool-4.0.1.ebuild
index 46063bd59a14..c9481e591e1d 100644
--- a/kde-base/kmousetool/kmousetool-4.0.1.ebuild
+++ b/kde-base/kmousetool/kmousetool-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-4.0.1.ebuild,v 1.1 2008/02/07 00:12:09 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-4.0.1.ebuild,v 1.2 2008/02/23 17:42:23 ingmar Exp $
 
 EAPI="1"
 
@@ -11,5 +11,6 @@ DESCRIPTION="KDE accessibility tool: translates mouse hovering into clicks"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook"
 
-RDEPEND="|| ( ( >=kde-base/knotify-${PV}:${SLOT} >=kde-base/phonon-${PV}:${SLOT} )
-		>=kde-base/kdebase-${PV}:${SLOT} )"
+RDEPEND="
+	>=kde-base/knotify-${PV}:${SLOT}
+	>=kde-base/phonon-${PV}:${SLOT}"
diff --git a/kde-base/kmplot/ChangeLog b/kde-base/kmplot/ChangeLog
index 8ffb34ee1187..67a134173067 100644
--- a/kde-base/kmplot/ChangeLog
+++ b/kde-base/kmplot/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kmplot
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/ChangeLog,v 1.81 2008/02/20 23:08:39 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/ChangeLog,v 1.82 2008/02/23 17:42:43 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kmplot-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *kmplot-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kmplot/kmplot-4.0.1.ebuild b/kde-base/kmplot/kmplot-4.0.1.ebuild
index 19cb194d1303..dfdda7eaee5e 100644
--- a/kde-base/kmplot/kmplot-4.0.1.ebuild
+++ b/kde-base/kmplot/kmplot-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-4.0.1.ebuild,v 1.1 2008/02/07 00:12:14 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-4.0.1.ebuild,v 1.2 2008/02/23 17:42:43 ingmar Exp $
 
 EAPI="1"
 
@@ -11,5 +11,4 @@ DESCRIPTION="Mathematical function plotter for KDE"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook"
 
-RDEPEND="|| ( >=kde-base/knotify-${PV}:${SLOT}
-		>=kde-base/kdebase-${PV}:${SLOT} )"
+RDEPEND=">=kde-base/knotify-${PV}:${SLOT}"
diff --git a/kde-base/knewsticker/ChangeLog b/kde-base/knewsticker/ChangeLog
index c7f136ad1367..27e1f1a5084f 100644
--- a/kde-base/knewsticker/ChangeLog
+++ b/kde-base/knewsticker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/knewsticker
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker/ChangeLog,v 1.82 2008/02/20 23:09:58 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker/ChangeLog,v 1.83 2008/02/23 17:43:04 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  knewsticker-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *knewsticker-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/knewsticker/knewsticker-4.0.1.ebuild b/kde-base/knewsticker/knewsticker-4.0.1.ebuild
index a8e4b465c088..f0a13a1c294d 100644
--- a/kde-base/knewsticker/knewsticker-4.0.1.ebuild
+++ b/kde-base/knewsticker/knewsticker-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker/knewsticker-4.0.1.ebuild,v 1.1 2008/02/07 00:10:48 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker/knewsticker-4.0.1.ebuild,v 1.2 2008/02/23 17:43:04 ingmar Exp $
 
 EAPI="1"
 
@@ -11,8 +11,7 @@ DESCRIPTION="Plasma widget: rss news ticker"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook"
 
-DEPEND="|| ( >=kde-base/plasma-${PV}:${SLOT}
-			>=kde-base/kdebase-${PV}:${SLOT} )"
+DEPEND=">=kde-base/plasma-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 src_compile() {
diff --git a/kde-base/kstars/ChangeLog b/kde-base/kstars/ChangeLog
index 6e87283efe75..94c58d88e882 100644
--- a/kde-base/kstars/ChangeLog
+++ b/kde-base/kstars/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kstars
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/ChangeLog,v 1.86 2008/02/20 23:22:18 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/ChangeLog,v 1.87 2008/02/23 17:43:24 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kstars-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *kstars-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kstars/kstars-4.0.1.ebuild b/kde-base/kstars/kstars-4.0.1.ebuild
index 0f0cd5d30582..131b93722607 100644
--- a/kde-base/kstars/kstars-4.0.1.ebuild
+++ b/kde-base/kstars/kstars-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-4.0.1.ebuild,v 1.1 2008/02/07 00:11:17 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-4.0.1.ebuild,v 1.2 2008/02/23 17:43:24 ingmar Exp $
 
 EAPI="1"
 
@@ -11,13 +11,12 @@ DESCRIPTION="KDE Desktop Planetarium"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug fits htmlhandbook nova sbig usb"
 
-COMMONDEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}
+DEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}
 		fits? ( sci-libs/cfitsio )
 		nova? ( >=sci-libs/libnova-0.12.1 )
 		sbig? ( sci-libs/indilib
 			usb? ( dev-libs/libusb ) )"
-DEPEND="${DEPEND} ${COMMONDEPEND}"
-RDEPEND="${RDEPEND} ${COMMONDEPEND}"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	epatch "${FILESDIR}/${PN}-4.0.0-destdir.patch"
diff --git a/kde-base/ktouch/ChangeLog b/kde-base/ktouch/ChangeLog
index ee1d5afec4e4..20acfc249f87 100644
--- a/kde-base/ktouch/ChangeLog
+++ b/kde-base/ktouch/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/ktouch
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ChangeLog,v 1.86 2008/02/20 23:24:48 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ChangeLog,v 1.87 2008/02/23 17:43:47 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> ktouch-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *ktouch-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/ktouch/ktouch-4.0.1.ebuild b/kde-base/ktouch/ktouch-4.0.1.ebuild
index 1cf5d1abb425..038168f6c535 100644
--- a/kde-base/ktouch/ktouch-4.0.1.ebuild
+++ b/kde-base/ktouch/ktouch-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-4.0.1.ebuild,v 1.1 2008/02/07 00:11:38 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-4.0.1.ebuild,v 1.2 2008/02/23 17:43:47 ingmar Exp $
 
 EAPI="1"
 
@@ -11,5 +11,4 @@ DESCRIPTION="KDE: A program that helps you to learn and practice touch typing"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook"
 
-RDEPEND="|| ( >=kde-base/knotify-${PV}:${SLOT}
-		>=kde-base/kdebase-${PV}:${SLOT} )"
+RDEPEND=">=kde-base/knotify-${PV}:${SLOT}"
diff --git a/kde-base/kttsd/ChangeLog b/kde-base/kttsd/ChangeLog
index 696fdd486904..c02264e2c1db 100644
--- a/kde-base/kttsd/ChangeLog
+++ b/kde-base/kttsd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kttsd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/ChangeLog,v 1.85 2008/02/20 23:25:16 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/ChangeLog,v 1.86 2008/02/23 17:44:08 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kttsd-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *kttsd-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kttsd/kttsd-4.0.1.ebuild b/kde-base/kttsd/kttsd-4.0.1.ebuild
index 9264ae43d730..e9b117566cb0 100644
--- a/kde-base/kttsd/kttsd-4.0.1.ebuild
+++ b/kde-base/kttsd/kttsd-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-4.0.1.ebuild,v 1.1 2008/02/07 00:11:12 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-4.0.1.ebuild,v 1.2 2008/02/23 17:44:08 ingmar Exp $
 
 EAPI="1"
 
@@ -12,9 +12,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="alsa debug htmlhandbook ktts"
 
 COMMONDEPEND="ktts? ( alsa? ( >=media-libs/alsa-lib-1.0.14a ) )
-	|| ( ( >=kde-base/kcmshell-${PV}:${SLOT}
-		>=kde-base/knotify-${PV}:${SLOT} )
-		>=kde-base/kdebase-${PV}:${SLOT} )"
+	>=kde-base/kcmshell-${PV}:${SLOT}
+	>=kde-base/knotify-${PV}:${SLOT}"
 DEPEND="${DEPEND} ${COMMONDEPEND}"
 RDEPEND="${RDEPEND} ${COMMONDEPEND}
 	ktts? ( app-accessibility/festival
diff --git a/kde-base/kturtle/ChangeLog b/kde-base/kturtle/ChangeLog
index 26a5a171501c..90850a099cd1 100644
--- a/kde-base/kturtle/ChangeLog
+++ b/kde-base/kturtle/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kturtle
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/ChangeLog,v 1.80 2008/02/20 23:25:43 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/ChangeLog,v 1.81 2008/02/23 17:44:28 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kturtle-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *kturtle-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kturtle/kturtle-4.0.1.ebuild b/kde-base/kturtle/kturtle-4.0.1.ebuild
index e859bd236e0f..e0e33a50a1ad 100644
--- a/kde-base/kturtle/kturtle-4.0.1.ebuild
+++ b/kde-base/kturtle/kturtle-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-4.0.1.ebuild,v 1.1 2008/02/07 00:10:56 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-4.0.1.ebuild,v 1.2 2008/02/23 17:44:28 ingmar Exp $
 
 EAPI="1"
 
@@ -11,5 +11,4 @@ DESCRIPTION="KDE: Educational programming environment using the Logo programming
 KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook"
 
-RDEPEND="|| ( >=kde-base/knotify-${PV}:${SLOT}
-		>=kde-base/kdebase-${PV}:${SLOT} )"
+RDEPEND=">=kde-base/knotify-${PV}:${SLOT}"
diff --git a/kde-base/ktux/ChangeLog b/kde-base/ktux/ChangeLog
index bf844f09d2ac..951cbced97d4 100644
--- a/kde-base/ktux/ChangeLog
+++ b/kde-base/ktux/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/ktux
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ChangeLog,v 1.76 2008/02/20 23:25:57 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ChangeLog,v 1.77 2008/02/23 17:44:48 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> ktux-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *ktux-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/ktux/ktux-4.0.1.ebuild b/kde-base/ktux/ktux-4.0.1.ebuild
index 41f7bf60029b..d3d8857d5111 100644
--- a/kde-base/ktux/ktux-4.0.1.ebuild
+++ b/kde-base/ktux/ktux-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ktux-4.0.1.ebuild,v 1.1 2008/02/07 00:10:46 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ktux-4.0.1.ebuild,v 1.2 2008/02/23 17:44:48 ingmar Exp $
 
 EAPI="1"
 
@@ -11,11 +11,9 @@ DESCRIPTION="KDE: screensaver featuring the Space-Faring Tux"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-COMMON_DEPEND=">=app-misc/strigi-0.5.7
-	|| ( >=kde-base/kscreensaver-${PV}:${SLOT}
-		    >=kde-base/kdebase-${PV}:${SLOT} )"
-DEPEND="${DEPEND} ${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}"
+DEPEND=">=app-misc/strigi-0.5.7
+	>=kde-base/kscreensaver-${PV}:${SLOT}"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	mycmakeargs="${mycmakeargs}
diff --git a/kde-base/kuser/ChangeLog b/kde-base/kuser/ChangeLog
index 6c6e8f14aa1b..77f9eea02f06 100644
--- a/kde-base/kuser/ChangeLog
+++ b/kde-base/kuser/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kuser
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/ChangeLog,v 1.79 2008/02/20 23:26:33 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/ChangeLog,v 1.80 2008/02/23 17:45:05 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kuser-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *kuser-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kuser/kuser-4.0.1.ebuild b/kde-base/kuser/kuser-4.0.1.ebuild
index daaef1583c3e..07cd8235bd60 100644
--- a/kde-base/kuser/kuser-4.0.1.ebuild
+++ b/kde-base/kuser/kuser-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-4.0.1.ebuild,v 1.1 2008/02/07 00:11:47 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-4.0.1.ebuild,v 1.2 2008/02/23 17:45:05 ingmar Exp $
 
 EAPI="1"
 
@@ -11,5 +11,4 @@ DESCRIPTION="KDE user (/etc/passwd and other methods) manager"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook"
 
-RDEPEND="|| ( >=kde-base/knotify-${PV}:${SLOT}
-		>=kde-base/kdebase-${PV}:${SLOT} )"
+RDEPEND=">=kde-base/knotify-${PV}:${SLOT}"
diff --git a/kde-base/kweather/ChangeLog b/kde-base/kweather/ChangeLog
index 348ccca211e5..0c85b97f6377 100644
--- a/kde-base/kweather/ChangeLog
+++ b/kde-base/kweather/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kweather
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/ChangeLog,v 1.82 2008/02/20 23:27:50 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/ChangeLog,v 1.83 2008/02/23 17:45:21 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kweather-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *kweather-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kweather/kweather-4.0.1.ebuild b/kde-base/kweather/kweather-4.0.1.ebuild
index c15fac1350dc..276b3637038c 100644
--- a/kde-base/kweather/kweather-4.0.1.ebuild
+++ b/kde-base/kweather/kweather-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/kweather-4.0.1.ebuild,v 1.1 2008/02/07 00:11:10 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/kweather-4.0.1.ebuild,v 1.2 2008/02/23 17:45:21 ingmar Exp $
 
 EAPI="1"
 
@@ -11,10 +11,8 @@ DESCRIPTION="KDE weather status display"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook"
 
-COMMON_DEPEND="|| ( >=kde-base/plasma-${PV}:${SLOT}
-		    >=kde-base/kdebase-${PV}:${SLOT} )"
-DEPEND="${DEPEND} ${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}"
+DEPEND=">=kde-base/plasma-${PV}:${SLOT}"
+RDEPEND="${DEPEND}"
 
 # More broken tests...
 RESTRICT="test"
diff --git a/kde-base/kwordquiz/ChangeLog b/kde-base/kwordquiz/ChangeLog
index b50cdf2baa56..7b8e2bc589b5 100644
--- a/kde-base/kwordquiz/ChangeLog
+++ b/kde-base/kwordquiz/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kwordquiz
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/ChangeLog,v 1.82 2008/02/20 23:28:43 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/ChangeLog,v 1.83 2008/02/23 17:45:41 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kwordquiz-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *kwordquiz-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kwordquiz/kwordquiz-4.0.1.ebuild b/kde-base/kwordquiz/kwordquiz-4.0.1.ebuild
index 8343de270a87..3aaf68297a37 100644
--- a/kde-base/kwordquiz/kwordquiz-4.0.1.ebuild
+++ b/kde-base/kwordquiz/kwordquiz-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-4.0.1.ebuild,v 1.1 2008/02/07 00:12:11 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-4.0.1.ebuild,v 1.2 2008/02/23 17:45:41 ingmar Exp $
 
 EAPI="1"
 
@@ -12,7 +12,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook"
 
 COMMONDEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}"
-DEPEND="${DEPEND} ${COMMONDEPEND}"
-RDEPEND="${RDEPEND} ${COMMONDEPEND}"
+DEPEND="${COMMONDEPEND}"
+RDEPEND="${COMMONDEPEND}"
 
 KMEXTRACTONLY="libkdeedu/keduvocdocument"
diff --git a/kde-base/okular/ChangeLog b/kde-base/okular/ChangeLog
index 45c57735d8b4..ef67b6a6e9c9 100644
--- a/kde-base/okular/ChangeLog
+++ b/kde-base/okular/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/okular
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.3 2008/02/17 02:40:10 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.4 2008/02/23 17:45:58 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> okular-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
   16 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> -okular-4.0.0.ebuild:
   Spring cleaning
diff --git a/kde-base/okular/okular-4.0.1.ebuild b/kde-base/okular/okular-4.0.1.ebuild
index 830f4ad68391..3a5eef672717 100644
--- a/kde-base/okular/okular-4.0.1.ebuild
+++ b/kde-base/okular/okular-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.0.1.ebuild,v 1.1 2008/02/07 00:12:56 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.0.1.ebuild,v 1.2 2008/02/23 17:45:58 ingmar Exp $
 
 EAPI="1"
 
@@ -11,7 +11,8 @@ DESCRIPTION="Okular is an universal document viewer based on KPDF for KDE 4."
 KEYWORDS="~amd64 ~x86"
 IUSE="chm debug djvu htmlhandbook jpeg pdf tiff"
 
-RDEPEND=">=app-text/libspectre-0.2
+RDEPEND="
+	>=app-text/libspectre-0.2
 	media-libs/freetype
 	kde-base/qimageblitz
 	chm? ( app-doc/chmlib )
diff --git a/kde-base/parley/ChangeLog b/kde-base/parley/ChangeLog
index 6e68eb04b646..4471fcc5591b 100644
--- a/kde-base/parley/ChangeLog
+++ b/kde-base/parley/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/parley
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/ChangeLog,v 1.4 2008/02/17 02:25:57 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/ChangeLog,v 1.5 2008/02/23 17:46:11 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> parley-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
   16 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> -parley-4.0.0.ebuild:
   Spring cleaning
diff --git a/kde-base/parley/parley-4.0.1.ebuild b/kde-base/parley/parley-4.0.1.ebuild
index 54d37e83b6ff..74ce5c72eec6 100644
--- a/kde-base/parley/parley-4.0.1.ebuild
+++ b/kde-base/parley/parley-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/parley-4.0.1.ebuild,v 1.1 2008/02/07 00:12:30 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/parley-4.0.1.ebuild,v 1.2 2008/02/23 17:46:11 ingmar Exp $
 
 EAPI="1"
 
@@ -12,7 +12,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook"
 
 COMMONDEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}"
-DEPEND="${DEPEND} ${COMMONDEPEND}"
-RDEPEND="${RDEPEND} ${COMMONDEPEND}"
+DEPEND="${COMMONDEPEND}"
+RDEPEND="${COMMONDEPEND}"
 
 KMEXTRACTONLY="libkdeedu/keduvocdocument"
diff --git a/kde-base/plasma/ChangeLog b/kde-base/plasma/ChangeLog
index 46d6b887e49e..1655f27a3266 100644
--- a/kde-base/plasma/ChangeLog
+++ b/kde-base/plasma/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/plasma
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma/ChangeLog,v 1.4 2008/02/17 01:44:00 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma/ChangeLog,v 1.5 2008/02/23 17:46:29 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> plasma-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
   16 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   -files/plasma-4.0.0-linkage.patch, -plasma-4.0.0.ebuild:
diff --git a/kde-base/plasma/plasma-4.0.1.ebuild b/kde-base/plasma/plasma-4.0.1.ebuild
index 4a01da865de2..fbdd4a567968 100644
--- a/kde-base/plasma/plasma-4.0.1.ebuild
+++ b/kde-base/plasma/plasma-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma/plasma-4.0.1.ebuild,v 1.1 2008/02/07 00:12:16 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma/plasma-4.0.1.ebuild,v 1.2 2008/02/23 17:46:29 ingmar Exp $
 
 EAPI="1"
 
@@ -28,8 +28,7 @@ DEPEND="${COMMONDEPEND}
 RDEPEND="${COMMONDEPEND}
 	>=kde-base/kde-menu-icons-${PV}:${SLOT}"
 PDEPEND="
-	|| ( kde-base/kdeartwork-iconthemes:${SLOT}
-		kde-base/kdeartwork:${SLOT} )"
+	kde-base/kdeartwork-iconthemes:${SLOT}"
 
 KMEXTRACTONLY="
 	ksmserver/org.kde.KSMServerInterface.xml
diff --git a/kde-base/superkaramba/ChangeLog b/kde-base/superkaramba/ChangeLog
index 0f21af71bcf3..0225e0eef910 100644
--- a/kde-base/superkaramba/ChangeLog
+++ b/kde-base/superkaramba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/superkaramba
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.66 2008/02/20 23:36:23 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.67 2008/02/23 17:46:45 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  superkaramba-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *superkaramba-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/superkaramba/superkaramba-4.0.1.ebuild b/kde-base/superkaramba/superkaramba-4.0.1.ebuild
index f8e6618be73f..641fe3f8b895 100644
--- a/kde-base/superkaramba/superkaramba-4.0.1.ebuild
+++ b/kde-base/superkaramba/superkaramba-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-4.0.1.ebuild,v 1.3 2008/02/18 17:06:03 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-4.0.1.ebuild,v 1.4 2008/02/23 17:46:45 ingmar Exp $
 
 EAPI="1"
 
@@ -11,12 +11,12 @@ DESCRIPTION="A tool to create interactive applets for the KDE desktop."
 KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook python"
 
-COMMONDEPEND="kde-base/qimageblitz
-	|| ( >=kde-base/plasma-$PV:$SLOT
-		>=kde-base/kdebase-${PV}:${SLOT} )
+COMMONDEPEND="
+	kde-base/qimageblitz
+	>=kde-base/plasma-$PV:$SLOT
 	python? ( dev-lang/python )"
-DEPEND="${DEPEND} ${COMMONDEPEND}"
-RDEPEND="${RDEPEND} ${COMMONDEPEND}"
+DEPEND="${COMMONDEPEND}"
+RDEPEND="${COMMONDEPEND}"
 
 PATCHES="${FILESDIR}/${P}-as-needed.patch"
 
diff --git a/kde-base/umbrello/ChangeLog b/kde-base/umbrello/ChangeLog
index f8de4b2357f0..4d9c5e14e360 100644
--- a/kde-base/umbrello/ChangeLog
+++ b/kde-base/umbrello/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/umbrello
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.82 2008/02/20 23:36:35 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.83 2008/02/23 17:47:01 ingmar Exp $
+
+  23 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> umbrello-4.0.1.ebuild:
+  Remove traces of monolithic KDE 4.
 
 *umbrello-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/umbrello/umbrello-4.0.1.ebuild b/kde-base/umbrello/umbrello-4.0.1.ebuild
index f997309d1670..9900fab8a394 100644
--- a/kde-base/umbrello/umbrello-4.0.1.ebuild
+++ b/kde-base/umbrello/umbrello-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-4.0.1.ebuild,v 1.1 2008/02/07 00:10:46 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-4.0.1.ebuild,v 1.2 2008/02/23 17:47:01 ingmar Exp $
 
 EAPI="1"
 
@@ -13,5 +13,5 @@ IUSE="debug htmlhandbook"
 
 COMMONDEPEND="dev-libs/libxml2
 	dev-libs/libxslt"
-DEPEND="${DEPEND} ${COMMONDEPEND}"
-RDEPEND="${RDEPEND} ${COMMONDEPEND}"
+DEPEND="${COMMONDEPEND}"
+RDEPEND="${COMMONDEPEND}"