gentoo resync : 04.08.2018

3 files changed, 11 insertions, 118 deletions

diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index b5e7eaf46523..d282e5bad84e 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -2,8 +2,6 @@ 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.21.tar.gz 1099021 BLAKE2B 129fd3145308c108ef2bd06b854aaf7cdb7ae7cce7a635c2028d210f87bc9591c89d8724b4d7a23d72e06e2ed73287c1379573f8cb3571cc63a47987db4f6b65 SHA512 1e37f433ff5cd4869145a575a89d6eaca6b17c0e029302e233277b400c5f0f0b76ea018d48178d6b8a75b72328f0ded9e885be836c0bb32367d6861ff11c7150
-DIST nsd-4.1.22.tar.gz 1099463 BLAKE2B 955973e9ee01c1a5ed0a7cff38f881c775785b17452538db468f874d032b426a197b3709693c2df148de4a0f87259754b64c7ea02e53d9d96974f8c723267e19 SHA512 cab025b80955a15d174592ba5f0955c59333a988bf11b094c166a80206b51b6fcef65e2e976cd77009bf3fded257719efa4674a3a3a9d859ebc14e35fca2ecfb
-EBUILD nsd-4.1.21.ebuild 2818 BLAKE2B fe0e9553ff2bec45c43a1d819d18ffa0bd18318937e74fefcd6b213c910c5d39f054ab72a95aea714f963ef933cd51222769a9dd9b836ef1a01be1d69043dbbf SHA512 429e3a1d9da83b7e92633d68e399d75befd44dd10142f491630d865f7229e00f636e05d799b7026bf7119d73925ee8185a901342cf5a14118c5da09f9cc80526
-EBUILD nsd-4.1.22.ebuild 2820 BLAKE2B be1a3a1c30a83f42503735efdb81502c3479b9b2d9465dc450e12c1dc6f3cc06fa414fec04cc7503af421e25ae4c434a8098ecef36fd4b3c8764968378823338 SHA512 e55d1a19c16131c14fac2380ca605324ab05795d74c07c91a61ea175d34c0159bebacacc2190c0817490e8e5b856fe6d8668f3c4185bb96881f27f785fbde69c
+DIST nsd-4.1.23.tar.gz 1102038 BLAKE2B 673146931421ba7be5e90b6f60db23f9e61f42687e4f0aac2d6624125f09067dab535a3badfd00d795a3948319467f3924ca24cc0697b0c203591c2d6efb1834 SHA512 7eb44658be6a3b94855d1a84201e5f20a02c8d85786ac0b1f82a3a67e6bc3c22602d03a8976c2bcb68ea68f0bcf72f1d9fe688e1fd1f9fbe6a774c97bdcf7939
+EBUILD nsd-4.1.23.ebuild 2792 BLAKE2B 5e7cbb5049ef66385ced5235c952e96f25e30c86c3536a8c2f6814a3066de8a8c3b019b6ca026ea70a563d86b9340e695cf2884b84f30e262ce316ff1780719c SHA512 788158e409868361e00791bfed6652c58c7c44791cc33a475aef433abcc104810c864de0aeb40bec22a7f6015213ddfd7fb5f2fc5a4376e14a08f1d4a1908bae
 MISC metadata.xml 1013 BLAKE2B b989a1ccafac96d48d6f1b72bace164fcb1c04885ec9436e37fb29d94bf8c5feb4a02a1b4fc04241b6fa3c9d6d89ec993e3a06b6efc7ccd45d4ace3fad16cb18 SHA512 e7c0d6a267fd06546ac58278ffb75280aa0c0ed55ddf0097614906c1863e55cf572ff7660e021ac8861c506ed0de126c0c5e68dd2d88aea1a395be3234607ce5
diff --git a/net-dns/nsd/nsd-4.1.22.ebuild b/net-dns/nsd/nsd-4.1.22.ebuild
deleted file mode 100644
index 6e71f765df89..000000000000
--- a/net-dns/nsd/nsd-4.1.22.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd
-
-# 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}"
-
-DESCRIPTION="An authoritative only, high performance, open source name server"
-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"
-IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl libressl"
-
-S="${WORKDIR}/${MY_P}"
-
-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"
-
-	keepdir /var/db/${PN}
-}
-
-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.21.ebuild b/net-dns/nsd/nsd-4.1.23.ebuild
index 021f321a5af8..85ea02fc2f0b 100644
--- a/net-dns/nsd/nsd-4.1.21.ebuild
+++ b/net-dns/nsd/nsd-4.1.23.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit user systemd
 
 # 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_PV="${PV/_beta/b}"
+MY_PV="${MY_PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="An authoritative only, high performance, open source name server"
@@ -21,7 +21,6 @@ IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit ro
 S="${WORKDIR}/${MY_P}"
 
 RDEPEND="
-	virtual/yacc
 	libevent? ( dev-libs/libevent )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
@@ -32,24 +31,24 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	sys-devel/flex
+	virtual/yacc
 "
 
-src_prepare() {
+PATCHES=(
 	# Fix the paths in the munin plugin to match our install
-	eapply "${FILESDIR}"/nsd_munin_.patch
-	eapply_user
-}
+	"${FILESDIR}"/nsd_munin_.patch
+)
 
 src_configure() {
 	local myeconfargs=(
+		--enable-largefile
 		--enable-pie
 		--enable-relro-now
-		--enable-largefile
+		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
 		--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-xfrdir="${EPREFIX}"/var/db/nsd
 		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
 		--with-zonesdir="${EPREFIX}"/var/lib/nsd
 		$(use_enable bind8-stats)