Semi-automatic merge, Update deps.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

178 files changed, 917 insertions, 451 deletions

diff --git a/kde-base/kate/ChangeLog b/kde-base/kate/ChangeLog
index 00e22b781042..9bedefd7c290 100644
--- a/kde-base/kate/ChangeLog
+++ b/kde-base/kate/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kate
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/ChangeLog,v 1.123 2009/03/04 20:31:46 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/ChangeLog,v 1.124 2009/03/08 13:23:26 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kate-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kate-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kate/kate-4.2.1.ebuild b/kde-base/kate/kate-4.2.1.ebuild
index 2308b92222e2..27d422de6897 100644
--- a/kde-base/kate/kate-4.2.1.ebuild
+++ b/kde-base/kate/kate-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-4.2.1.ebuild,v 1.1 2009/03/04 20:31:47 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-4.2.1.ebuild,v 1.2 2009/03/08 13:23:26 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,10 +11,11 @@ DESCRIPTION="Kate is an MDI texteditor."
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug +plasma"
 
-DEPEND=""
-RDEPEND="${DEPEND}
+DEPEND="
 	dev-libs/libxml2
-	dev-libs/libxslt"
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}"
 
 KMEXTRA="doc/kate-plugins"
 
diff --git a/kde-base/kcachegrind/ChangeLog b/kde-base/kcachegrind/ChangeLog
index 6a658ef42041..e7b85755310d 100644
--- a/kde-base/kcachegrind/ChangeLog
+++ b/kde-base/kcachegrind/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kcachegrind
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/ChangeLog,v 1.100 2009/03/04 20:37:19 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/ChangeLog,v 1.101 2009/03/08 13:23:49 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kcachegrind-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kcachegrind-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kcachegrind/kcachegrind-4.2.1.ebuild b/kde-base/kcachegrind/kcachegrind-4.2.1.ebuild
index a696a63d784b..70079b167eca 100644
--- a/kde-base/kcachegrind/kcachegrind-4.2.1.ebuild
+++ b/kde-base/kcachegrind/kcachegrind-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/kcachegrind-4.2.1.ebuild,v 1.1 2009/03/04 20:37:19 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/kcachegrind-4.2.1.ebuild,v 1.2 2009/03/08 13:23:49 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,4 +11,6 @@ DESCRIPTION="KDE Frontend for Cachegrind"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-RDEPEND="${RDEPEND} media-gfx/graphviz"
+RDEPEND="
+	media-gfx/graphviz
+"
diff --git a/kde-base/kcalc/ChangeLog b/kde-base/kcalc/ChangeLog
index e191e7d0af7e..d19e3206267a 100644
--- a/kde-base/kcalc/ChangeLog
+++ b/kde-base/kcalc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kcalc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/ChangeLog,v 1.104 2009/03/04 20:37:57 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/ChangeLog,v 1.105 2009/03/08 13:24:26 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kcalc-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kcalc-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kcalc/kcalc-4.2.1.ebuild b/kde-base/kcalc/kcalc-4.2.1.ebuild
index 0be3254d82a3..a918ca877249 100644
--- a/kde-base/kcalc/kcalc-4.2.1.ebuild
+++ b/kde-base/kcalc/kcalc-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-4.2.1.ebuild,v 1.1 2009/03/04 20:37:57 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-4.2.1.ebuild,v 1.2 2009/03/08 13:24:26 scarabeus Exp $
 
 EAPI="2"
 
@@ -12,7 +12,9 @@ DESCRIPTION="KDE calculator"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND="dev-libs/gmp"
+DEPEND="
+	dev-libs/gmp
+"
 RDEPEND="${DEPEND}"
 
 src_test() {
diff --git a/kde-base/kcminit/ChangeLog b/kde-base/kcminit/ChangeLog
index 602e7919b127..047cc9daf60d 100644
--- a/kde-base/kcminit/ChangeLog
+++ b/kde-base/kcminit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kcminit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/ChangeLog,v 1.92 2009/03/04 20:39:53 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/ChangeLog,v 1.93 2009/03/08 13:25:01 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kcminit-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kcminit-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kcminit/kcminit-4.2.1.ebuild b/kde-base/kcminit/kcminit-4.2.1.ebuild
index 83d3fc39d937..51e9f8e89b81 100644
--- a/kde-base/kcminit/kcminit-4.2.1.ebuild
+++ b/kde-base/kcminit/kcminit-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/kcminit-4.2.1.ebuild,v 1.1 2009/03/04 20:39:53 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/kcminit-4.2.1.ebuild,v 1.2 2009/03/08 13:25:01 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,5 +11,7 @@ DESCRIPTION="KCMInit - runs startups initialization for Control Modules."
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND=">=kde-base/ksplash-${PV}:${SLOT}"
+DEPEND="
+	>=kde-base/ksplash-${PV}:${SLOT}[kdeprefix=]
+"
 RDEPEND="${DEPEND}"
diff --git a/kde-base/kcontrol/ChangeLog b/kde-base/kcontrol/ChangeLog
index b32337b6f275..8c4a1f2f08db 100644
--- a/kde-base/kcontrol/ChangeLog
+++ b/kde-base/kcontrol/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kcontrol
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.133 2009/03/04 20:41:45 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.134 2009/03/08 13:26:11 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kcontrol-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kcontrol-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kcontrol/kcontrol-4.2.1.ebuild b/kde-base/kcontrol/kcontrol-4.2.1.ebuild
index 5c91a32865c3..82f6fe911347 100644
--- a/kde-base/kcontrol/kcontrol-4.2.1.ebuild
+++ b/kde-base/kcontrol/kcontrol-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-4.2.1.ebuild,v 1.1 2009/03/04 20:41:45 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-4.2.1.ebuild,v 1.2 2009/03/08 13:26:11 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,9 +11,9 @@ DESCRIPTION="The KDE Control Center"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND="
-	!<kde-base/ksmserver-${PV}:${SLOT}[kdeprefix=]
-	!kdeprefix? ( !<kde-base/ksmserver-${PV}[-kdeprefix] )
-	>=kde-base/kdnssd-${PV}:${SLOT}
-	>=kde-base/khotkeys-${PV}:${SLOT}
-	"
+RDEPEND="
+	!kdeprefix? ( !<kde-base/ksmserver-${PV} )
+	kdeprefix? ( !<kde-base/ksmserver-${PV}:${SLOT} )
+	>=kde-base/kdnssd-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/khotkeys-${PV}:${SLOT}[kdeprefix=]
+"
diff --git a/kde-base/kdeaccessibility-iconthemes/ChangeLog b/kde-base/kdeaccessibility-iconthemes/ChangeLog
index bc4ebcaa8489..0e8fddafae26 100644
--- a/kde-base/kdeaccessibility-iconthemes/ChangeLog
+++ b/kde-base/kdeaccessibility-iconthemes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeaccessibility-iconthemes
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-iconthemes/ChangeLog,v 1.100 2009/03/04 20:43:23 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-iconthemes/ChangeLog,v 1.101 2009/03/08 13:26:58 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdeaccessibility-iconthemes-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kdeaccessibility-iconthemes-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-4.2.1.ebuild b/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-4.2.1.ebuild
index 7689f1b0f5a1..8d1120840c2e 100644
--- a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-4.2.1.ebuild
+++ b/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-4.2.1.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-4.2.1.ebuild,v 1.1 2009/03/04 20:43:23 alexxy Exp $
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-4.2.1.ebuild,v 1.2 2009/03/08 13:26:58 scarabeus Exp $
 
 EAPI="2"
 
diff --git a/kde-base/kdeartwork-desktopthemes/ChangeLog b/kde-base/kdeartwork-desktopthemes/ChangeLog
index 81d1b5fb2ff5..ed75bdba7495 100644
--- a/kde-base/kdeartwork-desktopthemes/ChangeLog
+++ b/kde-base/kdeartwork-desktopthemes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeartwork-desktopthemes
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-desktopthemes/ChangeLog,v 1.4 2009/03/04 20:45:48 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-desktopthemes/ChangeLog,v 1.5 2009/03/08 13:27:33 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdeartwork-desktopthemes-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kdeartwork-desktopthemes-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.2.1.ebuild b/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.2.1.ebuild
index 09c97a10fe87..a19a5c041b8b 100644
--- a/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.2.1.ebuild
+++ b/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.2.1.ebuild,v 1.1 2009/03/04 20:45:48 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-desktopthemes/kdeartwork-desktopthemes-4.2.1.ebuild,v 1.2 2009/03/08 13:27:33 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,7 +11,3 @@ inherit kde4-meta
 DESCRIPTION="Additional themes from kde"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
-
-DEPEND="
-	!kdeprefix? ( !<kde-base/kdeplasma-addons-${PV}[-kdeprefix] )"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kdeartwork-kscreensaver/ChangeLog b/kde-base/kdeartwork-kscreensaver/ChangeLog
index 4f92bb7ab5ac..96684fb2601d 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.112 2009/03/04 20:47:43 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.113 2009/03/08 13:28:39 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdeartwork-kscreensaver-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kdeartwork-kscreensaver-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.2.1.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.2.1.ebuild
index 55ca9b83cc97..e2990ce24db0 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.2.1.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.2.1.ebuild,v 1.1 2009/03/04 20:47:43 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.2.1.ebuild,v 1.2 2009/03/08 13:28:39 scarabeus Exp $
 
 EAPI="2"
 
@@ -13,11 +13,12 @@ DESCRIPTION="Extra screensavers for kde"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug opengl xscreensaver"
 
-DEPEND="${DEPEND}
-	>=kde-base/kscreensaver-${PV}:${SLOT}[opengl?]
+DEPEND="
+	>=kde-base/kscreensaver-${PV}:${SLOT}[kdeprefix=,opengl?]
 	media-libs/libart_lgpl
 	opengl? ( virtual/opengl )
-	xscreensaver? ( x11-misc/xscreensaver )"
+	xscreensaver? ( x11-misc/xscreensaver )
+"
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch" )
diff --git a/kde-base/kdeartwork-wallpapers/ChangeLog b/kde-base/kdeartwork-wallpapers/ChangeLog
index 4a33071945a9..0b14cddd5cce 100644
--- a/kde-base/kdeartwork-wallpapers/ChangeLog
+++ b/kde-base/kdeartwork-wallpapers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeartwork-wallpapers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/ChangeLog,v 1.94 2009/03/04 20:50:08 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/ChangeLog,v 1.95 2009/03/08 13:30:18 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdeartwork-wallpapers-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kdeartwork-wallpapers-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.2.1.ebuild b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.2.1.ebuild
index f020e5846648..a63781b3f2ae 100644
--- a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.2.1.ebuild
+++ b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.2.1.ebuild,v 1.1 2009/03/04 20:50:08 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.2.1.ebuild,v 1.2 2009/03/08 13:30:18 scarabeus Exp $
 
 EAPI="2"
 
@@ -14,6 +14,7 @@ DESCRIPTION="Wallpapers from kde"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-RDEPEND="${RDEPEND}
-	!<kde-base/kde-wallpapers-$PV:${SLOT}[kdeprefix=]
-	!kdeprefix? ( !<kde-base/kde-wallpapers-$PV[kdeprefix=] )"
+RDEPEND="
+	!kdeprefix? ( !<kde-base/kde-wallpapers-${PV} )
+	kdeprefix? ( !<kde-base/kde-wallpapers-$PV:${SLOT} )
+"
diff --git a/kde-base/kdebase-data/ChangeLog b/kde-base/kdebase-data/ChangeLog
index d39d8df7b971..21c98b136a77 100644
--- a/kde-base/kdebase-data/ChangeLog
+++ b/kde-base/kdebase-data/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-data
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.107 2009/03/05 15:12:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.108 2009/03/08 13:32:09 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdebase-data-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
   05 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
   kdebase-data-4.2.1.ebuild:
diff --git a/kde-base/kdebase-data/kdebase-data-4.2.1.ebuild b/kde-base/kdebase-data/kdebase-data-4.2.1.ebuild
index 03a727f307ec..f2ca15507f35 100644
--- a/kde-base/kdebase-data/kdebase-data-4.2.1.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-4.2.1.ebuild,v 1.2 2009/03/05 15:12:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-4.2.1.ebuild,v 1.3 2009/03/08 13:32:09 scarabeus Exp $
 
 EAPI="2"
 
@@ -15,8 +15,9 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 # Some files were moved from dolphin to kdebase-data between the 4.1.85 and the 4.1.87
 # releases. Thus we need to block older versions of dolphin, including the :4.1 versions.
 RDEPEND="
-	!<kde-base/dolphin-4.1.87:4.2[kdeprefix=]
-	!kdeprefix? ( !<kde-base/dolphin-4.1.87[-kdeprefix] )
+	!=media-gfx/digikam-0.10.0_rc2[kdeprefix=]
+	!kdeprefix? ( !<kde-base/dolphin-${PV} )
+	kdeprefix? ( !<kde-base/dolphin-${PV}:${SLOT} )
 	x11-themes/hicolor-icon-theme
 "
 
diff --git a/kde-base/kdebase-desktoptheme/ChangeLog b/kde-base/kdebase-desktoptheme/ChangeLog
index e002093ce6a1..b891c6575720 100644
--- a/kde-base/kdebase-desktoptheme/ChangeLog
+++ b/kde-base/kdebase-desktoptheme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-desktoptheme
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/ChangeLog,v 1.4 2009/03/04 20:51:58 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/ChangeLog,v 1.5 2009/03/08 13:33:13 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdebase-desktoptheme-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kdebase-desktoptheme-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.2.1.ebuild b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.2.1.ebuild
index e91511e0f621..2602de84aa34 100644
--- a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.2.1.ebuild
+++ b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.2.1.ebuild,v 1.1 2009/03/04 20:51:58 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.2.1.ebuild,v 1.2 2009/03/08 13:33:13 scarabeus Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ DESCRIPTION="oxygen desktoptheme from kdebase"
 IUSE=""
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-RDEPEND="${DEPEND}
-	!kdeprefix? ( !kde-base/plasma-workspace:4.1[-kdeprefix] )
-	!<kde-base/plasma-workspace-${PV}:${SLOT}[kdeprefix=]
-	"
+RDEPEND="
+	!kdeprefix? ( !<kde-base/plasma-workspace-${PV} )
+	kdeprefix? ( !<kde-base/plasma-workspace-${PV}:${SLOT} )
+"
diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog
index 848691fc2b2f..eb2cba57d761 100644
--- a/kde-base/kdebase-kioslaves/ChangeLog
+++ b/kde-base/kdebase-kioslaves/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-kioslaves
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.137 2009/03/04 20:52:48 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.138 2009/03/08 13:34:18 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdebase-kioslaves-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kdebase-kioslaves-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.2.1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.2.1.ebuild
index d04fe176605e..3d8557f97078 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.2.1.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.2.1.ebuild,v 1.1 2009/03/04 20:52:48 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.2.1.ebuild,v 1.2 2009/03/08 13:34:18 scarabeus Exp $
 
 EAPI="2"
 
@@ -22,8 +22,8 @@ DEPEND="
 	samba? ( net-fs/samba )
 "
 RDEPEND="${DEPEND}
-	>=kde-base/kdesu-${PV}:${SLOT}
-	>=kde-base/kdialog-${PV}:${SLOT}
+	>=kde-base/kdesu-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kdialog-${PV}:${SLOT}[kdeprefix=]
 	virtual/ssh
 "
 
diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 56069e794f11..2ffd4b83e912 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-startkde
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.146 2009/03/04 20:55:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.147 2009/03/08 13:35:44 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdebase-startkde-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kdebase-startkde-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.2.1.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.2.1.ebuild
index 2b25959c1be8..1e04ec1d7757 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.2.1.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.2.1.ebuild,v 1.1 2009/03/04 20:55:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.2.1.ebuild,v 1.2 2009/03/08 13:35:44 scarabeus Exp $
 
 EAPI="2"
 
@@ -12,10 +12,9 @@ DESCRIPTION="Startkde script, which starts a complete KDE session, and associate
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-DEPEND=""
 # The KDE apps called from the startkde script.
 # These provide the most minimal KDE desktop.
-RDEPEND="${DEPEND}
+RDEPEND="
 	>=kde-base/kcminit-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kdebase-desktoptheme-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kdebase-kioslaves-${PV}:${SLOT}[kdeprefix=]
@@ -34,18 +33,17 @@ RDEPEND="${DEPEND}
 	>=kde-base/plasma-workspace-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/systemsettings-${PV}:${SLOT}[kdeprefix=]
 	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrandr
 	x11-apps/xsetroot
 	x11-apps/xset
-	x11-apps/xrandr
-	x11-apps/mkfontdir
-	x11-apps/xprop
 "
 
 KMEXTRACTONLY="
-	startkde.cmake
 	ConfigureChecks.cmake
 	kdm/
 	safestartkde.cmake
+	startkde.cmake
 "
 
 PATCHES=("${FILESDIR}/gentoo-startkde4.patch")
diff --git a/kde-base/kdemultimedia-kioslaves/ChangeLog b/kde-base/kdemultimedia-kioslaves/ChangeLog
index 26c4618dfac7..60e52b6a14af 100644
--- a/kde-base/kdemultimedia-kioslaves/ChangeLog
+++ b/kde-base/kdemultimedia-kioslaves/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdemultimedia-kioslaves
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.113 2009/03/04 21:04:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.114 2009/03/08 13:36:31 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdemultimedia-kioslaves-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kdemultimedia-kioslaves-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.2.1.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.2.1.ebuild
index 17a3a68e3545..96140cb3c1f3 100644
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.2.1.ebuild
+++ b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.2.1.ebuild,v 1.1 2009/03/04 21:04:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.2.1.ebuild,v 1.2 2009/03/08 13:36:31 scarabeus Exp $
 
 EAPI="2"
 
@@ -13,8 +13,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug encode flac vorbis"
 
 DEPEND="
-	>=kde-base/libkcddb-${PV}:${SLOT}
-	>=kde-base/libkcompactdisc-${PV}:${SLOT}
+	>=kde-base/libkcddb-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libkcompactdisc-${PV}:${SLOT}[kdeprefix=]
 	media-sound/cdparanoia
 	encode? (
 		flac? ( >=media-libs/flac-1.1.2 )
diff --git a/kde-base/kdepasswd/ChangeLog b/kde-base/kdepasswd/ChangeLog
index b9343cf99e97..cd34e70476b7 100644
--- a/kde-base/kdepasswd/ChangeLog
+++ b/kde-base/kdepasswd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdepasswd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/ChangeLog,v 1.111 2009/03/04 21:07:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/ChangeLog,v 1.112 2009/03/08 13:37:02 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kdepasswd-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kdepasswd-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kdepasswd/kdepasswd-4.2.1.ebuild b/kde-base/kdepasswd/kdepasswd-4.2.1.ebuild
index af0e662bd82f..4e4f01ce4250 100644
--- a/kde-base/kdepasswd/kdepasswd-4.2.1.ebuild
+++ b/kde-base/kdepasswd/kdepasswd-4.2.1.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/kdepasswd-4.2.1.ebuild,v 1.1 2009/03/04 21:07:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/kdepasswd-4.2.1.ebuild,v 1.2 2009/03/08 13:37:02 scarabeus Exp $
 
 EAPI="2"
 
-KMNAME="kdebase"
-KMMODULE="apps/${PN}"
-
+KMNAME="kdebase-apps"
 inherit kde4-meta
 
 DESCRIPTION="KDE GUI for passwd"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND=">=kde-base/libkonq-${PV}:${SLOT}"
+DEPEND="
+	>=kde-base/libkonq-${PV}:${SLOT}[kdeprefix=]
+"
 RDEPEND="${DEPEND}
-	>=kde-base/kdesu-${PV}:${SLOT}"
+	>=kde-base/kdesu-${PV}:${SLOT}[kdeprefix=]
+"
 
 KMLOADLIBS="libkonq"
diff --git a/kde-base/kdepim-kresources/ChangeLog b/kde-base/kdepim-kresources/ChangeLog
index 3ac1ab6a3c8f..6abef77d5fb3 100644
--- a/kde-base/kdepim-kresources/ChangeLog
+++ b/kde-base/kdepim-kresources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepim-kresources
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/ChangeLog,v 1.107 2009/03/05 18:10:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/ChangeLog,v 1.108 2009/03/08 13:37:41 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdepim-kresources-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
   05 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
   kdepim-kresources-4.2.1.ebuild:
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.2.1.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.2.1.ebuild
index 4621b5b1ba3a..fd82916a5b77 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-4.2.1.ebuild
+++ b/kde-base/kdepim-kresources/kdepim-kresources-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/kdepim-kresources-4.2.1.ebuild,v 1.2 2009/03/05 18:10:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/kdepim-kresources-4.2.1.ebuild,v 1.3 2009/03/08 13:37:41 scarabeus Exp $
 
 EAPI="2"
 
@@ -17,6 +17,7 @@ DEPEND="
 	>=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kaddressbook-${PV}:${SLOT}[kdeprefix=]
 "
+RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY="
 	akonadi/kcal/
@@ -24,7 +25,6 @@ KMEXTRACTONLY="
 	kmail/
 	knotes/
 	korganizer/version.h
-	libkdepim/
 "
 
 KMLOADLIBS="libkdepim"
diff --git a/kde-base/kdepim-wizards/ChangeLog b/kde-base/kdepim-wizards/ChangeLog
index 4782729d1d84..fc0bb784753b 100644
--- a/kde-base/kdepim-wizards/ChangeLog
+++ b/kde-base/kdepim-wizards/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepim-wizards
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/ChangeLog,v 1.96 2009/03/04 21:11:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/ChangeLog,v 1.97 2009/03/08 13:38:36 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdepim-wizards-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kdepim-wizards-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kdepim-wizards/kdepim-wizards-4.2.1.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-4.2.1.ebuild
index 3107241e8185..6be3c9e4df3b 100644
--- a/kde-base/kdepim-wizards/kdepim-wizards-4.2.1.ebuild
+++ b/kde-base/kdepim-wizards/kdepim-wizards-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/kdepim-wizards-4.2.1.ebuild,v 1.1 2009/03/04 21:11:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/kdepim-wizards-4.2.1.ebuild,v 1.2 2009/03/08 13:38:36 scarabeus Exp $
 
 EAPI="2"
 
@@ -12,22 +12,24 @@ DESCRIPTION="KDE PIM wizards"
 IUSE="debug"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-DEPEND="app-crypt/gpgme:1
-	kde-base/kdepim-kresources:${SLOT}
-	kde-base/libkdepim:${SLOT}"
+DEPEND="
+	app-crypt/gpgme:1
+	>=kde-base/kdepim-kresources-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}"
 
-KMEXTRACTONLY="knotes/
+KMEXTRACTONLY="
 	kmail/
+	knotes/
 	kresources/egroupware/
 	kresources/groupwise/
 	kresources/kolab/
 	kresources/scalix/
 	kresources/slox/
-	libkdepim"
-
-src_unpack() {
-	kde4-meta_src_unpack
+"
 
+src_prepare() {
 	ln -s "${PREFIX}"/include/kdepim-kresources/{kabc,kcal,knotes}_egroupwareprefs.h \
 		"${WORKDIR}"/${P}/kresources/egroupware/ \
 		|| die "Failed to link extra_headers."
@@ -37,4 +39,6 @@ src_unpack() {
 	ln -s "${PREFIX}"/include/kdepim-kresources/{kabc_groupwiseprefs,kcal_groupwiseprefsbase}.h \
 		"${WORKDIR}"/${P}/kresources/groupwise/ \
 		|| die "Failed to link extra_headers."
+
+	kde4-meta_src_prepare
 }
diff --git a/kde-base/kdialog/ChangeLog b/kde-base/kdialog/ChangeLog
index ff8f559f06c2..8d73bbed72f9 100644
--- a/kde-base/kdialog/ChangeLog
+++ b/kde-base/kdialog/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdialog
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/ChangeLog,v 1.95 2009/03/04 21:19:06 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/ChangeLog,v 1.96 2009/03/08 13:39:13 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kdialog-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kdialog-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kdialog/kdialog-4.2.1.ebuild b/kde-base/kdialog/kdialog-4.2.1.ebuild
index bce5dab92b25..c13de0cc1ff2 100644
--- a/kde-base/kdialog/kdialog-4.2.1.ebuild
+++ b/kde-base/kdialog/kdialog-4.2.1.ebuild
@@ -1,19 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-4.2.1.ebuild,v 1.1 2009/03/04 21:19:06 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-4.2.1.ebuild,v 1.2 2009/03/08 13:39:13 scarabeus Exp $
 
 EAPI="2"
 
-KMNAME="kdebase"
-KMMODULE="apps/kdialog"
+KMNAME="kdebase-apps"
 inherit kde4-meta
 
 DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	kernel_linux? (
-	|| ( sys-apps/eject
-		sys-block/unieject ) )"
diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 054b534b9f66..77d7b8ef79e4 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.151 2009/03/08 03:05:42 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.152 2009/03/08 13:39:58 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kdm-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
   08 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   kdm-4.2.1.ebuild:
diff --git a/kde-base/kdm/kdm-4.2.1.ebuild b/kde-base/kdm/kdm-4.2.1.ebuild
index 45f92224cd08..056f88f5139b 100644
--- a/kde-base/kdm/kdm-4.2.1.ebuild
+++ b/kde-base/kdm/kdm-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.2.1.ebuild,v 1.2 2009/03/08 03:05:42 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.2.1.ebuild,v 1.3 2009/03/08 13:39:58 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,25 +11,32 @@ DESCRIPTION="KDE login manager, similar to xdm and gdm"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="consolekit debug kerberos pam"
 
-DEPEND="x11-libs/libXau
+DEPEND="
+	x11-libs/libXau
 	x11-libs/libXdmcp
 	x11-libs/libXtst
+	consolekit? (
+		>=sys-apps/dbus-1.0.2
+		sys-auth/consolekit
+	)
 	kerberos? ( virtual/krb5 )
 	pam? (
-		>=kde-base/kcheckpass-${PV}:${SLOT}
+		>=kde-base/kcheckpass-${PV}:${SLOT}[kdeprefix=]
 		virtual/pam
 	)
-	consolekit? (
-		>=sys-apps/dbus-1.0.2
-		sys-auth/consolekit
-	)"
+"
 RDEPEND="${DEPEND}
-	>=kde-base/kdepasswd-${PV}:${SLOT}
+	>=kde-base/kdepasswd-${PV}:${SLOT}[kdeprefix=]
 	>=x11-apps/xinit-1.0.5-r2
-	x11-apps/xmessage"
+	x11-apps/xmessage
+"
 
-KMEXTRACTONLY="kcontrol/kdm/"
-KMEXTRA="libs/kdm/"
+KMEXTRACTONLY="
+	kcontrol/kdm/
+"
+KMEXTRA="
+	libs/kdm/
+"
 
 PATCHES=( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" )
 
diff --git a/kde-base/keditbookmarks/ChangeLog b/kde-base/keditbookmarks/ChangeLog
index 43828bcb3a4b..f0e44506a126 100644
--- a/kde-base/keditbookmarks/ChangeLog
+++ b/kde-base/keditbookmarks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/keditbookmarks
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/ChangeLog,v 1.19 2009/03/04 21:21:26 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/ChangeLog,v 1.20 2009/03/08 13:40:26 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  keditbookmarks-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *keditbookmarks-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/keditbookmarks/keditbookmarks-4.2.1.ebuild b/kde-base/keditbookmarks/keditbookmarks-4.2.1.ebuild
index bdb7b43d5f50..f06be0047c1a 100644
--- a/kde-base/keditbookmarks/keditbookmarks-4.2.1.ebuild
+++ b/kde-base/keditbookmarks/keditbookmarks-4.2.1.ebuild
@@ -1,18 +1,21 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/keditbookmarks-4.2.1.ebuild,v 1.1 2009/03/04 21:21:26 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/keditbookmarks-4.2.1.ebuild,v 1.2 2009/03/08 13:40:26 scarabeus Exp $
 
 EAPI="2"
 
-KMNAME="kdebase"
-KMMODULE="apps/${PN}"
+KMNAME="kdebase-apps"
 inherit kde4-meta
 
 DESCRIPTION="KDE's bookmarks editor"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND=">=kde-base/libkonq-${PV}:${SLOT}"
+DEPEND="
+	>=kde-base/libkonq-${PV}:${SLOT}[kdeprefix=]
+"
 RDEPEND="${DEPEND}"
 
-KMEXTRACTONLY="apps/lib/konq/"
+KMEXTRACTONLY="
+	lib/konq/
+"
diff --git a/kde-base/kfind/ChangeLog b/kde-base/kfind/ChangeLog
index a2c69ef5b03b..030398060792 100644
--- a/kde-base/kfind/ChangeLog
+++ b/kde-base/kfind/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kfind
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/ChangeLog,v 1.107 2009/03/04 21:23:38 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/ChangeLog,v 1.108 2009/03/08 13:40:53 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kfind-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kfind-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kfind/kfind-4.2.1.ebuild b/kde-base/kfind/kfind-4.2.1.ebuild
index 9abb1bbc5bc1..8876bbcf0bde 100644
--- a/kde-base/kfind/kfind-4.2.1.ebuild
+++ b/kde-base/kfind/kfind-4.2.1.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/kfind-4.2.1.ebuild,v 1.1 2009/03/04 21:23:38 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/kfind-4.2.1.ebuild,v 1.2 2009/03/08 13:40:53 scarabeus Exp $
 EAPI="2"
 
-KMNAME="kdebase"
-KMMODULE="apps/${PN}"
+KMNAME="kdebase-apps"
 inherit kde4-meta
 
 DESCRIPTION="KDE file finder utility"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND=">=kde-base/libkonq-${PV}:${SLOT}"
-RDEPEND="${DEPEND}"
-
-KMEXTRA="apps/doc/${PN}"
+KMEXTRA="
+	doc/${PN}/
+"
diff --git a/kde-base/kfourinline/ChangeLog b/kde-base/kfourinline/ChangeLog
index ed94ac45acf0..35a05adf1bfa 100644
--- a/kde-base/kfourinline/ChangeLog
+++ b/kde-base/kfourinline/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kfourinline
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfourinline/ChangeLog,v 1.19 2009/03/04 21:24:42 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfourinline/ChangeLog,v 1.20 2009/03/08 13:41:20 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kfourinline-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kfourinline-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kfourinline/kfourinline-4.2.1.ebuild b/kde-base/kfourinline/kfourinline-4.2.1.ebuild
index d8e9f5b91af4..5b5997a98565 100644
--- a/kde-base/kfourinline/kfourinline-4.2.1.ebuild
+++ b/kde-base/kfourinline/kfourinline-4.2.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfourinline/kfourinline-4.2.1.ebuild,v 1.1 2009/03/04 21:24:42 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfourinline/kfourinline-4.2.1.ebuild,v 1.2 2009/03/08 13:41:20 scarabeus Exp $
 
 EAPI="2"
 
 KMNAME="kdegames"
 inherit kde4-meta
 
-DESCRIPTION="kde four-in-a-row game"
+DESCRIPTION="KDE four-in-a-row game"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
diff --git a/kde-base/khangman/ChangeLog b/kde-base/khangman/ChangeLog
index 11f09e5edbcd..3ec15e632720 100644
--- a/kde-base/khangman/ChangeLog
+++ b/kde-base/khangman/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/khangman
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/ChangeLog,v 1.106 2009/03/04 21:28:40 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/ChangeLog,v 1.107 2009/03/08 13:41:58 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> khangman-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *khangman-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/khangman/khangman-4.2.1.ebuild b/kde-base/khangman/khangman-4.2.1.ebuild
index 4fd934fbccfc..2af7a3ea80ae 100644
--- a/kde-base/khangman/khangman-4.2.1.ebuild
+++ b/kde-base/khangman/khangman-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-4.2.1.ebuild,v 1.1 2009/03/04 21:28:40 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-4.2.1.ebuild,v 1.2 2009/03/08 13:41:58 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,7 +11,11 @@ DESCRIPTION="Classical hangman game for KDE"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}"
+DEPEND="
+	>=kde-base/libkdeedu-${PV}:${SLOT}[kdeprefix=]
+"
 RDEPEND="${DEPEND}"
 
-KMEXTRACTONLY="libkdeedu/keduvocdocument"
+KMEXTRACTONLY="
+	libkdeedu/keduvocdocument
+"
diff --git a/kde-base/khelpcenter/ChangeLog b/kde-base/khelpcenter/ChangeLog
index 16820125e35a..9b5d872bd49b 100644
--- a/kde-base/khelpcenter/ChangeLog
+++ b/kde-base/khelpcenter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/khelpcenter
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/ChangeLog,v 1.111 2009/03/04 21:29:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/ChangeLog,v 1.112 2009/03/08 13:42:40 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  khelpcenter-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *khelpcenter-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/khelpcenter/khelpcenter-4.2.1.ebuild b/kde-base/khelpcenter/khelpcenter-4.2.1.ebuild
index da1670a5db6b..66d85be1082c 100644
--- a/kde-base/khelpcenter/khelpcenter-4.2.1.ebuild
+++ b/kde-base/khelpcenter/khelpcenter-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/khelpcenter-4.2.1.ebuild,v 1.1 2009/03/04 21:29:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/khelpcenter-4.2.1.ebuild,v 1.2 2009/03/08 13:42:40 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,11 +11,15 @@ DESCRIPTION="The KDE Help Center"
 IUSE="debug"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-KMEXTRA="doc/faq
+RDEPEND="
+	dev-lang/perl
+	>=www-misc/htdig-3.2.0_beta6-r1
+"
+
+KMEXTRA="
+	doc/faq
 	doc/glossary
 	doc/quickstart
 	doc/userguide
-	doc/visualdict"
-
-DEPEND=""
-RDEPEND=">=www-misc/htdig-3.2.0_beta6-r1"
+	doc/visualdict
+"
diff --git a/kde-base/khotkeys/ChangeLog b/kde-base/khotkeys/ChangeLog
index 7763aa863fa1..8e22a50b4aa6 100644
--- a/kde-base/khotkeys/ChangeLog
+++ b/kde-base/khotkeys/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/khotkeys
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/ChangeLog,v 1.106 2009/03/04 21:30:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/ChangeLog,v 1.107 2009/03/08 13:43:24 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> khotkeys-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *khotkeys-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/khotkeys/khotkeys-4.2.1.ebuild b/kde-base/khotkeys/khotkeys-4.2.1.ebuild
index ee204e10f468..6365f00c6019 100644
--- a/kde-base/khotkeys/khotkeys-4.2.1.ebuild
+++ b/kde-base/khotkeys/khotkeys-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/khotkeys-4.2.1.ebuild,v 1.1 2009/03/04 21:30:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/khotkeys-4.2.1.ebuild,v 1.2 2009/03/08 13:43:24 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,11 +11,18 @@ DESCRIPTION="KDE: hotkey daemon"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND=">=kde-base/libkworkspace-${PV}:${SLOT}
-	x11-libs/libXtst"
+DEPEND="
+	>=kde-base/libkworkspace-${PV}:${SLOT}[kdeprefix=]
+	x11-libs/libXtst
+"
 RDEPEND="${DEPEND}"
 
-KMEXTRACTONLY="libs/kworkspace/"
+KMEXTRACTONLY="
+	libs/kworkspace/
+"
+
 src_compile() {
-	MAKEOPTS="${MAKEOPTS} -j1" kde4-meta_src_compile
+	MAKEOPTS="${MAKEOPTS} -j1"
+
+	kde4-meta_src_compile
 }
diff --git a/kde-base/kig/ChangeLog b/kde-base/kig/ChangeLog
index ed4b2b46c204..51a2ad9e5d78 100644
--- a/kde-base/kig/ChangeLog
+++ b/kde-base/kig/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kig
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/ChangeLog,v 1.110 2009/03/04 21:31:23 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/ChangeLog,v 1.111 2009/03/08 13:44:07 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kig-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kig-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kig/kig-4.2.1.ebuild b/kde-base/kig/kig-4.2.1.ebuild
index ddc6d50e98e5..990d280bd669 100644
--- a/kde-base/kig/kig-4.2.1.ebuild
+++ b/kde-base/kig/kig-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-4.2.1.ebuild,v 1.1 2009/03/04 21:31:23 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-4.2.1.ebuild,v 1.2 2009/03/08 13:44:07 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,7 +11,9 @@ DESCRIPTION="KDE Interactive Geometry tool"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug kig-scripting"
 
-DEPEND="kig-scripting? ( >=dev-libs/boost-1.32 )"
+DEPEND="
+	kig-scripting? ( >=dev-libs/boost-1.32 )
+"
 RDEPEND="${DEPEND}"
 
 src_configure() {
diff --git a/kde-base/kinfocenter/ChangeLog b/kde-base/kinfocenter/ChangeLog
index f4c0c209f7d9..754598672bc1 100644
--- a/kde-base/kinfocenter/ChangeLog
+++ b/kde-base/kinfocenter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kinfocenter
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/ChangeLog,v 1.15 2009/03/04 21:33:18 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/ChangeLog,v 1.16 2009/03/08 13:44:41 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kinfocenter-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kinfocenter-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kinfocenter/kinfocenter-4.2.1.ebuild b/kde-base/kinfocenter/kinfocenter-4.2.1.ebuild
index 29e5e5bdd315..e350b27a57e4 100644
--- a/kde-base/kinfocenter/kinfocenter-4.2.1.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-4.2.1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/kinfocenter-4.2.1.ebuild,v 1.1 2009/03/04 21:33:18 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/kinfocenter-4.2.1.ebuild,v 1.2 2009/03/08 13:44:41 scarabeus Exp $
 
 EAPI="2"
 
-KMNAME="kdebase"
-KMMODULE="apps/${PN}"
+KMNAME="kdebase-apps"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta
 
@@ -13,13 +12,18 @@ DESCRIPTION="The KDE Info Center"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug ieee1394"
 
-DEPEND="ieee1394? ( sys-libs/libraw1394 )
-	opengl? ( virtual/glu virtual/opengl )"
+DEPEND="
+	ieee1394? ( sys-libs/libraw1394 )
+	opengl? ( virtual/glu virtual/opengl )
+"
 RDEPEND="${DEPEND}
 	sys-apps/pciutils
-	sys-apps/usbutils"
+	sys-apps/usbutils
+"
 
-KMEXTRACTONLY="apps/cmake/modules/"
+KMEXTRACTONLY="
+	cmake/modules/
+"
 
 src_configure() {
 	mycmakeargs="${mycmakeargs}
diff --git a/kde-base/kjots/ChangeLog b/kde-base/kjots/ChangeLog
index 7ac2344e1a8d..41a1fe6803c1 100644
--- a/kde-base/kjots/ChangeLog
+++ b/kde-base/kjots/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kjots
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/ChangeLog,v 1.100 2009/03/04 21:35:57 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/ChangeLog,v 1.101 2009/03/08 13:45:09 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kjots-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kjots-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kjots/kjots-4.2.1.ebuild b/kde-base/kjots/kjots-4.2.1.ebuild
index c90b1615d087..55ec2a315b4e 100644
--- a/kde-base/kjots/kjots-4.2.1.ebuild
+++ b/kde-base/kjots/kjots-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/kjots-4.2.1.ebuild,v 1.1 2009/03/04 21:35:57 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/kjots-4.2.1.ebuild,v 1.2 2009/03/08 13:45:09 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,5 +11,7 @@ DESCRIPTION="Kjots - KDE note taking utility"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND=">=kde-base/libkdepim-${PV}:${SLOT}"
-KMEXTRACTONLY="libkdepim"
+DEPEND="
+	>=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/klettres/ChangeLog b/kde-base/klettres/ChangeLog
index 077634c625b8..bb3a1a1132d1 100644
--- a/kde-base/klettres/ChangeLog
+++ b/kde-base/klettres/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/klettres
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/ChangeLog,v 1.105 2009/03/04 21:38:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/ChangeLog,v 1.106 2009/03/08 13:45:39 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> klettres-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *klettres-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/klettres/klettres-4.2.1.ebuild b/kde-base/klettres/klettres-4.2.1.ebuild
index 4cec8d4f8195..318413af9d3f 100644
--- a/kde-base/klettres/klettres-4.2.1.ebuild
+++ b/kde-base/klettres/klettres-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-4.2.1.ebuild,v 1.1 2009/03/04 21:38:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-4.2.1.ebuild,v 1.2 2009/03/08 13:45:39 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,4 +11,6 @@ DESCRIPTION="KDE: KLettres helps a very young child or an adult learning "
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-RDEPEND=">=kde-base/knotify-${PV}:${SLOT}"
+RDEPEND="
+	>=kde-base/knotify-${PV}:${SLOT}[kdeprefix=]
+"
diff --git a/kde-base/klinkstatus/ChangeLog b/kde-base/klinkstatus/ChangeLog
index 9ddd1b022a3d..30a78f04cfea 100644
--- a/kde-base/klinkstatus/ChangeLog
+++ b/kde-base/klinkstatus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/klinkstatus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/ChangeLog,v 1.99 2009/03/04 21:39:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/ChangeLog,v 1.100 2009/03/08 13:46:11 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  klinkstatus-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *klinkstatus-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/klinkstatus/klinkstatus-4.2.1.ebuild b/kde-base/klinkstatus/klinkstatus-4.2.1.ebuild
index 3e8e901a1b40..9c3ad5a4ba3a 100644
--- a/kde-base/klinkstatus/klinkstatus-4.2.1.ebuild
+++ b/kde-base/klinkstatus/klinkstatus-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-4.2.1.ebuild,v 1.1 2009/03/04 21:39:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-4.2.1.ebuild,v 1.2 2009/03/08 13:46:11 scarabeus Exp $
 
 EAPI="2"
 KMNAME="kdewebdev"
@@ -9,4 +9,3 @@ inherit kde4-meta
 DESCRIPTION="KDE web development - link validity checker"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
-HOMEPAGE="http://www.kde.org/"
diff --git a/kde-base/klipper/ChangeLog b/kde-base/klipper/ChangeLog
index 9602d2d8bda8..8edff39b7229 100644
--- a/kde-base/klipper/ChangeLog
+++ b/kde-base/klipper/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/klipper
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/ChangeLog,v 1.105 2009/03/04 21:40:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/ChangeLog,v 1.106 2009/03/08 13:46:40 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> klipper-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *klipper-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/klipper/klipper-4.2.1.ebuild b/kde-base/klipper/klipper-4.2.1.ebuild
index 51d46be52bde..dd8bbb6c9169 100644
--- a/kde-base/klipper/klipper-4.2.1.ebuild
+++ b/kde-base/klipper/klipper-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-4.2.1.ebuild,v 1.1 2009/03/04 21:40:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-4.2.1.ebuild,v 1.2 2009/03/08 13:46:40 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,7 +11,9 @@ DESCRIPTION="Applet for KDE and X clipboard management"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND=">=kde-base/libkworkspace-${PV}:${SLOT}
-	>=kde-base/libtaskmanager-${PV}:${SLOT}
-	x11-libs/libXfixes"
+DEPEND="
+	>=kde-base/libkworkspace-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libtaskmanager-${PV}:${SLOT}[kdeprefix=]
+	x11-libs/libXfixes
+"
 RDEPEND="${DEPEND}"
diff --git a/kde-base/kmahjongg/ChangeLog b/kde-base/kmahjongg/ChangeLog
index 5f90b9996bb8..5cd188430423 100644
--- a/kde-base/kmahjongg/ChangeLog
+++ b/kde-base/kmahjongg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kmahjongg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/ChangeLog,v 1.104 2009/03/04 21:41:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/ChangeLog,v 1.105 2009/03/08 13:47:14 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kmahjongg-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kmahjongg-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kmahjongg/kmahjongg-4.2.1.ebuild b/kde-base/kmahjongg/kmahjongg-4.2.1.ebuild
index f7d019ada173..1da24c149234 100644
--- a/kde-base/kmahjongg/kmahjongg-4.2.1.ebuild
+++ b/kde-base/kmahjongg/kmahjongg-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-4.2.1.ebuild,v 1.1 2009/03/04 21:41:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-4.2.1.ebuild,v 1.2 2009/03/08 13:47:14 scarabeus Exp $
 
 EAPI="2"
 
@@ -10,8 +10,13 @@ inherit kde4-meta
 DESCRIPTION="Mahjongg for KDE"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
-DEPEND="${DEPEND}
-		>=kde-base/libkmahjongg-${PV}:${SLOT}"
+
+DEPEND="
+	>=kde-base/libkmahjongg-${PV}:${SLOT}[kdeprefix=]
+"
 RDEPEND="${DEPEND}"
 
-KMEXTRACTONLY="libkdegames libkmahjongg"
+KMEXTRACTONLY="
+	libkdegames/
+	libkmahjongg/
+"
diff --git a/kde-base/kmenuedit/ChangeLog b/kde-base/kmenuedit/ChangeLog
index f42295f77b67..634f6ba27722 100644
--- a/kde-base/kmenuedit/ChangeLog
+++ b/kde-base/kmenuedit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kmenuedit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/ChangeLog,v 1.99 2009/03/04 21:47:47 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/ChangeLog,v 1.100 2009/03/08 13:47:50 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kmenuedit-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kmenuedit-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kmenuedit/kmenuedit-4.2.1.ebuild b/kde-base/kmenuedit/kmenuedit-4.2.1.ebuild
index d16671ee2879..ddcb1fbbcf5e 100644
--- a/kde-base/kmenuedit/kmenuedit-4.2.1.ebuild
+++ b/kde-base/kmenuedit/kmenuedit-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/kmenuedit-4.2.1.ebuild,v 1.1 2009/03/04 21:47:47 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/kmenuedit-4.2.1.ebuild,v 1.2 2009/03/08 13:47:50 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,9 +11,13 @@ DESCRIPTION="KDE menu editor"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND="kde-base/khotkeys:${SLOT}"
+RDEPEND="
+	>=kde-base/khotkeys-${PV}:${SLOT}[kdeprefix=]
+"
 
-KMEXTRACTONLY="libs/kworkspace/"
+KMEXTRACTONLY="
+	libs/kworkspace/
+"
 
 src_configure() {
 	sed -i -e \
diff --git a/kde-base/kmix/ChangeLog b/kde-base/kmix/ChangeLog
index 365b8ac4fcef..480a0cbea016 100644
--- a/kde-base/kmix/ChangeLog
+++ b/kde-base/kmix/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kmix
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.107 2009/03/04 21:50:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.108 2009/03/08 13:48:37 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kmix-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kmix-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kmix/kmix-4.2.1.ebuild b/kde-base/kmix/kmix-4.2.1.ebuild
index 5a4b416ef5d4..2972e22b0641 100644
--- a/kde-base/kmix/kmix-4.2.1.ebuild
+++ b/kde-base/kmix/kmix-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-4.2.1.ebuild,v 1.1 2009/03/04 21:50:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-4.2.1.ebuild,v 1.2 2009/03/08 13:48:37 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,11 +11,14 @@ DESCRIPTION="KDE mixer gui"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="alsa debug"
 
-DEPEND="alsa? ( >=media-libs/alsa-lib-1.0.14a )"
+DEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.14a )
+"
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with alsa Alsa)"
+
 	kde4-meta_src_configure
 }
diff --git a/kde-base/kmousetool/ChangeLog b/kde-base/kmousetool/ChangeLog
index 5145dd134aae..74e8090202c4 100644
--- a/kde-base/kmousetool/ChangeLog
+++ b/kde-base/kmousetool/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kmousetool
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/ChangeLog,v 1.102 2009/03/04 21:50:57 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/ChangeLog,v 1.103 2009/03/08 13:49:05 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kmousetool-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kmousetool-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kmousetool/kmousetool-4.2.1.ebuild b/kde-base/kmousetool/kmousetool-4.2.1.ebuild
index 26d2a0907270..34bc0773b512 100644
--- a/kde-base/kmousetool/kmousetool-4.2.1.ebuild
+++ b/kde-base/kmousetool/kmousetool-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-4.2.1.ebuild,v 1.1 2009/03/04 21:50:57 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-4.2.1.ebuild,v 1.2 2009/03/08 13:49:05 scarabeus Exp $
 
 EAPI="2"
 
@@ -12,4 +12,5 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
 RDEPEND="
-	>=kde-base/knotify-${PV}:${SLOT}"
+	>=kde-base/knotify-${PV}:${SLOT}[kdeprefix=]
+"
diff --git a/kde-base/kmplot/ChangeLog b/kde-base/kmplot/ChangeLog
index 1e56f4fd7ce2..9663c550adc2 100644
--- a/kde-base/kmplot/ChangeLog
+++ b/kde-base/kmplot/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kmplot
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/ChangeLog,v 1.105 2009/03/04 21:52:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/ChangeLog,v 1.106 2009/03/08 13:49:37 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kmplot-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kmplot-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kmplot/kmplot-4.2.1.ebuild b/kde-base/kmplot/kmplot-4.2.1.ebuild
index a37a105b6922..ea2514e50236 100644
--- a/kde-base/kmplot/kmplot-4.2.1.ebuild
+++ b/kde-base/kmplot/kmplot-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-4.2.1.ebuild,v 1.1 2009/03/04 21:52:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-4.2.1.ebuild,v 1.2 2009/03/08 13:49:37 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,4 +11,6 @@ DESCRIPTION="Mathematical function plotter for KDE"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-RDEPEND=">=kde-base/knotify-${PV}:${SLOT}"
+RDEPEND="
+	>=kde-base/knotify-${PV}:${SLOT}[kdeprefix=]
+"
diff --git a/kde-base/knode/ChangeLog b/kde-base/knode/ChangeLog
index 350a22d2803d..0c63824858f6 100644
--- a/kde-base/knode/ChangeLog
+++ b/kde-base/knode/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/knode
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.103 2009/03/04 21:54:58 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.104 2009/03/08 13:50:19 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> knode-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *knode-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/knode/knode-4.2.1.ebuild b/kde-base/knode/knode-4.2.1.ebuild
index 61203e038f76..c9a7df89a89e 100644
--- a/kde-base/knode/knode-4.2.1.ebuild
+++ b/kde-base/knode/knode-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.2.1.ebuild,v 1.1 2009/03/04 21:54:58 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.2.1.ebuild,v 1.2 2009/03/08 13:50:19 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,13 +11,14 @@ DESCRIPTION="A newsreader for KDE"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND=">=kde-base/libkdepim-${PV}:${SLOT}
-	>=kde-base/libkpgp-${PV}:${SLOT}"
+DEPEND="
+	>=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libkpgp-${PV}:${SLOT}[kdeprefix=]
+"
 RDEPEND="${DEPEND}"
 
-KMEXTRACTONLY="libkdepim/
-	libkpgp/"
-	#kaddressbook/org.kde.KAddressbook.Core.xml
-	#korganizer/korgac/org.kde.korganizer.KOrgac.xml"
+KMEXTRACTONLY="
+	libkpgp/
+"
 
 KMLOADLIBS="libkdepim"
diff --git a/kde-base/knotes/ChangeLog b/kde-base/knotes/ChangeLog
index 3d816583de3a..9338a9956a0a 100644
--- a/kde-base/knotes/ChangeLog
+++ b/kde-base/knotes/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/knotes
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/ChangeLog,v 1.99 2009/03/04 21:55:34 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/ChangeLog,v 1.100 2009/03/08 13:50:48 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> knotes-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *knotes-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/knotes/knotes-4.2.1.ebuild b/kde-base/knotes/knotes-4.2.1.ebuild
index 468138ac3bfd..f330d9db97d5 100644
--- a/kde-base/knotes/knotes-4.2.1.ebuild
+++ b/kde-base/knotes/knotes-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-4.2.1.ebuild,v 1.1 2009/03/04 21:55:34 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-4.2.1.ebuild,v 1.2 2009/03/08 13:50:49 scarabeus Exp $
 
 EAPI="2"
 
@@ -8,10 +8,12 @@ KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="KDE Notes"
-IUSE="debug"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
 
-DEPEND="kde-base/libkdepim:${SLOT}"
+DEPEND="
+	>=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}"
 
-KMEXTRACTONLY="libkdepim"
 KMLOADLIBS="libkdepim"
diff --git a/kde-base/knotify/ChangeLog b/kde-base/knotify/ChangeLog
index d7a08d612e2b..77f44d082417 100644
--- a/kde-base/knotify/ChangeLog
+++ b/kde-base/knotify/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/knotify
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotify/ChangeLog,v 1.19 2009/03/04 21:56:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotify/ChangeLog,v 1.20 2009/03/08 13:51:19 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> knotify-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *knotify-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/knotify/knotify-4.2.1.ebuild b/kde-base/knotify/knotify-4.2.1.ebuild
index b32e6aa0b6de..9e6dba8ab42f 100644
--- a/kde-base/knotify/knotify-4.2.1.ebuild
+++ b/kde-base/knotify/knotify-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotify/knotify-4.2.1.ebuild,v 1.1 2009/03/04 21:56:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotify/knotify-4.2.1.ebuild,v 1.2 2009/03/08 13:51:19 scarabeus Exp $
 
 EAPI="2"
 
@@ -8,5 +8,5 @@ KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE notification daemon."
-IUSE="debug"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
diff --git a/kde-base/kode/ChangeLog b/kde-base/kode/ChangeLog
index 93cc041d0058..c41f5423bde5 100644
--- a/kde-base/kode/ChangeLog
+++ b/kde-base/kode/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kode
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kode/ChangeLog,v 1.85 2009/03/04 21:56:34 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kode/ChangeLog,v 1.86 2009/03/08 13:51:57 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kode-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kode-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kode/kode-4.2.1.ebuild b/kde-base/kode/kode-4.2.1.ebuild
index 169b8bc91046..eaaf89332632 100644
--- a/kde-base/kode/kode-4.2.1.ebuild
+++ b/kde-base/kode/kode-4.2.1.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kode/kode-4.2.1.ebuild,v 1.1 2009/03/04 21:56:34 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kode/kode-4.2.1.ebuild,v 1.2 2009/03/08 13:51:57 scarabeus Exp $
 
 EAPI="2"
 
 KMNAME="kdepim"
 inherit kde4-meta
 
-DESCRIPTION="KDE kpgp library"
-IUSE="debug"
+DESCRIPTION="Collection of code generation and XML helper tools."
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-KMEXTRACTONLY="libkdepim"
+IUSE="debug"
diff --git a/kde-base/kolourpaint/ChangeLog b/kde-base/kolourpaint/ChangeLog
index 305fe581d259..a730c388833a 100644
--- a/kde-base/kolourpaint/ChangeLog
+++ b/kde-base/kolourpaint/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kolourpaint
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/ChangeLog,v 1.106 2009/03/04 21:58:08 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/ChangeLog,v 1.107 2009/03/08 13:52:32 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kolourpaint-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kolourpaint-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kolourpaint/kolourpaint-4.2.1.ebuild b/kde-base/kolourpaint/kolourpaint-4.2.1.ebuild
index 19799f1ee938..312ef706654d 100644
--- a/kde-base/kolourpaint/kolourpaint-4.2.1.ebuild
+++ b/kde-base/kolourpaint/kolourpaint-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/kolourpaint-4.2.1.ebuild,v 1.1 2009/03/04 21:58:08 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/kolourpaint-4.2.1.ebuild,v 1.2 2009/03/08 13:52:32 scarabeus Exp $
 
 EAPI="2"
 
@@ -12,5 +12,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 LICENSE="BSD LGPL-2"
 
-DEPEND="kde-base/qimageblitz"
+DEPEND="
+	kde-base/qimageblitz
+"
 RDEPEND="${DEPEND}"
diff --git a/kde-base/kontact-specialdates/ChangeLog b/kde-base/kontact-specialdates/ChangeLog
index aeeb2f0d9b48..e9a0fc119fdc 100644
--- a/kde-base/kontact-specialdates/ChangeLog
+++ b/kde-base/kontact-specialdates/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kontact-specialdates
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact-specialdates/ChangeLog,v 1.95 2009/03/04 22:02:51 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact-specialdates/ChangeLog,v 1.96 2009/03/08 13:54:46 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kontact-specialdates-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kontact-specialdates-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kontact-specialdates/kontact-specialdates-4.2.1.ebuild b/kde-base/kontact-specialdates/kontact-specialdates-4.2.1.ebuild
index 5fa65da3c1d4..a3b96f681e10 100644
--- a/kde-base/kontact-specialdates/kontact-specialdates-4.2.1.ebuild
+++ b/kde-base/kontact-specialdates/kontact-specialdates-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact-specialdates/kontact-specialdates-4.2.1.ebuild,v 1.1 2009/03/04 22:02:51 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact-specialdates/kontact-specialdates-4.2.1.ebuild,v 1.2 2009/03/08 13:54:46 scarabeus Exp $
 
 EAPI="2"
 
@@ -12,19 +12,25 @@ DESCRIPTION="Special Dates plugin for Kontact: displays a summary of important h
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND=">=kde-base/libkdepim-${PV}:${SLOT}
-	>=kde-base/kontact-${PV}:${SLOT}
-	>=kde-base/kaddressbook-${PV}:${SLOT}
-	>=kde-base/korganizer-${PV}:${SLOT}
-	>=kde-base/libkholidays-${PV}:${SLOT}"
+DEPEND="
+	>=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libkholidays-${PV}:${SLOT}[kdeprefix=]
+"
 RDEPEND="${DEPEND}
-	>=kde-base/libkdepim-${PV}:${SLOT}"
-KMEXTRACTONLY="libkholidays
+	>=kde-base/kaddressbook-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/korganizer-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kontact-${PV}:${SLOT}[kdeprefix=]
+"
+
+KMEXTRACTONLY="
 	kontactinterfaces/
 	kaddressbook
 	korganizer
-	libkdepim"
-KMEXTRA="kontact/plugins/specialdates"
+	libkholidays
+"
+KMEXTRA="
+	kontact/plugins/specialdates/
+"
 
 src_prepare() {
 	# Fix target_link_libraries for now
diff --git a/kde-base/kontact/ChangeLog b/kde-base/kontact/ChangeLog
index 8d4d18f2d86a..9d00538f66fd 100644
--- a/kde-base/kontact/ChangeLog
+++ b/kde-base/kontact/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kontact
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.107 2009/03/04 22:02:10 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.108 2009/03/08 13:53:48 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kontact-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kontact-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kontact/kontact-4.2.1.ebuild b/kde-base/kontact/kontact-4.2.1.ebuild
index 3f07feae14e0..a154d0080e6e 100644
--- a/kde-base/kontact/kontact-4.2.1.ebuild
+++ b/kde-base/kontact/kontact-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.2.1.ebuild,v 1.1 2009/03/04 22:02:10 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.2.1.ebuild,v 1.2 2009/03/08 13:53:48 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,11 +11,14 @@ DESCRIPTION="KDE personal information manager"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND="app-crypt/gnupg
+DEPEND="
 	app-crypt/gpgme
-	>=kde-base/kontactinterfaces-${PV}:${SLOT}
-	>=kde-base/libkdepim-${PV}:${SLOT}"
-RDEPEND="${DEPEND}"
+	>=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+"
 
 KMLOADLIBS="libkdepim"
 KMSAVELIBS="true"
@@ -24,7 +27,7 @@ KMSAVELIBS="true"
 # kontact doesn't have to depend on all programs it has plugins for.
 #
 # xml targets from kmail/ are being uncommented by kde4-meta.eclass
-KMEXTRACTONLY="libkdepim/
+KMEXTRACTONLY="
 	kmail/
 	kontact/plugins/akregator/
 	kontact/plugins/kaddressbook/
@@ -37,4 +40,5 @@ KMEXTRACTONLY="libkdepim/
 	kontact/plugins/ktimetracker/
 	kontact/plugins/planner/
 	kontact/plugins/specialdates/
-	kontactinterfaces/"
+	kontactinterfaces/
+"
diff --git a/kde-base/kontactinterfaces/ChangeLog b/kde-base/kontactinterfaces/ChangeLog
index c3196895fd43..3f1c1f1c6479 100644
--- a/kde-base/kontactinterfaces/ChangeLog
+++ b/kde-base/kontactinterfaces/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kontactinterfaces
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontactinterfaces/ChangeLog,v 1.9 2009/03/04 22:01:33 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontactinterfaces/ChangeLog,v 1.10 2009/03/08 13:53:06 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kontactinterfaces-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kontactinterfaces-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kontactinterfaces/kontactinterfaces-4.2.1.ebuild b/kde-base/kontactinterfaces/kontactinterfaces-4.2.1.ebuild
index 52ab07f3e7f8..2c3aaa395523 100644
--- a/kde-base/kontactinterfaces/kontactinterfaces-4.2.1.ebuild
+++ b/kde-base/kontactinterfaces/kontactinterfaces-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontactinterfaces/kontactinterfaces-4.2.1.ebuild,v 1.1 2009/03/04 22:01:33 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontactinterfaces/kontactinterfaces-4.2.1.ebuild,v 1.2 2009/03/08 13:53:06 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,9 +11,14 @@ DESCRIPTION="Interfaces for Kontact"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND="kde-base/libkdepim:${SLOT}"
+DEPEND="
+	>=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	kaddressbook/org.kde.KAddressbook.Core.xml
+	korganizer/korgac/org.kde.korganizer.KOrgac.xml
+"
 
 KMSAVELIBS="true"
-KMEXTRACTONLY="kaddressbook/org.kde.KAddressbook.Core.xml
-			korganizer/korgac/org.kde.korganizer.KOrgac.xml"
-KMCOMPILEONLY="libkdepim"
diff --git a/kde-base/korganizer/ChangeLog b/kde-base/korganizer/ChangeLog
index 7a85cd9a367a..14d03bca481c 100644
--- a/kde-base/korganizer/ChangeLog
+++ b/kde-base/korganizer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/korganizer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.109 2009/03/04 22:05:58 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.110 2009/03/08 13:55:26 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> korganizer-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *korganizer-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/korganizer/korganizer-4.2.1.ebuild b/kde-base/korganizer/korganizer-4.2.1.ebuild
index ca4902823af0..667a4c814a15 100644
--- a/kde-base/korganizer/korganizer-4.2.1.ebuild
+++ b/kde-base/korganizer/korganizer-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.2.1.ebuild,v 1.1 2009/03/04 22:05:58 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.2.1.ebuild,v 1.2 2009/03/08 13:55:26 scarabeus Exp $
 
 EAPI="2"
 
@@ -15,10 +15,11 @@ DEPEND="
 	app-crypt/gpgme
 	>=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/libkholidays-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/ktimezoned-${PV}:${SLOT}[kdeprefix=]
 	kontact? ( >=kde-base/kaddressbook-${PV}:${SLOT}[kdeprefix=] )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	>=kde-base/ktimezoned-${PV}:${SLOT}[kdeprefix=]
+"
 
 KMLOADLIBS="libkdepim"
 KMEXTRA="kdgantt1"
@@ -28,7 +29,6 @@ KMEXTRACTONLY="
 	kaddressbook/org.kde.KAddressbook.Core.xml
 	kmail/
 	knode/org.kde.knode.xml
-	libkdepim
 	libkholidays
 "
 
diff --git a/kde-base/krdc/ChangeLog b/kde-base/krdc/ChangeLog
index bc347b791255..cae6e3e6d980 100644
--- a/kde-base/krdc/ChangeLog
+++ b/kde-base/krdc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/krdc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/ChangeLog,v 1.110 2009/03/04 22:10:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/ChangeLog,v 1.111 2009/03/08 13:56:00 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> krdc-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *krdc-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/krdc/krdc-4.2.1.ebuild b/kde-base/krdc/krdc-4.2.1.ebuild
index 789cc0905308..f2231c419586 100644
--- a/kde-base/krdc/krdc-4.2.1.ebuild
+++ b/kde-base/krdc/krdc-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/krdc-4.2.1.ebuild,v 1.1 2009/03/04 22:10:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/krdc-4.2.1.ebuild,v 1.2 2009/03/08 13:56:00 scarabeus Exp $
 
 EAPI="2"
 
@@ -17,7 +17,13 @@ IUSE="debug jpeg vnc zeroconf"
 DEPEND="
 	jpeg? ( media-libs/jpeg )
 	vnc? ( >=net-libs/libvncserver-0.9 )
-	zeroconf? ( || ( net-dns/avahi net-misc/mDNSResponder ) )"
+	zeroconf? (
+		|| (
+			net-dns/avahi
+			net-misc/mDNSResponder
+		)
+	)
+"
 RDEPEND="${DEPEND}"
 
 src_compile() {
@@ -25,5 +31,6 @@ src_compile() {
 		$(cmake-utils_use_with jpeg JPEG)
 		$(cmake-utils_use_with vnc LibVNCServer)
 		$(cmake-utils_use_with zeroconf DNSSD)"
+
 	kde4-meta_src_compile
 }
diff --git a/kde-base/krfb/ChangeLog b/kde-base/krfb/ChangeLog
index 63981f2ddcf3..946901c37ad0 100644
--- a/kde-base/krfb/ChangeLog
+++ b/kde-base/krfb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/krfb
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/ChangeLog,v 1.105 2009/03/04 22:11:42 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/ChangeLog,v 1.106 2009/03/08 13:56:32 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> krfb-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *krfb-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/krfb/krfb-4.2.1.ebuild b/kde-base/krfb/krfb-4.2.1.ebuild
index 201a45a9b5ee..86c8bf5ff6d0 100644
--- a/kde-base/krfb/krfb-4.2.1.ebuild
+++ b/kde-base/krfb/krfb-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.2.1.ebuild,v 1.1 2009/03/04 22:11:42 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.2.1.ebuild,v 1.2 2009/03/08 13:56:32 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,10 +11,17 @@ DESCRIPTION="VNC-compatible server to share KDE desktops"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug zeroconf"
 
-DEPEND=">=net-libs/libvncserver-0.9
+DEPEND="
+	>=net-libs/libvncserver-0.9
 	net-libs/openslp
 	x11-libs/libXdamage
-	zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )"
+	zeroconf? (
+		|| (
+			net-dns/avahi[mdnsresponder-compat]
+			net-misc/mDNSResponder
+		)
+	)
+"
 
 src_configure() {
 	# krfb requires both slp and vnc to build
diff --git a/kde-base/krosspython/ChangeLog b/kde-base/krosspython/ChangeLog
index a14381432e03..d8e21940f5f1 100644
--- a/kde-base/krosspython/ChangeLog
+++ b/kde-base/krosspython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/krosspython
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krosspython/ChangeLog,v 1.5 2009/03/04 22:12:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krosspython/ChangeLog,v 1.6 2009/03/08 13:56:53 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  krosspython-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *krosspython-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/krosspython/krosspython-4.2.1.ebuild b/kde-base/krosspython/krosspython-4.2.1.ebuild
index c5b751b72ef5..b2bf892633e0 100644
--- a/kde-base/krosspython/krosspython-4.2.1.ebuild
+++ b/kde-base/krosspython/krosspython-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krosspython/krosspython-4.2.1.ebuild,v 1.1 2009/03/04 22:12:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krosspython/krosspython-4.2.1.ebuild,v 1.2 2009/03/08 13:56:53 scarabeus Exp $
 
 EAPI="2"
 
@@ -9,7 +9,11 @@ KMMODULE="python/krosspython"
 inherit kde4-meta
 
 DESCRIPTION="Kross scripting framework: Python interpreter"
+KEYWORDS=""
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug"
 
-DEPEND="dev-lang/python"
+DEPEND="
+	dev-lang/python
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/krossruby/ChangeLog b/kde-base/krossruby/ChangeLog
index ea7b7df29f90..bcd5ac8db766 100644
--- a/kde-base/krossruby/ChangeLog
+++ b/kde-base/krossruby/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/krossruby
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/ChangeLog,v 1.3 2009/03/04 22:12:27 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/ChangeLog,v 1.4 2009/03/08 13:57:15 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> krossruby-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *krossruby-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/krossruby/krossruby-4.2.1.ebuild b/kde-base/krossruby/krossruby-4.2.1.ebuild
index 30abf76548ed..7d6501bbb572 100644
--- a/kde-base/krossruby/krossruby-4.2.1.ebuild
+++ b/kde-base/krossruby/krossruby-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/krossruby-4.2.1.ebuild,v 1.1 2009/03/04 22:12:27 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossruby/krossruby-4.2.1.ebuild,v 1.2 2009/03/08 13:57:15 scarabeus Exp $
 
 EAPI="2"
 
@@ -12,4 +12,7 @@ DESCRIPTION="Ruby plugin for the kdelibs/kross scripting framework."
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug"
 
-DEPEND="dev-lang/ruby"
+DEPEND="
+	dev-lang/ruby
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/krunner/ChangeLog b/kde-base/krunner/ChangeLog
index e6c44ffa8d4c..ca02fbf86047 100644
--- a/kde-base/krunner/ChangeLog
+++ b/kde-base/krunner/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/krunner
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.21 2009/03/04 22:13:27 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.22 2009/03/08 13:57:46 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> krunner-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *krunner-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/krunner/krunner-4.2.1.ebuild b/kde-base/krunner/krunner-4.2.1.ebuild
index cae9a3390347..a19c2ac35059 100644
--- a/kde-base/krunner/krunner-4.2.1.ebuild
+++ b/kde-base/krunner/krunner-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/krunner-4.2.1.ebuild,v 1.1 2009/03/04 22:13:27 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/krunner-4.2.1.ebuild,v 1.2 2009/03/08 13:57:46 scarabeus Exp $
 
 EAPI="2"
 
@@ -12,16 +12,20 @@ DESCRIPTION="KDE Command Runner"
 IUSE="debug xcomposite xscreensaver"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-COMMONDEPEND=">=kde-base/ksmserver-${PV}:${SLOT}
-	>=kde-base/ksysguard-${PV}:${SLOT}
-	>=kde-base/libkworkspace-${PV}:${SLOT}
+COMMONDEPEND="
+	>=kde-base/ksmserver-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/ksysguard-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libkworkspace-${PV}:${SLOT}[kdeprefix=]
 	x11-libs/libXxf86misc
 	opengl? ( virtual/opengl )
 	xcomposite? ( x11-libs/libXcomposite )
-	xscreensaver? ( x11-libs/libXScrnSaver )"
+	xscreensaver? ( x11-libs/libXScrnSaver )
+"
 DEPEND="${COMMONDEPEND}
 	x11-proto/xf86miscproto
-	xcomposite? ( x11-proto/compositeproto )"
+	xcomposite? ( x11-proto/compositeproto )
+	xscreensaver? ( x11-proto/scrnsaverproto )
+"
 RDEPEND="${COMMONDEPEND}"
 
 KMEXTRACTONLY="
@@ -32,7 +36,8 @@ KMEXTRACTONLY="
 	ksysguard/
 	ksmserver/org.kde.KSMServerInterface.xml
 	plasma/shells/screensaver/org.kde.plasma-overlay.App.xml
-	kcheckpass/"
+	kcheckpass/
+"
 
 KMLOADLIBS="libkworkspace"
 
diff --git a/kde-base/kscd/ChangeLog b/kde-base/kscd/ChangeLog
index 6f958685b3d8..8ef75ed9f091 100644
--- a/kde-base/kscd/ChangeLog
+++ b/kde-base/kscd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kscd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.109 2009/03/04 22:14:59 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.110 2009/03/08 13:58:20 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kscd-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kscd-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kscd/kscd-4.2.1.ebuild b/kde-base/kscd/kscd-4.2.1.ebuild
index 8f60a12fe5a3..0d4788f72eee 100644
--- a/kde-base/kscd/kscd-4.2.1.ebuild
+++ b/kde-base/kscd/kscd-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.2.1.ebuild,v 1.1 2009/03/04 22:14:59 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.2.1.ebuild,v 1.2 2009/03/08 13:58:20 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,9 +11,13 @@ DESCRIPTION="KDE CD player"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND=">=kde-base/libkcddb-${PV}:${SLOT}
-	>=kde-base/libkcompactdisc-${PV}:${SLOT}
-	media-libs/musicbrainz:1"
+DEPEND="
+	>=kde-base/libkcddb-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libkcompactdisc-${PV}:${SLOT}[kdeprefix=]
+	media-libs/musicbrainz:1
+"
 RDEPEND="${DEPEND}"
 
-KMEXTRACTONLY="libkcompactdisc/"
+KMEXTRACTONLY="
+	libkcompactdisc/
+"
diff --git a/kde-base/kshisen/ChangeLog b/kde-base/kshisen/ChangeLog
index 2f556002b2d6..c51f3567bb5b 100644
--- a/kde-base/kshisen/ChangeLog
+++ b/kde-base/kshisen/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kshisen
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/ChangeLog,v 1.104 2009/03/04 22:16:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/ChangeLog,v 1.105 2009/03/08 13:58:59 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kshisen-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kshisen-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kshisen/kshisen-4.2.1.ebuild b/kde-base/kshisen/kshisen-4.2.1.ebuild
index 09380d3f6f02..b554ecd12944 100644
--- a/kde-base/kshisen/kshisen-4.2.1.ebuild
+++ b/kde-base/kshisen/kshisen-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-4.2.1.ebuild,v 1.1 2009/03/04 22:16:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-4.2.1.ebuild,v 1.2 2009/03/08 13:58:59 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,5 +11,7 @@ DESCRIPTION="A KDE game similiar to Mahjongg"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND=">=kde-base/libkmahjongg-${PV}:${SLOT}"
+DEPEND="
+	>=kde-base/libkmahjongg-${PV}:${SLOT}[kdeprefix=]
+"
 RDEPEND="${DEPEND}"
diff --git a/kde-base/ksirk/ChangeLog b/kde-base/ksirk/ChangeLog
index cd27a5e4ab49..2692cfe69ee8 100644
--- a/kde-base/ksirk/ChangeLog
+++ b/kde-base/ksirk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/ksirk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirk/ChangeLog,v 1.9 2009/03/04 22:16:37 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirk/ChangeLog,v 1.10 2009/03/08 13:59:36 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> ksirk-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *ksirk-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/ksirk/ksirk-4.2.1.ebuild b/kde-base/ksirk/ksirk-4.2.1.ebuild
index 26c22183e30c..cf3f1ced2003 100644
--- a/kde-base/ksirk/ksirk-4.2.1.ebuild
+++ b/kde-base/ksirk/ksirk-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirk/ksirk-4.2.1.ebuild,v 1.1 2009/03/04 22:16:37 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirk/ksirk-4.2.1.ebuild,v 1.2 2009/03/08 13:59:36 scarabeus Exp $
 
 EAPI="2"
 
@@ -10,3 +10,8 @@ inherit kde4-meta
 DESCRIPTION="KDE: Ksirk is a KDE port of the board game risk"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
+
+DEPEND="
+	app-crypt/qca:2
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/ksmserver/ChangeLog b/kde-base/ksmserver/ChangeLog
index 26accd080d98..f05ab6682f45 100644
--- a/kde-base/ksmserver/ChangeLog
+++ b/kde-base/ksmserver/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/ksmserver
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.101 2009/03/04 22:17:13 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.102 2009/03/08 14:00:20 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> ksmserver-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *ksmserver-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/ksmserver/ksmserver-4.2.1.ebuild b/kde-base/ksmserver/ksmserver-4.2.1.ebuild
index 6795a646474c..fa6fcd706126 100644
--- a/kde-base/ksmserver/ksmserver-4.2.1.ebuild
+++ b/kde-base/ksmserver/ksmserver-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-4.2.1.ebuild,v 1.1 2009/03/04 22:17:13 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-4.2.1.ebuild,v 1.2 2009/03/08 14:00:20 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,13 +11,17 @@ DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND=">=kde-base/kcminit-${PV}:${SLOT}
-	>=kde-base/libkworkspace-${PV}:${SLOT}
-	>=kde-base/solid-${PV}:${SLOT}"
+DEPEND="
+	>=kde-base/kcminit-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libkworkspace-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/solid-${PV}:${SLOT}[kdeprefix=]
+"
 RDEPEND="${DEPEND}"
 
-KMEXTRACTONLY="kcminit/main.h
+KMEXTRACTONLY="
+	kcminit/main.h
 	libs/kworkspace/
-	solid/"
+	solid/
+"
 
 KMLOADLIBS="libkworkspace"
diff --git a/kde-base/ksplash/ChangeLog b/kde-base/ksplash/ChangeLog
index ea1cfd768f0b..0f3177d4d7b1 100644
--- a/kde-base/ksplash/ChangeLog
+++ b/kde-base/ksplash/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/ksplash
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ChangeLog,v 1.20 2009/03/04 22:18:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ChangeLog,v 1.21 2009/03/08 14:00:57 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> ksplash-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *ksplash-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/ksplash/ksplash-4.2.1.ebuild b/kde-base/ksplash/ksplash-4.2.1.ebuild
index c1f6aea040f8..be002a28877c 100644
--- a/kde-base/ksplash/ksplash-4.2.1.ebuild
+++ b/kde-base/ksplash/ksplash-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ksplash-4.2.1.ebuild,v 1.1 2009/03/04 22:18:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ksplash-4.2.1.ebuild,v 1.2 2009/03/08 14:00:57 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,18 +11,22 @@ DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="3dnow altivec debug mmx sse sse2 xinerama"
 
-RDEPEND="media-libs/libpng
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	xinerama? ( x11-proto/xineramaproto )"
+COMMONDEPEND="
+	media-libs/libpng
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${COMMONDEPEND}
+	xinerama? ( x11-proto/xineramaproto )
+"
+RDEPEND="${COMMONDEPEND}"
 
 src_configure() {
 	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_has 3dnow X86_3DNOW)
-		$(cmake-utils_has altivec PPC_ALTIVEC)
-		$(cmake-utils_has mmx X86_MMX)
-		$(cmake-utils_has sse X86_SSE)
-		$(cmake-utils_has sse2 X86_SSE2)
+		$(cmake-utils_use_has 3dnow X86_3DNOW)
+		$(cmake-utils_use_has altivec PPC_ALTIVEC)
+		$(cmake-utils_use_has mmx X86_MMX)
+		$(cmake-utils_use_has sse X86_SSE)
+		$(cmake-utils_use_has sse2 X86_SSE2)
 		$(cmake-utils_use_with xinerama X11_Xinerama)"
 
 	kde4-meta_src_configure
diff --git a/kde-base/kstars/ChangeLog b/kde-base/kstars/ChangeLog
index 81499371542e..027bc1a95ce5 100644
--- a/kde-base/kstars/ChangeLog
+++ b/kde-base/kstars/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kstars
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/ChangeLog,v 1.112 2009/03/04 22:19:56 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/ChangeLog,v 1.113 2009/03/08 14:01:39 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kstars-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kstars-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kstars/kstars-4.2.1.ebuild b/kde-base/kstars/kstars-4.2.1.ebuild
index 42ed6196d2ae..ccc5d84c491b 100644
--- a/kde-base/kstars/kstars-4.2.1.ebuild
+++ b/kde-base/kstars/kstars-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-4.2.1.ebuild,v 1.1 2009/03/04 22:19:56 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-4.2.1.ebuild,v 1.2 2009/03/08 14:01:39 scarabeus Exp $
 EAPI="2"
 
 KMNAME="kdeedu"
@@ -10,8 +10,11 @@ DESCRIPTION="KDE Desktop Planetarium"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug fits"
 
-DEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}
-	fits? ( >=sci-libs/cfitsio-0.390 )"
+DEPEND="
+	>=kde-base/libkdeedu-${PV}:${SLOT}[kdeprefix=]
+	fits? ( >=sci-libs/cfitsio-0.390 )
+"
+RDEPEND="${DEPEND}"
 
 # FIXME: Re-add as soon as indilib-0.6 is available
 #	indi? ( >=sci-libs/indilib-0.6 )"
diff --git a/kde-base/ksudoku/ChangeLog b/kde-base/ksudoku/ChangeLog
index 53b4f2c74c94..680a54946bf6 100644
--- a/kde-base/ksudoku/ChangeLog
+++ b/kde-base/ksudoku/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/ksudoku
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ChangeLog,v 1.23 2009/03/04 22:22:22 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ChangeLog,v 1.24 2009/03/08 14:02:26 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> ksudoku-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *ksudoku-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/ksudoku/ksudoku-4.2.1.ebuild b/kde-base/ksudoku/ksudoku-4.2.1.ebuild
index d1e20bfab31f..9f477c08aa65 100644
--- a/kde-base/ksudoku/ksudoku-4.2.1.ebuild
+++ b/kde-base/ksudoku/ksudoku-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ksudoku-4.2.1.ebuild,v 1.1 2009/03/04 22:22:22 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksudoku/ksudoku-4.2.1.ebuild,v 1.2 2009/03/08 14:02:26 scarabeus Exp $
 
 EAPI="2"
 
@@ -12,4 +12,6 @@ DESCRIPTION="KDE Sudoku"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-RDEPEND="!kdeprefix? ( !games-puzzle/ksudoku )"
+RDEPEND="
+	!kdeprefix? ( !games-puzzle/ksudoku )
+"
diff --git a/kde-base/ksysguard/ChangeLog b/kde-base/ksysguard/ChangeLog
index 82ec6685e966..42830693cfb1 100644
--- a/kde-base/ksysguard/ChangeLog
+++ b/kde-base/ksysguard/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/ksysguard
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.125 2009/03/06 01:12:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.126 2009/03/08 14:03:22 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> ksysguard-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
   06 Mar 2009; Jeroen Roovers <jer@gentoo.org> ksysguard-3.5.9-r1.ebuild:
   Stable for HPPA (bug #258257).
diff --git a/kde-base/ksysguard/ksysguard-4.2.1.ebuild b/kde-base/ksysguard/ksysguard-4.2.1.ebuild
index f0b73e7b1fec..790333777fb9 100644
--- a/kde-base/ksysguard/ksysguard-4.2.1.ebuild
+++ b/kde-base/ksysguard/ksysguard-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-4.2.1.ebuild,v 1.1 2009/03/04 22:22:59 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-4.2.1.ebuild,v 1.2 2009/03/08 14:03:22 scarabeus Exp $
 
 EAPI="2"
 
@@ -12,13 +12,19 @@ DESCRIPTION="KSysguard is a network enabled task manager and system monitor appl
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug lm_sensors"
 
-COMMONDEPEND="x11-libs/libXrender
+COMMONDEPEND="
+	x11-libs/libXrender
 	x11-libs/libXres
-	lm_sensors? ( sys-apps/lm_sensors )"
+	lm_sensors? ( sys-apps/lm_sensors )
+"
 DEPEND="${COMMONDEPEND}
-	x11-proto/renderproto"
+	x11-proto/renderproto
+"
+RDEPEND="${COMMONDEPEND}"
 
-KMEXTRA="libs/ksysguard/"
+KMEXTRA="
+	libs/ksysguard/
+"
 
 src_configure() {
 	mycmakeargs="${mycmakeargs}
@@ -28,7 +34,7 @@ src_configure() {
 }
 
 src_test() {
-# one out of two tests are broken. we just disable it. last tested on 4.1.0.
+	# one out of two tests are broken. we just disable it. last tested on 4.1.0.
 	sed -e '/guitest/s/^/#DONOTTEST/' \
 		-i "${S}"/libs/ksysguard/tests/CMakeLists.txt
 
diff --git a/kde-base/ksystemlog/ChangeLog b/kde-base/ksystemlog/ChangeLog
index 2cfc06190978..d95abb6b597b 100644
--- a/kde-base/ksystemlog/ChangeLog
+++ b/kde-base/ksystemlog/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/ksystemlog
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystemlog/ChangeLog,v 1.9 2009/03/04 22:23:23 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystemlog/ChangeLog,v 1.10 2009/03/08 14:03:59 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> ksystemlog-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *ksystemlog-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/ksystemlog/ksystemlog-4.2.1.ebuild b/kde-base/ksystemlog/ksystemlog-4.2.1.ebuild
index ea95d1188838..b6909f7acde0 100644
--- a/kde-base/ksystemlog/ksystemlog-4.2.1.ebuild
+++ b/kde-base/ksystemlog/ksystemlog-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystemlog/ksystemlog-4.2.1.ebuild,v 1.1 2009/03/04 22:23:23 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystemlog/ksystemlog-4.2.1.ebuild,v 1.2 2009/03/08 14:03:59 scarabeus Exp $
 
 EAPI="2"
 
@@ -12,4 +12,7 @@ DESCRIPTION="KSystemLog is a system log viewer for KDE."
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND="kde-base/kdepimlibs:${SLOT}"
+DEPEND="
+	>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${RDEPEND}"
diff --git a/kde-base/ktimetracker/ChangeLog b/kde-base/ktimetracker/ChangeLog
index 400c03e36f14..64a54d8ec753 100644
--- a/kde-base/ktimetracker/ChangeLog
+++ b/kde-base/ktimetracker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ktimetracker
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ChangeLog,v 1.10 2009/03/04 22:25:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ChangeLog,v 1.11 2009/03/08 14:04:31 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  ktimetracker-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *ktimetracker-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/ktimetracker/ktimetracker-4.2.1.ebuild b/kde-base/ktimetracker/ktimetracker-4.2.1.ebuild
index 2be40fcdba33..1ad29d2d9e26 100644
--- a/kde-base/ktimetracker/ktimetracker-4.2.1.ebuild
+++ b/kde-base/ktimetracker/ktimetracker-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ktimetracker-4.2.1.ebuild,v 1.1 2009/03/04 22:25:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ktimetracker-4.2.1.ebuild,v 1.2 2009/03/08 14:04:31 scarabeus Exp $
 
 EAPI="2"
 
@@ -8,14 +8,18 @@ KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="KTimeTracker tracks time spent on various tasks."
-IUSE="debug"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	>=kde-base/kontact-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kdepim-kresources-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}"
 
-DEPEND="kde-base/kontact:${SLOT}
-	kde-base/kdepim-kresources:${SLOT}
-	kde-base/libkdepim:${SLOT}"
+KMEXTRACTONLY="
+	kresources/
+"
 
-KMEXTRACTONLY="kresources
-	libkdepim"
-KMLOADLIBS="libkdepim
-	kontactinterfaces"
+KMLOADLIBS="libkdepim kontactinterfaces"
diff --git a/kde-base/ktouch/ChangeLog b/kde-base/ktouch/ChangeLog
index 5956b2057f0c..834d2f83df0c 100644
--- a/kde-base/ktouch/ChangeLog
+++ b/kde-base/ktouch/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/ktouch
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ChangeLog,v 1.111 2009/03/04 22:26:26 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ChangeLog,v 1.112 2009/03/08 14:05:19 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> ktouch-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *ktouch-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/ktouch/ktouch-4.2.1.ebuild b/kde-base/ktouch/ktouch-4.2.1.ebuild
index 4acc83d43506..f99a7f1a3794 100644
--- a/kde-base/ktouch/ktouch-4.2.1.ebuild
+++ b/kde-base/ktouch/ktouch-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-4.2.1.ebuild,v 1.1 2009/03/04 22:26:26 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-4.2.1.ebuild,v 1.2 2009/03/08 14:05:19 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,4 +11,6 @@ DESCRIPTION="KDE: A program that helps you to learn and practice touch typing"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-RDEPEND=">=kde-base/knotify-${PV}:${SLOT}"
+RDEPEND="
+	>=kde-base/knotify-${PV}:${SLOT}[kdeprefix=]
+"
diff --git a/kde-base/kturtle/ChangeLog b/kde-base/kturtle/ChangeLog
index 95b93d954847..5a5cb992d1a0 100644
--- a/kde-base/kturtle/ChangeLog
+++ b/kde-base/kturtle/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kturtle
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/ChangeLog,v 1.104 2009/03/04 22:28:48 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/ChangeLog,v 1.105 2009/03/08 14:06:45 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kturtle-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kturtle-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kturtle/kturtle-4.2.1.ebuild b/kde-base/kturtle/kturtle-4.2.1.ebuild
index 6aa22461956d..f7e8356c478e 100644
--- a/kde-base/kturtle/kturtle-4.2.1.ebuild
+++ b/kde-base/kturtle/kturtle-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-4.2.1.ebuild,v 1.1 2009/03/04 22:28:48 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-4.2.1.ebuild,v 1.2 2009/03/08 14:06:45 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,4 +11,6 @@ DESCRIPTION="KDE: Educational programming environment using the Logo programming
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-RDEPEND=">=kde-base/knotify-${PV}:${SLOT}"
+RDEPEND="
+	>=kde-base/knotify-${PV}:${SLOT}[kdeprefix=]
+"
diff --git a/kde-base/ktux/ChangeLog b/kde-base/ktux/ChangeLog
index e6dce69ea766..68ccd99ec5a1 100644
--- a/kde-base/ktux/ChangeLog
+++ b/kde-base/ktux/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/ktux
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ChangeLog,v 1.100 2009/03/04 22:29:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ChangeLog,v 1.101 2009/03/08 14:07:27 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> ktux-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *ktux-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/ktux/ktux-4.2.1.ebuild b/kde-base/ktux/ktux-4.2.1.ebuild
index cf4ac1cbe409..58b63e95b02a 100644
--- a/kde-base/ktux/ktux-4.2.1.ebuild
+++ b/kde-base/ktux/ktux-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ktux-4.2.1.ebuild,v 1.1 2009/03/04 22:29:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ktux-4.2.1.ebuild,v 1.2 2009/03/08 14:07:27 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,11 +11,14 @@ DESCRIPTION="KDE: screensaver featuring the Space-Faring Tux"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND=">=kde-base/kscreensaver-${PV}:${SLOT}"
+DEPEND="
+	>=kde-base/kscreensaver-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	sed -i -e's/${KDE4WORKSPACE_KSCREENSAVER_LIBRARY}/kscreensaver/' \
-	"${PN}"/CMakeLists.txt || die "Failed to patch CMakeLists.txt"
+		"${PN}"/CMakeLists.txt || die "Failed to patch CMakeLists.txt"
 
 	kde4-meta_src_prepare
 }
diff --git a/kde-base/kwallet/ChangeLog b/kde-base/kwallet/ChangeLog
index 9e79858cc0a6..516c98cd4020 100644
--- a/kde-base/kwallet/ChangeLog
+++ b/kde-base/kwallet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kwallet
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwallet/ChangeLog,v 1.20 2009/03/04 22:32:57 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwallet/ChangeLog,v 1.21 2009/03/08 14:07:48 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kwallet-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kwallet-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kwallet/kwallet-4.2.1.ebuild b/kde-base/kwallet/kwallet-4.2.1.ebuild
index bca61c934f03..f127a477dd62 100644
--- a/kde-base/kwallet/kwallet-4.2.1.ebuild
+++ b/kde-base/kwallet/kwallet-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwallet/kwallet-4.2.1.ebuild,v 1.1 2009/03/04 22:32:57 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwallet/kwallet-4.2.1.ebuild,v 1.2 2009/03/08 14:07:48 scarabeus Exp $
 
 EAPI="2"
 
@@ -12,6 +12,6 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
 RDEPEND="
-	>=kde-base/kcmshell-${PV}:${SLOT}
-	kde-base/kwalletd:${SLOT}
+	>=kde-base/kcmshell-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kwalletd-${PV}:${SLOT}[kdeprefix=]
 "
diff --git a/kde-base/kweather/ChangeLog b/kde-base/kweather/ChangeLog
index d9be503c6569..e4e6e4db75a1 100644
--- a/kde-base/kweather/ChangeLog
+++ b/kde-base/kweather/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kweather
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/ChangeLog,v 1.107 2009/03/04 22:33:31 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/ChangeLog,v 1.108 2009/03/08 14:08:13 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kweather-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kweather-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kweather/kweather-4.2.1.ebuild b/kde-base/kweather/kweather-4.2.1.ebuild
index 527b953b530a..e9c17a7d8fa0 100644
--- a/kde-base/kweather/kweather-4.2.1.ebuild
+++ b/kde-base/kweather/kweather-4.2.1.ebuild
@@ -1,24 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/kweather-4.2.1.ebuild,v 1.1 2009/03/04 22:33:31 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/kweather-4.2.1.ebuild,v 1.2 2009/03/08 14:08:13 scarabeus Exp $
 
 EAPI="2"
 
 KMNAME="kdetoys"
 inherit kde4-meta
 
-DESCRIPTION="KDE weather status display"
+DESCRIPTION="KDE weather service daemon"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
-
-DEPEND="
-	>=kde-base/plasma-workspace-${PV}:${SLOT}
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DWITH_Plasma=ON"
-
-	kde4-base_src_configure
-}
diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 68b4bc84b3f1..93871162fcfc 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.141 2009/03/04 22:34:09 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.142 2009/03/08 14:08:49 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kwin-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kwin-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kwin/kwin-4.2.1.ebuild b/kde-base/kwin/kwin-4.2.1.ebuild
index 751470283a27..525c1d42793b 100644
--- a/kde-base/kwin/kwin-4.2.1.ebuild
+++ b/kde-base/kwin/kwin-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.2.1.ebuild,v 1.1 2009/03/04 22:34:09 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.2.1.ebuild,v 1.2 2009/03/08 14:08:49 scarabeus Exp $
 
 EAPI="2"
 
@@ -12,29 +12,36 @@ DESCRIPTION="KDE window manager"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug captury xcomposite xinerama"
 
-COMMONDEPEND="x11-libs/libXdamage
+COMMONDEPEND="
+	>=kde-base/kephal-${PV}:${SLOT}[kdeprefix=]
+	x11-libs/libXdamage
 	x11-libs/libXfixes
 	>=x11-libs/libXrandr-1.2.1
 	x11-libs/libXrender
 	captury? ( media-libs/libcaptury )
 	opengl? ( virtual/opengl )
 	xcomposite? ( x11-libs/libXcomposite )
-	xinerama? ( x11-libs/libXinerama )"
+	xinerama? ( x11-libs/libXinerama )
+"
 DEPEND="${COMMONDEPEND}
-	kde-base/kephal:${SLOT}
 	x11-proto/damageproto
 	x11-proto/renderproto
 	xcomposite? ( x11-proto/compositeproto )
-	xinerama? ( x11-proto/xineramaproto )"
+	xinerama? ( x11-proto/xineramaproto )
+"
 RDEPEND="${COMMONDEPEND}"
 
-src_configure() {
+src_prepare() {
 	if ! use captury; then
 		sed -e 's:^PKGCONFIG..libcaptury:#DONOTFIND &:' \
 			-i "${S}"/kwin/effects/CMakeLists.txt || \
 			die "Making captury optional failed."
 	fi
 
+	kde4-meta_src_prepare
+}
+
+src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with opengl OpenGL)"
 
diff --git a/kde-base/kwordquiz/ChangeLog b/kde-base/kwordquiz/ChangeLog
index 4fff8181e85c..25982101b2ea 100644
--- a/kde-base/kwordquiz/ChangeLog
+++ b/kde-base/kwordquiz/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kwordquiz
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/ChangeLog,v 1.106 2009/03/04 22:34:48 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/ChangeLog,v 1.107 2009/03/08 14:09:43 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kwordquiz-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kwordquiz-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kwordquiz/kwordquiz-4.2.1.ebuild b/kde-base/kwordquiz/kwordquiz-4.2.1.ebuild
index de479800c1ff..0580a404a035 100644
--- a/kde-base/kwordquiz/kwordquiz-4.2.1.ebuild
+++ b/kde-base/kwordquiz/kwordquiz-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-4.2.1.ebuild,v 1.1 2009/03/04 22:34:48 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-4.2.1.ebuild,v 1.2 2009/03/08 14:09:43 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,7 +11,11 @@ DESCRIPTION="KDE: A powerful flashcard and vocabulary learning program"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}"
+DEPEND="
+	>=kde-base/libkdeedu-${PV}:${SLOT}[kdeprefix=]
+"
 RDEPEND="${DEPEND}"
 
-KMEXTRACTONLY="libkdeedu/keduvocdocument"
+KMEXTRACTONLY="
+	libkdeedu/keduvocdocument
+"
diff --git a/kde-base/kwrite/ChangeLog b/kde-base/kwrite/ChangeLog
index 33ab77710658..d01e670a07a5 100644
--- a/kde-base/kwrite/ChangeLog
+++ b/kde-base/kwrite/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kwrite
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrite/ChangeLog,v 1.19 2009/03/04 22:35:40 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrite/ChangeLog,v 1.20 2009/03/08 14:11:13 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kwrite-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kwrite-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kwrite/kwrite-4.2.1.ebuild b/kde-base/kwrite/kwrite-4.2.1.ebuild
index c19a69f1924d..9168bb3eacbd 100644
--- a/kde-base/kwrite/kwrite-4.2.1.ebuild
+++ b/kde-base/kwrite/kwrite-4.2.1.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrite/kwrite-4.2.1.ebuild,v 1.1 2009/03/04 22:35:40 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrite/kwrite-4.2.1.ebuild,v 1.2 2009/03/08 14:11:13 scarabeus Exp $
 
 EAPI="2"
 
-KMNAME="kdebase"
-KMMODULE="apps/${PN}"
+KMNAME="kdebase-apps"
 inherit kde4-meta
 
-DESCRIPTION="KDE MDI editor/ide"
+DESCRIPTION="KDE MDI editor/IDE"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-KMEXTRA="apps/doc/${PN}"
+KMEXTRA="
+	doc/${PN}/
+"
diff --git a/kde-base/kwrited/ChangeLog b/kde-base/kwrited/ChangeLog
index 72276f839f33..e43c5833044d 100644
--- a/kde-base/kwrited/ChangeLog
+++ b/kde-base/kwrited/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kwrited
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/ChangeLog,v 1.3 2009/03/04 22:35:15 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/ChangeLog,v 1.4 2009/03/08 14:10:31 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kwrited-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *kwrited-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/kwrited/kwrited-4.2.1.ebuild b/kde-base/kwrited/kwrited-4.2.1.ebuild
index 255fb1e519c1..03482c7cd905 100644
--- a/kde-base/kwrited/kwrited-4.2.1.ebuild
+++ b/kde-base/kwrited/kwrited-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/kwrited-4.2.1.ebuild,v 1.1 2009/03/04 22:35:15 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/kwrited-4.2.1.ebuild,v 1.2 2009/03/08 14:10:31 scarabeus Exp $
 
 EAPI="2"
 KMNAME="kdebase-workspace"
@@ -14,5 +14,5 @@ DEPEND="
 	>=sys-libs/libutempter-1.1.5
 "
 RDEPEND="${DEPEND}
-	!kdeprefix? ( !kde-base/konsole:4.1[-kdeprefix] )
+	!kdeprefix? ( !kde-base/konsole:4.1 )
 "
diff --git a/kde-base/libkcddb/ChangeLog b/kde-base/libkcddb/ChangeLog
index ec7743360f11..c57abbe6832c 100644
--- a/kde-base/libkcddb/ChangeLog
+++ b/kde-base/libkcddb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/libkcddb
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/ChangeLog,v 1.103 2009/03/04 22:36:42 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/ChangeLog,v 1.104 2009/03/08 14:11:47 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> libkcddb-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *libkcddb-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/libkcddb/libkcddb-4.2.1.ebuild b/kde-base/libkcddb/libkcddb-4.2.1.ebuild
index 2a1ee912422e..1f5786c7f086 100644
--- a/kde-base/libkcddb/libkcddb-4.2.1.ebuild
+++ b/kde-base/libkcddb/libkcddb-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/libkcddb-4.2.1.ebuild,v 1.1 2009/03/04 22:36:42 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/libkcddb-4.2.1.ebuild,v 1.2 2009/03/08 14:11:47 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,8 +11,9 @@ DESCRIPTION="KDE library for CDDB"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug musicbrainz"
 
-DEPEND="${DEPEND}
-	musicbrainz? ( media-libs/musicbrainz:1 )"
+DEPEND="
+	musicbrainz? ( media-libs/musicbrainz:1 )
+"
 RDEPEND="${DEPEND}"
 
 KMSAVELIBS="true"
@@ -20,5 +21,6 @@ KMSAVELIBS="true"
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with musicbrainz MusicBrainz)"
+
 	kde4-meta_src_configure
 }
diff --git a/kde-base/libkdegames/ChangeLog b/kde-base/libkdegames/ChangeLog
index e9ee5a676fb8..7decd7f65a22 100644
--- a/kde-base/libkdegames/ChangeLog
+++ b/kde-base/libkdegames/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/libkdegames
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/ChangeLog,v 1.106 2009/03/04 22:38:42 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/ChangeLog,v 1.107 2009/03/08 14:12:31 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  libkdegames-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *libkdegames-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/libkdegames/libkdegames-4.2.1.ebuild b/kde-base/libkdegames/libkdegames-4.2.1.ebuild
index d3ccb559f5f9..c78ea41db1bc 100644
--- a/kde-base/libkdegames/libkdegames-4.2.1.ebuild
+++ b/kde-base/libkdegames/libkdegames-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/libkdegames-4.2.1.ebuild,v 1.1 2009/03/04 22:38:42 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/libkdegames-4.2.1.ebuild,v 1.2 2009/03/08 14:12:31 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,7 +11,9 @@ DESCRIPTION="Base library common to many KDE games."
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND=">=dev-games/ggz-client-libs-0.0.14"
+DEPEND="
+	>=dev-games/ggz-client-libs-0.0.14
+"
 RDEPEND="${DEPEND}"
 
 KMSAVELIBS="true"
diff --git a/kde-base/libkonq/ChangeLog b/kde-base/libkonq/ChangeLog
index 50b77f66e3dc..2c8cb7c698b3 100644
--- a/kde-base/libkonq/ChangeLog
+++ b/kde-base/libkonq/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/libkonq
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/ChangeLog,v 1.108 2009/03/04 22:42:02 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/ChangeLog,v 1.109 2009/03/08 14:13:24 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> libkonq-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *libkonq-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/libkonq/libkonq-4.2.1.ebuild b/kde-base/libkonq/libkonq-4.2.1.ebuild
index c721811f777e..a2d1357ef67b 100644
--- a/kde-base/libkonq/libkonq-4.2.1.ebuild
+++ b/kde-base/libkonq/libkonq-4.2.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/libkonq-4.2.1.ebuild,v 1.1 2009/03/04 22:42:02 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/libkonq-4.2.1.ebuild,v 1.2 2009/03/08 14:13:24 scarabeus Exp $
 
 EAPI="2"
 
-KMNAME="kdebase"
-KMMODULE="apps/lib/konq"
+KMNAME="kdebase-apps"
+KMMODULE="lib/konq"
 CPPUNIT_REQUIRED="optional"
 inherit kde4-meta
 
@@ -13,5 +13,7 @@ DESCRIPTION="The embeddable part of konqueror"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 RESTRICT="test"
-PATCHES=("${FILESDIR}/fix_includes_install.patch")
+
 KMSAVELIBS="true"
+
+PATCHES=( "${FILESDIR}/fix_includes_install.patch" )
diff --git a/kde-base/libkpgp/ChangeLog b/kde-base/libkpgp/ChangeLog
index b7db7edb905c..a43bfbf3895c 100644
--- a/kde-base/libkpgp/ChangeLog
+++ b/kde-base/libkpgp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/libkpgp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/ChangeLog,v 1.82 2009/03/04 22:42:36 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/ChangeLog,v 1.83 2009/03/08 14:14:08 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> libkpgp-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *libkpgp-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/libkpgp/libkpgp-4.2.1.ebuild b/kde-base/libkpgp/libkpgp-4.2.1.ebuild
index c128e7ec7759..c697f5f5bea2 100644
--- a/kde-base/libkpgp/libkpgp-4.2.1.ebuild
+++ b/kde-base/libkpgp/libkpgp-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/libkpgp-4.2.1.ebuild,v 1.1 2009/03/04 22:42:36 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/libkpgp-4.2.1.ebuild,v 1.2 2009/03/08 14:14:08 scarabeus Exp $
 
 EAPI="2"
 
diff --git a/kde-base/libksane/ChangeLog b/kde-base/libksane/ChangeLog
index 63fe40728b6d..f07b6b00559b 100644
--- a/kde-base/libksane/ChangeLog
+++ b/kde-base/libksane/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/libksane
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksane/ChangeLog,v 1.10 2009/03/04 22:43:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksane/ChangeLog,v 1.11 2009/03/08 14:14:41 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> libksane-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *libksane-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/libksane/libksane-4.2.1.ebuild b/kde-base/libksane/libksane-4.2.1.ebuild
index a38a38c58641..bae76d9f7dd5 100644
--- a/kde-base/libksane/libksane-4.2.1.ebuild
+++ b/kde-base/libksane/libksane-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksane/libksane-4.2.1.ebuild,v 1.1 2009/03/04 22:43:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksane/libksane-4.2.1.ebuild,v 1.2 2009/03/08 14:14:41 scarabeus Exp $
 
 EAPI="2"
 
@@ -14,8 +14,10 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 LICENSE="LGPL-2"
 
-DEPEND="kde-base/qimageblitz
-	media-gfx/sane-backends"
+DEPEND="
+	kde-base/qimageblitz
+	media-gfx/sane-backends
+"
 RDEPEND="${DEPEND}"
 
 src_install() {
diff --git a/kde-base/libksieve/ChangeLog b/kde-base/libksieve/ChangeLog
index 2d8d7827d9be..79122e86ae25 100644
--- a/kde-base/libksieve/ChangeLog
+++ b/kde-base/libksieve/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/libksieve
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksieve/ChangeLog,v 1.76 2009/03/04 22:43:32 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksieve/ChangeLog,v 1.77 2009/03/08 14:15:17 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> libksieve-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *libksieve-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/libksieve/libksieve-4.2.1.ebuild b/kde-base/libksieve/libksieve-4.2.1.ebuild
index e28ed4b60a73..70d16df5d806 100644
--- a/kde-base/libksieve/libksieve-4.2.1.ebuild
+++ b/kde-base/libksieve/libksieve-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksieve/libksieve-4.2.1.ebuild,v 1.1 2009/03/04 22:43:32 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksieve/libksieve-4.2.1.ebuild,v 1.2 2009/03/08 14:15:17 scarabeus Exp $
 
 EAPI="2"
 
diff --git a/kde-base/libkworkspace/ChangeLog b/kde-base/libkworkspace/ChangeLog
index d962f40a623c..e6d7edec552f 100644
--- a/kde-base/libkworkspace/ChangeLog
+++ b/kde-base/libkworkspace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/libkworkspace
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/ChangeLog,v 1.21 2009/03/04 22:43:59 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/ChangeLog,v 1.22 2009/03/08 14:15:54 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  libkworkspace-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *libkworkspace-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/libkworkspace/libkworkspace-4.2.1.ebuild b/kde-base/libkworkspace/libkworkspace-4.2.1.ebuild
index 7d180e6d787e..96ae30f987cc 100644
--- a/kde-base/libkworkspace/libkworkspace-4.2.1.ebuild
+++ b/kde-base/libkworkspace/libkworkspace-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/libkworkspace-4.2.1.ebuild,v 1.1 2009/03/04 22:43:59 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/libkworkspace-4.2.1.ebuild,v 1.2 2009/03/08 14:15:54 scarabeus Exp $
 
 EAPI="2"
 
@@ -13,7 +13,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
 RDEPEND="
-	!<kde-base/libkworkspace-${PV}:${SLOT}
+	!kdeprefix? ( !<kde-base/libkworkspace-${PV} )
+	kdeprefix? ( !<kde-base/libkworkspace-${PV}:${SLOT} )
 "
 
 KMEXTRACTONLY="
diff --git a/kde-base/libplasmaclock/ChangeLog b/kde-base/libplasmaclock/ChangeLog
index d7177154ac2b..f4dbbab50cd8 100644
--- a/kde-base/libplasmaclock/ChangeLog
+++ b/kde-base/libplasmaclock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/libplasmaclock
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/ChangeLog,v 1.3 2009/03/04 22:44:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/ChangeLog,v 1.4 2009/03/08 14:16:24 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  libplasmaclock-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *libplasmaclock-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/libplasmaclock/libplasmaclock-4.2.1.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.2.1.ebuild
index 554db577ebe4..8b305df27cc6 100644
--- a/kde-base/libplasmaclock/libplasmaclock-4.2.1.ebuild
+++ b/kde-base/libplasmaclock/libplasmaclock-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/libplasmaclock-4.2.1.ebuild,v 1.1 2009/03/04 22:44:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/libplasmaclock-4.2.1.ebuild,v 1.2 2009/03/08 14:16:24 scarabeus Exp $
 
 EAPI="2"
 
@@ -13,6 +13,8 @@ DESCRIPTION="Libraries for KDE Plasma's clocks"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug xinerama"
 
-KMSAVELIBS="true"
+RDEPEND="
+	!kdeprefix? ( !kde-base/plasma-workspace:4.1 )
+"
 
-DEPEND="!kdeprefix? ( !kde-base/plasma-workspace:4.1 )"
+KMSAVELIBS="true"
diff --git a/kde-base/lilo-config/ChangeLog b/kde-base/lilo-config/ChangeLog
index 02cc24503a49..2cc263c0284d 100644
--- a/kde-base/lilo-config/ChangeLog
+++ b/kde-base/lilo-config/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/lilo-config
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lilo-config/ChangeLog,v 1.69 2009/03/04 22:45:34 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lilo-config/ChangeLog,v 1.70 2009/03/08 14:16:51 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  lilo-config-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *lilo-config-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/lilo-config/lilo-config-4.2.1.ebuild b/kde-base/lilo-config/lilo-config-4.2.1.ebuild
index 112053d08f21..b0ca17781ed3 100644
--- a/kde-base/lilo-config/lilo-config-4.2.1.ebuild
+++ b/kde-base/lilo-config/lilo-config-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lilo-config/lilo-config-4.2.1.ebuild,v 1.1 2009/03/04 22:45:34 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lilo-config/lilo-config-4.2.1.ebuild,v 1.2 2009/03/08 14:16:51 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,9 +11,11 @@ DESCRIPTION="KDE LiLo kcontrol module"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-RDEPEND="sys-boot/lilo"
-DEPEND="${RDEPEND}
-	kde-base/kdepimlibs:${SLOT}"
+DEPEND="
+	>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
+	sys-boot/lilo
+"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs="${mycmakeargs}
diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index 9ba8c6112853..8bc0a37218d4 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/marble
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.24 2009/03/04 22:47:26 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.25 2009/03/08 14:17:23 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> marble-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *marble-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/marble/marble-4.2.1.ebuild b/kde-base/marble/marble-4.2.1.ebuild
index 96cda2e7bbf9..3275a93d7302 100644
--- a/kde-base/marble/marble-4.2.1.ebuild
+++ b/kde-base/marble/marble-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.2.1.ebuild,v 1.1 2009/03/04 22:47:26 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.2.1.ebuild,v 1.2 2009/03/08 14:17:23 scarabeus Exp $
 
 EAPI="2"
 
@@ -20,7 +20,7 @@ DEPEND="
 	)
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1
-		kde? ( >=kde-base/pykde4-${PV}:${SLOT} )
+		kde? ( >=kde-base/pykde4-${PV}:${SLOT}[kdeprefix=] )
 	)
 "
 RDEPEND="${DEPEND}
diff --git a/kde-base/nepomuk/ChangeLog b/kde-base/nepomuk/ChangeLog
index 83b778621f69..de924ffad0b0 100644
--- a/kde-base/nepomuk/ChangeLog
+++ b/kde-base/nepomuk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/nepomuk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/ChangeLog,v 1.21 2009/03/04 22:48:46 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/ChangeLog,v 1.22 2009/03/08 14:18:01 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> nepomuk-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *nepomuk-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/nepomuk/nepomuk-4.2.1.ebuild b/kde-base/nepomuk/nepomuk-4.2.1.ebuild
index 30f231d680e8..b35451c042bb 100644
--- a/kde-base/nepomuk/nepomuk-4.2.1.ebuild
+++ b/kde-base/nepomuk/nepomuk-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/nepomuk-4.2.1.ebuild,v 1.1 2009/03/04 22:48:46 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/nepomuk-4.2.1.ebuild,v 1.2 2009/03/08 14:18:01 scarabeus Exp $
 
 EAPI="2"
 
@@ -12,7 +12,10 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
 DEPEND="
-	dev-libs/soprano[clucene]
-	>=kde-base/kdelibs-${PV}:${SLOT}[semantic-desktop]
+	|| (
+		dev-libs/soprano[clucene,redland]
+		dev-libs/soprano[clucene,sesame2]
+	)
+	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,semantic-desktop]
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-base/okular/ChangeLog b/kde-base/okular/ChangeLog
index a5f9dfefc16b..0103af1fae4d 100644
--- a/kde-base/okular/ChangeLog
+++ b/kde-base/okular/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/okular
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.25 2009/03/04 22:50:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.26 2009/03/08 14:18:34 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> okular-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *okular-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/okular/okular-4.2.1.ebuild b/kde-base/okular/okular-4.2.1.ebuild
index 46e446a7c5ec..0837d5af168d 100644
--- a/kde-base/okular/okular-4.2.1.ebuild
+++ b/kde-base/okular/okular-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.2.1.ebuild,v 1.1 2009/03/04 22:50:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.2.1.ebuild,v 1.2 2009/03/08 14:18:34 scarabeus Exp $
 
 EAPI="2"
 
@@ -18,10 +18,13 @@ DEPEND="
 	djvu? ( app-text/djvu )
 	ebook? ( app-text/ebook-tools )
 	jpeg? ( media-libs/jpeg )
+	pdf? (
+		>=app-text/poppler-0.8.5
+		>=app-text/poppler-bindings-0.8.5[qt4]
+	)
 	ps? ( app-text/libspectre )
-	pdf? ( >=app-text/poppler-0.8.5
-		>=app-text/poppler-bindings-0.8.5[qt4] )
-	tiff? ( media-libs/tiff )"
+	tiff? ( media-libs/tiff )
+"
 RDEPEND="${DEPEND}"
 
 src_configure() {
diff --git a/kde-base/parley/ChangeLog b/kde-base/parley/ChangeLog
index f11179f79546..cf1c5ea5eb4e 100644
--- a/kde-base/parley/ChangeLog
+++ b/kde-base/parley/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/parley
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/ChangeLog,v 1.22 2009/03/04 22:50:56 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/ChangeLog,v 1.23 2009/03/08 14:19:00 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> parley-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *parley-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/parley/parley-4.2.1.ebuild b/kde-base/parley/parley-4.2.1.ebuild
index a6a92702fbe1..dc4749f5a4b2 100644
--- a/kde-base/parley/parley-4.2.1.ebuild
+++ b/kde-base/parley/parley-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/parley-4.2.1.ebuild,v 1.1 2009/03/04 22:50:56 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/parley/parley-4.2.1.ebuild,v 1.2 2009/03/08 14:19:00 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,13 +11,18 @@ DESCRIPTION="KDE Educational: vocabulary trainer"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug +plasma"
 
-DEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}"
+DEPEND="
+	>=kde-base/libkdeedu-${PV}:${SLOT}[kdeprefix=]
+"
 RDEPEND="${DEPEND}"
 
-KMEXTRACTONLY="libkdeedu/keduvocdocument"
+KMEXTRACTONLY="
+	libkdeedu/keduvocdocument
+"
 
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with plasma Plasma)"
+
 	kde4-meta_src_configure
 }
diff --git a/kde-base/phonon-kde/ChangeLog b/kde-base/phonon-kde/ChangeLog
index ed687e6d54b2..a867ae078991 100644
--- a/kde-base/phonon-kde/ChangeLog
+++ b/kde-base/phonon-kde/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/phonon-kde
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.5 2009/03/04 22:51:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.6 2009/03/08 14:19:35 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> phonon-kde-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *phonon-kde-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/phonon-kde/phonon-kde-4.2.1.ebuild b/kde-base/phonon-kde/phonon-kde-4.2.1.ebuild
index e06252ea1b80..0e43adb6c1ee 100644
--- a/kde-base/phonon-kde/phonon-kde-4.2.1.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.2.1.ebuild,v 1.1 2009/03/04 22:51:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.2.1.ebuild,v 1.2 2009/03/08 14:19:35 scarabeus Exp $
 
 EAPI="2"
 
@@ -14,9 +14,12 @@ LICENSE="GPL-3"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND="!kde-base/phonon:${SLOT}
-	!kdeprefix? ( !kde-base/phonon-xine )"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	!kdeprefix? (
+		!kde-base/phonon
+		!kde-base/phonon-xine
+	)
+"
 
 src_prepare() {
 	# Don't build tests - they require OpenGL
diff --git a/kde-base/plasma-apps/ChangeLog b/kde-base/plasma-apps/ChangeLog
index 3a080e871817..9d9eff41fabb 100644
--- a/kde-base/plasma-apps/ChangeLog
+++ b/kde-base/plasma-apps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/plasma-apps
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/ChangeLog,v 1.9 2009/03/04 22:51:51 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/ChangeLog,v 1.10 2009/03/08 14:20:02 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  plasma-apps-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *plasma-apps-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild b/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild
index 3114e22d7185..3d660749332a 100644
--- a/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild
+++ b/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild
@@ -1,16 +1,20 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild,v 1.1 2009/03/04 22:51:51 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild,v 1.2 2009/03/08 14:20:02 scarabeus Exp $
 
 EAPI="2"
 
-KMNAME="kdebase"
-KMMODULE="apps/plasma"
+KMNAME="kdebase-apps"
+KMMODULE="plasma"
 inherit kde4-meta
 
 DESCRIPTION="Additional Applets for Plasma"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND="!kde-base/plasma:${SLOT}
-	kde-base/libkonq:${SLOT}"
+DEPEND="
+	>=kde-base/libkonq-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}
+	!kdeprefix? ( !kde-base/plasma )
+"
diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index 4adb108c8f25..d0e57da0a0a9 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/pykde4
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.8 2009/03/04 22:53:31 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.9 2009/03/08 14:20:25 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> pykde4-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *pykde4-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/pykde4/pykde4-4.2.1.ebuild b/kde-base/pykde4/pykde4-4.2.1.ebuild
index dbb7bea23f88..8b1e25120e7d 100644
--- a/kde-base/pykde4/pykde4-4.2.1.ebuild
+++ b/kde-base/pykde4/pykde4-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.2.1.ebuild,v 1.1 2009/03/04 22:53:31 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.2.1.ebuild,v 1.2 2009/03/08 14:20:25 scarabeus Exp $
 
 EAPI="2"
 
@@ -15,12 +15,8 @@ IUSE="akonadi debug semantic-desktop"
 
 DEPEND="
 	>=dev-python/PyQt4-4.4.4-r1[webkit]
-	>=kde-base/kdelibs-${PV}:${SLOT}[opengl]
-	akonadi? ( >=kde-base/kdepimlibs-${PV}:${SLOT} )
-	semantic-desktop? (
-		>=kde-base/kdelibs-${PV}:${SLOT}[semantic-desktop]
-		>=kde-base/nepomuk-${PV}:${SLOT}
-	)
+	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,opengl,semantic-desktop?]
+	akonadi? ( >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=] )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-base/soliduiserver/ChangeLog b/kde-base/soliduiserver/ChangeLog
index cb873f746a73..e1ec2d52154c 100644
--- a/kde-base/soliduiserver/ChangeLog
+++ b/kde-base/soliduiserver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/soliduiserver
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/soliduiserver/ChangeLog,v 1.19 2009/03/04 22:57:38 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/soliduiserver/ChangeLog,v 1.20 2009/03/08 14:20:57 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  soliduiserver-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *soliduiserver-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/soliduiserver/soliduiserver-4.2.1.ebuild b/kde-base/soliduiserver/soliduiserver-4.2.1.ebuild
index 877faca473c5..2c0f6898c4f0 100644
--- a/kde-base/soliduiserver/soliduiserver-4.2.1.ebuild
+++ b/kde-base/soliduiserver/soliduiserver-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/soliduiserver/soliduiserver-4.2.1.ebuild,v 1.1 2009/03/04 22:57:38 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/soliduiserver/soliduiserver-4.2.1.ebuild,v 1.2 2009/03/08 14:20:57 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,5 +11,7 @@ DESCRIPTION="KDE4: Soliduiserver"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND=">=kde-base/solid-${PV}:${SLOT}"
+DEPEND="
+	>=kde-base/solid-${PV}:${SLOT}[kdeprefix=]
+"
 RDEPEND="${DEPEND}"
diff --git a/kde-base/step/ChangeLog b/kde-base/step/ChangeLog
index d6dd66b8b44e..e5860d7183a3 100644
--- a/kde-base/step/ChangeLog
+++ b/kde-base/step/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/step
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/step/ChangeLog,v 1.10 2009/03/04 22:59:08 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/step/ChangeLog,v 1.11 2009/03/08 14:21:38 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> step-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *step-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/step/step-4.2.1.ebuild b/kde-base/step/step-4.2.1.ebuild
index 2b080b6dc41f..4a706a171ec3 100644
--- a/kde-base/step/step-4.2.1.ebuild
+++ b/kde-base/step/step-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/step/step-4.2.1.ebuild,v 1.1 2009/03/04 22:59:08 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/step/step-4.2.1.ebuild,v 1.2 2009/03/08 14:21:38 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,10 +11,12 @@ DESCRIPTION="The KDE physics simulator"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+gsl +qalculate"
 
-DEPEND=">=sci-mathematics/gmm-3.0
+DEPEND="
 	sci-libs/cln
+	>=sci-mathematics/gmm-3.0
 	gsl? ( >=sci-libs/gsl-1.9-r1 )
-	qalculate? ( >=sci-libs/libqalculate-0.9.5 )"
+	qalculate? ( >=sci-libs/libqalculate-0.9.5 )
+"
 RDEPEND="${DEPEND}"
 
 src_configure() {
diff --git a/kde-base/superkaramba/ChangeLog b/kde-base/superkaramba/ChangeLog
index ea7b34e3c7c5..02671c44b83b 100644
--- a/kde-base/superkaramba/ChangeLog
+++ b/kde-base/superkaramba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/superkaramba
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.93 2009/03/07 17:26:56 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.94 2009/03/08 14:22:09 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  superkaramba-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
   07 Mar 2009; Theo Chatzimichos <tampakrap@gentoo.org>
   +files/superkaramba-python-2.6.patch, superkaramba-3.5.9.ebuild,
diff --git a/kde-base/superkaramba/superkaramba-4.2.1.ebuild b/kde-base/superkaramba/superkaramba-4.2.1.ebuild
index f25cdc414535..a7123e69b6ae 100644
--- a/kde-base/superkaramba/superkaramba-4.2.1.ebuild
+++ b/kde-base/superkaramba/superkaramba-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-4.2.1.ebuild,v 1.1 2009/03/04 22:59:57 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-4.2.1.ebuild,v 1.2 2009/03/08 14:22:09 scarabeus Exp $
 
 EAPI="2"
 
@@ -22,5 +22,6 @@ PATCHES=( "${FILESDIR}/${PN}-as-needed.patch" )
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with python PythonLibs)"
+
 	kde4-meta_src_configure
 }
diff --git a/kde-base/umbrello/ChangeLog b/kde-base/umbrello/ChangeLog
index 7f4cb317ee08..5563c2f23751 100644
--- a/kde-base/umbrello/ChangeLog
+++ b/kde-base/umbrello/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/umbrello
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.105 2009/03/04 23:02:08 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.106 2009/03/08 14:22:40 scarabeus Exp $
+
+  08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> umbrello-4.2.1.ebuild:
+  Semi-automatic merge, Update deps.
 
 *umbrello-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/umbrello/umbrello-4.2.1.ebuild b/kde-base/umbrello/umbrello-4.2.1.ebuild
index e10221c8994f..6518b4764a28 100644
--- a/kde-base/umbrello/umbrello-4.2.1.ebuild
+++ b/kde-base/umbrello/umbrello-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-4.2.1.ebuild,v 1.1 2009/03/04 23:02:08 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-4.2.1.ebuild,v 1.2 2009/03/08 14:22:40 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,8 +11,9 @@ DESCRIPTION="KDE: Umbrello UML Modeller"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-COMMONDEPEND="dev-libs/boost
+DEPEND="
+	dev-libs/boost
 	dev-libs/libxml2
-	dev-libs/libxslt"
-DEPEND="${COMMONDEPEND}"
-RDEPEND="${COMMONDEPEND}"
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}"