gentoo resync : 29.10.2017

15 files changed, 304 insertions, 86 deletions

diff --git a/net-mail/amavis-logwatch/Manifest b/net-mail/amavis-logwatch/Manifest
index b8a5cd675aaa..ca8e0b9d28e3 100644
--- a/net-mail/amavis-logwatch/Manifest
+++ b/net-mail/amavis-logwatch/Manifest
@@ -5,8 +5,7 @@ AUX redundant-argument-to-sprintf.patch 1738 SHA256 6f7e911096abe09ccd88ed8fa326
 AUX unchecked-encrypted.patch 2022 SHA256 f6d4dba2dce5580f6ebbb6d0235b7841ea87b0105b3bbe1dc5740c4d4d8a2331 SHA512 6fc07898123012d2755851fa9a4ab026174fb82f1a85361ddc95f407c0f4ac9b1e8979215c1264c21775f997dff343f209676b6055728a52590b37d8e7e2f4ba WHIRLPOOL 9015a2527c6136731af83d0834f5ee8500ce6942d1965c30afc6d58b3afc517ebf6cbbbc51204ba8fa4d200502a15ce6642beb98dd15aacc919e11b87e7c8af7
 AUX unescaped-left-brace.patch 2043 SHA256 a1582521379af0bad46391de151fdf83144a67759ee32fe7cd1a8e2b9976359e SHA512 3e2f18070a76624b260bdb11586abf79ae16f237d0e765a766ce770e35c8aab6afbda58589514b65a3afedfc9104f491c1e69e3201f764b6590b5f34cde9e745 WHIRLPOOL 3cf1e2bafe00846d35dd41f9e57f679efd207837591598e02cb2b1fc1f26e48a2d0fb426d3676edcd514595ee8d4287621e23ed88f9574072527d4de930298c0
 DIST amavis-logwatch-1.51.03.tgz 87304 SHA256 247f12646f834f6ed067d7aa79ef89f458284a6141391c3d96d6225bb1679c92 SHA512 27338abf676f05ec77e3ffb65a1f9ab5274bf8de3ab65fa29d4584ed6fdeedcb85e9e95b124549afdc3fc47780540c1790fa8b273ee296fbd44378d4da450db5 WHIRLPOOL 3da18a7eedad87b609cf3b8573d1bdfb4ee3561776a500f88b58e5576e33a3184cc1deec32a8d0b9252ac51d9e97ba74c5b223080e82f4fce38a156f3ac6df3c
-EBUILD amavis-logwatch-1.51.03-r3.ebuild 1193 SHA256 ba2c74784ea248442c9c2b3abb892f8c41b4ac107315d1c2bc21a964cdc843b7 SHA512 ea96a9ea428d6b260266b74c44ca7eec0f6a760739439c1d36e66bfe89e37201546930ce89296b1750f15f4f41a17e712061abf0b07b14f4459499976092fac0 WHIRLPOOL 1290875ed39d80db0f6dba81f84386e97846cbb7857b25b09b277d41f0912b96b9f85109a2a59965e39c0a3a97eaca46176d85f3659299bfa99f7554c91152fe
-EBUILD amavis-logwatch-1.51.03.ebuild 893 SHA256 101cddc25741f51005e02d08bd4f90d612787c46bad197554b917b619bb42904 SHA512 f665e621e964bd62b2f76d9b893b172818a3a8f709e2fda4072f1b7a0751f8e9c5a42f2416bb93e4def055091b397247c04aef5911906932f9f077b01e0c07a3 WHIRLPOOL 98bc365221e2c819677fa934a32367c28fc3bf2aff0411de6aa6891c0e0b39163ba9bcab983db04eadc029667d424ffbd5df01e11e6bb211a588c7e43b1574f5
+EBUILD amavis-logwatch-1.51.03-r3.ebuild 1191 SHA256 d1238973e4426a1074edfa4715b932efd34ee486618cf0a08224bdd56db006aa SHA512 f6d22402f6b81587d8d98696f345bbda89b3e4c1b312e2713affda611a1b4faec324aea02deec07f6ee65e447a7a5c17f2d5a8376c0ce6fb1009a4e75baabe15 WHIRLPOOL 6cf71087f0f6ceacfc1bc249f2e1fe1094bdecc5bb532a0a5615300c8d5b5c9bb0afd8dc3f2788e3d6427fa45fcce21760def744c97cc97c11a92bcddf7a158d
 MISC ChangeLog 2204 SHA256 95cbfb16c6eebcef18a8559e6b16f61f69b57ba7c2e60ff0e1506374a0669336 SHA512 46e9fc2dc8ec7db7ca1ef4110857c0f042427c47edb4d6d5d7fca65e372f93bf1d841c0207e1cebd9827406032360694c82cf43157ccabbd66d6d27e261bb00c WHIRLPOOL 494bbb01369304c7a8f4abb7fb85938d5cba9f3c245c7cf1e012e182d577fa492639dbfd347f107219b0c1f9910701089536b8fb31ce944b4dceda07a54dfaaa
 MISC ChangeLog-2015 928 SHA256 c1e501d8ed1ecb5abf16abb6df2ea2bc326df14796d05423505b27530e8ad746 SHA512 c553a5750544c2006c8aea1c1d32b7df8e1d90b2096f5369b50e288e2bf56300a0ac82318eec3626db8226dca67c3a100081e1f690677df6a2e4a4ae1927ea22 WHIRLPOOL 61d96d5f0d4233414a70181629fdad2c1f82a3b9c347de7722392b73dfd17cb793dc83234fd3c007b22b9866d4246d337abd13850d7a27622a108cbf590ad005
 MISC metadata.xml 296 SHA256 9964c7a00fb143c08fd771f7d3601f658282cf28e5eecf249487c4b5f1e95b23 SHA512 ba96de61eeaec557c21ba83c0701d6b83f0e25752a4b949a2562e3eb4a0ceef44d0029d5a5bf5fed5ff7d9add59b8d40cfeac7a57ec566a48d23dca3c327e720 WHIRLPOOL ce6b711172c28911c1b8a31a1d58eba66ca1ebdd5307efdfc3d5def0543de5d8c52830e7109252a91b1b425d7b385711972b4827693d9218f2dbb4d0891d1922
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
index e312caecfdf7..79d11a94ef74 100644
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild
deleted file mode 100644
index f8eb3efd3b4f..000000000000
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A log analyzer for amavisd-new"
-HOMEPAGE="http://logreporters.sourceforge.net/"
-SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-lang/perl"
-
-src_prepare() {
-	# Replace the default config file location with ours.
-	local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
-	local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
-	sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
-		|| die 'failed to update the default config location'
-}
-
-src_compile() {
-	# The default make target just outputs instructions. We don't want
-	# the user to see these, so we avoid the default emake.
-	:
-}
-
-src_install() {
-	dodoc Bugs Changes README
-	doman ${PN}.1
-	dobin ${PN}
-	insinto /etc
-	doins ${PN}.conf
-}
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 691be3b60c43..8280d80a7975 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -19,7 +19,7 @@ EBUILD cyrus-imapd-2.5.11-r1.ebuild 4772 SHA256 27af620af50e6d70d44c781dc9a01f3e
 EBUILD cyrus-imapd-2.5.11.ebuild 4709 SHA256 6ccf2d3c818f0e387ce8652c0a3e745134bd88df4e62aab70f3c6ea32e886fcf SHA512 a07326ba69a7f81d900838e4796f85c90c00aaf16385818b8d3f47f70e77ff9a2de135a76effda42db5656b96f70c3369632c1138cb5fd377a2b8507da6e9d71 WHIRLPOOL e6c8f37a65d43a81a38065ca7b60521f6b769c48f8bbd0ef8f89c67b703cd8e2b3e4feffd679b0b7c3dcbd7cda3480fe41c73b802dc8f9b3dee83d527c9cd5c1
 EBUILD cyrus-imapd-3.0.3-r1.ebuild 5754 SHA256 652447ca47a913dd53d20ed976f630351d86e69104dc11afa01c7125a2a1b0c2 SHA512 d345ee957cbeca761b6bc6f60fa4c010e2887f73a08cec49c16fb7082450258d3d900856e6773ba9ffa7fdba5ddf061616adc626c61b44e6f98b1dea8c218a1b WHIRLPOOL 87519e916aab206173862f4c55e59a1d2b23cc0a7d38b9ad341da236a0be17115297b9d013310fb7effa173279f2f3ab4aac10a20d6992f867e78e2f8a04b12a
 EBUILD cyrus-imapd-3.0.3.ebuild 5702 SHA256 e47b9be010571ac5f464486dfd1f84ef1afeb57ea35a0f9ee87251f3c185d5c0 SHA512 35aaa7a6d27ac8186fde64371b9866cd1683e923d31a04cf2a11207955e0b92a181fba5a2707ccf8e4dd3906a7041046c9254fd09b18e6f110a58416e98cdecb WHIRLPOOL e5a165c709ceb05acb009db4ce7bab6277efde3dcfa5b2668d0e052e6fec7fb2a881f8b7c8b6a70be443936795638b8c10a896aa8e7f2d64ea9a4f80412c9060
-EBUILD cyrus-imapd-3.0.4.ebuild 5898 SHA256 f58fda33718256405e1cc31e47dc7533b4aa5f43556302369966850cd1517917 SHA512 35d2cf349e15d5aab22e9dc0dc154ade68d805d318a7d78fb54ec58155040ecd44cdb92ae029ee3a3ad5294a1524270d2d228997203e62e5eb33d6ab91e3b78b WHIRLPOOL c1f160e57f99e7ca625a057182c64debe74d4f98c8eba06083b9111b3b9970c294318329a8fbc6d5ac73a3e0bf44fdfc444cc2f607f6a4b260e0c9346d4ea471
+EBUILD cyrus-imapd-3.0.4.ebuild 5897 SHA256 1632bb5b14968ca18db416c7d4c1fcba7ccd5362ead438c9d58003a156381da6 SHA512 0fa1ecd5a28447c8ce13addf964ee35763865af6ae2d9d0d51bfa31c16a03c5aad4bb51b8ad577f5cccf9fdf915987fc8a29610a3366ebea468e74d646e70e5c WHIRLPOOL bcbd56cd2887c8ac5db836a986dae46c6928e750a4bf7ddc5762fdd7cda4a95a4b621c2c798a7ab60f5a342959ab7ded096f91d44ad3b0aa1545e630d7d2efd8
 MISC ChangeLog 4804 SHA256 d41f017230fe0f2251e7c5f25cbcb6bacde54806993d247f4efb5707312f7298 SHA512 f9109b2a23461c41b418476e2ce4c9a0bee7ee5572213406ffe74c4d1733f207bc8971cd6dac4fd77a762cbc294f5bf84d7ee8031acb39ad799f46b48e925213 WHIRLPOOL dfe3c74426eb843f9cb6b47c37702c2050769434c2e805beb793389d7081c37e69f02ed08389b8906823da724e075ffc4c300a5e0d542d3d328e560b7888f037
 MISC ChangeLog-2015 39151 SHA256 c2bd8f1276a9e00cef3d08c00d5f78aa34a4732c654c3f126ac3d126f804244d SHA512 253f158b336687ed21cdc0507c03bde6e440dc6ea0080d80ca6dd883c279db4f72b9e25f69ceed7c9300011a7705d040c64d2d8445bf45bcaf3e53c1afc08458 WHIRLPOOL ce61597c095271d0d4d613c89b734ac5f12c1f8f04a535cc9bb0e6cc7b5928c5ebc9c69c6f80b0badec8846109ab31f47f4276ecbf47a95167f361c5d1d675bb
 MISC metadata.xml 871 SHA256 2534843965cc06933180f661fe8126b607696e39f1c77112446ae262a5c7fe16 SHA512 25449c1218dfad7b692b37b799a659b6a10e0e31bb003fbed27b3b43ce3610f9ee5f17a995cf9244d5027ad84889a8e79a774f63101bb6ea35054ce9dbb1fe20 WHIRLPOOL 506cdb8d91ee25f145e2cb784612a5fada49974bc6e674ea5068ef1d3a445a747f44b60b59f693f6aeae609f683cfd643498fd6c36973436901217fc6b6ed3ad
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
index ea3be88683a3..013513de3487 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sphinx sqlite ssl static-libs tcpd test xapian"
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 9931f90409f4..40792e14b5da 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -12,13 +12,15 @@ DIST dovecot-2.2.30.2.tar.gz 6008134 SHA256 f3dba79c1ceeaa9dd0633f648d3a607704bf
 DIST dovecot-2.2.31.tar.gz 5993283 SHA256 034be40907748128d65088a4f59789b2f99ae7b33a88974eae0b6a68ece376a1 SHA512 071797e260a75de9117b03c0fa9d903de82b1f1c039c2aece2d7313587e6673c49174bfce17b80fe3f3725fcbc42ed3a1bd1f1c22efef5bc016752277eff3266 WHIRLPOOL cc54758f65cc1f6295cc5533dd784b888d53d9b884016de08ddd16d893f3dc43df2cff87e474dd9f0f4b9df1c90f62330f7c70f051497f34729829849b39e519
 DIST dovecot-2.2.32.tar.gz 6100268 SHA256 160b2151e2af359877f69cb2dcdfe1a3f4138ad3766e3b8562b96616e2f6bc2e SHA512 a26ce763fdea7d72ff9801d3b7d57a1f0d00278e4a1aa60d1be070fe5a6d2c6a15f266a519119492bee7a3e7a6b7d0732e9879e5c5841adbab8c0952cd1b7c7c WHIRLPOOL 11ec82d0648a3fcbeb803f23672c2a734b2bc41828d71990ff72d5f6bfa56e3b294034de615b5b34da257477727832025988446f0baa92a0a56f61aa1d695297
 DIST dovecot-2.2.33.1.tar.gz 6131180 SHA256 e4d9a182408100dce70e05dad1f8a703252a497aeb25706642286d84a118890b SHA512 46760a1d52f8d64c36bd4f589f7f240a13d66500c93e47ce479551647e8e4ef7322fc0c325c418c3e0495910292abae105ca5680cd4b0fcd78746723f1549b71 WHIRLPOOL 941cd157aadbbf6c46c2dca56708e14dea1b2a3103ff84c41e625f5a3b0a75ab15a4b8c2d4e45915fb92a4bd2d589e640425f2354524bc8bdda9604cdc39af3f
+DIST dovecot-2.2.33.2.tar.gz 6131086 SHA256 fe1e3b78609a56ee22fc209077e4b75348fa1bbd54c46f52bde2472a4c4cee84 SHA512 028910a4d02b1630f1ada4d1c45fcc3ea2057969db7078a78d46e2a578b4dceaf8be0ac8de4a613b4890019e721871f2d366ec651db658da4cc72977d3e09931 WHIRLPOOL a861ef3ef9f7cdb8926255c5d51f9d908fa84d671acbab676a8a4f1dbab9173c7005e8079519139a3b359b20f937cd3843a38686c03dab150855ca38c9ee3733
 EBUILD dovecot-2.2.19.ebuild 9085 SHA256 c6ba82ed8109d79688c2127479da169fdf6dc5a65552cf13af3d81e681c274d2 SHA512 cb619f9f5588ab1be1b5de749663e4798044d695a359c96182037c8b3cdb94c8a7b41eac93054f2979b30d09405a3396e83d0d08cad3ad964654ae98f7632098 WHIRLPOOL 170cd361c69375216783253103dd28fd9cb51ba4d46f800e2dc196aaeef26acb917fcdbb4b16c90e0fcc740449304c8170fa3fa9fa39e0d88ecbb5c3739d8860
 EBUILD dovecot-2.2.29.1.ebuild 9207 SHA256 9b76684eb0c7052510f3e29a3e03458235f6ea1327f6dae0d24a759148ef8d1c SHA512 ca5a2af20756d5ac72dc96dd2a80334a3dc533a55b13b1d78ffaf29754795c4af353e39ea34d8e76f82054cec154d4128dc958c855aefdc5ca1877f7c0f3d06b WHIRLPOOL 2087852cf3a36a46f25ecb200f80f7dfbc1d215f48ff574856124a7bdfb0d3a692793c98889797ef58dcd3d4f2c4fc23ff8b60ab9dbcf98e4de6b016fa035305
 EBUILD dovecot-2.2.30.1.ebuild 8646 SHA256 5abad12b2792e8d8022d9bf51485ecb472bc83243f44c1bc751932c1966fdd22 SHA512 b9460cd076d8cb35699abe54ed7dcffa77c83f920bc01ae451fcfefa609850323d6da91e84deb77f38c48174e60c7a9d26e7f086a0e65c7dfb96e3e2e0d8eb0a WHIRLPOOL b4299ee41581612994709e02350ddd4572c82a19bd4832d2d7d444afa36fdf2087437c99b8a771ac1157270f7d791b1447a41486014c9fdddeb71e60df7f568b
 EBUILD dovecot-2.2.30.2.ebuild 8646 SHA256 5abad12b2792e8d8022d9bf51485ecb472bc83243f44c1bc751932c1966fdd22 SHA512 b9460cd076d8cb35699abe54ed7dcffa77c83f920bc01ae451fcfefa609850323d6da91e84deb77f38c48174e60c7a9d26e7f086a0e65c7dfb96e3e2e0d8eb0a WHIRLPOOL b4299ee41581612994709e02350ddd4572c82a19bd4832d2d7d444afa36fdf2087437c99b8a771ac1157270f7d791b1447a41486014c9fdddeb71e60df7f568b
 EBUILD dovecot-2.2.31.ebuild 8652 SHA256 e6d18d821a52fdec681e96f909d47c55c22b1857d574d7ed6af3cde2cdc796a6 SHA512 c2780f5ecbe58947fd9ef01f5df4ee371aa224f63b86b9ddcee4c38cc11eeceff96880b29a29739b7b2479bc0b646ae09b57f38ee4cb31b005b5576e2edbffec WHIRLPOOL 0f3d2437d8d5e6ede3b4b4580513ae48863ddc6f52fb65efb97f46d0a6f1b4d3a01a8e12c836d4315c41cf364dd1cb35a83c1f88336dc6204d7fd8551d0fb568
-EBUILD dovecot-2.2.32.ebuild 8650 SHA256 a504fc429e85f6ffafed742343a3d1f964c30a249c561c19471ded7aa1148460 SHA512 9f9e05cf4274056ccbdb203abb2531c21918bd23ca748729edad71e04e5217300211c48d9e3cd572de76dbae8ad6230d6955bd12c76c19b13b2dd15f8bcdb19a WHIRLPOOL e6fd43467e88f88ddc7fc3f68c63f93113f55071bbb17e823a926ab4ae816a273448d4e7a2ed9743dffa992fbf1884926d6d9e44efa760855e386932adc2e5ce
+EBUILD dovecot-2.2.32.ebuild 8647 SHA256 d4a3496eaf022624cdf0fd996004340d3e1553257ade5b2d46998342735d0281 SHA512 f7e769155d455fbfce2b9ee3ee8e6aa7e123df8698adbf8c14cecdb9a46e6a45d7e50ed7f2482f7622c9fe480349fc9b3af9bd30e3faffcdb69341e812ae2665 WHIRLPOOL 5ffa113e322d2d23d873f1d736f1d771fd365ba909fcf618cbe7abd2c6c3fc85fec445dc1bbc9df4193bd80c6c4acf2438b49e15f9025ecbad8fd07c91b389c2
 EBUILD dovecot-2.2.33.1.ebuild 8652 SHA256 56fd02871646e19777d1a5e5f7878958c56dc5348e88b479947ec354d828fc6b SHA512 24dd9cbdfb0abfa7fa70ba07a77c8ecbe59a4ec22f20a840cb40cf7d9234dd003e4c5d0c5b52d32adc3dd76b7eb1af90a4f539d8f3dfa3e83c42a7e0c6a4e28d WHIRLPOOL a873f961994bccfeb3d586274f526e8251673c06b6e7e2239bcd0542cd371e3f3c8be2ac80a997a93ddf480665458a0b2c089dda397351d4654ae9b30f4530e6
+EBUILD dovecot-2.2.33.2.ebuild 8652 SHA256 56fd02871646e19777d1a5e5f7878958c56dc5348e88b479947ec354d828fc6b SHA512 24dd9cbdfb0abfa7fa70ba07a77c8ecbe59a4ec22f20a840cb40cf7d9234dd003e4c5d0c5b52d32adc3dd76b7eb1af90a4f539d8f3dfa3e83c42a7e0c6a4e28d WHIRLPOOL a873f961994bccfeb3d586274f526e8251673c06b6e7e2239bcd0542cd371e3f3c8be2ac80a997a93ddf480665458a0b2c089dda397351d4654ae9b30f4530e6
 MISC ChangeLog 9857 SHA256 973c08c13df5fb24d94aed96c681cf0ec7539b24581fd0caac2ab3c6e0b192e1 SHA512 0ff9e788bd55fac94e1e641edcbe7849e0dfc0d8152a2df047353f90c8de61655e79f450dbaedec27ffaa29853d3bd603960567109c41500aafafc77cb646206 WHIRLPOOL 32858c3ace71c60b6f0cd95b2dd380acee65dabf57253dc2be4a4dfe11b5468708a351a6591d5cbfa72b054666a0a0221d5e68702f530faf06e40d2d6a11a8bf
 MISC ChangeLog-2015 75391 SHA256 223be6e013f9d10fafa0176b5aee5e71b049add2a493aaa0cf379d9ea40aa04b SHA512 f333fd9ab300bfde52a6ca236fea8110f49362bfc2852783cb483f3769ab8df8c68f1fed0ac2271226bf5a829dc711dd683d5ee7a18313429f027e718cdf4c3d WHIRLPOOL fd8f34b8e8e18c13f98b668e0323d15bd75ee4fbd30258edaf46b93caf3beae51a189bc685b1b2fa3d0c565d5c57ca8f57ef8c89edc9fca362edece65b2c2c12
 MISC metadata.xml 1303 SHA256 50a1e4e8eec92e6c44f7bdb75934727fe0334e6ec6454946c4664a63b0303d16 SHA512 6c574a0373c64e3eaeb6f8a3f4ea88437afe8c43cae6ab7c9144cb75973e0e8b4d66f805fecc7aca62257f0e7ad581a6834d1ad06e5773b6617f0d0e8b623e7d WHIRLPOOL 00ca51b94155b00b3b2fae67daaeb9afb8e8a6fee12fc768964926914cae389053369fc0a73b6826fb24b8d0f4356d3e901f9dbd41b27eb354d852f26f36f592
diff --git a/net-mail/dovecot/dovecot-2.2.32.ebuild b/net-mail/dovecot/dovecot-2.2.32.ebuild
index 1f9dab308838..f6397ad5adc5 100644
--- a/net-mail/dovecot/dovecot-2.2.32.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.32.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
diff --git a/net-mail/dovecot/dovecot-2.2.33.2.ebuild b/net-mail/dovecot/dovecot-2.2.33.2.ebuild
new file mode 100644
index 000000000000..350498e8c2f4
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.33.2.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.4.21"
+if [[ ${PV} == *_rc* ]] ; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+	sieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+	selinux? ( sec-policy/selinux-dovecot )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite:* )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	textcat? ( app-text/libexttextcat )
+	vpopmail? ( net-mail/vpopmail )
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv
+	dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase"
+
+# Dovecot does not support building without ssl.  Force it for now
+REQUIRED_USE="ssl"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use managesieve && ! use sieve; then
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+	fi
+	# default internal user
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+	# default login user
+	enewuser dovenull -1 -1 /dev/null
+	# add "mail" group for suid'ing. Better security isolation.
+	if use suid; then
+		enewgroup mail
+	fi
+}
+
+src_prepare() {
+	eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
+	eapply_user
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--localstatedir="${EPREFIX}/var" \
+		--runstatedir="${EPREFIX}/run" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--disable-rpath \
+		--with-icu \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with lzma ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with ssl ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with textcat ) \
+		$( use_with vpopmail ) \
+		$( use_with zlib ) \
+		$( use_enable static-libs static ) \
+		${conf}
+
+	if use sieve || use managesieve ; then
+		# The sieve plugin needs this file to be build to determine the plugin
+		# directory and the list of libraries to link to.
+		emake dovecot-config
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		econf \
+			$( use_enable static-libs static ) \
+			--localstatedir="${EPREFIX}/var" \
+			--enable-shared \
+			--with-dovecot="../${MY_P}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	fi
+}
+
+src_test() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default
+	fi
+}
+
+src_install () {
+	default
+
+	# insecure:
+	# use suid && fperms u+s /usr/libexec/dovecot/deliver
+	# better:
+	if use suid;then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	dodoc AUTHORS NEWS README TODO
+	dodoc doc/*.{txt,cnf,xml,sh}
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext}
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext}
+	docinto wiki
+	dodoc doc/wiki/*
+	doman doc/man/*.{1,7}
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	local confd="${ED}/etc/dovecot/conf.d"
+
+	insinto /etc/dovecot
+	doins doc/example-config/*.{conf,ext}
+	insinto /etc/dovecot/conf.d
+	doins doc/example-config/conf.d/*.{conf,ext}
+	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	rm -f "${confd}/../README"
+
+	# .maildir is the Gentoo default
+	local mail_location="maildir:~/.maildir"
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" \
+		"${confd}/10-mail.conf" \
+		|| die "failed to update mail location settings in 10-mail.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${confd}/auth-system.conf.ext" \
+			|| die "failed to update PAM settings in auth-system.conf.ext"
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+		sed -i -e \
+			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update PAM settings in 10-auth.conf"
+	fi
+
+	# Disable ipv6 if necessary
+	if ! use ipv6; then
+		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	if use ssl; then
+		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+		|| die "ssl conf failed"
+		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+	fi
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		sed -i -e \
+			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
+			10-auth.conf"
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		sed -i -e \
+			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update ldap settings in 10-auth.conf"
+	fi
+
+	if use vpopmail; then
+		sed -i -e \
+			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update vpopmail settings in 10-auth.conf"
+	fi
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake DESTDIR="${ED}" install
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${ED}"/usr/share/doc/dovecot
+		docinto example-config/conf.d
+		dodoc doc/example-config/conf.d/*.conf
+		insinto /etc/dovecot/conf.d
+		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+		docinto sieve/rfc
+		dodoc doc/rfc/*.txt
+		docinto sieve/devel
+		dodoc doc/devel/DESIGN
+		docinto plugins
+		dodoc doc/plugins/*.txt
+		docinto extensions
+		dodoc doc/extensions/*.txt
+		docinto locations
+		dodoc doc/locations/*.txt
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+	if use ssl; then
+	# Let's not make a new certificate if we already have one
+		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
+			einfo "Creating SSL	certificate"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+			install_cert /etc/ssl/dovecot/server
+		fi
+	fi
+
+	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 425c9b7ed253..e81fa5970720 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -7,7 +7,7 @@ AUX mailman.service 288 SHA256 6cd1c76bac4ce0c6e15886089a62ed70012653a6416fc1d0c
 DIST mailman-2.1.23.tgz 9290881 SHA256 b022ca6f8534621c9dbe50c983948688bc4623214773b580c2c78e4a7ae43e69 SHA512 398dd5c301005512900aff38c068ee641eea9f2970dfde17c37a8641759bd6fff8e6d37ad63c0c86b4b1594459b3c92023844ca4ec23d1681ac02542bd97f8db WHIRLPOOL c5e45bd4fb59dca5017f547e25986addff8079bf10bdcb6f814942e56cfc618d0e6e075beb7d5240e591d809f27af442c4da9c5e5f35358f5bf86a4f24c1d38d
 DIST mailman-2.1.24.tgz 9251009 SHA256 89b0cfc13c52915b9cdebd4b772852f1043e7435554050b4f5f7094f9093cd77 SHA512 f62f224abe5eb4804828a4d83389432b34595b8d4533310cda4da58ab10c2e62e0b2419929dcc53c32e2754d8f62fa8ef68877db4c65f6112f08f0e452fd6a38 WHIRLPOOL 583f8157de5c93ad6e97f49921f57af65d272da801f3534b454992034484924efde2d792334b7db7dc90b02bbae92a796352a1a65e8576affa80eef9b5cedfc8
 EBUILD mailman-2.1.23.ebuild 5835 SHA256 789686a01c1e7e410094e235d72043106fca41e79d9871980e421c33ea54aaa4 SHA512 bb1e4b7ae51537c1d2d4e27ea96e58e4967a03cc6b7fded302bcbb67ff6d4d21186abc1829147c47ecedb361495ba07c543335b6f6edbc9e38f0e12fd42cd4ab WHIRLPOOL 4572f2c32186f6434aa9f79b9039e783f78f28f4763484feae50d92afca7e8a8f9000330cab38ae04f202d39a09a259eb67a1d9e5e27b70a8dafc0ee13b3ac13
-EBUILD mailman-2.1.24.ebuild 5836 SHA256 ce0fcfbfc506c2b886cb02c5d5ea84d7cdd869c54ec6a6ae46da349039d18665 SHA512 f1a9d9051e558719e4da671285baccebf454c8e2102943c7bec3cf37fbe282a9ac73e748c25ce0af25a1a41ebfd6ff83a90211b0cfba46a43466fbc6dc6ec010 WHIRLPOOL 2d0018829969d60d1175150abc46a953c9205987c24b3f44a6106ae46e64d3a488e23f1c7953c6cb697d279f806eeb815bc06e9371d31fbba39ca37e86df1e8f
+EBUILD mailman-2.1.24.ebuild 5835 SHA256 789686a01c1e7e410094e235d72043106fca41e79d9871980e421c33ea54aaa4 SHA512 bb1e4b7ae51537c1d2d4e27ea96e58e4967a03cc6b7fded302bcbb67ff6d4d21186abc1829147c47ecedb361495ba07c543335b6f6edbc9e38f0e12fd42cd4ab WHIRLPOOL 4572f2c32186f6434aa9f79b9039e783f78f28f4763484feae50d92afca7e8a8f9000330cab38ae04f202d39a09a259eb67a1d9e5e27b70a8dafc0ee13b3ac13
 MISC ChangeLog 4399 SHA256 a8af4fc02594e94c0f97bd5b4cb76da002a3706ca1508842b74f6e1342424d71 SHA512 ec569bc87d5841102bfcbcf2ec94d4d77a237906f63937cacdd76aa4e6a19a89690fd9a22d642f5d5711da76d5a69892e0f9aa77ef09381e8439cdce3c1c41d7 WHIRLPOOL e23b9c5853508342a4fc7281cd23cb6155300afee7152e73261df4e456b1854516b19c80b4174dc948b50c61f3c98f79cb232cca6d0ab5a42201182ec4029b08
 MISC ChangeLog-2015 20958 SHA256 913282d55fad5cfe19703c8c3de63e957c8df5929410d3c4331d8342b9280f62 SHA512 2dd773d7ea3ccdf1a2241e90f13f5585d9dbf7656c26ae196ac5219828aefba1cbe2c6dbdbfe1b6f584820d9a05f9af6ad8e7e34cc90fad15679bca54d12b967 WHIRLPOOL 2d047534d4739f8b82c7aa20e7e20b12f4c3b7b9252db3456d8c08d28bccc59c6ec375be64130bdc4eb91c355bb8ed87aa10da797da2add76ef0243060986ea0
 MISC metadata.xml 398 SHA256 8a1ea66253161fe81ab1e3f541237be1fef45d8bc64a21a230ffb67b3d6f0fe2 SHA512 e12fcde6e9360aaab80a5cece049ca20ba8deca00c7051987d0903d1dd9992545d62c10186f05dca6fed28682050efe704cc3ffd92bbcb0ceb9ce5ce972cf62f WHIRLPOOL b081299391465ee0a7f22ba0542c79a06e0e00d50497a24fe6463c32f6e545231d815cffb8b6ed3128da0623b1ae4a317dec4977e9a9cf59a2113e103c39ca67
diff --git a/net-mail/mailman/mailman-2.1.24.ebuild b/net-mail/mailman/mailman-2.1.24.ebuild
index 977d9d38712a..8c9de0c02035 100644
--- a/net-mail/mailman/mailman-2.1.24.ebuild
+++ b/net-mail/mailman/mailman-2.1.24.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.list.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="selinux"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 17551cdfe881..382431c7fc0d 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -14,7 +14,7 @@ DIST mailutils-3.2.tar.xz 2795512 SHA256 96d354e69e93d5ed6dc2e1019bc3ed3c6e32224
 DIST mailutils-3.3.tar.xz 2618632 SHA256 27d7fbdff904abf4eebf008c56ca61f135b110f8304c22bc4926dca4f944b4f6 SHA512 ece4e59ca46e287b8e69e45b9ca1207f9a7ef450ea009212ed9284d5aceaeafe64b0ee6333f42c1edcea2a2c45d414b8436e49bf342938bd78b7157a751bce9c WHIRLPOOL cf78b4d5762c7888c8995603b772d6b9b2485cd48c149d22c2c61a646857cf0f23f80a285a740b5d8ad177999eae302b90eb931d08021ee7fbd813463ce147ab
 EBUILD mailutils-3.1.1.ebuild 3575 SHA256 a3a8f2f6878946f91853ad2989e277e90e4c7abad868778b5ad275d84b7c4b74 SHA512 3fa3501b885b254bfaf86786d67a3177f0756cb0346ba630dc9b902c851ceb708abce1057d326de769704ff50d713859f0280433b384a6f17b016a4045d05570 WHIRLPOOL efb958c29b2e8ed499997cdc5e6e4fb78a2069750077acb605a17ef828f21931a9a5e3d2a6b00fac20f15c7d530ca18def937c2898fce872a6ec1193e154c8cc
 EBUILD mailutils-3.2.ebuild 3572 SHA256 2444d17d022ceedd371f2a76906d62b2778f04d45b6758c5205a182418980ec7 SHA512 eb2de61804c2e6da6a6c704f7df7e88b6ab8682b1e023e2f47661c504a38bea4fbe391fb4fce462f6674e1de645422c0a991f4d906635d41163dd9ac7874ad03 WHIRLPOOL 884887b2ecf8a6928e5b9f3af118dc808977f9826b7f19c59b1965a798471e16634e542f5e4f8b6712c6c5de7770c90839fe655802d4167e491911a52405adb8
-EBUILD mailutils-3.3.ebuild 3462 SHA256 a865dcc9e2cd804dd01e1c13b5fc9d804ea1b006394935e8eff26988ea4b5a17 SHA512 0cac9a11d3b995aff0cf97b633b64ef3f4b3807e5d0d1b355fe3e16e5b9ef1abfe0874c936cf5b8b67468188b3ba73c764945b6028cae14b97e7d05e2e716033 WHIRLPOOL 40f8f90250e0957ec7ae636a50defe11e0b858cf8590a71f5fbc7c431b708294a4c625f1e63168255a029b3767fe111a950aaede0e1d682f1c9377bf3856cdc1
+EBUILD mailutils-3.3.ebuild 3468 SHA256 796f08cb2af91b934cde1606abadef5dfb83dbd20aaaf842f52a42fd88891167 SHA512 0e2691b30d4da040975c89c059d2f79b5025a8f6a686e4d4a45bbbd49db9793b40caff76d4f9a6986132c88fd00657d930c2871020ae01ca3651dfd97b3a3f11 WHIRLPOOL bb64e4c4ea9be1144f6ea369fd573e06e73a47c16f1bbe2f32a85546949896be29287a5e980c6a81e1c9fbfbadacb4c8b3793fe1af4e5cdc93ed08f6abe9a8df
 MISC ChangeLog 5455 SHA256 22024cf49b78294fdbf350d540c1cbff74ded9b5ed5790552ad3063ff7940ba5 SHA512 b16a07cda1196de4eb31e60ad88a0aa9e28e43d7dd810d18269892a849ec70ebe4d1af7299a76557ef10289eade0c85cfa1fe4fc8af2ab6f622b5b70128ba7c4 WHIRLPOOL 57e8d636f52f82d34a233ceed610cdae1f84d4f73924fc2ce170cfd2c72105ca1924af35f59ab3bd7a0ff37113502597f1634ed2bcbf4cba3fbe22d8bd2cf38c
 MISC ChangeLog-2015 10533 SHA256 6005cfed69eb8d6065cbc67be396bb130ceb3a4c40427e17b5608ac72ed719cb SHA512 8351be5fb052ca348935f535ac456034fb1342871d6eb0ff3a66cd6565b33a383c197be33b6a42f0b57f15f6730f8f549f48d7a96142a124ef3f17a83651963f WHIRLPOOL 11932cba8f90b74c53f55de61748f1ca217ad5137376572d34166f19345e12bb5ce1b3fffb16b6a3e051c8e0407c2616b6d52d433b367bad1746740be1184fc0
 MISC metadata.xml 598 SHA256 11e28455f0762275ad80e82ebb26de0119b7791916fbb5a6c677185e213b6ecc SHA512 16f2b6b082da7c932457df31809c8ca1caca1f8439037f56b5751c28cf1217658ed60fd4155871d4d5d71e7040c01edbe37198dee27beeae1905da954317c8e7 WHIRLPOOL 34b3346cb70bb38e74fd021b28b21578dfa82a7b038db8ec5109b0e58a489cf8dece99cf33c970d22e7f410641c58ccc39ef8fea57b72f109b8c883791e74d0f
diff --git a/net-mail/mailutils/mailutils-3.3.ebuild b/net-mail/mailutils/mailutils-3.3.ebuild
index 00ddc41f835c..7c001e0b6168 100644
--- a/net-mail/mailutils/mailutils-3.3.ebuild
+++ b/net-mail/mailutils/mailutils-3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap \
 	mysql nls pam postgres python servers ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-mail/postfix-logwatch/Manifest b/net-mail/postfix-logwatch/Manifest
index f672357c5ec6..1d61ba184874 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -2,8 +2,7 @@ AUX multi-digit-enhanced-status.patch 1479 SHA256 89c7b86632ccff9f1cb2720a585100
 AUX redundant-argument-to-sprintf.patch 1744 SHA256 a3e500da7b5379f3c0600904b2092e7a6b3a9a8270d1137ebc0f0c07211a4103 SHA512 31e35603cee7c51ffe126ba0caeadbbca564694439101d92293d2163d3b674be552ac3e781d4b10fab11435d072bf3bb540e3070bd3a839dd6297fff02cf5b04 WHIRLPOOL 408129f782a7fd6a40f72061f4953726c48e87b5b3fdbb3b2e58e5f488a17e584ca411786591cbdc7d0f7e2745e8b5005b420a62b5c1811c92a0268d8c5f597d
 AUX unescaped-left-brace.patch 1277 SHA256 cf57345d6dec8bf8d45020af79d4c15bb95d4c3d98b2495bea39df561439eb15 SHA512 dcfdb1fc7793fcf8a1e41fd890023c901bccff5c241601f99a5aef398fe35c1eae82d786064e189ef2113aad9d2081a67d8451d9c58ceefc78192e22ac5d3033 WHIRLPOOL fde7e75c52ca4afc97bc7d8183c5161badf379f71ae543f5660cf566f7a42a780153457d18ce18492eb8aa9f524ac06e7f28539ec5e155649151b12127d4793b
 DIST postfix-logwatch-1.40.03.tgz 107065 SHA256 c9aae87471554bb93c9d91bd2df3999ce3fae19f75ffd43fdee3f8552232c748 SHA512 7059f409cabb3cb638885342ab876e1c85c87530c3544bf04c54a56707695acdc5cbb706e3f192ef5608c9a00706e4d7be3cc7b32286460719d7b497e44b3341 WHIRLPOOL 3c8e556863a79ec55af5e1a19204ddbc2fb3ac60c1a8162239f465da2cda465983f705755be7750e58e0a196c680b1e880f5c6aed0157baf275f6443535104a4
-EBUILD postfix-logwatch-1.40.03-r2.ebuild 1071 SHA256 e26f7d9d889364847fceec4712ffa74aff48319aa9a446500d0ab41c7cb5c46f SHA512 4fe1e57565820139e3228d3b3a10400d0ae68bfd89aa3a066bf2e83247244a2fd704c8c7ed7c2140659dabe8e2a3887c02fddbd40b6763e599d4594f24d40456 WHIRLPOOL dc557e7a7fe266617e7b1ad950c8411b7a893463633c5470690e16b1d1c46edb0d64d9c4ad29faea46f1f119b748f37b4c757121ec7216ad6305954094fcae5e
-EBUILD postfix-logwatch-1.40.03.ebuild 905 SHA256 d27fe92c7a60846aa5a796c2e22ed7cd1684699b853ff0e2d40c011dae12ec03 SHA512 ab5358dacd8bcbf723d2c8a310f67b2a351bf814a018f3a258d6ae68ca244aca34b214194d53678caa5cd5ba99e24a0c74a2fe068078659a955694c02adbca30 WHIRLPOOL 05afddb1f12be1e8a2a6e93a75692e1e7d6796afe560e434f75c04e31dd467e380d4dc55c3ac40bd1b4e06b0241987ed92a95dfdae1c9a1ed9defa8f7db89976
+EBUILD postfix-logwatch-1.40.03-r2.ebuild 1069 SHA256 67ad1c36450f608ae3a6d52f8a7e0cef8b61278ad83cd694cff6c19f695c34e8 SHA512 c92f554614484baba18a9a3e178e4a6d419f2c41cac23f951a518fd63513b8e9df278391441ec8ae2cf9c68f2923e274e3e436bbbf3761430a6c5d797635c5e7 WHIRLPOOL 8d94e99aa55903279a07e4cdb9d462757c34150e2b2eed679539dbeb719359cbc9a0192c27af791ecd982e492dd65082549843856881cfb6aa8c361a0b78e8a5
 MISC ChangeLog 2439 SHA256 23a257bb21b554b1099d717e06e9c6e22c92b564e921edafcf3297e53c361f66 SHA512 a78e1a9c4d3d70f6d2fcbff2201d0d348441f1ad1ce3d690cefcc82286f0571afda1676efb3c97a7f8cb34dee12f8f1f5dd86f0361562fede4b2750d6ad3e26f WHIRLPOOL 5967139fac80d2013a40056206dca62a5606f88a6b8cf2bf6580b438aa1ca57ecbf49e3ede57088cfcdfbd2a230263f16b6aa39e2509705c8365427f3524fbbf
 MISC ChangeLog-2015 1150 SHA256 0ea7b481e33e04aa79b6033fe7b2197661fc5599c5fa0c9df9382e98d536c3d6 SHA512 6d84cd9cba19e811f48b254cddd65d3fb43064f644ed179e95588c73b287520b78c272d43db1297b53dff6fda222ed6f5e45166acdede705b63aabe0530e30cd WHIRLPOOL 8eeffdfb7b8bae200f8ac33bd6b25339cc8b9d1bc4fe997c5fcb926af4b3aab3ecd0a2acdfd2c316a21d8e513f01dab3dce0f2f1a9bb0535ebe7abc25d88d523
 MISC metadata.xml 304 SHA256 b182e57c2917b40d2337cc57fe76f04e36af8c24004a80c61c3eea94f9b5477f SHA512 6df4937b334df95e1178cd70c594d9ef08e52f5b34f4da0a129cd3586192dabe974623b13b6992021231150e8a70b7c2d68e7b65faea39113efe04f9a2244cb1 WHIRLPOOL b774e93c9c2e496b4d859e2149b688d68785cb18bde4a6f17dc10dc1e09c199b0d3c775441b863936ce726a392adc7d6f69eeb2a45fd33ea7967984165cfb272
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild
index b798aeb3512f..f1ae6f1bf1c9 100644
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03.ebuild
deleted file mode 100644
index 375d2ed98b4b..000000000000
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A log analyzer for postfix"
-HOMEPAGE="http://logreporters.sourceforge.net/"
-SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-lang/perl"
-
-src_prepare() {
-	# Replace the default config file location with ours.
-	local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
-	local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
-	sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
-		|| die 'failed to update the default config location'
-}
-
-src_compile() {
-	# The default make target just outputs instructions. We don't want
-	# the user to see these, so we avoid the default emake.
-	:
-}
-
-src_install() {
-	dodoc Bugs Changes README ${PN}.conf-topn
-	doman ${PN}.1
-	dobin ${PN}
-	insinto /etc
-	doins ${PN}.conf
-}