gentoo resync : 04.05.2019

30 files changed, 134 insertions, 686 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index dad2e996e940..1104cbce2287 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/dhcpdump/Manifest b/net-analyzer/dhcpdump/Manifest
index 17f512065cf9..a313ca0d3f69 100644
--- a/net-analyzer/dhcpdump/Manifest
+++ b/net-analyzer/dhcpdump/Manifest
@@ -2,5 +2,5 @@ AUX dhcpdump-1.8-Makefile.patch 483 BLAKE2B 3da53d6ad4d1e6808ddb4abd9af7aafa8a7c
 AUX dhcpdump-1.8-debian.patch 2850 BLAKE2B d7e381388af48a8e0f1ffb78dddf4fb3652907569a84072fbd4efacec18051cce20891f270ae6857a8cf07e698381bb10604821eadcf35b963cd413e24df7143 SHA512 ccc97bb8c8f6dfa09d22407c8a9dec249860118ff9fc09af9488f1d4c8679f94ef6850040535048ba0bdde273a2a8c7759f02742ece0e409a020277349bedbac
 AUX dhcpdump-1.8-endianness.patch 259 BLAKE2B 65b402fa9c0969887cd0e9802e7736bb6becfcef9a4a0577e865402b6413d92cdabaf8f869eee27d27749fadae42ee70485ac078f9b789596e034d9616c3f281 SHA512 7a04bb0933fe6d54f696f18d7d1cbc1090a6f2bb92061bca0e52311264e35ec3884a2ddbdef2b31de7f81a652189fa9617de754d02aaaf17c1212c92106f07d2
 DIST dhcpdump-1.8.tar.gz 10740 BLAKE2B f87f1db539b06cffd68395982476bd7bfcad4e41d86aea7f3be357a07d597cdb34e8888eaf90e6dc11db0252dce418a3b1ad8a00b0d3a7c7faab48f14c6aec85 SHA512 52cd63d581a3c530c2f5baa66808d5b0241853651c720bd513b769b8301b4dff9c87243787014aea98a5b3ebed86ec317b58d262bf5031015141a4da50fb76e6
-EBUILD dhcpdump-1.8.ebuild 689 BLAKE2B adb9f6e1444f51557ed6274d8531d0e23a548b74d0e2504c4ba59e61ece90522eea49cc8dcf0c1fd4bc4a9835db17d0d7a76e9229e957436301c602226e48779 SHA512 9abf80278a31c479401bb62455be9fb5a75bfc9cc0a0f256bba30c608beb809a77a2e1548c118369ca390519535948a244960cf91cb118be4d0961630dc189e5
+EBUILD dhcpdump-1.8.ebuild 688 BLAKE2B 7d7032296a9ac9a2f0b5cc3409fd15da5a1f1f0a0933c7fbfecf0580e4dd1ca8d3108d9a887919e92a3ac5a7429aa480433d4f346b0494148188c065acb2aab9 SHA512 47abe430087c29ca1a43f58f247cc6da395f52fe480776b9cbab681e3cf7c9971ad0c4a9888c1cbb5fee9a09e7b20730fcdf0731ebf2446173f0537e0a135418
 MISC metadata.xml 418 BLAKE2B 93c3d8a35aab2e549f4129e3b0ac1f23c479017c1fdc0ff7d92fc31a14567383d5859621e65fbc3e1975cbaf201470cf19e6d92a35a9ac35dfb47cedb6208157 SHA512 776319938dbf31831e5b8655726ee04d2c8cbd3d43163c2ba9d3d9126608de9ca6e49df2c0f9fedfffacdbd2149f792b592d5d5e1881c226f0cb2eaba00a1fa4
diff --git a/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild
index 2973a6344152..e30805c0b696 100644
--- a/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild
+++ b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="DHCP Packet Analyzer/tcpdump postprocessor"
-HOMEPAGE="http://www.mavetju.org/unix/general.php"
-SRC_URI="http://www.mavetju.org/download/${P}.tar.gz"
+HOMEPAGE="https://www.mavetju.org/unix/general.php"
+SRC_URI="https://www.mavetju.org/download/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest
deleted file mode 100644
index 04aae20a1e72..000000000000
--- a/net-analyzer/dsniff/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX 2.3-makefile.patch 1530 BLAKE2B f3fde31947355c1a0d05b166f44f3ff449a4d1a369f8390b7b97075f82790fc31fc5173e100c43a514fbbf4b3860c35a66cf7da729f1206386277fd39b575324 SHA512 4f5721b34f5df8b2c3553ed7fbaab3ecb05763a7124f00f0c5f77afbd542e0eaaf1cd951c566b63ea9fa910521ffb9d1c7516c681175100125a16197f0beb846
-AUX 2.4_beta1-httppostfix.patch 674 BLAKE2B b716835e750e4029f974115ee54e86b05675defd933cb6471d16283e5d75d0f71d036acd98eaadcc4e3a1989b6edaed28de6c54112a820b3e07d8b7b64aede99 SHA512 2d47d4efa576203240d94b739cafb982833d52673f42b381cc109e7b44acbf173528a4c5d4dfa1b9b95a21c9e9296db5016946e0b5202f4fcbc67e28152c1068
-AUX 2.4_beta1-libtirpc.patch 590 BLAKE2B ea64ccdee4f518e9b667460805d82609df114082a4046c308d8978baa92be81c973b28b07da5b7277043ed3a4f2257a671db56e3d6c717c5e217e66096ab0e22 SHA512 c794ba7d43d7fac77a4d427f164efed1514a9caf93af8c11d6e094448b8b5c26be2d3da85e3ad62611a4bf337a3cca68ba27d3813c51d0692e9a793788c31f9d
-AUX 2.4_beta1-macof-size-calculation.patch 369 BLAKE2B 0562e78434326d7e5b4d266b607d67f6b23a58fafd0deb5db23fd896ecc9c8f7fc05de71b43698926b8eeed6f033998b7942844e1e845d8e55cb12705d286271 SHA512 070695aae4a0374f6d073e71f4e9362387b3b6a444058c9371564779b22c2218f32e830c7a1e39879860e956f8c826199ba90a0cb67423379358c1d0dd857ff1
-AUX 2.4_beta1-make.patch 2086 BLAKE2B 5808455a9751c64f17f08bfdd04073acc80e21d9ff18cc8ab41fbcc57ac7046348e6b1a8fe77ff6410afebcd10c77e7418dcae9cec57254e7eba039cb79ebfeb SHA512 bd16046e6ed429494f036234ac741f32d14e6f61f9cfdf303a18e04ed378ee2485d3b10cb2371d0cad30c18d7d2805dbb005cd48eece1bc2956187238a05b0b1
-AUX 2.4_beta1-rpc.patch 1157 BLAKE2B 9055c393ff3f8fe5c31ddf1141c2b2edf0d93b27b754d08e27124b196a9c30e28054a6a9c0e12481ce5247c46b9a69bb979831974fdb16a9db65111842ae87e3 SHA512 c45a3ab69222a25ac66a07c557431dd84e13ae8082ddf0ccf9f94e395a1b68a09fb136a36a8e3ba4dae4fe8e1f2f67c229ca1dc7488174893b2d43dc2eb8a471
-AUX 2.4_beta1-urlsnarf-pcap_timestamps.patch 463 BLAKE2B 77512cb1fc1449d90006c4a2d795172a8bd20532b3c5e4d37c993f45def3894950c254bec7cd406757f8db8973270b3d9ccc7eab8f583bfb5ddbb3b6f2e39853 SHA512 57a7e9e50b76ae260617f3c66036de41329c744ac1f08d70993a2bf724e22828320107776ca726b3c0bf20d921134368087dedeae19f287770cee6dca7d6e3e1
-DIST dsniff-2.4b1.tar.gz 131666 BLAKE2B f0cc3c875ed37ee573a28d2c54e7dc89bd14df233b047273ebb054820c2f8c61be22b0310c9354446a9ca6e99fdcd7f027fa7a122da667d4a809362dcb8c957f SHA512 62dafab293de6dc3e9b01561b3627d63ca334467c01c3550a6318d8bcbe99d5a301ec16967af34065a14e8bca1c4b6a41da766cbd51ebd8338615b950c4f642f
-DIST dsniff_2.4b1+debian-18.diff.gz 44819 BLAKE2B 79b5614cbe4f36c2d321cd392cbfd2db94530680fbbab35f5069850ab6bda0fab6b7a2a93a983773793b9f645499c24393d6c652f0aba6c48651ae17ff4b24fe SHA512 9f219dfa7fd68399126cd2b373a7054168638606c03e8297af46a89c242f81e45f99857922e6782cab608b8cafab528bcfaeb37acd3cca85f5b4a8efd91e71d5
-DIST dsniff_2.4b1+debian-22.1.debian.tar.gz 29657 BLAKE2B 88333aad1498cb5b4fd68776f8e0599672c9c69ee5b0d5424f0a8e9f0958412fb420a6d6ae6d46dc5e6c73c4ab39b1fedbef1a4c6879bb4c2bd363271cb6d98b SHA512 11c6a3c04b5a8b3afb78901003132186964e88019011bea69b43a000c31d23f15c1a1c343c2ad1b03bf0a09664aebfa6f99e335fdfa1496bb020db6541eab6e3
-EBUILD dsniff-2.4_beta1-r10.ebuild 1972 BLAKE2B b4fdd8fe9b4c3223ab3948536370baef6eb6f08af780923a2c508c36c870ab6d056bc5d11fabc84ae47f204f5ee88d896dc92e7adbc065a4a621f27bf83a27fd SHA512 b97424a3c1c724b6a59ac30e09ad85c8edea4f15cf38e38b05f725474a1027eb02fe176e3fd7601731c3a281c825a9b941c797adfdbeed5f5d08c20a89767e2a
-EBUILD dsniff-2.4_beta1-r4.ebuild 1429 BLAKE2B 2dfacf619d25f04ef05eeb8025ace665ad496a67b39a91088981701c61a38d531312071e4b7912b7b468f8a8c96d31e8fe0ed96868188d7cd317f13f8920f8fb SHA512 ccf1ad29250df3bf1bbcef51bc938cd66e2a392ad9b9b2c32256dda6f67b28a2f006f3c0283987b1fb159250fbedec5769ce772a8516f4a35992abd7fab3fc13
-EBUILD dsniff-2.4_beta1-r7.ebuild 1565 BLAKE2B 7ae21702bce46679aefd2809a3c1b4309c3893cdb4b67e087c3f03f6be7d65e34a222abadf40beecc5ab6e9262fcb3392082d808b4d549a6e121c41c3384d66a SHA512 8ba4fd2f434d9f64e9142eef4406d782ae43a91fe4ce6e1e0d867f4e2b6a61de5aa837e46ec1d4938b366c37433ed7ae695b40f5223b5669da3c6b520399f6e7
-EBUILD dsniff-2.4_beta1-r9.ebuild 2084 BLAKE2B 165fecbc8438a691d2278960bad53093cf8274275b1a288b4535ac63f190b6507e17818e83067065763671040494825c2378eb0673615e5bb0e0a1f724bce75a SHA512 bc15fdaf204159b2f59203983287cb38991d7e65d62497857d07385fdc1d1ddb320025e10de35bdda71d8af738394b40563f38b8b98247de4e5e49b38dfb4353
-MISC metadata.xml 832 BLAKE2B 2072b0bc0e49c68f9cdf2d0e3810d3b4d0fbbbeb9f5819d71d98a92f4dd73774a21ebdeb5ee991f12fcaf3a11a253e5fea45513627446f1eaabe7b8a0d569415 SHA512 0209f1adfd521cabc7b37a69d3ba8842a8d612487cb414d7aa16eccf461e78c4ab96c1387606badb896acd6a7a495697c30773c8eb5c74e949e22910212a9d44
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1-r10.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r10.ebuild
deleted file mode 100644
index e8040b8990e6..000000000000
--- a/net-analyzer/dsniff/dsniff-2.4_beta1-r10.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs
-
-DESCRIPTION="A collection of tools for network auditing and penetration testing"
-HOMEPAGE="https://monkey.org/~dugsong/dsniff/"
-SRC_URI="
-	https://monkey.org/~dugsong/${PN}/beta/${P/_beta/b}.tar.gz
-	mirror://debian/pool/main/d/${PN}/${PN}_2.4b1+debian-22.1.debian.tar.gz
-"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE="libressl X"
-
-DEPEND="net-libs/libpcap
-	>=net-libs/libnet-1.1.2.1-r1
-	>=net-libs/libnids-1.21
-	net-libs/libnsl:0=
-	net-libs/libtirpc
-	net-libs/rpcsvc-proto
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=sys-libs/db-4:*
-	X? ( x11-libs/libXmu )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_beta1/}"
-
-src_prepare() {
-	# replace Debian patch 23 with a simpler one (bug #506076)
-	mv -v \
-		"${WORKDIR}"/debian/patches/23_urlsnarf_timestamp.patch{,.old} || die
-	cp -v \
-		"${FILESDIR}"/${PV}-urlsnarf-pcap_timestamps.patch \
-		"${WORKDIR}"/debian/patches/23_urlsnarf_timestamp.patch || die
-
-	# Debian patchset, needs to be applied in the exact order that "series"
-	# lists or patching will fail.
-	# Bug #479882
-	eapply $(
-		for file in $(< "${WORKDIR}"/debian/patches/series ); do
-			printf "%s/debian/patches/%s " "${WORKDIR}" "${file}"
-		done
-	)
-
-	# Bug 125084
-	eapply "${FILESDIR}"/${PV}-httppostfix.patch
-
-	# various Makefile.in patches
-	eapply "${FILESDIR}"/${PV}-make.patch
-
-	# bug #538462
-	eapply "${FILESDIR}"/${PV}-macof-size-calculation.patch
-
-	# libtirpc support
-	eapply "${FILESDIR}"/${PV}-rpc.patch
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-libtirpc \
-		$(use_with X x) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake install install_prefix="${D}"
-	dodir /etc/dsniff
-	cp "${D}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \
-		"${D}"/etc/dsniff/ || die
-	dodoc CHANGES README TODO
-}
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild
deleted file mode 100644
index 30f23c56ef4b..000000000000
--- a/net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A collection of tools for network auditing and penetration testing"
-HOMEPAGE="https://monkey.org/~dugsong/dsniff/"
-SRC_URI="https://monkey.org/~dugsong/${PN}/beta/${P/_beta/b}.tar.gz
-	mirror://debian/pool/main/d/${PN}/${PN}_2.4b1+debian-18.diff.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="X"
-
-DEPEND="net-libs/libpcap
-	>=net-libs/libnet-1.1.2.1-r1
-	>=net-libs/libnids-1.21
-	>=dev-libs/openssl-0.9.6e
-	>=sys-libs/db-4.2.52_p4
-	sys-apps/sed
-	X? ( x11-libs/libXmu )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_beta1/}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Debian's patchset
-	epatch "${DISTDIR}"/${PN}_2.4b1+debian-18.diff.gz
-	epatch "${S}"/dsniff-2.4b1+debian/debian/patches/*.dpatch
-
-	sed -i 's:-DDSNIFF_LIBDIR=\\\"$(libdir)/\\\"::' Makefile.in || die "sed makefile"
-	epatch "${FILESDIR}"/2.3-makefile.patch
-
-	# Bug 125084
-	epatch "${FILESDIR}"/${PV}-httppostfix.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_with X x) \
-		|| die "econf failed"
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	emake install install_prefix="${D}" || die "emake install failed"
-	dodir /etc/dsniff
-	cp "${D}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \
-		"${D}"/etc/dsniff/
-	dodoc CHANGES README TODO
-}
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1-r7.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r7.ebuild
deleted file mode 100644
index 2a0d40b9f9b4..000000000000
--- a/net-analyzer/dsniff/dsniff-2.4_beta1-r7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A collection of tools for network auditing and penetration testing"
-HOMEPAGE="https://monkey.org/~dugsong/dsniff/"
-SRC_URI="
-	https://monkey.org/~dugsong/${PN}/beta/${P/_beta/b}.tar.gz
-	mirror://debian/pool/main/d/${PN}/${PN}_2.4b1+debian-22.1.debian.tar.gz
-"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="libressl X"
-
-DEPEND="net-libs/libpcap
-	>=net-libs/libnet-1.1.2.1-r1
-	>=net-libs/libnids-1.21
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=sys-libs/db-4:*
-	X? ( x11-libs/libXmu )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_beta1/}"
-
-src_prepare() {
-	# Debian patchset, needs to be applied in the exact order that "series"
-	# lists or patching will fail.
-	# Bug #479882
-	epatch $(
-		for file in $(< "${WORKDIR}"/debian/patches/series ); do
-			printf "%s/debian/patches/%s " "${WORKDIR}" "${file}"
-		done
-	)
-
-	# Bug 125084
-	epatch "${FILESDIR}"/${PV}-httppostfix.patch
-
-	# various Makefile.in patches
-	epatch "${FILESDIR}"/${PV}-make.patch
-
-	# bug #538462
-	epatch "${FILESDIR}"/${PV}-macof-size-calculation.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with X x) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake install install_prefix="${D}"
-	dodir /etc/dsniff
-	cp "${D}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \
-		"${D}"/etc/dsniff/
-	dodoc CHANGES README TODO
-}
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1-r9.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r9.ebuild
deleted file mode 100644
index cb6eecff826a..000000000000
--- a/net-analyzer/dsniff/dsniff-2.4_beta1-r9.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A collection of tools for network auditing and penetration testing"
-HOMEPAGE="https://monkey.org/~dugsong/dsniff/"
-SRC_URI="
-	https://monkey.org/~dugsong/${PN}/beta/${P/_beta/b}.tar.gz
-	mirror://debian/pool/main/d/${PN}/${PN}_2.4b1+debian-22.1.debian.tar.gz
-"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="libressl X"
-
-DEPEND="net-libs/libpcap
-	>=net-libs/libnet-1.1.2.1-r1
-	>=net-libs/libnids-1.21
-	net-libs/libnsl:0=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=sys-libs/db-4:*
-	|| (	<sys-libs/glibc-2.26[rpc]
-		(
-			>=sys-libs/glibc-2.26
-			net-libs/rpcsvc-proto
-			net-libs/libtirpc
-		)
-	)
-	X? ( x11-libs/libXmu )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_beta1/}"
-
-src_prepare() {
-	# replace Debian patch 23 with a simpler one (bug #506076)
-	mv -v \
-		"${WORKDIR}"/debian/patches/23_urlsnarf_timestamp.patch{,.old} || die
-	cp -v \
-		"${FILESDIR}"/${PV}-urlsnarf-pcap_timestamps.patch \
-		"${WORKDIR}"/debian/patches/23_urlsnarf_timestamp.patch || die
-
-	# Debian patchset, needs to be applied in the exact order that "series"
-	# lists or patching will fail.
-	# Bug #479882
-	epatch $(
-		for file in $(< "${WORKDIR}"/debian/patches/series ); do
-			printf "%s/debian/patches/%s " "${WORKDIR}" "${file}"
-		done
-	)
-
-	# Bug 125084
-	epatch "${FILESDIR}"/${PV}-httppostfix.patch
-
-	# various Makefile.in patches
-	epatch "${FILESDIR}"/${PV}-make.patch
-
-	# bug #538462
-	epatch "${FILESDIR}"/${PV}-macof-size-calculation.patch
-
-	# allow building against libtirpc, needed for glibc-2.26, bug 381391
-	epatch "${FILESDIR}"/${PV}-libtirpc.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with X x) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake install install_prefix="${D}"
-	dodir /etc/dsniff
-	cp "${D}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \
-		"${D}"/etc/dsniff/
-	dodoc CHANGES README TODO
-}
diff --git a/net-analyzer/dsniff/files/2.3-makefile.patch b/net-analyzer/dsniff/files/2.3-makefile.patch
deleted file mode 100644
index 6225ec2f4473..000000000000
--- a/net-analyzer/dsniff/files/2.3-makefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/Makefile.in	2003-08-25 18:07:17.000000000 +1200
-+++ b/Makefile.in	2003-08-25 18:29:13.000000000 +1200
-@@ -94,7 +94,7 @@
- 	$(RANLIB) $@
- 
- dsniff: $(HDRS) $(SRCS) $(OBJS)
--	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB)
-+	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(DBLIB) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(SSLLIB)
- 
- arpspoof: arpspoof.o arp.o
- 	$(CC) $(LDFLAGS) -o $@ arpspoof.o arp.o $(LIBS) $(PCAPLIB) $(LNETLIB)
-@@ -115,7 +115,7 @@
- 	$(CC) $(LDFLAGS) -o $@ msgsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
- 
- sshmitm: sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o
--	$(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
-+	$(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(DBLIB) $(LNETLIB) $(SSLLIB)
- 
- tcpkill: tcpkill.o pcaputil.o
- 	$(CC) $(LDFLAGS) -o $@ tcpkill.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
-@@ -130,7 +130,7 @@
- 	$(CC) $(LDFLAGS) -o $@ urlsnarf.o base64.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
- 
- webmitm: webmitm.o base64.o buf.o decode_http.o record.o
--	$(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
-+	$(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(DBLIB) $(LNETLIB) $(SSLLIB)
- 
- webspy: webspy.o base64.o buf.o remote.o
- 	$(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(X11LIB)
diff --git a/net-analyzer/dsniff/files/2.4_beta1-httppostfix.patch b/net-analyzer/dsniff/files/2.4_beta1-httppostfix.patch
deleted file mode 100644
index 62c9a90fe8e3..000000000000
--- a/net-analyzer/dsniff/files/2.4_beta1-httppostfix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/decode_http.c	2000-12-19 07:38:05.000000000 +0800
-+++ b/decode_http.c	2006-03-05 22:32:14.000000000 +0800
-@@ -139,14 +139,14 @@
- 				host = p;
- 			}
- 			else if (req[0] == 'P') {
--				if (strncmp(p, "Content-type: ", 14) == 0) {
--					if (strncmp(p + 14, "application/"
-+				if (strncasecmp(p, "Content-type: ", 14) == 0) {
-+					if (strncasecmp(p + 14, "application/"
- 						    "x-www-form-urlencoded",
- 						    33) != 0) {
- 						query = NULL;
- 					}
- 				}
--				else if (strncmp(p, "Content-length: ", 16) == 0) {
-+				else if (strncasecmp(p, "Content-length: ", 16) == 0) {
- 					p += 16;
- 					i = atoi(p);
- 					if ((msg = buf_tok(&inbuf, NULL, i)) == NULL)
diff --git a/net-analyzer/dsniff/files/2.4_beta1-libtirpc.patch b/net-analyzer/dsniff/files/2.4_beta1-libtirpc.patch
deleted file mode 100644
index 00c271ab9f93..000000000000
--- a/net-analyzer/dsniff/files/2.4_beta1-libtirpc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -37,8 +37,8 @@
- X11INC	= @X_CFLAGS@
- X11LIB	= @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@
- 
--INCS	= -I. $(X11INC) -I$(srcdir)/missing 
--LIBS	= @LIBS@ -L$(srcdir) -lmissing
-+INCS	= -I. $(X11INC) -I$(srcdir)/missing @TIRPC_CFLAGS@
-+LIBS	= @LIBS@ -L$(srcdir) -lmissing @TIRPC_LIBS@
- 
- INSTALL	= @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
---- a/configure.in
-+++ b/configure.in
-@@ -338,4 +338,6 @@
- AC_SUBST(SSLINC)
- AC_SUBST(SSLLIB)
- 
-+PKG_CHECK_MODULES([TIRPC], [libtirpc], [], [AC_MSG_NOTICE([Using glibc rpc support])])
-+
- AC_OUTPUT(Makefile)
diff --git a/net-analyzer/dsniff/files/2.4_beta1-macof-size-calculation.patch b/net-analyzer/dsniff/files/2.4_beta1-macof-size-calculation.patch
deleted file mode 100644
index 068133de2e4d..000000000000
--- a/net-analyzer/dsniff/files/2.4_beta1-macof-size-calculation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/macof.c
-+++ b/macof.c
-@@ -134,7 +134,7 @@ main(int argc, char *argv[])
- 		libnet_build_tcp(sport, dport, seq, 0, TH_SYN, 512,
- 				 0, 0, LIBNET_TCP_H, NULL, 0, l, 0);
- 		
--		libnet_build_ipv4(LIBNET_TCP_H, 0,
-+		libnet_build_ipv4(LIBNET_IPV4_H + LIBNET_TCP_H, 0,
- 				  libnet_get_prand(LIBNET_PRu16), 0, 64,
- 				  IPPROTO_TCP, 0, src, dst, NULL, 0, l, 0);
- 		
diff --git a/net-analyzer/dsniff/files/2.4_beta1-make.patch b/net-analyzer/dsniff/files/2.4_beta1-make.patch
deleted file mode 100644
index 29964eb28ac8..000000000000
--- a/net-analyzer/dsniff/files/2.4_beta1-make.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -16,7 +16,7 @@
- mandir		= @mandir@
- 
- CC	= @CC@
--CFLAGS	= @CFLAGS@ -DDSNIFF_LIBDIR=\"$(libdir)/\"
-+CFLAGS	= @CFLAGS@ 
- LDFLAGS	= @LDFLAGS@
- 
- PCAPINC = @PCAPINC@
-@@ -75,12 +75,20 @@
- .c.o:
- 	$(CC) $(CFLAGS) $(INCS) -c $(srcdir)/$*.c
- 
--all: libmissing.a $(PROGS)
-+all: $(PROGS)
-+
-+$(PROGS): libmissing.a
-+
-+$(OBJS): $(GEN)
- 
-+mount.h: mount.x
-+	rpcgen -h mount.x -o mount.h
-+
- mount.c: mount.x
--	rpcgen -h mount.x -o mount.h
- 	rpcgen -c mount.x -o mount.c
- 
-+nfs_prot.h: nfs_prot.x	
-+	rpcgen -h nfs_prot.x -o nfs_prot.h
-+
- nfs_prot.c: nfs_prot.x
--	rpcgen -h nfs_prot.x -o nfs_prot.h
- 	rpcgen -c nfs_prot.x -o nfs_prot.c
-@@ -93,7 +97,7 @@
- 	$(RANLIB) $@
- 
- dsniff: $(HDRS) $(SRCS) $(OBJS)
--	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB)
-+	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(DBLIB) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(SSLLIB)
- 
- arpspoof: arpspoof.o arp.o
- 	$(CC) $(LDFLAGS) -o $@ arpspoof.o arp.o $(LIBS) $(PCAPLIB) $(LNETLIB)
-@@ -114,7 +118,7 @@
- 	$(CC) $(LDFLAGS) -o $@ msgsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
- 
- sshmitm: sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o
--	$(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
-+	$(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(DBLIB) $(LNETLIB) $(SSLLIB)
- 
- sshow: sshow.o pcaputil.o
- 	$(CC) $(LDFLAGS) -o $@ sshow.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
-@@ -132,7 +136,7 @@
- 	$(CC) $(LDFLAGS) -o $@ urlsnarf.o base64.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
- 
- webmitm: webmitm.o base64.o buf.o decode_http.o record.o
--	$(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
-+	$(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(DBLIB) $(LNETLIB) $(SSLLIB)
- 
- webspy: webspy.o base64.o buf.o remote.o
- 	$(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(X11LIB)
diff --git a/net-analyzer/dsniff/files/2.4_beta1-rpc.patch b/net-analyzer/dsniff/files/2.4_beta1-rpc.patch
deleted file mode 100644
index b43c91d95815..000000000000
--- a/net-analyzer/dsniff/files/2.4_beta1-rpc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -37,8 +37,8 @@
- X11INC	= @X_CFLAGS@
- X11LIB	= @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@
- 
--INCS	= -I. $(X11INC) -I$(srcdir)/missing 
--LIBS	= @LIBS@ -L$(srcdir) -lmissing
-+INCS	= -I. $(X11INC) -I$(srcdir)/missing @RPC_CFLAGS@
-+LIBS	= @LIBS@ -L$(srcdir) -lmissing @RPC_LIBS@
- 
- INSTALL	= @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
---- a/configure.in
-+++ b/configure.in
-@@ -337,4 +337,23 @@
- AC_SUBST(SSLINC)
- AC_SUBST(SSLLIB)
- 
-+AC_ARG_WITH([libtirpc],
-+	    AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
-+	    [], [ with_libtirpc=no ])
-+
-+AS_IF([test "x$with_libtirpc" != xno], 
-+      [PKG_CHECK_MODULES([TIRPC], 
-+                         [libtirpc], 
-+                         [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
-+			 [AC_MSG_ERROR([libtirpc requested, but library not found.])]
-+	                )], 
-+      [AC_CHECK_HEADER(rpc/rpc.h, 
-+		       [RPC_CFLAGS=""; RPC_LIBS="";],
-+		       [AC_MSG_ERROR([sunrpc requested, but headers are not present.])]
-+	              )]
-+)
-+
-+AC_SUBST(RPC_CFLAGS)
-+AC_SUBST(RPC_LIBS)
-+
- AC_OUTPUT(Makefile)
diff --git a/net-analyzer/dsniff/files/2.4_beta1-urlsnarf-pcap_timestamps.patch b/net-analyzer/dsniff/files/2.4_beta1-urlsnarf-pcap_timestamps.patch
deleted file mode 100644
index a2a7a36966ac..000000000000
--- a/net-analyzer/dsniff/files/2.4_beta1-urlsnarf-pcap_timestamps.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Hilko Bengen <bengen@debian.org>
-Description: urlsnarf: use timestamps from pcap file if available. Closes: #573365
-Index: dsniff-2.4b1+debian/urlsnarf.c
-===================================================================
---- a/urlsnarf.c
-+++ b/urlsnarf.c
-@@ -57,7 +57,7 @@
- {
- 	static char tstr[32], sign;
- 	struct tm *t, gmt;
--	time_t tt = time(NULL);
-+	time_t tt = nids_last_pcap_header->ts.tv_sec;
- 	int days, hours, tz, len;
- 	
- 	gmt = *gmtime(&tt);
diff --git a/net-analyzer/dsniff/metadata.xml b/net-analyzer/dsniff/metadata.xml
deleted file mode 100644
index 87cd1022ae11..000000000000
--- a/net-analyzer/dsniff/metadata.xml
+++ /dev/null
@@ -1,17 +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>
-dsniff is a collection of tools for network auditing and penetration testing.
-dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor a
-network for interesting data (passwords, e-mail, files, etc.). arpspoof,
-dnsspoof, and macof facilitate the interception of network traffic normally
-unavailable to an attacker (e.g, due to layer-2 switching). sshmitm and webmitm
-implement active monkey-in-the-middle attacks against redirected SSH and HTTPS
-sessions by exploiting weak bindings in ad-hoc PKI.
-</longdescription>
-</pkgmetadata>
diff --git a/net-analyzer/httping/Manifest b/net-analyzer/httping/Manifest
index b2990f5d6652..200332127b8d 100644
--- a/net-analyzer/httping/Manifest
+++ b/net-analyzer/httping/Manifest
@@ -1,4 +1,5 @@
 AUX httping-2.2.1-flags.patch 161 BLAKE2B be0f5f8df2fd89f46f15b3ef6c0c06e9f04573a822a6ce6e559471e3db586d69de0e440e3b9c4f401f30ab741d9eb85077ead8d3f9d4c026e7398609602f7c2e SHA512 037f53e3f23247ddc5f33ef846bafe32e3f818242b92375d7145fa244c9a8aeeac2d3b1138cbffa792a9564a5e4e96274ff457a13be0c4b228033d47b21748d6
 DIST httping-2.5.tgz 71400 BLAKE2B da261827a4e2276816dbb2f9a6bac989f4ec0e7fc4b7686d51e57f8d4078ec3f94acef032b7042774e9cff57c8158696026e45d44ae1fbb00e52175c9c08b9a5 SHA512 397ce2eac91c9aede0eb19823bfca4e7f98c263937f5954c8a48d5248a251d2030e31f18decb7f7f8b0118ec0e16ec0a84ea4c943ccde7056b80de162954c355
 EBUILD httping-2.5.ebuild 1420 BLAKE2B d9d7ecc5c2ad171cb7dfac0bd8cc0d2ab01e398b84b02a89ef6e3d10e0435b5c0ef8cf105f8b38b74872895b3015100e2dfdcc7dcda4c3fda37339eac742c215 SHA512 4cc4438bd25d63cbeb1fbd0b8eeb42eefb8554af1d00959850a353bcede18b2504832673ad2a1caaeb3487b5aa532003c30fe83cc80645fa64231032ccf5aadd
+EBUILD httping-9999999.ebuild 1382 BLAKE2B 83dd9fea5843d43c1fe09cbbbd16e4056e6328bac8bcd5f78a9002b52ffbe0303cf529156532a2fa5548601ea44558abbe36c1c8c0b40b1fc6aa09318131b5c9 SHA512 43b214c43ac7a7d1aab26afb168ebc980930f721599d793638f8e8a53ff806220cc48b67003a64ada4f59ba9cfc0162458db1d22182a0d927e51fcf78f2d0f70
 MISC metadata.xml 344 BLAKE2B 7a460cc6d5df200cd57028b8e773452df890b91fee885c1337c7d9470acb38611f70bff7b0ff37f2854d304b1a8c1da5cbf219971dac72cb5ea536ba60d906f5 SHA512 3a2c114ecfba2e62b28c1a2ddb96bf57d73dda9c9dc50070c07beabbee711b37a560a71230b5a3ec8726b4d394674dcbb5943b33a62daed0c267e774b5ccbce7
diff --git a/net-analyzer/httping/httping-9999999.ebuild b/net-analyzer/httping/httping-9999999.ebuild
new file mode 100644
index 000000000000..32a92c0aead0
--- /dev/null
+++ b/net-analyzer/httping/httping-9999999.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit git-r3 toolchain-funcs
+
+DESCRIPTION="like ping but for HTTP requests"
+HOMEPAGE="https://www.vanheusden.com/httping/"
+EGIT_REPO_URI="https://github.com/flok99/httping"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug fftw libressl l10n_nl ncurses ssl +tfo"
+
+RDEPEND="
+	fftw? ( sci-libs/fftw:3.0 )
+	ncurses? ( sys-libs/ncurses:0= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	ncurses? ( virtual/pkgconfig )
+"
+
+# This would bring in test? ( dev-util/cppcheck ) but unlike
+# upstream we should only care about compile/run time testing
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1-flags.patch
+)
+
+src_prepare() {
+	default
+
+	# doman does not get PN-LANG.CAT so we move things around and then point at
+	# it later
+	if use l10n_nl; then
+		mkdir nl || die
+		mv httping-nl.1 nl/httping.1 || die
+	fi
+}
+
+src_configure() {
+	# not an autotools script
+	echo > makefile.inc || die
+
+	use ncurses && LDFLAGS+=" $( $( tc-getPKG_CONFIG ) --libs ncurses )"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		FW=$(usex fftw) \
+		DEBUG=$(usex debug) \
+		NC=$(usex ncurses) \
+		SSL=$(usex ssl) \
+		TFO=$(usex tfo)
+}
+
+src_install() {
+	dobin httping
+	doman httping.1
+
+	use l10n_nl && doman -i18n=nl nl/httping.1
+}
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index b02c92651ad5..11931cd12aad 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.3.1-es7.x86_64.rpm 67341324 BLAKE2B 97fafcd057eb58e8528c0c9da69467e275dcdac405a60dfb5c1d7a39f705f607b3988c182ba60e7e7da1545d8c79e520ca6d35e5531e64db8323db3b2f44c5c4 SHA512 6112a4cb9d76634696f6a3c0e783edb28153e11bde20a68c4d2d37bb0c811354fdf5e20aedb1e7b700051966248b09b86e58ec9b4aff6dab1babac409b63ecfa
+DIST Nessus-8.3.2-es7.x86_64.rpm 68708928 BLAKE2B 7a5bea2de3ca5ad9f18ffa61857e611e137c4f78decb7b4c855e6e55d01c11e2b5d26960070d2d06a383018692ff6b7844c7872903e505422f73b3d5001d95b9 SHA512 6e84a1f85ae98bd352d0ed77dfc3bbb7117e6cdf64b8fc0718f9f2200a95c53828e7e5ecce586d1b9abe55b3318c63ef03f28ada7365c7a9f0046e65fb59e615
 EBUILD nessus-bin-6.10.5.ebuild 1769 BLAKE2B 7fa43dc45ad25e40adbd568636257f1514a9464ec33fe4b9bd850564ba8deaeceedc2fafa259d7c53dab3293bbed0e34947bf28ec75df2842e1ba899572beeb6 SHA512 7302cbbabb12cb59b88a80055e4ff3c535bd866e175070736116dd5c98546e0c7b24742822a6a64a7b01979703452c4c7419c512e9a9185a3a99ffe822fb75c0
-EBUILD nessus-bin-8.3.1.ebuild 1654 BLAKE2B 0d59c80388e1119268776c8c98c6996d1c702d6362e2d4d1f3f69c950352aa420c9484c48d636904e8842e38478d3af86c4a458b9833d24f4a7923a9e8d7e70c SHA512 97b5baa4b22213b5211acccfb63292f210170c4ee6156f1035e077b0a914c6f4aea263f10a76f8530cfecca50bd0bfd1b82b7261c5b001f51dbce7b0a37252df
+EBUILD nessus-bin-8.3.2.ebuild 1654 BLAKE2B 0d59c80388e1119268776c8c98c6996d1c702d6362e2d4d1f3f69c950352aa420c9484c48d636904e8842e38478d3af86c4a458b9833d24f4a7923a9e8d7e70c SHA512 97b5baa4b22213b5211acccfb63292f210170c4ee6156f1035e077b0a914c6f4aea263f10a76f8530cfecca50bd0bfd1b82b7261c5b001f51dbce7b0a37252df
 MISC metadata.xml 345 BLAKE2B 05fdd17a4decd9a096175a59991a6df8260591c09193fef114895d7d29e0f08210aacd4517678410813d06a27b1032889c529e2966427c5a9ad454f9534d25f5 SHA512 3535519b1c621f6df120e6aa39f9a11ec132b68499a029915650218c16e9ca1a07cb30409ace95b2aa0204194a61c7b4743051e1f4ffc94cb5ba3372cac72e8c
diff --git a/net-analyzer/nessus-bin/nessus-bin-8.3.1.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.3.2.ebuild
index 45aa75d3c45a..45aa75d3c45a 100644
--- a/net-analyzer/nessus-bin/nessus-bin-8.3.1.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-8.3.2.ebuild
diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest
index 4fea8b16e1b9..6d2b9c920f46 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 2488 BLAKE2B 366e5fb55f86395a6e8623dcfb0953bace87ffeb739e1dcb245539765aa681cb3500606e4e5df5e89b46914af2f1f0f20f8968408c46639e907fcd09f615930a SHA512 1ee597e59db5643e001d69dee93953b1bdc5325f55e100a3c900fe7be53c23f1af64996fa822510fc8b0e36a97b806c1a0288beaf0264c4b7abf14100c1270c1
+EBUILD nrpe-3.2.1-r1.ebuild 2486 BLAKE2B a71330ceb27dba3654f6e4923ef4e395e6f831bd2fafe23220e39cdf31aa9d3a898bec0b4ceca4a4a7fee73c76efb69207b4ddb7b264a6af4c0aae84fa2cbc19 SHA512 71e4bf9e5a6ad3f1ff1315d09b84d56b2b5772d7f0627f09c60fa6f63c81ebf1bc89e2980085efb0a9d9a54b8d98846010b5f26c66bfb863f2421cef2c6b0e79
 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 c5a933d6063e..42a98a8d1eed 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/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index f6fc4bbf383d..c74e4b02e956 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -1,6 +1,9 @@
 AUX vnstat-1.17-conf.patch 352 BLAKE2B d87c9de8abb481f3f6086ec056e4c0e78e7d0bf982e29ec635326b7c5b6b998109efe69750098e6cc1d0248b8917fd3797fde8f5ff5ce06e4843d6e23778ae5e SHA512 d95fd80ae1887137dda7b13812cdb962a35a06f60e182fc66017bcc68ee5aa9aaadca01745b8194f468f8ed453ebe347c87ae7ddb4985e0e88450a33a1f8830c
 AUX vnstat-1.17-drop-root.patch 359 BLAKE2B f2866f958a08aa7e09148bdbaddcf2942801dde16982e3dedaea927041c00a205c7f4d8f68dd4e3da028e203a2ceb3af33a4ebd7c4046ff56040818a200ba7e9 SHA512 9e0b5d5d8b26c0657f8af41e615365e8e71dda051225bda103466754dd39f2e77ae277ad9f539920c7ae77e86618a9944ee33fb4a35d60ee3593541a38549362
 AUX vnstat-1.17-run.patch 296 BLAKE2B 73d7de3444209da86390650ee4bae364bc849abb92508d665473d94877ebea7d25022985ec5939eb8e32f6ad4a9d45af91ff9e455f520d0119c7e2e4a46055a3 SHA512 4baacbe8c3f1bcfb585060e0502ea7bc24dc7e964ecd381dadc7fb33395aa5655c33e83726a402e5dba212b92a4a498926add3b50aebb674458542772cf51afd
+AUX vnstat-2.2-conf.patch 318 BLAKE2B 23e9e546a860c5b708fe4d67e5f67e5274e269d5fe6377b8d7921124894a585b9de15c992ae91313940ddc83c79b44ca3d2c529fe2f827d749a70e7c1a4d9031 SHA512 1d28d47adbed2e51eb22b7ed4773aa9ae6a94f1f9ab9e06b5e2501ca59d7ffdbd83ba862194dd2148e4b897c3d28ad4f63b6eb79f8b6ad3e43b7eea931a685a6
+AUX vnstat-2.2-drop-root.patch 415 BLAKE2B c027b6056ec7ae26c64165e170bae3d5823e5017f2d7d25d88b5f030b91d7d60cd1a898d352bc706436e1858e8f2b003e9f4325acddd858f707abf75a9f20d77 SHA512 95e7602f2bd3c7277e4cdabadf4c1379a8217125c72cb2d343d010f8bf877243d3ac02b539e39ce830e3c48e9cdca6c7f35a73d6852d3f66e87a071986a78231
+AUX vnstat-2.2-run.patch 297 BLAKE2B 120045cff99c18d9be8e8a1655f8f043906c2c77563f139973f049c55d8b4c56558f2c47f973e036cb2c5071aafc24e6a6881dc1e13e196fd095ceb20677ff94 SHA512 c1e01bc7e71b56ac958c8071400f6f82c312a5f157333a3298596b85011dab5beb65b8dbc51a5f62aed68b56562266f7306e1cef82a69664b7486b148814db43
 AUX vnstat.cron 220 BLAKE2B de51e83326485932b6112035ec9d25440685f9d110a854eaa7963a54b50ce078d6199d3e491a7e3bfc686af1866e250f0b30eeb2c246424b9805fe11717adf1f SHA512 c901385f97323d1a686cee63d015eaf9ad38ed195a1c0e25dae671dd7061ebc918498684c55b90b0674960891dfca4b83f458174892c1b9efb48cd362fdb8477
 AUX vnstat.cron-r1 177 BLAKE2B 1f015b8db93decce2877ce3c431cbc14c9bb2dd798f0762e5a7fb98d1c42e59e9839ecb6feb25312320cc2fb6b1aecd9b97323a6318a10a4426146c07094f2ae SHA512 8074d65cf2f28bd5c02fe741dbe20f8404bc2e25b94b43d0bcc829ca088828227805caf9cb8cae020ae0a9370d68dc3c757fedf07d48c0fc71ba944f2da1cb94
 AUX vnstatd.confd 216 BLAKE2B d8ffd76612a5a8ce6b62ba4056c3bc91385c1980683cb487cc5fe2432a8d2e363fbc7ebe1e21d553a3b8ea04dea735342fe6f681320c98e8b41d51a869721c4e SHA512 d645817913d5b52e928561b3d6a0e869d8ae5db81b97af91c1ebfc6a8cd2df666c1653e6dc5f91c0a890033a89692f77eaf081c1cae5590446c69a70ea263946
@@ -10,13 +13,10 @@ AUX vnstatd.initd-r2 874 BLAKE2B 4ce5936af3a375d30bc8ab1b5ea1ddf1c2b4910394b8a9e
 AUX vnstatd.systemd 262 BLAKE2B e54c30a1bfa6c7a8bba32fa93c3d2417506c55e9499754419b24179147a5b35f0c51cf61a3f7c4840c88f81d09101c427ba64b41f0922303b8c353caafb883db SHA512 35f9714641d1b3288bed659bd010ef1b8f0316f915622dcf5d3250e1acdd3b438762ae934fab2f6cd350274c7ec0f70a7d8946448bbc6db67be6f91cd86aa47c
 AUX vnstatd.tmpfile 35 BLAKE2B c56373ebe1abe1111f6927839d79094b6ffd11527ce4e21016c31fc227f9564218ca479455b7cf4eb697d18d8389ba65266b91d71c5bf22c83a9337ae1d861d9 SHA512 e13b52e3c4fe8743074ab2704b6a6cbe0c855589fe19e05bba98f0193473437f350dfdc9675689172c54ed83491d9caef0cbb842f6c2533b98366cd78a4f0bac
 DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7964aad90fb76c407c5f7fb0085e6f9f54408e8ebc667475c15f260d701c5924737f20921ebc0a35affd52be SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3
-DIST vnstat-1.18.tar.gz 242502 BLAKE2B 2190c33ddf1c0a573e638234a94a86eb44fcc39e106ce8ece1f5ee5314dcc1efee237376ec109eb0873b9cf27ac3fe663526512f98a130114d417380bcb82a31 SHA512 4f9f08a57586bc57ede3d66802ee977c69b5f76ab42aa36e942e8d827dfce806dfc04916646fac01f57b026742a639fc5f7395b141a1c03ad11a1f977d02aa68
-DIST vnstat-2.0.tar.gz 259439 BLAKE2B f28f10962ae2acf04fc6669268bf5cf911ca2a5c77422b773f82a1ae25a0f90c2022aa5981c701bfa0246340113e24e0c3854174f6b3bee17d5474b9ba0916f0 SHA512 d5c9012b692adc9032ca1abde8619bd6a5de53c7c03b0fcae5b4b901c9769285a9de0b3a4f1bc21cfd74b96cfb10130a95e90cf179126ea676a777e1a9579a62
 DIST vnstat-2.1.tar.gz 259622 BLAKE2B 703e1260d0ea81a016ed89dbfa830f97ff6e38ca2dd4c96ea08ca8293e71cde8cf0048e6a68b9cb6f2f94aaec66764bbfc718173897d40fd6e8166c07d7e627c SHA512 4c88795ee254cb550873e7db72a5f7b795553ef944c3f4df4c351e83376ea02ae6f3376b01edf727072fe2ba178372705a73483c24269acc4c173ee0e03f8930
-EBUILD vnstat-1.17-r3.ebuild 1516 BLAKE2B c1638aa8e9ae4f36fb1490e7133e48fcab98c2368ea2f673c3449dde1bbf1c4211209c2865837ccc1355fc9e635e7100430447b8906516369da45922f35ff9ca SHA512 49d2f2cc331e380d66dceedeab8ed04e5f9767f4efabc2cc3211618cdc2abcc949cc72038abd15cc89e57b7e2dfe672e27bbcf7e3a768d084dab93200786b447
+DIST vnstat-2.2.tar.gz 264037 BLAKE2B dc82798a0c619d2aea3d3cbdd42bb10f73769b0e64443407daabc8838e5af5b0ef718c0769321116269f1bc6f50e99133a1d38ccb730f658f3215a83180589b7 SHA512 47bd544ed071268774bf55a8269f50694d2af0b14fe3eb50b707c4f09c9a0c0653360ac892136275355b2a647a0fed731f007d135edf4bc9b04dc537bf248acc
 EBUILD vnstat-1.17.ebuild 1432 BLAKE2B 670816f4084b10dd622dd9ab90d95c01f185d9d7a51bddd430c5cb0b0fd7900b5cf3417310b814a7299102978c9d4f165e0991978defb025e2935f9922715059 SHA512 669b9f5f8638dcca0c97d2f1c0a160bbfbf24ac5dfa6c4e3c0d6b1280dc6fb5923c512924397576ccbe75c762464fa93aa4022c524fd167800da1c5195e8c9b4
-EBUILD vnstat-1.18.ebuild 1516 BLAKE2B c1638aa8e9ae4f36fb1490e7133e48fcab98c2368ea2f673c3449dde1bbf1c4211209c2865837ccc1355fc9e635e7100430447b8906516369da45922f35ff9ca SHA512 49d2f2cc331e380d66dceedeab8ed04e5f9767f4efabc2cc3211618cdc2abcc949cc72038abd15cc89e57b7e2dfe672e27bbcf7e3a768d084dab93200786b447
-EBUILD vnstat-2.0.ebuild 1528 BLAKE2B 757d07cd46bfd69e4095401ea4380ef235a7cce65c81274f694fe9f243345b26bc9d997a4442edac1ce6cc3f700057208a2992107a22e31292b5cb6ffcc2f268 SHA512 c61469e9817aa4c15e0bb1d8a7438e5f2cc5af01c9a9cc6f2429c5c180662a0eb38de51e6780984deb7d6070e55bdd8e9f8afbd0ac8d74c5042bd66fd960dabd
 EBUILD vnstat-2.1.ebuild 1528 BLAKE2B b9c5a2bb6af9f75f1576605a295a9beccbe17f031538132c592c04d1747936e92ca1d308342fe230996c7b330d32ab6356232a0ba05b7cebddc93c0b15a368b3 SHA512 84cfa2c2b275fdaec4c31586fb98736481c21f5cb7fe60e1a52eff45094712d631d370126e2fcb064d5ef72c46d79caa23938bb62f4b1c052ebdf6f1625c459a
-EBUILD vnstat-9999.ebuild 1499 BLAKE2B 55e75f51d727d550b7ce56ff65d8a14bd493ca074df2114ae18b1dad10061d1493f8e27ca28584b59730a3b75fbe7c5400c022174695362b864c3ebc7ac93526 SHA512 b618e04b5ffd88b00f9e0f744db908f2e637ef422b17889f12dedeec3f9d4e22e0f6161c4ea065ab3eac737b8ea711f8256aba0c9822f49af0a5fd7cf52a0e20
+EBUILD vnstat-2.2.ebuild 1525 BLAKE2B 6bd8f55fdc399980494b108f9152d8a4b5bf552feb98deaedafe82744a9f5f01e1517b01d8d616027dc714a8d78ea55b7d06ee8251d547239c9747f87e799b8c SHA512 049caeb2e5a1b717151bd57e88de2dd7a7df4fb2408bba910a4b0ecf5318997fb30db4e25c600e3a4c62d2fe84f88fc67222de931fbcd4b6e794df2f06cbcdbf
+EBUILD vnstat-9999.ebuild 1502 BLAKE2B 85b6e903a1cd01f95b3140ff957f06f2cae8e890279fde5b89d8e478e23a9a1e96cd4db7ad31d00fe1bfb269330a367f35c24e844e3399ec44774adc1c6d80c7 SHA512 8c8644661509f62cd77319e0d445371cfbf4b9533f4e0602978103c1b7460c64a1a242a2495aeb35ac81c6b2f5898d042bfc4f0c51d544e8156f5632a2a26b02
 MISC metadata.xml 603 BLAKE2B 6cd01f8334d5768e057d6866f9c8d739af3680787d9159638a504eeeb74b2f01a36775bfa3e2afeb169d2948e290e8995b2100d572603eaa5ffa44c96b15b385 SHA512 7dbda5d3a317201c8eb0000f2b55af6b2de6fd44368ab39b08c60ee8eb1355264a8886d9a484ab75d47c0c0ce3f41059a8f354f7d6480ae20e469e4c29ca31e2
diff --git a/net-analyzer/vnstat/files/vnstat-2.2-conf.patch b/net-analyzer/vnstat/files/vnstat-2.2-conf.patch
new file mode 100644
index 000000000000..7bea5d8ffe97
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstat-2.2-conf.patch
@@ -0,0 +1,11 @@
+--- a/cfg/vnstat.conf
++++ b/cfg/vnstat.conf
+@@ -143,7 +143,7 @@
+ LogFile "/var/log/vnstat/vnstat.log"
+ 
+ # file used as daemon pid / lock file
+-PidFile "/var/run/vnstat/vnstat.pid"
++PidFile "/run/vnstat/vnstat.pid"
+ 
+ # 1 = 64-bit, 0 = 32-bit, -1 = old style logic, -2 = automatic detection
+ 64bitInterfaceCounters -2
diff --git a/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch b/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch
new file mode 100644
index 000000000000..2ed3ec1404a4
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch
@@ -0,0 +1,15 @@
+--- a/cfg/vnstat.conf
++++ b/cfg/vnstat.conf
+@@ -69,10 +69,10 @@
+ ##
+ 
+ # switch to given user when started as root (leave empty to disable)
+-DaemonUser ""
++DaemonUser "vnstat"
+ 
+ # switch to given group when started as root (leave empty to disable)
+-DaemonGroup ""
++DaemonGroup "vnstat"
+ 
+ # try to detect interface maximum bandwidth, 0 = disable feature
+ # MaxBandwidth will be used as fallback value when enabled
diff --git a/net-analyzer/vnstat/files/vnstat-2.2-run.patch b/net-analyzer/vnstat/files/vnstat-2.2-run.patch
new file mode 100644
index 000000000000..bb9222b5fe2f
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstat-2.2-run.patch
@@ -0,0 +1,11 @@
+--- a/src/common.h
++++ b/src/common.h
+@@ -229,7 +229,7 @@
+ #define CREATEDIRS 1
+ #define UPDATEFILEOWNER 1
+ #define LOGFILE "/var/log/vnstat/vnstat.log"
+-#define PIDFILE "/var/run/vnstat/vnstat.pid"
++#define PIDFILE "/run/vnstat/vnstat.pid"
+ #define IS64BIT -2
+ 
+ /* no transparency by default */
diff --git a/net-analyzer/vnstat/vnstat-1.17-r3.ebuild b/net-analyzer/vnstat/vnstat-1.17-r3.ebuild
deleted file mode 100644
index c3e6409650f7..000000000000
--- a/net-analyzer/vnstat/vnstat-1.17-r3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd user
-
-DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
-HOMEPAGE="https://humdi.net/vnstat/"
-SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gd selinux test"
-
-COMMON_DEPEND="
-	gd? ( media-libs/gd[png] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-libs/check )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-vnstatd )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.17-conf.patch
-	"${FILESDIR}"/${PN}-1.17-drop-root.patch
-	"${FILESDIR}"/${PN}-1.17-run.patch
-)
-
-pkg_setup() {
-	enewgroup vnstat
-	enewuser vnstat -1 -1 /var/lib/vnstat vnstat
-}
-
-src_compile() {
-	emake ${PN} ${PN}d $(usex gd ${PN}i '')
-}
-
-src_install() {
-	use gd && dobin vnstati
-	dobin vnstat vnstatd
-
-	exeinto /usr/share/${PN}
-	newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron
-
-	insinto /etc
-	doins cfg/vnstat.conf
-	fowners root:vnstat /etc/vnstat.conf
-
-	keepdir /var/lib/vnstat
-	fowners vnstat:vnstat /var/lib/vnstat
-
-	newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd
-	newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd
-
-	systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service
-	systemd_newtmpfilesd "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf
-
-	use gd && doman man/vnstati.1
-	doman man/vnstat.1 man/vnstatd.1
-
-	newdoc INSTALL README.setup
-	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
-}
diff --git a/net-analyzer/vnstat/vnstat-1.18.ebuild b/net-analyzer/vnstat/vnstat-1.18.ebuild
deleted file mode 100644
index c3e6409650f7..000000000000
--- a/net-analyzer/vnstat/vnstat-1.18.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd user
-
-DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
-HOMEPAGE="https://humdi.net/vnstat/"
-SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gd selinux test"
-
-COMMON_DEPEND="
-	gd? ( media-libs/gd[png] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-libs/check )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-vnstatd )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.17-conf.patch
-	"${FILESDIR}"/${PN}-1.17-drop-root.patch
-	"${FILESDIR}"/${PN}-1.17-run.patch
-)
-
-pkg_setup() {
-	enewgroup vnstat
-	enewuser vnstat -1 -1 /var/lib/vnstat vnstat
-}
-
-src_compile() {
-	emake ${PN} ${PN}d $(usex gd ${PN}i '')
-}
-
-src_install() {
-	use gd && dobin vnstati
-	dobin vnstat vnstatd
-
-	exeinto /usr/share/${PN}
-	newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron
-
-	insinto /etc
-	doins cfg/vnstat.conf
-	fowners root:vnstat /etc/vnstat.conf
-
-	keepdir /var/lib/vnstat
-	fowners vnstat:vnstat /var/lib/vnstat
-
-	newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd
-	newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd
-
-	systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service
-	systemd_newtmpfilesd "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf
-
-	use gd && doman man/vnstati.1
-	doman man/vnstat.1 man/vnstatd.1
-
-	newdoc INSTALL README.setup
-	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
-}
diff --git a/net-analyzer/vnstat/vnstat-2.0.ebuild b/net-analyzer/vnstat/vnstat-2.2.ebuild
index 8838083fcd65..c5e123218abe 100644
--- a/net-analyzer/vnstat/vnstat-2.0.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit systemd user
 
 DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
@@ -26,9 +26,9 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-vnstatd )
 "
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.17-conf.patch
-	"${FILESDIR}"/${PN}-1.17-drop-root.patch
-	"${FILESDIR}"/${PN}-1.17-run.patch
+	"${FILESDIR}"/${PN}-2.2-conf.patch
+	"${FILESDIR}"/${PN}-2.2-drop-root.patch
+	"${FILESDIR}"/${PN}-2.2-run.patch
 )
 
 pkg_setup() {
diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild
index 5e41cb65356a..0b1d30191127 100644
--- a/net-analyzer/vnstat/vnstat-9999.ebuild
+++ b/net-analyzer/vnstat/vnstat-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit git-r3 systemd user
 
 DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
@@ -26,9 +26,9 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-vnstatd )
 "
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.17-conf.patch
-	"${FILESDIR}"/${PN}-1.17-drop-root.patch
-	"${FILESDIR}"/${PN}-1.17-run.patch
+	"${FILESDIR}"/${PN}-2.2-conf.patch
+	"${FILESDIR}"/${PN}-2.2-drop-root.patch
+	"${FILESDIR}"/${PN}-2.2-run.patch
 )
 
 pkg_setup() {
@@ -63,6 +63,6 @@ src_install() {
 	use gd && doman man/vnstati.1
 	doman man/vnstat.1 man/vnstatd.1
 
-	newdoc INSTALL README.setup
-	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
+	newdoc INSTALL.md README.setup
+	dodoc CHANGES README.md UPGRADE.md FAQ examples/vnstat.cgi
 }