gentoo resync : 10.11.2019

30 files changed, 407 insertions, 489 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index a01b9bcf7bcf..b63dc3598850 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/bsnmp/Manifest b/net-analyzer/bsnmp/Manifest
deleted file mode 100644
index 926a18d307fc..000000000000
--- a/net-analyzer/bsnmp/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX bsnmp-1.10-gcc34.patch 311 BLAKE2B e0759cbafb17d415999301d6cb0e10b0cf9b2ce1ef953ddf47cb10783f1ac878fdc829999066e68d785f04347d6ed13864c94036edb1984fa7b5022ac253c43c SHA512 59d032c9779b3ed0e94891955fa80468b9a156002dd7f2d0d617aef161c22d4925d877e71d7a3f7c5acd7886ee503158deb26189bc62c94e706904ed6ccbfa32
-AUX bsnmp-1.12-mibII.patch 465 BLAKE2B a8349fd462a89070faa1553e6ae71be85fdc1d6a37abe5779693893e3972b10dee872db828a05702d5878c1e9a1795bce0b9cef9dfec67c0ee45b24aeeab7433 SHA512 d3d9950285864736ba606399724add0f033b718c7c707e65fa8e556dd81d86291d8755b9f8de12792c547f715d8c634e89a3ced94c1c8012804462bedca286e8
-AUX bsnmpd.init 239 BLAKE2B 0d4587060ee4866b15b0e435ae4040c75de4f4559b299f5d89c4722e48f94c5135686aa9cf51f6ddacd9c68b41d3f80c180bfdab3531e3a0bbed04ccbdf5352c SHA512 c10f543c37a873a69e93d7362709208726eea98aae8fafd108040d9f4d1d4d4c22d40ab7bfbf115d6598471c8ad332766a844a7bd4ec1424215bf0decec15e00
-AUX snmpd.config 2426 BLAKE2B e6031d307de5c70ff992cdb38586f328dfc76582ef93b9dfb4efe21e8382767744bace0d062ae696819149235cc44dc7ace93c442c1706dbc0ad8638470905fb SHA512 3fb763b93ba4bc11d1a03ef147f7303294ca26073bc10b55f22a7eb5107fd58f819079a1af9d2d8827e4cb5d5b645b3c44636482ea0855db3235be07a5f2d80b
-AUX werror.patch 532 BLAKE2B 46bd51ccd573d385745b568945e1e42ff8887af89d4aaaa3dafd15079e9ad269eea358f0651fb6f17011d2156d37694e9245d15be9df85f43971d2da95178df3 SHA512 2de595316841e7602b0950bcbe53c85af049c9474b12518119704df56663734616b64a16a8d1ccb34fbd240b0cd19afa6dc70289673ede9c8062f2becd0c98a3
-DIST bsnmp-1.11a.tar.gz 408165 BLAKE2B 11240fddb1b449927749baddc0c6a6e0d03c85a51fe6f3901e0b915f6060743875224de319c652f5aa70ed5f0a6d2a4ecea059a5d4d4441dff409bfa9be9a1bd SHA512 8b3695a147b5a3c012509f73c0627c8f7b66d99c54c53636d2add2d3427acf331bc4168ee88b8cad2536c1a15901fc38c4acd51e7630c48f4972504d94e8dc08
-DIST bsnmp-1.12.tar.gz 418653 BLAKE2B 87ec6325b2daade01ed46e6c1b5bdccaef310065e00a82b947c33d7451ec5485faa34d88b7371cb114fd4e70eee4746cb13ffaed2586bd35ed581883e1f748c3 SHA512 c2c292e21632ea475d30aafaf7f66566389bccabfd20886a27bc4af98dba24139568c0eaddd36710655abac9ca6a38525136e06f2cf7be8b9db8ca656b2021c9
-EBUILD bsnmp-1.11a.ebuild 836 BLAKE2B 1a3c27bc8c31f2bc3c62a949e92601c2f2ce399cfbc87d4d114d510087c11d0cd210881ab83f64d10b382cfb901e31f960b32be1bc0ac8e73251645f2a908d1d SHA512 e441784d65460217e765779d6101b19f1e87cae073545af05f2084a6088d1e4234af2e972fae24da274b383ac313980dd4dc125b5a01ad3dcd9742cdce367425
-EBUILD bsnmp-1.12-r1.ebuild 1031 BLAKE2B 9239e81c30721efc4e263ac124856c198d79061ff82dff7b7be85558c3a710edb086a4ce13984a04dfff1654c43fe92a0a9d24a089573d6f883abf65785d4c99 SHA512 3ee8f319ebbf173829aa53e7a4841997986393768f38e1337d8a6ecd95802f896306ac6dfd4b4f09ee819768b4e2011f585d25d9331d49c9fae177475e583034
-EBUILD bsnmp-1.12.ebuild 868 BLAKE2B 635988bc56ce9d251ae7863ed8c2bd41fc8e15d7ecde628919d1dbe7fb417a154a120e192514dc15e38cdb817b999a7ac0946778d461e832e289aa879f730474 SHA512 0c4ebbcd485155bbf80d6635ff8c62e85c9799ec6068769d9f4edcc3eb3cdc024a4e5e6ade1d439bf4b1c2c7e449bf46a495c6c40f91abbd721634d7796ba94a
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/bsnmp/bsnmp-1.11a.ebuild b/net-analyzer/bsnmp/bsnmp-1.11a.ebuild
deleted file mode 100644
index f19dc60cea7a..000000000000
--- a/net-analyzer/bsnmp/bsnmp-1.11a.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Mini-SNMP Daemon and Library"
-HOMEPAGE="http://people.freebsd.org/~harti/"
-SRC_URI="http://people.freebsd.org/~harti/bsnmp/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="tcpd"
-
-DEPEND="dev-libs/libbegemot
-	tcpd? ( sys-apps/tcp-wrappers )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.10-gcc34.patch"
-}
-
-src_compile() {
-	if use elibc_glibc; then
-		# bsnmp is bsd-based, without this it will fail
-		append-flags "-D_BSD_SOURCE"
-	fi
-
-	filter-flags -fno-inline
-
-	econf \
-		--with-libbegemot=/usr \
-		$(use_with tcpd tcpwrappers) \
-		|| die "econf failed"
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	einstall || die "make install failed"
-}
diff --git a/net-analyzer/bsnmp/bsnmp-1.12-r1.ebuild b/net-analyzer/bsnmp/bsnmp-1.12-r1.ebuild
deleted file mode 100644
index fdd92f44ff94..000000000000
--- a/net-analyzer/bsnmp/bsnmp-1.12-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Mini-SNMP Daemon and Library"
-HOMEPAGE="http://people.freebsd.org/~harti/"
-SRC_URI="http://people.freebsd.org/~harti/bsnmp/${P}.tar.gz"
-
-LICENSE="BSD GPL-2" # GPL-2 init script
-SLOT="0"
-KEYWORDS=""
-IUSE="tcpd"
-
-DEPEND="dev-libs/libbegemot
-	tcpd? ( sys-apps/tcp-wrappers )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.10-gcc34.patch"
-	epatch "${FILESDIR}/werror.patch"
-	epatch "${FILESDIR}/${P}-mibII.patch"
-}
-
-src_compile() {
-	if use elibc_glibc; then
-		# bsnmp is bsd-based, without this it will fail
-		append-flags "-D_BSD_SOURCE"
-	fi
-
-	filter-flags -fno-inline
-
-	econf \
-		--with-libbegemot=/usr \
-		$(use_with tcpd tcpwrappers) \
-		|| die "econf failed"
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	einstall || die "make install failed"
-	newinitd "${FILESDIR}"/bsnmpd.init bsnmpd || die
-	insinto /etc
-	doins "${FILESDIR}"/snmpd.config
-}
diff --git a/net-analyzer/bsnmp/bsnmp-1.12.ebuild b/net-analyzer/bsnmp/bsnmp-1.12.ebuild
deleted file mode 100644
index 57b8a2e3afd5..000000000000
--- a/net-analyzer/bsnmp/bsnmp-1.12.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Mini-SNMP Daemon and Library"
-HOMEPAGE="http://people.freebsd.org/~harti/"
-SRC_URI="http://people.freebsd.org/~harti/bsnmp/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="tcpd"
-
-DEPEND="dev-libs/libbegemot
-	tcpd? ( sys-apps/tcp-wrappers )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.10-gcc34.patch"
-	epatch "${FILESDIR}/werror.patch"
-}
-
-src_compile() {
-	if use elibc_glibc; then
-		# bsnmp is bsd-based, without this it will fail
-		append-flags "-D_BSD_SOURCE"
-	fi
-
-	filter-flags -fno-inline
-
-	econf \
-		--with-libbegemot=/usr \
-		$(use_with tcpd tcpwrappers) \
-		|| die "econf failed"
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	einstall || die "make install failed"
-}
diff --git a/net-analyzer/bsnmp/files/bsnmp-1.10-gcc34.patch b/net-analyzer/bsnmp/files/bsnmp-1.10-gcc34.patch
deleted file mode 100644
index f1220b83d521..000000000000
--- a/net-analyzer/bsnmp/files/bsnmp-1.10-gcc34.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur -x '*~' bsnmp-1.10/snmp_ntp/snmp_ntp.c bsnmp-1.10-fix/snmp_ntp/snmp_ntp.c
---- bsnmp-1.10/snmp_ntp/snmp_ntp.c	2005-05-23 11:03:48.000000000 +0200
-+++ bsnmp-1.10-fix/snmp_ntp/snmp_ntp.c	2005-07-10 01:58:35.557888936 +0200
-@@ -360,6 +360,8 @@
- 		free(rpkt);
- 		return (-1);
- 	}
-+	
-+	return (-1);
- }
- 
- /*
diff --git a/net-analyzer/bsnmp/files/bsnmp-1.12-mibII.patch b/net-analyzer/bsnmp/files/bsnmp-1.12-mibII.patch
deleted file mode 100644
index c93191823d6e..000000000000
--- a/net-analyzer/bsnmp/files/bsnmp-1.12-mibII.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/snmp_mibII/Makefile.in b/snmp_mibII/Makefile.in
-index d14c179..3a99850 100755
---- a/snmp_mibII/Makefile.in
-+++ b/snmp_mibII/Makefile.in
-@@ -10,7 +10,7 @@ MOD=	mibII
- SRCS=	${MOD}_tree.c mibII.c mibII_ifmib.c mibII_ip.c			\
- 	mibII_interfaces.c mibII_ipaddr.c mibII_ifstack.c		\
- 	mibII_rcvaddr.c mibII_nettomedia.c mibII_tcp.c mibII_udp.c	\
--	mibII_route.c
-+	mibII_route.c mibII_begemot.c
- INCS=	snmp_${MOD}.h
- DEFS=	mibII_tree.def
- MAN3=	snmp_mibII.3
diff --git a/net-analyzer/bsnmp/files/bsnmpd.init b/net-analyzer/bsnmp/files/bsnmpd.init
deleted file mode 100644
index 947e542a0437..000000000000
--- a/net-analyzer/bsnmp/files/bsnmpd.init
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Mini-SNMP Daemon"
-command="/usr/bin/bsnmpd"
-pidfile="/var/run/snmpd.pid"
-
-depend() {
-    use net
-}
diff --git a/net-analyzer/bsnmp/files/snmpd.config b/net-analyzer/bsnmp/files/snmpd.config
deleted file mode 100644
index 26f9f1aeb163..000000000000
--- a/net-analyzer/bsnmp/files/snmpd.config
+++ /dev/null
@@ -1,98 +0,0 @@
-# $FreeBSD: src/etc/snmpd.config,v 1.9.10.1.8.1 2012/03/03 06:15:13 kensmith Exp $
-#
-# Example configuration file for bsnmpd(1).
-#
-
-#
-# Set some common variables
-#
-location := "Room 200"
-contact := "sysmeister@example.com"
-system := 1	# FreeBSD
-traphost := localhost
-trapport := 162
-
-# Change this!
-read := "public"
-# Uncomment begemotSnmpdCommunityString.0.2 below that sets the community
-# string to enable write access.
-write := "geheim"
-trap := "mytrap"
-
-#
-# Configuration
-#
-%snmpd
-begemotSnmpdDebugDumpPdus	= 2
-begemotSnmpdDebugSyslogPri	= 7
-
-#
-# Set the read and write communities.
-#
-# The default value of the community strings is NULL (note, that this is
-# different from the empty string). This disables both read and write access.
-# To enable read access only the read community string must be set. Setting
-# the write community string enables both read and write access with that
-# string.
-#
-# Be sure to understand the security implications of SNMPv2 - the community
-# strings are readable on the wire!
-#
-begemotSnmpdCommunityString.0.1	= $(read)
-# begemotSnmpdCommunityString.0.2	= $(write)
-begemotSnmpdCommunityDisable	= 1
-
-# open standard SNMP ports
-begemotSnmpdPortStatus.0.0.0.0.161 = 1
-
-# open a unix domain socket
-begemotSnmpdLocalPortStatus."/var/run/snmpd.sock" = 1
-begemotSnmpdLocalPortType."/var/run/snmpd.sock" = 4
-
-# send traps to the traphost
-begemotTrapSinkStatus.[$(traphost)].$(trapport) = 4
-begemotTrapSinkVersion.[$(traphost)].$(trapport) = 2
-begemotTrapSinkComm.[$(traphost)].$(trapport) = $(trap)
-
-sysContact	= $(contact)
-sysLocation	= $(location)
-sysObjectId 	= 1.3.6.1.4.1.12325.1.1.2.1.$(system)
-
-snmpEnableAuthenTraps = 2
-
-#
-# Load MIB-2 module
-#
-begemotSnmpdModulePath."mibII"	= "/usr/lib/libsnmp_mibII.so.3.0"
-
-# Force a polling rate for the 64-bit interface counters in case
-# the automatic computation is wrong (which may be the case if an interface
-# announces the wrong bit rate via its MIB).
-#%mibII
-#begemotIfForcePoll = 2000
-
-#
-# Netgraph module
-#
-#begemotSnmpdModulePath."netgraph" = "/usr/lib/snmp_netgraph.so"
-#
-#%netgraph
-#begemotNgControlNodeName = "snmpd"
-
-#
-# pf(4) module
-#
-#begemotSnmpdModulePath."pf"	= "/usr/lib/snmp_pf.so"
-
-#
-# Host resources module
-#  This requires the mibII module.
-#
-#begemotSnmpdModulePath."hostres" = "/usr/lib/snmp_hostres.so"
-
-#
-# Bridge module
-#  This requires the mibII module.
-#
-#begemotSnmpdModulePath."bridge" = "/usr/lib/snmp_bridge.so"
-
diff --git a/net-analyzer/bsnmp/files/werror.patch b/net-analyzer/bsnmp/files/werror.patch
deleted file mode 100644
index 7a0968e84441..000000000000
--- a/net-analyzer/bsnmp/files/werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bsnmp-1.12/config/Makefile.pre.old	2012-04-26 10:45:58.000000000 -0400
-+++ bsnmp-1.12/config/Makefile.pre	2012-04-26 10:46:11.000000000 -0400
-@@ -53,7 +53,7 @@
- # Assume a Posix-ish make that passes MAKEFLAGS in the environment.
- SUBMAKE= $(MAKE) --no-print-directory
- 
--WARNS=	-Wsystem-headers -Werror -Wall -Wno-format-y2k -W	\
-+WARNS=	-Wsystem-headers -Wall -Wno-format-y2k -W		\
- 	-Wstrict-prototypes -Wmissing-prototypes		\
- 	-Wpointer-arith -Wreturn-type -Wcast-qual		\
- 	-Wwrite-strings -Wswitch -Wshadow -Wcast-align		\
diff --git a/net-analyzer/bsnmp/metadata.xml b/net-analyzer/bsnmp/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-analyzer/bsnmp/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/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest
index a82b86f53395..18d0a417ea7b 100644
--- a/net-analyzer/iptraf-ng/Manifest
+++ b/net-analyzer/iptraf-ng/Manifest
@@ -1,8 +1,10 @@
 AUX iptraf-ng-1.1.4-printf-format.patch 284 BLAKE2B 2357923966e14dde6497d86c63c9ce10884e88830fc3589ded97d43d7f22ce59bec7630c8f2d4aa0e11f0dba5a8720c5179f551d9913f510d0c9a68c3b9813b2 SHA512 d4b566bfa724209c920b688e3b51c722d05c6e63929d5338ee8dcfa978e0e0ff4ee8dd5e2d5f8a70afe317e2c379171fd28c7d7446a7b24b1efe17f525a5dad1
 AUX iptraf-ng-1.1.4-sprintf-format.patch 551 BLAKE2B 93a83234723924f80fa267b7bd29100d5f1108e44544fac5d484aabce6f3b15ea44431b5c28628c4a4f4327a287a49c95e744b758ada01ebe80a26312dfe0e00 SHA512 d3c49119f1ea5a3664e85b06e949bf574da3a000dcc9a3dcee92ae3d19e6a55a32031dacc4b759e3c63d85100129bb70ad58cbda7e45386da4b1660224198029
 AUX iptraf-ng-1.1.4-tcplog_flowrate_msg.patch 330 BLAKE2B edf2d08df81fb65c1f05bffd28bec622e008baa532353e90c5f275f10333dbbe1b67d9e2b801bbb424ea56628808b0f0a6f06fda6ee682deed42c71c9387a3ab SHA512 4b0c318ad245a82bb44243e23322f3d71ef4af9b4c86c95911e4da1e8145418ac7b9ee76c7d33bdf05c1189ec782443382de773e228c76f179fab87d5e897ec6
+DIST iptraf-ng-1.1.4-github.tar.gz 556843 BLAKE2B 6f4e2bd8c4cf271d90732810f0ba6ab146b3471b723e657c180cf95ce8e1361d18c6803d5da56e872b0e49234956304fe1ff5532fde1332bc30a51a77ef8bdc0 SHA512 675165e08f979daf70fdbd0bd7ae24803860a182f3f1f6e6905f79f65b283470eedcc7e2f8608006c92af258cfad49c0b571652d843107cc79ad8eda63d4e5cb
 DIST iptraf-ng-1.1.4.tar.gz 583306 BLAKE2B c06fdc25838901fc5528057ade5ebe28b5679a6a545f461cef2a5f4d3cbc1346a7ab3e94f4fe317a1760067e480c3c622df1027591d978b0ac1236ba9203e9da SHA512 8cafb0000cec75eb4071156a9e9350ffe6de99cb6386e8f50d05337113872ee50082a30009d85faa02d83633a8e727039791332d600654321b95ca6cfc881774
 EBUILD iptraf-ng-1.1.4-r1.ebuild 1330 BLAKE2B 909e0003854fd0fc6221705b7e1a43fa9ecad1f2a2e1660479288ae8a265efebb51743f08096d03b9e7c470e18df92e458fc79e8c331fd5de4a99d6f634dbf9e SHA512 8e47e2b556632445670916d1fddea8254f9078c3237c4c48f076cf7b61ebe5ccae30600d7485cb518b56ccf9e235dbdd72e3bbcd18a08a591bfde3ba3702b85c
 EBUILD iptraf-ng-1.1.4-r2.ebuild 1434 BLAKE2B 557210a6fd82005b9dc18c56b531d34d35f47d87090a807818eb59107853b8a41e5a5ba4f5f7d4ee0e79a8c60b3194b7cf1903927579471966699e4565340bf0 SHA512 71fd8f9b5fcc3f36b46a09d15e6a1d1bfcf1643574a958b0a8228cfb1c56f542ee163de7aa661ad79fd4d6df06fb4d02399843d1372bf4552464ab468afda8e7
-EBUILD iptraf-ng-9999.ebuild 1209 BLAKE2B 1489bd6abcd4f21bdc16a1ecd15d660ba7582e0d6345cc2a8166454e3412f7666f54c1d7807fc1831197454c04556eb6fc760d25caca60cd814a0f1277dbc2b8 SHA512 922a1150e0858ff22161ad6636a6f54f95fac1e6dd683d895ecd409a18ffe14bb981d00bfa20e7fe538edcfbc5990065830ed817b5d56fa3becba4f34f3fda74
+EBUILD iptraf-ng-1.1.4-r3.ebuild 1424 BLAKE2B c7c984b211d11d24f62eb9c27972ef13a08eb9c82b20a21a47a8d3a5c649b2195142456f76c44e1cadcea82ee1d46a0e0821e45208fa236aa6e37696fd716a2e SHA512 894659dca195030e0a3ab7683bb49c1b772fdaf5614a62966d52e03a589d0abadd51607d495940e3f8a155978a9a48c5689ccfebb9389a856253378c37fade85
+EBUILD iptraf-ng-9999.ebuild 1211 BLAKE2B de919ac3801e2b9b526f0c7064b5f5eb6ecaeab908b063e550060b93961dbb7b7bd9fc8cd2519c56bbad174d169ec2028c87b000f42c192c1046da6e0d4ba512 SHA512 68ab03abef69a33d4dd9e1349ec95e7ff0c932d116226f1fad114f805f05e58257d3616623b52da59b69836e6a03a3c4fb028e5b8308250d7507c675f78341fd
 MISC metadata.xml 376 BLAKE2B e5dd4ba7396c36e80ee1eed3eda4444bdd914e4701dd5acb0780b51a2e0e37020982bf624e1e8ecb81b5ba9af20f199885b52c03329d8238e43ca16c468a1900 SHA512 440bbe472188ac3acd7f0dcdddf8390e690a8f81cda49d6be5bed8a46cdf1fb10416f4313d426c408bd9f88501312af812badc765a24e76927b5ecfc64e7c225
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild
new file mode 100644
index 000000000000..b068ef51aeb0
--- /dev/null
+++ b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A console-based network monitoring utility"
+HOMEPAGE="https://github.com/iptraf-ng/iptraf-ng/"
+SRC_URI="${HOMEPAGE}archive/v${PV}.tar.gz -> ${P}-github.tar.gz"
+
+LICENSE="GPL-2 doc? ( FDL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.7-r7:0=
+"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+	!net-analyzer/iptraf
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-printf-format.patch
+	"${FILESDIR}"/${P}-sprintf-format.patch
+	"${FILESDIR}"/${P}-tcplog_flowrate_msg.patch
+)
+RESTRICT="test"
+
+src_prepare() {
+	sed -i \
+		-e '/^CC =/d' \
+		-e '/^CFLAGS/s:= -g -O2:+= :' \
+		-e '/^LDFLAGS =/d' \
+		-e 's|$(QUIET_[[:alpha:]]*)||g' \
+		Makefile || die
+	sed -i \
+		-e 's|IPTRAF|&-NG|g' \
+		-e 's|IPTraf|&-NG|g' \
+		-e 's|iptraf|&-ng|g' \
+		-e 's|rvnamed|&-ng|g' \
+		-e 's|RVNAMED|&-NG|g' \
+		src/*.8 || die
+
+	default
+}
+
+src_configure() {
+	# The configure script does not do very much we do not already control
+	append-cppflags '-DLOCKDIR=\"/run/lock/iptraf-ng\"'
+	tc-export CC
+}
+
+src_install() {
+	dosbin {iptraf,rvnamed}-ng
+
+	doman src/*.8
+	dodoc AUTHORS CHANGES FAQ README* RELEASE-NOTES
+
+	if use doc; then
+		docinto html
+		dodoc -r Documentation/*
+	fi
+
+	keepdir /var/{lib,log}/iptraf-ng #376157
+}
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild
index 284d4bb322e4..4c2ce0db62b9 100644
--- a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild
+++ b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 toolchain-funcs
+inherit flag-o-matic git-r3 toolchain-funcs
 
 DESCRIPTION="A console-based network monitoring utility"
 HOMEPAGE="https://github.com/iptraf-ng/iptraf-ng"
@@ -13,8 +13,6 @@ SLOT="0"
 KEYWORDS=""
 IUSE="doc"
 
-RESTRICT="test"
-
 RDEPEND="
 	>=sys-libs/ncurses-5.7-r7:0=
 "
@@ -23,10 +21,9 @@ DEPEND="
 	virtual/os-headers
 	!net-analyzer/iptraf
 "
+RESTRICT="test"
 
 src_prepare() {
-	default
-
 	sed -i \
 		-e '/^CC =/d' \
 		-e '/^CFLAGS/s:= -g -O2:+= :' \
@@ -40,15 +37,14 @@ src_prepare() {
 		-e 's|rvnamed|&-ng|g' \
 		-e 's|RVNAMED|&-NG|g' \
 		src/*.8 || die
-}
 
-# configure does not do very much we do not already control
-src_configure() { :; }
+	default
+}
 
-src_compile() {
+src_configure() {
+	# The configure script does not do very much we do not already control
+	append-cppflags '-DLOCKDIR=\"/run/lock/iptraf-ng\"'
 	tc-export CC
-	CFLAGS+=' -DLOCKDIR=\"/run/lock/iptraf-ng\"'
-	default
 }
 
 src_install() {
@@ -59,7 +55,7 @@ src_install() {
 
 	if use doc; then
 		docinto html
-		dodoc -r Documentation
+		dodoc -r Documentation/*
 	fi
 
 	keepdir /var/{lib,log}/iptraf-ng #376157
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index f986923bb649..3dcc07ea8df4 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,8 +1,11 @@
+AUX 99_nagios4-r1.conf 310 BLAKE2B 985059dfdef2159680e554149c805fc31d2cc635ff745cf8fa848f79a70577d825d50da05f63c4ff3b2171bd1683d40574df7c2650c12c7018f57118190cdb5c SHA512 8356e87bc69522838b17ecbcdcb8c9a9ceb51c9289651ff86160d3915fcf758d28e860f5f4f4465f319dec0712dd9e9c16a3aed682d5f8902ead4179a763dd10
 AUX 99_nagios4.conf 368 BLAKE2B 147f4b73bd2f7d71dabb56f646399b939d3a87c288efed9b135e9401120e81c27e2a05f96982b62e601d1dd9b21be494e866103467a363336234b8b15095daf1 SHA512 f0b239f23d74afa89483806f27fb9259054e46bc5742de8a414c9a9a9852a4fbdc14db45aeb148a15288196c8f7d51bdd485b005e20d012892e9e7321b50e161
+AUX lighttpd_nagios4-r1.conf 297 BLAKE2B 8976123407c47be6023c5dae57c833f7e0b43ae2c70348dcd72b754453b5a84dd335daa222b4b75e5c19b3d5c18b64496739bdb61b8f2f67f5655b80a0ffb65f SHA512 2ef5268e9ba228d12e3dabb5a23ce73e49b7149a047acd4a2daac3cd3415b5233aaaf3b972c85780e71bd5fe3eefb6755a6222b40a509104fb318e219366867f
 AUX lighttpd_nagios4.conf 325 BLAKE2B f89b9d5aed8305d54f76adf29c65ba20bee74b6c82d149c8b0a786dddacc58c62337072691136c486d4050d1e3bce82420398d5f525ebc0bb36eefdf3a6a2e7f SHA512 a2f854713512ee8ee5c451235beb6ffccf2e04617a98619c6de807a5abca0a424e0581c34b4d255dcbc108e677e18bed25dd33e3d38df8fe10d7d8d4fab015c9
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820 SHA512 f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
 DIST nagios-4.4.5.tar.gz 11304463 BLAKE2B e1152c2cd14aa790fbdb84c0d7b3eb4691b05793640bf2871bc4ab1e2d645bb52bb2d1660b7389fb26d599d015f71820988ed1cd58003ed978dd9df38c357675 SHA512 14372e2e4470229bd000a8ad94def6ae504ce3f8e2cf94a9da73736560d1e3b2633302fe232ee7099d88ba00aecde5a9e352901828d6d9a9cd1fdce203deca30
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
 EBUILD nagios-core-4.3.4.ebuild 6633 BLAKE2B b179113b24ff38a5c147de20cd48db21fa1379f4ab377c7c354a1f107f9651f1b348f7dbd26825aaacb1fe8ce54d8feedbd7a44b65d3c897480d1c87a1fd4183 SHA512 43668b229464870ff2843790b1fd3bed7e3e2c4ba58f8cc19b90d8e85418c0e86b3b604089ccf52a63f24f6c0fb5e9ea4045769b2f63df96dc7d70c53d3e8411
 EBUILD nagios-core-4.4.5-r3.ebuild 7470 BLAKE2B ceb783a9c27047b42b6464a2570452125f2ff6f5c7c6a3333a63f113b2c78037ca7cea1db6cd6ca783d58d3d4bfaa491fade7217bff29b76f2cbaa7496c74dc4 SHA512 4962381b6508363c2f330e81dd81d3de878cb7ef7428f8ba9fc71193c6a3de2c93c8c32298212312feaa72e76b0094fec7ff9e04a9f07072be8181c12497a82a
+EBUILD nagios-core-4.4.5-r4.ebuild 8065 BLAKE2B b60bdbed3ec5570ba690b1341889b504da237f7d0b5f676d5152098ce4e6e3bb3aa4c0ae6f33f4a251ca974e74b6534f201beaf5108da8f8f7399d5d561d52b6 SHA512 48e8a38aad29fed8908d8148e2dc69400e95daa900ec91121818a6168d24a9d381fadb7fd4687e3964509caef85fc7ef3259391752ab2317c23d6b49134a2af8
 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
diff --git a/net-analyzer/nagios-core/files/99_nagios4-r1.conf b/net-analyzer/nagios-core/files/99_nagios4-r1.conf
new file mode 100644
index 000000000000..54531ed6275b
--- /dev/null
+++ b/net-analyzer/nagios-core/files/99_nagios4-r1.conf
@@ -0,0 +1,16 @@
+<IfDefine NAGIOS>
+
+  ScriptAlias /nagios/cgi-bin/ @CGIBINDIR@
+  <Directory "@CGIBINDIR@">
+    AllowOverride AuthConfig
+    Options ExecCGI
+    Require all granted
+  </Directory>
+
+  Alias /nagios @WEBDIR@
+  <Directory "@WEBDIR@">
+    AllowOverride AuthConfig
+    Require all granted
+  </Directory>
+
+</IfDefine>
diff --git a/net-analyzer/nagios-core/files/lighttpd_nagios4-r1.conf b/net-analyzer/nagios-core/files/lighttpd_nagios4-r1.conf
new file mode 100644
index 000000000000..2653922ddc93
--- /dev/null
+++ b/net-analyzer/nagios-core/files/lighttpd_nagios4-r1.conf
@@ -0,0 +1,15 @@
+server.modules += ("mod_cgi")
+server.modules += ("mod_alias")
+
+$HTTP["url"] =~ "^/nagios/cgi-bin/" {
+  dir-listing.activate = "disable"
+  cgi.assign = (
+    ".pl"  => "/usr/bin/perl",
+    ".cgi" => ""
+  )
+}
+
+alias.url += (
+  "/nagios/cgi-bin" => "@CGIBINDIR@",
+  "/nagios"         => "@WEBDIR@"
+)
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r4.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.5-r4.ebuild
new file mode 100644
index 000000000000..4a5ffee95d4f
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.5-r4.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs user
+
+MY_P=${PN/-core}-${PV}
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/"
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+	web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd perl +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi
+#   * mod_cgid
+#   * mod_fcgid
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+DEPEND="dev-libs/libltdl:0
+	virtual/mailx
+	perl? ( dev-lang/perl:= )
+	web? (
+		app-arch/unzip
+		media-libs/gd[jpeg,png]
+		lighttpd? ( www-servers/lighttpd[php] )
+		apache2? (
+			|| (
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
+			|| (
+				dev-lang/php:*[apache2]
+				dev-lang/php:*[cgi]
+				dev-lang/php:*[fpm] )
+		)
+	)"
+RDEPEND="${DEPEND}
+	vim-syntax? ( app-vim/nagios-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 -1 -1 nagios
+}
+
+src_configure() {
+	local myconf
+
+	if use perl; then
+		myconf="${myconf} --enable-embedded-perl --with-perlcache"
+	fi
+
+	if use !apache2 && use !lighttpd ; then
+		myconf="${myconf} --with-command-group=nagios"
+	else
+		if use apache2 ; then
+			myconf="${myconf} --with-command-group=apache"
+			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
+		elif use lighttpd ; then
+			myconf="${myconf} --with-command-group=lighttpd"
+		fi
+	fi
+
+	econf ${myconf} \
+		--prefix="${EPREFIX}/usr" \
+		--bindir="${EPREFIX}/usr/sbin" \
+		--localstatedir="${EPREFIX}/var/lib/nagios" \
+		--sysconfdir="${EPREFIX}/etc/nagios" \
+		--libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" \
+		--with-cgibindir="${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin" \
+		--with-webdir="${EPREFIX}/usr/share/nagios/htdocs"
+
+	# The paths in the web server configuration files need to match
+	# those passed to econf above.
+	cp "${FILESDIR}/99_nagios4-r1.conf" \
+	   "${FILESDIR}/lighttpd_nagios4-r1.conf" \
+	   "${T}/" || die "failed to create copies of web server conf files"
+
+	sed -e "s|@CGIBINDIR@|${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin|g" \
+		-e "s|@WEBDIR@|${EPREFIX}/usr/share/nagios/htdocs|" \
+		-i "${T}/99_nagios4-r1.conf" \
+		-i "${T}/lighttpd_nagios4-r1.conf" \
+		|| die "failed to substitute paths into web server conf files"
+
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) nagios
+
+	if use web; then
+		# Only compile the CGIs/HTML when USE=web is set.
+		emake CC=$(tc-getCC) DESTDIR="${D}" cgis html
+	fi
+}
+
+src_install() {
+	dodoc Changelog CONTRIBUTING.md README.md THANKS UPGRADING
+
+	# There is no way to install the CGIs unstripped from the top-level
+	# makefile, so descend into base/ here. The empty INSTALL_OPTS
+	# ensures that root:root: owns the nagios executables.
+	cd "${S}/base" || die
+	emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
+	cd "${S}" || die
+
+	# Otherwise this gets installed as 770 and you get "access denied"
+	# for some reason or other when starting nagios. The permissions
+	# on nagiostats are just for consistency (these should both get
+	# fixed upstream).
+	fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats
+
+	# INSTALL_OPTS are needed for most of install-basic, but we don't
+	# want them on the LIBEXECDIR, argh.
+	emake DESTDIR="${D}" install-basic
+	fowners root:root /usr/$(get_libdir)/nagios/plugins
+
+	# Don't make the configuration owned by the nagios user, because
+	# then he can edit nagios.cfg and trick nagios into running as root
+	# and doing his bidding.
+	emake INSTALL_OPTS="" DESTDIR="${D}" install-config
+
+	# No INSTALL_OPTS used in install-commandmode, thankfully.
+	emake DESTDIR="${D}" install-commandmode
+
+	# The build system installs these directories, but portage assumes
+	# that the build system doesn't know what it's doing so we have to
+	# keepdir them, too. I guess you'll have to manually re-check the
+	# upstream build system forever to see if this is still necessary.
+	keepdir /var/lib/nagios{,/archives,/rw,/spool,/spool/checkresults}
+
+	if use web; then
+		# There is no way to install the CGIs unstripped from the
+		# top-level makefile, so descend into cgi/ here. The empty
+		# INSTALL_OPTS ensures that root:root: owns the CGI executables.
+		cd "${S}/cgi" || die
+		emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
+		cd "${S}" || die
+
+		# install-html installs the new exfoliation theme
+		emake INSTALL_OPTS="" DESTDIR="${D}" install-html
+
+		if use classicui; then
+			# This overwrites the already-installed exfoliation theme
+			emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui
+		fi
+
+		# Install cute Gentoo icons (bug #388323), setting their
+		# owner, group, and mode to match those of the rest of Nagios's
+		# images.
+		insinto /usr/share/nagios/htdocs/images/logos
+		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
+	fi
+
+	newinitd startup/openrc-init nagios
+
+	if use web ; then
+		if use apache2 ; then
+			# Install the Nagios configuration file for Apache.
+			insinto "/etc/apache2/modules.d"
+			doins "${T}/99_nagios4-r1.conf"
+		elif use lighttpd ; then
+			# Install the Nagios configuration file for Lighttpd.
+			insinto /etc/lighttpd
+			newins "${T}/lighttpd_nagios4-r1.conf" nagios.conf
+		else
+			ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
+			ewarn "out of the box. Since you are not using one of them, you"
+			ewarn "will have to configure your webserver yourself."
+		fi
+	fi
+}
+
+pkg_postinst() {
+
+	if use web; then
+		if use apache2 || use lighttpd ; then
+			if use apache2; then
+				elog "To enable the Nagios web front-end, please edit"
+				elog "${ROOT}etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
+				elog "to APACHE2_OPTS. Then Nagios will be available at,"
+				elog
+			elif use lighttpd; then
+				elog "To enable the Nagios web front-end, please add"
+				elog "'include \"nagios.conf\"' to the lighttpd configuration"
+				elog "file at ${ROOT}etc/lighttpd/lighttpd.conf. Then Nagios"
+				elog "will be available at,"
+				elog
+			fi
+
+			elog "  http://localhost/nagios/"
+		fi
+	fi
+
+	elog
+	elog "If your kernel has /proc protection, nagios"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding nagios into"
+	elog "the group wheel, but this is not recomended."
+	elog
+
+	if [ -n "${REPLACING_VERSIONS}" ]; then
+		ewarn "The local state directory for nagios has changed in v4.4.5,"
+		ewarn "from ${EROOT}var/nagios to ${EROOT}var/lib/nagios. If you"
+		ewarn "wish to migrate your state to the new location, first stop"
+		ewarn "nagios and then run"
+		ewarn ""
+		ewarn "  diff --recursive --brief ${EROOT}var/nagios ${EROOT}var/lib/nagios"
+		ewarn ""
+		ewarn "to identify any files that should be moved to the new"
+		ewarn "location. They can simply be moved with \"mv\" before"
+		ewarn "restarting nagios."
+	fi
+}
diff --git a/net-analyzer/nagios-plugin-check_lm_sensors/Manifest b/net-analyzer/nagios-plugin-check_lm_sensors/Manifest
index f208510dfec1..64607452ba8a 100644
--- a/net-analyzer/nagios-plugin-check_lm_sensors/Manifest
+++ b/net-analyzer/nagios-plugin-check_lm_sensors/Manifest
@@ -1,3 +1,3 @@
-DIST nagios-plugin-check_lm_sensors-4.1.1_p20170912.tar.gz 21681 BLAKE2B 7144c9b9fc4a2b2ccd964ce356809e8ea393b05f86015e5efe5b0ef70fccb585d520fdbba486fd1637c0ef9d2853d270cfb069f6bed22a105b5d80977a8481d7 SHA512 7870e29f58179bd71c917c2bcfe7ff0ee9f28be8b41b19b8f4f3e623fc3ca12395d6dbd55eef3f4084b3fedf2b1c4dc745357d045d19e1f00a3fe2e24a236e77
-EBUILD nagios-plugin-check_lm_sensors-4.1.1_p20170912.ebuild 883 BLAKE2B c1876996714bdbe8a4fc33f3710ab2d568d4ee4a524ffae3edf060913785f66d8dca206523dc633c139aef44fcc9f2930ed9cddbc5509211bb54c4c206fae290 SHA512 e975d6de793952394ba6515fc53a9771cfc84adbbbf3aaa0482903b2768fd4d103b97295e23bac99f31145152962c292a597dee85a661c7f961cf59c4d7f817e
+DIST nagios-plugin-check_lm_sensors-4.1.1_p20191028.tar.gz 21775 BLAKE2B d1b9946f45ea30e66baa87825c29aa64f18927ec5c07641d05789f189bc3aacb9764b3790eaa699d83c11860027bc36af9b85ba95b2845afa7533d03fd9d153d SHA512 4473719e5631edbebb8d8ee79578243a97c46cf70a14a2c780560df811f9d4d63081788b2059a9636f26d19a68ac0a44d6b68a4b386b1145d3f3fad8d60439fe
+EBUILD nagios-plugin-check_lm_sensors-4.1.1_p20191028.ebuild 906 BLAKE2B 05791b42b396406ea757ed94b6c21507f7371bde6cd0a6f7f3bdd518bf321d8b8853fc70a2b48129c6618e8a1657d842a54e1907ad29222b6e732811d1be51bc SHA512 0b85343ba3b1392382948059884ebcc065c0da86c070ddaa2507d19e694d5f41ebc0761ae1f4ae3caf170d43a6331c6db542f0c412f513bebe21745156de17c5
 MISC metadata.xml 414 BLAKE2B 659964f7e7ae50282899996b0341b6a2c4fbd7efca82612f48799900fa58c9d505ec61720e2f42c0efdcf9d23dd07353aa000628ae2cd0533fff1b8871d72474 SHA512 5fc065f5f51b539c6c73a2eac069cf6455a93fe0c2b33c4877c7cd8986c325502c825e4cf22bd0e64fccbd473f00932b53277f2634457837256a1b7229f699e7
diff --git a/net-analyzer/nagios-plugin-check_lm_sensors/nagios-plugin-check_lm_sensors-4.1.1_p20170912.ebuild b/net-analyzer/nagios-plugin-check_lm_sensors/nagios-plugin-check_lm_sensors-4.1.1_p20191028.ebuild
index 4587bb043e42..cd457b7e25dc 100644
--- a/net-analyzer/nagios-plugin-check_lm_sensors/nagios-plugin-check_lm_sensors-4.1.1_p20170912.ebuild
+++ b/net-analyzer/nagios-plugin-check_lm_sensors/nagios-plugin-check_lm_sensors-4.1.1_p20191028.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit perl-module vcs-snapshot
 
 MY_PN="${PN/nagios-plugin-/}"
-MY_COMMIT="36e453f791f0c8e32c2ead204f68511fd2ad4529"
+MY_COMMIT="80db8aa58be8f5d7800564d62305281be1ec8e6b"
 
 DESCRIPTION="Nagios plugin to monitor the values of onboard sensors and disk temperatures"
 HOMEPAGE="https://github.com/matteocorti/check_lm_sensors"
@@ -18,6 +18,7 @@ KEYWORDS="~amd64"
 
 DEPEND="dev-perl/Module-Install"
 RDEPEND="
+	dev-perl/JSON-MaybeXS
 	dev-perl/Monitoring-Plugin
 	virtual/perl-Getopt-Long
 "
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index bfccc700fd8a..6e97ca4578d2 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,5 +1,4 @@
 DIST netdata-1.18.1.tar.gz 3413907 BLAKE2B 9047f23875f446b378c80962e7f8e5c9424fbc2a405c75b76e242b26ae48336cbb026d3fc5c0e4127b0e5d1f1d5a14652ae92661474cd11ecbd64614461ab118 SHA512 fb72f4729e05ab83fe9462e31b10fc40243472ea9f6cbb9421e2ca549810f2f80b28b05e886faa66e15c53b317ee559a3e0fb3d382c36a424dd39fec779918d9
-EBUILD netdata-1.18.1-r1.ebuild 2775 BLAKE2B 07763a5746cda7ccd6e0c7949929606d8059e2d8912e17eeaa6a6087e33c3bb98791e41f3911411947f01e0d5177bfe2e2e934d22b0afac670af3271b60e9d4e SHA512 d6a8f0998f805de16e8f0c80377419405b2ac8249e988e2714aa594cdbf69144f359b4d7465a9e132c2f82a7a3904297516b33afd4c6b7f62b014a6881b2a2fa
-EBUILD netdata-1.18.1.ebuild 2905 BLAKE2B 170822976de7051309a9493de81456c05b729af237c083bd52e80eded0a264e605617a584c68d7791ca72c3a4d24583a90134297b16d5dc2daac89d158204b33 SHA512 dc5ac15f1cfb056b5d2946050c4b406c13e6a9f0c91d215e9fb7401976dbcae51317c2b8282adedb234f766db9578caf5e9fcd5a1345011c95514bebbbe55d98
-EBUILD netdata-9999.ebuild 2775 BLAKE2B 07763a5746cda7ccd6e0c7949929606d8059e2d8912e17eeaa6a6087e33c3bb98791e41f3911411947f01e0d5177bfe2e2e934d22b0afac670af3271b60e9d4e SHA512 d6a8f0998f805de16e8f0c80377419405b2ac8249e988e2714aa594cdbf69144f359b4d7465a9e132c2f82a7a3904297516b33afd4c6b7f62b014a6881b2a2fa
+EBUILD netdata-1.18.1-r1.ebuild 2757 BLAKE2B 1393c8575061ae6d7ee93b7f376155c0dba91da48ff283176f192fc46e01aff1459234fdadc4c8ab711e77169fc5e6c393dc87234ff30d900a9514aa6396a5ab SHA512 93d03fb2caeb01fb51a7e51b6191e8f99c4a0865165918d6e921b24a22c402dd601d8511980c28f2766320d0651da45e1015571c6b251b5bf5e2928cfe2d77eb
+EBUILD netdata-9999.ebuild 2874 BLAKE2B 6318cf1103aaacec8490bb2b149e6a9d52524fb915db5b46c5a78fec3840516abdcc578db3661eeb588ce176c5efd96be50dc9d95afd860e0d61f82d1cd8a0c5 SHA512 f4516f7657d973335768b662c7e18f58fcd05a0879fcc15763f72e2325888187d21d7a8153305445da567dcb2e28fe3a17bbea1c8ba87311c9bed79e8cfab437
 MISC metadata.xml 939 BLAKE2B fa9652dfc67eb1f088383a62d435349665f81dc9db3e1dd9c8412110f27297cc15681cbd2307c8a09cd490bd195e830311bf9a2612abfe14ecec18fb99a17eed SHA512 c9e7794f190c22d0b5a14d2431d7f15d7b048fcbcf8cf48499e6a71fb21f7fc0292bd944db6767e1f70413c484a338ffeccbf7a70c63d7c128e4bc72c7d24fe3
diff --git a/net-analyzer/netdata/netdata-1.18.1-r1.ebuild b/net-analyzer/netdata/netdata-1.18.1-r1.ebuild
index 955105404d12..3a8c0f7f98d0 100644
--- a/net-analyzer/netdata/netdata-1.18.1-r1.ebuild
+++ b/net-analyzer/netdata/netdata-1.18.1-r1.ebuild
@@ -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 cups dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
+IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -120,6 +120,4 @@ src_install() {
 	systemd_dounit system/netdata.service
 	insinto /etc/netdata
 	doins system/netdata.conf
-
-	doenvd 99netdata
 }
diff --git a/net-analyzer/netdata/netdata-1.18.1.ebuild b/net-analyzer/netdata/netdata-1.18.1.ebuild
deleted file mode 100644
index a9120717c5d0..000000000000
--- a/net-analyzer/netdata/netdata-1.18.1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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
-
-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 dbengine 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="
-	acct-group/netdata
-	acct-user/netdata
-	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 )
-	dbengine? (
-		dev-libs/libuv
-		app-arch/lz4
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	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"
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		--disable-jsonc \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(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:netdata /var/log/netdata
-	keepdir /var/log/netdata
-	fowners -Rc netdata:netdata /var/lib/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-
-	fowners -Rc root:netdata /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}/usr/$(get_libdir)/netdata/conf.d\"" > 99netdata
-	doenvd 99netdata
-}
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 955105404d12..b066aadbf11f 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -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 cups dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
+IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
 REQUIRED_USE="
 	mysql? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -120,6 +120,10 @@ src_install() {
 	systemd_dounit system/netdata.service
 	insinto /etc/netdata
 	doins system/netdata.conf
+}
 
-	doenvd 99netdata
+pkg_postinst() {
+	if use xen ; then
+		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
+	fi
 }
diff --git a/net-analyzer/poink/Manifest b/net-analyzer/poink/Manifest
index c5166566cbe6..820c70f57f89 100644
--- a/net-analyzer/poink/Manifest
+++ b/net-analyzer/poink/Manifest
@@ -1,4 +1,4 @@
-AUX poink-2.03-signed-char-fixup.patch 433 BLAKE2B ec4d276eb1a6db968aa0b0e349cf700a3e0368e2545ce34445a2e272d46775c5ad60d85209c7300818f0bcbb8ad7691affa359cbc51ba540d257bf03a909ba25 SHA512 13e05840df55c033245f1c4b07b63d479f2233e5baa37344539d85c94d9b4d612dd1daa19a7547fce6d037525035d4f5d26b30b7b8b6abc40d1a90c54e59f9db
+AUX poink-2.03-signed-char-fixup.patch 410 BLAKE2B 71c5a451b02f852e77bed4cd84020e29b14ab94f871fe4b26bd7116509c056d78c73a161c6228959ae0dd52c9954c249f3c0b1d329487ce242cf958ff4049888 SHA512 1ea5cf796923a37dfc22e67cfca4fdab2a24478d6e9ec58ff0b0913156a41dc727b8faa310e5ad2690c8e21e977db7fabe067ef95f8006eba366c49f66edda1e
 DIST poink-2.03.tar.gz 11427 BLAKE2B eeea10cbc7ba0b29d87de8c784ce0a68325ede592b190d570b71461c126517610309540876e46e6a1c49dbec8ef8009a4280e54a0e10e18086f27ecc8ae78b73 SHA512 25299093f3e70af97da85f0e7bbe9032466b3ef3ad886d4e658a0cfc11793570c2fb1eefd3330fa549517d033297e5ac3e90f7012a122c8ad988625372d986a8
-EBUILD poink-2.03.ebuild 652 BLAKE2B 15901ef5c4ca0b1a03842f5d0310637081cc104434a7166ad28770faae9eac46249b682662274db60d7da0005380b17d951c48ee12f9428c2dee20f0e4cd3a53 SHA512 7ac729e716b497c0b2f6d319215c7dec5e444ed5baa3a9d99402a5d4d2e1d29c9586463c6e3fafdfd0791508e9cd838fe31826ba182986b2ae60d4c805cb80a6
-MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
+EBUILD poink-2.03.ebuild 601 BLAKE2B 07dd6aa8873fc60240787c08030822033046b0fc2a588ef05aae5dea8d2d93e5999da6bc787f0eec22d7dc0e1c86cf85457d74ab76a91c8d33e133fa79287fba SHA512 3cfa073f09bc2c2a831cc89bddfaa674fdb8316b4537beb5cab7a7c416a73252ea8b43c43e77db408edb5f7e13a2c45f4f8ca8ea26194844e6bb27cc7ea2ca78
+MISC metadata.xml 481 BLAKE2B 165e600ce0bd03199be19f5e7f0aecbf8ccdec337c1975f5df955f89f964a31f0a8d07865692f7625aa332385dac44b49bd54756765625f18bf41464d45afe97 SHA512 467a35de86c66a59e3d54688d0994872a5279c11e3afd0b19d44c9cf135d3dbe475b398bef8f3600bcefd0e8914b875db576f05a641d2af1ec73f08fbf08b4bf
diff --git a/net-analyzer/poink/files/poink-2.03-signed-char-fixup.patch b/net-analyzer/poink/files/poink-2.03-signed-char-fixup.patch
index 543e58bb184e..deaff51bcf86 100644
--- a/net-analyzer/poink/files/poink-2.03-signed-char-fixup.patch
+++ b/net-analyzer/poink/files/poink-2.03-signed-char-fixup.patch
@@ -1,6 +1,6 @@
 diff -Nuar poink-2.03.orig/poink.c poink-2.03/poink.c
---- poink-2.03.orig/poink.c	2002-11-03 03:12:56.000000000 -0800
-+++ poink-2.03/poink.c	2007-06-11 11:59:09.763490735 -0700
+--- a/poink.c	2002-11-03 03:12:56.000000000 -0800
++++ b/poink.c	2007-06-11 11:59:09.763490735 -0700
 @@ -109,7 +109,8 @@
  	SOCKADDR_IN s;
  	struct timeval ping_start, ping_end;
diff --git a/net-analyzer/poink/metadata.xml b/net-analyzer/poink/metadata.xml
index 79d462e85571..b9c50c7f068b 100644
--- a/net-analyzer/poink/metadata.xml
+++ b/net-analyzer/poink/metadata.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-</maintainer>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		A TCP/IP-based ping implementation. It does not require special
+		privileges and is designed for multiuser shell systems. It is
+		meant to be a secure replacement for the standard IPv4 network
+		monitoring tool.
+	</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/poink/poink-2.03.ebuild b/net-analyzer/poink/poink-2.03.ebuild
index 856e7aef3a2b..e9f173afff5a 100644
--- a/net-analyzer/poink/poink-2.03.ebuild
+++ b/net-analyzer/poink/poink-2.03.ebuild
@@ -1,30 +1,29 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="TCP/IP-based ping implementation"
-HOMEPAGE="http://directory.fsf.org/security/system/poink.html"
-SRC_URI="http://ep09.pld-linux.org/~mmazur/poink/${P}.tar.gz"
-LICENSE="GPL-2"
+HOMEPAGE="https://directory.fsf.org/security/system/poink.html"
+SRC_URI="https://ep09.pld-linux.org/~mmazur/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE=""
-DEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PN}-2.03-signed-char-fixup.patch
-}
+PATCHES=( "${FILESDIR}/${PN}-2.03-signed-char-fixup.patch" )
 
 src_compile() {
-	emake CFLAGS="${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" || die
+	emake \
+	CFLAGS="${CFLAGS} ${LDFLAGS}" \
+	CC="$(tc-getCC)"
 }
 
 src_install() {
 	dobin poink poink6
 	newman ping.1 poink.1
-	dodoc README* ChangeLog COPYING
+	dodoc README* ChangeLog
 }
diff --git a/net-analyzer/raddump/Manifest b/net-analyzer/raddump/Manifest
index 3bd0822977f0..a6406ae284a2 100644
--- a/net-analyzer/raddump/Manifest
+++ b/net-analyzer/raddump/Manifest
@@ -1,3 +1,3 @@
 DIST raddump-0.3.1.tar.gz 175078 BLAKE2B b65bbf2200792c41ffe8363aaedc3e009fddc0b684f647352bba5011e84ab99c4741f9cf567e6a668c08ba7e4f8df144875379fbc7f1fff1a2217cdfbde1fde8 SHA512 35daf9c31fc21f29e713fa0f3e5c438f5762087060068506f6e0d829a0fabe74a99fdd1a35bf878aa0cbf5a5f0bec212b0af51b7c3df4e58ec0165b4dee023fa
-EBUILD raddump-0.3.1.ebuild 531 BLAKE2B 6f3bf012f900e5950712dd6f9d3bbd1c0d5a589b0090045b5f2102c2df52d204f8abf3ec9e2f2478a7a2b185b680d24b2d7252ec32fdcdb026ab425d9baa8ef1 SHA512 19f2578a373eeed9f5dd7e185b7a39cb88afa75d44d967a60c5a348b20f4fb174bd87d78e1b7a648b4d65ba359254ac4f709c104b063f176fddb2b81e4f45814
+EBUILD raddump-0.3.1.ebuild 437 BLAKE2B 435ffd657f0bc15355ee2800e130a5d4cef978454d2ca247853e32876cb2969e9b816c4ee829a9687e628c9ed49b1c35a70a28d7ec0a2d1528f3ded60efbfde8 SHA512 865caa2cb2a2d79d25e17eb0b5654b7002698deb670777cca38d08024b18dbcb90bd628ddf243942df33e002c697a8fe2dfc6212bc8900f15bfc822622109593
 MISC metadata.xml 303 BLAKE2B 3c2b1a4c5dcbad62c7402dacd87b8940fdb89ff2b92de1d174540c9f63ef7613392dce4f8d7c8f44798bd289b224d424f0a61a9738e2a72da91cd3d8b5f9c704 SHA512 909be6bfdade930b47197c82cbfdf7a38e1e1b88bf8dddb3fe887a75f3493c4fe343a274c87cc8e3ef73324f99049836d62da818b93a6b30954e140f5379926b
diff --git a/net-analyzer/raddump/raddump-0.3.1.ebuild b/net-analyzer/raddump/raddump-0.3.1.ebuild
index 5da55abc5891..84b83371d881 100644
--- a/net-analyzer/raddump/raddump-0.3.1.ebuild
+++ b/net-analyzer/raddump/raddump-0.3.1.ebuild
@@ -1,26 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit autotools
 
 DESCRIPTION="RADIUS packet interpreter"
 HOMEPAGE="https://sourceforge.net/projects/raddump/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
+
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE=""
-DEPEND=">=net-analyzer/tcpdump-3.8.3-r1"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	eautoreconf
-}
+RDEPEND=">=net-analyzer/tcpdump-3.8.3-r1"
+DEPEND=${RDEPEND}
 
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README TODO ChangeLog CREDITS
+src_prepare() {
+	default
+	eautoreconf
 }