gentoo resync : 24.12.2018

28 files changed, 238 insertions, 597 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index ef9fa5b2a221..4a8bcb436c89 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/c-icap-modules/Manifest b/net-proxy/c-icap-modules/Manifest
deleted file mode 100644
index 2c22c674fddc..000000000000
--- a/net-proxy/c-icap-modules/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST c_icap_modules-0.2.4.tar.gz 373120 BLAKE2B 59106c180005f822a44fb01adf4cf6635dff4dba8dbec17a450ff95ad2c34b607acd4c43875944e3fde1b6cb1c9c376a4bdbbf661f701501b0c2145785394fe8 SHA512 5752a52f58852f71c98ff60e5670468998fa481807b866b238bfc3f2465387cf4ce4b2ee1544c35021b618cda69798765479129133d9ac25d23662eac1adbc7f
-EBUILD c-icap-modules-0.2.4.ebuild 1111 BLAKE2B 410cd2c6f3aaf0e675ab37c27b30f620d89d95c07a83a72c778be2aca20841baf7ef0326aa107eb47543c874f79b7a20618be472b520705cec86231186b34bb7 SHA512 9feff59d651acc3369f2f00fb722855d55409888516afd83cd325c16f1ffd74c2c63918362abf0b785878750b89412bcbf623eae64438489f30c4ab6eae80b6b
-MISC metadata.xml 333 BLAKE2B dbdbe4225a15cf31a607a747c773ed2aec8533d2898692274a584fd2d24231d59e3578eccc70d2c9b00cb90bfcc857a7e9c5a3e3381df58f1921cd3c96297290 SHA512 6c99f30ce4ee6a472051f70f318e4a6745cac7d7b0f9a2f97f490e4ece6c8e91ba971c543fd717f6d8c5a8040cd17709d8a882ece8ce7718444afb72ae1672f5
diff --git a/net-proxy/c-icap-modules/c-icap-modules-0.2.4.ebuild b/net-proxy/c-icap-modules/c-icap-modules-0.2.4.ebuild
deleted file mode 100644
index c06b817fbfcb..000000000000
--- a/net-proxy/c-icap-modules/c-icap-modules-0.2.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib flag-o-matic
-
-MY_PN=c_icap_modules #${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="URL blocklist and virus scanner for the C-ICAP server"
-HOMEPAGE="http://c-icap.sourceforge.net/"
-SRC_URI="mirror://sourceforge/c-icap/${PN}/0.2.x/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="berkdb clamav"
-
-DEPEND="berkdb? ( sys-libs/db )
-	clamav? ( app-antivirus/clamav )
-	net-proxy/c-icap
-	sys-libs/glibc
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# some void *** pointers get casted around and can be troublesome to
-	# fix properly.
-	append-flags -fno-strict-aliasing
-
-	econf --sysconfdir=/etc/c-icap \
-		--disable-dependency-tracking \
-		--disable-maintainer-mode \
-		--disable-static \
-		$(use_with berkdb bdb) \
-		$(use_with clamav)
-}
-
-src_compile() {
-	emake LOGDIR="/var/log"
-}
-
-src_install() {
-	dodir /etc/c-icap
-
-	emake 	LOGDIR="/var/log" \
-		DESTDIR="${D}" install
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-proxy/c-icap-modules/metadata.xml b/net-proxy/c-icap-modules/metadata.xml
deleted file mode 100644
index 4964bf824fc9..000000000000
--- a/net-proxy/c-icap-modules/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>URL blocklist and virus scanner for the C-ICAP server</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">c-icap</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-proxy/c-icap/Manifest b/net-proxy/c-icap/Manifest
deleted file mode 100644
index b4f6ece3a6f7..000000000000
--- a/net-proxy/c-icap/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX c-icap-0.2.6-fix-icap-parsing.patch 522 BLAKE2B 371e498dc5ff1e6f63646a8caef270c36bc3769f3c991b22cf6ba0c459d654701dc7cd980eb072d9cad4e8fdae8a0c036fbe3f94e43e3445a5b77ca72c3ace4d SHA512 9bc60cba5d5560acad1320595176f0ccd654c4f88e2507da0e80d588999309b4180bc7b86843bf63d5688bcd377432a913ea76525ac5ccdec40155e70ecec9c0
-AUX c-icap.conf 359 BLAKE2B 028a2b8c7fb81005580085a7f3554e460c3f05950ca2696af234e035e9873aef12353450cd5a21fb2e8efeede43a0bced272e4515f4a5313f0088458b11bd4ec SHA512 2ccab04f6ddb1b76b41d9b26dfdcf3e43aa4acdaeeddc215f38e0f7f8b537687733c643d5cc2b0e06b95710a3cd76c8a67e33e8c8240b375d939fea649e86ba3
-AUX c-icap.init.3 693 BLAKE2B 09beb3ffad19455c0de6cd400f9078b147020477b468409273e5163b9ef1aaba75a0291536642053a6e1755f6bdf27266f6eeb2cd1bffa020e0f9bf594b9158d SHA512 9518ebdc57e69716717160fa11d2ade4648212ac4bbc65caeec0d0c7d2427cd0a8a70e1de36b6c81113c821ed9a11808f7d81595f8c1fc185013a1cd4ac93bdb
-AUX c-icap.logrotate 188 BLAKE2B abfc255d4b82a58ac7f94e76c1dcaa40fce2415ec5a0d760eba18f5843a1ffd0bdcfd3c238759032020249107a3a73b836db32052af44923ef855a69e46eaa51 SHA512 edc8dbbbaa06cf062b307e37ffee1dee9d566cc4b8a6947422125a22d956bcc639c483712ff6b6f6e9eb30852b4b0d5c293f1279463af89e8fc199828792a9e7
-DIST c_icap-0.2.6.tar.gz 581856 BLAKE2B ce1e83efd9f7d1a9e78fd1cd4dd60e2323b2e35ff44bbfd93484524ecd37f0a7d1031042527ca0dd9804fb44e1033063237ad3b4e516d1ef956a13cee45a633c SHA512 3b1fe1f89581ec4649f74771f4a33a08637428f6cf81a9228f5d08405207c3495e6dadd590254dd6804ccbb7c34af1fc62973563c6156c4249941a599a072a40
-EBUILD c-icap-0.2.6.ebuild 2854 BLAKE2B 4684b5cffa8f7ceaca5208d6bbf9f9902aa643eef3116179e7f198e6ad25c87efe0a742c493c6bb1e21b2d52eae158775be028d664858f26585937db5fad2d1d SHA512 abe180bfeab2c1223dfc9fa6deb1880a0f8fbdc9064950130700a50278fa3551af4761e9d03e1e878df6bec489ed91cd628726c6dc1b76ce107dd5d60a2b1615
-MISC metadata.xml 219 BLAKE2B d172b66d0ed900637f5035a61e04438364b379c236d01f7413f7d3464d75ed4d813bb656eeaec3001399891bb0ba8a61f52b1a62d3d01a658d0f34aa8cac6707 SHA512 1b367aedae4a1b2484e88740adb95edb652befa869fb44b25f98a9634dc8819f461913304e74ac254cff88841b254b256d33062b65cee579f8cbf9f72526e2aa
diff --git a/net-proxy/c-icap/c-icap-0.2.6.ebuild b/net-proxy/c-icap/c-icap-0.2.6.ebuild
deleted file mode 100644
index cd9886df7296..000000000000
--- a/net-proxy/c-icap/c-icap-0.2.6.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib flag-o-matic
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="C Implementation of an ICAP server"
-HOMEPAGE="http://c-icap.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="berkdb ipv6 ldap"
-
-RDEPEND="berkdb? ( sys-libs/db )
-	ldap? ( net-nds/openldap )
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/c-icap-0.2.6-fix-icap-parsing.patch
-}
-
-src_configure() {
-	# some void *** pointers get casted around and can be troublesome to
-	# fix properly.
-	append-flags -fno-strict-aliasing
-
-	econf \
-		--sysconfdir=/etc/${PN} \
-		--disable-dependency-tracking \
-		--disable-maintainer-mode \
-		--disable-static \
-		--enable-large-files \
-		$(use_enable ipv6) \
-		$(use_with berkdb bdb) \
-		$(use_with ldap)
-}
-
-src_compile() {
-	emake LOGDIR="/var/log"
-}
-
-src_install() {
-	emake \
-		LOGDIR="/var/log" \
-		DESTDIR="${D}" install
-
-	find "${D}" -name '*.la' -delete || die
-
-	# Move the daemon out of the way
-	dodir /usr/libexec
-	mv "${D}"/usr/bin/c-icap "${D}"/usr/libexec || die
-
-	# Remove the default configuration files since we have etc-update to
-	# take care of it for us.
-	rm "${D}"/etc/${PN}/c-icap.*.default || die
-
-	# Fix the configuration file; for some reason it's a bit messy
-	# around.
-	sed -i \
-		-e 's:/usr/var/:/var/:g' \
-		-e 's:/var/log/:/var/log/c-icap/:g' \
-		-e 's:/usr/etc/:/etc/c-icap/:g' \
-		-e 's:/usr/local/c-icap/etc/:/etc/c-icap/:g' \
-		-e 's:/usr/lib/:/usr/'$(get_libdir)'/:g' \
-		"${D}"/etc/${PN}/c-icap.conf \
-		|| die
-
-	dodoc AUTHORS README TODO ChangeLog
-
-	newinitd "${FILESDIR}/${PN}.init.3" ${PN}
-	newconfd "${FILESDIR}/${PN}.conf" ${PN}
-	keepdir /var/log/c-icap
-
-	insopts -m0644
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
-	# avoid triggering portage's symlink protection; this is handled by
-	# the init script anyway.
-	rm -rf "${D}"/var/run
-}
-
-pkg_postinst() {
-	elog "To enable Squid to call the ICAP modules from a local server you should set"
-	elog "the following in your squid.conf:"
-	elog ""
-	elog "    icap_enable on"
-	elog ""
-	elog "    # not strictly needed, but some modules might make use of these"
-	elog "    icap_send_client_ip on"
-	elog "    icap_send_client_username on"
-	elog ""
-	elog "    icap_service service_req reqmod_precache bypass=1 icap://localhost:1344/service"
-	elog "    adaptation_access service_req allow all"
-	elog ""
-	elog "    icap_service service_resp respmod_precache bypass=0 icap://localhost:1344/service"
-	elog "    adaptation_access service_resp allow all"
-	elog ""
-	elog "You obviously will have to replace \"service\" with the actual ICAP service to"
-	elog "use."
-}
diff --git a/net-proxy/c-icap/files/c-icap-0.2.6-fix-icap-parsing.patch b/net-proxy/c-icap/files/c-icap-0.2.6-fix-icap-parsing.patch
deleted file mode 100644
index b0275edefee5..000000000000
--- a/net-proxy/c-icap/files/c-icap-0.2.6-fix-icap-parsing.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- c-icap-0.2.2.orig/request.c	2013-02-03 16:37:43.000000000 +0000
-+++ c-icap-02.2/request.c	2012-06-19 12:55:51.000000000 +0000
-@@ -267,7 +267,7 @@
-                req->req_server[servnamelen] = '\0';
-                if (*end == '/') {       /*service */
-                     start = ++end;
--                    while (*end != ' ' && *end != '?')
-+                    while (*end && *end != ' ' && *end != '?')
-                          end++;
-                     len = end - start;
-                     if (len > 0) {
diff --git a/net-proxy/c-icap/files/c-icap.conf b/net-proxy/c-icap/files/c-icap.conf
deleted file mode 100644
index d3f2420b2dce..000000000000
--- a/net-proxy/c-icap/files/c-icap.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Use this to change the configuration file to use for c-icap.
-configfile=/etc/c-icap/c-icap.conf
-
-# Use this to set any extra option for the daemon. Do not use the -f
-# option here.
-EXTRA_OPTS=""
-
-# If you enabled LDAP support, and you'd like to access tables stored
-# in the local LDAP instance, you want to uncomment the following
-# line.
-#rc_need="slapd"
diff --git a/net-proxy/c-icap/files/c-icap.init.3 b/net-proxy/c-icap/files/c-icap.init.3
deleted file mode 100644
index c11ae50b9f79..000000000000
--- a/net-proxy/c-icap/files/c-icap.init.3
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-: ${configfile:=/etc/c-icap/c-icap.conf}
-
-get_config() {
-    local value=$(awk '$1 == "'$1'" { print $2 }' ${configfile})
-    echo ${value:-$2}
-}
-
-command="/usr/libexec/c-icap"
-command_arguments="${EXTRA_OPTS} -f ${configfile}"
-pidfile=$(get_config PidFile /var/run/c-icap/c-icap.pid)
-
-depend() {
-	need localmount
-	config ${configfile}
-	[ "$(get_config Logger file_logger)" = "sys_logger" ] && use logger
-}
-
-start_pre() {
-	local cmdsocket=$(get_config CommandsSocket /var/run/c-icap/c-icap.ctl)
-
-	checkpath -d "$(dirname "${cmdsocket}")" "$(dirname "${pidfile}")"
-}
diff --git a/net-proxy/c-icap/files/c-icap.logrotate b/net-proxy/c-icap/files/c-icap.logrotate
deleted file mode 100644
index c4c0a5d34f6e..000000000000
--- a/net-proxy/c-icap/files/c-icap.logrotate
+++ /dev/null
@@ -1,13 +0,0 @@
-/var/log/c-icap/access.log {
-	missingok
-	postrotate
-		/etc/init.d/c-icap restart
-	endscript
-}
-
-/var/log/cicap-server.log {
-	missingok
-	postrotate
-		/etc/init.d/c-icap restart
-	endscript
-}
diff --git a/net-proxy/c-icap/metadata.xml b/net-proxy/c-icap/metadata.xml
deleted file mode 100644
index af696825f7a7..000000000000
--- a/net-proxy/c-icap/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <upstream>
-    <remote-id type="sourceforge">c-icap</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-proxy/dnsproxy/Manifest b/net-proxy/dnsproxy/Manifest
index 70185cf7d123..95f98bbca455 100644
--- a/net-proxy/dnsproxy/Manifest
+++ b/net-proxy/dnsproxy/Manifest
@@ -1,6 +1,8 @@
-AUX dnsproxy-1.16-include.patch 265 BLAKE2B 18588593d63c1e9317c24c3b6f69e368be3f3bb33feef2e885433fa7187f7fa9080ccde24bfbb2ac907afbb790b3bab9dc9dcd24952f73eb604e36d5811034af SHA512 b97be76ef6d9fe4be6720bb14b3cff1fc02f5b25400629a6538fe2aee003323e0f577a80dd4750242dc008bd2e7912332c66e87bd7f653eeb2f9ecf2ddc29b25
+AUX dnsproxy-1.16-include.patch 192 BLAKE2B 6f76ec11e243a698b205d429a6381826d0ab2601f5449e6cbb2e8a4bc3ea4a7a08a5d3ea5b143b4e88e6eb7c51391cb13fe975d017a02f85f3deb82d6267ea65 SHA512 c9b17db9b7e6cf6709f74cb5b342bbb94fba0e5c132e8869a096148bcd8599a7e1f05906b6b9028e154233ea234f40cdc72870c486423ea7f0d8d286dfa6ad0e
 AUX dnsproxy.confd 153 BLAKE2B 69b61c47615ad7a5241865da4767ac439c63ec0d6fdf27dcff25991d5592cf6ca7d79dadbb54bdad558f725c13e4e54f3d7fae6d9355e7b86183f6b5d9a46cc6 SHA512 5aa16ba6f507509bb25677c68d5cef31b88b01ca1dbf7629e7702240870795327c0c4b0bcf77e643baada42c844d1d41d95aebe8b6271ede1c5ce3fa1507a8b6
 AUX dnsproxy.initd 704 BLAKE2B eec84ccc46a52d95eb17e7153fcf102611f47e06a96460987b10fe4f6ef4715cb3da198ee79a15dc680520fd87118d22c7d6f37c4e88a4bb4cb4296214683e63 SHA512 d36034ff8847c508844f617678257d699f172a8d680e9ff1f9cf6843b56d2461f68387c7c3d60afb369131a073fd9f8e43c343d47819457661e549b87aa59d8a
 DIST dnsproxy-1.16.tar.gz 47239 BLAKE2B 38134f93c95ec9f24d3e142251cd0dfd2b51fcaf02381ed00890e951f7a61af45e978264c4c17e3518585c408f6c88e47b6a0291939aedfc9f27b13a057650ff SHA512 f02498de963555556b656be432612e6d9ed72f29c838672c45ed2b4100cd6ae30b19091cbd33587259935342c86a733b820d2df54a8c3c1c699edb050b1b3d2b
-EBUILD dnsproxy-1.16-r2.ebuild 774 BLAKE2B 1c4339ac3f441832f3baf99810677bc79cb2b97e12d7e59d3cb3ce70cf7e7e17e4ed198eaa8b3c5fc8ba273367dfc2d1b3aae0b7a70d61438b07b28a9467f900 SHA512 bb494f54c8e58f8079d2c99d49662277a1d0b94f3ffacfca1d69f1d707747080a07a5ce232f03a1de18d0d92cf7008d549b80169c77eeee0a91f40b351744fb7
+DIST dnsproxy-1.17.tar.gz 47128 BLAKE2B 37b033b4c8f515b516ebf4780f7d28f6924fd66b9ca826d98567e8d3aab139c9a91a39bd0e8cf6d38084fce86f9ce8cb56f93d16918240d0d0815787dc06a72f SHA512 499910f59306477870f2c1cc7899fed409c5a569be348d11d17277bf4208ecd44173606022566b91b09546f915f1d990d56936f92245501af9fecf2110e88c32
+EBUILD dnsproxy-1.16-r2.ebuild 739 BLAKE2B a840299a31a5a54112a39be1584181dd3fab8ddb541f6bbc5c63dfd59aee9880d7b1b5aeb878df9b2f01612b03654213e94ea3e2095a2470c10a418b5b8cf494 SHA512 d252c73d022cf6e51b71885ff0984e11000d1fe9d95098918f2a548d89ef109df633b618b0ea393063d52ef6ce4d944825cecbdd61395ee8dc1b61d828ba7b15
+EBUILD dnsproxy-1.17.ebuild 741 BLAKE2B 1c559a47ee39c8c24a6cb75be97711fadc3dd3bdda881d802fef1a301698a8d5775cd0295e922e4cfcd6e0560617b990fed717a2753fc2888344b7e1c465b74a SHA512 c46a1b2f570b667031b9f6c47006ee25bf956a05bfe74838b8bc3532268643ee37e5e890094ca9a4cabbefe8e398c6a5704c8a57792fbe0fa1e21ef431c31feb
 MISC metadata.xml 468 BLAKE2B fb2dde133ab4a4e61b8acdf70cbbdc0b2d9427dba9dab1bbb1036642ae62ac9b12a9d5f4d282c9412e385ab54aa75c50fc67c745d0c9804f343f2074b412b82c SHA512 a74c88be1f57a3a2a850554d24226fc40433184a8533ba2acb4980c2d38ec7f8f62454ae25301b9f1bfa2b011e51462e159a65996c59701ca6555204a11f3c87
diff --git a/net-proxy/dnsproxy/dnsproxy-1.16-r2.ebuild b/net-proxy/dnsproxy/dnsproxy-1.16-r2.ebuild
index 05f68e06d9f6..57ab8dd9b981 100644
--- a/net-proxy/dnsproxy/dnsproxy-1.16-r2.ebuild
+++ b/net-proxy/dnsproxy/dnsproxy-1.16-r2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
-inherit eutils flag-o-matic
+inherit flag-o-matic
 
 DESCRIPTION="The dnsproxy daemon is a proxy for DNS queries"
 HOMEPAGE="https://www.wolfermann.org/dnsproxy.html"
@@ -12,19 +11,19 @@ SRC_URI="https://www.wolfermann.org/${P}.tar.gz"
 LICENSE="MIT GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libevent"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}"/${P}-include.patch
-	append-cppflags -D_GNU_SOURCE
 
-	default
-}
+DEPEND="
+	dev-libs/libevent
+"
+RDEPEND="
+	${DEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.16-include.patch
+)
 
 src_compile() {
+	append-cppflags -D_GNU_SOURCE
 	emake ${PN}
 }
 
diff --git a/net-proxy/dnsproxy/dnsproxy-1.17.ebuild b/net-proxy/dnsproxy/dnsproxy-1.17.ebuild
new file mode 100644
index 000000000000..77a4f6123f42
--- /dev/null
+++ b/net-proxy/dnsproxy/dnsproxy-1.17.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="The dnsproxy daemon is a proxy for DNS queries"
+HOMEPAGE="https://www.wolfermann.org/dnsproxy.html"
+SRC_URI="https://www.wolfermann.org/${P}.tar.gz"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-libs/libevent
+"
+RDEPEND="
+	${DEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.16-include.patch
+)
+
+src_compile() {
+	append-cppflags -D_GNU_SOURCE
+	emake ${PN}
+}
+
+src_install() {
+	dosbin ${PN}
+	keepdir /var/empty
+
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	insinto /etc/${PN}
+	newins ${PN}.conf ${PN}.conf.dist
+
+	dodoc README
+	doman ${PN}.1
+}
diff --git a/net-proxy/dnsproxy/files/dnsproxy-1.16-include.patch b/net-proxy/dnsproxy/files/dnsproxy-1.16-include.patch
index 96296f5ed2d8..81cbcce51839 100644
--- a/net-proxy/dnsproxy/files/dnsproxy-1.16-include.patch
+++ b/net-proxy/dnsproxy/files/dnsproxy-1.16-include.patch
@@ -1,5 +1,5 @@
---- dnsproxy.c.orig	2010-01-11 16:02:00.000000000 +0100
-+++ dnsproxy.c	2010-10-27 05:07:05.000000000 +0200
+--- a/dnsproxy.c
++++ b/dnsproxy.c
 @@ -28,6 +28,7 @@
  #include <stdio.h>
  #include <stdlib.h>
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 47683c4e4536..4bfe4d5454f2 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -9,9 +9,10 @@ DIST haproxy-1.6.14.tar.gz 1583859 BLAKE2B 91695f0b3d901ba70b6bce6572c2f549479c2
 DIST haproxy-1.7.10.tar.gz 1750937 BLAKE2B 26d970862e415b079d4130fd00564677584a7aad74d6812cabed36de9a629321330434b7d4fdf7c2e8b2945b7f394ca33e444158e7fa9b49937db501ea33e78a SHA512 ca6c50848c559ee2ffb9af2d281c3931473dd90d1686d95d962cf604cd92d2feb2b63e006e217cf9078cf08fdd73dc523318c97e13400bc0ef325de47111394e
 DIST haproxy-1.7.11.tar.gz 1752129 BLAKE2B 1947ab837f6b81761eec931e97c7349462561abecc78b2b58b285ebb4b0ae498753d236f3a243d3b5c1115a9ff6e5fe9392d428314a6342e2c1907d6886e09e4 SHA512 48ee30a1057e92971c041b088b6aef16d6843da9ecee9b738aaa64bb55d3c3b0be090a37bb5fc63ac42fe34ce994820349cc770756136c823051039fa6d01f74
 DIST haproxy-1.8.13.tar.gz 2063046 BLAKE2B 9ebccf2520719cdf209bc9a87bf28d015b5b673e0d017d5387af4025f930ac401f6a2cfa851583ffe6b6645b7b91ad255bb5db737688a1f310958072a11c8a80 SHA512 54d4cb0721a3868267d7e085b3d3bb050384e4279eb49e88abb925bb3ea8cc39ef9069bdc99b7b18a23fd22e0d29e24dfcb8a0507ddca9243a845e4418be9cc5
-DIST haproxy-1.8.14.tar.gz 2070813 BLAKE2B 113c80cc2f5f427dd419f9c4602d852dec3ae396f8f2cda67993aff4571c88edbd0a84df5c13585999369081182d5d9f8ac86b5bac3d81f7c04c08a00fcd16d2 SHA512 17727c19e0439a2b45be2ec583cd2ce30d1af2bf48bd3cdb2dce1eff670ab8b24d93eaa7bebb410947528d1ad88c3856495e498fff518620efbd32b9adf4eb66
+DIST haproxy-1.8.15.tar.gz 2076583 BLAKE2B 33ea8bfc42a63da08271d875032073d57ebaa22688cf19b3b83e4a1d00218a439b3275260d618557f879e364fc72917fa940a2d3cca44285da1e531440737c7c SHA512 425e1f3a9ab2c2d09934c5d783ad986bd61a638ba6466dd15c20c5b6e7fc3dfad7c398e10bbd336a856ccad29bab0f23e4b9c3d0f17a54b86c8b917e4b974bcb
 DIST haproxy-1.8.8.tar.gz 2054534 BLAKE2B 5eabd37dfb79783dc20425cbb16ca1e1afed23861f66c9e8a738dd56d9ca35b3ceb2604c308543ca99222aa867e11ff613fc09012669882a4bdaaff03cb76450 SHA512 8310f84b364348600273c295a3b315a79cba1f782b86b47d8d47b3ffd1e6fb62fd278c4f2dfa185d0a269f73c1067695a763733736877989a941162b625462a1
 DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd
+DIST haproxy-1.9.0.tar.gz 2325893 BLAKE2B bd837f72863c7d428b1c2427a2826ff486af2aa3ffb453be4d93eb0bcc46805de9b3b79df90b6594a0eab4295a1a1380d5c25166632d6268c9e8e2be57b2d55f SHA512 e83c6ccb54f8ce5d45817ffb8fe0bf4ea959988acbc1e45da9d32870bae1eb25f7fd85cb6c0507c2adc5dc0c7aa42de204e711c442b56fbd2dc642788b41bfce
 EBUILD haproxy-1.5.14.ebuild 3269 BLAKE2B fed37e73d128612260d8266045891a5e271ba399ee61af005409ab07b089297f4ca39adb67c50e0721efa9b7cdc112f0d5d30a65cb60ac027684ddb69e606c9c SHA512 41d1cfec30d177661f4402143ccf1335f5407adeb9f1581ea866011b1ec26c99da67fb2edd33e71e96b64665fa9c62641fd4b5dc1cd1383cc49877a0ce4292b4
 EBUILD haproxy-1.5.19-r2.ebuild 3283 BLAKE2B 698bb63a7c0b97aa62e1c3b12de9689ababa6407dc98870bd73fed0d7aad4f2e08f13faf466aa40d8c420618dcd82e2292a54b4a779772a8e106e7f88194c7b0 SHA512 f8056a851fb9800bcced3827d1294b8b81115c5da3ae603067bb4d10e276c9e053823ba72ebabf21955a7fe241911256e87d4f086eb029a5c1e3d144c15ebfc3
 EBUILD haproxy-1.6.11-r2.ebuild 4672 BLAKE2B 74b3adb390a7fa1d596e8e91f4ca5fbb46d7dfd201527956a514a3f0855f575b2fc1115b388126d8e54a1a80f13b5b62acb59f53eb92a5bd9ef3f02ab3867c38 SHA512 843c39796ab641d5036dc2f1d151da41acc5820713dd2c2857c551d684b0a5922abead4e9c2afb031bb75635842e9ead645ced6d9cebfa97ccc2f719caed8c58
@@ -19,8 +20,9 @@ EBUILD haproxy-1.6.14.ebuild 4608 BLAKE2B d85f4160498f8af8fcc05ccdbe68d771b9d8b5
 EBUILD haproxy-1.7.10.ebuild 4628 BLAKE2B 267e5228e4c1eb2386ab13a6f21d018e8f8643d9adcdb61851d150b281e2241eda97c701b4577fef8feee00c01409f8f2fc715a9681874fc05fc3f89c09da440 SHA512 941f9c3e0982ee44d51339b3feef43d93c7259413f2d77f8919e63056a0d0504468bd0637965141842af6c8dbb223f23155ffc0728f54bc1bbf539eef678c235
 EBUILD haproxy-1.7.11.ebuild 4632 BLAKE2B 06dd613111ce7410ce9190b2cbd825f4b9acd16d3c9995ca507fda90a77696e6c931b2f2caeb916ed0f6894110edaa056df5923c204107230af6a4f596c061ab SHA512 bb080ed92cbef8e2851262648519b5e0563749e3bd92396707791775801bf19f029e57fbe4fa029ea240cbc8f55b14e91d5656e85101fb2dc1e8ae219d111d51
 EBUILD haproxy-1.8.13.ebuild 4886 BLAKE2B 61bc37ea42b0dd5bc447b68cb45532c184f14ad40461faddb940e041682e88ac81af36ce44d961d1011bc54b788ad9baa4c9447950a97708ea33dcb9d677fc32 SHA512 5dad241368a64aba2b07e429ab82adff67df556fc2b5a447d4863a12d50098545127f30725887b447e6ed583e39177458267777c5b321636211aab5a61b85a65
-EBUILD haproxy-1.8.14.ebuild 4886 BLAKE2B de3d4a728a6ebc7d0aa7861982921a6de7ee412efcf819df59f7f63872866a848c395af26b5bfbfa2b29ef3969e60306ccb6a0c2c93bcbd7cdce1df976ab2c31 SHA512 6a9fc1b8200c62be0d271e4ba5d293c07fb872d4832a2d7ff743ed7b2c21995adb2007295dcf3653cd75e5af724bf9f184ae32ae132c88f8e8dd18dfc273c3b8
+EBUILD haproxy-1.8.15.ebuild 4886 BLAKE2B de3d4a728a6ebc7d0aa7861982921a6de7ee412efcf819df59f7f63872866a848c395af26b5bfbfa2b29ef3969e60306ccb6a0c2c93bcbd7cdce1df976ab2c31 SHA512 6a9fc1b8200c62be0d271e4ba5d293c07fb872d4832a2d7ff743ed7b2c21995adb2007295dcf3653cd75e5af724bf9f184ae32ae132c88f8e8dd18dfc273c3b8
 EBUILD haproxy-1.8.8.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
 EBUILD haproxy-1.8.9.ebuild 4885 BLAKE2B beb86eb5714d77b8dad4ac0abc55b46a0e4727ceae1a503ff1febe3943f6393f8ce99f97c098e4046c17de04a32c4f9d0a8708fd4c81eeb69e82f900f156285a SHA512 93290df98b67334d2c89ced563d15d25943a5c87c691fdce2ace423ca38acc364f9307f8a28a6654fb390d41c72ec627e005d0179d10138d92396365496ab8b8
+EBUILD haproxy-1.9.0.ebuild 4999 BLAKE2B 31f594dcff77ab7c263f4abf8475da04fa02bffe98ba3e491efce6000e4e8d9689326cf3e189428b1854702e2084b415a1ac6ee9f420686cc520a20736550416 SHA512 e64a65817ebe35d9bf5f045de9c18eccd8852dd7673d4c554caa8f595803f404e7d007f860c6b8dea296e0c074d8e6dcf7b403edc68043d3a854975b78ba60ed
 EBUILD haproxy-1.9.9999.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
 MISC metadata.xml 2071 BLAKE2B 303b68ae0788743ec5a8d893e69a87fd2d22188b2166f75c23cd2a47c06e69bfe43745016fafd64b5b298f7b56453fcbfb6b4d9bfede1e08e0c603bce7b0955f SHA512 4ac7fd3dcae2293fa3cdb54fba7dfd9cfbc28f5fca33442dd970861ca26672a0b21d825d36099fbf234831a403fb41eabe02d48eca2a971eaef857516427394b
diff --git a/net-proxy/haproxy/haproxy-1.8.14.ebuild b/net-proxy/haproxy/haproxy-1.8.15.ebuild
index 5e9022d20eb6..5e9022d20eb6 100644
--- a/net-proxy/haproxy/haproxy-1.8.14.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.15.ebuild
diff --git a/net-proxy/haproxy/haproxy-1.9.0.ebuild b/net-proxy/haproxy/haproxy-1.9.0.ebuild
new file mode 100644
index 000000000000..924a1c8d2855
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.9.0.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
+systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	pcre2-jit? ( pcre2 )
+	pcre? ( !pcre2 )
+	device-atlas? ( pcre )
+	?? ( slz zlib )"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre
+		pcre2-jit? ( dev-libs/libpcre2[jit] )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	slz? ( dev-libs/libslz:= )
+	zlib? ( sys-libs/zlib )
+	lua? ( dev-lang/lua:5.3 )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	enewgroup haproxy
+	enewuser haproxy -1 -1 -1 haproxy
+
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux2628
+		USE_GETADDRINFO=1
+		USE_TFO=1
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc examples/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/squidclamav/Manifest b/net-proxy/squidclamav/Manifest
deleted file mode 100644
index 55931e1b4e98..000000000000
--- a/net-proxy/squidclamav/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST squidclamav-6.10.tar.gz 436639 BLAKE2B 667f1ee9c204fa2bb2d98b2108abd19da253cf055d365d902ed9533ed842188c0675ec3120a518235b3ddd0b9f9e0fc11c2e020493b967b4a6f234e7195666ff SHA512 36a49720ea8984d3075364cc6150bd5063983aaeaaad538f6e4fde013b92243b0aeb39ef151e0a6752259739e1258d8170fa27eedf3a91384a5814fd81ae9382
-DIST squidclamav-6.8.tar.gz 840634 BLAKE2B 5088003645daa61ad3e21cdc7ad7c72d52d1f08e60f80e011002a4acd27c85b1cc9e6aa82f1734747e844f5439920aece1f9b072e8338f4a911213865f65aee0 SHA512 03d4ccbb970c1b3c9f0d632eae2b0c43fa0d2fc4b2fd495ef972018c069e20b7a4d198989a6010a1778c87a173fa90c49ea3d2332b89a5a9f6b5b7cb914879d0
-EBUILD squidclamav-6.10.ebuild 1747 BLAKE2B 4114a08f4cbb0c4bf3ea7ac6c0a6cd6c725de90f7adc5ff53817e3e2365e5addfaab2c557bdc5bdbfd0fd994a722d85c11462633b173f18d49734ceca8ab303d SHA512 01199da2721253eabf538bf76b3bad0278b541eb41692cddba1266b216af744ed33bfd4b0211012f0d28f61934bd7365e4df88a8c7f66029c1bab6e23d8cbeba
-EBUILD squidclamav-6.8.ebuild 1679 BLAKE2B 37f5ff94b902dd20ba79cc8498b7495643ef363cf7963d83c9e499da10041d1f7b79932ceff33774d4378b889b77c59d4e49f26bf7047f280b730c57e3bedc99 SHA512 e1044c83f7f02f9dfc0b32335d74c0fe839d4416ed7fd30621582f53506afbebef36119d49530f22c5b6ad51320d81ea475c4826ebe8e9070a3abec445d2f8b3
-MISC metadata.xml 510 BLAKE2B 70c4410ae86441cd377fcb146d4ad3ec7449e454f328d8f2c74d844f1903ee388cc81e677f4ae02c594a34c7b0e6708725614717a83bca6e7943c8068bbe0ec4 SHA512 e01fb33026918dca0635228a3b5eec99b5257f1ec90889480e3e75b62b448a28c76aad0e4e742b5017c6b310d9176372123bb76535caa23044db9ad0ecc45280
diff --git a/net-proxy/squidclamav/metadata.xml b/net-proxy/squidclamav/metadata.xml
deleted file mode 100644
index 4f9c96bd930a..000000000000
--- a/net-proxy/squidclamav/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <longdescription>
-    SquidClamAV is a <pkg>net-proxy/squid</pkg> redirector which allows easy antivirus file
-    scanning.  It can use either a local or a remote ClamAV daemon. As
-    of version 6.0, it is now an ICAP module for
-    <pkg>net-proxy/c-icap</pkg>.
-  </longdescription>
-  <upstream>
-    <remote-id type="sourceforge">squidclamav</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-proxy/squidclamav/squidclamav-6.10.ebuild b/net-proxy/squidclamav/squidclamav-6.10.ebuild
deleted file mode 100644
index ecfc677d0e8f..000000000000
--- a/net-proxy/squidclamav/squidclamav-6.10.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit libtool autotools
-
-DESCRIPTION="HTTP Antivirus for Squid based on ClamAv and ICAP"
-HOMEPAGE="http://squidclamav.darold.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="net-proxy/c-icap"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# version 6.3 causes maintainer-mode rebuild from tarball, and
-	# contains acinclude.m4 with libtool macros which cause trouble.
-	rm acinclude.m4 || die
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	econf --disable-static --enable-shared
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-
-	# delete its own documentation installed
-	rm -r "${D}"/usr/share/${PN} || die
-
-	dodoc README AUTHORS ChangeLog
-
-	# Fix configuration file to adapt to the Gentoo configuration
-	sed -i \
-		-e '/clamd_local/s:\.ctl:.sock:' \
-		"${D}"/etc/squidclamav.conf || die
-}
-
-pkg_postinst() {
-	elog "Starting from version 6, Squid Clamav is now a module for the c-icap"
-	elog "server, which is called from squid, rather than being a redirector"
-	elog "directly."
-	elog ""
-	elog "To enable the service, you should add this to your c-icap.conf file:"
-	elog ""
-	elog "    Service clamav squidclamav.so"
-	elog ""
-	elog "And then this to squid.conf (for a local ICAP server):"
-	elog ""
-	elog "    icap_enable on"
-	elog ""
-	elog "    # not strictly needed, but useful for special access"
-	elog "    icap_send_client_ip on"
-	elog "    icap_send_client_username on"
-	elog ""
-	elog "    icap_service clamav respmod_precache bypass=0 icap://localhost:1344/clamav"
-	elog "    adaptation_access clamav allow all"
-}
diff --git a/net-proxy/squidclamav/squidclamav-6.8.ebuild b/net-proxy/squidclamav/squidclamav-6.8.ebuild
deleted file mode 100644
index 045c33fafdcd..000000000000
--- a/net-proxy/squidclamav/squidclamav-6.8.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit libtool autotools
-
-DESCRIPTION="HTTP Antivirus for Squid based on ClamAv and ICAP"
-HOMEPAGE="http://squidclamav.darold.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="net-proxy/c-icap"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# version 6.3 causes maintainer-mode rebuild from tarball, and
-	# contains acinclude.m4 with libtool macros which cause trouble.
-	rm acinclude.m4 || die
-	eautoreconf
-	elibtoolize
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-
-	# delete its own documentation installed
-	rm -r "${D}"/usr/share/${PN} || die
-
-	dodoc README AUTHORS ChangeLog
-
-	# Fix configuration file to adapt to the Gentoo configuration
-	sed -i \
-		-e '/clamd_local/s:\.ctl:.sock:' \
-		"${D}"/etc/squidclamav.conf || die
-}
-
-pkg_postinst() {
-	elog "Starting from version 6, Squid Clamav is now a module for the c-icap"
-	elog "server, which is called from squid, rather than being a redirector"
-	elog "directly."
-	elog ""
-	elog "To enable the service, you should add this to your c-icap.conf file:"
-	elog ""
-	elog "    Service clamav squidclamav.so"
-	elog ""
-	elog "And then this to squid.conf (for a local ICAP server):"
-	elog ""
-	elog "    icap_enable on"
-	elog ""
-	elog "    # not strictly needed, but useful for special access"
-	elog "    icap_send_client_ip on"
-	elog "    icap_send_client_username on"
-	elog ""
-	elog "    icap_service clamav respmod_precache bypass=0 icap://localhost:1344/clamav"
-	elog "    adaptation_access clamav allow all"
-}
diff --git a/net-proxy/tayga/Manifest b/net-proxy/tayga/Manifest
index 74c20500e250..c97a4ff48156 100644
--- a/net-proxy/tayga/Manifest
+++ b/net-proxy/tayga/Manifest
@@ -1,3 +1,3 @@
 DIST tayga-0.9.2.tar.bz2 86022 BLAKE2B 9658960e0a8a4a419851a50f131a7dfb0790d0d188ad95ed5078033bd3a19180964a072dc177616b3451bc23dfa2b998058d73cc6aacfbb4b59c0b9173764440 SHA512 a7a81cccb7c3e32f00f142b1bac598b732dd748772b307561239d695418ada5302182d487e51d1cf95ed736c0180c01db2f33409d0b9343d6587b76cbb3bc573
 EBUILD tayga-0.9.2-r1.ebuild 484 BLAKE2B 2987bf7006a153dde6e5db99d4c2e871b504b4eafa3a39faec03623d6f3b42e94c7de837406baa40491ece824f91da95fa59b4f947145fb3d1e6b05ea5189d0d SHA512 65cbdda9b3f612e25456711c9d0614778b64cddc3264ef9dcf2c314fe57cf73439071296e7fd5e184ac95c0c8e3db7299f3447e73b078ca460700e619a5505cb
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-proxy/tayga/metadata.xml b/net-proxy/tayga/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/net-proxy/tayga/metadata.xml
+++ b/net-proxy/tayga/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index 5ec53991871e..26d27ca76d06 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -7,9 +7,5 @@ AUX tinyproxy-1.8.3-r2.initd 845 BLAKE2B 476c8e1b6ab41c42c65429fc031f8c58a2baa32
 AUX tinyproxy.service 172 BLAKE2B d2e6199bfee2bac52e08d4c5506131f19e2630ebe1d9ed12f71d575cef37454c229e9e08b1fc89d9e26052a1192913289ed3602d69686d6894eb68b8639e7a5a SHA512 4c4cd36a7e34d9ee27c05475b72d1b61f90592ccb44c9deb96a1375bb681b7901702f078ed24b7c633074c83e450275a4a66829f3b270f75fc786a50d1ef393f
 AUX tinyproxy.tmpfiles.conf 48 BLAKE2B f2cd35878580eb198920f5db8493e3e266b4325160a9590a0b59bef1cf0577d0129bb636d99442cdb2154b444a8cdc1c6d01b4850b57df774be00338c61902e4 SHA512 24440cdaed0af6cbdb191acb1769e0a17871ef95e03e62a6621a413a2616e5d90d748d909bb5d18c029b25d7bf91485dbe46ee11e8703a1cb9008be470536715
 DIST tinyproxy-1.10.0.tar.xz 176060 BLAKE2B 58f9b443c731de6b74d689a80ebd422d3b6f51f643546ee144b37fb3262725246f6a5fa1015267a94f192f8715eaf71ffc078ead75e6225a210f58ec28ee8fcf SHA512 8d82598c5f9c89bc672f4632139ac52696d5c7788963de51688a8aeb576c69004f8338fe1e1897bf704a21dfd25ab1effb092003b6afaa9a88c2b5d0608310f5
-DIST tinyproxy-1.8.3.tar.bz2 202430 BLAKE2B 1f85d6eb3a1b2cebe752f15e51869882c58f7dcafb2518511dd8c83c44a010a1cdac93e40e2c1f177a7687b126925258c79ff56011a42addd710b2009d546313 SHA512 69f1262b39d37f44a42621a0d25985632cdb790c8d9b49335a49a68c0f5237b97b111252856cba119895ac066770645560d2d7cd2de31f02103fa55fb4b3290c
-DIST tinyproxy-1.8.4.tar.xz 192300 BLAKE2B bc425ab40d5d5fb49111d74d67e7ac848d77ad4be87039b34543a118df317839aa529c6b9ca52f1eafe933e7d344e09770a76ed0184181591483c6b3f1d79243 SHA512 23398a2c8a6d926b371086ba96032d0fd8dd06d114edf24950b868f53bb6b4235cd0f5d6b9a0131879fcc16bbe6b71142a6855de593a937ef7b0c323b50e0aec
-EBUILD tinyproxy-1.10.0-r1.ebuild 1665 BLAKE2B bf45228833548cb2b1c72aac45b7ad639721af0cded7f6e5b6c88c153d01d7ea09cb409d37da2d4f8820b4bbcdb33c1f0f51618323dc12b8d42d41724e5acf64 SHA512 919ba85f49262335636e06a017707386c761795c71425daace940fbabcce614f2569d1912a4b3a06a15753f799fc172374f524f6a7ff510e7ac6bdbf4304b98a
-EBUILD tinyproxy-1.8.3-r4.ebuild 1965 BLAKE2B ff4e4b323dd7873329f8a0aeb13eec050a4f0ff1064faefb3da3dd58ed09650f1a889994c761a8d39bbc148e9efbc8fca3a474c16bb952040382d69a9e219081 SHA512 254ff872b2a6b0b837b6c43b83edcabf521d3bbf18f1cfdd45fd7f8e17f2202c35c4f8d7b365a9438a7eefd284f946df501c46df662c3d3e19847209bce69e8b
-EBUILD tinyproxy-1.8.4.ebuild 1847 BLAKE2B 16a1971bdd5c8f0f0304e217baccb189129d4e7bb2aa2ef0093304f079db567cb7a3321d2b41b95e34070a8338815bc2e06c88738e517eec229607df565ea414 SHA512 f5025431d4a18e1c5ee5e5012306651bed8ebce5bef193d254be55414aa30119c03122c321dfbbe7c5b3ce09ef141436c6408921adfca74aa5e899f18864d82f
+EBUILD tinyproxy-1.10.0-r1.ebuild 1660 BLAKE2B cc9e24eb152b981f3f3dfd37827c718adcf827f23d90adfbb1e6611d2066bac177deabecca03d9080527ab14e8b82b4e6ab6bd1e97c5f5deef104cea50a9e919 SHA512 0edd0392955f94edc895d8106c4d757e5668c925c7989ac81f01dd76e8df19875d4d09372210ec7d18cb8175f20fba2699a4d3cce2e7945e75baa50c178db72b
 MISC metadata.xml 627 BLAKE2B 3acd13c1d7a698ad83efa30c8471d5241533d66c09c103cda58c20d420d3bec2de5fcd42535d6b0b8197ae1d1aea445674e563177237ee20c348beeaf44aaf2d SHA512 96b439d626b40c45952059c1e3599a0e1743e50644c605e1519e685337a3eff806c73a8e1b3fd13920908d44eb256bc39657c9c76535a8806193581053e7a657
diff --git a/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild b/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild
index 16669d50efc5..3cf14c4a3097 100644
--- a/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild
+++ b/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tinyproxy/tinyproxy/releases/download/${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ~sparc x86"
 
 IUSE="test debug +filter-proxy reverse-proxy transparent-proxy
 +upstream-proxy +xtinyproxy-header"
diff --git a/net-proxy/tinyproxy/tinyproxy-1.8.3-r4.ebuild b/net-proxy/tinyproxy/tinyproxy-1.8.3-r4.ebuild
deleted file mode 100644
index c371c7b1b9ea..000000000000
--- a/net-proxy/tinyproxy/tinyproxy-1.8.3-r4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd user
-
-DESCRIPTION="A lightweight HTTP/SSL proxy"
-HOMEPAGE="http://www.banu.com/tinyproxy/"
-SRC_URI="http://www.banu.com/pub/${PN}/1.8/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc sparc x86"
-
-IUSE="test debug +filter-proxy minimal reverse-proxy
-	transparent-proxy +upstream-proxy +xtinyproxy-header"
-
-REQUIRED_USE="test? ( xtinyproxy-header )"
-
-DEPEND="!minimal? ( app-text/asciidoc )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.1-ldflags.patch
-	"${FILESDIR}"/${P}-r2-DoS-Prevention.patch
-
-)
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} "" "" "" ${PN}
-}
-
-src_prepare() {
-	use minimal && PATCHES+=( "${FILESDIR}/${PN}-1.8.1-minimal.patch" )
-
-	default
-
-	sed -i \
-		-e "s|nobody|${PN}|g" \
-		-e 's|/var/run/|/run/|g' \
-		etc/${PN}.conf.in || die "sed failed"
-
-	sed -i \
-		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	if use minimal; then
-		ln -s /bin/true "${T}"/a2x
-		export PATH="${T}:${PATH}"
-	fi
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable filter-proxy filter) \
-		$(use_enable reverse-proxy reverse) \
-		$(use_enable transparent-proxy transparent) \
-		$(use_enable upstream-proxy upstream) \
-		$(use_enable xtinyproxy-header xtinyproxy) \
-		--disable-silent-rules \
-		--localstatedir=/var
-}
-
-src_test() {
-	# The make check target does not run the test suite
-	emake test
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	diropts -m0775 -o ${PN} -g ${PN}
-	keepdir /var/log/${PN}
-
-	newinitd "${FILESDIR}"/${PN}-1.8.3-r2.initd tinyproxy
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_dotmpfilesd "${FILESDIR}"/${PN}.tmpfiles.conf
-}
-
-pkg_postinst() {
-	elog "For filtering domains and URLs, enable filter option in the configuration"
-	elog "file and add them to the filter file (one domain or URL per line)."
-}
diff --git a/net-proxy/tinyproxy/tinyproxy-1.8.4.ebuild b/net-proxy/tinyproxy/tinyproxy-1.8.4.ebuild
deleted file mode 100644
index 6c165306197c..000000000000
--- a/net-proxy/tinyproxy/tinyproxy-1.8.4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd tmpfiles user
-
-DESCRIPTION="A lightweight HTTP/SSL proxy"
-HOMEPAGE="https://github.com/tinyproxy/tinyproxy/"
-SRC_URI="https://github.com/tinyproxy/tinyproxy/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-IUSE="test debug +filter-proxy minimal reverse-proxy
-	transparent-proxy +upstream-proxy +xtinyproxy-header"
-
-REQUIRED_USE="test? ( xtinyproxy-header )"
-
-DEPEND="!minimal? ( app-text/asciidoc )"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} "" "" "" ${PN}
-}
-
-src_prepare() {
-	use minimal && PATCHES+=( "${FILESDIR}/${PN}-1.8.1-minimal.patch" )
-
-	default
-
-	sed -i \
-		-e "s|nobody|${PN}|g" \
-		etc/${PN}.conf.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	if use minimal; then
-		ln -s /bin/true "${T}"/a2x
-		export PATH="${T}:${PATH}"
-	fi
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable filter-proxy filter) \
-		$(use_enable reverse-proxy reverse) \
-		$(use_enable transparent-proxy transparent) \
-		$(use_enable upstream-proxy upstream) \
-		$(use_enable xtinyproxy-header xtinyproxy) \
-		--disable-silent-rules \
-		--localstatedir=/var
-}
-
-src_test() {
-	# The make check target does not run the test suite
-	emake test
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	diropts -m0775 -o ${PN} -g ${PN}
-	keepdir /var/log/${PN}
-
-	newinitd "${FILESDIR}"/${PN}-1.8.3-r2.initd tinyproxy
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_dotmpfilesd "${FILESDIR}"/${PN}.tmpfiles.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.tmpfiles.conf
-
-	elog "For filtering domains and URLs, enable filter option in the configuration"
-	elog "file and add them to the filter file (one domain or URL per line)."
-}