gentoo resync : 30.09.2018

3 files changed, 19 insertions, 11 deletions

diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 66018008dd74..e5ae46ad0be2 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -2,8 +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.23.tar.gz 1102038 BLAKE2B 673146931421ba7be5e90b6f60db23f9e61f42687e4f0aac2d6624125f09067dab535a3badfd00d795a3948319467f3924ca24cc0697b0c203591c2d6efb1834 SHA512 7eb44658be6a3b94855d1a84201e5f20a02c8d85786ac0b1f82a3a67e6bc3c22602d03a8976c2bcb68ea68f0bcf72f1d9fe688e1fd1f9fbe6a774c97bdcf7939
 DIST nsd-4.1.24.tar.gz 1107574 BLAKE2B 9e22d6a07bc7c63efb41b0b4e1a0e1e36d94db9bf79f31a704bd1ec7ba371b059669feebca4b6ed9427ba41017f661ebd8a30a26ee433b45374df75d2c182cb2 SHA512 68f7f62c740e5a73d1b9da4b6d593ff1b728bc398ad126a75febaa523a2117c80315bf90ca6a60aabf38539181e00524cedb106a32b4883aa8ed021462d47762
-EBUILD nsd-4.1.23.ebuild 2792 BLAKE2B 5e7cbb5049ef66385ced5235c952e96f25e30c86c3536a8c2f6814a3066de8a8c3b019b6ca026ea70a563d86b9340e695cf2884b84f30e262ce316ff1780719c SHA512 788158e409868361e00791bfed6652c58c7c44791cc33a475aef433abcc104810c864de0aeb40bec22a7f6015213ddfd7fb5f2fc5a4376e14a08f1d4a1908bae
-EBUILD nsd-4.1.24.ebuild 2940 BLAKE2B 7ee9ab031d999185636c740144546d8783d68c081ffefc832af33fef4e81d56ea0cdb5da37e554a9e1115b8e61da7d6ada5e2833fa16bb05aa2bc66e615c1f05 SHA512 e6af515d20dd8ddb13e56142e894c5c4f6c6d243d57ec0a849180c29e4f249c9a7658469fc871a9eef7873d67d90206752d03c9571c351f1d6a5f375e0668585
+DIST nsd-4.1.25.tar.gz 1108285 BLAKE2B 29428e59c0913e9eb6936b577c02b03136ae51e47d58f5d476368b4e6614e240a735a29ec5f224dbca6f76068fa81f0eed32fad75bf647673f35641ac414e3a6 SHA512 3a1de59d799a94aeb236139bf52f1d2e2139002ec8a033948a2324680df513e6c333e3564f526ca4fa106b42e50ae2bc67edadaeee72f608dabed962aacb5423
+EBUILD nsd-4.1.24.ebuild 2935 BLAKE2B d0b6febc24f042d518d85787cb107ccf84988c292ed35f09bc52a89c5e9282dff7ec49eb5fa8b7adee3fad4035d193654d982a33bd29108cb6bdeb03d01d0b22 SHA512 6e47eea4e97455959f5782652e0369e99eadf59fd18be8af5780d52039b1ae97dd5ac1bcd1c1767b1070e75a832ac3273f46d52e429f6b4fd8058d43afac38a5
+EBUILD nsd-4.1.25.ebuild 2937 BLAKE2B b167d5163b6ec650997b70b8b48d878164fba78aa7a09fac72c0cc9c7e92a7cc73b57c4a8fc48d26d6c11fc94f650121c4c374a66662c7d8f9134c1a7adca62a SHA512 de3629cd62543e497059c8e3d8fb24977895ff53709da9ead0d94a4a3e08d81fdc4d71a6b463851b8bbc7bfe02b2b47a6fc518901b90bfbbe89d6883f17971f9
 MISC metadata.xml 1013 BLAKE2B b989a1ccafac96d48d6f1b72bace164fcb1c04885ec9436e37fb29d94bf8c5feb4a02a1b4fc04241b6fa3c9d6d89ec993e3a06b6efc7ccd45d4ace3fad16cb18 SHA512 e7c0d6a267fd06546ac58278ffb75280aa0c0ed55ddf0097614906c1863e55cf572ff7660e021ac8861c506ed0de126c0c5e68dd2d88aea1a395be3234607ce5
diff --git a/net-dns/nsd/nsd-4.1.24.ebuild b/net-dns/nsd/nsd-4.1.24.ebuild
index 4ba2bdca0910..bce39add9171 100644
--- a/net-dns/nsd/nsd-4.1.24.ebuild
+++ b/net-dns/nsd/nsd-4.1.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # 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 systemd libressl"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-dns/nsd/nsd-4.1.23.ebuild b/net-dns/nsd/nsd-4.1.25.ebuild
index 85ea02fc2f0b..9a5fc16aa9bb 100644
--- a/net-dns/nsd/nsd-4.1.23.ebuild
+++ b/net-dns/nsd/nsd-4.1.25.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit user systemd
+inherit autotools user systemd
 
 # version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
 MY_PV="${PV/_beta/b}"
@@ -15,23 +15,25 @@ 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"
+KEYWORDS="~amd64 ~x86"
+IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
 
 S="${WORKDIR}/${MY_P}"
 
 RDEPEND="
 	libevent? ( dev-libs/libevent )
+	munin? ( net-analyzer/munin )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
-	munin? ( net-analyzer/munin )
+	systemd? ( sys-apps/systemd )
 "
 DEPEND="
 	${RDEPEND}
 	sys-devel/flex
 	virtual/yacc
+	systemd? ( virtual/pkgconfig )
 "
 
 PATCHES=(
@@ -39,6 +41,11 @@ PATCHES=(
 	"${FILESDIR}"/nsd_munin_.patch
 )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	local myeconfargs=(
 		--enable-largefile
@@ -60,6 +67,7 @@ src_configure() {
 		$(use_enable ratelimit)
 		$(use_enable root-server)
 		$(use_enable runtime-checks checking)
+		$(use_enable systemd)
 		$(use_with libevent)
 		$(use_with ssl)
 	)