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

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

2 files changed, 38 insertions, 1 deletions

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