gentoo resync : 22.10.2018

3 files changed, 28 insertions, 18 deletions

diff --git a/net-analyzer/bro/Manifest b/net-analyzer/bro/Manifest
index 509df47459bf..cfbbf57168ef 100644
--- a/net-analyzer/bro/Manifest
+++ b/net-analyzer/bro/Manifest
@@ -1,5 +1,5 @@
 AUX bro-2.4.1-fix-python-install-dir.patch 1748 BLAKE2B 5e1f5695a5d5c21f2e3aa506a351f7c3a8ddfe14e80071fc197fe9dbe1a75fc76973461c0aa113318a2dc33e1d84875c66e3596a75ea07b295b0b59719c62fa9 SHA512 0957f05ef4e4efff90f23a6ac885277f4d57df8ade4cf2f9a22b6935fc46679369857ad181f7bb4f071cb4c373d6b4bc8c49c8e8f9bea9325d85a7b2d2e6b62e
 AUX bro-2.4.1-remove-unnecessary-remove.patch 878 BLAKE2B 00ace3b27a7a71e2ab7b6e0b3abe856864190b53b0c7fd693236504700c8c92cc36c80177cb9075f1d27b4320885569e182e58231b56d78bc6b1710a1442f7c9 SHA512 e996a7571c3f9b85f1eb40206c07825f0cfdf7f9fc4a930d8dbb216e8e4636461f0a6be01fc341e6b4d5396d7637d76e39911c3d65e2d645da959d3aad17252d
 DIST bro-2.4.1.tar.gz 15010455 BLAKE2B 34e087253a62ad3d6948e1175fa05c34ceac7298103aef40a0ce791e1e83c8495d6f65c9489d0e7214ff1b743db766dfbf7b44544f7796b7b1f70ee7a1bedc67 SHA512 4f7bf6c037fe7b16214830d2dba9f7abffd853f66030aa710fb9f174a475f8cd27d8de6bacf965f142f942a42093ceb78dcd8cbcedac6fbcfdd65ac07b3dd410
-EBUILD bro-2.4.1-r2.ebuild 2454 BLAKE2B 8729ac158182dae9b0ab2bb923ccf9496045781775f26fe6987490cc89ba01143ca4d77488fa4b65cc6cc045c6a27a7a3679e6efd0f7887a911dde4fb7e5a77e SHA512 b947b5b90dd38d95257ce93e2f7278bf2a1e80f50db9a5513da46758385c41ecb9bdc9f3f04d39afea6ff46113d475bc796dfc91d054baff0ff57fe7cd635b27
-MISC metadata.xml 1065 BLAKE2B f8d529f18a04bf8c5b5f5920dfe343e9fad6e8675a38cf889b729d4764735902958ede3734b09bd4d471b526762af60b44835006cf35c0b833972a6dfe50738b SHA512 db905212d8b96c0f9dc303f2c879c3644ce3e86ab8dd1601c2b1dc37317f3975e4216f398709ea21a6bdc845c7231f7a663bf052daac8fc1e41b20e6fec7606d
+EBUILD bro-2.4.1-r2.ebuild 2473 BLAKE2B 2671634c9b7a0ad22ac0eae5fd53f274bd71e6ed7fa07fb485034725f36698a0a2287140f1b968d051d2a85a204b5dfcde6b5a25657b6644698ed969082b9019 SHA512 9c9a29c1806453ba231ca243cd1368b27dff78efb65c497d31f45a19f99f1ff49b62cca710bbcf9e6c599c9bc1614226de382fbaf0d6a467960c3df542e76c28
+MISC metadata.xml 1023 BLAKE2B 2b02ca31298c44c9932802e1701cd490d371a9078dcddcf407c10f16890ca36e57e81fb92f65876bb643a9c8f5683534c0c29d09c9f0c8924f5e9b51d9f3c963 SHA512 d95795994abf21198ba6a64de4eb4073ad83fb77f1ae4bf171ba29677e03a4abcf94d8b6163fe2a009dc64956b4cd8ce54287f6993c262b43a7b9e2b5ee3a28c
diff --git a/net-analyzer/bro/bro-2.4.1-r2.ebuild b/net-analyzer/bro/bro-2.4.1-r2.ebuild
index 5170d3b253a6..68ee260dc778 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 90d38c4236c6..61a2fa9e9057 100644
--- a/net-analyzer/bro/metadata.xml
+++ b/net-analyzer/bro/metadata.xml
@@ -8,11 +8,10 @@
         <flag name="broker">Bro's new Messaging Library (experimental)</flag>
         <flag name="geoip">Enable support for Maxmind's GeoIP library</flag>
         <flag name="ipv6">Support for mobile IPv6</flag>
-        <flag name="jemalloc">Support for the Jemalloc allocator</flag>
         <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>