gentoo resync : 31.10.2017

4 files changed, 2 insertions, 14 deletions

diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index a94a3d146ade..3cb9911c9adf 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,4 +1,3 @@
-AUX rspamd-1.5.7-map.patch 290 SHA256 e9494e2664da5c4d8c6bdcd75a82a81b9d7efa0e3825172cf564a412d0fea0cb SHA512 a85929322c80a527cf9ed71b3a09f89025a0e57c1db8f81e733cde5f612f21858fc6a92d59e4476266b1a478ee9935d0ba421e868e4f760494839649c4daaeca WHIRLPOOL 4530a4078977817625baf1b82462781495c57509ec9488bc05b8983d37ffa051f08fa2445ea7090f2d9e6e0eab1fe0b8dd7b681d909c409e868f579ae4c12b26
 AUX rspamd.init-r2 1030 SHA256 1296c61aa61a61dece2ccd71e19b6322f4d76bb12f6fe3416925fcbde8250613 SHA512 6419e21253ee98aa0a5ee44e750f9473b8688d79e460866b23a153a76949e20fee114f1b58dbce90b46dc758636af8591e2bae6abe0c513c889025564582351f WHIRLPOOL 0ad66f196d4b24d0cbcecbc8b59865cc4cad3fb826858910ec66022a7727ffa4ca5b41d41b921e6e648da2cd72520510878759395ff830ed08cb35a145fcbe9c
 AUX rspamd.init-r5 993 SHA256 3be6b028ca7eb6b528b845ed07b0823a83e22877bce5a7f557ba0f5ea3ebef7f SHA512 a51e13e344a67436ba377ed5b5f5516895f7b0a87571dd1d8391fbc4db5794e98e609672f103f997d6c13aded81595ac4e0c4f315e7c23a79408d0dc680930a5 WHIRLPOOL dc71ea01537be6ce95c2efe17546890e1893d10d1476276000caacd3bc8756903d1f46d28ece98df21891e78426246e7c8005515b8ceefbf775b02e74362fb54
 AUX rspamd.logrotate 226 SHA256 45c618348e4b207665d11927fa520b63462cb246cb3e1a80d111cabb756ac2be SHA512 9593e269fdac064050eb9e3e3bb25db73bb41163ff6764845bf4cc05512a4dfbb1cedce781f1ffa390d1d8df579fa66cb34d1629649133ba8f36a30d8050c323 WHIRLPOOL b829bcc92f70c9ffd63355476b1effb8ddd61eb7d5c44455bd6934edbd0479f0bfa87520066d4b854b35b251a386ef7c01b1cefb7bea4df2dcb6f7f513ebb5b5
diff --git a/mail-filter/rspamd/files/rspamd-1.5.7-map.patch b/mail-filter/rspamd/files/rspamd-1.5.7-map.patch
deleted file mode 100644
index 1477b13eee78..000000000000
--- a/mail-filter/rspamd/files/rspamd-1.5.7-map.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rspamd-1.5.7/src/libutil/map.c	2017-05-02 15:26:54.000000000 +0200
-+++ b/src/libutil/map.c	2017-05-02 16:22:37.695254699 +0200
-@@ -2290,7 +2290,7 @@
- 	}
- #else
- 	if (pcre_flags & PCRE_FLAG(UTF)) {
--		re_map->map_flags |= RSPAMD_REGEXP_FLAG_UTF;
-+		re_map->has_utf = TRUE;
- 	}
- #endif
- 
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 8d16428d6cf5..67c48815c0b7 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -16,7 +16,7 @@ AUX spamassassin.service.conf 333 SHA256 b6f942eb15f2476dbd161db92b8dacec43f2a06
 AUX spamassassin.service.conf-r1 85 SHA256 24c07ff083df9ed68e092ae5a7d9c1e3e457bceaf447dbafcce9d538b907b134 SHA512 270337a79cdd04c82edd11e97e1186d3bee9a97c6ab35496828f30e75893c69a4dc46cbfb7fc26c1dc6de361a6fcb5603eab704f89a10c787ad1b3041e75a191 WHIRLPOOL aa047534f981d2259685133fae61de47334f513ac5276e1413e37609dee63aa88204072009b16896361e70df56007bde77dfa31103305ea5f46955b2f026ec48
 AUX update-spamassassin-rules.cron 1378 SHA256 82aafaa2ba3d7f1d86ac06ed4c561b86c8288c10552fbee1304233b0f0bd1e43 SHA512 90927b7709569a24ea2a233f42b16fce91bfda85e75e859ad85bc7ad16f7ad61ddb32bafc9b5b72515949b9ba8dda597679c24c2be4688d974375faf00bbccd5 WHIRLPOOL 9677bfc0a382dff0a3cdc28e4f9e851c7567b7f86d8ee130933f7a5662f94f1128973ab6032c1e12c69c9a65ab49daad052364944e69843412c637ea4e592ed2
 DIST Mail-SpamAssassin-3.4.1.tar.bz2 2710985 SHA256 a0c1c9808f0684b389594eb8b2ccbace6486546593493f9308c9554563d14651 SHA512 91d50e2ce6520e3e1c7bc66da133a0815be34ced15e26b6e6c17af5a03d5c62f41d8086f25f65084d6634497148cf5439977d7d4a44d7c3e307535beac6629af WHIRLPOOL 1465fcbc0456c9a671087d395c2a9998e3852a47153a0f6770158a2a311196490274c620aab89e2a6ff163defa72b8e785032f9450e7903df355544d957e8908
-EBUILD spamassassin-3.4.1-r16.ebuild 7403 SHA256 cd3bec976d087ab28102b957c2eb8dec56c094841397b41a9f9451edb24856ea SHA512 0c7326ee4ceb150d88d30b320e8c44268402d93c9961c9de187354d8804837a7e99b9fe3e7e5b9558e9e48fe7cbc7ce5c9d3ad387015762e85ff29a8f9ebc83c WHIRLPOOL 7079521adbfd266c65135ff9c14ef6a742f180aa97d173dfc02eac6e01237ba288ac0e15a1da78aa40597dd8671555d4c1759f63b8562d4ce7f87517c1f7153d
+EBUILD spamassassin-3.4.1-r16.ebuild 7402 SHA256 c8fa8b0bd445eaf916498445f837e99ab96c4df09594be7c9286dbff091f4cff SHA512 f62681f1d2e30a1e0f8b24839c7057afe91b4741edba45a8cf5a2663fc73bf4ac7dc17313dbf35478296568c6d1be6299e6abdd5c473d2807dc9498756578a47 WHIRLPOOL b5f170e18ffa0e9565a3ed95bc4f2765138b6a06f4ddc2d830113156305487466e372dd07604b44a5ac0f5802c659f6ec9f1485fa31aa2e8a4e70682667b175e
 EBUILD spamassassin-3.4.1-r8.ebuild 7014 SHA256 fe09355899e12443765c5fd8b2a159030f0b30ae1d26f20d8ad6077128107bdd SHA512 0e71a3d5c7381fdc78c591050367d27f8281ed42789b5f0954af0dec2440b8e6183eb0303ff9056f9a0cf16bdc21ee866ef7889cabbcdc7401b6c49b81d72e6e WHIRLPOOL 7dd4a6550f381ae2249a0be15b85c70bd6f03e9df0d34f6a8a4ed3587deaf3236696cbb302808378e4989b74fc9f4ba67bae12476392639cc5a1dd60671f82c3
 MISC ChangeLog 11981 SHA256 ee39eba652ecdf545257c9addc9f251c27fc916a662b85733a18f3b6c8387602 SHA512 126d51d6ed71aff051cae7663139f0a23c8de136aa30965a77e039a421d8b75ec5382c3ecd1d1297c62acc57f79d9c18532f27f6f4db3efe833855bfea08b7eb WHIRLPOOL c8aac640da1663435b22c558549ce282c8fe22c0200d1aed7686e0124ee6397c7113d6d476e9ef8b6d9618f873bdab680d072ea9f4d424671cf947791904f0d7
 MISC ChangeLog-2015 50434 SHA256 c3346f6e5bc71f22cd441184a6242bb3fe146f0b14e87365e9007e48ee86e5e9 SHA512 575db565453ecb6c9f0b4e0d155647a68b0e6dd57bd4b90d2f41a7dd82522b3ecb5b6401bfa6edefaf2b7bd8f252cebde03e9cbbdf8e8d95dc596216c4a43359 WHIRLPOOL b5600e57eb295607d953b3c8345ec644b2c6e40084200d5ae8e3d14c2d8ff04d2e91d788a1a04ed8e367c4f5aeeeb0da637e684432f623fffcfb7b1c96d78cb6
diff --git a/mail-filter/spamassassin/spamassassin-3.4.1-r16.ebuild b/mail-filter/spamassassin/spamassassin-3.4.1-r16.ebuild
index ce0444bc8fb3..e04997ff3ed9 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.1-r16.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.1-r16.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