Security cleanup wrt bug #140514.

(Portage version: 2.1-r2)
 (Signed Manifest commit)

17 files changed, 7 insertions, 1365 deletions

diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index fc3cbc5da2f7..e66b2ed473f1 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,10 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 8patch-1.5.6.dyc.source_stat 1531 RMD160 5d79c63b915198c21f874bee3a6656178d4712b2 SHA1 1f84be728a72a75da38ea0140c8ae15fe8b206bf SHA256 8e52a7c033a6fe7f0fa12dd3a24234d0a90d9cea05dd80d11b646d9b845d997f
-MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
-RMD160 5d79c63b915198c21f874bee3a6656178d4712b2 files/8patch-1.5.6.dyc.source_stat 1531
-SHA256 8e52a7c033a6fe7f0fa12dd3a24234d0a90d9cea05dd80d11b646d9b845d997f files/8patch-1.5.6.dyc.source_stat 1531
 AUX Muttrc 667 RMD160 0405e73c6a4122869ce9a9bd408068d316740b71 SHA1 e30c96e6f21a30fe576abcb3be65a34accf4e11f SHA256 932940db69c951caaa87a17ee98a8e2262aeadf1e978f6d671b642184c5d545f
 MD5 6064ff5a3d1a71ccdb48f88872feb3a3 files/Muttrc 667
 RMD160 0405e73c6a4122869ce9a9bd408068d316740b71 files/Muttrc 667
@@ -13,10 +9,6 @@ AUX Muttrc.mbox 486 RMD160 0f692c9d3a7591f3a0611529616aa94a5c62a641 SHA1 9e23130
 MD5 30ce590d0284ffb0896857714c6a47d4 files/Muttrc.mbox 486
 RMD160 0f692c9d3a7591f3a0611529616aa94a5c62a641 files/Muttrc.mbox 486
 SHA256 10b251f88ccc5d4c95c96ab17b6ab6a30a16d6590ab896a60037f869fc4d44a0 files/Muttrc.mbox 486
-AUX mutt-1.5.10-nodoc.patch 406 RMD160 4cac3370c41713b093305f59b33523d8e3e52911 SHA1 08e0e4b1d91dc425c0d73eef8b9663e1f4b5ff78 SHA256 f0988022b065980c5a05da6d52e2857bfd23ebd4e55b844f7d415a2d1d775154
-MD5 3711d75d5d4a7d648166dcbfad6e10a3 files/mutt-1.5.10-nodoc.patch 406
-RMD160 4cac3370c41713b093305f59b33523d8e3e52911 files/mutt-1.5.10-nodoc.patch 406
-SHA256 f0988022b065980c5a05da6d52e2857bfd23ebd4e55b844f7d415a2d1d775154 files/mutt-1.5.10-nodoc.patch 406
 AUX mutt-1.5.11-fix-smime.patch 314 RMD160 5163d4e3ef2110cf558e30d5a444aaf6e46cfae4 SHA1 3083961a2876e24fd720288741b52682a3f38ffa SHA256 67e580a4bd41fe33b6c9410dfa18147e6450ff82ab2a5f9c7db5ddec420e2ba6
 MD5 84043a248b5e649cd1e4d18ca06a82dc files/mutt-1.5.11-fix-smime.patch 314
 RMD160 5163d4e3ef2110cf558e30d5a444aaf6e46cfae4 files/mutt-1.5.11-fix-smime.patch 314
@@ -33,21 +25,10 @@ AUX mutt-1.5.12-fix-pop-c.patch 753 RMD160 5d4566b5a22d2077e81b8a091f2749a3abd5f
 MD5 866165cb07d60b1f28c2a27c1c57e3b4 files/mutt-1.5.12-fix-pop-c.patch 753
 RMD160 5d4566b5a22d2077e81b8a091f2749a3abd5f289 files/mutt-1.5.12-fix-pop-c.patch 753
 SHA256 1d1c21865a1aae258eb1991a153b75f99f22e9272a4d0b74478cd65f943f7a2a files/mutt-1.5.12-fix-pop-c.patch 753
-AUX mutt-1.5.9-nodoc.patch 382 RMD160 f59ffb3a8f13090df3308d61b33c0b374d73207a SHA1 a5be95ac5b2c0c75eba9f78a53fa4bd74ad56ad8 SHA256 d1a69ef3726f146d8afb5ced47dfe751be97322cbe37aac96e97dcf96fe6f3ef
-MD5 b1da3a7a15479e6c5f08fb96c33b201e files/mutt-1.5.9-nodoc.patch 382
-RMD160 f59ffb3a8f13090df3308d61b33c0b374d73207a files/mutt-1.5.9-nodoc.patch 382
-SHA256 d1a69ef3726f146d8afb5ced47dfe751be97322cbe37aac96e97dcf96fe6f3ef files/mutt-1.5.9-nodoc.patch 382
-AUX mutt-1.5.9-sasl.patch 1378 RMD160 3c778482a45aab063d4a348c3c1cb4da6f63c576 SHA1 37a9e74ff335a719628632c98e9f3137fb137ffb SHA256 f978e23a335031fcd6bf26a07b34ab4fbda1296be38ff24e73416c762d23895f
-MD5 2dfbb4deb083480353ea66f578066061 files/mutt-1.5.9-sasl.patch 1378
-RMD160 3c778482a45aab063d4a348c3c1cb4da6f63c576 files/mutt-1.5.9-sasl.patch 1378
-SHA256 f978e23a335031fcd6bf26a07b34ab4fbda1296be38ff24e73416c762d23895f files/mutt-1.5.9-sasl.patch 1378
 AUX slang.patch 493 RMD160 16dcedee86fe91ecac48ec5be8a6f67798ef7ac0 SHA1 f913e8c717f76186b0edc8856bf02a167d540c70 SHA256 040c8b63b2d805dae800fa9b1826d158b7104641339cee9a404985616b3502c7
 MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493
 RMD160 16dcedee86fe91ecac48ec5be8a6f67798ef7ac0 files/slang.patch 493
 SHA256 040c8b63b2d805dae800fa9b1826d158b7104641339cee9a404985616b3502c7 files/slang.patch 493
-DIST mutt-1.4.2.1i-ja.1.tar.gz 78266
-DIST mutt-1.4.2.1i.tar.gz 2611253
-DIST mutt-1.5.10i.tar.gz 3156345 RMD160 e6855dd72e41b5e451b17bac9934bea8ca0c5db7 SHA1 3f9cbd330b1458a5c317fd29331f425aa36e0877 SHA256 0e6bcfa33ded3e025b253831d68d441f413d5717a9902a173f25f7de40061118
 DIST mutt-1.5.11.tar.gz 3187375 RMD160 812bfa6b1c9bfb1650341f7522298699c7b214a5 SHA1 cc5823016fe7de6ee3a131b19a3f78796f9f53d5 SHA256 0ff256a9851952a5f6dfb4b7dccf5dc26db9de5502d035748abc93dec84af474
 DIST mutt-1.5.12-gentoo-patches.tar.bz2 53435 RMD160 419ff2ebd14ad394ea5d34814f17583ee5a439b6 SHA1 013376bfbb97cb23ef58bf8248ea91b656b4bfe2 SHA256 e285cd217707719ba7a22e912c6cc00319e9873f31580bdef51331d9b6313dff
 DIST mutt-1.5.12.tar.gz 3440835 RMD160 e68d4c5b099b8148769d138a36fa8561b278969c SHA1 bb888a35f42a77de7e326c03b60854ad1cc266ea SHA256 0d0c2ab6cea0d93579bc5490fafdae3bf640070d993490c7b00ccac4fa808b67
@@ -55,39 +36,12 @@ DIST mutt-1.5.13-gentoo-patches.tar.bz2 53418 RMD160 67274bef651c1c78d1e6878d8bb
 DIST mutt-1.5.13.tar.gz 3442681 RMD160 9327b7f928aad78a20c2395629113ac2519bb945 SHA1 6d5b88d33e1727bf0342c31f06d55d7a3d2d4e0a SHA256 e0481690c0caf23b5c88359b2dbac70308f8f138663e8fee482b163562fe8da9
 DIST mutt-1.5.4-imap-fcc-status.patch 380 RMD160 cbeac806b610bcd945bf3b52120a8aa2aba27df3 SHA1 6567f4c9fac3ca52f13c23aed2e3aa017b49e25f SHA256 22cb4e1625ae2d22f94e8d815cb3515db75801f8a4cb9e4f047c4fb4ded8757c
 DIST mutt-1.5.7-mixmaster+nntp.patch 310 RMD160 38e42b700d1badb3d39550ada6eb08cb122480a0 SHA1 996f1f922d8150ce9b70b484877fe22ec8d463dd SHA256 e035b746f391aaba51b2e0917ecf4c60db7c81546a9b54f06881cf75410575da
-DIST mutt-1.5.8i.tar.gz 3010088 RMD160 2b941aa12381efb2cbad204ebf5512051909911b SHA1 d5381676b7bfb4ebee5d5261e5236d88414c2bd2 SHA256 3f50f60651a8c2543a8935f6593f7260b392e6207e4fa1d591ae54ba077124e0
-DIST mutt-1.5.9i.tar.gz 3036003 RMD160 888848046382b3c4e8b18eacd30af4291a7ed23d SHA1 a380747b86f11b2b3bf3c4407e70bfebe6d0af02 SHA256 d80142bfe7dd2c8ee9c2345c71fedded8b971267a9a29a853d48c562dd0605d4
-DIST mutt-cvs-header-cache.29 5120 RMD160 b9c84cdc699ca8b053cc1b39cbccb225b5701749 SHA1 4c952f75df9ce662e99e68f72934b3a1d3b0e1eb SHA256 5e7877d41480c07f2b8be146bda18261d78f42f51da5434bc5242362ad761ff0
-DIST patch-1.4.0.cd.edit_threads.9.5 22168
-DIST patch-1.4.2.rr.compressed.1-gentoo.bz2 13939
-DIST patch-1.5.10.rr.compressed.gz 10095 RMD160 9af76817f36b9f3f63d1c94435e7f78eba4279d3 SHA1 db09f0e5515aa56675cd041ee74e9eba6474cd81 SHA256 07a4ef9ae747c7b37edc5413c632f3d25ad43401e2b60081f9017ab761d9922f
 DIST patch-1.5.10.tt.assumed_charset.1.gz 2565 RMD160 7d3fb6d32c266ed35babdb10d13aae731783a64e SHA1 f7894822ba9107b3ac443f9b40babbd3ae3c778a SHA256 97cdb63694055e218dff8b85e8c0db8b5e0c7435a91d47479604480319156c6b
-DIST patch-1.5.10.vvv.nntp-gentoo.bz2 72894 RMD160 b1666655146bcfd346876365aa7fb0f56e9cc322 SHA1 65f93c66a4cfad8b864f8cf40902e7f7c73dce3d SHA256 9c71e8cc54122e277efca3ce9b7db7f27597fa63fa0777d3751820b9ae0e29ae
 DIST patch-1.5.11.rr.compressed.gz 9995 RMD160 f19cdeb949389cd3dd8f250ac96178f13ce92f67 SHA1 5d678038c7a2109761535bef2c7b65d93814e3d2 SHA256 1e2697136e0431508d2447de8b67fb32114d0b08ec043cc929e3ddf07202fcb5
 DIST patch-1.5.11.vvv.nntp-gentoo.bz2 44351 RMD160 e0d0754fd3f11f7a815dc6c64f0d96b13b2f580f SHA1 5618878a741199f17b61a3fea6d85976ee696814 SHA256 1e94c9862956c4292f518ead7f66192b6ad56abf5ba8660944393956bb32c723
 DIST patch-1.5.4.lpr.collapse_flagged 4790 RMD160 f8d8ea63c61557321c0afcc2a857a6b53a09629f SHA1 7118628e88a584daeb6a41e961b184ec92784993 SHA256 f0fc39fdad2f7c5ad23ee0ee7f484c2809340ac117a3f7dd8ebad57129a61a4a
-DIST patch-1.5.5.1.cd.edit_threads.9.5-gentoo-r1.bz2 6269 RMD160 e2ffc8f99bb944ca8699c5c81e44f4886454e4bb SHA1 1ae49a856cce5344f388fb5195c05b776b1bf489 SHA256 f27e3a8e132b463561e8871113e2b802854b00a9a4bc76e3a04172ef8e3aa09d
-DIST patch-1.5.5.1.cd.edit_threads.9.5-gentoo-r2.bz2 6288
 DIST patch-1.5.6.dw.mbox-hook.1 6445 RMD160 baa6e066fd834720ce02ad335c97d37982bcfab7 SHA1 e68073c37cb3a7ab30359e84470a39c58300cde5 SHA256 eaaa1b8279e358b47dca189721fb7fdcbe63576203b76e879868b30206b6166c
 DIST patch-1.5.6.dw.pgp-timeout.1 1448 RMD160 2907033013961301e3e356232c6b6cc646750746 SHA1 2675169ff3e176a431ad59054a83a4acbdd59129 SHA256 9ec9bcca7afccac1c4138be149ceb623fd9fbf60a31cec914d030ec94cde3f38
-DIST patch-1.5.6.tt.assumed_charset.1.gz 4640 RMD160 ab9a74d01a13499b0e122a7a1200bf3cbcb35014 SHA1 5f25f7f4d4a40a9d294c2d89c9f1f106d3188c64 SHA256 b9cafe5c32718ea6f952fa11397a9da72d8cc85d3ba2e9ae552606060d87303b
-DIST patch-1.5.8.rr.compressed.gz 10230 RMD160 15e6a9029229b11a1b70d911917e59fe9c5515e6 SHA1 eaeeeb9da8e88e5e57cfd88bd16c41b3ad89030e SHA256 14ab4ebd2e65908aa174cd2f37429fc4c00a503204301fe09fd37e042ec5eea4
-DIST patch-1.5.8.vvv.nntp-gentoo-r2.bz2 71752 RMD160 616740af44b0a71b6cc1481c7718168c1a7fa4dc SHA1 00b77ae7ba8a67d7a3d5f7458514b3222440a6fe SHA256 89171755d3decd131ab90084a571a82a786dc6576ed81fd156677c81758068d2
-DIST patch-1.5.8.vvv.nntp-gentoo.bz2 71780
-DIST patch-1.5.9.rr.compressed.gz 10260
-DIST patch-1.5.9.vvv.nntp-gentoo.bz2 72024
-EBUILD mutt-1.4.2.1.ebuild 3325 RMD160 d47eb33982b3b243701a7f34ed16d0bad99964e9 SHA1 822440e559fe02631df6830e0c368ef8c7076a00 SHA256 e9b0544f977363fef286f261d54ed9cc9c40dbf71da5be5e169bce35144d98f2
-MD5 0442dc8a023fb362892f0211a76643b0 mutt-1.4.2.1.ebuild 3325
-RMD160 d47eb33982b3b243701a7f34ed16d0bad99964e9 mutt-1.4.2.1.ebuild 3325
-SHA256 e9b0544f977363fef286f261d54ed9cc9c40dbf71da5be5e169bce35144d98f2 mutt-1.4.2.1.ebuild 3325
-EBUILD mutt-1.5.10-r1.ebuild 5577 RMD160 e96b0ad0d90042cd9d9eed36407b4591593a21af SHA1 56558994db7908d92e53ac55167e7e4c6f7ba919 SHA256 9ade915d3fbb4043eb0de244e71676aa7a0f4969dd87a48b5686601d50b43a2f
-MD5 fe66864cfc0e74a02e8eef626307f944 mutt-1.5.10-r1.ebuild 5577
-RMD160 e96b0ad0d90042cd9d9eed36407b4591593a21af mutt-1.5.10-r1.ebuild 5577
-SHA256 9ade915d3fbb4043eb0de244e71676aa7a0f4969dd87a48b5686601d50b43a2f mutt-1.5.10-r1.ebuild 5577
-EBUILD mutt-1.5.11-r1.ebuild 5780 RMD160 5ef7a94a86315765889f5c529422ce84a5a7ce76 SHA1 a916a2323d024fb3ca052a9992bc9c180921a4d9 SHA256 1ab10a4f034636091f6681eeb4dd5d629917daa0a789f31384bc91c536851976
-MD5 d3928473d52712c447ba78bdcd099dca mutt-1.5.11-r1.ebuild 5780
-RMD160 5ef7a94a86315765889f5c529422ce84a5a7ce76 mutt-1.5.11-r1.ebuild 5780
-SHA256 1ab10a4f034636091f6681eeb4dd5d629917daa0a789f31384bc91c536851976 mutt-1.5.11-r1.ebuild 5780
 EBUILD mutt-1.5.11-r2.ebuild 5826 RMD160 9c6ddfed254442886365632db5db43fdcca8bb3a SHA1 f2f01f25c8cd8e26065251432125fadcdb64e773 SHA256 ad541853e34fb961aaf30cf6da3bc1a1637675f7afbd2724ff445ff7c53d2a76
 MD5 4bb02d0ef6c6631248391487f07776b9 mutt-1.5.11-r2.ebuild 5826
 RMD160 9c6ddfed254442886365632db5db43fdcca8bb3a mutt-1.5.11-r2.ebuild 5826
@@ -104,38 +58,17 @@ EBUILD mutt-1.5.13.ebuild 4301 RMD160 09cdd1441ab14582118b7d6064c4f39d70cf89b4 S
 MD5 b1f3b2240eabe83924183f7d62ef99aa mutt-1.5.13.ebuild 4301
 RMD160 09cdd1441ab14582118b7d6064c4f39d70cf89b4 mutt-1.5.13.ebuild 4301
 SHA256 381ee7558b9ab307f2c892ce233d7c93053f89bb9cdbc4d9214db93395b6e33d mutt-1.5.13.ebuild 4301
-EBUILD mutt-1.5.8-r1.ebuild 4597 RMD160 222b7daf5f61f267e41f3fc5640878dbca821022 SHA1 e8b6299df945ff343fe0ad9dbf6c228e58356887 SHA256 575a95b9fae3ec6d98ea88fd9f78e7051a53493a259ccea35188b5c788577059
-MD5 4341f1162d2448007c1391f120b0b7df mutt-1.5.8-r1.ebuild 4597
-RMD160 222b7daf5f61f267e41f3fc5640878dbca821022 mutt-1.5.8-r1.ebuild 4597
-SHA256 575a95b9fae3ec6d98ea88fd9f78e7051a53493a259ccea35188b5c788577059 mutt-1.5.8-r1.ebuild 4597
-EBUILD mutt-1.5.8-r2.ebuild 4953 RMD160 f593b8a4e777df5d14415e50bd09e062b6afc87f SHA1 6d02414a1391ac08a3d2f0a2b4025726508ef279 SHA256 fc7d7f89f4fbc1647ee065b9f6dcd0035892b32132eb8e03fb9cc38572a57aed
-MD5 686e84ed1a2f55dd350786c63a5ae0b7 mutt-1.5.8-r2.ebuild 4953
-RMD160 f593b8a4e777df5d14415e50bd09e062b6afc87f mutt-1.5.8-r2.ebuild 4953
-SHA256 fc7d7f89f4fbc1647ee065b9f6dcd0035892b32132eb8e03fb9cc38572a57aed mutt-1.5.8-r2.ebuild 4953
-EBUILD mutt-1.5.9.ebuild 6261 RMD160 5e6785ef43d9fc1373d997a3569928b8eeabbf20 SHA1 0981e5dddacc7aab9697fabab6a63c6c28b42dde SHA256 015378a3efec08303b3d27bd3a00af690f3dc520e3f5f5b617dfef91e62155cb
-MD5 30320acb4631af3ac69c0f84550c6145 mutt-1.5.9.ebuild 6261
-RMD160 5e6785ef43d9fc1373d997a3569928b8eeabbf20 mutt-1.5.9.ebuild 6261
-SHA256 015378a3efec08303b3d27bd3a00af690f3dc520e3f5f5b617dfef91e62155cb mutt-1.5.9.ebuild 6261
-MISC ChangeLog 22219 RMD160 ff1c4d34fcec3320c8ce0a8cae66aeab43a98475 SHA1 5d89a559d2711e7f159e8201439a123526c21519 SHA256 a699e9d7ced8e9c9e2feffae4cb127984f6387e453bbb6da940a5d8096086fa7
-MD5 73f46701323e8bcd4bf3e04a6cc07845 ChangeLog 22219
-RMD160 ff1c4d34fcec3320c8ce0a8cae66aeab43a98475 ChangeLog 22219
-SHA256 a699e9d7ced8e9c9e2feffae4cb127984f6387e453bbb6da940a5d8096086fa7 ChangeLog 22219
+MISC ChangeLog 22583 RMD160 788ed275e11eb9e1863b891a25fbe399f13a0814 SHA1 d7eb9846099dbff55a6fd08df295c1524593d05b SHA256 2c25810bd5b90a042ae003928910830f7e208b5ad90e1b7ad3e4155eee88b3ae
+MD5 22d403160033ae16f5b3c240d2ed752f ChangeLog 22583
+RMD160 788ed275e11eb9e1863b891a25fbe399f13a0814 ChangeLog 22583
+SHA256 2c25810bd5b90a042ae003928910830f7e208b5ad90e1b7ad3e4155eee88b3ae ChangeLog 22583
 MISC metadata.xml 348 RMD160 67219e2080107537dc52f7de5c201a8e52ee0270 SHA1 8aa712f8642faf21ab136add0670cba3f8dc15d4 SHA256 a8c434275334e18b2e8c1b68fc88b5a1f6faef5a4344267d7ed708c0794b386d
 MD5 ab8fa36a71860fbc36c89a2c91745d28 metadata.xml 348
 RMD160 67219e2080107537dc52f7de5c201a8e52ee0270 metadata.xml 348
 SHA256 a8c434275334e18b2e8c1b68fc88b5a1f6faef5a4344267d7ed708c0794b386d metadata.xml 348
-MD5 cae412df424c3f499c539c93ebd02e48 files/digest-mutt-1.4.2.1 292
-RMD160 7ac7c1864079a96e5f791370e4f156c6395b176a files/digest-mutt-1.4.2.1 292
-SHA256 1825038b870137dab9824cc06926f5d05f6921cb7af2680f8e2ce4a5c0063a12 files/digest-mutt-1.4.2.1 292
-MD5 3f0418da2ce8f57b5117146a130aa7bd files/digest-mutt-1.5.10-r1 2379
-RMD160 23f13956891551640da0618c7b75ceb6ba89ae1b files/digest-mutt-1.5.10-r1 2379
-SHA256 8a453a2f87d02628edf50ebbd53fa14304c9f20253f87a7f070a3c10a6e0d07e files/digest-mutt-1.5.10-r1 2379
 MD5 69568e6998e03cb4a0ec726e6db0f77b files/digest-mutt-1.5.11 2373
 RMD160 cece5e8f8845f86c25320abbb28c016b5fe5c3d6 files/digest-mutt-1.5.11 2373
 SHA256 edab047516b025dba487a1ce5a8da5f71c75d4cbd993d50307ac4c5e16b5265e files/digest-mutt-1.5.11 2373
-MD5 69568e6998e03cb4a0ec726e6db0f77b files/digest-mutt-1.5.11-r1 2373
-RMD160 cece5e8f8845f86c25320abbb28c016b5fe5c3d6 files/digest-mutt-1.5.11-r1 2373
-SHA256 edab047516b025dba487a1ce5a8da5f71c75d4cbd993d50307ac4c5e16b5265e files/digest-mutt-1.5.11-r1 2373
 MD5 69568e6998e03cb4a0ec726e6db0f77b files/digest-mutt-1.5.11-r2 2373
 RMD160 cece5e8f8845f86c25320abbb28c016b5fe5c3d6 files/digest-mutt-1.5.11-r2 2373
 SHA256 edab047516b025dba487a1ce5a8da5f71c75d4cbd993d50307ac4c5e16b5265e files/digest-mutt-1.5.11-r2 2373
@@ -145,19 +78,10 @@ SHA256 64309746568f2c03699ad975a9db071fef8fc95a9bcb4e081d54d921fc33057a files/di
 MD5 3b282ac21c711571ace7792a326aa732 files/digest-mutt-1.5.13 518
 RMD160 f387b5242f64a563bd837a34af0123debb09a151 files/digest-mutt-1.5.13 518
 SHA256 e79af34a5a8d834a2f5556020b501596f7bdc9a82eaf73896e2e60ebac2a029a files/digest-mutt-1.5.13 518
-MD5 2a6d8631c8e9dc5787f3e81c101b2e35 files/digest-mutt-1.5.8-r1 1915
-RMD160 53c23697d035998f341bfc51c2a3f1101cce6b90 files/digest-mutt-1.5.8-r1 1915
-SHA256 b7f08e26971a5e044dc58eab918fd37ef32f65ae4627183758b452112524f66f files/digest-mutt-1.5.8-r1 1915
-MD5 961091c0e495017e75cad0bed9836aff files/digest-mutt-1.5.8-r2 2400
-RMD160 cf439a25c44776c5a28aaf2475bc09943b26991a files/digest-mutt-1.5.8-r2 2400
-SHA256 3cd60daa15a0044ff4e8b42ff8770aae0d9fcc0fa1d55567174432b7abfdce8f files/digest-mutt-1.5.8-r2 2400
-MD5 93771187b3c14e11933ee60b4a3cc9e8 files/digest-mutt-1.5.9 1779
-RMD160 7101019a6dbcda7942e348af23c17c0c1ce29ed4 files/digest-mutt-1.5.9 1779
-SHA256 cb3e4d84e1f3f26021e75b4b8e6d78f0545615c46b2f1953d9fbbe50fdb7bc63 files/digest-mutt-1.5.9 1779
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFE4LeWViELBEf1JB0RAsf8AJ98B947MR88VYduMzHNLtpSOf2/jQCcCUQx
-rCL6IMIlsce6IrE8TgR0pc8=
-=8Bmq
+iD8DBQFE4LznViELBEf1JB0RAitkAJ95mVx3OtMQDNkd+5KQ6ZumwmwwaQCeNPc4
+dWfYd54Dm/AqA2Fnzs05S8Q=
+=HwBb
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/files/8patch-1.5.6.dyc.source_stat b/mail-client/mutt/files/8patch-1.5.6.dyc.source_stat
deleted file mode 100644
index da380763263c..000000000000
--- a/mail-client/mutt/files/8patch-1.5.6.dyc.source_stat
+++ /dev/null
@@ -1,61 +0,0 @@
-? mutt/build
-? mutt/stamp-h1
-Index: mutt/init.c
-===================================================================
-RCS file: /home/roessler/cvs/mutt/init.c,v
-retrieving revision 3.19
-diff -u -r3.19 init.c
---- mutt/init.c	1 Feb 2004 18:00:16 -0000	3.19
-+++ mutt/init.c	6 Feb 2004 20:29:08 -0000
-@@ -1368,18 +1368,6 @@
-   char *linebuf = NULL;
-   size_t buflen;
-   pid_t pid;
--  struct stat s;
--
--  if (stat (rcfile, &s) < 0)
--  {
--    snprintf (err->data, err->dsize, _("%s: stat: %s"), rcfile, strerror (errno));
--    return (-1);
--  }
--  if (!S_ISREG (s.st_mode))
--  {
--    snprintf (err->data, err->dsize, _("%s: not a regular file"), rcfile);
--    return (-1);
--  }
- 
-   if ((f = mutt_open_read (rcfile, &pid)) == NULL)
-   {
-Index: mutt/muttlib.c
-===================================================================
-RCS file: /home/roessler/cvs/mutt/muttlib.c,v
-retrieving revision 3.18
-diff -u -r3.18 muttlib.c
---- mutt/muttlib.c	1 Feb 2004 17:10:43 -0000	3.18
-+++ mutt/muttlib.c	6 Feb 2004 20:29:09 -0000
-@@ -1134,6 +1134,8 @@
- FILE *mutt_open_read (const char *path, pid_t *thepid)
- {
-   FILE *f;
-+  struct stat s;
-+
-   int len = mutt_strlen (path);
- 
-   if (path[len - 1] == '|')
-@@ -1149,6 +1151,16 @@
-   }
-   else
-   {
-+    if (stat (path, &s) < 0)
-+    {
-+      mutt_error (_("%s: stat: %s"), path, strerror (errno));
-+      return (NULL);
-+    }
-+    if (!S_ISREG (s.st_mode))
-+    {
-+      mutt_error (_("%s: not a regular file"), path);
-+      return (NULL);
-+    }
-     f = fopen (path, "r");
-     *thepid = -1;
-   }
diff --git a/mail-client/mutt/files/digest-mutt-1.4.2.1 b/mail-client/mutt/files/digest-mutt-1.4.2.1
deleted file mode 100644
index 48f9e079c6bd..000000000000
--- a/mail-client/mutt/files/digest-mutt-1.4.2.1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 710bd56d3c4c4bcd1403bc4e053f7476 mutt-1.4.2.1i.tar.gz 2611253
-MD5 47b4dbd95f07d9ec2d8e0939f822b7c3 patch-1.4.2.rr.compressed.1-gentoo.bz2 13939
-MD5 18aec38f77a88995e6941df798ce4cd7 patch-1.4.0.cd.edit_threads.9.5 22168
-MD5 e5e108a990346eacff0b2648e03d098f mutt-1.4.2.1i-ja.1.tar.gz 78266
diff --git a/mail-client/mutt/files/digest-mutt-1.5.10-r1 b/mail-client/mutt/files/digest-mutt-1.5.10-r1
deleted file mode 100644
index 48b8b3364697..000000000000
--- a/mail-client/mutt/files/digest-mutt-1.5.10-r1
+++ /dev/null
@@ -1,27 +0,0 @@
-MD5 59400d12c6b5b3d122531000e53d1914 mutt-1.5.10i.tar.gz 3156345
-RMD160 e6855dd72e41b5e451b17bac9934bea8ca0c5db7 mutt-1.5.10i.tar.gz 3156345
-SHA256 0e6bcfa33ded3e025b253831d68d441f413d5717a9902a173f25f7de40061118 mutt-1.5.10i.tar.gz 3156345
-MD5 b65ec75e68ff9a0b6aca59d40822affc mutt-1.5.4-imap-fcc-status.patch 380
-RMD160 cbeac806b610bcd945bf3b52120a8aa2aba27df3 mutt-1.5.4-imap-fcc-status.patch 380
-SHA256 22cb4e1625ae2d22f94e8d815cb3515db75801f8a4cb9e4f047c4fb4ded8757c mutt-1.5.4-imap-fcc-status.patch 380
-MD5 404cb8677bb50937405531931629562f mutt-1.5.7-mixmaster+nntp.patch 310
-RMD160 38e42b700d1badb3d39550ada6eb08cb122480a0 mutt-1.5.7-mixmaster+nntp.patch 310
-SHA256 e035b746f391aaba51b2e0917ecf4c60db7c81546a9b54f06881cf75410575da mutt-1.5.7-mixmaster+nntp.patch 310
-MD5 f6cd5bd6c030d5d691d347a6e9d75b6a patch-1.5.10.rr.compressed.gz 10095
-RMD160 9af76817f36b9f3f63d1c94435e7f78eba4279d3 patch-1.5.10.rr.compressed.gz 10095
-SHA256 07a4ef9ae747c7b37edc5413c632f3d25ad43401e2b60081f9017ab761d9922f patch-1.5.10.rr.compressed.gz 10095
-MD5 ba2f45b05aa7ef453dbd3dccddf7baef patch-1.5.10.tt.assumed_charset.1.gz 2565
-RMD160 7d3fb6d32c266ed35babdb10d13aae731783a64e patch-1.5.10.tt.assumed_charset.1.gz 2565
-SHA256 97cdb63694055e218dff8b85e8c0db8b5e0c7435a91d47479604480319156c6b patch-1.5.10.tt.assumed_charset.1.gz 2565
-MD5 b6c5ba3052ce62173d8773094afacbdf patch-1.5.10.vvv.nntp-gentoo.bz2 72894
-RMD160 b1666655146bcfd346876365aa7fb0f56e9cc322 patch-1.5.10.vvv.nntp-gentoo.bz2 72894
-SHA256 9c71e8cc54122e277efca3ce9b7db7f27597fa63fa0777d3751820b9ae0e29ae patch-1.5.10.vvv.nntp-gentoo.bz2 72894
-MD5 93ea23bda53ca73a724954ee076bcfc3 patch-1.5.4.lpr.collapse_flagged 4790
-RMD160 f8d8ea63c61557321c0afcc2a857a6b53a09629f patch-1.5.4.lpr.collapse_flagged 4790
-SHA256 f0fc39fdad2f7c5ad23ee0ee7f484c2809340ac117a3f7dd8ebad57129a61a4a patch-1.5.4.lpr.collapse_flagged 4790
-MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
-RMD160 baa6e066fd834720ce02ad335c97d37982bcfab7 patch-1.5.6.dw.mbox-hook.1 6445
-SHA256 eaaa1b8279e358b47dca189721fb7fdcbe63576203b76e879868b30206b6166c patch-1.5.6.dw.mbox-hook.1 6445
-MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
-RMD160 2907033013961301e3e356232c6b6cc646750746 patch-1.5.6.dw.pgp-timeout.1 1448
-SHA256 9ec9bcca7afccac1c4138be149ceb623fd9fbf60a31cec914d030ec94cde3f38 patch-1.5.6.dw.pgp-timeout.1 1448
diff --git a/mail-client/mutt/files/digest-mutt-1.5.11-r1 b/mail-client/mutt/files/digest-mutt-1.5.11-r1
deleted file mode 100644
index f4edcdee3ebb..000000000000
--- a/mail-client/mutt/files/digest-mutt-1.5.11-r1
+++ /dev/null
@@ -1,27 +0,0 @@
-MD5 00e6f8f7c37d4840e5e30583ebee21ce mutt-1.5.11.tar.gz 3187375
-RMD160 812bfa6b1c9bfb1650341f7522298699c7b214a5 mutt-1.5.11.tar.gz 3187375
-SHA256 0ff256a9851952a5f6dfb4b7dccf5dc26db9de5502d035748abc93dec84af474 mutt-1.5.11.tar.gz 3187375
-MD5 b65ec75e68ff9a0b6aca59d40822affc mutt-1.5.4-imap-fcc-status.patch 380
-RMD160 cbeac806b610bcd945bf3b52120a8aa2aba27df3 mutt-1.5.4-imap-fcc-status.patch 380
-SHA256 22cb4e1625ae2d22f94e8d815cb3515db75801f8a4cb9e4f047c4fb4ded8757c mutt-1.5.4-imap-fcc-status.patch 380
-MD5 404cb8677bb50937405531931629562f mutt-1.5.7-mixmaster+nntp.patch 310
-RMD160 38e42b700d1badb3d39550ada6eb08cb122480a0 mutt-1.5.7-mixmaster+nntp.patch 310
-SHA256 e035b746f391aaba51b2e0917ecf4c60db7c81546a9b54f06881cf75410575da mutt-1.5.7-mixmaster+nntp.patch 310
-MD5 ba2f45b05aa7ef453dbd3dccddf7baef patch-1.5.10.tt.assumed_charset.1.gz 2565
-RMD160 7d3fb6d32c266ed35babdb10d13aae731783a64e patch-1.5.10.tt.assumed_charset.1.gz 2565
-SHA256 97cdb63694055e218dff8b85e8c0db8b5e0c7435a91d47479604480319156c6b patch-1.5.10.tt.assumed_charset.1.gz 2565
-MD5 95ec112ae0ce2cbd1b67bcc68756bf97 patch-1.5.11.rr.compressed.gz 9995
-RMD160 f19cdeb949389cd3dd8f250ac96178f13ce92f67 patch-1.5.11.rr.compressed.gz 9995
-SHA256 1e2697136e0431508d2447de8b67fb32114d0b08ec043cc929e3ddf07202fcb5 patch-1.5.11.rr.compressed.gz 9995
-MD5 d1ced97761933447ee3b8d8af9b20163 patch-1.5.11.vvv.nntp-gentoo.bz2 44351
-RMD160 e0d0754fd3f11f7a815dc6c64f0d96b13b2f580f patch-1.5.11.vvv.nntp-gentoo.bz2 44351
-SHA256 1e94c9862956c4292f518ead7f66192b6ad56abf5ba8660944393956bb32c723 patch-1.5.11.vvv.nntp-gentoo.bz2 44351
-MD5 93ea23bda53ca73a724954ee076bcfc3 patch-1.5.4.lpr.collapse_flagged 4790
-RMD160 f8d8ea63c61557321c0afcc2a857a6b53a09629f patch-1.5.4.lpr.collapse_flagged 4790
-SHA256 f0fc39fdad2f7c5ad23ee0ee7f484c2809340ac117a3f7dd8ebad57129a61a4a patch-1.5.4.lpr.collapse_flagged 4790
-MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
-RMD160 baa6e066fd834720ce02ad335c97d37982bcfab7 patch-1.5.6.dw.mbox-hook.1 6445
-SHA256 eaaa1b8279e358b47dca189721fb7fdcbe63576203b76e879868b30206b6166c patch-1.5.6.dw.mbox-hook.1 6445
-MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
-RMD160 2907033013961301e3e356232c6b6cc646750746 patch-1.5.6.dw.pgp-timeout.1 1448
-SHA256 9ec9bcca7afccac1c4138be149ceb623fd9fbf60a31cec914d030ec94cde3f38 patch-1.5.6.dw.pgp-timeout.1 1448
diff --git a/mail-client/mutt/files/digest-mutt-1.5.8-r1 b/mail-client/mutt/files/digest-mutt-1.5.8-r1
deleted file mode 100644
index 55155ff44bfe..000000000000
--- a/mail-client/mutt/files/digest-mutt-1.5.8-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-MD5 404cb8677bb50937405531931629562f mutt-1.5.7-mixmaster+nntp.patch 310
-RMD160 38e42b700d1badb3d39550ada6eb08cb122480a0 mutt-1.5.7-mixmaster+nntp.patch 310
-SHA256 e035b746f391aaba51b2e0917ecf4c60db7c81546a9b54f06881cf75410575da mutt-1.5.7-mixmaster+nntp.patch 310
-MD5 9b9bdef4ef7107332f8782b3a910d00e mutt-1.5.8i.tar.gz 3010088
-RMD160 2b941aa12381efb2cbad204ebf5512051909911b mutt-1.5.8i.tar.gz 3010088
-SHA256 3f50f60651a8c2543a8935f6593f7260b392e6207e4fa1d591ae54ba077124e0 mutt-1.5.8i.tar.gz 3010088
-MD5 8bd12eb073ef94712f3a88eb8493f195 mutt-cvs-header-cache.29 5120
-RMD160 b9c84cdc699ca8b053cc1b39cbccb225b5701749 mutt-cvs-header-cache.29 5120
-SHA256 5e7877d41480c07f2b8be146bda18261d78f42f51da5434bc5242362ad761ff0 mutt-cvs-header-cache.29 5120
-MD5 44df2038c3cb03b1f6f5d0b998a64aed patch-1.5.5.1.cd.edit_threads.9.5-gentoo-r1.bz2 6269
-RMD160 e2ffc8f99bb944ca8699c5c81e44f4886454e4bb patch-1.5.5.1.cd.edit_threads.9.5-gentoo-r1.bz2 6269
-SHA256 f27e3a8e132b463561e8871113e2b802854b00a9a4bc76e3a04172ef8e3aa09d patch-1.5.5.1.cd.edit_threads.9.5-gentoo-r1.bz2 6269
-MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
-RMD160 baa6e066fd834720ce02ad335c97d37982bcfab7 patch-1.5.6.dw.mbox-hook.1 6445
-SHA256 eaaa1b8279e358b47dca189721fb7fdcbe63576203b76e879868b30206b6166c patch-1.5.6.dw.mbox-hook.1 6445
-MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
-RMD160 2907033013961301e3e356232c6b6cc646750746 patch-1.5.6.dw.pgp-timeout.1 1448
-SHA256 9ec9bcca7afccac1c4138be149ceb623fd9fbf60a31cec914d030ec94cde3f38 patch-1.5.6.dw.pgp-timeout.1 1448
-MD5 994108508f9890329ff4ee07604a374d patch-1.5.8.rr.compressed.gz 10230
-RMD160 15e6a9029229b11a1b70d911917e59fe9c5515e6 patch-1.5.8.rr.compressed.gz 10230
-SHA256 14ab4ebd2e65908aa174cd2f37429fc4c00a503204301fe09fd37e042ec5eea4 patch-1.5.8.rr.compressed.gz 10230
-MD5 80e81a9df998d6c65821b21a864e45ed patch-1.5.8.vvv.nntp-gentoo.bz2 71780
diff --git a/mail-client/mutt/files/digest-mutt-1.5.8-r2 b/mail-client/mutt/files/digest-mutt-1.5.8-r2
deleted file mode 100644
index ee9eea1e4128..000000000000
--- a/mail-client/mutt/files/digest-mutt-1.5.8-r2
+++ /dev/null
@@ -1,27 +0,0 @@
-MD5 404cb8677bb50937405531931629562f mutt-1.5.7-mixmaster+nntp.patch 310
-RMD160 38e42b700d1badb3d39550ada6eb08cb122480a0 mutt-1.5.7-mixmaster+nntp.patch 310
-SHA256 e035b746f391aaba51b2e0917ecf4c60db7c81546a9b54f06881cf75410575da mutt-1.5.7-mixmaster+nntp.patch 310
-MD5 9b9bdef4ef7107332f8782b3a910d00e mutt-1.5.8i.tar.gz 3010088
-RMD160 2b941aa12381efb2cbad204ebf5512051909911b mutt-1.5.8i.tar.gz 3010088
-SHA256 3f50f60651a8c2543a8935f6593f7260b392e6207e4fa1d591ae54ba077124e0 mutt-1.5.8i.tar.gz 3010088
-MD5 8bd12eb073ef94712f3a88eb8493f195 mutt-cvs-header-cache.29 5120
-RMD160 b9c84cdc699ca8b053cc1b39cbccb225b5701749 mutt-cvs-header-cache.29 5120
-SHA256 5e7877d41480c07f2b8be146bda18261d78f42f51da5434bc5242362ad761ff0 mutt-cvs-header-cache.29 5120
-MD5 44df2038c3cb03b1f6f5d0b998a64aed patch-1.5.5.1.cd.edit_threads.9.5-gentoo-r1.bz2 6269
-RMD160 e2ffc8f99bb944ca8699c5c81e44f4886454e4bb patch-1.5.5.1.cd.edit_threads.9.5-gentoo-r1.bz2 6269
-SHA256 f27e3a8e132b463561e8871113e2b802854b00a9a4bc76e3a04172ef8e3aa09d patch-1.5.5.1.cd.edit_threads.9.5-gentoo-r1.bz2 6269
-MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
-RMD160 baa6e066fd834720ce02ad335c97d37982bcfab7 patch-1.5.6.dw.mbox-hook.1 6445
-SHA256 eaaa1b8279e358b47dca189721fb7fdcbe63576203b76e879868b30206b6166c patch-1.5.6.dw.mbox-hook.1 6445
-MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
-RMD160 2907033013961301e3e356232c6b6cc646750746 patch-1.5.6.dw.pgp-timeout.1 1448
-SHA256 9ec9bcca7afccac1c4138be149ceb623fd9fbf60a31cec914d030ec94cde3f38 patch-1.5.6.dw.pgp-timeout.1 1448
-MD5 c20f30c8cb6002a503aa373c5934f3bb patch-1.5.6.tt.assumed_charset.1.gz 4640
-RMD160 ab9a74d01a13499b0e122a7a1200bf3cbcb35014 patch-1.5.6.tt.assumed_charset.1.gz 4640
-SHA256 b9cafe5c32718ea6f952fa11397a9da72d8cc85d3ba2e9ae552606060d87303b patch-1.5.6.tt.assumed_charset.1.gz 4640
-MD5 994108508f9890329ff4ee07604a374d patch-1.5.8.rr.compressed.gz 10230
-RMD160 15e6a9029229b11a1b70d911917e59fe9c5515e6 patch-1.5.8.rr.compressed.gz 10230
-SHA256 14ab4ebd2e65908aa174cd2f37429fc4c00a503204301fe09fd37e042ec5eea4 patch-1.5.8.rr.compressed.gz 10230
-MD5 fb20d001bb7102cf78f8e1c734eabbdf patch-1.5.8.vvv.nntp-gentoo-r2.bz2 71752
-RMD160 616740af44b0a71b6cc1481c7718168c1a7fa4dc patch-1.5.8.vvv.nntp-gentoo-r2.bz2 71752
-SHA256 89171755d3decd131ab90084a571a82a786dc6576ed81fd156677c81758068d2 patch-1.5.8.vvv.nntp-gentoo-r2.bz2 71752
diff --git a/mail-client/mutt/files/digest-mutt-1.5.9 b/mail-client/mutt/files/digest-mutt-1.5.9
deleted file mode 100644
index 5d709530b91a..000000000000
--- a/mail-client/mutt/files/digest-mutt-1.5.9
+++ /dev/null
@@ -1,21 +0,0 @@
-MD5 404cb8677bb50937405531931629562f mutt-1.5.7-mixmaster+nntp.patch 310
-RMD160 38e42b700d1badb3d39550ada6eb08cb122480a0 mutt-1.5.7-mixmaster+nntp.patch 310
-SHA256 e035b746f391aaba51b2e0917ecf4c60db7c81546a9b54f06881cf75410575da mutt-1.5.7-mixmaster+nntp.patch 310
-MD5 c5318eba3404ebd78a15c680fa1b6056 mutt-1.5.9i.tar.gz 3036003
-RMD160 888848046382b3c4e8b18eacd30af4291a7ed23d mutt-1.5.9i.tar.gz 3036003
-SHA256 d80142bfe7dd2c8ee9c2345c71fedded8b971267a9a29a853d48c562dd0605d4 mutt-1.5.9i.tar.gz 3036003
-MD5 8bd12eb073ef94712f3a88eb8493f195 mutt-cvs-header-cache.29 5120
-RMD160 b9c84cdc699ca8b053cc1b39cbccb225b5701749 mutt-cvs-header-cache.29 5120
-SHA256 5e7877d41480c07f2b8be146bda18261d78f42f51da5434bc5242362ad761ff0 mutt-cvs-header-cache.29 5120
-MD5 82357a1177e6c7de7b2ddcd6d95894ed patch-1.5.5.1.cd.edit_threads.9.5-gentoo-r2.bz2 6288
-MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
-RMD160 baa6e066fd834720ce02ad335c97d37982bcfab7 patch-1.5.6.dw.mbox-hook.1 6445
-SHA256 eaaa1b8279e358b47dca189721fb7fdcbe63576203b76e879868b30206b6166c patch-1.5.6.dw.mbox-hook.1 6445
-MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
-RMD160 2907033013961301e3e356232c6b6cc646750746 patch-1.5.6.dw.pgp-timeout.1 1448
-SHA256 9ec9bcca7afccac1c4138be149ceb623fd9fbf60a31cec914d030ec94cde3f38 patch-1.5.6.dw.pgp-timeout.1 1448
-MD5 c20f30c8cb6002a503aa373c5934f3bb patch-1.5.6.tt.assumed_charset.1.gz 4640
-RMD160 ab9a74d01a13499b0e122a7a1200bf3cbcb35014 patch-1.5.6.tt.assumed_charset.1.gz 4640
-SHA256 b9cafe5c32718ea6f952fa11397a9da72d8cc85d3ba2e9ae552606060d87303b patch-1.5.6.tt.assumed_charset.1.gz 4640
-MD5 9d9ef4ec0e970f9fc3de2d5c6219a349 patch-1.5.9.rr.compressed.gz 10260
-MD5 52778aa7e5b9d46a724e1c386f6ef9f9 patch-1.5.9.vvv.nntp-gentoo.bz2 72024
diff --git a/mail-client/mutt/files/mutt-1.5.10-nodoc.patch b/mail-client/mutt/files/mutt-1.5.10-nodoc.patch
deleted file mode 100644
index e88176d7134d..000000000000
--- a/mail-client/mutt/files/mutt-1.5.10-nodoc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mutt-1.5.10/doc/Makefile.in.nodoc	2005-08-17 11:50:30.000000000 -0400
-+++ mutt-1.5.10/doc/Makefile.in	2005-08-17 11:50:38.000000000 -0400
-@@ -64,7 +64,7 @@
- 	ChangeLog.old					\
- 	README NEWS TODO README.SECURITY README.SSL 
- 
--all: mutt.1 muttrc.man try-html try-txt
-+all: mutt.1 muttrc.man
- 
- try-html: ../makedoc$(EXEEXT)
- 	test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
diff --git a/mail-client/mutt/files/mutt-1.5.9-nodoc.patch b/mail-client/mutt/files/mutt-1.5.9-nodoc.patch
deleted file mode 100644
index 5c97e8e66d55..000000000000
--- a/mail-client/mutt/files/mutt-1.5.9-nodoc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mutt-1.5.9/doc/Makefile.in.nosgml	2005-02-15 14:28:24.000000000 -0500
-+++ mutt-1.5.9/doc/Makefile.in	2005-08-11 19:17:29.210073879 -0400
-@@ -63,7 +63,7 @@
- 	ChangeLog.old					\
- 	README NEWS TODO README.SECURITY README.SSL 
- 
--all: muttrc.man try-html try-txt
-+all: muttrc.man
- 
- try-html: ../makedoc
- 	test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
diff --git a/mail-client/mutt/files/mutt-1.5.9-sasl.patch b/mail-client/mutt/files/mutt-1.5.9-sasl.patch
deleted file mode 100644
index dead1a793fe1..000000000000
--- a/mail-client/mutt/files/mutt-1.5.9-sasl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- mutt-1.5.9/configure.in.sasl	2005-08-11 19:39:15.000000000 -0400
-+++ mutt-1.5.9/configure.in	2005-08-11 19:39:41.499356683 -0400
-@@ -645,13 +645,13 @@
- 
- AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl[=PFX]], [Use Cyrus SASL library for POP/IMAP authentication]),
-         [
--        if test "$need_socket" != "yes"
--        then
--          AC_MSG_ERROR([SASL support is only useful with POP or IMAP support])
--        fi
--
-         if test "$with_sasl" != "no"
-         then
-+          if test "$need_socket" != "yes"
-+          then
-+            AC_MSG_ERROR([SASL support is only useful with POP or IMAP support])
-+          fi
-+
-           if test "$with_sasl" != "yes"
-           then
-             CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
-@@ -675,13 +675,13 @@
- 
- AC_ARG_WITH(sasl2, AC_HELP_STRING([--with-sasl2[=PFX]], [Use Cyrus SASL library version 2 for POP/IMAP authentication]),
-         [
--        if test "$need_socket" != "yes"
--        then
--          AC_MSG_ERROR([SASL support is only useful with POP or IMAP support])
--        fi
--
-         if test "$with_sasl2" != "no"
-         then
-+          if test "$need_socket" != "yes"
-+          then
-+            AC_MSG_ERROR([SASL support is only useful with POP or IMAP support])
-+          fi
-+
-           if test "$with_sasl2" != "yes"
-           then
-             CPPFLAGS="$CPPFLAGS -I$with_sasl2/include"
diff --git a/mail-client/mutt/mutt-1.4.2.1.ebuild b/mail-client/mutt/mutt-1.4.2.1.ebuild
deleted file mode 100644
index f27357ca94f7..000000000000
--- a/mail-client/mutt/mutt-1.4.2.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.4.2.1.ebuild,v 1.10 2006/08/14 17:48:48 ferdy Exp $
-
-IUSE="cjk imap mbox nls slang ssl vanilla"
-
-inherit eutils flag-o-matic
-
-edit_threads_patch="patch-1.4.0.cd.edit_threads.9.5"
-compressed_patch="patch-1.4.2.rr.compressed.1-gentoo.bz2"
-cjk_patch="mutt-${PV}i-ja.1.tar.gz"
-
-DESCRIPTION="a small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org"
-SRC_URI="ftp://ftp.mutt.org/mutt/mutt-${PV}i.tar.gz
-	mirror://gentoo/${compressed_patch}
-	http://cedricduval.free.fr/mutt/patches/download/${edit_threads_patch}
-	cjk? ( http://www.emaillab.org/mutt/1.4/${cjk_patch} )"
-#	http://www.spinnaker.de/mutt/compressed/${compressed_patch}
-
-RDEPEND="nls? ( sys-devel/gettext )
-	>=sys-libs/ncurses-5.2
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	slang? ( =sys-libs/slang-1* )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha hppa ~mips ppc sparc x86"
-
-pkg_setup() {
-	if ! use imap; then
-		echo
-		einfo "NOTE: The USE variable 'imap' is not in your USE flags."
-		einfo "For imap support in mutt, you will need to restart the build with USE=imap"
-		echo
-	fi
-}
-
-src_unpack() {
-	unpack ${P}i.tar.gz && cd ${S} || die "unpack failed"
-	if ! use vanilla; then
-		epatch ${DISTDIR}/${compressed_patch}
-		epatch ${DISTDIR}/${edit_threads_patch}
-	fi
-	if use cjk; then
-		cd ${WORKDIR}
-		unpack ${cjk_patch} && cd ${S} || die "unpack cjk failed"
-		epatch ${WORKDIR}/${cjk_patch%.t*}/patch-${PV}.tt.ja.1
-	fi
-}
-
-src_compile() {
-	local myconf="
-		$(use_enable nls) \
-		$(use_with ssl) \
-		$(use_enable imap) \
-		$(use_enable cjk default-japanese) \
-		--sysconfdir=/etc/mutt \
-		--with-docdir=/usr/share/doc/mutt-${PVR} \
-		--with-regex --enable-pop --enable-nfs-fix \
-		--disable-fcntl --enable-flock --enable-external-dotlock"
-
-	# See Bug #22787
-	unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
-
-	# See Bug #11170
-	case ${ARCH} in
-		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
-	esac
-
-	if use slang; then
-		myconf="${myconf} --with-slang"
-		ewarn "If you want a transparent background,"
-		ewarn "please merge mutt with USE=-slang."
-	else
-		# --without-slang doesn't work;
-		# specify --with-curses if you don't want slang
-		# (26 Sep 2001 agriffis)
-		myconf="${myconf} --with-curses"
-	fi
-
-	if use mbox; then
-		myconf="${myconf} --with-maildir=/var/spool/mail"
-	else
-		myconf="${myconf} --with-homespool=Maildir"
-	fi
-
-
-	if ! use vanilla; then
-		# imap part of edit_threads patch
-		myconf="${myconf} $(use_enable imap imap-edit-threads)"
-
-		# rr.compressed patch
-		myconf="${myconf} --enable-compressed"
-	fi
-	econf ${myconf}
-	sed -i 's/README.UPGRADE//' doc/Makefile || die "sed failed"
-	make || die "make failed (myconf=${myconf})"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "install failed"
-	find ${D}/usr/share/doc -type f | grep -v html | xargs gzip
-	if use mbox; then
-		echo "Not installing an /etc/Muttrc as mbox is default configuration"
-		echo "with mutt"
-	else
-		insinto /etc/mutt
-		doins $FILESDIR/Muttrc
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	echo
-	einfo "For information about using mutt, please refer to:"
-	einfo "  http://www.gentoo.org/doc/en/guide-to-mutt.xml"
-	echo
-}
diff --git a/mail-client/mutt/mutt-1.5.10-r1.ebuild b/mail-client/mutt/mutt-1.5.10-r1.ebuild
deleted file mode 100644
index 978dc90ba22f..000000000000
--- a/mail-client/mutt/mutt-1.5.10-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.10-r1.ebuild,v 1.2 2006/08/14 17:48:48 ferdy Exp $
-
-inherit eutils flag-o-matic
-
-patch_assumed_charset="patch-1.5.10.tt.assumed_charset.1.gz"
-patch_compressed="patch-${PV}.rr.compressed.gz"
-patch_mbox_hook="patch-1.5.6.dw.mbox-hook.1"
-patch_pgp_timeout="patch-1.5.6.dw.pgp-timeout.1"
-patch_imap_fcc_status="mutt-1.5.4-imap-fcc-status.patch"
-patch_collapse_flagged="patch-1.5.4.lpr.collapse_flagged"
-opt_patch_nntp="patch-${PV}.vvv.nntp-gentoo.bz2"
-
-DESCRIPTION="a small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org"
-SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}i.tar.gz
-	!vanilla? (
-		http://www.emaillab.org/${PN}/${PV}/${patch_assumed_charset}
-		http://mutt.kiev.ua/download/${P}/${patch_compressed}
-		http://www.woolridge.ca/${PN}/patches/${patch_mbox_hook}
-		http://www.woolridge.ca/${PN}/patches/${patch_pgp_timeout}
-		http://www.plumlocosoft.com/software/download/${patch_imap_fcc_status}
-		http://debian.lpr.ch/Mutt/${patch_collapse_flagged}
-		nntp? (
-			http://dev.gentoo.org/~agriffis/dist/${opt_patch_nntp}
-			mirror://gentoo/mutt-1.5.7-mixmaster+nntp.patch
-		)
-	)"
-IUSE="berkdb buffysize cjk crypt debug gdbm gnutls gpgme imap mbox nls nntp pop sasl smime ssl vanilla"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-RDEPEND="nls? ( sys-devel/gettext )
-	>=sys-libs/ncurses-5.2
-	gdbm?    ( sys-libs/gdbm )
-	!gdbm?   ( berkdb? ( >=sys-libs/db-4 ) )
-	imap?    (
-		gnutls?  ( >=net-libs/gnutls-1.0.17 )
-		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
-		sasl?    ( >=dev-libs/cyrus-sasl-2 )
-	)
-	pop?     (
-		gnutls?  ( >=net-libs/gnutls-1.0.17 )
-		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
-		sasl?    ( >=dev-libs/cyrus-sasl-2 )
-	)
-	gpgme?   ( >=app-crypt/gpgme-0.9.0 )"
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	sys-devel/autoconf
-	!vanilla? ( sys-devel/automake )"
-
-pkg_setup() {
-	if ! use imap; then
-		echo
-		einfo "The USE variable 'imap' is not in your USE flags."
-		einfo "For imap support in mutt, you will need to restart the build with USE=imap"
-		echo
-	fi
-}
-
-src_unpack() {
-	unpack ${P}i.tar.gz && cd ${S} || die "unpack failed"
-
-	# fix sasl support in configure.in
-	epatch ${FILESDIR}/mutt-1.5.9-sasl.patch
-
-	# disable sgml conversion since it fails with sgml2html
-	epatch ${FILESDIR}/mutt-1.5.10-nodoc.patch
-
-	if ! use vanilla ; then
-		for p in ${!patch_*} ; do
-			epatch ${DISTDIR}/${!p}
-		done
-
-		if use nntp; then
-			epatch ${DISTDIR}/${opt_patch_nntp}
-			# Allow mutt to build with mixmaster and nntp both enabled
-			epatch ${DISTDIR}/mutt-1.5.7-mixmaster+nntp.patch
-		fi
-
-		rm -rf configure autom4te.cache
-		aclocal -I m4					|| die "aclocal failed"
-		autoheader						|| die "autoheader failed"
-		emake -C m4 -f Makefile.am.in	|| die "emake in m4 failed"
-		automake --foreign				|| die "automake failed"
-	fi
-
-	WANT_AUTOCONF=2.1 autoconf		|| die "autoconf failed"
-}
-
-src_compile() {
-	declare myconf="
-		$(use_enable nls) \
-		$(use_enable gpgme) \
-		$(use_enable imap) \
-		$(use_enable pop) \
-		$(use_enable crypt pgp) \
-		$(use_enable smime) \
-		$(use_enable cjk default-japanese) \
-		$(use_enable debug) \
-		--with-curses \
-		--sysconfdir=/etc/${PN} \
-		--with-docdir=/usr/share/doc/${PN}-${PVR} \
-		--with-regex \
-		--disable-fcntl --enable-flock \
-		--enable-nfs-fix --enable-external-dotlock \
-		--with-mixmaster \
-		--without-sasl"
-
-	# See Bug #22787
-	unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
-
-	# mutt prioritizes gdbm over bdb, so we will too.
-	# hcache feature requires at least one database is in USE.
-	if use gdbm; then
-		myconf="${myconf} --enable-hcache --with-gdbm --without-bdb"
-	elif use berkdb; then
-		myconf="${myconf} --enable-hcache --with-bdb --without-gdbm"
-	else
-		myconf="${myconf} --disable-hcache --without-gdbm --without-bdb"
-	fi
-
-	# there's no need for gnutls, ssl or sasl without either pop or imap.
-	# in fact mutt's configure will bail if you do:
-	#   --without-pop --without-imap --with-ssl
-	if use pop || use imap; then
-		if use gnutls; then
-			myconf="${myconf} --with-gnutls"
-		elif use ssl; then
-			myconf="${myconf} --with-ssl"
-		fi
-		# not sure if this should be mutually exclusive with the other two
-		myconf="${myconf} $(use_with sasl sasl2)"
-	else
-		myconf="${myconf} --without-gnutls --without-ssl --without-sasl2"
-	fi
-
-	# See Bug #11170
-	case ${ARCH} in
-		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
-	esac
-
-	if use buffysize; then
-		ewarn "USE=buffy-size is just a workaround. Disable it if you don't need it."
-		myconf="${myconf} --enable-buffy-size"
-	fi
-
-	if use mbox; then
-		myconf="${myconf} --with-mailpath=/var/spool/mail"
-	else
-		myconf="${myconf} --with-homespool=Maildir"
-	fi
-
-	if ! use vanilla; then
-		# rr.compressed patch
-		myconf="${myconf} --enable-compressed"
-
-		# nntp patch
-		myconf="${myconf} $(use_enable nntp)"
-	fi
-
-	econf ${myconf} || die "configure failed"
-	make || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install failed"
-	find ${D}/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip
-	if use mbox; then
-		insinto /etc/mutt
-		newins ${FILESDIR}/Muttrc.mbox Muttrc
-	else
-		insinto /etc/mutt
-		doins ${FILESDIR}/Muttrc
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	echo
-	einfo "If you are new to mutt you may want to take a look at"
-	einfo "the Gentoo QuickStart Guide to Mutt E-Mail:"
-	einfo "   http://www.gentoo.org/doc/en/guide-to-mutt.xml"
-	echo
-}
diff --git a/mail-client/mutt/mutt-1.5.11-r1.ebuild b/mail-client/mutt/mutt-1.5.11-r1.ebuild
deleted file mode 100644
index a291fefdbe37..000000000000
--- a/mail-client/mutt/mutt-1.5.11-r1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.11-r1.ebuild,v 1.2 2006/08/14 17:48:48 ferdy Exp $
-
-inherit eutils flag-o-matic
-
-patch_assumed_charset="patch-1.5.10.tt.assumed_charset.1.gz"
-patch_compressed="patch-${PV}.rr.compressed.gz"
-patch_mbox_hook="patch-1.5.6.dw.mbox-hook.1"
-patch_pgp_timeout="patch-1.5.6.dw.pgp-timeout.1"
-patch_imap_fcc_status="mutt-1.5.4-imap-fcc-status.patch"
-patch_collapse_flagged="patch-1.5.4.lpr.collapse_flagged"
-opt_patch_nntp="patch-${PV}.vvv.nntp-gentoo.bz2"
-
-DESCRIPTION="a small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org"
-SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
-	!vanilla? (
-		http://www.emaillab.org/${PN}/1.5.10/${patch_assumed_charset}
-		http://mutt.kiev.ua/download/${P}/${patch_compressed}
-		http://www.woolridge.ca/${PN}/patches/${patch_mbox_hook}
-		http://www.woolridge.ca/${PN}/patches/${patch_pgp_timeout}
-		http://www.plumlocosoft.com/software/download/${patch_imap_fcc_status}
-		http://debian.lpr.ch/Mutt/${patch_collapse_flagged}
-		nntp? (
-			http://dev.gentoo.org/~ferdy/distfiles/${opt_patch_nntp}
-			mirror://gentoo/mutt-1.5.7-mixmaster+nntp.patch
-		)
-	)"
-IUSE="berkdb buffysize cjk crypt debug gdbm gnutls gpgme idn imap mbox nls nntp pop sasl smime ssl vanilla"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-RDEPEND="nls? ( sys-devel/gettext )
-	>=sys-libs/ncurses-5.2
-	gdbm?    ( sys-libs/gdbm )
-	!gdbm?   ( berkdb? ( >=sys-libs/db-4 ) )
-	imap?    (
-		gnutls?  ( >=net-libs/gnutls-1.0.17 )
-		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
-		sasl?    ( >=dev-libs/cyrus-sasl-2 )
-	)
-	pop?     (
-		gnutls?  ( >=net-libs/gnutls-1.0.17 )
-		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
-		sasl?    ( >=dev-libs/cyrus-sasl-2 )
-	)
-	idn?     ( net-dns/libidn )
-	gpgme?   ( >=app-crypt/gpgme-0.9.0 )
-	smime?   ( >=dev-libs/openssl-0.9.6 )
-	app-misc/mime-types"
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	~sys-devel/autoconf-2.59
-	!vanilla? ( sys-devel/automake )"
-
-pkg_setup() {
-	if ! use imap; then
-		echo
-		einfo "The USE variable 'imap' is not in your USE flags."
-		einfo "For imap support in mutt, you will need to restart the build with USE=imap"
-		echo
-	fi
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz && cd ${S} || die "unpack failed"
-
-	# Fix configure.in sasl checking
-	epatch "${FILESDIR}/${P}-sasl.patch"
-
-	# Fix smime message signing
-	epatch "${FILESDIR}/${P}-fix-smime.patch"
-
-	if ! use vanilla ; then
-		for p in ${!patch_*} ; do
-			epatch ${DISTDIR}/${!p}
-		done
-
-		if use nntp; then
-			epatch ${DISTDIR}/${opt_patch_nntp}
-			# Allow mutt to build with mixmaster and nntp both enabled
-			epatch ${DISTDIR}/mutt-1.5.7-mixmaster+nntp.patch
-		fi
-
-		rm -rf configure autom4te.cache
-		aclocal -I m4					|| die "aclocal failed"
-		autoheader						|| die "autoheader failed"
-		emake -C m4 -f Makefile.am.in	|| die "emake in m4 failed"
-		automake --foreign				|| die "automake failed"
-	fi
-
-	WANT_AUTOCONF=2.5 autoconf		|| die "autoconf failed"
-}
-
-src_compile() {
-	declare myconf="
-		$(use_enable nls) \
-		$(use_enable gpgme) \
-		$(use_enable imap) \
-		$(use_enable pop) \
-		$(use_enable crypt pgp) \
-		$(use_enable smime) \
-		$(use_enable cjk default-japanese) \
-		$(use_enable debug) \
-		$(use_with idn) \
-		--with-curses \
-		--sysconfdir=/etc/${PN} \
-		--with-docdir=/usr/share/doc/${PN}-${PVR} \
-		--with-regex \
-		--disable-fcntl --enable-flock \
-		--enable-nfs-fix --enable-external-dotlock \
-		--with-mixmaster"
-
-	# See Bug #22787
-	unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
-
-	# mutt prioritizes gdbm over bdb, so we will too.
-	# hcache feature requires at least one database is in USE.
-	if use gdbm; then
-		myconf="${myconf} --enable-hcache --with-gdbm --without-bdb"
-	elif use berkdb; then
-		myconf="${myconf} --enable-hcache --with-bdb --without-gdbm"
-	else
-		myconf="${myconf} --disable-hcache --without-gdbm --without-bdb"
-	fi
-
-	# there's no need for gnutls, ssl or sasl without either pop or imap.
-	# in fact mutt's configure will bail if you do:
-	#   --without-pop --without-imap --with-ssl
-	if use pop || use imap; then
-		if use gnutls; then
-			myconf="${myconf} --with-gnutls"
-		elif use ssl; then
-			myconf="${myconf} --with-ssl"
-		fi
-		# not sure if this should be mutually exclusive with the other two
-		myconf="${myconf} $(use_with sasl)"
-	else
-		myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
-	fi
-
-	# See Bug #11170
-	case ${ARCH} in
-		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
-	esac
-
-	if use buffysize; then
-		ewarn "USE=buffy-size is just a workaround. Disable it if you don't need it."
-		myconf="${myconf} --enable-buffy-size"
-	fi
-
-	if use mbox; then
-		myconf="${myconf} --with-mailpath=/var/spool/mail"
-	else
-		myconf="${myconf} --with-homespool=Maildir"
-	fi
-
-	if ! use vanilla; then
-		# rr.compressed patch
-		myconf="${myconf} --enable-compressed"
-
-		# nntp patch
-		myconf="${myconf} $(use_enable nntp)"
-	fi
-
-	econf ${myconf} || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install failed"
-	find ${D}/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip
-	if use mbox; then
-		insinto /etc/mutt
-		newins ${FILESDIR}/Muttrc.mbox Muttrc
-	else
-		insinto /etc/mutt
-		doins ${FILESDIR}/Muttrc
-	fi
-
-	# A newer file is provided by app-misc/mime-types. So we link it.
-	rm ${D}/etc/${PN}/mime.types
-	dosym /etc/mime.types /etc/${PN}/mime.types
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	echo
-	einfo "If you are new to mutt you may want to take a look at"
-	einfo "the Gentoo QuickStart Guide to Mutt E-Mail:"
-	einfo "   http://www.gentoo.org/doc/en/guide-to-mutt.xml"
-	echo
-}
diff --git a/mail-client/mutt/mutt-1.5.8-r1.ebuild b/mail-client/mutt/mutt-1.5.8-r1.ebuild
deleted file mode 100644
index a644dd52d369..000000000000
--- a/mail-client/mutt/mutt-1.5.8-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.8-r1.ebuild,v 1.12 2006/08/14 17:48:48 ferdy Exp $
-
-inherit eutils flag-o-matic
-IUSE="cjk ssl nls slang crypt imap mbox nntp sasl vanilla"
-
-edit_threads_patch="patch-1.5.5.1.cd.edit_threads.9.5-gentoo-r1.bz2"
-compressed_patch="patch-${PV}.rr.compressed.gz"
-nntp_patch="patch-${PV}.vvv.nntp-gentoo.bz2"
-mbox_hook_patch="patch-1.5.6.dw.mbox-hook.1"
-header_cache_patch="mutt-cvs-header-cache.29"
-pgp_timeout_patch="patch-1.5.6.dw.pgp-timeout.1"
-
-DESCRIPTION="a small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org"
-SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
-	!vanilla? (
-		mirror://gentoo/${edit_threads_patch}
-		http://mutt.kiev.ua/download/${P}/${compressed_patch}
-		http://www.woolridge.ca/mutt/patches/${mbox_hook_patch}
-		nntp? (
-			mirror://gentoo/${nntp_patch}
-			mirror://gentoo/mutt-1.5.7-mixmaster+nntp.patch
-		)
-		http://wwwcip.informatik.uni-erlangen.de/~sithglan/mutt/${header_cache_patch}
-		http://www.woolridge.ca/mutt/patches/${pgp_timeout_patch}
-	)"
-#	http://cedricduval.free.fr/mutt/patches/download/${edit_threads_patch}
-
-RDEPEND="nls? ( sys-devel/gettext )
-	>=sys-libs/ncurses-5.2
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	slang? ( =sys-libs/slang-1* )
-	!vanilla? ( sys-libs/gdbm )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )"
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	!vanilla? ( sys-devel/automake sys-devel/autoconf )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc-macos ppc64 sparc x86"
-
-pkg_setup() {
-	if ! use imap; then
-		echo
-		einfo "NOTE: The USE variable 'imap' is not in your USE flags."
-		einfo "For imap support in mutt, you will need to restart the build with USE=imap"
-		echo
-	fi
-}
-
-src_unpack() {
-	unpack ${P}i.tar.gz && cd ${S} || die "unpack failed"
-	if ! use vanilla; then
-		epatch ${DISTDIR}/${compressed_patch}
-		epatch ${DISTDIR}/${edit_threads_patch}
-		epatch ${DISTDIR}/${mbox_hook_patch}
-		epatch ${DISTDIR}/${header_cache_patch}
-		epatch ${DISTDIR}/${pgp_timeout_patch}
-		epatch ${DISTDIR}/${auto_decode_patch}
-		if use nntp; then
-			epatch ${DISTDIR}/${nntp_patch}
-			# Allow mutt to build with mixmaster and nntp both enabled
-			epatch ${DISTDIR}/mutt-1.5.7-mixmaster+nntp.patch
-		fi
-
-		# The following steps are necessary for the nntp patch and the
-		# header_cache_patch
-		aclocal -I m4					|| die "aclocal failed"
-		autoheader						|| die "autoheader failed"
-		make -C m4 -f Makefile.am.in	|| die "make in m4 failed"
-		automake --foreign				|| die "automake failed"
-		WANT_AUTOCONF=2.1 autoconf		|| die "autoconf failed"
-	fi
-}
-
-src_compile() {
-	local myconf="
-		$(use_enable nls) \
-		$(use_with ssl) \
-		$(use_enable imap) \
-		$(use_enable crypt pgp) \
-		$(use_enable crypt smime) \
-		$(use_enable cjk default-japanese) \
-		$(use_with sasl sasl2) \
-		--enable-compressed \
-		--with-mixmaster \
-		--sysconfdir=/etc/mutt \
-		--with-docdir=/usr/share/doc/mutt-${PVR} \
-		--with-regex --enable-pop --enable-nfs-fix \
-		--disable-fcntl --enable-flock --enable-external-dotlock"
-
-	# See Bug #22787
-	unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
-
-	# See Bug #11170
-	case ${ARCH} in
-		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
-	esac
-
-	if use slang; then
-		myconf="${myconf} --with-slang"
-		ewarn "If you want a transparent background,"
-		ewarn "please merge mutt with USE=-slang."
-	else
-		# --without-slang doesn't work;
-		# specify --with-curses if you don't want slang
-		# (26 Sep 2001 agriffis)
-		myconf="${myconf} --with-curses"
-	fi
-
-	if use mbox; then
-		myconf="${myconf} --with-maildir=/var/spool/mail"
-	else
-		myconf="${myconf} --with-homespool=Maildir"
-	fi
-
-	if ! use vanilla; then
-		# imap part of edit_threads patch
-		myconf="${myconf} $(use_enable imap imap-edit-threads)"
-
-		# rr.compressed patch
-		myconf="${myconf} --enable-compressed"
-
-		# nntp patch
-		myconf="${myconf} $(use_enable nntp)"
-
-		# maildir_header_cache_patch
-		myconf="${myconf} --enable-hcache"
-	fi
-
-	econf ${myconf}
-	make || die "make failed (myconf=${myconf})"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install failed"
-	find ${D}/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip
-	if use mbox; then
-		insinto /etc/mutt
-		newins ${FILESDIR}/Muttrc.mbox Muttrc
-	else
-		insinto /etc/mutt
-		doins ${FILESDIR}/Muttrc
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	echo
-	einfo "For information about using mutt, please refer to:"
-	einfo "  http://www.gentoo.org/doc/en/guide-to-mutt.xml"
-	echo
-}
diff --git a/mail-client/mutt/mutt-1.5.8-r2.ebuild b/mail-client/mutt/mutt-1.5.8-r2.ebuild
deleted file mode 100644
index 582930875591..000000000000
--- a/mail-client/mutt/mutt-1.5.8-r2.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.8-r2.ebuild,v 1.11 2006/08/14 17:48:48 ferdy Exp $
-
-inherit eutils flag-o-matic
-IUSE="cjk ssl nls slang crypt imap mbox nntp sasl buffysize vanilla"
-
-edit_threads_patch="patch-1.5.5.1.cd.edit_threads.9.5-gentoo-r1.bz2"
-compressed_patch="patch-${PV}.rr.compressed.gz"
-nntp_patch="patch-${PV}.vvv.nntp-gentoo-r2.bz2"
-mbox_hook_patch="patch-1.5.6.dw.mbox-hook.1"
-header_cache_patch="mutt-cvs-header-cache.29"
-pgp_timeout_patch="patch-1.5.6.dw.pgp-timeout.1"
-assumed_charset_patch="patch-1.5.6.tt.assumed_charset.1.gz"
-
-DESCRIPTION="a small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org"
-SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
-	!vanilla? (
-		mirror://gentoo/${edit_threads_patch}
-		http://www.emaillab.org/mutt/1.5/${assumed_charset_patch}
-		http://mutt.kiev.ua/download/${P}/${compressed_patch}
-		http://www.woolridge.ca/mutt/patches/${mbox_hook_patch}
-		nntp? (
-			mirror://gentoo/${nntp_patch}
-			mirror://gentoo/mutt-1.5.7-mixmaster+nntp.patch
-		)
-		http://wwwcip.informatik.uni-erlangen.de/~sithglan/mutt/${header_cache_patch}
-		http://www.woolridge.ca/mutt/patches/${pgp_timeout_patch}
-	)"
-#	http://cedricduval.free.fr/mutt/patches/download/${edit_threads_patch}
-
-RDEPEND="nls? ( sys-devel/gettext )
-	>=sys-libs/ncurses-5.2
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	slang? ( =sys-libs/slang-1* )
-	!vanilla? ( sys-libs/gdbm )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )"
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	!vanilla? ( sys-devel/automake sys-devel/autoconf )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ~ppc-macos ppc64 sparc x86"
-
-pkg_setup() {
-	if ! use imap; then
-		echo
-		einfo "NOTE: The USE variable 'imap' is not in your USE flags."
-		einfo "For imap support in mutt, you will need to restart the build with USE=imap"
-		echo
-	fi
-}
-
-src_unpack() {
-	unpack ${P}i.tar.gz && cd ${S} || die "unpack failed"
-	if ! use vanilla; then
-		epatch ${DISTDIR}/${compressed_patch}
-		epatch ${DISTDIR}/${edit_threads_patch}
-		epatch ${DISTDIR}/${mbox_hook_patch}
-		epatch ${DISTDIR}/${header_cache_patch}
-		epatch ${DISTDIR}/${pgp_timeout_patch}
-		epatch ${DISTDIR}/${assumed_charset_patch}
-		epatch ${DISTDIR}/${auto_decode_patch}
-		if use nntp; then
-			epatch ${DISTDIR}/${nntp_patch}
-			# Allow mutt to build with mixmaster and nntp both enabled
-			epatch ${DISTDIR}/mutt-1.5.7-mixmaster+nntp.patch
-		fi
-
-		# The following steps are necessary for the nntp patch and the
-		# header_cache_patch
-		aclocal -I m4					|| die "aclocal failed"
-		autoheader						|| die "autoheader failed"
-		emake -C m4 -f Makefile.am.in	|| die "emake in m4 failed"
-		automake --foreign				|| die "automake failed"
-		WANT_AUTOCONF=2.1 autoconf		|| die "autoconf failed"
-	fi
-}
-
-src_compile() {
-	local myconf="
-		$(use_enable nls) \
-		$(use_with ssl) \
-		$(use_enable imap) \
-		$(use_enable crypt pgp) \
-		$(use_enable crypt smime) \
-		$(use_enable cjk default-japanese) \
-		$(use_with sasl sasl2) \
-		--enable-compressed \
-		--with-mixmaster \
-		--sysconfdir=/etc/mutt \
-		--with-docdir=/usr/share/doc/mutt-${PVR} \
-		--with-regex --enable-pop --enable-nfs-fix \
-		--disable-fcntl --enable-flock --enable-external-dotlock"
-
-	# See Bug #22787
-	unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
-
-	# See Bug #11170
-	case ${ARCH} in
-		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
-	esac
-
-	if use buffysize; then
-		ewarn "You're using --enable-buffy-size. This is just a workaround. Disable it if you don't need it."
-		myconf="${myconf} --enable-buffy-size"
-	fi
-
-	if use slang; then
-		myconf="${myconf} --with-slang"
-		ewarn "If you want a transparent background,"
-		ewarn "please merge mutt with USE=-slang."
-	else
-		# --without-slang doesn't work;
-		# specify --with-curses if you don't want slang
-		# (26 Sep 2001 agriffis)
-		myconf="${myconf} --with-curses"
-	fi
-
-	if use mbox; then
-		myconf="${myconf} --with-maildir=/var/spool/mail"
-	else
-		myconf="${myconf} --with-homespool=Maildir"
-	fi
-
-	if ! use vanilla; then
-		# imap part of edit_threads patch
-		myconf="${myconf} $(use_enable imap imap-edit-threads)"
-
-		# rr.compressed patch
-		myconf="${myconf} --enable-compressed"
-
-		# nntp patch
-		myconf="${myconf} $(use_enable nntp)"
-
-		# maildir_header_cache_patch
-		myconf="${myconf} --enable-hcache"
-	fi
-
-	econf ${myconf}
-	emake || die "emake failed (myconf=${myconf})"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install failed"
-	find ${D}/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip
-	if use mbox; then
-		insinto /etc/mutt
-		newins ${FILESDIR}/Muttrc.mbox Muttrc
-	else
-		insinto /etc/mutt
-		doins ${FILESDIR}/Muttrc
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	echo
-	einfo "For information about using mutt, please refer to:"
-	einfo "  http://www.gentoo.org/doc/en/guide-to-mutt.xml"
-	echo
-}
diff --git a/mail-client/mutt/mutt-1.5.9.ebuild b/mail-client/mutt/mutt-1.5.9.ebuild
deleted file mode 100644
index 2b03ae0c76c1..000000000000
--- a/mail-client/mutt/mutt-1.5.9.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.9.ebuild,v 1.10 2006/08/14 17:48:48 ferdy Exp $
-
-inherit eutils flag-o-matic
-
-edit_threads_patch="patch-1.5.5.1.cd.edit_threads.9.5-gentoo-r2.bz2"
-compressed_patch="patch-${PV}.rr.compressed.gz"
-nntp_patch="patch-${PV}.vvv.nntp-gentoo.bz2"
-mbox_hook_patch="patch-1.5.6.dw.mbox-hook.1"
-header_cache_patch="mutt-cvs-header-cache.29"
-pgp_timeout_patch="patch-1.5.6.dw.pgp-timeout.1"
-assumed_charset_patch="patch-1.5.6.tt.assumed_charset.1.gz"
-
-DESCRIPTION="a small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org"
-SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
-	!vanilla? (
-		http://dev.gentoo.org/~agriffis/dist/${edit_threads_patch}
-		http://www.emaillab.org/mutt/1.5/${assumed_charset_patch}
-		http://mutt.kiev.ua/download/${P}/${compressed_patch}
-		http://www.woolridge.ca/mutt/patches/${mbox_hook_patch}
-		nntp? (
-			http://dev.gentoo.org/~agriffis/dist/${nntp_patch}
-			mirror://gentoo/mutt-1.5.7-mixmaster+nntp.patch
-		)
-		http://wwwcip.informatik.uni-erlangen.de/~sithglan/mutt/${header_cache_patch}
-		http://www.woolridge.ca/mutt/patches/${pgp_timeout_patch}
-	)"
-#	http://cedricduval.free.fr/mutt/patches/download/${edit_threads_patch}
-#	http://www.mutt.org.ua/download/${P}/${nntp_patch}
-IUSE="buffysize cjk crypt debug gdbm gnutls gpgme imap mbox nls nntp pop sasl slang smime ssl vanilla" # berkdb
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-RDEPEND="nls? ( sys-devel/gettext )
-	>=sys-libs/ncurses-5.2
-	gdbm?    ( sys-libs/gdbm )
-	slang?   ( =sys-libs/slang-1* )
-	imap?    (
-		gnutls?  ( >=net-libs/gnutls-1.0.17 )
-		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
-		sasl?    ( >=dev-libs/cyrus-sasl-2 )
-	)
-	pop?     (
-		gnutls?  ( >=net-libs/gnutls-1.0.17 )
-		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
-		sasl?    ( >=dev-libs/cyrus-sasl-2 )
-	)
-	gpgme?   ( >=app-crypt/gpgme-0.9.0 )"
-#	!gdbm?   ( berkdb? ( >=sys-libs/db-4 ) )
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	sys-devel/autoconf
-	!vanilla? ( sys-devel/automake )"
-
-pkg_setup() {
-	if ! use imap; then
-		echo
-		einfo "The USE variable 'imap' is not in your USE flags."
-		einfo "For imap support in mutt, you will need to restart the build with USE=imap"
-		echo
-	fi
-}
-
-src_unpack() {
-	unpack ${P}i.tar.gz && cd ${S} || die "unpack failed"
-
-	# fix sasl support in configure.in
-	epatch ${FILESDIR}/mutt-1.5.9-sasl.patch
-
-	# disable sgml conversion since it fails with sgml2html
-	epatch ${FILESDIR}/mutt-1.5.9-nodoc.patch
-
-	if ! use vanilla; then
-		epatch ${DISTDIR}/${compressed_patch}
-		epatch ${DISTDIR}/${edit_threads_patch}
-		epatch ${DISTDIR}/${mbox_hook_patch}
-		epatch ${DISTDIR}/${header_cache_patch}
-		epatch ${DISTDIR}/${pgp_timeout_patch}
-		epatch ${DISTDIR}/${assumed_charset_patch}
-		if use nntp; then
-			epatch ${DISTDIR}/${nntp_patch}
-			# Allow mutt to build with mixmaster and nntp both enabled
-			epatch ${DISTDIR}/mutt-1.5.7-mixmaster+nntp.patch
-		fi
-
-		aclocal -I m4					|| die "aclocal failed"
-		autoheader						|| die "autoheader failed"
-		emake -C m4 -f Makefile.am.in	|| die "emake in m4 failed"
-		automake --foreign				|| die "automake failed"
-	fi
-
-	WANT_AUTOCONF=2.1 autoconf		|| die "autoconf failed"
-}
-
-src_compile() {
-	declare myconf="
-		$(use_enable nls) \
-		$(use_enable gpgme) \
-		$(use_enable imap) \
-		$(use_enable pop) \
-		$(use_enable crypt pgp) \
-		$(use_enable smime) \
-		$(use_enable cjk default-japanese) \
-		$(use_enable debug) \
-		--sysconfdir=/etc/${PN} \
-		--with-docdir=/usr/share/doc/${PN}-${PVR} \
-		--with-regex \
-		--disable-fcntl --enable-flock \
-		--enable-nfs-fix --enable-external-dotlock \
-		--with-mixmaster \
-		--without-sasl"
-
-	# See Bug #22787
-	unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
-
-	# mutt prioritizes gdbm over bdb, so we will too.
-	# hcache feature requires at least one database is in USE.
-	if use gdbm; then
-		myconf="${myconf} --enable-hcache --with-gdbm --without-bdb"
-#	elif use berkdb; then
-#		myconf="${myconf} --enable-hcache --with-bdb --without-gdbm"
-	else
-		myconf="${myconf} --disable-hcache --without-gdbm --without-bdb"
-	fi
-
-	# there's no need for gnutls, ssl or sasl without either pop or imap.
-	# in fact mutt's configure will bail if you do:
-	#   --without-pop --without-imap --with-ssl
-	if use pop || use imap; then
-		if use gnutls; then
-			myconf="${myconf} --with-gnutls"
-		elif use ssl; then
-			myconf="${myconf} --with-ssl"
-		fi
-		# not sure if this should be mutually exclusive with the other two
-		myconf="${myconf} $(use_with sasl sasl2)"
-	else
-		myconf="${myconf} --without-gnutls --without-ssl --without-sasl2"
-	fi
-
-	# See Bug #11170
-	case ${ARCH} in
-		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
-	esac
-
-	if use buffysize; then
-		ewarn "USE=buffy-size is just a workaround. Disable it if you don't need it."
-		myconf="${myconf} --enable-buffy-size"
-	fi
-
-	if use slang; then
-		myconf="${myconf} --with-slang"
-		ewarn "If you want a transparent background, merge ${PN} with USE=-slang."
-	else
-		# --without-slang doesn't work;
-		# specify --with-curses if you don't want slang
-		# (26 Sep 2001 agriffis)
-		myconf="${myconf} --with-curses"
-	fi
-
-	if use mbox; then
-		myconf="${myconf} --with-mailpath=/var/spool/mail"
-	else
-		myconf="${myconf} --with-homespool=Maildir"
-	fi
-
-	if ! use vanilla; then
-		# imap part of edit_threads patch
-		myconf="${myconf} $(use_enable imap imap-edit-threads)"
-
-		# rr.compressed patch
-		myconf="${myconf} --enable-compressed"
-
-		# nntp patch
-		myconf="${myconf} $(use_enable nntp)"
-	fi
-
-	econf ${myconf} || die "configure failed"
-	make || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install failed"
-	find ${D}/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip
-	if use mbox; then
-		insinto /etc/mutt
-		newins ${FILESDIR}/Muttrc.mbox Muttrc
-	else
-		insinto /etc/mutt
-		doins ${FILESDIR}/Muttrc
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	echo
-	einfo "If you are new to mutt you may want to take a look at"
-	einfo "the Gentoo QuickStart Guide to Mutt E-Mail:"
-	einfo "   http://www.gentoo.org/doc/en/guide-to-mutt.xml"
-	echo
-}