gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /net-analyzer
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
171 files changed, 1183 insertions, 3511 deletions
diff --git a/net-analyzer/2ping/2ping-4.2.ebuild b/net-analyzer/2ping/2ping-4.2.ebuild
index 688c698a7823..87e4e3add809 100644
--- a/net-analyzer/2ping/2ping-4.2.ebuild
+++ b/net-analyzer/2ping/2ping-4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/net-analyzer/2ping/2ping-4.3.ebuild b/net-analyzer/2ping/2ping-4.3.ebuild
index 9e42a33b3dd6..bc1801958697 100644
--- a/net-analyzer/2ping/2ping-4.3.ebuild
+++ b/net-analyzer/2ping/2ping-4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/net-analyzer/2ping/Manifest b/net-analyzer/2ping/Manifest
index 5cf3fe9e82cf..23cf019e6d34 100644
--- a/net-analyzer/2ping/Manifest
+++ b/net-analyzer/2ping/Manifest
@@ -2,6 +2,6 @@ AUX 2pingd 692 BLAKE2B f393bc602a4e39f77970946926bae178f9181476f7331b9a91f1dddc6
 AUX 2pingd.conf 57 BLAKE2B 79c2a05661e342d5a5c3903071d42864d3185d6f387a6b73f129a70cadfadf081f43d9bdfea22281170b0ad27ec17f9b3612cf40b570390f44f845d7ca4555d0 SHA512 c8c666116e841b86a1f17a891453e6ea25976ad485b8299062971b45395420dd46ecc9ac36cb1de5000207372f8586850f62c6178ece5f70732bf17ae9ab4af9
 DIST 2ping-4.2.tar.gz 70054 BLAKE2B 01759c9f0d2eb2bf08e92155a74e11aaf7bb83adb43942be70b8e525486bba6608ad021bb149376f246bdcb066958c7d9886a1e5ea63094d715c8b25fa2b9784 SHA512 8c6e9b4cefd92929e8d5247f2c4caecdfc281548596f96fbfe52f99dc122dd1d53470c303e85bc469f0a7910937085ad36c7f928cb295c8f3fce5f3455dec3d9
 DIST 2ping-4.3.tar.gz 70386 BLAKE2B 7a73508bdf5fef0d6ef99d1d6b8bfdee65740277ef0e17913e2070503c20bd4d9598a7d7353eb68dbe5c7380e49e465ddd49adba4899f95daead36bbc8514f69 SHA512 f7186fe5bed2f12593d62f85fe364c9dc571f8b0ad10f6766515470ea8f8ed32d439e580003e78494b4742a8224e2b30cc454f8275a4877d432eb76646334e77
-EBUILD 2ping-4.2.ebuild 633 BLAKE2B da35f0b2a81797580163aacab68d13b8f71896c2172f7e10dcf3b4f052cd71f864d67050cee840ba92cbe3796ad77099ee27cf1bb9041e10ac6620691c414a04 SHA512 8d93bf7be8b3bea47bbbf9505684bc0cb0358c5ce90653dab6e3ad8fe67b106f49b960549560933e82865623a1fe7c2c754390e8e69932f72d3f5c9dc195ddd4
-EBUILD 2ping-4.3.ebuild 630 BLAKE2B 53aa3c5acc7802801b6276f381311efa0e56fbb8fc8a917f1c2c096add2e2eaed763b56f2311d4eb38d3e25d920cfda56ebbf8ec88363b21c1d07d853bafce8b SHA512 4c57d67ba7e8c09fb85c34dabbe0e2c97487fac4cc9a21bafa2b193fb3d6b0956363a9ee636f03676e28e34642182b33629ec8c62d6135785030337f35792967
+EBUILD 2ping-4.2.ebuild 628 BLAKE2B 25c8440858d8fd7a39aad68db490b04cfb9749b94240c516472cbc4e52084e82de9ace820fbe841708cafc3fd8bb1d346bf5000f85d624b419a670598627bdba SHA512 6719d8864f20c8fac0c125780dba45c08e95ee1fb2b1b631395cf93eaf7e5d4abe212055ab045e5e29adb8903e4a7d799d67a735d049a63c096239eecd11e8bb
+EBUILD 2ping-4.3.ebuild 628 BLAKE2B 7222cc05ca444b6313bf9d0a49ae578f0534c3712fb749d6592c4f4e7fbb1f2d74392dabeb36c122ad7c5ed17d62887f51d47767b8585abb0e4a049edba38f61 SHA512 f5d6e00d47bd1f28575d97645c566b124cc29c35435b50e2859862bad9ba7fce6c3f121a19449439cd53782649ebff156bccff8b16e93491c78e2778d23eec48
 MISC metadata.xml 400 BLAKE2B 8de660bda8c58cc5c6e6027c7e52efbd03ef973594e85a90483f0bb0dd2fcdcc4ee7989cf8624e72f0e71f31daf5af05c345126b862cad1007c3a45a8122bcd4 SHA512 9d35147319cbab8e826a2f0a8badee2169e70b8a52065d8639f2326ff0bfe1717a5e8b5422072f71677e2e4a99ec14a7d6e688662f2342d7917499c35a686154
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 087c5a877224..dad2e996e940 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/authforce/Manifest b/net-analyzer/authforce/Manifest
index 92e600653f0d..1ead876e31e2 100644
--- a/net-analyzer/authforce/Manifest
+++ b/net-analyzer/authforce/Manifest
@@ -2,5 +2,5 @@ AUX authforce-0.9.9-curl.patch 227 BLAKE2B e241e1ca54a51a39d8d57036467a892812c07
 AUX authforce-0.9.9-locale.patch 325 BLAKE2B 4379902c336744609ecd3a0a3d4039a10b83fe8ab3859d6e7faf9fd4aef3a74fc55f05f6c2fead2898bf112f1da774fa7c3ef54fae543d8af8bb9cd62e19e02d SHA512 0aa863400f54709a726fd2913d2d6039d3591221f9fcf60c843a3a24a2191f9eab70dd03cc574dc34cbc7e2824a58071b7167cc291f7e5cfad13da6e145f9206
 DIST authforce-0.9.9.tar.gz 424557 BLAKE2B 3b962f7c3d445525364b8e40e3b47d0c951e04b7b5d40077540b1dc34721aca5163f9328451f23b7f1891d3a5440d003568ca6eb5104a523bdccb33ade61546d SHA512 fd94c6ac5f98f480af4acba2de7c0ad81dbc4c759cce8f3f722dcf8870b0c16a9e7d462f4542784737e021f9c8d480b26895dddb4d5953f730ff8a181ad474b3
 EBUILD authforce-0.9.9-r1.ebuild 679 BLAKE2B 9453c08013bd3cbe978c2b18489458510a2f660a5003b11d97879d37843533d98a0f549e39b59a00fd7c03d5bcd092dc2de82b8edd27572a7124747e8c3a0ab1 SHA512 b11a9ee43bc66a9fc9cf4dd0012d7b71a790f4f425dcd302f92fb8b5157e90246a0a45a32c90e56fb8ac222b3391044b40ca0271aba8ec1cad2cc5033a99d5bf
-EBUILD authforce-0.9.9-r2.ebuild 874 BLAKE2B cd0011d138a5b27cd454bf9a7f1b88cc655cee7b97b090b92cb12010748fd9ac9c9e444f1df9e0d6782558342e690ba1a0f157a8b5fb5784c7c39459dee42191 SHA512 d6829e95c4ec6eda4cb836e166322937f9ffbe89d8f9ef5ef43be89d7d09288d6cd70b593ee4dde66a662bc74fffe0b5d7bfafce95dd4fde1a4bce3fed375ddf
+EBUILD authforce-0.9.9-r2.ebuild 873 BLAKE2B 6e9d8680041f94d33c0f102bbd6147a5a052e43759fcc7064b3dc62d1eeb3376771087bc4f9365d6486ce55a0cea8d843042def3a637f6f5baeda55e7d3d3b73 SHA512 4957fbea45b1b8c1772b169fdf8c4fb8bba12fec3de7ce2b5bb4b22fd7d128df097c4f4285a52b86ec08413508aef3fce919e8ff611eb6a88f2eeceb2242e408
 MISC metadata.xml 374 BLAKE2B b8e8fbec4bfcc8377695c3b95c0433d456ce69fc49bb9b9f0aa4cab50c2934f5d5825f8780266ced3d5d8deab3405833b5d8313f5e56b6e06d140f76332a5527 SHA512 440297159e51ec774ae0e8a30f20eb39902f5e587dd121ce8461e9fae47eae84d259f8eda43b803f8d3bd44b8e2e417fe8094d4ba2bc11d962b19d0cc3089e3e
diff --git a/net-analyzer/authforce/authforce-0.9.9-r2.ebuild b/net-analyzer/authforce/authforce-0.9.9-r2.ebuild
index 6bea4016bb12..21725278b044 100644
--- a/net-analyzer/authforce/authforce-0.9.9-r2.ebuild
+++ b/net-analyzer/authforce/authforce-0.9.9-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.divineinvasion.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="curl nls"
 
 RDEPEND="sys-libs/readline:0=
diff --git a/net-analyzer/bmon/Manifest b/net-analyzer/bmon/Manifest
index 063263c0f333..fec1c9b99e06 100644
--- a/net-analyzer/bmon/Manifest
+++ b/net-analyzer/bmon/Manifest
@@ -1,4 +1,5 @@
 AUX bmon-3.6-docdir-examples.patch 235 BLAKE2B f187f4bbc8b7e4de5e9bb1f289ef201ed17e6a64e0062ad370f5dcce1160da1774590aa824f2adf9b73c058b95ac2428e24bf8c5e78a1c16b45f4f1f33a889ca SHA512 2b74637c6dacfa03e680774787d8287ae084ba426a3e0e178b74f1468179916509ee5de2e0c93f7abe04356d0146ad6dd8e191d9a66718ec8eaf50cb6126afc8
 DIST bmon-4.0.tar.gz 61843 BLAKE2B d376cc6ca9f64c71cd7f8aa281e36e0f8717939c2ada3d9ed6d1231e1f6bc489146fa5f88a327abd6bc63803d2ed21eafff2888427bfd11d51156380ed6d6d1c SHA512 2a5b527a78cc1084c3b96d8d621b002ee86d377776d7e25f711dc2869e59bcd6277cc5f103549fe0b635b1368228a66941d5069fd1240cff678b308d7e17218d
 EBUILD bmon-4.0.ebuild 977 BLAKE2B 3641494d5435aa6119eb33229482bee50f63a3ddaef852e702d02b89ae208ab5e8f6b0d6bae2f04a915e4f2a902728224f892656c4a4bcbe9afde2fd22ad36bf SHA512 64e34261413488c02d7d84a9baad0c648a06fdfd3703d813b334e344ebcfe382cbda873137c9e3bf944db59181e4c04576add61e4c81113d034613a357078c70
+EBUILD bmon-999.ebuild 897 BLAKE2B d709b1098354d47dd2c67987e8adb63c2e6f02778772d45999bab26c901b504726262aff9d2ab68ba22b7d30fd2feb37213525b3ef33a67d5ade887feffb4294 SHA512 05e6be09ca6566481fcf8d1092d8b46282abddaecf5c6d84c1d4f3c4e1552e9993ed445afab6f29c7f997cf79179d1804e793cebe0fb280c62d5139e4077a5d0
 MISC metadata.xml 355 BLAKE2B 7d9ea44a97e5083c50bf60c34b30057ef90fd3263133f0600940747444d7485fccf3b47d988eb4cf968aee96bfff6b551b72adb003ca4fb6a2b58e31781fa936 SHA512 44b31fb1a2801c74cd4ba7260566447df31b9dd7bd55ed1ffdabc0bcfef8d5459e753cbbb0a2a31c5f2d87e7853972281cb9412b642e282be9a02be2f519fcef
diff --git a/net-analyzer/bmon/bmon-999.ebuild b/net-analyzer/bmon/bmon-999.ebuild
new file mode 100644
index 000000000000..cabc2a781616
--- /dev/null
+++ b/net-analyzer/bmon/bmon-999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3 linux-info toolchain-funcs
+
+DESCRIPTION="interface bandwidth monitor"
+HOMEPAGE="http://www.infradead.org/~tgr/bmon/ https://github.com/tgraf/bmon/"
+EGIT_REPO_URI="https://github.com/tgraf/bmon/"
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+KEYWORDS=""
+
+RDEPEND="
+	>=sys-libs/ncurses-5.3-r2:0=
+	dev-libs/confuse:=
+	dev-libs/libnl:3
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( ChangeLog )
+
+CONFIG_CHECK="~NET_SCHED"
+ERROR_NET_SCHED="
+	CONFIG_NET_SCHED is not set when it should be.
+	Run ${PN} -i proc to use the deprecated proc interface instead.
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6-docdir-examples.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		CURSES_LIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
+		--docdir="/usr/share/doc/${PF}"
+}
diff --git a/net-analyzer/bro/Manifest b/net-analyzer/bro/Manifest
deleted file mode 100644
index cfbbf57168ef..000000000000
--- a/net-analyzer/bro/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX bro-2.4.1-fix-python-install-dir.patch 1748 BLAKE2B 5e1f5695a5d5c21f2e3aa506a351f7c3a8ddfe14e80071fc197fe9dbe1a75fc76973461c0aa113318a2dc33e1d84875c66e3596a75ea07b295b0b59719c62fa9 SHA512 0957f05ef4e4efff90f23a6ac885277f4d57df8ade4cf2f9a22b6935fc46679369857ad181f7bb4f071cb4c373d6b4bc8c49c8e8f9bea9325d85a7b2d2e6b62e
-AUX bro-2.4.1-remove-unnecessary-remove.patch 878 BLAKE2B 00ace3b27a7a71e2ab7b6e0b3abe856864190b53b0c7fd693236504700c8c92cc36c80177cb9075f1d27b4320885569e182e58231b56d78bc6b1710a1442f7c9 SHA512 e996a7571c3f9b85f1eb40206c07825f0cfdf7f9fc4a930d8dbb216e8e4636461f0a6be01fc341e6b4d5396d7637d76e39911c3d65e2d645da959d3aad17252d
-DIST bro-2.4.1.tar.gz 15010455 BLAKE2B 34e087253a62ad3d6948e1175fa05c34ceac7298103aef40a0ce791e1e83c8495d6f65c9489d0e7214ff1b743db766dfbf7b44544f7796b7b1f70ee7a1bedc67 SHA512 4f7bf6c037fe7b16214830d2dba9f7abffd853f66030aa710fb9f174a475f8cd27d8de6bacf965f142f942a42093ceb78dcd8cbcedac6fbcfdd65ac07b3dd410
-EBUILD bro-2.4.1-r2.ebuild 2473 BLAKE2B 2671634c9b7a0ad22ac0eae5fd53f274bd71e6ed7fa07fb485034725f36698a0a2287140f1b968d051d2a85a204b5dfcde6b5a25657b6644698ed969082b9019 SHA512 9c9a29c1806453ba231ca243cd1368b27dff78efb65c497d31f45a19f99f1ff49b62cca710bbcf9e6c599c9bc1614226de382fbaf0d6a467960c3df542e76c28
-MISC metadata.xml 1023 BLAKE2B 2b02ca31298c44c9932802e1701cd490d371a9078dcddcf407c10f16890ca36e57e81fb92f65876bb643a9c8f5683534c0c29d09c9f0c8924f5e9b51d9f3c963 SHA512 d95795994abf21198ba6a64de4eb4073ad83fb77f1ae4bf171ba29677e03a4abcf94d8b6163fe2a009dc64956b4cd8ce54287f6993c262b43a7b9e2b5ee3a28c
diff --git a/net-analyzer/bro/bro-2.4.1-r2.ebuild b/net-analyzer/bro/bro-2.4.1-r2.ebuild
deleted file mode 100644
index 68ee260dc778..000000000000
--- a/net-analyzer/bro/bro-2.4.1-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="The Bro Network Security Monitor"
-HOMEPAGE="https://www.bro.org"
-SRC_URI="https://www.bro.org/downloads/release/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+broccoli +broctl -broker curl debug geoip ipv6 jemalloc +python -ruby tcmalloc static-libs +tools"
-
-RDEPEND="
-	app-shells/bash:0
-	dev-libs/openssl:0=
-	net-analyzer/ipsumdump
-	net-dns/bind-tools
-	net-libs/libpcap
-	sys-libs/zlib
-	broker? ( dev-libs/actor-framework:0/13.2 )
-	broctl? ( virtual/mta )
-	curl? ( net-misc/curl )
-	geoip? ( dev-libs/geoip )
-	ipv6? ( net-analyzer/ipsumdump[ipv6] )
-	jemalloc? ( dev-libs/jemalloc )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( >=dev-lang/ruby-1.8:= )
-	tcmalloc? ( dev-util/google-perftools )
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-3.0.3
-	dev-lang/perl
-"
-
-REQUIRED_USE="
-	broker? ( python )
-	broctl? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-	"${FILESDIR}/bro-2.4.1-remove-unnecessary-remove.patch"
-	"${FILESDIR}/bro-2.4.1-fix-python-install-dir.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable shell script feature which sets interpreter to build time default
-	find . -name "*.cmake" -exec sed -i -e "s:\${\${_shell}_interp}:/usr/bin/env ${EPYTHON}:g" {} + || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEBUG=$(usex debug true false)
-		-DENABLE_JEMALLOC=$(usex jemalloc true false)
-		-DDISABLE_PERFTOOLS=$(usex tcmalloc false true)
-		-DENABLE_BROKER=$(usex broker true false)
-		-DENABLE_CXX11=$(usex broker true false)
-		-DENABLE_STATIC=$(usex static-libs true false)
-		-DINSTALL_BROCCOLI=$(usex broccoli true false)
-		-DINSTALL_BROCTL=$(usex broctl true false)
-		-DINSTALL_AUX_TOOLS=$(usex tools true false)
-		-DENABLE_MOBILE_IPV6=$(usex ipv6 true false)
-		-DDISABLE_RUBY_BINDINGS=$(usex ruby false true)
-		-DDISABLE_PYTHON_BINDINGS=$(usex python false true)
-		-DBRO_LOG_DIR="/var/log/bro/"
-		-DBRO_SPOOL_DIR="/var/spool/bro/"
-		-DBRO_ETC_INSTALL_DIR="/etc/bro/"
-		-DINSTALL_LIB_DIR="/usr/$(get_libdir)"
-		-DPY_MOD_INSTALL_DIR="$(python_get_sitedir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	keepdir /var/log/bro /var/spool/bro/tmp
-	# Doesn't exist
-	rm -f "${ED}"/usr/share/broctl/scripts/broctl-config.sh
-}
diff --git a/net-analyzer/bro/files/bro-2.4.1-fix-python-install-dir.patch b/net-analyzer/bro/files/bro-2.4.1-fix-python-install-dir.patch
deleted file mode 100644
index 66d41ed4f47e..000000000000
--- a/net-analyzer/bro/files/bro-2.4.1-fix-python-install-dir.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/aux/broker/bindings/python/CMakeLists.txt	2016-03-17 23:26:42.707456012 +0100
-+++ b/aux/broker/bindings/python/CMakeLists.txt	2016-03-17 23:28:27.714453166 +0100
-@@ -52,19 +52,21 @@
- swig_add_module(pybroker python pybroker.i)
- swig_link_libraries(pybroker ${libbroker} ${PYTHON_LIBRARIES})
- 
--if ( BROKER_PYTHON_PREFIX )
--    set(pyver ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
--    set(PY_MOD_INSTALL_DIR
--        ${BROKER_PYTHON_PREFIX}/lib/python${pyver}/site-packages)
--elseif ( BROKER_PYTHON_HOME )
--    set(PY_MOD_INSTALL_DIR ${BROKER_PYTHON_HOME}/lib/python)
--else ()
--    execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
--        "from distutils.sysconfig import get_python_lib; print get_python_lib()"
--                    OUTPUT_VARIABLE PYTHON_SITE_PACKAGES
--                    OUTPUT_STRIP_TRAILING_WHITESPACE)
--    set(PY_MOD_INSTALL_DIR ${PYTHON_SITE_PACKAGES})
--endif ()
-+if ( NOT PY_MOD_INSTALL_DIR )
-+    if ( BROKER_PYTHON_PREFIX )
-+        set(pyver ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
-+        set(PY_MOD_INSTALL_DIR
-+            ${BROKER_PYTHON_PREFIX}/lib/python${pyver}/site-packages)
-+    elseif ( BROKER_PYTHON_HOME )
-+        set(PY_MOD_INSTALL_DIR ${BROKER_PYTHON_HOME}/lib/python)
-+    else ()
-+        execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
-+            "from distutils.sysconfig import get_python_lib; print get_python_lib()"
-+                        OUTPUT_VARIABLE PYTHON_SITE_PACKAGES
-+                        OUTPUT_STRIP_TRAILING_WHITESPACE)
-+        set(PY_MOD_INSTALL_DIR ${PYTHON_SITE_PACKAGES})
-+    endif ( BROKER_PYTHON_PREFIX )
-+endif ( NOT PY_MOD_INSTALL_DIR )
- 
- message(STATUS "Python bindings will be built and installed to: "
-                ${PY_MOD_INSTALL_DIR})
diff --git a/net-analyzer/bro/files/bro-2.4.1-remove-unnecessary-remove.patch b/net-analyzer/bro/files/bro-2.4.1-remove-unnecessary-remove.patch
deleted file mode 100644
index e4803bc7db91..000000000000
--- a/net-analyzer/bro/files/bro-2.4.1-remove-unnecessary-remove.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/CMakeLists.txt.old	2016-03-11 20:47:44.652900344 +0100
-+++ b/src/CMakeLists.txt	2016-03-11 20:48:11.665101378 +0100
-@@ -425,10 +425,10 @@
- 
- # Remove some stale files and scripts that previous Bro versions put in
- # place, yet make confuse us now. This makes upgrading easier.
--install(CODE "
--   file(REMOVE_RECURSE
--       ${BRO_SCRIPT_INSTALL_PATH}/base/frameworks/logging/writers/dataseries.bro
--       ${BRO_SCRIPT_INSTALL_PATH}/base/frameworks/logging/writers/elasticsearch.bro
--       ${BRO_SCRIPT_INSTALL_PATH}/policy/tuning/logs-to-elasticsearch.bro
--   )
--")
-+#install(CODE "
-+#   file(REMOVE_RECURSE
-+#       ${BRO_SCRIPT_INSTALL_PATH}/base/frameworks/logging/writers/dataseries.bro
-+#       ${BRO_SCRIPT_INSTALL_PATH}/base/frameworks/logging/writers/elasticsearch.bro
-+#       ${BRO_SCRIPT_INSTALL_PATH}/policy/tuning/logs-to-elasticsearch.bro
-+#   )
-+#")
diff --git a/net-analyzer/bro/metadata.xml b/net-analyzer/bro/metadata.xml
deleted file mode 100644
index 61a2fa9e9057..000000000000
--- a/net-analyzer/bro/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-    <use>
-        <flag name="broccoli">Enable the Bro Client Communication Library</flag>
-        <flag name="broctl">An interactive shell for managing Bro installations</flag>
-        <flag name="broker">Bro's new Messaging Library (experimental)</flag>
-        <flag name="geoip">Enable support for Maxmind's GeoIP library</flag>
-        <flag name="ipv6">Support for mobile IPv6</flag>
-        <flag name="python">Enable Python bindings</flag>
-        <flag name="ruby">Enable Ruby bindings (deprecated)</flag>
-        <flag name="tcmalloc">Enable Google's Performance Analysis Tools</flag>
-        <flag name="tools">Auxiliary tools for Bro: adtrace, bro-cut, devel-tools, rst</flag>
-    </use>
-    <longdescription lang="en">Bro is a powerful network analysis framework that is much different from the typical IDS you may know.
-    </longdescription>
-</pkgmetadata>
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index 2dca34f1ca75..2ea3cd5455bf 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -1,7 +1,7 @@
-DIST bwping-1.10.tar.gz 88986 BLAKE2B b30147d028757f8d158e4be26739b6f6750a7d7fc0a917958ec4229890f02efe635b99ecc0ea5bc137a3a1513946f926bc97f7114ea8b3a497ec596ea4671454 SHA512 80142ef3ce833f4d2358e1c34a2e6af7f3ccdd5bf53073fd0ee12e01601c815f10e3fa76c7f8d17afb0db9a32ecf6d3fa4274e1d5965c429dfa3d2ad2370ab65
+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.7.tar.gz 90441 BLAKE2B 2f8c4690388860470ac7f814ef29bc3de1738f0e46f53286000829a0483c8f000f2bd8d5f7d0fbf8ed9b8bdfb105576c7960a24da8f3f3fac36fd49d4b34370e SHA512 74b695a80c2fa54693af1afab78417dc6ca35130bbd9367950681ddbbebe36b38166068532e8296f336c5cad8230339b4fb4fb975f4b066cdacba8a99179cac7
-DIST bwping-1.9.tar.gz 90877 BLAKE2B f19b865b30cf92e80f7482c8c19b9fa364b95ec3359993a1a328eb114f6f478bde5cbd7fa43d0a31745f6ef430064cbf972a38caa2a6ad8dff38c5c96561b9d0 SHA512 6d70fc7a1b7965b4859e05be088d11af8e92ab844903ea5303e9b9be4cc37deaf02a7ee40ecba5d0ebf1ba2f047d0d156be25f7c62fe136ec3f703a7ef940ccf
-EBUILD bwping-1.10.ebuild 471 BLAKE2B 8fe23434bf1d07214fef35a14722ac34df276660a7216f670a8a7b5ca11ab4f0587b2691ed18e489df9abe4d22741db892c83bf646c7afadbf444f48c53a8c52 SHA512 59e1899501c8bc433bb9bbc0c7260eed27402628785372548638084c2b6a20fc29f7fdeb261b3714183b3d177eb61c1fe874c689040a470edd95281149800bb8
+EBUILD bwping-1.11.ebuild 472 BLAKE2B 819d256e3707192c97cc4aa408138073136a0d038cadb3ca2d3450f4163f15341cd549d975f4a81d6e54f6330e4cceffb921c56c2b8e37df351bd44a87c3c8f2 SHA512 bd1d1542c8f463eda0cda55fc5b70e4fadd06cc1da4a07249689fda4faa6d11b1d3ef7916905ef396f0de5f239a270131108e1f548a31adc026084c1abc6beeb
+EBUILD bwping-1.12.ebuild 370 BLAKE2B 512320560c918a5ac38f39b0d97caf2d71c5d3045d8957de35b3c98a175b07f2d477ed435a70278ad7bd76db89d0f92ce1ab054c27fee9620e69724185dbe34c SHA512 86c51a741dab38b67a5d337bd96274ad8a6d8cb9ff70b5c890abf16dd8e8a1dee7c0023c6e81e2492a3130e24315bac45ccd2a0d55b590ef9196b803c98b44b6
 EBUILD bwping-1.7-r1.ebuild 413 BLAKE2B fe0207442e38ee224b650126ae837f67b7df4dd52e17603628c46967b7fe659c2d8c44a6d6d40297b0879a099a84652c935ea3b2dd3d75ddc47b0115bc62a03f SHA512 28af947741c68432f9e6a9312cb74cef83aaaccb3dcd00d808a9b76dee3665ebe0d04d7a2c12b2eed06e78cd13e58a73f98102999e87147dbdaa5d175488874f
-EBUILD bwping-1.9.ebuild 415 BLAKE2B e3e994562d53530ae3f925d911d220ce3b4d99207aef29d2ea702869018c7d28cea53dd2527f882d097740c9663324587938a409fc67b2ad951be346ebdb4034 SHA512 147edbc346d231e9134e8052d5c252e43bf4351f48e424754f191098fd9ac3396ae1bf3b50f526ca84724273ba3808ac152c3c589dc996b65f1a4f1b15c05005
 MISC metadata.xml 651 BLAKE2B 5879ca4d339fc3b541e1b7f68be857a9552c9a06efd8b1985470f5143f1e1e14edb0eccb4815b7498590718a02ddbb155a1e49556cdef76ebd9fae6dc6f306c8 SHA512 bef41fb4c3d894de7f2b39b16171fd22e6ce584d2dd2a65e2ce2c645ffc4ae1d1b38d7667765fa3e6fbfacb92cd3ef7006d141b14a5a476489ed235d2ca095e0
diff --git a/net-analyzer/bwping/bwping-1.10.ebuild b/net-analyzer/bwping/bwping-1.11.ebuild
index 864760342b38..34ed9d0ea7ec 100644
--- a/net-analyzer/bwping/bwping-1.10.ebuild
+++ b/net-analyzer/bwping/bwping-1.11.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
-HOMEPAGE="http://bwping.sourceforge.net/"
+HOMEPAGE="https://bwping.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/net-analyzer/bwping/bwping-1.9.ebuild b/net-analyzer/bwping/bwping-1.12.ebuild
index 1f2bd02ad9eb..7b17782193d6 100644
--- a/net-analyzer/bwping/bwping-1.9.ebuild
+++ b/net-analyzer/bwping/bwping-1.12.ebuild
@@ -1,17 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
-HOMEPAGE="http://bwping.sourceforge.net/"
+HOMEPAGE="https://bwping.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6"
-
-src_configure() {
-	econf $(use_enable ipv6)
-}
+RESTRICT="test"
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index c9178c9228e0..5e2fbe577435 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,13 +1,7 @@
 AUX cacti-spine-0.8.8d-ping.patch 235 BLAKE2B ab0390faaa8cd7b473ae2341a0f80d4eb87678bcf219bdf6d35ac2e6885047c87a26454f5bf0d3bbf618fccfcec06c31639bdc9f35e4c0267cf8f4de5bc13cb9 SHA512 93ea39cefbe20741a372c644f79bc2bde80e8ba81cbdfa4425523a642c0853aafe12a46bfd84a5d2161a9afed4ff8fd933cf72adbabcd54e936da8dd7d89d265
 AUX cacti-spine-0.8.8g-net-snmp.patch 673 BLAKE2B 90badfc18bbeb3cd4a6f381ac732eb07ae371a25b4951728f129df617096f9c62203643cf2c42008e534c7ce0d51fa0a14e8e24a595d2e5dabbfc2badf5dda97 SHA512 4eadde6b71eb20df4baf42241e7ec9b4e99af6d5f2023ea044ec27c379a8e7c4d3accced97091764ce1c946e30eebafb18c7f598be280e9b6b0b255c27f4ef57
-DIST cacti-spine-1.1.20.tar.gz 801877 BLAKE2B 35da513691967e507b9d10c373de571e2ef84aa20021d1bcfb2bc446a99fbbd2c68ebcd99dc47bece4387faa6596a7b109d8a61f02a3b2413cb89bfbcaa22e89 SHA512 df552157e64da04f57493351831a0602dea9ca3219ce3936884aec894e6698559d429ec62936a307b43fd49eff674c670d7e0a047924b5f03c30abeeec91491f
-DIST cacti-spine-1.1.21.tar.gz 801907 BLAKE2B cdcda765d349db12df1c672c4469770297d09a3946f19f1e686c251ef30d5be1e3f772efeeb3f344b21ecdba29275dde1b683025ae7c16b10561486397a484f3 SHA512 0dfdd3444639a471bc5c0d35ea3898532f2ebf16679677fee8ad291221ed607b54acc7fbf25e78da7c5597eeaed6b870ad7af66a95e20f95afce3270c8da5dd0
-DIST cacti-spine-1.1.28.tar.gz 802006 BLAKE2B 79e833b6afb619a1d2361bad38c3a52dc1e29b296864670f830a3bc998e7e456638523da15032751d56c65aefe0480477e70b741b23882a2a38adb2262aef601 SHA512 2255823d29342b49babebbae175c29fc7054b05ec5ae5897609960d808409f46e6d0cfcba2038dfad9598bc23532794f6cf26032a0566d2d2d2c57d622d37ab1
 DIST cacti-spine-1.1.38.tar.gz 805437 BLAKE2B 32d934f54e00d83e9807dd194a7cacf8d5526c8e5b84c44ffad201c07edcb117f862266843552299fe04cc780575b9b2dc7129a106a20bd709cb82844ade7812 SHA512 5409a690e89fcc74e1e87e34e1918cab27d1243825955eb8256a92f8e9658f312345c66b338a4a07a0e38c94e3275131cb4e58fb70e7b59837c0e6c47746e45e
 DIST cacti-spine-1.2.2.tar.gz 2310298 BLAKE2B 782fb21fda6acf06434c6e996863a235670970b19e5218624723df4736c388c2d9f00c1e3cc623dad7973bcbbe7ae5d4bbe89e366c1f47ce83eac9b416f88cb4 SHA512 ef2f839f7b247439a8576d49e311546cfd2346eea06cfb26b7a05d4757ae28334e6ed6ea00396027dc6c0c6e107121ed38f356ba62d8202003553fea3b5d139e
-EBUILD cacti-spine-1.1.20.ebuild 859 BLAKE2B 4ce5b34307c2c365b9e70f523f888c0deb41b4bc0d853590c8394af59cf81045e78b5c653ece72a72f053eef6112d9095eb31e0a5563f1f968d179c891b4b4d0 SHA512 60668a2b2c306e9d12707e2e5cce908522019d58e0742b39ef0a1b5a63bc91d3ca35829842e22aeda0adbabaa200f954cffc6cd8427d1fab801078ceca6b90c2
-EBUILD cacti-spine-1.1.21.ebuild 862 BLAKE2B 7165f0d06307e442cdcbc3160f0fc1548188fd0ad7f3f6dd9a16dc0322e616c1c38dc85a7382c59b4a7809e9cd46ee83684cbbbc2a9dc398f493a3d83123bcb8 SHA512 2c241b9da06c6e069736d7f517f56cd2690e2a89a4c1d11c148761d0d8cae05aee0a48d74d264ec166c8d74477b7d3738170a37577119c2bc3a8ef2d697811c2
-EBUILD cacti-spine-1.1.28-r1.ebuild 867 BLAKE2B 7574ed48c6b1d8f949d1627729c4d37057412a30d1835efc86dadb4a9f7b8d48d8b556cc5dc65fc2c3485d9b2fd1c0752dd7e2f5a4cf10e96d2bc643ea231916 SHA512 b77d21b719683f433fa60730bb8b553d576c5798b924b61ff65083d1da5d2e5e471fdaf3db690d4a05282327dc443c19f5c1f7a2fef29a6fd618fd18d83453c1
-EBUILD cacti-spine-1.1.38-r1.ebuild 868 BLAKE2B 1e064df6a786d34f9fa0e7d28b483819dd21ab6be39a1cdf4d6a1e2aa85e612bbca9b2d8c5b9d933efb058c3efda0ca78e3271dbfcf530a11a34bc630b2c7b9a SHA512 1bf10b624a04f56e5681a882d8f993127aeece9f125e142e57ee967dfd0d3a19237c3afa53286440b697b5f888357fbb5569e2436548d28847201a49d9afaa3a
+EBUILD cacti-spine-1.1.38-r1.ebuild 864 BLAKE2B 3d2094cf54d8be7337b301afca195ed8419044c3a9869ff14304d51a545c30029b399bcc778c13f47a46c80829da120a794f366a7abcf751ab9ad9de4b2a981f SHA512 7eb9fb67a1b19564f91b3accac26f6af2c03d46915f51193f7b607439fc24cefb59e541005533d0b474d5492e1a80ae189ddaded2f7a991fba315885883b6ec0
 EBUILD cacti-spine-1.2.2.ebuild 886 BLAKE2B 4e06560bbf32a742232c640e5bb1f991d476ff74c6018781bf050f1fa41fe3170af62886c7fe21306121c2e178786a1a84517523fd0f726c512648bdd3e988f0 SHA512 73035c0963afe0539ad72ca7777d149d30185788752b6d204a3ad3330f8006624ac24a2276b41d010324ee71e298088680a813fc7be70db7913b34459a3032d4
 MISC metadata.xml 728 BLAKE2B 5e36aa5717b3f0f72d1d5116e9df6223fe4d99040b970fd86baebbc6835fa0c673327114dd867a2e52822fa71731b3e1fc3e93b77344be89de8fe0b9b648286d SHA512 a8aef67f6761ecf0ac98771a82908e67fb9aead1a32f7ececb8c80ae46c1a431abcfc1165ed471dd428bd6c0a5d4bdc2ddbea1c86ae5c917ff9786bacd6d0f38
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.20.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.20.ebuild
deleted file mode 100644
index 837f87b754fa..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-1.1.20.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-MY_P=${PN}-${PV/_p/-}
-
-DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
-HOMEPAGE="https://cacti.net/spine_info.php"
-SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
-
-CDEPEND="
-	dev-libs/openssl:*
-	net-analyzer/net-snmp
-	virtual/mysql
-"
-DEPEND="
-	${CDEPEND}
-	sys-apps/help2man
-"
-RDEPEND="
-	${CDEPEND}
-	>net-analyzer/cacti-0.8.8
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
-	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
-)
-
-src_prepare() {
-	default
-
-	AT_M4DIR="config" eautoreconf
-}
-
-src_install() {
-	dosbin spine
-	insinto /etc/
-	insopts -m0640 -o root
-	newins spine.conf{.dist,}
-	dodoc ChangeLog
-}
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.21.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.21.ebuild
deleted file mode 100644
index 4c78d022f85d..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-1.1.21.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-MY_P=${PN}-${PV/_p/-}
-
-DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
-HOMEPAGE="https://cacti.net/spine_info.php"
-SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ppc ~ppc64 ~sparc ~x86"
-
-CDEPEND="
-	dev-libs/openssl:*
-	net-analyzer/net-snmp
-	virtual/mysql
-"
-DEPEND="
-	${CDEPEND}
-	sys-apps/help2man
-"
-RDEPEND="
-	${CDEPEND}
-	>net-analyzer/cacti-0.8.8
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
-	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
-)
-
-src_prepare() {
-	default
-
-	AT_M4DIR="config" eautoreconf
-}
-
-src_install() {
-	dosbin spine
-	insinto /etc/
-	insopts -m0640 -o root
-	newins spine.conf{.dist,}
-	dodoc ChangeLog
-}
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.28-r1.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.28-r1.ebuild
deleted file mode 100644
index 3cfbf20feb3e..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-1.1.28-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-MY_P=${PN}-${PV/_p/-}
-
-DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
-HOMEPAGE="https://cacti.net/spine_info.php"
-SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-CDEPEND="
-	dev-libs/openssl:*
-	net-analyzer/net-snmp
-	dev-db/mysql-connector-c:0=
-"
-DEPEND="
-	${CDEPEND}
-	sys-apps/help2man
-"
-RDEPEND="
-	${CDEPEND}
-	>net-analyzer/cacti-0.8.8
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
-	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
-)
-
-src_prepare() {
-	default
-
-	AT_M4DIR="config" eautoreconf
-}
-
-src_install() {
-	dosbin spine
-	insinto /etc/
-	insopts -m0640 -o root
-	newins spine.conf{.dist,}
-	dodoc ChangeLog
-}
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.38-r1.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.38-r1.ebuild
index efea65e1b7ef..ad41da8c9153 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.1.38-r1.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.1.38-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86"
 
 CDEPEND="
 	dev-libs/openssl:*
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 09106afb9fc2..29c23a2af201 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,12 +1,6 @@
 AUX postinstall-en.txt 2249 BLAKE2B ec7a32177aca0ebec0194fc4dee825251a5ac71c1005c41f91ba7e7da690e8b3734312b7df5ef506aea771284264035517a73c12d37be1e9479dea7e6e5a99d4 SHA512 8df52b187b301b42382746f9dea43993f7963edf018bc80e94305a743ea5fbb024d670917c0200f4782c0a3bd47abfb879c755ad415581616ae5c6413cf00623
-DIST cacti-1.1.20.tar.gz 8903728 BLAKE2B 0efc22726540c57d9d6af71f80e9843bfee3d846ecfffbb8552511d06080c377ccfad8c8d19e21186b666c393d32a8f39196cb9caa0f005bb92f7c87c0fc316d SHA512 2d51c757916b366a188a3ab31771bafb6492aaa6ab2e778255945677bbb3f23f6fbfbb73ea9b05abf2f7cb26c0970bc208f68d5f1c016f8fe3b9da003dcd3b1b
-DIST cacti-1.1.21.tar.gz 8905650 BLAKE2B a6e579b7d846388a9b732465eecdb5694c226b5edc98c1a005bbb8c17a307fa4d6ec56342e77e68bc62302c29451527e634fbbe6a9788073f0c5608dac57b76b SHA512 383bfc24c038154fd03d8997cba0fdf8d87ee69305f392b254102b6c279c0b7e53562a2d3d1f996315152a36da467821876e3834dd7b62bdc057a3b7838b94d2
-DIST cacti-1.1.28.tar.gz 8953179 BLAKE2B a1a7c3e39cfdb0f47eee86131d2210fb209b351cf91b56b8584d90ef53d216ab85936d66942506415d7e2610bdf2aa5235430cc664edd05ab612815d60d42b18 SHA512 2816a78604d169951519404e4bfbf17377912efd7a8bf1ef2a262fde7414783e65ee4a6bcac7dd3175fd9942aebf475b7dbd1fe6d350f75cf88246d3561ef9e8
 DIST cacti-1.1.38.tar.gz 9081347 BLAKE2B 9f64bc7cd33187c4c744e1473409ea8998cd953c6fd047c66af6ff07d288678cbd944d2e70d0fc3838a42c7f7a9dbf7b094963391791a46bc50c3ed65ed4251f SHA512 1f91156416a9988fa149f9b8fc9fc7df904e4cf6d9a19a62d06c7de1ded99ddaec2f5b5f1a21b0effc4dee7b9c1d1911ca5aaa6113b57edc7e2f42b7969343b5
 DIST cacti-1.2.2.tar.gz 23800723 BLAKE2B 3608edd60d796dcd8c875f2611c268605813d9f4102ecac99dd71d1b7a904f7bb74031d1c5692d0af7964af9e1a13fb46a88d98bbb6961bde0696b339fe84505 SHA512 4a41aff20f06ad56f4723e52084d1a09e3b3eb017e8f1c957f700e4e2f9b12e8f0e599cb56611241c6fcc59bbd6bf957e948631f3beca72e2a7fdadacc473c65
-EBUILD cacti-1.1.20.ebuild 1260 BLAKE2B 108e6629d2899ee824b7780d16767fab184ce3728dd393cd67d71eef0dc80f519403ce36892dd12f0b625ff9497d4d33a886ffe4c8d41b62e5755401b8ed7148 SHA512 eca659c97f78a3d6c07541f9e6704a2f30b7607f4105aef14e9fb3d8f5ebfbe4a597d9caf5b0c61c1ab2077c93022e77c123f6def9dad2acb7378af8f0e0bdf0
-EBUILD cacti-1.1.21.ebuild 1263 BLAKE2B 18d258e8b49dac987da9201380a7688637c0ad4ee97937038063813ef559ffe8eeb4e364acdca2389474664a4b48f41e38e12a8e45d373dd30393d00717fdce3 SHA512 48918c9e3f8619c23e8af4dad9c806fc65dfcc5c2b7478adde44cddcf4fe3201eb4e4a9c114517f1f4f809b98a017fb24096f988fa63b29f7094f44aa85a931a
-EBUILD cacti-1.1.28.ebuild 1054 BLAKE2B 6e526ffd0439381c33d07a8535da5b4d9fff7d1a9afa51a12b119565ec99972f48989ab8e60a4c8321d25efb0336d9f6221f4e4938b9e09148d2dd1dbfccb551 SHA512 77fd43ae932a181431a05e52520a7f8f00c9d29b55367b09f2064e3482165b2339c38caabafacce3cf6252a80ea44309d89a490a25717c1ca01c33a649e365b8
-EBUILD cacti-1.1.38-r1.ebuild 1034 BLAKE2B e220c9f2516146da051c316d0ba3a13cd793e13ef4d689855332fe8b771ec7b98ff07e75cf1edf50d28a25f6ad6fbe77463a4928c2abaff06012ef3708adf0b8 SHA512 b475d9cb8c6f6df43e3734ce7346c5e531c3e87d169df550581b655ca57885588f492042d8feb5ae4407ec61521740d14bbd762b6e2aae331106c84cd8fb0186
+EBUILD cacti-1.1.38-r1.ebuild 1031 BLAKE2B 3e1d8d36763dd27d5823b458e80312ee7569fc906f13448bfd5af32d42a57abba4f336dbf9e6679573074b395f47e43e25453c29498835e96acd3bc594104445 SHA512 cebe81f683c4fc0c2cea917a9c29cb02933a34a11bc2e971baa2a12724f8dcd16bbdb9fab9dc50fffd5de8b551d995fc650dec0c69586cc46d055dcdedba9338
 EBUILD cacti-1.2.2.ebuild 1014 BLAKE2B d70d882dc895750ce208924f471075cede60644877edc87eace012a370b4cc5d34b4b3e4ef87924ab81381da0480d63ca5f85ece715463822261d951bd1b7497 SHA512 0c5a87b7c75a5f464e6a68308e678a05f5dc3385892e939bde653786a0ea7789fd0720f09509fcbc645b2ab52d63f8db569437a46205eb3552052a1407822c0a
 MISC metadata.xml 834 BLAKE2B 964a66f49027e0190434a6fe4dfdabd9153cb9a44b8b23ee1a0331e9c38a9ca1480b35412a2088d2ffc7feba6232330e26c8156b4461d663cb8c3bebbdf0e250 SHA512 f74b807c0629400ad06ee2b03650be38524268b2590d455ab4b672bc2c6c13856f881226a7c1d6e74e1acb6f85abc3d5bd311abaa6571216aca7698e8368e616
diff --git a/net-analyzer/cacti/cacti-1.1.20.ebuild b/net-analyzer/cacti/cacti-1.1.20.ebuild
deleted file mode 100644
index e85926548ee1..000000000000
--- a/net-analyzer/cacti/cacti-1.1.20.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils webapp
-
-# Support for _p* in version.
-MY_P=${P/_p*/}
-
-DESCRIPTION="Cacti is a complete frontend to rrdtool"
-HOMEPAGE="https://www.cacti.net/"
-SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86"
-IUSE="snmp doc"
-
-need_httpd
-
-RDEPEND="
-	dev-lang/php[cli,mysql,pdo,session,sockets,xml]
-	dev-php/adodb
-	net-analyzer/rrdtool[graph]
-	virtual/cron
-	virtual/mysql
-	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
-"
-
-src_prepare() {
-	default
-	sed -i -e \
-		's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \
-		"${S}"/include/global.php || die
-
-	rm -rf lib/adodb || die # don't use bundled adodb
-}
-
-src_compile() { :; }
-
-src_install() {
-	dodoc docs/{CHANGELOG,txt/manual.txt}
-	dodoc -r docs/html/
-	rm -rf docs
-
-	webapp_src_preinst
-
-	edos2unix `find -type f -name '*.php'`
-
-	dodir ${MY_HTDOCSDIR}
-	cp -r . "${D}"${MY_HTDOCSDIR}
-
-	webapp_serverowned ${MY_HTDOCSDIR}/rra
-	webapp_serverowned ${MY_HTDOCSDIR}/log
-	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/net-analyzer/cacti/cacti-1.1.21.ebuild b/net-analyzer/cacti/cacti-1.1.21.ebuild
deleted file mode 100644
index 7d51a73050c1..000000000000
--- a/net-analyzer/cacti/cacti-1.1.21.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils webapp
-
-# Support for _p* in version.
-MY_P=${P/_p*/}
-
-DESCRIPTION="Cacti is a complete frontend to rrdtool"
-HOMEPAGE="https://www.cacti.net/"
-SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="snmp doc"
-
-need_httpd
-
-RDEPEND="
-	dev-lang/php[cli,mysql,pdo,session,sockets,xml]
-	dev-php/adodb
-	net-analyzer/rrdtool[graph]
-	virtual/cron
-	virtual/mysql
-	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
-"
-
-src_prepare() {
-	default
-	sed -i -e \
-		's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \
-		"${S}"/include/global.php || die
-
-	rm -rf lib/adodb || die # don't use bundled adodb
-}
-
-src_compile() { :; }
-
-src_install() {
-	dodoc docs/{CHANGELOG,txt/manual.txt}
-	dodoc -r docs/html/
-	rm -rf docs
-
-	webapp_src_preinst
-
-	edos2unix `find -type f -name '*.php'`
-
-	dodir ${MY_HTDOCSDIR}
-	cp -r . "${D}"${MY_HTDOCSDIR}
-
-	webapp_serverowned ${MY_HTDOCSDIR}/rra
-	webapp_serverowned ${MY_HTDOCSDIR}/log
-	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/net-analyzer/cacti/cacti-1.1.28.ebuild b/net-analyzer/cacti/cacti-1.1.28.ebuild
deleted file mode 100644
index 921139358544..000000000000
--- a/net-analyzer/cacti/cacti-1.1.28.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils webapp
-
-# Support for _p* in version.
-MY_P=${P/_p*/}
-
-DESCRIPTION="Cacti is a complete frontend to rrdtool"
-HOMEPAGE="https://www.cacti.net/"
-SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="snmp doc"
-
-need_httpd
-
-RDEPEND="
-	dev-lang/php[cli,mysql,pdo,session,sockets,xml]
-	dev-php/adodb
-	net-analyzer/rrdtool[graph]
-	virtual/cron
-	virtual/mysql
-	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
-"
-
-src_compile() { :; }
-
-src_install() {
-	dodoc docs/{CHANGELOG,txt/manual.txt}
-	dodoc -r docs/html/
-	rm -rf docs
-
-	webapp_src_preinst
-
-	edos2unix `find -type f -name '*.php'`
-
-	dodir ${MY_HTDOCSDIR}
-	cp -r . "${D}"${MY_HTDOCSDIR}
-
-	webapp_serverowned ${MY_HTDOCSDIR}/rra
-	webapp_serverowned ${MY_HTDOCSDIR}/log
-	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/net-analyzer/cacti/cacti-1.1.38-r1.ebuild b/net-analyzer/cacti/cacti-1.1.38-r1.ebuild
index 920accbea9eb..12b17d1783ad 100644
--- a/net-analyzer/cacti/cacti-1.1.38-r1.ebuild
+++ b/net-analyzer/cacti/cacti-1.1.38-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.cacti.net/"
 SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86"
 IUSE="snmp doc"
 
 need_httpd
diff --git a/net-analyzer/carl/Manifest b/net-analyzer/carl/Manifest
index 0770098449d3..12478829b83c 100644
--- a/net-analyzer/carl/Manifest
+++ b/net-analyzer/carl/Manifest
@@ -1,3 +1,3 @@
 DIST carl-0.9.tar.gz 11096 BLAKE2B 46298873f8fff62a965a7ec7a657522dd90d1a298814f537bb5b32582ea63d0bcb1d4988cd31e6918f16514c65dd3c6517e9079c3c78f6cb0a4bc6d8ece1614a SHA512 9876e30d171bf00c4e53c6e90c98181ac25aeda004bdb8a03060c45a99c55fa087062076ff3964a222d2981ed682ae7b8f4cbade13c69154198200d35e1a577e
-EBUILD carl-0.9-r2.ebuild 418 BLAKE2B bbc91d45cdd2fa561a19cdfe9efb8470d73feb34f7a9dccf3bdca539f0bc93cb739030960dba8c2c53f78a5ead05fcbb547961584fcb7aa18c371cb3011474b8 SHA512 186dc220715268d25e6e80fb1eb84bed663cdba75c33e13c1e61fa00d331f71521b12fa65dc8a6af51a0bfab493dd0f15cadca9368bf0133f8fe9ad3100c449b
+EBUILD carl-0.9-r2.ebuild 411 BLAKE2B d86e0ebabde59510a2f89143e5772f27245a314ae0fe7819b84d6d076d44898b9bb9684eba51ba5ecd78583ebbcd8aa05d0ea2fcf5e05cc3710a4b467a05e27e SHA512 0264e5f9ed859a1046cc944589a1bfa4722ca511f0ff2d172ce91ae7ac1c77496ed1b0c4ddb15c99169b1510e337771100e6601ab62089f0c495f9a96e08fd74
 MISC metadata.xml 356 BLAKE2B bcdfa5dbbe63451ed8f27bfdcc926c60452ebf67fdcf486c487bb284b95c06f4baae460e7a6b607b698110175f2a21ad1fc702b3807ef53e2c6c40437bbdfb1b SHA512 e61b1bac117a325c4e96c7d8c594bd0de46379e573e8b89df72dfca572922807af29b2741c86be602d01856bed58bd369e72d65f0fef508d54001c00578d8637
diff --git a/net-analyzer/carl/carl-0.9-r2.ebuild b/net-analyzer/carl/carl-0.9-r2.ebuild
index 715bd16d4cf9..a1c6382aa5a2 100644
--- a/net-analyzer/carl/carl-0.9-r2.ebuild
+++ b/net-analyzer/carl/carl-0.9-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3)
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3)
 
 inherit distutils-r1
 
diff --git a/net-analyzer/dietsniff/Manifest b/net-analyzer/dietsniff/Manifest
deleted file mode 100644
index 6c3b76fa0fb1..000000000000
--- a/net-analyzer/dietsniff/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dietsniff-0.4.tar.gz 14375 BLAKE2B 8a66b0ebe4d010b2337e16b3d00e1defd52590293227e871e33c760b4456fe0dc4c08f2b4efe071807074e75ae5e44e53875e635766b97978f408b7943f343eb SHA512 fb6a1578f7c0554f51f2035449bbde3d810d0ec67c397ebcdf7d43bd704928dd304e2f519372f5b5d9e4168a2a9e5b4f3ccc46341862276d9c3bf3da0132f1fa
-EBUILD dietsniff-0.4.ebuild 846 BLAKE2B 6d9156a76c1bb349f0ae0b04f2597566a3f26ad3677909ea853d77eaa70222cba2d3329d48111e004b88216bb5582f6309146db10f35f5bbabf3d1deec22d301 SHA512 38c5e4a15c9bfb25aaee90a655f5e88ee88d922dc731bb411d4593d58c7b844491d39598d49be08fbfe028b26d3cdfce019ee38bbb7ef995dc1c618e5a23b7c1
-MISC metadata.xml 858 BLAKE2B 8ed7db380e5a5544961fc5ed50621a65ac4f2bb6db23d079978d497bc509eb4784e22d2d37f5ccc2dac9d65d5aa9de68bb091eb5af419eee73336fbf8fdb6476 SHA512 46811fc9c9c218f2866f2d60c06c3f8d29eef392cb14cc03f1fa6d62b7866c982c86215998033ae18ea0884e7588a9c4716d84e1d3e7252ca4e6c1182bb04578
diff --git a/net-analyzer/dietsniff/dietsniff-0.4.ebuild b/net-analyzer/dietsniff/dietsniff-0.4.ebuild
deleted file mode 100644
index 525ed6964dc3..000000000000
--- a/net-analyzer/dietsniff/dietsniff-0.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs vcs-snapshot
-
-DESCRIPTION="small and static packet sniffer based on dietlibc and libowfat"
-HOMEPAGE="https://github.com/hynek/dietsniff"
-SRC_URI="https://github.com/hynek/dietsniff/tarball/a80c0e64b3 -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-libs/libowfat
-	dev-libs/dietlibc"
-
-src_prepare() {
-	sed -e '/^prefix=/s:=.*:=/usr:' \
-		-e '/^MAN1DIR=/s:man/man1:share/man/man1:' \
-		-e '/^CC/s:=:?=:' \
-		-e '/^CFLAGS/s:=:+=:' \
-		-e '/^LDFLAGS/s:=-s:+=:' \
-		-e '/^dietsniff/,+3s: -o : $(LDFLAGS) -o :' \
-		-e '/^dietsniff/,+3s:strip:#strip:' \
-		-i Makefile
-	export CC="diet -Os $(tc-getCC)"
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/net-analyzer/dietsniff/metadata.xml b/net-analyzer/dietsniff/metadata.xml
deleted file mode 100644
index 9a1ccff140a7..000000000000
--- a/net-analyzer/dietsniff/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<bugs-to>https://github.com/hynek/dietsniff/issues</bugs-to>
-		<maintainer status="active">
-			<email>hs@ox.cx</email>
-			<name>Hynek Schlawack</name>
-		</maintainer>
-		<remote-id type="github">hynek/dietsniff</remote-id>
-	</upstream>
-	<longdescription>
-dietsniff is a network-debugging tool like tcpdump or ethereal. The
-difference to those powerful tools however is that dietsniff is linked
-against Felix von Leitner's dietlibc and doesn't require libpcap.
-Therefore it's really small while being static. dietsniff's most
-useful scenario is probably to sniff the packets into a pcap-logfile which
-can be later viewed using more user friendly applications.
-</longdescription>
-</pkgmetadata>
diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index 5a5e648381f0..2c97cf556038 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -1,8 +1,6 @@
 AUX cve-2017-6430.patch 2437 BLAKE2B 4267c1028467734e45f0a2b730498b6b1de86d9aca95377d7afe76d872ae05c0c9c5e600e8c35f7e0f74d00a125cbffce7f372d543e1728a83121c234ef65366 SHA512 fd3477e7ab087d2b0fdfff6ef331ca8ae4aa838ece54a84d4e597d57cf45425a4dc4be60b9caadf0af25ebe8072eea542092e400e6fe219696b0dc13ca4e205b
 AUX ettercap-0.8.2-openssl-1.1.patch 8769 BLAKE2B 6c9d7e8c60264b6ac0724891f9cbc9b2436bb943680d3e8612aee152bd360ea9f38a778175906787039041e654b49f91353f4cdc678f36753e289270c4b148b3 SHA512 0ba60719cde9648aae37499c1caa6f3e0630e31f1e819945648d778aa6359f0b3771d7673f16a81c4e7ea8efdcf84bf3fb55979d952cb767cb5334f5d154ca9d
 DIST ettercap-0.8.2.tar.gz 8082561 BLAKE2B 851df0a8700de45ce0e3427f7fdbdcd13feb2f75c0d1136563449db634b1f02276bade0d82a1a51bf8de726d6faddf05ff537e397c2e56cfc3e3181d25566fe9 SHA512 18137b1cc518c9db3c9650157a5cbf09dbb665b79876a24875d6c5125e8923ebde543464adb61cf1d1244101242f4d66b80d94ef3b36aa265cefca7646aa6415
-EBUILD ettercap-0.8.2-r1.ebuild 1714 BLAKE2B 2ffce7cce8e652e21470b00f70ef35d90ef768a9344abbebcbd92bed23ba008794932e622a3c31002651ff64e27336819943c14c92621fdb79b2d30d63da8852 SHA512 dda9381deb9b088fb39b7c1de4f7421b43c231d0c7535428ea148533787ece0a8bf31a93e580cfe108cfebd73da2b0ed1668274fa93d47042b1342447753be56
-EBUILD ettercap-0.8.2-r2.ebuild 1790 BLAKE2B e9facbe27ca2a72c28667fcc25c0ac959d2d1b8988f9e0824d351ba3049654391cd27603b350a0bef5752d61b4dce9f52563d2e0f35d1ac788e36015623a862e SHA512 8726c9a5e42ffd27f68974814d01be13c4912a680e001e810827d8edf4478797c6f63df79efa8208309fc92266dad3254f6a890dd15c877646552d7d3bdb64b3
-EBUILD ettercap-0.8.2.ebuild 1660 BLAKE2B 6cf57f82a93894c9bff14d56e823494fd7fd5fcce0285bd19e6316b5db7292e4a19874eccadfaa40ced9e2e3736007e94c30eb96f92f9b3bf714e75dd87f512e SHA512 d8a2b9dc5f6952cbffb15fe18689a7e3587a8d40e52159e65aaea9199f0de43da48bfc6b9c5ee6ab008f24f424d8350b0095246689d7ce36c4cd0a8c9f4f1015
+EBUILD ettercap-0.8.2-r2.ebuild 1789 BLAKE2B a23ee25a8d7c4b95a072183c1cbc6f1465b013ba5cb9cd894481b9063af043f7802ffd2b4311b030973b9acc04bf956e49922b2ed6105c67073f50b62b798946 SHA512 29bb82ce78874bf7b0b512b4a6033a80d1eafa125e4bbae14d6df3d89d92e55158ed6dea064fee50d04d82472b07082e177ffde512274c9e037f7a62299eb7ba
 EBUILD ettercap-9999.ebuild 1711 BLAKE2B 0ed80f63f24c4c595f2b1caf410259fbe974d0833bf8bdaa14f964009a9bd5c75540fcd6beff17622a355bce45408ea2ca52d2378196c7b37a515c6222d96441 SHA512 9d4fd99f08e11126ba68519404490c7000997aa349805a8d4a6d271e52fcda764dc3c8164a3f5ddfe63e819343d24c7f792d229da9d44ec56f039c87854e37ec
 MISC metadata.xml 657 BLAKE2B e32e3fbc55029a9398399a2e2b69974f720826f8769379868ae80e32d2a9b2a69bfeb59b349dae91b7f27a759647091f58ea07a9b23a6dcf32d373966310bdde SHA512 0b682cb596f905882f2c0682c163d31410b94ca873a468db93e155103aeb1e943bff1c55bde1c9537478ce324d368f468bcb91c98f0aefb9dfa2a2239d7f73d5
diff --git a/net-analyzer/ettercap/ettercap-0.8.2-r1.ebuild b/net-analyzer/ettercap/ettercap-0.8.2-r1.ebuild
deleted file mode 100644
index 71fe6afb63cf..000000000000
--- a/net-analyzer/ettercap/ettercap-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A suite for man in the middle attacks"
-HOMEPAGE="https://github.com/Ettercap/ettercap"
-SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" #mirror does not work
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="gtk ipv6 ncurses +plugins"
-
-RDEPEND="dev-libs/libbsd
-	dev-libs/libpcre
-	dev-libs/openssl:0=
-	net-libs/libnet:1.1
-	>=net-libs/libpcap-0.8.1
-	sys-libs/zlib
-	gtk? (
-		>=dev-libs/atk-1.2.4
-		>=dev-libs/glib-2.2.2:2
-		media-libs/freetype
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.2.2:2
-		>=x11-libs/pango-1.2.3
-	)
-	ncurses? ( >=sys-libs/ncurses-5.3:= )
-	plugins? ( >=net-misc/curl-7.26.0 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc"
-
-src_prepare() {
-	sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
-	epatch "${FILESDIR}"/cve-2017-6430.patch
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable ncurses CURSES)
-		$(cmake-utils_use_enable gtk)
-		$(cmake-utils_use_enable plugins)
-		$(cmake-utils_use_enable ipv6)
-		-DBUNDLED_LIBS=OFF
-		-DSYSTEM_LIBS=ON
-		-DINSTALL_SYSCONFDIR="${EROOT}"etc
-	)
-		#right now we only support gtk2, but ettercap also supports gtk3
-		#do we care? do we want to support both?
-
-		#we want to enable testing but it fails right now
-		#we want to disable the bundled crap, but we are missing at least "libcheck"
-		#if we want to enable tests, we need to fix it, and either package libcheck or allow bundled version
-		#$(cmake-utils_use_enable test TESTS)
-	cmake-utils_src_configure
-}
diff --git a/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild b/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild
index 318cbc6ec486..e8904593dbd3 100644
--- a/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git"
 else
 	SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" #mirror does not work
-	KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
 fi
 
 IUSE="doc gtk ipv6 libressl ncurses +plugins test"
diff --git a/net-analyzer/ettercap/ettercap-0.8.2.ebuild b/net-analyzer/ettercap/ettercap-0.8.2.ebuild
deleted file mode 100644
index 7cb81f8684c1..000000000000
--- a/net-analyzer/ettercap/ettercap-0.8.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A suite for man in the middle attacks"
-HOMEPAGE="https://github.com/Ettercap/ettercap"
-SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" #mirror does not work
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="gtk ipv6 ncurses +plugins"
-
-RDEPEND="dev-libs/libbsd
-	dev-libs/libpcre
-	dev-libs/openssl
-	net-libs/libnet:1.1
-	>=net-libs/libpcap-0.8.1
-	sys-libs/zlib
-	gtk? (
-		>=dev-libs/atk-1.2.4
-		>=dev-libs/glib-2.2.2:2
-		media-libs/freetype
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.2.2:2
-		>=x11-libs/pango-1.2.3
-	)
-	ncurses? ( >=sys-libs/ncurses-5.3 )
-	plugins? ( >=net-misc/curl-7.26.0 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc"
-
-src_prepare() {
-	sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable ncurses CURSES)
-		$(cmake-utils_use_enable gtk)
-		$(cmake-utils_use_enable plugins)
-		$(cmake-utils_use_enable ipv6)
-		-DBUNDLED_LIBS=OFF
-		-DSYSTEM_LIBS=ON
-		-DINSTALL_SYSCONFDIR="${EROOT}"etc
-	)
-		#right now we only support gtk2, but ettercap also supports gtk3
-		#do we care? do we want to support both?
-
-		#we want to enable testing but it fails right now
-		#we want to disable the bundled crap, but we are missing at least "libcheck"
-		#if we want to enable tests, we need to fix it, and either package libcheck or allow bundled version
-		#$(cmake-utils_use_enable test TESTS)
-	cmake-utils_src_configure
-}
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 8aa69394f337..21b01d8a0042 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 3192 BLAKE2B 3484aba0cf700524893a15474baeb6d5c30bd40a64fcb929d8da425350028145f56f161e3eaf5857b0b9d133b8586471ad53ee1c3d6150ed37468b659096da63 SHA512 c1643c7b8836c802356c9b3ae88e556f803b83b4d09ff2ca19d91ec1b2f54f99cff8e4ec3df4c7f531ca5c14a7c168c1b0d71ee8ceba95c1e554bfe600a3b11d
-EBUILD fail2ban-0.10.4.ebuild 3285 BLAKE2B f2f3e6ee392b5b56f116ec8650fa6ed5f529e24ad09de41984e5284ff822d5b360263c5001fac195c66cbbf652cb6f8b47dfdaf578de94694f1c7181df52b8f7 SHA512 adbc4d75a460e69776e923077d8432a75930c15f20bebb9dfb199f5d5600f0572db78c683fe2011c106f08166094be8d8628b53394a9fdf72016f7cde3efac4e
-EBUILD fail2ban-99999999.ebuild 2953 BLAKE2B ed24264dc38f050e9e8216e4253aac70eafb2e9ffb9b6be71ef81c3d6a7fc252abeeadb8dfc400d4b22be94f019129bc47dcbdf9b35aa120539d0c6dd29441f5 SHA512 0007d2d3925128c25cc37ffb28176fd071a742f3402a06410e793f1be1bee192e5ecf1dd5ecae3aa554465c969d0879d4ec4de6d15314f9fcafa811e4a3f0bed
+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
 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 1f4495bb15b8..c44c1d21b5a9 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 systemd
@@ -66,7 +66,7 @@ python_install_all() {
 	systemd_dotmpfilesd files/${PN}-tmpfiles.conf
 	doman man/*.{1,5}
 
-	# Use INSTALL_MASK  if you do not want to touch /etc/logrotate.d.
+	# Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
 	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
 	insinto /etc/logrotate.d
 	newins files/${PN}-logrotate ${PN}
@@ -101,7 +101,9 @@ pkg_postinst() {
 
 	if ! has_version dev-lang/python[sqlite]; then
 		elog "If you want to use ${PN}'s persistent database, then reinstall"
-		elog "dev-lang/python with USE=sqlite"
+		elog "dev-lang/python with USE=sqlite. If you do not use the"
+		elog "persistent database feature, then you should set"
+		elog "dbfile = :memory: in fail2ban.conf accordingly."
 	fi
 
 	if has_version sys-apps/systemd[-python]; then
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
index 55ab05ed1d4e..6f6e99cae9b7 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 eutils systemd vcs-snapshot
diff --git a/net-analyzer/fail2ban/fail2ban-99999999.ebuild b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
index 0adb597ee8cc..a3968f20f629 100644
--- a/net-analyzer/fail2ban/fail2ban-99999999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 git-r3 systemd
@@ -54,7 +54,7 @@ python_install_all() {
 	systemd_dotmpfilesd files/${PN}-tmpfiles.conf
 	doman man/*.{1,5}
 
-	# Use INSTALL_MASK  if you do not want to touch /etc/logrotate.d.
+	# Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
 	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
 	insinto /etc/logrotate.d
 	newins files/${PN}-logrotate ${PN}
@@ -89,7 +89,9 @@ pkg_postinst() {
 
 	if ! has_version dev-lang/python[sqlite]; then
 		elog "If you want to use ${PN}'s persistent database, then reinstall"
-		elog "dev-lang/python with USE=sqlite"
+		elog "dev-lang/python with USE=sqlite. If you do not use the"
+		elog "persistent database feature, then you should set"
+		elog "dbfile = :memory: in fail2ban.conf accordingly."
 	fi
 
 	if has_version sys-apps/systemd[-python]; then
diff --git a/net-analyzer/ffp/Manifest b/net-analyzer/ffp/Manifest
deleted file mode 100644
index c14aab440c31..000000000000
--- a/net-analyzer/ffp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ffp-0.0.8.tar.gz 201602 BLAKE2B 9b348d325e91ce59d0fc4e585ecf3827d7343ae9777854ac0e36ceb46a98dd50830498cab5d0f5ce95c2cef1ae825818956aefce390b9290c312d50d4f4466dd SHA512 b2e844905dd08a5c6180ac8e3988effb13b9a8dd8fa1432e65c61a3d4ea2c30c75fb560d392fd3d5b7df2ab364c82f769b57d93d88d4b0f6d52772ef1c3d71bc
-EBUILD ffp-0.0.8-r1.ebuild 596 BLAKE2B 751acb82fc562c3277227f4c7d0d992fb742616b48d0d6a074808c3b6ea7502b113622df2f8d47174c34a387296550b9db0c1b80016060e46ed414ffafb238b7 SHA512 35a910a632eb6eb0c1da74abe7d7c45ba2e66b79da74710e4f57567214cdf4c53fc4dd8cad1d41da82f75bdb9438b19accb92948a57cad367624d72a833b0400
-MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/ffp/ffp-0.0.8-r1.ebuild b/net-analyzer/ffp/ffp-0.0.8-r1.ebuild
deleted file mode 100644
index cbc60fb821f7..000000000000
--- a/net-analyzer/ffp/ffp-0.0.8-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="a tool to do fuzzy fingerprinting for man-in-the-middle attacks"
-HOMEPAGE="http://www.thc.org/thc-ffp/"
-SRC_URI="http://www.thc.org/releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="libressl"
-
-DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README TODO doc/ffp.pdf )
-
-src_prepare() {
-	tc-export CC
-}
-src_install() {
-	default
-	dohtml doc/ffp.html
-}
diff --git a/net-analyzer/ffp/metadata.xml b/net-analyzer/ffp/metadata.xml
deleted file mode 100644
index 74c2baebb4ec..000000000000
--- a/net-analyzer/ffp/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/net-analyzer/flent/Manifest b/net-analyzer/flent/Manifest
index ed3451fd56f1..6f20f0cd2592 100644
--- a/net-analyzer/flent/Manifest
+++ b/net-analyzer/flent/Manifest
@@ -1,3 +1,3 @@
 DIST flent-1.0.1.tar.gz 2285619 BLAKE2B d5ab68144c8520e8077eddd529beb248654d59e05e6b5c90823bae61a86b0dffae959c2089be03b96731e7575eabcfcae2c7b738e9a8a77520a615c48801549a SHA512 868b83a52805cfdb0dc49379aea25e07135a949cea0e6c2388b026099723c20aa7b0146e19110786e763c7f22e1663c42a8bc21bdae2199d00ac85438a3fdf74
-EBUILD flent-1.0.1-r1.ebuild 630 BLAKE2B c2b2fa9d4a0de2966529e0f3150eb9b0ccbd3eb64ba0e6c94ed9ebbf5fb65bd62a9df8b98d814a51089c47a734f71b805823b83954684d9e3568cd4991376ca4 SHA512 22cf85bd02a2ab9c441ab67ba90b556af8c21fc60f4a925dc2fb6a0939350d25cb09c8f51ea21ded8fe7d403edd30b002c07cec3725ee6939b9ff2c50f2cf4b8
+EBUILD flent-1.0.1-r1.ebuild 623 BLAKE2B 3e5d9df5e5d53fa2dc9b58a716a27b575334682ee94bf4c6bc8b2b7ddfca314ab2491d258ea49ba39dc0a5fc81e74bb0aa1234101e8f770479aa8ab82c5d27a8 SHA512 0e1e6fdb37171d8322b5e9bdedd18151b85431d2513b9356a744da016f380aa1714c53a4293ca2548e2958e3dbfe22efecb908b9f0100927b50b0b1bc7e21580
 MISC metadata.xml 391 BLAKE2B 85925178db6e1ae966b020139760580a899541dba0a5160dd0a40d99a13838ff9d4884e70ae5f594f34a311ecc7a3eae00cf9d6027f538b58ef6aca3f2e6b43d SHA512 f659fc94acbe2d182b842fe2ef9a5a6f2cdbf43fc229e200586ee3a3d0a89f49eeddede26efc370b2a7710a739b50d8d83f219248628581da795b9e80a25baf7
diff --git a/net-analyzer/flent/flent-1.0.1-r1.ebuild b/net-analyzer/flent/flent-1.0.1-r1.ebuild
index d93d6849eaf8..5d15a256f66d 100644
--- a/net-analyzer/flent/flent-1.0.1-r1.ebuild
+++ b/net-analyzer/flent/flent-1.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python2_7 python{3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index 4186038aa533..a18da3d40962 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -2,6 +2,6 @@ AUX graphite-web-1.1.3-fhs-paths.patch 2714 BLAKE2B 3c2e4a73e32626ba28ee1c3f5697
 AUX graphite-web-1.1.5-fhs-paths.patch 2712 BLAKE2B f3a05cd9a732ee69d52a62ac5164b3e8bdc5e1d29d3474167c2873f4322a882509f60908731a081f971c01681094f2b6a772a4fcf159ade85ac651f7b0d90c1c SHA512 b383da7aebf0c38b557ac07b0ba4ecd22c41bb9f3318a9f491b37f495a8d2ad5cd8d677076c15958d6326aa1a46574c01a8f5a9cd64fb77ac30fc4d630e8f532
 DIST graphite-web-1.1.3.tar.gz 1171342 BLAKE2B f18c84d707f93d897553ec05d7b910a3dba97c6068498d1b216f178ea8a1f64baf59bb572b433a56f5e417a2873c018a38a19c3b8c765f667d7c3fbb38b9ed0a SHA512 3f9de216bd55e4e8de7391087e9b876a16e4f137fd60932a6d5855804c3d9868422645177776258e74486b97ec7a853b63a6d89b1de9b325bcb50ad694208436
 DIST graphite-web-1.1.5.tar.gz 1173809 BLAKE2B 94a1b4deab3159d3bde2d3c8b6f9664f39942cb1b815ce042b196be3c0e769ee1acac4b619135e9471360849308b90e02e1df4f7d6b7d0ef31e46d38ee2425e5 SHA512 b2097609ca77a40e6e7d83a3141335e2208d69e7f4edbac8ce3505ed9dd654589836a3b3498bfb7f7585332bceeb8e367f0c10f3cf6afdb5ad6b96377338a7bb
-EBUILD graphite-web-1.1.3-r1.ebuild 3095 BLAKE2B 52399189a048fa49d0634a336ee57342723ac47f3a1728026bc7904e1193a328196c9120d57dd2a0d89977bce99145bd1df8230d71e38bdd3d8240b01e8407f1 SHA512 ab54778c65259528bd5bee7db7036152d1e0c6d8182b24933f92b1de91d12d1b2c31e860f688096c28fa87c36d981c897f2a924c8af34bc0789de477e0bd722f
-EBUILD graphite-web-1.1.5.ebuild 3122 BLAKE2B a9757685dfd3b91e1d753728cc5dd3b822d8aefdbeda4b86997ec9a78de6f42075f258b3885301608ad76228ef4fe29764a38a3b6f5e3680eb268642a357b4d1 SHA512 440e0a20ffd1ef6277b5c54e437f1eec0ebf64a9513a1f4a2df0234ec37a85afa600e2f2cc8d73da4cdec36fd1d0b5ec0fe1bfc835be6771aba784e235ac9a3d
+EBUILD graphite-web-1.1.3-r1.ebuild 3090 BLAKE2B 8fce95ada9ffb932655767a1c123aa3f4e4ec2080823b41a433b29dd709ec7742d2d479d680479fcdd2f0bc1b02d400cf09dd23dfd9432edcd369badafb8e6d9 SHA512 61884e3a81d26ca4825101d8c2d3b02110293e0ead60c82688f33e4e1cb8f9fb560d37cf38d9af874bbf996f821e61ce1aeaba15f98b05216276c4cf00d0d7d4
+EBUILD graphite-web-1.1.5.ebuild 3120 BLAKE2B c8cc498e2c8fcf05779882b5a8864d136d92033788c24e847a1578832e14e4b15cb71cbc9d06f9c74e764459697eb7a5f5cd02a79271e9d370ca4f1ff2d34364 SHA512 b9d3768ed3e8772a80ac168446af939abc11d10f26a95e6ab38b79365735d7173cdf7fd9e2a4f3accc3b5ca4ddbdd4e6081688b7926480b2ddae52b055530620
 MISC metadata.xml 592 BLAKE2B 1c284eea68c1db410d55439c14dbf245651157c8f3cb2c77357e50ad8d4426e1c2faf8bd767095f49e9a711e84bbe8b5223aa26529d6dd9cd8dd08c3d8c7c75a SHA512 e9be9344db6989ed9d1d649fff05c4d05c72528097c6d921b5d0d31f9be65d1cfb02071356101f46ffddfa5b7a91785995ad59e15ba0fd78b75d785959051a98
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
index 28df76799802..f28381633f81 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 
 inherit distutils-r1 python-utils-r1 prefix
 
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
index b0cada7cd870..f52246ead385 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )  # 3.7 dropped due to dep-hell
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )  # 3.7 dropped due to dep-hell
 
 inherit distutils-r1 python-utils-r1 prefix
 
diff --git a/net-analyzer/libnasl/Manifest b/net-analyzer/libnasl/Manifest
deleted file mode 100644
index 7dfb12b3b389..000000000000
--- a/net-analyzer/libnasl/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX libnasl-2.2.9-bison3.patch 596 BLAKE2B 12c2cfff4bb2cdc17da3334a167d4e41e56bd797d016e705a8fa6f0f956aaee95e1f662956782fca8ab31f6ca4f8175e812ecf056a31e9302c04537b9c6e091e SHA512 29d03681ffac9b050ff8bc5aa5641c70ebfd6523810e22941e7b262bb1591e3c2d59b3c863725e9dd5ff696ad1a5f2d2b573784607022afd62d33fcaee5822c4
-AUX libnasl-2.2.9-gentoo.patch 929 BLAKE2B 2380164d26990f7e8f2e6e262d01ec424cb42821206da5d55ce04757fec2b1f834cf7f276007fafc4c586f7bcd811ba785a9c1fbf8ab693c3ad7971bb82e5d50 SHA512 7d4fe54240b771f30f1b80e35be828868428ad24b3654aedb91ef5da42f2bde379347a4730e71f04edb373ab9d7a6be981769eef7aa3514d4275177391f7290f
-AUX libnasl-2.2.9-openssl-1.patch 844 BLAKE2B 9bd26f9fcade0c58a541b60ca94868e6670e90acfc299b4c79334f8dae20a3cefa551cb9dc5a21c68e5a79f8535c3f7aeef214ec58b69dc779f540313b9ebb0f SHA512 d39c7d89166aa2274dead9378e5b8c763672830aaa7ae7ee9166137aa984aa9d2497ebdfaf6312356c78c95404a763e3b6b9ab58a460cc1bfc8a9c8d1db8590e
-DIST libnasl-2.2.9.tar.gz 366960 BLAKE2B 4d5b5259c6bd1184d2bdf8f72a0e1f327666150f7d943c0343560d8ff0596819db10437f714c5fb7440afadf947492112c667bf224248f994be474ceb87243d9 SHA512 74a637d39f0d61c9e0f692d3a6754000ef635690a61b05c88608fd5bbee438ce720597babe25af80bccd4fca52f22531b3fc913820a13147c179f8a16c034e03
-EBUILD libnasl-2.2.9-r1.ebuild 983 BLAKE2B 908633cc36ffa9e9a12b04288fac481d3a76885769d44b7c6739430233d871a24f0d881170405babdcda706801f74665f093afb6064fbbd47bcbd0e58ceb542a SHA512 bb8dbde665776d6bd0df74e532c8553638c5114bb7d5bfdd7c6c162474b9c911fe1d465a2834fce18ae671b6a628996fa87d0329dbc5f53cbb846cd9d8a9dc33
-MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/libnasl/files/libnasl-2.2.9-bison3.patch b/net-analyzer/libnasl/files/libnasl-2.2.9-bison3.patch
deleted file mode 100644
index 91f91fa38e09..000000000000
--- a/net-analyzer/libnasl/files/libnasl-2.2.9-bison3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/nasl/nasl_grammar.y
-+++ b/nasl/nasl_grammar.y
-@@ -1,4 +1,6 @@
--%pure_parser
-+%pure-parser
-+%parse-param {naslctxt * parm}
-+%lex-param {naslctxt * parm}
- %expect 1
- %{
- /* Nessus Attack Scripting Language version 2
-@@ -31,7 +33,7 @@
- #include "nasl_lex_ctxt.h"
- #include "nasl_debug.h"
- 
--static void naslerror(const char *);
-+static void naslerror(naslctxt *, const char *);
- #define YYERROR_VERBOSE
- %}
- 
-@@ -465,8 +467,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
--static void 
--naslerror(const char *s)
-+static void naslerror(naslctxt *parm, const char *s)
- {
-   fputs(s, stderr);
- }
diff --git a/net-analyzer/libnasl/files/libnasl-2.2.9-gentoo.patch b/net-analyzer/libnasl/files/libnasl-2.2.9-gentoo.patch
deleted file mode 100644
index c82f76d60016..000000000000
--- a/net-analyzer/libnasl/files/libnasl-2.2.9-gentoo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-index 860653d..82bdf2f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- include nasl.tmpl
- 
- all: 
--	cd nasl && ${MAKE}
-+	${MAKE} -C nasl
- 
- nasl.tmpl: nasl.tmpl.in configure
- 	$(SHELL) configure $(CONFIGURE_ARGS)
---- a/nasl/Makefile
-+++ b/nasl/Makefile
-@@ -97,11 +97,11 @@ cflags :
- 	@echo "echo \"$(NESSUS_CFLAGS) $(include) $(DEFS) \"" > cflags
- 	@chmod +x cflags
- 
--nasl : cflags $(OBJS) nasl.c
--	$(CC) $(CFLAGS)  $(NESSUS_INCLUDE) $(include) -o nasl -DVERSION=\"$(VERSION)\" nasl.c $(OBJS) $(NESSUS_LIBS) 
-+nasl : cflags $(OBJS) nasl.c libnasl.la
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(NESSUS_INCLUDE) $(include) -o nasl -DVERSION=\"$(VERSION)\" nasl.c $(OBJS) $(NESSUS_LIBS) 
- 
- libnasl.la : cflags $(OBJS)
--	$(COMPILE) $(NESSUS_LIBS) -o libnasl.la $(LO_OBJS) -rpath ${libdir} \
-+	$(COMPILE) $(NESSUS_LIBS) $(LDFLAGS) -o libnasl.la $(LO_OBJS) -rpath ${libdir} \
- 	-version-info ${PACKAGE_VERSION}
- 
- install : libnasl.la nasl
diff --git a/net-analyzer/libnasl/files/libnasl-2.2.9-openssl-1.patch b/net-analyzer/libnasl/files/libnasl-2.2.9-openssl-1.patch
deleted file mode 100644
index fc3b38be4c2e..000000000000
--- a/net-analyzer/libnasl/files/libnasl-2.2.9-openssl-1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-http://bugs.gentoo.org/326545
-
---- a/nasl/nasl_crypto.c
-+++ b/nasl/nasl_crypto.c
-@@ -22,7 +22,9 @@
-   */
- #include <includes.h>
- #ifdef HAVE_SSL
-+#ifdef HAVE_OPENSSL_MD2_H
- #include <openssl/md2.h>
-+#endif
- #include <openssl/md4.h>
- #include <openssl/md5.h>
- #include <openssl/ripemd.h>
-@@ -45,6 +47,7 @@
- 
- 
- /*-------------------[  Std. HASH ]-------------------------------------*/
-+#ifdef HAVE_OPENSSL_MD2_H
- tree_cell * nasl_md2(lex_ctxt * lexic)
- {
-  char * data = get_str_var_by_num(lexic, 0);
-@@ -63,6 +66,7 @@
-  retc->size = MD2_DIGEST_LENGTH;
-  return retc;
- }
-+#endif
- 
- tree_cell * nasl_md4(lex_ctxt * lexic)
- {
-@@ -192,12 +196,12 @@
-  return retc;
- }
- 
--
-+#ifdef HAVE_OPENSSL_MD2_H
- tree_cell * nasl_hmac_md2(lex_ctxt * lexic)
- {
-  return nasl_hmac(lexic, EVP_md2());
- }
--
-+#endif
- 
- tree_cell * nasl_hmac_md5(lex_ctxt * lexic)
- {
diff --git a/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild b/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild
deleted file mode 100644
index 497332220f40..000000000000
--- a/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A remote security scanner for Linux (libnasl)"
-HOMEPAGE="http://www.nessus.org/"
-SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
-IUSE="static-libs"
-
-RDEPEND="
-	~net-analyzer/nessus-libraries-${PV}
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/bison
-"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-openssl-1.patch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-bison3.patch
-
-	sed \
-		-e "/^LDFLAGS/s:$:${LDFLAGS}:g" \
-		-i nasl.tmpl.in || die
-
-	tc-export CC
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--enable-shared
-}
-
-src_compile() {
-	# emake fails for >= -j2. bug #16471.
-	emake -C nasl cflags
-	emake
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-analyzer/libnasl/metadata.xml b/net-analyzer/libnasl/metadata.xml
deleted file mode 100644
index 74c2baebb4ec..000000000000
--- a/net-analyzer/libnasl/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index e707226397ec..cabc7f546772 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,7 +1,5 @@
 AUX database.yml 613 BLAKE2B c724103b21f7650e4c6a221a22984cbff1be21ae761b62666db5d048e087f3d4e891e30b75fcacdcb5dc2fc369dd8dff4de042d6b87f47bffffeb45bd05aca46 SHA512 b178724382a88b87b9007f950fb5e8f93936f3e5a58f89c90f67120c4d50c98d4de758c8a6e321a0a68caa12ccab003d502377621bfe762279eb5ae2a3d5ff2b
-DIST metasploit-4.14.16.tar.gz 23726763 BLAKE2B ab2d3f10c948db394643f2bcd9b08822f16133ef81abe7048b6c4e49bf635abded40d7359b9787f7f955ba6eccfdb81ff6372d24dd2acd732ba9f16cb41ca8b4 SHA512 882968e68ff5adf10426f6e8480f3eac7cd9b289c1e641a91e537d31a434858f2c47b4f7b5bf23fcfc22eceecd2527eedb7eac3e9a8ad4a212187762b1b9aab2
 DIST metasploit-4.17.21.tar.gz 28812125 BLAKE2B 15ff8ccac99d783b7b9cd20d6512df551b3143b4947d2f347b2558d1bafd2861d41fe6b051034c75cd25030ad85d26f261ffe9149dd27d551f92f17fcc0b4075 SHA512 00763f515bc6b556d4dbe15a7c58fac3c7febb64fb339fd5c05ad2b18b5b55bdf8815daca35f24bb22bea3d376db4f4610918730d813079e5ac3f8d5ad16d2d9
-EBUILD metasploit-4.14.16-r2.ebuild 11790 BLAKE2B 8b2fb60ffa9bf4636f4c0cbd25802fa531339d4e439478118fbef1fd2b411095544984195bccf69100049ecdca7f7e276e2f79ca489d953e2a597f9ce6cfde34 SHA512 a9a189b1d3eef0054aa63628b16b51a5c16be4861b12afae2442083cffbc37e3e18fd8ed0955d4e9190fefe0c72417b4623aca17a68c35d363097eeb4dcfaf17
 EBUILD metasploit-4.17.21-r4.ebuild 12241 BLAKE2B bd8f424eb18242dcf6113c99ce1ec2b22d3a493a3b54ba1de1af358c2efece5e93e8430ae6726ffc3011cccddff656cfe6b4e51ea229f4656d39018739872bf5 SHA512 56b1bcf9388914ef39adf2b438bbc168fbe88b27404c753441843581efc35cb280a39240125c47a005834f8e1acad05a098d4fca472d4f364835d32fe4dabd80
 EBUILD metasploit-9999.ebuild 12233 BLAKE2B 43593e3349db4932a2c4808be403b07e4dceb79abdad407a3285a515f31209ddddbeddf371822fc71156f99c1dae3dbbee8423d776370926a6108adcafa4dcce SHA512 eea4237aaaf6a6c36f6df83a1b4475126797c3fa2c2c5758042e28079b46637e56e0b509abe28eaa149029dd5db683111773d479c59c972b4b4f1d258483e799
 MISC metadata.xml 853 BLAKE2B 9b0b2e6c82a4df1327ded8b8381fa1e557ba4353ae5dab9665e7b59950d36e61faead5d8672e2cc10dad68b5a3250126a7fb1c4edc7f6814f28ea3f6df663473 SHA512 9af2dae0c12ae84ae2a7887fad0e7f5ea1d945a8b6e6674ba9e3c3bbff167b00a4aeff2da8b457ff8657f83d617dad67f633b260578a1e9608475fe45585cad0
diff --git a/net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild b/net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild
deleted file mode 100644
index fb8f4c563b88..000000000000
--- a/net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-#never ever ever have more than one ruby in here
-USE_RUBY="ruby23"
-inherit eutils ruby-ng
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
-	inherit git-r3
-	KEYWORDS=""
-	SLOT="9999"
-else
-	##Tags https://github.com/rapid7/metasploit-framework/releases
-	MY_PV=${PV/_p/-}
-	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-	RUBY_S="${PN}-framework-${MY_PV}"
-	inherit eapi7-ver
-	SLOT="$(ver_cut 1).$(ver_cut 2)"
-fi
-
-DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-LICENSE="BSD"
-IUSE="development +java nexpose openvas oracle +pcap test"
-
-#multiple known bugs with tests reported upstream and ignored
-#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
-RESTRICT="test"
-
-RUBY_COMMON_DEPEND="virtual/ruby-ssl
-	>=dev-ruby/activesupport-4.2.6:4.2
-	>=dev-ruby/actionpack-4.2.6:4.2
-	>=dev-ruby/activerecord-4.2.6:4.2
-	dev-ruby/bcrypt-ruby
-	dev-ruby/bit-struct
-	>=dev-ruby/builder-3.0
-	dev-ruby/bundler
-	dev-ruby/filesize:*
-	>=dev-ruby/jsobfu-0.3.0:*
-	dev-ruby/json:*
-	dev-ruby/kissfft
-	dev-ruby/metasm:1.0.2
-	>=dev-ruby/metasploit_data_models-2.0.0
-	dev-ruby/meterpreter_bins:0.0.22
-	dev-ruby/metasploit-payloads:1.2.24
-	dev-ruby/metasploit_payloads-mettle:0.1.9
-	>=dev-ruby/metasploit-credential-2.0.0
-	>=dev-ruby/metasploit-concern-2.0.0
-	>=dev-ruby/metasploit-model-2.0.0
-	dev-ruby/msgpack
-	dev-ruby/net-ssh:*
-	dev-ruby/nokogiri
-	dev-ruby/octokit
-	dev-ruby/openssl-ccm:1.2.1
-	dev-ruby/patch_finder
-	>=dev-ruby/recog-2.0.14
-	dev-ruby/redcarpet
-	>=dev-ruby/rkelly-remix-0.0.6
-	dev-ruby/rex-arch
-	dev-ruby/rex-bin_tools
-	dev-ruby/rex-core
-	dev-ruby/rex-encoder
-	dev-ruby/rex-exploitation
-	dev-ruby/rex-java
-	dev-ruby/rex-mime
-	dev-ruby/rex-nop
-	dev-ruby/rex-ole
-	dev-ruby/rex-powershell
-	dev-ruby/rex-random_identifier
-	dev-ruby/rex-registry
-	dev-ruby/rex-socket
-	dev-ruby/rex-sslscan
-	dev-ruby/rex-rop_builder
-	dev-ruby/rex-struct2
-	dev-ruby/rex-text
-	dev-ruby/rex-zip
-	dev-ruby/ruby_smb:*
-	dev-ruby/sqlite3
-	>=dev-ruby/pg-0.11:*
-	dev-ruby/packetfu:1.1.13
-	>=dev-ruby/rubyzip-1.1
-	>=dev-ruby/rb-readline-0.5.4
-	dev-ruby/robots
-	dev-ruby/sshkey
-	dev-ruby/tzinfo:*
-	dev-ruby/windows_error
-	dev-ruby/xmlrpc
-	java? ( dev-ruby/rjb )
-	nexpose? ( dev-ruby/nexpose )
-	openvas? ( dev-ruby/openvas-omp )
-	oracle? ( dev-ruby/ruby-oci8 )
-	pcap? ( dev-ruby/pcaprub:*
-		dev-ruby/network_interface )
-	development? ( dev-ruby/fivemat
-			dev-ruby/pry
-			dev-ruby/redcarpet
-			dev-ruby/yard
-			>=dev-ruby/rake-10.0.0
-			>=dev-ruby/factory_girl-4.1.0 )"
-	#lorcon doesn't support ruby21
-	#lorcon? ( net-wireless/lorcon[ruby] )
-ruby_add_bdepend "${RUBY_COMMON_DEPEND}
-		test? ( >=dev-ruby/factory_girl-4.1.0
-			dev-ruby/fivemat
-			dev-ruby/database_cleaner
-			>=dev-ruby/rspec-2.12
-			dev-ruby/shoulda-matchers
-			dev-ruby/timecop
-			>=dev-ruby/rake-10.0.0 )"
-ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
-
-COMMON_DEPEND="dev-db/postgresql[server]
-	|| ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal] )
-	net-analyzer/nmap"
-RDEPEND+=" ${COMMON_DEPEND}
-	>=app-eselect/eselect-metasploit-0.16"
-
-RESTRICT="strip"
-
-QA_PREBUILT="
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
-	usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
-	usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
-	usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
-	usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
-	usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
-	"
-
-pkg_setup() {
-	if use test; then
-		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
-		su postgres -c "createuser msf_test_user -d -S -R"
-		if [ $? -ne 0 ]; then
-			su postgres -c "dropuser msf_test_user" || die
-			su postgres -c "createuser msf_test_user -d -S -R" || die
-		fi
-		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
-	fi
-	ruby-ng_pkg_setup
-}
-
-all_ruby_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-#		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
-#		rm -r msf3
-		#msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
-		#msf_version=${msf_version#*=}
-	fi
-}
-
-all_ruby_prepare() {
-	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
-	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
-	eapply_user
-
-	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
-	rm -r data/cpuinfo
-
-	#remove unneeded ruby bundler versioning files
-	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
-	#we regen this file in each_ruby_prepare
-	rm Gemfile.lock
-
-	#The Gemfile contains real known deps
-	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
-	#use released packetfu
-	sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die
-	#git gems are only for ruby24 support and we are not there yet
-	sed -i "/git:/d" Gemfile || die
-
-	#now we edit the Gemfile based on use flags
-	if ! use pcap; then
-		sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die
-	fi
-	if ! use nexpose; then
-		sed -i -e "/nexpose/d" metasploit-framework.gemspec || die
-	fi
-	#no support for nessus right now
-	#if ! use nessus; then
-		sed -i -e "/nessus/d" metasploit-framework.gemspec || die
-	#fi
-	if ! use openvas; then
-		sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die
-	fi
-	#even if we pass --without=blah bundler still calculates the deps and messes us up
-	if ! use development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-	fi
-	if ! use test; then
-		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
-	fi
-	if ! use test && ! use development; then
-		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
-	fi
-	#We don't need simplecov
-	sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
-	sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
-
-	#we need to edit the gemspec too, since it tries to call git instead of anything sane
-	#probably a better way to fix this... if I care at some point
-	sed -i -e "/^  spec.files/,/^  }/d" metasploit-framework.gemspec || die
-
-	#https://bugs.gentoo.org/show_bug.cgi?id=584522 no tzinfo-data by choice in gentoo
-	sed -i '/tzinfo-data/d' metasploit-framework.gemspec
-
-	#avoid specifically versioned rex-arch
-	sed -i -e "/rex-arch/ s/, '0.1.4'//" metasploit-framework.gemspec || die
-
-	#let's bogart msfupdate
-	rm msfupdate
-	echo "#!/bin/sh" > msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"\"" >> msfupdate
-	if [[ ${PV} == "9999" ]] ; then
-		echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
-		echo "	smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
-		echo "else" >> msfupdate
-		echo "	echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
-		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
-		echo "fi" >> msfupdate
-	else
-		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
-		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
-		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
-	fi
-	#this is set executable in src_install
-
-	#install our database.yml file before tests are run
-	cp "${FILESDIR}"/database.yml config/
-
-}
-
-each_ruby_prepare() {
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-
-	#force all metasploit executables to use desired ruby version
-	#https://dev.metasploit.com/redmine/issues/8357
-	for file in $(ls -1 msf*)
-	do
-		#poorly adapted from python.eclass
-		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
-	done
-}
-
-each_ruby_test() {
-	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
-
-	#we bogart msfupdate so no point in trying to test it
-	rm spec/msfupdate_spec.rb || die
-	#we don't really want to be uploading to virustotal during the tests
-	rm spec/tools/virustotal_spec.rb || die
-
-	# https://dev.metasploit.com/redmine/issues/8425
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
-
-	MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake  || die
-	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
-}
-
-each_ruby_install() {
-	#Tests have already been run, we don't need this stuff
-	rm -r spec || die
-	rm -r test || die
-	rm Gemfile.lock || die
-
-	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
-	# should be as simple as copying everything into the target...
-	dodir /usr/$(get_libdir)/${PN}${SLOT}
-	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
-	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
-	fowners -R root:0 /
-
-}
-
-all_ruby_install() {
-	# do not remove LICENSE, bug #238137
-	dodir /usr/share/doc/${PF}
-	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
-	ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/$(get_libdir)/${PN}${SLOT}/documentation"
-
-	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
-
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
-	EOF
-}
-
-pkg_postinst() {
-	elog "Before use you should run 'env-update' and '. /etc/profile'"
-	elog "otherwise you may be missing important environmental variables."
-
-	elog "You need to prepare the database by running:"
-	elog "emerge --config postgresql"
-	elog "/etc/init.d/postgresql-<version> start"
-	elog "emerge --config =metasploit-${PV}"
-
-	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
-
-	einfo
-	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
-}
-
-pkg_config() {
-	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
-	su postgres -c "createuser msf_user -D -S -R"
-	su postgres -c "createdb --owner=msf_user msf_database"
-}
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index b764f7d34b48..91e7fe284646 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -18,8 +18,11 @@ DIST munin-2.0.38-gentoo-1.tar.xz 5404 BLAKE2B d375c6a6c5bda768f83f701a9cf0236eb
 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
 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.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.47.ebuild b/net-analyzer/munin/munin-2.0.47.ebuild
new file mode 100644
index 000000000000..d1c4dea964e8
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.47.ebuild
@@ -0,0 +1,416 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PATCHSET=1
+
+inherit 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-Exception
+		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/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() {
+	echo ${PV} > RELEASE || die
+
+	eapply "${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/nagios-icinga-openvpn/Manifest b/net-analyzer/nagios-icinga-openvpn/Manifest
index 81826975c95e..8b5d9be05e07 100644
--- a/net-analyzer/nagios-icinga-openvpn/Manifest
+++ b/net-analyzer/nagios-icinga-openvpn/Manifest
@@ -1,3 +1,3 @@
 DIST nagios-icinga-openvpn-0.0.1.tar.gz 4637 BLAKE2B 365b6450cccd5f7f25348583eae45c0b15932ec1e858d375171911e4108dd2b7fc133559a35399ece8d2a349f05b2f51897cf9e271f498b6bbaa2c6bba3551a9 SHA512 0dae6c2df71a20e287720767aa4ba41d0568f3cd4bd2a6eb252f86d810d3de265ddc38397df15bb1b115ba35ac68aa6e18345dc4432d4d13b08b500483ffbb11
-EBUILD nagios-icinga-openvpn-0.0.1.ebuild 1126 BLAKE2B 714dfdb3e2f6086fab0cc358daf9b05ee6abf83a0be3792629e63ea6a7295b49ce923a3d0d4e05d65d81c3b01440235929fb02e005e2a4fb10d8721eb230c600 SHA512 98af7661f2b33475ad700fc2b182259f16f9ed36abbaef53e5d0c579fb7cc5c7a9fed9d83917d5410e47bd3855ac18a42a189ee948cad87674f996923952aa5a
+EBUILD nagios-icinga-openvpn-0.0.1.ebuild 1119 BLAKE2B e295b34ab41c296db0626f1b40a591ad976ccb573151c0529dbc2100489b87a3342084cdba1ded401400b4a14d5787d2b1a5a214b54cc033a1b3dd53c5f68680 SHA512 a7d55763ca4257becc5bf054eb7c9a78fb9b1b9c017778559a074a07805d5178a583fec8708848f92c7ee1c54d509a653c953e79be0e4ff36d57302a3d467394
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild
index e8e112ffe2f0..e9b11236fdba 100644
--- a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild
+++ b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1
 
 MY_PN="check_openvpn"
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index 7ded7e178665..dc07161dcd8a 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -3,7 +3,7 @@ AUX nagstamon-3.0-setup.patch 1139 BLAKE2B f399c6c600785629c7c90b1de396c17805882
 DIST Nagstamon-2.0.1.tar.gz 535814 BLAKE2B f366a0b5d2f2e4c7168bbb996b68aea7f9ea2f248c25505f8e2ca553d4c275260eec8fdad27b7c1187826cca0cebc7c027491a4f7b6acb24ddf604b6b6a8a930 SHA512 f9c8ab928a78f289693ae58cd3dde6fa75dd66dc931dbec6a4affc35bd96f16c39a03cb441575c9ca42e810ae5962fc7226513b8cc2a17871e0365aa3a207db6
 DIST Nagstamon-3.0.2.tar.gz 542005 BLAKE2B 090875cabbf22feea5cfe0eab0934b503d68df0f49c0a2e8056ccfed8251f278e149da5d0f8002cc5c96ffddd5b89a3ad997d90790e33c9cf1b9ffd9e32a83c0 SHA512 8b05b74adc7399b84cfb66d4c55ff80b2a37af7612496578bdc72ce00f712c8eae087204d00e7d7f1e1d35377f7bb8460d5cf337e315943a48a4ad5108e8d14f
 DIST Nagstamon-3.2.1.tar.gz 545190 BLAKE2B ce8b6624a3b1b61e307281ba193d07850bd5d104205d21e2967c1f65c0fdb217be2b2422d0312cfccaba766b814cb1f298a2ed62d07b7377530fd2ef3200a46f SHA512 c3ddda8d046d08514f7633b9129abebdc039e7faee5a618ef8ef77fc2c518bad798572fb549eb9ab9ef96377cd390e159934f268d9bd97c071c4895682bff8e6
-EBUILD nagstamon-2.0.1.ebuild 1193 BLAKE2B 9364c8ec44986d3352e29ba9a543cb417f812c114746e5743bf5993463d34adff33c75967c8bb3fae6783cda1a5653601afcdcf03d4c6d86c3eb1d4f79fb6f68 SHA512 4e4e469d11fcb40dfc5a3a2f0ce5c95886432c92f11116f9e860fb7f3ae7a0159ea26108bf32729ef75807bc37e885e96cb97b22e9b806057eeac0e27ae298e1
-EBUILD nagstamon-3.0.2-r1.ebuild 1383 BLAKE2B 19c84d6faa5a09290a73da7252060e5a23fa52f0c040e8fad80154269595f291933c8150e6b714cd4882e3164696e0f35aed75144f6b5cec8fe3e37e101f1596 SHA512 42ed49a6983b713c208e7cf59214fbd25056cfb014d73ead0039d1a127238d59718218e2ff9731ea6a9eedbe959a234360d703f162d947fb3c424c80de4f3e36
-EBUILD nagstamon-3.2.1.ebuild 1509 BLAKE2B d6881601f24d5b93909bd1f40ed14743531368bc6f8dc9986693a62b3e4c813e0d80efe31dc170298990a60b5ae192d9d295da62271a1a46dc653fe3800a6774 SHA512 fd69b0d24c2a6830dcc6e46aa2ed155bbf676c6322e5dd757440b1f43ba3d94514d963efda997a2f94757d6bd28cffca8a5daabb1435773e2488b3d495028270
+EBUILD nagstamon-2.0.1.ebuild 1188 BLAKE2B c7b20f426bad35ce37deabb64e18a8dcf374cb7f7d43516aed423ae12fda2b5d4ccf8c5f6ddc93aa1aff7f2e037b129cc44bd44bd818113a293c44b0cc223bd5 SHA512 46a35dbd486c0d2b6b3fd0c5768594c377253f5887302eab3eb0afdf7d25cccfae75e8369f81ddc882ed8842d55f8aaff9d054aac60b8cddd940e916c793684f
+EBUILD nagstamon-3.0.2-r1.ebuild 1378 BLAKE2B eb629c155a340da2a44da0028d0e5bbf0c0fc1770a249fce235914e02e322ad31b183df25ecd01f0035fd49ee94cc4dfa6d02f74b21df29d695ca24024a72ba8 SHA512 f491e0913cf8ce4f32187f50a5544169789c7ad843038cff420042ae1a6e67565f7d8b7b863f209860f4ae5da81d9dbfafa233f4a803280e7421ec00d4caf6c0
+EBUILD nagstamon-3.2.1.ebuild 1507 BLAKE2B 25993aae252c7fbe105e6c0986c8e1ce90ae00e04260e6d30239bd5a30f5d730034ae8042c79b5b6ed104cbea9830bcb7d69468927a45d6f448f1baa677b127f SHA512 d937268668cb9364b3cae7b5e0602d537a037c8d29b670eac56581cc6826ccff8b2187c43d98e065a7451ae791ba810e5122c94b53f12ee30e104f1556bfad38
 MISC metadata.xml 525 BLAKE2B ad9c68b36b1260f907ceb8f50389fd0e035d441d33e99c71bb8dd493cda5cdaaa4e2ec32746d2b96d15b776d9de03070e411515f34e90c93063dd4b6b803c155 SHA512 5a1bf5be48ee8d28b501dceea33c65791b13cf0301c6bb170e4fe5ecd7b771cc28d3e9a49b82440770800854146961069cb26529ed5fe3e2c9a796329b085c64
diff --git a/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild b/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild
index 4b6cb94a77d7..e821856fd242 100644
--- a/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit eutils python-r1 distutils-r1
 
diff --git a/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild b/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild
index 508d1a24e804..af868ef5e77c 100644
--- a/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit eutils python-r1 distutils-r1
 
diff --git a/net-analyzer/nagstamon/nagstamon-3.2.1.ebuild b/net-analyzer/nagstamon/nagstamon-3.2.1.ebuild
index 50e2743bf1d8..eda377457944 100644
--- a/net-analyzer/nagstamon/nagstamon-3.2.1.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-3.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit eutils python-r1 distutils-r1
 
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index 5bde5338c505..08a5c9f12867 100644
--- a/net-analyzer/nessus-agent-bin/Manifest
+++ b/net-analyzer/nessus-agent-bin/Manifest
@@ -1,6 +1,6 @@
 AUX nessusagent.initd 563 BLAKE2B 63820368c95dc2358ff73843e239a084e21cea48bd4dfd170e486f0c702e7ec6be1581478f7c37dd12868dd3648dfd8f44b8ff47c85fdab0276a0c84b78eb7d1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718
-DIST NessusAgent-7.1.1-es7.x86_64.rpm 15646432 BLAKE2B 5c78ab227f309fd0b86b504ca18cb767b768785111517faebee44c56d226a2189d34ceacaae000907b89e977192bc8a058236499b865a593fb5754f46f6521ee SHA512 5f1340f26ae11378ddc1efc4d2f153111e592955ec648f740ffa538d5e437332f5c79ab92a737ebbb318786ef28ab5177c8cc73ebde909529c050b64df2ee8a1
 DIST NessusAgent-7.1.2-es7.x86_64.rpm 15663484 BLAKE2B 6b7290a39984acfc95ec0b75c8f9e6b04ecdfe630fe792f32ffb539676bad73a7db02789dcbfb6dae3d40c1e9eef1065282c20ca9a3c51b29fe0540f70cc82bc SHA512 64aff80fd5115b0f261e0156c83a67b47a7f68d7d1e8803be87a54cecaf6be1f03bf213ee68a0ffae9a2b2ad35ea7766445444ed132c077f46127cd5772f7a39
-EBUILD nessus-agent-bin-7.1.1.ebuild 1962 BLAKE2B df4b53f29f182f10839fbe5612fed593decd1dcda1f66ec735c79d1cbd6887b1fc6d1500ee070c1d47aa62ee71d998ce5dc9b271863b92d4f7de26dbff8f93c5 SHA512 79cd0ce502fd885670c04f16807001623ffb6020ed052bde70a59ed85b7a915747d8af2e156a7cc433ab0bae0bcae27a5c801c7b564850cccd93b7a5b979acda
+DIST NessusAgent-7.3.2-es7.x86_64.rpm 15690964 BLAKE2B 8be82fc99abdf9ffa58af6e4ad0b19313406c0d5db4b7a231360f82414a0fef7c5b3237ac1653ee8fab222b0866fd0071729e0320e6a6a7da76171642a2be32f SHA512 5009d125d917e2aba25d1743f19954302d27e02860df89d7081715e28539e6e44dfee5d9a9ca471ba7c008c27a59843034daf46b13f2b08b02a1a823ff0a3fa8
 EBUILD nessus-agent-bin-7.1.2.ebuild 1970 BLAKE2B e041a1556fb042ad02231c1fb5decc60bd0c31ab5a5193506cebca6b58d3424ec205c21045a672787312650ad74907d647cba6370a315b7b397314985c060c3e SHA512 86927ab4ae3d5cd12abbb5ba497bbc055c8365fd9025e2b1a3b98fd0f22331090bcabdbf91bb332a7360f098584d9f248a4d1321038c017e0147f3cd541c1327
-MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
+EBUILD nessus-agent-bin-7.3.2.ebuild 1970 BLAKE2B 278773d237abd92549945042f22e33de29803a1eb7f94678d85c8824fe4e93e932afa56bb250680a997706fe3be683f960656e48a8272e87ac9c8b628902b2ca SHA512 6b075584220409015a3e82cddc2f2b7d1b68aa1ec2093b6ddf350bb35461b4c29969fd02ee646b30bbf3c2cea5cbe6bd339b7b8f14bdb04122238d86da25c684
+MISC metadata.xml 353 BLAKE2B e3ba298accb9a0618eb7340652a32cc166702f8873b49de734f6c117e2aeadbd9c31a76f231574ee04159454633191d4d3480925c05c993be174bf4efd3cc994 SHA512 81bc629de5c0367706b7b3259b3bb68edff6260dd47de345153af292a81fb6df23771b0f4974617f1fdef7b446dc17ab3c485d44d3dcb376e93c69173503a348
diff --git a/net-analyzer/nessus-agent-bin/metadata.xml b/net-analyzer/nessus-agent-bin/metadata.xml
index 3e5026ee3754..c8e172bcbf62 100644
--- a/net-analyzer/nessus-agent-bin/metadata.xml
+++ b/net-analyzer/nessus-agent-bin/metadata.xml
@@ -5,4 +5,8 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.1.1.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.3.2.ebuild
index c56eacb41b01..20d896ea6290 100644
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.1.1.ebuild
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.3.2.ebuild
@@ -30,7 +30,7 @@ QA_PREBUILT="opt/nessus_agent/bin/nasl
 S="${WORKDIR}"
 
 pkg_nofetch() {
-	einfo "Please download ${A} from ${HOMEPAGE}/agent-download"
+	einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus-agents"
 	einfo "The archive should then be placed into your DISTDIR directory."
 }
 
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index 63c39691576c..b02c92651ad5 100644
--- a/net-analyzer/nessus-bin/Manifest
+++ b/net-analyzer/nessus-bin/Manifest
@@ -1,6 +1,6 @@
 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.0.1-es7.x86_64.rpm 62028348 BLAKE2B 07e174d8d3c68773e55cacf57ca836163288db0c4458a8e987279ef9099a82c662aaf00699e5938afe51d549a1114144a0fef246151d4b2c088367bc900236aa SHA512 4351c40e0133f1ca56d0366814b9daba1ee4e12aa496fcc23971f26e9313fdab9c195b43c0848488acdea178a95d383bdf46ecf0355a2214713ce23458156ab9
+DIST Nessus-8.3.1-es7.x86_64.rpm 67341324 BLAKE2B 97fafcd057eb58e8528c0c9da69467e275dcdac405a60dfb5c1d7a39f705f607b3988c182ba60e7e7da1545d8c79e520ca6d35e5531e64db8323db3b2f44c5c4 SHA512 6112a4cb9d76634696f6a3c0e783edb28153e11bde20a68c4d2d37bb0c811354fdf5e20aedb1e7b700051966248b09b86e58ec9b4aff6dab1babac409b63ecfa
 EBUILD nessus-bin-6.10.5.ebuild 1769 BLAKE2B 7fa43dc45ad25e40adbd568636257f1514a9464ec33fe4b9bd850564ba8deaeceedc2fafa259d7c53dab3293bbed0e34947bf28ec75df2842e1ba899572beeb6 SHA512 7302cbbabb12cb59b88a80055e4ff3c535bd866e175070736116dd5c98546e0c7b24742822a6a64a7b01979703452c4c7419c512e9a9185a3a99ffe822fb75c0
-EBUILD nessus-bin-8.0.1.ebuild 1659 BLAKE2B bdce151748fb933871c7ed9af3ba08d01f62f7dfc8427e2d138543fa423d9e67297dc5ba0a24a18787dcbcc04c63a276a95710c21eb47d07c8ed61c88549b1bc SHA512 4a397ec964610384fa52c73ff9fbe359bd02fa180e95ce814d035d0c9f0b63ee560b6dca014660dafeada32283a7b1a4c44f71f604425da89b275246c774bd6a
-MISC metadata.xml 378 BLAKE2B e50657a9e2f4d45e9e98dff42285ee235260f4336766b4fb009d5f1621e5b37ef342cfd2079dc569f07b302dbd8a888973e54e3e2093ccff5342ab2797c01e70 SHA512 c406caf29d68764b9b0be058c7002869dd4ada724d83a83e06701eb6ff87cff397a417b498eaf5c1b0a27c4945de66f2c80860a85f6395b05b96cb844dadc4de
+EBUILD nessus-bin-8.3.1.ebuild 1654 BLAKE2B 0d59c80388e1119268776c8c98c6996d1c702d6362e2d4d1f3f69c950352aa420c9484c48d636904e8842e38478d3af86c4a458b9833d24f4a7923a9e8d7e70c SHA512 97b5baa4b22213b5211acccfb63292f210170c4ee6156f1035e077b0a914c6f4aea263f10a76f8530cfecca50bd0bfd1b82b7261c5b001f51dbce7b0a37252df
+MISC metadata.xml 345 BLAKE2B 05fdd17a4decd9a096175a59991a6df8260591c09193fef114895d7d29e0f08210aacd4517678410813d06a27b1032889c529e2966427c5a9ad454f9534d25f5 SHA512 3535519b1c621f6df120e6aa39f9a11ec132b68499a029915650218c16e9ca1a07cb30409ace95b2aa0204194a61c7b4743051e1f4ffc94cb5ba3372cac72e8c
diff --git a/net-analyzer/nessus-bin/metadata.xml b/net-analyzer/nessus-bin/metadata.xml
index 961085586781..240647db5de6 100644
--- a/net-analyzer/nessus-bin/metadata.xml
+++ b/net-analyzer/nessus-bin/metadata.xml
@@ -5,8 +5,8 @@
 	<email>marecki@gentoo.org</email>
 	<name>Marek Szuba</name>
 </maintainer>
-<maintainer type="project">
-	<email>netmon@gentoo.org</email>
-	<name>Gentoo network monitoring and analysis project</name>
+<maintainer type="person">
+	<email>zerochaos@gentoo.org</email>
+	<name>Rick Farina</name>
 </maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/nessus-bin/nessus-bin-8.0.1.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.3.1.ebuild
index 4f5348ff1268..45aa75d3c45a 100644
--- a/net-analyzer/nessus-bin/nessus-bin-8.0.1.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-8.3.1.ebuild
@@ -20,7 +20,7 @@ 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.${PV}
+	opt/nessus/lib/nessus/libjemalloc.so.2
 	opt/nessus/lib/nessus/libnessus-glibc-fix.so
 	opt/nessus/sbin/nessus-service
 	opt/nessus/sbin/nessuscli
@@ -29,7 +29,7 @@ QA_PREBUILT="opt/nessus/bin/nasl
 S="${WORKDIR}"
 
 pkg_nofetch() {
-	einfo "Please download ${A} from ${HOMEPAGE}/downloads/nessus"
+	einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus"
 	einfo "The archive should then be placed into your DISTDIR directory."
 }
 
diff --git a/net-analyzer/nessus-client/Manifest b/net-analyzer/nessus-client/Manifest
deleted file mode 100644
index bbbba366a23b..000000000000
--- a/net-analyzer/nessus-client/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX nessus-client-1.0.2-make.patch 2647 BLAKE2B d7f7d3d9ead2562efe78e39cfde8bb6a4421649b3b58a7dc1fc35aea29c4e3a869e15291bf5dc2a7a7124e46a104ee02e9c99e651a0e5124e376873f0fa579fc SHA512 534ffc58b34cb382ba6e87cce27f8a842bb945f3cd5dbe239dc0acd1f8a3757347d3c529d41f7a213021491933030650fe70a161365eba2a80f81362ced3e48b
-DIST NessusClient-1.0.2.tar.gz 2058324 BLAKE2B 8e2d27bc2c88d57bb57088d6061119144282db547d3f21bb242c9ba20e7f091fdbae3ee26f21ab4b8c33b8a3ff901c311e77ecb2d28aecf3d066152db2d2efcc SHA512 999e8ba11208351ffc37bad9fabc8c0b01e4abc2a638660818a1877cdb21a5d3b40d330b722debe9833e87db60e4f8aef53044f14fe5eeb8ffe57f3522bfa927
-DIST nessus-client.png.bz2 10043 BLAKE2B 471dabb9effab168d6a92595a258679e961e8e1a64c29aa4b0ff0d013b67bf5b417d764390eddfff6bd9bdae0f385d1858890ec97dfbffa2f1d45b26e40c7dc3 SHA512 39e2b41e3b4fcfdace80085c917754fb0a4cfebcf1f684d97e36e5212e8e2e3539f10527909d7e4e350afdc73801ac1fb5bff2bb5c12be4770e2bb27487542af
-EBUILD nessus-client-1.0.2-r2.ebuild 1314 BLAKE2B 24fe7a4d2a23e898f7ab7b611cb6376862276a632eae3ca541eb472eb8b980caf6dfd6d2464ba2fe9ab2283f33b0fd9b78d22cb568b9bb584951569f9109ad58 SHA512 80eeaa4af943c450800246eceadb707df73d4c0e708678fc40d5b4a69a006288b551061b42b72142f7076aa594d1d3ed0aef04066458c2bf78a52abff4f8aca9
-MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch b/net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch
deleted file mode 100644
index a233449b14ad..000000000000
--- a/net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/Makefile	2006-12-23 15:27:39.000000000 +0100
-+++ b/Makefile	2010-08-23 01:12:51.000000000 +0200
-@@ -2,8 +2,10 @@
- 
- ALLDEPS = nessus.tmpl
- 
--all: libnessus-client client sslstuff
--
-+all:
-+	$(MAKE) -C libnessus
-+	$(MAKE) -C nessus
-+	$(MAKE) -C ssl
- 
- nessus.tmpl: nessus.tmpl.in configure VERSION
- 	$(SHELL) configure $(CONFIGURE_ARGS)
-@@ -21,20 +23,17 @@
- 	$(INSTALL) -m $(CLIENTMODE) nessusclient-mkcert $(DESTDIR)${bindir}
- 	$(INSTALL) -m $(CLIENTMODE) ssl/nessusclient-mkrand $(DESTDIR)${bindir}
- 
--sslstuff:
--	cd ssl && $(MAKE)
--
- install-man:
- 	@echo installing man pages ...
- 	@test -d $(DESTDIR)${mandir}/man1 || $(INSTALL_DIR) $(DESTDIR)${mandir}/man1
- 	@test -d $(DESTDIR)${mandir}/man8 || $(INSTALL_DIR) $(DESTDIR)${mandir}/man8
- 	@test -d $(DESTDIR)${datadir}/doc/ || $(INSTALL_DIR) $(DESTDIR)${datadir}/doc/
--	@test -d $(DESTDIR)${datadir}/doc/NessusClient || $(INSTALL_DIR) $(DESTDIR)${datadir}/doc/NessusClient
-+	@test -d $(NESSUS_DOCDIR) || $(INSTALL_DIR) $(NESSUS_DOCDIR)
- 
- 	$(INSTALL) -c -m 0444 ${MAN_NESSUS_1} $(DESTDIR)${mandir}/man1/NessusClient.1
- 	$(INSTALL) -c -m 0444 doc/nessusclient-mkcert.1 $(DESTDIR)${mandir}/man1/nessusclient-mkcert.1
- 	$(INSTALL) -c -m 0444 doc/nessusclient-mkrand.1 $(DESTDIR)${mandir}/man1/nessusclient-mkrand.1
--	$(INSTALL) -c -m 0444 doc/NessusClient_UserGuide.pdf $(DESTDIR)${datadir}/doc/NessusClient/NessusClient_UserGuide.pdf
-+	$(INSTALL) -c -m 0444 doc/NessusClient_UserGuide.pdf $(NESSUS_DOCDIR)/NessusClient_UserGuide.pdf
- 
- win32: ${MAN_NESSUS_1}
- 	$(MANROFF) ${MAN_NESSUS_1}  > doc/NessusClient.1.cat
-@@ -45,23 +44,15 @@
- 	@echo ' --------------------------------------------------------------'
- 	@echo
- 
--client-install : client
-+client-install : nessus
- 	test -d $(DESTDIR)${bindir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${bindir}
- 	$(INSTALL) -m $(CLIENTMODE) ${make_bindir}/NessusClient $(DESTDIR)${bindir}
- 
--client : 
--	cd nessus && $(MAKE)
--
--libnessus-client:
--	cd libnessus && $(MAKE)
--
--
- doc : $(MAN_NESSUS_1)
- 
- $(MAN_NESSUS_1) : $(MAN_NESSUS_1).in
- 	@sed -e 's?@NESSUSD_CONFDIR@?${NESSUSD_CONFDIR}?g;s?@NESSUSD_DATADIR@?${NESSUSD_DATADIR}?g;s?@NESSUSD_PLUGINS@?${NESSUSD_PLUGINS}?g;' $(MAN_NESSUS_1).in  >$(MAN_NESSUS_1)
- 
--
- clean:
- 	cd nessus && $(MAKE) clean
- 	cd libnessus && $(MAKE) clean
---- a/ssl/Makefile	2006-09-12 23:41:31.000000000 +0200
-+++ b/ssl/Makefile	2010-08-23 01:16:51.000000000 +0200
-@@ -6,7 +6,7 @@
- all : nessusclient-mkrand
- 
- nessusclient-mkrand: $(OBJS)
--	$(CC) $(OBJS) -o nessusclient-mkrand -lm
-+	$(CC) $(LDFLAGS) $(OBJS) -o nessusclient-mkrand -lm
- 
- nessusclient-mkrand.o: nessusclient-mkrand.c
- 	$(CC) $(CFLAGS) -c nessusclient-mkrand.c 
diff --git a/net-analyzer/nessus-client/metadata.xml b/net-analyzer/nessus-client/metadata.xml
deleted file mode 100644
index 74c2baebb4ec..000000000000
--- a/net-analyzer/nessus-client/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild b/net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild
deleted file mode 100644
index f7bdb5234055..000000000000
--- a/net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-MY_PN=NessusClient
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A client for the Nessus vulnerability scanner"
-HOMEPAGE="http://www.nessus.org/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz
-	mirror://gentoo/nessus-client.png.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libressl doc"
-
-RDEPEND="!net-analyzer/nessus-core
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=x11-libs/gtk+-2.8.8:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/htmldoc )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-make.patch
-	sed -i \
-		-e "/NESSUS_DOCDIR/s|/doc/NessusClient|/doc/${PF}|g" \
-		nessus.tmpl.in || die
-}
-
-src_configure() {
-	tc-export CC
-	econf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc CHANGES README_SSL VERSION
-
-	doicon "${WORKDIR}"/${PN}.png
-	make_desktop_entry NessusClient "Nessus Client" nessus-client "Network"
-}
-
-pkg_postinst() {
-	if ! use doc; then
-		elog "If you do not have documentation installed, nessus-client"
-		elog "will complain. To install documentation, please emerge with"
-		elog "the doc useflag set. Beware that it will emerge app-text/htmldoc,"
-		elog "a big package."
-	fi
-}
diff --git a/net-analyzer/nessus-core/Manifest b/net-analyzer/nessus-core/Manifest
deleted file mode 100644
index 11ea73ac42a2..000000000000
--- a/net-analyzer/nessus-core/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 2.2.9-crash.patch 418 BLAKE2B 6d60d6e1d304a41fc11e703407ddef9bb2eebc7e639a86e4cd6a27cbdd83a795a645644566618f000958a04e9bcb374f1893222e1a2b524f09fdd7465e0d181f SHA512 4581f8a09c23e15adf6401ae9aa90df62a300928ee07467911c3c3dff05c6833cf8112ed12598c3f97f496e745c7d8c7de09db0af3a0a87e02a0b8a95a5026ef
-AUX 2.2.9-gentoo.patch 1470 BLAKE2B efb265b0332c726ba75a83e3df82b6c5533c575b957e0667e45144117f732696d7dddbc83eed4860489928befe9bc883e789cbdf82600465a871e8d154086660 SHA512 0d90d349a7c5171cde30dd6d5e2f703c9a8a4c5b02480d785212a36d34fba32784e3655af9d1bb71d6883b6f7b557025c58c72aea701a291e193ffc8459898f7
-AUX nessus-core-2.2.9-open.patch 315 BLAKE2B 33ada175c33559501ad8a8d3b7759f5e94afcbd89d18a2ef01f7069ff32cdf8cdd6dfe53ef999d9ad4bff72f39d6aa1801d4ac04ce8d90ce2de9507c93618712 SHA512 27e90f533f68a858aa813e706a7c0234e63a119db9c0f13026908192ce6b182b04e39c2522637e3ec089dd33854902ce96214186e5a9afb1600a98dfb3415994
-AUX nessusd-r7 528 BLAKE2B 67d6582f40c82d904ac6fcc53c301700759926b3414efca68a1f1901c8f1e6352ef1748d408c0edd555be8d7a1a3643ac12f5b43d8fd0614c45ef795fdd3b50c SHA512 0c2d94e55b1ef3709cc2f52936e4477bdc5c491445dd93c2fc7341834b083eb76ada19bdc6b070c698134b72eb593819f38787420e5851951278f4db964204d7
-DIST nessus-core-2.2.9.tar.gz 674390 BLAKE2B 76599f5a6521d7f2a38d75c647eeaa4faa5d5482803ea1cf21ae0ffbe37f7d638f03c1710b65f5a442af55ccf5eea07385393c34761549441afee6e466b4eadd SHA512 7ec7f35a2b407126d174b6015e7d9566535892d64c5ea4d05297fbf93493016a885ca15c9102abfd515422b49fcd23585e7d41537a4f1afc0b6278c28690fcb1
-EBUILD nessus-core-2.2.9-r1.ebuild 1530 BLAKE2B cd02eb2e27f1aec385323cd4e6498c00246723f190dcf55b8b8f04e28a64bdaf2bb34ddbb04d563e5b19bade48ade5ed51db04aca24f779d11bb50a1e5a92e16 SHA512 abc06136517c68846c34947db0f03b5de6ba7b6689b5e8a2e56813e1db85f443e05b0898adbae2781250fa68c8915840c72f6abdd08e1f379675eb825bd3da16
-MISC metadata.xml 361 BLAKE2B 07d089ccda4f08680e178984e75ae715d42316ffd81344ada749c0731bdd178573bdb83b87f4e2e17de4c28e16ae81db48b4127536971e1eedd9130878418920 SHA512 7e520fb18d066189ee3af40543687e3f378c7e2eb06f3dd869101aa4621893a962f82f0fa50973ba2db817b0266a2cb5caba5e294a9eb1e141e6c25cf9d6a72c
diff --git a/net-analyzer/nessus-core/files/2.2.9-crash.patch b/net-analyzer/nessus-core/files/2.2.9-crash.patch
deleted file mode 100644
index d95c28404de2..000000000000
--- a/net-analyzer/nessus-core/files/2.2.9-crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- nessus-core/nessus/auth.c	2007-08-31 23:12:36.000000000 +0200
-+++ nessus-core/nessus/auth.c	2007-08-31 23:12:52.000000000 +0200
-@@ -92,11 +92,11 @@
-   char * buffer = emalloc(s);
-   int len, n = 0;
-   signal(SIGPIPE, sighand_pipe);
--  va_start(param, data);
- 
-  
-   for(;;)
-   {
-+   va_start(param, data);
-    r = vsnprintf(buffer, s - 1, data, param);
-    if(r >= 0 && r < s)break;
-    s = r > s ? r + 2 : s * 2;
diff --git a/net-analyzer/nessus-core/files/2.2.9-gentoo.patch b/net-analyzer/nessus-core/files/2.2.9-gentoo.patch
deleted file mode 100644
index c97f6979340d..000000000000
--- a/net-analyzer/nessus-core/files/2.2.9-gentoo.patch
+++ /dev/null
@@ -1,58 +0,0 @@
- Makefile              |   10 +++++-----
- nessus-fetch/Makefile |    2 +-
- ssl/Makefile          |    2 +-
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index b1485b3..382900a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -86,17 +86,17 @@ client-install : client
- 	$(INSTALL) -m $(CLIENTMODE) ${make_bindir}/nessus $(DESTDIR)${bindir}
- 
- client : 
--	cd nessus && $(MAKE)
-+	$(MAKE) -C nessus
- 
--server : 
--	cd nessusd && $(MAKE)
-+server : client
-+	$(MAKE) -C nessusd
- 
- sslstuff : 
--	cd ssl && $(MAKE)
-+	$(MAKE) -C ssl
- 
- 
- fetchtool:
--	cd nessus-fetch && $(MAKE)
-+	$(MAKE) -C nessus-fetch
- 
- 
- doc : $(MAN_NESSUS_1) $(MAN_NESSUSD_8)
-diff --git a/nessus-fetch/Makefile b/nessus-fetch/Makefile
-index 63439bc..89fd8c9 100644
---- a/nessus-fetch/Makefile
-+++ b/nessus-fetch/Makefile
-@@ -5,7 +5,7 @@ include ../nessus.tmpl
- all: nessus-fetch
- 
- nessus-fetch: nessus-fetch.o
--	$(CC) nessus-fetch.o -o nessus-fetch $(LIBS)
-+	$(CC) $(LDFLAGS) nessus-fetch.o -o nessus-fetch $(LIBS)
- 
- nessus-fetch.o: nessus-fetch.c
- 	$(CC) $(NESSUS_CFLAGS) ${include} $(DEFS) $(NESSUS_DEFS) -c nessus-fetch.c
-diff --git a/ssl/Makefile b/ssl/Makefile
-index 738a692..5e51426 100644
---- a/ssl/Makefile
-+++ b/ssl/Makefile
-@@ -6,7 +6,7 @@ OBJS = nessus-mkrand.o
- all : nessus-mkrand
- 
- nessus-mkrand: $(OBJS)
--	$(CC) $(OBJS) -o nessus-mkrand -lm
-+	$(CC) $(LDFLAGS) $(OBJS) -o nessus-mkrand -lm
- 
- nessus-mkrand.o: nessus-mkrand.c
- 	$(CC) $(CFLAGS) -c nessus-mkrand.c 
diff --git a/net-analyzer/nessus-core/files/nessus-core-2.2.9-open.patch b/net-analyzer/nessus-core/files/nessus-core-2.2.9-open.patch
deleted file mode 100644
index fe60ede62b29..000000000000
--- a/net-analyzer/nessus-core/files/nessus-core-2.2.9-open.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nessus-core/nessusd/detached.c.orig
-+++ nessus-core/nessusd/detached.c
-@@ -408,7 +408,7 @@
-  char * target;
- {
-  char * fname = detached_fname(globals);
-- int f = open(fname, O_CREAT|O_WRONLY|O_TRUNC);
-+ int f = open(fname, O_CREAT|O_WRONLY|O_TRUNC, 0600);
-  if(f >= 0)
-  {
-   write(f, target, strlen(target));
diff --git a/net-analyzer/nessus-core/files/nessusd-r7 b/net-analyzer/nessus-core/files/nessusd-r7
deleted file mode 100644
index e19296b01b9b..000000000000
--- a/net-analyzer/nessus-core/files/nessusd-r7
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting nessusd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/nessusd -- -D
-	eend $? 
-}
-
-stop() {
-	ebegin "Stop nessusd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/nessusd
-	einfo "Waiting for the environment to be sane"
-	while [ -n "$RUNNING" ] ; do
-		sleep 1
-		RUNNING=$(ps aux | grep -m 1 nessusd: | grep -v grep)
-	done
-	sleep 3
-	eend $?
-}
diff --git a/net-analyzer/nessus-core/metadata.xml b/net-analyzer/nessus-core/metadata.xml
deleted file mode 100644
index 3907d4a0d0e6..000000000000
--- a/net-analyzer/nessus-core/metadata.xml
+++ /dev/null
@@ -1,9 +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>A remote security scanner for Linux (nessus-core)</longdescription>
-</pkgmetadata>
diff --git a/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild b/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild
deleted file mode 100644
index 695ef1f31909..000000000000
--- a/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs eutils autotools
-
-DESCRIPTION="A remote security scanner for Linux (nessus-core)"
-HOMEPAGE="http://www.nessus.org/"
-SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug gtk prelude tcpd"
-
-RDEPEND="
-	~net-analyzer/nessus-libraries-${PV}
-	~net-analyzer/libnasl-${PV}
-	tcpd? ( sys-apps/tcp-wrappers )
-	gtk? ( x11-libs/gtk+:2 )
-	prelude? ( dev-libs/libprelude )
-	!net-analyzer/nessus-client"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${PN}
-
-DOCS="README* UPGRADE_README CHANGES doc/*.txt doc/ntp/*"
-
-src_prepare() {
-	tc-export CC
-	epatch \
-		"${FILESDIR}"/${PV}-gentoo.patch \
-		"${FILESDIR}"/${PV}-crash.patch \
-		"${FILESDIR}"/${P}-open.patch
-
-	sed -i -e "/^LDFLAGS/s:$:${LDFLAGS}:g" nessus.tmpl.in || die
-	sed -i -e 's:CFLAGS="-g"; ::' configure.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable tcpd tcpwrappers) \
-		$(use_enable debug) \
-		$(use_enable gtk)
-}
-
-src_compile() {
-	emake -C nessus cflags
-	emake -C nessusd cflags
-	default
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/nessusd-r7 nessusd
-	keepdir /var/lib/nessus/logs
-	keepdir /var/lib/nessus/users
-	# newer version is provided by nessus-libraries
-	# should be fixed upstream in version 2.2.6
-	rm "${ED}"/usr/include/nessus/includes.h
-}
diff --git a/net-analyzer/nessus-libraries/Manifest b/net-analyzer/nessus-libraries/Manifest
deleted file mode 100644
index 218e56a85955..000000000000
--- a/net-analyzer/nessus-libraries/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX nessus-libraries-2.2.9-linking.patch 2009 BLAKE2B a912cb0912db2a7cff9f10a12b6cc3efa67ab118df9a46962d8b8f721a4834ab89c5fc5bd58b1f1a3d0cfb6f6bbd191e3af6bcfcd3e14d81d2368f0d3c5f9756 SHA512 2d6e3e32b37eb73d03fbad4f3bd6107ec228cf2cbe8811869fe7019ed430e7ec89d54b20b36606be0621427a4d80919ae64225b9a5df28194ff995fe8d5d8279
-DIST nessus-libraries-2.2.9.tar.gz 426560 BLAKE2B 0ad26fa0cccbe9229b0f02d9a2d4000895fd04a3f37cbccf9562e7dc852364b5ba71c4f3ab70dae69c6326ef243879ebb771679cc6c7fccf5e500824df32de1f SHA512 4a87ad07cde5ca82d673efbe2b2d951231880533bc30be4b265ea1f81fba39ae90ef150293486e8bba227a1c174e89cde6e8f95b60f2250f7c2c9ae910d52cff
-EBUILD nessus-libraries-2.2.9-r1.ebuild 1202 BLAKE2B 2900d05c6aab6547ae19a0cca1709545814d533935bee38cff315fe59c56979becd99b23b47a3a619a269a935ec0a87de809a7bb66c5ec26b3c52a7215746d9a SHA512 9f79ce3aa10c2d4d3750ec266bdb2f0bcf440ab0e765a8383aa3ddb4eecb78a797c2e7e8e85827ddcce0a0b34cbb7f239873007545e25609bf2c3d3710428ce6
-MISC metadata.xml 366 BLAKE2B 81089d6299ba60b664a73e36ff5c9fe81dd2a6502fb60968b8e72e3d5ae452dc3d35efd9ed64486be3d352bdfd473b4d89f86e8c44821cb21ba640c2176f9837 SHA512 488a5015a0350d14c89f1b3f1f16babdfcb965b27cc56a24335a35649116d1220405c9ef210fbacf96c8c855aa49cb2fd33387ed4df10e2f39ca269176887509
diff --git a/net-analyzer/nessus-libraries/files/nessus-libraries-2.2.9-linking.patch b/net-analyzer/nessus-libraries/files/nessus-libraries-2.2.9-linking.patch
deleted file mode 100644
index 41cd2b21c938..000000000000
--- a/net-analyzer/nessus-libraries/files/nessus-libraries-2.2.9-linking.patch
+++ /dev/null
@@ -1,61 +0,0 @@
- Makefile                   |    4 ++--
- libhosts_gatherer/Makefile |    2 +-
- libnessus/Makefile         |    4 ++--
- libnessus/kb.c             |    1 +
- 4 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 938d1b2..672d8cf 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,8 +3,8 @@ include nessus.tmpl
- ALLDEPS = nessus.tmpl nessus-config
- 
- all: $(ALLDEPS) $(PCAP_MAKE)
--	cd libnessus && ${MAKE}
--	cd libhosts_gatherer && ${MAKE}
-+	${MAKE} -C libnessus
-+	${MAKE} -C libhosts_gatherer
- 
- nessus-config: nessus-config.pre Makefile nessus.tmpl
- 	@echo Creating $@ ...
-diff --git a/libhosts_gatherer/Makefile b/libhosts_gatherer/Makefile
-index e2a647c..7d628d8 100644
---- a/libhosts_gatherer/Makefile
-+++ b/libhosts_gatherer/Makefile
-@@ -22,7 +22,7 @@ install : libhosts_gatherer.la
- 	$(LIBTOOL) --finish $(DESTDIR)${libdir}
- 	
- libhosts_gatherer.la : $(OBJS)
--	$(LIBTOOL) $(CC) -o libhosts_gatherer.la $(LO_OBJS) -rpath ${libdir} \
-+	$(LIBTOOL) $(CC) $(LDFLAGS) -o libhosts_gatherer.la $(LO_OBJS) -rpath ${libdir} \
- 	-version-info ${PACKAGE_VERSION}
- 	        
- hg_utils.o : hg_utils.h hosts_gatherer.h hg_utils.c
-diff --git a/libnessus/Makefile b/libnessus/Makefile
-index c5a96db..211f57a 100644
---- a/libnessus/Makefile
-+++ b/libnessus/Makefile
-@@ -100,8 +100,8 @@ kb.o: kb.c
- snprintf.o : snprintf.c
- 	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c snprintf.c	
- libnessus.la: $(OBJS)
--	$(LIBTOOL) $(CC) -o libnessus.la $(LO_OBJS) -rpath ${libdir} \
--	-version-info ${PACKAGE_VERSION}
-+	$(LIBTOOL) $(CC) $(LDFLAGS) -o libnessus.la $(LO_OBJS) -rpath ${libdir} \
-+	-version-info ${PACKAGE_VERSION} `pcap-config --libs` `pkg-config --libs openssl`
- 
- install : libnessus.la
- 	test -d $(DESTDIR)${libdir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${libdir}
-diff --git a/libnessus/kb.c b/libnessus/kb.c
-index 921c1a1..cbfd840 100644
---- a/libnessus/kb.c
-+++ b/libnessus/kb.c
-@@ -20,6 +20,7 @@
-  */ 
- 
- #include <includes.h>
-+#include <fnmatch.h>
- #define HASH_MAX 65537 
- 
- 
diff --git a/net-analyzer/nessus-libraries/metadata.xml b/net-analyzer/nessus-libraries/metadata.xml
deleted file mode 100644
index 41f809fbde83..000000000000
--- a/net-analyzer/nessus-libraries/metadata.xml
+++ /dev/null
@@ -1,9 +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>A remote security scanner for Linux (nessus-libraries)</longdescription>
-</pkgmetadata>
diff --git a/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild b/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild
deleted file mode 100644
index 5b4734740551..000000000000
--- a/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A remote security scanner for Linux (nessus-libraries)"
-HOMEPAGE="http://www.nessus.org/"
-SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
-IUSE="crypt debug libressl static-libs"
-
-# Hard dep on SSL since libnasl won't compile when this package is emerged -ssl.
-DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-linking.patch
-
-	sed -i -e "s:^\(LDFLAGS=\):\1 ${LDFLAGS}:g" nessus.tmpl.in || die
-	sed -i -e '/sbindir/d' Makefile || die
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		$(use_enable crypt cypher) \
-		$(use_enable debug) \
-		$(use_enable debug debug-ssl) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--with-ssl="${EPREFIX}/usr/$(get_libdir)" \
-		--disable-nessuspcap
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-analyzer/nessus-plugins/Manifest b/net-analyzer/nessus-plugins/Manifest
deleted file mode 100644
index 2adbb53df516..000000000000
--- a/net-analyzer/nessus-plugins/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 2.2.9-gentoo.patch 2518 BLAKE2B 635774b61b5d8f2f1ad16967aa2153de1c824a2044cb21a22cdc76d7a47ed18c1fbea2f2478a60bfe8b4cf46526cc44ac4c94c0a5366fa09c94f22f7340a7a6c SHA512 a2d3e17691085a83946bc0ab92eb606bb90d8b325fead9704c935598a2487c5bc73022802aaa98f6056647a3cec8a3d111bcffc7db270cc82590911f27e48894
-DIST nessus-plugins-GPL-2.2.9.tar.gz 1064740 BLAKE2B 347559036c5054f0b6a890b41f9fba27cb44be5a4885e5d6e3594241006b9723037297d9af82c78844305bc8b46573e81d7bc6bed137ee1044cff47cb877cb37 SHA512 b76a77be29409bca00fb014ae8e35878283e5d8adccef570da08b65df760f46438ef0392c4435366831b4bc456715f7af9c0ad5e20dd5554f1e4b8c9e8791b04
-EBUILD nessus-plugins-2.2.9-r1.ebuild 776 BLAKE2B 08e5a5f72d37ec34a880ad8841f2a9ee00478764dc1988eccb73871e85fd0b28573dd04d7be0e8ffdaf50f0b1ac9a06a153098e4675d44dc3db4ab33c1ddcaa5 SHA512 64704f03dd5d8abb2b8adcc0ac5c58b0ea00239e3868d7a41fe1f0e09a2d155392d304ef9a15517b5f3da72ec798d68053a6e956eb2042783d5edc7016ded683
-MISC metadata.xml 364 BLAKE2B de88fb7eb010b73088ad413c1ea2471e91f5cd23d3ba269230297c67921f2d439a8feb050658c6b17474e6537ed6319feee42d6b471044de341ac57502a78a17 SHA512 8a5cf6ab17a5c3a117fad6efa89c0b0d193ed91a0e6d4fb08c14641f275a2fade7088cc35ef2ccb55df3dd02456b1ebbc9ca4d7e5ada78526036986b7d0c4dc2
diff --git a/net-analyzer/nessus-plugins/files/2.2.9-gentoo.patch b/net-analyzer/nessus-plugins/files/2.2.9-gentoo.patch
deleted file mode 100644
index 39366844382f..000000000000
--- a/net-analyzer/nessus-plugins/files/2.2.9-gentoo.patch
+++ /dev/null
@@ -1,58 +0,0 @@
- plugins/find_service/Makefile       |    2 +-
- plugins/nessus_tcp_scanner/Makefile |    2 +-
- plugins/ssl_ciphers/Makefile        |    2 +-
- plugins/synscan/Makefile            |    2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/plugins/find_service/Makefile b/plugins/find_service/Makefile
-index f4fd8e3..12e62a3 100644
---- a/plugins/find_service/Makefile
-+++ b/plugins/find_service/Makefile
-@@ -5,7 +5,7 @@ PLUGNAME=find_service
- all : $(PLUGNAME).nes
- $(PLUGNAME).nes : $(PLUGNAME).c
- 	$(LIBTOOL) $(CC) $(DEFS) $(include) -c  $(PLUGNAME).c
--	$(LIBTOOL) $(CC) $(DEFS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
-+	$(LIBTOOL) $(CC) $(LDFLAGS) $(DEFS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
- 	-rpath $(rootdir)/bin/plugins
- 	../install_plug $(PLUGNAME) $(rootdir)
- clean :
-diff --git a/plugins/nessus_tcp_scanner/Makefile b/plugins/nessus_tcp_scanner/Makefile
-index 8cf6c6d..7a27495 100644
---- a/plugins/nessus_tcp_scanner/Makefile
-+++ b/plugins/nessus_tcp_scanner/Makefile
-@@ -8,7 +8,7 @@ PLUGNAME=nessus_tcp_scanner
- all : $(PLUGNAME).nes
- $(PLUGNAME).nes : $(PLUGNAME).c 
- 	$(LIBTOOL) $(CC) $(DEFS) $(include) -c  $(PLUGNAME).c
--	$(LIBTOOL) $(CC) $(DEFS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) -lm $(LIBUTIL) \
-+	$(LIBTOOL) $(CC) $(LDFLAGS) $(DEFS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) -lm $(LIBUTIL) \
- 	-rpath $(rootdir)/bin/plugins
- 	../install_plug $(PLUGNAME) $(rootdir)
- clean :
-diff --git a/plugins/ssl_ciphers/Makefile b/plugins/ssl_ciphers/Makefile
-index dc10e64..1747745 100644
---- a/plugins/ssl_ciphers/Makefile
-+++ b/plugins/ssl_ciphers/Makefile
-@@ -5,7 +5,7 @@ PLUGNAME=ssl_ciphers
- all : $(PLUGNAME).nes
- $(PLUGNAME).nes : $(PLUGNAME).c
- 	$(LIBTOOL) $(CC) $(DEFS) $(include) -c  $(PLUGNAME).c
--	$(LIBTOOL) $(CC) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
-+	$(LIBTOOL) $(CC) $(LDFLAGS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
- 	-rpath $(rootdir)/bin/plugins
- 	../install_plug $(PLUGNAME) $(rootdir)
- clean :
-diff --git a/plugins/synscan/Makefile b/plugins/synscan/Makefile
-index 16aefa1..c434b92 100644
---- a/plugins/synscan/Makefile
-+++ b/plugins/synscan/Makefile
-@@ -5,7 +5,7 @@ PLUGNAME=synscan
- all : $(PLUGNAME).nes
- $(PLUGNAME).nes : $(PLUGNAME).c
- 	$(LIBTOOL) $(CC) $(DEFS) $(include) -c  $(PLUGNAME).c
--	$(LIBTOOL) $(CC) $(DEFS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
-+	$(LIBTOOL) $(CC) $(DEFS) $(LDFLAGS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
- 	-rpath $(rootdir)/bin/plugins
- 	../install_plug $(PLUGNAME) $(rootdir)
- clean :
diff --git a/net-analyzer/nessus-plugins/metadata.xml b/net-analyzer/nessus-plugins/metadata.xml
deleted file mode 100644
index 3c5a6082eb8f..000000000000
--- a/net-analyzer/nessus-plugins/metadata.xml
+++ /dev/null
@@ -1,9 +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>A remote security scanner for Linux (nessus-plugins)</longdescription>
-</pkgmetadata>
diff --git a/net-analyzer/nessus-plugins/nessus-plugins-2.2.9-r1.ebuild b/net-analyzer/nessus-plugins/nessus-plugins-2.2.9-r1.ebuild
deleted file mode 100644
index 1bf4d4933b7a..000000000000
--- a/net-analyzer/nessus-plugins/nessus-plugins-2.2.9-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A remote security scanner for Linux (nessus-plugins)"
-HOMEPAGE="http://www.nessus.org/"
-SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/nessus-plugins-GPL-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="libressl"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	~net-analyzer/nessus-core-${PV}
-	~net-analyzer/nessus-libraries-${PV}
-	net-libs/libpcap"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${PN}
-
-src_prepare() {
-	tc-export CC
-	epatch "${FILESDIR}"/${PV}-gentoo.patch
-}
-
-src_install() {
-	default
-	dodoc docs/*.txt
-}
diff --git a/net-analyzer/nessus/Manifest b/net-analyzer/nessus/Manifest
deleted file mode 100644
index 8d1b2940f45c..000000000000
--- a/net-analyzer/nessus/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD nessus-2.2.9.ebuild 833 BLAKE2B 6e3ac2eef64e609bfee3b3ec13d58a15990ae01386b12e79c36f0015c108ebde7494c6ae0362d31363babbf75f50c0d79389a9144e6c299688bb26b95d163b8c SHA512 53641d0693bf7e017264c7f88a07457fffee4336810b2138bb6ce4ee782f0e82da64ed4cf3e92f80fbee1a4da7dffa4a7d074b5042e154762cda15162aa3c641
-MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/nessus/metadata.xml b/net-analyzer/nessus/metadata.xml
deleted file mode 100644
index 74c2baebb4ec..000000000000
--- a/net-analyzer/nessus/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/net-analyzer/nessus/nessus-2.2.9.ebuild b/net-analyzer/nessus/nessus-2.2.9.ebuild
deleted file mode 100644
index eb724b7270e2..000000000000
--- a/net-analyzer/nessus/nessus-2.2.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A remote security scanner"
-HOMEPAGE="http://www.nessus.org/"
-SRC_URI=""
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	~net-analyzer/nessus-libraries-${PV}
-	~net-analyzer/libnasl-${PV}
-	~net-analyzer/nessus-core-${PV}
-	~net-analyzer/nessus-plugins-${PV}"
-
-pkg_postinst() {
-	elog "The following article may be useful to get started:"
-	elog "http://www.securityfocus.com/infocus/1741"
-}
-
-pkg_postrm() {
-	elog "Note: this is a META ebuild for ${P}."
-	elog "to remove it completely or before re-emerging"
-	elog "either use 'depclean', or remove/re-emerge these packages:"
-	elog
-	for dep in ${RDEPEND}; do
-		elog "     ${dep}"
-	done
-	echo
-}
diff --git a/net-analyzer/netcat6/Manifest b/net-analyzer/netcat6/Manifest
deleted file mode 100644
index fcb5477da305..000000000000
--- a/net-analyzer/netcat6/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX netcat6-1.0-automake-1.14.patch 428 BLAKE2B 3ed473a4287f51ea22aa96a9155ae3bfb6883dc44258d569510667f0aaed0a632a7092205016a887bc53652e33d08a793c19d3cc85fcffad01853c39ab9e9e77 SHA512 91aa92162b379632318e429853382c0e73d8c37ac73fce91975dcc7340705435e5832c4fa7a185a1ad3f4c7b492a256fe08e8233da4bce963969325983f1e473
-AUX netcat6-1.0-unix-sockets.patch 8039 BLAKE2B 24ce41cc8d12280d4a06662fe3a2c2801f5a33087578eab27fed05bc8d4fc9a276057483de304ef78f28f2c89a48673ce670d9b819b86a2d763515d79cb41725 SHA512 2fbbbb4bdabada521d9fb33ad545459a03a8b443387a490a07a8bcd403817650a2f2cfd73c8a4e8e8fd02d1f5c0bd8a045ecd31ec5ffbdf5d22e0c1b758b12bc
-DIST nc6-1.0.tar.bz2 264257 BLAKE2B 2e9ebdfb45246b8cbfd8515e51ab3262593425f98d1eec623dd21932d48a6bd200d537d3e326e3122835a3a18584c19d1dcc43118ba34d9a21cb8505c8510d3c SHA512 199f3bd18bb452544da8ca1b0f5347f79662bea81e9af335a41ed62c12d5d8cb41d99442ca54f301538d27aec4ada5f59db87461e5b0f20333ba1b52859bd35a
-EBUILD netcat6-1.0-r2.ebuild 1110 BLAKE2B 1dfe776097733194c955f5772ff94e88e84b11e25297086dfc53b45773e9a00ca8b627094fc69b155a9185898b7f0ab6f77f74116ec69771a096c5655068c467 SHA512 98fe194d36cbec39d10572ca4e597b4d8ed47237583c294e02797c30793544a94e69ad6541bc555f0be514c21afcd0c4e9870ab8a534e86ca9d153cd7f91bc38
-MISC metadata.xml 357 BLAKE2B 775c1871988fa11fb08eb8d923a2f7119a9cdc4e6d1325b0bba5408e7ea51268687661d46fe3a4a45aa265bf30783edb42cc1b0ae2e1bbf15738e0907a8df3e6 SHA512 a5b578146dd743e567e6edceda335342e825a502c0ccabd25597c8c0bc0f8cea6ed662547af284ac6e28da05822f95ac4087411d93d503822379cac49118a6bb
diff --git a/net-analyzer/netcat6/files/netcat6-1.0-automake-1.14.patch b/net-analyzer/netcat6/files/netcat6-1.0-automake-1.14.patch
deleted file mode 100644
index f7c128590be8..000000000000
--- a/net-analyzer/netcat6/files/netcat6-1.0-automake-1.14.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -2,9 +2,9 @@
- AC_INIT(nc6, 1.0, [ds6-devel@deepspace6.net])
- AC_CONFIG_AUX_DIR(config)
- AC_CONFIG_SRCDIR(src/main.c)
--AM_GNU_GETTEXT_VERSION(0.14.1)
- AM_INIT_AUTOMAKE(1.6)           dnl Automake 1.6 or better is required
--AM_CONFIG_HEADER(config.h)
-+AM_GNU_GETTEXT_VERSION(0.14.1)
-+AC_CONFIG_HEADERS(config.h)
- AC_PREREQ(2.52)                 dnl Autoconf 2.52 or better is required
- 
- 
diff --git a/net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch b/net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch
deleted file mode 100644
index 5ab0ece124f1..000000000000
--- a/net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch
+++ /dev/null
@@ -1,303 +0,0 @@
---- a/docs/nc6.1.in
-+++ b/docs/nc6.1.in
-@@ -160,6 +160,10 @@
- With this option set, netcat6 will use UDP as the transport protocol (TCP is
- the default).
- .TP 13
-+.I \-U, --unix
-+With this option set, netcat6 will connect to a unix domain socket.
-+The listen mode has not been implemented yet.
-+.TP 13
- .I \-v
- Enable verbose mode.  This gives some basic information about what netcat6
- is doing.  Use it twice for extra verbosity.
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -6,6 +6,7 @@
-   network.h \
-   afindep.h \
-   bluez.h \
-+  unixsocket.h \
-   netsupport.h \
-   parser.h \
-   readwrite.h \
-@@ -20,6 +21,7 @@
-   afindep.c \
-   netsupport.c \
-   parser.c \
-+  unixsocket.c \
-   readwrite.c \
-   io_stream.c \
-   connection.c
-
---- a/src/connection.c
-+++ b/src/connection.c
-@@ -109,6 +109,9 @@
- 		fatal_internal("unavailable bluez support required");
- #endif
- 		break;
-+	case PROTO_UNIX:
-+		ainfo->ai_family = PF_UNIX;
-+		break;
- 	default:
- 		fatal_internal("unknown socket domain");
- 	}
-@@ -144,6 +147,10 @@
- 		fatal_internal("unavailable bluez support required");
- #endif
- 		break;
-+	case UNIX_PROTOCOL:
-+		ainfo->ai_protocol = 0;
-+		ainfo->ai_socktype = SOCK_STREAM;
-+		break;
- 	default:
- 		fatal_internal("unknown socket type");
- 	}
-
---- a/src/connection.h
-+++ b/src/connection.h	2008-10-25 14:17:09 +0000
-@@ -31,12 +31,14 @@
- 	PROTO_UNSPECIFIED,
- 	PROTO_IPv6,
- 	PROTO_IPv4,
-+	PROTO_UNIX,
- 	PROTO_BLUEZ
- } sock_family_t;
- 
- typedef enum sock_protocol {
- 	TCP_PROTOCOL,
- 	UDP_PROTOCOL,
-+	UNIX_PROTOCOL,
- 	SCO_PROTOCOL,
- 	L2CAP_PROTOCOL
- } sock_protocol_t;
-
---- a/src/network.c
-+++ b/src/network.c
-@@ -23,6 +23,7 @@
- #include "network.h"
- #include "connection.h"
- #include "afindep.h"
-+#include "unixsocket.h"
- #ifdef ENABLE_BLUEZ
- #include "bluez.h"
- #endif/*ENABLE_BLUEZ*/
-@@ -113,6 +114,11 @@
- 
- 	/* invoke the appropriate connector for the protocol family */
- 	switch (ca_family(attrs)) {
-+	case PROTO_UNIX:
-+		fd = unixsocket_connect(&hints,
-+				remote->address,
-+				timeout, &socktype);
-+		break;
- #ifdef ENABLE_BLUEZ
- 	case PROTO_BLUEZ:
- 		fd = bluez_connect(&hints,
-
---- a/src/parser.c
-+++ b/src/parser.c
-@@ -109,7 +109,9 @@
- 	{"bluetooth",           no_argument,        NULL, 'b'},
- #define OPT_SCO			24
- 	{"sco",			no_argument,        NULL,  0 },
--#define OPT_MAX			25
-+#define OPT_UNIX_SOCKET		25
-+	{"unix",		no_argument,        NULL, 'U'},
-+#define OPT_MAX			26
- 	{0, 0, 0, 0}
- };
- 
-@@ -160,7 +162,7 @@
- 	_verbosity_level = 0;
- 
- 	/* option recognition loop */
--	while ((c = getopt_long(argc, argv, "46be:hlnp:q:s:uvw:xX",
-+	while ((c = getopt_long(argc, argv, "46be:hlnp:q:s:uUvw:xX",
- 	                        long_options, &option_index)) >= 0)
- 	{
-  		switch (c) {
-@@ -231,6 +233,9 @@
- 			family = PROTO_IPv6;
- 			ca_set_flag(attrs, CA_STRICT_IPV6);
- 			break;
-+		case 'U':
-+			family = PROTO_UNIX;
-+			break;
- 		case 'b':
- 			family = PROTO_BLUEZ;
- 			break;
-@@ -330,6 +335,9 @@
- 	/* set default protocols */
- 	if (protocol == PROTO_UNSPECIFIED) {
- 		switch (family) {
-+		case PROTO_UNIX:
-+			protocol = UNIX_PROTOCOL;
-+			break;
- 		case PROTO_BLUEZ:
- 			protocol = L2CAP_PROTOCOL;
- 			break;
-@@ -344,6 +352,11 @@
- 		fatal(_("cannot specify UDP protocol and bluetooth"));
- 	if (protocol == SCO_PROTOCOL && family != PROTO_BLUEZ)
- 		fatal(_("--sco requires --bluetooth (-b)"));
-+	if (protocol == UNIX_PROTOCOL && family != PROTO_UNIX)
-+		fatal(_("--unix does not need protocol specifications"));
-+
-+	if (family == PROTO_UNIX && listen_mode)
-+		fatal(_("--unix cannot --listen yet"));
- 
- 	/* check compiled options */
- #ifndef ENABLE_BLUEZ
-@@ -380,6 +393,10 @@
- 			fatal_internal("unknown/unsupported bluetooth "
- 			               "protocol %d", protocol);
- 		break;
-+	case PROTO_UNIX:
-+		if (protocol != UNIX_PROTOCOL)
-+			fatal_internal("unknown/unsupported UNIX protocol %d", protocol);
-+		break;
- 	default:
- 		fatal_internal("invalid protocol family %d", family);
- 	}
-@@ -425,18 +442,18 @@
- 		fatal(_("cannot set both --recv-only and --send-only"));
- 	}
- 
--	/* check ports have not been specified with --sco */
--	if (protocol == SCO_PROTOCOL) {
-+	/* check ports have not been specified with --sco and --unix */
-+	if (protocol == SCO_PROTOCOL || protocol == UNIX_PROTOCOL) {
- 		if (remote_address.service != NULL)
--			fatal(_("--sco does not support remote port"));
-+			fatal(_("--sco and --unix do not support remote port"));
- 		if (local_address.service != NULL)
--			fatal(_("--sco does not support local port (-p)"));
-+			fatal(_("--sco and --unix do not support local port (-p)"));
- 	}
- 
- 	/* check mode specific option availability and interactions */
- 	if (listen_mode == true) {
- 		/* check port has been specified (except with sco) */
--		if (local_address.service == NULL && protocol != SCO_PROTOCOL) {
-+		if (local_address.service == NULL && protocol != SCO_PROTOCOL && protocol != UNIX_PROTOCOL) {
- 			fatal(_("in listen mode you must specify a port "
- 			      "with the -p switch"));
- 		}
-@@ -450,6 +467,7 @@
- 		/* check port has been specified (except with sco) */
- 		if (remote_address.address == NULL || 
- 		    (remote_address.service == NULL &&
-+		    protocol != UNIX_PROTOCOL &&
- 		    protocol != SCO_PROTOCOL))
- 		{
- 			fatal(_("you must specify the address/port couple "
-@@ -553,6 +571,8 @@
- 	fprintf(fp, " -6                     %s\n", _("Use only IPv6"));
- 	fprintf(fp, " -b, --bluetooth        %s\n",
- 	              _("Use Bluetooth (defaults to L2CAP protocol)"));
-+	fprintf(fp, " -U, --unix             %s\n",
-+	              _("Connect to unix domain sockets"));
- 	fprintf(fp, " --buffer-size=BYTES    %s\n", _("Set buffer size"));
- 	fprintf(fp, " --continuous           %s\n",
- 	              _("Continuously accept connections\n"
-
---- a/src/unixsocket.c
-+++ b/src/unixsocket.c
-@@ -0,0 +1,78 @@
-+/*
-+ *  unixsocket.c - address family independant networking functions
-+ */  
-+#include "system.h"
-+#include "unixsocket.h"
-+#include "misc.h"
-+#include "netsupport.h"
-+#include "parser.h"
-+
-+#include <assert.h>
-+#include <errno.h>
-+#include <string.h>
-+#include <stdlib.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <sys/un.h>
-+#include <unistd.h>
-+#include <limits.h>
-+
-+RCSID("@(#) $Id$");
-+
-+
-+int unixsocket_connect(const struct addrinfo *hints,
-+		const char *remote_address,
-+		time_t timeout, int *rt_socktype)
-+{
-+	int err, fd = -1;
-+	struct sockaddr_un sa;
-+	const struct addrinfo *ptr = hints;
-+
-+	/* make sure arguments are valid and preconditions are respected */
-+	assert(hints != NULL);
-+	assert(remote_address != NULL && strlen(remote_address) > 0);
-+	assert(sizeof(sa.sun_path) >= strlen(remote_address));
-+
-+	sa.sun_family = ptr->ai_family;
-+	strncpy(sa.sun_path, remote_address, sizeof(sa.sun_path));
-+
-+
-+	/* create the socket */
-+	fd = socket(ptr->ai_family, ptr->ai_socktype, ptr->ai_protocol);
-+	if (fd < 0) {
-+		warning("cannot create the socket: %s", strerror(errno));
-+		return -1;
-+	}
-+
-+	/* attempt the connection */
-+	err = connect_with_timeout(fd, (struct sockaddr *)&sa, sizeof(sa), timeout);
-+	
-+	if (err != 0)
-+	{
-+		/* check error code */
-+		if (verbose_mode()) {
-+			/* use different error message for timeout */
-+			if (errno == ETIMEDOUT) {
-+				/* connection timed out */
-+				warning(_("timeout while connecting to %s"), remote_address);
-+			}
-+			else {
-+				/* connection failed */
-+				warning(_("cannot connect to %s: %s"), remote_address, strerror(errno));
-+			}
-+		}
-+		close(fd);
-+		return -1;
-+	}
-+
-+	assert(ptr == NULL || fd >= 0);
-+
-+	/* let the user know the connection has been established */
-+	if (verbose_mode()) warning(_("%s open"), remote_address);
-+
-+	/* return the socktype */
-+	if (rt_socktype != NULL) *rt_socktype = ptr->ai_socktype;
-+
-+	return fd;
-+}
-+
-
---- a/src/unixsocket.h
-+++ b/src/unixsocket.h
-@@ -0,0 +1,12 @@
-+#ifndef UNIXSOCKET_H
-+#define UNIXSOCKET_H
-+
-+#include <netdb.h>
-+#include <sys/types.h>
-+
-+/* establish a connection and return a new fd and socktype */
-+int unixsocket_connect(const struct addrinfo *hints,
-+		const char *remote_address,
-+		time_t timeout, int *socktype);
-+
-+#endif
-
diff --git a/net-analyzer/netcat6/metadata.xml b/net-analyzer/netcat6/metadata.xml
deleted file mode 100644
index 3baf3341ea46..000000000000
--- a/net-analyzer/netcat6/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="sourceforge">netcat6</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/netcat6/netcat6-1.0-r2.ebuild b/net-analyzer/netcat6/netcat6-1.0-r2.ebuild
deleted file mode 100644
index 1942014970e2..000000000000
--- a/net-analyzer/netcat6/netcat6-1.0-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools toolchain-funcs
-
-DESCRIPTION="Obsolete netcat clone from before netcat had IPv6 support"
-HOMEPAGE="http://netcat6.sourceforge.net/"
-SRC_URI="ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 nls bluetooth"
-
-# need to block netcat as we provide the "nc" file now too
-DEPEND="
-	bluetooth? ( net-wireless/bluez )
-"
-RDEPEND="
-	${DEPEND}
-	!net-analyzer/netcat
-"
-
-S=${WORKDIR}/nc6-${PV}
-
-DOCS=( AUTHORS BUGS README NEWS TODO CREDITS ChangeLog )
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-unix-sockets.patch \
-		"${FILESDIR}"/${P}-automake-1.14.patch
-	AM_OPTS="--force-missing" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable bluetooth bluez) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	default
-	dodir /usr/bin
-	dosym /usr/bin/nc6 /usr/bin/nc
-}
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 0ff3b0457d8b..3aeaeaf5dce8 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,4 +1,7 @@
 DIST netdata-1.13.0.tar.gz 3095581 BLAKE2B 0149600d308717ce8bdab2af6b4b0403a762fff15c62cf61a94141c0a73f8867cde265a2065e6f1e42cee7291375a7c33a3eff804017d40146d5ecba6f5414a8 SHA512 dddd0005b746429255601e284f498072560bb62c4875a17a731d8e47c3c168c4934476f46eefc7b0deafb54490fcbb6e5ea97aac51a0461f7a63f34d3770c250
-EBUILD netdata-1.13.0.ebuild 2637 BLAKE2B f814ddaba621e8e5dd931b3abc9072b6ed169f683bbc303152b814229f3224d6200b9b4e639203cda6864a1c44b02b76407f143e1ebffc3de19fd77218a0f3ad SHA512 1c6b51024ceca7cd73f79bdeb3db1781f8055820cff8c2f3b2a5896dbd06abb396ae409c2266d7076e93c3b9bd711021f0e47ade2793e4093383fe1056136198
-EBUILD netdata-9999.ebuild 2637 BLAKE2B 350cefa34f5963df9969c8ee78fb7bdcfa807827c37f6cc716dbdda1e55d59c2d1dcb4614ed10552afa363932cb4ec786891dd971f8cb596173dd9f675856b22 SHA512 ee2fe5a9c9cddfcb2cc74fad245e6778cfcedeaf16088b2c3c78377fbd2d6124930436443aa35efcc8e2881669939a9bfdd20b701cc6bb4066b1a030d4b62470
-MISC metadata.xml 864 BLAKE2B 2c56df62c37c672fe6343a740efa82d16c44dc6f3f38a9afb51cb9c6e93aabd6344ddad599c1504d670e9c1447374b3c6f74125da83577721bcf88a4f68a2dc2 SHA512 cf053acf66105fdd9dfdcff3f6d130f11a2ea0bbf4c553ae704fd86fdd7787efddd55b1bb5f7f8d2ba7e6e2e1a8b800bd80bf907c9b0beba8f12c15e1277694b
+DIST netdata-1.14.0.tar.gz 3116199 BLAKE2B 366fdd7fc94799f170a2957e26fadfacd0cc71ae22f1ac2390633fc2e9d48b2f725ec1f87cc21096d2ed8a948e1dfcfc5d9e90540ad3ef93fd918569a387a64f SHA512 7e4d9eb171eadd0d2b553a6ac7345a7f1ec368f22fa0d1d67b6430e2b388be5d06a1464b539b9b44c07a5440dab58ece5605c44b279889d9e4bf696102b01b25
+EBUILD netdata-1.13.0.ebuild 2633 BLAKE2B 917373166cefb26f30a9f62fedec407be3e7332774b419cb36db4a8ec6978d774f527a21d8b09e9bc4ed920144d7dc0378c9ecd30eaf51e855c6557b4e950556 SHA512 b964e4a3949b0ccf268cc8caa6ede03a45c3fbf5ec9b2d98e2c8ca9efec2643d8bbcf4233a087ac259c9a62c19f54ecaa15183a51fae0642c93c80d27c95cda8
+EBUILD netdata-1.14.0-r1.ebuild 2783 BLAKE2B 581d2bf6e944612d833d5d1c9a96a4de3f885df5587b57a3ddbdf88ed1781ffc2ea51c6179baeec5bc10322e09249fc1f745c1613b61a8ebb80b84d988040409 SHA512 15f74bfe0a00e23d2d108ffa2325b3837cf5cbfae91a22350cad78a4bfd0d05c89857b32a92896180a15d70e2c4aec7de53e1a70420636075092a642790c82dd
+EBUILD netdata-1.14.0.ebuild 2623 BLAKE2B 8552936e3884d9b62a6b2ee94ce4d14fb80feff59412e35b5f6174f5de2abc0506fc22311386b3337c3ee250fe0952acda36ae1524e924bf39673aa5f74a7eac SHA512 82d51a4bcd131b4dca9090ec6c6b344e37efabb5521f06315324bc006fdf5cd9930f4b68c4aa4a90f1ca7a1135803872726521f3d4ac21504a60047f8abaab96
+EBUILD netdata-9999.ebuild 2783 BLAKE2B 581d2bf6e944612d833d5d1c9a96a4de3f885df5587b57a3ddbdf88ed1781ffc2ea51c6179baeec5bc10322e09249fc1f745c1613b61a8ebb80b84d988040409 SHA512 15f74bfe0a00e23d2d108ffa2325b3837cf5cbfae91a22350cad78a4bfd0d05c89857b32a92896180a15d70e2c4aec7de53e1a70420636075092a642790c82dd
+MISC metadata.xml 921 BLAKE2B d0dfbd5bc5d49552053b908e2fc43357821b0bc63cc2a80a067bb699b937405e7e83ee9e2204de47676891d588cf259d4349e7c7104570671d9be114e78f1175 SHA512 7b1d4da58e73201c0e402ee5d5acd4edb0fd72a8cef212539c9bb020cb68cf101d5afda37538e0c4945947f2cdcaf60b6600634468c4a2de9b163cb45307ab1e
diff --git a/net-analyzer/netdata/metadata.xml b/net-analyzer/netdata/metadata.xml
index 04af360a6e2a..06a8ae53618a 100644
--- a/net-analyzer/netdata/metadata.xml
+++ b/net-analyzer/netdata/metadata.xml
@@ -11,6 +11,7 @@
         <flag name="nfacct">Enable the nfacct plugin</flag>
         <flag name="nodejs">Enable use of nodejs (which some plugins use)</flag>
         <flag name="tor">Enable monitoring of tor</flag>
+        <flag name="xen">Enable monitoring of xen</flag>
     </use>
     <upstream>
         <remote-id type="github">netdata/netdata</remote-id>
diff --git a/net-analyzer/netdata/netdata-1.13.0.ebuild b/net-analyzer/netdata/netdata-1.13.0.ebuild
index aed65af73963..c52e2322bd9a 100644
--- a/net-analyzer/netdata/netdata-1.13.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.13.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit autotools fcaps linux-info python-r1 systemd user
 
diff --git a/net-analyzer/netdata/netdata-1.14.0-r1.ebuild b/net-analyzer/netdata/netdata-1.14.0-r1.ebuild
new file mode 100644
index 000000000000..54d150969d3c
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.14.0-r1.ebuild
@@ -0,0 +1,121 @@
+# 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,3_6,3_7} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 cups ipmi mysql nfacct nodejs postgres +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=${NETDATA_USER} \
+		$(use_enable cups plugin-cups) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	# Remove unneeded .keep files
+	find "${ED}" -name ".keep" -delete || die
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	keepdir /var/log/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+
+	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
diff --git a/net-analyzer/netdata/netdata-1.14.0.ebuild b/net-analyzer/netdata/netdata-1.14.0.ebuild
new file mode 100644
index 000000000000..59396a96cc0e
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.14.0.ebuild
@@ -0,0 +1,114 @@
+# 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,3_6,3_7} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python tor"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=${NETDATA_USER} \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	# Remove unneeded .keep files
+	find "${ED}" -name ".keep" -delete || die
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	keepdir /var/log/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+
+	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 9e53cefcc74a..54d150969d3c 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit autotools fcaps linux-info python-r1 systemd user
 
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
 
 LICENSE="GPL-3+ MIT BSD"
 SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python tor"
+IUSE="caps +compression cpu_flags_x86_sse2 cups ipmi mysql nfacct nodejs postgres +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -27,10 +27,10 @@ REQUIRED_USE="
 
 # most unconditional dependencies are for plugins.d/charts.d.plugin:
 RDEPEND="
+	app-misc/jq
 	>=app-shells/bash-4:0
 	|| (
 		net-analyzer/openbsd-netcat
-		net-analyzer/netcat6
 		net-analyzer/netcat
 	)
 	net-analyzer/tcpdump
@@ -40,6 +40,7 @@ RDEPEND="
 	sys-apps/util-linux
 	virtual/awk
 	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
 	compression? ( sys-libs/zlib )
 	ipmi? ( sys-libs/freeipmi )
 	nfacct? (
@@ -58,6 +59,10 @@ RDEPEND="
 		)
 		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -85,8 +90,10 @@ src_configure() {
 	econf \
 		--localstatedir="${EPREFIX}"/var \
 		--with-user=${NETDATA_USER} \
+		$(use_enable cups plugin-cups) \
 		$(use_enable nfacct plugin-nfacct) \
 		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable xen plugin-xenstat) \
 		$(use_enable cpu_flags_x86_sse2 x86-sse) \
 		$(use_with compression zlib)
 }
diff --git a/net-analyzer/netsniff-ng/Manifest b/net-analyzer/netsniff-ng/Manifest
deleted file mode 100644
index 5bfbf6881b53..000000000000
--- a/net-analyzer/netsniff-ng/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST netsniff-ng-0.6.1.tar.xz 565956 BLAKE2B ed965ee91c3d4bb6f339f983ee67052633f1fb90da114e1086672342adeec06ca2fa1b70a210b6a7cd43baacf59ff2c2b7fa72c2ea3e9477ba12055d0f34f50e SHA512 a07f3d5f85c517e220db53ac3a93e6337e49cbc8d69b730261697e765e449fa25024782b2b4fac089288f8753471e2fca3162b55c3bb2a9fcbbb10b96391efc1
-EBUILD netsniff-ng-0.6.1.ebuild 1324 BLAKE2B 43e5ab2c4dd9b2b6b2241b11c423330c03d2055649fa6c363ffe53b91dc56bbfabc54b8bc394442cac48150fe97ebcc94a7f5821bef1eba371f654fd69e297e6 SHA512 6d297cfc26ea6f5f6a1cbb577cb9c593a68022cd4448112e40f93a56ab250820fed3071245459c9d5b1fa60372feb0bfe8e473ea33a9eb8285c190c67b2036ae
-EBUILD netsniff-ng-9999.ebuild 1321 BLAKE2B 6972fb2c40d19b2d4257ec0641ca6777e8ee236b0da9cf159da18279b6b9b3aa204148d4e4c75046bdec64c51089ebfba06d2b2f0e615ae9331c912c55c97284 SHA512 39e58aaa796dc1056a54b8f00bf6ffca0a2bc21b66d0b1c75d6b84251a44250d5e6858d84b5fd3c8dcabce5baf55896744c2a8f269328659aa68d650a3ff1fb5
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/netsniff-ng/metadata.xml b/net-analyzer/netsniff-ng/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-analyzer/netsniff-ng/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.6.1.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-0.6.1.ebuild
deleted file mode 100644
index e2787720d544..000000000000
--- a/net-analyzer/netsniff-ng/netsniff-ng-0.6.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="high performance network sniffer for packet inspection"
-HOMEPAGE="http://netsniff-ng.org/"
-SRC_URI="http://pub.${PN}.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/geoip
-	dev-libs/libcli
-	dev-libs/libnl:3
-	dev-libs/userspace-rcu:=
-	net-libs/libnet:1.1
-	net-libs/libnetfilter_conntrack
-	net-libs/libpcap
-	sys-libs/ncurses:0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	=net-libs/nacl-0_p20110221*
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -e '/CFLAGS/s:?=:+=:' \
-		-e '/CPPFLAGS/s:?=:+=:' \
-		-e '/CFLAGS/s:\(-g\|-O2\|-O3\|-m\(arch\|tune\)=native\)::g' \
-		-i.bak Makefile || die
-
-	if ! grep nacl-20110221 curvetun/nacl_build.sh >/dev/null ; then
-		die "have nacl-20110221, expected $(grep ${MY_NACL_P} curvetun/nacl_build.sh)"
-	fi
-
-	export NACL_INC_DIR="${EROOT}usr/include/nacl"
-	export NACL_LIB_DIR="${EROOT}usr/$(get_libdir)/nacl"
-
-	epatch_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" \
-		LEX=lex YAAC=bison STRIP=true \
-		Q= HARDENING=1
-}
-
-src_install() {
-	emake PREFIX="${ED}usr" ETCDIR="${ED}etc" install
-
-	dodoc AUTHORS README REPORTING-BUGS
-}
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild
deleted file mode 100644
index 7cf9b0ff7822..000000000000
--- a/net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit git-2 eutils multilib toolchain-funcs
-
-DESCRIPTION="high performance network sniffer for packet inspection"
-HOMEPAGE="http://netsniff-ng.org/"
-EGIT_REPO_URI="https://github.com/borkmann/${PN}.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="dev-libs/geoip
-	dev-libs/libcli
-	dev-libs/libnl:3
-	dev-libs/userspace-rcu:=
-	net-libs/libnet:1.1
-	net-libs/libnetfilter_conntrack
-	net-libs/libpcap
-	sys-libs/ncurses:0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	=net-libs/nacl-0_p20110221*
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -e '/CFLAGS/s:?=:+=:' \
-		-e '/CPPFLAGS/s:?=:+=:' \
-		-e '/CFLAGS/s:\(-g\|-O2\|-O3\|-m\(arch\|tune\)=native\)::g' \
-		-i Makefile || die
-
-	if ! grep nacl-20110221 curvetun/nacl_build.sh >/dev/null ; then
-		die "have nacl-20110221, expected $(grep ${MY_NACL_P} curvetun/nacl_build.sh)"
-	fi
-
-	export NACL_INC_DIR="${EROOT}usr/include/nacl"
-	export NACL_LIB_DIR="${EROOT}usr/$(get_libdir)/nacl"
-
-	epatch_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" \
-		LEX=lex YAAC=bison STRIP=@true \
-		Q= HARDENING=1
-}
-
-src_install() {
-	emake PREFIX="${ED}usr" ETCDIR="${ED}etc" install
-
-	dodoc AUTHORS README REPORTING-BUGS
-}
diff --git a/net-analyzer/nodebrain/Manifest b/net-analyzer/nodebrain/Manifest
deleted file mode 100644
index 58defa20a234..000000000000
--- a/net-analyzer/nodebrain/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX nodebrain-0.8.14-include.patch 691 BLAKE2B a9fe57fc8c2f419b64fd601f5fe82ca6d4a60abd8d202207d610d0c878e64fd11864fb35081ca68621ff83b8c368646260073efdcc4fc6ddb93d0e40032762bb SHA512 406b57b9d9dd8b203c9b4b1303732c31fbd960624dd6f11a858e805ff0e1c48a251ba6f69dedf521a0ebf7bbd4ea3bba35f457b4d066aebe91942309852b2b4b
-AUX nodebrain-0.9.04-include.patch 151 BLAKE2B af7856aa8234dc7a11ffb2d505b37829707614f63418d7b4f5838c6975da8813eba05cfe47bca61d40166a53d8fa8178af0c0c9ed38a6f76ec9e60d6cb78d425 SHA512 88f4184757c63d5cf239c1322df216427ef006ae0ab5b899ab254e4196e76c6ad6cdbe0f5be368fa188bf0a22d1f7295b2186c33608f328e6147f69b06b102a6
-DIST nodebrain-0.9.04.tar.gz 2475665 BLAKE2B 04ca839dc862372717530127fc1ec66df2e06bf2bb5b368e5b427d0efc953629b98ef05e3a58ee5e506c1937dcd4e7e676bee32fe841547cbba07063be88e8ef SHA512 a6cbebef09569d2d086954fc06b7a0bbc2828a5041289fdb7b537bd75b354610f3cf28baded5fce9679d89ffea3e245ab59323a00d060e98819d367775fd5226
-EBUILD nodebrain-0.9.04-r1.ebuild 830 BLAKE2B af9f83d767621a042c3fce3836e304c1131bd41f83c144593ef95df8e96efbf5f33f63af85f5844d218bbe155c67d625fef44731dccaad36ed5f3a8e806cc6db SHA512 6656f049ffb75b5a2f997d3b0caae24b182af8563293a3aa28cf6dc8fd49dd727d535bd65ea88ef591a65b7f09869a2badeea266878353497cb86c78cf4a94be
-EBUILD nodebrain-0.9.04.ebuild 814 BLAKE2B 11d57913aec15031b9dbe5af51c598427743ff78e67f1690157b78427452084e5b1459a9666eda9abe3775cda659b723cb519d9b04903c67f64502ea6713c1e7 SHA512 11fd2cfec1db526674828c0970cbb0fabf9cbdfbc0b37a03af3d698c6d790512b3af6d28bfd2bb295f866c5b924ff450a3ad5936fc09ae730fdb7aae4e02472e
-EBUILD nodebrain-9999.ebuild 867 BLAKE2B 60a9641332e544e2c3c90c127d0db3a70923f8dd533f70eae7c6d9c9fa1f6aadfbc9dbbbb142144feae76aff0ff4fae85c12d99355ce900e371d804ca60ea1bc SHA512 a82f7afad23877151f58d868b593ddb666f9c1ffc20603d595ee3e5f750718fe1152d26bd428023684c0515eff08ca31c1b254352cf30a732441b44358b569a4
-MISC metadata.xml 359 BLAKE2B 2ee0a383e3c92b5f9e00926c9b5c1c9e5acb4d38492a5f7de12975b8b6c6ef873b32bdeb67c178df5dfd693d92655eb438a99597d0983b870e57a6c5fb9bbeaa SHA512 5b6e59de14c1e181ba2306ace2fa3241758b2205b1cba18611a12bb89fcdb2cdfe31313c8de17ed9e09dee6f91c5aca47fe50da5b53d2bde188197c4f3cbf1ed
diff --git a/net-analyzer/nodebrain/files/nodebrain-0.8.14-include.patch b/net-analyzer/nodebrain/files/nodebrain-0.8.14-include.patch
deleted file mode 100644
index c34965bfe5e5..000000000000
--- a/net-analyzer/nodebrain/files/nodebrain-0.8.14-include.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/lib/nbbfi.c
-+++ b/lib/nbbfi.c
-@@ -197,6 +197,7 @@
- *=============================================================================
- */
- #include <nb/nbi.h>
-+#include <ctype.h> /* isdigit() */
- 
- /**************************************************************************
- * Index Routines
---- a/lib/nbkit.c
-+++ b/lib/nbkit.c
-@@ -51,6 +51,7 @@
- #include <pwd.h>
- #include <errno.h>
- #include <unistd.h>
-+#include <stdlib.h> /* system() */
- 
- static int nbKitUsage(void){
-     printf("Usage:\n");
---- a/module/webster/nb_webster.c
-+++ b/module/webster/nb_webster.c
-@@ -78,6 +78,7 @@
- */
- #include "config.h"
- #include <nb/nb.h>
-+#include <ctype.h> /* isalnum() */
- 
- #if defined(WIN32)
- 
diff --git a/net-analyzer/nodebrain/files/nodebrain-0.9.04-include.patch b/net-analyzer/nodebrain/files/nodebrain-0.9.04-include.patch
deleted file mode 100644
index 61d98a673375..000000000000
--- a/net-analyzer/nodebrain/files/nodebrain-0.9.04-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/lib/nbhash.c
-+++ b/lib/nbhash.c
-@@ -81,6 +81,7 @@
- */
- #include <nb/nbi.h>
- #include <stddef.h>
-+#include <stdint.h>
- 
- struct TYPE *typeHash;
- 
diff --git a/net-analyzer/nodebrain/metadata.xml b/net-analyzer/nodebrain/metadata.xml
deleted file mode 100644
index b1e688b96833..000000000000
--- a/net-analyzer/nodebrain/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="sourceforge">nodebrain</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/nodebrain/nodebrain-0.9.04-r1.ebuild b/net-analyzer/nodebrain/nodebrain-0.9.04-r1.ebuild
deleted file mode 100644
index 8c76a34f5374..000000000000
--- a/net-analyzer/nodebrain/nodebrain-0.9.04-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Monitor and do event correlation"
-HOMEPAGE="http://nodebrain.sourceforge.net/"
-SRC_URI="mirror://sourceforge/nodebrain/nodebrain-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs"
-
-CDEPEND="
-	dev-libs/libedit
-"
-DEPEND="
-	${CDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-	sys-apps/texinfo
-"
-RDEPEND="
-	${CDEPEND}
-	!sys-boot/netboot
-	!www-apps/nanoblogger
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.14-include.patch
-	"${FILESDIR}"/${PN}-0.9.04-include.patch
-)
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--include=/usr/include
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-
-	dodoc -r AUTHORS ChangeLog NEWS README THANKS sample/ html/
-}
diff --git a/net-analyzer/nodebrain/nodebrain-0.9.04.ebuild b/net-analyzer/nodebrain/nodebrain-0.9.04.ebuild
deleted file mode 100644
index 1169e2f71849..000000000000
--- a/net-analyzer/nodebrain/nodebrain-0.9.04.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Monitor and do event correlation"
-HOMEPAGE="http://nodebrain.sourceforge.net/"
-SRC_URI="mirror://sourceforge/nodebrain/nodebrain-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs"
-
-CDEPEND="dev-libs/libedit"
-DEPEND="
-	${CDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-	sys-apps/texinfo
-"
-RDEPEND="
-	${CDEPEND}
-	!sys-boot/netboot
-	!www-apps/nanoblogger
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.8.14-include.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--include=/usr/include
-}
-
-src_install() {
-	default
-	use static-libs || prune_libtool_files
-	dodoc AUTHORS NEWS README THANKS sample/*
-	dohtml html/*
-}
diff --git a/net-analyzer/nodebrain/nodebrain-9999.ebuild b/net-analyzer/nodebrain/nodebrain-9999.ebuild
deleted file mode 100644
index 36adf58b091f..000000000000
--- a/net-analyzer/nodebrain/nodebrain-9999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils git-r3
-
-DESCRIPTION="Monitor and do event correlation"
-HOMEPAGE="http://nodebrain.sourceforge.net/"
-EGIT_REPO_URI="https://github.com/trettevik/nodebrain-nb"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE="static-libs"
-
-CDEPEND="
-	dev-libs/libedit
-"
-DEPEND="
-	${CDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-	sys-apps/texinfo
-"
-RDEPEND="
-	${CDEPEND}
-	!sys-boot/netboot
-	!www-apps/nanoblogger
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.14-include.patch
-	"${FILESDIR}"/${PN}-0.9.04-include.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--include=/usr/include
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-
-	dodoc -r AUTHORS ChangeLog NEWS README THANKS sample/ html/
-}
diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest
index 1db0730d5ee9..4fea8b16e1b9 100644
--- a/net-analyzer/nrpe/Manifest
+++ b/net-analyzer/nrpe/Manifest
@@ -10,6 +10,6 @@ AUX nrpe.xinetd.2 245 BLAKE2B 3e9db31c7d5b28dab18d2f5855d0465f25fc9cf4a70deac9a5
 DIST nrpe-2.15.tar.gz 419695 BLAKE2B 999ecc633cbd2dc516ff0654db3ac0cc58a88d93ae4ace1040888fe73d8fb471306d95312ac364c79b3a47300ac57c0c429a24697c37bfa639f1da55cb6bc756 SHA512 03ce9774b5112d03235dc9da075770d89d1bcc5ffa5faf221ff7ea8ec5c92ded1e1ae9222581a87cf53736d190ac047e1acce7edc2f31f26c432d786cdef0e73
 DIST nrpe-3.2.1.tar.gz 518015 BLAKE2B c9be2bf24e3d9977a7ff5c2f0e08bfe841729289af836bb7ac6ccb2c173a519958b12cc3e90ece612ac6c2527ad472ef1464be648a66b11ff8ad483d5ad78cc1 SHA512 ec6ff42a00bd97ed80010a82e26dc35fd419f2feda65820cda0108068173c1ae44eee698833a50fd2079429a6f5eb1321c4f06b09c6708bc5fbe48f176389856
 EBUILD nrpe-2.15-r3.ebuild 4013 BLAKE2B 6609597c36f1df0228f627a66f1a2edaf2c30c93d3f143c69ab92c2c914f1e83bbb3bfd2bdd286fdc42411b3d86ca9716609f278838849ed940aa35dc7cad9c0 SHA512 d2442384f0bea253479f06186b78f013514f6fbaddc1aea531eec6b7f0436061aab3852d4035bd61fcaa6beefa2f2724200d8845d62851ced816895aa9258179
-EBUILD nrpe-3.2.1-r1.ebuild 2492 BLAKE2B ebb0854ab2b82dfbfca0e14793626f1bd54fe22e11c48a5fa58a04f77d595466546b2e8ec1e3b5a6737ff84cb79de1ffaf6d9ac2dad3d1307ab686abac30bb09 SHA512 5bbc8c841a683682ca09509eeb016fb9ec2fefa3705d8db3380c822d800b90f629256f1c20a900c06077087a48acda9beba77967e63b53a5934b2fea6da25600
+EBUILD nrpe-3.2.1-r1.ebuild 2488 BLAKE2B 366e5fb55f86395a6e8623dcfb0953bace87ffeb739e1dcb245539765aa681cb3500606e4e5df5e89b46914af2f1f0f20f8968408c46639e907fcd09f615930a SHA512 1ee597e59db5643e001d69dee93953b1bdc5325f55e100a3c900fe7be53c23f1af64996fa822510fc8b0e36a97b806c1a0288beaf0264c4b7abf14100c1270c1
 EBUILD nrpe-3.2.1.ebuild 1938 BLAKE2B bd00244a5585503b24b108f167345560d0b7855a8cdd1497fc4e853b86b42e4f9fb67aa1fc767ca67f5e3b1e13424828f295b0a74316c95a17ebb26dbea7aa0f SHA512 f0fa9659e5c06ad4239ede15ac5303675812db6cd06febade51c68aaa05e289ad1f206e53f78c327e918955be4e69e07b621671110044b3f1fc1d161ee36ee64
 MISC metadata.xml 882 BLAKE2B 76bf034c9869b503725f301f0f478c0449787057f1ba4bc22842ddee2d4460b68be1654cdc18e04504469880b71113e7a4b5a0a37fc9138eeb1b39fc2c8833f1 SHA512 2bbdd6bb5d0802985b242b8c058c749eca1adfb102820e2c587699622299936df90ee1ff43445df8686e1dd1648d0131bee40639ddfad3e26e9877c0c61dc40e
diff --git a/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild b/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild
index 558209c7effe..c5a933d6063e 100644
--- a/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild
+++ b/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc ~x86"
 IUSE="command-args libressl selinux ssl"
 
 DEPEND="sys-apps/tcp-wrappers
diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest
index 013a4c793454..8e2933b04d77 100644
--- a/net-analyzer/openbsd-netcat/Manifest
+++ b/net-analyzer/openbsd-netcat/Manifest
@@ -6,5 +6,5 @@ DIST netcat-openbsd_1.190-2.debian.tar.xz 34836 BLAKE2B 3ff4390c07d05e8d1a19c869
 DIST netcat-openbsd_1.190.orig.tar.gz 22384 BLAKE2B c3e83106f53a0214f71c805b1dfe6b66718dfca217f713a0d7016cb0a3c75c78580fbdd277bd7b5324371145c4b986ebb867e6f779cd61ffecb8e732ebabcb84 SHA512 32310813391f63b8283dc4a63e52821e464ecbfcd0ea995e8e15047c6252a86b31eb4725dc69b778594c43d6ce0cc081aa0f00d7cda0587c91941f20b93a33fe
 EBUILD openbsd-netcat-1.105-r1.ebuild 1430 BLAKE2B 1ce2ef02d31caacd30fe25b58c642245dbc92ca1148009ca5d5d8c6b50815e7b3123b3a8cc353ef904a2730aaeaa6e52059f00134a69e56b798c9b29b27b5e28 SHA512 186bd9579a5281d8bda48e81b51d307ca44597e003de96c6a4cd17663db5afea1b9e80baf7d7a581ba3055b253e31cdb60b0e0970b385d6a71aab684d2469209
 EBUILD openbsd-netcat-1.105.ebuild 1134 BLAKE2B c425b0d279ad20feb27a802264128cea191d8863a177f1844b467438110b6741611da891aae0ac6696f9bcbb187589176aac46c4539871462ab27fa7df7a4d30 SHA512 e589f9d09d36eed49ef88cffa0363f8244a0ade60710a043eed891d6c31c008e597b2df5ece4cd87e8ddc4d5078222aa8cff608d51c5ae02be0dccefca1b3a9b
-EBUILD openbsd-netcat-1.190.ebuild 1529 BLAKE2B bbcfe598d239064d79abb64337edf2eab31884844758d14b976b7f824da87d28bced9356996f2a218d39359c403946584473d9a8a0ace863f45664a1972d0709 SHA512 dc81c094bc4c70073f439092218ffb5a2d2d551721e2ec50165cc039b208a08a979b6cfbf64e52f9242e687f36790c19c64fdef20f901f3449db1e91a6f70a2c
+EBUILD openbsd-netcat-1.190.ebuild 1536 BLAKE2B 3eeb06ff47ab74e126dd6d5381a0ceb5e8979b32e82468781daa83e25d0869e4ebf3818f58982f18c1b99784f698fd70dfcd146b935e364de044b251380fc156 SHA512 9357418b7cd5cdd09ab43fdcc413f696b086ce849600f2f0e6de6c790bdf4909b379cbcb49d58971d9b5c800fb07f782820bf5eabcef6751c3763f6633e66147
 MISC metadata.xml 351 BLAKE2B 52a6f3fb0e94749d226310a8439bc81e3a6fb4a59116b23d63ce992e246807e4486595330f3b0cc5a437672eadf4fb8ecea21fc8a0565fc5e9311d341917dc60 SHA512 80bf423a6e8309ff117540ce0d2e29eeea89f3de4c4e4aea161ba37675ff0415a4f5a8cc37cb2ffe841e702de66a324888509a2f66df9576b76e774febfc8936
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild
index 8d3169615744..83108311916c 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="elibc_Darwin"
 
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x64-macos"
 
 DEPEND="virtual/pkgconfig"
 RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
diff --git a/net-analyzer/ospd/Manifest b/net-analyzer/ospd/Manifest
index 15e176b9037a..2841afe90ee9 100644
--- a/net-analyzer/ospd/Manifest
+++ b/net-analyzer/ospd/Manifest
@@ -1,5 +1,5 @@
 DIST ospd-1.0.0.tar.gz 39656 BLAKE2B 754a7fcca382617ce7eed33d8d148d516c550435da7abed0e294e216898c0ad96d53bae62e5396b590812015c9a71be5346187d521c4051d5b2dc04345336b59 SHA512 64b1b42c5292dc8cf8b1ffde9082f4d05ff62f4d0bf2ed7b2b5d2ba4d3c3611ae8af30b39c8becb9f6bdc36eb519a0b881cdeb50891e5a2273003f6181cbebfb
 DIST ospd-1.3.2.tar.gz 39097 BLAKE2B 4c102e1e6857f89015666950e2d7a107bf81c861f9c6d4d74aab33f77585ea871e353aa95deb3f84a1bb4cd391f40121ca927835ebec9db2545eb8f606e96df7 SHA512 26ec0b45d74df687264ce2d5e42a6f51cfb982f8fe00863294b990ee8db819b7f54ebf3f095094c32c2bc91a51d987ac83f15f4bf15e931d4ffd215b72ac6bec
 EBUILD ospd-1.0.0.ebuild 656 BLAKE2B ddddf826a72c516f10f3421ea7a7f45ebfa0b42dad541842d6a9209f60c6c6584bab1d9d43b4b9c0e22be54f7a4951667149dfdc17d710a828b0bd01613a48c2 SHA512 059abfdeb1701da5897b6c3d30b69228c04e7ba52e238a865861f7104465b7b94226bb391e084aeeb46c5db37bcb312054dd1af4b8908f3d20401786f7166c23
-EBUILD ospd-1.3.2.ebuild 740 BLAKE2B f1d11ed7eb17a20713ec0799ef5715a4cfac843e2a2a04bc96c9842e5a739df459465dfc3d2cd2bd41a021f6aedbbbb95390a8012595182311310bd3919e4e98 SHA512 b43e525c47bc162215757203e2dc21c06a6f65bfb73e6ce87c83e57164b2b9e343bd34cbe240849814c852f8d91a78c73b98ba4cf2f0834e0996ede2c8039887
+EBUILD ospd-1.3.2.ebuild 738 BLAKE2B 59907c080ef008560f9f56157f341f2a56684d384015bfda76bf7fb38668f26f1c74b9bd2c5e32631240afdc2571d72df02f1236a084791736e78c9f7202ca92 SHA512 4ace8420652b2017aa0425e35a562c0a5e211ab2967c3af72dbbb7804aa2d3ebe6d2274c3ef48ab1158dbaf8805e7f98d5ae52d6cbce1eaa4c51a3482aa774e0
 MISC metadata.xml 435 BLAKE2B 4d40c4dcffe9bfd81d1c1b517b4e6d6e1e658f9d6be65f8ad962ecbbee78bf0cc6bbb5805f2e056375c7371697a453453f8eeae40bae1bdf890be8f3e23ccfbc SHA512 fc802728917b8ebc3c43e3c35ce1fa7b8aa30d89d60abcfcd82eb6baf0152d02384b2e336664942bd89c3ed27a418f37a13699b68a424f36645c51c1310a6e16
diff --git a/net-analyzer/ospd/ospd-1.3.2.ebuild b/net-analyzer/ospd/ospd-1.3.2.ebuild
index 976983ae9504..9b9c31af66ea 100644
--- a/net-analyzer/ospd/ospd-1.3.2.ebuild
+++ b/net-analyzer/ospd/ospd-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Openvas OSP (Open Scanner Protocol)"
diff --git a/net-analyzer/ossec-hids/Manifest b/net-analyzer/ossec-hids/Manifest
index 2a204dc8cd56..4b5c72ef9fac 100644
--- a/net-analyzer/ossec-hids/Manifest
+++ b/net-analyzer/ossec-hids/Manifest
@@ -3,5 +3,6 @@ AUX makefile.patch 933 BLAKE2B 29e0d41592983d060c5faeaf1a5719c6c6b41469e1de6f63d
 DIST ossec-hids-3.1.0.tar.gz 1886469 BLAKE2B c175c8659a8b5d0d269a5cb6bf142276f29e6f676afc6029accf854d68299d71147ba65a667601e77c6db8ca49a29afa49534e5683369f420f6389059ae61fc3 SHA512 fe55f82ac354d9fcd767d8379a492279644308788535780bb029d46688c93f259771686462570137555b40082c6756daad44bbdd1ddc953ed0bb22b65c6cb566
 DIST ossec-hids-3.2.0.tar.gz 1896977 BLAKE2B d77cff3a3a72287ad2235f346c7d07cfdad83872d956f57877ed44ad21bb717e4b4ddcfd0e8b2ce45cb90160bb63a28a7d06bc6225b53cc5ed42f7a97c5a1765 SHA512 40b25b97c43a66b8a145914ab0badd9d4f7de7d2168aa7a49abdf778c620a4b533ce3de0883d26c4c39816cf78674a053788a57c5f9c38fbea7cd8b13a35d18f
 EBUILD ossec-hids-3.1.0.ebuild 1565 BLAKE2B a87f9f384fd9164a1aac6c1febbafccc8018d10a75508c9acd4fb97d5da6dbe1d1c7dc364c1e38017ca64f5a758764cbb3f628ac52dc1d71496dbf6f7d70e3bf SHA512 797ee671d1f16d8d0144f069a55223d8a030477cb8137c9549ae5cf20d1831fd6c47bcb7ee0bb3134430cbcaa1cc6e97be5a3f96a29a8fd7b7168bd9f705d043
+EBUILD ossec-hids-3.2.0-r1.ebuild 1591 BLAKE2B 96f58a00121e6c9a997032bba5dfcc8a403637ab600f088ca6e9b690002f744ebb9c42d8d88f173951a2d4bb0c05222edfce9b3cbdd7643c1da1165538e4f474 SHA512 39a2a1248e0b643b9f9701debdde41310be0b35c60c01869381d205fb1d90850bc2be9cdd853a973b185defbe009303dc49c86066860d2390038dde1b1c7d98c
 EBUILD ossec-hids-3.2.0.ebuild 1530 BLAKE2B fbb10305328d1666b2718485c3c4afc7ac7f08402cd07b265debc891212b2ffa152c8a0c22d46221ee81229f5fd289306c26fcab32f82c4203910bfe81dc2ce4 SHA512 1e0b2fe87c451ade9d83466f9bcef7e476ff5e39441fa17e5665006b01f7d07cb1d564ef09a2af6d60c867ddc32d524eaa0004125527b6f7eafaa07ec3db359a
 MISC metadata.xml 1184 BLAKE2B 491f885913c264b0bd1eb3bea5131e64afd36f8a07a8964a07a987dc67a5537a2a6fd1a8018b339e487218649833eab4a05199fe5d2b7aa79483ec3494a44bb7 SHA512 e786d57b92a5563eb9d3e4ca60c7f45cf1adf59e9409001f032dac07621cfcfedeaed4fc0d438d0b8c2f3146074d9e75874ebeb31616e158692ae2447fd3c767
diff --git a/net-analyzer/ossec-hids/ossec-hids-3.2.0-r1.ebuild b/net-analyzer/ossec-hids/ossec-hids-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..31980c7fe55f
--- /dev/null
+++ b/net-analyzer/ossec-hids/ossec-hids-3.2.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user
+
+DESCRIPTION="Open Source Host-based Intrusion Detection System"
+HOMEPAGE="https://www.ossec.net/"
+SRC_URI="https://github.com/ossec/ossec-hids/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="agent hybrid local mysql postgres server sqlite"
+REQUIRED_USE="^^ ( agent hybrid local server )
+	?? ( mysql postgres )"
+
+DEPEND="mysql? ( virtual/mysql )
+	sqlite? ( dev-db/sqlite:3 )
+	postgres? ( dev-db/postgresql:= )"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${P}/src"
+PATCHES=( "${FILESDIR}/makefile-${PV}.patch" )
+
+declare -a MY_OPT
+
+pkg_setup() {
+	enewuser ossec -1 -1 /var/ossec
+	enewuser ossecm -1 -1 -1 ossec
+	enewuser ossecr -1 -1 -1 ossec
+}
+
+src_configure() {
+	local target="local"
+	use agent && target="agent"
+	use hybrid && target="hybrid"
+	use server && target="server"
+	MY_OPT=(
+		TARGET=${target}
+		USE_SQLITE=$(usex sqlite)
+		V=0
+		ZLIB_SYSTEM=yes
+	)
+	use mysql && MY_OPT+=( DATABASE=mysql )
+	use postgres && MY_OPT+=( DATABASE=pgsql )
+}
+
+src_compile() {
+	emake "${MY_OPT[@]}" PREFIX=/var/ossec
+}
+
+src_test() {
+	emake "${MY_OPT[@]}" PREFIX=/var/ossec test
+}
+
+src_install() {
+	keepdir /var/ossec/logs/{alerts,archives,firewall}
+	keepdir /var/ossec/lua/{compiled,native}
+	keepdir /var/ossec/queue/{agent-info,agentless,alerts,diff,fts,ossec,rids,rootcheck,syscheck}
+	keepdir /var/ossec/{.ssh,stats,tmp,var/run}
+	newenvd - 50ossec-hids <<<'CONFIG_PROTECT="/var/ossec/etc"'
+	emake "${MY_OPT[@]}" PREFIX="${D}/var/ossec" install
+}
diff --git a/net-analyzer/postal/Manifest b/net-analyzer/postal/Manifest
deleted file mode 100644
index bdfad73e1bc7..000000000000
--- a/net-analyzer/postal/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX 01_postal-0.70-gcc43.patch 268 BLAKE2B a3801ea5e740d0bc5f875162502d2093326ee4ed25f9ee4b02a2f6f3c760f97cce664e8cb81352db8459d0208adadcbc083a75311e5daafab56a974bc701fdb9 SHA512 6d2b6c4a947af4fe7c40315c42a5304bff0ff092016a37c2473a33d1f6e0fb39e527ec028802dc221d5993b50be6b2bd427e69820a20048d5861b1a5840085e6
-AUX 02_postal-0.72-nossl.patch 1905 BLAKE2B e0a77069ba17720ce66b4eecee8d3785d38cbea26232b85deb18ca1b0a8cb622fe43288ffbb720d5a059cc3a9938284f97b686e4787dc958e3a8e000d20cd6a6 SHA512 22a1a3f2300f3da2f79325203889d8bb924721115762935f130d4d93617efba1e4058f57860aa78b16714ebc475f6654d1cfeddf5f93ae140d5e9ecda7d6ef65
-AUX 03_postal-0.70-c++0x-integrated.patch 7258 BLAKE2B 448936aebcb098013379858fac57b899a06c4e8082e2310a6527e7485c2e26c94dff0e3cce0f7d2ed299ed5949776d4d64c9470d40723b802e322f875e375fce SHA512 6e9fee3ab6f08a707e207bebf6d6816db500a4b2b8867e5771b949808aa9a42d32c280cd6ccc2b0e1006103801b18127be21d2b89cdf7f158221389320ff5e98
-AUX 04_postal-0.70-warnings.patch 445 BLAKE2B 1911b0d20940433eabe13efed4b8bf5e8566f85a4c05c9b2b106d3f28172103bbc802ce660566c34a79cac0fb046560209525a089246c89c75d339457380d6e3 SHA512 14c933f3a998a2dff7e2acc2970369e59509ac79684772da9da1747eda0065c5669cdfe21820883a2b103678d6b85278f9d330c051fc801a719d7e0e7f922422
-AUX 05_postal-0.70-openssl-1.patch 529 BLAKE2B cb0eaa9b91b7f1aaea2564517c0877d755c56654ae6e076c7fa14a7e53d28c5c1cab0bd60c2bdf340e478d37396ef25b179f8fcd21cb21a07e8d6e8226153a0b SHA512 a1faba251a5939a9f0258c5689e3dc82553e4f66a4c288bca1b30ec5db10ebd912214cf03209035e37aa5dba92a4300b105c28af7f6db24a8f5bbd2b9b537c6d
-AUX 06_postal-0.70-ldflags.patch 1276 BLAKE2B 21ae7a98d9dc4da7954e62d1e36bdc76ea3615b9f31b1aab0ee583ffd540f23777abbca09c1500ba9a8b68f812401b786f85b24cee86daeb1b07b24a5b40a6b5 SHA512 aa509bcc917d0b9c83faf00f9625681f6a394d91260aa304692916a90318e67d03009acbd48cb4fcf7ff0baf0578d70363125b172b1117ec0691d9bd32aa47c1
-DIST postal-0.72.tgz 106720 BLAKE2B 31374e36c0437dd7ebdf5e26ded159d9cfb22d4a97858de058b58ecebd2e31ae18ef9bdda5d61c06c89b1f05a903904ed9cc424918a66ead168be3af6786b994 SHA512 858d5a3ec452e868d6026d631d59260eab83e90c64ce185bf9c6cecd3494c591ba7cb1455f35a5f003acbbe33f4974669e6820750e4d4ce9432d72b350263c99
-EBUILD postal-0.72.ebuild 1080 BLAKE2B 6f5b472556565cce7a060a12b747b8d6cf063d4e44bb92a187000051185a7ebf5e0aeae922f399a2d8f0d7be5fad769a51da0c20b6eac887ef8b50fe6ab6752c SHA512 fe97e6ed80997f90e539049189443933f49eaf3c70ff0f7272b523008ed7ded1c91ef00bb19a9e27fad66d21d2d1a0435c44dde1af108190facf0713d64b917c
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-analyzer/postal/files/01_postal-0.70-gcc43.patch b/net-analyzer/postal/files/01_postal-0.70-gcc43.patch
deleted file mode 100644
index fe577603ad3d..000000000000
--- a/net-analyzer/postal/files/01_postal-0.70-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rabid.cpp.orig	2008-06-15 14:05:19.776258513 +0200
-+++ rabid.cpp	2008-06-15 14:05:47.927250506 +0200
-@@ -12,6 +12,8 @@
- #include <strings.h>
- #include "postal.h"
- #include "logit.h"
-+#include <cstring>
-+
- #ifdef USE_GNUTLS
- #include <errno.h>
- #include <gcrypt.h>
diff --git a/net-analyzer/postal/files/02_postal-0.72-nossl.patch b/net-analyzer/postal/files/02_postal-0.72-nossl.patch
deleted file mode 100644
index 238dbdbb783d..000000000000
--- a/net-analyzer/postal/files/02_postal-0.72-nossl.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -NrU5 postal-0.69.orig/configure.in postal-0.69/configure.in
---- configure.in	2008-04-09 03:08:28.000000000 +0200
-+++ configure.in	2008-04-23 22:37:41.000000000 +0200
-@@ -13,15 +13,28 @@
- else
-   stripping="-s"
- fi
- 
- AC_ARG_ENABLE(openssl,
--      [  --disable-openssl  disables openssl support],
--      DISABLEOPENSSL=$opensslval, DISABLEOPENSSL=no)
-+	[  --disable-openssl	disable openssl support],
-+	[ if test $enableval = yes; then
-+		DISABLEOPENSSL=no
-+	else
-+		DISABLEOPENSSL=yes
-+	fi ]
-+	,
-+	[ DISABLEOPENSSL=no ])
-+
- AC_ARG_ENABLE(gnutls,
--      [  --disable-gnutls  disables gnutls support],
--      DISABLEGNUTLS=$gnutlsval, DISABLEGNUTLS=no)
-+	[  --disable-gnutls  disables gnutls support],
-+	[if test $enableval = yes; then
-+		DISABLEGNUTLS=no
-+	else
-+		DISABLEGNUTLS=yes
-+	fi]	
-+	,
-+	[ DISABLEGNUTLS=no ])
- 
- dnl Checks for programs.
- AC_LANG_CPLUSPLUS
- AC_PROG_CC
- AC_PROG_CXX
-@@ -118,17 +131,17 @@
- crypt_ldflags=
- if [[ "$GNUTLS" = "no" ]]; then
-   gnutls=""
- else
-   gnutls="#define USE_GNUTLS"
--  crypt_ldflags="$extra_ldflags -lgnutls -lgcrypt"
-+  crypt_ldflags=" -lgnutls -lgcrypt"
- fi
- if [[ "$OPENSSL" = "no" ]]; then
-   openssl=""
- else
-   openssl="#define USE_OPENSSL"
--  crypt_ldflags="$extra_ldflags -lssl -lcrypto"
-+  crypt_ldflags=" -lssl -lcrypto"
- fi
- 
- AC_SUBST(large_file)
- large_file=""
- 
-diff -NrU5 postal-0.69.orig/Makefile.in postal-0.69/Makefile.in
---- Makefile.in	2008-04-10 03:19:34.000000000 +0200
-+++ Makefile.in	2008-04-23 22:37:13.000000000 +0200
-@@ -16,11 +16,11 @@
- INSTALL=@INSTALL@
- 
- TESTEXE=ex-test
- BASEOBJS=userlist.o thread.o results.o address.o tcp.o cmd5.o mutex.o logit.o expand.o @extra_objs@
- LFLAGS=-lstdc++ @extra_ldflags@
--CRYPTLFLAGS=-lstdc++ @crypt_ldflags@
-+CRYPTLFLAGS=-lstdc++ @extra_ldflags@  @crypt_ldflags@ 
- 
- 
- ALLOBJS=$(BASEOBJS) smtp.o client.o basictcp.o bhmusers.o smtpserver.o
- 
- postal: postal.cpp $(BASEOBJS) postal.h smtp.o
diff --git a/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch b/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch
deleted file mode 100644
index 448af31a8966..000000000000
--- a/net-analyzer/postal/files/03_postal-0.70-c++0x-integrated.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-diff -NrU5 postal-0.69.orig/bhm.cpp postal-0.69/bhm.cpp
---- postal-0.69.orig/bhm.cpp	2008-04-23 22:39:01.000000000 +0200
-+++ postal-0.69/bhm.cpp	2008-04-24 01:31:54.000000000 +0200
-@@ -7,10 +7,11 @@
- #include <ctype.h>
- #include <unistd.h>
- #include <sys/wait.h>
- #include <signal.h>
- #include <stdio.h>
-+#include <cstdlib>
- #include <sys/poll.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <arpa/inet.h>
- #include <netinet/ip.h>
-diff -NrU5 postal-0.69.orig/bhmusers.cpp postal-0.69/bhmusers.cpp
---- postal-0.69.orig/bhmusers.cpp	2008-04-10 03:36:27.000000000 +0200
-+++ postal-0.69/bhmusers.cpp	2008-04-24 00:04:07.000000000 +0200
-@@ -1,9 +1,10 @@
- #include "bhmusers.h"
- #include <stdio.h>
- #include <cstring>
- #include "expand.h"
-+#include <cstdlib>
- 
- BHMUsers::BHMUsers(const char *userListFile)
- {
-   char buf[1024];
-   FILE *fp = fopen(userListFile, "r");
-diff -NrU5 postal-0.69.orig/bhmusers.h postal-0.69/bhmusers.h
---- postal-0.69.orig/bhmusers.h	2006-09-28 17:20:28.000000000 +0200
-+++ postal-0.69/bhmusers.h	2008-04-24 00:14:05.000000000 +0200
-@@ -4,16 +4,21 @@
- using namespace std;
- 
- #include <string>
- #include "conf.h"
- 
-+#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L)
-+#include <unordered_map>
-+#include <tr1/functional_hash.h>
-+#else
- #ifdef HAVE_EXT_HASH_MAP
- using namespace __gnu_cxx;
- #include <ext/hash_map>
- #else
- #include <hash_map.h>
- #endif
-+#endif
- 
- #include "postal.h"
- 
- typedef enum { eNone = 0, eDefer, eReject, eBounce, eGrey } USER_SMTP_ACTION;
- 
-@@ -21,10 +26,13 @@
- {
-   USER_SMTP_ACTION action;
-   int sync_time;
- } BHM_DATA;
- 
-+#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L)
-+typedef unordered_map<string, BHM_DATA , hash<string> > NAME_MAP;
-+#else
- namespace __gnu_cxx
- {
-   template<> struct hash< std::string >
-   {
-     size_t operator() ( const std::string &x ) const
-@@ -33,10 +41,11 @@
-     }
-   };
- }
- 
- typedef hash_map<string, BHM_DATA , hash<string> > NAME_MAP;
-+#endif
- 
- class BHMUsers
- {
- public:
-   BHMUsers(const char *userListFile);
-diff -NrU5 postal-0.69.orig/configure.in postal-0.69/configure.in
---- postal-0.69.orig/configure.in	2008-04-23 22:39:01.000000000 +0200
-+++ postal-0.69/configure.in	2008-04-24 01:20:35.000000000 +0200
-@@ -155,6 +155,98 @@
- 
- AC_CHECK_HEADERS(vector ext/hash_map)
- 
- dnl Checks for library functions.
- 
-+AC_DEFUN([AC_COMPILE_STDCXX_0X], [
-+  AC_CACHE_CHECK(if g++ supports C++0x features without additional flags,
-+  ac_cv_cxx_compile_cxx0x_native,
-+  [AC_LANG_SAVE
-+  AC_LANG_CPLUSPLUS
-+  AC_TRY_COMPILE([
-+  template <typename T>
-+    struct check 
-+    {
-+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-+    };
-+
-+    typedef check<check<bool>> right_angle_brackets;
-+
-+    int a;
-+    decltype(a) b;
-+
-+    typedef check<int> check_type;
-+    check_type c;
-+    check_type&& cr = c;],,
-+  ac_cv_cxx_compile_cxx0x_native=yes, ac_cv_cxx_compile_cxx0x_native=no)
-+  AC_LANG_RESTORE
-+  ])
-+
-+  AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x,
-+  ac_cv_cxx_compile_cxx0x_cxx,
-+  [AC_LANG_SAVE
-+  AC_LANG_CPLUSPLUS
-+  ac_save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -std=c++0x"       
-+  AC_TRY_COMPILE([
-+  template <typename T>
-+    struct check 
-+    {
-+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-+    };
-+
-+    typedef check<check<bool>> right_angle_brackets;
-+
-+    int a;
-+    decltype(a) b;
-+
-+    typedef check<int> check_type;
-+    check_type c;
-+    check_type&& cr = c;],,
-+  ac_cv_cxx_compile_cxx0x_cxx=yes, ac_cv_cxx_compile_cxx0x_cxx=no)
-+  CXXFLAGS="$ac_save_CXXFLAGS"
-+  AC_LANG_RESTORE
-+  ])
-+
-+  AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x,
-+  ac_cv_cxx_compile_cxx0x_gxx,
-+  [AC_LANG_SAVE
-+  AC_LANG_CPLUSPLUS
-+  ac_save_CXXFLAGS="$CXXFLAGS"
-+  CXXFLAGS="$CXXFLAGS -std=gnu++0x"     
-+  AC_TRY_COMPILE([
-+  template <typename T>
-+    struct check 
-+    {
-+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-+    };
-+
-+    typedef check<check<bool>> right_angle_brackets;
-+
-+    int a;
-+    decltype(a) b;
-+
-+    typedef check<int> check_type;
-+    check_type c;
-+    check_type&& cr = c;],,
-+  ac_cv_cxx_compile_cxx0x_gxx=yes, ac_cv_cxx_compile_cxx0x_gxx=no)
-+  CXXFLAGS="$ac_save_CXXFLAGS"
-+  AC_LANG_RESTORE
-+  ])
-+
-+  if test "$ac_cv_cxx_compile_cxx0x_native" = yes || 
-+     test "$ac_cv_cxx_compile_cxx0x_cxx" = yes || 
-+     test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then
-+    AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ])
-+  fi
-+])
-+
-+AC_COMPILE_STDCXX_0X
-+
-+AC_SUBST(cstd)
-+cstd=
-+if test "$ac_cv_cxx_compile_cxx0x_cxx" = yes; then
-+	cstd=-std=c++0x
-+fi
-+
- AC_OUTPUT(Makefile postal.h port.h postal.spec sun/pkginfo)
-+
-diff -NrU5 postal-0.69.orig/Makefile.in postal-0.69/Makefile.in
---- postal-0.69.orig/Makefile.in	2008-04-23 22:39:01.000000000 +0200
-+++ postal-0.69/Makefile.in	2008-04-24 00:29:40.000000000 +0200
-@@ -8,12 +8,12 @@
- prefix=@prefix@
- eprefix=@exec_prefix@
- WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wcast-qual -pedantic
- WPLUS=-Woverloaded-virtual -ffor-scope
- 
--CXX=@CXX@ $(CFLAGS) -O2 -g $(WFLAGS) $(WPLUS)
--CC=@CC@ $(CFLAGS) -O2 -g $(WFLAGS)
-+CXX=@CXX@ @cstd@ $(CFLAGS) $(WFLAGS) $(WPLUS)
-+CC=@CC@ $(CFLAGS) $(WFLAGS)
- 
- INSTALL=@INSTALL@
- 
- TESTEXE=ex-test
- BASEOBJS=userlist.o thread.o results.o address.o tcp.o cmd5.o mutex.o logit.o expand.o @extra_objs@
-diff -NrU5 postal-0.69.orig/postal.cpp postal-0.69/postal.cpp
---- postal-0.69.orig/postal.cpp	2007-01-14 05:40:23.000000000 +0100
-+++ postal-0.69/postal.cpp	2008-04-24 01:30:49.000000000 +0200
-@@ -6,10 +6,11 @@
- #include "smtp.h"
- #include <unistd.h>
- #include <sys/wait.h>
- #include <signal.h>
- #include <stdio.h>
-+#include <cstdlib>
- #include "postal.h"
- #include "logit.h"
- #ifdef USE_GNUTLS
- #include <errno.h>
- #include <gcrypt.h>
-diff -NrU5 postal-0.69.orig/smtp.cpp postal-0.69/smtp.cpp
---- postal-0.69.orig/smtp.cpp	2008-04-19 00:01:39.000000000 +0200
-+++ postal-0.69/smtp.cpp	2008-04-24 00:14:49.000000000 +0200
-@@ -7,10 +7,11 @@
- #include <time.h>
- #include "userlist.h"
- #include "logit.h"
- #include "results.h"
- #include <cstring>
-+#include <cstdlib>
- 
- smtpData::smtpData()
-  : m_quit("QUIT\r\n")
-  , m_randomLetters("abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890 `~!@#$%^&*()-_=+[]{};:'\"|/?<>,")
-  , m_randomLen(strlen(m_randomLetters))
-diff -NrU5 postal-0.69.orig/smtp.h postal-0.69/smtp.h
---- postal-0.69.orig/smtp.h	2008-04-19 00:01:23.000000000 +0200
-+++ postal-0.69/smtp.h	2008-04-24 00:18:03.000000000 +0200
-@@ -4,16 +4,20 @@
- using namespace std;
- #include <string>
- #include <cstring>
- #include <time.h>
- #include "conf.h"
-+#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L)
-+#include <unordered_map>
-+#else
- #ifdef HAVE_EXT_HASH_MAP
- using namespace __gnu_cxx;
- #include <ext/hash_map>
- #else
- #include <hash_map.h>
- #endif
-+#endif
- #include "tcp.h"
- #include "mutex.h"
- 
- class results;
- 
-@@ -28,11 +32,15 @@
-   {
-     return (l1 == l2);
-   }
- };
- 
-+#if (defined HAVE_STDCXX_0X) || (__cplusplus >= 201103L)
-+typedef unordered_map<unsigned long, string *, hash<unsigned long>, eqlng> NAME_MAP;
-+#else
- typedef hash_map<unsigned long, string *, hash<unsigned long>, eqlng> NAME_MAP;
-+#endif
- 
- class smtpData
- {
- public:
-   smtpData();
diff --git a/net-analyzer/postal/files/04_postal-0.70-warnings.patch b/net-analyzer/postal/files/04_postal-0.70-warnings.patch
deleted file mode 100644
index 066cf972cdf7..000000000000
--- a/net-analyzer/postal/files/04_postal-0.70-warnings.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -NrU5 postal-0.69.orig/bhm.cpp postal-0.69/bhm.cpp
---- postal-0.69.orig/bhm.cpp	2008-04-23 01:47:25.000000000 +0200
-+++ postal-0.69/bhm.cpp	2008-04-23 02:10:17.000000000 +0200
-@@ -67,11 +67,11 @@
-   Logit *debug;
- } thread_data;
- 
- enum { eFree = 0, eUsed, eFinished };
- 
--int check_sender(CPCCHAR addr)
-+int check_sender(CPCCHAR)
- {
-   return 0;
- }
- 
- int readCommand(base_tcp &t, char *buf, int bufSize, bool stripCR, int timeout = 60);
-
diff --git a/net-analyzer/postal/files/05_postal-0.70-openssl-1.patch b/net-analyzer/postal/files/05_postal-0.70-openssl-1.patch
deleted file mode 100644
index 5b5c054ac98c..000000000000
--- a/net-analyzer/postal/files/05_postal-0.70-openssl-1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://bugs.gentoo.org/327937
-
---- basictcp.h
-+++ basictcp.h
-@@ -89,7 +89,11 @@
- 
- #ifdef USE_SSL
- #ifdef USE_OPENSSL
-+  #if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+  const SSL_METHOD *m_sslMeth;
-+  #else
-   SSL_METHOD *m_sslMeth;
-+  #endif
-   SSL_CTX* m_sslCtx;
-   SSL *m_ssl;
- #else
---- tcp.h
-+++ tcp.h
-@@ -100,7 +100,11 @@
- 
- #ifdef USE_SSL
- #ifdef USE_OPENSSL
-+  #if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+  const SSL_METHOD *m_sslMeth;
-+  #else
-   SSL_METHOD *m_sslMeth;
-+  #endif
-   SSL_CTX* m_sslCtx;
-   SSL *m_ssl;
- #else
diff --git a/net-analyzer/postal/files/06_postal-0.70-ldflags.patch b/net-analyzer/postal/files/06_postal-0.70-ldflags.patch
deleted file mode 100644
index 7bfb92de7f0d..000000000000
--- a/net-analyzer/postal/files/06_postal-0.70-ldflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.in~	2011-06-08 11:38:59.123333174 +0300
-+++ Makefile.in		2011-06-08 11:46:02.000000000 +0300
-@@ -24,19 +24,19 @@
- ALLOBJS=$(BASEOBJS) smtp.o client.o basictcp.o bhmusers.o smtpserver.o
- 
- postal: postal.cpp $(BASEOBJS) postal.h smtp.o
--	$(CXX) postal.cpp $(BASEOBJS) smtp.o -o postal $(CRYPTLFLAGS)
-+	$(CXX) $(LDFLAGS) postal.cpp $(BASEOBJS) smtp.o -o postal $(CRYPTLFLAGS)
- 
- rabid: rabid.cpp $(BASEOBJS) postal.h client.o
--	$(CXX) rabid.cpp $(BASEOBJS) client.o -o rabid $(CRYPTLFLAGS)
-+	$(CXX) $(LDFLAGS) rabid.cpp $(BASEOBJS) client.o -o rabid $(CRYPTLFLAGS)
- 
- bhm: bhm.cpp userlist.o basictcp.o logit.o results.o mutex.o bhmusers.o postal.h
--	$(CXX) bhm.cpp userlist.o basictcp.o logit.o results.o mutex.o bhmusers.o -o bhm $(CRYPTLFLAGS)
-+	$(CXX) $(LDFLAGS) bhm.cpp userlist.o basictcp.o logit.o results.o mutex.o bhmusers.o -o bhm $(CRYPTLFLAGS)
- 
- ex-test: ex-test.cpp expand.o
--	$(CXX) ex-test.cpp expand.o -o ex-test $(LFLAGS)
-+	$(CXX) $(LDFLAGS) ex-test.cpp expand.o -o ex-test $(LFLAGS)
- 
- postal-list: postal-list.cpp expand.o
--	$(CXX) postal-list.cpp expand.o -o postal-list $(LFLAGS)
-+	$(CXX) $(LDFLAGS) postal-list.cpp expand.o -o postal-list $(LFLAGS)
- 
- install-bin: $(EXE) $(SEXE)
- 	mkdir -p $(DESTDIR)$(eprefix)/sbin $(DESTDIR)$(eprefix)/bin
diff --git a/net-analyzer/postal/metadata.xml b/net-analyzer/postal/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/net-analyzer/postal/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-analyzer/postal/postal-0.72.ebuild b/net-analyzer/postal/postal-0.72.ebuild
deleted file mode 100644
index 82e1541dd2e7..000000000000
--- a/net-analyzer/postal/postal-0.72.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="SMTP and POP mailserver benchmark. Supports SSL, randomized user accounts and more"
-HOMEPAGE="http://www.coker.com.au/postal/"
-SRC_URI="http://www.coker.com.au/postal/${P}.tgz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="ssl gnutls"
-#ssl is an alias for openssl. If both ssl and gnutls are enabled, automagic will
-#enable only gnutls.
-DEPEND="ssl? (
-	!gnutls? ( >=dev-libs/openssl-0.9.8g )
-	gnutls? ( >=net-libs/gnutls-2.2.2 )
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/01_${PN}-0.70-gcc43.patch"
-	epatch "${FILESDIR}/02_${PN}-0.72-nossl.patch"
-	epatch "${FILESDIR}/03_${PN}-0.70-c++0x-integrated.patch"
-	epatch "${FILESDIR}/04_${PN}-0.70-warnings.patch"
-	epatch "${FILESDIR}/05_${PN}-0.70-openssl-1.patch"
-	epatch "${FILESDIR}/06_${PN}-0.70-ldflags.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-stripping \
-		$(use_enable ssl openssl) \
-		$(use_enable gnutls)
-}
diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest
index 96a5c9890279..b1a68c675d31 100644
--- a/net-analyzer/prelude-correlator/Manifest
+++ b/net-analyzer/prelude-correlator/Manifest
@@ -8,6 +8,6 @@ DIST prelude-correlator-4.0.0.tar.gz 347973 BLAKE2B 93f383d5d3ca3632f841b8523efa
 DIST prelude-correlator-4.1.1.tar.gz 237036 BLAKE2B f3965b179d101450bd5b64805d0c982cc093de47fbbc4b4e0077f231cffcf152f3ace78cab5e96d7e18d8af0fae7de0fb5c70c17b8888245558ab091bee6438d SHA512 ac6eb554ab8d20325afbe49fcec9e238d84579cb68ee5731e6ec7d1da11c1b745e60117fade76d8747c93f57d4ae91461fd6e82160f659f88a0bb545e4990597
 EBUILD prelude-correlator-3.0.1-r1.ebuild 723 BLAKE2B 7eadb37a0f6316a87acd061ea90011fdf5158b2d1e0dd025eaa8b07426959af0fe55a57dc76bac474eaa1a43fadf4836621a60f6a708682bcb30ce49f2aca2c5 SHA512 23cfb488a3d604f4bc5351de67c2fedfafc9668c04e81ada545525f0b134ec5765b6555329f8b50fd5ffe7f3f41a79801d556a9faa67b17cd0e4c45604a3c9d1
 EBUILD prelude-correlator-3.1.0.ebuild 730 BLAKE2B 66213e6210c1a2aedeafb7aa964968916e7dae6c98e7fb8c99745146487d898f90c5e94bbd1f0ef56cc707d015e47427538341cb980dd9350c81bdd8608cc9ee SHA512 f79772b4efec8ed3cd4f1023dc6e9661b5669233321393e807519bf28f792491488bf44562114b3cbd98a7c5fbd4b1b0131818dc592908e3dcf7fa2c665bb00f
-EBUILD prelude-correlator-4.0.0.ebuild 759 BLAKE2B bcf71507bec9e7978cf9f861fe091c9550394edcf1092d8a5715540de6a27b9ac52c8bdc9d09684b9adcc4ac2a5165e5c340d910e8729eef3388d7b81faca0ae SHA512 1b5ac5a4685186fb94a4d81695cf06f98409c73e1f87b2e9440a81c72e6fbe14b3d6ea4419de539177257e7a0c5a9957d836e01e56e70ea389a455f37cc3fb07
-EBUILD prelude-correlator-4.1.1.ebuild 817 BLAKE2B b739386a10b3b5c3286ddb3b29f62fd95ba83733d4f36a0fd928b71a08112dd1a5641168426e4d00a7a1ab3e083db01feb6e9418bb926c1c916be90099f13cdf SHA512 17713240c2ec9af350c3d804572d8108c2463b69e286d52bbb7db75c50392866bc822b7feb2338744a163abdc575c8e6eb21439855fb239ea33240adb442aae2
+EBUILD prelude-correlator-4.0.0.ebuild 754 BLAKE2B 04dac021defd6cc3da1cc62549ee7e229927bcb09c54124c6c339b9ea887566d2602e9780e8cb829a7888b2c04ecf55440673a1133f8422906a8c08d846c7d74 SHA512 7c1ef815f8206e750f20edd8e27da666cb21418dacb9a0b4dc355f99167d9fdd21c6aeaff50a781398a973c8655bd73a2da4eeb6706079f59e5cfc3345681033
+EBUILD prelude-correlator-4.1.1.ebuild 812 BLAKE2B d31e2cdd7c14be30c85866a7071d1662c7404a5b557e53a2bec69631f9864f5f12ead69c357a324152ed5513d40322370abb697e497bc18e6f5c669f65fb3da4 SHA512 aa941e0d397872477d3ca6d03c4773019dbf7b908cf7cb89ae2986955656b2f49c28ba918ab5ebeb1080f7fb87c398db7988507061986dd81cc73abbb9e1c812
 MISC metadata.xml 824 BLAKE2B c17f62271dea0b8f93fdc83b0ccf67545ea24c5bd3f71d782832bc9c8588bdd98b513ed3f6bc5c307aebb3bc3be76e7e8311e38438234779d5da6f248383fb15 SHA512 3b0db2aace5a45f8994622063ca9fb32a06bcb385b63fb013c191606f07e9bb03c1354549b07ac4c17d74a9f25db44be7ea45fc34d6332079209cc56f5262209
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild
index 9d02e0824128..8be97f154722 100644
--- a/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild
+++ b/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 
 inherit distutils-r1 systemd
 
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild
index 1ff9d4c41e25..86ce56c4df97 100644
--- a/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild
+++ b/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 
 inherit distutils-r1 systemd
 
diff --git a/net-analyzer/prelude-nessus/Manifest b/net-analyzer/prelude-nessus/Manifest
deleted file mode 100644
index 3d1ceda41f17..000000000000
--- a/net-analyzer/prelude-nessus/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST prelude-correlation-20021107.tar.bz2 7613 BLAKE2B d943bf569af306647a527b40e455813bb13da09c1c2b46006a42c76d05facddd7073e995fda59246d1773f36598acda272cd6c11fe0ee05ac1e0c5f8282c46f5 SHA512 2dcc1d038d9385bef8082476fccce768a47f04eac7c687d684739cd837b9e02f4514bb6296ad98ecc17d0208ec7c39d7401de5abd212ef403b349a76faa0ee79
-EBUILD prelude-nessus-20021107.ebuild 504 BLAKE2B 362baade01ad3d974952598c81473f7c97d712a50f92870d4012e2a2c3fb15801ac03d6488d0046ce89083f01bb03a45e5505d99a361dc85e0c039d3863d5e57 SHA512 17b108e76ad45511c7e739428331c9161fa4ea79b73086ded386001871ab499858b15a6ee629b80413f9e34b8ffb44896e2e4dc5bd8ef1bb572f737777b8a08a
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/prelude-nessus/metadata.xml b/net-analyzer/prelude-nessus/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-analyzer/prelude-nessus/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-analyzer/prelude-nessus/prelude-nessus-20021107.ebuild b/net-analyzer/prelude-nessus/prelude-nessus-20021107.ebuild
deleted file mode 100644
index d16e50a2ba17..000000000000
--- a/net-analyzer/prelude-nessus/prelude-nessus-20021107.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Nessus Correlation support for Prelude-IDS"
-HOMEPAGE="http://www.rstack.org/oudot/prelude/correlation/"
-
-MY_P="${P/nessus/correlation}"
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	dobin *.pl
-	dodoc CORRELATION_README EXAMPLES NEWS vuln.conf_example
-}
diff --git a/net-analyzer/pypacker/Manifest b/net-analyzer/pypacker/Manifest
index 3492fee01b0c..e273b28e200a 100644
--- a/net-analyzer/pypacker/Manifest
+++ b/net-analyzer/pypacker/Manifest
@@ -1,5 +1,5 @@
 DIST pypacker-2.9.tar.gz 276080 BLAKE2B 3bab4b4c7879fea10accbd3fb2bcb4a8e27096a29240f6b8e4e06c3486ee0cb2b8fa1e83674dee759fafc85c2e182cb75e836c00dfe28c83c0bb2cecaed758cd SHA512 b7ca61948a55a37661fa402ebc5a9c2be456e8df14d1ee091a50ccd1362c7a7fa9224e1ae2b8ee8057f302ee9e0c61c06d07b627dde92947f8d22158ef3623b8
 DIST pypacker-4.6.tar.gz 592362 BLAKE2B 41fc63f1fc40ab1cfc007db9dfc6d18cedb51cc8525dc2b467bc03babe03c49f9f0771b8146aacf80f74c511619da85e1f7d56667bcda350710e4c0bafb89351 SHA512 c55205b35f653903149517aad0e2d055745edd6c1a28b1b49aeaa435ca327693b20ed6f851011fa80df1fcc5281ac8b92fbffa3b1381cb3d4507ef7d45d49545
-EBUILD pypacker-2.9.ebuild 701 BLAKE2B 16a0ffa73034e84801260a4a8cbed76ea81331d8aeb8e8a3744b77bfbf74ebeea8e0bfb881e97371eb869321fb87d115ecbfea343786210ef2ba4c6dfc634d47 SHA512 6dcbe72212bc1f9308b07476a18b86097223ccd0931769c8004568f4063d3f857529c224f7d49471a093cb20f65a0b9a022bdbdc5f9664afeb9ccacb5350d01a
-EBUILD pypacker-4.6.ebuild 698 BLAKE2B 67701c48430b6cdbe24d4a7df926b9c9a1d80133ad51ea34167bce2b232eb8767c92c5781f4a09d3c3262f942eeebd7d325edb17d6c90a38c92f6439551b4d24 SHA512 f441b89db0edef1280fc07af26b785ec564c34958d2b21d307b8677387ee977d4710567833834723993f514dbf0acd9c8ef20941ee4f07a7c8f33a73c56260b3
+EBUILD pypacker-2.9.ebuild 696 BLAKE2B 3ec2822ab28c7ab75e6a2cd049ad397a4ef86c54f60d06f87c8d544e911a0d513651211dc4020f267e864db782188f3c4e31d749e58a1656427ad68b3b1ff67d SHA512 7fc02ab96434a780d5e6f51e8ccd6f5c2fbbe8227e4f41ba93f85f0894d805f028a6cc3e8321a9455079335698f558a796944c6a7be37ceb40413d4b6098350b
+EBUILD pypacker-4.6.ebuild 696 BLAKE2B 849590e13844edc4d6d08d4995e3284f0aa1e7a90ca969802f6525046197984d6e6c5d4a3f07ac4def5be19812395924a68c102d1bbc8a690405af1530b1526e SHA512 7f80a767611317ded7eb0e94f3b62add6432acdac9c95ac92d2bb2155b34ef1f991a094cdc9db731b7eb8a171bc5af6ac2afd27b882579922f17240e082352d4
 MISC metadata.xml 471 BLAKE2B 16f24ca5a8c373e40115c441da2b6efabca5ebf7f6cd5d4e55c64320172d92470e34c484c7c9d63dce8f4fcf1aff0a0adc0d0743807cd342756aabfe790b4356 SHA512 8eda90dced7132f754ceccf39fbd1b7fdce0ff01490987eb6c6258544dcac27ba03313cb401396e0014c0fff42133da53698681ad5ac48d0f29bead5786abe2f
diff --git a/net-analyzer/pypacker/pypacker-2.9.ebuild b/net-analyzer/pypacker/pypacker-2.9.ebuild
index 24fb0f784415..dabd1067842f 100644
--- a/net-analyzer/pypacker/pypacker-2.9.ebuild
+++ b/net-analyzer/pypacker/pypacker-2.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/net-analyzer/pypacker/pypacker-4.6.ebuild b/net-analyzer/pypacker/pypacker-4.6.ebuild
index 03473c1ed8f2..69e44bec5cc8 100644
--- a/net-analyzer/pypacker/pypacker-4.6.ebuild
+++ b/net-analyzer/pypacker/pypacker-4.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/net-analyzer/ripe-atlas-tools/Manifest b/net-analyzer/ripe-atlas-tools/Manifest
index c3b835a5b38c..6fc3f965802b 100644
--- a/net-analyzer/ripe-atlas-tools/Manifest
+++ b/net-analyzer/ripe-atlas-tools/Manifest
@@ -1,3 +1,3 @@
 DIST ripe.atlas.tools-1.2.3.tar.gz 86364 BLAKE2B de2aa0a57e135d463d1edb7e3277d21052353009d1dbcc2ead03d659c9736e61f36e95d102b5c3792448a1ea304e340f97856647f3c565fec9fcbbf0c414596a SHA512 f9e3b94ac9561faf0f6738099a0511b5aedb3b0d3230997a8033b8a1a804b885169891de8f408933ad90e3d4543375741657d9989fef09548d9cc8f0d9920e66
-EBUILD ripe-atlas-tools-1.2.3-r1.ebuild 1303 BLAKE2B 4e4cead8479d1bafca52840400e0ef23e36e0ba205323f71c5fdb774c9e17a6c5bc498e486e57b45cd359f7c854afdef2183bbcf18ed29fd4471cc3a60a2dcdd SHA512 0fbb6e077ae0855fa070620a34b0c63f6a6a749b6e9cd871ecbd94a0ec4bd4d8ae3f6e28ccd4365b67c584c720fa33e1c9dfbdcdebaada5c1cbe74ec232e8c14
+EBUILD ripe-atlas-tools-1.2.3-r1.ebuild 1298 BLAKE2B bba6c61e4b254bc7fabde642811c27b4084b7c25af89086d20113561b1a74a6e03f57b3cb81b6f82394aed51d523ec1da7ccab654cbe6c0a03cbb45981b4b6fd SHA512 4ed7eecad1da46e3696c8dc20e21d477d53f3bc2aaab8b1f4e3bfde90def07736c7e43a22d62937b5cbbc236e6cd317a5343ef205fe272971793e4f2c033724a
 MISC metadata.xml 245 BLAKE2B b9eb390672e4258c0f413eba0dbed731d0f8b2b65275669505e6c5ccdb034944856c212e564f307bc5567203f4897164654f047a2355b9d6f493e0633dce8192 SHA512 d4e3e22b2dde06b42ba712b048c38c8809da125ad6eacb06823f2013d5c9c9b82a4a0b5ffc104f0b786ef048700980c72bed9cabb90a1003db929d2ead0db9d5
diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild
index 896c96e4e9df..608ea0ded029 100644
--- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild
+++ b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 06ecf2dc39c9..aaf1bd899aaa 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -12,7 +12,7 @@ AUX rrdtool-1.7.1-rrdcached.socket.patch 733 BLAKE2B a9ca7691e1589061e65ed4acd3d
 DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd
 DIST rrdtool-1.7.0.tar.gz 2849994 BLAKE2B f7a91fa661728850af55356a69b61ea1d4343c79579823e025e0a0757d1dab0d2cda6387197ece20e07f33a657743350cadfaf6504500f13be472d18e8826a3f SHA512 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f
 DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3066bb32e981b3254e41c53e29529698da5ef73f8365391180c76d15808d1d727a0834b8025893b01c3b9af8f46 SHA512 ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14
-EBUILD rrdtool-1.6.0-r1.ebuild 4242 BLAKE2B d2ea90e0403a983d4ac042d1c4c604ddbad700cfea668ea67c005b32d3a47c5ec32d0b91fb70cb91cd9b6dad6dc666779b481220a41b8156cf47d8ccfe6c4467 SHA512 9375bfbfd4b9430c03247e4631345fa30330af54ed14429320342f943faec8452be8bcc7acb02d588bd1cf9ac7d4b582d5feb75aabc6ec32a19bc03087a71e41
-EBUILD rrdtool-1.7.0.ebuild 4308 BLAKE2B 3ff52745ab04139e19136e930e8eb6ba0d2796693fb35bd1aa1ac88dc2181d395cc9c987590933310bf643166ad523786e2f20a9d1dbc3a9fe5393f0fde044c0 SHA512 a3ed4704b13c7081b7f00ab20ed8d5961325fee67bdfba281ce795f53c6cf9e6a648fabff472b8d778c5ee0196ca13841cfd5b29ef971afb66fc57c80876db81
-EBUILD rrdtool-1.7.1.ebuild 4296 BLAKE2B e10b677e38f2f492361577a65c3299fe9c178bdd3bd940db37f990f3116e02fb84e2b498f2572ad4a1c5e6f236d4d1810ce329202121117ac48bbe0b4b533982 SHA512 84e6de423a2db656d8b772c96f6e5711f26b6b3763fa0763a25412b531b846db37ea0b5482130b16e468fe22d50aa03cfbe32cbd8d8b425c02ca8f16bd27e75c
+EBUILD rrdtool-1.6.0-r1.ebuild 4248 BLAKE2B 2e072f4503032b3f103ffb8ba21e60d9376608e763142b450b66a8dc6418cb130623f8d3eb8eaab68d884c9d80c561d318c9b2bae6fa17f0e9621815bdc710c7 SHA512 7ebb70f03615b612174bc9a66262c5eb2e658b8d7b6ddfce41bcff7e0ed589f31af4fd101dfedbd2b7578bdd88d060adba5f78028894a2d9a428c4b04a040e8e
+EBUILD rrdtool-1.7.0.ebuild 4301 BLAKE2B e5f7164f2dd661e6b56692812a7d09a42f2edf5402d8729e6114ff35ef66c4744e461c699376a10cfeadac2883f2c68a97de712eeb1e2b555732bddaeac2b1dc SHA512 2526dbb47c58bc067dd85f3923be6e22db815a2d6b71322452744eee5f440aace60178e6daddfda04635f2175277f4d28cffa3ab6d63f1660ae7c7b13b199e00
+EBUILD rrdtool-1.7.1.ebuild 4292 BLAKE2B cf7635462e588fedd509fd11fd22477da670b1d5f0e10cf6dad9655eb9e0bd06950d55cbaf0dd3ec65fbc1782e31836ee62ca64203ff8941f5d60ffb8e06054d SHA512 ea773f709ed7cbad26aaf8b163cf89158c27dcb1e83ecb3425fcd750e76c19485bc9cba598aff78e0831f1a77a8894feaa411a90e9ccc09a4dede5bb0b08263b
 MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
diff --git a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
index 6ca31577b340..2967a716b0c0 100644
--- a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="${HOMEPAGE}pub/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild
index 824cc09eb77a..9f3cdf8e4bdf 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 DISTUTILS_OPTIONAL=true
 DISTUTILS_SINGLE_IMPL=true
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit autotools perl-module distutils-r1 flag-o-matic multilib
 
 MY_P=${P/_/-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
index fea91bb10cfa..456d9c726c42 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 DISTUTILS_OPTIONAL=true
 DISTUTILS_SINGLE_IMPL=true
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit autotools perl-module distutils-r1 flag-o-matic multilib
 
 MY_P=${P/_/-}
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index b6915fc9b66f..0b8ac0d9f70c 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,6 +1,6 @@
 DIST scapy-2.3.2.tar.gz 1166056 BLAKE2B bce5f37bd833dc457089cdfebd2dc019c4f7bed636935b4a6b51a2cf7355f5761fadaa304e93c276daa2200c48ab0e1c0a08bd278e30dfea1faa01321a0b957e SHA512 6b15e102708d1bd0ca0c910e2d82416cd172634409f93c506542a7dc6b69ddc9c9afef6ec07929f70cc0f8f4c455cdc84d9b35bc2c5b72f79dd7e6785306dc7a
 DIST scapy-2.4.0.tar.gz 3182131 BLAKE2B af591b103c90736a5e62801f4c0ebd495e2e71c79ee81f04fdd194739b460c9940b8fcf0c6e279701095979144eff25ca4734926c0251721b37dc63fe8dd9e89 SHA512 0fe80150cd83db7735c9d0b70ec832a4e68eb5160ad8559e9b1bd79c52a9950ef7c9555ea2a1ee1dc8df1f055a885c52552c29e304faf40250ce9c502a5f870a
 EBUILD scapy-2.3.2-r1.ebuild 859 BLAKE2B 0ca5a6e0167ba5979444c5e994f7b7cc70ff6956862f757a2303698c71930f1f08815a74e4500a7fe9f5667d9723765461b02b2264c9332e29d9c38820cc8386 SHA512 7b731147b9b3024e00dcaf4ce0c43d23fafcff737389be66d7ad4a9b3f5f4a15ef00d2e255eaf0487377e2c6a4b88017c4fb8265dcc4f9a817ef0785da494661
-EBUILD scapy-2.4.0.ebuild 1037 BLAKE2B f3ef7f4a91c9ac52dc34df1b07512cce0193255c0a4c4ef3f7c2888e4108d79977371e408206ad4002eec60f459ff4b473999307bbd98efff1462289325dd668 SHA512 771dd160785c597009bc490cfabbd076f43833bf6f2a350496fa976024caf2b7f2f8457869062e0a35784a4d88aedffebfbd8cbea978198c4d0f3085b81ebd0a
-EBUILD scapy-9999.ebuild 999 BLAKE2B 2c61522bc128d74c8acd148c942eeb0dbbd85482a58c5544dccf7af13aa9d85d0900334e254e38fa373fec380956a2e85d5ce76d241f8b12fc99dce48f706c45 SHA512 3fad60f8813012d4152a7648cd631a9f06f7068d223e30a306c9b32404bb2665e5b0af5f3baf91f0a1342d78173978821137218a8538e5dcf6aa9fd55959a7a9
+EBUILD scapy-2.4.0.ebuild 1032 BLAKE2B fc0f639924d5e7fe3664e5935a569653b3f30964a9ec20900ddf00869c51ecb2ab9260dcf0d1f7615a3fcbf16ae7248f07c3d7be442c245e407ac60ecab6b116 SHA512 60b0c20b04e0463c38e10c1e74fc675e316b0976e85fd0a76abc630cbeecb08fb2159212c493e82077c5f1abeeec09b7cbecc436eb4f06648307602ec24a39d8
+EBUILD scapy-9999.ebuild 994 BLAKE2B 89b25b3c24f18409eefaf5b29ebe052a2c2dd8436ca8d467d7709f61c570e8006d5277bb7d1a0311334f30146e61a06f5a1dd4a9f358c70a27940fb951af2cc4 SHA512 b848b8bf4752e5eea1bcfc491f328d8a58795fa0719f7861e6e647bf705af36c5ff82cdbcfa5f31ff80875f1d9f0aa35366b5f02ac871bb61bb470cabde101b3
 MISC metadata.xml 674 BLAKE2B 9aeb70531e3395462033100fc9b709533c158bf7939aa46930558b48e9f750030bc26f750b574f3e31ee5779c65a7afb48ed74f8db9d738849e9ab97d621f351 SHA512 54bbc8a152f8433e3da143261bc530df95e8a5808791582e2d2115476001f63381219a3738bb80c1833f56d331ee54908cf72f3c72cc27e05100f6de8edc6caf
diff --git a/net-analyzer/scapy/scapy-2.4.0.ebuild b/net-analyzer/scapy/scapy-2.4.0.ebuild
index 87c9eb983d6f..f5c9435fdff2 100644
--- a/net-analyzer/scapy/scapy-2.4.0.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+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"
diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild
index 37900e5421fc..3005f30dde5d 100644
--- a/net-analyzer/scapy/scapy-9999.ebuild
+++ b/net-analyzer/scapy/scapy-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 inherit distutils-r1 git-r3 readme.gentoo-r1
 
 DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest
index 38a3a61977ef..81e636f09c5f 100644
--- a/net-analyzer/speedtest-cli/Manifest
+++ b/net-analyzer/speedtest-cli/Manifest
@@ -1,3 +1,3 @@
 DIST speedtest-cli-2.0.2.tar.gz 23915 BLAKE2B 95b88e1666d7bc50c525ae7eb587e1b53babe02549e3b6b81f59451166fdbfb5561daa29e1de308d3ca7340989bcb6e7b43edd84bf371716284c034cdeb21fd8 SHA512 12fa9a5dd8bcb7a7ee68ecc9075dc5c18f089cecf003e7e643dbb6b1c3663f17c2aba48d1e84aa27bff6b66e207d39ecaf874aebad1d71cac772c58b62191723
-EBUILD speedtest-cli-2.0.2.ebuild 663 BLAKE2B 41d2a7e1359e7131fbfd1a0d15eb4f7b9b8591e4353537f2369c410fa53810e79d20ee82faab0bd5fe4e4c2f415e9e3879083c8ca6ffa5301aabbadc3f1de943 SHA512 ab8d9a9093f4fd53da16566af22b853af77e032e42735eada29d63ce09c5b3c23974628e038114e330a54a85f63c921718a6c7e62fc3ee74ee14b3123f65803b
+EBUILD speedtest-cli-2.0.2.ebuild 659 BLAKE2B b1158cc13f1edcf3430f0ba7973a5d5bb617aa836cf9ccf08c7b15b57585642468a41237de0cb9e7254f2fc5a8f997529c1a323c5d4b10173d183d585f3702d0 SHA512 3830ba3d46b8391cd2f0f63a11f70acda45af07cc8025ca4ac1aba574312634f754558cb54bf40c2d051c20a06221f193610f45bbfd76836e7ea24e936eb9324
 MISC metadata.xml 460 BLAKE2B 488a43d888cbc4baa7d74bcf4b8852054037be8227f380d43f187baba239e253c2a0aa3ce1d8c2c672a4947be9e4268a2d1fa8adbb3db38fee9e2334851bc7eb SHA512 6e911380a7bc75a4f5726f4bb8f864a2660e93cb07be2cdf55b428fe8615e9e31c7a78f978064ed73fdc1133d6611b3bc3a39966439bb249e4f8a69dbae88f1c
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild
index 5ac123e2be42..3e6301cf17bf 100644
--- a/net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild
+++ b/net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index 385648c185a6..42e747ae0864 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -5,6 +5,6 @@ DIST sslscan-1.11.12-rbsec.tar.gz 56346 BLAKE2B 0079a4be50c037c02bc716341315e0a2
 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 1160 BLAKE2B 78393762f24f14b4ab4b35b1e42652cd99702b6e6deead3a2b494322f436b3b4b4435f89c5c686ef94666cc7757c90c946b8aefc791b6bd83ad0f3626f7cf033 SHA512 4cf812a3cea514ea1cf56e599821b008cd7e1144edf33279c539c203b9d4eedc99ebf9e9268b6808774d338be2551809be2f75b284a7c0f7d8e4518a1f6c6553
+EBUILD sslscan-1.11.12.ebuild 1159 BLAKE2B e833000726c35c274f1a5e085dce6480a5bb74128eceb14428287f9001f84faacd5e87b8d563dfe02cb7e291538ad091421a6b24c4e0e9692bf1ac7e4e9eac40 SHA512 1c3b5dd0535efab91d77470b22c734b090c2ec10db39e32517fcad1e0294ad32c024c5e4add139c4efe0c84204210ce8f011624b3e896f98aec40b6d0c1f7c3d
 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.12.ebuild b/net-analyzer/sslscan/sslscan-1.11.12.ebuild
index dc915652a7f7..8346fab8248a 100644
--- a/net-analyzer/sslscan/sslscan-1.11.12.ebuild
+++ b/net-analyzer/sslscan/sslscan-1.11.12.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
@@ -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 )"
diff --git a/net-analyzer/tcping/Manifest b/net-analyzer/tcping/Manifest
index e96d7a374183..06d60e400ef0 100644
--- a/net-analyzer/tcping/Manifest
+++ b/net-analyzer/tcping/Manifest
@@ -1,4 +1,3 @@
 DIST tcping-1.3.5.tar.gz 5889 BLAKE2B 8636d1fa4ff65eb14c8fe3c8d6e5b31740b84f0ccc1517b8b35ac613ace3be4b7584b6b7ccd5cf7737c7b7fea678d8d85ac54c00186ce79920dd1756c8c66fd3 SHA512 729360cd1f820ec7c68e2c64365caf60daace8c486c64fe96a88d1037b9818dd27603408962842b74d0db1ee2306ef68522f3f3369c1390e4554929297de760d
 EBUILD tcping-1.3.5-r1.ebuild 629 BLAKE2B 05cd6050a41c66d83680bef698b122c743c40625f82d9b52c5c1c3ccee1ad56f86ce370fe6e5ed304234e6398bf48d7b5f264b5134eb4fac4ee07605cc7e67d4 SHA512 2114c7fbafe9714a4e37050b04959af00cb78e5cdb26ce8dcc5474d35ddda4ba9c3c442f05e0b304857e6a8231d6b8a565db58e1f7c19c3206ea8780f2a948d5
-EBUILD tcping-1.3.5.ebuild 590 BLAKE2B a49a9943751d54cdbbced91555399fce50d7d47b64413e8675cd4e9a9803756f28c434985651ae335b84cb42029f2b4ed3bfc075e066c1df4f56cc90becad807 SHA512 27c45d10a1c1d99f7851fe81e7c9b86d138db9cae29feb4e8303e31fcc9d94a5e497a931471837c48f8c3240c5bee7d28852837a47ee7a9d9974c33409531589
 MISC metadata.xml 214 BLAKE2B 4dab37301a1db60dcb52e9f891190c6a47df7685658ea2accf8e152430b2ec3162a78bc9ad4cf7836954b10be3897228d998c0436a1179df673c25a87b166a86 SHA512 81de8d9677e88447cac7cfa2b6155040211f235c3186591a08a145b9e711f1e7cfbb133762fc9f54db8ba975e5cdba1f7654775a523150556fea26af6ba116f9
diff --git a/net-analyzer/tcping/tcping-1.3.5.ebuild b/net-analyzer/tcping/tcping-1.3.5.ebuild
deleted file mode 100644
index 3c883e7c10db..000000000000
--- a/net-analyzer/tcping/tcping-1.3.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="Ping implementation that uses the TCP protocol"
-HOMEPAGE="http://www.linuxco.de/tcping/tcping.html"
-SRC_URI="http://www.linuxco.de/tcping/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	sed -e '/^CC=/s:=:?=:' \
-		-e '/^CCFLAGS/s:=:+=:' \
-		-e 's/$(CCFLAGS)/$(CCFLAGS) $(LDFLAGS)/' \
-		-i Makefile || die
-	tc-export CC
-	export CCFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin tcping
-	dodoc README
-}
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index af359979f221..31bc279f6234 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1,7 +1,5 @@
 AUX tcpreplay-4.3.0-enable-pcap_findalldevs.patch 333 BLAKE2B 1beb39a7263bf8491998760e4a62ac8908300e28c43500812d37d2512f9d63fcd175b93c1b384e03e9570e741dd95dea09ead017a014a4b62b3449833fe9b248 SHA512 3d035736c0656f6ace85b45af595866e06c8464641023e9d1606c288e598cde18eb96b1be8300514f6f31bc83756ae76b436402666036456571201ca38fe5026
-DIST tcpreplay-4.3.1.tar.xz 746804 BLAKE2B c1feb541b8243b00b2fa6ee9742ced4ef47c58a58d3a95be88faa0fa4301da0cb962a620df724cd4526ea31e74a0e7d7161eb44afea37467a19976a20855e0e0 SHA512 2dbad1a88ed19db897cc1222883c02eb7f0808f64cafb3c3ef8f21c0cfcb14d3ebb92a8a01ea203ca128ed675d2e7dcdb30d0bce30eb79e729d9d45d309f9220
 DIST tcpreplay-4.3.2.tar.xz 747268 BLAKE2B 27cad902785975f9c7fbfb8abef24ae95fbc8812e0a4fabd3b1ecf74bb9f0a99cdb0c37db72c433296d3cebba89d0bbc90e944195e585bf2d1c2d93ef234c4f6 SHA512 641dd636d9c5c30637d0103f8b21da3ce234f9e3ed7ab4d2b20d004fc4a14301672dcd678b2d5e0eb90d55a97bcb0c4c67f31c790a5aa3c509a92d1142c5b7b9
-EBUILD tcpreplay-4.3.1.ebuild 1921 BLAKE2B 901852df7b7c0ef75796e2313c1940a595f3c40fc9a62cf27caeffe45708e1e11a9d16c5e9bd01e3880b1b9391b728164347e21caf2168ad1c4414d825cfa42b SHA512 3ad59027e0d85ee1230cc79e3b05024b979e9fc49bae10aad3a83e21cb5684847105264df4c354959561b593a39937f851f8dc87176b53fcef3694c4d3997da4
-EBUILD tcpreplay-4.3.2.ebuild 1923 BLAKE2B 9c2056a5d46252ea15586f90e19dbe9d7a3ef8faf98163029b1531fc57160f6b3201dc68a144334b5a001666c499059064cf76b4c362a145832d7a0f846c5a31 SHA512 61d5805bcc3041f1b45d70324a49179d0ed916768abec93ed0c099453a51e2fa48ff3f01013831c0c929489901e17ab8c0e6ff100bc79677078f4ba7efbe2680
+EBUILD tcpreplay-4.3.2.ebuild 1921 BLAKE2B 901852df7b7c0ef75796e2313c1940a595f3c40fc9a62cf27caeffe45708e1e11a9d16c5e9bd01e3880b1b9391b728164347e21caf2168ad1c4414d825cfa42b SHA512 3ad59027e0d85ee1230cc79e3b05024b979e9fc49bae10aad3a83e21cb5684847105264df4c354959561b593a39937f851f8dc87176b53fcef3694c4d3997da4
 EBUILD tcpreplay-999999.ebuild 1860 BLAKE2B 7e5894985eb08e8b82aa434bb30c096679c50995203be58c2490374e9163502b50585fe2afc530e9de918441181d1deef76ea999030bc40d4a077ca6b6da83e1 SHA512 36de21822cd88ab40c1c7b70c762be1284391bbb42ad0b56b9d10ddfe3de4b5f9e9195c41d900dc57fe84064003cadb389b3fefc13283e871e2adc14dfb02ebd
 MISC metadata.xml 1116 BLAKE2B 23c8b7009a77b68831affc57432a87a31fde213d7e7ee88f68ced4a4e21a56c55f97497e610fc486a42c699759ef1edf1904fa9b0fe976df4fc9930535f97037 SHA512 58cb13a648ba7b9f9fd8c7a7cdfd37d56f0d7b957824a55d63001a8708f93d529b29e52df051bdce0c87eb672d24c7b2c35ee8a1e94ba062e2a1e12dd0d0ee1b
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.1.ebuild
deleted file mode 100644
index 3d0c5b4f1d7a..000000000000
--- a/net-analyzer/tcpreplay/tcpreplay-4.3.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic
-
-DESCRIPTION="utilities for editing and replaying previously captured network traffic"
-HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay"
-LICENSE="BSD GPL-3"
-SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV/_/-}/${P/_/-}.tar.xz -> ${P}.tar.xz"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc x86"
-IUSE="debug pcapnav +tcpdump"
-
-DEPEND="
-	>=sys-devel/autogen-5.18.4[libopts]
-	dev-libs/libdnet
-	>=net-libs/libpcap-0.9
-	tcpdump? ( net-analyzer/tcpdump )
-	pcapnav? ( net-libs/libpcapnav )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=(
-	docs/{CHANGELOG,CREDIT,HACKING,TODO}
-)
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch
-)
-
-S=${WORKDIR}/${P/_/-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \
-		src/common/sendpacket.c || die
-	sed -i \
-		-e 's|@\([A-Z_]*\)@|$(\1)|g' \
-		-e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \
-		-e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \
-		src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# By default it uses static linking. Avoid that, bug 252940
-	econf \
-		$(use_enable debug) \
-		$(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \
-		$(use_with tcpdump tcpdump /usr/sbin/tcpdump) \
-		--enable-dynamic-link \
-		--enable-local-libopts \
-		--enable-shared \
-		--with-libdnet \
-		--with-testnic2=lo \
-		--with-testnic=lo
-}
-
-src_test() {
-	if [[ ! ${EUID} -eq 0 ]]; then
-		ewarn "Some tests were disabled due to FEATURES=userpriv"
-		ewarn "To run all tests issue the following command as root:"
-		ewarn " # make -C ${S}/test"
-		emake -j1 -C test tcpprep || die "self test failed - see ${S}/test/test.log"
-	else
-		emake -j1 test || {
-			ewarn "Note that some tests require eth0 iface to be up." ;
-			die "self test failed - see ${S}/test/test.log" ; }
-	fi
-}
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild
index a73ca26a8cc6..3d0c5b4f1d7a 100644
--- a/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild
@@ -10,7 +10,7 @@ LICENSE="BSD GPL-3"
 SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV/_/-}/${P/_/-}.tar.xz -> ${P}.tar.xz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~sparc x86"
 IUSE="debug pcapnav +tcpdump"
 
 DEPEND="
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index 1d6d53f49984..e77e6461e01e 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,7 +1,3 @@
-DIST testssl-2.9.5_p5.tar.gz 8955523 BLAKE2B dcafb0931ddfb9d653acf79f72d2e30b2acc4a80246ecb3f26eaa35d4a69d5af65123005de34d09c563978593450895bf451b866182fd3ea38bdb121fb8e9385 SHA512 8a26989e1b8f45a2ac25efab500c89eeec2dbdbb9c0af715a61433ce0737ed69221df09a9554b6ae4415081a66ef4f6afd44c92405afefe4a810cb4375988700
 DIST testssl-2.9.5_p7.tar.gz 8955971 BLAKE2B 6ca3bc60445c9448c3dc24ee7262e57bc03a2c686bbeebcc1cc850edfa652538c1ba5365189c27e78f0cb977e68d2ea1a9f940d47cd0a53402d1fa9a31a33483 SHA512 35ab900b84db8a0a210cb9ce8bb794ff7e8cddd5c85a151083bc76eba834dce37597b29b6235fcf2ce37b004dd295b1756e01374a4943e1e2ed0d2a8cf8761f6
-EBUILD testssl-2.9.5_p5-r1.ebuild 1291 BLAKE2B dde1e0edccf415dc4f717515e6fb8f333e935215e6452c3457fd203153e523bdf4546a03aef68defee5234359d75d6ab8f74ad91a2504a2b4695e80b601fdd5d SHA512 6ec8005eb3a27a079e800d21b5b03382435e32e8fd9b1def669b464400cdcb182598b3a9f6ece631defc0ae2549fdebeed4f6da4c182929d227e6d63139a60ba
-EBUILD testssl-2.9.5_p5-r2.ebuild 1529 BLAKE2B 989592309812555613fd5d6ecff8173fe1c1bbe384aad4d406f8a827911037e459c1627b08ccf5f0f0f5f20c95f68f9eee0f358c77476d3f985c481d9b6cd6b3 SHA512 e1e6277065413fa8f80a734b008a60ace4ce7275981ff3a2f1d15ca960d69f124545496c39d86228b7f6cf605bf8d56edb48b6446dd54839417c9b75431deb04
-EBUILD testssl-2.9.5_p5.ebuild 1477 BLAKE2B a26cf73f44a63fe823838d748d943cf8e910fa36efc86b13a900af29a17c08061012fa66c07810473c5e9fa43ab6e49290903ebe8beaa2b2407529d7b4350436 SHA512 e217b3f116f62202485715a917f18ea32d902bcd0514dfaa9f5ddc6d3e435df76885daac253243dad99a812f31f51239c8dff6c886b1c376d3f6138f52639780
-EBUILD testssl-2.9.5_p7.ebuild 1529 BLAKE2B a268be0fe9f09ec0e20948626862f5395ef03f69e5f57d08c1195e565daaf43e44bf8ab479b7b659e4df6260a5900fcbfa4e9183be2531eb5903d2e7dfd7cb38 SHA512 a67cb6bd539b49330c3a1be66fcdd61cba7645461829054e61420fadfdf90c506340a387ff4a67914fc9b6b6882865a49a14ab4b1c8f6a96c0efec8cbed97a33
+EBUILD testssl-2.9.5_p7.ebuild 1527 BLAKE2B 8dddf30b779034c519b25dc3c7b1951517ad2ed2623a3ba6b85d259521509032457206034735d80bc1f8475f80786594f9de11b3623c090bfcc1903afe497c1b SHA512 ae42c3b0397f7bbcb19dc1547c7d27cea64f4613482ed2b06df504533edc8b41d84ab2be9d486694d711d9c7019689cd28e1a7efa630aabb47cf3345bf0d752f
 MISC metadata.xml 427 BLAKE2B 5504150e6ed2e079db47b71afd8826e0543162d259ffb690caab572f6f87cf358ec4216b7859c274047f4d880aed40ab6858633856e12f9d9d05683198b75fba SHA512 83dacfa2293a8f14bce97a01f732376e76f84c4eb4fffbed1049b08210850cc5b54381d83df15bec2ecc1c1a592148d538ac37053b36fa1022542e023a97d9ab
diff --git a/net-analyzer/testssl/testssl-2.9.5_p5-r1.ebuild b/net-analyzer/testssl/testssl-2.9.5_p5-r1.ebuild
deleted file mode 100644
index 41bdd598f1b3..000000000000
--- a/net-analyzer/testssl/testssl-2.9.5_p5-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN}.sh"
-MY_PV="${PV/_p/-}"
-
-DESCRIPTION="Tool to check TLS/SSL cipher support"
-HOMEPAGE="https://testssl.sh/"
-SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 bundled-openssl? ( openssl )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bundled-openssl"
-
-RDEPEND="
-	app-shells/bash[net]
-	net-dns/bind-tools
-	sys-apps/util-linux
-	sys-libs/ncurses:0
-	sys-process/procps
-	!bundled-openssl? ( dev-libs/openssl:0 )
-"
-
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-QA_PREBUILT="opt/${PN}/*"
-
-pkg_setup() {
-	use amd64 && BUNDLED_OPENSSL="openssl.Linux.x86_64"
-}
-
-src_prepare() {
-	default
-	sed -i ${PN}.sh \
-		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
-		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
-
-	if use bundled-openssl; then
-		sed -i ${PN}.sh \
-			-e "/find_openssl_binary()/a OPENSSL=\"/opt/${PN}/${BUNDLED_OPENSSL}\"" || die
-	fi
-}
-
-src_install() {
-	dodoc CHANGELOG.stable-releases.txt CREDITS.md Readme.md
-	dodoc openssl-rfc.mappping.html
-
-	dobin ${PN}.sh
-
-	insinto /etc/${PN}
-	doins etc/*
-
-	if use bundled-openssl; then
-		exeinto /opt/${PN}
-		use amd64 && doexe bin/${BUNDLED_OPENSSL}
-	fi
-}
diff --git a/net-analyzer/testssl/testssl-2.9.5_p5-r2.ebuild b/net-analyzer/testssl/testssl-2.9.5_p5-r2.ebuild
deleted file mode 100644
index 2cabe7984eb1..000000000000
--- a/net-analyzer/testssl/testssl-2.9.5_p5-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN}.sh"
-MY_PV="${PV/_p/-}"
-
-DESCRIPTION="Tool to check TLS/SSL cipher support"
-HOMEPAGE="https://testssl.sh/"
-SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 bundled-openssl? ( openssl )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bundled-openssl kerberos"
-
-RDEPEND="
-	app-shells/bash[net]
-	net-dns/bind-tools
-	sys-apps/util-linux
-	sys-libs/ncurses:0
-	sys-process/procps
-	bundled-openssl? (
-		kerberos? (
-			sys-libs/zlib
-			virtual/krb5
-		)
-	)
-	!bundled-openssl? ( dev-libs/openssl:0 )
-"
-
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-QA_PREBUILT="opt/${PN}/*"
-
-pkg_setup() {
-	if use amd64; then
-		if use kerberos; then
-			BUNDLED_OPENSSL="openssl.Linux.x86_64.krb5"
-		else
-			BUNDLED_OPENSSL="openssl.Linux.x86_64"
-		fi
-	elif use x86; then
-		BUNDLED_OPENSSL="openssl.Linux.i686"
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i ${PN}.sh \
-		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
-		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
-
-	if use bundled-openssl; then
-		sed -i ${PN}.sh \
-			-e "/find_openssl_binary()/a OPENSSL=\"/opt/${PN}/${BUNDLED_OPENSSL}\"" || die
-	fi
-}
-
-src_install() {
-	dodoc CHANGELOG.stable-releases.txt CREDITS.md Readme.md
-	dodoc openssl-rfc.mappping.html
-
-	dobin ${PN}.sh
-
-	insinto /etc/${PN}
-	doins etc/*
-
-	if use bundled-openssl; then
-		exeinto /opt/${PN}
-		use amd64 && doexe bin/${BUNDLED_OPENSSL}
-	fi
-}
diff --git a/net-analyzer/testssl/testssl-2.9.5_p5.ebuild b/net-analyzer/testssl/testssl-2.9.5_p5.ebuild
deleted file mode 100644
index 74b3c2197714..000000000000
--- a/net-analyzer/testssl/testssl-2.9.5_p5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN}.sh"
-MY_PV="${PV/_p/-}"
-
-DESCRIPTION="Tool to check TLS/SSL cipher support"
-HOMEPAGE="https://testssl.sh/"
-SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 bundled-openssl? ( openssl )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bundled-openssl"
-
-RDEPEND="
-	app-shells/bash[net]
-	dev-libs/openssl:0
-	net-dns/bind-tools
-	sys-apps/util-linux
-	sys-libs/ncurses:0
-	sys-process/procps
-"
-
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-QA_PREBUILT="opt/${PN}/*"
-
-pkg_setup() {
-	use amd64 && BUNDLED_OPENSSL="openssl.Linux.x86_64"
-}
-
-src_prepare() {
-	default
-	sed -i ${PN}.sh \
-		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
-		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
-}
-
-src_install() {
-	dodoc CHANGELOG.stable-releases.txt CREDITS.md Readme.md
-	dodoc openssl-rfc.mappping.html
-
-	dobin ${PN}.sh
-
-	insinto /etc/${PN}
-	doins etc/*
-
-	if use bundled-openssl; then
-		exeinto /opt/${PN}
-		use amd64 && doexe bin/${BUNDLED_OPENSSL}
-	fi
-}
-
-pkg_postinst() {
-	if use bundled-openssl; then
-		einfo "A precompiled version of OpenSSL has been installed into /opt/${PN},"
-		einfo "configured to enable a wider range of features to allow better testing."
-		einfo ""
-		einfo "To use it, call ${PN} appropriately:"
-		einfo "${MY_PN} --openssl /opt/${PN}/${BUNDLED_OPENSSL} example.com"
-	fi
-}
diff --git a/net-analyzer/testssl/testssl-2.9.5_p7.ebuild b/net-analyzer/testssl/testssl-2.9.5_p7.ebuild
index 72ba2c885aff..4398957f634b 100644
--- a/net-analyzer/testssl/testssl-2.9.5_p7.ebuild
+++ b/net-analyzer/testssl/testssl-2.9.5_p7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2 bundled-openssl? ( openssl )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bundled-openssl kerberos"
 
 RDEPEND="
diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest
index 65c8cfde3aa6..8607c23d6d06 100644
--- a/net-analyzer/wapiti/Manifest
+++ b/net-analyzer/wapiti/Manifest
@@ -1,6 +1,6 @@
 DIST wapiti-3.0.0.tar.gz 528316 BLAKE2B f1845e762fa155746b9706cb379ac187d0b8136082f6545ad5c486b915975561dcea272eb8213c9a3347b42bb7e9653fd2303e47c12c91f4d66f31047afd5a44 SHA512 5a04dde6e4bc051a05d55fb4f3f7171ee659a64c51f807d3c6d4dd0d8d182688d9e48e8449a1aeedab34f04fbf89dc13fa97d13fb0fdb45ba6820bde6936e36e
 DIST wapiti3-3.0.1.tar.gz 530486 BLAKE2B ccc13a14404269059d154aa32126cca6603be8d4f56b2adf2ffdd18c242ac2ea14306171a0ff5e4e654c3451db209668d4e5c9471bc3d5765cea71b1e9ff1fda SHA512 596df444d19cc2b98dd88f033c66ac65bcc8ab6e34508c1fa201503d2e61ca053ecddaa7a0814329c87e1e10c013306dd7dd4b56e644d4b5dab5924d75c6f4d7
-EBUILD wapiti-3.0.0.ebuild 778 BLAKE2B a7385fb08636ec161fd3a9c11061bf1af9806eed34e472cfe6d3fb2578d6483f13ad0cc7628f75c1f293523b04eef08fe9cc7e61a61d88c5631a78966345c31f SHA512 753e4d61b6be4ed012fc4251a7561dd8546632865f7485d5c68604718a8d2c1d73d1b518b2a99377be785091eef6e8fa0160aef6c46e1639fb257bb47ad325a7
-EBUILD wapiti-3.0.1.ebuild 820 BLAKE2B a30e47142ccb4747e39b9d592948430c3d68f43f2b07c9add6a00c909981dcbb9f71ff99339d5139bc7a0c20ad7346e5d766721df7b1daed9f9c210ba25fe905 SHA512 4eb9ce2415ef8ddfd95617319d714bd417ac7e539552d1809bd98d190cb1ea3983a00c643dae5160a168c159c01583d763f9f34756c217663cf1082fc9fd9755
-EBUILD wapiti-9999.ebuild 800 BLAKE2B e9b0f9d54f3c94904cbd217b7218141a6179528b6efd1c89f2356817df98ba902e8be297b72ad965ad5a70ee8a3d22f7b7def35ff3bee0a258dd08c053ac681d SHA512 10fb2896b49e009a38b8ca555197c0bb09d815e299c5dbc165217228e0817c6a983a2d47ac7c57625bb951777510dfcc04ece6e7a20808eb255be3b75064e9fc
+EBUILD wapiti-3.0.0.ebuild 773 BLAKE2B 523372fe70bcaaf93fae84e7ea22c44016067ffd46b9c520adfa96ab023b4b33fb2bcc6ce3724e618bccc669b9722f536f4535a060c187e7ea26dafeb69d1dd7 SHA512 42cb8736caea7370d225fe13ed51dbcfdd046cff91235f507d7718711e784b55c52b7804c1b8e7c44628bf7b4cfb3ab3cc74e527f2ed9fe95ab4adef00f52141
+EBUILD wapiti-3.0.1.ebuild 815 BLAKE2B eec75ae9d207ba0ab645765ae8cd64244b677418fe7f0a74c6ba115ef8bcd0625d19529ec1a47a1304c25ffbd37652a6a143b3e9eaacce5cb1e06356dd741b5d SHA512 3a93077e01db192a3ad12a27167f756df79427cdece3d7f21c699bc4214884a4f59f5b93928af936d74ba8c76d655aaa8ea4bdaa74e2a161b4b3423d799b1701
+EBUILD wapiti-9999.ebuild 795 BLAKE2B 16242bb4ff51572036dac46508be146bbce382b7e4d8fb4721eb88d9e008cfb74a9687f8007fae17daada156b975b879bf8437e5aa0f43042bb664c55765f343 SHA512 f8f0d00c618a4d59e832883636ecfb6279123fc125f7104f82c30088645c7bc2baf0c9ca2ddd27ea53bb3e9c7b25230b8636e0a04f6e113e2088deabf14216d4
 MISC metadata.xml 864 BLAKE2B 9551f009fa754e945364018cc66edcedc0b032929983895547b21dfdac4ad1a4dd33e72ef8613f4ed622631f04a96c4560a4a379b572e986086f8c5a9955d85c SHA512 6af9d0300f0d9edeff11f0478aaf2461337ac36c78ce3d0dd9c3fe30be33cb2b96a1e5fee2c4fe9e89c75bedd06347fd6ca27dfac8bc0d9c0539615487310f25
diff --git a/net-analyzer/wapiti/wapiti-3.0.0.ebuild b/net-analyzer/wapiti/wapiti-3.0.0.ebuild
index a3f9f3451f63..9ff47d165002 100644
--- a/net-analyzer/wapiti/wapiti-3.0.0.ebuild
+++ b/net-analyzer/wapiti/wapiti-3.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE='xml'
 
 inherit distutils-r1
diff --git a/net-analyzer/wapiti/wapiti-3.0.1.ebuild b/net-analyzer/wapiti/wapiti-3.0.1.ebuild
index 0b0c74416a8a..b96bead9fad6 100644
--- a/net-analyzer/wapiti/wapiti-3.0.1.ebuild
+++ b/net-analyzer/wapiti/wapiti-3.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE='xml'
 
 inherit distutils-r1
diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild
index 525c4a02ceb0..be4f6180daec 100644
--- a/net-analyzer/wapiti/wapiti-9999.ebuild
+++ b/net-analyzer/wapiti/wapiti-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE='xml'
 
 ESVN_REPO_URI="https://svn.code.sf.net/p/wapiti/code/trunk/"
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 30977558f24b..b535deb18856 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -10,7 +10,9 @@ AUX wireshark-99999999-qtsvg.patch 160 BLAKE2B f282867fc9cf3d770fb6abb5e6e9b471e
 AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 DIST wireshark-2.6.7.tar.xz 28420060 BLAKE2B fda1fb2b9a8968916dd24c59c193854ab56dc13d5a69d2f589ae89b257f92794d092a3da75c2e20b1c83c902966db15527346dc4072a38d16a21ed095cde364e SHA512 bd0f87debd8bd8947f386aaec9fc843148e3cdfbffc28ba499526c4053732becea606061deae6799da0cf52458fba840ba0ff8e4a034a671fa876b8a0ff25677
 DIST wireshark-3.0.0.tar.xz 30953760 BLAKE2B ee866966000cf902da6f330eb8a4b281d34a3ca88e9d92a7de1069172c8aeb86f9222e1467c5d3722ee055baf88d8ba0eb6fe27084d0b35f9639bdb9741d25e1 SHA512 917708b5edc25609536c7bd7cf4ae32a901fd99118302138dc0bf6f1ad092a8e5069a917cc8cf6cb77190f54e50623a4eba1ee10ffc225ee3051b50cf02a0963
+DIST wireshark-3.0.1.tar.xz 30903792 BLAKE2B 583052691cc20e97511f2407a64fbdffae91c09275429c9c9a60dbafcfc91ce79270f09710e8fba7db053565f1afc9786caf22ef21e700dd0f97c2f38b139e31 SHA512 59c3f36e4e7a1a7ea8f926dbf8ca495f83346396e1df5edf6a1bb34823c84308f52a1b6d46be9675d3af9ce8718da4a574f63a4fb210d8fc52131f4534d8670d
 EBUILD wireshark-2.6.7.ebuild 6510 BLAKE2B de9400f9081e9a225d4c3e43f715db085b2e420fd5fe91badba9a9ddbb4f78d83715f4505203b54fab0f5d3aab6366b35ad09ed91d9cf681e2ab3f744840bbfc SHA512 6d0f9594348164136a731ea99a82b22bfec73f51f477446a58f85da5873c956a2806d310c9aa74bf2a8b124c7a22e405b7b1e555d903f316801dedec19c404f5
-EBUILD wireshark-3.0.0-r1.ebuild 6677 BLAKE2B 644e25d08956e608e40313d7e974926c617c3cfa9ff05e45cf14be2a1d453bdb186dcfad2a2ceedd53cd30f8d854292a6d9e1171826a59d26f5b5b1bee772038 SHA512 56b471c1a6ec596ea678e0f03bd3a304cddbbade2f02fb9d1c11a3aaef8665a9ab60fabf585875c02cee5b2eb1b49c33a828060033daf3a18fbbb15d3fd4c702
-EBUILD wireshark-99999999.ebuild 6607 BLAKE2B c837949c6769fe700e81d303402c9bf40bd045c3da6b8baee423ddb5594664f4f99030edcdf955433fe2f593628a8f72a1645c00adf933f27e7e54222889b02e SHA512 6d6154f198b827b6ba8e872032b07a88282fde989752e58638c9d6b00c9708d3a94614304c7e835cf3c48f608992405ffa756e25bac61749c8e4ce336528f7ed
-MISC metadata.xml 4882 BLAKE2B 82d8cc65f2229522e9ff07e650d6fbca97143b7cf65c1e5a576362af265e945f24507a2b1deb6d2d32ea72197b2fdab9d946ff96210ec8d5bb4d32fabea4eadf SHA512 9a391d56aaa05817484ec1a9c82acfe074657ecf9356d94b8837d908a014fd5732281ea6d28d4759f711e0772dfaba19f64043921aa65657b389c909cc68c707
+EBUILD wireshark-3.0.0-r1.ebuild 6675 BLAKE2B e00d0e4b1e778db1abe5baefc609c4640b597b6d1f8a8fafe1ab3963d0e7eac32c57a5a6629378d83fa38cf8c4700adf4d70b6289a96b171bce9381cd3581bd3 SHA512 2ce1ba5cb2e1a534e2bedbce3923c614ba03834c1ff20d1e1a73cf2450ee3066277da3a2a20e44344cd706b12c3ec77185dc405bfae186b2e33dff3914daa444
+EBUILD wireshark-3.0.1.ebuild 6645 BLAKE2B 913afdbacafd77f21c802c1ee66ea23ff2314fc67552a9713ce6c34a9cfa89276b26c4032d597d9f50532bc63f159674b0f9244288ce725636f21f179ac2dc01 SHA512 40a68db2216783d04703c51e3467b28820387ba68796f71818244cdc2ed041d3acba4d1d1a5bf20edd930bb8241f2aa71d7fe47d019fa98ca4851a0248f82899
+EBUILD wireshark-99999999.ebuild 6742 BLAKE2B 1c7c56171e9fa7a768966a6949c00fa8afa7a108c5da6dd912188790541d0a0308618ab9f484e983444b63df3e7960558ad15886277b17fdf053b5640c97e123 SHA512 81ce54ba8d23f0b3f9ab62ab1718bff1bd96981d3349fb779672c3ffb0f155bf2997c62e051e7334188fe12a3b8af4bce1f9f4f5ef1925eeeac7a0970b383043
+MISC metadata.xml 5078 BLAKE2B f6cce66c296cee00dc8409609f502a88ea9acbc76f2bb8ab5bf0ea7468b91899ad301c1f56e32c9244c1acba6b8572e2f0bef0b416a833226d5c91b9f0ae6923 SHA512 1c8b1596001ac29e32fe2252584acbf53495305f5d894927b9e193f224f45c42cd182e96bb32420488e371ef51d4cdb927148de53f2f797ddefcf43a60cfa5bd
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 268fb2956451..4a20e26519da 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -30,6 +30,7 @@ be exported to XML, PostScript®, CSV, or plain text.
 <flag name="adns">Use <pkg>net-dns/c-ares</pkg> to resolve DNS names</flag>
 <flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag>
 <flag name="bcg729">Use <pkg>media-libs/bcg729</pkg> for G.729 codec support in RTP Player</flag>
+<flag name="brotli">Use <pkg>app-arch/brotli</pkg> for compression/decompression</flag>
 <flag name="capinfos">Install capinfos, to print information about capture files</flag>
 <flag name="captype">Install captype, to print the file types of capture files</flag>
 <flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag>
@@ -44,6 +45,8 @@ be exported to XML, PostScript®, CSV, or plain text.
 <flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
 <flag name="nghttp2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag>
 <flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
+<flag name="plugin_ifdemo">Install plugin interface demo</flag>
+<flag name="plugins">Install plugins</flag>
 <flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag>
 <flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag>
 <flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag>
diff --git a/net-analyzer/wireshark/wireshark-3.0.0-r1.ebuild b/net-analyzer/wireshark/wireshark-3.0.0-r1.ebuild
index f755315a7d8c..3ef6f605164f 100644
--- a/net-analyzer/wireshark/wireshark-3.0.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune multilib python-r1 qmake-utils user xdg-utils
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
diff --git a/net-analyzer/wireshark/wireshark-3.0.1.ebuild b/net-analyzer/wireshark/wireshark-3.0.1.ebuild
new file mode 100644
index 000000000000..3e7cdc79b613
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.0.1.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit cmake-utils fcaps flag-o-matic ltprune multilib python-r1 qmake-utils user xdg-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+IUSE="
+	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
+	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
+	nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
+	smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
+	+udpdump zlib
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.32:2
+	dev-libs/libgcrypt:0
+	adns? ( >=net-dns/c-ares-1.5 )
+	bcg729? ( media-libs/bcg729 )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	filecaps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	netlink? ( dev-libs/libnl:3 )
+	nghttp2? ( net-libs/nghttp2 )
+	pcap? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	sdjournal? ( sys-apps/systemd )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+	!<perl-core/Pod-Simple-3.170
+	!<virtual/perl-Pod-Simple-3.170
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
+	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
+	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_configure() {
+	local mycmakeargs
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	python_setup 'python3*'
+
+	mycmakeargs+=(
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dpauxmon=$(usex dpauxmon)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sdjournal=$(usex sdjournal)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+		-DBUILD_wireshark=$(usex qt5)
+		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_CAP=$(usex filecaps caps)
+		-DENABLE_CARES=$(usex adns)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" test-programs
+	emake -C "${BUILD_DIR}" test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+	# install headers
+	insinto /usr/include/wireshark
+	doins ws_diag_control.h ws_symbol_export.h \
+		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		epan/wmem
+		wiretap
+		wsutil
+	)
+	for dir in "${dirs[@]}"
+	do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking
+	# in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use qt5; then
+		local s
+		for s in 16 32 48 64 128 256 512 1024; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins image/wsicon${s}.png wireshark.png
+		done
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
+
+	if use dumpcap && use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 42ebd544329b..937819a5e035 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6,7} )
-inherit cmake-utils fcaps flag-o-matic git-r3 ltprune multilib python-r1 qmake-utils user xdg-utils
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit fcaps flag-o-matic git-r3 multilib python-r1 qmake-utils user xdg-utils cmake-utils
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/"
@@ -13,11 +13,11 @@ LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
-	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
-	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
-	nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
-	smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
-	+udpdump zlib
+	adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
+	dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap
+	+netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt +randpktdump
+	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
+	+text2pcap tfshark +tshark +udpdump zlib
 "
 
 S=${WORKDIR}/${P/_/}
@@ -27,6 +27,7 @@ CDEPEND="
 	dev-libs/libgcrypt:0
 	adns? ( >=net-dns/c-ares-1.5 )
 	bcg729? ( media-libs/bcg729 )
+	brotli? ( app-arch/brotli )
 	ciscodump? ( >=net-libs/libssh-0.6 )
 	filecaps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
@@ -59,6 +60,8 @@ CDEPEND="
 DEPEND="
 	${CDEPEND}
 	${PYTHON_DEPS}
+"
+BDEPEND="
 	!<perl-core/Pod-Simple-3.170
 	!<virtual/perl-Pod-Simple-3.170
 	dev-lang/perl
@@ -80,6 +83,7 @@ RDEPEND="
 "
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
+	plugin_ifdemo? ( plugins )
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
@@ -147,6 +151,7 @@ src_configure() {
 		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
 		-DDISABLE_WERROR=yes
 		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_BROTLI=$(usex brotli)
 		-DENABLE_CAP=$(usex filecaps caps)
 		-DENABLE_CARES=$(usex adns)
 		-DENABLE_GNUTLS=$(usex ssl)
@@ -157,6 +162,8 @@ src_configure() {
 		-DENABLE_NETLINK=$(usex netlink)
 		-DENABLE_NGHTTP2=$(usex nghttp2)
 		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PLUGINS=$(usex plugins)
+		-DENABLE_PLUGIN_IFDEMO=$(usex plugin_ifdemo)
 		-DENABLE_SBC=$(usex sbc)
 		-DENABLE_SMI=$(usex smi)
 		-DENABLE_SNAPPY=$(usex snappy)
@@ -168,8 +175,7 @@ src_configure() {
 }
 
 src_test() {
-	emake -C "${BUILD_DIR}" test-programs
-	emake -C "${BUILD_DIR}" test
+	cmake-utils_src_test
 }
 
 src_install() {
@@ -215,8 +221,6 @@ src_install() {
 			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
 		done
 	fi
-
-	prune_libtool_files
 }
 
 pkg_postinst() {
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /net-analyzer
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)