[gentoo-commits] repo/gentoo:master commit in: net-analyzer/suricata/, net-analyzer/ntopng/

[Slawek Lis]

commit:     909c0f0babd784307cae0c3d88c0e9e1d16f63b7
Author:     Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 20:25:35 2016 +0000
Commit:     Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 06:12:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=909c0f0b

drop system-htp use flag (#575144)

Package-Manager: portage-2.2.27

 net-analyzer/ntopng/ntopng-2.0.ebuild        | 23 +++++++++++++++++++++--
 net-analyzer/suricata/metadata.xml           |  1 -
 net-analyzer/suricata/suricata-2.0.11.ebuild |  8 +++-----
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/ntopng/ntopng-2.0.ebuild b/net-analyzer/ntopng/ntopng-2.0.ebuild
index b8aa18d..1f16266 100644
--- a/net-analyzer/ntopng/ntopng-2.0.ebuild
+++ b/net-analyzer/ntopng/ntopng-2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-inherit autotools user
+inherit autotools eutils user
 
 DESCRIPTION="Network traffic analyzer with web interface"
 HOMEPAGE="http://www.ntop.org/"
@@ -27,7 +27,26 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
 	cat "${S}/configure.seed" | sed "s/@VERSION@/${PV}/g" | sed "s/@SHORT_VERSION@/${PV}/g" > "${S}/configure.ac"
+	epatch "${FILESDIR}/${P}-dont-build-ndpi.patch"
 	eautoreconf
+
+	cd "${S}/nDPI"
+	eautoreconf
+}
+
+src_configure() {
+	cd "${S}/nDPI"
+	econf
+	cd "${S}"
+	econf
+}
+
+src_compile() {
+	cd "${S}/nDPI"
+	emake
+
+	cd "${S}"
+	emake
 }
 
 src_install() {

diff --git a/net-analyzer/suricata/metadata.xml b/net-analyzer/suricata/metadata.xml
index 517666e..0f80bed 100644
--- a/net-analyzer/suricata/metadata.xml
+++ b/net-analyzer/suricata/metadata.xml
@@ -13,6 +13,5 @@
     <flag name="nflog">Enable libnetfilter_log support</flag>
     <flag name="nfqueue">Enable AF_PACKET support</flag>
     <flag name="rules">Enable AF_PACKET support</flag>
-    <flag name="system-htp">Use net-libs/libhtp instead of bundled one</flag>
   </use>
 </pkgmetadata>

diff --git a/net-analyzer/suricata/suricata-2.0.11.ebuild b/net-analyzer/suricata/suricata-2.0.11.ebuild
index 0323836..a1a7eb3 100644
--- a/net-analyzer/suricata/suricata-2.0.11.ebuild
+++ b/net-analyzer/suricata/suricata-2.0.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet control-socket cuda debug +detection geoip hardened lua luajit nflog +nfqueue +rules system-htp test"
+IUSE="+af-packet control-socket cuda debug +detection geoip hardened lua luajit nflog +nfqueue +rules test"
 
 DEPEND="
 	>=dev-libs/jansson-2.2
@@ -23,6 +23,7 @@ DEPEND="
 	net-libs/libnfnetlink
 	dev-libs/nspr
 	dev-libs/nss
+	>=net-libs/libhtp-0.5.18
 	net-libs/libpcap
 	sys-apps/file
 	cuda?       ( dev-util/nvidia-cuda-toolkit )
@@ -31,7 +32,6 @@ DEPEND="
 	luajit?     ( dev-lang/luajit:* )
 	nflog?      ( net-libs/libnetfilter_log )
 	nfqueue?    ( net-libs/libnetfilter_queue )
-	system-htp? ( >=net-libs/libhtp-0.5.18 )
 "
 # #446814
 #	prelude?    ( dev-libs/libprelude )
@@ -54,6 +54,7 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		"--localstatedir=/var/" \
+		"--enable-non-bundled-htp" \
 		$(use_enable af-packet) \
 		$(use_enable detection) \
 		$(use_enable nfqueue) \
@@ -85,9 +86,6 @@ src_configure() {
 # 	if use prelude ; then
 # 		myeconfargs+=( $(use_enable prelude) )
 # 	fi
-	if use system-htp ; then
-		myeconfargs+=( $(use_enable system-htp non-bundled-htp) )
-	fi
 	if use lua ; then
 		myeconfargs+=( $(use_enable lua) )
 	fi