gentoo resync : 12.05.2022

14 files changed, 124 insertions, 66 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 573b8083e4e2..c15afac3c971 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/amavisd-milter/Manifest b/mail-filter/amavisd-milter/Manifest
index 4ed96368e6d8..805e8fb25044 100644
--- a/mail-filter/amavisd-milter/Manifest
+++ b/mail-filter/amavisd-milter/Manifest
@@ -2,6 +2,8 @@ AUX amavisd-milter.confd 357 BLAKE2B 4c584ef42c9c1f135160d574dabed9882978930ddf1
 AUX amavisd-milter.initd-r2 402 BLAKE2B 1b25d6eff80efac18b0674e91602e163ce94545dfa9879666af88a206526c1dd55d7563ea418a0b3921d64fc494227a3f03ad81ef5ff0cd92725dfb136aa22c4 SHA512 0d0fdc98bcea9c72332cba2dbe5809b8dabedbe27a15be39b22a4428f0ec3903743f911ac9737c031c04e9152bb62522dbc0ae9fc03b1ca0c2e593aedd88b5c4
 DIST amavisd-milter-1.7.0.tar.gz 192688 BLAKE2B 882ecdc1f4b1b3fba2f7f82ffb3e7f4ecf27ce42fc14df926a508b852dd142161af9ce65bc367a5968f64a29a40cb362a0783bdbaf4dff2559715bfd53170f73 SHA512 52fdfe4acdd94e387de63d93aa3347dce46e7e16b8ab51679c7bbfc4f6faba160de5ca55aae141cbd06f3d9d1122dea67fdd67562dd5b8314055f7f6071545af
 DIST amavisd-milter-1.7.1.tar.gz 193425 BLAKE2B e93f7f8f4c3b5e59fbfc160e60c8620231f8ab2a5fa06c39cf42b71c0c0abca4e27a1334d01e89337628ccdd685e059be469eeafc385521a780de1bf82bf3070 SHA512 db2fd53a3047a21fb20743fce7d01899eb92efffc62159d3022e0b5014dbfb3667e1664868734d84b58f5daadd8270d3e05a68c60a01a1ac35d104105cc86586
+DIST amavisd-milter-1.7.2.tar.gz 191224 BLAKE2B 82865acacec1004e611bbafd940d5721660b0daa1af1aea742d4176c613ce2af0e4bde523d0363b97e3f361270641acda477797eab9e8df9feb266c80ef6009c SHA512 639a5a4f92131f9b8d004255819e36dedd529ec95f8290663c6ea5860dbbce049a822ba0e68158228716778265009b93024e9102defdf9250d4e889157008181
 EBUILD amavisd-milter-1.7.0-r1.ebuild 650 BLAKE2B 40e8095761fd9ca4e873283291d89ccc1350b0eb06d84d8ceebff1dc2ca2321b01e29b90709c64d49dde1ee045288eda0c176190ffce4e3b4bab396f23c92e66 SHA512 1b685eb610e6aa50593325378c76e8501297354256a06fe10e6e6463634d21e97ca0d360e96e7298b90940d784929391149a632d69dbd0fc6410ba6b0ec2ed45
 EBUILD amavisd-milter-1.7.1.ebuild 652 BLAKE2B 09317271c519d835155c510ed1ab6cb55502066eb4849cb00b7da8efd85c41ea16f1b540b9e8826751b6d6ac36910902f1a110b7e737ad958b18a03abbbf095a SHA512 7a51d4a44c20a186476fb29d92d2901477cc3c01e06b03c93ddcd583a2cd2f63e936486111a7446b7d1ad5298de15cb3fde53cd89fcbfe4de7430ffadd6f1a69
+EBUILD amavisd-milter-1.7.2.ebuild 652 BLAKE2B 351952943ca9b1cd61f1b0fd6e7ad5c2617547d41322eb7d9c1388079df8cd6fdcf335cdc779cb4e84430b2c2124ea25799a463dd59fa9107d064d26e5e8b5ab SHA512 7ec8bf28179f7e671d1072daceb199e212ee365228d9e04846f836ed6238e94b48ced3e8eecb4fa1b60e1c77a65a79d82ede28e2c15df90e4cf24dcfcc7bc3fb
 MISC metadata.xml 333 BLAKE2B 612ff1239b67cc232069226263c42531349ec44f51a249afd1db683761a99bdac63a1b19ea96707a809af26f9cfcd52d90ffe343e1f32dbd20317cbff7f2aad0 SHA512 845a38e47210175bc6a4a4cd2927135d7463514c0d5907e702064a1ce4670faef0675a41e17873616a1bb6c779756ace4344122d32a707783d075770d1acf0ce
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.7.2.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.7.2.ebuild
new file mode 100644
index 000000000000..ced1ec9e7e1f
--- /dev/null
+++ b/mail-filter/amavisd-milter/amavisd-milter-1.7.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="sendmail milter for amavisd-new"
+HOMEPAGE="https://github.com/prehor/amavisd-milter/"
+SRC_URI="https://github.com/prehor/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	|| (
+		mail-filter/libmilter
+		mail-mta/sendmail
+	)"
+RDEPEND="${DEPEND}
+	mail-filter/amavisd-new"
+
+DOCS=( AMAVISD-MILTER.md CHANGES INSTALL )
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/amavisd-milter.initd-r2" amavisd-milter
+	newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
+}
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index 038b02fcf090..02b386a6af06 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -1,7 +1,8 @@
 AUX opendmarc-1.4.1.1-CVE-2021-34555.patch 2517 BLAKE2B 93ebfb101591e5b797b52de4d85a6e199c208544076a7d5bc05fb8b7237c663a204a45172d4cf38d408daf57d5076929b3de227e4e787d97c85aad3e42af9d03 SHA512 24df989c7a501ffea5da43469e049f4a5d9de82f2fe67875f93bad690f558d1734b9d4ea2da1a6aebdedb80b576ada8e12844e7aa061117dd41da3e23c24e176
+AUX opendmarc-1.4.1.1-underlinking.patch 522 BLAKE2B 2d960253144f0c2a159a36bfa119d166e26643d89ee0982af0618373cd387a6375209a41cab0fcfb694d4ba212442428961d31f8323427204423e80d10c3a9c3 SHA512 a95b070bd0ab8d2f6a2b417d3a7c930bc5d8a8d5749c60bdb669dbb97c5dc4817d706aabe928842bead7d746e676ba8d172706c7355c8ae7ac0b9dc38998a5f4
 AUX opendmarc.confd 91 BLAKE2B 124b653c68cd7a1081d2374fb901d55f3cf5af6957745130848f6ae1e93b007ad5ecff5527bed9da03d7033195e599c6052e6d28ec43f2b1e3fc5d1a20631dbc SHA512 2febb226e9495835c515d92c8e7cbb85db3c08ac287a7449d8117b5e9533902d8b3d190fa8face4b69f4cf0c0ede5d860a8b5f97d776c6d7d95bf9f196eb67e2
-AUX opendmarc.initd 1509 BLAKE2B b1cde9546c95b51c8c395f10eddf85bcb2fd17fd8a537df523e04a71d241c0fad4a3d2e4c34c950d7b684be518368fe78538828b81627d647e3531177eabb85e SHA512 00c9901cf5b460e20d8010d4aedfd7c338c76d1053f9ddcd9d4aa2c183345e3b810d0bee1207ff9a7ad988577192c52470ca62c67130a981fa67e393d5c70129
+AUX opendmarc.initd 1521 BLAKE2B a397bbcbd6eb773ec8b80ac1243578391b1afb65830c726472d7890d6b59549092689022f34c7f314e3bfe3ca08fb903e2b363621b8752983d4aa73d94ee4da8 SHA512 ee61381a4b8d65dbea3306f0ed057767856fbfb6c65d5e3a2bb98843a8754527bd59999aaa3b3c0990725177c7de2c03c0ffccb9e6b4823176a0b9a5ba316931
 AUX opendmarc.service 800 BLAKE2B 866b1aaa0c8570494ac56aaa9962821204a7a24437cdb8bec0343c716cfc1d3748a368a32ec314dfce7e4264188cfb1dff51212d60340d4be8e33394a85486f6 SHA512 b140dc3ac99ee7c3dcee80743d6c4295dec4ce5090ab9f560ffe35f9d5e63c7f5af871edcc759be462b8110706028c047cd05ae910a74ecba0436620d6b291bb
 DIST opendmarc-1.4.1.1.tar.gz 426618 BLAKE2B a74b2623bc35abb5c34f8d1eff737c71af8f5cadfd6a5d0a85adb6536efd2958118f9da25dd9b736dc24563221968c4ee1ff99b101fa30909764563bda2a8d88 SHA512 ee034386c70c75b87ca2fce0849a1a3538e10e0aebfb0fc9dcba6817d2cf71f52aa5586ccaacdee620190c5fbb81498419fb8e8db9fac15d7c71a61a7da396a6
-EBUILD opendmarc-1.4.1.1-r2.ebuild 1733 BLAKE2B e086228ba2e38b5c01346b23c12d6f82fb0c574303e7bf61ed86e52e2a0029b6bdaf9a51bad0c2f2015a60c4a561746478ea3c9192668df32fd8e62f74e5e40f SHA512 8be05d69f76638cfae700c40d58257fe4f9736f5d78f928e7ed6db08a9c60810085a96d278e5386a1edc3b0b03309a0e87357d3d801fed3dc7a949360c139a10
+EBUILD opendmarc-1.4.1.1-r4.ebuild 1739 BLAKE2B 6c3f8849951fa3a0e7215053a46dc8dd52d3dbb6ba380fd46812a7332e66cca3cad0bc734ea40e1b59c8f4b1cca973c61999c5e283a38622bb67a042c73584e7 SHA512 fe8ad02b7e8a53f34c012665fe75c465645c7c0390aec31da04cb6bb4c85ab6525f6179da63b5d5f9507bddc5b27589a0d745c674b1be0bddb190c627c7ba30f
 MISC metadata.xml 513 BLAKE2B 6af2b5fb83bcc5e942e86f2d57455a54209186f8786fb6e76ce558c4bb0167d85ce419f7270e9b6e83914bdc8d0e963dc285227700bc5940096bbdbf78da93dd SHA512 eef3e5d89bf553098937118f2454cf0a7d715b31e2e49f5648260fd8c7abd03676f7a4047843e621406b54bb3c16bd4aa1409dc56d6d5ab0267a628a0cb15a99
diff --git a/mail-filter/opendmarc/files/opendmarc-1.4.1.1-underlinking.patch b/mail-filter/opendmarc/files/opendmarc-1.4.1.1-underlinking.patch
new file mode 100644
index 000000000000..825ee461dfd6
--- /dev/null
+++ b/mail-filter/opendmarc/files/opendmarc-1.4.1.1-underlinking.patch
@@ -0,0 +1,17 @@
+libopendmarc.so.2.0.3 uses
+* __dn_expand
+* __dn_skipname
+* __res_nquery
+which are defined in libresolv in glibc 2.33 and older.
+
+See: https://bugs.gentoo.org/839951
+
+--- a/libopendmarc/Makefile.am
++++ b/libopendmarc/Makefile.am
+@@ -15,5 +15,6 @@
+ 			  opendmarc_spf_dns.c \
+                           opendmarc_internal.h
+ libopendmarc_la_LDFLAGS = -version-info $(LIBOPENDMARC_VERSION_INFO)
++libopendmarc_la_LIBADD = $(LIBRESOLV)
+ libopendmarc_includedir = $(includedir)/opendmarc
+ libopendmarc_include_HEADERS = dmarc.h
diff --git a/mail-filter/opendmarc/files/opendmarc.initd b/mail-filter/opendmarc/files/opendmarc.initd
index 6a8300f145d6..3f55464e11b4 100644
--- a/mail-filter/opendmarc/files/opendmarc.initd
+++ b/mail-filter/opendmarc/files/opendmarc.initd
@@ -15,8 +15,9 @@ check_cfg() {
 		return 1
 	fi
 	# create /var/run/opendmarc
-	mkdir -p /var/run/opendmarc >& /dev/null
-	chown ${OPENDMARC_USER}:${OPENDMARC_GROUP} /var/run/opendmarc >& /dev/null
+	mkdir -p /var/run/opendmarc > /dev/null 2>&1
+	chown ${OPENDMARC_USER}:${OPENDMARC_GROUP} \
+		/var/run/opendmarc > /dev/null 2>&1
 	PIDFILE=$(sed -ne 's/^[[:space:]]*PidFile[[:space:]]\+//p' "${CONFFILE}")
 	local PIDDIR="${PIDFILE%/*}"
 	if [ ! -d  "${PIDDIR}" ] ; then
diff --git a/mail-filter/opendmarc/opendmarc-1.4.1.1-r2.ebuild b/mail-filter/opendmarc/opendmarc-1.4.1.1-r4.ebuild
index e0c31d75209b..e0d08ea8755b 100644
--- a/mail-filter/opendmarc/opendmarc-1.4.1.1-r2.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.4.1.1-r4.ebuild
@@ -8,11 +8,12 @@ inherit autotools systemd
 DESCRIPTION="Open source DMARC implementation"
 HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
 SRC_URI="https://github.com/trusteddomainproject/OpenDMARC/archive/rel-${PN}-${PV//./-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenDMARC-rel-${PN}-${PV//./-}"
 
 LICENSE="BSD"
 SLOT="0/3"  # 1.4 has API breakage with 1.3, yet uses same soname
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="spf +reports static-libs"
+IUSE="spf +reports"
 
 DEPEND="reports? ( dev-perl/DBI )
 	|| ( mail-filter/libmilter mail-mta/sendmail )"
@@ -25,10 +26,9 @@ RDEPEND="${DEPEND}
 	)
 	spf? ( mail-filter/libspf2 )"
 
-S=${WORKDIR}/OpenDMARC-rel-${PN}-${PV//./-}
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.1.1-CVE-2021-34555.patch
+	"${FILESDIR}"/${PN}-1.4.1.1-underlinking.patch
 )
 
 src_prepare() {
@@ -42,16 +42,16 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--disable-static \
 		$(use_with spf) \
 		$(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
-		$(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir)) \
-		$(use_enable static-libs static)
+		$(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir))
 }
 
 src_install() {
 	default
 
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.la
+	find "${ED}" -name '*.la' -delete || die
 
 	newinitd "${FILESDIR}"/opendmarc.initd opendmarc
 	newconfd "${FILESDIR}"/opendmarc.confd opendmarc
diff --git a/mail-filter/postsrsd/Manifest b/mail-filter/postsrsd/Manifest
index aa75ffaa42cb..92cccaa90954 100644
--- a/mail-filter/postsrsd/Manifest
+++ b/mail-filter/postsrsd/Manifest
@@ -3,4 +3,4 @@ AUX postsrsd.init-r2 857 BLAKE2B 2f5a38543d22127dcc6223cd8c13f20f81928e3fea8087d
 DIST postsrsd-1.11.tar.gz 36309 BLAKE2B 352894d82cf0bc16f711433b83282f31f94dc6358fcdda1362c00834bf41d70ea9f543c45428fca19d9798888a6a3b7c1676b8e3b35e4f21e8e27b707f986592 SHA512 cc041bbbd0277dd416a19e427d63eace3489dc518ebe3a61a022b3e2e159bcb09731a0eb5547eb85bd55887821726b66e828326c109c2ebe26b27dbd062a8d89
 EBUILD postsrsd-1.11-r1.ebuild 756 BLAKE2B d397260ecc695354ea99bfd6ac8606e93ec01c1b185f86b34470c95004be091b8e0e48b453bf26f0dbede1f59f2888bacad136f1bcde2cddc9031b92796a16a8 SHA512 8a600337e3fb57794f973141c00a738d7bf616700ab0268c162790adbd396cfa4c08574770cd79d2997aa47c5a221ee68d392a58470726b7ba85031dc8c9fe3b
 EBUILD postsrsd-1.11.ebuild 754 BLAKE2B e6dc7a2410d0482a306a5a83f6756d7ebcc1d63e34b1ccd759d91d900f4e9552ad770df60b0564f21048f3bcbc11078a7b156fceebd8b2255150124152c0c83f SHA512 ac29922ad2ef289850da012f919b0faba93e2397c249cc4a1d3a9b6b038e9fddd7a5b1d8083c7a49d455dec377ed5735b043eb2e7b98eaf4b9260aebdc3238f1
-MISC metadata.xml 338 BLAKE2B 751d5fe2586f3daea62b0147ef88175506d7b4ebee1a57a5117f4cbff11509afb7432f7ca3f8686828d66ad9a0de5610013017e2d6e05d1861d09b1fa89073ba SHA512 dd389e2fe4d05e7ba60234794bf4c795bc43c5031212e52d747c63f0fba30561034c67b8c5493b31bef81a01b04a0dd2d06c3891266e99b503eb2d4b8891d113
+MISC metadata.xml 255 BLAKE2B 1462ee2ef39a028a9e39b71389ef87b4919fcd453c17671b6bac6885330e9743cc460441926254a97869aab9e1a977606e60f202edd5dcc021f94cdf224e1edb SHA512 6f9d956f4ecac31747ca1f346bd827f48c10f63a64ac87d597ac792f7a08af9656bb0d657a6b98335a0896c152b8d0bac2ef882ccccc517fa71c01b2befb8632
diff --git a/mail-filter/postsrsd/metadata.xml b/mail-filter/postsrsd/metadata.xml
index 417c6cb1d7c2..031be196863a 100644
--- a/mail-filter/postsrsd/metadata.xml
+++ b/mail-filter/postsrsd/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>djc@gentoo.org</email>
-    <name>Dirkjan Ochtman</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">roehling/postsrsd</remote-id>
   </upstream>
diff --git a/mail-filter/pyzor/Manifest b/mail-filter/pyzor/Manifest
index 3dce394454df..1a54e28a890b 100644
--- a/mail-filter/pyzor/Manifest
+++ b/mail-filter/pyzor/Manifest
@@ -1,3 +1,5 @@
 DIST pyzor-1.0.0_p20200523.tar.gz 138077 BLAKE2B 13ad30f06ce32a24a42dd5aaa21ad2a6700df1bac3dc54a86532748688b094ee0f56a8e28e34336298388c6e0b95868e95d040866c9afa561d867069496608fe SHA512 afe3b14794aea68b1a7d72840257976c7c9f755a6f6dcaaf6ebacab465c176fe2aa84f3fe176006cdbe26ef0b07ed949f75f6ef729f65c604fadf6ce8472da8f
+DIST pyzor-1.0.0_p20211223.tar.gz 138500 BLAKE2B 242a7b2df3451f659d820771454e685868792bd2275b6d69d4c4adfd6044c781abe2d72fe1500a6074851faf8e88e95d6578c546d4d95fda03e11609d1a0b436 SHA512 218bea40515a21b1e08b2bad5b7ba339ba84fff2da425dc58df72a967730ebe10e319944e1604ff56bb37f6a8ae7bc0cd974b54b18a4878ba103131b8ea47b67
 EBUILD pyzor-1.0.0_p20200523.ebuild 1565 BLAKE2B 09a2f7abd6979ffede603c0e20f3a6656481fba2c97a67801dea217440f5e1eff9da8b0efca6ece299be75edd61072760d0dfd53f2d06785f72192c29e104354 SHA512 4c387c7cbafd33ffdc3476844e1eb7314d8b8cc8307c51c8291e270cce580845e61c98d39f4fac5661bd20a546eb44ac656f25275cd0f0e92243dd813770c3e2
+EBUILD pyzor-1.0.0_p20211223.ebuild 1548 BLAKE2B 87ea582e181719a0da6a2f0cba5027be0906668a688a93212fdaad0b26ca8ccfe00dcbfbbd141f40d946a49cc5335ed9b9da67169dd4a17157c9e9892e35e703 SHA512 8ce84a4905cb9cb8157d9f9e7bb323db183ab77456ad2ddb405cfe0ac509877d22052997c333ac0ce032c673f5bb64eace886358527972d1b6aef785e3959a5a
 MISC metadata.xml 954 BLAKE2B 62c3a125c862739d03a90657b689242c2e184ffa34b63a59697053cd6385d0d0804c1fa4246146b8fbdb08563d906e4179456b21ee5371889765c53446ebb061 SHA512 1bfbaabcb0b795d2ef3dc4763a46c909c422e23bafd522e072b2d00cc374713c78c005fba26d5df6f8cbbb7a2e411fba36a7741098e17890e4a7dee83b40038f
diff --git a/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild b/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild
new file mode 100644
index 000000000000..b7766b0cbbe6
--- /dev/null
+++ b/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_COMMIT="2dbe627c1ec245db206cdc73bf1f9d785f1512d8"
+DESCRIPTION="A distributed, collaborative spam detection and filtering network"
+HOMEPAGE="https://github.com/SpamExperts/pyzor"
+SRC_URI="https://github.com/SpamExperts/pyzor/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc gdbm gevent mysql pyzord redis test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	pyzord? (
+		gdbm? ( $(python_gen_impl_dep 'gdbm') )
+		gevent? ( dev-python/gevent[${PYTHON_USEDEP}] )
+		mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] )
+		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	)"
+DEPEND="
+	test? (
+		gdbm? ( $(python_gen_impl_dep 'gdbm') )
+		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	)
+"
+
+# TODO: maybe upstream would support skipping tests for which the
+# dependencies are missing?
+REQUIRED_USE="
+	pyzord? ( || ( gdbm redis ) )
+	test? ( gdbm redis )
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	pytest -vv tests/unit || die "Tests fail with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	if use pyzord; then
+		dodir /usr/sbin
+		mv "${ED}"/usr/bin/pyzord* "${ED}/usr/sbin" \
+		   || die "failed to relocate pyzord"
+	else
+		rm "${ED}"/usr/bin/pyzord* || die "failed to remove pyzord"
+	fi
+}
diff --git a/mail-filter/spampd/Manifest b/mail-filter/spampd/Manifest
index 82eadceaef4c..5d5204229eab 100644
--- a/mail-filter/spampd/Manifest
+++ b/mail-filter/spampd/Manifest
@@ -1,11 +1,8 @@
 AUX conf 665 BLAKE2B 21638b47bcd8f90b5521c131aae983ec7ceb51fc470eb991f5fe1b670d267efc0314b787e8e6f094b793a08239717d0d183766a676b127320a59037ccd718c7b SHA512 f184a784261923b8e36279c5cca24783812617220d266f5f16f15e83e2e2f3b0f9c1b9a82b9b3ac7d297b28a15af78d858f9f250757171187e6ff2c885a3b741
 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 1004 BLAKE2B 2e451d27fc271f3e44b88a78fdb281a2165a839e8b497a0ca556249f9c8c7e5277c74555566a9522729a59a1f4a067d4d9e6132bbb24728dbb7256e9d58eb650 SHA512 fee3a49d283b1531f7c1e0d2005bbbcda7f8e71f90ee3fb1b4f0ac8744c6f35768be939356fdd3c2526d9d1e12994d999e25fdda85a52f1cfc89c41fde11e2a9
 MISC metadata.xml 248 BLAKE2B f428f5f2f65de66d56a844d3a708834fec83b4299b30ad3d0f3a1c47b3784f7a249af8bf38bfd7743694e4102c990a646fd4f27ea0e0d955efba39ec7b86715e SHA512 b629842dc09e477b307a2627300c4e91c5613430c80396abfdcefb6f4c9a08cc6ee4b044d1ea4cf53e2e2d711a7123f74b9d38c871d96d18f7214ecfdbda322e
diff --git a/mail-filter/spampd/files/init-r1 b/mail-filter/spampd/files/init-r1
deleted file mode 100644
index b6402e4b5b55..000000000000
--- a/mail-filter/spampd/files/init-r1
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: spampd configuration file is /etc/conf.d/spampd
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting spampd"
-	start-stop-daemon --start --quiet \
-		--exec /usr/sbin/spampd.pl -- --pid=/run/spampd.pid \
-			${SPAMPD_OPTS}
-	eend $? "Failed to start spampd"
-}
-
-stop() {
-	ebegin "Stopping spampd"
-	start-stop-daemon --stop --quiet --pidfile /run/spampd.pid
-	eend $? "Failed to stop spampd"
-}
diff --git a/mail-filter/spampd/spampd-2.42.ebuild b/mail-filter/spampd/spampd-2.42.ebuild
deleted file mode 100644
index a31d8091448b..000000000000
--- a/mail-filter/spampd/spampd-2.42.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="spampd is a program to scan messages for Unsolicited Commercial E-mail content"
-HOMEPAGE="http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm"
-SRC_URI="https://github.com/mpaperno/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-DEPEND="
-	dev-perl/Net-Server
-	mail-filter/spamassassin"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_install() {
-	dosbin spampd.pl
-	dodoc changelog.txt misc/spampd-rh-rc-script.sh misc/spampd.service spampd.html
-	newinitd "${FILESDIR}"/init-r1 spampd
-	newconfd "${FILESDIR}"/conf spampd
-}