Cleanup, fix #195927 and #201684

(Portage version: 2.1.4_rc9)
 (Unsigned Manifest commit)

1 files changed, 11 insertions, 61 deletions

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 583bed92847f..775f846a23ae 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cyrus-imapd-2.2-db45.patch 1283 RMD160 e3925988a6c628eb5567aa482351bb6a8ab01113 SHA1 b074166f6092ee58db685038c45382f77479bdb1 SHA256 4d814546280b83cf420855faf067ac95d36818be8b2a9ad9973805f261c1d90e
 MD5 94e33770741d5309d51ba7f4edbe1fc5 files/cyrus-imapd-2.2-db45.patch 1283
 RMD160 e3925988a6c628eb5567aa482351bb6a8ab01113 files/cyrus-imapd-2.2-db45.patch 1283
@@ -9,18 +6,6 @@ AUX cyrus-imapd-2.2-libwrap.patch 390 RMD160 4ed2b14f549ccfab487cff66e5f2cb8ebdd
 MD5 88f50354abbcae1950a2d11c74db5fe5 files/cyrus-imapd-2.2-libwrap.patch 390
 RMD160 4ed2b14f549ccfab487cff66e5f2cb8ebdd39427 files/cyrus-imapd-2.2-libwrap.patch 390
 SHA256 2bddad2045130090ea23f5ad65d797cfa1f6083446bd00411cb1540cb56d4e0e files/cyrus-imapd-2.2-libwrap.patch 390
-AUX cyrus-imapd-2.2.10-drac.patch 926 RMD160 7a587e2f756e6058262348d19c80fd27ad169a52 SHA1 bae33be47b618516caea435d52990abca38e6fe7 SHA256 9c9b297767ef787bc76fa134b178848695199b662860515f0157f59f726b5b84
-MD5 945aad1ac6ce2e72b6dede038c37c934 files/cyrus-imapd-2.2.10-drac.patch 926
-RMD160 7a587e2f756e6058262348d19c80fd27ad169a52 files/cyrus-imapd-2.2.10-drac.patch 926
-SHA256 9c9b297767ef787bc76fa134b178848695199b662860515f0157f59f726b5b84 files/cyrus-imapd-2.2.10-drac.patch 926
-AUX cyrus-imapd-2.2.10-libwrap.patch 390 RMD160 4ed2b14f549ccfab487cff66e5f2cb8ebdd39427 SHA1 0075421585a73f2673e3daff9a4c140d9cc5046e SHA256 2bddad2045130090ea23f5ad65d797cfa1f6083446bd00411cb1540cb56d4e0e
-MD5 88f50354abbcae1950a2d11c74db5fe5 files/cyrus-imapd-2.2.10-libwrap.patch 390
-RMD160 4ed2b14f549ccfab487cff66e5f2cb8ebdd39427 files/cyrus-imapd-2.2.10-libwrap.patch 390
-SHA256 2bddad2045130090ea23f5ad65d797cfa1f6083446bd00411cb1540cb56d4e0e files/cyrus-imapd-2.2.10-libwrap.patch 390
-AUX cyrus-imapd-2.2.12-drac.patch 926 RMD160 7a587e2f756e6058262348d19c80fd27ad169a52 SHA1 bae33be47b618516caea435d52990abca38e6fe7 SHA256 9c9b297767ef787bc76fa134b178848695199b662860515f0157f59f726b5b84
-MD5 945aad1ac6ce2e72b6dede038c37c934 files/cyrus-imapd-2.2.12-drac.patch 926
-RMD160 7a587e2f756e6058262348d19c80fd27ad169a52 files/cyrus-imapd-2.2.12-drac.patch 926
-SHA256 9c9b297767ef787bc76fa134b178848695199b662860515f0157f59f726b5b84 files/cyrus-imapd-2.2.12-drac.patch 926
 AUX cyrus-imapd-2.2.12-gcc4.patch 396 RMD160 b01f76386facd436cd9db247a7a4c31129ae55b8 SHA1 daf5672ab93c6bcc5bdb4807537c9f5617b21855 SHA256 f5c8e11355df0ac41ede1fa18381241097e143669ba5903c90ff4b20aeed273c
 MD5 77413f5bcf777e10908f9a755e6ff55e files/cyrus-imapd-2.2.12-gcc4.patch 396
 RMD160 b01f76386facd436cd9db247a7a4c31129ae55b8 files/cyrus-imapd-2.2.12-gcc4.patch 396
@@ -41,10 +26,6 @@ AUX cyrus-imapd-2.2.13-pts.patch 647 RMD160 f321203e723a39508df8812e30ba3a660c5b
 MD5 64a35455ea1674129587faeba44a0106 files/cyrus-imapd-2.2.13-pts.patch 647
 RMD160 f321203e723a39508df8812e30ba3a660c5bd526 files/cyrus-imapd-2.2.13-pts.patch 647
 SHA256 d775fbc182402b8bf6aec160bc3eedbbb23f4d44f64f07a8ab0d44ef9ca54f77 files/cyrus-imapd-2.2.13-pts.patch 647
-AUX cyrus-imapd-2.3.6-afs.patch 950 RMD160 c42d13e91664b6480a41f0a8afc136b2d0db96b2 SHA1 f0d580b716da43c466dca594daa6f7e94c6291d2 SHA256 72e74e008c9e8bf63e2c8feef542f62e73730e6aafb7d4a2c895671b7b0a6482
-MD5 aa91f37cdb0cfa70b127eb76dcd2a2ee files/cyrus-imapd-2.3.6-afs.patch 950
-RMD160 c42d13e91664b6480a41f0a8afc136b2d0db96b2 files/cyrus-imapd-2.3.6-afs.patch 950
-SHA256 72e74e008c9e8bf63e2c8feef542f62e73730e6aafb7d4a2c895671b7b0a6482 files/cyrus-imapd-2.3.6-afs.patch 950
 AUX cyrus-imapd-2.3.8-drac_with_autocreate.patch 2378 RMD160 a545ffbf21e7d14897d177b2866bc5df9df3130f SHA1 16e29ddddd924877d9d7dd572a6bcafe25c67725 SHA256 f55235912bcec09c91270dfeb9f2846300f70c22eef945781e77473ea7013aa6
 MD5 687f311749b0a998d7cf832aa451fbf5 files/cyrus-imapd-2.3.8-drac_with_autocreate.patch 2378
 RMD160 a545ffbf21e7d14897d177b2866bc5df9df3130f files/cyrus-imapd-2.3.8-drac_with_autocreate.patch 2378
@@ -85,59 +66,28 @@ AUX imapd.conf 1587 RMD160 74e02af5daa7648ce7e366478c1b89b112750e6b SHA1 e4f189c
 MD5 66137eb399ec7760afc24491a10d8bd7 files/imapd.conf 1587
 RMD160 74e02af5daa7648ce7e366478c1b89b112750e6b files/imapd.conf 1587
 SHA256 69eacd9fffad55f20990fcf3b117fe4e2ac55233515ed70698c65a6deb42503f files/imapd.conf 1587
-DIST cyrus-imapd-2.2.12-64bit-quota.tgz 6537 RMD160 d739761d39656b7081f52f4ba2e5f3428c19203e SHA1 6e850d2279fb25e439f5b786d23bfa59ad49f482 SHA256 a7e1fde21479dbce7441f68e0a86de1947744cea0ec424f759e77583ee7e90f6
-DIST cyrus-imapd-2.2.12-64bit-quotas.patch.bz2 6251 RMD160 4c9493ee7f1a251dc8fff816341dbd7d32851e98 SHA1 b07235f27a4655cc491b26fa88ceed2d8292d559 SHA256 2a1b7eb5dee6bc6d3d7bd25ddb10a142d49cbde4af5982403362b09967d39069
-DIST cyrus-imapd-2.2.12.tar.gz 1961161 RMD160 ff4a95e519ea066ed9b21b515b18bdacaf0d1852 SHA1 08adc5dfde1288c0d9e7de44e7ea4d17a7940d06 SHA256 3c6f41255ba15d8b2ea78320dd5e0c98e07fe0b5c3c4b84bc20f503427bd1b7b
 DIST cyrus-imapd-2.2.13.tar.gz 2109770 RMD160 7e8ac84b5ddd9f1206e71d5b659d07d8400f9ac2 SHA1 ba84b67a1cae4c15d5a588d010764031167970c4 SHA256 109e85b901bfcdbdd6a76d7cac83af866aa9c37a40919be7f58813319082d09c
 DIST cyrus-imapd-2.3.9-uoa.tbz2 17935 RMD160 1e46f17972552ed94496d1dfee8671332844775b SHA1 1fc400239cf2410f531570c37d19ad964c606a14 SHA256 3ca66f3ec992416276daca9e43dd159797d2838ff9efd118139495a86e070f5d
 DIST cyrus-imapd-2.3.9.tar.gz 2272004 RMD160 c9aae3476108c0face06dfe304a136015370b166 SHA1 b95e1de87ff2c7a42d4bec87c839fe439452a79c SHA256 27e6476789788b7c72f09711103f7c4bd0136dbd33ceadd0ae2dc776a17ab437
-EBUILD cyrus-imapd-2.2.12-r4.ebuild 9291 RMD160 33aafae49131264bcf0458391e6e8e6ac8d7305f SHA1 4c3f97280bfb18fcc75c9896a273fe186fb9a53a SHA256 ece32053f0764ca2e4bcd066fa784aaf46275ea71a4a7b9bff2f8103fe6504b0
-MD5 eaaaef280594ffc872c7de53016c5eff cyrus-imapd-2.2.12-r4.ebuild 9291
-RMD160 33aafae49131264bcf0458391e6e8e6ac8d7305f cyrus-imapd-2.2.12-r4.ebuild 9291
-SHA256 ece32053f0764ca2e4bcd066fa784aaf46275ea71a4a7b9bff2f8103fe6504b0 cyrus-imapd-2.2.12-r4.ebuild 9291
-EBUILD cyrus-imapd-2.2.12-r5.ebuild 9292 RMD160 c9d5f82d21d27a14cdaaaf45cbebaa96aeceee80 SHA1 9dd8ab7d9a2e8cf7f6f301afe71ffdbc5ab8ee06 SHA256 27b5beb67e57dd30d81a18ffae5498ab5c80f8d547ba022ac6b9345cde02c634
-MD5 2b6b84524fa21b526827b40ae55882a2 cyrus-imapd-2.2.12-r5.ebuild 9292
-RMD160 c9d5f82d21d27a14cdaaaf45cbebaa96aeceee80 cyrus-imapd-2.2.12-r5.ebuild 9292
-SHA256 27b5beb67e57dd30d81a18ffae5498ab5c80f8d547ba022ac6b9345cde02c634 cyrus-imapd-2.2.12-r5.ebuild 9292
-EBUILD cyrus-imapd-2.2.12-r6.ebuild 9423 RMD160 3dc7922bb0a189d1aee35feb469ead6231183b61 SHA1 c923849c686a8c280fca80c526740e7e9a5fbf26 SHA256 30afd0cdcba3573aff925325fb4e1a92b8ff0e55934293e511533581e65d7cd0
-MD5 d16903ef3c543083650c282e6ce000b3 cyrus-imapd-2.2.12-r6.ebuild 9423
-RMD160 3dc7922bb0a189d1aee35feb469ead6231183b61 cyrus-imapd-2.2.12-r6.ebuild 9423
-SHA256 30afd0cdcba3573aff925325fb4e1a92b8ff0e55934293e511533581e65d7cd0 cyrus-imapd-2.2.12-r6.ebuild 9423
 EBUILD cyrus-imapd-2.2.13-r1.ebuild 9642 RMD160 28201df2ebc0f1aa29c48b9d41bfa0e7382b48a4 SHA1 ae38d8942a2b798517bffca964555c6492faae5a SHA256 52edc4b04f9088de111bab7eca070602ecb9d707bc9f01f5b04e4af0a18f3a03
 MD5 393661d3e80e76fc348edd2e0e22bb42 cyrus-imapd-2.2.13-r1.ebuild 9642
 RMD160 28201df2ebc0f1aa29c48b9d41bfa0e7382b48a4 cyrus-imapd-2.2.13-r1.ebuild 9642
 SHA256 52edc4b04f9088de111bab7eca070602ecb9d707bc9f01f5b04e4af0a18f3a03 cyrus-imapd-2.2.13-r1.ebuild 9642
-EBUILD cyrus-imapd-2.3.9.ebuild 7925 RMD160 780a086aebbbf5e52d7fc8896fb933a82d9b980d SHA1 610c75e4718cdea0158efa5ca48c1622f952af08 SHA256 de1427e0aed2287e18457ea3458c9842941a4269ec56b7bccd85b9696c7919ce
-MD5 ddc581c54dc4147c5265770a5b0c578a cyrus-imapd-2.3.9.ebuild 7925
-RMD160 780a086aebbbf5e52d7fc8896fb933a82d9b980d cyrus-imapd-2.3.9.ebuild 7925
-SHA256 de1427e0aed2287e18457ea3458c9842941a4269ec56b7bccd85b9696c7919ce cyrus-imapd-2.3.9.ebuild 7925
-MISC ChangeLog 21376 RMD160 d2e3226d70b3ca7356e5382f00a736005caf6415 SHA1 db59b993aea4a77c630f68c86877a0330fe8cb8c SHA256 fb86f20cbb54e57c33b145d4ab79688ab4e1b63f3d85459519b7cfa369359f13
-MD5 4220cd9f21bc66853e1f4a00f1c394ab ChangeLog 21376
-RMD160 d2e3226d70b3ca7356e5382f00a736005caf6415 ChangeLog 21376
-SHA256 fb86f20cbb54e57c33b145d4ab79688ab4e1b63f3d85459519b7cfa369359f13 ChangeLog 21376
+EBUILD cyrus-imapd-2.3.9-r1.ebuild 7992 RMD160 5597008c46ae7f176d65bae1d96597cbc54fd375 SHA1 b54ae446bd01b8d6e8de21b3c3a18f7a12ff3c01 SHA256 25ef76f86bd8b94ed073a90b98ae37f0d6ce5aa8834adb03f459288b5d1139c9
+MD5 ffd626616a38860f0d0a737c4d5b8295 cyrus-imapd-2.3.9-r1.ebuild 7992
+RMD160 5597008c46ae7f176d65bae1d96597cbc54fd375 cyrus-imapd-2.3.9-r1.ebuild 7992
+SHA256 25ef76f86bd8b94ed073a90b98ae37f0d6ce5aa8834adb03f459288b5d1139c9 cyrus-imapd-2.3.9-r1.ebuild 7992
+MISC ChangeLog 21820 RMD160 1808a2a9b1b556e7f4679b7e084d20d35ed9cc3f SHA1 d8b5bbe63d2d07b264e488a1358da9eb2cf64f98 SHA256 aed61dc701aa17b14193141b1975f216b8a3aa978440836eb3f7daecf88ddeb4
+MD5 8b9ccea27519ed07c59a21115d0c2f57 ChangeLog 21820
+RMD160 1808a2a9b1b556e7f4679b7e084d20d35ed9cc3f ChangeLog 21820
+SHA256 aed61dc701aa17b14193141b1975f216b8a3aa978440836eb3f7daecf88ddeb4 ChangeLog 21820
 MISC metadata.xml 227 RMD160 dea45630aba3c22da6ccfe5867e88797658a9e41 SHA1 82018ee8f0b71c0e29e01aa374a89275a46dde26 SHA256 d3c03c4962fef1e25acac4875ada3102e5122e3eb7292d83d9833df8ef581d5c
 MD5 a562a93428a4efa4b0b4c0943075e3ff metadata.xml 227
 RMD160 dea45630aba3c22da6ccfe5867e88797658a9e41 metadata.xml 227
 SHA256 d3c03c4962fef1e25acac4875ada3102e5122e3eb7292d83d9833df8ef581d5c metadata.xml 227
-MD5 8c219986e0c374c302460c7204eb96fe files/digest-cyrus-imapd-2.2.12-r4 259
-RMD160 c3b34254e2030756e02decdb2593e4ebb3604994 files/digest-cyrus-imapd-2.2.12-r4 259
-SHA256 ad62d41892313174ffa09db9b0f48fdbc5a1feb33e2ba0bf6d9f1b7e06ce62d5 files/digest-cyrus-imapd-2.2.12-r4 259
-MD5 7f11e6246a6c05fa75edb1d390b9aab8 files/digest-cyrus-imapd-2.2.12-r5 536
-RMD160 709d6bc114a3bae15efd905a4ccdd94f8acad157 files/digest-cyrus-imapd-2.2.12-r5 536
-SHA256 c91c6ebeb4fc1b8871b1aaedd708ea747f7242c31eadef15b08a3157cf4e236d files/digest-cyrus-imapd-2.2.12-r5 536
-MD5 910af2936a45ea0f3b82e4aabd0f8683 files/digest-cyrus-imapd-2.2.12-r6 557
-RMD160 1a52f85a408e19658272bca033e57c126765beaa files/digest-cyrus-imapd-2.2.12-r6 557
-SHA256 3760068629a0eb327e951c8f1f47f02f8e8e97db9929720386044f2d0b507cff files/digest-cyrus-imapd-2.2.12-r6 557
 MD5 557d07d40c036efbbd10ef852a0b6c57 files/digest-cyrus-imapd-2.2.13-r1 259
 RMD160 232835b5f24ede499731cb761b501e47d4c884be files/digest-cyrus-imapd-2.2.13-r1 259
 SHA256 7afc422d893280bcc49f9e7bf45d2292f6560132160d5c7f98d35782a6167291 files/digest-cyrus-imapd-2.2.13-r1 259
-MD5 c55df6df734f859e5f0ef9d3b9a9b969 files/digest-cyrus-imapd-2.3.9 512
-RMD160 617c63af48df4adba02101a30db0f4e70b73508f files/digest-cyrus-imapd-2.3.9 512
-SHA256 e03dc15ac8b730f5c4ca419fa764cc374d8821e67ceb147d4f0358ad6673913b files/digest-cyrus-imapd-2.3.9 512
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHAULGCkvF58q80IkRAqixAKCFD5+SIREkg471vrNl6sfuLjR/nwCfUbEm
-nPBU2eGHMKN0MVuB8Sbbd48=
-=C7Z3
------END PGP SIGNATURE-----
+MD5 c55df6df734f859e5f0ef9d3b9a9b969 files/digest-cyrus-imapd-2.3.9-r1 512
+RMD160 617c63af48df4adba02101a30db0f4e70b73508f files/digest-cyrus-imapd-2.3.9-r1 512
+SHA256 e03dc15ac8b730f5c4ca419fa764cc374d8821e67ceb147d4f0358ad6673913b files/digest-cyrus-imapd-2.3.9-r1 512