Add a blocker in RDEPEND on virtual/imapd so we avoid manpage collisions; bug #198633

Package-Manager: portage-2.1.4.4

3 files changed, 37 insertions, 7 deletions

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index c36365725c23..1d2ab1b3e180 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cyrus-imapd-2.2-libwrap.patch 390 RMD160 4ed2b14f549ccfab487cff66e5f2cb8ebdd39427 SHA1 0075421585a73f2673e3daff9a4c140d9cc5046e SHA256 2bddad2045130090ea23f5ad65d797cfa1f6083446bd00411cb1540cb56d4e0e
 AUX cyrus-imapd-2.3.11-drac_with_autocreate.patch 2334 RMD160 53bb3d38e121ac22e4149de52151f3c3945f4934 SHA1 7571d40975aa61f9ac04e30bc371ab4733b3acdb SHA256 bfe1cabf1131b3ae3e67d5847d965cc4dfe2ac001064cc56176d3d2553651f3f
 AUX cyrus-imapd-2.3.8-drac_with_autocreate.patch 2378 RMD160 a545ffbf21e7d14897d177b2866bc5df9df3130f SHA1 16e29ddddd924877d9d7dd572a6bcafe25c67725 SHA256 f55235912bcec09c91270dfeb9f2846300f70c22eef945781e77473ea7013aa6
@@ -13,7 +16,14 @@ DIST cyrus-imapd-2.3.11-uoa.tbz2 18045 RMD160 8f35b2399b47669d99fd301be1e14aaaab
 DIST cyrus-imapd-2.3.11.tar.gz 2275173 RMD160 34727e08cc25f3cb6e0ea0195b96de942de10f48 SHA1 6218f0dc4f1792e786677362b8b3965e4593122e SHA256 87ce58b28ed1f8974118c02ac009377bb3de62adccd699a67f0100158106d842
 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.3.11.ebuild 7984 RMD160 f106c95889aba796d7903458190e808b33489a92 SHA1 141e737a8701c776bda904995cd05c7550efd2a4 SHA256 1e0116b0214b3b877cd189f0ca150955ebc886ea6b442b8830b40a4998d3de6e
-EBUILD cyrus-imapd-2.3.9-r1.ebuild 7876 RMD160 aa7e9db191441e8816601ebcd94471daa3488ef6 SHA1 87d2b78b151c9d0c16adf8079269353bb286114c SHA256 0b9220d07ed978a653902b533c4db489e565e03db06ec275fcf6c6e9bd162539
-MISC ChangeLog 23976 RMD160 ef1009bac2385f1d5afdbeb9ffe23e443ca84ccc SHA1 4d54440dfb47f2df1b17b592a3674f183de16445 SHA256 f4fa869e93641e5ba88e323939bb3b5ed1de76db7cb10d8fa2c8ae04d02740e8
+EBUILD cyrus-imapd-2.3.11.ebuild 8017 RMD160 d6b3b1a841e5b644560060971fec4d0ceaa21016 SHA1 de105a65d441cd6a02a497f53045748f00cc171a SHA256 c82ad3605451cc496036142e363d74023ba72364579ca6d823679f4cdc16e218
+EBUILD cyrus-imapd-2.3.9-r1.ebuild 7908 RMD160 39b4b354fab0d4f304c65c290bfcac39a7f5e27b SHA1 ba4ccfe7c28b2a66bdc01ec9ad3e3a6be88c8f67 SHA256 0209fb6f7a2c3f9a6ec509b512f643c294ea8c62faff8f4d3031c011ad0846b3
+MISC ChangeLog 24170 RMD160 167448c37e84703c4e8ea3d25a1b86af3e0a1259 SHA1 23ba1bf0112920d080fd7ff71c52905743f8579b SHA256 6223f2ef60cabfe52b81acbe147b8bea8d2b6147f12eeb073dbda0c68c6a188b
 MISC metadata.xml 227 RMD160 dea45630aba3c22da6ccfe5867e88797658a9e41 SHA1 82018ee8f0b71c0e29e01aa374a89275a46dde26 SHA256 d3c03c4962fef1e25acac4875ada3102e5122e3eb7292d83d9833df8ef581d5c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH3FhDCRZPokWLroQRArbsAJ99RcAcWjbav17CxBIe5JgeNfoBqwCeM81o
+1De4EXubdZXYRcCdrtfb+aU=
+=UwJc
+-----END PGP SIGNATURE-----
diff --git a/net-mail/uw-imap/Manifest b/net-mail/uw-imap/Manifest
index 5ac267251800..011f8db5740b 100644
--- a/net-mail/uw-imap/Manifest
+++ b/net-mail/uw-imap/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX uw-imap-2004c-amd64-so-fix.patch 675 RMD160 f13adf21e7043175d2b2dd356b2ba48554e9e99f SHA1 fd6aad7b87d71795cb3e9bdee29b70ca72b289e9 SHA256 8f80dff390a5d87afd71ab07bbff0eed00acb14b3bfa2355f33ba22e833af202
 AUX uw-imap.xinetd 491 RMD160 31830c6e2dad66a1436060d0a66c44bfb4082ae3 SHA1 7102bbb4f16afd6afd1f910d51a4046fb35ca65b SHA256 d3c39241c283df0cd3e10a7bd06c6fb84243199399d355bd22d098418e3ff5fe
 AUX uw-imaps.xinetd 486 RMD160 4374eab026aa9a02e82561d0ec153025aaf20868 SHA1 fd152c1f425bc1a6632c642d35d0ef7e019368f8 SHA256 c17f14aa5f356becb4ba309b68935fefdb08e664ae8e4a69ebc11e388ac5cfd0
@@ -5,6 +8,13 @@ AUX uw-ipop2.xinetd 563 RMD160 bc9ff033aa6f4166d75b38691a9b32203353b4ab SHA1 a7d
 AUX uw-ipop3.xinetd 472 RMD160 e4ad32c91284ffca80876e48d7d2fa649e4ae6f8 SHA1 a8de537d059bd8fe0e6aea693b7969b41ec1f7d4 SHA256 ddcfa0d79ea53edc4905a2eb10fb04bb23951bf02fd4c5cefa03e6303d5a1512
 AUX uw-ipop3s.xinetd 469 RMD160 28b09d47e577643c08f959ed09b7b63371c4e029 SHA1 95531d852a58d41c465a358fe5a4c390344b2eab SHA256 fa2c408770b27f29ea25297540f2bc0789f2e5bd98f72f48a9f1659df3d39264
 DIST imap-2004g.tar.Z 2246713 RMD160 a016a06ba073e879d2574a6395ce1074ea74c687 SHA1 791a8bb247ca51ce0a4c32e814a2f736c2bcf066 SHA256 958ab8a6a8b5a1a53167793141fe5bf1fbafc012be1d3f70a21f5f2f493ffa6d
-EBUILD uw-imap-2004g-r2.ebuild 5206 RMD160 2197e25939888c7a557fefcf9af64515ca01663e SHA1 45c4ae0526d8199bc4874749e91160d079abf790 SHA256 e6f412e7b073a41175ea091af18f804f19b02dc4677274bd860d8c0b5fce3b37
-MISC ChangeLog 13571 RMD160 1a7507ee0a6cb7fc7d23df0f2264ffa0ddb8b056 SHA1 1cfec6e12dbd4149f487d16c854b74328a00df99 SHA256 bac45fcd526368750d626dfc69a98df4dc7fa5d227e62472ad33bd087c872e87
+EBUILD uw-imap-2004g-r2.ebuild 5248 RMD160 44c1c667a450848e7f25cb0d4892269c806c782e SHA1 c254daa5ffb626214d108c2e226bd57ccbd1887e SHA256 916553c9aa501b5f73823fcd8134e51306158c035036b0dad668b1973cd94939
+MISC ChangeLog 13737 RMD160 c14e5255c24e72a2b0a82ccb3ae1793eaf85b21b SHA1 ef474d4813bcfb4d525e822e09eded083898618a SHA256 43bdd6721039bc0477925ee5e8b7a2d92f3cd2e129ce9174b660c31d99e0db75
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH3FkFCRZPokWLroQRAuPzAKCBP7gMYXt+yxFfP7/pNEUNdtWwzgCgrmk5
+FNXJZRYV6ltNuVw9ZFyml84=
+=BLNw
+-----END PGP SIGNATURE-----
diff --git a/net-mail/vimap/Manifest b/net-mail/vimap/Manifest
index f47dd2f079c4..3580b111f0ac 100644
--- a/net-mail/vimap/Manifest
+++ b/net-mail/vimap/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX uw-imap.pam-system-auth 344 RMD160 83119b2960c3dadfd4def18368382c69787b6d2c SHA1 eb4ebaa698bd31eb943eea074c2418f73c129a10 SHA256 36b853138232649786b754ffd55d23ded8e85c4f5048a5806262a18e358e38f9
 AUX uw-imap.xinetd 492 RMD160 f38b90d562f02f2387a729d35b6a60490f9ee203 SHA1 3b056aba7aa0ec7709e0fdbac05c50f873d33bc8 SHA256 d935692a8e7433ca1194cfad0ce48a9d2fe6013873f569a826c1ed2fd595aa8d
 AUX uw-imaps.xinetd 487 RMD160 bc4d2c6ea873bbf313e5728688d9776290b1eab1 SHA1 998081dbbc5006a429be52dc1ca96a8a30a0b712 SHA256 a501426cc717b70b69cb729069466de448048f5f8f78c379aaf8d4bd61c8be5a
@@ -7,6 +10,13 @@ AUX uw-ipop3s.xinetd 474 RMD160 d12bd772752f8ab83b3c84180ba1ef9b45a6e1c6 SHA1 c9
 AUX vimap-2002c-amd64-so-fix.patch 675 RMD160 f13adf21e7043175d2b2dd356b2ba48554e9e99f SHA1 fd6aad7b87d71795cb3e9bdee29b70ca72b289e9 SHA256 8f80dff390a5d87afd71ab07bbff0eed00acb14b3bfa2355f33ba22e833af202
 DIST imap-2002c-virtual.patch.bz2 10394 RMD160 65ad46273b559467c14e0c42427badbc286c1fd1 SHA1 ec222e9bcdad2e4beb118714d21d682f9a209000 SHA256 55ff4d38b762cadda5e408f8a4cef3adbb3266b5a0cb31b0cee567f06eb70f0a
 DIST imap-2002c1.tar.Z 2111395 RMD160 997df4c9ec61318dbab309398b00b9cb2adf4f9c SHA1 a41c4d798ee5d5821771a9d6b5d96a936cb09b92 SHA256 4eddc00b6a23745b6b28d557923034be5eb50faf1738e32fa3353aaa9b4db981
-EBUILD vimap-2002c-r3.ebuild 4721 RMD160 268441cc344ed65bad4a19bb280f43136e8ec567 SHA1 3408f15fa54b95ea8a02c09e7da14a7ca98d326e SHA256 ce18082457d83ba59f1033b9b80f849898c84c2d4db8a71f19923c9e4dbd42e3
-MISC ChangeLog 3039 RMD160 25c53ae47876ec5b1dfbb6b7a8e4910e83b046f3 SHA1 9c7b0e3055d2990b408c675efc49ca1713b09ffe SHA256 28447b650a03dcbbb84f5116631511e6e5976d96d9506100e91efd52e1250570
+EBUILD vimap-2002c-r3.ebuild 4793 RMD160 6a4c38675eca8f56f9d1fc2795d6d84389e9d395 SHA1 056fa7ca3cc5a51e42329c879de9849a2d129fdb SHA256 17183fcfddc35e234128be9041449dc8846ee673345056566213130d7a964676
+MISC ChangeLog 3203 RMD160 242109b6c481b7119c67b4ef8633dd8ef131c23d SHA1 1d3bf2442d0081f974792ad801da42a9f1736467 SHA256 7b39430d938971ac8f5e2ea732d6216735537dbd05da41acd41d07cc3a87e7c5
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH3FmuCRZPokWLroQRAlZRAKCsAvwHjfr1lTfdqvW7hSIWT7kI/QCgvzki
+WmAuWxrVNFun+9DiIIiYih0=
+=Wn3c
+-----END PGP SIGNATURE-----