| 1 |
commit: 4fba75a8ae81e9f4c302a96509c16543bfd7b15e |
| 2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
| 3 |
AuthorDate: Wed Nov 27 12:07:55 2019 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 14 08:41:37 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fba75a8 |
| 7 |
|
| 8 |
mail-filter/rspamd: sync live, bump EAPI=7 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.16 |
| 11 |
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> |
| 12 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 13 |
|
| 14 |
mail-filter/rspamd/rspamd-9999.ebuild | 25 ++++++++++++------------- |
| 15 |
1 file changed, 12 insertions(+), 13 deletions(-) |
| 16 |
|
| 17 |
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild |
| 18 |
index a44b355c466..15d5bfbf501 100644 |
| 19 |
--- a/mail-filter/rspamd/rspamd-9999.ebuild |
| 20 |
+++ b/mail-filter/rspamd/rspamd-9999.ebuild |
| 21 |
@@ -1,9 +1,9 @@ |
| 22 |
# Copyright 1999-2019 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
-EAPI=6 |
| 26 |
+EAPI=7 |
| 27 |
|
| 28 |
-inherit cmake-utils pax-utils systemd tmpfiles user |
| 29 |
+inherit cmake-utils pax-utils systemd tmpfiles |
| 30 |
|
| 31 |
if [[ ${PV} == *9999 ]] ; then |
| 32 |
EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git" |
| 33 |
@@ -19,14 +19,17 @@ LICENSE="Apache-2.0" |
| 34 |
SLOT="0" |
| 35 |
IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2" |
| 36 |
|
| 37 |
-RDEPEND="dev-db/sqlite:3 |
| 38 |
+RDEPEND=" |
| 39 |
+ acct-group/rspamd |
| 40 |
+ acct-user/rspamd |
| 41 |
+ dev-db/sqlite:3 |
| 42 |
dev-libs/glib:2 |
| 43 |
dev-libs/icu:= |
| 44 |
dev-libs/libev |
| 45 |
+ dev-libs/libsodium |
| 46 |
+ dev-util/ragel |
| 47 |
net-libs/libnsl |
| 48 |
sys-apps/file |
| 49 |
- dev-util/ragel |
| 50 |
- dev-libs/libsodium |
| 51 |
blas? ( sci-libs/openblas ) |
| 52 |
cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) |
| 53 |
jemalloc? ( dev-libs/jemalloc ) |
| 54 |
@@ -37,11 +40,6 @@ RDEPEND="dev-db/sqlite:3 |
| 55 |
!pcre2? ( dev-libs/libpcre[jit=] )" |
| 56 |
DEPEND="${RDEPEND}" |
| 57 |
|
| 58 |
-pkg_setup() { |
| 59 |
- enewgroup rspamd |
| 60 |
- enewuser rspamd -1 -1 /var/lib/rspamd rspamd |
| 61 |
-} |
| 62 |
- |
| 63 |
src_prepare() { |
| 64 |
cmake-utils_src_prepare |
| 65 |
|
| 66 |
@@ -56,10 +54,11 @@ src_configure() { |
| 67 |
-DRUNDIR=/var/run/rspamd |
| 68 |
-DDBDIR=/var/lib/rspamd |
| 69 |
-DLOGDIR=/var/log/rspamd |
| 70 |
+ -DENABLE_BLAS=$(usex blas ON OFF) |
| 71 |
+ -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) |
| 72 |
+ -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) |
| 73 |
-DENABLE_LUAJIT=$(usex jit ON OFF) |
| 74 |
-DENABLE_PCRE2=$(usex pcre2 ON OFF) |
| 75 |
- -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) |
| 76 |
- -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) |
| 77 |
) |
| 78 |
cmake-utils_src_configure |
| 79 |
} |
| 80 |
@@ -79,7 +78,7 @@ src_install() { |
| 81 |
|
| 82 |
# Remove mprotect for JIT support |
| 83 |
if use jit; then |
| 84 |
- pax-mark m "${ED%/}"/usr/bin/rspamd-* "${ED%/}"/usr/bin/rspamadm-* |
| 85 |
+ pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* |
| 86 |
fi |
| 87 |
|
| 88 |
insinto /etc/logrotate.d |
Archives