From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 65F5E138334 for ; Sat, 14 Dec 2019 08:42:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6510E0880; Sat, 14 Dec 2019 08:42:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8BFCEE0880 for ; Sat, 14 Dec 2019 08:42:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 52D5C34D82E for ; Sat, 14 Dec 2019 08:42:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 741228D7 for ; Sat, 14 Dec 2019 08:41:58 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1576312897.4fba75a8ae81e9f4c302a96509c16543bfd7b15e.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-filter/rspamd/rspamd-9999.ebuild X-VCS-Directories: mail-filter/rspamd/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 4fba75a8ae81e9f4c302a96509c16543bfd7b15e X-VCS-Branch: master Date: Sat, 14 Dec 2019 08:41:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: efb149f8-5e84-43f7-accc-43a252bd33a4 X-Archives-Hash: e270b38917fef769a0fca1bf40dae8de commit: 4fba75a8ae81e9f4c302a96509c16543bfd7b15e Author: Petr Vaněk atlas cz> AuthorDate: Wed Nov 27 12:07:55 2019 +0000 Commit: Joonas Niilola gentoo 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 atlas.cz> Signed-off-by: Joonas Niilola 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