From 636033030fe9f7f8ede842106ca259934d057467 Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Fri, 4 Sep 2009 17:39:23 +0200
Subject: [PATCH] Add patch for kde-base/kmail-4.3.0 that removes the
 requirement for trusted keys when encrypting.

---
 kde-base/kmail/Manifest                            |  5 ++
 kde-base/kmail/files/kmail-4.1.72-fix.patch        | 10 ++++
 .../remove-trust-requirement-for-encryption.patch  | 12 +++++
 kde-base/kmail/kmail-4.3.0.ebuild                  | 55 ++++++++++++++++++++++
 4 files changed, 82 insertions(+)
 create mode 100644 kde-base/kmail/Manifest
 create mode 100644 kde-base/kmail/files/kmail-4.1.72-fix.patch
 create mode 100644 kde-base/kmail/files/remove-trust-requirement-for-encryption.patch
 create mode 100644 kde-base/kmail/kmail-4.3.0.ebuild

diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
new file mode 100644
index 0000000..445cd0c
--- /dev/null
+++ b/kde-base/kmail/Manifest
@@ -0,0 +1,5 @@
+AUX kmail-4.1.72-fix.patch 303 RMD160 71a7687bf589cad6189347e960121e5780846f29 SHA1 f34ca2031003a6e29c04cc0f9270b31249f48427 SHA256 9b8c6e387d5b76469350b8f351479b5eab9ca834985d6e29fccfb7a48c803679
+AUX remove-trust-requirement-for-encryption.patch 576 RMD160 34b63fb1c1eec9aca4d7f52f47f1781ccbf6ee73 SHA1 8879a3770655328f80a92c39e1b0aa5dd375a23e SHA256 8347d87ce66cc35f14a44e57d6ec4586e7eb5c640d1c33670ef923edfd23a51e
+DIST kdepim-4.3.0.tar.bz2 11320808 RMD160 47a5603889265ec20af3251589ee904d4b68d993 SHA1 9cae4058cf69b5799554ff863cd9467c2506b1d5 SHA256 a5cde787a207da52f065510f27f4980ee852e8b05cc5d72d3a102d967a99f6f8
+EBUILD kmail-4.3.0.ebuild 1585 RMD160 50c7cd6dfb04f1400d229daf603ae333439e7ac5 SHA1 b5767d53b17c691fc76ea0265cc225390daa0394 SHA256 41f5535825ef972fc468c90f63a7ecefe1898544b3dc0c3e43e68902d82a172b
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kmail/files/kmail-4.1.72-fix.patch b/kde-base/kmail/files/kmail-4.1.72-fix.patch
new file mode 100644
index 0000000..af541d7
--- /dev/null
+++ b/kde-base/kmail/files/kmail-4.1.72-fix.patch
@@ -0,0 +1,10 @@
+--- kmail/kmstartup.cpp	2008-09-29 07:55:47.000000000 +0200
++++ kmail/kmstartup.cpp	2008-11-06 20:43:56.000000000 +0100
+@@ -18,7 +18,6 @@
+ 
+ 
+ #include "kmstartup.h"
+-#include <kdepim-compat.h> // for KDE_signal, remove in KDEPIM 4.2
+ 
+ #include "kmkernel.h" //control center
+ #include "kcursorsaver.h"
diff --git a/kde-base/kmail/files/remove-trust-requirement-for-encryption.patch b/kde-base/kmail/files/remove-trust-requirement-for-encryption.patch
new file mode 100644
index 0000000..09af579
--- /dev/null
+++ b/kde-base/kmail/files/remove-trust-requirement-for-encryption.patch
@@ -0,0 +1,12 @@
+diff -ur kmail-4.3.0-orig/kmail/keyresolver.cpp kmail-4.3.0/kmail/keyresolver.cpp
+--- kmail-4.3.0-orig/kmail/keyresolver.cpp	2009-06-17 22:07:58.000000000 +0200
++++ kmail-4.3.0/kmail/keyresolver.cpp	2009-09-04 17:19:43.000000000 +0200
+@@ -122,7 +122,7 @@
+         return false;
+   const std::vector<GpgME::UserID> uids = key.userIDs();
+   for ( std::vector<GpgME::UserID>::const_iterator it = uids.begin() ; it != uids.end() ; ++it ) {
+-    if ( !it->isRevoked() && it->validity() >= GpgME::UserID::Marginal )
++    if ( !it->isRevoked() )
+       return true;
+ #if 0
+     else
diff --git a/kde-base/kmail/kmail-4.3.0.ebuild b/kde-base/kmail/kmail-4.3.0.ebuild
new file mode 100644
index 0000000..fae1123
--- /dev/null
+++ b/kde-base/kmail/kmail-4.3.0.ebuild
@@ -0,0 +1,55 @@
+# 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.3.0.ebuild,v 1.1 2009/08/04 00:42:32 wired Exp $
+
+EAPI="2"
+
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="debug +handbook +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
+	libksieve
+	mimelib
+"
+KMEXTRA="
+	plugins/kmail/
+"
+KMLOADLIBS="libkdepim"
+
+PATCHES=( "${FILESDIR}/${PN}-4.1.72-fix.patch" "${FILESDIR}/remove-trust-requirement-for-encryption.patch" )
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with semantic-desktop Nepomuk)"
+
+	kde4-meta_src_configure
+}
+
+src_compile() {
+	# Bug #276377: kontact/ can build before kmail/, causing a dependency not to be built
+	# Upstream as KDE Bug #198807
+	# (setting via MAKEOPTS to trigger a repoman warning)
+	MAKEOPTS="${MAKEOPTS} -j1"
+	kde4-meta_src_compile
+}
-- 
2.7.4