[gentoo-commits] repo/gentoo:master commit in: net-analyzer/bro/

[Pacho Ramos]

commit:     82390375869f024db57e35c815acb3379ca71709
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 20 15:51:42 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Oct 20 16:35:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82390375

net-analyzer/bro: Fix multiple QA issues

Closes: https://bugs.gentoo.org/600740
Closes: https://bugs.gentoo.org/654504
Closes: https://bugs.gentoo.org/654506
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-analyzer/bro/bro-2.4.1-r2.ebuild | 39 +++++++++++++++++++++++-------------
 net-analyzer/bro/metadata.xml        |  2 +-
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/net-analyzer/bro/bro-2.4.1-r2.ebuild b/net-analyzer/bro/bro-2.4.1-r2.ebuild
index 5170d3b253a..68ee260dc77 100644
--- a/net-analyzer/bro/bro-2.4.1-r2.ebuild
+++ b/net-analyzer/bro/bro-2.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,13 +15,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+broccoli +broctl -broker curl debug geoip ipv6 jemalloc +python -ruby tcmalloc static-libs +tools"
 
-RDEPEND="app-shells/bash:0
-	dev-libs/openssl:0
+RDEPEND="
+	app-shells/bash:0
+	dev-libs/openssl:0=
 	net-analyzer/ipsumdump
 	net-dns/bind-tools
 	net-libs/libpcap
 	sys-libs/zlib
-	broker? ( =dev-libs/actor-framework-0.13.2* )
+	broker? ( dev-libs/actor-framework:0/13.2 )
 	broctl? ( virtual/mta )
 	curl? ( net-misc/curl )
 	geoip? ( dev-libs/geoip )
@@ -29,16 +30,23 @@ RDEPEND="app-shells/bash:0
 	jemalloc? ( dev-libs/jemalloc )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( >=dev-lang/ruby-1.8:= )
-	tcmalloc? ( dev-util/google-perftools )"
+	tcmalloc? ( dev-util/google-perftools )
+"
 DEPEND="${RDEPEND}
 	>=dev-lang/swig-3.0.3
-	dev-lang/perl"
+	dev-lang/perl
+"
 
-REQUIRED_USE="broker? ( python )
+REQUIRED_USE="
+	broker? ( python )
 	broctl? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-PATCHES=( "${FILESDIR}/bro-2.4.1-remove-unnecessary-remove.patch"
-	"${FILESDIR}/bro-2.4.1-fix-python-install-dir.patch" )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	"${FILESDIR}/bro-2.4.1-remove-unnecessary-remove.patch"
+	"${FILESDIR}/bro-2.4.1-fix-python-install-dir.patch"
+)
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -57,10 +65,6 @@ src_configure() {
 		-DDISABLE_PERFTOOLS=$(usex tcmalloc false true)
 		-DENABLE_BROKER=$(usex broker true false)
 		-DENABLE_CXX11=$(usex broker true false)
-		-DBROKER_PYTHON_PREFIX="/usr"
-		-DLIBCAF_INCLUDE_DIR_CORE="/usr/include/"
-		-DLIBCAF_INCLUDE_DIR_IO="/usr/include/"
-		-DLIBCAF_ROOT_DIR="/usr"
 		-DENABLE_STATIC=$(usex static-libs true false)
 		-DINSTALL_BROCCOLI=$(usex broccoli true false)
 		-DINSTALL_BROCTL=$(usex broctl true false)
@@ -77,3 +81,10 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
+
+src_install() {
+	cmake-utils_src_install
+	keepdir /var/log/bro /var/spool/bro/tmp
+	# Doesn't exist
+	rm -f "${ED}"/usr/share/broctl/scripts/broctl-config.sh
+}

diff --git a/net-analyzer/bro/metadata.xml b/net-analyzer/bro/metadata.xml
index 4928e7d79a7..61a2fa9e905 100644
--- a/net-analyzer/bro/metadata.xml
+++ b/net-analyzer/bro/metadata.xml
@@ -11,7 +11,7 @@
         <flag name="python">Enable Python bindings</flag>
         <flag name="ruby">Enable Ruby bindings (deprecated)</flag>
         <flag name="tcmalloc">Enable Google's Performance Analysis Tools</flag>
-        <flag name="tools">Small auxiliary tools for Bro</flag>
+        <flag name="tools">Auxiliary tools for Bro: adtrace, bro-cut, devel-tools, rst</flag>
     </use>
     <longdescription lang="en">Bro is a powerful network analysis framework that is much different from the typical IDS you may know.
     </longdescription>