gentoo resync : 16.06.2019

23 files changed, 341 insertions, 215 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 32f7cfc369f0..c7db7dfeece1 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index 9503f7b7f4b6..3700f7dcb624 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -1,7 +1,7 @@
-DIST bwping-1.12.tar.gz 103462 BLAKE2B 31d6efa200e06d9891fa98c5e0eadeb203cb6987c99b92810e941aee5c6d6efc78c000a893155ae948efe7076c68d98f026e86015cdc915fb4ab4cc8f3023096 SHA512 622bdb79deece746f7371347cd609222047ea79ee866d6a7faee518e0f8119d0547714b32e40abd632b2f72334b64a825a0cf53a3179f2da25f0b06a35d4e47e
 DIST bwping-1.14.tar.gz 104555 BLAKE2B ff201147748a9ea72970c88e6afcc25271d6854339396967ec799db872b198207db709eea70aab1681158eafa2f3de8c4f8ab8028108dc94d8fa7372d3fed2e0 SHA512 d71b5abfa328d76f1d3a0d87201f3291c3b91417890eeacc62cd4fcf714fd93e976373e137c0756456648e9010196680f873e9664da6ad6c3b6b5e611584311a
+DIST bwping-1.15.tar.gz 104234 BLAKE2B f0bc4b050760c775b5186667c2c15ce431832761d0bf00bf451d37514f93bafc1b6379ba96c30b1132f6dcb22fd4626304e4037c47794f9bf6fe28d10d5df6fb SHA512 76578571e3b3ca0f5ee61c28380d784fdcfbcee632e92b28a42c446ded9fb0fd0b682f360a51fca2df599353d5da9227762b186b5339ccfe7b9a7fa876399f8a
 DIST bwping-1.7.tar.gz 90441 BLAKE2B 2f8c4690388860470ac7f814ef29bc3de1738f0e46f53286000829a0483c8f000f2bd8d5f7d0fbf8ed9b8bdfb105576c7960a24da8f3f3fac36fd49d4b34370e SHA512 74b695a80c2fa54693af1afab78417dc6ca35130bbd9367950681ddbbebe36b38166068532e8296f336c5cad8230339b4fb4fb975f4b066cdacba8a99179cac7
-EBUILD bwping-1.12.ebuild 370 BLAKE2B 512320560c918a5ac38f39b0d97caf2d71c5d3045d8957de35b3c98a175b07f2d477ed435a70278ad7bd76db89d0f92ce1ab054c27fee9620e69724185dbe34c SHA512 86c51a741dab38b67a5d337bd96274ad8a6d8cb9ff70b5c890abf16dd8e8a1dee7c0023c6e81e2492a3130e24315bac45ccd2a0d55b590ef9196b803c98b44b6
 EBUILD bwping-1.14.ebuild 398 BLAKE2B 556526a0ab554aeb57647a6bf467553ed19cb84bd1cc681c4b062751b48ff84b5b5797c960f7c708b65854352c27c7a8ccbb6122524051d2c3a89579f6330468 SHA512 03df1be29bdba3be647cc670891ff9b22ce9db0cd0d6079244a1a5fa0f07be742e60801c3a1780e3d66f31dd5c0db9c66689a39806ecae648ae26e9bae15783d
+EBUILD bwping-1.15.ebuild 398 BLAKE2B 556526a0ab554aeb57647a6bf467553ed19cb84bd1cc681c4b062751b48ff84b5b5797c960f7c708b65854352c27c7a8ccbb6122524051d2c3a89579f6330468 SHA512 03df1be29bdba3be647cc670891ff9b22ce9db0cd0d6079244a1a5fa0f07be742e60801c3a1780e3d66f31dd5c0db9c66689a39806ecae648ae26e9bae15783d
 EBUILD bwping-1.7-r1.ebuild 413 BLAKE2B fe0207442e38ee224b650126ae837f67b7df4dd52e17603628c46967b7fe659c2d8c44a6d6d40297b0879a099a84652c935ea3b2dd3d75ddc47b0115bc62a03f SHA512 28af947741c68432f9e6a9312cb74cef83aaaccb3dcd00d808a9b76dee3665ebe0d04d7a2c12b2eed06e78cd13e58a73f98102999e87147dbdaa5d175488874f
 MISC metadata.xml 651 BLAKE2B 5879ca4d339fc3b541e1b7f68be857a9552c9a06efd8b1985470f5143f1e1e14edb0eccb4815b7498590718a02ddbb155a1e49556cdef76ebd9fae6dc6f306c8 SHA512 bef41fb4c3d894de7f2b39b16171fd22e6ce584d2dd2a65e2ce2c645ffc4ae1d1b38d7667765fa3e6fbfacb92cd3ef7006d141b14a5a476489ed235d2ca095e0
diff --git a/net-analyzer/bwping/bwping-1.12.ebuild b/net-analyzer/bwping/bwping-1.15.ebuild
index 7b17782193d6..27887df81901 100644
--- a/net-analyzer/bwping/bwping-1.12.ebuild
+++ b/net-analyzer/bwping/bwping-1.15.ebuild
@@ -4,10 +4,13 @@
 EAPI=7
 
 DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
-HOMEPAGE="https://bwping.sourceforge.net/"
+HOMEPAGE="https://bwping.sourceforge.io/"
 SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86 ~x86-fbsd"
-RESTRICT="test"
+
+src_test() {
+	[[ ${UID} = 0 ]] && default
+}
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 21b01d8a0042..c71c01656f1c 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,5 +1,5 @@
 DIST fail2ban-0.10.4.tar.gz 493104 BLAKE2B 3a58ab114cf25172c77b229ce53bf6dd009d4fb8c700142480ba0212072d8820126bfabf5dd417835bdac5f5b65d599c6dde859d8c57267e90cfb569dc4a2073 SHA512 ee53f2e8dc3cda4f588c60da5227d3d71550496ddfdf5bdbffced25bafd442b8e2352a9ad9f27bf76489903b5b779cdb9614963342de907c1036ae9268b8f35f
-EBUILD fail2ban-0.10.4-r2.ebuild 3325 BLAKE2B 0f26dcaa4ffa8a9df41466f5fd2408cc2e6d5a0ca77e2ff451a1160a566bbaea010007506f76872ddc8e7e3f37a1318b76070c2536536e24d1149093871d5582 SHA512 91cabbe9cb3e6e5304d73c71538918e93e03acc5cb7a1e0d66711c8fa71f4ff98856176c15d4826f0188d834c8860d5405c8904a79997888f20a4c78514572e2
-EBUILD fail2ban-0.10.4.ebuild 3281 BLAKE2B 4827058174106b89319a7b773dd2740ab1cba53229b5ecbcbac8f69bd70cf53523bb7ae98db16e4d0c97f98c44d620714faea969131683c1eab558837082fb97 SHA512 0739be84615cf4a1f2874b731557f8c5797be6161eb3d842534b07e4d6aced4cdcfcac3c1fc0bf9391ca515ff64e519d08261fcd1c8d49313ac9143ac6f0e38c
-EBUILD fail2ban-99999999.ebuild 3086 BLAKE2B b6954f87e8d6dd2a5c448d545c9a0f4a2741b942358bb28c32a38d133f65cad0a5f8c921860a2b62148dbaab686fdfa68c24e3e715c63e1d7c118d03e198ee83 SHA512 d27e4ad960bf87a1d5b66c19537c3ef9b80f766eabf3d2c0a5e4f839952633f32829855ac3d43e29370eca7f07d30ec16744d6ba6a51e64747b1357b539cf598
+EBUILD fail2ban-0.10.4-r2.ebuild 3326 BLAKE2B 8e1b3e1df71dc9179e10c0f6494be5a80e7545b5e504d909fcdb7d9ceb3fc6666712fec2c5a51d73c34d6663d0409f51a789086c0a8e93dd0993c495c3da1e1a SHA512 bc576caced2b5da19f5cf4af112881920f12593e19d0471770611d5603ef717b21a60b7cefcaf7dbca6dd6e91fe366c96877b80fa61415e9a65a145214d322ed
+EBUILD fail2ban-0.10.4.ebuild 3282 BLAKE2B ed096c484b45759d1b1f164b25651094b46b84aebe9027997d37d2bec4dd61f8abae5f2cf222eaea2930b3560e5de50ece3826e26c6e801af544fb630d05fa28 SHA512 a26c2cf6e1e83dc3c53e5d46d0d8ff739f6843ad0d019c41e524aca30d49cde29c6f59296f446e04fbf6cdbf0946f625897180644181839179c916a1d14df299
+EBUILD fail2ban-99999999.ebuild 3087 BLAKE2B 6e6ab336757845e7d7e4da03c705f9b6b6877b19f007d5aa6f4a3faac0b9d6b10cfb51101334bd376e51f8280797245757696c623a7463873cd90cf456fde79a SHA512 d2441165011a25ac3616b5cf7e10ef53cdea1993a020c4af6ec5466ec86d48bd4065d86d184a9d56d5eab7ac5b952e2db1df2aa6e170209cae09d7acff5a53e4
 MISC metadata.xml 372 BLAKE2B 7fca866187d9a128e6fb6787a4099d7a6442e0e51e558786773b91c3e2f06e67167d76f9bc96be0fe1baa1c44fc3f0e9e2105a327a10cb2720b3e3f9e4303a66 SHA512 4d5710e2fb4a7c353ca6bd3203bceef57d4d004367993dc1044800ee8713a3f4697fe8ba3472a73ecd015503656dfb7cd68d674c99188ce5702769cfeaf06b25
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
index c44c1d21b5a9..9f2e26d12f29 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd
 
 DESCRIPTION="scans log files and bans IPs that show malicious signs"
-HOMEPAGE="http://www.fail2ban.org/"
+HOMEPAGE="https://www.fail2ban.org/"
 SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
index 6f6e99cae9b7..3b63990008e6 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 eutils systemd vcs-snapshot
 
 DESCRIPTION="scans log files and bans IPs that show malicious signs"
-HOMEPAGE="http://www.fail2ban.org/"
+HOMEPAGE="https://www.fail2ban.org/"
 SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/fail2ban/fail2ban-99999999.ebuild b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
index a3968f20f629..d4e1f1886dc8 100644
--- a/net-analyzer/fail2ban/fail2ban-99999999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 git-r3 systemd
 
 DESCRIPTION="scans log files and bans IPs that show malicious signs"
-HOMEPAGE="http://www.fail2ban.org/"
+HOMEPAGE="https://www.fail2ban.org/"
 EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/gspoof/Manifest b/net-analyzer/gspoof/Manifest
index 071910ea45e4..a326d9ab5e8c 100644
--- a/net-analyzer/gspoof/Manifest
+++ b/net-analyzer/gspoof/Manifest
@@ -1,5 +1,7 @@
-AUX gspoof-3.2-icon.patch 2943 BLAKE2B 7f90de86ffdf7d767bd6a3e2a278fe122719905aa1a9f0573d268a434ca5ce60de1c287ee709e2dac4a3815eacb0d8ce96382c95c31e1cb9ef900088f9ccc752 SHA512 b3ad70e8a50d4a735a5c09c0b6ea749f7cd3029f77408cd4cfd0546111b95d6a1e9e93944ca3fa66ba1ce807b38548be2b894ac68f0fa7fca1af996054658c03
+AUX gspoof-3.2-icon.patch 2951 BLAKE2B 952de6a5c1345656da88f52efba8a18da2dc45b4b29f99816dff9c0a09aa003ab566f3ec831f39ead762c04a7b014dbdc1a4f73ee8f521502fffd6b8da195268 SHA512 ccfe1e2db4f08f0847316f6ac5b4cd884f450acaf609c479afe4ab9c1884126f54a8ef623779a16eed38676fde7f32aca9e58692e9ecff25656870589adfda15
+AUX gspoof-3.2-libdir.patch 668 BLAKE2B 1f31874c36368022b18814a6dcbc0c3b8696b9ba12f51c6f5e1bf201ae2e8eb42f21521e9fc9cc1e214d8ee480f198c84b393b483c66766ecffb9b6aee07022f SHA512 d4cd192132d1a7cb12676032cb1d787b44b1ec5c7fd8667c1f69455de3892011407b1663a15d47c7a8aba38b61fb76f6f141c1c01f24420c5dad2b39f347f641
 AUX gspoof-def-values.patch 903 BLAKE2B dff9e5e8bd60a51f2acddf4e553c326fd491aa40670954da6f84cbd4ad5a357327af8833f8eb2b5e0b67653761aeab55e37964bbc1c012b2eddfdf1c3157270a SHA512 92b4a1b682669acd13b4fbf77083b633b881f4933445910976492fd093e1c4db3ef0b9d45f487ef8c3df9f252ca239d5411026f527ed3e0ab2972bbfbeea8666
 DIST gspoof-3.2.tar.gz 69340 BLAKE2B c5769a242d6d388b7606594a01b6543822167505ea6210a05f6a514c47ea875efdea3e81b495b1a635fa15d9a065a35b631b20512b326304e366f692f8a73be5 SHA512 be90aeeb9ac93b5c4a190564ecfedd05ee077afed67696b773cb79949043975807dabed8f49597dcd3b08b9b0ee53c598caa9dced6f97bd9d6170f8e82b8f0f9
 EBUILD gspoof-3.2-r2.ebuild 781 BLAKE2B 6a6daee33cb1f1ce1fde54f17c25296b5649b6c5ca0dbeacd881b159495c3f75bbcc68b59f2473b69ad59328a1215555733eb0e5f35dbc6599559e659d828f2d SHA512 4ae31501fa1ade40bc50c2ff6e52ac15d6bc110eb5e81a312830541b4aa381bc6792bb3804ee292c671d0670475798b84b2aae71bf7810b756278e3c3abf7498
+EBUILD gspoof-3.2-r3.ebuild 774 BLAKE2B abb6523147ce136f1ac634991f6e1a04289a6724d77d9fb42de94f152337e699381d0077f0819aa5eb44cbf634d31ad781badd6d6659d410800ba9a80d312d82 SHA512 44c3edef6ab00bbe199ef94737e31f4a9a5efb75eb3e288b69600a780e424ba103feabce68f0fde6f889ab3e90457feaccf43ee297418578c47eeadf443a037f
 MISC metadata.xml 248 BLAKE2B 86f5c3602168393b46b79f56b1bbcba7d32ab183eb1a640932bb91b4876e49e1ee407a9a5807f8bb559b5df9ee3c2fdc9fe6f69ec8b1744b7fcf2746a59e96a5 SHA512 d037f260b0d638df2bf9356b7d50974b341eefecd9e45a07b392d7180233299584f4911df4fd427122afd7e49e5f32417e0f2a3a92996450233e58eb51c34026
diff --git a/net-analyzer/gspoof/files/gspoof-3.2-icon.patch b/net-analyzer/gspoof/files/gspoof-3.2-icon.patch
index df13a08677db..863049e0d2c7 100644
--- a/net-analyzer/gspoof/files/gspoof-3.2-icon.patch
+++ b/net-analyzer/gspoof/files/gspoof-3.2-icon.patch
@@ -1,7 +1,7 @@
 Fix icon path and name.
 
---- gtk.c
-+++ gtk.c
+--- a/gtk.c
++++ b/gtk.c
 @@ -24,9 +24,7 @@
     gtk_set_locale ();
     gtk_init (&_argc, &_argv);
@@ -13,8 +13,8 @@ Fix icon path and name.
  
     MainWin = create_MainWin();
  
---- interface.c
-+++ interface.c
+--- a/interface.c
++++ b/interface.c
 @@ -102,7 +102,7 @@
     gtk_widget_set_size_request (MainWin, 640, 480);
     gtk_window_set_title (GTK_WINDOW (MainWin), BANNER);
diff --git a/net-analyzer/gspoof/files/gspoof-3.2-libdir.patch b/net-analyzer/gspoof/files/gspoof-3.2-libdir.patch
new file mode 100644
index 000000000000..67674c2f5155
--- /dev/null
+++ b/net-analyzer/gspoof/files/gspoof-3.2-libdir.patch
@@ -0,0 +1,17 @@
+Don't assume that $(libdir) is lib. Rely on linker defaults instead.
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,13 +55,6 @@ AC_ARG_WITH([libnet-prefix],
+             [ LIBNET_PREFIX=$withval ],
+             [ LIBNET_PREFIX=/usr ])
+ 	    
+-AC_CHECK_FILE([$LIBNET_PREFIX/lib/libnet.a],
+-              [LDFLAGS="-L$LIBNET_PREFIX/lib"
+-	       CPPFLAGS="-I$LIBNET_PREFIX/include" ],
+-              AC_MSG_ERROR([
+-Libnet-1.1.1 Packet Shaping Library is required!
+-Verify to have installed it and pass --with-libnet-prefix to configure.
+-Or download it from http://www.packetfactory.net/libnet ])) 
+               
+ AC_CHECK_LIB(net, libnet_name2addr4,, 
+ AC_MSG_ERROR([
diff --git a/net-analyzer/gspoof/gspoof-3.2-r3.ebuild b/net-analyzer/gspoof/gspoof-3.2-r3.ebuild
new file mode 100644
index 000000000000..938a95c5179a
--- /dev/null
+++ b/net-analyzer/gspoof/gspoof-3.2-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils
+
+DESCRIPTION="A simple GTK/command line TCP/IP packet generator"
+HOMEPAGE="http://gspoof.sourceforge.net/"
+SRC_URI="http://gspoof.sourceforge.net/src/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+DEPEND="
+	x11-libs/gtk+:2
+	dev-libs/glib:2
+	net-libs/libnet:1.1
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-def-values.patch
+	"${FILESDIR}"/${P}-icon.patch
+	"${FILESDIR}"/${PN}-3.2-libdir.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin gspoof
+	newicon pixmap/icon.png ${PN}.png
+	dodoc README CHANGELOG TODO
+}
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index 08a5c9f12867..9255055edbbc 100644
--- a/net-analyzer/nessus-agent-bin/Manifest
+++ b/net-analyzer/nessus-agent-bin/Manifest
@@ -1,6 +1,8 @@
 AUX nessusagent.initd 563 BLAKE2B 63820368c95dc2358ff73843e239a084e21cea48bd4dfd170e486f0c702e7ec6be1581478f7c37dd12868dd3648dfd8f44b8ff47c85fdab0276a0c84b78eb7d1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718
 DIST NessusAgent-7.1.2-es7.x86_64.rpm 15663484 BLAKE2B 6b7290a39984acfc95ec0b75c8f9e6b04ecdfe630fe792f32ffb539676bad73a7db02789dcbfb6dae3d40c1e9eef1065282c20ca9a3c51b29fe0540f70cc82bc SHA512 64aff80fd5115b0f261e0156c83a67b47a7f68d7d1e8803be87a54cecaf6be1f03bf213ee68a0ffae9a2b2ad35ea7766445444ed132c077f46127cd5772f7a39
 DIST NessusAgent-7.3.2-es7.x86_64.rpm 15690964 BLAKE2B 8be82fc99abdf9ffa58af6e4ad0b19313406c0d5db4b7a231360f82414a0fef7c5b3237ac1653ee8fab222b0866fd0071729e0320e6a6a7da76171642a2be32f SHA512 5009d125d917e2aba25d1743f19954302d27e02860df89d7081715e28539e6e44dfee5d9a9ca471ba7c008c27a59843034daf46b13f2b08b02a1a823ff0a3fa8
+DIST NessusAgent-7.4.0-es7.x86_64.rpm 15719960 BLAKE2B 3ea992c54d7a5acf09bc0097b6780993daab68ef2ac4816b247dba8deb949f5fd3202f9244d8ca6d9b53414163deb942b4e2739e14b42396a9a64b2265dea18e SHA512 35d948807a5110a3b1e32abf8a427aebbf082555ffd7f11abff037909119eed8f866f09121d2523107a6b2c374a45f0ff42933b1148d7679436540956d227c4b
 EBUILD nessus-agent-bin-7.1.2.ebuild 1970 BLAKE2B e041a1556fb042ad02231c1fb5decc60bd0c31ab5a5193506cebca6b58d3424ec205c21045a672787312650ad74907d647cba6370a315b7b397314985c060c3e SHA512 86927ab4ae3d5cd12abbb5ba497bbc055c8365fd9025e2b1a3b98fd0f22331090bcabdbf91bb332a7360f098584d9f248a4d1321038c017e0147f3cd541c1327
 EBUILD nessus-agent-bin-7.3.2.ebuild 1970 BLAKE2B 278773d237abd92549945042f22e33de29803a1eb7f94678d85c8824fe4e93e932afa56bb250680a997706fe3be683f960656e48a8272e87ac9c8b628902b2ca SHA512 6b075584220409015a3e82cddc2f2b7d1b68aa1ec2093b6ddf350bb35461b4c29969fd02ee646b30bbf3c2cea5cbe6bd339b7b8f14bdb04122238d86da25c684
+EBUILD nessus-agent-bin-7.4.0.ebuild 1970 BLAKE2B 278773d237abd92549945042f22e33de29803a1eb7f94678d85c8824fe4e93e932afa56bb250680a997706fe3be683f960656e48a8272e87ac9c8b628902b2ca SHA512 6b075584220409015a3e82cddc2f2b7d1b68aa1ec2093b6ddf350bb35461b4c29969fd02ee646b30bbf3c2cea5cbe6bd339b7b8f14bdb04122238d86da25c684
 MISC metadata.xml 353 BLAKE2B e3ba298accb9a0618eb7340652a32cc166702f8873b49de734f6c117e2aeadbd9c31a76f231574ee04159454633191d4d3480925c05c993be174bf4efd3cc994 SHA512 81bc629de5c0367706b7b3259b3bb68edff6260dd47de345153af292a81fb6df23771b0f4974617f1fdef7b446dc17ab3c485d44d3dcb376e93c69173503a348
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.0.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.0.ebuild
new file mode 100644
index 000000000000..20d896ea6290
--- /dev/null
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm pax-utils systemd
+
+MY_P="NessusAgent-${PV}-es7"
+
+DESCRIPTION="A remote security scanner for Linux - agent component"
+HOMEPAGE="https://www.tenable.com/"
+SRC_URI="${MY_P}.x86_64.rpm"
+
+LICENSE="GPL-2 Nessus-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="mirror fetch strip"
+
+QA_PREBUILT="opt/nessus_agent/bin/nasl
+	opt/nessus_agent/bin/nessus-mkrand
+	opt/nessus_agent/lib/nessus/libjemalloc.so.${PV}
+	opt/nessus_agent/lib/nessus/libnessus-glibc-fix.so
+	opt/nessus_agent/lib/nessus/plugins/ovaldi64-rhel7.inc
+	opt/nessus_agent/sbin/nessus-check-signature
+	opt/nessus_agent/sbin/nessus-service
+	opt/nessus_agent/sbin/nessuscli
+	opt/nessus_agent/sbin/nessusd"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus-agents"
+	einfo "The archive should then be placed into your DISTDIR directory."
+}
+
+src_install() {
+	# Using doins -r would strip executable bits from all binaries
+	cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files"
+
+	pax-mark m "${D}"/opt/nessus_agent/sbin/nessusd
+
+	# Make sure these originally empty directories do not vanish,
+	# Nessus will not run properly without them
+	keepdir /opt/nessus_agent/com/nessus/CA
+	keepdir /opt/nessus_agent/etc/nessus
+	keepdir /opt/nessus_agent/var/nessus/logs
+	keepdir /opt/nessus_agent/var/nessus/tmp
+	keepdir /opt/nessus_agent/var/nessus/users
+
+	newinitd "${FILESDIR}"/nessusagent.initd nessusagent
+	systemd_dounit usr/lib/systemd/system/nessusagent.service
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "In order to link the agent to Tenable.io or an instance of Nessus Manager,"
+		elog "obtain an appropriate linking key and run"
+		elog ""
+		elog "  /opt/nessus_agent/sbin/nessuscli agent link --key=<key> --host=<host> --port=<port> [optional parameters]"
+		elog ""
+		elog "This can be done before the agent is started."
+	fi
+}
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index 11931cd12aad..2b1937d744cb 100644
--- a/net-analyzer/nessus-bin/Manifest
+++ b/net-analyzer/nessus-bin/Manifest
@@ -1,6 +1,8 @@
 AUX nessusd-initd 582 BLAKE2B 67c5e73262512c590b5b4fc0668297a504677aa3d771fdeee2809c921d988faef19cbf10a7fb26d52114e1a67d33ef197e32c561cd5b2003c8abbde2dfe5cb4f SHA512 f825fad89564303aeff423f3c32a1544ee4b063ef57702cd54220aebed8e01e7b178ff5bd10b48b654ebdee78657a9bc41caf779a23968d008916fd51e88b2f4
 DIST Nessus-6.10.5-es7.x86_64.rpm 41596796 BLAKE2B 2d9078eb3a53bc9fe63a649f6829ac757424bdecd007bdcaefcda661951a18918ce4f2823fe3ae88ded68453e82a06ccd2d225db26713c5b72bdd09f9e665b1d SHA512 a407aa010d3d59d5c4d717159851a6b81ef9e1f1b4327c8382abe1b866c4969cf6e32251077270eae719b66af9ce29641c40ca6093df30f88ce9be81ba168f75
 DIST Nessus-8.3.2-es7.x86_64.rpm 68708928 BLAKE2B 7a5bea2de3ca5ad9f18ffa61857e611e137c4f78decb7b4c855e6e55d01c11e2b5d26960070d2d06a383018692ff6b7844c7872903e505422f73b3d5001d95b9 SHA512 6e84a1f85ae98bd352d0ed77dfc3bbb7117e6cdf64b8fc0718f9f2200a95c53828e7e5ecce586d1b9abe55b3318c63ef03f28ada7365c7a9f0046e65fb59e615
+DIST Nessus-8.4.0-es7.x86_64.rpm 69321556 BLAKE2B 678a93b51a57688c45512e91f940fa372070484b67b5d716faada48b1d6a1d95126dc1a482c6e43b8ff37b9c1e99fa538c0cf01dfca05e22edb83d1156c4fd4d SHA512 cdbd1e94c283104c47ea29950339962b4aa541c783f849cd92b6ce83f04632d9ed7eb88a3791d1054a98b256ef787d84c70bb3b56af3fb1801e16d8412d4b763
 EBUILD nessus-bin-6.10.5.ebuild 1769 BLAKE2B 7fa43dc45ad25e40adbd568636257f1514a9464ec33fe4b9bd850564ba8deaeceedc2fafa259d7c53dab3293bbed0e34947bf28ec75df2842e1ba899572beeb6 SHA512 7302cbbabb12cb59b88a80055e4ff3c535bd866e175070736116dd5c98546e0c7b24742822a6a64a7b01979703452c4c7419c512e9a9185a3a99ffe822fb75c0
 EBUILD nessus-bin-8.3.2.ebuild 1654 BLAKE2B 0d59c80388e1119268776c8c98c6996d1c702d6362e2d4d1f3f69c950352aa420c9484c48d636904e8842e38478d3af86c4a458b9833d24f4a7923a9e8d7e70c SHA512 97b5baa4b22213b5211acccfb63292f210170c4ee6156f1035e077b0a914c6f4aea263f10a76f8530cfecca50bd0bfd1b82b7261c5b001f51dbce7b0a37252df
+EBUILD nessus-bin-8.4.0.ebuild 1654 BLAKE2B 0d59c80388e1119268776c8c98c6996d1c702d6362e2d4d1f3f69c950352aa420c9484c48d636904e8842e38478d3af86c4a458b9833d24f4a7923a9e8d7e70c SHA512 97b5baa4b22213b5211acccfb63292f210170c4ee6156f1035e077b0a914c6f4aea263f10a76f8530cfecca50bd0bfd1b82b7261c5b001f51dbce7b0a37252df
 MISC metadata.xml 345 BLAKE2B 05fdd17a4decd9a096175a59991a6df8260591c09193fef114895d7d29e0f08210aacd4517678410813d06a27b1032889c529e2966427c5a9ad454f9534d25f5 SHA512 3535519b1c621f6df120e6aa39f9a11ec132b68499a029915650218c16e9ca1a07cb30409ace95b2aa0204194a61c7b4743051e1f4ffc94cb5ba3372cac72e8c
diff --git a/net-analyzer/nessus-bin/nessus-bin-8.4.0.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.4.0.ebuild
new file mode 100644
index 000000000000..45aa75d3c45a
--- /dev/null
+++ b/net-analyzer/nessus-bin/nessus-bin-8.4.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm pax-utils systemd
+
+MY_P="Nessus-${PV}-es7"
+
+DESCRIPTION="A remote security scanner for Linux"
+HOMEPAGE="https://www.tenable.com/"
+SRC_URI="${MY_P}.x86_64.rpm"
+
+LICENSE="GPL-2 Nessus-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="mirror fetch strip"
+
+QA_PREBUILT="opt/nessus/bin/nasl
+	opt/nessus/bin/ndbg
+	opt/nessus/bin/nessus-mkrand
+	opt/nessus/lib/nessus/libjemalloc.so.2
+	opt/nessus/lib/nessus/libnessus-glibc-fix.so
+	opt/nessus/sbin/nessus-service
+	opt/nessus/sbin/nessuscli
+	opt/nessus/sbin/nessusd"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus"
+	einfo "The archive should then be placed into your DISTDIR directory."
+}
+
+src_install() {
+	# Using doins -r would strip executable bits from all binaries
+	cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files"
+
+	pax-mark m "${D}"/opt/nessus/sbin/nessusd
+
+	# Make sure these originally empty directories do not vanish,
+	# Nessus will not run properly without them
+	keepdir /opt/nessus/com/nessus/CA
+	keepdir /opt/nessus/etc/nessus
+	keepdir /opt/nessus/var/nessus/logs
+	keepdir /opt/nessus/var/nessus/tmp
+
+	newinitd "${FILESDIR}"/nessusd-initd nessusd-bin
+	systemd_newunit usr/lib/systemd/system/nessusd.service nessusd-bin.service
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "To get started launch the nessusd-bin service, then point your Web browser to"
+		elog "  https://<yourhost>:8834/"
+	else
+		elog "You may want to restart the nessusd-bin service to use"
+		elog "the new version of Nessus."
+	fi
+}
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 454f17a03542..b1b879a92247 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -18,6 +18,6 @@ DIST net-snmp-5.8.tar.gz 6591680 BLAKE2B ac1bff4152310da57818a00d752a08a7fc61d69
 EBUILD net-snmp-5.7.3-r5.ebuild 5123 BLAKE2B 4b131228917ab3884ca81e2777e1de6f8a73fa8b5ca5bfb15aa3224e00a6f7aa0d750ff18339c5abfcb26c01c592c7f182a47bca26728e0e620971c846bb4838 SHA512 a0aa82e9b35f0e2e8f33fe4abe55b706ddb7e6918da85916189e54c1a7273f121a42d802ff0a13ab53e4ed382b398f0fc6834cf9686aedabf850a7fb55230c9a
 EBUILD net-snmp-5.7.3-r6.ebuild 5156 BLAKE2B 29fbde65309d3169b9b9ce45aef271d70d583b859e27362c5c4c5185da1922abf5075f577b046c5e46042f2f1d335633cd81a56dd7e0fa99487f74797f91eb55 SHA512 e80156676b3b4841c24c6aa20af042ef6ea7c21fbf0ea08bb37af95ae4966a0a80f2bcede1e0231fa8065a21b4d97b12ce1828b012a8d887fe808898523405fa
 EBUILD net-snmp-5.7.3_p3-r1.ebuild 5235 BLAKE2B 20975c562ad43c1a20d4116aa2d422285adbad4df23f7f975357668fbbed6951705fffcec1008498374c42f14ecc6dc96e471970fba95cc592b862019bf23c18 SHA512 c058c0f7351da016936c454830887510a204bc9ae7d798f81323a4a4228fa51ad52551a68e95125c88ed2f511b3d0ee6860cd09bce70ae9d8719ad9673e3f9cd
-EBUILD net-snmp-5.8-r1.ebuild 5267 BLAKE2B c4bef47ba3e85c5ca4a1c82117229cd6dc71492ad48da130d113b9553cbab7b39bcbd9283a42704186bd1b5aa9da76bfcff715259c4d41b2dffe6112739d1d97 SHA512 f8db0813f70ea01272f981b9f3a181d61fde1fcef65c255d0fc723c6c2ac4933c1f8a10fa6512fa8904847708c3e7201bf212eeb183fe3f49593e44d96cad7be
+EBUILD net-snmp-5.8-r1.ebuild 5264 BLAKE2B 08450602568f2b2854cb62c123709035259cf71435911fa34f9ba7aa512755d8a911373d831ec7645f1829c42281444da4bc85c6f30f7da1e2082290d0e3b572 SHA512 8d870aa51ac3d5d65dfef6e94ca38fe154d689c011d494e1a931852b34ddc17a5fb3382ba1637b3f7bffd6bf8e79c52a75a25a675c7b9b8a41ad1c8a8151f848
 EBUILD net-snmp-99999999.ebuild 5227 BLAKE2B 30ce2a65e1628ce78759589124604cd9db583c05edfc7cd8c1ab05d31fec7368271eaa073dff921304849e835608f0e63d58c0775b85bd69d391a259b9d3d1a9 SHA512 9690b14e47ecb2e9e5d8f6d32a6e9c429b3c5561975f0045e82fa9616afaae1f892099f789243eb68fcb522e0318b19782bf82fbc848356c93aa97b3fd5ba47c
 MISC metadata.xml 1193 BLAKE2B b53ad11776e58b025bb3655b4f3bb96580f0dbde557cfa037e272ab6e71411b4bec434a82df646da3f3b53e1eda24555cf26366084c27d8729ec0342249a5c93 SHA512 4b9d6d7d36786dd2176f0d90bc4f55f310595807d4a364132c098df60de2c0bab6e8619760de768667e1c13bbcf5d209a73469e06bd1d78323bea76ae4fdf981
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
index 38b9ce6db86c..32697e5f3148 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${P/_/.}
 # GPL-2 for the init scripts
 LICENSE="HPND BSD GPL-2"
 SLOT="0/35"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="X bzip2 doc elf kmem ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
 
 COMMON_DEPEND="
diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest
index 38e99163c2f8..13b7c7754f9a 100644
--- a/net-analyzer/tcpflow/Manifest
+++ b/net-analyzer/tcpflow/Manifest
@@ -1,12 +1,12 @@
-AUX tcpflow-1.5.0_alpha-gentoo.patch 5929 BLAKE2B 2e5c965d37dd093ff226ec44a47999c14a43757300d5dda82f112c64bddbbf442935ef740f5cb3121718abffb13f1d237c5c828c17885934d28c34278d106837 SHA512 afb1102de33918b50ecd30e53d336b9d3d3c9f50be5396cb2865e03d0ada0465b91a31bc683dd2690f4bc8c3c8ca287716bfa0eb6c84919951806790e01b6e69
 AUX tcpflow-1.5.0_alpha-libcapng.patch 235 BLAKE2B dff01050c14223ecece11396e1e5b60b7a485dd5a46a1c44774442ab441ca10153bcb9bbe9dc9cf60b99b412c74e96ba32fd8b1af06d5babdfd8a60cd9442263 SHA512 0d2bd1ed7056033c94fa32deeac70e31ea35309e38e54c66f5092547559cf4c037bf2f4302deee3474839681eeba24cc4ac1068597c0ee28d48d2a10c2eea063
+AUX tcpflow-1.5.2-gentoo.patch 1344 BLAKE2B 2b795f920d9605f53f81b03dd125dc52c6cf0ad8471c630b0f9d17a65bfbe01d5736f4528f0592f154e54e2e06d2c01d0939501f4474568cc41054e9ae1068a3 SHA512 b7bab2ebb03e7d0ce400880eb27963a02e7f2d47f2df624dba71ec67e0aeace04eae0d8ac21e029e9353c69c1d003fc4b4edcc5fcbe9972244422925433fead6
 DIST be13_api-20170924.tar.gz 75724 BLAKE2B a5257346b9c0740d9758543fe7772c960e1941735abefe4d24d347631b35d1511fde8eb5a58dbb2824c54e78ee0d686a2549ceea2c1dc91e05ef92899c8b3c2d SHA512 5bf0d28f23df9436304245ccbdbf4af5b0f65e62b92e3039cfb9a70fe2056aa90dcce906db02f3df83fcf2a415c8a46f0f75468d48e13b15673d11c447a4c9c4
 DIST dfxml-20170921.tar.gz 163616 BLAKE2B 17214d15596a136efb2afc7246ee0f5696620b5aac7c2d78e37764f51487ff816de5a7c0f59e7484d358a8cd8eab34841716970cd859f0ce868ac29c8532754c SHA512 0885947aaf8efe639c13324413ef0cca49750027b48b434f226fb9fbfba494e84e245da879dc0d77b46bddc27798f7f5df12590fce47b096683034bbc61280e1
-DIST tcpflow-1.5.0alpha.tar.gz 763403 BLAKE2B 3010ba5dc039ee9ebeedf9fd453e9a36cc9adda26bc40dd93938dd56e7bc070a62de0c0fd61af976a866b2f50b3857606c0c962fd6194112392af18708fbfdcb SHA512 240ea6ccb39d13cc86fdaf8bb8284b796d2ceb070aee2dbb0364a6d9f572863159e79ad40259aa6e85c729e28f35c2f453df261490c09c321276686be4627b96
+DIST tcpflow-1.5.2.tar.gz 788545 BLAKE2B b3995cf0f4bedce207dcac19de3d57920231cab75df030da1cf93fb815999de602fd1e3f0955c82effff88f9a3945a891c3b3f0e08449cf366de4bb8269a6452 SHA512 e060779c78f79ba6efdf5f9d8ff490823ff06051a7089247b8155c03f487776fa1896e487e8dca1d5842b617fc5d9056e043f01ac3276edeec1d394ed24bc7e9
 DIST tcpflow_1.4.5+repack1-1.debian.tar.xz 11144 BLAKE2B 1188e259406b5bf4feaa95b6a6805217564f71f377b6ae5baa707453da4f0d9bf15c7fdfe1fea0a9c4586e5c24f9b4cea8fd5226a97d762d9f5969d3381d4bbb SHA512 ed2c491595a3d5382ca79fe945467639af3d99658d002353f90e07aa6b1a955e57ab0fbbc3fadf964e9d6d3dba4fd327a02c1b07d6a239efdf90b365928b2a1e
 DIST tcpflow_1.4.5+repack1-4.debian.tar.xz 12228 BLAKE2B a7c1725d2a82a6ef63800c3bf8fe4d99fd81566fe3b1dbd77238337784954e3161fae868b2a915a9fa2ce580a81d726b6359f905953a952e500f811e9e38c4b5 SHA512 27d8a7a735b06c35cc2985cb26a129a490fc2236eedeede21977afe4c3096a6fde3ea18de1aaa3a1c6a56bc36d332b1e8bd4c7be933d5b031509a69cae189b18
 DIST tcpflow_1.4.5+repack1.orig.tar.gz 725962 BLAKE2B 282849bded34acc79ece4b06c72d5ed05ada07bb2e1a5e6e15dd7c6c46f8f1e57b5bfb018b1a23bdd543d0664b3bd5a3f756342fd657930a77c1ab8307358421 SHA512 fed8589957e3c790b5b6837b9b578d5dcbde316122ed6b3d4f908d1d73f23c6ed8a11720ee0510e878eaa7a6c559a2f35e7df2c77e3cb1f2810040adf7ac2b85
 EBUILD tcpflow-1.4.5_p1-r1.ebuild 1119 BLAKE2B 47a36a5f641e96a2a16afc41c02468ea83b93b425b7c6f1e7f3382321119d3459cbe7e1c9e4a42e02a73fe205d9da21f7afe596c543f6d5879bc5d0fa2b0bbbe SHA512 bbaaf72e7ab163093392d1c4c690281f84100209f4084f351c60823bbbf94e7787530dc75120123ff4a7f4439de06d1a1c815a97185f0735753444d374d8506b
 EBUILD tcpflow-1.4.5_p4-r1.ebuild 1132 BLAKE2B 431b20f5779a0cb828d321069300f12348f75f47d75dd9d2fd7411bebe956f0f40085ff1a0e33fd5036bc919881d07972506ae2dea4362c6f63713eb433d0c33 SHA512 e781ef6618cbd549828bf426c2fdd9511b037d149f45279d54da658b48b5e6302e62b278e9fe36782cf458e2a335263507efb3be8134d698900c4530455a1bfa
-EBUILD tcpflow-1.5.0_alpha.ebuild 1522 BLAKE2B 1c76c86d7bd33c265eb61e0c4d26179617ea9ea04a15652f62ba2df607caa580b6ddfa4488927220f03a979a723a1388f778020c2d8654bb211fc90b928b0b80 SHA512 e1ed5c6ecfe8e00d78dd01f919dbcd0b85a5bb0267b434ca0b238398563359da4c507f0ef680b039953f4040180c70cd1142415940373a7fd319fe2e6916e506
+EBUILD tcpflow-1.5.2.ebuild 1467 BLAKE2B eb7752d796db2c7727ac3b3aa8bfceba4db245d01efdd3d2f0d55815ae6bccab9d69fe0947bf68dab3b8ed1a5e15a99df965ebd20676297e0049d5c1d505ffff SHA512 5c53a52906ddc2ac8e9e6d23b760a27cfbe4bbc546bc09a7500a54df924ac2a527ea337af9d7895138b12e56b000013ec1931f12b6ced376d9f90f7a8524b97e
 MISC metadata.xml 360 BLAKE2B e69d4aa24b5949bff690f0dd8e735d85e975424fec366d7952232a9efd223c163b57684eadde0ddaee26cb0a763e09b64ef7b6361e97611e2369eb1b037d7341 SHA512 32d3c4b5fabd54d1c6c1db15d8af755a6c83725f1d52f5be2ffd7e9975113d200581da4e4a735d823bdf5d12408c8306cc08ef08721ce924f04e137a7da8fa08
diff --git a/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-gentoo.patch b/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-gentoo.patch
deleted file mode 100644
index 6a2dc10cff9e..000000000000
--- a/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-gentoo.patch
+++ /dev/null
@@ -1,191 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -29,7 +29,6 @@
- AC_PROG_INSTALL
- 
- m4_include([m4/slg_searchdirs.m4])
--m4_include([m4/slg_gcc_all_warnings.m4])
- 
- 
- # use C++11 mode if available; HAVE_CXX11 is defined in config.h if so.  Don't
-@@ -96,96 +95,6 @@
- fi
- 
- ################################################################
--#
--# Enable all the compiler debugging we can find
--#
--# This is originally from PhotoRec, but modified substantially by Simson
--# Figure out which flags we can use with the compiler. 
--#
--# These I don't like:
--# -Wdeclaration-after-statement -Wconversion
--# doesn't work: -Wunreachable-code 
--# causes configure to crash on gcc-4.2.1: -Wsign-compare-Winline 
--# causes warnings with unistd.h:  -Wnested-externs 
--# Just causes too much annoyance: -Wmissing-format-attribute 
--# Check GCC
--WARNINGS_TO_TEST="-MD -D_FORTIFY_SOURCE=2 -Wpointer-arith -Wmissing-declarations -Wmissing-prototypes \
--    -Wshadow -Wwrite-strings -Wcast-align -Waggregate-return \
--    -Wbad-function-cast -Wcast-qual -Wundef -Wredundant-decls -Wdisabled-optimization \
--    -Wfloat-equal -Wmultichar -Wc++-compat -Wmissing-noreturn "
--
--if test $mingw = "no" ; then
--  # add the warnings we do not want to do on mingw
--  WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Wall -Wstrict-prototypes"
--fi
--
--echo "Warnings to test: $WARNINGS_TO_TEST"
--
--for option in $WARNINGS_TO_TEST
--do
--  SAVE_CFLAGS="$CFLAGS"
--  CFLAGS="$CFLAGS $option"
--  AC_MSG_CHECKING([whether gcc understands $option])
--  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
--      [has_option=yes],
--      [has_option=no; CFLAGS="$SAVE_CFLAGS"])
--  AC_MSG_RESULT($has_option)
--  unset has_option
--  unset SAVE_CFLAGS
--  if test $option = "-Wmissing-format-attribute" ; then
--    AC_DEFINE(HAVE_MISSING_FORMAT_ATTRIBUTE_WARNING,1,
--		[Indicates that we have the -Wmissing-format-attribute G++ warning])
--  fi
--done
--unset option
--
--
--# C++
--# We don't use these warnings:
--# -Waggregate-return -- aggregate returns are GOOD; they simplify code design
--# We can use these warnings after ZLIB gets upgraded:
--# -Wundef  --- causes problems with zlib
--# -Wcast-qual 
--# -Wmissing-format-attribute  --- Just too annoying
--AC_LANG_PUSH(C++)
--WARNINGS_TO_TEST="-Wall -MD -D_FORTIFY_SOURCE=2 -Wpointer-arith \
--    -Wshadow -Wwrite-strings -Wcast-align  \
--    -Wredundant-decls -Wdisabled-optimization \
--    -Wfloat-equal -Wmultichar -Wmissing-noreturn \
--    -Woverloaded-virtual -Wsign-promo \
--    -funit-at-a-time"
--
--if $CXX -dM -E - < /dev/null | grep -q __clang__ ; then
--   AC_MSG_RESULT([Using clang])
--   clang='yes'
-- else
--   AC_MSG_RESULT([not using clang])   
--   clang='no'
--   # -Wstrict-null-sentinel is not supported under clang or under Darwin's gcc
--   WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Wstrict-null-sentinel"
--fi
--
--if test $mingw = "no" ; then
--  # add the warnings we don't want to do on mingw
--  WARNINGS_TO_TEST="$WARNINGS_TO_TEST  -Weffc++"
--fi
--
--for option in $WARNINGS_TO_TEST
--do
--  SAVE_CXXFLAGS="$CXXFLAGS"
--  CXXFLAGS="$CXXFLAGS $option"
--  AC_MSG_CHECKING([whether g++ understands $option])
--  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
--      [has_option=yes],
--      [has_option=no; CXXFLAGS="$SAVE_CXXFLAGS"])
--  AC_MSG_RESULT($has_option)
--  unset has_option
--  unset SAVE_CXXFLAGS
--done
--unset option
--AC_LANG_POP()    
--
--################################################################
- ##
- 
- 
-@@ -396,7 +305,12 @@
- 	AC_CHECK_HEADERS(cap-ng.h)
- fi
- 
-+################################################################
-+# http-parser
- 
-+AC_CHECK_LIB(http_parser,http_parser_init,,
-+  AC_MSG_ERROR([http-parser library not installed]))
-+AC_CHECK_HEADERS(http_parser.h)
- 
- ################################################################
- # Specify our other headers
-@@ -603,35 +517,6 @@
-   Mmissing_library="$Mmissing_library python27"           # Not sure: https://github.com/macports/macports-ports/blob/master/lang/python27/Portfile
- ])
- 
--############## drop optimization flags if requested ################
--
--# Should we disable optimization?
--AC_ARG_WITH([opt], AC_HELP_STRING([--without-opt], [Drop all -O C flags]))
--# Or maybe just tone it down a bit?
--AC_ARG_WITH([o3], AC_HELP_STRING([--without-o3], [Do not force O3 optimization; use default level]))
--
--if test x"${AFF_NOOPT}" != "x" ; then
--  AC_MSG_NOTICE([Dropping optimization flags because AFF_NOOPT is set.])
--   with_opt="no";
--fi
--
--if test "${with_opt}" = "no" ; then
--  AC_MSG_NOTICE([Dropping optimization flags])
--  CFLAGS=`echo "$CFLAGS" | sed s/-O[[0-9]]//`             # note the double quoting! 
--  CXXFLAGS=`echo "$CXXFLAGS" | sed s/-O[[0-9]]//`
--
--  AC_MSG_NOTICE([Removing -D_FORTIFY_SOURCE=2])
--  CPPFLAGS=`echo $CPPFLAGS | sed s/-D_FORTIFY_SOURCE=2//`
--  CXXFLAGS=`echo $CXXFLAGS | sed s/-D_FORTIFY_SOURCE=2//`
--  CFLAGS=`echo $CFLAGS | sed s/-D_FORTIFY_SOURCE=2//`
--else
--  # and increase optimizer from -O2 to -O3 if not explicitly forbidden
--  if test "${with_o3}" != "no" ; then
--      CFLAGS=`echo   -g "$CFLAGS"   | sed s/-O2/-O3/`             # note the double quoting! 
--      CXXFLAGS=`echo -g "$CXXFLAGS" | sed s/-O2/-O3/`
--  fi
--fi
--
- AC_OUTPUT
- 
- ## Finally, record the values of CFLAGS, CPPFLAGS, and CXXFLAGS for DFXML
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -90,18 +90,10 @@
- 	scan_netviz.cpp \
- 	pcap_writer.h \
- 	iptree.h \
--	http-parser/http_parser.c \
--	http-parser/http_parser.h \
- 	mime_map.cpp \
- 	mime_map.h 
- 
- EXTRA_DIST =\
--	http-parser/AUTHORS \
--	http-parser/CONTRIBUTIONS \
--	http-parser/LICENSE-MIT \
--	http-parser/Makefile \
--	http-parser/README.md \
--	http-parser/http_parser.gyp \
- 	wifipcap/README.txt \
- 	wifipcap/TimeVal.cpp \
- 	wifipcap/TimeVal.h \
---- a/src/scan_http.cpp
-+++ b/src/scan_http.cpp
-@@ -11,7 +11,11 @@
- #include "tcpip.h"
- #include "tcpdemux.h"
- 
-+#ifdef HAVE_HTTP_PARSER_H
-+#include "http_parser.h"
-+#else
- #include "http-parser/http_parser.h"
-+#endif
- 
- #include "mime_map.h"
- 
diff --git a/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch b/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch
new file mode 100644
index 000000000000..de0864004a0c
--- /dev/null
+++ b/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch
@@ -0,0 +1,61 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,7 +30,6 @@
+ AC_PROG_INSTALL
+ 
+ m4_include([m4/slg_searchdirs.m4])
+-m4_include([m4/slg_gcc_all_warnings.m4])
+ 
+ 
+ # use C++11 mode if available; HAVE_CXX11 is defined in config.h if so.  Don't
+@@ -402,7 +402,12 @@
+	AC_CHECK_HEADERS(cap-ng.h)
+ fi
+ 
+-
++################################################################
++# http-parser
++ 
++AC_CHECK_LIB(http_parser,http_parser_init,,
++  AC_MSG_ERROR([http-parser library not installed]))
++AC_CHECK_HEADERS(http_parser.h)
+ 
+ ################################################################
+ # Specify our other headers
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -90,20 +90,12 @@
+ 	scan_netviz.cpp \
+ 	pcap_writer.h \
+ 	iptree.h \
+-	http-parser/http_parser.c \
+-	http-parser/http_parser.h \
+ 	mime_map.cpp \
+ 	mime_map.h 
+ 
+ EXTRA_DIST =\
+ 	inet_ntop.c \
+ 	inet_ntop.h \
+-	http-parser/AUTHORS \
+-	http-parser/CONTRIBUTIONS \
+-	http-parser/LICENSE-MIT \
+-	http-parser/Makefile \
+-	http-parser/README.md \
+-	http-parser/http_parser.gyp \
+ 	wifipcap/README.txt \
+ 	wifipcap/TimeVal.cpp \
+ 	wifipcap/TimeVal.h \
+--- a/src/scan_http.cpp
++++ b/src/scan_http.cpp
+@@ -11,7 +11,11 @@
+ #include "tcpip.h"
+ #include "tcpdemux.h"
+ 
++#ifdef HAVE_HTTP_PARSER_H
++#include "http_parser.h"
++#else
+ #include "http-parser/http_parser.h"
++#endif
+ 
+ #include "mime_map.h"
+ 
diff --git a/net-analyzer/tcpflow/tcpflow-1.5.0_alpha.ebuild b/net-analyzer/tcpflow/tcpflow-1.5.2.ebuild
index 6c5c1bdafe13..0271f130a3ba 100644
--- a/net-analyzer/tcpflow/tcpflow-1.5.0_alpha.ebuild
+++ b/net-analyzer/tcpflow/tcpflow-1.5.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools flag-o-matic
 
 DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
-HOMEPAGE="https://github.com/simsong/tcpflow https://packages.qa.debian.org/t/tcpflow.html"
+HOMEPAGE="https://github.com/simsong/tcpflow"
 SRC_URI="
 	https://api.github.com/repos/simsong/be13_api/tarball/c81521d768bb78499c069fcd7c47adc8eee0350c -> be13_api-20170924.tar.gz
 	https://api.github.com/repos/simsong/dfxml/tarball/7d11eaa7da8d31f588ce8aecb4b4f5e7e8169ba6 -> dfxml-20170921.tar.gz
@@ -38,8 +38,8 @@ DEPEND="
 "
 S=${WORKDIR}/${PN}-${P/_/}
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0_alpha-gentoo.patch
 	"${FILESDIR}"/${PN}-1.5.0_alpha-libcapng.patch
+	"${FILESDIR}"/${PN}-1.5.2-gentoo.patch
 )
 
 src_prepare() {
diff --git a/net-analyzer/telegraf/Manifest b/net-analyzer/telegraf/Manifest
index 687266d24252..2591ddc2933d 100644
--- a/net-analyzer/telegraf/Manifest
+++ b/net-analyzer/telegraf/Manifest
@@ -202,8 +202,11 @@ DIST github.com-wvanbergen-kazoo-go-f72d8611297a7cf105da904c04198ad701a60101.tar
 DIST github.com-yuin-gopher-lua-46796da1b0b4794e1e341883a399f12cc7574b55.tar.gz 149759 BLAKE2B f182ad2096559c0069a8179f3b2bd3225cf1528290152e79aee1e827754135ffdeb5484174eda09762d758c9d790457a0262224c0162a5c82b5c13e06e16be5d SHA512 bc6d08287146e9a20cf22dc0ec4cca02003ce53a6a0609475aeb3319bb83e8bf9394d408ba9b25f347c4bb6d2fb817680746e0c7dab13a3c7351cf7d2119560f
 DIST github.com-yuin-gopher-lua-66c871e454fcf10251c61bf8eff02d0978cae75a.tar.gz 148862 BLAKE2B b22c654322c0ba9722b7f10411fcc03e97dcbd937c6446e30b0ffebc63a4ddae5b3c86aebb2dd537f1b9e25aef57fec5a2966ebb76aa586f73e25eb1c7b2378b SHA512 8a57a8a180b684c1263bab7b98339554b0efc95a73fc3ac558ff9177f0a09f0bc41b24285c96dce6a114031b0166a384c2a8e9d169dbb3c643c9017dcc8d0c18
 DIST github.com-zensqlmonitor-go-mssqldb-ffe5510c6fa5e15e6d983210ab501c815b56b363.tar.gz 450131 BLAKE2B 6d9ced571d0db14cbd3223449734757e4b5c797cbdfdf10725f2d3cb7867093608a7fd3ca1a2c5398848c92090269b8d35f504de439ce2ca6b482ac8180697c9 SHA512 52ed5b9e8399f00a83c0a50f8fdd0ab5419005159aa5ef80c5d8ab76c37f319e1c4d3e0bd5e0ba25006fa790d3756d2788baf30b2ef79b1f86b001d64a702820
+DIST telegraf-1.10.4-vendor.tar.gz 69744868 BLAKE2B 97123bb14b89d28519c73426491189a9245450c72bd59e6745a76c61730a730cd5b2c59c7f205c0dfd058b3d5fce4d331a3e39ecc1a5da1ac439c8946e634fab SHA512 53f5bc9fc60ccae3a9549ab38cb4b558a331524351b70b83deb483090a45edf8868856c1311893d9d8e091e649769ccb580bb32cc46a16da1deb8390704a6c84
+DIST telegraf-1.10.4.tar.gz 1372505 BLAKE2B f3064cd71b1b6f9a8aae8e5425813386bd6d4e4f06c2e95f35c09d055aef6b811867bb1fe1724e88311f82e8214a1c7ae23a0b5ab8461cfa6b0adebe3b86cb28 SHA512 7e6c27bb5b94382f00f48ce98906f7e505abe734b47e29c2c07f245c2c5c12c522eb3f59be2773bfea78316b7b808d0d425d07fa7c247af7cd280a041759cc34
 DIST telegraf-1.5.3.tar.gz 911976 BLAKE2B 3e67a037eb22be88de700131f15120faa13b7a9bd8404f76c29376e3e4da630d84767fd8cbff45b3e14e6ce836dcc68a2a87b462eb91d398d57370c1112879c0 SHA512 48e80a4f3f00b5c18f584e28836c36abd7b7f9bacb33dd90ff569dbdc0a5bf69e29d38ae2d74a9c14ee6dc3400dda91e586dd31bc11522257c2206efb3e93348
 DIST telegraf-1.8.3.tar.gz 1205303 BLAKE2B 60579cca57863362cb4003f8da4326cef0d1bc4986d07d38f4b594556736ad79e0363098df41c13a2d10bbeeccce20fabcd0b07c7e187cbeecb5c561008d587e SHA512 367069b3578529307d5fa6eb14eabf78a44743d75e5df7c3860b35de212b5809c54cd1a7c791076137f60096d227774b4d5206606cd3fad08594721b4b49de4e
+EBUILD telegraf-1.10.4.ebuild 1328 BLAKE2B d90230f4d99b4e3397f9ddd95d7e210894321245f8d89debc6a5b2a4b4698b418231703d4b3f651da5c67df0de63bff255dd413340e8769d582579935f993592 SHA512 d208883ac6787db14fc883cde3c68d10d34c48f0ac0b4e1f59c7167f67e9c2ccf395bca6cda9eeda4b7ecf4a3c010de1a3a42b0b69fe880a59a3efa3c22cb0e0
 EBUILD telegraf-1.5.3.ebuild 8161 BLAKE2B 53f9c9b2fc23e06e2d8cea9d11198fa0b8b91cd8c5721a7baaac36a300473da2b2494399f0786d9dbf022fa92093f9bf1eeb234a314ed97bdb97a48c6d6df730 SHA512 ecd1b258a0932732f4a738ef4baae5e7b7ae97eb076cc2d3ff6e824429e75b64d3c70385e843fe27daa1a09d8bb80a9977291bc8808922ea46100ab99f09e779
 EBUILD telegraf-1.8.3.ebuild 10888 BLAKE2B 84331e20f7ada3e7e1882a6a0e34ba3f2d764350265dc199edefb21a247e3e89be1bb9ae216782bb8b7e0af7bb160972be8084341ef86d37c2a101d1e89d2a52 SHA512 ab279f166ad698c7547a8c26a155ac2566829a71d01654df7f8bc4a9ee5f4278e5fb79da39ffae7dac949ee1181f53eb6ba94e9e28272fd918b92ed40e60400a
 MISC metadata.xml 397 BLAKE2B 2a5052554a207a61b00ce3997cd42292b00aaa7a434aee3361abc24057d705c0ec82885550a0515439775fec013319c325b911684bc351f9478adf4a0b7c26d1 SHA512 e27b2a6ed4fe38df2a3ab0d70fe4e82bbe874987be1cfa26df2ff5cdfa93a1fd55b19fa6c901ea1adda058fafc703d15438bdd3119023f4da0e2fd5cc915a52e
diff --git a/net-analyzer/telegraf/telegraf-1.10.4.ebuild b/net-analyzer/telegraf/telegraf-1.10.4.ebuild
new file mode 100644
index 000000000000..26d57829cbfc
--- /dev/null
+++ b/net-analyzer/telegraf/telegraf-1.10.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/influxdata/telegraf
+
+inherit systemd user
+
+MY_PV="${PV/_rc/-rc.}"
+COMMIT=3548ce47
+DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics."
+HOMEPAGE="https://github.com/influxdata/telegraf"
+VENDOR_URI="https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz"
+SRC_URI="https://github.com/influxdata/telegraf/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	${VENDOR_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+
+pkg_setup() {
+	enewgroup telegraf
+	enewuser telegraf -1 -1 -1 telegraf
+}
+
+src_prepare() {
+	default
+	ln -s ../vendor
+}
+
+src_compile() {
+	echo module ${EGO_PN} > go.mod
+	set -- env GO111MODULE=on go build -mod vendor -v -x -o telegraf \
+		-ldflags="-X main.commit=${COMMIT} -X main.version=${PV}" \
+		cmd/telegraf/telegraf.go
+	echo "$@"
+	"$@" || die
+}
+
+src_install() {
+	dobin telegraf
+	insinto /etc/telegraf
+	doins etc/telegraf.conf
+	keepdir /etc/telegraf/telegraf.d
+
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/telegraf
+
+systemd_dounit scripts/telegraf.service
+	newconfd "${FILESDIR}"/telegraf.confd telegraf
+	newinitd "${FILESDIR}"/telegraf.rc telegraf
+
+	dodoc -r docs/*
+
+	keepdir /var/log/telegraf
+	fowners telegraf:telegraf /var/log/telegraf
+}