From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-963283-garchives=archives.gentoo.org@lists.gentoo.org>
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 50A9D139694
	for <garchives@archives.gentoo.org>; Mon, 24 Jul 2017 08:30:17 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 9102C1FC00A;
	Mon, 24 Jul 2017 08:30:16 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(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 6D43B1FC00A
	for <gentoo-commits@lists.gentoo.org>; Mon, 24 Jul 2017 08:30:16 +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 322C0341739
	for <gentoo-commits@lists.gentoo.org>; Mon, 24 Jul 2017 08:30:15 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 3188474B4
	for <gentoo-commits@lists.gentoo.org>; Mon, 24 Jul 2017 08:30:12 +0000 (UTC)
From: "Slawek Lis" <slis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Slawek Lis" <slis@gentoo.org>
Message-ID: <1500885003.8610c416bfc5e5fb30a1925c6d5dbbce5537baab.slis@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/suricata/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-analyzer/suricata/suricata-3.2-r1.ebuild
X-VCS-Directories: net-analyzer/suricata/
X-VCS-Committer: slis
X-VCS-Committer-Name: Slawek Lis
X-VCS-Revision: 8610c416bfc5e5fb30a1925c6d5dbbce5537baab
X-VCS-Branch: master
Date: Mon, 24 Jul 2017 08:30:12 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: c82d69ce-c66a-46ce-9343-a8fb9c8276b9
X-Archives-Hash: 7caedd125f548482b92f08a142f58d85

commit:     8610c416bfc5e5fb30a1925c6d5dbbce5537baab
Author:     Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 08:29:45 2017 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 08:30:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8610c416

net-analyzer/suricata: Solved conflicting use flags

Use flags LUA and LUAJIT cannot be set at the same time.
Reported in bug 625814

Reported-By: deference <AT> null.net
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 net-analyzer/suricata/suricata-3.2-r1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-analyzer/suricata/suricata-3.2-r1.ebuild b/net-analyzer/suricata/suricata-3.2-r1.ebuild
index 419c56ac26d..f6aa21dbcc4 100644
--- a/net-analyzer/suricata/suricata-3.2-r1.ebuild
+++ b/net-analyzer/suricata/suricata-3.2-r1.ebuild
@@ -14,6 +14,8 @@ 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