[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     4fba75a8ae81e9f4c302a96509c16543bfd7b15e
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Wed Nov 27 12:07:55 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 08:41:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fba75a8

mail-filter/rspamd: sync live, bump EAPI=7

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 mail-filter/rspamd/rspamd-9999.ebuild | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index a44b355c466..15d5bfbf501 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils pax-utils systemd tmpfiles user
+inherit cmake-utils pax-utils systemd tmpfiles
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
@@ -19,14 +19,17 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
 
-RDEPEND="dev-db/sqlite:3
+RDEPEND="
+	acct-group/rspamd
+	acct-user/rspamd
+	dev-db/sqlite:3
 	dev-libs/glib:2
 	dev-libs/icu:=
 	dev-libs/libev
+	dev-libs/libsodium
+	dev-util/ragel
 	net-libs/libnsl
 	sys-apps/file
-	dev-util/ragel
-	dev-libs/libsodium
 	blas? ( sci-libs/openblas )
 	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
 	jemalloc? ( dev-libs/jemalloc )
@@ -37,11 +40,6 @@ RDEPEND="dev-db/sqlite:3
 	!pcre2? ( dev-libs/libpcre[jit=] )"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	enewgroup rspamd
-	enewuser rspamd -1 -1 /var/lib/rspamd rspamd
-}
-
 src_prepare() {
 	cmake-utils_src_prepare
 
@@ -56,10 +54,11 @@ src_configure() {
 		-DRUNDIR=/var/run/rspamd
 		-DDBDIR=/var/lib/rspamd
 		-DLOGDIR=/var/log/rspamd
+		-DENABLE_BLAS=$(usex blas ON OFF)
+		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
 		-DENABLE_LUAJIT=$(usex jit ON OFF)
 		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
-		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
 	)
 	cmake-utils_src_configure
 }
@@ -79,7 +78,7 @@ src_install() {
 
 	# Remove mprotect for JIT support
 	if use jit; then
-		pax-mark m "${ED%/}"/usr/bin/rspamd-* "${ED%/}"/usr/bin/rspamadm-*
+		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
 	fi
 
 	insinto /etc/logrotate.d