gentoo resync : 16.02.1018

3 files changed, 3 insertions, 46 deletions

diff --git a/net-proxy/dnsproxy/Manifest b/net-proxy/dnsproxy/Manifest
index 95f98bbca455..4a9779fee14e 100644
--- a/net-proxy/dnsproxy/Manifest
+++ b/net-proxy/dnsproxy/Manifest
@@ -1,8 +1,6 @@
 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
 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
+EBUILD dnsproxy-1.17.ebuild 739 BLAKE2B 93d652e8a2060b1e22b2ecb12e48c2a7c25097434f9ee478c25bdb94b8533ac152bf8a99c7a3e16d0a876bbe48127e5d5966f60315f25300d0c0112d43bda795 SHA512 6927217add2b16a4bc8a7a44d6d07e1df3a52c4bab5d276724284a354d57e9896201e13c34365b68a115c25c53cdfdc849d487f256125d5c66fbf65ef2b4ed24
 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
deleted file mode 100644
index 57ab8dd9b981..000000000000
--- a/net-proxy/dnsproxy/dnsproxy-1.16-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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/dnsproxy-1.17.ebuild b/net-proxy/dnsproxy/dnsproxy-1.17.ebuild
index 77a4f6123f42..88a520424713 100644
--- a/net-proxy/dnsproxy/dnsproxy-1.17.ebuild
+++ b/net-proxy/dnsproxy/dnsproxy-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://www.wolfermann.org/${P}.tar.gz"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-libs/libevent