gentoo resync : 09.07.2022

6 files changed, 80 insertions, 80 deletions

diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 1c85736ce73f..345831aae6b7 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -1,15 +1,13 @@
-AUX nsd-4.3.9-no_ssl.patch 662 BLAKE2B 372b8d842a9ee79b30aee24b5df339bda5de697cefc3a5616fa048e58cf8c6be0cf2b90c046fe211a374e9c643d28222c8a67c52fe7fa86417caaa88a127619c SHA512 3bb33786d19803b8ce4e8119fb5be5fb450aaeba81f915eb7f758f61b6e5bad1cdfc3daa7c217d6cf367561a9387df7e5682028c22d598045b2e4164b42db6ca
 AUX nsd.initd-r1 1383 BLAKE2B b90de2ebef09a4f9050f6e95f5faf659c62910462aba1179daccde4e63a3972124247e6e8ce725c4dbd34a7fcd4f14b40899d7b59ba4937bdc59c493f6f7e173 SHA512 f775c78b529c5c7f1130035ea9c6cf1c1e9c1790c5df84fafd86a41294748a46c82b66c58df8385f8f4bbca8113427c665051aeec5720073bd9823607c9f8ce1
 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.3.8.tar.gz 1225840 BLAKE2B 19d014f130844aab5b7c6224658c6e5a4a7d8d337ceb11e1641bceb367fe76b46be146c703296a12cec834020992eabec0e1ee8f3cb6211333ac8c4c7029fef5 SHA512 aec892f85a6757bfdf537c6f0b4bc3d60c564b3062b582af14df800b24261edc96bedcd0b6649444a46b198b9018397e356b919a871364032c8a2db6256b9268
-DIST nsd-4.3.9.tar.gz 1222919 BLAKE2B 0b317c246f66476e95727d763bf7444cde14936c8a87036843458b89f8c79790130995db3f0f9ff33d8bfda756cf3ae4724b07f97ee2996f05a2dcd1c14bc0e5 SHA512 de170cbaf6e0be0a20941d9d6b2102a7dddb59a320c30566238447d5740e4497f751f54488f36c2b89f2c3cff6e3101df31a36d0d2d66db8d77cfb6e86124f32
-DIST nsd-4.4.0.tar.gz 1226433 BLAKE2B 8ead662c2ad87e9cfd9424898758cb7a7e6adc3c419583e0a4c3ced4d6bb8ae5005266af621ee4c138a06215652b60b65f075a875b6473dc92d1bef414901be1 SHA512 0fa32337246ccdaf9d6fe4257792cef8b6ce6de086fdee1024983da7b90a77b9039061cee87a2e0ad7eddf195411c57f4777469d973f2bdc10d3a51ee96d90bc
 DIST nsd-4.5.0.tar.gz 1259059 BLAKE2B 5c90a17b2c2df3cf06bea2609fb02198b4fdde3e9ed7cc0a07526d43069f735458a0c1775fc7b45ac7bd1fba42ec329fe5b67378d6282bf86f6c520f73b00397 SHA512 0309e1ff083b6f2118ba6fd59425319c21f31558d30e17a40eb8f1e53dee9e3e766d7b53eb50462130ba17b454a3559dc786d344cb779468d255732bbc6bc5da
+DIST nsd-4.6.0.tar.gz 1273532 BLAKE2B 962bb93decb268d6958afad0e3182f256c91a9e78179db21458d00571df200faf23efe327b99a2bac423d092ad759dc678230bbdc45cfb95b75f2e7a271005c6 SHA512 e9f035e42f47ac115cb2c1d0ebdef8b13b1feebca91d4f840d36904efb5ab44a817584b28c9d0d3e236fde1581e8283bcdd554a5463d4b5788329f9245414cbb
 EBUILD nsd-4.3.8.ebuild 3049 BLAKE2B 3499602d7adbc789ceab25cf46d5006c3744589872774fb9a019d9353a457e221ba11e2c05e74c737f214b08f38abe2a85fcf3e4247896aea5ebc4d296f81f8f SHA512 d1be9bac66251d7f1a37b0ed62d162cbce93a5b483ebff88de50c3f1c87b6f20235874303a18ab26ae731a235fe7f4fb245e09f07272bdd3a0a8704c5c8e8796
-EBUILD nsd-4.3.9.ebuild 3093 BLAKE2B 443b5593181d0a5586c715b8c78887f5ffb0fb9e9b525f8af0d2786bb4912562fce74d258a71df34342c0692cd98be1ee3e2ebd11e11f1feb2c37709dd94fce4 SHA512 ff61b9bc7e9f9cfd24de1f4a9abb8dd810937bd7cba48f185f1f50160624ad9ba2e906dd8bd90d91e9a81d70bb8616e1de803c7ab743f3886fa8765c740d580a
-EBUILD nsd-4.4.0.ebuild 3166 BLAKE2B e7d9f5a1208e13456c0a29095e4e2e1132c5d03b2bd3d498079313e8ece39b77f69a65917d9117a811d79f2578debf3c1d5fb6fbfe6b607f2eea062518860109 SHA512 fe6e353bd410ed2f00eca4581ec0c23c1a9b033f6bd01fe03b177c93d5e441d329e3e15a8c566fba184a6d10f6433049373729a1101d137745784720747b83b5
-EBUILD nsd-4.5.0.ebuild 3166 BLAKE2B e7d9f5a1208e13456c0a29095e4e2e1132c5d03b2bd3d498079313e8ece39b77f69a65917d9117a811d79f2578debf3c1d5fb6fbfe6b607f2eea062518860109 SHA512 fe6e353bd410ed2f00eca4581ec0c23c1a9b033f6bd01fe03b177c93d5e441d329e3e15a8c566fba184a6d10f6433049373729a1101d137745784720747b83b5
-EBUILD nsd-9999.ebuild 3166 BLAKE2B e7d9f5a1208e13456c0a29095e4e2e1132c5d03b2bd3d498079313e8ece39b77f69a65917d9117a811d79f2578debf3c1d5fb6fbfe6b607f2eea062518860109 SHA512 fe6e353bd410ed2f00eca4581ec0c23c1a9b033f6bd01fe03b177c93d5e441d329e3e15a8c566fba184a6d10f6433049373729a1101d137745784720747b83b5
+EBUILD nsd-4.5.0-r1.ebuild 3153 BLAKE2B d9edcc348716fddc9c776d8f77889532100719d218b8d8662dd68023d340064c8b97f74da15b56b1d3474334b96821cb879305042562df978c9b8b18e058fa83 SHA512 a071cfb2135c75131a4c05180ada77ea30915adc0276831f9f1861347bd7a9978662d07d1c541cf2ca59f98a3d9edcf46b00ac305193e785b8b6fecc0bcc80ac
+EBUILD nsd-4.5.0.ebuild 3164 BLAKE2B f7e5de846b7dd78f2d95c40dfed9ce694f8773976929760ca9667d3209a5aa35bc909edce689d6ceae18faf73364775ae1b8df1cb7d09fe42e39d72b39b1b60d SHA512 d77bd9baae67acac772692cf26392e39fd6a4afb4f01dca399b015e19631d267e7cff32442f1d9e8dde83951b8587ca91d23f66505d743440bdcf20819b90807
+EBUILD nsd-4.6.0.ebuild 3153 BLAKE2B d9edcc348716fddc9c776d8f77889532100719d218b8d8662dd68023d340064c8b97f74da15b56b1d3474334b96821cb879305042562df978c9b8b18e058fa83 SHA512 a071cfb2135c75131a4c05180ada77ea30915adc0276831f9f1861347bd7a9978662d07d1c541cf2ca59f98a3d9edcf46b00ac305193e785b8b6fecc0bcc80ac
+EBUILD nsd-9999.ebuild 3153 BLAKE2B d9edcc348716fddc9c776d8f77889532100719d218b8d8662dd68023d340064c8b97f74da15b56b1d3474334b96821cb879305042562df978c9b8b18e058fa83 SHA512 a071cfb2135c75131a4c05180ada77ea30915adc0276831f9f1861347bd7a9978662d07d1c541cf2ca59f98a3d9edcf46b00ac305193e785b8b6fecc0bcc80ac
 MISC metadata.xml 1077 BLAKE2B 81ba4f798150f077bf01a0c901f6552ce3b56dd54efa5c988206c956c58674d2f4fd9e046e4cddb5ad798aea1c5cb59ad1e6d7b0ea250fe297167fd1dcc5c3a5 SHA512 8c105314e496ec71c847a1768cefa12b2bcdad2f00e38fca0e90a1b2f2a66b26b271a17c883a5d1be9dd66190477c0e0e67b0412699c2ca34a2f6655e3e55b36
diff --git a/net-dns/nsd/files/nsd-4.3.9-no_ssl.patch b/net-dns/nsd/files/nsd-4.3.9-no_ssl.patch
deleted file mode 100644
index 33553a0ec889..000000000000
--- a/net-dns/nsd/files/nsd-4.3.9-no_ssl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From c5e6a8e5e566380c8c6731e9feb7ac686a1c0735 Mon Sep 17 00:00:00 2001
-From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
-Date: Fri, 28 Jan 2022 16:38:53 +0100
-Subject: [PATCH] - Fix #206: build with --without-ssl fails.
-
-diff --git a/edns.c b/edns.c
-index c7fc39d9..478ec681 100644
---- a/edns.c
-+++ b/edns.c
-@@ -21,6 +21,12 @@
- #include "nsd.h"
- #include "query.h"
- 
-+#if !defined(HAVE_SSL) || !defined(HAVE_CRYPTO_MEMCMP)
-+/* we need fixed time compare, pull it in from tsig.c */
-+#define CRYPTO_memcmp memcmp_fixedtime
-+int memcmp_fixedtime(const void *s1, const void *s2, size_t n);
-+#endif
-+
- void
- edns_init_data(edns_data_type *data, uint16_t max_length)
- {
diff --git a/net-dns/nsd/nsd-4.4.0.ebuild b/net-dns/nsd/nsd-4.5.0-r1.ebuild
index a41057e6300d..d3d5d3b51e9d 100644
--- a/net-dns/nsd/nsd-4.4.0.ebuild
+++ b/net-dns/nsd/nsd-4.5.0-r1.ebuild
@@ -6,10 +6,9 @@ EAPI=8
 inherit autotools systemd
 
 DESCRIPTION="An authoritative only, high performance, open source name server"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
-LICENSE="BSD"
-SLOT="0"
-if [[ "${PV}" == *9999 ]] ; then
+HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd"
+
+if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/NLnetLabs/nsd.git"
 else
@@ -18,12 +17,17 @@ else
 	MY_PV="${MY_PV/_rc/rc}"
 	MY_P="${PN}-${MY_PV}"
 
-	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
+	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+		SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
+		S="${WORKDIR}"/${MY_P}
+
+		KEYWORDS="~amd64 ~x86"
+	fi
 fi
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="bind8-stats debug dnstap libevent minimal-responses mmap munin +nsec3 ratelimit root-server ssl systemd"
 
 RDEPEND="
 	acct-group/nsd
@@ -51,17 +55,20 @@ PATCHES=(
 
 src_prepare() {
 	default
+
 	# Required to get correct pkg-config macros with USE="systemd"
-	# see bugs #663618 and #758050
+	# See bugs #663618 and #758050
 	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
+		--enable-ipv6
 		--enable-largefile
 		--enable-pie
 		--enable-relro-now
 		--enable-tcp-fastopen
+
 		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
 		--with-logfile="${EPREFIX}"/var/log/nsd.log
 		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
@@ -69,20 +76,21 @@ src_configure() {
 		--with-xfrdir="${EPREFIX}"/var/db/nsd
 		--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 debug checking)
 		$(use_enable dnstap)
-		$(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_enable systemd)
 		$(use_with libevent)
 		$(use_with ssl)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
@@ -93,7 +101,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
 
-	# install munin plugin and config
+	# Install munin plugin and config
 	if use munin ; then
 		exeinto /usr/libexec/munin/plugins
 		doexe contrib/nsd_munin_
@@ -103,7 +111,7 @@ src_install() {
 
 	systemd_dounit "${FILESDIR}"/nsd.service
 
-	# remove the /run directory that usually resides on tmpfs and is
+	# 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"
 
diff --git a/net-dns/nsd/nsd-4.5.0.ebuild b/net-dns/nsd/nsd-4.5.0.ebuild
index a41057e6300d..63333507b30a 100644
--- a/net-dns/nsd/nsd-4.5.0.ebuild
+++ b/net-dns/nsd/nsd-4.5.0.ebuild
@@ -19,7 +19,7 @@ else
 	MY_P="${PN}-${MY_PV}"
 
 	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/net-dns/nsd/nsd-4.3.9.ebuild b/net-dns/nsd/nsd-4.6.0.ebuild
index e4f824b01061..d3d5d3b51e9d 100644
--- a/net-dns/nsd/nsd-4.3.9.ebuild
+++ b/net-dns/nsd/nsd-4.6.0.ebuild
@@ -5,21 +5,29 @@ EAPI=8
 
 inherit autotools systemd
 
-# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
-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"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/NLnetLabs/nsd.git"
+else
+	# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
+	MY_PV="${PV/_beta/b}"
+	MY_PV="${MY_PV/_rc/rc}"
+	MY_P="${PN}-${MY_PV}"
+
+	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+		SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
+		S="${WORKDIR}"/${MY_P}
+
+		KEYWORDS="~amd64 ~x86"
+	fi
+fi
+
 LICENSE="BSD"
 SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd"
-
-S="${WORKDIR}/${MY_P}"
+IUSE="bind8-stats debug dnstap libevent minimal-responses mmap munin +nsec3 ratelimit root-server ssl systemd"
 
 RDEPEND="
 	acct-group/nsd
@@ -30,9 +38,7 @@ RDEPEND="
 	)
 	libevent? ( dev-libs/libevent )
 	munin? ( net-analyzer/munin )
-	ssl? (
-		dev-libs/openssl:0=
-	)
+	ssl? ( dev-libs/openssl:0= )
 	systemd? ( sys-apps/systemd )
 "
 DEPEND="${RDEPEND}"
@@ -45,23 +51,24 @@ BDEPEND="
 PATCHES=(
 	# Fix the paths in the munin plugin to match our install
 	"${FILESDIR}"/nsd_munin_.patch
-
-	"${FILESDIR}/${P}-no_ssl.patch" #832213
 )
 
 src_prepare() {
 	default
+
 	# Required to get correct pkg-config macros with USE="systemd"
-	# see bugs #663618 and #758050
+	# See bugs #663618 and #758050
 	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
+		--enable-ipv6
 		--enable-largefile
 		--enable-pie
 		--enable-relro-now
 		--enable-tcp-fastopen
+
 		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
 		--with-logfile="${EPREFIX}"/var/log/nsd.log
 		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
@@ -69,20 +76,21 @@ src_configure() {
 		--with-xfrdir="${EPREFIX}"/var/db/nsd
 		--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 debug checking)
 		$(use_enable dnstap)
-		$(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_enable systemd)
 		$(use_with libevent)
 		$(use_with ssl)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
@@ -93,7 +101,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
 
-	# install munin plugin and config
+	# Install munin plugin and config
 	if use munin ; then
 		exeinto /usr/libexec/munin/plugins
 		doexe contrib/nsd_munin_
@@ -103,7 +111,7 @@ src_install() {
 
 	systemd_dounit "${FILESDIR}"/nsd.service
 
-	# remove the /run directory that usually resides on tmpfs and is
+	# 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"
 
diff --git a/net-dns/nsd/nsd-9999.ebuild b/net-dns/nsd/nsd-9999.ebuild
index a41057e6300d..d3d5d3b51e9d 100644
--- a/net-dns/nsd/nsd-9999.ebuild
+++ b/net-dns/nsd/nsd-9999.ebuild
@@ -6,10 +6,9 @@ EAPI=8
 inherit autotools systemd
 
 DESCRIPTION="An authoritative only, high performance, open source name server"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
-LICENSE="BSD"
-SLOT="0"
-if [[ "${PV}" == *9999 ]] ; then
+HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd"
+
+if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/NLnetLabs/nsd.git"
 else
@@ -18,12 +17,17 @@ else
 	MY_PV="${MY_PV/_rc/rc}"
 	MY_P="${PN}-${MY_PV}"
 
-	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
+	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+		SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
+		S="${WORKDIR}"/${MY_P}
+
+		KEYWORDS="~amd64 ~x86"
+	fi
 fi
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="bind8-stats debug dnstap libevent minimal-responses mmap munin +nsec3 ratelimit root-server ssl systemd"
 
 RDEPEND="
 	acct-group/nsd
@@ -51,17 +55,20 @@ PATCHES=(
 
 src_prepare() {
 	default
+
 	# Required to get correct pkg-config macros with USE="systemd"
-	# see bugs #663618 and #758050
+	# See bugs #663618 and #758050
 	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
+		--enable-ipv6
 		--enable-largefile
 		--enable-pie
 		--enable-relro-now
 		--enable-tcp-fastopen
+
 		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
 		--with-logfile="${EPREFIX}"/var/log/nsd.log
 		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
@@ -69,20 +76,21 @@ src_configure() {
 		--with-xfrdir="${EPREFIX}"/var/db/nsd
 		--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 debug checking)
 		$(use_enable dnstap)
-		$(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_enable systemd)
 		$(use_with libevent)
 		$(use_with ssl)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
@@ -93,7 +101,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
 
-	# install munin plugin and config
+	# Install munin plugin and config
 	if use munin ; then
 		exeinto /usr/libexec/munin/plugins
 		doexe contrib/nsd_munin_
@@ -103,7 +111,7 @@ src_install() {
 
 	systemd_dounit "${FILESDIR}"/nsd.service
 
-	# remove the /run directory that usually resides on tmpfs and is
+	# 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"