gentoo resync 08.09.2018

7 files changed, 2 insertions, 111 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index b9096c94c3f8..8b7de7bd1152 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 96cce4939f20..12187dc69ee6 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -1,6 +1,4 @@
-AUX 3.4.1-spamd.conf 887 BLAKE2B 15781a5c3d5e858c331c5002ac28e959927a823aca89390f2e3a46f8187e710252675d4835fc7a3120b7562ee608b34b10749a83ba08a5fe9e15971c08f73750 SHA512 627b6a4d54adf2feeaaf2197a5193c6f216812eab685ee833bdf4e3d765f40996790c0a4e22ff618d23985053e96a521fb48d19a648ab47ff2b0e9c23621a7e8
 AUX 3.4.1-spamd.conf-r1 1257 BLAKE2B bbdeeda731965dcd863c2a9bc615295b7d48e0110994dac66bfccb4ee1d84c9c50e6c2fd6649b09b7206e16120ed7e55b387ba76afdf0fe7e629bc767d87a80c SHA512 b2233d9330fa06d13dc8d222fa16198a1f81dcb9c87ca93961db54d9f2514cdabd824d0f25c0cca678495f271f48f601ee14363c2a2f833100facae307226beb
-AUX 3.4.1-spamd.init 1226 BLAKE2B 203d44e8e72088e34c3644d9a3457cc5684616b8211892b86714e0d44de866c61caf6b2fd9ad64f3b30d505bd0922ce3e19c30496f99f9087cb144f0eab836b7 SHA512 94e7b6cf5867d123fc1252cdb200906da80b2df4563c35d9e28db8bf0a4fac812797ad13c214a6d41bdac4d70d62d3bbcd3990f8405b3585f1a41c4db1f1be48
 AUX 3.4.1-spamd.init-r2 1178 BLAKE2B 885a396e8b66e066e0f12bf49b9e66bad9db30551b8c807a7f8166b51a240aac751d0bab1d2cd50962a1f95f19d51a3e26b1d04d03276e4f3796de38382cfe38 SHA512 e17a735d4f0df52488c4e38acd9c4795145ae5355cc9ac640d07662883b65ff95d54168cca2ce6ec0a35d6879e3426b3b3e341fa0551c86d0e87b92d7f02cda1
 AUX 3.4.1-spamd.init-r3 1180 BLAKE2B c7290e6016b27247610b050f77368fcbf3dd3f4ab0a72a933b3819f35dfe9f9085f13f73be95b1169e04d3a09bc4cec6284e87963059ac047d5908df3458fb2b SHA512 2c968750da3252e8dcce4cebf105a26a9dbc471e39bda7d66180e0fbf930b11dd3a98337d7c387026375918b660768c637c2f2031d6624ce3237d9cc8cd88a02
 AUX secrets.cf 664 BLAKE2B a501fb93369743e3c9139cc780f166168313613c840857bc0e72def5b3e168f235afc16a1dc34afa0e839ffa9da6c0c360c9a93a126d9dd711b4473e0a19ebcc SHA512 bb6992098a44e16147be46b75b70e3fb81672285dd71a30719606e2cab556720fc9dd318c7a80832ceaf2e6d9c98c2dd7434f48242feede1922c3e1073559edb
@@ -14,13 +12,11 @@ AUX spamassassin-3.4.1-bug_7361.patch 16483 BLAKE2B bcb17a9e246bee95e0f5ffcd8b08
 AUX spamassassin-3.4.1-bug_7404.patch 792 BLAKE2B 711c5916827504dd06eebe6138df4bca7e364825c0df601b6bb6542e68f18d8a7546e05f23671b6a8d479f7dc12365217fc8437425b6a342331661f0e4aa644e SHA512 8bc613699872f0358d699f0c151bf9eac6ff80d9dc878d38fca522ac091f4e1348982bf2ce8029c7f241fdbabbf531e1d45f301159f6eddfbeb935252bd577e5
 AUX spamassassin-3.4.1-bug_7462.patch 5836 BLAKE2B 734601071cfff101177d98afa758f15622bd393ea02ab247b20a8fc368c8600a094bb1de04b3ffb3c9d9d9878d332c25587a65e1f4a5cbd01d21eb99f3ee7458 SHA512 68cad4b4ebd46fa186df04c926043fcdcf0099504451ed2b323d35871d142448431777baf2d374082554e1ef914efbf8f89001e1975c10e73e8865f3feff5878
 AUX spamassassin-3.4.1-perl526.patch 484 BLAKE2B eca4a52d15171fe048bfd3f997aa73c1eb0235a50c5b4e61a28ea1c707eddf184a888a0e1c75700cda9ced26ccf693d8a8040cac1bf59f46ea66854f0aa99d37 SHA512 ded5a6079f95bb4a771e23b382af83498f16144eb9ba613b97b365b52d96845255f26ddf561b7d6edaa53c7acad3d62294adb01ce4a8a4157470a5ed92cd1b13
-AUX spamassassin.service-r1 323 BLAKE2B 3ddf1eee1946e80391a19f6232753ca6d28c67435fcdcddb9b51c933040f7c6258086bbecafd53c575e686d86f512475372575a268d9e92482d122bded9b2c02 SHA512 3c9356d1a24f73c3a3374398058c8e7cb9875ee98a1b6bb96d5a6d9ec2de4de527717f12d809b40d4d768958e098f6e5e04803018f9b7e46a0322cd9319c0923
 AUX spamassassin.service-r4 182 BLAKE2B c5813612e78602d6e67b527f07a8a38171422a638bf419135b34f950a036e899ee6d6a129413ab52ca737f18258265cad971a0b84057561b7012fbc390efd7e9 SHA512 35da6ed8baa1cfc13546b409ed65d18334410ee497f9609c89cd4993dc8084ed479ddc7658e72a52a9b79f1a73d4efba42148b7238678c17a2965f9ff6a608e9
-AUX spamassassin.service.conf 333 BLAKE2B 87ef99f2466bd5d72aaf4158b7221dba79952facc61854faf802943ef9bacfbfa4aee7b090f16fe5cd5e436a30ca0de7ddf3b652ffb38e858145ff95b904d555 SHA512 d818e0ca5bfa9dadb94f99351a307f41c05bc46b89f55a03b9ba2fba0bd06fada06adf1a3eff949f3a04151f3680b279d78fba08c8f28873d17e4a4aa55edca4
 AUX spamassassin.service.conf-r2 120 BLAKE2B cdefa5d73234be5331f7ff7cc646f10365adf515b85bf0d9912d240105579747f3834b7f72402a31b5be9b8ed0faf2545ae0a4ed46ebd3c7a90962f764fb5e8a SHA512 55b93ce1636505beabba21cd208541750ef448e952658b65d6e1447f92cec3a35e3d489d014a0229765117168cc03b4675652709f7ed9973be8fba84c10786dd
 AUX update-spamassassin-rules.cron 1378 BLAKE2B 0fda2be565deae75c0248c6dfc5abfc05a3fc4724cfed74175d35d276e8ea257ee93abce1d56be8c2f957621c039a2ba7e25a368f339b9b80f8dd9865944320b SHA512 90927b7709569a24ea2a233f42b16fce91bfda85e75e859ad85bc7ad16f7ad61ddb32bafc9b5b72515949b9ba8dda597679c24c2be4688d974375faf00bbccd5
 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 7864 BLAKE2B 0b0ec546057bab2a4e0b70be5472e64ffc04544bd2a70f08b2adca8d8a0d93e46978ae43afd4260f9077f1ec6643489253632dcd323862397c733c7c7f578bd0 SHA512 66c19caac7f4227ce632ef81cd99de8439e27889db47b36bbb3e755d75f0774f3cd8a84a68c27bc0de0c326c0078187cc320e80fe2fb20c5222afa02bd8746ff
+EBUILD spamassassin-3.4.1-r21.ebuild 7863 BLAKE2B 19ea702e6886b0c8359a191f18ffe8a506621b0b90d15b63f17987520a2a9c0bd51b07303ee62df75fb1f5ef60cd6483bc4ad05fdb6c1e85000e3de1f1e266d3 SHA512 02b373302dcca7f5992c7b89ed43df767f4c627c68294bdf5804aae6c042c14cacf6caeb89e0e314bee72c5f54619322de6a896e09e4d74dce14882a9276bb58
 MISC metadata.xml 807 BLAKE2B 14bf38e1888040ece6a48e7a8234917d5f9ae8d699995a0414520c0d262b91518c233ee3d3b1d13d7b5068fea8ec612bfee2a84ce825748e471b6ba6c25728b5 SHA512 2cc4534cdb5ed62612419a99a67e9e8e1867ba73a2daf957e3df8e7f2fd0bd058b7c9bb31fdfadb56d4001ce89e66d8f9da89d620e482d8f13502f288eb4136b
diff --git a/mail-filter/spamassassin/files/3.4.1-spamd.conf b/mail-filter/spamassassin/files/3.4.1-spamd.conf
deleted file mode 100644
index 0cb7cbbfc471..000000000000
--- a/mail-filter/spamassassin/files/3.4.1-spamd.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# Config file for /etc/init.d/spamd
-#
-# ***WARNING***
-#
-# spamd was not designed to listed to an untrusted network. spamd
-# is vulnerable to DoS attacks (and eternal doom) if used to listen
-# to an untrusted network.
-#
-# ***WARNING***
-#
-
-# Additional options to pass to the spamd daemon. The spamd(1) man
-# page explains the available options. If you choose to listen on a
-# non-default interface, you will need to use OpenRC's "rc_need"
-# mechanism to ensure that your interface comes up before spamd
-# starts. The openrc-run(8) man page describes rc_need.
-SPAMD_OPTS="--max-children=5 --create-prefs --helper-home-dir"
-
-# Sets the 'nice' level of the spamd process.
-SPAMD_NICELEVEL=0
-
-# How long (in seconds) should we wait for spamd to stop after we've
-# asked it to? After this amount of time, if spamd is still running,
-# we will assume that it has failed to stop.
-SPAMD_TIMEOUT=15
diff --git a/mail-filter/spamassassin/files/3.4.1-spamd.init b/mail-filter/spamassassin/files/3.4.1-spamd.init
deleted file mode 100644
index cbe91e93231d..000000000000
--- a/mail-filter/spamassassin/files/3.4.1-spamd.init
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PIDDIR=/run/spamd
-PIDFILE=${PIDDIR}/spamd.pid
-
-extra_started_commands="reload"
-
-depend() {
-	before mta
-	use logger
-@USEPOSTGRES@	use postgresql
-@USEMYSQL@	use mysql
-}
-
-start() {
-	ebegin "Starting spamd"
-
-	# Ensure that the PID file's directory exists.
-	checkpath --directory "${PIDDIR}"
-
-	# Reloading spamd causes its PID to change, so we track it by
-	# name instead.
-	start-stop-daemon --start --quiet \
-		--name spamd \
-		--nicelevel ${SPAMD_NICELEVEL} \
-		--pidfile ${PIDFILE} \
-		--exec /usr/sbin/spamd -- \
-			--daemonize \
-			--pidfile=${PIDFILE} \
-			${SPAMD_OPTS}
-
-	retval=$?
-
-	eend ${retval} "Failed to start spamd"
-}
-
-stop() {
-	ebegin "Stopping spamd"
-	# Retry after SPAMD_TIMEOUT seconds because spamd can take a
-	# while to kill off all of its children. This was bug 322025.
-	start-stop-daemon --stop \
-			  --quiet \
-			  --retry ${SPAMD_TIMEOUT} \
-			  --pidfile ${PIDFILE}
-	eend $? "Failed to stop spamd"
-}
-
-reload() {
-	ebegin "Reloading configuration"
-	# Warning: causes the PID of the spamd process to change.
-	start-stop-daemon --signal HUP --quiet --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/mail-filter/spamassassin/files/spamassassin.service-r1 b/mail-filter/spamassassin/files/spamassassin.service-r1
deleted file mode 100644
index 3d145817f129..000000000000
--- a/mail-filter/spamassassin/files/spamassassin.service-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Spamassassin daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/run/spamd.pid
-ExecStart=/usr/sbin/spamd -d --pidfile /run/spamd.pid -m 5 $SPAMD_OPTS
-ExecReload=/bin/kill -HUP $MAINPID
-StandardOutput=syslog
-StandardError=syslog
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/mail-filter/spamassassin/files/spamassassin.service.conf b/mail-filter/spamassassin/files/spamassassin.service.conf
deleted file mode 100644
index 9fc1f6294525..000000000000
--- a/mail-filter/spamassassin/files/spamassassin.service.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Here you can append some options to spamd process, please
-# double check that you make needed changes in service file if
-# you use options requiring it
-# Some options:
-#
-# -c          to create a per user configuration file
-# -H [dir]    to switch home dirs for helper apps, dir optional
-
-[Service]
-Environment="SPAMD_OPTS= -c -H"
diff --git a/mail-filter/spamassassin/spamassassin-3.4.1-r21.ebuild b/mail-filter/spamassassin/spamassassin-3.4.1-r21.ebuild
index b4c49f4207ad..faa01ee8d397 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