9 files changed, 148 insertions, 146 deletions
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 96fdb1d6d0d5..27967675fdeb 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 8f4b1abf2e1d..c1566e13c8d7 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -4,7 +4,9 @@ AUX maildrop-disable-fam.patch 2291 BLAKE2B dd57e9c6d176fd7ca6cedafb9c0f497dd445
 AUX maildroprc 58 BLAKE2B b9ee443f0e9223690f077983541de86dd55c8b36ae2bafdea69563f74dff60ba4234c8388fe257045a36d61bc5f1db4c5a89c56678cbb8b0d4f187120e70a4cb SHA512 3077160382882db22d095dff4b27368e7482b63a9756a3cf7a61e8470ed933af0fdb04a61ebae155b14a7b1fafc598a4cdd1bb660d957f00190b95eb41e81f4e
 DIST maildrop-3.0.0.tar.bz2 2091018 BLAKE2B 3c8e3ae5c2c2f636b0223e2bafadcb88bf34be63c792a177febac5c41ccd50cab04755f14a26731c38a35531abea1faa70d4af5587a6e68a21735f050f2d46d8 SHA512 1f1e1682ec7c2d0c1f2e71059f186d9a9d3118194b1e558d3a6e5826721fb14a661f4d75df42ce2626430ac072b50e723b563ae00c1ebdeb4da96abfeb534eff
 DIST maildrop-3.0.2.tar.bz2 2129406 BLAKE2B 10572c9c0fcb7a31f10fdfb005562afd425d157fe515f31d7fc6721247b0a5d5d381b51da39f0161de0c8722af89da225273728928510fd9d79c18c18b5759e5 SHA512 a2e6ad9c6982e468b4f778fe6956312aa1da54c93269311922f247a89ede49349a6cbce869b08ced22354d18259ebc043e4f4adf1e0b364d8e110797b24efbc8
+DIST maildrop-3.1.0.tar.bz2 2154698 BLAKE2B 8eaec33ccb3f117e0cd069eac2af736f5cc3485314ea14ac594f8e716e68d3f1e20143ba47533c08a835707dda1e8ba0fad2eea5d3bf5845668f8ad375e56387 SHA512 4d4ab1acd9f81beb54af9af86d0f8c3145f962f1ff2fd5e9209e31b63054cc41b3e4a1300965a8855a39dbcfa1cdbdef2ad194af1f12e079c1361b12b293ed56
 EBUILD maildrop-3.0.0-r1.ebuild 3671 BLAKE2B ae904548d8d4a7d467a78fbdf144d536bcdc8b1e059c7a326dc07b1da54e781c31965188d9344f33174acfc1440e47da5a750123fb4ec2490b79e92ed324c0df SHA512 9d90c17cccdcd04202b977b931a69628a7f932b5165100df07be6ee24a71008b0a95a59c4ec763cf0d5b151f3bbf9b6c07af0936b3de2b67a91f7636f7376eb7
 EBUILD maildrop-3.0.2-r1.ebuild 3771 BLAKE2B 38cec99a43f0ba0a7a61ae3dafc443cbe498a97d74031b891930abe895b0602c6dd783c4854e0fec75d8a28ba9c68476039100cb0d9a228e124f5442ed58cf2a SHA512 0bdb6b0e7cffda19ba848eb07ba77675f22947694d0bb419f9cc7bbaa4f9c3ecfff478d306f7a0b6040b552fe3c2df5fc8387e4e632b6e75550370c969fa31ed
 EBUILD maildrop-3.0.2.ebuild 3679 BLAKE2B 5710c15f4f2813973682056c90320c5b4c030dbc68e16ba9fe5c6b1c8c90137983cf2b7345ec955f1265d4d9fde20e579db93dc52caa8b212e13218b31610d9e SHA512 cf1b7be26db3bcb4649020453e22775735dd9b07023e563c4ad38a9db4622a44bc9ffac3d4d9ae6a6e0bb5564ed13e73e3fb54e049641a588904959dcb061e99
+EBUILD maildrop-3.1.0-r1.ebuild 3651 BLAKE2B 32b2fa64ed4620648609c63105eef1bc0e716308246fc3598f93217895f81900b763b8897925fba3b071f816255b58410db643126a42078581bc7e02b413a62f SHA512 4d4458e220bdec023b26713958a83ae8c01b0ffc99ec576a4243726631a2bc586e53fa37910a0d713c28ead59fbea0c7899ae9d188c1f173d23723d288c508e8
 MISC metadata.xml 639 BLAKE2B 7b97d1b0ecf5622dcb89729dcfb27480f05c764df98d7d22e0477fbc1498911cdecf47ea5544cdca325e85126fa07d139cc019774ec8e988b4eff5dd4ace29f8 SHA512 077c7066f2ac3e44ccecf1e45a76e293d20c1ff858455e32599fb0b7348d4b5ef8da6c3f55f44b3e2368f9c9c6d3d2b538e12fd3bc82fab983181e2a694a4d49
diff --git a/mail-filter/maildrop/maildrop-3.1.0-r1.ebuild b/mail-filter/maildrop/maildrop-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..68fa7df9873d
--- /dev/null
+++ b/mail-filter/maildrop/maildrop-3.1.0-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic autotools
+
+DESCRIPTION="Mail delivery agent/filter"
+[[ -z ${PV/?.?/}   ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+[[ -z ${PV/?.?.?/} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+[[ -z ${SRC_URI}   ]] && SRC_URI="https://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2"
+HOMEPAGE="https://www.courier-mta.org/maildrop/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="berkdb debug dovecot gdbm ldap mysql postgres static-libs authlib +tools trashquota"
+
+CDEPEND="!mail-mta/courier
+	net-mail/mailbase
+	dev-libs/libpcre2
+	net-dns/libidn2:=
+	>=net-libs/courier-unicode-2.0:=
+	gdbm?     ( >=sys-libs/gdbm-1.8.0:= )
+	mysql?    ( net-libs/courier-authlib )
+	postgres? ( net-libs/courier-authlib )
+	ldap?     ( net-libs/courier-authlib )
+	authlib?  ( net-libs/courier-authlib )
+	!gdbm? (
+		berkdb? ( >=sys-libs/db-3:= )
+	)
+	gdbm? ( net-mail/courier-imap[gdbm?,berkdb?] )
+	berkdb? ( net-mail/courier-imap[gdbm?,berkdb?] )
+	tools? (
+		!mail-mta/netqmail
+		!net-mail/courier-imap
+	)"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+	dev-lang/perl
+	dovecot? ( net-mail/dovecot )"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+	mysql? ( authlib )
+	postgres? ( authlib )
+	ldap? ( authlib )"
+
+S=${WORKDIR}/${P%%_pre}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.0-testsuite.patch
+	"${FILESDIR}"/${PN}-3.0.2-makedat.patch
+)
+
+src_prepare() {
+	# Prefer gdbm over berkdb
+	if use gdbm ; then
+		use berkdb && elog "Both gdbm and berkdb selected. Using gdbm."
+	fi
+
+	# no need to error out if no default - it will be given to econf anyway
+	sed -i -e \
+		's~AC_MSG_ERROR(Cannot determine default mailbox)~SPOOLDIR="./.maildir"~' \
+		"${S}"/libs/maildrop/configure.ac || die "sed failed"
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-devel
+		--disable-tempdir
+		--enable-syslog=1
+		--enable-use-flock=1
+		--enable-use-dotlock=1
+		--enable-restrict-trusted=1
+		--enable-maildrop-uid=root
+		--enable-maildrop-gid=mail
+		--enable-sendmail=/usr/sbin/sendmail
+		--cache-file="${S}"/configuring.cache
+		$(use_enable static-libs static)
+		$(use_enable dovecot dovecotauth)
+		$(use_with trashquota)
+	)
+
+	local mytrustedusers="apache dspam root mail fetchmail"
+	mytrustedusers+=" daemon postmaster qmaild mmdf vmail alias"
+	myeconfargs+=( --enable-trusted-users="${mytrustedusers}" )
+
+	# These flags make maildrop cry
+	replace-flags -Os -O2
+	filter-flags -fomit-frame-pointer
+
+	if use gdbm ; then
+		myeconfargs+=( --with-db=gdbm )
+	elif use berkdb ; then
+		myeconfargs+=( --with-db=db )
+	else
+		myeconfargs+=( --without-db )
+	fi
+
+	if ! use mysql && ! use postgres && ! use ldap && ! use authlib ; then
+		myeconfargs+=( --disable-authlib )
+	fi
+
+	# default mailbox is $HOME/.maildir for Gentoo
+	maildrop_cv_SYS_INSTALL_MBOXDIR="./.maildir" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use authlib ; then
+		fperms 4755 /usr/bin/maildrop
+	fi
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README \
+		README.postfix README.dovecotauth UPGRADE \
+		maildroptips.txt
+	docinto maildir
+	dodoc libs/maildir/AUTHORS libs/maildir/INSTALL \
+		libs/maildir/README*.txt libs/maildir/*.html
+
+	# bugs 61116, 374009, and 639124
+	if ! use tools ; then
+		for tool in "maildirmake" "deliverquota"; do
+			rm "${D}/usr/bin/${tool}" || die
+			rm "${D}/usr/share/man/man"[0-9]"/${tool}."[0-9] || die
+		done
+		rm "${D}/usr/share/man/man5/maildir.5" || die
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/maildroprc
+
+	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
+}
diff --git a/mail-filter/pyzor/Manifest b/mail-filter/pyzor/Manifest
index b785d6531ad6..f4731a12d6ea 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 1502 BLAKE2B 7ca39eaf0be5654a86d0a3e495a6bd263ba3354da7d53cbc911bb25868fa9277e0f388d7badc8889413b56c9dd7cc19042f68abb8bc3aafdf83b20a98610163c SHA512 8cf7c85404e2424cc54cf17ffa4ebb802183f896b6ae5d2bad2d86c0f642596fff6c6beff0bce00220e977d24599d5d465c18066e19c79b56ea967229e33bf45
-EBUILD pyzor-1.0.0_p20211223.ebuild 1488 BLAKE2B 681cee28b6ff164110537665314bc47472742cfd48d9c0f3b3819b8ea27625db2e85733d4f82b2784e3e9883bae5154f121d8a7b6ae07155feaa602a5208de6b SHA512 208e01f5b677760a575df94df30f13790a4be3128561f0be8e02f7e5f8a1849847545d4a4b935f982c9cb508fade5aaf8d899321260686371d9b23531b90bafe
-MISC metadata.xml 845 BLAKE2B 864c09201b76bf8e4ad67bc51482be1e517ce05c29fb05772bd72569ee2dee89d0cc957b77a6193ef5724fca4dd53e3b667de4a14c506165cbc59175f0af2e07 SHA512 a2678815e0042af4fab7741d87d9259d9fc84d8a7397ab03044e8b1c9dc654af6dce5ba0df8134a1b68bd26d898e9b566a26ce20a19ce4b01a29b202963bf409
+EBUILD pyzor-1.0.0_p20200523.ebuild 1496 BLAKE2B 40b47dfa4bac2cf38de7a262699e606c59fa5d93fc707b80023415ba925e61353aa5f47834ea528cf5df76e44e4bd0472e3afae40b2c05e364bd1b293cefb713 SHA512 4060eb04214c2b927daa7a639eb75f8d82b16d19aea719abda119b51c65580d7b5b322104f5d8a8c7ee26e68c51c8e90c92097d176f0af739f9610bed1a44669
+EBUILD pyzor-1.0.0_p20211223.ebuild 1482 BLAKE2B 33f2d1ab495d1fd27fb7f0db25082607696f9b7b29c1a4662e4b9f7a2b7155faf2e54d691ecbcc05d4a71245436509aaf18679aa3f5e0171b60a52ec745a41a0 SHA512 1af61f9ea9296106b070617313c7786d35586c2e53877976e96d18c4db122449612c1d1d8e0e95e449ce839b8c3c0c14760a4b5a42f471cf1e76564f83894f55
+MISC metadata.xml 842 BLAKE2B f7041329b4babc35d93e5d3ab00b0bd54f2f6b2337037c713b692a25f5b5ab4ac6f318d6537e41ef8f07f8b5191b7a6dbffd29d063bc2548975febded51688ff SHA512 87362e92959650b365e83115c4d1ec2b328e4c8ab6144e94fa4e82c0009317f91e0fd7f77e9c58b6ca3450ec92dd6bc8194fbf25c30177c0ccfeeb9a8a5216a4
diff --git a/mail-filter/pyzor/metadata.xml b/mail-filter/pyzor/metadata.xml
index f8858867b591..77c2f9becde8 100644
--- a/mail-filter/pyzor/metadata.xml
+++ b/mail-filter/pyzor/metadata.xml
@@ -16,7 +16,7 @@
     </flag>
     <flag name="redis">
       Enables the redis back-end database engine for pyzord through
-      <pkg>dev-python/redis-py</pkg>
+      <pkg>dev-python/redis</pkg>
     </flag>
   </use>
   <upstream>
diff --git a/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild b/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
index 577c307d81f7..39b48f25723c 100644
--- a/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
+++ b/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
@@ -23,12 +23,12 @@ RDEPEND="
 	pyzord? (
 		gdbm? ( $(python_gen_impl_dep 'gdbm') )
 		mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] )
-		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+		redis? ( dev-python/redis[${PYTHON_USEDEP}] )
 	)"
 DEPEND="
 	test? (
 		gdbm? ( $(python_gen_impl_dep 'gdbm') )
-		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+		redis? ( dev-python/redis[${PYTHON_USEDEP}] )
 	)
 "
 BDEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild b/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild
index 300980c646b2..2f9075743d61 100644
--- a/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild
+++ b/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild
@@ -23,12 +23,12 @@ RDEPEND="
 	pyzord? (
 		gdbm? ( $(python_gen_impl_dep 'gdbm') )
 		mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] )
-		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+		redis? ( dev-python/redis[${PYTHON_USEDEP}] )
 	)"
 DEPEND="
 	test? (
 		gdbm? ( $(python_gen_impl_dep 'gdbm') )
-		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+		redis? ( dev-python/redis[${PYTHON_USEDEP}] )
 	)
 "
 
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 21accf1f76c1..540247f513a6 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -8,9 +8,7 @@ AUX rspamd-r1.logrotate 305 BLAKE2B 58e816e54fd0a7e977dd2f6dcf97617c188888ffea66
 AUX rspamd-r7.init 1357 BLAKE2B 90227e0980397a256e6136cac4a4a4d143130d82a211bfd4894d5f8deb85113e0b219e6453257d548ec3d80de24241e6ecfc2b0a4178cb344c8c6549d96e549b SHA512 89a079d32b7d8c5a037c7bb2ab6825624ce89ea4b25893bcf6f49befc0c7b924b51d48b30bf61c4b3ea5bc3ccbaba16664c7df52236debda0bdb58f1adf8867a
 AUX rspamd.conf 908 BLAKE2B 9d8c310c00990f47012e9d1710fbb7567ae5b0e92a411d3fb2696bfb32b70c31ceeaded873f06c759a471d534fb872656907e73ee095150fae384de4df6e9946 SHA512 753011de167af9261cc67676357aadf34d0b160d343a20d5efe8b3389e8a604775b7a6abbaad3174acae7df5579b52b4ba8a0a714419084befedfa96a3a8a9b1
 AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4abe3b3d3e6046d362dae9efc723dd675dff8f1c1df9d05c09e539fcd251382cd9fc5e92351ece8a9 SHA512 1c7e6b79a05cdf9a886c6e233417a0d7b398a1e27ddd3b19c3a595afd50e502a7fd7c09a3499cb9fe6e0291b8493d150550b094c8bf6e2221b71915239c72ef8
-DIST rspamd-3.3.tar.gz 5680874 BLAKE2B 2fbafabc0a59ca4ad1bbdc1b7ceb5b5bc281dc75d2997ac50c080cdf5ced2582409e3f98b63239bab64fafbcc63016d857967fe00c371a6d5b896d170f5da4a9 SHA512 02c5e62cb9ce32cdd6da859c4afe2bf03fcaff456d79f68ab7c3c288a0b36f11a701825c3cb7f0ecaccd419f84ce693961c1ed955ce4dbcfe291a8e978e2e69c
 DIST rspamd-3.4.tar.gz 5689732 BLAKE2B 8d1b98205f51cfe834db3ed53b8be72ada834980380cba06c4470689d16ef4a6396190ae27044ae76a7b35df6afd3cdf551f9469d878ac69ec61ef6b86b46104 SHA512 fec8cb7b845bf25d02f1c32c82bf35ad9c65f3301a73f3ea611b6fcfa0ac1b75f75561c4c42f142f876ac3a78f96fd91d22d30c5b3600e4001e25f06bc693ccf
-EBUILD rspamd-3.3.ebuild 3009 BLAKE2B 21d6b71e76aef770ad6220ae6dc149d7e8bed968d4d76d4a0ebbde8dfaa2de09a758dfe97272a0ec03b28aaaeebb8472609696f1fa308d788d210a664d5929ed SHA512 af382fa55eaa3078d4fedd7ed5cbc655d914591bdceb49362bce90462448b0c2528d496f813e23ce65631e3af1e84c9f9fc5510ee71edc31608d28d142e9e9b0
 EBUILD rspamd-3.4-r2.ebuild 3669 BLAKE2B f4176ac0886d5628cda9a1c5d3cfb88b1bfaf0d3ef166170d42d68da11f8d866cde901206d303fd572cc2c718d6cb7515fbbde29a5e0061886aeafeffb8a30f5 SHA512 28083c7df17c4ca97bd0fd4a5fb383594c2251167fecf2b39890c027b5f0359569e88935210047039b52a92efc4f4891b7092095b3a3fc643428402a1d66a65c
 EBUILD rspamd-9999.ebuild 2977 BLAKE2B 78567033b92fcb6237f794092cb62c7aa284211dab41c88d4a9c9069643c73f7b13afdd313bb14ecda628046158498f20b8783309ead10978d4a572a2fa5a19f SHA512 723b836bf5d404f7baaf298a8e28af7b126f14acab74f732dd19615c326917782ff6cb0d483e651cfb0f15966c8335066d96ca83a49752476488379fee5a2741
 MISC metadata.xml 554 BLAKE2B 65f4d0c5cd49f3caad6aeb0ab37bbba43505faf800491ebfa9af8366511bb46243a1ec873d7944cbe77dbb554beef8318a76f98dd4be69407b7befa3272a69b0 SHA512 d9a82aed6a7c63dad8727be080458c165e5c5f4a3ae87330c82447bc21d87c6c10730d0622fecbc5d255ca97312992c4f45c219ad8edcf2a9f4a386a79265d22
diff --git a/mail-filter/rspamd/rspamd-3.3.ebuild b/mail-filter/rspamd/rspamd-3.3.ebuild
deleted file mode 100644
index 6fb46e9d9b6b..000000000000
--- a/mail-filter/rspamd/rspamd-3.3.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit cmake lua-single pax-utils systemd tmpfiles
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/rspamd/rspamd.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-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 selinux test"
-RESTRICT="!test? ( test )"
-
-# A part of tests use ffi luajit extension
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	test? ( lua_single_target_luajit )"
-
-RDEPEND="${LUA_DEPS}
-	$(lua_gen_cond_dep '
-		dev-lua/LuaBitOp[${LUA_USEDEP}]
-		dev-lua/lua-argparse[${LUA_USEDEP}]
-	')
-	acct-group/rspamd
-	acct-user/rspamd
-	app-arch/zstd:=
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/icu:=
-	dev-libs/libev
-	dev-libs/libfmt:=
-	dev-libs/libpcre2:=[jit=]
-	dev-libs/libsodium:=
-	dev-libs/openssl:0=[-bindist(-)]
-	dev-libs/snowball-stemmer:=
-	>=dev-libs/xxhash-0.8.0
-	sys-apps/file
-	sys-libs/zlib
-	blas? (
-		virtual/blas
-		virtual/lapack
-	)
-	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
-	jemalloc? ( dev-libs/jemalloc:= )
-	selinux? ( sec-policy/selinux-spamassassin )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/doctest
-"
-BDEPEND="
-	dev-util/ragel
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
-	"${FILESDIR}/rspamd-3.2-unbundle-lua.patch"
-	"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
-	"${FILESDIR}/rspamd-3.3-remove-test-case.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,xxhash,zstd} || die
-
-	> cmake/Toolset.cmake || die #827550
-
-	sed -i -e 's/User=_rspamd/User=rspamd/g' \
-		rspamd.service \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFDIR=/etc/rspamd
-		-DRUNDIR=/var/run/rspamd
-		-DDBDIR=/var/lib/rspamd
-		-DLOGDIR=/var/log/rspamd
-
-		-DSYSTEM_DOCTEST=ON
-		-DSYSTEM_FMT=ON
-		-DSYSTEM_XXHASH=ON
-		-DSYSTEM_ZSTD=ON
-
-		-DENABLE_BLAS=$(usex blas ON OFF)
-		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
-		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-		-DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF)
-		-DENABLE_PCRE2=ON
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build run-test
-}
-
-src_install() {
-	cmake_src_install
-
-	newconfd "${FILESDIR}"/rspamd.conf rspamd
-	newinitd "${FILESDIR}/rspamd-r7.init" rspamd
-	systemd_newunit rspamd.service rspamd.service
-
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-
-	# Remove mprotect for JIT support
-	if use lua_single_target_luajit; then
-		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rspamd-r1.logrotate rspamd
-
-	diropts -o rspamd -g rspamd
-	keepdir /var/{lib,log}/rspamd
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-}