Remove unused patches.

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

8 files changed, 15 insertions, 130 deletions

diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 6fc7c2d6b16b..57cbe3f7eef1 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.323 2013/01/05 20:18:58 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.324 2013/01/08 12:18:24 kensington Exp $
+
+  08 Jan 2013; Michael Palimaka <kensington@gentoo.org>
+  -files/kmail-4.7.4-gcc44.patch, -files/kmail-4.8.3-qt47-compat.patch,
+  -files/kmail-4.8.4-sec.patch, -files/kmail-4.8.5-spamfilter-mail-loss.patch,
+  -files/kmail-4.9.0-gcc44.patch, -files/kmail-4.9.0-spamfilter-mail-loss.patch:
+  Remove unused patches.
 
 *kmail-4.9.5 (05 Jan 2013)
 
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 861813cefa2c..3db23ef07d15 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -6,12 +6,6 @@ AUX 4.4/0004-kmail-Make-spell-checking-work-again.patch 1138 SHA256 a7b37c0dc865
 AUX 4.4/0004-libkdepim-Make-spell-checking-work-again.patch 1946 SHA256 57ca15b378faab075b8efd76b0379defcef1e8c110b60f65f3fb9272feacc0cc SHA512 ebb33447d06c76dce434ab6847674a1f790ab6300e0617cf8e88289c6af3ab8d96f3e0c62d7e9d01539fd30cc4dff301b9c8a77d1eefa2fc6b72198804dceb4f WHIRLPOOL 4c6a3bc00f976fd456c0940134ca389ad58cd4cb28c30a04d235e96c2a4b3ab6cc4dd25a4ff23558b3278f40f02b4c2ebef6837d244926aceaba4c137ede32ca
 AUX 4.4/0005-Fix-bug-276086-crash-on-exit.patch 768 SHA256 f062bbc2e095cadfc53a420bcfe7f87569e7ba0506395285227625401286ea46 SHA512 3b39db7e037e757ddf8f6900f6196a99e0d74fc1f8b8dcf9a7661fbc85f86c6b52afdbcf570f771bbcdf6167b64b16403b9cb522f3e4cec3df10f9018a6b4be9 WHIRLPOOL 761ac1b4e511d68fe639788ce4a23096fcab6d80600e333c4ede8672d97ed380d0a1ccb00cf5628677fcb1cc87f0390213a02372254c68f907d671660b0c3b94
 AUX kmail-4.4.9-nodbus.patch 3922 SHA256 c70b1ca83ec89cc66c77e45d68632b412bbdbf0ec6bf989cb7674461ae114e68 SHA512 e883195c70559b9b161432f6593529a58e1b8b3d3e97d49a33f61a63a7992844e8658c0bf0f38f2f31b6b1e6d1e6f4b4611cf979dbbe98effa24db868402bbdf WHIRLPOOL d8d85987172602036ab4edae3f8aebe601ab7b37cd10eaf0b67faf758ee7f4ca84aebf1be977318f36464f17f765d59b4f284608fb315734be114769f16ffd5e
-AUX kmail-4.7.4-gcc44.patch 492 SHA256 6407d434616d32194c2b58b357dd11d9b427b62d20dd31671da5b1e0881e51f6 SHA512 2a4319050ab9f7813d9a9d365df87f168043b22afd9ba1cfe72f69cd509367c3f7fef144c79a91d8c4322e40daed3cef8ecbab8b456c8e4938c6e39b2acfa149 WHIRLPOOL 1e10746bf795d4192fe9a38a4f26ecbb411c1a026a89721ebf426704ff0d9a8a0c284aa0ef0354c55bfb9756a810a88759fa2201fd37c8c89647f0cfe8b055c3
-AUX kmail-4.8.3-qt47-compat.patch 348 SHA256 d14af0b62c1b5b18841422b985269069d22bbc1cbc6740ceddca7a977794261f SHA512 eef7bc8100a2c40270a77a9d8a1a1204b68347c15d3a03eede441ee544699f3e3894c87e985264c11fa3239b42dcccedb007f2abc7c7d33a8d791d6aed6a7e38 WHIRLPOOL fe82849e18abd34f0722800f0ce396aa5051222d5eaac8efef526e3190093ff238296db5a61f4e5fb9133f54cbe6369ddc6185f160480487860a8158d5141ef8
-AUX kmail-4.8.4-sec.patch 1058 SHA256 55dcb1b4e7de1c2fb391c7aaed42df10c4d2ea93d05549e219c7125f2eb81760 SHA512 bb43df6c27e565ed1f7147129953abfbcb2b52b8b0c5dfd01b340926cdac016b7c3de7625c528eeaf2d0c94059bc82fef11f4c72faf74fbc761baac0ffbfd373 WHIRLPOOL 73e8ac316c1c852de87228aa0ef7dfaa27eb03e359ffee763fa9aefa35d3861671a9ddc77656f41b81b68c99b04aaefa4e673a81556deb973fcaabe2f3a4c3d3
-AUX kmail-4.8.5-spamfilter-mail-loss.patch 1181 SHA256 30710925f55ab20745a31a0dd2b51085ac41195dcf7159c94cd942ca538d3f87 SHA512 3851b0dd79165249fff1d74edc13909e9ac4e1e6fc832ce0eb448d79284ba65d1b5665a266407090daa7fe7da238d9be845950f5cab8890461eb16959a3261ea WHIRLPOOL 176c53fb575424af93d205935347688abe5f72eee8595c522cdfa4f9d099cfc274bd86153521ee7a6fad98287b4ee942879456f6b06452afe9045abaa14798cd
-AUX kmail-4.9.0-gcc44.patch 662 SHA256 410cf3852fd90d9a07f0aee6c0be28660c4c99b5cfb0124a25297978cfca2d79 SHA512 4848d6d88cfce1b456be1003028991b6638fbf7356cb3e70f5b08a3feee8e198951d6688439ded1e9a7c2735d3b38438d663bb57bee89de92af1257882893535 WHIRLPOOL 44ea45313ae729365e48b07d64df459640a6b3748db0d8cdb41618ead958fb05381b722971b0c7d0de3cf86d8b6950a1cbd95d2faeffb83a53fb8f59ed9f6adc
-AUX kmail-4.9.0-spamfilter-mail-loss.patch 1311 SHA256 c5a58ac00fae9da9f7b31fe1843301f343b1e4fb2573862c29eb8de2e85d81e4 SHA512 5cc76586e6aa7ecf91527182e5ab7dff4285c98f0c45b93d4a40f6069368cd7c556dc950cf73685e48d688171b9d885d9716209851f476d64f8726f5af83879f WHIRLPOOL 3d35b25e81a7c882109ef03e0f16d84ccab20bb92fbd5f769c9e27381b93448a4d74518b41f51e05ccf66edae7693a738911967eeff29c729619954c94043175
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
 DIST kdepim-4.9.3.tar.xz 14415092 SHA256 de1f7b796a96d2a7f7f5a621e26ccd79110a171c71b0224a4d4b63453e6680d8 SHA512 8196c917d55d2b5e0dac4d8f75494233a2afc462c6de96b47cf1e9ea3741f07e016d97fa36a9986f2dfbc40c6357772a5c68c8ad1f3230786da3f6c6a0d02682 WHIRLPOOL d5f8680f104824abf63e7b1c6d79060d5c9acbdb581aff276b44abbf5d18da52c836d16e0d3554850e41d9b51a00b714dfe42f0f6bc6e9d143657ab60502a84a
 DIST kdepim-4.9.4.tar.xz 14568168 SHA256 b1d865a66020f95d3bec4fafaa5de8796eb08cc0c897968a56aada8fd828ff0a SHA512 a8c7b0910a7cabae39374caeefade5bb075f18281504c87fa4cda291a9bcce2d85974f97eb2f59699039900fa34490f58e1bf72d4ef300d41cd68598f23181bd WHIRLPOOL 7edfdf010de6e3ff790988bb60d0c4abdd361bd1d19e76eb889ca9eab587ebf58308b905b61ae22670509517a9c763eeafde49cd202d9f1fb85a82bcd4bb4700
@@ -21,12 +15,16 @@ EBUILD kmail-4.4.11.1.ebuild 1757 SHA256 9f95b55a5c1d3fa304e1bdf6913bb109808101a
 EBUILD kmail-4.9.3.ebuild 1728 SHA256 a51e83b13f934c5b0a42efcdd4a4f6b110764b0c291799d25bd83bcb790ed59f SHA512 e60eb79e221d7fcf3d612c67494bdedde4a02c48dd49218087c1d0900d075efa72c76618e5329ea78c770ea36f5976a1b09f8663ac5e6a987d6ded042a1b90d2 WHIRLPOOL 9a13b97eb953123bc3c8e4f87877f89271d3e9c550d1312c533d602f41e9a4562db4e61bd8b765810a6f4b0e2f09ef8cd26bb7ba0515612d06be796f8ba74b42
 EBUILD kmail-4.9.4.ebuild 1739 SHA256 640c8720c9b89aeeca318f9f01dd546b4f477143b3a6559c759452062f366dc6 SHA512 8b02a24ed1e3380a5b7583340d22e054151dc3aa93b6a7d6aea4a5fd2a6461d315091b044a32310eecaee7a169b977027011395d982572f8329c87b5bb47ec7b WHIRLPOOL 7988349b4cb8a717a149a9be4f8cfc3586ef7cb5d9741b97a4fe2f80b39cea5977886a0682b421633b3b31bc001bb51497d64833f555a489a58423b1847610d3
 EBUILD kmail-4.9.5.ebuild 1741 SHA256 c54b92d1aef092fdabc1490e214c2520cee59b825d4dce84bb7bf8760d74e558 SHA512 aed9a8636983de54f6616c2b0fb695eb7d1efda00b84a8dbdaafe9bd06ddb0d6ac0334c0f14d2fda8da475eb5b58a38689da8fffed73c1a72d9aba281d0d6068 WHIRLPOOL a9c55317742c1f81cdfb081b4514f58b2b0b08f707bfcd8ad08508a5e187758dd0684f1d7c218bb33e24294a4fff83a34169df33598a9cfcfc405ffeebd499f6
-MISC ChangeLog 42337 SHA256 9e4bd61a91861de6f88deb749f88178e93e6b6461e6fca2d729f0a982840f838 SHA512 4620fe627f3ca6e70aa7995d597e79d0c5c88f9b649e543136851c98b25120d08c4187fb9cc0ff3525b7d586d801097203c990057e4b4f6747ec6540984b8355 WHIRLPOOL 0ac6f587c785c61095a44b2cbd9024fdab1c595d13a934ed15d20979ac4649df35f7e959b93880551169fc8f682fb71c01768874b062aca5126ced4f0236d95c
+MISC ChangeLog 42653 SHA256 011669e191cb168af202ce23cff1311302292eb95e49618887e76aceb3314442 SHA512 31034fe39c556deafc5222cc624bab49270daa5859c238f9c627c0e61cb65974dd7f00bf5eb106d20909d900a2e0d488db06f6ad156e69e0e458dbb3e7f9b4dd WHIRLPOOL c95b7c548cd062510bd2e4b2c632508c61ba189b3abd514389894169f0b8282735a0d25a52eaf459f180952835ff14cea1a2ed034fd559128eb5e8a4c067dc97
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDoi04ACgkQ23laikJhg1S8QwCfVCpv9j5D7sSgUi2Xm79wiP+s
-8RwAoJRE3KEWZGmHz5e3PCJQl/C5W+Wp
-=XIqm
+iQEcBAEBCAAGBQJQ7A3lAAoJEMbwO6tnXQ0sd7IH/3WgX+RGS6sCzdP0+jzAbpTN
+f3gxqsqoMLgttjErj4VZ7mKDxBADEd74ZVwfBXNPa5a1KBo2B+zizIiT/BUlD/X+
+VCMKlHX7OREnAkkmcC39vboV5Sn9kl+2GweChwgTBEiYF9Z1AimZLl5Mt7fKnIgg
+v+GvWhI3xB2cvuoecw06kH1nKjj+eUVeBVBTkBRd+QotofQwOWnh6WW2G7LMXala
+VJimL3yFSkhlaE9vXYCdmaCpbzstPYkeOHYCOXQTj+iVcVv1cOseGpqwIgjQVjuW
+Xzaz9yHn0sVEq8Hv46wczxBYQYqbfoONxM9iTT6iWNLpHiws8ctFrR9vxDdEFmA=
+=Jlt0
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kmail/files/kmail-4.7.4-gcc44.patch b/kde-base/kmail/files/kmail-4.7.4-gcc44.patch
deleted file mode 100644
index 363620292c70..000000000000
--- a/kde-base/kmail/files/kmail-4.7.4-gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN kmail-4.7.4.orig/messagecomposer/akonadisender.cpp kmail-4.7.4/messagecomposer/akonadisender.cpp
---- kmail-4.7.4.orig/messagecomposer/akonadisender.cpp	2011-12-02 00:25:40.000000000 +0100
-+++ kmail-4.7.4/messagecomposer/akonadisender.cpp	2011-12-30 23:10:05.151509937 +0100
-@@ -38,7 +38,6 @@
- #include <messagecore/stringutil.h>
- #include <messagecore/messagehelpers.h>
- 
--using namespace KMime;
- using namespace KMime::Types;
- using namespace KPIM;
- using namespace MailTransport;
diff --git a/kde-base/kmail/files/kmail-4.8.3-qt47-compat.patch b/kde-base/kmail/files/kmail-4.8.3-qt47-compat.patch
deleted file mode 100644
index a6c553260feb..000000000000
--- a/kde-base/kmail/files/kmail-4.8.3-qt47-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/messageviewer/viewer_p.cpp
-+++ b/messageviewer/viewer_p.cpp
-@@ -1930,8 +1930,10 @@ void ViewerPrivate::slotToggleHtmlMode()
- 
- void ViewerPrivate::slotFind()
- {
-+#if QT_VERSION >= 0x040800
-   if ( mViewer->hasSelection() )
-     mFindBar->setText( mViewer->selectedText() );
-+#endif  
-   mFindBar->show();
-   mFindBar->focusAndSetCursor();
- }
diff --git a/kde-base/kmail/files/kmail-4.8.4-sec.patch b/kde-base/kmail/files/kmail-4.8.4-sec.patch
deleted file mode 100644
index 0e1aa39a068c..000000000000
--- a/kde-base/kmail/files/kmail-4.8.4-sec.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From dbb2f72f4745e00f53031965a9c10b2d6862bd54 Mon Sep 17 00:00:00 2001
-From: Montel Laurent <montel@kde.org>
-Date: Mon, 2 Jul 2012 07:00:53 +0200
-Subject: [PATCH] Security fix found by David yesterday during debug (cherry
- picked from commit
- b6a46407d83ad9368a9825c687fa44e660f7104a)
-
----
- messageviewer/htmlquotecolorer.cpp |    4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/messageviewer/htmlquotecolorer.cpp b/messageviewer/htmlquotecolorer.cpp
-index b54e989..67c3062 100644
---- a/messageviewer/htmlquotecolorer.cpp
-+++ b/messageviewer/htmlquotecolorer.cpp
-@@ -40,6 +40,10 @@ QString HTMLQuoteColorer::process( const QString &htmlSource )
- #ifndef KDEPIM_NO_WEBKIT
-   // Create a DOM Document from the HTML source
-   QWebPage page(0);
-+  page.settings()->setAttribute( QWebSettings::JavascriptEnabled, false );
-+  page.settings()->setAttribute( QWebSettings::JavaEnabled, false );
-+  page.settings()->setAttribute( QWebSettings::PluginsEnabled, false );
-+
-   QWebFrame *frame = page.mainFrame();
-   frame->setHtml( htmlSource );
-   
--- 
-1.7.9.2
-
diff --git a/kde-base/kmail/files/kmail-4.8.5-spamfilter-mail-loss.patch b/kde-base/kmail/files/kmail-4.8.5-spamfilter-mail-loss.patch
deleted file mode 100644
index 5e9210ecb9a2..000000000000
--- a/kde-base/kmail/files/kmail-4.8.5-spamfilter-mail-loss.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 628faec2651f6f20a438f61fc9c861c0d5eab0f8
-Author: Andras Mantia <amantia@kde.org>
-Date:   Sat Aug 25 11:52:45 2012 +0300
-
-    Now fix for real the mail loss on spam filtering. The previous fix's idea was good, just that unfortunately the default value is "setCacheOnly(true)" set in AgentBasePrivate, so we have to explicitely set the cacheonly to false, otherwise mail content is not fetched from the mail server when passing through a filter that needs a content.
-    
-    FIXED-IN: 4.8.6
-    
-    BUG: 295484
-
-diff --git a/mailfilteragent/mailfilteragent.cpp b/mailfilteragent/mailfilteragent.cpp
-index 5f66e74..4e37ac7 100644
---- a/mailfilteragent/mailfilteragent.cpp
-+++ b/mailfilteragent/mailfilteragent.cpp
-@@ -111,6 +111,7 @@ void MailFilterAgent::initialCollectionFetchingDone( KJob *job )
- 
-   changeRecorder()->itemFetchScope().setAncestorRetrieval( Akonadi::ItemFetchScope::Parent );
-   if (m_filterManager->requiresFullMailBody()) {
-+    changeRecorder()->itemFetchScope().setCacheOnly(false);
-     changeRecorder()->itemFetchScope().fetchFullPayload();
-   } else {
-     changeRecorder()->itemFetchScope().fetchPayloadPart( Akonadi::MessagePart::Header, true );
diff --git a/kde-base/kmail/files/kmail-4.9.0-gcc44.patch b/kde-base/kmail/files/kmail-4.9.0-gcc44.patch
deleted file mode 100644
index 29e7115e1960..000000000000
--- a/kde-base/kmail/files/kmail-4.9.0-gcc44.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 92bface95453799620cd2368a7c0771c4304bbf3
-Author: David Faure <faure@kde.org>
-Date:   Thu Aug 9 11:58:30 2012 +0200
-
-    Fix compilation with gcc-4.4.7, a gentoo user reported this fixed the issue.
-    
-    (Message::Foo was ambiguous due to KMime::Message and namespace Message in
-    messagecomposer/util.h)
-
-diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
-index 92593f2..c4bcd86 100644
---- a/kmail/kmreaderwin.cpp
-+++ b/kmail/kmreaderwin.cpp
-@@ -45,7 +45,6 @@ using MessageViewer::CSSHelper;
- #include "stringutil.h"
- 
- #include <kmime/kmime_mdn.h>
--using namespace KMime;
- 
- #include "messageviewer/viewer.h"
- using namespace MessageViewer;
diff --git a/kde-base/kmail/files/kmail-4.9.0-spamfilter-mail-loss.patch b/kde-base/kmail/files/kmail-4.9.0-spamfilter-mail-loss.patch
deleted file mode 100644
index 9a2dc4b5b095..000000000000
--- a/kde-base/kmail/files/kmail-4.9.0-spamfilter-mail-loss.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit e98937475a7f03e69a3a3c6a4ee67a8d41f027b5
-Author: Andras Mantia <amantia@kde.org>
-Date:   Sat Aug 25 11:47:36 2012 +0300
-
-    Now fix for real the mail loss on spam filtering. The previous fix's idea was good, just that unfortunately the default value is "setCacheOnly(true)" set in AgentBasePrivate, so we have to explicitely set the cacheonly to false, otherwise mail content is not fetched from the mail server when passing through a filter that *needs* a content.
-    
-    FIXED-IN: 4.9.1
-    
-    BUG: 295484
-    (cherry picked from commit c691cb5d9cc7bb337c149e0279e21397f168c314)
-
-diff --git a/mailfilteragent/mailfilteragent.cpp b/mailfilteragent/mailfilteragent.cpp
-index 7220d90..75d6f05 100644
---- a/mailfilteragent/mailfilteragent.cpp
-+++ b/mailfilteragent/mailfilteragent.cpp
-@@ -117,6 +117,7 @@ void MailFilterAgent::initialCollectionFetchingDone( KJob *job )
-   Akonadi::CollectionFetchJob *fetchJob = qobject_cast<Akonadi::CollectionFetchJob*>( job );
- 
-   changeRecorder()->itemFetchScope().setAncestorRetrieval( Akonadi::ItemFetchScope::Parent );
-+  changeRecorder()->itemFetchScope().setCacheOnly(false);
-   mRequestedPart = m_filterManager->requiredPart();
-   if (mRequestedPart == MailCommon::SearchRule::CompleteMessage) {
-     changeRecorder()->itemFetchScope().fetchFullPayload();