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

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 73 insertions, 2 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/Manifest b/kde-base/kmail/Manifest
index 7af302d5904d..80a53467a8b3 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -1,3 +1,4 @@
+AUX 4.2.0-kwallet.patch 841 RMD160 b8142d90b7800ff04cd605f0dae41c1ab5f6ca14 SHA1 85c348dc647b259cecb050e6b304a84a33fc9721 SHA256 5d13a4cd584f54dc7e17281e18eddeb590e12ef5752054a14d770df6198bf821
 AUX kmail-4.1.72-fix.patch 303 RMD160 71a7687bf589cad6189347e960121e5780846f29 SHA1 f34ca2031003a6e29c04cc0f9270b31249f48427 SHA256 9b8c6e387d5b76469350b8f351479b5eab9ca834985d6e29fccfb7a48c803679
 DIST kdepim-3.5-patchset-04.tar.bz2 133990 RMD160 9d9fd1e7b04512f1f28bba78d5eeadfc3e3280ba SHA1 ff535be3a60938382094642af18776a529620209 SHA256 8b1968a7bef8ab2efdb2d87e96943ce636775b76365bc1bc99e1e377f9abfc61
 DIST kdepim-3.5-patchset-05.tar.bz2 24339 RMD160 1059e70a9c71197356a9e592a95a53155305cfb0 SHA1 df0426d995b9db6a83679924a97b641ac8e7d997 SHA256 d94b0b3013669501e0cc9816815a4c1809e96861ff14c3067c719b5f6a7a646d
@@ -8,6 +9,7 @@ DIST kdepim-4.2.0.tar.bz2 13549914 RMD160 56d8cde5af183dd5cd16d35db032fb340ff383
 EBUILD kmail-3.5.10.ebuild 2276 RMD160 68af4ccedc0e9ff3fe4e92f5591beb1158a91a65 SHA1 2bf6074587e0243b5b5bb7ac452f6184e8530bf2 SHA256 0b7060850d3eb07eb524b2058d7b3971c32db7c1198f773b7f0aaa4b333db81d
 EBUILD kmail-3.5.9.ebuild 2268 RMD160 aacf7d5fec3d94bc1e43d07484a2272e29ab46bb SHA1 2e091f9b0f73a82f9a256e50c904b7eabe958b85 SHA256 8ee499c48c8c2bce00fbdda06df8953349ecb6301a94d776c07c28181ae321ef
 EBUILD kmail-4.1.4.ebuild 1199 RMD160 738ef7997a6ed3749857b3b65c87e024650e352a SHA1 4ae978c4cb8d7f770b19e9c57501c90ca3d56cb4 SHA256 07b121d831e3473023a34114adccc1e26ccb2ee88a14ed6dad143420c005a647
+EBUILD kmail-4.2.0-r1.ebuild 1178 RMD160 106fb569b0c41b584db1f0944aa3bc811c18c4e1 SHA1 0ea1678114c9f267398330733bc695ba1fb0e507 SHA256 46362333667b67cc440f401072c97bcf1f32be9256db0664142a4c57592bb4b9
 EBUILD kmail-4.2.0.ebuild 1138 RMD160 6e37255e21b5c707080e45c491b0fd843b38a128 SHA1 81e9a3debc70289ce758c38f4969e7e6fc038982 SHA256 fd163ef4931725542f6038781a16b08a6841439f483321f913291fdc51b37b57
-MISC ChangeLog 20112 RMD160 739139f7f31989265f6d37bf6c192484dc49090e SHA1 674c30eca9908e18f313d10502cd1313debe236b SHA256 c63248ec13431c9eae5504494ed6491d13915c1f46445d152323b3f2a08d6aa7
+MISC ChangeLog 20329 RMD160 3760efae9d93b0b43b433acb40a2304cb0c1fb80 SHA1 8b835cc4e5986a332773325a499af5d83ee6ecc2 SHA256 f40d7509a47becbe23d2f54ab5a41dcc5d52024d649aa44d850d96bc422ed81b
 MISC metadata.xml 460 RMD160 fccac9a3b4fe7e3b81ea748f8f59a5dd1dbc879b SHA1 aad14e284ccbae2906c52f7912e894278a4ffcc1 SHA256 12e2a4bf51d4b21dd664c78fc075239545a5836e07065357180842b476e3afc8
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
+}