Upstream changed the tarball to merge the GCC 4.1 patch, so remove it and redigest.

(Portage version: 2.1.2_pre3-r5)
 (Signed Manifest commit)

2 files changed, 15 insertions, 32 deletions

diff --git a/kde-misc/tork/Manifest b/kde-misc/tork/Manifest
index c2f85aef76bb..eaf61d239aed 100644
--- a/kde-misc/tork/Manifest
+++ b/kde-misc/tork/Manifest
@@ -9,24 +9,20 @@ AUX tork-0.08-geoip.patch 3233 RMD160 963a714068ca409486d40f6dc2c3555bdad966d5 S
 MD5 042a0102d401251148dd9928e93a7f3d files/tork-0.08-geoip.patch 3233
 RMD160 963a714068ca409486d40f6dc2c3555bdad966d5 files/tork-0.08-geoip.patch 3233
 SHA256 bcc1f5fd7aca40cbf9a5a1d0f194620f62c517f9065610d637480047afeb7263 files/tork-0.08-geoip.patch 3233
-AUX tork-0.09-gcc41.patch 432 RMD160 c09cacf8d077bdb0673ac073984befa7f191677e SHA1 2477b32421857caff93cd0b850cf476ca0fd3768 SHA256 d04afd47ca38b350457042929b25739d1645a70f62f91a52db5114bffe705765
-MD5 8d025f4feef92182553761b771d33507 files/tork-0.09-gcc41.patch 432
-RMD160 c09cacf8d077bdb0673ac073984befa7f191677e files/tork-0.09-gcc41.patch 432
-SHA256 d04afd47ca38b350457042929b25739d1645a70f62f91a52db5114bffe705765 files/tork-0.09-gcc41.patch 432
 DIST tork-0.08.tar.bz2 1432911 RMD160 8388ea08e57829f42a49ef88ece9031d4367f894 SHA1 66b966e8426cf433854a472398105bdedbf295af SHA256 86e4463afdc50d0b384bffca64035960342cf0d21c851b9655f80153cd9403ba
-DIST tork-0.09.tar.bz2 1900253 RMD160 42cc5bc8dc13b5afe9d29c3b405e388b6aa7c0f5 SHA1 6788fd8118216933ac5b437c439dade940282346 SHA256 1b572e429db34421f94916830ca7347df228235b6e31d22913f67fb12d9b33fb
+DIST tork-0.09.tar.bz2 1900835 RMD160 67d51ac8561a0a3ac3b1b21230145baf3e046cee SHA1 8fb9691e34474f4384cd6dfddc780afc394c47c5 SHA256 db5c5afcd69ba449ee734bd57827c01595c7ec077c69ab186529beca59257181
 EBUILD tork-0.08.ebuild 868 RMD160 9f8771ca61bdcccb8deefa7b9b076247f62dddc4 SHA1 2e584e6e816d8c7b0b198bf22e7cd79b762833d6 SHA256 4fd586a33fa7d8ce33f9e8e1d4b2da39bb8596c7ce2af480de26867d17deaa74
 MD5 b86a9bd84a12cf2e260456cfd8522740 tork-0.08.ebuild 868
 RMD160 9f8771ca61bdcccb8deefa7b9b076247f62dddc4 tork-0.08.ebuild 868
 SHA256 4fd586a33fa7d8ce33f9e8e1d4b2da39bb8596c7ce2af480de26867d17deaa74 tork-0.08.ebuild 868
-EBUILD tork-0.09.ebuild 754 RMD160 1c867f6c99db8528b9c23dd711d950f99f9b59fc SHA1 3e390fe4a6daf436360890f02ac3688f696fa509 SHA256 65badc15dfd642f9fc1ecd5aa8112ac6e64430bf724f0b759a806c9250ae03e4
-MD5 70ff69b8b3819d1ffa43cd654a454b7d tork-0.09.ebuild 754
-RMD160 1c867f6c99db8528b9c23dd711d950f99f9b59fc tork-0.09.ebuild 754
-SHA256 65badc15dfd642f9fc1ecd5aa8112ac6e64430bf724f0b759a806c9250ae03e4 tork-0.09.ebuild 754
-MISC ChangeLog 1688 RMD160 9a6827646e29948e33e4706828a3663190bd0e55 SHA1 4782347b04fa2affbae4c9b63179896d982e2b97 SHA256 f1fee5876dbe7a55908d5a2042252f6a853a3a8aa8c9172a69408ce06876eeb5
-MD5 801b96d8388453d67848775df0bfe4f3 ChangeLog 1688
-RMD160 9a6827646e29948e33e4706828a3663190bd0e55 ChangeLog 1688
-SHA256 f1fee5876dbe7a55908d5a2042252f6a853a3a8aa8c9172a69408ce06876eeb5 ChangeLog 1688
+EBUILD tork-0.09.ebuild 714 RMD160 becf9b7dd97ca3c93721e2003f31c11b02e730c5 SHA1 fc012b591679e6c63bce5cdbbf7b164b92260e44 SHA256 da1651972dce84b55aa4aa90db69e4c5b5d155cba0ee9cd82ba2cd9bf257ea57
+MD5 f9778c9185b90637a5fd1ec0e76bc28c tork-0.09.ebuild 714
+RMD160 becf9b7dd97ca3c93721e2003f31c11b02e730c5 tork-0.09.ebuild 714
+SHA256 da1651972dce84b55aa4aa90db69e4c5b5d155cba0ee9cd82ba2cd9bf257ea57 tork-0.09.ebuild 714
+MISC ChangeLog 1880 RMD160 9b5427d4bd60049fffc87650f807333850aac971 SHA1 7a691d847a4157b796e97ebe881ec695ca4be033 SHA256 8e13670f5a0ac078e281e0f6569f4e42d077d15a8ad6438b4adcde35cf6b629e
+MD5 a61fc6c8500d4edc1b973ae93bf6669e ChangeLog 1880
+RMD160 9b5427d4bd60049fffc87650f807333850aac971 ChangeLog 1880
+SHA256 8e13670f5a0ac078e281e0f6569f4e42d077d15a8ad6438b4adcde35cf6b629e ChangeLog 1880
 MISC metadata.xml 254 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a SHA1 899c7665ef94c737788e8a2c53bc8a3d97a1356a SHA256 addaf999f171c0e580a0399105382e9b213e14f3bd85b74671742b41f41c2261
 MD5 64e213d0db015eb97e16b31ec6e748c3 metadata.xml 254
 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a metadata.xml 254
@@ -34,13 +30,13 @@ SHA256 addaf999f171c0e580a0399105382e9b213e14f3bd85b74671742b41f41c2261 metadata
 MD5 47a17fbd8e2f4a707aa660ce2229e3fc files/digest-tork-0.08 235
 RMD160 fca00763dd9a5cebf4e15badb320b090a00d09e7 files/digest-tork-0.08 235
 SHA256 240b6de97513e840056fed9eb4be6f8b2328d71e01947cead636dcb952f9bfa0 files/digest-tork-0.08 235
-MD5 7e25c05e4fabcaf8ddb982838d10b6a4 files/digest-tork-0.09 235
-RMD160 db3bc75b4586357b03605c06f2b0084870dafd93 files/digest-tork-0.09 235
-SHA256 3252282dd34de19c15ca01858c560c6f8c177dc412e4d6ff222e93b0d15644a3 files/digest-tork-0.09 235
+MD5 7874de58c8a3f2b1a73ad7e17c922c00 files/digest-tork-0.09 235
+RMD160 d8040fe951416657f4f44872854beccbdcc067ec files/digest-tork-0.09 235
+SHA256 2f51ed3091ee58aeffcdbd8f680c6d6343bdefa07e618be32291b782c8c5e257 files/digest-tork-0.09 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFNtHbAiZjviIA2XgRAkzQAJ0Yg76F7zbZQM0WPi5+8m1/qDr6gACgpP7D
-FbCnUYUeCgSoACcKcedOn1Y=
-=o1Ed
+iD8DBQFFOV0PAiZjviIA2XgRAmb9AKDofroLjE/wiRtQ1v+TR0hqHK2caQCfcIs5
+JLhC+lswYDuxqLflwMS2uKI=
+=paZg
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/tork/files/tork-0.09-gcc41.patch b/kde-misc/tork/files/tork-0.09-gcc41.patch
deleted file mode 100644
index a28b6fbc47ff..000000000000
--- a/kde-misc/tork/files/tork-0.09-gcc41.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: tork-0.09/src/tork.h
-===================================================================
---- tork-0.09.orig/src/tork.h
-+++ tork-0.09/src/tork.h
-@@ -88,7 +88,7 @@ public:
-     KSystemTray *_tray;
-     torkView *m_view;
-     QDict<QListViewItem> inodes;
--    bool tork::connectedToTor(){return (client!=0) ? true : false;};
-+    bool connectedToTor(){return (client!=0) ? true : false;};
- 
- private slots:
-     void fileNew();