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

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

2 files changed, 42 insertions, 1 deletions

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