| 1 |
commit: d4e40e0eb9740bbeec133addc8ccfff64cde699b |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 26 22:17:25 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 26 19:33:10 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4e40e0e |
| 7 |
|
| 8 |
net-analyzer/suricata: [QA] Use standard meaning of USE=luajit |
| 9 |
|
| 10 |
Fix the package to use standard meaning for USE=luajit instead of making |
| 11 |
it exclusive with USE=lua. |
| 12 |
|
| 13 |
net-analyzer/suricata/metadata.xml | 1 - |
| 14 |
net-analyzer/suricata/suricata-4.0.3.ebuild | 21 +++++++++++++-------- |
| 15 |
2 files changed, 13 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-analyzer/suricata/metadata.xml b/net-analyzer/suricata/metadata.xml |
| 18 |
index 58878c64f05..0afee5625d1 100644 |
| 19 |
--- a/net-analyzer/suricata/metadata.xml |
| 20 |
+++ b/net-analyzer/suricata/metadata.xml |
| 21 |
@@ -9,7 +9,6 @@ |
| 22 |
<flag name="control-socket">Enable unix socket</flag> |
| 23 |
<flag name="cuda">Enable NVIDIA Cuda computations support</flag> |
| 24 |
<flag name="detection">Enable detection modules</flag> |
| 25 |
- <flag name="luajit">Enable Luajit support</flag> |
| 26 |
<flag name="nflog">Enable libnetfilter_log support</flag> |
| 27 |
<flag name="nfqueue">Enable NFQUEUE support for inline IDP</flag> |
| 28 |
<flag name="redis">Enable Redis support</flag> |
| 29 |
|
| 30 |
diff --git a/net-analyzer/suricata/suricata-4.0.3.ebuild b/net-analyzer/suricata/suricata-4.0.3.ebuild |
| 31 |
index 604eae665be..e501c9c775b 100644 |
| 32 |
--- a/net-analyzer/suricata/suricata-4.0.3.ebuild |
| 33 |
+++ b/net-analyzer/suricata/suricata-4.0.3.ebuild |
| 34 |
@@ -14,8 +14,6 @@ SLOT="0" |
| 35 |
KEYWORDS="~amd64 ~x86" |
| 36 |
IUSE="+af-packet control-socket cuda debug +detection geoip hardened logrotate lua luajit nflog +nfqueue redis +rules test" |
| 37 |
|
| 38 |
-REQUIRED_USE="lua? ( !luajit )" |
| 39 |
- |
| 40 |
DEPEND=" |
| 41 |
>=dev-libs/jansson-2.2 |
| 42 |
dev-libs/libpcre |
| 43 |
@@ -29,8 +27,10 @@ DEPEND=" |
| 44 |
sys-apps/file |
| 45 |
cuda? ( dev-util/nvidia-cuda-toolkit ) |
| 46 |
geoip? ( dev-libs/geoip ) |
| 47 |
- lua? ( dev-lang/lua:* ) |
| 48 |
- luajit? ( dev-lang/luajit:* ) |
| 49 |
+ lua? ( |
| 50 |
+ !luajit? ( dev-lang/lua:* ) |
| 51 |
+ luajit? ( dev-lang/luajit:* ) |
| 52 |
+ ) |
| 53 |
nflog? ( net-libs/libnetfilter_log ) |
| 54 |
nfqueue? ( net-libs/libnetfilter_queue ) |
| 55 |
redis? ( dev-libs/hiredis ) |
| 56 |
@@ -87,10 +87,15 @@ src_configure() { |
| 57 |
# myeconfargs+=( $(use_enable prelude) ) |
| 58 |
# fi |
| 59 |
if use lua ; then |
| 60 |
- myeconfargs+=( $(use_enable lua) ) |
| 61 |
- fi |
| 62 |
- if use luajit ; then |
| 63 |
- myeconfargs+=( $(use_enable luajit) ) |
| 64 |
+ myeconfargs+=( |
| 65 |
+ $(use_enable !luajit lua) |
| 66 |
+ $(use_enable luajit) |
| 67 |
+ ) |
| 68 |
+ else |
| 69 |
+ myeconfargs+=( |
| 70 |
+ --disable-lua |
| 71 |
+ --disable-luajit |
| 72 |
+ ) |
| 73 |
fi |
| 74 |
|
| 75 |
# this should be used when pf_ring use flag support will be added |
Archives