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

(Portage version: 2.2_rc25/cvs/Linux x86_64)

2 files changed, 36 insertions, 1 deletions

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
+}