gentoo resync : 05.12.2021

20 files changed, 107 insertions, 136 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index d2b55e42a7e4..70fe5c94694c 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/popfile/Manifest b/mail-filter/popfile/Manifest
index 2af8b5856da3..d938c44b820e 100644
--- a/mail-filter/popfile/Manifest
+++ b/mail-filter/popfile/Manifest
@@ -1,4 +1,4 @@
 AUX popfile 715 BLAKE2B 071dd14e37401ab0c5c25d644f55275fbf59bd9dba5bca39202f27338492603a95c023fe1288c507f76f78d4c0137580d8a279c4738247f8b507b3090318a313 SHA512 a802f753de335552a0b54da98baaad07ceda1da83f0c082d4e2204c90378c35ca5f34bfee1f7beaf11ee6795b7287dcf3db07eedf958665134064dfd9168fae2
 DIST popfile-1.1.3.zip 523431 BLAKE2B cf084e572bf0d8da7d4ce4435f7df9c527ebb0d6714f9b5ac2c2d8701231f452989de048e24bdd7cec2483466ed20f1ed9aa84255f7606a9ffb2bb06bf05b30c SHA512 0e3ed3d67d2c2b456643335dd030a51e890bb371c5b8cf9eed9fac350a2536b8884eeffff78fcb27b99c39711505df533ee3ded5b40714fb46e54c2d25b3dda9
-EBUILD popfile-1.1.3-r1.ebuild 1061 BLAKE2B a2e05050da24674ddf86a57ee8989249e4474b3b0131c9191890d7ecec332fb141c57ce1d9c0330d5d79b1a950cd4bdd14e1e48c5753c9df2d3f891214ec0140 SHA512 1039a1b6941fdca5fd07160bf9527ec49b3facf62cdde2a6f8360ad58398da72d1b76e917b113601f4fde8ed7c3ab471871725fb2bf7e8ab40e1c4b2524a3b46
+EBUILD popfile-1.1.3-r1.ebuild 1084 BLAKE2B 38f272a9eea5b2f15bbf28b5e81716b4ae912111a645afc11cdc3364465ff825c034cd9aedd44b4d60b7c3c3ad11a3f042f9242ec79c7c1411580f1080988f99 SHA512 a0d4b77909b03f08e5fecd17b09d284275ecf72893447d37127bccd2d62beb572e72a51a4ed5ab92aff5a1f1b4f56286d487455877d9c9cbe0ae4b88ec9b248c
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/mail-filter/popfile/popfile-1.1.3-r1.ebuild b/mail-filter/popfile/popfile-1.1.3-r1.ebuild
index 83d9ec1209ff..2c9cd804d0ec 100644
--- a/mail-filter/popfile/popfile-1.1.3-r1.ebuild
+++ b/mail-filter/popfile/popfile-1.1.3-r1.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
+
 inherit edos2unix
 
 DESCRIPTION="Anti-spam bayesian filter"
 HOMEPAGE="http://getpopfile.org"
 SRC_URI="http://getpopfile.org/downloads/${P}.zip"
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -29,21 +31,19 @@ RDEPEND="virtual/perl-Digest-MD5
 		dev-perl/IO-Socket-SSL
 		dev-perl/Net-SSLeay )
 	xmlrpc? ( dev-perl/PlRPC )"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
+BDEPEND="app-arch/unzip"
 
 src_prepare() {
+	default
 	local f
-	for f in `find ./ -type f`; do
+	for f in $(find ./ -type f || die); do
 		edos2unix "${f}"
 	done
 }
 
 src_install() {
 	dodoc *.change*
-	rm -rf *.change* license
+	rm -r *.change* license || die
 
 	insinto /usr/share/${PN}
 	doins -r *
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 23b018effb37..c0713a9918b5 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -13,8 +13,8 @@ AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4ab
 DIST rspamd-2.7.tar.gz 5126227 BLAKE2B 70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930 SHA512 8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
 DIST rspamd-3.0.tar.gz 5535659 BLAKE2B 605ac59b947b49efb026e04d153df5fc0d56c65712def3f2c54a949db32b8534e634d172a1899cc08e98e0a9da839fc00f0f569dc8c52a743f38bd71b8abaeaa SHA512 1ea6f9ffe58b7f280dbd31e39db6412ebeddda634ca8a669fa5bff2951d17123a5d4a09ec0f366c6b0c0b585f868e646fd49e4d45bd451408675b927ec2557c4
 DIST rspamd-3.1.tar.gz 5566920 BLAKE2B dfb31534e7dbce303729e89537f83eea90d6524a0ccf81633e0d55840f21936985ba5991f2a2ed9ca5594a4a3938f9366f7a1879fc553f41ab52bb89460b87dc SHA512 3c3c06c10d3dfc90e4bc92c7ebaff4bd4854d3b0e56d6476f0223918c4a52f4cc7a8b381b1f867164199ee18ea00eda77ae0315925f3fd71596d610200667178
-EBUILD rspamd-2.7-r103.ebuild 2680 BLAKE2B 75275dd49ac5b6b2f33a53e54934025f0341df190efe6c66034e54377ece549a6fb0c93accac6ca54b543b78b3b600a3ad1a8e75ac1d3677a4688344ecd733d8 SHA512 1be59df83281b02c14cf24a4b13fc841e9dbc0a7e2218807ee3394dfaccc9b73001208dfe22dc88abf2073c6c6b3acf61937627b765a82e71eaad8d8c6054eab
-EBUILD rspamd-3.0-r3.ebuild 2971 BLAKE2B e610fb708f188a34b774743e41ad0bd921d78a143a2142b4743828ad2edd493baee0a819fd3df9328836d371c5c2da64269c0e3ec6c3d7b659396af6473b0e38 SHA512 d2cdd8c91c98c58a7bb73a1493f0d76684817678d01ad5a856c77863b429db4578c32739a49009d4815182940d40d9a2fcfbe3ec98a9edb56769578506d79d45
-EBUILD rspamd-3.1.ebuild 2851 BLAKE2B 98c4585f0676de1b818c4d2297c0f677fa7f99bec09296c8c6061928939ccca730ff080c9a7be84ac693f383f48339faf04c2566cdca6098cf2bed51d8e4f44c SHA512 ece9fa974ac682edaa3bedc42218cb43e4b1ab1348a9b8a31c0c47677d02c5d3a230676310d4406526c2a830e5fb9482297c1db6dd05bf6e8dd20d551b166d08
-EBUILD rspamd-9999.ebuild 2851 BLAKE2B 98c4585f0676de1b818c4d2297c0f677fa7f99bec09296c8c6061928939ccca730ff080c9a7be84ac693f383f48339faf04c2566cdca6098cf2bed51d8e4f44c SHA512 ece9fa974ac682edaa3bedc42218cb43e4b1ab1348a9b8a31c0c47677d02c5d3a230676310d4406526c2a830e5fb9482297c1db6dd05bf6e8dd20d551b166d08
-MISC metadata.xml 684 BLAKE2B d8307b970c2c3b029911bfca2d5949742acab13dc35b49c4bb3f8f13bb9e39edd00aad743dcdbbb1b07db3929dba1c32d04ccfcfd20613878dab81f84afc48da SHA512 a7efd262772d7323ae07d94738b3871ff3fd2ca89711a0950d1e4f1c80b228d6ea42df64bace80a6fd2e9786ae5fe4c760560556e9dc2a5deb6b4e36dd48024c
+EBUILD rspamd-2.7-r103.ebuild 2645 BLAKE2B e2116351088e43ee3c62f9defdf8fa46aa2cbde1889219325130d029dcd73dc476d9015b7c3d01b33240e6f650872da61fef47fe7365029a3b9907ba0bab1e56 SHA512 b82708290ae84d57c3903d965df5c108b4a595d4278569f453f3866d5cc119ed07e41e12e1f4ad54d136d296924671670cf9fe0623c4cfccffc464b0a583f245
+EBUILD rspamd-3.0-r3.ebuild 2936 BLAKE2B f34324cbc30d49cea77200a3761a4b3947a4b645d86c82e601dd4a1d14b20fd546a3c04195aa79d70294ba8bcc6f88b34b3247b649603e40ba6d9ae7f3e2493d SHA512 7d6cb01d02542f8275e40e2ff21e390d95da89942d5b8c58cbee27d5ff825507d3c154881ba126411260933600194eba8739f67dd647d692e2ac0fec730bde4e
+EBUILD rspamd-3.1.ebuild 2855 BLAKE2B e97810948f4790f44dedc59fa856823ef0cdfc20d0ae4adc2358d6f2644903fd311fd8dd16e0766e4600d0390c4eab33e5432627b08ec0d906c8da1f4c5caf8f SHA512 8d57c5a91580a969aff87c7c6c09c4d3fb5924226588e861e1bb97f2bb2c289382a857009b130410b32241f06d695c214f7ebaddc519a8db2f7710e521910c94
+EBUILD rspamd-9999.ebuild 2855 BLAKE2B e97810948f4790f44dedc59fa856823ef0cdfc20d0ae4adc2358d6f2644903fd311fd8dd16e0766e4600d0390c4eab33e5432627b08ec0d906c8da1f4c5caf8f SHA512 8d57c5a91580a969aff87c7c6c09c4d3fb5924226588e861e1bb97f2bb2c289382a857009b130410b32241f06d695c214f7ebaddc519a8db2f7710e521910c94
+MISC metadata.xml 747 BLAKE2B 8205e9a0000d40183806cabbd38dd80f8c6cb83d0d375f38e23c884f30e0472591f58eeb2770aab6d976eb084c80f2b15cc348bbc4dafaa356ecbc23f5387762 SHA512 03fbb7317bc3a30c76dbabaf747e8edf028d21e2f5e1e77d3eb419bcbea15ed6f83bb3beddc416730c3da1158ada91441695801fbe4c4332072a2eac9a61dae1
diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
index a183078256ab..b1f97d1434d0 100644
--- a/mail-filter/rspamd/metadata.xml
+++ b/mail-filter/rspamd/metadata.xml
@@ -17,6 +17,7 @@
     <remote-id type="github">vstakhov/rspamd</remote-id>
   </upstream>
   <use>
-    <flag name="pcre2">Use dev-libs/libpcre2</flag>
+    <flag name="pcre2">Use <pkg>dev-libs/libpcre2</pkg></flag>
+    <flag name="jit">Enable PCRE JIT support</flag>
   </use>
 </pkgmetadata>
diff --git a/mail-filter/rspamd/rspamd-2.7-r103.ebuild b/mail-filter/rspamd/rspamd-2.7-r103.ebuild
index 8a361f82f03e..e3e4d0e59f1e 100644
--- a/mail-filter/rspamd/rspamd-2.7-r103.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r103.ebuild
@@ -21,8 +21,7 @@ LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain u
 SLOT="0"
 IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2"
 
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	jit? ( lua_single_target_luajit )"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="${LUA_DEPS}
 	$(lua_gen_cond_dep '
diff --git a/mail-filter/rspamd/rspamd-3.0-r3.ebuild b/mail-filter/rspamd/rspamd-3.0-r3.ebuild
index 1ff4af0796ec..54434e12ad55 100644
--- a/mail-filter/rspamd/rspamd-3.0-r3.ebuild
+++ b/mail-filter/rspamd/rspamd-3.0-r3.ebuild
@@ -24,7 +24,6 @@ RESTRICT="!test? ( test )"
 
 # A part of tests use ffi luajit extension
 REQUIRED_USE="${LUA_REQUIRED_USE}
-	jit? ( lua_single_target_luajit )
 	test? ( lua_single_target_luajit )"
 
 RDEPEND="${LUA_DEPS}
diff --git a/mail-filter/rspamd/rspamd-3.1.ebuild b/mail-filter/rspamd/rspamd-3.1.ebuild
index df5d75abfd0e..b4d4c6d23bae 100644
--- a/mail-filter/rspamd/rspamd-3.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.1.ebuild
@@ -24,7 +24,6 @@ RESTRICT="!test? ( test )"
 
 # A part of tests use ffi luajit extension
 REQUIRED_USE="${LUA_REQUIRED_USE}
-	jit? ( lua_single_target_luajit )
 	test? ( lua_single_target_luajit )"
 
 RDEPEND="${LUA_DEPS}
@@ -69,6 +68,8 @@ src_prepare() {
 
 	rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die
 
+	> cmake/Toolset.cmake || die #827550
+
 	sed -i -e 's/User=_rspamd/User=rspamd/g' \
 		rspamd.service \
 		|| die
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index df5d75abfd0e..b4d4c6d23bae 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -24,7 +24,6 @@ RESTRICT="!test? ( test )"
 
 # A part of tests use ffi luajit extension
 REQUIRED_USE="${LUA_REQUIRED_USE}
-	jit? ( lua_single_target_luajit )
 	test? ( lua_single_target_luajit )"
 
 RDEPEND="${LUA_DEPS}
@@ -69,6 +68,8 @@ src_prepare() {
 
 	rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die
 
+	> cmake/Toolset.cmake || die #827550
+
 	sed -i -e 's/User=_rspamd/User=rspamd/g' \
 		rspamd.service \
 		|| die
diff --git a/mail-filter/spamassassin-botnet/Manifest b/mail-filter/spamassassin-botnet/Manifest
index 6832e74dd384..258aefc50037 100644
--- a/mail-filter/spamassassin-botnet/Manifest
+++ b/mail-filter/spamassassin-botnet/Manifest
@@ -1,3 +1,3 @@
 DIST Botnet-0.8.tar 81920 BLAKE2B 1be10d1d4859c3624494565449b17714b1e563303aec4f2b68df07edf2560377d3bf4b937b2094e0c1bf62c92156b3b00a7107545544df1480dc3db849a812a1 SHA512 4108efab3062a7e35cb008875d438cd079aa46ab829b5b172463f70537efa6dee41a0226df3a63392f31ae0e2042c851e9585a408b65bab94cb7400a4d9034bb
-EBUILD spamassassin-botnet-0.8-r1.ebuild 1088 BLAKE2B 23878ba66c11f1a6d6dee0ff2d172979e568e7777af5025c53aa325bfa864812820f9347e624303a268b886fe0ffd09cbf74387365d307e2e160ff8e1d0e3027 SHA512 4e5b3bad8d884c0a145458bd4a22d1b84cfb7c0409cdc367853a9ff3f8665fd31d74017641f9edb16e33bbcc7d0d7cf64efce173f596adeffd1e7abccb2b664b
+EBUILD spamassassin-botnet-0.8-r1.ebuild 1083 BLAKE2B bafd723ae75ce22dcac9d0a06b51e3dcc95b36004d038187f4349bd8c11eb030e758b13edad82ed08042875df620e25907e729856120ad3f4bfdb650b3cf5044 SHA512 b672ddd4264400dc1fe915ba7ee57a32f05f6707a085a051254444804b909c854017a9e4e57a616c19914f0a0d768534dc4dfe848a0d5844826f196661809546
 MISC metadata.xml 609 BLAKE2B e3dedf37eb1205c658a65b00385d4b92f6aaef815c66ba013dc0687e6bd72eae5954c26b97b808f19fb64b69417c08a8f652dcc95b6e4e5e9898f828808c9f21 SHA512 6891c8a268938396bd1b4e0656456c9e5ce3826b1a481d6d71da61f66d1b1d6758a442aca3452d755bb720c820e61403a60b7ce336a3884aa3f4ac4b6581ae96
diff --git a/mail-filter/spamassassin-botnet/spamassassin-botnet-0.8-r1.ebuild b/mail-filter/spamassassin-botnet/spamassassin-botnet-0.8-r1.ebuild
index f4486210f919..a8bf5a5a1e7c 100644
--- a/mail-filter/spamassassin-botnet/spamassassin-botnet-0.8-r1.ebuild
+++ b/mail-filter/spamassassin-botnet/spamassassin-botnet-0.8-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 inherit perl-module
 
@@ -11,20 +11,18 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="SpamAssassin plugin that attempts to detect messages sent by a botnet"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="http://people.ucsc.edu/~jrudd/spamassassin/${MY_P}.tar"
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND=">=mail-filter/spamassassin-3.0.0"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"
-
 src_compile() {
 	# make sure it doesn't try to look for the .pm in the same dir as the .cf
-	sed -rie 's/^(loadplugin.+)[ ]+Botnet.pm/\1/' Botnet.cf
+	sed -rie 's/^(loadplugin.+)[ ]+Botnet.pm/\1/' Botnet.cf || die
 }
 
 src_install() {
diff --git a/mail-filter/spamdyke/Manifest b/mail-filter/spamdyke/Manifest
deleted file mode 100644
index 817a15a1902b..000000000000
--- a/mail-filter/spamdyke/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST spamdyke-5.0.1.tgz 383720 BLAKE2B 5128ef128af1b136e9a78df6e38f727d06e51bae82cb604513f80458265eee03d5966655ae70544d6ba24f0719c35dcc9a153e245a8c2c7ef1f7dab3ee90e561 SHA512 a022c8a8d4a8d74f5249f8e2d901d3de423ee853bbaffaf7e86cece1d19880d9039135892ef6ccb8a2a0fb11532c487402dc97a8dd6d89c9de431752c55f6eb9
-EBUILD spamdyke-5.0.1.ebuild 1927 BLAKE2B 740d3d2d5f3378a96938d5b3438a0711f587b560bdfb00d20e303a09e67b6b59bbc194bd633a37cb05fcf23b2f8704c7f5503093c35fc1b58072b9c618e17a1f SHA512 0a8570c3123bbfc9f2b0acd4d2d8fd2a3bc739469a234860da30385d9fd4f704ddd571dd2ef9f4cdac2ea132ba9f2e8e15d261a647ab2296f8abe704f219fc7d
-MISC metadata.xml 700 BLAKE2B 2ae7c5044a4b985dfa6ac036d4e11a0a10da3270c150838a20e478b1ce4529360df3727a078ed6d5fbb0e4234ae2a250026790e16ecbe0303f4f0ccde06c8714 SHA512 ebab4d1e31f126594a0f7db2df11cfd41677e27e3ded42602879cd83b6accae52601451a92bef62a5859622ad60ee2e72c292d348835ea09a9af2e928eb866b5
diff --git a/mail-filter/spamdyke/metadata.xml b/mail-filter/spamdyke/metadata.xml
deleted file mode 100644
index 6177d3a7b858..000000000000
--- a/mail-filter/spamdyke/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-spamdyke is a filter for monitoring and intercepting SMTP connections between a
-remote host and a qmail server. Spam is blocked while the remote server
-(spammer) is still connected; no additional processing or storage is needed.
-
-In addition to all of its anti-spam filters, spamdyke also includes a number of
-features to enhance qmail.
-
-Best of all, using spamdyke does not require patching or recompiling qmail!
-</longdescription>
-<use>
-	<flag name="ssl">Enables TLS protocol for spamdyke</flag>
-</use>
-</pkgmetadata>
diff --git a/mail-filter/spamdyke/spamdyke-5.0.1.ebuild b/mail-filter/spamdyke/spamdyke-5.0.1.ebuild
deleted file mode 100644
index 27c11ebaf741..000000000000
--- a/mail-filter/spamdyke/spamdyke-5.0.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="A drop-in connection-time spam filter for qmail"
-HOMEPAGE="http://www.spamdyke.org/"
-SRC_URI="http://www.spamdyke.org/releases/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ssl"
-
-DEPEND="
-	ssl? (
-		dev-libs/openssl:0=
-	)"
-
-RDEPEND="
-	${DEPEND}
-	virtual/qmail"
-
-S="${WORKDIR}/${P}/${PN}"
-
-src_prepare() {
-	echo "# Configuration option for ${PN}" > ${PN}.conf || die
-	if use ssl; then
-		echo "tls-certificate-file=/var/qmail/control/clientcert.pem" \
-			>> ${PN}.conf || die
-	fi
-	cat <<- EOF >> ${PN}.conf || die
-graylist-level=always-create-dir
-graylist-dir=/var/tmp/${PN}/graylist
-reject-empty-rdns
-reject-unresolvable-rdns
-dns-blacklist-entry=zen.spamhaus.org
-local-domains-file=/var/qmail/control/rcpthosts
-EOF
-	sed -i \
-		-e "/STRIP_CMD/d" \
-		Makefile.in || die "sed on Makefile.in failed"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ssl tls)
-	cd ../utils || die
-	econf
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-	cd ../utils
-	emake CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	insinto /etc/${PN}
-	doins ${PN}.conf
-	dodir /var/tmp/${PN}/graylist
-	fowners -R qmaild /var/tmp/${PN}/graylist
-	cd ../utils || die
-	dobin domain2path
-	cd ../documentation || die
-	dodoc {Changelog,INSTALL,UPGRADING}.txt
-	dohtml FAQ.html \
-		README.html \
-		README_ip_file_format.html \
-		README_rdns_directory_format.html \
-		README_rdns_file_format.html
-}
-
-pkg_postinst() {
-	ewarn  "Change /var/qmail/control/conf-common:SOFTLIMIT_OPTS="-m 16000000""
-	ewarn  "to 32000000 or spamdyke will fail to load"
-	elog "In /var/qmail/control/conf-smtpd insert the line:"
-	elog "QMAIL_SMTP_PRE=\"${QMAIL_SMTP_PRE} spamdyke -f /etc/${PN}/${PN}.conf\""
-	elog "Run spamdyke with the '-h' flag to see the available options and"
-	elog "update /etc/spamdyke/spamdyke.conf accordingly"
-}
diff --git a/mail-filter/spampd/Manifest b/mail-filter/spampd/Manifest
index 69deacea8d82..faf67247f8ad 100644
--- a/mail-filter/spampd/Manifest
+++ b/mail-filter/spampd/Manifest
@@ -1,6 +1,11 @@
 AUX conf 665 BLAKE2B 21638b47bcd8f90b5521c131aae983ec7ceb51fc470eb991f5fe1b670d267efc0314b787e8e6f094b793a08239717d0d183766a676b127320a59037ccd718c7b SHA512 f184a784261923b8e36279c5cca24783812617220d266f5f16f15e83e2e2f3b0f9c1b9a82b9b3ac7d297b28a15af78d858f9f250757171187e6ff2c885a3b741
-AUX init 526 BLAKE2B 9b78b45417c996f9e533d151a5c7f7677857715c0f05ed586088fd4a9796a4442fad06ae1b8ed53deb3adc880fc985519a22fe513abbea1f57b581d6d1dc92f5 SHA512 bae9152a51e07f702649b64f0d44b12d115242dd9b44bc12b2695647eaedd635180d6cff31c26a203df7ce0ae7623db274c64d2c3eb80258aa0c6a92f31cb55f
+AUX init 541 BLAKE2B c642ca0ccfa1518471a2138ba024ff7289c45907c0afa05c23808ab4180db58281a26ac9e058776ed540ce2ef3006d00119fc408248884a7177b556907130f8f SHA512 751d763683c9a9fa7323be9cefdd09414b0bf2972d3b5e275e24675bc458dca5ea64c059edaf0ecafa83a18e1ade23ac0d808cb34e812addc67273c18b217dc3
 AUX init-r1 521 BLAKE2B 42b31324c1b9a3226429aaa58af1d19f280b09ab40c21769de401f533b7436df21bdada171de43b0888ebd83fbfbbb29227523ed2f608d696c0c0d8335dccd07 SHA512 fc32a28811b9d7f0d6f6d3d53b10df1b49b8ec68aaa058f5309809aa4c1e4ac17b5823b3b0f46b0823297b00548c45acff54acdb9c5f8e612260462fde2f8d72
+AUX spampd-2.61-no-pid-file.patch 457 BLAKE2B 12783c433d04ac6799799c95a18d069daad6a0b0e68d41fda4b8a714da68ae648362194136110f70b5f5e144e9e7d916164062eb367991f60d66d7071113a8bb SHA512 a9e57ab781e91a61e25a0b985060aff443c9650ee3688c6d7210a5bc658c6a1953d3c4f87b9742cd367b9c643486808cbb5ba94c9e44c2b62df369af6006ddfa
+AUX spampd.service 249 BLAKE2B 54417bbe22213fbdcf66a242d2eebe09a2e5cd5ab2dd739b4d1ff26ab091c4a4ede85517a4daf1f39df77dddcf5e503b8a3d643faccb920ab96d6f805826b24a SHA512 c36213a5b446329cb30e480af7fd594235fe5918e6f4b398b79d2eec5d6f72a4f93a9f12feae3bf343edc363e8138359f7c3e2e5dd8bcba66fe34ac2af5c25d6
+AUX spampd.service.conf 138 BLAKE2B dc636d87ce96d5db36702400b80f6dadb95e4ac4317b8587f5738fb39d7935343f9bf82bee836bb0fefed63f300fc449baa923e9be98f6a2325399547804f65f SHA512 f6b563daadf9890aee13a46ab79fe47cc6b7f337e7f4a8259620c051472bcf245436647ad86b8f019be3afeb4effb6d6d15ebae564267cef790a1bf53366e183
 DIST spampd-2.42.tar.gz 202504 BLAKE2B 9ad74d3199345ba54c613fa928cfd177fded551ca304dd22c802b996b95e2905d40d92bfa25d7c64b823b2357c657f283c9550b635f3188fbbb42fb793cd2b8d SHA512 5c44b5902efd6c628fb62887b755012b137940d7d687f5d9489e5f96623d6eeca5f3641a76fe3b2ce8585040c3661e19df981c612cdb1a767b4a46fec982fa4e
+DIST spampd-2.61.tar.gz 246956 BLAKE2B de2b428fbed80ba6d65bd2b249a3adfb00cd0a33df21b71676da1949b680dbfee72412ae2c752f4e5dcf9f7f7349ae59ce94f81b2abae5fd4de34d3a92954fbb SHA512 e2f84c4b24648d4f4db70174f04b72981faa1c54ffc4bbc433d14c730ef4ad7fd4cd3772a476f25be0bee103e951700d038634d14848f1eb90849d1a6655199b
 EBUILD spampd-2.42.ebuild 691 BLAKE2B 71619b66a3da13bcaa64c98649f2cc3e4437273ebe0ecae7c4781383bd59b52e896b2dfa6f9882d39e09924cdececcc81da0b3fe8f7491bc8369c97666b64d6c SHA512 aebd63988be67bd3a989e0094d49997267a4ead02ec17eaad97d940f017dbee911e71660fa9f209a13a0846e9c759e1074d3f0427d5d320836f26e622f6264be
+EBUILD spampd-2.61.ebuild 1005 BLAKE2B 5ab5ba9ceae0e1cbe4ce0659646c6bd7c511ffa4b094c287d5cd00d01550d0ff184cd377515949857fbae852cd135d79c4e34531abb4c66f605fe05067bb52cf SHA512 099fdf40c8f6e8ca16179062676d3fd65955ed7b3a8d6df6da3ad514d8c4d99ef4117b41fac3f22c594970e1ba15ac9694cd399d53377bde51906abc4a5d6f87
 MISC metadata.xml 248 BLAKE2B f428f5f2f65de66d56a844d3a708834fec83b4299b30ad3d0f3a1c47b3784f7a249af8bf38bfd7743694e4102c990a646fd4f27ea0e0d955efba39ec7b86715e SHA512 b629842dc09e477b307a2627300c4e91c5613430c80396abfdcefb6f4c9a08cc6ee4b044d1ea4cf53e2e2d711a7123f74b9d38c871d96d18f7214ecfdbda322e
diff --git a/mail-filter/spampd/files/init b/mail-filter/spampd/files/init
index 7a5171e46034..339a938d9c7d 100644
--- a/mail-filter/spampd/files/init
+++ b/mail-filter/spampd/files/init
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: spampd configuration file is /etc/conf.d/spampd
@@ -10,14 +10,14 @@ depend() {
 
 start() {
 	ebegin "Starting spampd"
-	start-stop-daemon --start --quiet \
-		--exec /usr/sbin/spampd -- --pid=/var/run/spampd.pid \
+	start-stop-daemon --start --quiet --interpreted \
+		--exec /usr/sbin/spampd -- --pid=/run/spampd.pid \
 			${SPAMPD_OPTS}
 	eend $? "Failed to start spampd"
 }
 
 stop() {
 	ebegin "Stopping spampd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/spampd.pid
+	start-stop-daemon --stop --quiet  --retry 60 --pidfile /run/spampd.pid
 	eend $? "Failed to stop spampd"
 }
diff --git a/mail-filter/spampd/files/spampd-2.61-no-pid-file.patch b/mail-filter/spampd/files/spampd-2.61-no-pid-file.patch
new file mode 100644
index 000000000000..b5151e11f8a5
--- /dev/null
+++ b/mail-filter/spampd/files/spampd-2.61-no-pid-file.patch
@@ -0,0 +1,11 @@
+diff -ruN spampd-2.61-v/spampd.pl spampd-2.61/spampd.pl
+--- spampd-2.61-v/spampd.pl	2021-08-07 06:01:37.000000000 +1000
++++ spampd-2.61/spampd.pl	2021-08-13 03:48:34.527166029 +1000
+@@ -761,6 +761,7 @@
+ 
+   # Set misc. options based on other options.
+   $srv_p->{setsid}= 0 if !$srv_p->{background};
++  $srv_p->{pid_file} = undef if !$srv_p->{background};
+   $sa_p->{home_dir_for_helpers} = $sa_p->{userstate_dir};
+   $sa_p->{username} = $srv_p->{user};
+ }
diff --git a/mail-filter/spampd/files/spampd.service b/mail-filter/spampd/files/spampd.service
new file mode 100644
index 000000000000..78ef5520323c
--- /dev/null
+++ b/mail-filter/spampd/files/spampd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=SpamAssassin Proxy Daemon
+Before=mail-transfer-agent.target
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/sbin/spampd --nodetach $SPAMPD_OPTS
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/mail-filter/spampd/files/spampd.service.conf b/mail-filter/spampd/files/spampd.service.conf
new file mode 100644
index 000000000000..1c2d9c1154e1
--- /dev/null
+++ b/mail-filter/spampd/files/spampd.service.conf
@@ -0,0 +1,5 @@
+[Service]
+User=mail
+Group=mail
+Environment="SPAMPD_OPTS=--host=localhost:10025 --relayhost=localhost:10026 --tagall --set-envelope-from"
+
diff --git a/mail-filter/spampd/spampd-2.61.ebuild b/mail-filter/spampd/spampd-2.61.ebuild
new file mode 100644
index 000000000000..347362e06dc9
--- /dev/null
+++ b/mail-filter/spampd/spampd-2.61.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="A program to scan messages for Unsolicited Commercial E-mail content"
+HOMEPAGE="http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm https://github.com/mpaperno/spampd"
+SRC_URI="https://github.com/mpaperno/spampd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="acct-group/mail
+	acct-user/mail
+	dev-lang/perl
+	dev-perl/Net-Server
+	mail-filter/spamassassin
+	virtual/perl-IO-Socket-IP"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-pid-file.patch"
+)
+
+src_compile() {
+	mv ${PN}.pl ${PN} || die
+	pod2man ${PN}.pod > ${PN}.1 || die
+}
+
+src_install() {
+	dosbin ${PN}
+
+	dodoc changelog.txt
+	doman ${PN}.1
+
+	newinitd "${FILESDIR}"/init spampd
+	newconfd "${FILESDIR}"/conf spampd
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+}