gentoo resync : 17.12.2017

5 files changed, 2 insertions, 81 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 71fd4cd9a7a3..3a6d60917b75 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index e95bd0164e30..8a09b2958fe1 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -4,6 +4,6 @@ DIST ldns-1.6.17.tar.gz 1315403 BLAKE2B 67cf163c0fc529730f6de6a7ed3c581a2fdc3be7
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
 EBUILD ldns-utils-1.6.12.ebuild 1351 BLAKE2B c2d36cf2b3924821904af1632d3df395d92ec0835030cce8f03d150478ccae743be26e795ab9e6e7a104771bd7119832efcfe05f1b9f9790472d25a91a457d57 SHA512 74b2120348484901b4736f10cc4fc4f36b4ae728fb3173623c8e5274205c1bbe5b6d535ddf62c20e367fedbcdc0591a870fae871ac99679325267a67721b3829
 EBUILD ldns-utils-1.6.17.ebuild 1138 BLAKE2B 0731e3377961d21b35e5a4237d72079a24b22ed76a24efd8deb0d275f9c54ca40968901802b7a25d1033a4fbc6e0f8322775ff23f81263766a6e65e8c9ef6f7d SHA512 3ae6b8549ed43e1957127129094ece798f1e7f64dae5521f83eeb59a37bc72ae7e97963b68fadf3c5446c8c019d3800ce06f7e29acaf2c6e748750aed6db03d0
-EBUILD ldns-utils-1.7.0-r1.ebuild 1196 BLAKE2B afb07717090ce66525fc555b9d71032c2425f3f5d57ba39a8381c76955801aaac829843926320912091ccb3a9de7932e52bf199441e0c74ea08053d054ca1222 SHA512 563683821a591bec054ae0969ddb7149cf35b73acd029f6ead279f6291915cd0841bd7145538346ae4d1e2bd4778c50014096b33bb537d33b5dbdf83b9a5da66
+EBUILD ldns-utils-1.7.0-r1.ebuild 1195 BLAKE2B 694c51b06647f44bfa8ed29413e5b59deb5bf0d482dae3100853bcdeafee2546e8f24a8cca04489b059d6b709f42750d12fc9aec16a0e8885eec002aa375cfa6 SHA512 263cd2d8582a97f71035c21d6d3c0345ad39546cd64c82644943983052d70d01da786e0f62c7cd25f204a1b3a2959ac27900305e14f91f35ac971ffd36a12fe0
 EBUILD ldns-utils-1.7.0.ebuild 1138 BLAKE2B 7a7d609335d3ee0e6f7591953a3a4217db3685268a9243d89fbdb67014ed5b906522745bad4ed0ab1fc3a36be6e48519991b92377b78578f4f1fbed6cb50ca60 SHA512 7969ea780081157652a9e3c601f19b34b1aef9565c53fdab51e5d4a8f55fc7b29186d5c2a47eb3eb0cf54f2785a1d2cf0ae52b57d83962ecb6b564c588992363
 MISC metadata.xml 742 BLAKE2B 78bcba18e70bea755bab35347639a1a529961e91b709b789c045db918525939e9fdb4a7adb6dd7801c64bd02090503d5b3edbe444fbf34615ec3ebb5342d2288 SHA512 a0c0fc0a7dd05890fa9b2d6bf99c5b96990d76993d27d18a382ab69e1200aa5f472865c5de928575d773f70ef21314519bc46a1d2a138da34d569bf56a7d8748
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
index d8a92d6de1ab..47a56741ea3b 100644
--- a/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="+dane ecdsa examples gost ssl"
 
 REQUIRED_USE="
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 286562fc291b..00bfc3fde441 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.0.7.tar.bz2 1107546 BLAKE2B 3ccda73878599e3ade69e4dc6b0787e588a8403fb7cacfbe574409513b8723cbfd29a3c73d857120def801da60a4bedbc0f0c396e6642adb0287204cde301331 SHA512 0c8873adcce5ed9b41f161bc71635da23496b4ae48dbffff7dcdf9c5181e720f9aa94e18bd64e0dff9fa03eae8410dc93585a74d13f0c16d38b0d1c0f4146bb2
 DIST pdns-recursor-4.0.8.tar.bz2 1071831 BLAKE2B d9ab0dada8efa4b05c136650b9a2eab3aec4acab28ffb6da5bb4f627dc085b2c2d046d1f0dac5cf6e7054b47d76b8d7b95f56cc096b613891a4422b77e9abe9d SHA512 9886fccd3042904b7133e03a7b45479c8f2f57ecb33e4a043703b5e84816cd04a331503870e16030c86b353c1e14d9283dba767c1247e46ed6e14b7e0e93a5ef
 DIST pdns-recursor-4.1.0.tar.bz2 1222751 BLAKE2B b2b5a7dee227b28eb3a1451a4d07cb1804e039e6b405c332f30fbb8df39f395906607f3c074b2469b01885b702d12e86e4ffd6114811404134c16956905c744f SHA512 1e4d70f3794005c3f45b2ec0ab580c3697e7de3096f3378b9b9d1cd53f10f95e577522ca9f634eb235b166f007e8a2bfa99f312ddf19f266ad4bb0965167fd7c
-EBUILD pdns-recursor-4.0.7.ebuild 1698 BLAKE2B bf67849d5f47c1f0d148596aea3fbc4268ad6696761f76f7fdb3b3b574708b01a464f12ae2a6c1df8979d60ec0cb877542dbf927af91bb2709e4510ce675a691 SHA512 358312b26fad4c6f2c473b7756f9c6d71c77045d6c7d0e92a10555848bc1643d9fc59454f61f8286d0891d181a1f6b20eeae055598dc7b150ba06faa0af44650
 EBUILD pdns-recursor-4.0.8.ebuild 1698 BLAKE2B bf67849d5f47c1f0d148596aea3fbc4268ad6696761f76f7fdb3b3b574708b01a464f12ae2a6c1df8979d60ec0cb877542dbf927af91bb2709e4510ce675a691 SHA512 358312b26fad4c6f2c473b7756f9c6d71c77045d6c7d0e92a10555848bc1643d9fc59454f61f8286d0891d181a1f6b20eeae055598dc7b150ba06faa0af44650
 EBUILD pdns-recursor-4.1.0.ebuild 1826 BLAKE2B 07f2d1113ff90503c702e1306f0d9ef87573a04b86f4eeb94dd51be8da29158e4cab390f1a57cc2066760c621e1c87413c0be265c9cd5a94443cce100227c654 SHA512 ab9825a07f4057d8f1a33a5162d0a76f01b55383e62647a9756ea1796405d5f92ad5cc254e2ef3c0ce849cf06a5ffa83519cce8af25ad7874c5c7b510d0929b6
 MISC metadata.xml 1076 BLAKE2B 4f68267d5dfcf3cff38f306f440ed2e9a7f5193c14c1029bcfcbbfca4f8f310c94969001c781e1b78a14cec2a6e313e44d82bebbd9694fe46f97759372e63711 SHA512 374be5aa98c4bab340d8d63c859ab08a392e926fbb4d55e1f5a2967d41c401d13d5e8d5997c0790c3b8f96662b56e4492343248d7c8e0a067dc7eaf3f4b56e95
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.0.7.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.0.7.ebuild
deleted file mode 100644
index 8ad027121b3c..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.0.7.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs flag-o-matic eutils versionator
-
-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 lua luajit protobuf systemd"
-REQUIRED_USE="?? ( lua luajit )"
-
-DEPEND="lua? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	systemd? ( sys-apps/systemd:0= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		$(use_enable systemd) \
-		$(use_with lua) \
-		$(use_with luajit) \
-		$(use_with protobuf)
-}
-
-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
-		version_compare ${old} 4.0.0-r1
-		[[ $? -eq 1 ]] || 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
-}