15 files changed, 118 insertions, 161 deletions
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 3c4d7e6c54cb..6ae46d61e444 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 74cc4fbf015c..f07f657c052b 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -9,4 +9,4 @@ DIST avahi-0.7.tar.gz 940047 BLAKE2B 8299577bf27ee65fad5d743dbf94202b148a6fc8682
 EBUILD avahi-0.6.32.ebuild 5485 BLAKE2B a16979e77772ecf824dd03db48ae39d9c3ad8bba89211cc7c15ed3bec0cb57db0a793b14f3e0d55ff5afb52312fda6b8e5ca77ea17c1830f3be8a21d1cd9e6f6 SHA512 2290435448ddadfd4bc4b48b40e6cd2bce036e0022c20f717d5d782f7622627ff6116cc2057642a8a0291f17afb207182a0fd3ce1ec1c68313f9342350e51c41
 EBUILD avahi-0.7-r1.ebuild 5143 BLAKE2B 49679babf67928cbc925042e890abcbb60d97c7c967964712673a39a79dff3701dd05f53186b611c58c7d8df3d0d62f940c7306e17f91b0934494252ef833474 SHA512 6caee5018f83eb7a8b51bf5656c345ce36f5dcffd714bcdf318b82830381cb33711db62eed94c76e59e5577521e3daef58ac2761fa95caf65306e42c2697cef1
 EBUILD avahi-0.7-r2.ebuild 5123 BLAKE2B ee26ad8c2088ec3ecf0602955bc69b8294fca639030993c028f196a979cde210bd7cb4745528a97e7f9036039dd3c52547b96295e7834a44cdeb37db926bdba6 SHA512 7f9850f51b66538ae2b841683c3642a25cc03915bad5dba5d48aa6b341b857ee1b4478f66259c0570ad6e9b44c92ecec9c8acd31fb9ce257e2a8aa1515384fec
-MISC metadata.xml 970 BLAKE2B 26904ceb3a89833caa77e2315d99be8ef729277a021faa3800a1cd0abe94c516d53176e65668d00687a6bb6ee807a2011106268f14a4d5012c27132e4fca4f3c SHA512 b9498d4757b6bd793846e4cbdd5c37da601a8e1430cafd1a6039ff54f8ff10576684c58801ebc679061f975cefa5909c94c30976e84354a5fcc7d2a586f7fa8e
+MISC metadata.xml 1025 BLAKE2B 6a13958a5fafd973058008477fe96575956dde8888c555eb5dfc9382536a637b1f659494a164f7973dadf8a37420cc1b586f63ab2e418b9aea8bd44aa90c0250 SHA512 2f22fbed84d4e1b1f85523f3a2a4b43678ae76b9300e0c43dea561532f392c4370fff25ebfc04537423736e7059f0f606c25ade7e37410449ba9f0c8216c27a3
diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml
index 046761ce22c0..aa917b89cf2f 100644
--- a/net-dns/avahi/metadata.xml
+++ b/net-dns/avahi/metadata.xml
@@ -20,5 +20,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">lathiat/avahi</remote-id>
+		<remote-id type="cpe">cpe:/a:avahi:avahi</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-dns/coredns/Manifest b/net-dns/coredns/Manifest
index 6a35afae58d5..b9ef98965173 100644
--- a/net-dns/coredns/Manifest
+++ b/net-dns/coredns/Manifest
@@ -1,14 +1,11 @@
 AUX coredns.confd 39 BLAKE2B 5db4c5b9e992dc7beff0ba80a7cc5337d5ddad132c2467b64b5214d9e4fabfaf1821bb61e727a49d052196f64bf2ece1f40f4c665d8ca53f17a98d2251c0731e SHA512 ade2ce80cf2a1f0bdc5d2de3a80194973289e3d62cbd349cfc7f03fa3bc8c3afc95a7a8dc4a46eda0c401239c226c55acb50b71d5596ed65e9afc56be6dfbb97
 AUX coredns.initd 497 BLAKE2B 3e29d701123c0b039312c9d7306aa81aecbbec3dfa654da382ae9598b3bd6c2b3e224d0faef8549d37606055a49e9d78413e7aff552148bc417cebf3ecd5d960 SHA512 afc2a20c1a2918292931cf27446ac817df1a9e88a4c3ffe7fee50c4424c1c8ae7dd084753a624d382ad2158020fb565ba6151c3eaca2ff4d80c9640e566529a1
 AUX coredns.logrotated 81 BLAKE2B 7fe70e32133a9470a60834dee5632151ed215e478a9de697dbca3ee553e5a8719bc941251c6a37723625b7c59f10f5050c79edb94ac8d4127561c12813ba6a27 SHA512 c697c08c3b1153ae224a1eeb3521f9ee594de4852bc6ef78d94dc7f6f680517659a653ab5c13ea03918deb79e6654ef11512ba4c90fe06ea4591fefbab876ece
-DIST coredns-1.3.0.tar.gz 6503544 BLAKE2B b285743b2aa41c29f7c6e77615205ba09d856914d592e1906de36c60048ac0342416d3719b36a7dda635a0801c3a78478f6e07dc98e908b88f34410db7db5937 SHA512 d525ea7f224343f677842f17939207bf7719d81e21015c1e4ff298627d14fcdd9e8bd93833d28929ce19e782857018f45eb0be07d73926edc5ec54e3071b96b3
 DIST coredns-1.3.1.tar.gz 5784513 BLAKE2B 4f04bd338939732fa284901e60b094d555b186c9c701a849aef7416e020aec6f7eccb9ff4654e08cd1daf0b130ad103ba2b3d11ffaf1810029aa049e6e69a6bc SHA512 0992f6fff08aa0a91b0be3c03b54a23f50d5a6dcba63f652c6d65cf925b900826b1b711f7621402ec059152e4fdd01e0d2f8fee4a1e414aa4fd2b12ad6e7a13a
 DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
 DIST github.com-mholt-caddy-6f580c6aa36c54c3e1c65b5c609550a8a2508e3e.tar.gz 2918590 BLAKE2B 44e50f98c48687d0d5a2155bb7f093ef7e18b6a0f0a23186ee6be28866b9e7dd79a8e0b5223f8a2250f710b2d290d7274195cdaced8b25eb6c478c7e00a2dc43 SHA512 ebf7dfa6376d9bf9f487919a630148c9870fadc23beed12b70837ed73b72852bb0373407f3e994903bba2365ce1233f79c786465f2bc1c99f64718dd8e14d844
 DIST github.com-miekg-dns-56be65265e34e731425e0269a301774938827c60.tar.gz 3885474 BLAKE2B 7de6f916469ccd9a09fbfbf90feafdd47aab7484542167cbb6ab3ba6051f55e77f9691851adbc0fa285f3463200f09da4c752a643fc79f1fe48e4db48068aca3 SHA512 ae001df0d4b1c692f6c35c02bd67cd1d91b19d8cc1e92cad9f2253e21a0c1b88bd7b6b7b150bb51e551ffee31241d1e6bd736606a1b8305b1c65165c91b0c39d
-DIST github.com-miekg-dns-7586a3cbe8ccfc63f82de3ab2ceeb08c9939af72.tar.gz 3886474 BLAKE2B d844c4c6c5749c7fde4712ed87f2bda7f8f048a1694ec8f22e811b4c0d1e8b2ceffba88921ecf965efa65d7290c436744ec17cda3f00ed3df3aba08bbc6be796 SHA512 63f08795063d48a15bae40c55d5edd997b1b341dead43c908fc9b9be71c7876c19f28965d9dc58b81ce48eeefcf09e3f1832141b6e2e3850e138dd727f64995d
 DIST github.com-prometheus-client_golang-505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz 130114 BLAKE2B df1149ebda18c7940ea35fbe09b08be6437a8d4c4f812e3b4b088da8a374718212f0b10a153f3e04a6ffbe0bac109a92e5eca8b95814d221cd6a01d5fcfd48c5 SHA512 27a3cd10256ba6784b2f1318919ad6ce9e2a15c029c18961cd760a7569d5c683097c7407478b2ec96852163a321cda854aba18b0a73e0dda836480d05451bd62
 DIST github.com-prometheus-procfs-1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz 61606 BLAKE2B f67de9c0f3e8d814bed1711f0e0771c13e7d4d8d9dcc67ede3615bb80f8a8f20bbcf9ef65e46dff4a41cc587ef10ad54ffdb6909fbe83f19993422ed5714dd81 SHA512 8cabd997ac2405fe53aa507b6755aff7aa4ae2a1fdb3711abfac5d29bdd369412a17359c3d9c3ebc4945d1b6310c2fadd25201ec7b040b20e2ac5d27b56c564b
-EBUILD coredns-1.3.0.ebuild 1325 BLAKE2B dd12e68824ba9d0d19888d1ae3b1243b2eb516f80e033d5c6f9ecc8e7628874383dbb2dd1ccf2fd33675f4647ccedb882853324a6237cae0dd6387fbb83e8d7e SHA512 6d9097ce0e665f3c6805edc1268280eaa8dabe762e8931bd3bca0257e8979c2497619fd0c42f3400b2a5e22319b45d4ead509ae4b1637b5e989f263aaae862de
 EBUILD coredns-1.3.1.ebuild 1329 BLAKE2B b3b7e499404ddad19ed072bba158a41adfa069034e68fbf4e45c7969c1b25ecb4e8f8bc751fd58ddee596189884a840d421d3fd580fd98c55620d0c22d1a72c8 SHA512 26599e042af39b5fc4aaa8292cb8268c135fc632533c920125f4516bea5cbb2afe60709db138156a8c066df51c5acc5837e8fdced80c4b0f00721218ca65a685
 MISC metadata.xml 252 BLAKE2B 7baf6a36298a65278df45bc6e36a8ad2e613e3442ce78d334635f1ea2550695e12883bf64e5648ce684803ed18014e70898f719db30558367e4012a63ca121ab SHA512 0b024640287c05805bfd170d1c38b1de9c1165ad20548d52a89650b39d6da814a27718d739252c2d2a57b8694ddae913fffc4af7bb78bb2a3985475a88c19d7c
diff --git a/net-dns/coredns/coredns-1.3.0.ebuild b/net-dns/coredns/coredns-1.3.0.ebuild
deleted file mode 100644
index e7bd00feea36..000000000000
--- a/net-dns/coredns/coredns-1.3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=( "github.com/mholt/caddy 6f580c6aa36c54c3e1c65b5c609550a8a2508e3e"
-	"github.com/miekg/dns 7586a3cbe8ccfc63f82de3ab2ceeb08c9939af72"
-	"github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
-	"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
-	"github.com/prometheus/procfs 1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4"
-)
-
-EGO_PN="github.com/${PN}/${PN}"
-
-inherit golang-build golang-vcs-snapshot
-
-GITCOMMIT="c8f0e94026b5f3530064dd3266eef1a80e3b0f1c"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A DNS server that chains middleware"
-HOMEPAGE="https://github.com/coredns/coredns"
-
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -v -ldflags="-X github.com/coredns/coredns/coremain.GitCommit=${GITCOMMIT}" || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN}
-	dobin ${PN}
-	dodoc README.md
-	doman man/*
-	popd || die
-
-	newinitd "${FILESDIR}"/coredns.initd coredns
-	newconfd "${FILESDIR}"/coredns.confd coredns
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/coredns.logrotated coredns
-}
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index b34fb1bd58e4..5cc7d8b0e970 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -6,8 +6,10 @@ AUX dnscrypt-proxy.service 1198 BLAKE2B 14db1a48f94b07622e0f52d8510e6c1634013e66
 AUX dnscrypt-proxy.socket 517 BLAKE2B afa07d5a441b55de46059935a0fa9b7f61bcbfced925b24282be27978a507248303a43f32f2785d585e79c6a9f456a9c3118028014cb78cde5df4ea1be150b6c SHA512 9620307006642cd211b8032939b2e4f592f73d041c6a499f1c74160812853b03543ff84619e8060e064b99a3b7c44b794907722fe485233937e3804b49e29a36
 DIST dnscrypt-proxy-2.0.19.tar.gz 3339713 BLAKE2B e65b5ed8243aa6cf471700c6edba6e843fdf6482443335ec74201363657b23a7c6e432318e4de508120b6210cecd02666d97bb62a5f2968ce7d4813518eb3997 SHA512 4501a64717c0f2a9313e9328340e466c9ec325d09ef548f6af9a7855ff3497fb741269a17b397a36e2a120519820378e9f98a6a768a3678ea8144ee4690364f6
 DIST dnscrypt-proxy-2.0.25.tar.gz 2596674 BLAKE2B 10947c9e496c47a565e62fb4ca6ad95679da0d237885fe09da367b501bf0dd228cb3d4af41b3527dca64665364527ec2db06afab2c209792409078debd7d3fc8 SHA512 74a47b013e15cbdcf8691bf3618cce40149f9832f6fc4c2cbfb6af2a72b4ecb52b068a150999771a77fcf4fdb49c64dabd127c5101ae29fb86723bc30c946133
+DIST dnscrypt-proxy-2.0.27.tar.gz 2478887 BLAKE2B e9cabd6bdb330c3174cb904951f9e1a0a5482b642d458dd9fc7cba8d05333e7d91c37d43fbd360d8fbcda1c5febd2e5d577e0e612d9c2211047ba2a047b929ef SHA512 68cecec0228b3f03d5c50576c7dec32c7474a22bd1740d43b29514b5a00f27376ed5236302fa68c493f0c188134855b277fbbbb922222937fa726783af3f7246
 EBUILD dnscrypt-proxy-2.0.19.ebuild 3057 BLAKE2B f624c0a34f235f9ed5c7bfd93e4c3f3284387d56ae594e27a51e541bfd56a19ea81fff955df3eb2442bca093c42f56b75759ebd325a972c05023e4e27f2f793e SHA512 6bd9621a4902a3de52b912f4bd3a0653cf42d74538a36328f558ae4d62f734e577ab90041d119fc6587067aa36faf5f52f0447e9c84f84fee873d748180ecdcf
 EBUILD dnscrypt-proxy-2.0.25-r2.ebuild 2818 BLAKE2B 68b69f308ceda1969bbc53f098a1a3ae0a04fe3029e38653993fc4899fe5d84956730ef4cc923ce041cc98cbe15559daa367fe901e125f5d69603ff0e8a40836 SHA512 786ff205b146066fb9d2d97d0d3d4f589a1d9523cc554633a738906a2bda435891af3b421985483d1a0e56731dc803f39e5ae9c8074d4297fae713c3822e4661
 EBUILD dnscrypt-proxy-2.0.25.ebuild 2760 BLAKE2B b5644b87589d113331e0d2bb902313481999e27d135df14ba0991c756eb4ecd3dc22e5d335ab794b980c540aa88c2ab92ad5fb9298e2fac18a397eb65d170065 SHA512 0ef7ddd2a4b6b33eed3bef91c9ef313c1e6d1f432f6d5de36fc4d908478b569e415c1eef4f5d53f3836bc337a8d93926f49526a5f964ae718b450ff17e6e01cc
+EBUILD dnscrypt-proxy-2.0.27.ebuild 2818 BLAKE2B 68b69f308ceda1969bbc53f098a1a3ae0a04fe3029e38653993fc4899fe5d84956730ef4cc923ce041cc98cbe15559daa367fe901e125f5d69603ff0e8a40836 SHA512 786ff205b146066fb9d2d97d0d3d4f589a1d9523cc554633a738906a2bda435891af3b421985483d1a0e56731dc803f39e5ae9c8074d4297fae713c3822e4661
 EBUILD dnscrypt-proxy-9999.ebuild 2818 BLAKE2B 68b69f308ceda1969bbc53f098a1a3ae0a04fe3029e38653993fc4899fe5d84956730ef4cc923ce041cc98cbe15559daa367fe901e125f5d69603ff0e8a40836 SHA512 786ff205b146066fb9d2d97d0d3d4f589a1d9523cc554633a738906a2bda435891af3b421985483d1a0e56731dc803f39e5ae9c8074d4297fae713c3822e4661
 MISC metadata.xml 630 BLAKE2B a20afc1f8db35b9833819322d9845519540f27864a21b743c364a14c70cabb23efca28fe4302a6d995846941ab41a92e3f811898c18281f613f2d44811249d4d SHA512 803fab528ee6776c5c101770a4fb93d021ac8bf4a71e341f99b067df8dceaa413d53604ba616b99cb695fefc25424035a2754fa033a0e62ec5fd7c3e24219d22
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.27.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.27.ebuild
new file mode 100644
index 000000000000..694bc5d7c027
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.27.ebuild
@@ -0,0 +1,101 @@
+# 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
+
+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 ~ppc64 ~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"
+
+RDEPEND="
+	acct-group/dnscrypt-proxy
+	acct-user/dnscrypt-proxy
+"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
+
+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/${EGO_PN}" || 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
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy
+
+	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/dnssec-tools/Manifest b/net-dns/dnssec-tools/Manifest
index 55b37f6d4baf..c6a7cfad6275 100644
--- a/net-dns/dnssec-tools/Manifest
+++ b/net-dns/dnssec-tools/Manifest
@@ -6,7 +6,5 @@ AUX rollerd.confd 234 BLAKE2B 9a360e3c66bbc785b0a925991ae954e16808922b44a597949f
 AUX rollerd.initd 409 BLAKE2B d3f545fa48d061c0bff8d7a73352f4307678e14006ecb51cb78d32854685d422f269a436ab64307295aab700481bf601de5f3315b1677ac594319e341b15c423 SHA512 1d50ea92a5cd63f77bdf3c780cf33f1d540fc5dbcfd0bd5eea5cc1f156a15c872b2f6b3bbfdf57bb72a99527ce0a6d1bded254d153dc28df51bfab8e6dcd4d9d
 AUX rollerd.service 202 BLAKE2B 8d3841fdaa9a8a5503eba707e22ba66d62a5b28fea3ab1b7a689958f66dd4a3ae53a613f622093846f2dbfa1fdb52fc30bfe772def34d6180e88079b5b3d2bd6 SHA512 5eb0786a0fcad3fe88db3d2391a2ec3dd272818aed0c17a664fff7f126da467ef2e47671212c86c7cc27f0e62873c63968cdbdff6c561499639f8a608e93648b
 DIST dnssec-tools-2.2.3.tar.gz 42941393 BLAKE2B b7b6a54113fb5cf030bd60e18f5446b02d1ceba3564ac854b0305225672545e802fecfa1169dc81e68ffe195533e06082dc22500a51b48965aa9c0fc32c915ed SHA512 fd2467f116f77089bddf9311706f356957f4ae735d827d393534e4001b621c9dfc904ff3d4da698d37e8e97b1be9448ab2fd5455c124656399aac30f1f642baf
-DIST dnssec-tools-2.2.tar.gz 4430138 BLAKE2B 52683f19d66066b2938ef3667d066a6ab59b4579cb2cbba87c79b42700d3f70bfe84c0f712bca607ee3023d152b16b0ba1a9635e7779cc61aab7a2c8f9d05830 SHA512 5d0d936a2dabc648033cbd74ff6f1b309ae66bf3f2ab1223c8be5879fa4385bfdfd8cee2b4005b0d0e7ed85eeb1b81a9a4092d300fa725d4b19a84bf2619a280
-EBUILD dnssec-tools-2.2-r1.ebuild 1743 BLAKE2B aa9d666f251118863a65410ec534219732cf07a2794c290e231492e3908a179f1d8db3a4d9a467a233b1707d96b634e1bc458af61b0c86857d9955cf3e4d288e SHA512 74c273b9f4e55ed261450ffcf1b4b8a5bb45d248040e75e6167e257c6eb008452f64b1283e8c3fc8a4dab39cbaa2fd4f478a9e9c164a09d794877e4af8e25628
 EBUILD dnssec-tools-2.2.3.ebuild 1841 BLAKE2B b39a326d15fb4b5c321882f44884812b426c10b0d5cf015dd992edffeebd489e830fdbe20597dcbbb152f5ef2cd9f464ffcca4799e4664cddd0394127af14fc3 SHA512 4a1bcc954ef7363a4558105834abf481829c0f7ff31cde5a6ef8645b4e642a206fc447544ec9e72ee8a97dd73578ee070c2b0721f31fe292e9a4ffca585fb1c7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dns/dnssec-tools/dnssec-tools-2.2-r1.ebuild b/net-dns/dnssec-tools/dnssec-tools-2.2-r1.ebuild
deleted file mode 100644
index f4c7cf6da527..000000000000
--- a/net-dns/dnssec-tools/dnssec-tools-2.2-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
-
-inherit readme.gentoo-r1 systemd
-
-DESCRIPTION="Tools to ease the deployment of DNSSEC related technologies"
-HOMEPAGE="https://www.dnssec-tools.org/"
-SRC_URI="https://www.dnssec-tools.org/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Crypt-OpenSSL-Random
-	dev-perl/Getopt-GUI-Long
-	dev-perl/GraphViz
-	dev-perl/MailTools
-	dev-perl/Net-DNS
-	dev-perl/Net-DNS-SEC
-	dev-perl/XML-Simple"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0-dtinitconf.patch )
-
-src_prepare() {
-	default
-	sed -e '/^maninstall:/,+3s:$(MKPATH) $(mandir)/$(man1dir):$(MKPATH) $(DESTDIR)/$(mandir)/$(man1dir):' \
-		-i Makefile.in || die
-	sed -e 's:/usr/local/etc:/etc:g' \
-		-e 's:/usr/local:/usr:g' \
-		-i tools/donuts/donuts \
-		-i tools/etc/dnssec-tools/dnssec-tools.conf \
-		-i tools/scripts/genkrf || die
-}
-
-src_configure() {
-	econf \
-		--disable-bind-checks \
-		--without-validator \
-		--with-perl-build-args=INSTALLDIRS=vendor \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/rollerd.initd rollerd
-	newconfd "${FILESDIR}"/rollerd.confd rollerd
-	systemd_dounit "${FILESDIR}"/rollerd.service
-
-	newinitd "${FILESDIR}"/donutsd.initd donutsd
-	newconfd "${FILESDIR}"/donutsd.confd donutsd
-	systemd_dounit "${FILESDIR}"/donutsd.service
-
-	find "${ED}" -name "*.la" -delete || die
-	readme.gentoo_create_doc
-}
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Please run 'dtinitconf' in order to set up the required
-/etc/dnssec-tools/dnssec-tools.conf file
-
-DNSSEC Validator has been split into net-dns/dnssec-validator
-"
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 9f4e0d1ad0a2..0e057371fdf5 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -4,4 +4,4 @@ DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21d
 EBUILD libidn2-2.1.1a-r1.ebuild 1319 BLAKE2B 15d25cfc11f73533d94bdd40c20bb3bcf313c7b79e3a2750b12af32f712b0156469b4a1198ab3f8653246ef19e1ebccb29a3b8f0bbf04d2ed0a4261b3497cb91 SHA512 a5c09aa232d92230a4ed703c8ca022b387fd2c2e9afd287f0bfa69912c97210fc79da5876b520d573dd7983604967e89a62911ebbc82d3462bde4736f0bb2b7d
 EBUILD libidn2-2.2.0.ebuild 1332 BLAKE2B 9ebf852e6f4af2212e70e779990586d1632483b204dd84c34f0773f19fbc76462fe6023fd7799431c2efb1dcb9c8254fdc658af5c8e52aed31faa324cddf883b SHA512 83050754150dfebea699555702da010a58c3e89f7287e9bc22c88f458b7a9d81b81e0db18dd95aff7f4aa84e7f503b5cac4453981fc540fec79e0b53d631b24f
 EBUILD libidn2-99999.ebuild 1416 BLAKE2B ea56153f0eb2ca68fcd2fd170e2cfeedc8399a3bf5ba78d8bc78250ebbd59dd05e4074dee3bb4d3caf67b4c3391de331a495423d0f0cdc16c953fd4fa75ea278 SHA512 66f96b4e87d01dbb779d29ab83cfe6c1e756dcbc5db1555ca9128f0faa7888156c45e71befb2daa45c86aa77afeb9bdd6551b6336b955f57fb4179d1b2c6e512
-MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
+MISC metadata.xml 298 BLAKE2B 10b6250e87ec67fff437294893f9ac1a0c923b6c2bf69bc0462698632fbed280538f547a920cba9e8a1175534ad35a5a5d8d0d48f6824c378c46d34f91787712 SHA512 fb859efba7ea8f760f3d3f341496feeda5f8af633f40d4785ea738037017eae89060555447ae29abe69c0acc6f911a323aaa94dfc39f34e6aa9996af506372c0
diff --git a/net-dns/libidn2/metadata.xml b/net-dns/libidn2/metadata.xml
index 5ba62861f1c4..87360eddc9b2 100644
--- a/net-dns/libidn2/metadata.xml
+++ b/net-dns/libidn2/metadata.xml
@@ -4,4 +4,7 @@
 <maintainer type="person">
 <email>jer@gentoo.org</email>
 </maintainer>
+<upstream>
+<remote-id type="cpe">cpe:/a:libidn2_project:libidn2</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-dns/rbldnsd/Manifest b/net-dns/rbldnsd/Manifest
index dedda795e839..9508e52a8e38 100644
--- a/net-dns/rbldnsd/Manifest
+++ b/net-dns/rbldnsd/Manifest
@@ -4,6 +4,7 @@ AUX rbldnsd-0.997a-format-security-compile-fix.patch 914 BLAKE2B dadce821f6d1d06
 AUX rbldnsd-0.997a-robust-ipv6-test-support.patch 10867 BLAKE2B b2470f4a364c490b01cc8c2349d18d54ce6bc44f0113883bab763742cd798a0edec8add591a716ea99ac2d121bb1070bda1109d40018a91c162aaede3a2bc31d SHA512 a502df0c102a92dbccba482741ef628cde409f6d87d8467b66a0e4f595f8b28b9e99db0832ca27e3dbf317018b33f666b8bb8962988177cfaf1e0d28b6bf21d6
 AUX rbldnsd-0.998-fix-huge-zone-OOM.patch 1659 BLAKE2B 310b0b0851a09b5161919ce5a7fd97bb57c6ecbc1d87780af04c31214c72d25ca5d9dae481a46d1e5ccec4c5ba7b04b2b216a8ed104eb2af47b95771e32fa1b8 SHA512 2342d29322e6a5b726319a60c54a7f8d19b020e3dfc8a9d236ac7b6a55d9755b9afe1505c2f835604016fb899630074090baa737b2d3a24f7b4d4e4d911b0443
 DIST rbldnsd-0.998.tar.gz 145363 BLAKE2B e698f5b99ed1deae1aedda1952c19eb6189cbdcc71ecfa043faada966d30eee93e158dfeb059603dc493a665a7c56c84ff6ee636fc9eec7de38eb0bc73ed26db SHA512 7b6fb106f8188b2ce6e05b622cf90a393a4642f00faa5bddc184ce02dbd2beee9d8de22cb09ae53a25c475f28f99d13fbf6252f0d4c1d72bf47ba23f769e7074
-EBUILD rbldnsd-0.998-r2.ebuild 1568 BLAKE2B c4983b42897a54744ac13f1393a0ffad8cbd9e878bb943d05a23e2b8fff72c3cab233258d667993368d2a879530b9bb6e09457fe81a1388dd81ad276996350f9 SHA512 4d027da14375e3d51a9fa8d9bc10697996c5ff5a68ba75d322c02b7ee8ddce062f993cec3ca2070fbd6d8f2d8452c99529e7d5b7e9a771b34dde110c43298b76
+DIST rbldnsd-0.998b.tar.gz 154022 BLAKE2B f0bf03bef69853d45c3546c6fd3e58ffb95e76192ecb64f71f6799c6041749b1d117bed2bb21edbf1dec81d1684334b3af7d60b35d49089efb3a5e28752be6db SHA512 9b9c8694824a99b4ad120a22dbe4b05351867434e43ed0d8137990d3ece90ed67349965b6ed0450066d6663c1858545774c733b0d7afff304095de500ba30175
 EBUILD rbldnsd-0.998.ebuild 1550 BLAKE2B aef0a1798de7b636f6f0d2bc7c46607fe321eabd3e0db3bc6820ba1ebaea6625ca002128422b44e21b65b0f9b4c9ecfb02cbfad64c4ccc7ecc2695bbc0cad496 SHA512 0035d4f3a4119a03cb7f102ae63a25ef09d85e216dae8fd847a050b670ac281b624fa4873fe6d4cc0454c4e67d891748509a4f0f2180bdb932def5ccc7aa999a
+EBUILD rbldnsd-0.998b.ebuild 1458 BLAKE2B 81fb2726eb6b4b86b180870743d512cc336b62fc488f140461a776c4beecbac72fc45686668759732729a68609a9c77997d40e73d6505e79856edb050fdd154b SHA512 176492ba596b13ee7003fb056149439bae7b1662a8adaed50b7c050e0452aac230fbf663f8031f9983abae696718e6d8c0da75ec5ca06deb5c4002bfd0a75314
 MISC metadata.xml 1219 BLAKE2B 78d1de3d2e056e8d1441e929686a9cf1d073348f2b58ef263ffee7c6e9c03ad59b387c6112fdcb845915b1d5f41eaf6825f21510e7d085852ab49567412eb867 SHA512 23bddced94702b936cadbaf9a6a51cfd8506715a766cbef9dbb0fb69bf02443e0c8636b6237f98fd3922d0c43fb17c7c2850074e6bdefc2c9af3731a01971f8f
diff --git a/net-dns/rbldnsd/rbldnsd-0.998-r2.ebuild b/net-dns/rbldnsd/rbldnsd-0.998b.ebuild
index 04537f305756..27c112013d70 100644
--- a/net-dns/rbldnsd/rbldnsd-0.998-r2.ebuild
+++ b/net-dns/rbldnsd/rbldnsd-0.998b.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 
 inherit toolchain-funcs user python-any-r1
@@ -16,16 +16,16 @@ KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~x86-fbsd"
 IUSE="ipv6 test zlib"
 
 RDEPEND="zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	test? (
+		${RDEPEND}
 		${PYTHON_DEPS}
 		$(python_gen_any_dep 'dev-python/pydns:2[${PYTHON_USEDEP}]')
 	)"
 
 PATCHES=(
 	"${FILESDIR}/rbldnsd-0.997a-robust-ipv6-test-support.patch"
-	"${FILESDIR}/rbldnsd-0.997a-format-security-compile-fix.patch"
-	"${FILESDIR}/rbldnsd-0.998-fix-huge-zone-OOM.patch"
 )
 
 src_configure() {
@@ -60,8 +60,8 @@ src_install() {
 	newconfd "${FILESDIR}"/confd-0.997a rbldnsd
 }
 
-pkg_postinst() {
+pkg_preinst() {
 	enewgroup rbldns
-	enewuser rbldns -1 -1 /var/db/rbldnsd rbldns
+	enewuser rbldns -1 -1 -1 rbldns
 	fowners rbldns:rbldns /var/db/rbldnsd
 }
diff --git a/net-dns/validns/Manifest b/net-dns/validns/Manifest
index e35fa1c9a3d7..7328e32f1e2f 100644
--- a/net-dns/validns/Manifest
+++ b/net-dns/validns/Manifest
@@ -1,5 +1,3 @@
-DIST validns-0.7.tar.gz 185377 BLAKE2B 53d1607062e4d6669b82bc5bfa3ff987eafabbb9d8a2b3005cdd1f5c5f1c2e29885de80c0b859cb22776d04f07c701ac8f8ffc4b7bfb6feb9eb411eab476acf2 SHA512 2309aabdf863ff51b035ecf4536f2499d9373aed057a07546bdf4498c06c8e6cb36fc8094a8e3b26b49bd12c245ea705421744b354e46c3cc3927f6c3b33e72a
 DIST validns-0.8.tar.gz 190325 BLAKE2B cb1f7200aa9256e24bc9c9d071c4680e22ef436dbe997bc0278331b76131070d3797012d0f40f7bd66f5cfa2c8b8baef80753764caf758351a41c27f8cc59030 SHA512 2443bb8a7373f27d41ab3be1a92b61696d05b74afa42c19db54f6e999e4a634499faa44a5feefd3bc515bc677a8ef0a076092cf13316eff6d1cc504ff9702038
-EBUILD validns-0.7.ebuild 526 BLAKE2B b108891333f275e69e8320e136dbe42cd491f07ebeb842ff2a14b471acb51d18c84d9adf3bb3600372ccc9502d49211e8456b628a6282cb9472e1c95b33c6582 SHA512 301fb91e5dbfb030f3cb16cb5e3a4ee07a8692e600b6a33ea049250ae430c751d50ed1e2945ead284795c4b19091f7de9fa74a7fcd000ddcc917a89e12e4fc6a
 EBUILD validns-0.8.ebuild 526 BLAKE2B b108891333f275e69e8320e136dbe42cd491f07ebeb842ff2a14b471acb51d18c84d9adf3bb3600372ccc9502d49211e8456b628a6282cb9472e1c95b33c6582 SHA512 301fb91e5dbfb030f3cb16cb5e3a4ee07a8692e600b6a33ea049250ae430c751d50ed1e2945ead284795c4b19091f7de9fa74a7fcd000ddcc917a89e12e4fc6a
 MISC metadata.xml 471 BLAKE2B bdb426332df401e1df1fc63668c077dfc5b4275ba7e9e1734a9a59e6cbccd433214323fc20a93eb3d570f653087250b85451f1402f1c8724a929ea98d98be6b8 SHA512 26c46b8856c214a71ac566859c44f7ed029d96d9e61f98094d9cce02201c3c4520986bd8aeafec734ecc6c89d95266544f21b0c58677c6411c49ff7e85f73142
diff --git a/net-dns/validns/validns-0.7.ebuild b/net-dns/validns/validns-0.7.ebuild
deleted file mode 100644
index b50c9ab0f8d9..000000000000
--- a/net-dns/validns/validns-0.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A high performance DNS/DNSSEC zone validator"
-HOMEPAGE="http://www.validns.net/"
-SRC_URI="http://www.validns.net/download/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-libs/judy"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-perl/Test-Command-Simple )
-"
-
-src_install() {
-	dobin validns
-	doman validns.1
-	dodoc {notes,technical-notes,todo,usage}.mdwn Changes README
-}