[kde-base/kgpg] Clean unneeded patches

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

4 files changed, 13 insertions, 309 deletions

diff --git a/kde-base/kgpg/ChangeLog b/kde-base/kgpg/ChangeLog
index f8f15b7107c0..fee0fcb5ee01 100644
--- a/kde-base/kgpg/ChangeLog
+++ b/kde-base/kgpg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kgpg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/ChangeLog,v 1.122 2009/06/14 11:02:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/ChangeLog,v 1.123 2009/06/14 13:09:36 alexxy Exp $
+
+  14 Jun 2009; Alexey Shvetsov <alexxy@gentoo.org>
+  -files/kgpg-4.2.3-gnupg-2.0.10.patch:
+  Clean unneeded patches
 
   14 Jun 2009; Alexey Shvetsov <alexxy@gentoo.org> -kgpg-4.2.3.ebuild,
   -kgpg-4.2.3-r1.ebuild:
diff --git a/kde-base/kgpg/files/kgpg-4.2.3-gnupg-2.0.10.patch b/kde-base/kgpg/files/kgpg-4.2.3-gnupg-2.0.10.patch
deleted file mode 100644
index 6683824d414d..000000000000
--- a/kde-base/kgpg/files/kgpg-4.2.3-gnupg-2.0.10.patch
+++ /dev/null
@@ -1,298 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=263454
-https://bugs.kde.org/show_bug.cgi?id=188473
-http://websvn.kde.org/?view=rev&revision=973317
-
---- kgpg/kgpginterface.cpp
-+++ kgpg/kgpginterface.cpp
-@@ -464,11 +464,11 @@
- {
-     m_publiclistkeys = KgpgKeyList();
-     m_publickey = KgpgKey();
--    m_numberid = 1;
-+    m_numberid = 0;
-     cycle = "none";
- 
-     GPGProc *process = new GPGProc(this);
--    *process << "--with-colons" << "--with-fingerprint";
-+    *process << "--with-colons" << "--with-fingerprint" << "--fixed-list-mode";
-     if (withsigs)
-         *process << "--list-sigs";
-     else
-@@ -514,7 +514,7 @@
-             m_publickey.setSize(lsp.at(2).toUInt());
-             m_publickey.setAlgorithm(Convert::toAlgo(lsp.at(3).toInt()));
-             m_publickey.setFingerprint(lsp.at(4));
--            m_publickey.setCreation(QDate::fromString(lsp.at(5), Qt::ISODate));
-+            m_publickey.setCreation(QDateTime::fromTime_t(lsp.at(5).toUInt()).date());
-             m_publickey.setOwnerTrust(Convert::toOwnerTrust(lsp.at(8)));
- 
-             if (lsp.at(6).isEmpty())
-@@ -523,7 +523,7 @@
-             }
-             else
-             {
--                m_publickey.setExpiration(QDate::fromString(lsp.at(6), Qt::ISODate));
-+                m_publickey.setExpiration(QDateTime::fromTime_t(lsp.at(6).toUInt()).date());
-             }
- 
-             if (lsp.at(11).contains("D", Qt::CaseSensitive))  // disabled key
-@@ -531,45 +531,9 @@
-             else
-                 m_publickey.setValid(true);
- 
--            QString fullname = lsp.at(9);
--            if (fullname.contains("<"))
--            {
--                QString kmail = fullname;
--
--                if (fullname.contains(')') )
--                    kmail = kmail.section(')', 1);
--
--                kmail = kmail.section('<', 1);
--                kmail.truncate(kmail.length() - 1);
--
--                if (kmail.contains('<') ) // several email addresses in the same key
--                {
--                    kmail = kmail.replace('>', ';');
--                    kmail.remove('<');
--                }
--
--                m_publickey.setEmail(kmail);
--            }
--            else
--                m_publickey.setEmail(QString());
--
--            QString kname = fullname.section(" <", 0, 0);
--            if (fullname.contains('(') )
--            {
--                kname = kname.section(" (", 0, 0);
--                QString comment = fullname.section('(', 1, 1);
--                comment = comment.section(')', 0, 0);
--
--                m_publickey.setComment(comment);
--            }
--            else
--                m_publickey.setComment(QString());
--            m_publickey.setName(kname);
--
-             cycle = "pub";
- 
--            // the first uid is merged into the public key
--            m_numberid = 1;
-+            m_numberid = 0;
-         }
-         else
-         if ((lsp.at(0) == "fpr") && (items >= 10))
-@@ -587,7 +551,7 @@
-             sub.setTrust(Convert::toTrust(lsp.at(1)));
-             sub.setSize(lsp.at(2).toUInt());
-             sub.setAlgorithm(Convert::toAlgo(lsp.at(3).toInt()));
--            sub.setCreation(QDate::fromString(lsp.at(5), Qt::ISODate));
-+            sub.setCreation(QDateTime::fromTime_t(lsp.at(5).toUInt()).date());
- 
-             // FIXME: Please see kgpgkey.h, KgpgSubKey class
-             if (lsp.at(11).contains('D'))
-@@ -607,7 +571,7 @@
-             }
-             else
-             {
--                sub.setExpiration(QDate::fromString(lsp.at(6), Qt::ISODate));
-+                sub.setExpiration(QDateTime::fromTime_t(lsp.at(6).toUInt()).date());
-             }
- 
-             m_publickey.subList()->append(sub);
-@@ -619,7 +583,7 @@
-             m_numberid++;
-             KgpgKeyUat uat;
-             uat.setId(QString::number(m_numberid));
--            uat.setCreation(QDate::fromString(lsp.at(5), Qt::ISODate));
-+            uat.setCreation(QDateTime::fromTime_t(lsp.at(5).toUInt()).date());
-             m_publickey.uatList()->append(uat);
- 
-             cycle = "uat";
-@@ -627,19 +591,11 @@
-         else
-         if ((lsp.at(0) == "uid") && (items >= 10))
-         {
--            KgpgKeyUid uid;
--
--            uid.setTrust(Convert::toTrust(lsp.at(1)));
--            if ((items > 11) && lsp.at(11).contains('D'))
--                uid.setValid(false);
--            else
--                uid.setValid(true);
--
--            uid.setIndex(++m_numberid);
-             QString fullname = lsp.at(9);
-+            QString kmail;
-             if (fullname.contains('<') )
-             {
--                QString kmail = fullname;
-+                kmail = fullname;
- 
-                 if (fullname.contains(')') )
-                     kmail = kmail.section(')', 1);
-@@ -652,28 +608,40 @@
-                     kmail = kmail.replace('>', ';');
-                     kmail.remove('<');
-                 }
--
--                uid.setEmail(kmail);
-             }
--            else
--                uid.setEmail(QString());
- 
-             QString kname = fullname.section(" <", 0, 0);
-+            QString comment;
-             if (fullname.contains('(') )
-             {
-                 kname = kname.section(" (", 0, 0);
--                QString comment = fullname.section('(', 1, 1);
-+                comment = fullname.section('(', 1, 1);
-                 comment = comment.section(')', 0, 0);
--
--                uid.setComment(comment);
-             }
--            else
--                uid.setComment(QString());
--            uid.setName(kname);
- 
--            m_publickey.uidList()->append(uid);
-+		if (m_numberid == 0) {
-+			m_numberid++;
-+			m_publickey.setEmail(kmail);
-+			m_publickey.setComment(comment);
-+			m_publickey.setName(kname);
-+		} else {
-+			KgpgKeyUid uid;
-+
-+			uid.setEmail(kmail);
-+			uid.setComment(comment);
-+			uid.setName(kname);
-+			uid.setTrust(Convert::toTrust(lsp.at(1)));
-+			if ((items > 11) && lsp.at(11).contains('D'))
-+				uid.setValid(false);
-+			else
-+				uid.setValid(true);
-+
-+			uid.setIndex(++m_numberid);
-+
-+			m_publickey.uidList()->append(uid);
- 
--            cycle = "uid";
-+			cycle = "uid";
-+		}
-         }
-         else
-         if (((lsp.at(0) == "sig") || (lsp.at(0) == "rev")) && (items >= 11))
-@@ -681,7 +649,7 @@
-             KgpgKeySign signature;
- 
-             signature.setId(lsp.at(4));
--            signature.setCreation(QDate::fromString(lsp.at(5), Qt::ISODate));
-+            signature.setCreation(QDateTime::fromTime_t(lsp.at(5).toUInt()).date());
- 
-             if (lsp.at(6).isEmpty())
-             {
-@@ -689,43 +657,8 @@
-             }
-             else
-             {
--                signature.setExpiration(QDate::fromString(lsp.at(6), Qt::ISODate));
--            }
--
--            QString fullname = lsp.at(9);
--            if (fullname.contains('<') )
--            {
--                QString kmail = fullname;
--
--                if (fullname.contains(')') )
--                    kmail = kmail.section(')', 1);
--
--                kmail = kmail.section('<', 1);
--                kmail.truncate(kmail.length() - 1);
--
--                if (kmail.contains('<' )) // several email addresses in the same key
--                {
--                    kmail = kmail.replace('>', ';');
--                    kmail.remove('<');
--                }
--
--                signature.setEmail(kmail);
--            }
--            else
--                signature.setEmail(QString());
--
--            QString kname = fullname.section(" <", 0, 0);
--            if (fullname.contains('(' ))
--            {
--                kname = kname.section(" (", 0, 0);
--                QString comment = fullname.section('(', 1, 1);
--                comment = comment.section(')', 0, 0);
--
--                signature.setComment(comment);
-+                signature.setExpiration(QDateTime::fromTime_t(lsp.at(6).toUInt()).date());
-             }
--            else
--                signature.setComment(QString());
--            signature.setName(kname);
- 
-             if (lsp.at(10).endsWith('l'))
-                 signature.setLocal(true);
-@@ -769,7 +702,7 @@
-     m_secretactivate = false;
- 
-         GPGProc *process = new GPGProc(this);
--        *process << "--with-colons" << "--list-secret-keys" << "--with-fingerprint";
-+        *process << "--with-colons" << "--list-secret-keys" << "--with-fingerprint" << "--fixed-list-mode";
- 
-         *process << ids;
- 
-@@ -789,6 +722,7 @@
- {
-     QStringList lsp;
-     int items;
-+    bool hasuid = true;
- 
-     while ( (items = p->readln(lsp)) >= 0 )
-     {
-@@ -804,7 +738,7 @@
-                 m_secretkey.setSize(lsp.at(2).toUInt());
-                 m_secretkey.setAlgorithm(Convert::toAlgo(lsp.at(3).toInt()));
-                 m_secretkey.setFingerprint(lsp.at(4));
--                m_secretkey.setCreation(QDate::fromString(lsp[5], Qt::ISODate));
-+                m_secretkey.setCreation(QDateTime::fromTime_t(lsp.at(5).toUInt()).date());
-                 m_secretkey.setSecret(true);
- 
-                 if (lsp.at(6).isEmpty())
-@@ -813,8 +747,14 @@
-                 }
-                 else
-                 {
--                    m_secretkey.setExpiration(QDate::fromString(lsp.at(6), Qt::ISODate));
-+                    m_secretkey.setExpiration(QDateTime::fromTime_t(lsp.at(6).toUInt()).date());
-                 }
-+                hasuid = true;
-+            } else if ((lsp.at(0) == "uid") && (items >= 10)) {
-+                if (hasuid)
-+                   continue;
-+
-+                hasuid = true;
- 
-                 QString fullname = lsp.at(9);
-                 if (fullname.contains('<' ))
-@@ -1541,12 +1481,12 @@
- {
- 	GPGProc *listproc = new GPGProc(this);
- 	*listproc << "--status-fd=1";
--	*listproc << "--with-colons" << "--list-sigs" << keyID;
-+	*listproc << "--with-colons" << "--list-sigs" << "--fixed-list-mode" << keyID;
- 	listproc->start();
- 	listproc->waitForFinished(-1);
- 
- 	QString line;
--	int curuid = 1;
-+	int curuid = 0;
- 	int signs = 0;
- 	int tgtuid = uid.toInt();
- 
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index f6643f9b2ef2..4afeded59a6b 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -2,7 +2,6 @@
 Hash: SHA1
 
 AUX kmail-4.1.72-fix.patch 303 RMD160 71a7687bf589cad6189347e960121e5780846f29 SHA1 f34ca2031003a6e29c04cc0f9270b31249f48427 SHA256 9b8c6e387d5b76469350b8f351479b5eab9ca834985d6e29fccfb7a48c803679
-AUX kmail-4.2.3-allow_replying_to_messages_in_sent_folder.patch 1469 RMD160 4cf7af2dc35cbd4aff2c8b0ed209ef5fc1a2b014 SHA1 be5e1738ccfb4f5ea9278957fe66d725103e2a3f SHA256 4b6ba99b5f51570eb218c85f642e5a077fb4df51f5d41d53e7346eeaf2e1af08
 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
 DIST kdepim-3.5.10.tar.bz2 14559901 RMD160 52a834dc8eb377d397404a16a09c8a59b568b305 SHA1 537da60fe3564ecc0ed2802e744fbf96386909a9 SHA256 95ec92023a25e4868e55389fa4648b337fed870d744d3b63022ed9838ff9b429
@@ -11,12 +10,12 @@ DIST kdepim-4.2.4.tar.bz2 12132236 RMD160 2ffdd586591bfeaaff6242539a94e7fee0dfde
 EBUILD kmail-3.5.10.ebuild 2273 RMD160 c85b1dc8b54ad502acdc601d0d452464b6197c73 SHA1 b527be5001930b4ace69316a9fc8ec4c9ad9dfa0 SHA256 72cca31c3fc77475c99f8eca50ee60f87e0f3ca4895136bca3739a0ef030e798
 EBUILD kmail-3.5.9.ebuild 2268 RMD160 aacf7d5fec3d94bc1e43d07484a2272e29ab46bb SHA1 2e091f9b0f73a82f9a256e50c904b7eabe958b85 SHA256 8ee499c48c8c2bce00fbdda06df8953349ecb6301a94d776c07c28181ae321ef
 EBUILD kmail-4.2.4.ebuild 1272 RMD160 ab45a38dd5093e2709a457beb8ce296e3e69f261 SHA1 78ab10180362d396c815784c037116d0a632f735 SHA256 517eb51025fc98dfae0c3f8da2c42f38876ec8769a6a2ea2251cf1125aa3bd7b
-MISC ChangeLog 22837 RMD160 98b92c349a12bf948ee12b4d155c5f5b8e7fad98 SHA1 6e9d8b7ef58b9e4fa3ceb2b97dc7f8618ac28db2 SHA256 13c60bcd78e959d20323058b5eb52e2835dccc358b9f2c868b2f935666d70212
+MISC ChangeLog 22984 RMD160 9c7ecf5762554d302fb01008b7a6dae88bbf5507 SHA1 9bcde341cd3a37acd1c647c06ba4bd21545743f2 SHA256 22226f1d3d421ed7e5f50105f7460f178d16d0c9c2bd7c200ae03aece75c197e
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAko02q4ACgkQ5BmOA85PVLj+sQCfT97b6L0N+0RqoSW64E7Q9/Q+
-4UQAoJAbJSIAKwO8NL0fnbJ8G5OuuRAg
-=wI3w
+iEYEARECAAYFAko093UACgkQ5BmOA85PVLj7RwCfdfHo2dhZq6EkbZ9nA8ez+91b
+uaUAn1mnKgiSE0hKcUPNePIAuwHoO65M
+=ZT0m
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kmilo/Manifest b/kde-base/kmilo/Manifest
index a1dbfd6411fb..379b9281982c 100644
--- a/kde-base/kmilo/Manifest
+++ b/kde-base/kmilo/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX kmilo-3.5.8-198015_XF86Audio.patch 2781 RMD160 15a54329f39e1e7af316566684d8ca620a9761aa SHA1 00c0147f52f2a387901be7900d0b9641ca0f456d SHA256 0916cbffb011e4589bed8e71e9e76cae5982e0e7d111a9afa3abb061b0667c5e
 AUX kmilo-3.5.9-fixpaths.patch 1293 RMD160 00707847b77bfb8633cce85d90904a621368b47c SHA1 4f6e44a5ee2aba7253790293b94fe3da0e0e1d22 SHA256 993554de64ddff672b2d4c35aa4105a0a1dd2c970d634590574e855d04473233
 DIST kdeutils-3.5.10.tar.bz2 3062038 RMD160 98edf87a92c6baf2a3dcd119659cead1110d5789 SHA1 dfa440253fd9802d1a9665d339c20d903ea676af SHA256 85f25c3651e1e4daf331c021ae932de3202037eba54709655dc04efcfeda0c18
 DIST kdeutils-3.5.9.tar.bz2 3060841 RMD160 ac98dce89f31469de8b582328fa2a0f10e835d01 SHA1 143c1284e4e4f3c985af1e156652e415f566ba17 SHA256 65df88b026720b8e11446c9a0a5d8cd942d236097e9c6ca63607fab04884b5ff
 EBUILD kmilo-3.5.10.ebuild 695 RMD160 3b6328b01bc2353ab46ac8d013582aed6b2015e3 SHA1 bb23d1b3998d574aeee81a43451fc8d1124c8069 SHA256 bf38338c002cd2e8dbb9d6b0168076313d4e19e39557626668358d501c5bf4ba
 EBUILD kmilo-3.5.9-r1.ebuild 688 RMD160 b4cf7643dc45cdd9d95b040d413a6bb14404f1d9 SHA1 9203e6d0cc1774cd47bf50b86fd0277a3e69c11b SHA256 7e1478d099475b6fc5431c9cf1d0482090073eaaf3f3b7e405d85959f47843ea
 EBUILD kmilo-3.5.9.ebuild 643 RMD160 be33fbe2b44ff74b9a21d5e5796c9eb1a92b3aec SHA1 5d8f1539d2f2f6d625189db8b4220632769c58a4 SHA256 37d77a747e8df7c9128f0f30c05c72ab8f0d4c18a7756403b3872b17acfac0bc
-MISC ChangeLog 12854 RMD160 f2c2b4953c6e2b9e40cb2f9502e9b0f2ccdf7d88 SHA1 6ce870e4ed017023bee676527c585fca6f472046 SHA256 49fdeb627c94d9b944c66bbe75f3c480ad4d059cb2542ba241bcd2bdcb4aabf1
+MISC ChangeLog 12976 RMD160 60c1aeb845f5f84c1d438c7bfa8084caf9656691 SHA1 225f3963a8b5ee3350b1c110b887a2931e07801d SHA256 66fbd285e78e37d4530c776431b60bcedb7123e28ede6ee5297a61c5dba7d7cc
 MISC metadata.xml 254 RMD160 8bc2cf55739966e902eaa0bfc8e0c81684574d78 SHA1 08f3a1b1accec481ede7eb93cb9941eac2c06710 SHA256 951dc1516a542c1ca82566c8989932f2852a3250750a8a4e7bf1f65da90de93e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoqTGYACgkQkKaRLQcq0GLC6wCgpuJS4WQBpAMh6kCy2NLRQIgk
-gUkAn1d1eiUv5P9upK6pH1/Vuewja/yf
-=UBu5
+iEYEARECAAYFAko097IACgkQ5BmOA85PVLhGCwCeLXc11wkWhRxJsCzHbhoVnrh0
+hucAoKpuTrPZ2+qgj6/UJhESFWYBaouZ
+=jJmh
 -----END PGP SIGNATURE-----