gentoo resync : 20.02.2019

16 files changed, 87 insertions, 401 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 3b990b8a5c1d..1b635d573393 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest
index 5191e4acb058..65bd37cfb510 100644
--- a/net-analyzer/argus-clients/Manifest
+++ b/net-analyzer/argus-clients/Manifest
@@ -1,10 +1,11 @@
 AUX argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch 521 BLAKE2B 729ad11ec1fce4bf6d795d7317bb124b7992d7b3800a4a9390af9b611839e5a355eddaedbafd1cd8661b2d3a94aca3a7952ec4e1601680c46fbfe61f08c7fd40 SHA512 63f3526e2c13820a8d58bbd0d4d2c19c289a6a59bfbe2b1d6593820304cf6cdc4159cb24ff019175016116f036c99c7a73947ca51a1ec18893948a09a651f28e
 AUX argus-clients-3.0.7.21-curses-readline.patch 611 BLAKE2B 046d31d75bef26da50b58fd646192437c25cff3a13752f5c94a3b5fab6f3f5ef265c2a51c9768e90b9bf8bbb197d363ab132f27f967b925ce19a98f66ed2020d SHA512 17910c0e2e2d3efefd1efe713bea5b394087415d103aa18254c7f8e8e4f4aae7d8670db8ab9d6045c145bfc0d5e804c653eca6e1c169813075c1af37ff01a0b2
 AUX argus-clients-3.0.8.2-ar.patch 767 BLAKE2B b13abee07d0d11319890e36d0dd3f446996eb0fe5ddda70d834873349c5b9bfdaa2029526ce2146efb88887b454c6019462908786f47b372e1d2de4f52a8dadf SHA512 793dec8cf09bb730b327a6af35e89b029922329d5e031767b840b1c974dd0ed3482f5590ee6b3f76480d0518139281474c849797df70ddd3013ac06822d0575a
+AUX argus-clients-3.0.8.2-curses-readline.patch 777 BLAKE2B 374420361e1cca506e51fa977ad1da0c37fb3596e181a6880e09b9392fc7926f98fe52f78c7d7b09cb237e64253ce78deb46fb545fd349431fb62b8bafc31316 SHA512 f6fbcb3a4aed87214dc1d08c9a7b5b807cea88a1789e7487f0b0b30896e6d1c7a3cf21b04d7d8afbcfb5f205edce5b5a50a8d67cd3556d9badbeecc103f98770
 AUX argus-clients-3.0.8.2-rpc.patch 967 BLAKE2B b59450ad0a21eeb1e37d84f518e0e5417ab82f9e6afe5bca078e3dc14f8b52a0a07abc42040569d4d665145794187cf8f554310acd4f98cfab17f0046f381ad6 SHA512 3292d71b78be693901cd8fca3712d5f866185968e30747278d793b9c280091ecbd1f6e61390b48338b07dfa760efda96e1cbf15d279137a4f85991d69b7526cc
 DIST argus-clients-3.0.8.2.tar.gz 2776072 BLAKE2B 429a12d63f38ce1c5dae343be28543f3c8b6dd746661a893a0108db100762d60dec619cdccfff525b84c0843f0bb61c7e5d96df561a369e6df0d1e6a821d938a SHA512 20aac16bd6474b8f98c8fc86b21ad0b43aca62264c6de2f7f26eea876a90f7276cdaf2241a510a19ae445f40f5d0d05ec6a5869980b6889e6eb5937dbff0f855
 DIST argus-clients-3.0.8.tar.gz 2627515 BLAKE2B e7753ce1a65f24639c0c36d694033b038abb7cf835b89a1020edf72829f9196cad2a1be5958a28a51884c169ff7b4e295381501e61cf1e1eb1ee1557fccb6d8f SHA512 79022b3c3e472ebc526b27c20c25ae97abdb9a363a91ebbe3baf405f2aba9bdd80fbc0250b444d3d7ab4488e3c1325389a4719e92d9aded7598a91c3309369c2
-EBUILD argus-clients-3.0.8.2-r2.ebuild 1466 BLAKE2B 7d31b9db95c02fa48431db81af1605ed9991745e31f22ad06509a554317cd0e23802d5cb5eee39621ed1766d97b3656ddee3bc89f75bda0d54df6923aef98fb5 SHA512 25ae6dd3d2c5a5e7ed34b4243074b24ed1871c643098fe1363d7738e3d23ebd980229ca00a62068604544c5fb499624d4e6c2e709cb0911e84a3085082c1fdaa
+EBUILD argus-clients-3.0.8.2-r2.ebuild 1517 BLAKE2B 47512e061e1fea4b5b1fd1d2dc0e980b01ef98847cb4efdf944f1999721e17caa8d65a01018f84720e4b457f3cd7bb0447b887a8c80aa072bac4ff561f410535 SHA512 a3c0fc9f20f14860a98cca43a3f4edaf2be91e51876c8fd923434902856baedcc6fe07f46a22cd99864289d40072bd24e53007b98cc737e4110f4a28a3f4dc48
 EBUILD argus-clients-3.0.8.2.ebuild 1453 BLAKE2B f18f8d5c4e85d441b72e6490730dd6b6f9e0c04e433caa58b9fe297d2a40ba3f811f113a7739a8b7df67aafd07d254c7561703ff5bd5fad523879502567eade1 SHA512 b5fd648853deb3a81982a462da9e6ac1c8cbcc453fb6144e5afa303a6465f33daf846212e47d781c33b9e5a0737fa8fcc6dcb0edc4ebf4a1f59583606382851b
 EBUILD argus-clients-3.0.8.ebuild 1446 BLAKE2B aeb8501a05352c57c5cf5338ee19f598549d96df3d39da2864da8eefa32d3d59e48b0e8f89de39970524bba1a861a3dbf7b50110c815eecdd54258d1fa1f98cb SHA512 90119ef5268e3afafb73b97d4eab3b55d761609064b1d1f371f908715d49f81992d35d6f86466f312e106b014410b1afe4b6815d5b626a2e0485f74cd968f147
 MISC metadata.xml 383 BLAKE2B f19de1514d40bf02fc21d447b5d5eed6cf1917fff41a0462a993b0d7572d5d75ca80c6a2e7a0b1de83e9c167d5b5046e96a11ddc3d99595b79079cc4c76e5a54 SHA512 16728e62acf8d17d105ce0d0c0bd32197a9157544aeee9c9601ffc716ccd70cb126086b732c2814d5c4124f3546bb1fe7efddd27b7f686ae2c1960cbf7f90780
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
index 34882be08c07..42799057487b 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
 	"${FILESDIR}"/${PN}-3.0.8.2-rpc.patch
 	"${FILESDIR}"/${PN}-3.0.8.2-ar.patch
+	"${FILESDIR}"/${PN}-3.0.8.2-curses-readline.patch
 )
 
 src_prepare() {
diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-curses-readline.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-curses-readline.patch
new file mode 100644
index 000000000000..fc8d3d0ed6e2
--- /dev/null
+++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-curses-readline.patch
@@ -0,0 +1,21 @@
+--- a/examples/ramysql/Makefile.in
++++ b/examples/ramysql/Makefile.in
+@@ -56,7 +56,8 @@
+ 
+ 
+ MYSQLLIB = @MYSQL_LDFLAGS@ 
+-CURSESLIB = @CURSESLIB@ @V_READLINE@
++CURSESLIB = @CURSESLIB@
++V_READLINE = @V_READLINE@
+ 
+ 
+ # Standard CFLAGS
+@@ -94,7 +95,7 @@
+ 	$(CC) $(CCOPT) -o $@ rasql.o $(LDFLAGS) $(MYSQLLIB) $(LIB) $(COMPATLIB)
+ 
+ $(INSTALLBIN)/rasqlinsert: rasqlinsert.o raclient.o $(LIB)
+-	$(CC) $(CCOPT) -o $@ raclient.o rasqlinsert.o @V_PCRE@ $(LDFLAGS) $(MYSQLLIB) $(LIB) $(COMPATLIB) $(CURSESLIB)
++	$(CC) $(CCOPT) -o $@ raclient.o rasqlinsert.o @V_PCRE@ $(LDFLAGS) $(MYSQLLIB) $(LIB) $(COMPATLIB) $(CURSESLIB) $(V_READLINE)
+ 
+ $(INSTALLBIN)/rasqltimeindex: rasqltimeindex.o $(LIB)
+ 	$(CC) $(CCOPT) -o $@ rasqltimeindex.o @V_PCRE@ $(LDFLAGS) $(MYSQLLIB) $(LIB) $(COMPATLIB)
diff --git a/net-analyzer/fragroute/Manifest b/net-analyzer/fragroute/Manifest
index d89f0f5ad620..835d47b3aab9 100644
--- a/net-analyzer/fragroute/Manifest
+++ b/net-analyzer/fragroute/Manifest
@@ -1,3 +1,4 @@
+AUX fragroute-1.2.6-pcap_open.patch 1171 BLAKE2B cdd664bea732c2abab0813526eba79a7dd7beef3c373a7f86414356d786f47b950561a74ed5bc9d404a7b39f63ab12c5b711835b056fccbda8583f8e7541c5ed SHA512 f60abf95fa5bd8798cf88f40d972311bbee4f877ee46cee1aa6e4438b5e4dd6c3b990b5e2565d24d1ce9c72d23f950ef13abd889d11a2f1bf6f34fb01957e7c6
 DIST fragroute-1.2.6-ipv6.tar.gz 163309 BLAKE2B c1927fdb6fbe6873b62fa48c5355b0b0d2be7b2183c94f259b8e0b4b3dec8a171defc4c6fbde507e522b28dffcc86dd68ae0ffe380a9d21eb478ebe7068d4beb SHA512 76c6fbe37100a43df477f0ba455a2bed6ac53c1f369e147d220562a34eca0eb273171e4b9ff4f3fc473c3f99a8344f6d49963c20d7cfaf6879200322a491ffc3
-EBUILD fragroute-1.2.6.ebuild 1101 BLAKE2B f2d9cbc7e8a59fbf1bc2a5914888a6d7371d038e3501666ea6d0dc0c30cb9b7af67c6dcabb59643bbe8c8615abe518f95ed40185c30d893767e4732a0ee4d6ee SHA512 7b7f40e9bffe3e94fe8c8ae24d8bfde92af603de773500d90f9dfa3707140b2c5f27c57fe75945fd81d9596ac51c85dd66c9d1315a4d91729c22ffaa437f29e9
+EBUILD fragroute-1.2.6-r1.ebuild 1037 BLAKE2B 81e3443bdd270b36cbf94e88412cd3220befc5faf843bf1619e3ba2f8fca3a5eadaf5cf40983e265bb214c12fb7af9bc2e59780f26bb5992f4dbdbf38514b687 SHA512 49b02420969d14fcba01898ac514f8fe2342a0cb9eae0e74eb3f685930d9bd7802200c3d9c4b9f62061ab1422018a8b93a45ef0819547fd092c5f134b26ce534
 MISC metadata.xml 364 BLAKE2B 6f99923afef64e689bb2169801086f433f54879999551e8ac7e74f3c49ae10b2381041e626a024efe57b167a9394219b3ff3f313b049b2d40ba5404134b766c1 SHA512 3b38ee5be21d5a6957e39fea01461187f01f5b34a0538df8b6f6c217e0832a5d6cb5dbd9b6508cb5a977618dd9f8ffb0d0feefb0ec6c050efcfb4fa68a00ed78
diff --git a/net-analyzer/fragroute/files/fragroute-1.2.6-pcap_open.patch b/net-analyzer/fragroute/files/fragroute-1.2.6-pcap_open.patch
new file mode 100644
index 000000000000..6dedb535d3b5
--- /dev/null
+++ b/net-analyzer/fragroute/files/fragroute-1.2.6-pcap_open.patch
@@ -0,0 +1,44 @@
+--- a/fragtest.c
++++ b/fragtest.c
+@@ -458,7 +458,7 @@
+ 	if ((ctx.ip = ip_open()) == NULL)
+ 		err(1, "couldn't open raw IP interface");
+ 
+-	if ((ctx.pcap = pcap_open(ifent.intf_name)) == NULL)
++	if ((ctx.pcap = fragroute_pcap_open(ifent.intf_name)) == NULL)
+ 		err(1, "couldn't open %s for sniffing", ifent.intf_name);
+ 	
+ 	if ((ctx.dloff = pcap_dloff(ctx.pcap)) < 0)
+--- a/tun-loop.c
++++ b/tun-loop.c
+@@ -331,7 +331,7 @@
+ 		return (tun_close(tun));
+ 	
+ 	/* Set up to sniff on loopback. */
+-	if ((tun->pcap = pcap_open(tun->ifent->intf_name)) == NULL)
++	if ((tun->pcap = fragroute_pcap_open(tun->ifent->intf_name)) == NULL)
+ 		return (tun_close(tun));
+ 	
+ 	if (pcap_filter(tun->pcap, "ip dst %s", addr_ntoa(dst)) < 0)
+--- a/pcaputil.c
++++ b/pcaputil.c
+@@ -27,7 +27,7 @@
+ #include "pcaputil.h"
+ 
+ pcap_t *
+-pcap_open(char *device)
++fragroute_pcap_open(char *device)
+ {
+ 	char ebuf[PCAP_ERRBUF_SIZE];
+ 	pcap_t *pcap;
+--- a/pcaputil.h
++++ b/pcaputil.h
+@@ -9,7 +9,7 @@
+ #ifndef PCAPUTIL_H
+ #define PCAPUTIL_H
+ 
+-pcap_t *pcap_open(char *device);
++pcap_t *fragroute_pcap_open(char *device);
+ int	pcap_dloff(pcap_t *pcap);
+ int	pcap_filter(pcap_t *pcap, const char *fmt, ...);
+ 
diff --git a/net-analyzer/fragroute/fragroute-1.2.6.ebuild b/net-analyzer/fragroute/fragroute-1.2.6-r1.ebuild
index 480dc836096d..53aaa81ffc3d 100644
--- a/net-analyzer/fragroute/fragroute-1.2.6.ebuild
+++ b/net-analyzer/fragroute/fragroute-1.2.6-r1.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
 MY_P="${P}-ipv6"
 
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="Testing of network intrusion detection systems, firewalls and TCP/IP stacks"
 HOMEPAGE="https://github.com/stsi/fragroute-ipv6"
@@ -22,26 +20,28 @@ RDEPEND="
 	net-libs/libpcap
 	>=dev-libs/libdnet-1.12[ipv6]
 "
-DEPEND="${RDEPEND}
-	virtual/awk"
-
-S="${WORKDIR}/${MY_P}"
-
+DEPEND="
+	${RDEPEND}
+	virtual/awk
+"
 DOCS=( INSTALL README TODO )
+PATCHES=(
+	"${FILESDIR}"/${P}-pcap_open.patch
+)
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	default
 	# Remove broken and old files, autotools will regen needed files
 	rm *.m4 acconfig.h missing Makefile.in || die
 	# Add missing includes
 	sed -i -e "/#define IPUTIL_H/a#include <stdio.h>\n#include <stdint.h>" iputil.h || die
-	autotools-utils_src_prepare
+	eautoreconf
 }
 
 src_configure() {
-	local myeconfargs=(
-		--with-libevent="${EPREFIX}"/usr \
+	econf \
 		--with-libdnet="${EPREFIX}"/usr \
+		--with-libevent="${EPREFIX}"/usr \
 		--with-libpcap="${EPREFIX}"/usr
-	)
-	autotools-utils_src_configure
 }
diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index e8234dfd25c1..89c3520ec08d 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -1,10 +1,5 @@
-AUX linkchecker-9.2-unbundle.patch 840 BLAKE2B ad18d9722b8fe84c3728d5c62e741eeec5c82856384950610519aa641c15b80483bd04c8c32ff1bd275d28dcd2e73a657a7d4d324cb7889f550849cfa9e3932e SHA512 899db2f7567d7f101ca995d2b8b26dfaedb854a856902cb3fd2bda50f872e9bd345d10acf7b4687635541a8c5cc69050146c317c7f2875d8841f98d5d8b9d7d4
 AUX linkchecker-9.3-bash-completion.patch 621 BLAKE2B bce120caf1cddcd11e49c06b5cbd08e5651ad48e89e07c72382f0ea7da62a4070f2e4607880f4ccb44b015c953ca8b9734d10db77081d2ff027fcc30c7163e39 SHA512 736b4da75bf905845964e2a097d192fe075095656818d9e9fd118327510d8fe176c713d5e77752be99b2b13fc10dc4c07bd246cb8b77bd2a99056e6ef0fe4904
-AUX linkchecker-9.3.1-build-fix.patch 450 BLAKE2B 176f2617c0e2285473d500b351a918d9a48ef631662f6ecbfe7abe8ac37a6a8fd0406838193f068c42a9baeb09d9630e70aa518f51e480dfc3dc0c8ae17d6e9a SHA512 47c30bb1e2724ec96ca0c5223dce4ab0c79e30752be799498e84ff5953f78d9495265f59635a337690d28e6d44740296d9771c342cee6a88b30fe46bf2c58952
-AUX linkchecker-9.3.1-requests.patch 1870 BLAKE2B 6ac551b151b805f373b2bccf6d47e08158e85c894721c640d8d1701e177e52a4bd780b0b195503bf0e8e3709175f1ec73c8f7e24dd578aa63846cfd17b851e47 SHA512 fbfd999cdb48628bb3ce14bca2f114e104a69c0355a00c9b81a543c5ac10a8bec0ab71dcbbefc81bc8f468a7e17a9a89dcd5d795ce565b9452131ac2ee6e5fe3
-DIST linkchecker-9.3.1.tar.gz 779286 BLAKE2B eec374a3455b5348533b29b03ab14558dd19a20e1058947eed9d8027a8b1705b63525e6b8fcf2c4feb59a782ca0e0ad8567e321ca4679320e9d6f256e14df990 SHA512 355c9d262502e123732807b5aaabc17060d267de44a6dc1fee9dd6655c56320ded0c1ff638d985c2dbec366d15803cfb78fae4c1a9943de11c5b4292f5a99305
 DIST linkchecker-9.4.0.tar.gz 489909 BLAKE2B 1c9d9af96778f9d2b542a078ba9da8751d6f7bc170809d5eefef6e8e2d5587e969f1cba3d6ae116b6de981949dd638b0d78fc416ce5055b3156da308b5a95d67 SHA512 3423f710a46d921c4387ffcfe1a8632cb889bcfdb4d56cbabcae87ca41547221e854546efd6e440e798ea85531c34a35f3ab779cd6bc2b6e63095015ad0537ba
-EBUILD linkchecker-9.3.1-r1.ebuild 1635 BLAKE2B ffe1b02ded5cacb0a1906696634220f69a61d3a426a1cd1d592f88c11a0ac1bcfd2cbd44a6ad61bbd0f4b896bcde56be6ec277181cdde85da84bc18bbd306e36 SHA512 b91819cb02a957f9a3ae3e891e66a27305834983b92384430c24cdf82e2e1b744b17df16b60ffd80d70923de5f6fa1f83a02e27f747044a2b7753c0bcc9478b0
-EBUILD linkchecker-9.4.0.ebuild 1418 BLAKE2B 82f3c2ec15f63aab72a5eb364f00ab3c1146f30201ab05633d27eae985cd4d1f1f80580b21b050d8cde6b4746702f4b3e9e4105f8f1061a370ac65cc2d5193ad SHA512 ca2877a5c0df9fd851497f6fae47c42a6182f93f9e9197e66f41a4282e5f07601a69aff64b9323c8f9078f6f25aba4236527e28cce8e6d68d37730c7286d3388
+EBUILD linkchecker-9.4.0.ebuild 1417 BLAKE2B 1674975fc3c778beaf6e78b6d6f7320cbb6fb913d0fe0d5de029aea274b961cd9e5ec1adbfcd07745320327f1c1edbe6f73682ed40adec397894e37a1970c76f SHA512 0802830c19cdb9750ae4ad5d997452b4f3cd103dc41478618fdc971ab0a9e3ce4185abcabcaf89f804f2194e4367de681e77e8c776635ca6ed6396576db31119
 EBUILD linkchecker-9999.ebuild 1221 BLAKE2B 0193a2f063e41a641b2b008e4b84abce2aa41826d9a84f51582b21dcafaa5633bbeb6c771f232f9cafcc49c1d3c9f2ca50c3b473b9d208839e2d3b6153ef3abe SHA512 970acb72a0edc5fd6792b6d06bfc2807682ee9e7c275187b6b80248322e575363db3b485828845abbb58ed3e1dacdbce3fe98d0b6a8538df96dc2f1237e2c92d
 MISC metadata.xml 319 BLAKE2B dbf67b67a9a9a65ff108e9ee4c5881023a53533d9bbeee71e9ba1a55658f2a746b408859515f593ce2ef0fd93f938fbb17c5c7a70fa48eda4be977634d11e7c5 SHA512 2fbc3b85bcfd178e2614ef73d55c633e6e3b5ee59d39ca0a6099ffd7e8067e890f69252666d8d6d9a173371d95c4b1fbb8157cb94fd307ee20672fb9ff4182fb
diff --git a/net-analyzer/linkchecker/files/linkchecker-9.2-unbundle.patch b/net-analyzer/linkchecker/files/linkchecker-9.2-unbundle.patch
deleted file mode 100644
index 598f856b0007..000000000000
--- a/net-analyzer/linkchecker/files/linkchecker-9.2-unbundle.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- setup.py | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/setup.py b/setup.py
-old mode 100755
-new mode 100644
-index dc30a7d..d62622b
---- a/setup.py
-+++ b/setup.py
-@@ -900,9 +900,6 @@ o a command line, GUI and web interface
-         'py2exe': MyPy2exe,
-         'py2app': MyPy2app,
-     },
--    package_dir = {
--        'linkcheck_dns.dns': 'third_party/dnspython/dns',
--    },
-     packages = [
-         'linkcheck',
-         'linkcheck.bookmarks',
-@@ -917,10 +914,6 @@ o a command line, GUI and web interface
-         'linkcheck.network',
-         'linkcheck.parser',
-         'linkcheck.plugins',
--        'linkcheck_dns.dns',
--        'linkcheck_dns.dns.rdtypes',
--        'linkcheck_dns.dns.rdtypes.ANY',
--        'linkcheck_dns.dns.rdtypes.IN',
-     ],
-     ext_modules = [
-         Extension('linkcheck.HtmlParser.htmlsax',
diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3.1-build-fix.patch b/net-analyzer/linkchecker/files/linkchecker-9.3.1-build-fix.patch
deleted file mode 100644
index bcfd2cc800e4..000000000000
--- a/net-analyzer/linkchecker/files/linkchecker-9.3.1-build-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/setup.py b/setup.py
-index b42ed8c..ec206e6 100755
---- a/setup.py
-+++ b/setup.py
-@@ -654,8 +654,7 @@ myemail = "bastian.kleineidam@web.de"
- 
- data_files = [
-     ('share/linkchecker',
--        ['config/linkcheckerrc',
--        'doc/html/lccollection.qhc', 'doc/html/lcdoc.qch']),
-+        ['config/linkcheckerrc']),
-     ('share/linkchecker/examples',
-         ['cgi-bin/lconline/leer.html.en',
-          'cgi-bin/lconline/leer.html.de',
diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch b/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch
deleted file mode 100644
index 56c57fa37997..000000000000
--- a/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 9b12b5d66fa9b832f4d9e19a0b9dcb92607ee3e5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@debian.org>
-Date: Mon, 2 Oct 2017 20:18:54 -0400
-Subject: [PATCH] workaround new limitation in requests
-
-newer requests do not expose the internal SSL socket object so we
-cannot verify certificates. there was work to allow custom
-verification routines which we could use, but this never finished:
-
-https://github.com/shazow/urllib3/pull/257
-
-so right now, just treat missing socket information as if the cert was
-missing.
-
-Closes: #76
----
- linkcheck/checker/httpurl.py | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/linkcheck/checker/httpurl.py b/linkcheck/checker/httpurl.py
-index 161619c5..bde77c70 100644
---- a/linkcheck/checker/httpurl.py
-+++ b/linkcheck/checker/httpurl.py
-@@ -194,6 +194,10 @@ def _get_ssl_sock(self):
-         """Get raw SSL socket."""
-         assert self.scheme == u"https", self
-         raw_connection = self.url_connection.raw._connection
-+        if not raw_connection:
-+            # this happens with newer requests versions:
-+            # https://github.com/linkcheck/linkchecker/issues/76
-+            return None
-         if raw_connection.sock is None:
-             # sometimes the socket is not yet connected
-             # see https://github.com/kennethreitz/requests/issues/1966
-@@ -204,7 +208,10 @@ def _add_ssl_info(self):
-         """Add SSL cipher info."""
-         if self.scheme == u'https':
-             sock = self._get_ssl_sock()
--            if hasattr(sock, 'cipher'):
-+            if not sock:
-+                log.debug(LOG_CHECK, "cannot extract SSL certificate from connection")
-+                self.ssl_cert = None
-+            elif hasattr(sock, 'cipher'):
-                 self.ssl_cert = sock.getpeercert()
-             else:
-                 # using pyopenssl
diff --git a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
deleted file mode 100644
index dd72dc62cfd6..000000000000
--- a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite?"
-
-inherit bash-completion-r1 distutils-r1 eutils
-
-DESCRIPTION="Check websites for broken links"
-HOMEPAGE="https://github.com/linkcheck/linkchecker"
-SRC_URI="https://github.com/linkcheck/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-macos ~x64-solaris"
-IUSE="gnome sqlite"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-"
-DEPEND=""
-
-RESTRICT="test"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-9.2-unbundle.patch"
-		"${FILESDIR}/${PN}-9.3-bash-completion.patch"
-		"${FILESDIR}/${PN}-9.3.1-build-fix.patch"
-		"${FILESDIR}/${PN}-9.3.1-requests.patch"
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	delete_gui() {
-		rm -rf \
-			"${ED}"/usr/bin/linkchecker-gui* \
-			"${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
-	}
-
-	DOCS=(
-		doc/upgrading.txt
-		doc/python3.txt
-		doc/changelog.txt
-		doc/development.txt
-	)
-	distutils-r1_python_install_all
-
-	python_foreach_impl delete_gui
-	rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die
-
-	newicon doc/html/logo64x64.png ${PN}.png
-
-	docinto html
-	dodoc doc/html/*
-	newbashcomp config/linkchecker-completion ${PN}
-}
-
-pkg_postinst() {
-	optfeature "bash-completion support" dev-python/argcomplete[${PYTHON_USEDEP}]
-	optfeature "Virus scanning" app-antivirus/clamav
-	optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}]
-}
diff --git a/net-analyzer/linkchecker/linkchecker-9.4.0.ebuild b/net-analyzer/linkchecker/linkchecker-9.4.0.ebuild
index ea79afb87f71..ce086daf5a23 100644
--- a/net-analyzer/linkchecker/linkchecker-9.4.0.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linkcheck/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~ppc-macos ~x64-solaris"
+KEYWORDS="amd64 x86 ~ppc-macos ~x64-solaris"
 IUSE="sqlite"
 
 RDEPEND="
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index 986723dba957..6c54935d0f2a 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,7 +1,4 @@
 AUX define-own-mysql-port-constant.patch 3271 BLAKE2B a9776567af41b106616c10aac02042147d162a452e17480433a8fd8ffcf3ce506d6930215e8a8eaa219d7811adffbcc2b3ee6a004661ca2a1f8bdc3339bf3526 SHA512 18cb9be96b3e39a07eeb1cf6bccbbe26766ac355f4822c132253e25a6909c418071c2dc546fb60c055b78f620180035e57436a8ebb771ae1096b78d2e1c7c6ec
-DIST nagios-plugins-2.0.3.tar.gz 2659772 BLAKE2B d4deccf04458daccde5fbe7e6c659282d36fec69096e6b1b8487455db0089f7a5073ce14ef6a74f82869de08ad740b0d3b617d691c85b8895e475302152ca33c SHA512 2753e6f3fc7433a5583fee01e63a65b9ea74155964f2b6e6bf3458e56cb29ea5dbd020f83816044a717b66d6548d203b3a082fba0faedcd629c7a8457bc19b36
 DIST nagios-plugins-2.2.1.tar.gz 2728818 BLAKE2B ea89862935491d9c31403a36712d39557fa8e90dc2306e027531e974933cd13cc6b55ebfdd7dfc7541d6458741aaf57714df57fdddc92049001a59f0ffb6413a SHA512 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3
-EBUILD nagios-plugins-2.0.3-r2.ebuild 2828 BLAKE2B 2581655bd322f74c6253811b6a10de420c5f1c90677d87d5f344f4939d45b00d394fe8b026b44ed9bf76024d18ef67d4f7ab222e6fa75e72d88e7c4f44eae94a SHA512 cabe19f142006c4d104721361c2c58fc7a103717041050a21bc21b47adb6702bf05c77f1ed8b063f74b11a59a2dd1120d8478e5b1d803636aeb9f1ae92c2ae91
-EBUILD nagios-plugins-2.2.1-r2.ebuild 3109 BLAKE2B fb9958b01df2993cf3f2f95c50996f94b30e9238a39e116dd857255c60bb4d516781171041d8070a50ffc7526766d24b0331c4f93302d875e17775043b4f84ab SHA512 a7080b7c27013958a97a9125ba11bfa93be6402dbe8a8667b80f236bf3364e994b44815bb6ace6e24e08a0f9c0f90f96f47ca2d71403152c444b4b5afd064249
 EBUILD nagios-plugins-2.2.1-r3.ebuild 3116 BLAKE2B d8d272c092af7fe6cab2c5f08f73e6a836e7862b98e65a42edb0125c87446504f89fa01d54663e7bd31da35bf45bfebd58b98ce137c4c6949ebc1e5b77932458 SHA512 9e59c607ff8177ddb930ad3e5cafd2ccf6dda76faa6b935532ecfae2c27ff696d4b7f5e8cca04164a98f3a1829c6ad969e41ac0a1fff3748f467df0387dfccc6
 MISC metadata.xml 1430 BLAKE2B 63a889dc51085a41a5dec4b6c32e6262ff59fdb1413699736d6332a75406749551b1c82d62a2662f4d7935c46a4bc3b51e0ca7e3b070656163fb0b6fc69c742e SHA512 d6cbc6820de52e1ed471b97a6c592af72474db492204594314eebb656b8abe89a01667a7bbb621418fd393aeacb28e9a10c5749de7ace67dd15119f701019e72
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r2.ebuild
deleted file mode 100644
index e50223884561..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib user
-
-DESCRIPTION="Official set of plugins for Nagios"
-HOMEPAGE="http://nagios-plugins.org/"
-SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
-IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres samba snmp ssh +ssl"
-
-# Most of the plugins use automagic dependencies, i.e. the plugin will
-# get built if the binary it uses is installed. For example, check_snmp
-# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
-# installed. End result: most of our runtime dependencies are required
-# at build time as well.
-#
-# REAL_DEPEND contains the dependencies that are actually needed to
-# build. DEPEND contains those plus the automagic dependencies.
-#
-REAL_DEPEND="dev-lang/perl
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:* )
-	ssl? ( dev-libs/openssl:0 )"
-
-DEPEND="${REAL_DEPEND}
-	nagios-dns? ( net-dns/bind-tools )
-	nagios-game? ( games-util/qstat )
-	nagios-ping? ( net-analyzer/fping )
-	samba? ( net-fs/samba )
-	ssh? ( net-misc/openssh )
-	snmp? ( dev-perl/Net-SNMP
-			net-analyzer/net-snmp[-minimal] )"
-
-# Basically everything collides with nagios-plugins.
-RDEPEND="${DEPEND}
-	!net-analyzer/monitoring-plugins"
-
-# At least one test is interactive.
-RESTRICT="test"
-
-src_prepare() {
-	# Fix the path to our perl interpreter
-	sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \
-		"${S}"/plugins-scripts/*.pl || die
-}
-
-src_configure() {
-	# Use an array to prevent econf from mangling the ping args.
-	local myconf=()
-
-	if use ssl; then
-		myconf+=( $(use_with ssl openssl /usr) )
-	else
-		myconf+=( --without-openssl )
-		myconf+=( --without-gnutls )
-	fi
-
-	# The autodetection for these two commands can hang if localhost is
-	# down or ICMP traffic is filtered. Bug #468296.
-	myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
-
-	if use ipv6; then
-		myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
-	fi
-
-	econf \
-		$(use_with mysql) \
-		$(use_with ipv6) \
-		$(use_with ldap) \
-		$(use_with postgres pgsql /usr) \
-		"${myconf[@]}" \
-		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
-		--sysconfdir="/etc/nagios"
-}
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
-		NEWS README REQUIREMENTS SUPPORT THANKS )
-
-pkg_preinst() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-pkg_postinst() {
-	elog "This ebuild has a number of USE flags that determine what you"
-	elog "are able to monitor. Depending on what you want to monitor, some"
-	elog "or all of these USE flags need to be set."
-	elog
-	elog "The plugins are installed in ${ROOT}usr/$(get_libdir)/nagios/plugins"
-}
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild
deleted file mode 100644
index 70bc775d0c45..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="Official plugins for Nagios"
-HOMEPAGE="http://nagios-plugins.org/"
-SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
-
-# Most of the plugins use automagic dependencies, i.e. the plugin will
-# get built if the binary it uses is installed. For example, check_snmp
-# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
-# installed. End result: most of our runtime dependencies are required
-# at build time as well.
-#
-# REAL_DEPEND contains the dependencies that are actually needed to
-# build. DEPEND contains those plus the automagic dependencies.
-#
-REAL_DEPEND="dev-lang/perl
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:* )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	radius? ( net-dialup/freeradius-client )"
-
-DEPEND="${REAL_DEPEND}
-	nagios-dns? ( net-dns/bind-tools )
-	nagios-game? ( games-util/qstat )
-	nagios-ping? ( net-analyzer/fping )
-	samba? ( net-fs/samba )
-	ssh? ( net-misc/openssh )
-	snmp? ( dev-perl/Net-SNMP
-			net-analyzer/net-snmp[-minimal] )"
-
-# Basically everything collides with nagios-plugins.
-RDEPEND="${DEPEND}
-	!net-analyzer/monitoring-plugins
-	selinux? ( sec-policy/selinux-nagios )"
-
-# At least one test is interactive.
-RESTRICT="test"
-
-DOCS=(
-	ACKNOWLEDGEMENTS
-	AUTHORS
-	CODING
-	ChangeLog
-	FAQ
-	NEWS
-	README
-	REQUIREMENTS
-	SUPPORT
-	THANKS
-)
-
-PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" )
-
-src_prepare() {
-	default
-
-	# Fix the path to our perl interpreter
-	sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \
-		"${S}"/plugins-scripts/*.pl \
-		|| die 'failed to fix perl interpreter path'
-}
-
-src_configure() {
-	# Use an array to prevent econf from mangling the ping args.
-	local myconf=()
-
-	if use ssl; then
-		myconf+=( $(use_with ssl openssl /usr) )
-	else
-		myconf+=( --without-openssl )
-		myconf+=( --without-gnutls )
-	fi
-
-	# The autodetection for these two commands can hang if localhost is
-	# down or ICMP traffic is filtered. Bug #468296.
-	myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
-
-	if use ipv6; then
-		myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
-	fi
-
-	econf \
-		$(use_with mysql) \
-		$(use_with ipv6) \
-		$(use_with ldap) \
-		$(use_with postgres pgsql /usr) \
-		$(use_with radius) \
-		"${myconf[@]}" \
-		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
-		--sysconfdir="/etc/nagios"
-}
-
-pkg_preinst() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-pkg_postinst() {
-	elog "This ebuild has a number of USE flags that determine what you"
-	elog "are able to monitor. Depending on what you want to monitor, some"
-	elog "or all of these USE flags need to be set."
-	elog
-	elog "The plugins are installed in ${ROOT}usr/$(get_libdir)/nagios/plugins"
-}