Add patch for kwallet asking pass all the time. Revbump. Per bug #256918.

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

3 files changed, 70 insertions, 1 deletions

diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index b46b4e41d62c..7a66fe252c5c 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.148 2009/01/28 09:34:16 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.149 2009/01/30 13:22:26 scarabeus Exp $
+
+*kmail-4.2.0-r1 (30 Jan 2009)
+
+  30 Jan 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/4.2.0-kwallet.patch, +kmail-4.2.0-r1.ebuild:
+  Add patch for kwallet asking pass all the time. Revbump. Per bug #256918.
 
   28 Jan 2009; Alexey Shvetsov <alexxy@gentoo.org>
   +files/kmail-4.1.72-fix.patch:
diff --git a/kde-base/kmail/files/4.2.0-kwallet.patch b/kde-base/kmail/files/4.2.0-kwallet.patch
new file mode 100644
index 000000000000..2f5c93898f5b
--- /dev/null
+++ b/kde-base/kmail/files/4.2.0-kwallet.patch
@@ -0,0 +1,21 @@
+--- kmail/networkaccount.cpp	2008-05-21 10:33:40.000000000 +0200
++++ ../networkaccount.cpp	2009-01-30 12:28:32.032158332 +0100
+@@ -205,16 +205,16 @@
+ 
+       //If the password should be written to the wallet, do that
+       if ( !mStorePasswdInConfig ) {
+-        Wallet *wallet = kmkernel->wallet();
+ 
+         //If the password is dirty, try to store it in the wallet
+         if ( mPasswdDirty ) {
++          Wallet *wallet = kmkernel->wallet();
+           if ( wallet && wallet->writePassword( "account-" + QString::number(mId), passwd() ) == 0 )
+             passwdStored = true;
+         }
+ 
+         //If the password isn't dirty, it is already stored in the wallet.
+-        else if ( wallet )
++        else
+           passwdStored = true;
+ 
+         //If the password is stored in the wallet, it isn't dirty or stored in the config
diff --git a/kde-base/kmail/kmail-4.2.0-r1.ebuild b/kde-base/kmail/kmail-4.2.0-r1.ebuild
new file mode 100644
index 000000000000..c7b4b9035395
--- /dev/null
+++ b/kde-base/kmail/kmail-4.2.0-r1.ebuild
@@ -0,0 +1,42 @@
+# 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.2.0-r1.ebuild,v 1.1 2009/01/30 13:22:26 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
+KEYWORDS="~amd64 ~x86"
+IUSE="debug htmlhandbook +semantic-desktop"
+
+DEPEND=">=kde-base/libkdepim-${PV}:${SLOT}
+	>=kde-base/libkleo-${PV}:${SLOT}
+	>=kde-base/libkpgp-${PV}:${SLOT}
+	>=kde-base/libksieve-${PV}:${SLOT}
+	>=kde-base/mimelib-${PV}:${SLOT}
+	semantic-desktop? ( >=kde-base/nepomuk-${PV}:${SLOT} )"
+
+RDEPEND="${DEPEND}
+	>=kde-base/kmailcvt-${PV}:${SLOT}"
+
+KMEXTRACTONLY="kaddressbook/org.kde.KAddressbook.Core.xml
+	korganizer/org.kde.Korganizer.Calendar.xml
+	libkdepim
+	libkleo
+	libkpgp
+	mimelib"
+KMEXTRA="${KMEXTRA} plugins/kmail/"
+KMLOADLIBS="libkdepim"
+
+PATCHES=( "${FILESDIR}/${PN}-4.1.72-fix.patch" "${FILESDIR}/${PV}-kwallet.patch" )
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with semantic-desktop Nepomuk)"
+
+	MAKEOPTS="${MAKEOPTS} -j1"
+
+	kde4-meta_src_configure
+}