Automatic-merge: merge updates for 4.2.1 from kde-testing.

Package-Manager: portage-2.2_rc25/cvs/Linux x86_64

114 files changed, 1213 insertions, 176 deletions

diff --git a/kde-base/cervisia/ChangeLog b/kde-base/cervisia/ChangeLog
index 009030d5cdff..6f973ed51d5a 100644
--- a/kde-base/cervisia/ChangeLog
+++ b/kde-base/cervisia/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/cervisia
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/ChangeLog,v 1.104 2009/03/08 18:53:44 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/ChangeLog,v 1.105 2009/03/15 14:17:25 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> cervisia-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -cervisia-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/cervisia/cervisia-4.2.1.ebuild b/kde-base/cervisia/cervisia-4.2.1.ebuild
index 3f0dfce3c620..e5aedab52b81 100644
--- a/kde-base/cervisia/cervisia-4.2.1.ebuild
+++ b/kde-base/cervisia/cervisia-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/cervisia/cervisia-4.2.1.ebuild,v 1.2 2009/03/08 13:09:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/cervisia-4.2.1.ebuild,v 1.3 2009/03/15 14:17:25 scarabeus Exp $
 
 EAPI="2"
 
@@ -14,3 +14,11 @@ IUSE="debug"
 RDEPEND="
 	dev-util/cvs
 "
+
+src_prepare() {
+	# Disable hardcoded kdepimlibs check - only 4.2 branch is affected
+	sed -i -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \
+		CMakeLists.txt || die "failed to disable kdepimlibs hardcoded check"
+
+	kde4-meta_src_prepare
+}
diff --git a/kde-base/gwenview/ChangeLog b/kde-base/gwenview/ChangeLog
index 38fae5d2cbc0..769d054431ae 100644
--- a/kde-base/gwenview/ChangeLog
+++ b/kde-base/gwenview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/gwenview
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/ChangeLog,v 1.23 2009/03/08 18:55:28 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/ChangeLog,v 1.24 2009/03/15 14:18:07 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  gwenview-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -gwenview-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/gwenview/gwenview-4.2.1-r1.ebuild b/kde-base/gwenview/gwenview-4.2.1-r1.ebuild
index bed53affdc37..44f036efbf78 100644
--- a/kde-base/gwenview/gwenview-4.2.1-r1.ebuild
+++ b/kde-base/gwenview/gwenview-4.2.1-r1.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/gwenview/gwenview-4.2.1-r1.ebuild,v 1.1 2009/03/06 01:16:28 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/gwenview-4.2.1-r1.ebuild,v 1.2 2009/03/15 14:18:07 scarabeus Exp $
 
 EAPI="2"
 
@@ -15,11 +15,12 @@ RESTRICT="test"
 DEPEND="
 	media-gfx/exiv2
 	media-libs/jpeg
-	kipi? ( >=kde-base/libkipi-${PV}:${SLOT} )
-	>=kde-base/kdelibs-${PV}:${SLOT}[semantic-desktop?]
+	kipi? ( >=kde-base/libkipi-${PV}:${SLOT}[kdeprefix=] )
+	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,semantic-desktop?]
+"
+RDEPEND="${DEPEND}
+	semantic-desktop? ( >=kde-base/nepomuk-${PV}:${SLOT}[kdeprefix=] )
 "
-
-RDEPEND="${DEPEND}"
 
 PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${KDEDIR}/$(get_libdir)/pkgconfig"
 
diff --git a/kde-base/kalarm/ChangeLog b/kde-base/kalarm/ChangeLog
index b3fe4e601e37..065b0bf7c7a1 100644
--- a/kde-base/kalarm/ChangeLog
+++ b/kde-base/kalarm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kalarm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.100 2009/03/08 18:57:15 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.101 2009/03/15 14:18:37 scarabeus Exp $
+
+*kalarm-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> +kalarm-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -kalarm-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/kalarm/kalarm-4.2.1-r1.ebuild b/kde-base/kalarm/kalarm-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..c1e4322bc9b5
--- /dev/null
+++ b/kde-base/kalarm/kalarm-4.2.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:18:37 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	>=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libkholidays-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	kmail
+	libkholidays
+"
diff --git a/kde-base/kappfinder/ChangeLog b/kde-base/kappfinder/ChangeLog
index b6675ac3e160..577696688fc2 100644
--- a/kde-base/kappfinder/ChangeLog
+++ b/kde-base/kappfinder/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kappfinder
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/ChangeLog,v 1.109 2009/03/09 11:47:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/ChangeLog,v 1.110 2009/03/15 14:19:13 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kappfinder-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   09 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kappfinder-4.2.1.ebuild:
   Fix wrong kmextra.
diff --git a/kde-base/kappfinder/kappfinder-4.2.1.ebuild b/kde-base/kappfinder/kappfinder-4.2.1.ebuild
index 96feb0178066..7f76381c21bf 100644
--- a/kde-base/kappfinder/kappfinder-4.2.1.ebuild
+++ b/kde-base/kappfinder/kappfinder-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/kappfinder/kappfinder-4.2.1.ebuild,v 1.4 2009/03/09 11:47:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/kappfinder-4.2.1.ebuild,v 1.5 2009/03/15 14:19:13 scarabeus Exp $
 
 EAPI="2"
 
-KMNAME="kdebase"
-KMMODULE="apps/${PN}"
+KMNAME="kdebase-apps"
 inherit kde4-meta
 
 DESCRIPTION="KDE tool that looks for well-known apps in your path and creates entries for them in the KDE menu"
@@ -13,5 +12,5 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
 KMEXTRA="
-	apps/doc/${PN}
+	doc/${PN}
 "
diff --git a/kde-base/kapptemplate/ChangeLog b/kde-base/kapptemplate/ChangeLog
index e1369fd7dedb..9bb7320ecc53 100644
--- a/kde-base/kapptemplate/ChangeLog
+++ b/kde-base/kapptemplate/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kapptemplate
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/ChangeLog,v 1.85 2009/03/08 19:00:42 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/ChangeLog,v 1.86 2009/03/15 14:19:39 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kapptemplate-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -kapptemplate-4.2.0.ebuild:
diff --git a/kde-base/kapptemplate/kapptemplate-4.2.1.ebuild b/kde-base/kapptemplate/kapptemplate-4.2.1.ebuild
index e783429d93ff..fb81067f08eb 100644
--- a/kde-base/kapptemplate/kapptemplate-4.2.1.ebuild
+++ b/kde-base/kapptemplate/kapptemplate-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/kapptemplate/kapptemplate-4.2.1.ebuild,v 1.1 2009/03/04 20:31:10 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/kapptemplate-4.2.1.ebuild,v 1.2 2009/03/15 14:19:39 scarabeus Exp $
 
 EAPI="2"
 
@@ -13,3 +13,11 @@ IUSE="debug"
 
 # Fails, checked revision 810882.
 RESTRICT="test"
+
+src_prepare() {
+	# Disable hardcoded kdepimlibs check - only 4.2 branch is affected
+	sed -i -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \
+		CMakeLists.txt || die "failed to disable kdepimlibs hardcoded check"
+
+	kde4-meta_src_prepare
+}
diff --git a/kde-base/kate/ChangeLog b/kde-base/kate/ChangeLog
index 3d74726bb315..caa959173a5c 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.126 2009/03/14 11:01:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/ChangeLog,v 1.127 2009/03/15 14:20:07 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kate-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   14 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kate-4.2.1.ebuild:
   Add kdepimlips to depend. Per bug #262407.
diff --git a/kde-base/kate/kate-4.2.1.ebuild b/kde-base/kate/kate-4.2.1.ebuild
index 94f39311f3e5..b2ce1fb114e1 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.3 2009/03/14 11:01:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-4.2.1.ebuild,v 1.4 2009/03/15 14:20:07 scarabeus Exp $
 
 EAPI="2"
 
@@ -14,12 +14,19 @@ IUSE="debug +plasma"
 DEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
-	>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
 "
 RDEPEND="${DEPEND}"
 
 KMEXTRA="doc/kate-plugins"
 
+src_prepare() {
+	# Disable hardcoded kdepimlibs check - only 4.2 branch is affected
+	sed -i -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \
+		CMakeLists.txt || die "failed to disable kdepimlibs hardcoded check"
+
+	kde4-meta_src_prepare
+}
+
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with plasma Plasma)"
diff --git a/kde-base/kbugbuster/ChangeLog b/kde-base/kbugbuster/ChangeLog
index e66014151312..7cfa871f0e4d 100644
--- a/kde-base/kbugbuster/ChangeLog
+++ b/kde-base/kbugbuster/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kbugbuster
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/ChangeLog,v 1.98 2009/03/08 19:05:10 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/ChangeLog,v 1.99 2009/03/15 14:20:35 scarabeus Exp $
+
+*kbugbuster-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +kbugbuster-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -kbugbuster-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/kbugbuster/kbugbuster-4.2.1-r1.ebuild b/kde-base/kbugbuster/kbugbuster-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..9f2cf79b5e85
--- /dev/null
+++ b/kde-base/kbugbuster/kbugbuster-4.2.1-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/kbugbuster-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:20:35 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdesdk"
+inherit kde4-meta
+
+DESCRIPTION="KBugBuster - A tool for checking and reporting KDE apps' bugs"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/kcachegrind/ChangeLog b/kde-base/kcachegrind/ChangeLog
index a2d75234b137..24e8fc4e74ca 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.102 2009/03/08 19:05:39 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/ChangeLog,v 1.103 2009/03/15 14:21:01 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kcachegrind-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -kcachegrind-4.2.0.ebuild:
diff --git a/kde-base/kcachegrind/kcachegrind-4.2.1.ebuild b/kde-base/kcachegrind/kcachegrind-4.2.1.ebuild
index 70079b167eca..ad71bd8a6cfd 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.2 2009/03/08 13:23:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/kcachegrind-4.2.1.ebuild,v 1.3 2009/03/15 14:21:01 scarabeus Exp $
 
 EAPI="2"
 
@@ -14,3 +14,11 @@ IUSE="debug"
 RDEPEND="
 	media-gfx/graphviz
 "
+
+src_prepare() {
+	# Disable hardcoded kdepimlibs check - only 4.2 branch is affected
+	sed -i -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \
+		CMakeLists.txt || die "failed to disable kdepimlibs hardcoded check"
+
+	kde4-meta_src_prepare
+}
diff --git a/kde-base/kcontrol/ChangeLog b/kde-base/kcontrol/ChangeLog
index 3f156773b953..7c35288f82d5 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.135 2009/03/08 19:09:15 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.136 2009/03/15 14:21:36 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kcontrol-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -kcontrol-4.2.0.ebuild,
   -kcontrol-4.2.0-r1.ebuild:
diff --git a/kde-base/kcontrol/kcontrol-4.2.1.ebuild b/kde-base/kcontrol/kcontrol-4.2.1.ebuild
index 50879bf9ccab..907d0126dabc 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.3 2009/03/08 14:53:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-4.2.1.ebuild,v 1.4 2009/03/15 14:21:36 scarabeus Exp $
 
 EAPI="2"
 
@@ -12,8 +12,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
 RDEPEND="
-	!kdeprefix? ( !<kde-base/ksmserver-${PV}[-kdeprefix] )
-	kdeprefix? ( !<kde-base/ksmserver-${PV}:${SLOT}[kdeprefix=] )
+	!kdeprefix? ( !kde-base/ksmserver:4.1[-kdeprefix] )
 	>=kde-base/kdnssd-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/khotkeys-${PV}:${SLOT}[kdeprefix=]
 "
diff --git a/kde-base/kdeaccounts-plugin/ChangeLog b/kde-base/kdeaccounts-plugin/ChangeLog
index dca6cf0e3a7e..d319d8fc20b4 100644
--- a/kde-base/kdeaccounts-plugin/ChangeLog
+++ b/kde-base/kdeaccounts-plugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeaccounts-plugin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccounts-plugin/ChangeLog,v 1.20 2009/03/08 19:12:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccounts-plugin/ChangeLog,v 1.21 2009/03/15 14:22:09 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdeaccounts-plugin-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeaccounts-plugin-4.2.0.ebuild:
diff --git a/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.2.1.ebuild b/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.2.1.ebuild
index 7664bfbf9545..78b7543ce79b 100644
--- a/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.2.1.ebuild
+++ b/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-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/kdeaccounts-plugin/kdeaccounts-plugin-4.2.1.ebuild,v 1.1 2009/03/04 20:44:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccounts-plugin/kdeaccounts-plugin-4.2.1.ebuild,v 1.2 2009/03/15 14:22:09 scarabeus Exp $
 
 EAPI="2"
 
@@ -10,3 +10,8 @@ inherit kde4-meta
 DESCRIPTION="Addressbook Plugin that puts names/email addresses of all KDE SVN accounts into an addressbook"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
+
+DEPEND="
+	>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/kdeartwork-kscreensaver/ChangeLog b/kde-base/kdeartwork-kscreensaver/ChangeLog
index decd33f3fa1e..99a7ddfe885f 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.116 2009/03/13 22:25:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.117 2009/03/15 14:22:50 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdeartwork-kscreensaver-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   13 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
   kdeartwork-kscreensaver-4.2.1.ebuild:
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 46efd606b968..8cba581d6398 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.4 2009/03/13 22:25:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.2.1.ebuild,v 1.5 2009/03/15 14:22:50 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,17 +11,17 @@ inherit kde4-meta
 
 DESCRIPTION="Extra screensavers for kde"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug +eigen +opengl +xscreensaver"
+IUSE="debug +eigen opengl xscreensaver"
 
-DEPEND="
+RDEPEND="
 	>=kde-base/kscreensaver-${PV}:${SLOT}[kdeprefix=,opengl?]
-	>=kde-base/plasma-workspace-${PV}:${SLOT}[kdeprefix=]
 	media-libs/libart_lgpl
-	eigen? ( dev-cpp/eigen:2 )
 	opengl? ( virtual/opengl )
 	xscreensaver? ( x11-misc/xscreensaver )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	eigen? ( dev-cpp/eigen:2 )
+"
 
 PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch" )
 
diff --git a/kde-base/kdeartwork-wallpapers/ChangeLog b/kde-base/kdeartwork-wallpapers/ChangeLog
index fb1c4733e48f..9c6b1ae9e82d 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.96 2009/03/08 19:16:45 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/ChangeLog,v 1.97 2009/03/15 14:23:18 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdeartwork-wallpapers-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeartwork-wallpapers-4.2.0.ebuild:
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 af07781003c1..e3f3a3afba95 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.3 2009/03/08 14:59:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.2.1.ebuild,v 1.4 2009/03/15 14:23:18 scarabeus Exp $
 
 EAPI="2"
 
@@ -16,5 +16,5 @@ IUSE=""
 
 RDEPEND="
 	!kdeprefix? ( !<kde-base/kde-wallpapers-${PV}[-kdeprefix] )
-	kdeprefix? ( !<kde-base/kde-wallpapers-$PV:${SLOT}[kdeprefix=] )
+	kdeprefix? ( !<kde-base/kde-wallpapers-${PV}:${SLOT} )
 "
diff --git a/kde-base/kdebase-data/ChangeLog b/kde-base/kdebase-data/ChangeLog
index 49188f8ff281..a21254c24742 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.109 2009/03/08 19:17:39 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.110 2009/03/15 14:23:46 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdebase-data-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -kdebase-data-4.2.0.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 dc705ce688e2..ebe887349352 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.4 2009/03/08 15:01:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-4.2.1.ebuild,v 1.5 2009/03/15 14:23:46 scarabeus Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 # releases. Thus we need to block older versions of dolphin, including the :4.1 versions.
 RDEPEND="
 	!kdeprefix? ( !<kde-base/dolphin-${PV}[-kdeprefix] )
-	kdeprefix? ( !<kde-base/dolphin-${PV}:${SLOT}[kdeprefix=] )
+	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 1cd442f476cb..0df0f8659bbd 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.6 2009/03/08 19:18:02 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/ChangeLog,v 1.7 2009/03/15 14:24:12 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdebase-desktoptheme-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -kdebase-desktoptheme-4.2.0.ebuild:
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 00beba14e91a..f2e3cae44e30 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.3 2009/03/08 15:03:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.2.1.ebuild,v 1.4 2009/03/15 14:24:12 scarabeus Exp $
 
 EAPI="2"
 
@@ -14,5 +14,5 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	!kdeprefix? ( !<kde-base/plasma-workspace-${PV}[-kdeprefix] )
-	kdeprefix? ( !<kde-base/plasma-workspace-${PV}:${SLOT}[kdeprefix=] )
+	kdeprefix? ( !<kde-base/plasma-workspace-${PV}:${SLOT} )
 "
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index fba41ca2107c..dd0baf0b207e 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.572 2009/03/11 17:15:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.573 2009/03/15 14:25:03 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kdelibs-4.2.1-r2.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   11 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
   files/kdelibs-4.2.1-kcatalog.patch:
diff --git a/kde-base/kdelibs/kdelibs-4.2.1-r2.ebuild b/kde-base/kdelibs/kdelibs-4.2.1-r2.ebuild
index 3bf70d82a236..b73bf6fc7138 100644
--- a/kde-base/kdelibs/kdelibs-4.2.1-r2.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.2.1-r2.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/kdelibs/kdelibs-4.2.1-r2.ebuild,v 1.1 2009/03/11 14:47:59 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.1-r2.ebuild,v 1.2 2009/03/15 14:25:03 scarabeus Exp $
 
 EAPI="2"
 
@@ -18,25 +18,7 @@ kerberos mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf"
 LICENSE="LGPL-2.1"
 RESTRICT="test"
 
-# Blockers added for !kdeprefix? due to packages from old versions,
-# removed in the meanwhile
-# kde-base/libplasma
-# kde-base/knewsticker
-# kde-base/kpercentage
-# kde-base/ktnef
 COMMONDEPEND="
-	!<=kde-base/kdebase-3.5.9-r4
-	!<=kde-base/kdebase-startkde-3.5.10
-	!<kde-base/kdelibs-3.5.10
-	!x11-libs/qt-phonon
-	!kdeprefix? (
-		!kde-base/kitchensync:4.1[-kdeprefix]
-		!kde-base/knewsticker:4.1[-kdeprefix]
-		!kde-base/kpercentage:4.1[-kdeprefix]
-		!kde-base/ktnef:4.1[-kdeprefix]
-		!kde-base/libplasma[-kdeprefix]
-		!<=kde-misc/kdnssd-avahi-0.1.2:0
-	)
 	>=app-misc/strigi-0.6.3[qt4,dbus]
 	dev-libs/libpcre
 	dev-libs/libxml2
@@ -50,6 +32,7 @@ COMMONDEPEND="
 	media-libs/libpng
 	>=media-sound/phonon-4.3.1[xcb]
 	sys-apps/dbus[X]
+	sys-libs/zlib
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
@@ -67,16 +50,16 @@ COMMONDEPEND="
 		kernel_linux? ( sys-apps/acl )
 	)
 	alsa? ( media-libs/alsa-lib[midi] )
+	bzip2? ( app-arch/bzip2 )
 	fam? ( virtual/fam )
 	jpeg2k? ( media-libs/jasper )
 	kerberos? ( virtual/krb5 )
-	nls? ( virtual/libintl )
 	openexr? (
 		media-libs/openexr
 		media-libs/ilmbase
 	)
 	opengl? ( virtual/opengl )
-	semantic-desktop? ( >=dev-libs/soprano-2.1.64 )
+	semantic-desktop? ( >=dev-libs/soprano-2.2.2[dbus] )
 	spell? (
 		app-dicts/aspell-en
 		app-text/aspell
@@ -90,20 +73,42 @@ COMMONDEPEND="
 		)
 	)
 "
-
 DEPEND="${COMMONDEPEND}
-	sys-devel/gettext
 	doc? ( app-doc/doxygen )
+	nls? ( virtual/libintl )
 "
-
+# Blockers added for !kdeprefix? due to packages from old versions,
+# removed in the meanwhile
+# kde-base/libplasma
+# kde-base/knewsticker
+# kde-base/kpercentage
+# kde-base/ktnef
 RDEPEND="${COMMONDEPEND}
+	!<=kde-base/kdebase-3.5.9-r4
+	!<=kde-base/kdebase-startkde-3.5.10
+	!<kde-base/kdelibs-3.5.10
+	!x11-libs/qt-phonon
+	!kdeprefix? (
+		!kde-base/kitchensync:4.1
+		!kde-base/knewsticker:4.1
+		!kde-base/kpercentage:4.1
+		!kde-base/ktnef:4.1
+		!<kde-base/libkworkspace-${PV}[-kdeprefix]
+		!kde-base/libplasma
+		!<=kde-misc/kdnssd-avahi-0.1.2:0
+	)
+	kdeprefix? (
+		!<kde-base/libkworkspace-${PV}:${SLOT}
+		!<=kde-misc/kdnssd-avahi-0.1.2:0
+	)
 	x11-apps/iceauth
 	x11-apps/rgb
 "
 
 # upstream patches / dist patches
-# {FILESDIR}/${P}-qt4.5.patch is upstream revision 934640 and fixes upstream bug 186038 and
-# Gentoo bug 261367 - ${FILESDIR}/${P}-kcatalog.patch fixes remaining issues on both bugs
+# {FILESDIR}/${P}-qt4.5.patch is upstream revision 934640
+# and fixes upstream bug 186038 and Gentoo bug 261367
+# ${FILESDIR}/${P}-kcatalog.patch fixes remaining issues on both bugs
 PATCHES=(
 	"${FILESDIR}/dist/09_disable_debug_messages_if_not_explicitly_enabled.patch"
 	"${FILESDIR}/dist/20_use_dejavu_as_default_font.patch"
@@ -112,6 +117,14 @@ PATCHES=(
 	"${FILESDIR}/${P}-kcatalog.patch"
 )
 
+src_prepare() {
+	sed -i -e 's/find_package(ACL)/macro_optional_find_package(ACL)/' \
+		CMakeLists.txt \
+		|| die "Failed to make ACL disabled even when present in system."
+
+	kde4-base_src_prepare
+}
+
 src_configure() {
 	if use zeroconf; then
 		if has_version net-dns/avahi; then
@@ -130,11 +143,11 @@ src_configure() {
 	mycmakeargs="${mycmakeargs}
 		-DWITH_HSPELL=OFF
 		-DKDE_DEFAULT_HOME=${HME}
-		$(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 acl ACL)
 		$(cmake-utils_use_with alsa Alsa)
 		$(cmake-utils_use_with bzip2 BZip2)
diff --git a/kde-base/kdepasswd/ChangeLog b/kde-base/kdepasswd/ChangeLog
index 45d5d980182c..15a5c4c24c81 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.114 2009/03/08 22:46:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/ChangeLog,v 1.115 2009/03/15 14:25:31 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kdepasswd-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kdepasswd-4.2.1.ebuild:
   Revert wrongly commited new eclass behavior.
diff --git a/kde-base/kdepasswd/kdepasswd-4.2.1.ebuild b/kde-base/kdepasswd/kdepasswd-4.2.1.ebuild
index da69a7a26172..259699d3e5c6 100644
--- a/kde-base/kdepasswd/kdepasswd-4.2.1.ebuild
+++ b/kde-base/kdepasswd/kdepasswd-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/kdepasswd/kdepasswd-4.2.1.ebuild,v 1.3 2009/03/08 22:46:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/kdepasswd-4.2.1.ebuild,v 1.4 2009/03/15 14:25:31 scarabeus Exp $
 
 EAPI="2"
 
-KMNAME="kdebase"
-KMMODULE="apps/${PN}"
+KMNAME="kdebase-apps"
 inherit kde4-meta
 
 DESCRIPTION="KDE GUI for passwd"
diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index 1bb1faf0e126..04b06d26c036 100644
--- a/kde-base/kdeplasma-addons/ChangeLog
+++ b/kde-base/kdeplasma-addons/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeplasma-addons
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.14 2009/03/08 21:06:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.15 2009/03/15 14:25:57 scarabeus Exp $
+
+*kdeplasma-addons-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +kdeplasma-addons-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeplasma-addons-4.2.0.ebuild, -kdeplasma-addons-4.2.0-r1.ebuild:
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.2.1-r1.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..84f2acf1ff75
--- /dev/null
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.2.1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:25:57 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdeplasma-addons"
+OPENGL_REQUIRED="optional"
+WEBKIT_REQUIRED="always"
+inherit kde4-base
+
+DESCRIPTION="Extra Plasma applets and engines."
+HOMEPAGE="http://www.kde.org/"
+LICENSE="GPL-2 LGPL-2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug xinerama"
+
+DEPEND="
+	>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/krunner-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/plasma-workspace-${PV}:${SLOT}[kdeprefix=]
+	opengl? ( >=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,opengl] )
+	xinerama? ( x11-proto/xineramaproto )
+"
+RDEPEND="${DEPEND}
+	!kdeprefix? ( !kde-misc/lancelot-menu )
+	xinerama? ( x11-libs/libXinerama )
+"
+
+PATCHES=( "${FILESDIR}/lancelot-qt45.patch" )
+
+src_prepare() {
+	sed -i -e 's/${KDE4WORKSPACE_PLASMACLOCK_LIBRARY}/plasmaclock/g' \
+		-e 's/${KDE4WORKSPACE_WEATHERION_LIBRARY}/weather_ion/g' \
+		-e 's/${KDE4WORKSPACE_TASKMANAGER_LIBRARY}/taskmanager/g' \
+		applets/{binary-clock,fuzzy-clock,weather_station,lancelot/app/src}/CMakeLists.txt \
+		|| die "Failed to patch CMake files"
+
+	sed -i -e 's/(KDE4_PLASMA_OPENGL_FOUND)/(KDE4_PLASMA_OPENGL_FOUND AND OPENGL_FOUND)/g' \
+		applets/CMakeLists.txt \
+		|| die "Failed to make OpenGL applets optional"
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		-DDBUS_INTERFACES_INSTALL_DIR=${KDEDIR}/share/dbus-1/interfaces/
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with xinerama X11_Xinerama)"
+
+	kde4-base_src_configure
+}
diff --git a/kde-base/kdesdk-kioslaves/ChangeLog b/kde-base/kdesdk-kioslaves/ChangeLog
index 7d7b6f70b704..48da5940ac63 100644
--- a/kde-base/kdesdk-kioslaves/ChangeLog
+++ b/kde-base/kdesdk-kioslaves/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdesdk-kioslaves
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.102 2009/03/08 19:34:52 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.103 2009/03/15 14:26:23 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdesdk-kioslaves-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -kdesdk-kioslaves-4.2.0.ebuild:
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.2.1.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.2.1.ebuild
index 1a6279dfcadb..f839c269d9c5 100644
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.2.1.ebuild
+++ b/kde-base/kdesdk-kioslaves/kdesdk-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/kdesdk-kioslaves/kdesdk-kioslaves-4.2.1.ebuild,v 1.1 2009/03/04 21:12:09 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.2.1.ebuild,v 1.2 2009/03/15 14:26:23 scarabeus Exp $
 
 EAPI="2"
 
@@ -12,11 +12,23 @@ DESCRIPTION="kioslaves from kdesdk package: the subversion kioslave"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
-DEPEND="dev-libs/apr
-	dev-util/subversion"
-RDEPEND="${RDEPEND}"
+DEPEND="
+	dev-libs/apr
+	dev-util/subversion
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Disable hardcoded kdepimlibs check - only 4.2 branch is affected
+	sed -i -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \
+		CMakeLists.txt || die "failed to disable kdepimlibs hardcoded check"
+
+	kde4-meta_src_prepare
+}
 
 src_configure() {
-	mycmakeargs="${mycmakeargs} -DAPRCONFIG_EXECUTABLE=/usr/bin/apr-1-config"
+	mycmakeargs="${mycmakeargs}
+		-DAPRCONFIG_EXECUTABLE=/usr/bin/apr-1-config"
+
 	kde4-meta_src_configure
 }
diff --git a/kde-base/kdesdk-misc/ChangeLog b/kde-base/kdesdk-misc/ChangeLog
index 1d28bb56db64..07552f9ebe58 100644
--- a/kde-base/kdesdk-misc/ChangeLog
+++ b/kde-base/kdesdk-misc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdesdk-misc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-misc/ChangeLog,v 1.78 2009/03/08 19:35:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-misc/ChangeLog,v 1.79 2009/03/15 14:26:50 scarabeus Exp $
+
+*kdesdk-misc-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +kdesdk-misc-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -kdesdk-misc-4.2.0.ebuild:
diff --git a/kde-base/kdesdk-misc/kdesdk-misc-4.2.1-r1.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..2b221a413277
--- /dev/null
+++ b/kde-base/kdesdk-misc/kdesdk-misc-4.2.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-misc/kdesdk-misc-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:26:50 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdesdk"
+KMNOMODULE="true"
+inherit kde4-meta
+
+DESCRIPTION="kdesdk-misc - Various files and utilities"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="!kde-base/poxml"
+
+KMEXTRA="
+	kmtrace/
+	kprofilemethod/
+	poxml/
+"
+
+src_prepare() {
+	# Disable hardcoded kdepimlibs check - only 4.2 branch is affected
+	sed -i -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \
+		CMakeLists.txt || die "failed to disable kdepimlibs hardcoded check"
+
+	kde4-meta_src_prepare
+}
diff --git a/kde-base/kdesdk-scripts/ChangeLog b/kde-base/kdesdk-scripts/ChangeLog
index 3df9d59cf8e8..2aa0fbb0f049 100644
--- a/kde-base/kdesdk-scripts/ChangeLog
+++ b/kde-base/kdesdk-scripts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdesdk-scripts
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/ChangeLog,v 1.91 2009/03/08 19:36:22 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/ChangeLog,v 1.92 2009/03/15 14:27:18 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdesdk-scripts-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -kdesdk-scripts-4.2.0.ebuild:
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-4.2.1.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-4.2.1.ebuild
index 012c01e71be4..42c9808b0318 100644
--- a/kde-base/kdesdk-scripts/kdesdk-scripts-4.2.1.ebuild
+++ b/kde-base/kdesdk-scripts/kdesdk-scripts-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/kdesdk-scripts/kdesdk-scripts-4.2.1.ebuild,v 1.1 2009/03/04 21:14:06 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/kdesdk-scripts-4.2.1.ebuild,v 1.2 2009/03/15 14:27:18 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,3 +11,11 @@ inherit kde4-meta
 DESCRIPTION="Kdesdk Scripts - Some useful scripts for the development of applications"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
+
+src_prepare() {
+	# Disable hardcoded kdepimlibs check - only 4.2 branch is affected
+	sed -i -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \
+		CMakeLists.txt || die "failed to disable kdepimlibs hardcoded check"
+
+	kde4-meta_src_prepare
+}
diff --git a/kde-base/kdesdk-strigi-analyzer/ChangeLog b/kde-base/kdesdk-strigi-analyzer/ChangeLog
index 3414bfb7026f..3e19c021add6 100644
--- a/kde-base/kdesdk-strigi-analyzer/ChangeLog
+++ b/kde-base/kdesdk-strigi-analyzer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdesdk-strigi-analyzer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-strigi-analyzer/ChangeLog,v 1.10 2009/03/08 19:36:43 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-strigi-analyzer/ChangeLog,v 1.11 2009/03/15 14:27:50 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdesdk-strigi-analyzer-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -kdesdk-strigi-analyzer-4.2.0.ebuild:
diff --git a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.2.1.ebuild b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.2.1.ebuild
index c48f25bd5e9e..238b1f68cef7 100644
--- a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.2.1.ebuild
+++ b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-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/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.2.1.ebuild,v 1.1 2009/03/04 21:14:33 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.2.1.ebuild,v 1.2 2009/03/15 14:27:50 scarabeus Exp $
 
 EAPI="2"
 
@@ -11,3 +11,11 @@ inherit kde4-meta
 DESCRIPTION="kdesdk: strigi plugins"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
+
+src_prepare() {
+	# Disable hardcoded kdepimlibs check - only 4.2 branch is affected
+	sed -i -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \
+		CMakeLists.txt || die "failed to disable kdepimlibs hardcoded check"
+
+	kde4-meta_src_prepare
+}
diff --git a/kde-base/kdialog/ChangeLog b/kde-base/kdialog/ChangeLog
index 1e5575c6a8ba..1963b290a410 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.98 2009/03/08 22:47:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/ChangeLog,v 1.99 2009/03/15 14:28:17 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kdialog-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kdialog-4.2.1.ebuild:
   Revert wrongly commited new eclass behavior.
diff --git a/kde-base/kdialog/kdialog-4.2.1.ebuild b/kde-base/kdialog/kdialog-4.2.1.ebuild
index 5f50b342ec31..454dca754a60 100644
--- a/kde-base/kdialog/kdialog-4.2.1.ebuild
+++ b/kde-base/kdialog/kdialog-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/kdialog/kdialog-4.2.1.ebuild,v 1.3 2009/03/08 22:47:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-4.2.1.ebuild,v 1.4 2009/03/15 14:28:17 scarabeus Exp $
 
 EAPI="2"
 
-KMNAME="kdebase"
-KMMODULE="apps/${PN}"
+KMNAME="kdebase-apps"
 inherit kde4-meta
 
 DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts"
diff --git a/kde-base/keditbookmarks/ChangeLog b/kde-base/keditbookmarks/ChangeLog
index 9a6b2d132dbd..f61e24904b2d 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.22 2009/03/09 17:25:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/ChangeLog,v 1.23 2009/03/15 14:28:41 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  keditbookmarks-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   09 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
   keditbookmarks-4.2.1.ebuild:
diff --git a/kde-base/keditbookmarks/keditbookmarks-4.2.1.ebuild b/kde-base/keditbookmarks/keditbookmarks-4.2.1.ebuild
index 8931e8beccb7..e433143436f1 100644
--- a/kde-base/keditbookmarks/keditbookmarks-4.2.1.ebuild
+++ b/kde-base/keditbookmarks/keditbookmarks-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/keditbookmarks/keditbookmarks-4.2.1.ebuild,v 1.3 2009/03/09 17:25:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/keditbookmarks-4.2.1.ebuild,v 1.4 2009/03/15 14:28:41 scarabeus Exp $
 
 EAPI="2"
 
-KMNAME="kdebase"
-KMMODULE="apps/keditbookmarks"
+KMNAME="kdebase-apps"
 inherit kde4-meta
 
 DESCRIPTION="KDE's bookmarks editor"
@@ -18,5 +17,5 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY="
-	apps/lib/konq/
+	lib/konq/
 "
diff --git a/kde-base/kfilereplace/ChangeLog b/kde-base/kfilereplace/ChangeLog
index d86a575a7407..29034804dbb4 100644
--- a/kde-base/kfilereplace/ChangeLog
+++ b/kde-base/kfilereplace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kfilereplace
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/ChangeLog,v 1.100 2009/03/08 19:43:37 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/ChangeLog,v 1.101 2009/03/15 14:29:09 scarabeus Exp $
+
+*kfilereplace-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +kfilereplace-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -kfilereplace-4.2.0.ebuild:
diff --git a/kde-base/kfilereplace/kfilereplace-4.2.1-r1.ebuild b/kde-base/kfilereplace/kfilereplace-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..95513547f827
--- /dev/null
+++ b/kde-base/kfilereplace/kfilereplace-4.2.1-r1.ebuild
@@ -0,0 +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/kfilereplace/kfilereplace-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:29:09 scarabeus Exp $
+
+EAPI="2"
+KMNAME="kdewebdev"
+inherit kde4-meta
+
+DESCRIPTION="KDE web development - powerful search and replace in multiple files"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
diff --git a/kde-base/kget/ChangeLog b/kde-base/kget/ChangeLog
index 584fcf81cb72..bd4db9921e17 100644
--- a/kde-base/kget/ChangeLog
+++ b/kde-base/kget/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kget
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v 1.107 2009/03/08 19:46:36 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v 1.108 2009/03/15 14:29:39 scarabeus Exp $
+
+*kget-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> +kget-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -kget-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/kget/kget-4.2.1-r1.ebuild b/kde-base/kget/kget-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..824c9d1b9b1a
--- /dev/null
+++ b/kde-base/kget/kget-4.2.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:29:39 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdenetwork"
+inherit kde4-meta
+
+DESCRIPTION="An advanced download manager for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug +plasma bittorrent -bittorrent-external +semantic-desktop sqlite"
+
+DEPEND="
+	dev-libs/libpcre
+	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,semantic-desktop?]
+	bittorrent? (
+		app-crypt/qca:2
+		dev-libs/gmp
+	)
+	bittorrent-external? ( >=net-p2p/ktorrent-3.1.5[kdeprefix=] )
+	sqlite? ( dev-db/sqlite )
+"
+RDEPEND="${DEPEND}
+	semantic-desktop? ( >=kde-base/nepomuk-${PV}:${SLOT}[kdeprefix=] )
+"
+
+pkg_setup() {
+	if use bittorrent && use bittorrent-external; then
+		echo
+		eerror "USE flag 'bittorrent' conflicts with these USE flag 'bittorrent-external'"
+		eerror
+		eerror "You must disable these conflicting flags before you can emerge this package."
+		eerror "You can do this by disabling one of these flags in /etc/portage/package.use:"
+		eerror "    =${CATEGORY}/${PN}-${PV} -bittorrent-external"
+		echo
+		die "Conflicting USE flags found"
+	fi
+
+	kde4-base_pkg_setup
+}
+
+src_prepare() {
+	if ! use bittorrent && ! use bittorrent-external; then
+		sed -i -e '/bittorrent/s:^:#DONOTCOMPILE :' \
+			"${S}"/kget/transfer-plugins/CMakeLists.txt \
+			|| die "sed to disable torrent support failed."
+	fi
+
+	kde4-meta_src_prepare
+}
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_enable bittorrent EMBEDDED_TORRENT_SUPPORT)
+		$(cmake-utils_use_with plasma Plasma)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with sqlite Sqlite)"
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kgpg/ChangeLog b/kde-base/kgpg/ChangeLog
index ed6babb72136..b6b5b3a44b47 100644
--- a/kde-base/kgpg/ChangeLog
+++ b/kde-base/kgpg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kgpg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/ChangeLog,v 1.108 2009/03/08 19:47:48 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/ChangeLog,v 1.109 2009/03/15 14:30:13 scarabeus Exp $
+
+*kgpg-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> +kgpg-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -kgpg-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/kgpg/kgpg-4.2.1-r1.ebuild b/kde-base/kgpg/kgpg-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..08320d339f69
--- /dev/null
+++ b/kde-base/kgpg/kgpg-4.2.1-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:30:13 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdeutils"
+inherit kde4-meta
+
+DESCRIPTION="KDE gpg keyring manager"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+"
diff --git a/kde-base/killbots/ChangeLog b/kde-base/killbots/ChangeLog
index eab441fe2406..60d12bc8a129 100644
--- a/kde-base/killbots/ChangeLog
+++ b/kde-base/killbots/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/killbots
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/killbots/ChangeLog,v 1.5 2009/03/08 19:50:49 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/killbots/ChangeLog,v 1.6 2009/03/15 14:30:39 scarabeus Exp $
+
+*killbots-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +killbots-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -killbots-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/killbots/killbots-4.2.1-r1.ebuild b/kde-base/killbots/killbots-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..14ba444b2487
--- /dev/null
+++ b/kde-base/killbots/killbots-4.2.1-r1.ebuild
@@ -0,0 +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/killbots/killbots-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:30:39 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdegames"
+inherit kde4-meta
+
+DESCRIPTION="Kill the bots or they kill you!"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
diff --git a/kde-base/kinfocenter/ChangeLog b/kde-base/kinfocenter/ChangeLog
index 3dd7a20d000c..f907db2e6abd 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.18 2009/03/08 22:50:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/ChangeLog,v 1.19 2009/03/15 14:31:03 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kinfocenter-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
   kinfocenter-4.2.1.ebuild:
diff --git a/kde-base/kinfocenter/kinfocenter-4.2.1.ebuild b/kde-base/kinfocenter/kinfocenter-4.2.1.ebuild
index d36a61084a04..7d141f74acf0 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.3 2009/03/08 22:50:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/kinfocenter-4.2.1.ebuild,v 1.4 2009/03/15 14:31:03 scarabeus Exp $
 
 EAPI="2"
 
-KMNAME="kdebase"
-KMMODULE="apps/${PN}"
+KMNAME="kdebase-apps"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta
 
diff --git a/kde-base/kleopatra/ChangeLog b/kde-base/kleopatra/ChangeLog
index a3e51e1c178a..aed427a5793d 100644
--- a/kde-base/kleopatra/ChangeLog
+++ b/kde-base/kleopatra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kleopatra
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/ChangeLog,v 1.11 2009/03/09 20:34:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/ChangeLog,v 1.12 2009/03/15 14:31:28 scarabeus Exp $
+
+*kleopatra-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +kleopatra-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   09 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kleopatra-4.2.1.ebuild:
   Update deps for new eclass.
diff --git a/kde-base/kleopatra/kleopatra-4.2.1-r1.ebuild b/kde-base/kleopatra/kleopatra-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..97551574d2b7
--- /dev/null
+++ b/kde-base/kleopatra/kleopatra-4.2.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/kleopatra-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:31:28 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Kleopatra - KDE X.509 key manager"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+#RESTRICT="test"
+
+DEPEND="
+	app-crypt/gpgme
+	dev-libs/libassuan
+	>=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libkleo-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+"
+
+KMEXTRACTONLY="
+	libkleo
+"
+KMLOADLIBS="libkleo"
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		-DWITH_QGPGME=ON"
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 22ef8cd3d089..99636a911815 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.155 2009/03/09 20:36:18 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.156 2009/03/15 14:32:29 scarabeus Exp $
+
+*kmail-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> +kmail-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   09 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kmail-4.2.1.ebuild:
   update deps for new eclass.
diff --git a/kde-base/kmail/kmail-4.2.1-r1.ebuild b/kde-base/kmail/kmail-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..6e2d9d1de830
--- /dev/null
+++ b/kde-base/kmail/kmail-4.2.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:32:29 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug +semantic-desktop"
+
+DEPEND="
+	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,semantic-desktop?]
+	>=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libkleo-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libkpgp-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libksieve-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/mimelib-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}
+	>=kde-base/kmailcvt-${PV}:${SLOT}[kdeprefix=]
+	semantic-desktop? ( >=kde-base/nepomuk-${PV}:${SLOT}[kdeprefix=] )
+"
+
+KMEXTRACTONLY="
+	kaddressbook/org.kde.KAddressbook.Core.xml
+	korganizer/org.kde.Korganizer.Calendar.xml
+	libkleo
+	libkpgp
+	mimelib
+"
+KMEXTRA="
+	plugins/kmail/
+"
+KMLOADLIBS="libkdepim"
+
+PATCHES=( "${FILESDIR}/${PN}-4.1.72-fix.patch" )
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with semantic-desktop Nepomuk)"
+
+	MAKEOPTS="${MAKEOPTS} -j1"
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kmailcvt/ChangeLog b/kde-base/kmailcvt/ChangeLog
index 9a22d8baa731..7f02a2c46c12 100644
--- a/kde-base/kmailcvt/ChangeLog
+++ b/kde-base/kmailcvt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmailcvt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmailcvt/ChangeLog,v 1.89 2009/03/08 19:58:09 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmailcvt/ChangeLog,v 1.90 2009/03/15 14:31:57 scarabeus Exp $
+
+*kmailcvt-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +kmailcvt-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -kmailcvt-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/kmailcvt/kmailcvt-4.2.1-r1.ebuild b/kde-base/kmailcvt/kmailcvt-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..e889530ebcb4
--- /dev/null
+++ b/kde-base/kmailcvt/kmailcvt-4.2.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmailcvt/kmailcvt-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:31:57 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KMail Import Filters"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	app-crypt/gpgme
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+"
+
+# xml targets from kmail are being uncommented by kde4-meta.eclass
+KMEXTRACTONLY="
+	kmail/
+"
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		-DWITH_QGpgme=ON"
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/knode/ChangeLog b/kde-base/knode/ChangeLog
index 4bd4bea10cc3..367bdd6a86af 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.106 2009/03/09 17:28:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.107 2009/03/15 14:32:57 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> knode-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   09 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> knode-4.2.1.ebuild:
   Fix missing kmextra. Per bug #261837.
diff --git a/kde-base/knode/knode-4.2.1.ebuild b/kde-base/knode/knode-4.2.1.ebuild
index e2cc6f571f3d..8982f355722e 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.3 2009/03/09 17:28:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.2.1.ebuild,v 1.4 2009/03/15 14:32:57 scarabeus Exp $
 
 EAPI="2"
 
@@ -19,7 +19,6 @@ RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY="
 	libkpgp/
-	libkdepim/
 "
 
 KMLOADLIBS="libkdepim"
diff --git a/kde-base/kommander/ChangeLog b/kde-base/kommander/ChangeLog
index 8f0697e94b66..d7ff5f43ac70 100644
--- a/kde-base/kommander/ChangeLog
+++ b/kde-base/kommander/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kommander
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/ChangeLog,v 1.103 2009/03/12 11:36:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/ChangeLog,v 1.104 2009/03/15 14:33:26 scarabeus Exp $
+
+*kommander-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +kommander-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   12 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kommander-4.2.1.ebuild:
   Add missing kdepimlibs dep.
diff --git a/kde-base/kommander/kommander-4.2.1-r1.ebuild b/kde-base/kommander/kommander-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..84af466d681d
--- /dev/null
+++ b/kde-base/kommander/kommander-4.2.1-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:33:26 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdewebdev"
+inherit kde4-meta
+
+DESCRIPTION="KDE dialog system for scripting"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug tidy"
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with tidy LibTidy)"
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kompare/ChangeLog b/kde-base/kompare/ChangeLog
index 10c60c25ea61..f36765494d82 100644
--- a/kde-base/kompare/ChangeLog
+++ b/kde-base/kompare/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kompare
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/ChangeLog,v 1.103 2009/03/08 20:09:39 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/ChangeLog,v 1.104 2009/03/15 14:33:54 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kompare-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -kompare-4.2.0.ebuild,
   -kompare-4.2.0-r1.ebuild:
diff --git a/kde-base/kompare/kompare-4.2.1.ebuild b/kde-base/kompare/kompare-4.2.1.ebuild
index a537e9894583..5553f7613760 100644
--- a/kde-base/kompare/kompare-4.2.1.ebuild
+++ b/kde-base/kompare/kompare-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/kompare/kompare-4.2.1.ebuild,v 1.1 2009/03/04 21:59:10 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/kompare-4.2.1.ebuild,v 1.2 2009/03/15 14:33:54 scarabeus Exp $
 
 EAPI="2"
 
@@ -10,3 +10,11 @@ inherit kde4-meta
 DESCRIPTION="Kompare is a program to view the differences between files."
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
+
+src_prepare() {
+	# Disable hardcoded kdepimlibs check - only 4.2 branch is affected
+	sed -i -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \
+		CMakeLists.txt || die "failed to disable kdepimlibs hardcoded check"
+
+	kde4-meta_src_prepare
+}
diff --git a/kde-base/kontactinterfaces/ChangeLog b/kde-base/kontactinterfaces/ChangeLog
index b6316bf9621f..64f2e69a61b6 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.12 2009/03/09 17:27:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontactinterfaces/ChangeLog,v 1.13 2009/03/15 14:34:45 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kontactinterfaces-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   09 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
   kontactinterfaces-4.2.1.ebuild:
diff --git a/kde-base/kontactinterfaces/kontactinterfaces-4.2.1.ebuild b/kde-base/kontactinterfaces/kontactinterfaces-4.2.1.ebuild
index cb40df228c95..7782ae6932f0 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.3 2009/03/09 17:27:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontactinterfaces/kontactinterfaces-4.2.1.ebuild,v 1.4 2009/03/15 14:34:45 scarabeus Exp $
 
 EAPI="2"
 
@@ -19,7 +19,6 @@ RDEPEND="${DEPEND}"
 KMEXTRACTONLY="
 	kaddressbook/org.kde.KAddressbook.Core.xml
 	korganizer/korgac/org.kde.korganizer.KOrgac.xml
-	libkdepim/utils.h
 "
 
 KMSAVELIBS="true"
diff --git a/kde-base/krfb/ChangeLog b/kde-base/krfb/ChangeLog
index 4b1bcf018904..74001f296268 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.107 2009/03/08 20:20:13 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/ChangeLog,v 1.108 2009/03/15 14:35:13 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> krfb-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -krfb-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/krfb/krfb-4.2.1.ebuild b/kde-base/krfb/krfb-4.2.1.ebuild
index 86c8bf5ff6d0..c4a1ab6f2e04 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.2 2009/03/08 13:56:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.2.1.ebuild,v 1.3 2009/03/15 14:35:13 scarabeus Exp $
 
 EAPI="2"
 
@@ -22,6 +22,7 @@ DEPEND="
 		)
 	)
 "
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	# krfb requires both slp and vnc to build
diff --git a/kde-base/ksaneplugin/ChangeLog b/kde-base/ksaneplugin/ChangeLog
index 5cbc08353bde..f1cabc873ba9 100644
--- a/kde-base/ksaneplugin/ChangeLog
+++ b/kde-base/ksaneplugin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksaneplugin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ChangeLog,v 1.5 2009/03/08 20:22:42 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksaneplugin/ChangeLog,v 1.6 2009/03/15 14:35:37 scarabeus Exp $
+
+*ksaneplugin-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +ksaneplugin-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -ksaneplugin-4.2.0.ebuild:
diff --git a/kde-base/ksaneplugin/ksaneplugin-4.2.1-r1.ebuild b/kde-base/ksaneplugin/ksaneplugin-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..610cdb40ca90
--- /dev/null
+++ b/kde-base/ksaneplugin/ksaneplugin-4.2.1-r1.ebuild
@@ -0,0 +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/ksaneplugin/ksaneplugin-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:35:37 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdegraphics"
+
+inherit kde4-meta
+
+DESCRIPTION="SANE Plugin for KDE"
+HOMEPAGE="http://www.kipi-plugins.org"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	>=kde-base/libksane-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/kstartperf/ChangeLog b/kde-base/kstartperf/ChangeLog
index 6496f797e2ed..1487e40fbfa5 100644
--- a/kde-base/kstartperf/ChangeLog
+++ b/kde-base/kstartperf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kstartperf
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartperf/ChangeLog,v 1.10 2009/03/08 20:28:22 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartperf/ChangeLog,v 1.11 2009/03/15 14:36:01 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kstartperf-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -kstartperf-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/kstartperf/kstartperf-4.2.1.ebuild b/kde-base/kstartperf/kstartperf-4.2.1.ebuild
index 639e62796a10..ff36f19119e8 100644
--- a/kde-base/kstartperf/kstartperf-4.2.1.ebuild
+++ b/kde-base/kstartperf/kstartperf-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/kstartperf/kstartperf-4.2.1.ebuild,v 1.1 2009/03/04 22:20:57 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstartperf/kstartperf-4.2.1.ebuild,v 1.2 2009/03/15 14:36:01 scarabeus Exp $
 
 EAPI="2"
 
@@ -10,3 +10,11 @@ inherit kde4-meta
 DESCRIPTION="Messures starting performance of applications"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
+
+src_prepare() {
+	# Disable hardcoded kdepimlibs check - only 4.2 branch is affected
+	sed -i -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \
+		CMakeLists.txt || die "failed to disable kdepimlibs hardcoded check"
+
+	kde4-meta_src_prepare
+}
diff --git a/kde-base/kttsd/ChangeLog b/kde-base/kttsd/ChangeLog
index 5fe28f9df0aa..0c96a6e9dce7 100644
--- a/kde-base/kttsd/ChangeLog
+++ b/kde-base/kttsd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kttsd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/ChangeLog,v 1.111 2009/03/08 20:34:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/ChangeLog,v 1.112 2009/03/15 14:36:32 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kttsd-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -kttsd-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/kttsd/kttsd-4.2.1.ebuild b/kde-base/kttsd/kttsd-4.2.1.ebuild
index 194a267d016e..26f39c19f856 100644
--- a/kde-base/kttsd/kttsd-4.2.1.ebuild
+++ b/kde-base/kttsd/kttsd-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/kttsd/kttsd-4.2.1.ebuild,v 1.1 2009/03/04 22:27:40 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-4.2.1.ebuild,v 1.2 2009/03/15 14:36:32 scarabeus Exp $
 
 EAPI="2"
 
@@ -12,15 +12,14 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="alsa debug +ktts +phonon"
 
 DEPEND="
-	>=kde-base/kcmshell-${PV}:${SLOT}
-	>=kde-base/knotify-${PV}:${SLOT}
 	ktts? (
 		alsa? ( >=media-libs/alsa-lib-1.0.14a )
 		phonon? ( >=media-sound/phonon-4.3.1 )
 	)
 "
-
 RDEPEND="${DEPEND}
+	>=kde-base/kcmshell-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/knotify-${PV}:${SLOT}[kdeprefix=]
 	ktts? (
 		app-accessibility/epos
 		app-accessibility/festival
diff --git a/kde-base/kuiviewer/ChangeLog b/kde-base/kuiviewer/ChangeLog
index 9b6238a69d3b..e541939a9213 100644
--- a/kde-base/kuiviewer/ChangeLog
+++ b/kde-base/kuiviewer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kuiviewer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/ChangeLog,v 1.92 2009/03/08 20:37:11 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/ChangeLog,v 1.93 2009/03/15 14:36:59 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kuiviewer-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -kuiviewer-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/kuiviewer/kuiviewer-4.2.1.ebuild b/kde-base/kuiviewer/kuiviewer-4.2.1.ebuild
index 65dd012feb3f..6d1403c5b305 100644
--- a/kde-base/kuiviewer/kuiviewer-4.2.1.ebuild
+++ b/kde-base/kuiviewer/kuiviewer-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/kuiviewer/kuiviewer-4.2.1.ebuild,v 1.1 2009/03/04 22:30:43 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/kuiviewer-4.2.1.ebuild,v 1.2 2009/03/15 14:36:59 scarabeus Exp $
 
 EAPI="2"
 
@@ -10,3 +10,11 @@ inherit kde4-meta
 DESCRIPTION="KUIViewer - Displays Designer's UI files"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
+
+src_prepare() {
+	# Disable hardcoded kdepimlibs check - only 4.2 branch is affected
+	sed -i -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \
+		CMakeLists.txt || die "failed to disable kdepimlibs hardcoded check"
+
+	kde4-meta_src_prepare
+}
diff --git a/kde-base/kuser/ChangeLog b/kde-base/kuser/ChangeLog
index e7c8827b174e..4888cfc6fd0d 100644
--- a/kde-base/kuser/ChangeLog
+++ b/kde-base/kuser/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kuser
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/ChangeLog,v 1.104 2009/03/08 20:38:04 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/ChangeLog,v 1.105 2009/03/15 14:37:26 scarabeus Exp $
+
+*kuser-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> +kuser-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -kuser-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/kuser/kuser-4.2.1-r1.ebuild b/kde-base/kuser/kuser-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..2a876a5591be
--- /dev/null
+++ b/kde-base/kuser/kuser-4.2.1-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:37:26 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdeadmin"
+inherit kde4-meta
+
+DESCRIPTION="KDE user (/etc/passwd and other methods) manager"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}
+	>=kde-base/knotify-${PV}:${SLOT}[kdeprefix=]
+"
diff --git a/kde-base/kwrite/ChangeLog b/kde-base/kwrite/ChangeLog
index 38602775028d..b98bf0e1cf03 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.23 2009/03/09 11:49:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrite/ChangeLog,v 1.24 2009/03/15 14:38:19 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kwrite-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   09 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kwrite-4.2.1.ebuild:
   Fix wrong kmextra.
diff --git a/kde-base/kwrite/kwrite-4.2.1.ebuild b/kde-base/kwrite/kwrite-4.2.1.ebuild
index 9a0abd6566ce..b826e993edfd 100644
--- a/kde-base/kwrite/kwrite-4.2.1.ebuild
+++ b/kde-base/kwrite/kwrite-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/kwrite/kwrite-4.2.1.ebuild,v 1.4 2009/03/09 11:49:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrite/kwrite-4.2.1.ebuild,v 1.5 2009/03/15 14:38:19 scarabeus Exp $
 
 EAPI="2"
 
-KMNAME="kdebase"
-KMMODULE="apps/${PN}"
+KMNAME="kdebase-apps"
 inherit kde4-meta
 
 DESCRIPTION="KDE MDI editor/IDE"
@@ -13,5 +12,5 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
 KMEXTRA="
-	apps/doc/${PN}/
+	doc/${PN}/
 "
diff --git a/kde-base/kwrited/ChangeLog b/kde-base/kwrited/ChangeLog
index 2a77cfb5a66f..6b6bea240fcf 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.5 2009/03/08 20:40:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/ChangeLog,v 1.6 2009/03/15 14:37:54 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kwrited-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -kwrited-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/kwrited/kwrited-4.2.1.ebuild b/kde-base/kwrited/kwrited-4.2.1.ebuild
index 03482c7cd905..6902e0df4a4b 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.2 2009/03/08 14:10:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwrited/kwrited-4.2.1.ebuild,v 1.3 2009/03/15 14:37:54 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? ( !kde-base/konsole:4.1[-kdeprefix] )
 "
diff --git a/kde-base/libkdepim/ChangeLog b/kde-base/libkdepim/ChangeLog
index 21649133ee2e..992730f04ee2 100644
--- a/kde-base/libkdepim/ChangeLog
+++ b/kde-base/libkdepim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkdepim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.112 2009/03/09 20:33:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.113 2009/03/15 14:38:48 scarabeus Exp $
+
+*libkdepim-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +libkdepim-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   09 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> libkdepim-4.2.1.ebuild:
   update deps for new eclass.
diff --git a/kde-base/libkdepim/libkdepim-4.2.1-r1.ebuild b/kde-base/libkdepim/libkdepim-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..811a709a4648
--- /dev/null
+++ b/kde-base/libkdepim/libkdepim-4.2.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:38:48 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Common library for KDE PIM apps"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	>=kde-base/kode-${PV}:${SLOT}[kdeprefix=]
+"
+
+KMEXTRACTONLY="
+	kaddressbook/org.kde.KAddressbook.Core.xml
+	korganizer/korgac/org.kde.korganizer.KOrgac.xml
+"
+
+KMSAVELIBS="true"
+
+src_install() {
+	kde4-meta_src_install
+
+	# install additional generated headers that are needed by other packages that
+	# are derived from kdepim. e.g. kmail.
+	pushd "${WORKDIR}/${PN}_build/libkdepim/" 2>/dev/null || die "pushd libkdepim failed"
+	insinto "${PREFIX}/include"
+	doins ui_addresspicker.h ui_categoryselectdialog_base.h || die "Failed to install extra header files."
+	popd 2>/dev/null
+}
diff --git a/kde-base/libkleo/ChangeLog b/kde-base/libkleo/ChangeLog
index c55640fcb2ab..724896ef59e2 100644
--- a/kde-base/libkleo/ChangeLog
+++ b/kde-base/libkleo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkleo
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkleo/ChangeLog,v 1.11 2009/03/09 20:35:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkleo/ChangeLog,v 1.12 2009/03/15 14:39:13 scarabeus Exp $
+
+*libkleo-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +libkleo-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   09 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> libkleo-4.2.1.ebuild:
   update deps for new eclass
diff --git a/kde-base/libkleo/libkleo-4.2.1-r1.ebuild b/kde-base/libkleo/libkleo-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..3bfb00f5d059
--- /dev/null
+++ b/kde-base/libkleo/libkleo-4.2.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkleo/libkleo-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:39:13 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KDE library for encryption handling."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+"
+
+KMSAVELIBS="true"
+
+src_configure() {
+	mycmakeargs="${mycmakeargs} -DWITH_QGPGME=ON"
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/libkonq/ChangeLog b/kde-base/libkonq/ChangeLog
index f072b2d0406e..7f870fa55e2a 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.111 2009/03/08 22:56:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/ChangeLog,v 1.112 2009/03/15 14:39:41 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> libkonq-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> libkonq-4.2.1.ebuild:
   Revert wrongly commited new eclass behavior.
diff --git a/kde-base/libkonq/libkonq-4.2.1.ebuild b/kde-base/libkonq/libkonq-4.2.1.ebuild
index 01642cd437a9..96e0c10b0ddc 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.3 2009/03/08 22:56:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/libkonq-4.2.1.ebuild,v 1.4 2009/03/15 14:39:41 scarabeus Exp $
 
 EAPI="2"
 
-KMNAME="kdebase"
-KMMODULE="apps/lib/konq/"
+KMNAME="kdebase-apps"
+KMMODULE="lib/konq"
 CPPUNIT_REQUIRED="optional"
 inherit kde4-meta
 
diff --git a/kde-base/libkworkspace/ChangeLog b/kde-base/libkworkspace/ChangeLog
index 1ba55d89ca3d..540a9724399f 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.23 2009/03/08 20:49:11 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/ChangeLog,v 1.24 2009/03/15 14:40:05 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  libkworkspace-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -libkworkspace-4.2.0.ebuild:
diff --git a/kde-base/libkworkspace/libkworkspace-4.2.1.ebuild b/kde-base/libkworkspace/libkworkspace-4.2.1.ebuild
index 991a6335c280..0e5d90b1e758 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.3 2009/03/08 15:06:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/libkworkspace-4.2.1.ebuild,v 1.4 2009/03/15 14:40:05 scarabeus Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ IUSE="debug"
 
 RDEPEND="
 	!kdeprefix? ( !<kde-base/libkworkspace-${PV}[-kdeprefix] )
-	kdeprefix? ( !<kde-base/libkworkspace-${PV}:${SLOT}[kdeprefix=] )
+	kdeprefix? ( !<kde-base/libkworkspace-${PV}:${SLOT} )
 "
 
 KMEXTRACTONLY="
diff --git a/kde-base/libplasmaclock/ChangeLog b/kde-base/libplasmaclock/ChangeLog
index 62320bd0bbba..e4d7b1f0b016 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.5 2009/03/08 20:49:34 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/ChangeLog,v 1.6 2009/03/15 14:40:31 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  libplasmaclock-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -libplasmaclock-4.2.0.ebuild:
diff --git a/kde-base/libplasmaclock/libplasmaclock-4.2.1.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.2.1.ebuild
index 8b305df27cc6..c765381df58c 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.2 2009/03/08 14:16:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libplasmaclock/libplasmaclock-4.2.1.ebuild,v 1.3 2009/03/15 14:40:31 scarabeus Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug xinerama"
 
 RDEPEND="
-	!kdeprefix? ( !kde-base/plasma-workspace:4.1 )
+	!kdeprefix? ( !kde-base/plasma-workspace:4.1[-kdeprefix] )
 "
 
 KMSAVELIBS="true"
diff --git a/kde-base/lokalize/ChangeLog b/kde-base/lokalize/ChangeLog
index 03bf5aef8299..b3a40e743806 100644
--- a/kde-base/lokalize/ChangeLog
+++ b/kde-base/lokalize/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/lokalize
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/ChangeLog,v 1.10 2009/03/08 20:51:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/ChangeLog,v 1.11 2009/03/15 14:40:56 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> lokalize-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -lokalize-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/lokalize/lokalize-4.2.1.ebuild b/kde-base/lokalize/lokalize-4.2.1.ebuild
index 96741e3b70b4..3b79c36553ec 100644
--- a/kde-base/lokalize/lokalize-4.2.1.ebuild
+++ b/kde-base/lokalize/lokalize-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/lokalize/lokalize-4.2.1.ebuild,v 1.1 2009/03/04 22:46:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.2.1.ebuild,v 1.2 2009/03/15 14:40:56 scarabeus Exp $
 
 EAPI="2"
 
@@ -10,3 +10,11 @@ inherit kde4-meta
 DESCRIPTION="KDE4 translation tool"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
+
+src_prepare() {
+	# Disable hardcoded kdepimlibs check - only 4.2 branch is affected
+	sed -i -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \
+		CMakeLists.txt || die "failed to disable kdepimlibs hardcoded check"
+
+	kde4-meta_src_prepare
+}
diff --git a/kde-base/nepomuk/ChangeLog b/kde-base/nepomuk/ChangeLog
index f21af4a597cf..15032df6ee85 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.23 2009/03/08 20:52:51 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/ChangeLog,v 1.24 2009/03/15 14:41:21 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> nepomuk-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -nepomuk-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/nepomuk/nepomuk-4.2.1.ebuild b/kde-base/nepomuk/nepomuk-4.2.1.ebuild
index b35451c042bb..32f2501e5e5a 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.2 2009/03/08 14:18:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/nepomuk-4.2.1.ebuild,v 1.3 2009/03/15 14:41:21 scarabeus Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ IUSE="debug"
 DEPEND="
 	|| (
 		dev-libs/soprano[clucene,redland]
-		dev-libs/soprano[clucene,sesame2]
+		dev-libs/soprano[clucene,java]
 	)
 	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,semantic-desktop]
 "
diff --git a/kde-base/nsplugins/ChangeLog b/kde-base/nsplugins/ChangeLog
index 298009df94d8..049a725cecb5 100644
--- a/kde-base/nsplugins/ChangeLog
+++ b/kde-base/nsplugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/nsplugins
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.130 2009/03/08 20:53:22 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.131 2009/03/15 14:41:50 scarabeus Exp $
+
+*nsplugins-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +nsplugins-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -nsplugins-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/nsplugins/nsplugins-4.2.1-r1.ebuild b/kde-base/nsplugins/nsplugins-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..8e563dd59d0d
--- /dev/null
+++ b/kde-base/nsplugins/nsplugins-4.2.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:41:50 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-apps"
+inherit kde4-meta
+
+DESCRIPTION="Netscape plugins support for Konqueror."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	x11-libs/libXt
+"
+RDEPEND="${DEPEND}
+	>=kde-base/konqueror-${PV}:${SLOT}[kdeprefix=]
+"
+
+KMEXTRACTONLY="
+	konqueror/settings/
+"
diff --git a/kde-base/phonon-kde/ChangeLog b/kde-base/phonon-kde/ChangeLog
index b1cb692b07f2..a89e7df0da45 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.7 2009/03/08 20:55:07 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.8 2009/03/15 14:42:16 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> phonon-kde-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -phonon-kde-4.2.0.ebuild,
   -phonon-kde-4.2.0-r1.ebuild:
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 0e43adb6c1ee..a56873f75573 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.2 2009/03/08 14:19:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.2.1.ebuild,v 1.3 2009/03/15 14:42:16 scarabeus Exp $
 
 EAPI="2"
 
@@ -15,10 +15,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
 RDEPEND="
-	!kdeprefix? (
-		!kde-base/phonon
-		!kde-base/phonon-xine
-	)
+	!kdeprefix? ( !kde-base/phonon-xine[-kdeprefix] )
 "
 
 src_prepare() {
diff --git a/kde-base/plasma-apps/ChangeLog b/kde-base/plasma-apps/ChangeLog
index 5ad4f0051ad7..27cd5eba7547 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.12 2009/03/08 22:54:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/ChangeLog,v 1.13 2009/03/15 14:42:42 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  plasma-apps-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
   plasma-apps-4.2.1.ebuild:
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 5a46220d2b6d..11db1cfe9f3e 100644
--- a/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild
+++ b/kde-base/plasma-apps/plasma-apps-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/plasma-apps/plasma-apps-4.2.1.ebuild,v 1.3 2009/03/08 22:54:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild,v 1.4 2009/03/15 14:42:42 scarabeus Exp $
 
 EAPI="2"
 
-KMNAME="kdebase"
-KMMODULE="apps/plasma"
+KMNAME="kdebase-apps"
+KMMODULE="plasma"
 inherit kde4-meta
 
 DESCRIPTION="Additional Applets for Plasma"
@@ -16,5 +16,5 @@ DEPEND="
 	>=kde-base/libkonq-${PV}:${SLOT}[kdeprefix=]
 "
 RDEPEND="${DEPEND}
-	!kdeprefix? ( !kde-base/plasma )
+	!kdeprefix? ( !kde-base/plasma[-kdeprefix] )
 "
diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index 5f8227b428b8..734d39ce3f8c 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/plasma-workspace
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.12 2009/03/08 21:10:53 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.13 2009/03/15 14:43:13 scarabeus Exp $
+
+*plasma-workspace-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +plasma-workspace-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
   +files/4.2.1-panelview-crash-fix.patch, plasma-workspace-4.2.1.ebuild:
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.2.1-r1.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..1c7ed9a910ce
--- /dev/null
+++ b/kde-base/plasma-workspace/plasma-workspace-4.2.1-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:43:13 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-workspace"
+KMMODULE="plasma"
+inherit python kde4-meta
+
+DESCRIPTION="Plasma: KDE desktop framework"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug google-gadgets python rss xcomposite xinerama"
+
+COMMONDEPEND="
+	>=kde-base/kephal-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/ksysguard-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libkworkspace-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libplasmaclock-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libtaskmanager-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/soliduiserver-${PV}:${SLOT}[kdeprefix=]
+	x11-libs/libXau
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXtst
+	google-gadgets? ( >=x11-misc/google-gadgets-0.10.5[qt4] )
+	python? (
+		>=dev-python/PyQt4-4.4.0
+		>=dev-python/sip-4.7.1
+		>=kde-base/pykde4-${PV}:${SLOT}[kdeprefix=]
+	)
+	rss? ( >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=] )
+	xcomposite? ( x11-libs/libXcomposite )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${COMMONDEPEND}
+	xcomposite? ( x11-proto/compositeproto )
+	xinerama? ( x11-proto/xineramaproto )
+"
+RDEPEND="${COMMONDEPEND}
+	!kdeprefix? ( !kde-base/plasma[-kdeprefix] )
+	>=kde-base/kioclient-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kde-menu-icons-${PV}:${SLOT}[kdeprefix=]
+"
+
+KMEXTRA="
+	libs/nepomukquery/
+	libs/nepomukqueryclient/
+"
+KMEXTRACTONLY="
+	krunner/dbus/org.freedesktop.ScreenSaver.xml
+	krunner/dbus/org.kde.krunner.App.xml
+	ksmserver/org.kde.KSMServerInterface.xml
+	libs/kworkspace/
+	libs/taskmanager/
+	ksysguard/
+"
+
+KMLOADLIBS="libkworkspace libplasmaclock libtaskmanager"
+
+PATCHES=(
+	"${FILESDIR}/4.2.1-panelview-crash-fix.patch"
+	"${FILESDIR}/4.2-fix-quicklaunch.patch"
+)
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with google-gadgets Googlegadgets)
+		$(cmake-utils_use_with python SIP)
+		$(cmake-utils_use_with python PyQt4)
+		$(cmake-utils_use_with python PyKDE4)
+		$(cmake-utils_use_with rss KdepimLibs)
+		-DWITH_Xmms=OFF"
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	kde4-meta_src_install
+
+	python_version
+	rm -f "${D}/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4/*.py[co]
+	rm -f "${D}${PREFIX}"/share/apps/plasma_scriptengine_python/*.py[co]
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	python_mod_optimize \
+		"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
+		"${PREFIX}"/share/apps/plasma_scriptengine_python
+}
+
+pkg_postrm() {
+	kde4-meta_pkg_postrm
+
+	python_mod_cleanup
+}
diff --git a/kde-base/powerdevil/ChangeLog b/kde-base/powerdevil/ChangeLog
index c7de071f50e8..be7f344e8c7b 100644
--- a/kde-base/powerdevil/ChangeLog
+++ b/kde-base/powerdevil/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/powerdevil
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/ChangeLog,v 1.4 2009/03/08 20:56:10 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/ChangeLog,v 1.5 2009/03/15 14:43:39 scarabeus Exp $
+
+*powerdevil-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +powerdevil-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -powerdevil-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/powerdevil/powerdevil-4.2.1-r1.ebuild b/kde-base/powerdevil/powerdevil-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..d464b0221541
--- /dev/null
+++ b/kde-base/powerdevil/powerdevil-4.2.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/powerdevil-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:43:39 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-workspace"
+inherit kde4-meta
+
+DESCRIPTION="PowerDevil is an utility for KDE4 for Laptop Powermanagement."
+HOMEPAGE="http://www.kde-apps.org/content/show.php/PowerDevil?content=85078"
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	>=kde-base/libkworkspace-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/solid-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}
+	!sys-power/powerdevil
+"
+
+KMEXTRACTONLY="
+	krunner/
+	ksmserver/org.kde.KSMServerInterface.xml
+"
diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog
index 5e07ccb26687..6d01b0b12c41 100644
--- a/kde-base/systemsettings/ChangeLog
+++ b/kde-base/systemsettings/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/systemsettings
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.23 2009/03/08 21:00:07 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.24 2009/03/15 14:44:08 scarabeus Exp $
+
+*systemsettings-4.2.1-r1 (15 Mar 2009)
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +systemsettings-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -systemsettings-4.2.0.ebuild, -systemsettings-4.2.0-r1.ebuild:
diff --git a/kde-base/systemsettings/systemsettings-4.2.1-r1.ebuild b/kde-base/systemsettings/systemsettings-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..b31bdfa6c7f9
--- /dev/null
+++ b/kde-base/systemsettings/systemsettings-4.2.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:44:08 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-workspace"
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="System settings utility"
+IUSE="debug +usb xinerama"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+COMMONDEPEND="
+	>=dev-libs/glib-2
+	media-libs/fontconfig
+	>=media-libs/freetype-2
+	>=x11-libs/libxklavier-3.2
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	opengl? ( virtual/opengl )
+	usb? ( dev-libs/libusb )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${COMMONDEPEND}
+	x11-proto/kbproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )
+"
+RDEPEND="${COMMONDEPEND}
+	>=kde-base/kcontrol-${PV}:${SLOT}[kdeprefix=]
+	x11-apps/setxkbmap
+	|| (
+		x11-misc/xkbdata
+		x11-misc/xkeyboard-config
+	)
+"
+
+KMEXTRA="
+	kcontrol/
+"
+KMEXTRACTONLY="
+	krunner/dbus/org.kde.krunner.App.xml
+	krunner/dbus/org.kde.screensaver.xml
+	kwin/
+	libs/
+	plasma/
+"
+
+PATCHES=( "$FILESDIR/20_use_dejavu_as_default_font.patch" )
+
+src_prepare() {
+	sed -i -e 's/systemsettingsrc DESTINATION ${SYSCONF_INSTALL_DIR}/systemsettingsrc DESTINATION ${CONFIG_INSTALL_DIR}/' \
+		systemsettings/CMakeLists.txt \
+		|| die "Failed to fix systemsettingsrc install location"
+
+	kde4-meta_src_prepare
+}
+
+# FIXME: is have_openglxvisual found without screensaver
+src_configure() {
+	# Old keyboard-detection code is unmaintained,
+	# so we force the new stuff, using libxklavier.
+	mycmakeargs="${mycmakeargs}
+		-DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON
+		-DWITH_GLIB2=ON -DWITH_GObject=ON
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with usb USB)
+		$(cmake-utils_use_with xinerama X11_Xinerama)"
+
+	MAKEOPTS="${MAKEOPTS} -j1"
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/umbrello/ChangeLog b/kde-base/umbrello/ChangeLog
index c7bffc37c886..479c3db38457 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.107 2009/03/08 21:01:04 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.108 2009/03/15 14:44:37 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> umbrello-4.2.1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -umbrello-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/umbrello/umbrello-4.2.1.ebuild b/kde-base/umbrello/umbrello-4.2.1.ebuild
index 6518b4764a28..f92b9457b358 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.2 2009/03/08 14:22:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-4.2.1.ebuild,v 1.3 2009/03/15 14:44:37 scarabeus Exp $
 
 EAPI="2"
 
@@ -17,3 +17,11 @@ DEPEND="
 	dev-libs/libxslt
 "
 RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Disable hardcoded kdepimlibs check - only 4.2 branch is affected
+	sed -i -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \
+		CMakeLists.txt || die "failed to disable kdepimlibs hardcoded check"
+
+	kde4-meta_src_prepare
+}