gentoo resync : 02.08.2019

21 files changed, 190 insertions, 528 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 40679c5e2e9e..530aba9ebb36 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index e31ad245858e..3cc9db10ee66 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,20 +1,13 @@
 AUX config-full-paths-r10.patch 2487 BLAKE2B a0c7ff420a9000903ec8fdf446c463ef367db2ec934147817f08c12277d5e1704db7c7ec89ec068a5cdc26f88eb794f8caf6d9eb318764783ad62e22ce9a2798 SHA512 15a8af5fff20d9f9d7931faf40d2f9ff1a960a764d7330287af65290e85e986892f0b94a6b311e8ae0be60be3b78caa10c71e438275f20d44706850c2a61d407
 AUX dnscrypt-proxy.confd 162 BLAKE2B 4547fc4a4ec00a809bac7b55bd7a7c8efb54e526179a7e2103fdf716711912987961969619e6b6e6b2e201253e90f828ffa5eb011c0870c112a028c4cfd89ce5 SHA512 25ccbc09df7b51bc0fa4587f7a715429ba11517c64db53086dd09df24470da71b81dbacebe227bd41d1f9576b4560dc58729969eb7b33aa233ec6a6a07d573ab
 AUX dnscrypt-proxy.initd 632 BLAKE2B 6f82264977f3ca795d4f92919cf7da606c02a0d10ce601b9634caf9ead02fa96e07d90fea83b90422f2affdbb74ce29c37132384c666fc0553b9d7b45d1e7cf8 SHA512 cd1cd5e4d72d5a19c636abab7cce9f6d61c4053653fc2ace4cf241fa518a916b243e4a8c8c1b6678c0d1b2d017953c367e1e28da6aa7c9c33a60bbdf8768a072
-AUX dnscrypt-proxy.logrotate 92 BLAKE2B d8946a3bee8fc3a9ee6fbcf569b05ad801ea6990a407958139e69e683cd06d2cc122d803418948f7371a3dbf50edef20259cecceaf9a154ff8de18a66c8a6188 SHA512 6b65c9ab0902ad65326de7c78304d6b1153538be7f70429813fc4065a970932047c42696dc5f5722022de47c82a99192e47ed3a35fe689d9017bb7f17491c860
+AUX dnscrypt-proxy.logrotate 105 BLAKE2B 892cc2acb621bb2c653f4545ac1c58777cc048b9a2f954eac7d92fdf6109b529884d20e4bc14af6aa6cde4d6e0dcac33347216de33e915f5d1ba850fda361602 SHA512 ef5f9886d7c49334e642fa6b0abd748fcff05e171493998559539f7f48f0241607d4923c7b30ed81b2bae1037ae28e49072170000a5b4cbeb6fb77e9dc3a6546
 AUX dnscrypt-proxy.service 1198 BLAKE2B 14db1a48f94b07622e0f52d8510e6c1634013e66ab5e5cdd7ddf7c0cde4441fd78b71134e4cfb6f122ba4a191ec032d54e92b1be97e4bd49af61a873431ea002 SHA512 c7dfe482a8ea17cb67681b92ac65a2d2d58d2be364351d131b0b689905d80390c5df794f6c7fb944bd508f69af72af96d36c1b7f7c5c70af7ee636423ab77e11
 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.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
-DIST dnscrypt-proxy-2.0.24.tar.gz 2596668 BLAKE2B 6a736d2d1ef11c88191f21bf631d54f6687250841e0b9ed2893b940915fc8b7c5d70f4a6c9dfa06ade97bde4c943d9615725475c4d880033228f247658a879c8 SHA512 f345fe9d299dc7fa876de686e5d9c471041f00e8297dcff31787a246caaecd150a762222c7e417815181e678ab2b222623dbf6a111c529c40a4f7e17dc7467a2
 DIST dnscrypt-proxy-2.0.25.tar.gz 2596674 BLAKE2B 10947c9e496c47a565e62fb4ca6ad95679da0d237885fe09da367b501bf0dd228cb3d4af41b3527dca64665364527ec2db06afab2c209792409078debd7d3fc8 SHA512 74a47b013e15cbdcf8691bf3618cce40149f9832f6fc4c2cbfb6af2a72b4ecb52b068a150999771a77fcf4fdb49c64dabd127c5101ae29fb86723bc30c946133
 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-2.0.24.ebuild 2752 BLAKE2B 4c91abd7dbe07b6b0822112cf0e5ec9db4a3cc0064b864d4de5f873e6fddf3eaaf1b326194da7d9f2e335bb3befcb68c50aee22792fef17e80182396a4f964dc SHA512 89446ed3521718baa10e0508016409e95457b1220fd73405496512683d9712e083b224599cec32169783155c0a18e3ba512593f2ffab349a666fb8e8dd9c553a
-EBUILD dnscrypt-proxy-2.0.25.ebuild 2752 BLAKE2B 4c91abd7dbe07b6b0822112cf0e5ec9db4a3cc0064b864d4de5f873e6fddf3eaaf1b326194da7d9f2e335bb3befcb68c50aee22792fef17e80182396a4f964dc SHA512 89446ed3521718baa10e0508016409e95457b1220fd73405496512683d9712e083b224599cec32169783155c0a18e3ba512593f2ffab349a666fb8e8dd9c553a
-EBUILD dnscrypt-proxy-9999.ebuild 2841 BLAKE2B 0e18db90c357cde0f8321c3d77869d56b188d1ec10904190e5e4123725f9bf066c5dfe07bcb98e6eef0577aa1893834e68a1390002d67dbc423b1caee2c24c83 SHA512 630d824f63c551f4526649ec600fdb0957c461fed423fb88c332fd26f658aba308e79a419c31537b6a3a765ca2dd95a02ae0e20e017f6bf66a980d20b9575b4c
+EBUILD dnscrypt-proxy-2.0.25-r2.ebuild 2802 BLAKE2B 9ef59ca6f1c1420b0e78e485200f77e82a21943ea3def958cc57eb2eee711d2163c0a09ea6879633bca586125ac0a4adecfbbff836b37c9fd77d233d5635db8a SHA512 a3145859567cf38cdeeb8ac46e15c5d09ac4fd2e18b917a17a282df0517bdedd8e4966bb053a1cff153910fe807499fb766144807f23b8aabc817df76f253ea2
+EBUILD dnscrypt-proxy-2.0.25.ebuild 2751 BLAKE2B 66312945aa9e10440e95397b43568cc5c88132b478f14d6c8db858d74ad0c264be7b403e4e0dedf86d2113ba47a9a903ed01801aaf074e7b222dde03cdc948d0 SHA512 b0beba09050c01099059b5bb83ed1ba235a0cd20bd4633c2ccbfb89f7ed8d57f3270c1da1b61b2cf7d283d39dcf22325b503b955e381ab3b1779c2a5610e303c
+EBUILD dnscrypt-proxy-9999.ebuild 2802 BLAKE2B 9ef59ca6f1c1420b0e78e485200f77e82a21943ea3def958cc57eb2eee711d2163c0a09ea6879633bca586125ac0a4adecfbbff836b37c9fd77d233d5635db8a SHA512 a3145859567cf38cdeeb8ac46e15c5d09ac4fd2e18b917a17a282df0517bdedd8e4966bb053a1cff153910fe807499fb766144807f23b8aabc817df76f253ea2
 MISC metadata.xml 630 BLAKE2B a20afc1f8db35b9833819322d9845519540f27864a21b743c364a14c70cabb23efca28fe4302a6d995846941ab41a92e3f811898c18281f613f2d44811249d4d SHA512 803fab528ee6776c5c101770a4fb93d021ac8bf4a71e341f99b067df8dceaa413d53604ba616b99cb695fefc25424035a2754fa033a0e62ec5fd7c3e24219d22
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.22.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.22.ebuild
deleted file mode 100644
index 419d40281c69..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.22.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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/dnscrypt-proxy/dnscrypt-proxy-2.0.23.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.23.ebuild
deleted file mode 100644
index 419d40281c69..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.23.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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/dnscrypt-proxy/dnscrypt-proxy-2.0.24.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.24.ebuild
deleted file mode 100644
index 419d40281c69..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.24.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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/dnscrypt-proxy/dnscrypt-proxy-2.0.21.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild
index 419d40281c69..44a5c203f652 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.21.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 EGO_PN="github.com/jedisct1/${PN}"
 
-inherit fcaps golang-build systemd user
+inherit fcaps golang-build systemd
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -24,14 +24,14 @@ 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 )
 
-pkg_setup() {
-	enewgroup dnscrypt-proxy
-	enewuser dnscrypt-proxy -1 -1 /var/empty dnscrypt-proxy
-}
-
 src_prepare() {
 	default
 	# Create directory structure suitable for building
@@ -62,6 +62,9 @@ src_install() {
 	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
 }
 
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25.ebuild
index 419d40281c69..257c123d9b07 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://${EGO_PN}.git"
 else
 	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~x86"
 fi
 
 DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
index 721259c1364f..44a5c203f652 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 EGO_PN="github.com/jedisct1/${PN}"
 
-inherit fcaps golang-build systemd user
+inherit fcaps golang-build systemd
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -24,14 +24,14 @@ 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 )
 
-pkg_setup() {
-	enewgroup dnscrypt-proxy
-	enewuser dnscrypt-proxy -1 -1 /var/empty dnscrypt-proxy
-}
-
 src_prepare() {
 	default
 	# Create directory structure suitable for building
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate
index dcc603284a85..ff58fbeab1ea 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate
@@ -1,5 +1,6 @@
 /var/log/dnscrypt-proxy/*.log {
-        copytruncate
-        missingok
-        notifempty
+	su dnscrypt-proxy dnscrypt-proxy
+	copytruncate
+	missingok
+	notifempty
 }
diff --git a/net-dns/dnssec-validator/Manifest b/net-dns/dnssec-validator/Manifest
index d7a0630f9c40..43551fba85b2 100644
--- a/net-dns/dnssec-validator/Manifest
+++ b/net-dns/dnssec-validator/Manifest
@@ -1,8 +1,4 @@
-AUX dnssec-validator-2.1-respect-LDFLAGS.patch 529 BLAKE2B b4e3199c1263973e93b744077025b11a1ab9d525d28129744b5c3dc5b9e4e4fc5461dbe4a2d7c36e8dee6f3b743cf73ae328cc5b044f8c1887d6601b33fe8ac1 SHA512 c6ff47eee87ff5b1add81b80136f58369c3b782d2ebae7328152374e7e6ed565bd116a75d69f5fb8ec8273800c4ebd47707aa4560e7bff8007651e13a8590eb6
-AUX dnssec-validator-2.2-glib-2.25.patch 5308 BLAKE2B 169c0163926388243d22f3ee5e73a30966525975c9dea800170dc82f61113902cb2d5d5e61bd4edab28ab41b9f0fd1cb2978f1433a1e75cc710cc481786bbc62 SHA512 17aa048f52c7fafc0074c83a725a6b487e88c4a55e3f3f082fa876b2d7ad95cbc3506401991de64546dd97f1ab75421dc3079a0b2d9dd02a26f90658830bf6af
 AUX dnssec-validator-2.2.3-ldflags.patch 955 BLAKE2B b6cf8f7e812d4ed14dfafde00afabdd30f2fb54ae604613d0f43520eb683e5f19113477421d9aba86ecc7f89a2706f12c713c19a3690bd93bb7c284123b08a71 SHA512 dfa88f661318b0f3406ce984455b3890ddc891ec2e4ac20ce5eb46d47b22014b001f447fbf69ac1a5d2a3239dfe4d6a330040d768ef4b1ad3ee4923ca06f95d0
 DIST dnssec-tools-2.2.3.tar.gz 42941393 BLAKE2B b7b6a54113fb5cf030bd60e18f5446b02d1ceba3564ac854b0305225672545e802fecfa1169dc81e68ffe195533e06082dc22500a51b48965aa9c0fc32c915ed SHA512 fd2467f116f77089bddf9311706f356957f4ae735d827d393534e4001b621c9dfc904ff3d4da698d37e8e97b1be9448ab2fd5455c124656399aac30f1f642baf
-DIST dnsval-2.2.tar.gz 1060434 BLAKE2B 3a19d5f4128e32f81ae824a128c65b5c5b6f21cef2786d1050631db10084a479614241d869bb33d054d96e7a1e286c472296edf8c4c7e45abd84aaa4df599f28 SHA512 1a01911b08e447d992f4843db8e10bc91041f9e3eaa8a3c050f71f0d7028292145379d1b769e69a837a157443abfa8b0b8ecc289c1b2fa4d33a9234282e9ae05
-EBUILD dnssec-validator-2.2-r1.ebuild 1097 BLAKE2B 98c4b321fac53ce8241c5d8d1cca0e52d4518d6ad93921e2d1bde07fadacafa13700cbbd595001a9e3e770c07ac34e7733845413324018817e6ed338a4a8f827 SHA512 96b4fe7ac902f4da7c53c3e7319d4199ba30730b6d8151d0bddc9659d692b1c5f52d8b5d4a5efd3d0405786905880efa532c6a5df7ee788ef449283c2868f78a
 EBUILD dnssec-validator-2.2.3.ebuild 1432 BLAKE2B 5220ffae8d4e02399992af28947240a965b771e6a0f51ff17656eec7c4719b4ccdb3d2a7038905aa223c6ad8e508b4466151e8e9d38df85d3239e1406c1b1f2f SHA512 5a0c6285c0faf1c4a1542f3e21878c16cccded2caa482ba4e9e6810a762bbf33fa29c45054f9d4634eee79788df6e647d2def69ab1efb33af4251dd1bdfb5363
-MISC metadata.xml 978 BLAKE2B 88d72546d795b1a35cf55e754a625ade144ed7eda00bad406b0bca768f75282ec224900e7047b65a6ac1462af42d7ff8b195134e8ddd22c844ef719609f29d80 SHA512 2502af154fe0a98d2f76fb9818d654d40407627b331be994b25a843122c4c9cf5872388e5f86756da1c1e28d5fb82764da3a154c6449e9f6b17a157b960f2cac
+MISC metadata.xml 917 BLAKE2B 83e755db86b934e09789aae1c6aa9654ed3c83826e76f1b61c91ba153c213bad833d1efb0d3bf45bcd761cf9896c5fc85247b693d704a41a7fe9d5fae1895067 SHA512 0f3be57605abf3c6cb0e55f11924bf505b3ac61234ea237e4d0e1df6d89c5feb25ea643ff9dec77cbb25a832de976a74329dbd8d04a05d3c108ef022696f848e
diff --git a/net-dns/dnssec-validator/dnssec-validator-2.2-r1.ebuild b/net-dns/dnssec-validator/dnssec-validator-2.2-r1.ebuild
deleted file mode 100644
index e1adc510a275..000000000000
--- a/net-dns/dnssec-validator/dnssec-validator-2.2-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="DNSSEC validator (dnsval)"
-HOMEPAGE="https://www.dnssec-tools.org/"
-SRC_URI="https://www.dnssec-tools.org/download/dnsval-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="ipv6 static-libs +threads +ecdsa-check"
-
-RDEPEND="dev-libs/openssl:0
-	ecdsa-check? ( dev-libs/openssl:0[-bindist] )
-	!<net-dns/dnssec-tools-1.13"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/dnsval-${PV}
-
-PATCHES=( "${FILESDIR}"/${PN}-2.1-respect-LDFLAGS.patch
-	"${FILESDIR}"/${P}-glib-2.25.patch )
-
-src_configure() {
-	econf \
-		--with-nsec3 \
-		--with-dlv \
-		$(use_with ipv6) \
-		$(use_with threads) \
-		$(use_enable ecdsa-check)
-}
-
-src_install() {
-	dodir /usr/bin /usr/include/validator
-	default
-
-	insinto /etc/dnssec-tools
-	doins etc/{dnsval.conf,root.hints}
-	elog "Creating /etc/dnssec-tools/resolv.conf as symlink to /etc/resolv.conf"
-	dosym ../resolv.conf /etc/dnssec-tools/resolv.conf
-
-	use static-libs || find "${D}" -name "*.a" -delete
-	prune_libtool_files
-}
diff --git a/net-dns/dnssec-validator/files/dnssec-validator-2.1-respect-LDFLAGS.patch b/net-dns/dnssec-validator/files/dnssec-validator-2.1-respect-LDFLAGS.patch
deleted file mode 100644
index 05660275de96..000000000000
--- a/net-dns/dnssec-validator/files/dnssec-validator-2.1-respect-LDFLAGS.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- dnsval-2.1/libsres/Makefile.in
-+++ dnsval-2.1/libsres/Makefile.in
-@@ -63,7 +63,7 @@
- 	$(RM) -rf $(LT_DIR)
- 
- $(LIBRES): $(LOBJ)
--	$(LIBTOOLLD) -o $@ $(LOBJ) 
-+	$(LIBTOOLLD) -o $@ $(LOBJ) $(LDFLAGS) -lssl
- 
- install:
- 	$(MKPATH) $(DESTDIR)$(libdir)
---- dnsval-2.1/libval/Makefile.in
-+++ dnsval-2.1/libval/Makefile.in
-@@ -65,7 +65,7 @@
- 	$(RM) -rf $(LT_DIR)
- 
- $(LIBVAL): $(LOBJ)
--	$(LIBTOOLLD) -o $@ $(LOBJ) $(LSRES)
-+	$(LIBTOOLLD) -o $@ $(LOBJ) $(LSRES) $(LDFLAGS) -lssl -lpthread
- 
- install:
- 	$(MKPATH) $(DESTDIR)$(libdir)
diff --git a/net-dns/dnssec-validator/files/dnssec-validator-2.2-glib-2.25.patch b/net-dns/dnssec-validator/files/dnssec-validator-2.2-glib-2.25.patch
deleted file mode 100644
index 8d2a5560b981..000000000000
--- a/net-dns/dnssec-validator/files/dnssec-validator-2.2-glib-2.25.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- validator/include/validator/validator-compat.h
-+++ validator/include/validator/validator-compat.h
-@@ -678,6 +678,11 @@ typedef enum __ns_rcode {
- #define ns_t_zxfr    256 /* BIND-specific, nonstandard. */
- #endif /* HAVE_NS_T_KX */
-
-+/* glibc 2.25 is missing ns_t_zxfr */
-+#if !defined(ns_t_zxfr)
-+#define ns_t_zxfr    256 /* BIND-specific, nonstandard. */
-+#endif /* glibc 2.25 */
-+
- #if !HAVE_DECL_NS_T_DS
- #define ns_t_ds       43
- #endif
-@@ -818,53 +823,6 @@ typedef enum __ns_flag {
-         ns_f_max
- } ns_flag;
-
--/* The Algorithm field of the KEY and SIG RR's is an integer, {1..254} */
--#define NS_ALG_MD5RSA           1       /* MD5 with RSA */
--#define NS_ALG_DH               2       /* Diffie Hellman KEY */
--#define NS_ALG_DSA              3       /* DSA KEY */
--#define NS_ALG_DSS              NS_ALG_DSA
--#define NS_ALG_EXPIRE_ONLY      253     /* No alg, no security */
--#define NS_ALG_PRIVATE_OID      254     /* Key begins with OID giving alg */
--
--/* Protocol values  */
--/* value 0 is reserved */
--#define NS_KEY_PROT_TLS         1
--#define NS_KEY_PROT_EMAIL       2
--#define NS_KEY_PROT_DNSSEC      3
--#define NS_KEY_PROT_IPSEC       4
--#define NS_KEY_PROT_ANY         255
--
--/* Signatures */
--#define NS_MD5RSA_MIN_BITS       512    /* Size of a mod or exp in bits */
--#define NS_MD5RSA_MAX_BITS      2552
--        /* Total of binary mod and exp */
--#define NS_MD5RSA_MAX_BYTES     ((NS_MD5RSA_MAX_BITS+7/8)*2+3)
--        /* Max length of text sig block */
--#define NS_MD5RSA_MAX_BASE64    (((NS_MD5RSA_MAX_BYTES+2)/3)*4)
--#define NS_MD5RSA_MIN_SIZE      ((NS_MD5RSA_MIN_BITS+7)/8)
--#define NS_MD5RSA_MAX_SIZE      ((NS_MD5RSA_MAX_BITS+7)/8)
--
--#define NS_DSA_SIG_SIZE         41
--#define NS_DSA_MIN_SIZE         213
--#define NS_DSA_MAX_BYTES        405
--
--/* Offsets into SIG record rdata to find various values */
--#define NS_SIG_TYPE     0       /* Type flags */
--#define NS_SIG_ALG      2       /* Algorithm */
--#define NS_SIG_LABELS   3       /* How many labels in name */
--#define NS_SIG_OTTL     4       /* Original TTL */
--#define NS_SIG_EXPIR    8       /* Expiration time */
--#define NS_SIG_SIGNED   12      /* Signature time */
--#define NS_SIG_FOOT     16      /* Key footprint */
--#define NS_SIG_SIGNER   18      /* Domain name of who signed it */
--
--/* How RR types are represented as bit-flags in NXT records */
--#define NS_NXT_BITS 8
--#define NS_NXT_BIT_SET(  n,p) (p[(n)/NS_NXT_BITS] |=  (0x80>>((n)%NS_NXT_BITS)))
--#define NS_NXT_BIT_CLEAR(n,p) (p[(n)/NS_NXT_BITS] &= ~(0x80>>((n)%NS_NXT_BITS)))
--#define NS_NXT_BIT_ISSET(n,p) (p[(n)/NS_NXT_BITS] &   (0x80>>((n)%NS_NXT_BITS)))
--#define NS_NXT_MAX 127
--
- /*
-  * Inline versions of get/put short/long.  Pointer is advanced.
-  */
-@@ -931,6 +889,57 @@ int	ns_parse_ttl(const char *, u_long *);
-
- #endif /* HAVE_ARPA_NAMESER_H */
-
-+/* glibc 2.25 passes HAVE_ARPA_NAMESER_H, but doesn't have NS_ALG_MD5RSA and more defines. */
-+#if !defined(HAVE_ARPA_NAMESER_H) || defined(eabi) || defined(ANDROID) ||defined(__OpenBSD__) || !defined(NS_ALG_MD5RSA)
-+/* The Algorithm field of the KEY and SIG RR's is an integer, {1..254} */
-+#define NS_ALG_MD5RSA           1       /* MD5 with RSA */
-+#define NS_ALG_DH               2       /* Diffie Hellman KEY */
-+#define NS_ALG_DSA              3       /* DSA KEY */
-+#define NS_ALG_DSS              NS_ALG_DSA
-+#define NS_ALG_EXPIRE_ONLY      253     /* No alg, no security */
-+#define NS_ALG_PRIVATE_OID      254     /* Key begins with OID giving alg */
-+
-+/* Protocol values  */
-+/* value 0 is reserved */
-+#define NS_KEY_PROT_TLS         1
-+#define NS_KEY_PROT_EMAIL       2
-+#define NS_KEY_PROT_DNSSEC      3
-+#define NS_KEY_PROT_IPSEC       4
-+#define NS_KEY_PROT_ANY         255
-+
-+/* Signatures */
-+#define NS_MD5RSA_MIN_BITS       512    /* Size of a mod or exp in bits */
-+#define NS_MD5RSA_MAX_BITS      2552
-+        /* Total of binary mod and exp */
-+#define NS_MD5RSA_MAX_BYTES     ((NS_MD5RSA_MAX_BITS+7/8)*2+3)
-+        /* Max length of text sig block */
-+#define NS_MD5RSA_MAX_BASE64    (((NS_MD5RSA_MAX_BYTES+2)/3)*4)
-+#define NS_MD5RSA_MIN_SIZE      ((NS_MD5RSA_MIN_BITS+7)/8)
-+#define NS_MD5RSA_MAX_SIZE      ((NS_MD5RSA_MAX_BITS+7)/8)
-+
-+#define NS_DSA_SIG_SIZE         41
-+#define NS_DSA_MIN_SIZE         213
-+#define NS_DSA_MAX_BYTES        405
-+
-+/* Offsets into SIG record rdata to find various values */
-+#define NS_SIG_TYPE     0       /* Type flags */
-+#define NS_SIG_ALG      2       /* Algorithm */
-+#define NS_SIG_LABELS   3       /* How many labels in name */
-+#define NS_SIG_OTTL     4       /* Original TTL */
-+#define NS_SIG_EXPIR    8       /* Expiration time */
-+#define NS_SIG_SIGNED   12      /* Signature time */
-+#define NS_SIG_FOOT     16      /* Key footprint */
-+#define NS_SIG_SIGNER   18      /* Domain name of who signed it */
-+
-+/* How RR types are represented as bit-flags in NXT records */
-+#define NS_NXT_BITS 8
-+#define NS_NXT_BIT_SET(  n,p) (p[(n)/NS_NXT_BITS] |=  (0x80>>((n)%NS_NXT_BITS)))
-+#define NS_NXT_BIT_CLEAR(n,p) (p[(n)/NS_NXT_BITS] &= ~(0x80>>((n)%NS_NXT_BITS)))
-+#define NS_NXT_BIT_ISSET(n,p) (p[(n)/NS_NXT_BITS] &   (0x80>>((n)%NS_NXT_BITS)))
-+#define NS_NXT_MAX 127
-+#endif
-+/* glibc 2.25 */
-+
- int libsres_msg_getflag(ns_msg han, int flag);
- /*
-  * at one open ns_msg_getflag was a macro on Linux, but now it is a
diff --git a/net-dns/dnssec-validator/metadata.xml b/net-dns/dnssec-validator/metadata.xml
index 94a38b12e8db..7702fb5a8958 100644
--- a/net-dns/dnssec-validator/metadata.xml
+++ b/net-dns/dnssec-validator/metadata.xml
@@ -16,7 +16,6 @@
 	</longdescription>
 	<use>
 		<flag name="dlv">Enable support for the DNSSEC look-aside validation</flag>
-		<flag name="ecdsa-check">Requires openssl[-bindist]</flag>
 		<flag name="nsec3">Enable support for the NSEC3 Resource Record</flag>
 	</use>
 	<upstream>
diff --git a/net-dns/hash-slinger/Manifest b/net-dns/hash-slinger/Manifest
index 393fe1a47045..cc72081a36af 100644
--- a/net-dns/hash-slinger/Manifest
+++ b/net-dns/hash-slinger/Manifest
@@ -1,5 +1,5 @@
 DIST hash-slinger-2.6.tar.gz 34864 BLAKE2B 4bd66a30ce0f6f57676d8c8691a38743b2b4263fc600b9a3756f1ff4676477bd61a4b20df082227a3437ca2bcbb1ad4e44643f8a87cda0a1123dab8fafa26140 SHA512 1e5d67ed2ef8eae910927fbd7419928d87ba31a91ca43a1c163b05f725da96a50d30e1539c4c55a68a22f0e2c9a2f7c7101fbdcfb5fc903e87fe4c22e20f33af
 DIST hash-slinger-2.7.tar.gz 37684 BLAKE2B e8758251c51139723778ca0db271cbc730e19bba25fad3f7f784f06774ce52038f520c11b526fffd30570854112f0e7b184f6d05e4d20847ac2c014bc66151f8 SHA512 b1b3e46c4cdd8b983b55156c9bcc58afc973c2503cde48283e98306e381753547f425bfaee68707ae10b2e31b71d01485b34e4a9841c9ce2048f9551f23d0976
-EBUILD hash-slinger-2.6-r1.ebuild 1080 BLAKE2B e6b311ccf8cbf61d80876bafc4ad88af0c6608ff0a1f82bc321ef0b36e33c641b0ba7a99d3ad6bbc7b10d442393d00a4740cc76ab95d2fe259c2d359fdfd0736 SHA512 4fd96cd8da7677d285b85d97d10fb405a20e1c9a964c0db2cd6a59ae258c5f3a6b8235b5548983890912bd6f9cffe1686e09051e8e1f61d0692bdc7721d1212f
-EBUILD hash-slinger-2.7.ebuild 1080 BLAKE2B e6b311ccf8cbf61d80876bafc4ad88af0c6608ff0a1f82bc321ef0b36e33c641b0ba7a99d3ad6bbc7b10d442393d00a4740cc76ab95d2fe259c2d359fdfd0736 SHA512 4fd96cd8da7677d285b85d97d10fb405a20e1c9a964c0db2cd6a59ae258c5f3a6b8235b5548983890912bd6f9cffe1686e09051e8e1f61d0692bdc7721d1212f
+EBUILD hash-slinger-2.6-r1.ebuild 1076 BLAKE2B 6a5920d8930cdbc70d353d020bda6413ad51a51867c9b151e71f00088ddd78410bdf3313600805ede1992bd9fe217088d58aac5fdaa4e341db54f1690bd08b19 SHA512 b1e974bb72e667cae331fbe546a4309590611c06988d2eda4fdfc7d5c201d5e9c60b443dc52a23259451a8c958f6a6ff510c66e3511cd0b23fb95698e58f1548
+EBUILD hash-slinger-2.7-r1.ebuild 1076 BLAKE2B 6a5920d8930cdbc70d353d020bda6413ad51a51867c9b151e71f00088ddd78410bdf3313600805ede1992bd9fe217088d58aac5fdaa4e341db54f1690bd08b19 SHA512 b1e974bb72e667cae331fbe546a4309590611c06988d2eda4fdfc7d5c201d5e9c60b443dc52a23259451a8c958f6a6ff510c66e3511cd0b23fb95698e58f1548
 MISC metadata.xml 488 BLAKE2B e51e5da837d62c1fefc50f59a31bc8464e1cfdaf770130562b20ad33c8f9b8b5bc604e508eaa5b9087fe59e25fdd3993f5fedc062f0a75ad6ad723234e7e5f6f SHA512 d7d812a2e7a32bd659135bddc88f74b3f882237eba39d96d67ef8a5a53656c64090bfa4535a104e0581c82f2d8e6c69357a314cf8750cb4dd1a5fb421cb3251e
diff --git a/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild
index a73f7bc1f8d9..a2ff821691bc 100644
--- a/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild
+++ b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild
@@ -21,10 +21,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND=""
 RDEPEND="
 	${PYTHON_DEPS}
+	dev-python/dnspython[$PYTHON_USEDEP]
 	dev-python/ipaddr[$PYTHON_USEDEP]
 	dev-python/m2crypto[$PYTHON_USEDEP]
 	net-dns/unbound[python,$PYTHON_USEDEP]
-	virtual/python-dnspython[$PYTHON_USEDEP]
 	ipsec? ( net-vpn/libreswan[dnssec] )
 	openpgp? ( dev-python/python-gnupg[$PYTHON_USEDEP] )
 	ssh? ( net-misc/openssh )
diff --git a/net-dns/hash-slinger/hash-slinger-2.7.ebuild b/net-dns/hash-slinger/hash-slinger-2.7-r1.ebuild
index a73f7bc1f8d9..a2ff821691bc 100644
--- a/net-dns/hash-slinger/hash-slinger-2.7.ebuild
+++ b/net-dns/hash-slinger/hash-slinger-2.7-r1.ebuild
@@ -21,10 +21,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND=""
 RDEPEND="
 	${PYTHON_DEPS}
+	dev-python/dnspython[$PYTHON_USEDEP]
 	dev-python/ipaddr[$PYTHON_USEDEP]
 	dev-python/m2crypto[$PYTHON_USEDEP]
 	net-dns/unbound[python,$PYTHON_USEDEP]
-	virtual/python-dnspython[$PYTHON_USEDEP]
 	ipsec? ( net-vpn/libreswan[dnssec] )
 	openpgp? ( dev-python/python-gnupg[$PYTHON_USEDEP] )
 	ssh? ( net-misc/openssh )
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index ec205fdcddaf..a6610971a893 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -1,4 +1,4 @@
-AUX nsd.initd-r1 1386 BLAKE2B d3a5ca31ffd06d9cf4da09617f523f61e5b8aea4e3217bf11431f32b5e7e5b59c96de3c5e1806b3e2c74cc96527e41e609e693ad88dfbcf19262b7dc5d0369fc SHA512 a8dc5b4dd6b8d763f96e46bb9bc8a43ce7518455c6efaee7061b47b477b380f47d831b993966fc4fe253657f2a3d16077dfda5c900d5788d5b991f5f9d92e618
+AUX nsd.initd-r1 1383 BLAKE2B b90de2ebef09a4f9050f6e95f5faf659c62910462aba1179daccde4e63a3972124247e6e8ce725c4dbd34a7fcd4f14b40899d7b59ba4937bdc59c493f6f7e173 SHA512 f775c78b529c5c7f1130035ea9c6cf1c1e9c1790c5df84fafd86a41294748a46c82b66c58df8385f8f4bbca8113427c665051aeec5720073bd9823607c9f8ce1
 AUX nsd.munin-conf 23 BLAKE2B 0b08804b2218d77ea925d4c9e26e73649b453b923d6d7b1e1df39ceb58b92a44c48cb21583a480e622f72d07650f410f2e0703f1d16af08152aed16982ab8da2 SHA512 c06d0b035387e7be79cfa8fedf8afb3900772146c6d4090ac39ea2ef165772d875b222ef467bd73422078ef57818bcc931ca67fa290bd99a7a9456efa5448853
 AUX nsd.service 272 BLAKE2B 66a7d4132246589f71341afd98361f6b02082be3d4e230c86ae690876a797ea0a4580b29892d91feba2785ea933a053f862e0d00f2c8a8c09ab907386c39a03c SHA512 fbca86887bfc36d61af06992cc98b3f3cb33c39274fbdc1e53d489bdcc767993911fab27a20244c3878b36bacbd1644a552364b2f7bf4d48e6eb247d0eecdf0f
 AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d79b36be3f96486eb89fdd62a42b5ed4816ad99835366864603568613e27504894340ebb64057e2b2c3 SHA512 6034086d6b6f6980468766c901e92291fea8a32df179561ede2add5918c37bfe3aabf122735d4ae2e28efece394fd3398f9a0cc4d8fdcc1e5da1ca709d2ba6ae
diff --git a/net-dns/nsd/files/nsd.initd-r1 b/net-dns/nsd/files/nsd.initd-r1
index a032cb226fd7..2a97c6dea708 100755..100644
--- a/net-dns/nsd/files/nsd.initd-r1
+++ b/net-dns/nsd/files/nsd.initd-r1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="NSD is an authoritative-only, high performance, open source name server"
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index bd6cc4d34d6b..7514ee8fbb55 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,7 +1,9 @@
 AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf403453422888e2cb44fa4fed7891241919a39c8c6f539a61de032654650a45ea548a6983777ea1bfe029e817f2c315 SHA512 ac16f8d528d6138d3c2cbf997fd8fbb467d388aa63eb6ed4e7780a3dad11ea885b91252ff0809b1d2cf7d5200814b8963aab890af84741ea86d35b2f5955a7ea
 AUX pdns-r1 2533 BLAKE2B 0d4af8f9cd4568cde40b44c72cb10a29662daa514df1a1d8174dd02f2ad4324cb7c99a05736bac7cbe80e1b9081832cac95d8c482eb4d1a8c344a6b55da623e3 SHA512 6392f59f82b82621b6cab6823f7761cd875bc6818c48db846df289057c02d8119a1024c5ecdf70a5ca8a55c00a2c3c56240d36b42cc038a25e8616ab9b966dd6
 DIST pdns-4.1.10.tar.bz2 1117663 BLAKE2B 9c1b8c608862b42019c6b753af950f940455538b439824e10d28a79a4f04fe926decf86f286d79c850f39e0df345d646ba774e5557cce1d44f6c120d8b2892a3 SHA512 59a7a52468f6daae8de01bb2b08d812906ef58047026369895341cfff253a5b9ba29d6a6b43a822f1632641eec34fa1afa6fbb5b0ba5e72ecce8e61787892136
+DIST pdns-4.1.11.tar.bz2 1118103 BLAKE2B f4ba0c463c7ff5f2185b33956ef7749b5ca6496ce850a189ec5a537d174e1391784f2c0c2af3bc7b68d2f1e01ec57c8731dc07a7690905ab7a6e386a1a8f3e4d SHA512 18215f523a39d48c8756bc13ecae1bd78967c2d66619d93ddaafb13062690002a9bdfe1d337796820706692c449286c7b9e9b8d45933684d32acbc20e490c0c4
 DIST pdns-4.2.0-rc2.tar.bz2 1245187 BLAKE2B 30ee03752dafa02f5618ba26def1cb8d49b0f7f004b54fcb8d7640b0d60897ac9a9b13e918ab3aaee1d679af772aacd0591e9c9cd3bf6b1af79305e06cac1cdb SHA512 695589980fc35e73fc0e72f57034e2cfefd7b046100dc6f8740ac94dd50ee068453c72aa2ee5626e6cccfca1eeb5e3f036b844039db52d5c45f070d291002122
 EBUILD pdns-4.1.10.ebuild 4196 BLAKE2B af3cfdf1057305c0675ea5aa66d6774a1a8625b2b53ed7ff132f916a0502c14662c8c9ae40d161bce8c088df68d7448ca971ba7007ceb9f8eb6c01578086f664 SHA512 99dc3cac1fc167c1b7e546209266717002f723898a74a43d1c566a0daf7f31c432db6ae39ba1e31edfc0ad2b3983c20c42f36d9ae7b3cd857e9500ebcd01bad2
+EBUILD pdns-4.1.11.ebuild 4198 BLAKE2B 6f5a5605abb7b08ccd7b959997db18d7f8adca4d1eefba2cd2dc3bff227eef09a6d345bee089cb7649a0a47e37f597404f9f9c9f3eebf42ea6906eaf93e15739 SHA512 10c501e58ded7213cf21eca41502fe2e9dda82733e54591c28ec97a9b58c6d59e3e402511a074082f9d6c28930239ca8a9fd4a590d0f2d4759c836eea91ca6b0
 EBUILD pdns-4.2.0_rc2.ebuild 4194 BLAKE2B d69bc3cdba723d7868a0f6db2f34a92bd814a677290a4f666288b1e4325820f62f554489916934721fcbf3a273385a257345eba1177660db99d55bb7aae878ff SHA512 6ca852f4554024df407f26f1908a9fb41b4d1f6c31d5d54d0a58071ffdc68890ddf1ae203f0f46dac49e5895b1a214b0f878f8ec72ea565af0dc0396067e035f
 MISC metadata.xml 1383 BLAKE2B fd622facab46aaba7d1e54529574ec0d0531254fcbed8c454bc21438212a9d7f0ce744417b24461e1dc144a3daded8d252d805011b77bc5f396bb59297cf55c4 SHA512 6301ccaa19d82478a7e338cf1ad3b586cbdc4c2b98298bb306e7913399efab4e30305756cc7dcf6df4d81520733f2095c4bf61f65ac83763e38f375c2cc0b2a7
diff --git a/net-dns/pdns/pdns-4.1.11.ebuild b/net-dns/pdns/pdns-4.1.11.ebuild
new file mode 100644
index 000000000000..9c4996e63d3b
--- /dev/null
+++ b/net-dns/pdns/pdns-4.1.11.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib user
+
+DESCRIPTION="The PowerDNS Daemon"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# other possible flags:
+# db2: we lack the dep
+# oracle: dito (need Oracle Client Libraries)
+# xdb: (almost) dead, surely not supported
+
+IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test"
+
+REQUIRED_USE="mydns? ( mysql )"
+
+RDEPEND="
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:=
+	botan? ( dev-libs/botan:2= )
+	lua? (
+		!luajit? ( dev-lang/lua:= )
+		luajit? ( dev-lang/luajit:= )
+	)
+	mysql? ( dev-db/mysql-connector-c )
+	postgres? ( dev-db/postgresql:= )
+	ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
+	sqlite? ( dev-db/sqlite:3 )
+	opendbx? ( dev-db/opendbx )
+	geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip )
+	sodium? ( dev-libs/libsodium:= )
+	tinydns? ( >=dev-db/tinycdb-0.77 )
+	protobuf? ( dev-libs/protobuf )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}"/${P/_/-}
+
+src_configure() {
+	local dynmodules="pipe bind" # the default backends, always enabled
+
+	#use db2 && dynmodules+=" db2"
+	use ldap && dynmodules+=" ldap"
+	use lua && dynmodules+=" lua"
+	use mydns && dynmodules+=" mydns"
+	use mysql && dynmodules+=" gmysql"
+	use opendbx && dynmodules+=" opendbx"
+	#use oracle && dynmodules+=" goracle oracle"
+	use postgres && dynmodules+=" gpgsql"
+	use remote && dynmodules+=" remote"
+	use sqlite && dynmodules+=" gsqlite3"
+	use tinydns && dynmodules+=" tinydns"
+	use geoip && dynmodules+=" geoip"
+	#use xdb && dynmodules+=" xdb"
+
+	econf \
+		--disable-static \
+		--sysconfdir=/etc/powerdns \
+		--libdir=/usr/$(get_libdir)/powerdns \
+		--with-modules= \
+		--with-dynmodules="${dynmodules}" \
+		--with-mysql-lib=/usr/$(get_libdir) \
+		$(use_enable botan) \
+		$(use_enable debug verbose-logging) \
+		$(use_enable test unit-tests) \
+		$(use_enable tools) \
+		$(use_enable systemd) \
+		$(use_enable sodium libsodium) \
+		$(usex lua "$(use_with !luajit lua) $(use_with luajit)" \
+			'--without-lua --without-luajit') \
+		$(use_with protobuf) \
+		${myconf}
+}
+
+src_compile() {
+	default
+	use doc && emake -C codedocs codedocs
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
+
+	fperms 0700 /etc/powerdns
+	fperms 0600 /etc/powerdns/pdns.conf
+
+	# set defaults: setuid=pdns, setgid=pdns
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
+		"${D}"/etc/powerdns/pdns.conf
+
+	newinitd "${FILESDIR}"/pdns-r1 pdns
+
+	keepdir /var/empty
+
+	if use doc; then
+		docinto html
+		dodoc -r codedocs/html/.
+	fi
+
+	# Install development headers
+	insinto /usr/include/pdns
+	doins pdns/*.hh
+	insinto /usr/include/pdns/backends/gsql
+	doins pdns/backends/gsql/*.hh
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/dnsdomain2.schema
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	enewgroup pdns
+	enewuser pdns -1 -1 /var/empty pdns
+}
+
+pkg_postinst() {
+	elog "PowerDNS provides multiple instances support. You can create more instances"
+	elog "by symlinking the pdns init script to another name."
+	elog
+	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
+	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
+
+	if use ldap ; then
+		ewarn "The official LDAP backend module is only compile-tested by upstream."
+		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
+	fi
+
+	local old
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 3.2 || continue
+
+		ewarn "To fix a security bug (bug #458018) had the following"
+		ewarn "files/directories the world-readable bit removed (if set):"
+		ewarn "  ${EPREFIX}/etc/powerdns"
+		ewarn "  ${EPREFIX}/etc/powerdns/pdns.conf"
+		ewarn "Check if this is correct for your setup"
+		ewarn "This is a one-time change and will not happen on subsequent updates."
+		chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf}
+
+		break
+	done
+}