gentoo resync : 20.11.2017

6 files changed, 65 insertions, 5 deletions

diff --git a/net-analyzer/nodebrain/Manifest b/net-analyzer/nodebrain/Manifest
index 1c70bc483a2a..e7b89959a917 100644
--- a/net-analyzer/nodebrain/Manifest
+++ b/net-analyzer/nodebrain/Manifest
@@ -1,6 +1,8 @@
 AUX nodebrain-0.8.14-include.patch 691 SHA256 8fced6a07f0cdba5cf23da24e84f89d4d40741e7be26fed36efd46cbe16ec043 SHA512 406b57b9d9dd8b203c9b4b1303732c31fbd960624dd6f11a858e805ff0e1c48a251ba6f69dedf521a0ebf7bbd4ea3bba35f457b4d066aebe91942309852b2b4b WHIRLPOOL 80d91e9309bfe487137411bbfe8c078fcecbb691396cf8c9eccdb076d5013ed29dfe7a0feecd46639e2db70b625bfdc3b6e11d0e14e6ecf28e2fe66ae8984449
+AUX nodebrain-0.9.04-include.patch 151 SHA256 0b519197305e778c0f1fa83d6efc935a4a090f6ecbd20d51ef96b100a0365285 SHA512 88f4184757c63d5cf239c1322df216427ef006ae0ab5b899ab254e4196e76c6ad6cdbe0f5be368fa188bf0a22d1f7295b2186c33608f328e6147f69b06b102a6 WHIRLPOOL 8ae7aa8ea17e0ffb5b11f6a1889ee9bedc70f1ce7022a8fcb073c23e8af1ad05fe810bcc2262f01538d970402163b621ea4d5037305265cce5cfd626e7251a6d
 DIST nodebrain-0.9.04.tar.gz 2475665 SHA256 4fd936050fa08d5639312fca32528034b82e2c4caf10c23126db6bb8d0eb0175 SHA512 a6cbebef09569d2d086954fc06b7a0bbc2828a5041289fdb7b537bd75b354610f3cf28baded5fce9679d89ffea3e245ab59323a00d060e98819d367775fd5226 WHIRLPOOL b7bc9f4417ac14574c7a3db8be46a695cbbac66cc9bdc7ceff7346002e7849a919750089e16fc618ad9bde996b69b832ffe48c903b4b41b5ad52948bf3cc09ee
+EBUILD nodebrain-0.9.04-r1.ebuild 830 SHA256 442c8b0c411ae18ad22611fe66a901a8f325070c0b7ac43f3373d90f95b35816 SHA512 6656f049ffb75b5a2f997d3b0caae24b182af8563293a3aa28cf6dc8fd49dd727d535bd65ea88ef591a65b7f09869a2badeea266878353497cb86c78cf4a94be WHIRLPOOL abad6af6f0809fdd58c3b07fc9bbd342374cf5271f5d25127f580b64141c7190d391c497a0ed49eebec67150b9e3b91feba1d61f34105c5ea6ac4fe7a65f49f1
 EBUILD nodebrain-0.9.04.ebuild 814 SHA256 c8b6be2546c738f9682eed0e2858c5f07ec0dd33be15daba248141b8e6c6d2a3 SHA512 11fd2cfec1db526674828c0970cbb0fabf9cbdfbc0b37a03af3d698c6d790512b3af6d28bfd2bb295f866c5b924ff450a3ad5936fc09ae730fdb7aae4e02472e WHIRLPOOL 6bb1fa8570b4f16e21ab1ddf52f1a0ea2548dc6b7c07dfc59ebbda831ad263cd1b57d5462217d74e435cd1520c24d06b32a13c3a0542aaa121232d5ef5272f66
-EBUILD nodebrain-9999.ebuild 825 SHA256 73fc694d88d3367b3437558e69dd053969ea3586a3e4cf209c056cc171fa11d6 SHA512 33452bd32b9919d88bb00d4f6fbccf3fbd9c6af37e2bf801c22f5b4debe05280f2c736a8106b177f637f180560e593ab91667fd2922dc542e38d89719eec2768 WHIRLPOOL 4c495a32163334e4d5d6939456403bf3efc7003f486a05bae2260e847a2f8245f05a28f977f5146e4eb987a60d1a1f458147ccc7410c3e1806bacdf3b16d2da5
+EBUILD nodebrain-9999.ebuild 867 SHA256 d53f4beaadd6f7b49d658323e017f9b0704ae1c9bfb99dc9430fd0715fedc1d8 SHA512 a82f7afad23877151f58d868b593ddb666f9c1ffc20603d595ee3e5f750718fe1152d26bd428023684c0515eff08ca31c1b254352cf30a732441b44358b569a4 WHIRLPOOL 96e7f599fb8f7829d39cf6f7d575c012ab096ae9ffde9f48a49c64945ea9f04c9bd0f5785f75f54b23382ae7c1dc6626969969b24ad9acc028098470c6c1a077
 MISC ChangeLog 995 SHA256 0827a4b682043cd6e8a0e0510d3823e66a982e3449a53a29956b74bdc124f9f6 SHA512 847b2d30443955594c1aa4bc31198ee62a72211343bb0a157ebfee2ce1e28e51f8801397778100390e4a4ce973252c25e3ab5bf1fed17876995a4e57b4ba24d5 WHIRLPOOL 3e69cfb645ac60ed3aa002f5b467b8650464a0c0485c1b269139f442d8f677c932fc742bec521c3c39e6d08b28ccc888a1a98dd926c58a1b625a227946974506
 MISC metadata.xml 359 SHA256 cecdc4c0b71bc402156d5b5a1ad181e7f57ee850ccd74b84dd438e36a36c1ff2 SHA512 5b6e59de14c1e181ba2306ace2fa3241758b2205b1cba18611a12bb89fcdb2cdfe31313c8de17ed9e09dee6f91c5aca47fe50da5b53d2bde188197c4f3cbf1ed WHIRLPOOL f50c9044597948465795db331724041b11f3172baa6243c174b4d16d34cdeed97b102a4dae38bbad16081fa7108ad73fdb86fa3842ed07a19bd38a4f49db6a02
diff --git a/net-analyzer/nodebrain/files/nodebrain-0.9.04-include.patch b/net-analyzer/nodebrain/files/nodebrain-0.9.04-include.patch
new file mode 100644
index 000000000000..61d98a673375
--- /dev/null
+++ b/net-analyzer/nodebrain/files/nodebrain-0.9.04-include.patch
@@ -0,0 +1,10 @@
+--- a/lib/nbhash.c
++++ b/lib/nbhash.c
+@@ -81,6 +81,7 @@
+ */
+ #include <nb/nbi.h>
+ #include <stddef.h>
++#include <stdint.h>
+ 
+ struct TYPE *typeHash;
+ 
diff --git a/net-analyzer/nodebrain/nodebrain-0.9.04-r1.ebuild b/net-analyzer/nodebrain/nodebrain-0.9.04-r1.ebuild
new file mode 100644
index 000000000000..8c76a34f5374
--- /dev/null
+++ b/net-analyzer/nodebrain/nodebrain-0.9.04-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Monitor and do event correlation"
+HOMEPAGE="http://nodebrain.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nodebrain/nodebrain-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static-libs"
+
+CDEPEND="
+	dev-libs/libedit
+"
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+	sys-apps/texinfo
+"
+RDEPEND="
+	${CDEPEND}
+	!sys-boot/netboot
+	!www-apps/nanoblogger
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.14-include.patch
+	"${FILESDIR}"/${PN}-0.9.04-include.patch
+)
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--include=/usr/include
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+
+	dodoc -r AUTHORS ChangeLog NEWS README THANKS sample/ html/
+}
diff --git a/net-analyzer/nodebrain/nodebrain-9999.ebuild b/net-analyzer/nodebrain/nodebrain-9999.ebuild
index c27ee0d59ed0..36adf58b091f 100644
--- a/net-analyzer/nodebrain/nodebrain-9999.ebuild
+++ b/net-analyzer/nodebrain/nodebrain-9999.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.8.14-include.patch
+	"${FILESDIR}"/${PN}-0.9.04-include.patch
 )
 
 src_prepare() {
@@ -46,7 +47,7 @@ src_configure() {
 src_install() {
 	default
 
-	dodoc -r AUTHORS ChangeLog NEWS README THANKS sample/ html/
-
 	prune_libtool_files
+
+	dodoc -r AUTHORS ChangeLog NEWS README THANKS sample/ html/
 }
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f0abe77b8e41..b7ebb6a59513 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,7 +5,7 @@ AUX wireshark-99999999-androiddump.patch 198 SHA256 7607082abf45448fd4def4693522
 DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44
 DIST wireshark-2.4.2.tar.xz 28791712 SHA256 d1acb24735fd35e18e9b7a0555ec58277c2b87da45a19ebeb8087c3dda55f47d SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417 WHIRLPOOL 245454643e138c61ccb380ae236482fea702cf4c0507de1c1d3d6dc9f7312809533db7b0fba585f95b8caf5b76affa4da23ad263b8f95174dfbb9c2ee3300177
 EBUILD wireshark-2.2.7.ebuild 6489 SHA256 0978c03c370a2d1b8e2e910bd1c3a57f8cd6984fa2e25b15e152b3fbbd4b95b9 SHA512 3aad3004619a02cd4a2bb8a9d4f87e0a669e2ea23a0e83377056477af4a2b5a6f7ed95d9c7fe1373e847fb186c014c87f5cb96f5f32d4bff7bfc2700710301f9 WHIRLPOOL a3715bb7c19f1007dac053ec1aaf1e49232b31605ec55761884bb6556e19fb1f0b53440657bf0f49330630d5beef435881f157cb6af3be02cc5cfd90134c156f
-EBUILD wireshark-2.4.2.ebuild 7339 SHA256 45da1163e308e972b3167c556c95106d49b6cde0120905f1e832d51782f08e64 SHA512 5445fceb73f46d3ac2a8629f6b0ed525080c3d65864d2d600da33cdbda4ba0599e84da924484a15c482e73389bd9429c63b3eb0c430458a8fda784ed5249f072 WHIRLPOOL fb55ea750850ff2a665dcda2967da70685308796f8f5c1d5a0599c1e8d38fb09dc9cb3b1479634f3b67cf4beacc421c51024417c888824b329a6e497974dfb5a
+EBUILD wireshark-2.4.2.ebuild 7337 SHA256 929d273ae937130a9c72059359f9331e221bfc0de68f0632710f130fbc75e641 SHA512 8e77633581947acc961ff073d9f117326497ff6cab113a26fccd3d8931b231ddcd62b6b8a704e175d2546b6af15d0fa831407c99fdf17d96de24afc470c35439 WHIRLPOOL f05158af0e5a968a5e4f7365dcac346ea864c58ce320693f8ee544cfbca4189b5692740cfff3ba294ee23d7930245157bd6b85adcff2e42592d629b1cd063c31
 EBUILD wireshark-99999999.ebuild 7244 SHA256 72ba7b56f2f65ede095d2694d246225ce9162512166962bcede6fe89d842cc52 SHA512 84107c356b10259f6b230931ff136c3dcd364e7aa928cc29609d253ec36e11193e7f723548965c9f085c49040a9ddcf9bfcfd476242178b25ae8213eb0617742 WHIRLPOOL e985f39f06d5dbda4a4a71290b8f024ef483c65ac3c5cf2fe9aac02c79f7ef685eeefeb5a0a5a75c75765342116d554983620aec0f24b893c86db9cdc19c9e61
 MISC ChangeLog 28152 SHA256 4d533b118cf6326befb9d60fef7212306a14528010f3c1864ea6657e20b00605 SHA512 1dbf03f303e0e05eb243d70595fd88e7ea4d14e397a3d717fe2ac9ba05e2407e1928f2cd78b7bc6fe205ce8d660e75b6f11608546b32a70ffc1ec24629567fd5 WHIRLPOOL fbb5a086aa52c90e28c392813dd7b8ade906f4376ec596741e2396b9160e2e64a45148a793b45530ae3ab6dd744dccf6c30261cdf354ada3a50c11a545afd811
 MISC ChangeLog-2015 107469 SHA256 077b97e93bc0bcebd520af0c72ec9df8da0af9b004423b34190b15c201341b2b SHA512 ce81239e7a9731845ee59ef8206094263b501ab74130cf2a34f8e052e6bf431f019c116c732e2b290c1c61e65ab548e1e10009d1d269cc83fed7f295aee555bc WHIRLPOOL 936c3ea54e274000a61a4114c7d69415f7289183b7c7f75b72925fa9ca0f0f6d42a4ef367d625d4e5892587eee680bbf63eb2945fbc4a98e68b04907ed3fdbc5
diff --git a/net-analyzer/wireshark/wireshark-2.4.2.ebuild b/net-analyzer/wireshark/wireshark-2.4.2.ebuild
index eedb72485f7e..77aa34a9b99e 100644
--- a/net-analyzer/wireshark/wireshark-2.4.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
 	+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua