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

["Sam James" <sam@gentoo.org>]

commit:     ce8c5ced6f2dd5150bbfb248015f92bbffb1959f
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Fri Nov 12 08:33:57 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 10:08:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce8c5ced

mail-filter/rspamd: make USE=jit to control only PCRE JIT support

It is valid configuration to use JIT enabled PCRE with non-JIT Lua and
vice versa, as it was pointed out in a bug report. Therefore, this
change removes

 jit? ( lua_single_target_luajit )

restriction from all available ebuilds.

Closes: https://bugs.gentoo.org/822765
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/22915
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-filter/rspamd/metadata.xml           | 1 +
 mail-filter/rspamd/rspamd-2.7-r103.ebuild | 3 +--
 mail-filter/rspamd/rspamd-3.0-r3.ebuild   | 1 -
 mail-filter/rspamd/rspamd-3.1.ebuild      | 1 -
 mail-filter/rspamd/rspamd-9999.ebuild     | 1 -
 5 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
index a183078256ab..78a3ccc54c80 100644
--- a/mail-filter/rspamd/metadata.xml
+++ b/mail-filter/rspamd/metadata.xml
@@ -18,5 +18,6 @@
   </upstream>
   <use>
     <flag name="pcre2">Use dev-libs/libpcre2</flag>
+    <flag name="jit">Enable PCRE JIT support</flag>
   </use>
 </pkgmetadata>

diff --git a/mail-filter/rspamd/rspamd-2.7-r103.ebuild b/mail-filter/rspamd/rspamd-2.7-r103.ebuild
index 8a361f82f03e..e3e4d0e59f1e 100644
--- a/mail-filter/rspamd/rspamd-2.7-r103.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r103.ebuild
@@ -21,8 +21,7 @@ LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain u
 SLOT="0"
 IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2"
 
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	jit? ( lua_single_target_luajit )"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="${LUA_DEPS}
 	$(lua_gen_cond_dep '

diff --git a/mail-filter/rspamd/rspamd-3.0-r3.ebuild b/mail-filter/rspamd/rspamd-3.0-r3.ebuild
index 1ff4af0796ec..54434e12ad55 100644
--- a/mail-filter/rspamd/rspamd-3.0-r3.ebuild
+++ b/mail-filter/rspamd/rspamd-3.0-r3.ebuild
@@ -24,7 +24,6 @@ RESTRICT="!test? ( test )"
 
 # A part of tests use ffi luajit extension
 REQUIRED_USE="${LUA_REQUIRED_USE}
-	jit? ( lua_single_target_luajit )
 	test? ( lua_single_target_luajit )"
 
 RDEPEND="${LUA_DEPS}

diff --git a/mail-filter/rspamd/rspamd-3.1.ebuild b/mail-filter/rspamd/rspamd-3.1.ebuild
index df5d75abfd0e..3d43ffe54025 100644
--- a/mail-filter/rspamd/rspamd-3.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.1.ebuild
@@ -24,7 +24,6 @@ RESTRICT="!test? ( test )"
 
 # A part of tests use ffi luajit extension
 REQUIRED_USE="${LUA_REQUIRED_USE}
-	jit? ( lua_single_target_luajit )
 	test? ( lua_single_target_luajit )"
 
 RDEPEND="${LUA_DEPS}

diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index df5d75abfd0e..3d43ffe54025 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -24,7 +24,6 @@ RESTRICT="!test? ( test )"
 
 # A part of tests use ffi luajit extension
 REQUIRED_USE="${LUA_REQUIRED_USE}
-	jit? ( lua_single_target_luajit )
 	test? ( lua_single_target_luajit )"
 
 RDEPEND="${LUA_DEPS}