gentoo resync : 18.01.2020

14 files changed, 203 insertions, 181 deletions

diff --git a/net-analyzer/dnsenum/files/dnsenum-1.2.2-remove-extension.patch b/net-analyzer/dnsenum/files/dnsenum-1.2.2-remove-extension.patch
new file mode 100644
index 000000000000..751d673fed2d
--- /dev/null
+++ b/net-analyzer/dnsenum/files/dnsenum-1.2.2-remove-extension.patch
@@ -0,0 +1,62 @@
+--- a/dnsenum.pl
++++ b/dnsenum.pl
+@@ -1,11 +1,11 @@
+ #!/usr/bin/perl
+ #
+ #
+-#	dnsenum.pl VERSION 1.2.2
++#	dnsenum VERSION 1.2.2
+ #	This version:	- Improvement of output
+ #			- Added DNS Server Fingerprinting
+ #		
+-#	dnsenum.pl: multithread script to enumerate information on
++#	dnsenum: multithread script to enumerate information on
+ #		a domain and to discover non-contiguous ip blocks.
+ #	
+ #	1) Get the host's addresse.
+@@ -45,7 +45,7 @@
+ #
+ #	Special thanks to all perl developers.
+ #
+-#	please see perldoc dnsenum.pl for options and arguments
++#	please see perldoc dnsenum for options and arguments
+ 
+ use strict;
+ use warnings;#it complains about uninitialized values when it doesn't find address in RR; need to fix later
+@@ -71,7 +71,7 @@
+ my ($timeout, $delay, $pages, $ipcount, $ipvalid) = (10, 3, 20, 0, 0);
+ my ($output);
+ my $writer;
+-my $program = 'dnsenum.pl';
++my $program = 'dnsenum';
+ my $wildcards = 'pseudorandabcdefuvwxyz0123456789.';
+ my $VERSION = '1.2.2';
+ 
+@@ -1365,15 +1365,15 @@
+ 
+ =head1 NAME
+ 
+-dnsenum.pl: multithread script to enumerate information on a domain and to discover non-contiguous IP blocks.
++dnsenum: multithread script to enumerate information on a domain and to discover non-contiguous IP blocks.
+ 
+ =head1 VERSION
+ 
+-dnsenum.pl version 1.2.2
++dnsenum version 1.2.2
+ 
+ =head1 SYNOPSIS
+ 
+-dnsenum.pl [options] <domain>
++dnsenum [options] <domain>
+ 
+ =head1 DESCRIPTION
+ 
+@@ -1673,7 +1673,7 @@
+ 
+ =head1 README
+ 
+-dnsenum.pl: multithread script to enumerate information on a domain
++dnsenum: multithread script to enumerate information on a domain
+ and to discover non-contiguous ip blocks.
+ 
+ =head1 PREREQUISITES
diff --git a/net-analyzer/ifstat/Manifest b/net-analyzer/ifstat/Manifest
index 6cc249df860f..c0aec38f0ec6 100644
--- a/net-analyzer/ifstat/Manifest
+++ b/net-analyzer/ifstat/Manifest
@@ -1,5 +1,5 @@
 AUX ifstat-1.1-hardened.patch 416 BLAKE2B f7cd655039a5fd68d49b8885b954dc1655551b8d9e120e698f1831e65b6d65ff7175b7cfe91cd58f117df8ac64eb05b17820ca963c078855989a5820b1d5da2c SHA512 64ff9119a6c492f0d011fcc0868425479b4b9bb8520b4f5e8323b106b9be555e763a9e73ef1e6833f652ebb51d048611d3504b26a94adebf5e21cd695c4417fc
 AUX ifstat-1.1-make.patch 4110 BLAKE2B b7495a19db3dde53c3172bdf44e1b4381df2dfcc58a000236b458cc962d017ecd5e8c08f036d964d706f33d9f77d3b870655245d5b74d3d43c333a46fa0d7bac SHA512 28b292b00b465a44344556c8f96bb237a0185ac176f0bea2374a0d6c03bc834997450c0c152a00a469f2a6837c3f60aa66cc85615d50cb5aeec1a379e155775a
 DIST ifstat-1.1.tar.gz 67920 BLAKE2B b9aeb18488f419fd6a03f698ed41d442b812765d5c1636dc6ea1e0484b5b1a6bc40b484bf88a715c63417d52db92927c128477714264ee3fe14ceb482330cb06 SHA512 b1aef8e7b14cbf265e2d42277478fd12a565287f90f37b0a826ba3e7d29640df757c7d56f149e406bf5890663ed734b2c658c4f1e2b258ded3649f2fc3e9ac64
-EBUILD ifstat-1.1-r2.ebuild 678 BLAKE2B 789c1417fee3f88480805b71597be12cd330f35f9630bcf105f6a8c8ea5360a623fdc84d075f8f6f1fc1be73701a0c7b451adab17038a9ab1e8704ed6df25c67 SHA512 e9ce902a81a8f5d713f698578affa6afae32597b909111565dc4d4ab0536b53aac6960180f1f8154323551d988b3744c1819a5a3d67f9ec9e0d0358412146935
+EBUILD ifstat-1.1-r2.ebuild 674 BLAKE2B 8e7540501ad5ee32209ab267e1c70bf7d02aefd9ade064bfe662afaeec8a518cd8c2ad4218080d924cf798c7dde71590a8ff7439e39b60048f0cb4a731770379 SHA512 bb9d65936a13b3fe2c4983fa777723b4ed3826a218a2b1e08b40a8d86c60af23679667c177c89e84f136aaf32b9b2f4d4429a297c429c601681a87006c3ff2de
 MISC metadata.xml 491 BLAKE2B 013e212ad11f3f2d08d91c617ec13c73b12133a552bd6f7dca90878a6f6a6d4d8c9f0b3c11452e7a20fd6e84356a98a15b66505eaa024c67bc061db9eaa24d08 SHA512 8635cf579260c356913a3905758c92a7ae05edb211add2031311f2a2b1970da2bf02657c7071960ed7a5162124937a9f727050a609120847c88b5392a4a7a3e7
diff --git a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
index 98a8a89c5741..42600860feb7 100644
--- a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
+++ b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
@@ -1,28 +1,30 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit autotools eutils
+EAPI=7
 
-IUSE="snmp"
+inherit autotools
 
 DESCRIPTION="Network interface bandwidth usage, with support for snmp targets"
-SRC_URI="http://gael.roualland.free.fr/ifstat/${P}.tar.gz"
 HOMEPAGE="http://gael.roualland.free.fr/ifstat/"
+SRC_URI="http://gael.roualland.free.fr/ifstat/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 sparc x86"
+IUSE="snmp"
 
 DEPEND="snmp? ( >=net-analyzer/net-snmp-5.0 )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-make.patch
+	"${FILESDIR}"/${P}-hardened.patch
+)
 DOCS=( HISTORY README TODO )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-make.patch
-	epatch "${FILESDIR}"/${P}-hardened.patch
-
+	default
 	eautoreconf
 }
 
diff --git a/net-analyzer/ippl/Manifest b/net-analyzer/ippl/Manifest
index e992e13dfe08..47b68e2f092f 100644
--- a/net-analyzer/ippl/Manifest
+++ b/net-analyzer/ippl/Manifest
@@ -1,3 +1,4 @@
+AUX ippl-1.4.14-fix-build-system.patch 1031 BLAKE2B 93a35f8dcd2955e3189b459b3758427b4405468cc639a7eb911854076327427f205370555542a86a6e0f7580e0f24007c896be46eaad19f6a38ad3a99679a519 SHA512 1c360bd88f8bf82cc7e739d71f0ee260cd87926658be43bbbf3450fd15647a590d5b79846759f9342806dbd13cd1ebec2a30830ed59081b21e6d295ef584408c
 AUX ippl-1.4.14-format-warnings.patch 645 BLAKE2B 24d9d12e456fc5686c04ed003dcf7c7b4e3c3c9188fda4c36c14a052740d0286c6c617c36965f06ab212c73c6ac2ef330ab39d2bb8eb3c60802f451b0399db1b SHA512 e3b247d5628883c4bbc5ae24e39bf4ef0910ed15dbcc7a13d586eddbea6ee1dfa5de1c4252c07fa87564da60febbb200f0e78a58cf29547db4b7446eebc73544
 AUX ippl-1.4.14-includes.patch 374 BLAKE2B 8f870033fa01978bba0d0e950c74ddc6e06a5d82bdd411aa1b561cdae8f5ff6c901dc0b70db638bc91176038e156a0ecc3fd588f3d8898a77a4722b7b746cee1 SHA512 5e7c8ab27770e3f50d09ee7e1f68246828d1b540a87c50c5c1afb3bbbe646af3b3d71369dfe2e41a1f04c306d88b8ef20f2be80edca8c201f7cb6d8c5539dfc9
 AUX ippl-1.4.14-manpage.patch 306 BLAKE2B 46c9901a4f365bceb67610bf1ecc4fb5be0011320af552a7afcaf2ec863de972d523f81436c60a81bcbeada3056f1e246c3ec5bf125c518ab03e637c6f74332e SHA512 4dc5b6ad12875c94a5b86ca380aeabb003734aabfd54b97edba20614b449dab35d8ba748e8faeda8a2bf2608158d4dd5c6e34c82b664ddf4fd12710ab81498ef
@@ -5,6 +6,5 @@ AUX ippl-1.4.14-noportresolve.patch 10610 BLAKE2B 94061b2dac8aeb383b149ced13d8a6
 AUX ippl-1.4.14-privilege-drop.patch 4289 BLAKE2B 456854f3a9df7d802a5a18ba98a657cb61ddbf52fbeb05a9098c7854dc3f7fe0c6a93a525bfd2d0c02b69092d491effe8099dfefebca08fd9a0c08c8c8ff7bcb SHA512 7b711bd0ac56867a6936035f63b047c1e86fe072f215dcc18eb8dada58d1087964a29b05c1eadef0303d203329a91a053e747c997d78ecd1697788e9f7a15f2f
 AUX ippl.rc 573 BLAKE2B c70512acb076fc08e0106bcac078463e7e0d37697c2dee7cc6ebd1cffb726239838d7da4794ce1e70a5b4a9e2169019b7b463c1d3a28778afc03daad8b163673 SHA512 2aadbb7cf33c83addef03e7815dd5d6c6a983ee0b269677d251a3b4550e2c038db4436b03a27024ea5ce12f0ca1eb2b87f33ba267e78f70afb06436119b99396
 DIST ippl-1.4.14.tar.gz 54030 BLAKE2B 384747ea50e55e52695606538850958320afe53dbe3c71e42c90302dff0b535d2167d18a40f0b2953f941cda1aa238490bfe7b7fde8f675071668ea5f561af74 SHA512 3d71afc3ec7a0420cc9b269bf67dc008a777464c68d233dfbad4ee7a2dd2b960e114500e42866977e31b9dbeee26bbefea937fef8a09aa41cf87f96361ba0088
-EBUILD ippl-1.4.14-r3.ebuild 1164 BLAKE2B 6077913dff48feaed40e8e37945c9ffaf89be2614748f9d4cb95349ed0edb8cc7f8cc7b6f6656581d090c77081c723ee19ca1f46f948c1f2bd7f11cafa2ec099 SHA512 1d840eb3757d941ba84955d80799425f45732db03151b5b00e45a6cf7e97b84ed7b4c3c017677d99748cb8d88b1b119796acc6ea01c0a5b1938022416fa85c1c
-EBUILD ippl-1.4.14-r5.ebuild 1133 BLAKE2B 2d29cba5a827c13d122257585a621c9104f3fe4f09fe8adf1775f315a1b0a9936c19daa5ddf53e02488f5427cb4887645e26552e5f02efe8b8922fcc49fbf988 SHA512 6da05595f41493eee312d43f6120ebb961806e949a132a28541d38e0b501305650b51e386bd08f89d709afd4b56a28380eb0014ddb56e274625e84af319669ce
+EBUILD ippl-1.4.14-r6.ebuild 938 BLAKE2B 25fc383a267fb292660407110b346ffb1d1cd0d7e00a3bca9fe5e79e549fb4ac22a6247ff92b596e4a6b252e49bf34c5fd0f604bc021b87c70ca59c3d4972e32 SHA512 43d60378476a2e18bbeb1b80dc118a8080dd454b758b26a6209700f83cd23c2f50e321dff517fbc9a0882dc7dca4dd3a1c4141fb51e683f23975df37e0669b8e
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/ippl/files/ippl-1.4.14-fix-build-system.patch b/net-analyzer/ippl/files/ippl-1.4.14-fix-build-system.patch
new file mode 100644
index 000000000000..c6c65cb14d50
--- /dev/null
+++ b/net-analyzer/ippl/files/ippl-1.4.14-fix-build-system.patch
@@ -0,0 +1,44 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11,10 +11,10 @@
+ all: binary docs
+ 
+ binary: Makefile Source/Makefile
+-	@cd Source && make && cd ..
++	@cd Source && $(MAKE) && cd ..
+ 
+ docs:
+-	@cd Docs && make && cd ..
++	@cd Docs && $(MAKE) && cd ..
+ 
+ install: all
+ 	$(INSTALL) -d -m 755 $(SBINDIR)
+@@ -29,7 +29,7 @@
+ 	$(INSTALL) -m 644 Docs/ippl.conf.5 $(MANDIR)/man5/ippl.conf.5
+ 
+ clean:
+-	@cd Source && make clean && cd .. && cd Docs && make clean && cd ..
++	@cd Source && $(MAKE) clean && cd .. && cd Docs && $(MAKE) clean && cd ..
+ 
+ distclean: clean
+ 	$(RM) *~ Makefile.common Makefile Source/Makefile Docs/Makefile build-stamp install-stamp
+--- a/Source/Makefile.in
++++ b/Source/Makefile.in
+@@ -10,7 +10,7 @@
+ CC=@CC@
+ CFLAGS=@CFLAGS@
+ WARNINGS=-Wall@PEDANTIC@
+-LDFLAGS=
++LDFLAGS=@LDFLAGS@
+ 
+ SRCS=	main.c \
+ 	configuration.c \
+@@ -49,7 +49,7 @@
+ y.tab.c: ippl.y Makefile ../Makefile.common
+ 	$(YACC) -d $<
+ 
+-lex.yy.c: ippl.l Makefile ../Makefile.common
++lex.yy.c: ippl.l y.tab.c Makefile ../Makefile.common
+ 	$(LEX) $<
+ 
+ clean:
diff --git a/net-analyzer/ippl/ippl-1.4.14-r3.ebuild b/net-analyzer/ippl/ippl-1.4.14-r3.ebuild
deleted file mode 100644
index 9f807cd264aa..000000000000
--- a/net-analyzer/ippl/ippl-1.4.14-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs user
-
-DESCRIPTION="A daemon which logs TCP/UDP/ICMP packets"
-HOMEPAGE="http://pltplp.net/ippl/"
-SRC_URI="http://pltplp.net/ippl/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="virtual/yacc
-	>=sys-devel/flex-2.5.4a-r4"
-RDEPEND=""
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/ippl-1.4.14-noportresolve.patch \
-		"${FILESDIR}"/ippl-1.4.14-manpage.patch \
-		"${FILESDIR}"/ippl-1.4.14-privilege-drop.patch \
-		"${FILESDIR}"/ippl-1.4.14-includes.patch
-	sed -i Source/Makefile.in \
-		-e 's|^LDFLAGS=|&@LDFLAGS@|g' \
-		|| die "sed Source/Makefile.in"
-	sed -i Makefile.in \
-		-e 's|make |$(MAKE) |g' \
-		|| die "sed Makefile.in"
-	# fix for bug #351287
-	sed -i -e '/lex.yy.c/s/ippl.l/& y.tab.c/' Source/Makefile.in \
-		|| die "sed src/Makefile.in"
-	tc-export CC
-}
-
-src_install() {
-	dosbin Source/ippl
-
-	insinto "/etc"
-	doins ippl.conf
-
-	doman Docs/{ippl.8,ippl.conf.5}
-
-	dodoc BUGS CREDITS HISTORY README TODO
-
-	newinitd "${FILESDIR}"/ippl.rc ippl
-}
-
-pkg_postinst() {
-	enewuser ippl
-}
diff --git a/net-analyzer/ippl/ippl-1.4.14-r5.ebuild b/net-analyzer/ippl/ippl-1.4.14-r5.ebuild
deleted file mode 100644
index e436f03ac433..000000000000
--- a/net-analyzer/ippl/ippl-1.4.14-r5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs user
-
-DESCRIPTION="A daemon which logs TCP/UDP/ICMP packets"
-HOMEPAGE="http://pltplp.net/ippl/"
-SRC_URI="http://pltplp.net/ippl/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-DEPEND="virtual/yacc
-	>=sys-devel/flex-2.5.4a-r4"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/ippl-1.4.14-noportresolve.patch \
-		"${FILESDIR}"/ippl-1.4.14-manpage.patch \
-		"${FILESDIR}"/ippl-1.4.14-privilege-drop.patch \
-		"${FILESDIR}"/ippl-1.4.14-includes.patch \
-		"${FILESDIR}"/ippl-1.4.14-format-warnings.patch
-
-	sed -i Source/Makefile.in \
-		-e 's|^LDFLAGS=|&@LDFLAGS@|g' \
-		|| die
-
-	sed -i Makefile.in \
-		-e 's|make |$(MAKE) |g' \
-		|| die
-
-	# fix for bug #351287
-	sed -i -e '/lex.yy.c/s/ippl.l/& y.tab.c/' Source/Makefile.in \
-		|| die
-
-	tc-export CC
-}
-
-src_install() {
-	dosbin Source/ippl
-
-	insinto "/etc"
-	doins ippl.conf
-
-	doman Docs/{ippl.8,ippl.conf.5}
-
-	dodoc BUGS CREDITS HISTORY README TODO
-
-	newinitd "${FILESDIR}"/ippl.rc ippl
-}
-
-pkg_postinst() {
-	enewuser ippl
-}
diff --git a/net-analyzer/ippl/ippl-1.4.14-r6.ebuild b/net-analyzer/ippl/ippl-1.4.14-r6.ebuild
new file mode 100644
index 000000000000..1cddf3d999fa
--- /dev/null
+++ b/net-analyzer/ippl/ippl-1.4.14-r6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A daemon which logs TCP/UDP/ICMP packets"
+HOMEPAGE="http://pltplp.net/ippl/"
+SRC_URI="http://pltplp.net/ippl/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+BDEPEND="
+	virtual/yacc
+	sys-devel/flex"
+RDEPEND="acct-user/ippl"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.14-noportresolve.patch
+	"${FILESDIR}"/${PN}-1.4.14-manpage.patch
+	"${FILESDIR}"/${PN}-1.4.14-privilege-drop.patch
+	"${FILESDIR}"/${PN}-1.4.14-includes.patch
+	"${FILESDIR}"/${PN}-1.4.14-format-warnings.patch
+	# bug #351287
+	"${FILESDIR}"/${PN}-1.4.14-fix-build-system.patch
+)
+
+src_configure() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	dosbin Source/ippl
+
+	insinto /etc
+	doins ippl.conf
+
+	doman Docs/{ippl.8,ippl.conf.5}
+	dodoc BUGS CREDITS HISTORY README TODO
+
+	newinitd "${FILESDIR}"/ippl.rc ippl
+}
diff --git a/net-analyzer/nagios-check_dnssec/Manifest b/net-analyzer/nagios-check_dnssec/Manifest
index 2d512e94b630..64d4ff00e919 100644
--- a/net-analyzer/nagios-check_dnssec/Manifest
+++ b/net-analyzer/nagios-check_dnssec/Manifest
@@ -1,3 +1,3 @@
 DIST check_dnssec-0.1_p28.tar.bz2 73458 BLAKE2B 0b3ae3e051734924b89160a67a84b3cbe3f5db0ee036780b4efcbd7857a18a6ac6b180dddab7475be079d5fe902b8eeed4c6acb021b31c70daef69632ff3ecaf SHA512 e99b155f38963858750443f3cf834e4505f871cb06bbfabf07ade1b333b18507b9364e7250118ed5ee4a2134e2a45ee68b6386a9f3b0cb30a0bb02a4a6e263fa
-EBUILD nagios-check_dnssec-0.1_p28.ebuild 652 BLAKE2B e671f946a5dfb1d8adc7c6f4b0fe948145c3e5a4dc1b0e2209cbdae6d67f467fcd3158bee64c4a9634106dc86fe96323b98bb4b81c9260ce171410566814bf09 SHA512 8e528c18bec83c4405c89497212dc62e3f9a2b1ce606b9c6639b9cad5758beb7d491a521a0f67f7583b3fb298b019850abc6425e451633625e181c3d5ca218cd
+EBUILD nagios-check_dnssec-0.1_p28.ebuild 617 BLAKE2B 3597e8c429c071467e18f5b1d86dc2ab4fe1166759fa71355ec2664b29316a2afd8c21d74d2c78c2d7cd769b15181566610d559b5e8df8379e6b70868b469ee3 SHA512 e95d56bce1c0cb9fb16f4ce6c094d3c2ec9424d72e2617ee8d3fc4046d29e069eaa70c736211a2d696619984dadb842eec11fb3ed9eb012f72036733ae6822a7
 MISC metadata.xml 271 BLAKE2B 7231d9dcb020ef6bb73db6e7038abab171c5ac137e457e50bd730b126a20a8af0a21b1cb987b00b8965af807dde7b0431dfacb6066d15d08b5bfbfbaecf3e5a0 SHA512 f323a192c090757e24caa9352b8be964050a00a86d174507c858c2a3a61767c243dba99ac37571779128d73e9bf6817f056d6d590be2b2ec8a8e3f3a92a4f304
diff --git a/net-analyzer/nagios-check_dnssec/nagios-check_dnssec-0.1_p28.ebuild b/net-analyzer/nagios-check_dnssec/nagios-check_dnssec-0.1_p28.ebuild
index e83bff31808c..ed5fc8bb0488 100644
--- a/net-analyzer/nagios-check_dnssec/nagios-check_dnssec-0.1_p28.ebuild
+++ b/net-analyzer/nagios-check_dnssec/nagios-check_dnssec-0.1_p28.ebuild
@@ -1,30 +1,32 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils autotools
-DESCRIPTION="check_dnssec is a set of Nagios plugins to monitor DNSSEC services"
-HOMEPAGE="https://svn.durchmesser.ch/trac/check_dnssec"
+inherit autotools
 
 MY_P=${P/nagios-/}
 
+DESCRIPTION="check_dnssec is a set of Nagios plugins to monitor DNSSEC services"
+HOMEPAGE="https://svn.durchmesser.ch/trac/check_dnssec"
 # No upstream tarballs, tagged releaess in SVN only.
 SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
 LICENSE="GPL-3"
 SLOT="0"
-
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
-		net-libs/ldns"
+DEPEND="
+	|| (
+		net-analyzer/nagios-plugins
+		net-analyzer/monitoring-plugins
+	)
+	net-libs/ldns"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	default
 	eautoreconf
 }
-
-DOCS=( ChangeLog README AUTHORS )
diff --git a/net-analyzer/nagios-check_ipmi_sensor/Manifest b/net-analyzer/nagios-check_ipmi_sensor/Manifest
index f1051f1fe1d6..f94e4c97f1d7 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/Manifest
+++ b/net-analyzer/nagios-check_ipmi_sensor/Manifest
@@ -1,7 +1,5 @@
 DIST check_ipmi_sensor_v3-14e6586.tgz 21836 BLAKE2B f56a44c5afd4583e64bd0e938aa03ec51a659a5f18c01685e3e03115f46ceda62ae899be677b1ba993cc0543c8cb775c9cc0c35c4b862b678a873e57e0361d21 SHA512 ac0744348e4d68459326396ee7fcc98bb0c3d2115fcf9724c7391f6f8dc9c0e2bb89a832822424b415acc3062201fb67d7eaceb4b9f2f41526e5fe8823187a0e
 DIST check_ipmi_sensor_v3-8120430.tgz 20620 BLAKE2B 2542c4320498700362e8e7c1cfe0d00d98e4894e987aac002f0e2db499fdab4c27b33ff587349a836ae18d7b89939a96f6a66484b46486caa0d548c3e794d1c3 SHA512 89b3fd7ae2d523e1510c528d44d03ad9af5bc174bb325393f50a4a95380c996867b4502b55f38712515f556fe0f2019e15f6800ca1db00a9bbbcef655f1fd845
-DIST check_ipmi_sensor_v3.1.tar.gz 19135 BLAKE2B 0b2765793ca1728ac31334fdd15766789e185d368103f4044970f2c2eed5c29a5d5942ec7c64f0649596416dc6e756fa5d59d7d8bd3af839ee93e3a3a9578da5 SHA512 b6af98af23ebff361cf2f94ff6c4b083ff175532c1f65b785d6b928db896a6109437f64bb7a93688f20574f0b92485e40d3d0aa4785113703527574b9c28b079
-EBUILD nagios-check_ipmi_sensor-3.1.ebuild 646 BLAKE2B a407aebda8c5b4d7ce6dd10a97cd0cc7c3b5b65127c725a89d0e9e79bb6d17bee9da18d8c556bc41423e4f9fee2c10f59346c525d93b0146333ec1446e14ee30 SHA512 6dd41aab000f780cec4ade01d52318cf3e3e078e56a4f29ace889ee31d1e3c5c98a30935d3df77e03b7e08f5415ef8248d33deb2b1ea0685634835639f39d2d1
 EBUILD nagios-check_ipmi_sensor-3.2.ebuild 727 BLAKE2B 76466c4fa05637265ed3118dcc69e5220b3f5ce13c7dabecfaf76c12f6091719479ca2eb7a94103dd830e13fba9493623fc2c16876603cd0f9ef6d00f81c369e SHA512 30739d3b309269c94ab56b849924e987245eeec9f66e27173a8ccb667279e4c2bc6c4e3d0b5c9ff743d01d3839e0340dbbdfc7d245d434eb1eae53a2976c9b5d
 EBUILD nagios-check_ipmi_sensor-3.6.ebuild 730 BLAKE2B 615ab829f001af4e269a9ec2046e90d57ee39cd6be6be4ac31c1b1274b1a531cb90145a57aab5dfa9dcb6952a8279fe52494d036c5314e3afad1573844e3dcf5 SHA512 5df875927e39743c7f9de056aec8a6b45d18bd95651fdfeecf7169c5e9a43ce91b579996114ed62d24b6755e524a526190138def79091ee43cefee6803479f92
 MISC metadata.xml 369 BLAKE2B d2bf674244eb694d8440e6122e48b53e8edf1f18007c10c5b1bdb585e90697e2bad23cde386075ad4b2b5f05cd489e35defde73c351080494f0f0e6485af5713 SHA512 d6f073707c4a9acd674e378c42d2c4662429dc8c666428823c4f1e8d9bf7529370e384fa79b5c9a081cd82f8a7c01b0ca8f8d781ccf56411124fb26c8583b9dd
diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.1.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.1.ebuild
deleted file mode 100644
index ad6bee924da1..000000000000
--- a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit multilib
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN#nagios-}_v${MY_PV}"
-
-DESCRIPTION="IPMI Sensor Monitoring Plugin for Nagios/Icinga"
-HOMEPAGE="http://www.thomas-krenn.com/en/oss/ipmi-plugin/"
-SRC_URI="http://www.thomas-krenn.com/en/oss/ipmi-plugin/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 hppa ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	dev-perl/IPC-Run
-	sys-libs/freeipmi"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	exeinto /usr/$(get_libdir)/nagios/plugins
-	doexe check_ipmi_sensor
-
-	dodoc changelog.txt
-}
diff --git a/net-analyzer/thrulay/Manifest b/net-analyzer/thrulay/Manifest
index c5bae7fbe7bb..1bb0a4416810 100644
--- a/net-analyzer/thrulay/Manifest
+++ b/net-analyzer/thrulay/Manifest
@@ -1,5 +1,5 @@
 AUX thrulayd-conf.d 248 BLAKE2B 78679b56450e476181e51a77145d462b8824bc7c9d01bb16cece24f9f83c30923bcd0c36b10103b8fcac23e6b14bf56b04072c025da08e6114b6ccc2e6489d83 SHA512 d74cf8e47c48b762ab76ec74bf92227092706a4594a8b894a58eb0a8972ae99ad9fa565e1ea5520144e692429e35f67593c37ac79e2682a9cebd2044bc3b510a
 AUX thrulayd-init.d 557 BLAKE2B 203082d1e1005c6f5c5e313bedf78251c79a608063cd968c018d56aeb39f2ecd5ba4bee8c1beda97ca22ba19d5bedda88369ac89680abd563547812b994366fd SHA512 9573ca678b719b913f492b8f2303c8c25b1b49fe727aae5f89016c1d3a2d34595655b851ef26eb85a8f66379b9ea1868babb1e1e1a8e9bef9a61858aa467b9a2
 DIST thrulay-0.9.tar.gz 370312 BLAKE2B fdcbc0785ccc61bb85454d878f46bef97c346dd8c8a54591c993940615a8047b24fad00ffca5c3db6d7c1303b42c67f45b828e899564d7c920cc83924e3a18c2 SHA512 9655ef37f6ef3ba51a2fadacf08978fb1c284af6b571dbf76c44e5582bf705bec08170b3b2cc69512b8327485dfd3f758ed2addf510a075558aea70eb4779a6f
-EBUILD thrulay-0.9-r1.ebuild 864 BLAKE2B 9494ba34eede02b41ad1f73024221b5d0a219296d3da1956bbae1ff7b5edc858525d9bd3d3c2775d61eaadeb5643696d1d03402e44f855d653cd554dc24455c1 SHA512 71fd5e82a8621b32eb5a01507d6dd2b63bfd508daac5d4afe9f14df4d45dfa76b15c1b19629fa6ee26058b7f829c61a6fadde43f5f98f766216a3ad905bfdb90
+EBUILD thrulay-0.9-r1.ebuild 831 BLAKE2B d0c522eb5f752d9b4d90cb329f974d663e319f4d9be995b42aa8dded8a097abf50436176e6f4bd08b95b83cd142e5eb38b10be805c613d880271783e6c23ef2f SHA512 d1e20e2d809df5bfccef7a0946f1d7118398e4ae44623a6f1b30d0e4af4f7423b547336984077002a9c47bba1abdbe1a7a45c7322830d106bac63a9f4124fa6b
 MISC metadata.xml 303 BLAKE2B 2191f0ce17b8138cc499869831c34d76e7e449ea780f7be0a8d6b86fd0dac2a2eb5276faeed06c088f5e28e98907f5a9fef49bec6a229b86489bfcad1aa52db1 SHA512 ccf7095c2929ce1262d94f379a7a704d82980b691da0d77e8ec5684803ab6c40bcd85d167cc50f37411e92ace6978b90953e71395ab6f56a31479f2ca3a35ccf
diff --git a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
index f66426aacee5..388b9ba4e265 100644
--- a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
+++ b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
@@ -1,30 +1,40 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit toolchain-funcs autotools
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Measure the capacity of a network by sending a bulk TCP stream over it"
 HOMEPAGE="http://www.internet2.edu/~shalunov/thrulay/"
-SRC_URI="http://www.internet2.edu/~shalunov/thrulay/${P}.tar.gz
-		mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="
+	http://www.internet2.edu/~shalunov/thrulay/${P}.tar.gz
+	mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
-DEPEND=""
 
 src_prepare() {
-	echo 'thrulay thrulayd: libthrulay.la' >>src/Makefile.am
+	default
+
+	echo 'thrulay thrulayd: libthrulay.la' >> src/Makefile.am || die
 	eautoreconf
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
-	emake install DESTDIR="${D}"
-	#dobin src/thrulay || die "dobin failed"
-	#dosbin src/thrulayd || die "dosbin failed"
-	dodoc LICENSE README TODO doc/thrulay-protocol.txt
+	default
+
+	dodoc doc/thrulay-protocol.txt
 	doman doc/thrulay*.[1-8]
+
 	newinitd "${FILESDIR}"/thrulayd-init.d thrulayd
 	newconfd "${FILESDIR}"/thrulayd-conf.d thrulayd
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }