gentoo resync : 29.12.2022

19 files changed, 81 insertions, 108 deletions

diff --git a/mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild b/mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild
index 426c5373fb9b..f7d840c8624b 100644
--- a/mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild
+++ b/mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -319,7 +319,7 @@ pkg_postinst() {
 			/etc/MailScanner/MailScanner.conf.pre_upgrade.${MY_PV} \
 			/etc/MailScanner/MailScanner.conf.${MY_PV} \
 			> /etc/MailScanner/MailScanner.conf 2> /dev/null
-		eend
+		eend $?
 	else
 		cp /etc/MailScanner/MailScanner.conf.sample \
 			/etc/MailScanner/MailScanner.conf
diff --git a/mail-filter/MailScanner/Manifest b/mail-filter/MailScanner/Manifest
index b4f95d005a80..588701298c62 100644
--- a/mail-filter/MailScanner/Manifest
+++ b/mail-filter/MailScanner/Manifest
@@ -1,5 +1,5 @@
 AUX confd.mailscanner 147 BLAKE2B be4369be15115d4e1194d0d56b547e88a824378dce4af82f1600cff3cbd7fc75bd99919a6127e1c4ae99268605cc4d96187b4806fb7dbe60000adda8b9c0b2fd SHA512 2fb6f96eef254fae597e23ddb80c649e5754999e542436b7172ab4fca0d3e281645a2fcf21a3bde4c6c9d7cd48de868e64e74c5caac7ff235dbbbcc6c2ebeda3
 AUX initd.mailscanner 982 BLAKE2B c630647b12057e9c56264b9d5b58a6cf4fca8e3d07d38204a64714fcc99d7be3929b2e774e268ec958fefa071db2ec20e9dacc22a64b6c1f4e338c57c1bee6ef SHA512 88a14b02ec004b487b6aa9a8732092a18b465f8aa81e2c958b96434064a15ad5a5ce43b473679bd8b18a661f972c8df756c54691d35c4261dff8a26cd8e291ec
 DIST MailScanner-install-4.84.5-2.tar.gz 9510489 BLAKE2B 7bfdb0ba9fbd38281328e66fab9512b6dcc596d92fb18186df950d26c451bff0a8fa5345df7849e60e0040e6559754ef9e2099c17425ed4a6465071e0fb610dd SHA512 d9d082e29ddb6eae4f30069298507805a7674c264bf8edad3db3322fa0f2c2ad4539c0c2213c6fcbee11b7c57a36218c1d24243077358bac98e7ae07f7ee506f
-EBUILD MailScanner-4.84.5.2.ebuild 9560 BLAKE2B bd421f08f148633612872243d2c7fab5c748c795e92890521032f32000ebd40813babe09d83694062240de873864d950cdb6a6b0a4fc3cded7479ac0c69503ff SHA512 5327747a40ad5b828b70b1e04efdc2ca53e94244fbd498d09812d95c122be9e8cee78f6d0de2dc45ee068327cc3a0328294f305f3bd26ff83786a084325cca7a
+EBUILD MailScanner-4.84.5.2.ebuild 9563 BLAKE2B 3c9c041a4d2c13ba003ff76cd78d7b0f5214db229d0caa43920e0bd0918f5dcc4cd7d2033cb169c748b995cc369b54e531a30a1f7ae9647bdbcf0b3f249f2238 SHA512 ccbb34d8b13fc07633d1db644082d2e463d1aab3a0f2cd7d07adaeddf2214d395bd650debd49c286c193b07a5485dfa69129ed49419bf496bd6f5910e2d89f3a
 MISC metadata.xml 512 BLAKE2B 30f43c43035ab46eddf1f612e92d745725a8020bcd10310443c3264e82f8a9a0d1ca55beac421ce8469668f972bab19b27b5f8e364fbd581c3f3ce191012ee78 SHA512 ad1e585e4e25c2cf164e5ba9507c84be562548929e65349650c1715e7b32dce1f2c00b83475192e820c66e3ee96eef6e37f00035eb975d9a3f155423c504a1dd
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index c15afac3c971..88b920575238 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
index b127eaa05b20..ed2fc22e1446 100644
--- a/mail-filter/imapfilter/Manifest
+++ b/mail-filter/imapfilter/Manifest
@@ -1,3 +1,4 @@
 DIST imapfilter-2.7.5.tar.gz 59441 BLAKE2B 0326a698f3be18da47c99cbe20e5e51cde8abcaebf365b3f00e5b1dba6bfaed5139b65766bd447dc596736da504063d5c87c21d1c5c11d6bc7ebd947d9d44835 SHA512 a64747d745ecd5a2f61d486cd8fec1bceeb97ce459ec57454311a960dbfce526c15e8bddeb16860b8efd9710de93845adec61ec892355a0bef7bddc4517e1442
+EBUILD imapfilter-2.7.5-r1.ebuild 975 BLAKE2B d9df09eaea0c39c58e8759a166c112fbc91f7aea860f52f145aac8b2b90f9524b1cdef38b09e12bc2d74fcfdb96db75c1d65f0fba1b2d0f706ade0cebc499fca SHA512 04e51183124e70229abb8da04d21eecf1621b272a3d82af664bbfb38992e5a1150a9db8c9c75e1333d8dda1c8e6d008a994ccac98fba880fef3d921cccb482f8
 EBUILD imapfilter-2.7.5.ebuild 964 BLAKE2B 2e559bbd69599a6b2324a301d5b96ea6fae09722f9e48579d736862bdad85bf71cad0535599e3769b63ef76d1719fedf80e1f3ec4105a52ba42243474810e1dd SHA512 bfaf9de115ec289be6fe523cf675747e5db9bfba190c8a1ce8b72ca3dad4175ccc143da90f579dc205231dec41bdc5d18f5d9ef7e5d252f771f178898e714581
 MISC metadata.xml 250 BLAKE2B 5c308c036dbb29b4cb092885b1b2e50040594286788fa36ce3b46e315215f69927c19f8f75325283d22546443b703d6cd09847d9a44c311765b623b79de18bb5 SHA512 526d2f2ec89586f365daeabf5ce8a23fdf5872c778c320f65f6614e44f8e6129cbe2e187541e9e902b5e6c5ab7085a86a14a45718eb3874ba071eaf194bb1178
diff --git a/mail-filter/imapfilter/imapfilter-2.7.5-r1.ebuild b/mail-filter/imapfilter/imapfilter-2.7.5-r1.ebuild
new file mode 100644
index 000000000000..6f25c2f85bc8
--- /dev/null
+++ b/mail-filter/imapfilter/imapfilter-2.7.5-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua-single toolchain-funcs
+
+DESCRIPTION="An IMAP mail filtering utility"
+HOMEPAGE="https://github.com/lefcha/imapfilter"
+SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	dev-libs/libpcre2
+	${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS NEWS README samples/*"
+
+src_prepare() {
+	default
+	sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
+		-e "/^MANDIR/s:man:share/man:" \
+		-e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
+		-e "/^CFLAGS/s/-O//" \
+		src/Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		LDFLAGS="${LDFLAGS}" \
+		INCDIRS=$(lua_get_CFLAGS) \
+		LIBLUA=$(lua_get_LIBS)
+}
+
+src_install() {
+	default
+	doman doc/imapfilter.1 doc/imapfilter_config.5
+}
diff --git a/mail-filter/procmail/Manifest b/mail-filter/procmail/Manifest
index 19611cd58b9c..fbc73d78631d 100644
--- a/mail-filter/procmail/Manifest
+++ b/mail-filter/procmail/Manifest
@@ -9,5 +9,5 @@ AUX procmail-maxprocs-fix.diff 465 BLAKE2B 05df3e8111ec4953a034fbdd93c9342b1581e
 AUX procmail-pipealloc.diff 825 BLAKE2B 532fe5fe01b34989e6d5805c0e5e1681d0b64f3838214b9715b44431c58d3f681ec4c889935071542b832b0ca7d96cd07d043918d2cf592ec4d150a483a58480 SHA512 e2a93060ff133f073c8a988db1bd92cfe3aac149ee04eda65862c468576fe194cd09379a545a94bbb1e20dbe1e142eae9f7949e930288178968fd95f5450fdbc
 AUX procmail-prefix.patch 5748 BLAKE2B c25d1de87d59771f959940d59195096711e70cc2a586d6eb585a58dfa96da8eb02ebe1bc03e08c0f8d6678da97d6c6016f99ae2669f4931e9cfdeb39ff23d230 SHA512 be61e6e0c89145caea1351241196c3bc986382340ecba0360d10918691cf1e35c67028a33ffaf22c83a0c747d06e58f437bf84854fc819206fa6e7bf0bbeb0d5
 DIST procmail-3.22.tar.gz 226817 BLAKE2B 4fd4641abcd3a897ea19bd8f76446f88806d22649d5221f8cef6f9efc29f7fcc02c9707cbf00c32fe247f16579d28fd887d3c18c4d3a2f8877c351bf92e85866 SHA512 3d0658329a55957a8d5741e03b0853b030c4524acef30641663213aa9eefc8264f8cc2b68a00a89e5f9f0f7c916c41a42e1b6c8df562c545ba97d8ab9049a936
-EBUILD procmail-3.22-r15.ebuild 3610 BLAKE2B 642a7efe3a502bf2f812104029bac0b91619b78cd2119fa36debf7011c253d775154ad1943115ab2013906b5a88fef2c0bef82dae8bb36117091e6513cc84ce0 SHA512 0e1a49e558dc85dd13e432661ab4b373b2f0cf1dcad99d2f756b851348ce57b8a7d0ccc640f5d73904ae09298c782e847da835d317bba14157ea933ea3a06765
+EBUILD procmail-3.22-r15.ebuild 3617 BLAKE2B df944c6f348250ae422d85688c12ea823442e95ed7e2f2e619a1663c0982653c78aa63f6dc60c9bcf17edd15066957e53fe9939f146fb61cdbb5c17101799a27 SHA512 9e03bfca6f02bdfd1e286bde7e35ebd0642da21c70967b6b74da4ad638fabd1f594f2a1909f86741f30ced18f51576d942a0112decf609ede8b7116f8fa0d2ab
 MISC metadata.xml 266 BLAKE2B 79f966d9cb2ccd6caf08bbe8dc0be32a68d25db0297cdfa0559af748e97a03522a2d13912058bd990dc4b89b9491ff04a669365cdd3416547029dad1911195c6 SHA512 9f8f1eadf7f43af21f263dce4a153531fad580c7d879abeb6dced4ec2bc7e88cbaaff1e861b798a3b29615201933f471b7a9e5e8188e68a0709ccfa8a51710d3
diff --git a/mail-filter/procmail/procmail-3.22-r15.ebuild b/mail-filter/procmail/procmail-3.22-r15.ebuild
index cbdc4d089194..4d8764f0af5a 100644
--- a/mail-filter/procmail/procmail-3.22-r15.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="mbox selinux"
 
 DEPEND="acct-group/mail
diff --git a/mail-filter/pyzor/Manifest b/mail-filter/pyzor/Manifest
index 1a54e28a890b..d70a288de9dc 100644
--- a/mail-filter/pyzor/Manifest
+++ b/mail-filter/pyzor/Manifest
@@ -1,5 +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
+EBUILD pyzor-1.0.0_p20211223.ebuild 1547 BLAKE2B 3b38d92f56e5102b15ed42f22bef1fd70a9a4be0c35ddb4e9eab982c3cade4a6c67043d2b4fb4aafea1c2a326514608f2a62bd7c49122f76c474fc29a1140b41 SHA512 3fcbe02ac24f95f65aef53b7c80b45b73b836d8c1863a65bc2c521c685890aa016352bc2058adee7a3adbe69a12a31380b71a56dfba7eb81d66f5d0a657fd223
 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
index b7766b0cbbe6..85182f021560 100644
--- a/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild
+++ b/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc gdbm gevent mysql pyzord redis test"
 RESTRICT="!test? ( test )"
 
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 3ddda0f791a4..a0879d92661a 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -15,9 +15,9 @@ DIST rspamd-2.7.tar.gz 5126227 BLAKE2B 70f57dba6ac9abe93d735d42e84bd17a179703532
 DIST rspamd-3.0.tar.gz 5535659 BLAKE2B 605ac59b947b49efb026e04d153df5fc0d56c65712def3f2c54a949db32b8534e634d172a1899cc08e98e0a9da839fc00f0f569dc8c52a743f38bd71b8abaeaa SHA512 1ea6f9ffe58b7f280dbd31e39db6412ebeddda634ca8a669fa5bff2951d17123a5d4a09ec0f366c6b0c0b585f868e646fd49e4d45bd451408675b927ec2557c4
 DIST rspamd-3.1.tar.gz 5566920 BLAKE2B dfb31534e7dbce303729e89537f83eea90d6524a0ccf81633e0d55840f21936985ba5991f2a2ed9ca5594a4a3938f9366f7a1879fc553f41ab52bb89460b87dc SHA512 3c3c06c10d3dfc90e4bc92c7ebaff4bd4854d3b0e56d6476f0223918c4a52f4cc7a8b381b1f867164199ee18ea00eda77ae0315925f3fd71596d610200667178
 DIST rspamd-3.2.tar.gz 5637835 BLAKE2B 8d42b34dacdc818689fd8602abf8c4d5ff2431eb30b2d8fae6e78642ce4361d39a54cb4b981c58cd31205b0f2013978896081e0d7364620312db3fa855d14b1e SHA512 fd3570da24d7f09f48ba6e98c210789b85006c51adaf37336c83a570ef5b9239d4a09491b647464254d3600fbea7c662ec271e9a77ee4108236962490c677a79
-EBUILD rspamd-2.7-r104.ebuild 2660 BLAKE2B 686f0b1654f99906731519e73b397194027bcd620de37bd22f9c6369f948a3b51c3f4fb5a232d651bb53fdb0afafc7cf989021845c62c1dc7b297e73e31af517 SHA512 aed6860f94cd163c11ecb5511ff254a4cdfd6f9719192e460c4d082d9bdf5be89a027eef0ddeef829aab14703d6386ad588d08b7982d0c762bae39cdbcd57984
-EBUILD rspamd-3.0-r4.ebuild 2951 BLAKE2B cfca70ed9b3e396223bd00d55dee0ccc77c447b9b9ffd12efb4c67692b9f85816cc479769ca479ac33a11764790a6b1692079f3c794ba3a1457f1756acc8aeec SHA512 c4a6bd14abce61d2364bbc9aea28d829c0420a4b69ada8075b56a40fed38b6e624e8ac391948371844840e06b41789de0988310a87ae158509c131edeba76b13
-EBUILD rspamd-3.1-r2.ebuild 2879 BLAKE2B 9cb0194aa733c6cf1685b245ba84929f679af58a1967a5b26fda083fc156da5e9c55b60c9e557957d7c29c40d7097ef2b614244fa1d7073d59e92ed25ac6482a SHA512 858e119de3ad4a39efb17131d387fc39ada41263a036b210c3dbb7839aebc0903df2d30dc405f5c6ab32c15fad35a4f33a22c8d533ce858756cea9e04632e305
-EBUILD rspamd-3.2.ebuild 2906 BLAKE2B e1aa6a03336842a7a89cc7685c6281fb80520e3702329f68fa3bb9f916b6d361604edd36950478b4e139c6b331e5a782e3054b95b1f59bf628af8b0fce6d059a SHA512 eef9e18fca0b28fb61bf7d4c27f6e1fcce794c0ee7c2a38c8150fdfe70713366fdaf6dab164b328dde0756aa71df24ca75c987d8ad8660ac5eae60b4ef0cdf05
-EBUILD rspamd-9999.ebuild 2903 BLAKE2B e2ce96b302fa2d7d793a2728b31f2f01d25bd5b67d9b616ba7413e720807c8a0a171f13e98c15fc23c7ffa9ed24e6d5391bf09d5ffbf5c17fea12de78cab4efb SHA512 732916a7d023ac5526ac21175c4731fa533354928a8ee6bf2b0572c5f86bc2cf690431af0169f1c0a760990b17d0f419b2200e12beffa59312a94f52a1d8af56
+EBUILD rspamd-2.7-r104.ebuild 2714 BLAKE2B 66f8af6dc6c41333c6adfc7109d18fb4afe3add890c7599488f411d7605ce88ae401a5d9460dd0c4fd732ccfcc8409ea38fb1ff05f666dafb2846d7dc043316c SHA512 3f90efea931ce5c42ceda477879124803ab6c07b8633480ec27c12869cc8645804b262b7a44db540cafb2f6045a44eeda58cfd994645ddc9739474339ca29f70
+EBUILD rspamd-3.0-r4.ebuild 3005 BLAKE2B d92759892eab41d6c0674c13b2cdff521df58c8895d2f530010df694e352634dadeeb835ab6cfbd7d543e085e6bbd7f7d24357a56c0be4c82581b9a7e41845ac SHA512 d75a91150729eac9ea6f1dcae227f45cbf0e8b305795e9d72e42d50312c765e3ab9a1bb2573abbd0b0676d805d5cb073401f6b0fc8d00ed9639d61d8f372e94a
+EBUILD rspamd-3.1-r2.ebuild 2926 BLAKE2B acad05d3c35d53dc4c50e5f651f09fedc77dc0c7ec93c35f8e1adedc0b1e208d1076a599475d0d14ee2d6f831143579a2139ea9de6ccb0c66d534ab78de50bb6 SHA512 c5e495833dc636dd94657c5afb10b4dacaffca04441a35287514dcb7d0add3c0d9a8da8025a8d320bc95c169ed82f70922298225d2f8c9416a8c15d5c97a39b1
+EBUILD rspamd-3.2.ebuild 2904 BLAKE2B 1104dbd6d492d327b005708a4009829e53af0be6b58093d4795e1b2461c6287608246bf8f16f3d59dde8410141544e8b0669541cf43768f30539a728de9668a3 SHA512 c81efb5e723aa945ff974726b2ae72fee2d365b549f71628ccfdab8ac95a0af4919aae9eeaccabce4711b74debfffeb0efe67de50c6f4f62ed990d88f29db03d
+EBUILD rspamd-9999.ebuild 2957 BLAKE2B 9bdfb834dc41c15d8f6c2167cda32e609d833d7f94d6880215198f5c368202e5629f545723014318c6e2e28137c6e15eec4f2cfdee2c126cf554918ccb2c097d SHA512 793127e2802abba5779289e6e35765913f46a319722dbd182518eb098044922beda534d0343659541226e815ad8c7cf069c26ac4197295fe772c8336c23ef45f
 MISC metadata.xml 619 BLAKE2B 4146079273f7d9f592e37a9bcfb1ea1ec70191d0146b4f628234f33a4fe3ac2e0f1f642ae2c6ae6924f86f4d8f8448d23ceb5f813060d07af493b8ec93716acc SHA512 d0ab9bdb65773453a899bc1032e6698af5596e17cdc7153fbfe1b6004060ee4e654a03e70f9bc50f11e1ad48330dc4578a8b380381224c298370ea9489f239c2
diff --git a/mail-filter/rspamd/rspamd-2.7-r104.ebuild b/mail-filter/rspamd/rspamd-2.7-r104.ebuild
index 8c015b8220b0..12fd017ebb51 100644
--- a/mail-filter/rspamd/rspamd-2.7-r104.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r104.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="Rapid spam filtering system"
 HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
 LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
 SLOT="0"
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 selinux"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
@@ -46,7 +46,8 @@ RDEPEND="${LUA_DEPS}
 	jemalloc? ( dev-libs/jemalloc:= )
 	dev-libs/openssl:0=[-bindist(-)]
 	pcre2? ( dev-libs/libpcre2:=[jit=] )
-	!pcre2? ( dev-libs/libpcre[jit=] )"
+	!pcre2? ( dev-libs/libpcre[jit=] )
+	selinux? ( sec-policy/selinux-spamassassin )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/ragel
diff --git a/mail-filter/rspamd/rspamd-3.0-r4.ebuild b/mail-filter/rspamd/rspamd-3.0-r4.ebuild
index e8f4e0ccb5a0..ad3bcaa4ff19 100644
--- a/mail-filter/rspamd/rspamd-3.0-r4.ebuild
+++ b/mail-filter/rspamd/rspamd-3.0-r4.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="Rapid spam filtering system"
 HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
 LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
 SLOT="0"
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 test"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 selinux test"
 RESTRICT="!test? ( test )"
 
 # A part of tests use ffi luajit extension
@@ -51,7 +51,8 @@ RDEPEND="${LUA_DEPS}
 	jemalloc? ( dev-libs/jemalloc:= )
 	dev-libs/openssl:0=[-bindist(-)]
 	pcre2? ( dev-libs/libpcre2:=[jit=] )
-	!pcre2? ( dev-libs/libpcre[jit=] )"
+	!pcre2? ( dev-libs/libpcre[jit=] )
+	selinux? ( sec-policy/selinux-spamassassin )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/ragel
diff --git a/mail-filter/rspamd/rspamd-3.1-r2.ebuild b/mail-filter/rspamd/rspamd-3.1-r2.ebuild
index 9e9406415871..ac8b9e2b716a 100644
--- a/mail-filter/rspamd/rspamd-3.1-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.1-r2.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="Rapid spam filtering system"
 HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
 LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
 SLOT="0"
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 test"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 selinux test"
 RESTRICT="!test? ( test )"
 
 # A part of tests use ffi luajit extension
@@ -50,10 +50,11 @@ RDEPEND="${LUA_DEPS}
 	jemalloc? ( dev-libs/jemalloc:= )
 	dev-libs/openssl:0=[-bindist(-)]
 	pcre2? ( dev-libs/libpcre2:=[jit=] )
-	!pcre2? ( dev-libs/libpcre[jit=] )"
+	!pcre2? ( dev-libs/libpcre[jit=] )
+	selinux? ( sec-policy/selinux-spamassassin )"
 DEPEND="
 	${RDEPEND}
-	<dev-cpp/doctest-2.4.7"
+	dev-cpp/doctest"
 BDEPEND="
 	dev-util/ragel
 	virtual/pkgconfig
diff --git a/mail-filter/rspamd/rspamd-3.2.ebuild b/mail-filter/rspamd/rspamd-3.2.ebuild
index 4446b30d950e..136dcaf7574d 100644
--- a/mail-filter/rspamd/rspamd-3.2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.2.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="Rapid spam filtering system"
 HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
 LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
 SLOT="0"
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit test"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit selinux test"
 RESTRICT="!test? ( test )"
 
 # A part of tests use ffi luajit extension
@@ -51,10 +51,10 @@ RDEPEND="${LUA_DEPS}
 	)
 	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
 	jemalloc? ( dev-libs/jemalloc:= )
+	selinux? ( sec-policy/selinux-spamassassin )
 "
-# This version is also affected with bug #830624
 DEPEND="${RDEPEND}
-	<dev-cpp/doctest-2.4.7
+	dev-cpp/doctest
 "
 BDEPEND="
 	dev-util/ragel
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index bbae6a310243..7874f481a0d1 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="Rapid spam filtering system"
 HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
 LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
 SLOT="0"
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit test"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit selinux test"
 RESTRICT="!test? ( test )"
 
 # A part of tests use ffi luajit extension
@@ -52,6 +52,7 @@ RDEPEND="${LUA_DEPS}
 	)
 	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
 	jemalloc? ( dev-libs/jemalloc:= )
+	selinux? ( sec-policy/selinux-spamassassin )
 "
 DEPEND="${RDEPEND}
 	dev-cpp/doctest
diff --git a/mail-filter/sigh/files/sigh.initd b/mail-filter/sigh/files/sigh.initd
index 8fe64679bab1..8fe64679bab1 100755..100644
--- a/mail-filter/sigh/files/sigh.initd
+++ b/mail-filter/sigh/files/sigh.initd
diff --git a/mail-filter/spf-engine/Manifest b/mail-filter/spf-engine/Manifest
index 03ff7680d20c..a9014349c2f6 100644
--- a/mail-filter/spf-engine/Manifest
+++ b/mail-filter/spf-engine/Manifest
@@ -1,4 +1,3 @@
-DIST spf-engine-2.9.2.tar.gz 52737 BLAKE2B 39d6c9831ef3ea489f2910fcbcaec9b2bed627f02459e20826166f04a2fe895aecf83768a3446a037e4231cc317ee277f6ff8e9030c72d8819739f6af889d632 SHA512 fe1fe82411ed4d6fcfadccd6ccc9fbd36372b4676051aafa5984740cba862336b00567576b3e32451cd24b0cfcd992d7dfdee33f0cf65a35f4009837e99b8f98
-EBUILD spf-engine-2.9.2-r3.ebuild 2783 BLAKE2B 6cb7071aada85cd6c41aa2285404dc86d130dec6a4082ea5c26369f6b47431cbbd3f9ef05c54bc8c9d6bd8977cf6c8b04cc9d2e9a4527d8b06e6eb4f9df03ff7 SHA512 f6b78f1ca2bb3c33b2477719f8f6d8c3645444afa51ec58fce86504ade28ff830b38bb7b00cf70c616a9834080f468e24a2d215188e753c284927a06b3207aec
-EBUILD spf-engine-2.9.2-r4.ebuild 2721 BLAKE2B e895e288e1bea3877167d237c54d18b0a0968b04eee8118bb998f68e50565600231256ce28976ee3f4c26a857e0118b29e66e71a9edf6471cff7d61a4aed87ea SHA512 125c1895b5e8584c38bee6470f899a3cf0be7ab7acd18bc3f0416100ac41546e33510549ad9a4392d69a12ea0d5ef3549dd2d6afdfaabbaaa0190e3cb891f99c
+DIST spf-engine-2.9.3.tar.gz 52974 BLAKE2B 9e6c47af7d523e1486d9bbfee2b0e53a4a97dbfc93e1cd14f70d4676542defaf6fede397d33e21c00e9bb2cdd1016c98981b6c0e735bdfd225b226920b9470b1 SHA512 adde80eca38f372ad00ed7355951007b9c02ef8a52a5a4edcbf2fa9959220f1083e3e313668e9c7ad2c26144148ae8ff62ec468d79936d96b43897598254f528
+EBUILD spf-engine-2.9.3.ebuild 2719 BLAKE2B 3f1a223431077cc57b3f01e6abb7efb6ccf1d3674f3c38a07b460f661f083abdf9ffb2cfa043f42291f0dee4b301c8d5022591d0b7ae775f1924aee771e3bd0a SHA512 632955f3af1f693a10a7687d7278eae241237fdfc4c3b1f637e9f232a4819b390f73a8ba2ac8b28698f3a99a908e356776063435054543c2847e4b62af5fd9e5
 MISC metadata.xml 351 BLAKE2B 896ff35eb02fb2dc7a81f61d7698c72566061e15a43773b24655f12840e47b9f84ab98778498da1418b74007309fff3257de8b5ea06f60b4d358633ebfec12cd SHA512 e592b10d44514d4f5ac34295b727a58659d82d41e100c97c96f7881d0e189311e30aa2527a32d92ae1cbefea55aa722d39c7c36c3d3b259fc3b1df04bd9b075f
diff --git a/mail-filter/spf-engine/spf-engine-2.9.2-r3.ebuild b/mail-filter/spf-engine/spf-engine-2.9.2-r3.ebuild
deleted file mode 100644
index 4936a62e0edb..000000000000
--- a/mail-filter/spf-engine/spf-engine-2.9.2-r3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
-
-# The built-in ipaddress module handles the parsing of IP addresses. If
-# python is built without ipv6 support, then ipaddress can't parse ipv6
-# addresses, and the daemon will crash if it sees an ipv6 SPF record. In
-# other words, it's completely broken.
-PYTHON_REQ_USE="ipv6(+)"
-
-# setup.py defines entry_points
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Policy daemon and milter for Postfix SPF verification"
-HOMEPAGE="https://launchpad.net/spf-engine"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/pyspf[${PYTHON_USEDEP}]"
-
-RDEPEND="${DEPEND}
-	dev-python/authres[${PYTHON_USEDEP}]"
-
-DOCS=( CHANGES policyd-spf.conf.commented README README.per_user_whitelisting )
-
-python_prepare_all() {
-	# The "real" config file mentions the commented one, so we point
-	# users in the right direction.
-	local oldconf="policyd-spf.conf.commented"
-	local newconf="/usr/share/doc/${PF}/${oldconf}"
-
-	sed -e "1 s~ ${oldconf}~,\n#  ${newconf}~" -i policyd-spf.conf \
-		|| die 'failed to update commented config file path'
-
-	distutils-r1_python_prepare_all
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Remove the milter files that are installed by default. The milter
-	# isn't quite ready:
-	#
-	#   * The README says it's experimental not well-tested.
-	#   * There's no documentation for its configuration parameters
-	#     (expecially the UserID).
-	#   * The configuration file is hard-coded to /usr/local.
-	#   * The paths in the systemd service file are hard-coded to /usr/local.
-	#   * We need to write an OpenRC service script for it.
-	#
-	# These are all eventually doable, but I'm not willing to commit to
-	# making the milter work before upstream is.
-	#
-	rm "${ED}/usr/bin/pyspf-milter" \
-		|| die "failed to remove ${ED}/usr/bin/pyspf-milter"
-	rm -r "${ED}/usr/lib/systemd" \
-		|| die "failed to remove ${ED}/usr/lib/systemd"
-	rm -r "${ED}/usr/etc/init.d" \
-		|| die "failed to remove ${ED}/usr/etc/init.d"
-	einfo "The milter component of spf-engine is still deemed experimental"
-	einfo "and not well-tested by upstream. It's missing configuration"
-	einfo "files, service scripts, and documentation. In other words, it"
-	einfo "doesn't work yet."
-
-	# The setuptools installation routing always works relative to
-	# python's prefix, so that when installing locally you wind up
-	# with paths like /usr/local/etc. However for system installs
-	# that does the wrong thing and puts the sysconfdir at /usr/etc.
-	# Here we move it to the right place.
-	mv -v "${ED}/usr/etc" "${ED}/" || die 'failed to relocate sysconfdir'
-}
diff --git a/mail-filter/spf-engine/spf-engine-2.9.2-r4.ebuild b/mail-filter/spf-engine/spf-engine-2.9.3.ebuild
index 250e794e33cd..bfccc6c22a96 100644
--- a/mail-filter/spf-engine/spf-engine-2.9.2-r4.ebuild
+++ b/mail-filter/spf-engine/spf-engine-2.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/pyspf[${PYTHON_USEDEP}]"