diff options
author | Michał Górny <mgorny@gentoo.org> | 2018-02-26 23:17:25 +0100 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2018-03-26 21:33:10 +0200 |
commit | d4e40e0eb9740bbeec133addc8ccfff64cde699b (patch) | |
tree | 3dc9fbc84566cf8397f141f8c6bb3643319ba282 | |
parent | */*: Remove redundant local descriptions for USE=luajit (diff) | |
download | gentoo-d4e40e0eb9740bbeec133addc8ccfff64cde699b.tar.gz gentoo-d4e40e0eb9740bbeec133addc8ccfff64cde699b.tar.bz2 gentoo-d4e40e0eb9740bbeec133addc8ccfff64cde699b.zip |
net-analyzer/suricata: [QA] Use standard meaning of USE=luajit
Fix the package to use standard meaning for USE=luajit instead of making
it exclusive with USE=lua.
-rw-r--r-- | net-analyzer/suricata/metadata.xml | 1 | ||||
-rw-r--r-- | net-analyzer/suricata/suricata-4.0.3.ebuild | 21 |
2 files changed, 13 insertions, 9 deletions
diff --git a/net-analyzer/suricata/metadata.xml b/net-analyzer/suricata/metadata.xml index 58878c64f05c..0afee5625d1a 100644 --- a/net-analyzer/suricata/metadata.xml +++ b/net-analyzer/suricata/metadata.xml @@ -9,7 +9,6 @@ <flag name="control-socket">Enable unix socket</flag> <flag name="cuda">Enable NVIDIA Cuda computations support</flag> <flag name="detection">Enable detection modules</flag> - <flag name="luajit">Enable Luajit support</flag> <flag name="nflog">Enable libnetfilter_log support</flag> <flag name="nfqueue">Enable NFQUEUE support for inline IDP</flag> <flag name="redis">Enable Redis support</flag> diff --git a/net-analyzer/suricata/suricata-4.0.3.ebuild b/net-analyzer/suricata/suricata-4.0.3.ebuild index 604eae665be7..e501c9c775b2 100644 --- a/net-analyzer/suricata/suricata-4.0.3.ebuild +++ b/net-analyzer/suricata/suricata-4.0.3.ebuild @@ -14,8 +14,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+af-packet control-socket cuda debug +detection geoip hardened logrotate lua luajit nflog +nfqueue redis +rules test" -REQUIRED_USE="lua? ( !luajit )" - DEPEND=" >=dev-libs/jansson-2.2 dev-libs/libpcre @@ -29,8 +27,10 @@ DEPEND=" sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) - lua? ( dev-lang/lua:* ) - luajit? ( dev-lang/luajit:* ) + lua? ( + !luajit? ( dev-lang/lua:* ) + luajit? ( dev-lang/luajit:* ) + ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) @@ -87,10 +87,15 @@ src_configure() { # myeconfargs+=( $(use_enable prelude) ) # fi if use lua ; then - myeconfargs+=( $(use_enable lua) ) - fi - if use luajit ; then - myeconfargs+=( $(use_enable luajit) ) + myeconfargs+=( + $(use_enable !luajit lua) + $(use_enable luajit) + ) + else + myeconfargs+=( + --disable-lua + --disable-luajit + ) fi # this should be used when pf_ring use flag support will be added |