10 files changed, 114 insertions, 141 deletions
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index ae8f9824a0ea..86503bb3df4a 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index b81b6f25b843..1b4a44f3702b 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -1,8 +1,6 @@
 AUX stubby.confd-r1 546 BLAKE2B 2f81b79b290264701ee75029ee61e006e7f6e2425ebd8090e2f07d4aed4903b88e07576893f653a8704f5181b3fb67f51327e41fef909bc56f5022bf124a4183 SHA512 10793c0ab9081c083dd702b57ffd864aa5a6d76f678eeb704b577188c0a00536f39f2dbb960d8333564b99981a5e2d4414802ffa8506b7cb41fc517680e2b78c
 AUX stubby.initd-r1 636 BLAKE2B 1f8e96c0b844837af8d46f12c80750979be3e763bd7ac08b956f69a8fd4fd9cdf018cc666e1fc47a324ee3960e358489e01b8da6d7d09cae8dffe9cff1b38b90 SHA512 556c35dbcdc157668308e502895519e73fa723074bc8cb1d7cbfd762e0831a584be67a9204744dad17ff4ffaaf9b97b67ed60acfc6ef56e44e240c51d2f783b0
 AUX stubby.logrotate 76 BLAKE2B f68efa844df0a0b97bcfaa117fa74b0c314df18d4aefd9b934f9b9b9f9001a41ebaf148d266272529c594a79eb27c0b99ff9f30d4c519f91128d35b4ea87eb22 SHA512 c4f1de3789debd1d51a47499960b6f688bc594b4beb01062a55c5623a6ceb07d03705e4f411c9a0cc88442af223120b29c46a9dc72c600477d3e598f9c02c805
-AUX stubby.systemd 239 BLAKE2B b638a87ce4edfa3a36b1fe5bb4d91fef8aad40bf4bd4ee6d20d377cb2d868f65046521f3c4aada35827db87b67abfdff0ab203890bdb3f3a427e0a1c58bf7b4b SHA512 3c871cb10356b1291c08190ece8ad480bf6dc9bdfdfb079625a02ade0630e18bebdeaf88f4d1548bbabccf4bfe692c91896994297d2569d05a70e8dfe7d1b4fb
-AUX stubby.tmpfilesd 80 BLAKE2B c9afbd1e4b686b448e43a7ba4106351f9cb76c0ba5fe527463000e75090000c5d02cd78e16cc193061af274d53a696abc950019e6d0ec82fe9609b2ee5b006bc SHA512 c6bb320c02d62ecf8663d806318de8dc4a1cc401579a6a1b7ff5d7af8c9d24b8470d8bdecc2a9359ea40e6b3224f95909cb4decbfb9977e5a3ec8898535981fa
-DIST getdns-1.4.1.tar.gz 1055348 BLAKE2B 3b664e669327f5d866e6b40defb3ee4b62a09be228cac726478dbc6843b64aaf49faa328e1013700daf554c4df1144a8d56cca9d9405057d35b89b8ab7ae1f43 SHA512 b15da1c898d4bb4e5dcd93b47f481696dd456d8a841b02122c46035f3da27ca13b5513e7b6a00e943d1a5f5cec8c5ce1f13729d3ce0c887d8faa31d201864b27
-EBUILD getdns-1.4.1-r2.ebuild 1902 BLAKE2B f3b7e70a08dffc4a43ff6a6bf9cbc5651541ccff6467021b99ac7fec3970b3a84bd5c53363ec09a4cbe7ca79e5a234f36520a0c88f04bc9de1bade997ec22970 SHA512 c1b5d9b1eace4bf52274b50bef2ccb47c404475e6963f64141306f67d697b79e997d1b1f9a261edd810fdce74828c944ddef8a9cdd66fe93efdabac406fa6602
+DIST getdns-1.4.2.tar.gz 1059122 BLAKE2B 79399bb70e58bf449e99052c9f32ebb9d4e6ac26c753d99963d591661ee04ccfaf58e4f35589187a9a89fd9bccc0bff9d319c8b11da9522fbb17a915612ce9bd SHA512 fbbbe80df0f66e295c590c1751c11fcfc66efa200203ce1fdc11a471130fbaa837fa6bade076e17e1dac03d71c3522a67a660f2bdb4766aead19119da355bdd4
+EBUILD getdns-1.4.2.ebuild 1884 BLAKE2B 18700c0594d4a5110b821ec97a38bb33130af3b0d7dca311a4fa18442cc88feec11775f7781878d56b6462566c35a0691dca117a056a99cfdcc18a63a2ea61e0 SHA512 89bf649f84c0774189048cdc2608504aeffdf34759e6914c0b75a13b2abd8a5f8ca9c5321f6e06dd872a1acbb58e4f657a80d608c602d4bb5dd713a6abcce4f2
 MISC metadata.xml 857 BLAKE2B 25a516aa2d67d8ce5961b8a99d71f355fb99f163ccbbeee29c7c505729ba76735b7d6977f5aa8cb60b328943c715a9dbb4652b4e3133009e220c1db0de9cf875 SHA512 33065cbe6ddfa2b0382d55a0441a819f2d4795cd458fe6b53d4da444b9542d49781d7dcf7b11615c46e3157bdc1deab89c765a24ee100c67687fb64cd2099bd1
diff --git a/net-dns/getdns/files/stubby.systemd b/net-dns/getdns/files/stubby.systemd
deleted file mode 100644
index b85b8e90b036..000000000000
--- a/net-dns/getdns/files/stubby.systemd
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=stubby DNS resolver
-
-[Service]
-WorkingDirectory=/run/stubby
-ExecStart=/usr/bin/stubby
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-User=stubby
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-dns/getdns/files/stubby.tmpfilesd b/net-dns/getdns/files/stubby.tmpfilesd
deleted file mode 100644
index bf70492743ad..000000000000
--- a/net-dns/getdns/files/stubby.tmpfilesd
+++ /dev/null
@@ -1,2 +0,0 @@
-# tmpfiles.d (5) for use with stubby.service
-d /run/stubby 0750 root stubby - -
diff --git a/net-dns/getdns/getdns-1.4.1-r2.ebuild b/net-dns/getdns/getdns-1.4.2.ebuild
index bff5d734d08e..c0978a76f061 100644
--- a/net-dns/getdns/getdns-1.4.1-r2.ebuild
+++ b/net-dns/getdns/getdns-1.4.2.ebuild
@@ -54,8 +54,8 @@ src_install() {
 		newconfd "${FILESDIR}"/stubby.confd-r1 stubby
 		insinto /etc/logrotate.d
 		newins "${FILESDIR}"/stubby.logrotate stubby
-		systemd_newunit "${FILESDIR}"/stubby.systemd stubby.service
-		systemd_newtmpfilesd "${FILESDIR}"/stubby.tmpfilesd stubby.conf
+		systemd_dounit "${S}"/stubby/systemd/stubby.service
+		systemd_dotmpfilesd "${S}"/stubby/systemd/stubby.conf
 	fi
 }
 
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index ed63eb5f503b..aa0dbeb88657 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -2,8 +2,7 @@ AUX 50libidn-gentoo.el 455 BLAKE2B d6d3a0576c1d0b5030ae32ed5c99e198f06faa897864d
 AUX libidn-1.33-CVE-2017-14062.patch 2348 BLAKE2B 4f9606d25405d950f23444886e423008d928991b23c5a05a8de794eea18f236aa8f4b53b7945f4340aa3b2f4f7aa9c63d5dadaf3bc0513ee3f5e27ecb9040a7a SHA512 25e6ff17d2d6886fec51db7e9584bbb7aff9b717c23accf7c956611f1bf4c965cc5f51837367c410b7c8c29c58170e94e2e0146e9e2921b3a0c5bc411bcddfbb
 AUX libidn-1.33-parallel-make.patch 3584 BLAKE2B fbd1f372b11bc1da38bdeb3a8c0f01708339e0a7c23da7f22b450985a2b69c31887a5f686430e5014d1a5c116ae7e03b922c0350f3926e5a43e5cbc6cdbbfb83 SHA512 de98b4122c272bcd38a673beab8da56fac5b4c877d4bc0930505979addf4cc4e85fcf065ee9044d1196e83b1d2d5389ee8dceac4ffe7bf623a3f3c7bc7aca4f1
 DIST libidn-1.33.tar.gz 3501056 BLAKE2B ce6319dc61dd825cf7ddb33f4279c178709e16ce2815c3d1a464bba6b5c6cc493107a10a686f349247a0d6023b1b834a650046e68da9f2f559870dba13a59384 SHA512 38dd459eaeda0c9e3cc2d24d967113515a499747550a2a9157f32357def90d71a3a3b52398e96a44a28cd5948dc353b0473c4ff0453a69720191c4cb49cac2c6
-DIST libidn-1.34.tar.gz 3691634 BLAKE2B 4a121c7152543ffd2237e66e69a2bf31042837684cd864fdabb7d9e60700f05c8b909bb8bd5ca7d13449939f3989ef5c88dccb303854b8a540b93e8f2979aae0 SHA512 1a9b5f2554d3953591b92010fa0fdedc438ca8bc31d2bc06c621eb5d423e81656607f09ac75bb02e1a5420459f69e82b5fb82987afa50db69793f9cd7a08365a
+DIST libidn-1.35.tar.gz 4169217 BLAKE2B 809f9e854a4f2fcd3b2d5f7cdb34e2c68a0f00f5fcffc9002ead2d2d3dcee38022b3288f29716437f65f09e259e35cc98679d9c9d943423190cebb76fcbc94fa SHA512 782260f73b1fd8ebea8a40e2b3a6866c4f67494b2b3df03748daa9c0f842a9578932e746eb4bbf2547fccb1d65d7fc99a7977759dbe58f87f2fdd26d0fe45a09
 EBUILD libidn-1.33-r2.ebuild 2882 BLAKE2B 882b4421c020f431c6c3be5f0e64ea1f2b0111c2214b49d7940f9a9dff54f6780a4efef71f6469e1d02aa0e4300d4fc5ef13911f4b10ddc4090a3e1f0c925356 SHA512 b91e73753ee12dc9d73b455f962010716cde98a56b9b8c436350383ced5bd4095ded41ba804723cdc7d2cc0e107f57ea840385c0d2110e5e43016d454031208e
-EBUILD libidn-1.33.ebuild 2663 BLAKE2B 72ac3df1929e2a8a30ecbcb53dd4293b72c5583eb8996f76f31735a13114d33cb7ceefe52a14e0c3fb994bae9bce27062c2134bd2927ea6c21229f6fa4df2c5c SHA512 341670045698b9d7a45e6d08708aa54aea59355ffd0a1c3c26bf4e76159e6fa619502e6e06a450560f2135744e89e1bc14289d07e8a984b83868fe9aadf7f2e3
-EBUILD libidn-1.34.ebuild 2661 BLAKE2B a03825b63c58ecdd80d09ef7db3829b570edc73f7c34d596d7c1c5e8f4ada6da4669a2ce823b0395a38885f82dc0f53cbc5451d8bc9ced8d5a17a98105f5c015 SHA512 61a6d0f67d919860b70131eff9ae569490fad5f0e37d00ca8a7674ef0fde2e21fab20cabdb983e2a97fd48d8ddd65b9390245ed36ed3d5e4b6d9c1c57ff3e355
+EBUILD libidn-1.35.ebuild 2660 BLAKE2B 8ba157cb03e8f0dfb28eb68312917f9d5f2a12b1e3eb5753469b9d327c5278def5fe9be09f93705306886a9ed33a24245fe9e9028061ffe524da21cd02450e10 SHA512 015605562eed7981677cad0c9533a6ec795a6fb41dea2b9140b424589e48f9e543c41b809e94a1809d902c28b21d95149c5be5d76c04cbe160525f56e7b88d89
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/net-dns/libidn/libidn-1.33.ebuild b/net-dns/libidn/libidn-1.33.ebuild
deleted file mode 100644
index 9e70e212809a..000000000000
--- a/net-dns/libidn/libidn-1.33.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit elisp-common java-pkg-opt-2 mono-env multilib-minimal libtool
-
-DESCRIPTION="Internationalized Domain Names (IDN) implementation"
-HOMEPAGE="https://www.gnu.org/software/libidn/"
-SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs java mono nls static-libs"
-
-DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
-COMMON_DEPEND="
-	emacs? ( virtual/emacs )
-	mono? ( >=dev-lang/mono-0.95 )
-"
-DEPEND="${COMMON_DEPEND}
-	nls? (
-		>=sys-devel/gettext-0.17
-	)
-	java? (
-		>=virtual/jdk-1.5
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	nls? (
-		>=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
-	)
-	java? (
-		>=virtual/jre-1.5
-	)
-"
-
-pkg_setup() {
-	mono-env_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# bundled, with wrong bytecode
-	rm "${S}/java/${P}.jar" || die
-
-	eapply_user
-
-	elibtoolize  # for Solaris shared objects
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} GJDOC=javadoc \
-	econf \
-		$(multilib_native_use_enable java) \
-		$(multilib_native_use_enable mono csharp mono) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		--disable-silent-rules \
-		--disable-valgrind-tests \
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		--with-packager-bug-reports="https://bugs.gentoo.org" \
-		--with-packager-version="r${PR}" \
-		--with-packager="Gentoo"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi; then
-		use emacs && elisp-compile "${S}"/src/*.el
-		use java && use doc && emake -C java/src/main/java javadoc
-	fi
-}
-
-multilib_src_test() {
-	# only run libidn specific tests and not gnulib tests (bug #539356)
-	emake -C tests check
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_newjar java/${P}.jar ${PN}.jar
-		rm -r "${ED}"/usr/share/java || die
-		use doc && java-pkg_dojavadoc "${S}"/doc/java
-	fi
-}
-
-multilib_src_install_all() {
-	if use emacs; then
-		# *.el are installed by the build system
-		elisp-install ${PN} "${S}"/src/*.elc
-		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
-	else
-		rm -r "${ED}/usr/share/emacs" || die
-	fi
-
-	einstalldocs
-	if use doc ; then
-		dohtml -r doc/reference/html/.
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-dns/libidn/libidn-1.34.ebuild b/net-dns/libidn/libidn-1.35.ebuild
index b8f545507a9d..a87ed91b740a 100644
--- a/net-dns/libidn/libidn-1.34.ebuild
+++ b/net-dns/libidn/libidn-1.35.ebuild
@@ -9,8 +9,8 @@ HOMEPAGE="https://www.gnu.org/software/libidn/"
 SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0/12"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs java mono nls static-libs"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 9f657f0a39dd..ab91a43ec754 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -3,5 +3,7 @@ AUX nsd.munin-conf 23 BLAKE2B 0b08804b2218d77ea925d4c9e26e73649b453b923d6d7b1e1d
 AUX nsd.service 272 BLAKE2B 66a7d4132246589f71341afd98361f6b02082be3d4e230c86ae690876a797ea0a4580b29892d91feba2785ea933a053f862e0d00f2c8a8c09ab907386c39a03c SHA512 fbca86887bfc36d61af06992cc98b3f3cb33c39274fbdc1e53d489bdcc767993911fab27a20244c3878b36bacbd1644a552364b2f7bf4d48e6eb247d0eecdf0f
 AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d79b36be3f96486eb89fdd62a42b5ed4816ad99835366864603568613e27504894340ebb64057e2b2c3 SHA512 6034086d6b6f6980468766c901e92291fea8a32df179561ede2add5918c37bfe3aabf122735d4ae2e28efece394fd3398f9a0cc4d8fdcc1e5da1ca709d2ba6ae
 DIST nsd-4.1.20.tar.gz 1096797 BLAKE2B aa1415933f8d1d1415349407c54cfdec581304ca27733110b45bc109288506ad2a92c110565695ac7cb4afae3b955fe09fe740196f268c810e0be992e4f55353 SHA512 4e646303d9da920a9ad567ea3e04a06d8b66bc0d84117908ae69126c131321d660548f32e7bb54e248dae4f48d5152c0a204bf8bf9262ac4394371c05305b21e
+DIST nsd-4.1.21.tar.gz 1099021 BLAKE2B 129fd3145308c108ef2bd06b854aaf7cdb7ae7cce7a635c2028d210f87bc9591c89d8724b4d7a23d72e06e2ed73287c1379573f8cb3571cc63a47987db4f6b65 SHA512 1e37f433ff5cd4869145a575a89d6eaca6b17c0e029302e233277b400c5f0f0b76ea018d48178d6b8a75b72328f0ded9e885be836c0bb32367d6861ff11c7150
 EBUILD nsd-4.1.20.ebuild 2794 BLAKE2B 35b9ba3fae0c9bbb5c34877eb810d9b1a45d4b9c386a41a805ea30c4928dfa6cf11157b68b5c8f963300156dd14524be331270d96559ee5b10baf1c6a090e707 SHA512 b4292ebe23c0a887da7a73b6b5af141eaec0aa8eebd0acb75708966ea8d25464a2626365986c6332d0696c529925725830f39e2e3718e19ecaacace2f9f8ea65
+EBUILD nsd-4.1.21.ebuild 2820 BLAKE2B be1a3a1c30a83f42503735efdb81502c3479b9b2d9465dc450e12c1dc6f3cc06fa414fec04cc7503af421e25ae4c434a8098ecef36fd4b3c8764968378823338 SHA512 e55d1a19c16131c14fac2380ca605324ab05795d74c07c91a61ea175d34c0159bebacacc2190c0817490e8e5b856fe6d8668f3c4185bb96881f27f785fbde69c
 MISC metadata.xml 1013 BLAKE2B b989a1ccafac96d48d6f1b72bace164fcb1c04885ec9436e37fb29d94bf8c5feb4a02a1b4fc04241b6fa3c9d6d89ec993e3a06b6efc7ccd45d4ace3fad16cb18 SHA512 e7c0d6a267fd06546ac58278ffb75280aa0c0ed55ddf0097614906c1863e55cf572ff7660e021ac8861c506ed0de126c0c5e68dd2d88aea1a395be3234607ce5
diff --git a/net-dns/nsd/nsd-4.1.21.ebuild b/net-dns/nsd/nsd-4.1.21.ebuild
new file mode 100644
index 000000000000..6e71f765df89
--- /dev/null
+++ b/net-dns/nsd/nsd-4.1.21.ebuild
@@ -0,0 +1,104 @@
+# 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
+}