gentoo resync : 10.01.2018

3 files changed, 3 insertions, 106 deletions

diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 2e3db75e377a..7d4219c8cf1c 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -2,10 +2,8 @@ AUX nsd.initd-r1 1386 BLAKE2B d3a5ca31ffd06d9cf4da09617f523f61e5b8aea4e3217bf114
 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
-DIST nsd-4.1.16.tar.gz 1088633 BLAKE2B c170ca8c4008d8db383a072c40bbf262487979bff659b3d0d76cb0203e1b7ff9f9c2bc4bc46912628c246d2cd12e55486a526fbdaa4f23eaa177fb2dcc4769e9 SHA512 51135bbf412cdc5d6d9be02af9fef16513f0529155c102debfd6bd68b025d289c684777a8fca57de86b25f68bc94aef89d2cfefb871b8d63048d262f6c8eb8e3
 DIST nsd-4.1.18.tar.gz 1095673 BLAKE2B e3dc86e64614323dbefb334769a8095dc674f422f8e62c91e2918f4622ceac0ebef7dec42d5a714b15ad2f3af368ba817239a0027d3a685abf603cf00e9fa9d1 SHA512 d9939b8813677127ccd3e87e709b27a8a4f96cc0221ab77563d9349cb6dd56ae39bb7349ede9aed9aaa07de9310bcaeb8be8b17f608e9c4714b4fb084f2e756f
 DIST nsd-4.1.19.tar.gz 1096567 BLAKE2B f6e700d0c6f539caa0f1ff94fb43091eb15b32421f4b952566ca5ae31b94922248cc5ffd28a97abd6870d6bdd8acd76e80b06717584c626634f0a01eed76ae51 SHA512 fc99590f84658311cf33428d87c84c73b231ac0c90f8ca47daedeb264642e291eb2e79f8dee304dd4dc3a73bd9c7fbe65f2bd164b120bd7b13429ad483882d82
-EBUILD nsd-4.1.16.ebuild 2785 BLAKE2B 70dbdff83803797fdc08266b117554715aa74f577ed5c1681bc913cd0d60f189a1a25291e23b9a4b544530e140f79182c5dd4b6938df529c13d4f1b449cc1200 SHA512 92ddc87fb87c7534969bb5fa10b6365dcf586d461440c82e8c2d48668a02e1cc314641e4f5230474572c1f176498bcf75a115983d80a33c91061ce0aa2dafe2a
-EBUILD nsd-4.1.18.ebuild 2796 BLAKE2B b9974cfd43dbaecd1babb1cc477b8b2743679bb933407e4e39518b207b84de771e2b56057590dfc2178f8536323bc8ef9c7660e09ba6d8be6461f8f2a3f7d80f SHA512 744c2364db1b41edec79bbba3604c12417ece1bb1e0c0064d74dd72ce70b1dd19520845c48ce969055beca72a42a4ab5dda547cb0b6a7a235301d5e46d80b5b7
+EBUILD nsd-4.1.18.ebuild 2794 BLAKE2B 35b9ba3fae0c9bbb5c34877eb810d9b1a45d4b9c386a41a805ea30c4928dfa6cf11157b68b5c8f963300156dd14524be331270d96559ee5b10baf1c6a090e707 SHA512 b4292ebe23c0a887da7a73b6b5af141eaec0aa8eebd0acb75708966ea8d25464a2626365986c6332d0696c529925725830f39e2e3718e19ecaacace2f9f8ea65
 EBUILD nsd-4.1.19.ebuild 2796 BLAKE2B b9974cfd43dbaecd1babb1cc477b8b2743679bb933407e4e39518b207b84de771e2b56057590dfc2178f8536323bc8ef9c7660e09ba6d8be6461f8f2a3f7d80f SHA512 744c2364db1b41edec79bbba3604c12417ece1bb1e0c0064d74dd72ce70b1dd19520845c48ce969055beca72a42a4ab5dda547cb0b6a7a235301d5e46d80b5b7
 MISC metadata.xml 1013 BLAKE2B b989a1ccafac96d48d6f1b72bace164fcb1c04885ec9436e37fb29d94bf8c5feb4a02a1b4fc04241b6fa3c9d6d89ec993e3a06b6efc7ccd45d4ace3fad16cb18 SHA512 e7c0d6a267fd06546ac58278ffb75280aa0c0ed55ddf0097614906c1863e55cf572ff7660e021ac8861c506ed0de126c0c5e68dd2d88aea1a395be3234607ce5
diff --git a/net-dns/nsd/nsd-4.1.16.ebuild b/net-dns/nsd/nsd-4.1.16.ebuild
deleted file mode 100644
index 1b7f7b998e3e..000000000000
--- a/net-dns/nsd/nsd-4.1.16.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd
-
-DESCRIPTION="An authoritative only, high performance, open source name server"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
-# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
-MY_PV=${PV/_rc/rc}
-MY_PV=${MY_PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-S="${WORKDIR}/${MY_P}"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl libressl"
-
-RDEPEND="
-	virtual/yacc
-	libevent? ( dev-libs/libevent )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	munin? ( net-analyzer/munin )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-"
-
-src_prepare() {
-	# Fix the paths in the munin plugin to match our install
-	eapply "${FILESDIR}"/nsd_munin_.patch
-	eapply_user
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-pie
-		--enable-relro-now
-		--enable-largefile
-		--with-logfile="${EPREFIX}"/var/log/nsd.log
-		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
-		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
-		--with-xfrdir="${EPREFIX}"/var/db/nsd
-		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state
-		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
-		--with-zonesdir="${EPREFIX}"/var/lib/nsd
-		$(use_enable bind8-stats)
-		$(use_enable bind8-stats zone-stats)
-		$(use_enable ipv6)
-		$(use_enable minimal-responses)
-		$(use_enable mmap)
-		$(use_enable nsec3)
-		$(use_enable ratelimit)
-		$(use_enable root-server)
-		$(use_enable runtime-checks checking)
-		$(use_with libevent)
-		$(use_with ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
-
-	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
-
-	# install munin plugin and config
-	if use munin ; then
-		exeinto /usr/libexec/munin/plugins
-		doexe contrib/nsd_munin_
-		insinto /etc/munin/plugin-conf.d
-		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
-	fi
-
-	systemd_dounit "${FILESDIR}"/nsd.service
-
-	# remove the /run directory that usually resides on tmpfs and is
-	# being taken care of by the nsd init script anyway (checkpath)
-	rm -r "${ED}"/run || die "Failed to remove /run"
-}
-
-pkg_postinst() {
-	# Do this in postinst to ensure the uid/gid is consistent for binpkgs
-	enewgroup nsd
-	enewuser nsd -1 -1 -1 nsd
-
-	# database directory, writable by nsd for database updates and zone transfers
-	install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/db/nsd
-
-	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/lib/nsd
-}
diff --git a/net-dns/nsd/nsd-4.1.18.ebuild b/net-dns/nsd/nsd-4.1.18.ebuild
index 4a7e4dbabe2b..537cf030813c 100644
--- a/net-dns/nsd/nsd-4.1.18.ebuild
+++ b/net-dns/nsd/nsd-4.1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
 SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl libressl"
 
 S="${WORKDIR}/${MY_P}"