gentoo resync : 18.05.2019

34 files changed, 325 insertions, 667 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 2ff6d38e29c5..134c74a6345e 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index 2ea3cd5455bf..9503f7b7f4b6 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -1,7 +1,7 @@
-DIST bwping-1.11.tar.gz 105921 BLAKE2B 92d00c2774b8de0c56ab7e95fc0cccf2929202510ce41bfb89ea915f7aa7f9a131992a2ccf84c7a7e70e346f8eec0019cfb6ccffd362b416df0b22e197fe36b2 SHA512 bf802fc027c63cf784cb8d662c43153675411fa8c96c7b3d3e16bf3e7e92c70242e599704142225e6b4731176d4ab9df82eb5a4103b2b6d0227fde735ee95b03
 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.7.tar.gz 90441 BLAKE2B 2f8c4690388860470ac7f814ef29bc3de1738f0e46f53286000829a0483c8f000f2bd8d5f7d0fbf8ed9b8bdfb105576c7960a24da8f3f3fac36fd49d4b34370e SHA512 74b695a80c2fa54693af1afab78417dc6ca35130bbd9367950681ddbbebe36b38166068532e8296f336c5cad8230339b4fb4fb975f4b066cdacba8a99179cac7
-EBUILD bwping-1.11.ebuild 472 BLAKE2B 819d256e3707192c97cc4aa408138073136a0d038cadb3ca2d3450f4163f15341cd549d975f4a81d6e54f6330e4cceffb921c56c2b8e37df351bd44a87c3c8f2 SHA512 bd1d1542c8f463eda0cda55fc5b70e4fadd06cc1da4a07249689fda4faa6d11b1d3ef7916905ef396f0de5f239a270131108e1f548a31adc026084c1abc6beeb
 EBUILD bwping-1.12.ebuild 370 BLAKE2B 512320560c918a5ac38f39b0d97caf2d71c5d3045d8957de35b3c98a175b07f2d477ed435a70278ad7bd76db89d0f92ce1ab054c27fee9620e69724185dbe34c SHA512 86c51a741dab38b67a5d337bd96274ad8a6d8cb9ff70b5c890abf16dd8e8a1dee7c0023c6e81e2492a3130e24315bac45ccd2a0d55b590ef9196b803c98b44b6
+EBUILD bwping-1.14.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.11.ebuild b/net-analyzer/bwping/bwping-1.14.ebuild
index 34ed9d0ea7ec..27887df81901 100644
--- a/net-analyzer/bwping/bwping-1.11.ebuild
+++ b/net-analyzer/bwping/bwping-1.14.ebuild
@@ -2,22 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools
 
 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"
-IUSE="ipv6"
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable ipv6)
+src_test() {
+	[[ ${UID} = 0 ]] && default
 }
diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index 0cb141f28c35..e9a9d4573e61 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -5,6 +5,6 @@ AUX flowcapture.confd 1928 BLAKE2B db22630c3741867466c1292651364e41028dafeeaf10d
 AUX flowcapture.initd 816 BLAKE2B 6e27085fa0b8048f1b6f2d449d154a0fe9f2d7b8fa511de53d7eca684ef716b8ceeaaa3fedf9e0a01e76b1723e6646b6727bc76c3e9b2168060fe3bd7b363af7 SHA512 c3f62821efc94fb6305ba3c54415319c42a624a3c604c96497af0fdd7b4076e618a070006146346eb3de0549bc2bc36e3e3ffd9f7aba832dd18c29da0370463a
 AUX linkme 283 BLAKE2B 1c1e84a29f8fccc62dc84ba8ffbd182255a5bda7979132ff721fc537bb523e221b3963e3dce4f5700f53586ef4c4acccbab605099edf7e068bf6dd2e71882721 SHA512 a9db8dec8b6f2a83b8896951bf1711ec7c58dd18d2da7db7015c0a000114b3d1da9bee4dd64842c074b332a06a890b2eea1b8ffc0399ce0efa39bf6527466359
 DIST flow-tools-0.68.5.1.tar.bz2 914062 BLAKE2B 8a987c1aac53a1370045ab118888c51ce2de7b8db4074432e86e701153469163870cf1cf9da9e2267ed934d240de4b4bf2391b4681012b82db7e4205207b7fa4 SHA512 ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57
-EBUILD flow-tools-0.68.5.1-r10.ebuild 1640 BLAKE2B 1d7b5e006cea30d8bd874ac57e770622d6f7b94d3bd3d7c2f7e5891d77265919abf46fbf84dd4947b16d92d98857f01ab18e49d62591783431b52cb5708dab5b SHA512 76d38aeaa85a409926c51bcd3c8bb7c603f0f24507013fe70ca3ef919af72c9240a3d11e72068e983e7dce9e91f7709972feb489ed0b790b1d01b8fc2234bf41
+EBUILD flow-tools-0.68.5.1-r10.ebuild 1637 BLAKE2B 29bae346e3b76f36438d2c242a69ff82c4586cc603c626f9d3a24df64fd841d35d7668177e565d319a64ff3d2343240b7ae62860bd1a8a59171fad0de1130644 SHA512 4ab063f2495e3f362613e2877afa9e3e6df8e8e5058762d115aca7cc98732eda06b5fd88c2e15cd3291b7434d34f6c45d73a4266a5c021127bb842af9ad2b45b
 EBUILD flow-tools-0.68.5.1-r9.ebuild 1615 BLAKE2B f041ee019a4d4d70f4612f25c5904112a2c08e4868d727dcea9c370bb9461acc5d1eadbe2f452fec3d5f319e38ebcf0910a8217eef8ebcbc4b7ed9f7af2dc36d SHA512 c7d85fc7c617008977f8e9d151eb1765a416d8ad7edc011b870b9b1f6727dbc80b26f1a3ce527b661d5f4da68047c4910e007e467d006796523a6135689003d8
 MISC metadata.xml 902 BLAKE2B 16f4780c8fc2a803580d1ad9321e1db662c1c720f744f544b57a2eb65f9859c02dced677f3ea1732b05afe70abb55b4a9c349fb375ee24abf083b8376d521fb1 SHA512 45f900d25bc2b968ce9a04fd143106962c1a242b776840eb2c1b51f0e02d71000f9a2fdf19286f7873e07c25aa9d528597f1b1fe0e7e083c29de5304b87aeab3
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild
index 9d62c33981ae..4a048f0d81c0 100644
--- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug libressl mysql postgres ssl static-libs"
 
 RDEPEND="sys-apps/tcp-wrappers
diff --git a/net-analyzer/gnu-netcat/Manifest b/net-analyzer/gnu-netcat/Manifest
deleted file mode 100644
index 8ecaacf9e411..000000000000
--- a/net-analyzer/gnu-netcat/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX gnu-netcat-LC_CTYPE.patch 479 BLAKE2B a458dc0df5d2f085b30b10d6f33f3ca6beb1b56348e8671098f2b3360da010311ae84d0ca69449df0b535d054ca0a1bff0ad6ca3943e583eb0964657118c4e6f SHA512 9ec66fe94fe5d6b76d94959d1e26a3b5ae7f1b09b9d863c73867a1325a14b3691e475ce7db54612f16ef4cc954815d268fb19a16cf5bfce4b0d585e40b690293
-AUX gnu-netcat-close.patch 342 BLAKE2B 24fd65ae42672c292c832fc1b5ca4d9ed64263f3fca45f5bb2b8a492f52bc2191fea471d4738541b660ac513b7adf662c204bbcfb8a919c1d2de083685244618 SHA512 920153a3c65f2a8c54ec1bfe3c2588a300c507fb3e88f80d69c2f816a802c72843a4c34900fd5a2e5bd03ab952f25796a6b601a105e01fa9097b19cff9bf0f11
-AUX gnu-netcat-flagcount.patch 479 BLAKE2B bf3838a82c8df361cb8f596d103bff0f52345d5ab2816f1de056acab71089585e0bca1b1c75793d4b67390246038fc502ed2b3c99c3c667361f6a325ef9df228 SHA512 cc8cefad31422eec8fc549e02c3cac5a725f6d0232d2a6e4383324530f5bdb771ec5e9221f2455b2f4b3d636eeda73a346a9cfb74856977b10136685420199d2
-DIST netcat-0.7.1.tar.bz2 325687 BLAKE2B a846fafcd006cc284f982fe66a3de5154ef1d74d20926344c54066f9b5e86f7bef06eb99313d5ec7f9f09bdb9b12ca82421b945bc6d3b8c6bb5f843cd6d31c2c SHA512 283c02f849c3bb62615a5ccb7796192804dafcecb34f3c6b553cbc12c715654963b81e253762923c6069be9768b93dde576a392b89b167912c323354f1376e83
-EBUILD gnu-netcat-0.7.1-r3.ebuild 825 BLAKE2B 551b658157629574a6ab163f61714196a0795db70e69185aafebf91ce252861934996e10b3d0163d2d366ce65cf8235be94fc579a790b04b2a9a95bd38073df2 SHA512 cd9819f4492caed56aea60c1d55b19f78ae338fe79700f0c17bfa819ee895faad9fbada396d06362f388de0e76616dfb3d86f0533b95913603d240e8c1139119
-EBUILD gnu-netcat-0.7.1-r4.ebuild 808 BLAKE2B 1ed69114e472c8e38641c3ef8dadb509d8ba541dd85defc42fb5390d40f942f69d96e11aae57161a886310aebc731cb2d0a2824f11fbed7e9ebd30ce03ab022a SHA512 88cee294f6ad2f0792e760c0397b02cc73b88eac0af1f6bc77b315683ef6df01244736e0efc23ffe5793c8f9e1b516abeb98269f52a4d95dc761d39ca7fe8aa9
-MISC metadata.xml 425 BLAKE2B f13edbb0cd292574b75df3cffd4f9786d267eee4525c839ba668947df28cdcfafa5a460decca9a2deeafbdd6956c8c2af416bed862ffcb43b2f980a54c7f2ea1 SHA512 a2cbcf2da6524c0ce77c0961511555cbcc36adea879aeb0aae82e973827b34e2b3d9f6d78317262bd4b0e07726316fd36055024dd36cd228edb384fe27d84a85
diff --git a/net-analyzer/gnu-netcat/files/gnu-netcat-LC_CTYPE.patch b/net-analyzer/gnu-netcat/files/gnu-netcat-LC_CTYPE.patch
deleted file mode 100644
index 1c67f92e6c2a..000000000000
--- a/net-analyzer/gnu-netcat/files/gnu-netcat-LC_CTYPE.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-In russian locale, netcat error messages display as '???????'
-
-Need to set LC_CTYPE along with LC_MESSAGES to correctly display messages in
-locales other then C/POSIX
-Required for correct i18n support in glibc.
-
-(bug #200875 by Михаил)
-
-
---- a/src/netcat.c
-+++ b/src/netcat.c
-@@ -157,6 +157,7 @@
-   connect_sock.domain = PF_INET;
- 
- #ifdef ENABLE_NLS
-+  setlocale(LC_CTYPE, "");
-   setlocale(LC_MESSAGES, "");
-   bindtextdomain(PACKAGE, LOCALEDIR);
-   textdomain(PACKAGE);
diff --git a/net-analyzer/gnu-netcat/files/gnu-netcat-close.patch b/net-analyzer/gnu-netcat/files/gnu-netcat-close.patch
deleted file mode 100644
index eb1862d1fd52..000000000000
--- a/net-analyzer/gnu-netcat/files/gnu-netcat-close.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/doc/netcat.1
-+++ b/doc/netcat.1
-@@ -256,6 +256,13 @@
- source address for the connecting socket.
- .Sh "Advanced Options"
- .IX Subsection "Advanced Options"
-+.IP "\fB\-c" 4
-+.IX Item "-c"
-+.PD 0
-+.IP "\fB\-\-close" 4
-+.IX Item "--close"
-+.PD
-+closes connection on EOF from stdin.
- .IP "\fB\-i \s-1SECS\s0\fR" 4
- .IX Item "-i SECS"
- .PD 0
diff --git a/net-analyzer/gnu-netcat/files/gnu-netcat-flagcount.patch b/net-analyzer/gnu-netcat/files/gnu-netcat-flagcount.patch
deleted file mode 100644
index 765212cb0e99..000000000000
--- a/net-analyzer/gnu-netcat/files/gnu-netcat-flagcount.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/flagset.c
-+++ b/src/flagset.c
-@@ -134,7 +134,7 @@
- 
- int netcat_flag_count(void)
- {
--  register char c;
-+  register unsigned char c;
-   register int i;
-   int ret = 0;
- 
-@@ -154,8 +154,8 @@
- 	Assumed that the bit number 1 is the sign, and that we will shift the
- 	bit 1 (or the bit that takes its place later) until the the most right,
- 	WHY it has to keep the wrong sign? */
--      ret -= (c >> 7);
--      c <<= 1;
-+      ret += (c & 1);
-+      c >>= 1;
-     }
-   }
- 
diff --git a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild
deleted file mode 100644
index 836745b08346..000000000000
--- a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="the GNU network swiss army knife"
-HOMEPAGE="http://netcat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/netcat/netcat-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nls"
-
-S=${WORKDIR}/netcat-${PV}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-flagcount.patch \
-		"${FILESDIR}"/${PN}-close.patch \
-		"${FILESDIR}"/${PN}-LC_CTYPE.patch
-}
-
-src_configure() {
-	use debug && append-flags -DDEBUG
-	econf $(use_enable nls)
-}
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_install() {
-	default
-	rm "${ED}"usr/bin/nc
-}
diff --git a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r4.ebuild b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r4.ebuild
deleted file mode 100644
index 3685ef0208f2..000000000000
--- a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="the GNU network swiss army knife"
-HOMEPAGE="http://netcat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/netcat/netcat-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nls"
-
-PATCHES=(
-		"${FILESDIR}"/${PN}-LC_CTYPE.patch
-		"${FILESDIR}"/${PN}-close.patch
-		"${FILESDIR}"/${PN}-flagcount.patch
-)
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-S=${WORKDIR}/netcat-${PV}
-
-src_configure() {
-	use debug && append-flags -DDEBUG
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-	rm "${ED}"usr/bin/nc || die
-}
diff --git a/net-analyzer/gnu-netcat/metadata.xml b/net-analyzer/gnu-netcat/metadata.xml
deleted file mode 100644
index cc4e9c9f18c3..000000000000
--- a/net-analyzer/gnu-netcat/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>netmon@gentoo.org</email>
-		<name>Gentoo network monitoring and analysis project</name>
-	</maintainer>
-	<longdescription>the GNU network swiss army knife</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">netcat</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index fc0d76201b31..827e635bd6e6 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -4,8 +4,10 @@ DIST hydra-8.1.tar.gz 559031 BLAKE2B a3d2b52508a1d03a2f3d6cecf7100543487b5a0f621
 DIST hydra-8.5.tar.gz 1193694 BLAKE2B bf202ccf58f64e2b57a15b5aaf8d4357b8d37d0a634179d2b4fe0c7d63da1e363b02e8578de7d984c75f1e764fc95477aecac9643954c05acbcc63865e066b0a SHA512 67fd92bd5983a94314334471c526b71ca77dec6e359e55f4fb2fc78160e2065957b6c9af1ff694bcc5334893a8b5e0fe1b39d984248bde4e55dc2a9f9a8b1271
 DIST hydra-8.6.tar.gz 1200238 BLAKE2B d9470be5280ec51dfcb701cc3dd87ffaef7076c990a30e833c3fe7bc0f2b951f40eae26dab28ebbb1116f3d5e884a3c0819a5913c68e714a3b8597af75140829 SHA512 d5d70b5df54fbc556c6db9e9e44b869f29e54aca03dc3cc9e1777d310fcf604b9602ba08250c5bb0d009963dc0ca5c169e61d3f64d7ec2383760fc819d6b6c61
 DIST hydra-8.9.1.tar.gz 1186320 BLAKE2B 97c29cda5e26197ed66aa29555b0e4de3ef5b08bf65aa09fd0d564ee5f63825af71d6a41c4552a06a4c86a98dab5a69913c0b0200fe4e5068284ec7fc1f1061b SHA512 68b07dcb22bc55937e79035954417d820691e3a1eea169c959886ce6a741f545efe7879f31f41a1751779c923410dcc67fe8914bb9b5cf567edfc6fad3997d72
+DIST hydra-9.0.tar.gz 1168498 BLAKE2B b4834c66fb1bebcd19151784b75d4c9220cbf7045b289a063a1cbc48a793abfa2edcb466d43234bd4c8e14074a2e2a39ccd697698392f24f39c84da54ee07165 SHA512 58067bd2696e82645bb959fe5537f2876e1d8c170a15fe6a9ac65bbdc33cfb75b47fd1a969c314a6c6d91b2b6c0ce4ba087680bbd67a5a38925a2a8b5c5ad338
 EBUILD hydra-8.1.ebuild 2233 BLAKE2B bfab4cabfd270198cebef133e46f02c0d37f31c6fe25e2328bea8afad5d1a6245e91935e241a7ebf641e2a6494c8ee375e51e095a38a1a133c2d3e7c1079b411 SHA512 ec97e4046bba01f8bb5e42c2524e88ede9dbb92d92d13cf02218ccabb8cbf94372af4b55e87cb64c73b745138f16cd63b2fef552304289db6761d5f1568ebd3c
 EBUILD hydra-8.5-r1.ebuild 2384 BLAKE2B 5baadb7ef9b87ad01b91cb1cb72bc5494b7d5dae8e3af2b2f5942bf2b49c8bbfdcd56c8b106fe8ceb466c35319bb7bc22e5341277e103a0b6fba24a5df9865b6 SHA512 9f1420cf1752c897c81e94f28c745d29d28d5d2a398e13e1d54f60089c8ab9d7fb40ca48836a1cad8714ce2066bd1ac2908749b2e162841830f8ca74c0f68ea7
 EBUILD hydra-8.6-r1.ebuild 2383 BLAKE2B 8632d894bc07e6f8a6582d062e6e2313771c468b47313634962388250d1a375b9ebb54d9c1a25ca57d246a825fc1b479868afa572813bfa6d6f11e09fc6cc927 SHA512 80a5bdf8bbd61d899c90c8b54e2a8a072ffcd8cc64e68479581c5895f6600b6ffd461b124e6ea0f406788ded984f4463c563bd2a73d2d0fed65b7553e70763e0
 EBUILD hydra-8.9.1.ebuild 2365 BLAKE2B a774ceb88fbc563a1306d9ec8b3e09095e693c73c037f064f1fc0d58d2be81eaab1ffaf7b0b278132dca3f93ec6fcb74f12ef19071da30a25856f6a11cc97b0a SHA512 4a9021fd787fdfc587b5ad585f5ec223e0876ef75baef4c7c397ecc54598858760d651ff4c10cc03e225708ebd26b86f0b4cfe22f8be752e419c510afde8d763
-MISC metadata.xml 440 BLAKE2B e3d225870d374fef1dfc92508a273aa3be760b20b994d9f0d0060be29c39411fefa865fd812a3979fbf7f338dd850d7d22a2947caf6cafbb66b4209bdd73090e SHA512 7ea011416c0de77c47fb7d8276cdcbefe0a11a9f9bb9b9a1d763f7f0c1bae705aea7db6252ba3284e3141c257216c845b8353c4a944c67ba3c8881467d827afa
+EBUILD hydra-9.0.ebuild 3632 BLAKE2B 530888e77109cdea282a15c056a1d14e805826675689317663c72b131f5e78d0085000773cd511772181e9cdef06f338636ed80f69e79d15569836b9bd30bf0c SHA512 67639cac1e89042f9754980abf0f16b732c1a1705ccb980574b6bf808b92a6971091dbc0370228bb0c3973bafb186ca6c6c5edbadcc78b592609d668cee1cb54
+MISC metadata.xml 571 BLAKE2B 15177ec654ebb1b0a8afe4fcf48578579765545b0a8c1477900b7bfb24718f2645ae1b4fbdeb7110e3a2958be58869bf57181d6d9518a26f0e6f7d751fec2d3e SHA512 41e64b2953d3512bebf56e82ba27690ef3cfa87ae6b6508838e0678229c06f7bea6b9cf50046c41c76f519fdf23b08971fbe3cd5176b2b4f3875ee66e78d7e5f
diff --git a/net-analyzer/hydra/hydra-9.0.ebuild b/net-analyzer/hydra/hydra-9.0.ebuild
new file mode 100644
index 000000000000..d71a62a645f8
--- /dev/null
+++ b/net-analyzer/hydra/hydra-9.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Advanced parallized login hacker"
+HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra"
+SRC_URI="
+	${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="
+	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses
+	oracle pcre postgres rdp libssh subversion zlib
+"
+
+RDEPEND="
+	gtk? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+	firebird? ( dev-db/firebird )
+	gcrypt? ( dev-libs/libgcrypt )
+	idn? ( net-dns/libidn:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	memcached? ( dev-libs/libmemcached[sasl] )
+	mongodb? ( dev-libs/mongo-c-driver )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	ncp? ( net-fs/ncpfs )
+	ncurses? ( sys-libs/ncurses:= )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:* )
+	rdp? ( net-misc/freerdp )
+	libssh? ( >=net-libs/libssh-0.4.0 )
+	subversion? ( dev-vcs/subversion )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+S=${WORKDIR}/thc-${P}
+
+src_prepare() {
+	default
+
+	# None of the settings in Makefile.unix are useful to us
+	mv Makefile.unix{,.gentoo_unused} || die
+	touch Makefile.unix || die
+
+	sed -i \
+		-e 's:|| echo.*$::' \
+		-e '/\t-$(CC)/s:-::' \
+		-e '/^OPTS/{s|=|+=|;s| -O3||}' \
+		-e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \
+		Makefile.am || die
+}
+
+src_configure() {
+	# Note: the top level configure script is not autoconf-based
+	tc-export CC PKG_CONFIG
+
+	export OPTS="${CFLAGS}"
+
+	hydra_sed() {
+		if use ${1}; then
+			einfo "Enabling ${1}"
+			if [[ -n "${3}" ]]; then
+				sed -i 's#'"${2}"'#'"${3}"'#' configure || die
+			fi
+		else
+			einfo "Disabling ${1}"
+			sed -i 's#'"${2}"'##; s#'"${4}"'##' configure || die
+		fi
+	}
+
+	hydra_sed firebird '-lfbclient' '' '-DLIBFIREBIRD'
+	hydra_sed gcrypt '-lgcrypt' '$( ${CTARGET:-${CHOST}}-libgcrypt-config --libs )' '-DHAVE_GCRYPT'
+	hydra_sed idn '-lidn' '$( "${PKG_CONFIG}"  --libs libidn )' '-DLIBIDN -DHAVE_PR29_H'
+	hydra_sed libssh '-lssh' '$( "${PKG_CONFIG}"  --libs libssh )' '-DLIBSSH'
+	hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}"  --libs libmemcached )' '-DLIBMCACHED'
+	hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}"  --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON'
+	hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT'
+	hydra_sed ncp '-lncp' '' '-DLIBNCP'
+	hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}"  --libs ncurses )' '-DLIBNCURSES'
+	hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}"  --libs libpcre )' '-DHAVE_PCRE'
+	hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}"  --libs libpq )' '-DLIBPOSTGRES'
+	hydra_sed oracle '-locci -lclntsh' '' '-DLIBORACLE'
+	hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}"  --libs freerdp2 )' '-DLIBFREERDP2'
+	# TODO: https://bugs.gentoo.org/686148
+	#hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '$( "${PKG_CONFIG}"  --libs libsvn_client )' '-DLIBSVN'
+	hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN'
+	hydra_sed zlib '-lz' '$( "${PKG_CONFIG}"  --libs zlib )' '-DHAVE_ZLIB'
+
+	sh configure \
+		$(use gtk || echo --disable-xhydra) \
+		$(usex debug '--debug' '') \
+		--nostrip \
+		--prefix=/usr \
+		|| die
+
+	if use gtk ; then
+		pushd hydra-gtk || die
+		econf
+	fi
+}
+
+src_compile() {
+	emake XLIBPATHS=''
+	use gtk && emake -C hydra-gtk
+}
+
+src_install() {
+	dobin hydra pw-inspector
+	use gtk && dobin hydra-gtk/src/xhydra
+	dodoc CHANGES README
+}
diff --git a/net-analyzer/hydra/metadata.xml b/net-analyzer/hydra/metadata.xml
index 40f7b4bb57bc..3a5ee322a93f 100644
--- a/net-analyzer/hydra/metadata.xml
+++ b/net-analyzer/hydra/metadata.xml
@@ -3,8 +3,11 @@
 <pkgmetadata>
 <maintainer type="project">
 <email>netmon@gentoo.org</email>
-<name>Gentoo network monitoring and analysis project</name>
 </maintainer>
-<longdescription>Advanced parallized login hacker</longdescription>
-<use><flag name="ncp">NCP protocol (NetWare) support through <pkg>net-fs/ncpfs</pkg></flag></use>
+<use>
+<flag name="gcrypt">Enable radmin2 support through <pkg>dev-libs/libgcrypt</pkg></flag>
+<flag name="libssh">Enable SSH support through <pkg>net-libs/libssh</pkg></flag>
+<flag name="mongodb">MongoDB support through <pkg>dev-libs/libmongo-client</pkg></flag>
+<flag name="ncp">NCP protocol (NetWare) support through <pkg>net-fs/ncpfs</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/net-analyzer/ifstatus/Manifest b/net-analyzer/ifstatus/Manifest
index 7337ba34d0c6..e00bc2bb340a 100644
--- a/net-analyzer/ifstatus/Manifest
+++ b/net-analyzer/ifstatus/Manifest
@@ -1,7 +1,9 @@
 AUX ifstatus-1.1.0-gcc43.patch 177 BLAKE2B eebb05af9a80e552ad162231a22cb6ae2a65f80f788fc863aa6a8f330fdca710e49cdb0974c8ff1271338c8b38e580b6db76e947a96d022dee7364195c74a724 SHA512 9241cfcceef902ee52ca6ee1fec4e84823b4c75fd2e8329b2644f6c776d77d298c0f5943aac4b901409117720021d595abb79ac8473a3dca18f2cf78e1ecf769
 AUX ifstatus-1.1.0-gcc6.patch 397 BLAKE2B 2b723cfec0fcd087606b32cbf8eced77f6e90e6bf20cd61ca43f0f5dde33a43bb8eaa7aeed699e1ab57e458aaa48f9689b2be623320a6c931768371d937bd4ab SHA512 f90abee913b3e16c44015e3f61a0b1dc120043293cdf439640443409d1b862e9881f5599a481db32b557a04e7f161cfbd378307e611a2499dbafd857ec00c47b
 AUX ifstatus-1.1.0-tinfo.patch 472 BLAKE2B 180f38fbeb7c820db4e25204e60719eb66acd193e12ceb3ab5c955a251a42f86f742970af4994472e215f40bc4f300ddfcf8b30ee8537bffb117446e2aef48f6 SHA512 0b30c07113d2bd8012438bdefcc494d8a80e14143af9e2099d511f934d50995e3f9cf3fcbafce947c139753f118dbee484742241a1ee3ea85593012a4835b56c
+AUX ifstatus-2.0.0-tinfo.patch 191 BLAKE2B 3294763f55f0219c9f19d317b931470aaa15b2463f3acf309475d88a4d30d2fe88839d3f41e250a80dc45c5c37022be2edd31b0e82db3c64bcc2e7b626408846 SHA512 febc844be240323844fc0b7f29b4c00ef4c0cfb29b50cad8501be05271d21733529f1725b0e5980f2c973663f9953e242b4f6bd4bb567d9a13701f0c7cca30ea
 DIST ifstatus-v1.1.0.tar.gz 25233 BLAKE2B de9d088bf7001799c3a54775c0c63d5dcf4f1f3f4998ce02b82a11bea7a6dabb1263829ff42ba1cd05ebd6b202827196757727c24db022ffa7d06ece38db6616 SHA512 2660310be7186067315414218e3d3d269499e391c7ffa12022ac53a0456ddbe0f7d5562b788fe6b2569b7d0eba7acf5699e0386769a91606a3e14b51239a2766
-EBUILD ifstatus-1.1.0-r1.ebuild 897 BLAKE2B ccf0ebc398530bafd475e99659ef8d8896667b11ab89dcea895ed3e1dba8b844be3ec741c42184c95e8fe907d661fda7db154ceeb49830aed0c1361393d3607d SHA512 71e51872bfb0653fa56446ee7be7c5e09f4dd88ebd41d670c7ef1ac769b480a66437ab739a84418b1a86dce9beec9fac822b96e2fe0456b58c5e00d5e47d7b6b
+DIST ifstatus-v2.0.0.tar.gz 24058 BLAKE2B 09a2b0af26cb05dfc24eefdbb6ac52b0ac289a687301f5fa67f0fcaf2622da96e149af3f7c08257e0ef8418f4f08b5ca1b77af71ba7c00dabddcb87cc95ddce7 SHA512 e1720f5dcc26788149cc72ccb72b85fffc72b367f2268e1e4f06a8fe4d80685146d310746c0b1a913e24995f6e93011d7d75ea5b4f9ca479af2d79264b89e27d
 EBUILD ifstatus-1.1.0-r2.ebuild 928 BLAKE2B 9646aaa3eeb56fa383563286a786142efeb0381552423eb4916671c6cc00d87fde4ea45427c70a484951ab2cce17b07d229d5ed4e6eedff375b325ecc1a5dabc SHA512 20882c2ebe3e23bedb9ba8ebcc83d5c37be9d9940fe3c51d71fe5f9041f3b6b56e44764134bbb76c696d682bf156a9e923c8dd3854ba4a5b4b1e45a5a1921a7b
+EBUILD ifstatus-2.0.0.ebuild 893 BLAKE2B 8c49738d994275e79823280afbcb24b150e1c82de6ec83dbb172690e1397134fbb83aad052c46ef92aee9f38d84e29736e461c4e2ceaa894d7257c28ce746fa3 SHA512 bf8da74e62af253c57a35b3b15067abbd9cd9cd03e862739e5cf080e4e92a6d89ba5017d518ec9812ed292939aa779377f7f208f6ebe4e5c31a1126287fe8cea
 MISC metadata.xml 358 BLAKE2B e6d48885bc56f4b4057509378e2f84fe2468c417805bcaca14686a250420762c76bd3a656612019d5784a65df12e85b4dbaf89265d9b91d9455190d234f28813 SHA512 b23a7f0e009c71d86cd145b033b4bc7f77e7a316f048d8236e9bb2bf9cd34671ec24af37b11ef934791c6f046e1a761087c7f5e570bac80b09e30862e162d005
diff --git a/net-analyzer/ifstatus/files/ifstatus-2.0.0-tinfo.patch b/net-analyzer/ifstatus/files/ifstatus-2.0.0-tinfo.patch
new file mode 100644
index 000000000000..ab2f5a921368
--- /dev/null
+++ b/net-analyzer/ifstatus/files/ifstatus-2.0.0-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,7 +2,7 @@
+ # Gabriel Montenegro 
+ 
+ GCC = g++
+-LDFLAGS = -lncurses
++LDFLAGS += $(shell $(PKG_CONFIG) --libs ncurses)
+ CFLAGS = -O2 -Wall
+ 
+ BIN = ifstatus
diff --git a/net-analyzer/ifstatus/ifstatus-1.1.0-r1.ebuild b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
index 219bdaa49c5d..7b2612d29fee 100644
--- a/net-analyzer/ifstatus/ifstatus-1.1.0-r1.ebuild
+++ b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils toolchain-funcs
+EAPI=7
+inherit toolchain-funcs
 
-KEYWORDS="amd64 arm ~ppc x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 
 DESCRIPTION="A simple CLI program for displaying network statistics in real time"
 HOMEPAGE="http://ifstatus.sourceforge.net/"
@@ -12,22 +12,21 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-v${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-RDEPEND=">=sys-libs/ncurses-4.2:0="
+RDEPEND="
+	>=sys-libs/ncurses-4.2:0=
+"
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
 "
-
-S="${WORKDIR}/${PN}"
-
 PATCHES=(
-	"${FILESDIR}/${P}-gcc43.patch"
-	"${FILESDIR}/${P}-tinfo.patch"
+	"${FILESDIR}"/${PN}-2.0.0-tinfo.patch
 )
+S="${WORKDIR}/${PN}-v${PV}"
 
-src_prepare() {
-	default
+src_compile() {
 	tc-export CXX PKG_CONFIG
+	emake GCC=$(tc-getCXX) ${PN}
 }
 
 src_install() {
@@ -37,7 +36,7 @@ src_install() {
 
 pkg_postinst() {
 	elog	"You may want to configure ~/.ifstatus/ifstatus.cfg"
-	elog 	"before running ifstatus. For example, you may add"
+	elog	"before running ifstatus. For example, you may add"
 	elog	"Interfaces = eth0 there. Read the README file for"
 	elog	"more information."
 }
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 91e7fe284646..3b6df1a1cef1 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -12,17 +12,14 @@ AUX munin-node_init.d_2.0.19 598 BLAKE2B a6442b2873a01d3846ae502314bbdee4ac08ce9
 AUX munin-node_init.d_2.0.7 745 BLAKE2B 069f730d947991d9ecbc75dfa038dcc5ef089ad1759dbea8d15c40a4fef7b5b33a1bc9dea2d916c0e4dd88285015a7aa714f3fd900c7724e3d3e620b84a4cdd2 SHA512 e6652707c539afef01e7cd777acec2c639edf66fb9bf1f126711d19f166eb3ef69d5ed8e895e77e4fb0b7f5a4c8788eb6532f4e09d13693d164e6edbde55e5d0
 AUX munin.apache.include 604 BLAKE2B 796293be594baefca293b6cc5f5d6f31c9ab28ecaa209c776aced2d2a0916ff4b61c195393f19355a6460bf2bde8baf41892e4f41905332996afde32e99397ea SHA512 de4797ccac5c9299dd55140300276f746febf3ac5bfebfc48901ca71fa0e035017917eba054b251cc2383c65f1e209e244906b34eebad237f43a7bd7171f6087
 AUX munin.apache.include-2.4 577 BLAKE2B efd0a424cb058b77aa19d6384fac085345f789264b19d878126ca826eda84e79714741529218d9715ba51e175cb1628839e1ca09733f67b370b2401e019c9351 SHA512 b07791a4d5b822b5d0ad84ddbea3444cc1475cee8ee20f62dbb5f3a1792b71dba995e412433d30b3c295e40ad5346528d25e04438ec2dfa535983aae9198cea4
-DIST munin-2.0.34-gentoo-1.tar.xz 11920 BLAKE2B 19cb949b8712ad57544b424de0cb09f9eb33d4c8fe5f680bd3655efb5f0adce53ba4a839258e0324bf734f7367819abc8c6a4b859a48b36b015ea80c0b1f4a29 SHA512 706f8dd1ba49eadb5e89f821f52d4c691b0270885a4167639b6417f9516bb2b0b8b212a82f50fb892e03b57817d650b3552754ecb437718c7e7ef3cdfaf83b2b
-DIST munin-2.0.34.tar.gz 1349842 BLAKE2B 641a780cd42d07c1a4f370dbf3a2647c99d3d69b5226a50f198ef561ff36e362fe397a55102ce57ef70a4a730ed14e02cb3a4f3043cac1874f36670535e0968e SHA512 db802266842e103017c8c3bc0fc676d0d6146a37b06e69e709cfb396d67c42ac4932b8d4979e4d1a108fc0c2467c66423799212f6ea1279fb9ed64352ddf41cc
 DIST munin-2.0.38-gentoo-1.tar.xz 5404 BLAKE2B d375c6a6c5bda768f83f701a9cf0236eba6f024c6ac430356cff725c35cfdd84240f5df57d87a0c5bcd71fa5c1dc0482c6a91f7a46d75aeca68f745a74264243 SHA512 a725f978710f328b0a14aa96b5ba499eead358668431c2d53483847846a447bc6f5be855d12c0c13e7dadf821e1c8aee1352ba90f380db389c6d720a0704785f
 DIST munin-2.0.38.tar.gz 2253625 BLAKE2B 10e4c1f9fb846fd30491c00c5be19d627ae97b033a190cfa1d3a5def7455daf7c6cae741b08f3389b4508220eb2bda6b6afd7eddf620dbb745eecd9cbc3e7b08 SHA512 1139cd2ca765ba85fcf7cf37986fb0dd5423d976ae2943373ee4706f376a6f299f0c626912db318eb49e541054017c604725e6f9b0c1e9198530375a2db6eb05
-DIST munin-2.0.43-gentoo-1.tar.xz 4288 BLAKE2B 4b8695c8800712d07474aac3057041c03c63226a7569895d8ff5587592d0d7cdfaf808675ecf08a47c1986a2d8f8cb220091ce680aa87e1e4b7b5f88c806b258 SHA512 ebcd44d9385c799514ac930790928052692ab0f71bc4a641899fa9b6458e083b7f16230a95f703c5b0e2848ab6879e79a1e77f165fcd880c91e4581aafa336aa
-DIST munin-2.0.43.tar.gz 2264931 BLAKE2B 92f2e13517a725303fe2569e65539b432822aa713c663a9974b9fba62db02a3606d0c56240e4e9d108a9f1aaa2ed3fcd9622387aa9b28eccc28356aee2e28777 SHA512 c01448e51aceafd8330e815c11fe63458768b48209edbffad983cffeff2b46f6eef8726792793485d491be9530dacb0bce11abeb2664e01541c73a77c9fd360c
 DIST munin-2.0.47-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.47.tar.gz 2257217 BLAKE2B 5b21c779487741ed505f77e07926d275741471a4dc699c8b8032bf008853c93757b7d0303773fbd76ec72dcf9185927a50517ca6d7744bd1020cdccd966cbb1b SHA512 63b292378576726886a606f089ef3b19073bba89b63768570d9f1e6d12c69d1dcded6b2b377fd53290443108023a01c9cc81b6fd2ea092259cdf5b116bff665a
-EBUILD munin-2.0.34.ebuild 12222 BLAKE2B 2a807d7d83ae99af03812a00bebb78d6089a4a94f7fae417b99afa0b07a0ea53ec633334b682c839ee018bb56b6b8e6fb043ec038930bcd89fa04e151f22d70d SHA512 20b6ee28055cb652d231046d1725ca75160d274b41da1fbc9e67bdbe276948013a7376ca9563b3dac71195f4cbd460644db1db0daa00f89c8302603976553a9c
+DIST munin-2.0.49-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
+DIST munin-2.0.49.tar.gz 2257501 BLAKE2B f2852357e3aa0c1ca3e217b66c3e2d1c0d9c70bf1f8487517ee913e2223ca1c5ae9b922c07f83754522c51fddd0f72f87f5ceea9b7e9642a44aab04ead44538f SHA512 e8bf652000ab76f16bc3b18a16c5231ffb5523fe9f78a90bec97ca31e46ff73566e1cbbf0a3616931d0b46ceb6f5a2b5d4fdc68c797539419a2217dccf643762
 EBUILD munin-2.0.38.ebuild 12317 BLAKE2B b6ff588ee1677a7c4224f7c9bc11701fd3b6c4c1384644254ca75a9e30a885222eaae96344415b773311d70e17443043e573ef7fa1f38fd16358acd452dee614 SHA512 a536fd709bf2bec938551eeba84054b9a8b7a12e82ec9c2abc75f81463871c8809e6d97cfe5dd0e265d2bcd3faf25c1dc438d6fb7ded527cd2ad4437733bc7eb
-EBUILD munin-2.0.43.ebuild 12271 BLAKE2B e1c883585d3e0385ea3c26e4eaa192bca79375416c71cb05f638ead5e553c75df9e9f8fb21725ec80f1dd6fb3a02749cc73a9e59fe918762ea1063ee19ed9f93 SHA512 2dc47464b3a1a0f437e8cf9d6794ee5587306b44e522217db2df2bf483ed1e1cb9909a7d21141c19cb27ec8145492303c1ec50b09f1c7cc919d4c94da4054fb6
 EBUILD munin-2.0.47.ebuild 12243 BLAKE2B dea9c3a348864d433d2ea6eb9d855aa8304d4e37f0821e827bc02b6540119afc1984839500bae78e542830ad21fed41cb905cf4c1fff0ab8e2872d1774cf75f2 SHA512 9e2dc7f379d7d99d486fe7f298e36dd9b21129526afe63eee2c3fd148fce4fade486e056edea616decc5d4e38dd530ab6c72d2d495adc9df2083ddb75a3a1dc9
+EBUILD munin-2.0.49.ebuild 12278 BLAKE2B f0718f2ef584bd6ff3af292889cd054e6db60785b6fb25a20704fc8a48def5707db089c98dcb31e7a86bea28830452317b6401a5b0b4d3020d958937025b2780 SHA512 b153bcf01e52eff5312c8df9b457ba784d99d3861ca2c61f9044c9b942e9b0a4b1b3cf91093e354c97c50f54cf4f466f6767f7ebf5c13b52fd0709f336487842
 EBUILD munin-2.1.9999.ebuild 11520 BLAKE2B 7f55a4e139ddb37419299ff65fbda91e22a3e890c86c23bc7d83f902fdc81f36ad665d3f0c6d7bbfdb60684740e1ae86ec9ec9f34dbf15f49e5385c72156fa55 SHA512 6069e6d31b9385885e98e815d4bf33227689fa8e74c48f4aa7b6af673be76d25ef26e777ef819563a8978a3cd73bc518b0ad3e5807c58a5b0e575aeb712f5ce5
 MISC metadata.xml 4116 BLAKE2B 652f8bb067b024f91b3f2fb9d885c93405ccd3e4fdfa141ae5e2996f9898e757d7be93d7e74d027a82403d2b9b472f7c6fec95815b18a0b2975e20e328fb7862 SHA512 ecfa257040277d815c05693724e9ff454b5ddefc1134b6afb38d66783a5e415aae78bdb35aeb0e80882a7b8ff19499f2b3b3646cc2a139e7797a0a718c2389f3
diff --git a/net-analyzer/munin/munin-2.0.34.ebuild b/net-analyzer/munin/munin-2.0.34.ebuild
deleted file mode 100644
index f786b99dcbc4..000000000000
--- a/net-analyzer/munin/munin-2.0.34.ebuild
+++ /dev/null
@@ -1,413 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PATCHSET=1
-
-inherit eutils user java-pkg-opt-2 systemd
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin-monitoring.org/"
-SRC_URI="
-	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
-REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
-# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
-DEPEND_COM="
-	dev-lang/perl:=[berkdb]
-	dev-perl/DBI
-	dev-perl/Date-Manip
-	dev-perl/File-Copy-Recursive
-	dev-perl/List-MoreUtils
-	dev-perl/Log-Log4perl
-	dev-perl/Net-CIDR
-	dev-perl/Net-DNS
-	dev-perl/Net-Netmask
-	dev-perl/Net-SNMP
-	dev-perl/Net-Server[ipv6(-)?]
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	virtual/perl-MIME-Base64
-	virtual/perl-Storable
-	virtual/perl-Text-Balanced
-	virtual/perl-Time-HiRes
-	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
-	asterisk? ( dev-perl/Net-Telnet )
-	cgi? (
-		dev-perl/FCGI
-		dev-perl/CGI-Fast
-		)
-	dhcpd? (
-		>=net-misc/dhcp-3[server]
-		dev-perl/Net-IP
-		dev-perl/HTTP-Date
-		)
-	doc? ( dev-python/sphinx )
-	http? ( dev-perl/libwww-perl )
-	irc? ( dev-perl/Net-IRC )
-	ldap? ( dev-perl/perl-ldap )
-	kernel_linux? ( sys-process/procps )
-	memcached? ( dev-perl/Cache-Memcached )
-	mysql? (
-		virtual/mysql
-		dev-perl/Cache-Cache
-		dev-perl/DBD-mysql
-		)
-	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
-	ssl? ( dev-perl/Net-SSLeay )
-	syslog? ( virtual/perl-Sys-Syslog )
-	!minimal? (
-		dev-perl/HTML-Template
-		dev-perl/IO-Socket-INET6
-		dev-perl/URI
-		>=net-analyzer/rrdtool-1.3[graph,perl]
-		virtual/ssh
-		)
-	"
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	dev-perl/Module-Build
-	java? ( >=virtual/jdk-1.5 )
-	test? (
-		dev-perl/Test-Deep
-		dev-perl/Test-LongString
-		dev-perl/Test-Differences
-		dev-perl/Test-MockModule
-		dev-perl/Test-MockObject
-		dev-perl/File-Slurp
-		dev-perl/IO-stringy
-		dev-perl/IO-Socket-INET6
-	)"
-RDEPEND="${DEPEND_COM}
-		virtual/awk
-		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
-		java? (
-			>=virtual/jre-1.5
-			|| ( net-analyzer/netcat6 net-analyzer/netcat )
-		)
-		!minimal? (
-			virtual/cron
-			media-fonts/dejavu
-		)
-		selinux? ( sec-policy/selinux-munin )
-		!<sys-apps/openrc-0.11.8"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup munin
-	enewuser munin 177 -1 /var/lib/munin munin
-	enewuser munin-async -1 /bin/sh /var/spool/munin-async
-	esethome munin-async /var/spool/munin-async
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${WORKDIR}"/patches/*.patch
-
-	eapply_user
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
-	use cgi || cgidir="${T}/useless/cgi-bin"
-
-	local cgiuser=$(usex apache2 apache munin)
-
-	cat >> "${S}"/Makefile.config <<- EOF
-	PREFIX=\$(DESTDIR)/usr
-	CONFDIR=\$(DESTDIR)/etc/munin
-	DOCDIR=${T}/useless/doc
-	MANDIR=\$(PREFIX)/share/man
-	LIBDIR=\$(PREFIX)/libexec/munin
-	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
-	CGIDIR=${cgidir}
-	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
-	CGIUSER=${cgiuser}
-	DBDIR=\$(DESTDIR)/var/lib/munin
-	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
-	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
-	LOGDIR=\$(DESTDIR)/var/log/munin
-	PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
-	JCVALID=$(usex java yes no)
-	STATEDIR=\$(DESTDIR)/run/munin
-	EOF
-}
-
-# parallel make and install need to be fixed before, and I haven't
-# gotten around to do so yet.
-src_compile() {
-	emake -j1
-	use doc && emake -C doc html
-}
-
-src_test() {
-	if [[ ${EUID} == 0 ]]; then
-		eerror "You cannot run tests as root."
-		eerror "Please enable FEATURES=userpriv before proceeding."
-		return 1
-	fi
-
-	local testtargets="test-common test-node test-plugins"
-	use minimal || testtargets+=" test-master"
-
-	LC_ALL=C emake -j1 ${testtargets}
-}
-
-src_install() {
-	local dirs="
-		/var/log/munin
-		/var/lib/munin/plugin-state
-		/etc/munin/plugin-conf.d
-		/etc/munin/plugins"
-	use minimal || dirs+=" /etc/munin/munin-conf.d/"
-
-	keepdir ${dirs}
-	fowners munin:munin ${dirs}
-
-	# parallel install doesn't work and it's also pointless to have this
-	# run in parallel for now (because it uses internal loops).
-	emake -j1 DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
-
-	# we remove /run from the install, as it's not the package's to deal
-	# with.
-	rm -rf "${D}"/run || die
-
-	# remove the plugins for non-Gentoo package managers; use -f so that
-	# it doesn't fail when installing on non-Linux platforms.
-	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
-
-	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
-
-	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
-
-	dodir /usr/lib/tmpfiles.d
-	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
-	d /run/munin 0700 munin munin - -
-	EOF
-
-	systemd_dounit "${FILESDIR}"/munin-async.service
-	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-node.service
-
-	cat >> "${T}"/munin.env <<- EOF
-	CONFIG_PROTECT=/var/spool/munin-async/.ssh
-	EOF
-	newenvd "${T}"/munin.env 50munin
-
-	dodoc README ChangeLog INSTALL
-	if use doc; then
-		cd "${S}"/doc/_build/html || die
-		docinto html
-		dodoc -r *
-		cd "${S}" || die
-	fi
-
-	dodir /etc/logrotate.d/
-	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
-		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
-
-	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
-
-	if use syslog; then
-		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
-			"${D}"/etc/munin/munin-node.conf || die
-	fi
-
-	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
-	# munin-node service is ran as user root, and only later drops
-	# privileges.
-	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
-		"${D}"/etc/munin/munin-node.conf || die
-
-	keepdir /var/spool/munin-async/.ssh
-	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
-	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
-	fperms 0750 /var/spool/munin-async{,/.ssh}
-	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
-
-	if use minimal; then
-		# This requires the presence of munin-update, which is part of
-		# the non-minimal install...
-		rm "${D}"/usr/libexec/munin/plugins/munin_stats
-	else
-		# remove font files so that we don't have to keep them around
-		rm "${D}"/usr/libexec/${PN}/*.ttf || die
-
-		if use cgi; then
-			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
-
-			keepdir /var/cache/munin-cgi
-			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
-			fowners $(usex apache2 apache munin) \
-				/var/cache/munin-cgi \
-				/var/log/munin/munin-cgi-{graph,html}.log
-
-			if use apache2; then
-				insinto /etc/apache2/vhosts.d
-				newins "${FILESDIR}"/munin.apache.include munin.include
-				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
-			fi
-		else
-			sed \
-				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
-				-i "${D}"/etc/munin/munin.conf || die
-		fi
-
-		keepdir /var/lib/munin/.ssh
-		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
-		IdentityFile /var/lib/munin/.ssh/id_ecdsa
-		IdentityFile /var/lib/munin/.ssh/id_rsa
-		EOF
-
-		fowners munin:munin /var/lib/munin/.ssh/{,config}
-		fperms go-rwx /var/lib/munin/.ssh/{,config}
-
-		dodir /usr/share/${PN}
-		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
-		# Force the shell to bash
-		SHELL=/bin/bash
-		# Mail reports to root@, not munin@
-		MAILTO=root
-
-		# This runs the munin task every 5 minutes.
-		*/5	* * * *		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#*/1 * * * *		/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#*/2 * * * *		/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#*/15 * * * *		nice /usr/libexec/munin/munin-html
-		EOF
-
-		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
-		# Mail reports to root@, not munin@, only execute one at a time
-		!mailto(root),serial(true)
-
-		# This runs the munin task every 5 minutes.
-		@ 5		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#@ 1	/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#@ 2	/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#@ 5	nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#@ 15	nice /usr/libexec/munin/munin-html
-		EOF
-
-		# remove .htaccess file
-		find "${D}" -name .htaccess -delete || die
-	fi
-}
-
-pkg_config() {
-	if use minimal; then
-		einfo "Nothing to do."
-		return 0
-	fi
-
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /usr/share/${PN}/f?crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-
-	ebegin "Setting up cron ..."
-	if has_version sys-process/fcron; then
-		fcrontab - -u munin < /usr/share/${PN}/fcrontab
-	else
-		# dcron is very fussy about syntax
-		# the following is the only form that works in BOTH dcron and vixie-cron
-		crontab - -u munin < /usr/share/${PN}/crontab
-	fi
-	eend $?
-
-	einfo "Press enter to set up the SSH keys used for SSH transport"
-	read
-
-	# generate one rsa (for legacy) and one ecdsa (for new systems)
-	ssh-keygen -t rsa \
-		-f /var/lib/munin/.ssh/id_rsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	ssh-keygen -t ecdsa \
-		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	chown -R munin:munin /var/lib/munin/.ssh || die
-	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
-
-	einfo "Your public keys are available in "
-	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
-	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
-	einfo "and follows for convenience"
-	echo
-	cat /var/lib/munin/.ssh/id_*.pub
-}
-
-pkg_postinst() {
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node."
-	elog ""
-	elog "To make use of munin-async, make sure to set up the corresponding"
-	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
-	elog ""
-	if ! use minimal; then
-		elog "Please run"
-		elog "  emerge --config net-analyzer/munin"
-		elog "to automatically configure munin's cronjobs as well as generate"
-		elog "passwordless SSH keys to be used with munin-async."
-	fi
-	elog ""
-	elog "Further information about setting up Munin in Gentoo can be found"
-	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
-
-	if use cgi; then
-		chown $(usex apache2 apache munin) \
-			"${ROOT}"/var/cache/munin-cgi \
-			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
-
-		if use apache2; then
-			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
-			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
-			elog "host you want it to be served."
-			elog "If you want to enable CGI-based HTML as well, you have to add to"
-			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
-		else
-			elog "Effective CGI support has just been added in 2.0.7-r6."
-			elog "Documentation on how to use it is still sparse."
-		fi
-	fi
-
-	# we create this here as we don't want Portage to check /run
-	# symlinks but we still need this to be present before the reboot.
-	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
-		mkdir "${ROOT}"/run/munin
-		chown munin:munin "${ROOT}"/run/munin
-		chmod 0700 "${ROOT}"/run/munin
-	fi
-}
diff --git a/net-analyzer/munin/munin-2.0.43.ebuild b/net-analyzer/munin/munin-2.0.49.ebuild
index f62ac42c05b1..caf8f3564d6e 100644
--- a/net-analyzer/munin/munin-2.0.43.ebuild
+++ b/net-analyzer/munin/munin-2.0.49.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -97,7 +97,7 @@ RDEPEND="${DEPEND_COM}
 		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
 		java? (
 			>=virtual/jre-1.5
-			|| ( net-analyzer/netcat6 net-analyzer/netcat )
+			|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
 		)
 		!minimal? (
 			virtual/cron
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 54de15ac5f37..17f2542ce038 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 5238 BLAKE2B c81ee055e0f8c08b7d212cdfde040c70ca6e44f8b9e3f30e525ba55f4eaf6471e0407decb306e2e9d6bd4b249574c931c4e9713771ba9b573187bdb0ae72a1e2 SHA512 c67d9d362d217b74f688dffce217399b2395104e8512786ad906353441f8822e13f1283ae16d576aa5f513d58009239dc3362635e478ca954b7eb40c6f75cfa7
+EBUILD net-snmp-5.8-r1.ebuild 5237 BLAKE2B 95c6e3e548dbadec6a92578b38e37e33df7b4ae38f472e1b1790822ad8733bbc91aa21a92b97936d87d65a6ec785a44f9c5e2ce7e15e1a64100d5983248966b8 SHA512 6e9de1aa9dba9552c7a9e046d0bb01db8d4b6e4feeb5417e17503d4beb8ab1acf7a43346ae4853440b0f85565c4186d1fcadb88e07ff5165d91fd66c42803af8
 EBUILD net-snmp-99999999.ebuild 5190 BLAKE2B 49c9bf18d335cdeace6e94a6046c74a3241ec66100d625e6ef5967e86cfed06417d44bfb80940e49d67cf67fd021962bba5eb4c8be007390dc40c3fccf625e73 SHA512 c771920f9db1560b23f43fb3689af3b36deb691d94912d324f09f513a744eafbdfe2f24ce09c4bf33b8d5cb6b330853835a5297e27003ece8b3c32dd4d023e98
 MISC metadata.xml 1142 BLAKE2B d026289018d327a888079b9c3cb7cf65dff58dd87735f7317d15d78698fe307d4dad2dfed10adab428eee0eb3abf357c82554b0861029a70fb60b82537601d84 SHA512 76efbc8444b344164960e671df273afaadbb4b64e73b136f559d4f039ee4b145f8ae989d271a8cc025edc917e4213828e0c77f6e5b0258b4c0eb9653c98c58c0
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 4f53c1fa2dde..206113c8979c 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 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/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 5dcf097ca85c..3d6ba3bbeebf 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -3,7 +3,9 @@ AUX pmacctd-init.d 839 BLAKE2B 06d09dd80b526c9e12579e0ee2f76de96d91fef6f533727c5
 DIST pmacct-1.6.2.tar.gz 1311678 BLAKE2B 123629ca2e5e58bb4e684001b1c6d2d510e18450eed1c6e45bbe79ec7bb37072ba9b844fe0d8826a7923d0b09cf6923ea87d4e22fb2f251e7ebb9744d1c59b93 SHA512 8495f97752ae586fd842eed49ce91db3e4753133f7d380d067e7df153abeea469e5126800074e9071cb7227a3f1df64d4642dfece624fbbfa39b4537fde38b46
 DIST pmacct-1.7.1.tar.gz 1392360 BLAKE2B 75a4dda461c2fe643c24a901c19efacf325d1922bcda503a1ff41fe0b6c4178732d476b479875e9e0ba34872dbd86b8d8b2087471148f10e202f57c4a212f2fd SHA512 6a5d75522b9197b324907598ee4ba22bbda96b45e10f62df2ae507e23faac927af5468f587deab08d1e0f3f6422c609d106dcf30fa7bf16eb215bb35ea6aa08c
 DIST pmacct-1.7.2.tar.gz 1416302 BLAKE2B 5d6f9c5849c07c7bdd3b6251b2611935ff558ca393d2cc0d21e5e681b0069b3a5bb4a985a9dc59b62b8b4ed697ecbd4cbb71f0aba42ce8d1527187b98d2e90d3 SHA512 ffdc63e96fc6af6f5d531243bc0aec0925663d8e91e83ada275f8e9a969dcf85cebd06b17ae2c796722bb209602d5b2bc487757ec736a740a8f33698d93a8675
+DIST pmacct-1.7.3.tar.gz 1467237 BLAKE2B a2fb627df9f61f91c69a9333a968485695b45c8ebe812e11ba250185a5e93f262954290d7ee41789fb13f7f5c5ef336294be83c8d91adcd0fc3c348485e515af SHA512 09d0e6721760035112cb0c7936fe177f7858b19fa1df2c7da84822dc816413e7c6bace35fe45ad32930961183d61f9e4f3a4879747be45f47ab658a3e0f055b2
 EBUILD pmacct-1.6.2.ebuild 1790 BLAKE2B be2fe64588677200a54a4866e2946cb5516fb65d4f1ac0bef07287796321d3832c4acba1284f8bc285bbacf6513493a297880bccca350e6d7286ef6569e1d6e6 SHA512 6db9673c145cec1da55e4cd18428f64fb334066eb0a5794adc6127a0ba27144301237aa6e30e1c4a93ce892ad4306369da46e9572b41430df7a776080b7edcc0
 EBUILD pmacct-1.7.1-r1.ebuild 2131 BLAKE2B 93f73d535296d1c3634968a262a1d4aea8b7e27150310ed051a5e7a0bd42c95f09452b7bd0116521763b8acf890a71742ce0772c0468eadfb5dd17717ff5750c SHA512 e2cb9688373c62963391d989f99b909ae246d5b890333d7352871abe9f8feda20bcc046e29777bf0002fee5e6952f1ec49b6ea0decd927b240c919d8c4b2f5cf
 EBUILD pmacct-1.7.2-r1.ebuild 2125 BLAKE2B 8a2d62e19cf7e5c6f2de12956cbdda845825648b18c19c4d37190e1cbdd4cc0dd926e8c2330b5bc5acbaee2c989cbbb8f928d31fbe1566fa049549972a9f5828 SHA512 55d6e8b369a0f734e81175829472b2312cf7e24a23acfb3609a76adcbe3f72e2df4ff6460b87fc4c381ea78cd95f446ce26f956b35e4a46d9ebce8ec1ac597e1
+EBUILD pmacct-1.7.3.ebuild 2107 BLAKE2B 1b41bedd1d6f0e7f4968941597162eca42c246900b2db0ea466d81070b6b9d2b4b3ebf33740a55ce2dcb84f79f0d82d4451db63e48bf543ebed4f2d8aee36079 SHA512 534a7a873a1308faabb8c5f4dea983e4a62cc5bf72fbf58830982e0a7dce945dbd108db5a79806ea13b6ad19353054a0a147e43666861a66a556d5481c610f7a
 MISC metadata.xml 1424 BLAKE2B 75ce1e74993587289adbef0841807d758f0a587bc5b0429cb03a86be690d49479a2cf37211006ae905473528f3f4714ec2827e5bc556a4bcaf368215f97db7b8 SHA512 ddfd0eaac09d66640660baffe80ca83911000632416602eb258b2c01e630ada343ebeff7191c53fe71e4d5e658c94eac9a95bf4527a9ba40ee674ffa9442d856
diff --git a/net-analyzer/pmacct/pmacct-1.7.3.ebuild b/net-analyzer/pmacct/pmacct-1.7.3.ebuild
new file mode 100644
index 000000000000..5887b587804d
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-1.7.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="http://www.pmacct.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="
+	64bit +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql
+	ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq
+"
+REQUIRED_USE="
+	?? ( geoip geoipv2 )
+	kafka? ( jansson )
+	rabbitmq? ( jansson )
+"
+
+RDEPEND="
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	geoipv2? ( dev-libs/libmaxminddb )
+	jansson? ( dev-libs/jansson )
+	kafka? ( dev-libs/librdkafka )
+	mongodb? (
+		>=dev-libs/mongo-c-driver-0.8.1-r1
+		<dev-libs/mongo-c-driver-0.98
+	)
+	mysql? ( dev-db/mysql-connector-c:0= )
+	ndpi? ( net-libs/nDPI )
+	nflog? ( net-libs/libnetfilter_log )
+	postgres? ( dev-db/postgresql:* )
+	rabbitmq? ( net-libs/rabbitmq-c )
+	sqlite? ( =dev-db/sqlite-3* )
+	zmq? ( >=net-libs/zeromq-4.2.0:= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_configure() {
+	tc-export CC AR RANLIB
+	append-cppflags -DMYSQL_SERVER_VERSION=99999999
+
+	econf \
+		$(use_enable 64bit) \
+		$(use_enable bgp-bins) \
+		$(use_enable bmp-bins) \
+		$(use_enable geoip) \
+		$(use_enable geoipv2) \
+		$(use_enable jansson) \
+		$(use_enable kafka) \
+		$(use_enable l2) \
+		$(use_enable plabel) \
+		$(use_enable mongodb) \
+		$(use_enable mysql) \
+		$(use_enable ndpi) \
+		$(use_enable nflog) \
+		$(use_enable postgres pgsql) \
+		$(use_enable rabbitmq) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable st-bins) \
+		$(use_enable traffic-bins) \
+		$(use_enable zmq) \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql telemetry; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index c0c8985be57f..4815cc5859b4 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,8 +1,10 @@
 DIST scapy-2.3.2.tar.gz 1166056 BLAKE2B bce5f37bd833dc457089cdfebd2dc019c4f7bed636935b4a6b51a2cf7355f5761fadaa304e93c276daa2200c48ab0e1c0a08bd278e30dfea1faa01321a0b957e SHA512 6b15e102708d1bd0ca0c910e2d82416cd172634409f93c506542a7dc6b69ddc9c9afef6ec07929f70cc0f8f4c455cdc84d9b35bc2c5b72f79dd7e6785306dc7a
 DIST scapy-2.4.0.tar.gz 3182131 BLAKE2B af591b103c90736a5e62801f4c0ebd495e2e71c79ee81f04fdd194739b460c9940b8fcf0c6e279701095979144eff25ca4734926c0251721b37dc63fe8dd9e89 SHA512 0fe80150cd83db7735c9d0b70ec832a4e68eb5160ad8559e9b1bd79c52a9950ef7c9555ea2a1ee1dc8df1f055a885c52552c29e304faf40250ce9c502a5f870a
 DIST scapy-2.4.2.tar.gz 3330071 BLAKE2B a40074594cd561b33d04364fba743fa5fe741b06b2ad8f8f9ebe9dfb0b9a3bc4f641cd16d99a4ba070fc0763d7cfeb8d3ecd056f162d509070cdd57d55d6ad9c SHA512 980f708a849ae26edca3eb6618a41668818c5883bca699f347f47a8964b3ee44a6ceefe4a12cb7d5fe6c13f5cbe2b7547938e53139f4ec9e6ef384e30c9bb6db
-EBUILD scapy-2.3.2-r1.ebuild 859 BLAKE2B 0ca5a6e0167ba5979444c5e994f7b7cc70ff6956862f757a2303698c71930f1f08815a74e4500a7fe9f5667d9723765461b02b2264c9332e29d9c38820cc8386 SHA512 7b731147b9b3024e00dcaf4ce0c43d23fafcff737389be66d7ad4a9b3f5f4a15ef00d2e255eaf0487377e2c6a4b88017c4fb8265dcc4f9a817ef0785da494661
-EBUILD scapy-2.4.0.ebuild 1032 BLAKE2B fc0f639924d5e7fe3664e5935a569653b3f30964a9ec20900ddf00869c51ecb2ab9260dcf0d1f7615a3fcbf16ae7248f07c3d7be442c245e407ac60ecab6b116 SHA512 60b0c20b04e0463c38e10c1e74fc675e316b0976e85fd0a76abc630cbeecb08fb2159212c493e82077c5f1abeeec09b7cbecc436eb4f06648307602ec24a39d8
-EBUILD scapy-2.4.2.ebuild 1034 BLAKE2B e49261facec1453d9a35955e7c0c959bb1df5a16192052e3c88de498625a2fff1ae72422e5973b6837e59d3fdfde8c223dbd442fe0e5da7c20391de5e5dcda31 SHA512 71f020a55c0748eb1bcb76a27137248460c6c23db5bb5dd7160af6c8f45bf0c761c314ac76aca24c2c1eeef31a40406fa7f614ddce11e77d81220a1ab54d3617
-EBUILD scapy-9999.ebuild 994 BLAKE2B 89b25b3c24f18409eefaf5b29ebe052a2c2dd8436ca8d467d7709f61c570e8006d5277bb7d1a0311334f30146e61a06f5a1dd4a9f358c70a27940fb951af2cc4 SHA512 b848b8bf4752e5eea1bcfc491f328d8a58795fa0719f7861e6e647bf705af36c5ff82cdbcfa5f31ff80875f1d9f0aa35366b5f02ac871bb61bb470cabde101b3
+DIST scapy-2.4.3_rc1.tar.gz 2455703 BLAKE2B 7db2af39afad694b49296d0e02a7e649c31023fbb12d66faccb777e297240b84e39558dd0ba56dab159e8412cec93d868ec02542afa385e2ec49d1a80b8788d4 SHA512 29996996521d5802b435c27dee5ad91fdd3e974dc86a3ba1377c67eb5c81a639fdfa18790ca2275df54685a963f7c69bde10b01887ba54315ddef6d2c002f8d8
+EBUILD scapy-2.3.2-r1.ebuild 869 BLAKE2B a1695ad6505bc5367342dfc3ffbd9a5d8e537f3cbdda910e69f617e1a93932d4f2bdd2a7bba2b1d887de7bb7f79a14dca981d12a7c4468683fe3eaae7820a67c SHA512 375c40a3da50a5ba136034c2c3cccba46d61c6ac63ff29c12d0ceeb3e20fece28812b0a1bd22710ec1ec0be62c57263f5744a652052bdd461099f657d63636f5
+EBUILD scapy-2.4.0.ebuild 1013 BLAKE2B e3c6a15e9faacdcf4bd5e36b0ab8e97b962012ca80df400393fc3011847829c52ce231e5594a85a611e74b342f1713d9a0679e0dbef71ca251205a22af1aac48 SHA512 e4c1595760abbb32fc7d0545e94974a044201d7219ea9537ef2ccd60550fd1d4fa0d0b30bdb639885c53cdce9077fcd974ea71182bb5d664b3210576c68ae596
+EBUILD scapy-2.4.2.ebuild 1015 BLAKE2B 84ed365afa54aca1f499902ebc7a200f3464f9f7e9157fdab17749ce59cf25524e18ae9f7181e09e760d2a02ddd701eeccb5b10371573e33961f0037ebfced13 SHA512 434e19fcee3d9c71b7967440cd8af2dd2cae36f8e26f99e9b02de202fe80116a0e8eb501be8db7ff7d633f6f1bec7202b5b65826a7a21881042f1b9b5f723dc4
+EBUILD scapy-2.4.3_rc1.ebuild 1015 BLAKE2B 4217feb98a994332d8efc0f8a5ab46352aaccc3125fd962ed18a1da49731399a5826ccbe8de1c963ca8becf9c9d1c5f7389d995a3d763e9fbcf822bf30a231ab SHA512 990f4c97c5f86a33c41f1af6ea761eabcccfff6bc7f492f0c552765fcaf6c0b6122940da696d06cea3b08de1b702b38ac17cc29aeed7513ad6d6107e5c29fad7
+EBUILD scapy-9999.ebuild 977 BLAKE2B a15521edc49f7bf13c8aed716444ad120bde4d1208a4dee50737e21ab49b79870dbefb3a0793814bf81dffc778da0902f31fd6bc7ffe8268214c25da62db3e54 SHA512 d038dfbb47a750cc6cd7067f97d92f8f728e82d446fda21d1110d55886e9fc2defe54299946ca30be335b4dac40eb7fffc79ae5aa9f1b0f04149bd7e978fc4c5
 MISC metadata.xml 674 BLAKE2B 9aeb70531e3395462033100fc9b709533c158bf7939aa46930558b48e9f750030bc26f750b574f3e31ee5779c65a7afb48ed74f8db9d738849e9ab97d621f351 SHA512 54bbc8a152f8433e3da143261bc530df95e8a5808791582e2d2115476001f63381219a3738bb80c1833f56d331ee54908cf72f3c72cc27e05100f6de8edc6caf
diff --git a/net-analyzer/scapy/scapy-2.3.2-r1.ebuild b/net-analyzer/scapy/scapy-2.3.2-r1.ebuild
index 69f18cdf55a9..e3f662d3328b 100644
--- a/net-analyzer/scapy/scapy-2.3.2-r1.ebuild
+++ b/net-analyzer/scapy/scapy-2.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils distutils-r1
 
 DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
-HOMEPAGE="http://www.secdev.org/projects/scapy/"
+HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy"
 SRC_URI="https://github.com/secdev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/scapy/scapy-2.4.0.ebuild b/net-analyzer/scapy/scapy-2.4.0.ebuild
index f5c9435fdff2..25d400437783 100644
--- a/net-analyzer/scapy/scapy-2.4.0.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.0.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 inherit distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
-HOMEPAGE="http://www.secdev.org/projects/scapy/ https://github.com/secdev/scapy"
+HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy"
 SRC_URI="https://github.com/secdev/${PN}/archive/v${PV/_/}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/scapy/scapy-2.4.2.ebuild b/net-analyzer/scapy/scapy-2.4.2.ebuild
index 113734a51279..121abefbe78e 100644
--- a/net-analyzer/scapy/scapy-2.4.2.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.2.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 inherit distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
-HOMEPAGE="http://www.secdev.org/projects/scapy/ https://github.com/secdev/scapy"
+HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy"
 SRC_URI="https://github.com/secdev/${PN}/archive/v${PV/_/}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/scapy/scapy-2.4.3_rc1.ebuild b/net-analyzer/scapy/scapy-2.4.3_rc1.ebuild
new file mode 100644
index 000000000000..25877178edf3
--- /dev/null
+++ b/net-analyzer/scapy/scapy-2.4.3_rc1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
+HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy"
+SRC_URI="https://github.com/secdev/${PN}/archive/v${PV/_/}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RDEPEND="
+	net-analyzer/tcpdump
+"
+S=${WORKDIR}/${P/_/}
+DOC_CONTENTS="
+Scapy has optional support for the following packages:
+
+	dev-python/cryptography
+	dev-python/gnuplot-py
+	dev-python/ipython
+	dev-python/pyx
+	media-gfx/graphviz
+	net-analyzer/tcpreplay
+	virtual/imagemagick-tools
+
+	See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst""
+"
+
+src_prepare() {
+	echo ${PV/_/} > ${PN}/VERSION
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc -r doc/${PN}/*
+	DISABLE_AUTOFORMATTING=plz readme.gentoo_create_doc
+}
diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild
index 3005f30dde5d..55240a18ff01 100644
--- a/net-analyzer/scapy/scapy-9999.ebuild
+++ b/net-analyzer/scapy/scapy-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 inherit distutils-r1 git-r3 readme.gentoo-r1
 
 DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
-HOMEPAGE="http://www.secdev.org/projects/scapy/ https://github.com/secdev/scapy"
+HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy"
 EGIT_REPO_URI="https://github.com/secdev/${PN}"
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index 42e747ae0864..3645f36d2949 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -1,10 +1,7 @@
-DIST sslscan-1.11.11-rbsec-openssl.tar.gz 5523256 BLAKE2B d8f5aa8bf748310fe1186ec9ab74ecc33425d6fa3db709d94516780d4efadbdd9cf6358798796704dfeb4032ec615298f3b67c8150e314f1e79a4d826c2589b7 SHA512 9bfdac0b6dcbb9e932ef41db9753f7298cf38ddc18731386968289114fd5ed10d81e95523d557b42b431377638d2f62fb710189e7d944ba89979fe5e3437fd3f
-DIST sslscan-1.11.11-rbsec.tar.gz 53432 BLAKE2B 08be7c5a4126e8dee85adb48bd5d55f5e7931820462a18fe904439edc8fc690d60379c53c436d4953f9fbbb94c4e47eebd3fd48867b00d5819ba651569c99b7b SHA512 9492f1460b45212f80a19364c284ef2a11ad0c343bb324447ec519685d52805104d95a7817fda4d43af98ce2be2edede889e6ae83eab37d75be0ab46dca29d72
 DIST sslscan-1.11.12-rbsec-openssl.tar.gz 5523256 BLAKE2B d8f5aa8bf748310fe1186ec9ab74ecc33425d6fa3db709d94516780d4efadbdd9cf6358798796704dfeb4032ec615298f3b67c8150e314f1e79a4d826c2589b7 SHA512 9bfdac0b6dcbb9e932ef41db9753f7298cf38ddc18731386968289114fd5ed10d81e95523d557b42b431377638d2f62fb710189e7d944ba89979fe5e3437fd3f
 DIST sslscan-1.11.12-rbsec.tar.gz 56346 BLAKE2B 0079a4be50c037c02bc716341315e0a2164742f270a54fa616ba223b5ecc56bdfa9cec3bc495cd57d4d20cdb4331c622bb78b705f2516fcff228306bb1e5c6ff SHA512 e667cc50f0ec71343b73ca11871a1a53aa9f255c671f16b7c5f33093125a1e60d6e7945e7bd7296f4a71aa6837c823dc939e18982f3e3f831acc061ead9e7ebb
 DIST sslscan-1.11.13-rbsec-openssl.tar.gz 5523256 BLAKE2B d8f5aa8bf748310fe1186ec9ab74ecc33425d6fa3db709d94516780d4efadbdd9cf6358798796704dfeb4032ec615298f3b67c8150e314f1e79a4d826c2589b7 SHA512 9bfdac0b6dcbb9e932ef41db9753f7298cf38ddc18731386968289114fd5ed10d81e95523d557b42b431377638d2f62fb710189e7d944ba89979fe5e3437fd3f
 DIST sslscan-1.11.13-rbsec.tar.gz 57006 BLAKE2B ea5e2754f5a8218ee1f3aba26e7efe2394fa87b79137955705edc4600d67139f2641ac7b4e7a92f7273878f5b150e3e1b159114c833dc180049688563cf5095b SHA512 51477e5b29a2fc87e2d6c8d76430eeb2a6feb388d47392938b9e2c572acc5926534a19dc249080a066256a1a6cbfe08b162e9f3839386c86116352e5eb57c544
-EBUILD sslscan-1.11.11.ebuild 1161 BLAKE2B 11d5dc98ef503bef04efdb8037ca794e2e7341378543f3c987b5c3e2c25665ee94c393ea632dd1af69bcb5e7463b727db72dbe6666c812c5e88161b8c589e792 SHA512 b1be927c3ee5a5fe0a26621c089222ca38d31f1d169c4dca73986dfb27a7e4dcdceafb37ce7b68828003422e008a1dca241589777616476b687834b4a6e1eefc
-EBUILD sslscan-1.11.12.ebuild 1159 BLAKE2B e833000726c35c274f1a5e085dce6480a5bb74128eceb14428287f9001f84faacd5e87b8d563dfe02cb7e291538ad091421a6b24c4e0e9692bf1ac7e4e9eac40 SHA512 1c3b5dd0535efab91d77470b22c734b090c2ec10db39e32517fcad1e0294ad32c024c5e4add139c4efe0c84204210ce8f011624b3e896f98aec40b6d0c1f7c3d
+EBUILD sslscan-1.11.12.ebuild 1158 BLAKE2B 8e6eaf2230adcbd177ac5b6b5755afd110c6ffd1d63abfecd2bd52139a6697935e855b793ddb03eef404642b66fa0fe6a3a24e2a142781c8d148b9d0ecae9e4f SHA512 0436371a9d645dd0396844dc5ffcd5bb8d7180892760024bcc57344962c05e1019eda986a6e116b51b319712d9876a86786a0d6e89fc13ece85a1d45790e5222
 EBUILD sslscan-1.11.13.ebuild 1160 BLAKE2B 132efea34f015b54ecd5e6c4e47aaca1c3a2f34b3dad1d95caded11b9a2261427d7c0177521a5676b38f315147e452aac56f9c9d3a68dec85d69ab4bcf3f6328 SHA512 e5f66a9aa033596ef033c87d31328d6a62969b7164143c0fd0629e1c497c5f7a16cd68b2bf1853a5d34ecb769d9d6c74bcdfbb222d864de85f59ed58806f90a3
 MISC metadata.xml 295 BLAKE2B 4aed9a7658ee65ef0630a49abe71b2ab860377365b040ea0e19dfd8069f05e64cdab2c93fdf95276ad4087c247a18c195d05c81d90226ab6e753950fafce846e SHA512 561d272316db60726db149ffd3f77a59ed4fd7d16dd96e8064e1994666812d5056180965ef93939904ae653e0aa2cbc04621f5700464d5115490d56c24354bb4
diff --git a/net-analyzer/sslscan/sslscan-1.11.11.ebuild b/net-analyzer/sslscan/sslscan-1.11.11.ebuild
deleted file mode 100644
index 3c2e05a39993..000000000000
--- a/net-analyzer/sslscan/sslscan-1.11.11.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Upstream now builds against the openssl 1.0.x fork by PeterMosmans
-MOSMANS_OPENSSL_COMMIT=c9ba19c8b7fd131137373dbd1fccd6a8bb0628be
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Fast SSL configuration scanner"
-HOMEPAGE="https://github.com/rbsec/sslscan"
-MY_FORK="rbsec"
-SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz
-	static? ( https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libressl +static"
-
-DEPEND="libressl? ( dev-libs/libressl )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}-${MY_FORK}"
-
-src_prepare() {
-	if use static; then
-		ln -s ../openssl-${MOSMANS_OPENSSL_COMMIT} openssl || die
-		touch .openssl_is_fresh || die
-
-		sed -i -e '/openssl\/.git/,/fi/d' \
-			-e '/openssl test/d' Makefile || die
-
-	fi
-
-	default
-}
-
-src_compile() {
-	if use static; then
-		emake static
-	else
-		emake
-	fi
-}
-
-src_install() {
-	DESTDIR="${D}" emake install
-
-	dodoc Changelog README.md
-}
diff --git a/net-analyzer/sslscan/sslscan-1.11.12.ebuild b/net-analyzer/sslscan/sslscan-1.11.12.ebuild
index 8346fab8248a..6d30e8c8c250 100644
--- a/net-analyzer/sslscan/sslscan-1.11.12.ebuild
+++ b/net-analyzer/sslscan/sslscan-1.11.12.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libressl +static"
 
 DEPEND="libressl? ( dev-libs/libressl )"