16 files changed, 154 insertions, 277 deletions
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 0edc8ab89421..45911375deaa 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index 70736b03d009..f4288f5b6676 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -14,9 +14,7 @@ AUX makefile-parallel-test25.patch 2828 BLAKE2B f450c46bf2702e787a410400a3d44824
 AUX srv_record_support.patch 5423 BLAKE2B 28167fbf8b404b926e484a4cf93ddf4b1ff450be23dad032e91d286497d7eee06793d6161d9a242fbe315ff969398cc532df816b2ae4462108d67593d2b90bcc SHA512 2efedc7c7aaa209bb4a9d65ef1b28934d68c216fd428a27a099ba4801e8be04e1417bdbbf0077088264cd8bc3eb2441855c96890189d8d73804243e6ca4d0851
 AUX string_length_255.patch 299 BLAKE2B 083d963d8d67baec402321c7fb8be2e485985ce03daea1d198912204dda6a90b794d5df3519b4177de8720122b46600cc9fe669f265cf9b81c75e4335ae081d6 SHA512 b451d23e1a45636dfae7cf69c64e3edde6b655bc0c7407586429e0d8282f17ef6215c6c33a6d238115c39d34fa57fa7699a7a10f146344c677fde10c0e207ac3
 DIST djbdns-1.05-man.tar.gz 17170 BLAKE2B 2fef7e1be8a427b2c426c2af58bf4c22795e64d03e0f605ca333e38f187ff65b333e88a7cea0e8a9ec867b446b5ca34a5c97dd24ae18b28ee4c747f2fd1f1608 SHA512 98af7bd9033a2205fbbc0f23b7eab45b9756f6ceff5199a62952e19c89c9fe3c03495cb6f8621d388f883c40650309a1509095417df3f54af21a71350c4aa183
-DIST djbdns-1.05-test27.diff.bz2 20695 BLAKE2B 5eb2b5deeb81ec802bec4787b844f8b072e46a06ea28cf28a2702f8d545c3248256357669471f78b61f30c656b6f325bb8c0710dbdfa3ad2c2b00d5fb02bfc66 SHA512 e5acf26ff353ae20b6c2186140255bf0ae478a75a9946163d4474a003afbf8c2f47e61a12fc3ed4b9eff17ec8732e9d91bfbb10fb2762310b067180b6d471ba0
 DIST djbdns-1.05-test28.diff.xz 22072 BLAKE2B fff6c13220adfa056a0ac5942ff9385d83b75f8622adaebab65f557a2ca8d014fe3c255fe55ba9afca56b24880b7cd28597b26b5bcc3bbbd3ef9f581b67004fd SHA512 7fbfeda10221a0a09897c2e744df5606c83113c394ce055d822b0d8733873d72567a88c37905d21c7d2395170fc12b9e9eb133a941aa809f1b9856872ab48230
 DIST djbdns-1.05.tar.gz 85648 BLAKE2B 51918fcc8944e64e72709636ee7d56975a138a2806e22c019fa836770de3a338bb8f682216b89c09d6b2861c2423e60e28dc60639f5a86aca2040e1788e4cf5c SHA512 20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9
-EBUILD djbdns-1.05-r32.ebuild 4351 BLAKE2B ef4774774e33fc267e4a4f9f94c82c5d0e909cf32a8edbcec301991325e83c9d48a5ddc96f01a0f7fb5fc8e0f775133410fc97f61da861753f83bc774d8d6ea4 SHA512 03311e521344f266b46fa0e72e319363c22f344d330422343f6f4fb7474017ca97b6361decb7956a5e396b067a00aa11c82769945bec34ae285302a99804fd95
-EBUILD djbdns-1.05-r33.ebuild 3669 BLAKE2B cd377c17efade7cf27320b12a63dd5af23689c9049551803fc0afc78ffc4a1a618784a243557d3269e21b92dffa91905404a79d88134c437bf3be316492b8237 SHA512 327373b911ba458b7410c25a7be52dca868ced6c59aa3e24b74998e65bd433d927a7c1e2f2bd8463ea113fb2a682e3771efd15742f304837f2b658fd3609e0a7
+EBUILD djbdns-1.05-r33.ebuild 3668 BLAKE2B 88326348e308236be5cbd7cce6e1e08655df4560c76ac01cd696e3020f40242e68488b7d244cd40892bea1497abe88641298380a10a084b4483f72bdadbd6003 SHA512 474d4912e297b348cbfa8876e2f3dacc62f589e25d24ebbaa922584487b33a3a28a5933c80b36547846123a96e65776da441ef896ec5c0f02767cf28a144f916
 MISC metadata.xml 244 BLAKE2B c21c7a6cd7f859220baee98b22912e06955a7d63b4fc954a40507126ef6cb30659a3b7e89e798bb7d074814810f9625d3979ed2ac8877e213dc378da841bc786 SHA512 125b00b9e85650a6dcc365871f9f8be44d85cde4b938a66f7d96b6dc0237a1cae68b30be1ee16d7850998fc31be35eaf459df1bb7d9ea169904854b532f37bab
diff --git a/net-dns/djbdns/djbdns-1.05-r32.ebuild b/net-dns/djbdns/djbdns-1.05-r32.ebuild
deleted file mode 100644
index acfed9c3992d..000000000000
--- a/net-dns/djbdns/djbdns-1.05-r32.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic readme.gentoo-r1 toolchain-funcs user
-
-DESCRIPTION="Collection of DNS client/server software"
-HOMEPAGE="http://cr.yp.to/djbdns.html"
-IPV6_PATCH="test27"
-
-SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
-	http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
-	ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.bz2 )"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="ipv6 selinux"
-
-DEPEND=""
-RDEPEND="sys-apps/ucspi-tcp
-	virtual/daemontools
-	selinux? ( sec-policy/selinux-djbdns )"
-
-src_unpack(){
-	# Unpack both djbdns and its man pages to separate directories.
-	default
-
-	# Now move the man pages under ${S} so that user patches can be
-	# applied to them as well in src_prepare().
-	mv "${PN}-man" "${P}/man" || die "failed to transplant man pages"
-}
-
-src_prepare() {
-	eapply \
-		"${FILESDIR}/headtail-r1.patch" \
-		"${FILESDIR}/dnsroots.patch" \
-		"${FILESDIR}/dnstracesort.patch" \
-		"${FILESDIR}/string_length_255.patch" \
-		"${FILESDIR}/srv_record_support.patch" \
-		"${FILESDIR}/increase-cname-recustion-depth.patch"
-
-	# Fix CVE2009-0858
-	eapply "${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
-
-	# Fix CVE2012-1191
-	eapply "${FILESDIR}/CVE2012-1191_0001-ghost-domain-attack.patch"
-
-	if use ipv6; then
-		elog 'At present dnstrace does NOT support IPv6. It will'\
-			 'be compiled without IPv6 support.'
-
-		# Create a separate copy of the source tree for dnstrace.
-		cp -pR "${S}" "${S}-noipv6" || die
-
-		# The big ipv6 patch.
-		eapply "${WORKDIR}/${P}-${IPV6_PATCH}.diff"
-
-		# Fix CVE2008-4392 (ipv6)
-		eapply \
-			"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test25-r1.patch" \
-			"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch" \
-			"${FILESDIR}/makefile-parallel-test25.patch"
-
-		cd "${S}-noipv6" || die
-	fi
-
-	# Fix CVE2008-4392 (no ipv6)
-	eapply \
-		"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-r1.patch" \
-		"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
-
-	# Later versions of the ipv6 patch include this, but even if
-	# USE=ipv6, we're in the ${S}-noipv6 directory at this point.
-	eapply "${FILESDIR}/${PV}-errno-r1.patch"
-
-	eapply_user
-}
-
-src_compile() {
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
-	echo "/usr" > conf-home || die
-	emake
-
-	# If djbdns is compiled with IPv6 support, it breaks dnstrace.
-	# Therefore we must compile dnstrace separately without IPv6
-	# support.
-	if use ipv6; then
-		elog 'Compiling dnstrace without ipv6 support'
-		cp conf-cc conf-ld conf-home "${S}-noipv6/" || die
-		cd "${S}-noipv6" || die
-		emake dnstrace
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins dnsroots.global
-
-	into /usr
-	dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
-		*-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
-		dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
-
-	if use ipv6; then
-		dobin dnsip6 dnsip6q "${S}-noipv6/dnstrace"
-	fi
-
-	dodoc CHANGES README
-
-	doman man/*.[158]
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# The nofiles group is no longer provided by baselayout.
-	# Share it with qmail if possible.
-	enewgroup nofiles 200
-
-	enewuser dnscache -1 -1 -1 nofiles
-	enewuser dnslog -1 -1 -1 nofiles
-	enewuser tinydns -1 -1 -1 nofiles
-}
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS='
-To configure djbdns, please follow the instructions at,
-
-	http://cr.yp.to/djbdns.html
-
-Of particular interest are,
-
-	axfrdns : http://cr.yp.to/djbdns/axfrdns-conf.html
-	dnscache: http://cr.yp.to/djbdns/run-cache-x-home.html
-	tinydns : http://cr.yp.to/djbdns/run-server.html
-
-Portage has created users for axfrdns, dnscache, and tinydns; the
-commands to configure these programs are,
-
-	1. axfrdns-conf tinydns dnslog /var/axfrdns /var/tinydns $ip
-	2. dnscache-conf dnscache dnslog /var/dnscache $ip
-	3. tinydns-conf tinydns dnslog /var/tinydns $ip
-
-(replace $ip with the ip address on which the server will run).
-
-If you wish to configure rbldns or walldns, you will need to create
-those users yourself (although you should still use the "dnslog"
-user for the logs):
-
-	4. rbldns-conf $username dnslog /var/rbldns $ip $base
-	5. walldns-conf $username dnslog /var/walldns $ip
-'
diff --git a/net-dns/djbdns/djbdns-1.05-r33.ebuild b/net-dns/djbdns/djbdns-1.05-r33.ebuild
index 7f53b8fb3fcd..ef0a8724cc1e 100644
--- a/net-dns/djbdns/djbdns-1.05-r33.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r33.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""
diff --git a/net-dns/dnscap/Manifest b/net-dns/dnscap/Manifest
index d705b7fb797f..84d4aa9daed9 100644
--- a/net-dns/dnscap/Manifest
+++ b/net-dns/dnscap/Manifest
@@ -1,4 +1,6 @@
-AUX dnscap-20130814.install.patch 853 BLAKE2B 5f237bc91ee0e83d498d8df525d81aa137f520d484fbb05df29084669be611574bc53ad5258d3ccbc8068ff574c14126a19e22bf6a27cbf99cfc20b70565cc50 SHA512 03bda20b9034e2a594ae08824306583f1591ddc9b3fe5542d84e4a4534100a8b09f70b34db89a7a3edc97e4b4c9219a6586ca7b0f79878206efa8407bd44d23a
-DIST dnscap-20130814.tar.gz 99615 BLAKE2B e663349e4acc20b88f7aee14676736534746c54072a4bf5d9ab9aa9935781a39f4a94d0d718108aba6b4035390214d76caf62f9cd71b364507ec55c7e93fd07d SHA512 1969d8cc47c6206369a02b29064dbb7f663a2187203ab1f49d862082bfb6e44c9fccf90fb63d65a523c7a5cf4d24815a74b9dd18d81267b4447252d7a04f33dd
-EBUILD dnscap-20130814.ebuild 616 BLAKE2B ae959b4432e505f41d0e7b72b280c56d82739aae617717fd0a41ba70bb77ca920f384c3528483945d169bed646b4cd4a53e58c6f12f1ffde64a027ce21aca597 SHA512 17d2ac3dde251af82c60c5776fb920d3e0dd2fb97acd1a52b326059afc3a298855c0e1384eaa4bc0cfc74ea3cbb33a27d5e8373a00a5e5aeba6c9834b0c0de61
-MISC metadata.xml 253 BLAKE2B 5bb80744dcf743f25ff5e1d3a9f7b2b5d01c88b97f037db85174d34ba5a1085dd74a91512f5c24adc0566bdf05e9879bfe43c4baeb31f7e95954da8ae927b386 SHA512 6dfa2faffbc0abe4db46b75ab602d9b564ac560ece923772c9336d4c1047b0c8a51d4135186b62cac30751ca95f0d4086b8191917bcff5f5a39caa1ac81806e0
+AUX dnscap-0_p20130814.install.patch 853 BLAKE2B 5f237bc91ee0e83d498d8df525d81aa137f520d484fbb05df29084669be611574bc53ad5258d3ccbc8068ff574c14126a19e22bf6a27cbf99cfc20b70565cc50 SHA512 03bda20b9034e2a594ae08824306583f1591ddc9b3fe5542d84e4a4534100a8b09f70b34db89a7a3edc97e4b4c9219a6586ca7b0f79878206efa8407bd44d23a
+DIST dnscap-0_p20130814.tar.gz 99609 BLAKE2B 5881d0d98d664246dd79272cb52f2afbd1261002c70951e33288b09e105b802f55bb0b639c20f1b008e10ceb13f7c81d646ba54db7c30204c1a0a92eb9c69bf2 SHA512 135b6498013bf4a12882ed5cf89cf2df480a357b16a65e99b1c8c1b3b400217611a4c16d1b34ffc521f7eedfdda61662180801c89d80cbbc8719dcec50128531
+DIST dnscap-1.10.0.tar.gz 661981 BLAKE2B e4c3c1cf0ddc21fb5c28abb339607c0233097394cd5c75b55a90d89903aab4beaf32f8ab8fc09a57c16eb2d9598c8fa6b98d034a5c5c5226c1c7a0e8a03e8b9b SHA512 b116bcdf876dd1b03d9d093549e8e19db6f366d6df4eef3ddd09cf8eb1d79e94c9abebdd702702efb105633b2e437bbc835abcb1252599261a546881de477791
+EBUILD dnscap-0_p20130814.ebuild 612 BLAKE2B a748e878a845cdc1158cdc7d536d313ac63ae8e80e1b6ad6ed009ac055aff362045490667c6d9706120d0a510ecc6c5fd94e11c91555e5342ed7bf6418dd486d SHA512 a9edfc5e175ffb73dbcf5eac7840a4c74efb96e481b8cab477f4bcf584f61480cd015e3fd65e49255f12f103b7dc48fd23663ea48fe39de538ec7391c5df129e
+EBUILD dnscap-1.10.0.ebuild 587 BLAKE2B 5783d7fef07d955b3bdb6fc3dc596e1c3f5422242eee1a6e173b867e8fda95b2b6899c2c27f22fb7499e0e45c4028af0246572963ca92d3c4e0438bc1b4b956a SHA512 53a156266ecaa02f80ab4572b361bbf6f5194b50f8732b8ca6c891453a4447711b9bca18669989d2e99666c811116cb70e476cf8eae8ed26861fdb4377422d3c
+MISC metadata.xml 456 BLAKE2B bdda5ca1757331c14c11df81e2bb7e5915f9c771b8ecac997fb528334ab9e0d961f79fbb690f47329b5d7ae77cba7a6e44e01f26160a5a21a4c2be0374d74955 SHA512 b9d9248bcc882d4c50403ebed1474aeae687682141798d16965a1eea88700dcd28bf95a16437397b919abdfbf0f812612f2578251c147a6f1b11dcae799af383
diff --git a/net-dns/dnscap/dnscap-20130814.ebuild b/net-dns/dnscap/dnscap-0_p20130814.ebuild
index 229ade9c0a25..63d02bf19d69 100644
--- a/net-dns/dnscap/dnscap-20130814.ebuild
+++ b/net-dns/dnscap/dnscap-0_p20130814.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,8 +8,8 @@ HOMEPAGE="https://dnscap.dns-oarc.net/"
 
 ## github commit tarball
 MY_GIT_COMMIT="727ed7d5e46625abc2c8d988689a300589e948b6"
-MY_P="verisign-${PN}-${MY_GIT_COMMIT:0:7}"
-SRC_URI="https://github.com/verisign/${PN}/tarball/${MY_GIT_COMMIT} -> ${PF}.tar.gz"
+MY_P="DNS-OARC-${PN}-${MY_GIT_COMMIT:0:7}"
+SRC_URI="https://github.com/DNS-OARC/${PN}/tarball/${MY_GIT_COMMIT} -> ${P}.tar.gz"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-dns/dnscap/dnscap-1.10.0.ebuild b/net-dns/dnscap/dnscap-1.10.0.ebuild
new file mode 100644
index 000000000000..38e157300abc
--- /dev/null
+++ b/net-dns/dnscap/dnscap-1.10.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Network capture utility designed specifically for DNS traffic"
+HOMEPAGE="https://dnscap.dns-oarc.net/"
+SRC_URI="https://www.dns-oarc.net/files/dnscap/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="ISC"
+IUSE=""
+
+RDEPEND="net-libs/libpcap
+	net-libs/ldns
+	sys-libs/zlib
+	dev-libs/openssl:=
+	dev-perl/YAML"
+
+DEPEND="${RDEPEND}"
+
+pkg_postinst() {
+	elog "If you plan to use dnscap's -x/-X features, it is necessary to install"
+	elog "net-dns/bind as well."
+}
diff --git a/net-dns/dnscap/files/dnscap-20130814.install.patch b/net-dns/dnscap/files/dnscap-0_p20130814.install.patch
index b09c7cfdbfcf..b09c7cfdbfcf 100644
--- a/net-dns/dnscap/files/dnscap-20130814.install.patch
+++ b/net-dns/dnscap/files/dnscap-0_p20130814.install.patch
diff --git a/net-dns/dnscap/metadata.xml b/net-dns/dnscap/metadata.xml
index 7b236670d1f5..79e371959b81 100644
--- a/net-dns/dnscap/metadata.xml
+++ b/net-dns/dnscap/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>nerve@ipwar.ch</email>
+    <name>Daniel Heule</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">verisign/dnscap</remote-id>
   </upstream>
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 213f3c6c7c85..887295983731 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -6,8 +6,10 @@ AUX dnscrypt-proxy.socket 517 BLAKE2B afa07d5a441b55de46059935a0fa9b7f61bcbfced9
 DIST dnscrypt-proxy-2.0.19.tar.gz 3339713 BLAKE2B e65b5ed8243aa6cf471700c6edba6e843fdf6482443335ec74201363657b23a7c6e432318e4de508120b6210cecd02666d97bb62a5f2968ce7d4813518eb3997 SHA512 4501a64717c0f2a9313e9328340e466c9ec325d09ef548f6af9a7855ff3497fb741269a17b397a36e2a120519820378e9f98a6a768a3678ea8144ee4690364f6
 DIST dnscrypt-proxy-2.0.21.tar.gz 2189155 BLAKE2B 3cab3ec4208e93733cefad49732c3fde644aac5401191d53a8c5962a1173456c09e12eaadeba6e086c078968b9467743cba7167ff0c84af2cf2f1d2209edd49f SHA512 e01869b963ef7454f9136d8ececc4e541dae489524e03cc2906fc3b661281bd6ebf5ef8b6dc29a6bcc1dabb638b9e74200b3ed48ebcd69cd3306e8bab5dd248a
 DIST dnscrypt-proxy-2.0.22.tar.gz 2192330 BLAKE2B 7688354d50a9c80368881be622ca8ef9cebd901a7023e071bb7eba603c876bf496f017a0abb5d9c6591fd4c31aad748c574a34ff47c5462c7417124282aaa37e SHA512 ea2641e79739e75e8a7e6bc24a788488537ffa823e18a3585f95ca1ae90bef9890c65eaf7feb80cc5ad09165cef9513d4025e96367ca87fc59333534f8856102
+DIST dnscrypt-proxy-2.0.23.tar.gz 2552615 BLAKE2B fe59304d431a006fa8cf09cee97fcb62a2ea04306fd5b632a22c66fd7c0894ca4cac27280dc3eb2470cc1a503da9e0bc4316fe43c6c77391f305618137361a20 SHA512 d4eeaf20a397c8aed08a7a91a720637bb49395488eb1f7ab4a52ca8832d3e0b98fb320b86ca30ad19e1e3504e226379e5d325891a68624532493fc4796959462
 EBUILD dnscrypt-proxy-2.0.19.ebuild 3048 BLAKE2B 37463586ec37f3bb80ade8fa943eb2e9b0dc35e06ddcc6d6eff45bd7f8c9f26bfc793508d3390e3e498a8f99e95b0e203f9d2f7c3441ddb068d43d677d0ac81e SHA512 724395be46a0100b9a9dcbbcbff1313ed03a028f99c0c348a55e8c87909fee5fd452b642b42ee202e52084604ae7bfb96edd3ed888b314914a234efaaec93824
 EBUILD dnscrypt-proxy-2.0.21.ebuild 2752 BLAKE2B 4c91abd7dbe07b6b0822112cf0e5ec9db4a3cc0064b864d4de5f873e6fddf3eaaf1b326194da7d9f2e335bb3befcb68c50aee22792fef17e80182396a4f964dc SHA512 89446ed3521718baa10e0508016409e95457b1220fd73405496512683d9712e083b224599cec32169783155c0a18e3ba512593f2ffab349a666fb8e8dd9c553a
 EBUILD dnscrypt-proxy-2.0.22.ebuild 2752 BLAKE2B 4c91abd7dbe07b6b0822112cf0e5ec9db4a3cc0064b864d4de5f873e6fddf3eaaf1b326194da7d9f2e335bb3befcb68c50aee22792fef17e80182396a4f964dc SHA512 89446ed3521718baa10e0508016409e95457b1220fd73405496512683d9712e083b224599cec32169783155c0a18e3ba512593f2ffab349a666fb8e8dd9c553a
+EBUILD dnscrypt-proxy-2.0.23.ebuild 2752 BLAKE2B 4c91abd7dbe07b6b0822112cf0e5ec9db4a3cc0064b864d4de5f873e6fddf3eaaf1b326194da7d9f2e335bb3befcb68c50aee22792fef17e80182396a4f964dc SHA512 89446ed3521718baa10e0508016409e95457b1220fd73405496512683d9712e083b224599cec32169783155c0a18e3ba512593f2ffab349a666fb8e8dd9c553a
 EBUILD dnscrypt-proxy-9999.ebuild 2752 BLAKE2B 4c91abd7dbe07b6b0822112cf0e5ec9db4a3cc0064b864d4de5f873e6fddf3eaaf1b326194da7d9f2e335bb3befcb68c50aee22792fef17e80182396a4f964dc SHA512 89446ed3521718baa10e0508016409e95457b1220fd73405496512683d9712e083b224599cec32169783155c0a18e3ba512593f2ffab349a666fb8e8dd9c553a
 MISC metadata.xml 630 BLAKE2B a20afc1f8db35b9833819322d9845519540f27864a21b743c364a14c70cabb23efca28fe4302a6d995846941ab41a92e3f811898c18281f613f2d44811249d4d SHA512 803fab528ee6776c5c101770a4fb93d021ac8bf4a71e341f99b067df8dceaa413d53604ba616b99cb695fefc25424035a2754fa033a0e62ec5fd7c3e24219d22
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.23.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.23.ebuild
new file mode 100644
index 000000000000..419d40281c69
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.23.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/jedisct1/${PN}"
+
+inherit fcaps golang-build systemd user
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+else
+	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="pie"
+
+DEPEND=">=dev-lang/go-1.12"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
+
+pkg_setup() {
+	enewgroup dnscrypt-proxy
+	enewuser dnscrypt-proxy -1 -1 /var/empty dnscrypt-proxy
+}
+
+src_prepare() {
+	default
+	# Create directory structure suitable for building
+	mkdir -p "src/${EGO_PN%/*}" || die
+	# fixes $GOPATH/go.mod exists but should not
+	rm go.mod || die
+	mv "${PN}" "src/${EGO_PN}" || die
+	mv "vendor" "src/" || die
+}
+
+src_configure() {
+	EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)"
+}
+
+src_install() {
+	dobin dnscrypt-proxy
+
+	insinto /etc/dnscrypt-proxy
+	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
+	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
+
+	insinto /usr/share/dnscrypt-proxy
+	doins -r "utils/generate-domains-blacklists/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if ! use filecaps; then
+		ewarn "'filecaps' USE flag is disabled"
+		ewarn "${PN} will fail to listen on port 53"
+		ewarn "please do one the following:"
+		ewarn "1) re-enable 'filecaps'"
+		ewarn "2) change port to > 1024"
+		ewarn "3) configure to run ${PN} as root (not recommended)"
+		ewarn
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "Using systemd socket activation may cause issues with speed"
+		elog "latency and reliability of ${PN} and is discouraged by upstream"
+		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
+		elog "It is disabled by default for new installations"
+		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
+		elog
+
+	fi
+
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	elog "Also see https://github.com/jedisct1/${PN}/wiki"
+}
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index ec995cd782e0..aff5fabdc591 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,9 +1,5 @@
-DIST libidn2-2.0.4.tar.gz 2008524 BLAKE2B 7163e1eff498031c7433911533b34d993876b55d9b324aaef39c93db2cceee78dec4c8cfbf4d9dabd1dbbb03a8cbd65021f26a94758f57b32ef98dc869f744b6 SHA512 1e51bd4b8f8907531576291f1c2a8865d17429b4105418b4c98754eb982cd1cbb3adbeab4ec0c1c561d2dba11d876c7c09e5dc5b315c55a2c24986d7a2a3b4d2
-DIST libidn2-2.0.5.tar.gz 2091929 BLAKE2B 1eb52ae7c9295bf4b5d6e36e6852ffb54b10663a0e3cea06df110bd7798fcb0d1b8e3b7169e4a11e800a23fc9f606167dcb7fc2d4a684e861d73a236de5c578c SHA512 9d040d60de40316788825d8720d509d5b8a82287415e09e17792c2f32fad99ca77f43e55888b9484db69426eaa0ece59e9671eee9cc46411afbdb0f81af31a79
 DIST libidn2-2.1.1a.tar.gz 2122867 BLAKE2B 616bdf4c2c5095a29511db293fa908d4cac23f77e17bb6c60f8aa8c8a8a10f1b4e8b84b82406599fe0cc7122fd89c50ec252f1716198f72496800a19924fa09c SHA512 404a739e33d324f700ac8e8119de3feef0de778bbb11be09049cb64eab447cd101883f6d489cca1e88c230f58bcaf9758fe102e571b6501450aa750ec2a4a9c6
 DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
-EBUILD libidn2-2.0.4.ebuild 1226 BLAKE2B 349e7d0e1eb6bb0705dbd0a583bb29cb6a397f24a34a79bddd232fbb146a8e52ae57a750fe7c50c571f385ef79917d9190cb2e7a4ce3e533fce2f64d6d9d974d SHA512 3d4fc2e41b37d57cee88c9aae5222b491d38dd57cbd146da32f5a2ca6c1f68e8779a11637d12f406b99535212aaa6605d6ccae8e816d0e20881696a0ad0be9e2
-EBUILD libidn2-2.0.5.ebuild 1239 BLAKE2B 0fe9690d0cfefeac0991f3c9a54a1fc1a8905346fb6b97a40b8fbb3e2300e1020065dbbcf3ca99be6e15402997739319986e9477fb8efb55eb4f954d66479663 SHA512 8fb726639f2a0097be3d33f98b14ae79339da02f92e57295927e8ab7bd35c65d6285d63c2337381ca38050c389aad533f6a01c049f16ab867cf3aef22ae08e70
-EBUILD libidn2-2.1.1a.ebuild 1259 BLAKE2B d276d9eb648baa977f4c64476a3a5d28eee0ff90d12525f4fa9f261ddde73ebb77cf024539b5e62050094cbe90368fb5b5565aa1ab22a8ac981040632329110b SHA512 0c7bb475002c67a8531bac602c221be0ef6b95193a3f1d517d651f457ee971d70a2de1f82bcd82c49ab0a7d3d62ae49a91f98c2541ec9a6090a6cfc921a2807e
-EBUILD libidn2-99999.ebuild 1360 BLAKE2B cd6caaf3be83316d81ecd36b165ce74dd9aed4bc63cdb54a704cf2491b6a85245b3297f94905a13a787cc7fc462062267ced38c81b840f7b8431e121ee9f217e SHA512 f484360e40fc6ae6091c10a1894d8e6bdb89a479078ce98189806da8748b88cd1b567c260d61cfd078af40597ea93496cb1c3d7d821c606308203d0b6378ddce
+EBUILD libidn2-2.1.1a.ebuild 1310 BLAKE2B 93808e974baf42da581cf1d57d2be56a1bb330048b67496ac4edec26aa2de822580f63a5ce054262b23120ffd7db641ffd46d096f4d61ded1aeef46dcafd35bf SHA512 4354f1e07a501f06de95a4858f0d811090f4d2a414006cd55612453d82431fbaaf0983024ce7b725e04820c2b2ca379a486d1302efb630ef4a4d050b036b2dab
+EBUILD libidn2-99999.ebuild 1414 BLAKE2B e6218cc1f9e34463fdfb2add7ca5046614ed8a5e628197f26e1a7ac5479434de6ff74d4ae13d397551fbb2775e66a562501483b2fc84756ec078898ebc668dc9 SHA512 3205a27af62f61a568dfbe152c7b566be2c893926f06f6bed0c673f630699d2df55167b2cda444e05ca260a82dd0bcfbae229bfe5a2115846f1d243ef689a44d
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/net-dns/libidn2/libidn2-2.0.4.ebuild b/net-dns/libidn2/libidn2-2.0.4.ebuild
deleted file mode 100644
index bf10cc63fd6e..000000000000
--- a/net-dns/libidn2/libidn2-2.0.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic multilib-minimal
-
-DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
-HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2"
-SRC_URI="
-	mirror://gnu/libidn/${P}.tar.gz
-"
-
-LICENSE="GPL-2+ LGPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/libunistring[${MULTILIB_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	sys-apps/help2man
-"
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Darwin ar chokes when TMPDIR doesn't exist (as done for some
-		# reason in the Makefile)
-		sed -i -e '/^TMPDIR = /d' Makefile.in || die
-		export TMPDIR="${T}"
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--disable-doc \
-		--disable-gtk-doc
-}
-
-multilib_src_install() {
-	default
-
-	prune_libtool_files
-}
diff --git a/net-dns/libidn2/libidn2-2.0.5.ebuild b/net-dns/libidn2/libidn2-2.0.5.ebuild
deleted file mode 100644
index 96124bffc61e..000000000000
--- a/net-dns/libidn2/libidn2-2.0.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic multilib-minimal
-
-DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
-HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2"
-SRC_URI="
-	mirror://gnu/libidn/${P}.tar.gz
-"
-
-LICENSE="GPL-2+ LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/libunistring[${MULTILIB_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	sys-apps/help2man
-"
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Darwin ar chokes when TMPDIR doesn't exist (as done for some
-		# reason in the Makefile)
-		sed -i -e '/^TMPDIR = /d' Makefile.in || die
-		export TMPDIR="${T}"
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--disable-doc \
-		--disable-gtk-doc
-}
-
-multilib_src_install() {
-	default
-
-	prune_libtool_files
-}
diff --git a/net-dns/libidn2/libidn2-2.1.1a.ebuild b/net-dns/libidn2/libidn2-2.1.1a.ebuild
index 7e61ecfbaca3..59ac826e2a2d 100644
--- a/net-dns/libidn2/libidn2-2.1.1a.ebuild
+++ b/net-dns/libidn2/libidn2-2.1.1a.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ LGPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
@@ -42,7 +42,9 @@ multilib_src_configure() {
 	econf \
 		$(use_enable static-libs static) \
 		--disable-doc \
-		--disable-gtk-doc
+		--disable-gcc-warnings \
+		--disable-gtk-doc \
+		--disable-silent-rules
 }
 
 multilib_src_install() {
diff --git a/net-dns/libidn2/libidn2-99999.ebuild b/net-dns/libidn2/libidn2-99999.ebuild
index 5e05d730b6ad..9c8ed496c8ac 100644
--- a/net-dns/libidn2/libidn2-99999.ebuild
+++ b/net-dns/libidn2/libidn2-99999.ebuild
@@ -54,7 +54,9 @@ multilib_src_configure() {
 	econf \
 		$(use_enable static-libs static) \
 		--disable-doc \
-		--disable-gtk-doc
+		--disable-gcc-warnings \
+		--disable-gtk-doc \
+		--disable-silent-rules
 }
 
 multilib_src_install() {