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

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

2 files changed, 34 insertions, 1 deletions

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