gentoo resync : 19.07.2019

7 files changed, 7 insertions, 86 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 105412403cb1..40679c5e2e9e 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/https_dns_proxy/Manifest b/net-dns/https_dns_proxy/Manifest
index a3d33c75610f..50c8d5bc7329 100644
--- a/net-dns/https_dns_proxy/Manifest
+++ b/net-dns/https_dns_proxy/Manifest
@@ -1,2 +1,2 @@
 EBUILD https_dns_proxy-9999.ebuild 552 BLAKE2B 0d76f409a18e635add94a786bd4f0ba5ac540edd5a967df9d2a0e0cfffc0df6ce9d06a8b4b70267f7c9ec2658030c2c7a7015fe2eef83163f74da635cef908fb SHA512 675c06e8c2fdd4bcedf7cb5cc3878ce7755a78487575d00007fb549f90f5688adf99b10adf01ffadaa192cd960e4d275887fcad4f9b32e44bffcb9989d51268b
-MISC metadata.xml 234 BLAKE2B 4ab5e20ac8cd7616459df3a2d1288b2db813de532746f48a20170412d150971cdcf2394587f666da21f79425aea23081158596d76d1396290397f4570777f836 SHA512 4f985061f0ca0ef352f5123b88054e0e5c21dc3a8bf662de341c2282d218664af5be9844231270360733ac72fd3c4f02e495932773835acfb8ebc3ade84e2e98
+MISC metadata.xml 260 BLAKE2B 897c54de6400658926860fee21bb812ad0f6b0e262bc8c1244669d34aad0f6814edf8eba6662a506c84d9da089df24d0867688a1257aa014eae02a2ce191defa SHA512 aa56c6b36e38232389e84250b453d720facf94aaecc1894c665715d32ba42a75cbf3e0845d0eeca4dcdb05d0289b8f6f1b5c863bb6f99cfec17b4ec3f583b728
diff --git a/net-dns/https_dns_proxy/metadata.xml b/net-dns/https_dns_proxy/metadata.xml
index 05f6714f2c94..99a1bb6c7e38 100644
--- a/net-dns/https_dns_proxy/metadata.xml
+++ b/net-dns/https_dns_proxy/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">wrouesnel/dns-over-https-proxy</remote-id>
 	</upstream>
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 6d9061ff83a5..cfe7d05c32ad 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,8 +1,6 @@
 AUX pdns-recursor-r1 1135 BLAKE2B 90f28d33c126882e5b5e29209ec12f336797720832f7750262329cc5d47fefdf8bcb5208807e47638037a704abbbebd0ee2b1380a3d1d54feab6d4900c250176 SHA512 9dce3cd454ed6b61af8d70c90a8464c60d16eb8342ffc46558f5dcc5089c77aff4581f208684ddb25c4512ce6f39c54afaf267dcade667d812511ae3fa3a1f48
-DIST pdns-recursor-4.1.12.tar.bz2 1245110 BLAKE2B 187fe117ab64f234d144d7e2d91a119afe1d6b0a45079f1f9527724081c64f594c8c5d5b4dbc6e25b4beef1fcdfb3e5caed8e5a434921bf6b66e07617d0fb6f9 SHA512 d228976937ede7e9f6b3375e573f5b436d9df7ae246e411b13acb095a1a58f12173b663acc364ce0fbdcc61b3d5522e101472a88da8f044e44541564f9915d9e
 DIST pdns-recursor-4.1.14.tar.bz2 1249908 BLAKE2B 8918cbfa2b8ef91b18b7ef79c94bb2ae5e73f2dd835e810aca6480b7338be19e9d151f6ace6cd42bba6c71123378b95811dfa570d31ce2aa3e141b9e49753c8e SHA512 9b1842df5d32f0f7a7080bedb98d8f9e36c08cbf7427c9ba1bd07bae40ef48ad4a843d6eaff336d1fe9869c209c05f4edf1117b994b6ed5818146445b28b3011
-DIST pdns-recursor-4.2.0-rc2.tar.bz2 1315766 BLAKE2B 59dc8002cc9c034f6bafc84e0a6148f0f2bc35118b15de646ec6d02421f2ae28f1bd8acc19fb428b801d49698d38766ab529547fb10eb1f6eab5299b3ded98a2 SHA512 1738c811713ffcd28f5036b1f67860f96ba0625d5ffa77344b5ec6ad547054ef40a1042b3bb1eeea7250b3037287bd01b57a40305d6555faa71c02733c1e0ce3
-EBUILD pdns-recursor-4.1.12.ebuild 1756 BLAKE2B e2fbacc7c51b9979ec9b1a034cac79d3f0960b70614aacb69362577e047383d03b35e2baefd0e5ceea666baa913e4bf2c068b2ab9d28567f8bd0458b2c63506e SHA512 acd802ca6e50382bbe08992ee77791d08ad9aeae143d889423bfe5cd08818fe83e0ec091ab1e65020883d838779bc344b0969a6f90dbb241fb66666fb0b434d8
-EBUILD pdns-recursor-4.1.14.ebuild 1804 BLAKE2B 7cea57f7268aab9d16b526e070f7e8b999788f6d28707376eb4451b86af87b5f57b1ca14758b4e7e9e44833ac8583bd9ae24a7c3d4674ff373f2dbcc4f32cd71 SHA512 96e29573690bd3b44b31e2f80ebfd049f21d57fbc01de38d53e4804608cf3a61d0821a79baa3d3bc2a46f7cb6285641a876a6a331dea074a7163a0d8edac8b0f
-EBUILD pdns-recursor-4.2.0_rc2.ebuild 1788 BLAKE2B 4bd0954bbf949b75e3dd47c338af4b0e4148027b4bd5cf5df8ec5e6a8a387e6024b923ee5ede858eb6f581a38e2965e6e7a06a4a137ee0ae479c4870d684ccc7 SHA512 4ec082568d1265293da90cc24766b702aec0fd4371fa067c91b108ee367d5473c040c3461f01e6ab3d3998939aa82bd13f2b5332f38286a5d24361bea0328680
+DIST pdns-recursor-4.2.0.tar.bz2 1316156 BLAKE2B 3ceb71695b0d5aa2826e28975f45d03910b23f2d7dfbe7388ffd19ea51c37bf6758ea6f90f1772b0c4ed217ef844e112961f51c04dee4db20a05f1e25ae6b71f SHA512 e4be63c1be70f0dfd7aab71f1184d5cc1d15e60e775451a96e8472db6fb3825762ebd6f51b593b167389868bbfde0538612b14a04c03f3f60a7e49f7882e78bf
+EBUILD pdns-recursor-4.1.14.ebuild 1802 BLAKE2B 2943554881f1873014e5712c2baef1ef4bd9e3f0e7061ab576aac0d23c7ae8657a744d257b015532f6c57c3086ec748e3f1faaa4e12f70f626ad7096e7c81511 SHA512 31141369c4c6229c9dd13309d5b0cce47cac7c0ef6d765ff72eb4515691a9742fc510bc80cbd4c71fbf739829e157d29565df0f8240f84a5a1767e021fb484d7
+EBUILD pdns-recursor-4.2.0.ebuild 1785 BLAKE2B 82cbbf5546fdafc609cf894d6d1db631617bfc99c5e41268a1cef72904b31f88499c79d0a0c2e7af478a408f9e199b60888248382c768e335b6f6782d309ee6a SHA512 8148cd27aa5d133ad4a111ca832672900759d09b8ec7de1a1c7f97f4eb85af48983a58734310ddd7889c5f2e1d0369cbd94c2046c9a2b9b0c663f7d5b903a14b
 MISC metadata.xml 954 BLAKE2B 91824dd5b63f8533d2f0a9df87df133ba87f54d6ede9dfd1b1e920251081372fa659dbeb75e2252d91804a2fe269508693ef507c7e070a3cca5ba18711ea8d70 SHA512 1ade9c243b0bdaf70146c344bc318f8c042f846bd91c8e42706d803638c2132bc9ecc9f83db5b862e6e6aff65be9c7437250ac831264a640367d1308c8e3fcfe
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.12.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.12.ebuild
deleted file mode 100644
index 45a74d2b9434..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.12.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="libressl luajit protobuf snmp sodium systemd"
-
-DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	systemd? ( sys-apps/systemd:0= )
-	snmp? ( net-analyzer/net-snmp )
-	sodium? ( dev-libs/libsodium:= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		$(use_enable systemd) \
-		$(use_enable sodium libsodium) \
-		$(use_with !luajit lua) \
-		$(use_with luajit luajit) \
-		$(use_with protobuf) \
-		$(use_with snmp net-snmp)
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 4.0.0-r1 || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.14.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.14.ebuild
index 8c6bb86d0ac8..25a4668601a4 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.14.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug libressl luajit protobuf snmp sodium systemd"
 
 DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.2.0_rc2.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.2.0.ebuild
index 4430ff42e693..2ae00b46ee1f 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.2.0_rc2.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="" # ~amd64 ~arm ~x86
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug libressl luajit protobuf snmp sodium systemd"
 
 DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )