gentoo resync : 25.08.2018

5 files changed, 3 insertions, 7 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 564c1b4a7fee..b9096c94c3f8 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/razor/Manifest b/mail-filter/razor/Manifest
index 09cbafd04871..2c8179dea7a9 100644
--- a/mail-filter/razor/Manifest
+++ b/mail-filter/razor/Manifest
@@ -2,4 +2,4 @@ AUX razor-2.85-cosmetic-pv-fix.patch 616 BLAKE2B 58def0277c1142b664f65ae9f6e7f31
 AUX razor-2.85-use-sha-not-sha1.patch 3897 BLAKE2B 5cbdd0cbf6a80f4d2e1eba364d2db5ef972368257110daaf07c8ee6444884b07ff930184a4c92c1b0e7af89cfd5384ada7d00ddd79114c799bc8ad34e8f61a51 SHA512 891a93408f56bb6a7b43814a501cce8775c51abe7cf227c39dd18699ac5f4c1aa5484842435edda58f7141a87e5ebe1496bfe959afab09fb44c3558c66511289
 DIST razor-agents-2.85.tar.bz2 81691 BLAKE2B fdb389ca4192dc2a3b87935fe97a4750ab715ae163aa1cf8adf5c6dd54e8e2f2ca53f1fcc37505b5ea0ec4e9bdb78a14ae8b30fca770de80a2a69e3e534ec3ab SHA512 31dded1969dde963389a5939514c29638ad07f45dbb2f4c633cf20ebc4abab94e65e9a6d8885233cdde686ef365aab11fa5eba2ca38d79c5b8fab689143ff5db
 EBUILD razor-2.85-r2.ebuild 2674 BLAKE2B e3160a36643630aa1e8d2ce4260c0a135d4631d35abf2e538dd8cd8c1ea19b340da0afa52b2db54c2078a20929bcfc01c453dfc2af5643d7ddb393cd8d489ba0 SHA512 b506a09d12550f7c25bce17e458456ce7aab6858d120dc82b5f6adfb0b18ee53e2019eee8514a20e50337f949cf29421460d99f83fe65a9865d34d9e05250cbd
-MISC metadata.xml 705 BLAKE2B d0672ed0f1b55a34b285b706ed221673caf3bdba562c4f981f0e9a711f15a55213058568ff853e0469578bf569c8ae3a8095a27f3791ec3b015482d4ca570d03 SHA512 7634caefc54a09f7c83ae77103110e4f48641b1d6f1a091951a9e969c934303bdb4227120eec35cf46c1000f414782436c7eb8248f59b8bd4dcd4dbcce1047b7
+MISC metadata.xml 588 BLAKE2B 41114b28fb19ea1165d71b5a7371ed475b58ca2fbdd772b280a40ce090cb1132fea2ec248c35f999067f203ab5c30bcc19c17db4e1cff1fc86886ab599fe7826 SHA512 7f347fae3820ef0c5b5fc914377bd5f11090dd0792b1c4736596d433cc07b6b3ff492f73c7ff605b60765d7c3f400531b00777ff4a8cc198af498209ed519847
diff --git a/mail-filter/razor/metadata.xml b/mail-filter/razor/metadata.xml
index db02698daf07..4502233cea06 100644
--- a/mail-filter/razor/metadata.xml
+++ b/mail-filter/razor/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>net-mail@gentoo.org</email>
 		<name>Net-Mail</name>
 	</maintainer>
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 1bb6b4f2b3fe..96cce4939f20 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -22,5 +22,5 @@ AUX update-spamassassin-rules.cron 1378 BLAKE2B 0fda2be565deae75c0248c6dfc5abfc0
 DIST Mail-SpamAssassin-3.4.1.tar.bz2 2710985 BLAKE2B f85b0ed2bae783bc6dfa39df36589a6cb90e6c657efcff1fa094f952847e4bcb24aa232b6689804bb1170204ae1d33216ed9bde207d7a7a6863410d8f847c391 SHA512 91d50e2ce6520e3e1c7bc66da133a0815be34ced15e26b6e6c17af5a03d5c62f41d8086f25f65084d6634497148cf5439977d7d4a44d7c3e307535beac6629af
 EBUILD spamassassin-3.4.1-r19.ebuild 7828 BLAKE2B 2cbf6260632b4fba3e0f25eeb4301be18a321768d6ac77f479d0d0bb7914fb978b59817db61ac35acb19386b2831381f1e6f7784dd8c72f94999c0c9e8cb718c SHA512 822bbd4cefdd73a8174072c2131cd8deead8416192ce7b9373165476cdaa2b3056b589d9143fc84944ad9bd312333852cd510e3ac949afba5310fda9a778b64c
 EBUILD spamassassin-3.4.1-r20.ebuild 7814 BLAKE2B 144d0498236d9f504e252d7dea23910a7ece9739a8df0a2f840be25ae656702f64847f533b5dcbd54761e3fb5e073b49ca117107269b5bc25a36ab64c0d52468 SHA512 3bc999d93244311e074cbecf3b6e4ad7db065b8ddeb1a13f0cd93e654ed7694d8c527b35dc624479efb56bdb050fa46996a5a8bce15fa3968e26970e87552d32
-EBUILD spamassassin-3.4.1-r21.ebuild 7867 BLAKE2B 7908223347fa7e36c8bacd98895c7cc3376b3bf53a9a57c8721f7388d756b34124c3d5e97f64cd8a661133a7626c639da522560156b6f54c5457f79b4cc460ed SHA512 3cfcee71f47b88ac2b34cc3e4aa10bff8a341774931c81464c6aae838275b8766f7d25103d76f3ae650b90af36f8cbbe6998196d520f2814f17c5bb18357b121
+EBUILD spamassassin-3.4.1-r21.ebuild 7864 BLAKE2B 0b0ec546057bab2a4e0b70be5472e64ffc04544bd2a70f08b2adca8d8a0d93e46978ae43afd4260f9077f1ec6643489253632dcd323862397c733c7c7f578bd0 SHA512 66c19caac7f4227ce632ef81cd99de8439e27889db47b36bbb3e755d75f0774f3cd8a84a68c27bc0de0c326c0078187cc320e80fe2fb20c5222afa02bd8746ff
 MISC metadata.xml 807 BLAKE2B 14bf38e1888040ece6a48e7a8234917d5f9ae8d699995a0414520c0d262b91518c233ee3d3b1d13d7b5068fea8ec612bfee2a84ce825748e471b6ba6c25728b5 SHA512 2cc4534cdb5ed62612419a99a67e9e8e1867ba73a2daf957e3df8e7f2fd0bd058b7c9bb31fdfadb56d4001ce89e66d8f9da89d620e482d8f13502f288eb4136b
diff --git a/mail-filter/spamassassin/spamassassin-3.4.1-r21.ebuild b/mail-filter/spamassassin/spamassassin-3.4.1-r21.ebuild
index 18438cd92a69..b4c49f4207ad 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.1-r21.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.1-r21.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
 
 # The Makefile.PL script checks for dependencies, but only fails if a