gentoo resync : 14.07.2018

8 files changed, 94 insertions, 256 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 54ea9c575679..04fccf8c5c2a 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index 9b0b6525dc6a..e64ae8a892e1 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -1,8 +1,5 @@
-AUX dcc-1.3.140-configure-fix.patch 426 BLAKE2B 25d25ac4a82b59a39559b7ffe45231f1f44ad9b610992722ea3eae525a20d94e29b3c9a46b46381e2983a78070978e1e6467327e7286eaa576007742ed3499eb SHA512 e6057fef60053a07013c5575422e46ad50004583385650f5b95593bbb45949779fe65c10776952eaa3edaa504d24a1243fa6be8026873b63a915bfccb0b8740a
 AUX dcc-1.3.140-freebsd.patch 381 BLAKE2B 4324c87a09de1027b7df46bab82efbea28ae4f92d2a261d0ba44707a67b07b1d57d7aafad7be3e0bcf263928839b669151b2f7edd1413ab677337c4fe6376043 SHA512 b622085c54246cb38185262f851d611bad6e636d91a4a94ec7b966565a7d01a1a2a0445616eb3086f6c1d62a6c865e7248fcc828efbaaa70cdc7bbe2975c01d4
 AUX dcc.confd 274 BLAKE2B 757f3e751028b0c35c166f708c328b506721549267bf1e87e841b746f5d35a6bcbeab6dcebe5deb1c4207b8b11dc0db34925cb93410b556508105cc4c64b6132 SHA512 15b7e4ded3e56e9d15509305df244e29ec7a6c3c163c49a4597e16274317d88f5aff5522984a2a3002f838d0220d04c2ea3def8d771712a11685408a4983d3b4
-AUX dcc.initd 3013 BLAKE2B b1ab4903350233bc79113ca3ab9c28f04d6a4f76755d53b583c0111553c1a6964a4e634bc442769f53779cf8d22b94648f6b95f2839ebbfb8f9ffd1af954175a SHA512 67127b752526edda0ef036d4874b73b6dc3d1c13fbcb29f301acccc4cee1dc2dafc32af1f61003cbb2f874b2853aec1075d04e730f90083ae452ad7c5525396c
-AUX dcc.initd-1.3.140 2693 BLAKE2B 4d39ab7127de001308f7c9c4e96fd3d78bc4bb8561e05e2eac349df596765762ba4670904c28dbd926ede065faca54c1e1dde46ecd33e64dd7b7fcd67c8d770b SHA512 70a012699b6a66dfe085a6a77497cc9c2b88b32dee51b1a691a8ed70cb467bb7308bb9ea9594f5582adb23199638401e6454e8760bb293019cd81ab538daf20a
 AUX dcc.initd-1.3.154 2793 BLAKE2B 6ad77dfe2a80070c969ed71b0517fdbc0ad0bf2bcc96207fa80a7331d15ba77ac8b5e369c2bec5e164819da876e2ba022f31db3a455d72a6e52387a014d8de38 SHA512 e171e4333d735aa7da99ae322ce04954554a6738b943ca085e51707dd0bf231f7c170211f019027ddf01ec750ed1b8728b5d54b48dee6ee7fc37f8a810aded01
 DIST dcc-1.3.154.tar.Z 1711292 BLAKE2B 3e53488e718b13a1c36c1531f552ee811f42b274f4c24f26b484bd2b184fa3c34e0241be82aad1f6fa1a7a485fc172efdfea1dd7938fe190d9bbffa711f20abf SHA512 703bd3de44ccff3f318239dc2ca26a285f83ae0340a91391bcc5b719c298e77c8122d1502665350ddfc9fb14f12d9b6a56cba422ff8985db9cee6c91091fb987
 DIST dcc-1.3.158.tar.Z 1714175 BLAKE2B 19e11e9e78268e76bf97f16ad6f03f0bb114ec9fbc9b1f8bb6ca7ce72fa419b1e50a6d35ee32ed5352b13da96002d313c00a07395317d33082eb69c9ae60008e SHA512 24fba5ea713e8df1468644508c323d64b3868685716b7cc02263933476940a807cfc4593432a9195371308c83d4ea93653e89634681d95dcb32f5d65c7274599
diff --git a/mail-filter/dcc/files/dcc-1.3.140-configure-fix.patch b/mail-filter/dcc/files/dcc-1.3.140-configure-fix.patch
deleted file mode 100644
index 41620929c61e..000000000000
--- a/mail-filter/dcc/files/dcc-1.3.140-configure-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Avoid installing into /no/.
-
-Signed-off-by: Lars Wendler (Polynomial-C) <polynomial-c@gentoo.org>
-X-Gentoo-Bug: 388383
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/388383
-
---- dcc-1.3.140/configure
-+++ dcc-1.3.140/configure
-@@ -3256,7 +3256,7 @@
-   withval="$with_cgibin"
-   :
- fi
--if test -n "$with_cgibin" -a "$with_cgi_bin" != no; then
-+if test -n "$with_cgibin" -a "$with_cgibin" != no; then
-     cgibin="$with_cgibin"
- fi
- 
diff --git a/mail-filter/dcc/files/dcc.initd b/mail-filter/dcc/files/dcc.initd
deleted file mode 100644
index 1e64a16c6306..000000000000
--- a/mail-filter/dcc/files/dcc.initd
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use logger
-	need net
-	before mta
-}
-
-checkconfig() {
-	if [[ ! -f "/etc/dcc/dcc_conf" || ! -r "/etc/dcc/dcc_conf" ]]
-	then
-		eerror "You need a DCC configuration in /etc/dcc/dcc_conf"
-		return 1
-	else
-		source "/etc/dcc/dcc_conf"
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	if [[ "${START_DCC_DCCD}" == "yes" ]]
-	then
-		if [[ "${DCCD_ENABLE}" != "on" ]]
-		then
-			einfo "DCCD_ENABLE is not setto 'on' in dcc_conf"
-		else
-			if [[ -x "${DCC_LIBEXEC}/start-dccd" ]]
-			then
-				ebegin "Starting dccd"
-				${DCC_LIBEXEC}/start-dccd >/dev/null 2>&1
-				eend ${?}
-			else
-				eerror "You enabled DCCD but start-dccd is missing or not executable"
-			fi
-		fi
-	fi
-
-	if [[ "${START_DCC_GREY}" == "yes" ]]
-	then
-		if [[ "${GREY_ENABLE}" != "on" ]]
-		then
-			einfo "GREY_ENABLE is not set to 'on' in dcc_conf"
-		else
-			if [[ -x "${DCC_LIBEXEC}/start-grey" ]]
-			then
-				ebegin "Starting grey"
-			${DCC_LIBEXEC}/start-grey >/dev/null 2>&1
-				eend ${?}
-			else
-				eerror "You enabled GREY but start-grey is missing or not executable"
-			fi
-		fi
-	fi
-
-	if [[ "${START_DCC_DCCM}" == "yes" ]]
-	then
-		if [[ "${DCCM_ENABLE}" != "on" ]]
-		then
-			einfo "DCCM_ENABLE is not set to 'on' in dcc_conf"
-		else
-			if [[ -x "${DCC_LIBEXEC}/start-dccm" ]]
-			then
-				ebegin "Starting dccm"
-				${DCC_LIBEXEC}/start-dccm >/dev/null 2>&1
-				eend ${?}
-				for ((dccmtimeout=0 ; dccmtimeout <= 20 ; dccmtimeout++))
-				do
-					if [[ ! -S "${DCC_RUNDIR}/dccm" || ! -r "${DCC_RUNDIR}/dccm" ]]
-					then
-						sleep 1
-					else
-						break
-					fi
-				done
-				chown ${SOCKET_USER:-milter}:${SOCKET_GROUP:-milter} ${DCC_RUNDIR}/dccm 1>/dev/null 2>&1
-				chmod ${SOCKET_MODE:-664} ${DCC_RUNDIR}/dccm 1>/dev/null 2>&1
-				sed -i -e "s:^\-::" ${DCC_RUNDIR}/dccm.pid
-			else
-				eerror "You enabled DCCM but start-dccm is missing or not executable"
-			fi
-		fi
-	fi
-
-	if [[ "${START_DCC_DCCIF}" == "yes" ]]
-	then
-		if [[ "${DCCIFD_ENABLE}" != "on" ]]
-		then
-			einfo "DCCIFD_ENABLE is not set to 'on' in dcc_conf"
-		else
-			if [[ -x "${DCC_LIBEXEC}/start-dccifd" ]]
-			then
-				ebegin "Starting dccif"
-				${DCC_LIBEXEC}/start-dccifd >/dev/null 2>&1
-				eend ${?}
-			else
-				eerror "You enabled DCCIF but start-dccif is missing or not executable"
-			fi
-		fi
-	fi
-}
-
-stop() {
-	checkconfig || return 1
-
-	if [[ -r "${DCC_RUNDIR}/dccifd.pid" ]]
-	then
-		ebegin "Stopping dccif"
-		kill -15 $(< ${DCC_RUNDIR}/dccifd.pid) 2>/dev/null
-		eend ${?}
-	fi
-
-	if [[ -r "${DCC_RUNDIR}/dccm.pid" ]]
-	then
-		ebegin "Stopping dccm"
-		kill -15 $(< ${DCC_RUNDIR}/dccm.pid) 2>/dev/null
-		eend ${?}
-	fi
-
-	if (pidof dccd >/dev/null 2>&1) && [[ -x "${DCC_LIBEXEC}/stop-dccd" ]]
-	then
-		ebegin "Stopping dccd"
-		${DCC_LIBEXEC}/stop-dccd >/dev/null 2>&1
-		eend ${?}
-	fi
-
-	if (pidof dccd >/dev/null 2>&1) && [[ -x "${DCC_LIBEXEC}/stop-dccd" ]]
-	then
-		ebegin "Stopping grey"
-		${DCC_LIBEXEC}/stop-dccd -G >/dev/null 2>&1
-		eend ${?}
-	fi
-}
diff --git a/mail-filter/dcc/files/dcc.initd-1.3.140 b/mail-filter/dcc/files/dcc.initd-1.3.140
deleted file mode 100644
index 8fc4ac3540c3..000000000000
--- a/mail-filter/dcc/files/dcc.initd-1.3.140
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use logger
-	need net
-	before mta
-}
-
-checkconfig() {
-	if [ ! -f "/etc/dcc/dcc_conf" ]; then
-		eerror "You need a DCC configuration in /etc/dcc/dcc_conf"
-		return 1
-	fi
-	for i in DCCD_ENABLE GREY_ENABLE DCCM_ENABLE DCCIFD_ENABLE DCC_LIBEXEC DCC_RUNDIR \
-		SOCKET_USER SOCKET_GROUP SOCKET_MODE; do
-		read -r ${i} <<-EOF
-		$( grep ^[[:space:]]*${i} /etc/dcc/dcc_conf | sed s/.*=// )
-	EOF
-	done
-	DCC_RUNDIR="${DCC_RUNDIR:-/var/run/dcc}"
-	if [ ! -d "${DCC_RUNDIR}" ]; then
-		checkpath -q -d -o root:root -m 0755 "${DCC_RUNDIR}" || return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	local atleastone="${DCCD_ENABLE}${GREY_ENABLE}${DCCM_ENABLE}${DCCIFD_ENABLE}"
-	atleastone=$( echo ${atleastone} | tr -d 'off' )
-	if [ -z "${atleastone}" ]; then
-		eend 1 "At least one service should be 'on' in /etc/dcc/dcc_conf"
-		return 1
-	fi
-
-	if [ "${DCCD_ENABLE}" = "on" ] && [ -x "${DCC_LIBEXEC}/start-dccd" ]; then
-		ebegin "Starting dccd"
-		${DCC_LIBEXEC}/start-dccd >/dev/null 2>&1
-		eend ${?}
-	fi
-
-	if [ "${GREY_ENABLE}" = "on" ] && [ -x "${DCC_LIBEXEC}/start-grey" ]; then
-		ebegin "Starting grey"
-		${DCC_LIBEXEC}/start-grey >/dev/null 2>&1
-		eend ${?}
-	fi
-
-	if [ "${DCCM_ENABLE}" = "on" ] && [ -x "${DCC_LIBEXEC}/start-dccm" ]; then
-		ebegin "Starting dccm"
-		${DCC_LIBEXEC}/start-dccm >/dev/null 2>&1
-		eend ${?}
-		local dccmtimeout=0
-		while [ ${dcctimeout} -le 20 ] ; do
-			if [ -S "${DCC_RUNDIR}/dccm" ] || [ -r "${DCC_RUNDIR}/dccm" ]; then
-				break
-			else
-				sleep 1
-				dcctimeout=$(($dcctimeout + 1))
-			fi
-		done
-		chown ${SOCKET_USER:-milter}:${SOCKET_GROUP:-milter} ${DCC_RUNDIR}/dccm 1>/dev/null 2>&1
-		chmod ${SOCKET_MODE:-664} ${DCC_RUNDIR}/dccm 1>/dev/null 2>&1
-		sed -i -e "s:^\-::" ${DCC_RUNDIR}/dccm.pid 1>/dev/null 2>&1 || return 1
-	fi
-
-	if [ "${DCCIFD_ENABLE}" = "on" ] && [ -x "${DCC_LIBEXEC}/start-dccifd" ]; then
-		ebegin "Starting dccif"
-		${DCC_LIBEXEC}/start-dccifd >/dev/null 2>&1
-		eend ${?}
-	fi
-}
-
-stop() {
-	checkconfig || return 1
-
-	if [ -r "${DCC_RUNDIR}/dccifd.pid" ]; then
-		ebegin "Stopping dccif"
-		kill -15 $(< ${DCC_RUNDIR}/dccifd.pid) 2>/dev/null
-		eend ${?}
-	fi
-
-	if [ -r "${DCC_RUNDIR}/dccm.pid" ]; then
-		ebegin "Stopping dccm"
-		kill -15 $(< ${DCC_RUNDIR}/dccm.pid) 2>/dev/null
-		eend ${?}
-	fi
-
-	if (pidof dccd >/dev/null 2>&1) && [ -x "${DCC_LIBEXEC}/stop-dccd" ]; then
-		ebegin "Stopping dccd"
-		${DCC_LIBEXEC}/stop-dccd >/dev/null 2>&1
-		eend ${?}
-	fi
-
-	if (pidof dccd >/dev/null 2>&1) && [ -x "${DCC_LIBEXEC}/stop-dccd" ]; then
-		ebegin "Stopping grey"
-		${DCC_LIBEXEC}/stop-dccd -G >/dev/null 2>&1
-		eend ${?}
-	fi
-}
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 9d574632ef11..21fc054d7d4a 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -6,10 +6,12 @@ DIST rspamd-1.6.6.tar.gz 2487482 BLAKE2B f18640f64a8c0bcf6077267a1715f0bb096ab18
 DIST rspamd-1.7.1.tar.gz 4453460 BLAKE2B 28070804a6daf7f6354203038fbd974176a1ed5135b51a5ef7f089e63ffac3b3bbdca1961154b846f5b7d054071925722b311b46a3be6d09ff3d853232cbbd5f SHA512 3de4e07fa9cc72e306936a201f6bc019b5bf6f3ade003bf9217dc8a7decf027b986d80e1c0d2f09460af6f1d59aa520fee68287ad6ccee1cec94698054bc2fbb
 DIST rspamd-1.7.2.tar.gz 4460606 BLAKE2B 2c4389fd5350d67d21745288f74c4e1276772c47bbb0c74364227d0c04e4102c2ce00cd8242a639825e8c9971e87822af7a38a0a8561ba979e3f3b396d120414 SHA512 45ab95c7488e58da9e8803daefda5a0f8920cc4d4c4508a0347ed07d201124d07b10e93010b2be5fab3ecd0ac2be962bcebbb41f434a449fdbc31ded744878cf
 DIST rspamd-1.7.5.tar.gz 4494681 BLAKE2B 709b589157cb61568ebe78af64bb2363cb7342736e29971f30de1e1a1e9e667402006cb3a34e1d240a32560608ab9ab86838a288707b5043c89c3d9127880f60 SHA512 3e77c99abd47b1d22ccae33c0312b4338253af0ff10825dc2796fc42864142c91324d349677098bcd0c156a9229c04d3ce8a08808b6eb702624c918722e3acc4
+DIST rspamd-1.7.7.tar.gz 4534430 BLAKE2B 83ba39b80293bf87f397e6b1b1cbec27e7c44f096a148b6d29c641d10b607b616865ec54c1a88dc55f620b17e8c69bcf8690ee509d1b9a517a923fe0afc08b70 SHA512 7436848b3fc0e2ef90dcc54b48c1c95d6a7753175f484297de2e77bd117a9858da09b2a50f8692f210e48421b604ef465311b97197b473823a87ac74337d7752
 EBUILD rspamd-1.6.5.ebuild 1868 BLAKE2B 3a1b3b56887ac104ad88a01e6ba591d12dc2cd26faad7015b172f86fe9980527e96f8834237d88590ea3045ff15b4d75f6eb89378a24c34257dbb5a3a689bd0a SHA512 1377875abc3cdb66f5dd78fda1e44b93fb8a1f1c39f17757d7289a2c13464071731116ed1e4450b7c371f7682407575986fe73c8e0d9e3d0352b29a7e4098511
 EBUILD rspamd-1.6.6.ebuild 1947 BLAKE2B a126b72800155611a024b3767643b1e511d70a4cee87727d35292500b6d97cbb538b3dd960efef11d78de270d5804d0e1af20629898a017d635e9fec2bbf6e10 SHA512 62e4cca1df35d0889f06667cc2cb4498d818d555fea5a71a0cd924acc25eec25bf1e292a56f448b0339dbacd39f790502da239d8bb61c9500d58ac5c2a2d4118
 EBUILD rspamd-1.7.1.ebuild 1868 BLAKE2B b96b526ad711af5be848b9fe6ae541aec4fd05ff6b49ddaa6e39a7f5c6d208b2a48f3f650371bd4bff86d88a11e8eaedded27e903677d4d7445953b8138daab2 SHA512 9169fdab9007c470f68d4e9f227a6769dbdbad9e51bb3f8c5fb3ceb220cbc97fc65bfb6df27e45276816da7f10793f6c87c9f41df1c27fe8bd2b3d3d016fb46e
 EBUILD rspamd-1.7.2.ebuild 1975 BLAKE2B 8ed2fa843435751c54b1e3bcc1701e3915b39d2967403fd74374cce8b20c26e4334239dda05041967d8fc266f1e7e76270d4cca28dc3cfa7f45f7bb990cd2e3d SHA512 da8518a050e62b815c7c2742ccfdfedd431299d6906bc840cc6cecb0fd05e51620475da63929eca5208ffd3d87eb3e36afd6d315619703059ef50f3f19170207
 EBUILD rspamd-1.7.5.ebuild 2158 BLAKE2B d1c19e91d0f1a1c886ca4173436003e3fb69511fd10a1ff4b6c09da8c978e0fd1bcf7c7e5d22bcef0771a6024616ea52ad5b586b492a67433281a3435d834b1e SHA512 063c50d3ae63e8811ea2d115250cbd08d8963e39e9259ad35140a8b6c8faf40820ae238b18d098c206d4b2969169ddbdda617a0244671e2b761227627342b247
-EBUILD rspamd-9999.ebuild 2158 BLAKE2B d1c19e91d0f1a1c886ca4173436003e3fb69511fd10a1ff4b6c09da8c978e0fd1bcf7c7e5d22bcef0771a6024616ea52ad5b586b492a67433281a3435d834b1e SHA512 063c50d3ae63e8811ea2d115250cbd08d8963e39e9259ad35140a8b6c8faf40820ae238b18d098c206d4b2969169ddbdda617a0244671e2b761227627342b247
+EBUILD rspamd-1.7.7.ebuild 2175 BLAKE2B 52ec154fc0bb61b361aa6fde7fe261e4c095f5a3a0de0c5f96f30ac23dfc50188d78ed354ff5033bf65e65f9c747c6d85dd7d5bc8f1612453201029237cf0bd5 SHA512 534cd4d4977c54a77283c646ad1c3146bb9dac3b39ff55d00a8cc09d91274060eaedf215ad62bd4c75debceec41b53cef5ec9d718ed452a9317183a8b7a3b2f0
+EBUILD rspamd-9999.ebuild 2175 BLAKE2B 52ec154fc0bb61b361aa6fde7fe261e4c095f5a3a0de0c5f96f30ac23dfc50188d78ed354ff5033bf65e65f9c747c6d85dd7d5bc8f1612453201029237cf0bd5 SHA512 534cd4d4977c54a77283c646ad1c3146bb9dac3b39ff55d00a8cc09d91274060eaedf215ad62bd4c75debceec41b53cef5ec9d718ed452a9317183a8b7a3b2f0
 MISC metadata.xml 905 BLAKE2B 2b14bdf8077a435c70da3c7d3c259a457a2defa947674365ea9928b070efecc6e6aac2bfc3663d9125be6c4844e3dda0e79feeb8c96d7cf3495fb16605cbf39b SHA512 16d6df60d418d067d25b0ad42abdc9a0b36b4ac94ef96c3d3c48c725eab09ec59a2e9808a70065714f18eb6c7150ca8379763f0c5e14b04e3ed47c4167fb7e1e
diff --git a/mail-filter/rspamd/rspamd-1.7.7.ebuild b/mail-filter/rspamd/rspamd-1.7.7.ebuild
new file mode 100644
index 000000000000..e4b16db1465f
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-1.7.7.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999 ]] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
+fi
+
+inherit cmake-utils user systemd pax-utils ${SCM}
+
+DESCRIPTION="Rapid spam filtering system"
+HOMEPAGE="https://github.com/vstakhov/rspamd"
+
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2 +torch"
+REQUIRED_USE="torch? ( jit )"
+
+RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	fann? ( sci-mathematics/fann )
+	pcre2? ( dev-libs/libpcre2[jit=] )
+	!pcre2? ( dev-libs/libpcre[jit=] )
+	jit? ( dev-lang/luajit:2 )
+	jemalloc? ( dev-libs/jemalloc )
+	dev-libs/libevent
+	net-libs/libnsl
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	<dev-util/ragel-7.0
+	sys-apps/file
+	gd? ( media-libs/gd[jpeg] )
+	dev-libs/icu
+	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )"
+DEPEND="dev-util/ragel
+	${RDEPEND}"
+
+QA_MULTILIB_PATHS="usr/lib/rspamd/.*"
+
+pkg_setup() {
+	enewgroup rspamd
+	enewuser rspamd -1 -1 /var/lib/rspamd rspamd
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFDIR=/etc/rspamd
+		-DRUNDIR=/var/run/rspamd
+		-DDBDIR=/var/lib/rspamd
+		-DLOGDIR=/var/log/rspamd
+		-DENABLE_LUAJIT=$(usex jit ON OFF)
+		-DENABLE_FANN=$(usex fann ON OFF)
+		-DENABLE_GD=$(usex gd ON OFF)
+		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
+		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
+		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_TORCH=$(usex torch ON OFF)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}/rspamd.init-r5" rspamd
+
+	# Remove mprotect for JIT support
+	if use jit; then
+		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die
+	fi
+
+	keepdir /var/lib/rspamd
+	keepdir /var/log/rspamd
+
+	fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/rspamd.logrotate" rspamd
+
+	systemd_newunit rspamd.service rspamd.service
+}
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index 1a20cc22321c..e4b16db1465f 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -34,6 +34,7 @@ RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] )
 	jit? ( dev-lang/luajit:2 )
 	jemalloc? ( dev-libs/jemalloc )
 	dev-libs/libevent
+	net-libs/libnsl
 	dev-db/sqlite:3
 	dev-libs/glib:2
 	<dev-util/ragel-7.0