gentoo resync : 22.10.2018

10 files changed, 29 insertions, 159 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 0f0c8107c4bf..c6c483e51789 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index c661bde39c5c..5cd9a0f4ada9 100644
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -1,6 +1,4 @@
-AUX bogofilter-1.2.2-gcc34.patch 1393 BLAKE2B e5f1c3fca416ab76114aeaa2da700b4c8cb809279544d3eb477c7ff4d8d63d1889168eb4fb0ab90e2e00abf7a578d7d37e6e2a39181f1c8cdcf71b60974de729 SHA512 7179efbc1a8a4ba79a6710d6324c955dfa255e46fb5d9ac3377b11843f8eb545bf6e9ce5b547a62198d7be4fd989b9a5ea96487d34491df7d42f33a818f02b84
 AUX bogofilter-1.2.4-test-env.patch 392 BLAKE2B a72f6e0c08ca9f100188fff9da98ca41b45c87b42abbc6f68432eef597eb691609130d57f8723a800da6eaabbf87b87e4eed79539a5cf6f88539803d8f9bc4fb SHA512 c9f08a1af44d3281aff119a821423adbb9533cd49d87986a13d817db8d9446bc48a195b964527940aa0e41f5106bd4d7b2a9684c6c725bafed95adb8d3e87e96
 DIST bogofilter-1.2.4.tar.bz2 887848 BLAKE2B 4ed5c15a44f5a166e3858581ccc59b36ebde2fe1eb402cc0471378600b555b2452f4eae04d7d37dcb7638568db0c196da2d2504a3a569d7571c4aacd7e0ceea7 SHA512 e8c0b6bcc14f12fbbb2752e697a6d9065e17abfca3f70045ce9fe668d01c1cfad4adaa35c81546ecdd3639b0c28f3f4776bb5ed4699f21e9e2a5b19ca33479db
-EBUILD bogofilter-1.2.4-r1.ebuild 3739 BLAKE2B 8bdc42c8080fad6a9043a078d418c732f4a2029613ee2dc3ed75e3ac60da9ea1141352022c9d2852bc6b2473b8a1419c85600e001c7e9b7c571ce634a7fff68b SHA512 f82ea953c36071d6b5f25ce645d585712906f7bfe688400ce0e45cb561cdb7cb774243216bd9af090308744c9d6cd8c4f70fd00b69fe85a28c3331a0cc580021
-EBUILD bogofilter-1.2.4-r2.ebuild 3779 BLAKE2B c92a3ef27e359b61fc1f9a27de6c70994796ae59c91560838fdf44f2079ea71ba25aaeba648b94316bae835bb07954b4e6bcf22cb2e58e3d227ee5b00710d9cb SHA512 61b790cca316f76517ae4de404bebd5cf6da3108807db18d15d31fed2e5de18645564316050393ecb995a9ec77af7335c86885cec1f0789afbea2cc295a01b2b
+EBUILD bogofilter-1.2.4-r2.ebuild 3774 BLAKE2B 822e26dc1134281d8a005fda52bd77d53d58cd3a90e9eca9c91d56a637d2857ae4965323386ad6506d23559eed4e84540824fabf6cbc7d9a719677c5372344e6 SHA512 5cbbad8a17c31aafad72f69a0ac8a86a4e1f76f9efcaacc15210965b98695f229c2f42f143aaac4bf31f8f234a453b78891171f5f10303d4de0b8903f2d0fee0
 MISC metadata.xml 681 BLAKE2B 847326098ccdb227a492c2c03c6173e8260db73a91df37ed739511402fc2466476cc7ffb5c356b203b46945524224237bcec8058e2ef19d0436c25a2611003cf SHA512 cce40d35e042c532ccac225225ca6a137a041f9da6f8f0696cfd4b12fa6876662379bf2cc01e36bb91bf32479561be0ca44b20a86a7788448207a35983042277
diff --git a/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild b/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild
deleted file mode 100644
index 5ccb2b340a55..000000000000
--- a/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools db-use eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed"
-HOMEPAGE="http://bogofilter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="berkdb sqlite tokyocabinet"
-
-DEPEND="
-	virtual/libiconv
-	berkdb?  ( >=sys-libs/db-3.2:* )
-	!berkdb? (
-		sqlite?  ( >=dev-db/sqlite-3.6.22 )
-		!sqlite? (
-			tokyocabinet? ( dev-db/tokyocabinet )
-			!tokyocabinet? ( >=sys-libs/db-3.2:* )
-		)
-	)
-	sci-libs/gsl:=
-	app-arch/pax"
-# pax needed for bf_tar
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	has_version mail-filter/bogofilter || return 0
-	if  (   use berkdb && ! has_version 'mail-filter/bogofilter[berkdb]' ) || \
-		( ! use berkdb &&   has_version 'mail-filter/bogofilter[berkdb]' ) || \
-		(   use sqlite && ! has_version 'mail-filter/bogofilter[sqlite]' ) || \
-		( ! use sqlite &&   has_version 'mail-filter/bogofilter[sqlite]' ) || \
-		( has_version '>=mail-filter/bogofilter-1.2.1-r1' && \
-			(   use tokyocabinet && ! has_version 'mail-filter/bogofilter[tokyocabinet]' ) || \
-			( ! use tokyocabinet &&   has_version 'mail-filter/bogofilter[tokyocabinet]' )
-		) ; then
-		ewarn
-		ewarn "If you want to switch the database backend, you must dump the wordlist"
-		ewarn "with the current version (old use flags) and load it with the new version!"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# bug 445918
-	sed -i -e 's/ -ggdb//' configure.ac || die
-
-	# bug 421747
-	epatch "${FILESDIR}"/${P}-test-env.patch
-	chmod +x src/tests/t.{ctype,leakfind,lexer.qpcr,lexer.eoh,message_id,queue_id}
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="" berkdb=true
-	myconf="--without-included-gsl"
-
-	# determine backend: berkdb *is* default
-	if use berkdb && use sqlite ; then
-		elog "Both useflags berkdb and sqlite are in USE:"
-		elog "Using berkdb as database backend."
-	elif use berkdb && use tokyocabinet ; then
-		elog "Both useflags berkdb and tokyocabinet are in USE:"
-		elog "Using berkdb as database backend."
-	elif use sqlite && use tokyocabinet ; then
-		elog "Both useflags sqlite and tokyocabinet are in USE:"
-		elog "Using sqlite as database backend."
-		myconf="${myconf} --with-database=sqlite"
-		berkdb=false
-	elif use sqlite ; then
-		myconf="${myconf} --with-database=sqlite"
-		berkdb=false
-	elif use tokyocabinet ; then
-		myconf="${myconf} --with-database=tokyocabinet"
-		berkdb=false
-	elif ! use berkdb ; then
-		elog "Neither berkdb nor sqlite nor tokyocabinet are in USE:"
-		elog "Using berkdb as database backend."
-	fi
-
-	# Include the right berkdb headers for FreeBSD
-	if ${berkdb} ; then
-		append-cppflags "-I$(db_includedir)"
-	fi
-
-	# bug #324405
-	if [[ $(gcc-version) == "3.4" ]] ; then
-		epatch "${FILESDIR}"/${PN}-1.2.2-gcc34.patch
-	fi
-
-	econf ${myconf}
-}
-
-src_test() {
-	emake -C src/ check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	exeinto /usr/share/${PN}/contrib
-	doexe contrib/{bogofilter-qfe,parmtest,randomtrain}.sh \
-		contrib/{bfproxy,bogominitrain,mime.get.rfc822,printmaildir}.pl \
-		contrib/{spamitarium,stripsearch}.pl
-
-	insinto /usr/share/${PN}/contrib
-	doins contrib/{README.*,dot-qmail-bogofilter-default} \
-		contrib/{bogogrep.c,bogo.R,bogofilter-milter.pl,*.example} \
-		contrib/vm-bogofilter.el \
-		contrib/{trainbogo,scramble}.sh
-
-	dodoc AUTHORS NEWS README RELEASE.NOTES* TODO GETTING.STARTED \
-		doc/integrating-with-* doc/README.{db,sqlite}
-
-	dohtml doc/*.html
-
-	dodir /usr/share/doc/${PF}/samples
-	mv "${D}"/etc/bogofilter.cf.example "${D}"/usr/share/doc/${PF}/samples/ || die
-	rmdir "${D}"/etc || die
-}
diff --git a/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild b/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild
index da01b7d26747..f83e1f2d5ab0 100644
--- a/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild
+++ b/mail-filter/bogofilter/bogofilter-1.2.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="berkdb sqlite tokyocabinet"
 
 # pax needed for bf_tar
diff --git a/mail-filter/bogofilter/files/bogofilter-1.2.2-gcc34.patch b/mail-filter/bogofilter/files/bogofilter-1.2.2-gcc34.patch
deleted file mode 100644
index 80e4d787cf87..000000000000
--- a/mail-filter/bogofilter/files/bogofilter-1.2.2-gcc34.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN bogofilter-1.2.1-orig/src/Makefile.am bogofilter-1.2.1/src/Makefile.am
---- bogofilter-1.2.1-orig/src/Makefile.am	2009-05-28 22:59:05.000000000 +0200
-+++ bogofilter-1.2.1/src/Makefile.am	2010-06-16 22:52:36.000000000 +0200
-@@ -16,7 +16,7 @@
- AM_CPPFLAGS = -iquote$(top_srcdir)/gnugetopt -iquote$(top_srcdir)/trio \
- 	      -I$(srcdir) @GSL_CFLAGS@ -I$(top_srcdir)/gsl/specfunc -I$(top_srcdir)
- else
--AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I- -I. \
-+AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I. \
- 	      -I$(srcdir) @GSL_CFLAGS@ -I$(top_srcdir)/gsl/specfunc -I$(top_srcdir)
- endif
- 
-diff -ruN bogofilter-1.2.1-orig/src/Makefile.in bogofilter-1.2.1/src/Makefile.in
---- bogofilter-1.2.1-orig/src/Makefile.in	2009-08-01 21:00:51.000000000 +0200
-+++ bogofilter-1.2.1/src/Makefile.in	2010-06-16 22:52:23.000000000 +0200
-@@ -483,7 +483,7 @@
- @ENABLE_MEMDEBUG_TRUE@MEMDEBUG_SRC = memdebug.c memdebug.h
- noinst_LIBRARIES = libbogofilter.a $(am__append_3) $(am__append_5) \
- 	$(am__append_10)
--@USE_GCC4_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I- -I. \
-+@USE_GCC4_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I. \
- @USE_GCC4_FALSE@	      -I$(srcdir) @GSL_CFLAGS@ -I$(top_srcdir)/gsl/specfunc -I$(top_srcdir)
- 
- @USE_GCC4_TRUE@AM_CPPFLAGS = -iquote$(top_srcdir)/gnugetopt -iquote$(top_srcdir)/trio \
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 523f3cdbc78d..49896df26b6b 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -18,4 +18,4 @@ EBUILD rspamd-1.7.7.ebuild 2175 BLAKE2B 52ec154fc0bb61b361aa6fde7fe261e4c095f5a3
 EBUILD rspamd-1.7.8.ebuild 2139 BLAKE2B 0352647a74ab84ba452f37f9c8a971f899dddb4ad61779ae8096794d63ede23729b3723700b28824f270761624230a3da8dbff5a83ccc1b1bda5232ce8ef9414 SHA512 bf624d2c221b4422180a09d4599c91c10e9cc2c204cc26d7fbcb258becbd96b2e1822b45ae65e97cb93db40737400d77e3bdd8e48ed5a9129d9bd6cd70ecacc8
 EBUILD rspamd-1.7.9.ebuild 2175 BLAKE2B 52ec154fc0bb61b361aa6fde7fe261e4c095f5a3a0de0c5f96f30ac23dfc50188d78ed354ff5033bf65e65f9c747c6d85dd7d5bc8f1612453201029237cf0bd5 SHA512 534cd4d4977c54a77283c646ad1c3146bb9dac3b39ff55d00a8cc09d91274060eaedf215ad62bd4c75debceec41b53cef5ec9d718ed452a9317183a8b7a3b2f0
 EBUILD rspamd-9999.ebuild 2175 BLAKE2B 52ec154fc0bb61b361aa6fde7fe261e4c095f5a3a0de0c5f96f30ac23dfc50188d78ed354ff5033bf65e65f9c747c6d85dd7d5bc8f1612453201029237cf0bd5 SHA512 534cd4d4977c54a77283c646ad1c3146bb9dac3b39ff55d00a8cc09d91274060eaedf215ad62bd4c75debceec41b53cef5ec9d718ed452a9317183a8b7a3b2f0
-MISC metadata.xml 905 BLAKE2B 6a7f5f1473668977870cafbf01b9396324f47cb6b998dbde0fde43d71facf1f818d97b10fc853ff331941f31445202457e9108a46201f5ce5ea6762ac905c829 SHA512 2233d0816b80b113fcf1ec75a0808bd694a83738e7f70d5cbb01dcaa127cfe11253e7f5ca9c9801820b7b21b3cd6a80bec2ea428b026311583a05fda8fc3d815
+MISC metadata.xml 834 BLAKE2B 48979c23212a496c955667b99cfb618da9f682e2269bb42c9b4e4932b94304197422bc2480e7177d73ff6cb246e53a964bd43f5819827e4b6342786c282277db SHA512 c9a2106f419b90885905947aebacfdd15e7d1a66cb9cc6267cb79f487c9069f8ed2cc65c3d6d0ec05b011ade53ed2177df8f11ee49ee1e720dcf6ac365bc28d1
diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
index 13dc9bdd1539..2b4ad4e2b87e 100644
--- a/mail-filter/rspamd/metadata.xml
+++ b/mail-filter/rspamd/metadata.xml
@@ -18,7 +18,6 @@
   </upstream>
   <use>
     <flag name="fann">Enable neural network plugin (requires <pkg>sci-mathematics/fann</pkg>).</flag>
-    <flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
     <flag name="pcre2">Use dev-libs/libpcre2</flag>
     <flag name="torch">Enable torch support. This is required for the neural module</flag>
   </use>
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index ea045636795a..314df19ae483 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -12,6 +12,7 @@ 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-3.4.2-bug_7632.patch 673 BLAKE2B a819b0817efb745f1dc9d971fa476d9da355b72df41ffc58a7a505a5a2c1588ecee3e1dbe79c3a0d03ba04a6fc2e63bc018b49240da1417bb2a967925ed85e84 SHA512 adf9f78a60a95d16cf918e048c178986ec5543fb80a350d9419800b2bcc8fbcc8669967b77d9a85dfce7b67528fe9d816f5ca9a435444197f9ac1aa83d92fec3
 AUX spamassassin.service-r4 182 BLAKE2B c5813612e78602d6e67b527f07a8a38171422a638bf419135b34f950a036e899ee6d6a129413ab52ca737f18258265cad971a0b84057561b7012fbc390efd7e9 SHA512 35da6ed8baa1cfc13546b409ed65d18334410ee497f9609c89cd4993dc8084ed479ddc7658e72a52a9b79f1a73d4efba42148b7238678c17a2965f9ff6a608e9
 AUX spamassassin.service.conf-r2 120 BLAKE2B cdefa5d73234be5331f7ff7cc646f10365adf515b85bf0d9912d240105579747f3834b7f72402a31b5be9b8ed0faf2545ae0a4ed46ebd3c7a90962f764fb5e8a SHA512 55b93ce1636505beabba21cd208541750ef448e952658b65d6e1447f92cec3a35e3d489d014a0229765117168cc03b4675652709f7ed9973be8fba84c10786dd
 AUX update-spamassassin-rules.cron 1378 BLAKE2B 0fda2be565deae75c0248c6dfc5abfc05a3fc4724cfed74175d35d276e8ea257ee93abce1d56be8c2f957621c039a2ba7e25a368f339b9b80f8dd9865944320b SHA512 90927b7709569a24ea2a233f42b16fce91bfda85e75e859ad85bc7ad16f7ad61ddb32bafc9b5b72515949b9ba8dda597679c24c2be4688d974375faf00bbccd5
@@ -20,5 +21,5 @@ DIST Mail-SpamAssassin-3.4.2.tar.bz2 2700016 BLAKE2B a29b4cfce5e578c07ec54b22241
 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 7862 BLAKE2B 0d5897de61875e18bc7791ff15b6955be8685caf7ede9bc8294f46b3b7ab1a3f98657f2b1c3769303c4b728e530bf97187430b835c0dfb3b31f2f11951cc37ad SHA512 3d48cb3993e648c59a8073100f03a9f2e7b08c6aa2032374386ea014bc4df1053a6f01110655e8be1d217743f3927c4f183d61735602b09f54ed23eee38b0bbb
-EBUILD spamassassin-3.4.2-r1.ebuild 7559 BLAKE2B 14046d07476558eaef6215efd12a7d7223798f3e636d53a90aacbbc04c4bca7ca5f4165b8e7c2659cd4e646e2063e32c58e5fccdc3c171a7cdb4d9a808579773 SHA512 f5af2334f11841ce5441b7a20edb33b70b582f0bf770006a9fbb96d3016a66ab8cfc4ca29d7c18c2b5858380d9bcb3910b7f60cc7d81b7e2c53775fb8b73f1d0
+EBUILD spamassassin-3.4.2-r2.ebuild 7612 BLAKE2B 03a46239d55d3bd7d780416693a2ed29e8686de5c9b43597408d735d24bc8861ff67bf6bf43b53604b3da6aa3e0b875b17c1b17641450c2be8140185564ec8f1 SHA512 e5ccd3a0e352bd9e018d874209e1ba73198f4dedbfe89ec39282cfc7c598624bfc22bd084bce94a66294d955e81b19ed73786e40e7bffbbbd59438f891f2f0af
 MISC metadata.xml 807 BLAKE2B 14bf38e1888040ece6a48e7a8234917d5f9ae8d699995a0414520c0d262b91518c233ee3d3b1d13d7b5068fea8ec612bfee2a84ce825748e471b6ba6c25728b5 SHA512 2cc4534cdb5ed62612419a99a67e9e8e1867ba73a2daf957e3df8e7f2fd0bd058b7c9bb31fdfadb56d4001ce89e66d8f9da89d620e482d8f13502f288eb4136b
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7632.patch b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7632.patch
new file mode 100644
index 000000000000..a9a065abd817
--- /dev/null
+++ b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7632.patch
@@ -0,0 +1,20 @@
+This upstream fix changes the informational message,
+
+  dns: new_dns_packet: domain is utf8 flagged...
+
+to a debug one. This should prevent it from being spammed in your logs
+a million times a day.
+
+Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7632
+
+--- a/lib/Mail/SpamAssassin/DnsResolver.pm	2018/10/12 06:14:11	1843622
++++ b/lib/Mail/SpamAssassin/DnsResolver.pm	2018/10/12 06:38:56	1843623
+@@ -547,7 +547,7 @@
+   eval {
+ 
+     if (utf8::is_utf8($domain)) {  # since Perl 5.8.1
+-      info("dns: new_dns_packet: domain is utf8 flagged: %s", $domain);
++      dbg("dns: new_dns_packet: domain is utf8 flagged: %s", $domain);
+     }
+ 
+     $domain =~ s/\.*\z/./s;
diff --git a/mail-filter/spamassassin/spamassassin-3.4.2-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild
index 2fd2d38d2b86..a0a03b9f2483 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.2-r1.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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
@@ -77,6 +77,8 @@ DEPEND="${REQDEPEND}
 	)"
 RDEPEND="${REQDEPEND} ${OPTDEPEND}"
 
+PATCHES=( "${FILESDIR}/spamassassin-3.4.2-bug_7632.patch" )
+
 src_prepare() {
 	default