Version bumps. Cleanup. Migrate to python-r1. Fixes #516472, #501290, #499892 and #506346.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)

10 files changed, 107 insertions, 868 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 7b0721c0c445..26a590fccab7 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.501 2014/08/02 18:20:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.502 2014/08/15 12:05:02 idl0r Exp $
+
+*bind-9.10.0_p2 (15 Aug 2014)
+*bind-9.9.5_p1 (15 Aug 2014)
+
+  15 Aug 2014; Christian Ruppert <idl0r@gentoo.org> -bind-9.8.6.ebuild,
+  -bind-9.9.4_p2.ebuild, -bind-9.9.5-r2.ebuild, +bind-9.9.5_p1.ebuild,
+  +bind-9.10.0_p2.ebuild, -files/named.conf, -files/named.conf-r6,
+  +files/named.conf-r8, -files/named.confd-r6, -files/named.init-r12,
+  -files/named.service, metadata.xml:
+  Version bumps. Cleanup. Migrate to python-r1. Fixes #516472, #501290, #499892
+  and #506346.
 
   02 Aug 2014; Agostino Sarubbo <ago@gentoo.org> bind-9.9.5-r3.ebuild:
   Stable for ppc64, wrt bug #506796
diff --git a/net-dns/bind/bind-9.8.6.ebuild b/net-dns/bind/bind-9.10.0_p2.ebuild
index d0e8206980d5..6525167898cb 100644
--- a/net-dns/bind/bind-9.8.6.ebuild
+++ b/net-dns/bind/bind-9.10.0_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.6.ebuild,v 1.2 2014/01/18 18:16:15 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.10.0_p2.ebuild,v 1.1 2014/08/15 12:05:02 idl0r Exp $
 
 # Re dlz/mysql and threads, needs to be verified..
 # MySQL uses thread local storage in its C api. Thus MySQL
@@ -13,7 +13,9 @@
 
 EAPI="5"
 
-inherit eutils autotools toolchain-funcs flag-o-matic multilib db-use user
+PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
+
+inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
 
 MY_PV="${PV/_p/-P}"
 MY_PV="${MY_PV/_rc/rc}"
@@ -21,37 +23,26 @@ MY_P="${PN}-${MY_PV}"
 
 SDB_LDAP_VER="1.1.0-fc14"
 
-# bind-9.8.0-P1-geoip-1.3.patch
-GEOIP_PV=1.3
-#GEOIP_PV_AGAINST="${MY_PV}"
-GEOIP_PV_AGAINST="9.8.3-P1"
-GEOIP_P="bind-${GEOIP_PV_AGAINST}-geoip-${GEOIP_PV}"
-GEOIP_PATCH_A="${GEOIP_P}.patch"
-GEOIP_DOC_A="bind-geoip-1.3-readme.txt"
-GEOIP_SRC_URI_BASE="http://bind-geoip.googlecode.com/"
-
 RRL_PV="${MY_PV}"
 
-# GeoIP: http://bind-geoip.googlecode.com/
-# DNS RRL: http://www.redbarn.org/dns/ratelimits/
+NSLINT_DIR="contrib/nslint-3.0a2/"
+
 # SDB-LDAP: http://bind9-ldap.bayour.com/
 
 DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
 HOMEPAGE="http://www.isc.org/software/bind"
 SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
 	doc? ( mirror://gentoo/dyndns-samples.tbz2 )
-	geoip? ( ${GEOIP_SRC_URI_BASE}/files/${GEOIP_DOC_A}
-			 ${GEOIP_SRC_URI_BASE}/files/${GEOIP_PATCH_A} )
 	sdb-ldap? (
 		http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
-	)
-	rrl? ( http://ss.vix.su/~vjs/rl-${RRL_PV}.patch )"
+	)"
 
-LICENSE="ISC BSD BSD-2 HPND JNIC openssl"
+LICENSE="GPL-2 ISC BSD BSD-2 HPND JNIC openssl"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb caps dlz doc filter-aaaa geoip gost gssapi idn ipv6 ldap mysql odbc
-postgres rpz rrl sdb-ldap selinux ssl static-libs threads urandom xml"
+IUSE="berkdb caps dlz doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
+ldap mysql nslint odbc postgres python rpz sdb-ldap selinux ssl static-libs
+threads urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
 REQUIRED_USE="postgres? ( dlz )
@@ -63,7 +54,7 @@ REQUIRED_USE="postgres? ( dlz )
 	gost? ( ssl )
 	threads? ( caps )"
 
-DEPEND="ssl? ( dev-libs/openssl:0 )
+DEPEND="ssl? ( dev-libs/openssl:0[-bindist] )
 	mysql? ( >=virtual/mysql-4.0 )
 	odbc? ( >=dev-db/unixODBC-2.2.6 )
 	ldap? ( net-nds/openldap )
@@ -82,6 +73,9 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+# bug 479092, requires networking
+RESTRICT="test"
+
 pkg_setup() {
 	ebegin "Creating named group and user"
 	enewgroup named 40
@@ -122,32 +116,15 @@ src_prepare() {
 	fi
 
 	# should be installed by bind-tools
-	sed -i -r -e "s:(nsupdate|dig) ::g" bin/Makefile.in || die
-
-	if use geoip; then
-		cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die
-		sed -i -e 's:^ PATCHVER=3: PATCHVER=6:' \
-			-e 's:^ RELEASETYPE=-P: RELEASETYPE=:' \
-			-e 's:RELEASEVER=1:RELEASEVER=:' \
-			${GEOIP_PATCH_A} || die
-#		sed -i -e 's:RELEASEVER=1:RELEASEVER=2:' \
-#			${GEOIP_PATCH_A} || die
-		epatch -F0 ${GEOIP_PATCH_A}
-	fi
-
-	if use rrl; then
-		cp "${DISTDIR}"/rl-${RRL_PV}.patch "${S}" || die
-#		sed -i -e 's:^ RELEASETYPE=: RELEASETYPE=-P:' \
-#			-e 's:^ RELEASEVER=: RELEASEVER=1:' \
-#			rl-${RRL_PV}.patch || die
-
-		# Response Rate Limiting (DNS RRL) - bug 434650
-		epatch rl-${RRL_PV}.patch
-	fi
+	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
 
 	# Disable tests for now, bug 406399
 	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
 
+	if use nslint; then
+		sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:' ${NSLINT_DIR}/nslint.{c,8} || die
+	fi
+
 	# bug #220361
 	rm aclocal.m4
 	rm -rf libtool.m4/
@@ -197,15 +174,40 @@ src_configure() {
 		$(use_enable caps linux-caps) \
 		$(use_with gost) \
 		$(use_enable filter-aaaa) \
+		$(use_enable fixed-rrset) \
+		$(use_with python) \
+		--without-readline \
 		${myconf}
 
+	# $(use_enable static-libs static) \
+
 	# bug #151839
 	echo '#undef SO_BSDCOMPAT' >> config.h
+
+	if use nslint; then
+		cd $NSLINT_DIR
+		econf
+	fi
+}
+
+src_compile() {
+	emake
+
+	if use nslint; then
+		emake -C $NSLINT_DIR CCOPT="${CFLAGS}"
+	fi
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
 
+	if use nslint; then
+		cd $NSLINT_DIR
+		dobin nslint
+		doman nslint.8
+		cd "${S}"
+	fi
+
 	dodoc CHANGES FAQ README
 
 	if use idn; then
@@ -232,21 +234,18 @@ src_install() {
 		popd 1>/dev/null
 	fi
 
-	use geoip && dodoc "${DISTDIR}"/${GEOIP_DOC_A}
-
 	insinto /etc/bind
-	newins "${FILESDIR}"/named.conf-r6 named.conf
+	newins "${FILESDIR}"/named.conf-r8 named.conf
 
 	# ftp://ftp.rs.internic.net/domain/named.cache:
 	insinto /var/bind
 	doins "${FILESDIR}"/named.cache
 
 	insinto /var/bind/pri
-	newins "${FILESDIR}"/127.zone-r1 127.zone
 	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
 
-	newinitd "${FILESDIR}"/named.init-r12 named
-	newconfd "${FILESDIR}"/named.confd-r6 named
+	newinitd "${FILESDIR}"/named.init-r13 named
+	newconfd "${FILESDIR}"/named.confd-r7 named
 
 	if use gost; then
 		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' "${D}/etc/init.d/named" || die
@@ -264,7 +263,20 @@ src_install() {
 
 	# bug 405251, library archives aren't properly handled by --enable/disable-static
 	if ! use static-libs; then
-		find "${D}" -type f -name '*.la' -delete || die
+		find "${D}" -type f -name '*.a' -delete || die
+	fi
+
+	# bug 405251
+	find "${D}" -type f -name '*.la' -delete || die
+
+	if use python; then
+		install_python_tools() {
+			dosbin bin/python/dnssec-{checkds,coverage}
+		}
+		python_foreach_impl install_python_tools
+
+		python_replicate_script "${D}usr/sbin/dnssec-checkds"
+		python_replicate_script "${D}usr/sbin/dnssec-coverage"
 	fi
 
 	# bug 450406
@@ -275,13 +287,17 @@ src_install() {
 	dosym /var/bind/dyn /etc/bind/dyn
 	keepdir /var/bind/{pri,sec,dyn}
 
-	dodir /var/{run,log}/named
+	dodir /var/log/named
 
-	fowners root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri,dyn}
-	fowners root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}
+	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
 	fperms 0750 /etc/bind /var/bind/pri
-	fperms 0770 /var/{run,log}/named /var/bind/{,sec,dyn}
+	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
+
+	systemd_newunit "${FILESDIR}/named.service-r1" named.service
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/generate-rndc-key.sh"
 }
 
 pkg_postinst() {
@@ -324,19 +340,6 @@ pkg_postinst() {
 		elog "/var/bind because bind will now mount the needed directories into"
 		elog "the chroot dir."
 	fi
-
-	ewarn
-	ewarn "NOTE: /var/bind/named.ca has been renamed to /var/bind/named.cache"
-	ewarn "you may need to fix your named.conf!"
-	ewarn
-	ewarn "NOTE: If you upgrade from <net-dns/bind-9.4.3_p5-r1, you may encounter permission problems"
-	ewarn "To fix the permissions do:"
-	ewarn "chown root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri,dyn}"
-	ewarn "chown root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}"
-	ewarn "chmod 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}"
-	ewarn "chmod 0750 /etc/bind /var/bind/pri"
-	ewarn "chmod 0770 /var/{run,log}/named /var/bind/{,sec,dyn}"
-	ewarn
 }
 
 pkg_config() {
@@ -363,9 +366,9 @@ pkg_config() {
 	echo; einfo "Setting up the chroot directory..."
 
 	mkdir -m 0750 -p ${CHROOT}
-	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/{run,log}}
+	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run}
 	mkdir -m 0750 -p ${CHROOT}/etc/bind
-	mkdir -m 0770 -p ${CHROOT}/var/{bind,{run,log}/named}
+	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/
 	# As of bind 9.8.0
 	if has_version net-dns/bind[gost]; then
 		if [ "$(get_libdir)" = "lib64" ]; then
@@ -375,7 +378,7 @@ pkg_config() {
 			mkdir -m 0755 -p ${CHROOT}/usr/lib/engines
 		fi
 	fi
-	chown root:named ${CHROOT} ${CHROOT}/var/{bind,{run,log}/named} ${CHROOT}/etc/bind
+	chown root:named ${CHROOT} ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ ${CHROOT}/etc/bind
 
 	mknod ${CHROOT}/dev/null c 1 3
 	chmod 0666 ${CHROOT}/dev/null
diff --git a/net-dns/bind/bind-9.9.4_p2.ebuild b/net-dns/bind/bind-9.9.4_p2.ebuild
deleted file mode 100644
index 3bbb2563d18b..000000000000
--- a/net-dns/bind/bind-9.9.4_p2.ebuild
+++ /dev/null
@@ -1,429 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.4_p2.ebuild,v 1.12 2014/07/06 12:56:15 mgorny Exp $
-
-# Re dlz/mysql and threads, needs to be verified..
-# MySQL uses thread local storage in its C api. Thus MySQL
-# requires that each thread of an application execute a MySQL
-# thread initialization to setup the thread local storage.
-# This is impossible to do safely while staying within the DLZ
-# driver API. This is a limitation caused by MySQL, and not the DLZ API.
-# Because of this BIND MUST only run with a single thread when
-# using the MySQL driver.
-
-EAPI="5"
-
-PYTHON_DEPEND="python? 2:2.7 3"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit python eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
-
-MY_PV="${PV/_p/-P}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SDB_LDAP_VER="1.1.0-fc14"
-
-# bind-9.8.0-P1-geoip-1.3.patch
-GEOIP_PV=1.3
-#GEOIP_PV_AGAINST="${MY_PV}"
-GEOIP_PV_AGAINST="9.9.2"
-GEOIP_P="bind-${GEOIP_PV_AGAINST}-geoip-${GEOIP_PV}"
-GEOIP_PATCH_A="${GEOIP_P}.patch"
-GEOIP_DOC_A="bind-geoip-1.3-readme.txt"
-GEOIP_SRC_URI_BASE="http://bind-geoip.googlecode.com/"
-
-RRL_PV="${MY_PV}"
-
-# GeoIP: http://bind-geoip.googlecode.com/
-# SDB-LDAP: http://bind9-ldap.bayour.com/
-
-#	geoip? ( ${GEOIP_SRC_URI_BASE}/files/${GEOIP_DOC_A}
-#		${GEOIP_SRC_URI_BASE}/files/${GEOIP_PATCH_A} )
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/software/bind"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )
-	geoip? ( ${GEOIP_SRC_URI_BASE}/files/${GEOIP_DOC_A}
-			 http://dev.gentoo.org/~idl0r/${P}-geoip.patch )
-	sdb-ldap? (
-		http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
-	)"
-
-LICENSE="ISC BSD BSD-2 HPND JNIC openssl"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb caps dlz doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
-ldap mysql odbc postgres python rpz rrl sdb-ldap selinux ssl static-libs threads
-urandom xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="postgres? ( dlz )
-	berkdb? ( dlz )
-	mysql? ( dlz !threads )
-	odbc? ( dlz )
-	ldap? ( dlz )
-	sdb-ldap? ( dlz )
-	gost? ( ssl )
-	threads? ( caps )"
-
-DEPEND="ssl? ( dev-libs/openssl:0[-bindist] )
-	mysql? ( >=virtual/mysql-4.0 )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )
-	idn? ( net-dns/idnkit )
-	postgres? ( dev-db/postgresql-base )
-	caps? ( >=sys-libs/libcap-2.1.0 )
-	xml? ( dev-libs/libxml2 )
-	geoip? ( >=dev-libs/geoip-1.4.6 )
-	gssapi? ( virtual/krb5 )
-	sdb-ldap? ( net-nds/openldap )
-	gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )
-	|| ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-
-	if use python; then
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Adjusting PATHs in manpages
-	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
-		sed -i \
-			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-			"${i}" || die "sed failed, ${i} doesn't exist"
-	done
-
-	if use dlz; then
-		# bind fails to reconnect to MySQL5 databases, bug #180720, patch by Nicolas Brousse
-		# (http://www.shell-tips.com/2007/09/04/bind-950-patch-dlz-mysql-5-for-auto-reconnect/)
-		if use mysql && has_version ">=dev-db/mysql-5"; then
-			epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch
-		fi
-
-		if use odbc; then
-			epatch "${FILESDIR}/${PN}-9.7.3-odbc-dlz-detect.patch"
-		fi
-
-		# sdb-ldap patch as per  bug #160567
-		# Upstream URL: http://bind9-ldap.bayour.com/
-		# New patch take from bug 302735
-		if use sdb-ldap; then
-			epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
-			cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
-			cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
-			cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
-		fi
-	fi
-
-	# should be installed by bind-tools
-	sed -i -r -e "s:(nsupdate|dig) ::g" bin/Makefile.in || die
-
-	if use geoip; then
-#		cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die
-#		sed -i -e 's:^ RELEASETYPE=: RELEASETYPE=-P:' \
-#			-e 's:RELEASEVER=:RELEASEVER=2:' \
-#			${GEOIP_PATCH_A} || die
-#		sed -i -e 's:^ PATCHVER=2: PATCHVER=4:' ${GEOIP_PATCH_A} || die
-#		epatch -F0 ${GEOIP_PATCH_A}
-		epatch -F0 "${DISTDIR}/${P}-geoip.patch"
-	fi
-
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	# bug #220361
-	rm aclocal.m4
-	rm -rf libtool.m4/
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-
-	if use urandom; then
-		myconf="${myconf} --with-randomdev=/dev/urandom"
-	else
-		myconf="${myconf} --with-randomdev=/dev/random"
-	fi
-
-	use geoip && myconf="${myconf} --with-geoip"
-
-	# bug #158664
-#	gcc-specs-ssp && replace-flags -O[23s] -O
-
-	# To include db.h from proper path
-	use berkdb && append-flags "-I$(db_includedir)"
-
-	export BUILD_CC=$(tc-getBUILD_CC)
-	econf \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		--with-libtool \
-		--enable-full-report \
-		$(use_enable threads) \
-		$(use_with dlz dlopen) \
-		$(use_with dlz dlz-filesystem) \
-		$(use_with dlz dlz-stub) \
-		$(use_with postgres dlz-postgres) \
-		$(use_with mysql dlz-mysql) \
-		$(use_with berkdb dlz-bdb) \
-		$(use_with ldap dlz-ldap) \
-		$(use_with odbc dlz-odbc) \
-		$(use_with ssl openssl "${EPREFIX}"/usr) \
-		$(use_with ssl ecdsa) \
-		$(use_with idn) \
-		$(use_enable ipv6) \
-		$(use_with xml libxml2) \
-		$(use_enable xml newstats) \
-		$(use_with gssapi) \
-		$(use_enable rpz rpz-nsip) \
-		$(use_enable rpz rpz-nsdname) \
-		$(use_enable caps linux-caps) \
-		$(use_with gost) \
-		$(use_enable filter-aaaa) \
-		$(use_enable fixed-rrset) \
-		$(use_enable rrl) \
-		$(use_with python) \
-		--without-readline \
-		${myconf}
-
-	# $(use_enable static-libs static) \
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc CHANGES FAQ README
-
-	if use idn; then
-		dodoc contrib/idn/README.idnkit
-	fi
-
-	if use doc; then
-		dodoc doc/arm/Bv9ARM.pdf
-
-		docinto misc
-		dodoc doc/misc/*
-
-		# might a 'html' useflag make sense?
-		docinto html
-		dohtml -r doc/arm/*
-
-		docinto contrib
-		dodoc contrib/named-bootconf/named-bootconf.sh \
-			contrib/nanny/nanny.pl
-
-		# some handy-dandy dynamic dns examples
-		pushd "${D}"/usr/share/doc/${PF} 1>/dev/null
-		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
-		popd 1>/dev/null
-	fi
-
-	use geoip && dodoc "${DISTDIR}"/${GEOIP_DOC_A}
-
-	insinto /etc/bind
-	newins "${FILESDIR}"/named.conf-r6 named.conf
-
-	# ftp://ftp.rs.internic.net/domain/named.cache:
-	insinto /var/bind
-	doins "${FILESDIR}"/named.cache
-
-	insinto /var/bind/pri
-	newins "${FILESDIR}"/127.zone-r1 127.zone
-	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
-
-	newinitd "${FILESDIR}"/named.init-r12 named
-	newconfd "${FILESDIR}"/named.confd-r6 named
-
-	if use gost; then
-		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' "${D}/etc/init.d/named" || die
-	else
-		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' "${D}/etc/init.d/named" || die
-	fi
-
-	newenvd "${FILESDIR}"/10bind.env 10bind
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f "${D}"/usr/share/man/man1/{dig,host,nslookup}.1*
-	rm -f "${D}"/usr/share/man/man8/{dnssec-keygen,nsupdate}.8*
-	rm -f "${D}"/usr/bin/{dig,host,nslookup,dnssec-keygen,nsupdate}
-	rm -f "${D}"/usr/sbin/{dig,host,nslookup,dnssec-keygen,nsupdate}
-
-	# bug 405251, library archives aren't properly handled by --enable/disable-static
-	if ! use static-libs; then
-		find "${D}" -type f -name '*.la' -delete || die
-	fi
-
-	if use python; then
-		install_python_tools() {
-			python_convert_shebangs $PYTHON_ABI bin/python/dnssec-checkds bin/python/dnssec-coverage
-			exeinto /usr/sbin
-			newexe bin/python/dnssec-checkds dnssec-checkds-${PYTHON_ABI}
-			newexe bin/python/dnssec-coverage dnssec-coverage-${PYTHON_ABI}
-		}
-		python_execute_function install_python_tools
-
-		rm -f "${D}/usr/sbin/dnssec-"{checkds,coverage}
-		python_generate_wrapper_scripts "${D}usr/sbin/dnssec-checkds"
-		python_generate_wrapper_scripts "${D}usr/sbin/dnssec-coverage"
-	fi
-
-	# bug 450406
-	dosym named.cache /var/bind/root.cache
-
-	dosym /var/bind/pri /etc/bind/pri
-	dosym /var/bind/sec /etc/bind/sec
-	dosym /var/bind/dyn /etc/bind/dyn
-	keepdir /var/bind/{pri,sec,dyn}
-
-	dodir /var/{run,log}/named
-
-	fowners root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri,dyn}
-	fowners root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0750 /etc/bind /var/bind/pri
-	fperms 0770 /var/{run,log}/named /var/bind/{,sec,dyn}
-
-	systemd_dounit "${FILESDIR}/named.service"
-	systemd_dotmpfilesd "${FILESDIR}/named.conf"
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/generate-rndc-key.sh"
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if use urandom; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a
-			echo
-		fi
-		chown root:named /etc/bind/rndc.key
-		chmod 0640 /etc/bind/rndc.key
-	fi
-
-	einfo
-	einfo "You can edit /etc/conf.d/named to customize named settings"
-	einfo
-	use mysql || use postgres || use ldap && {
-		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
-		elog "uncomment the specified rc_named_* lines in your"
-		elog "/etc/conf.d/named config to ensure they'll start before bind"
-		einfo
-	}
-	einfo "If you'd like to run bind in a chroot AND this is a new"
-	einfo "install OR your bind doesn't already run in a chroot:"
-	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
-	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
-	einfo
-
-	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
-	if [[ -n ${CHROOT} ]]; then
-		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		elog "To enable the old behaviour (without using mount) uncomment the"
-		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		elog "If you decide to use the new/default method, ensure to make backup"
-		elog "first and merge your existing configs/zones to /etc/bind and"
-		elog "/var/bind because bind will now mount the needed directories into"
-		elog "the chroot dir."
-	fi
-
-	ewarn
-	ewarn "NOTE: /var/bind/named.ca has been renamed to /var/bind/named.cache"
-	ewarn "you may need to fix your named.conf!"
-	ewarn
-	ewarn "NOTE: If you upgrade from <net-dns/bind-9.4.3_p5-r1, you may encounter permission problems"
-	ewarn "To fix the permissions do:"
-	ewarn "chown root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri,dyn}"
-	ewarn "chown root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}"
-	ewarn "chmod 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}"
-	ewarn "chmod 0750 /etc/bind /var/bind/pri"
-	ewarn "chmod 0770 /var/{run,log}/named /var/bind/{,sec,dyn}"
-	ewarn
-}
-
-pkg_config() {
-	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
-	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
-	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
-
-	if [[ -z "${CHROOT}" ]]; then
-		eerror "This config script is designed to automate setting up"
-		eerror "a chrooted bind/named. To do so, please first uncomment"
-		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
-		die "Unset CHROOT"
-	fi
-	if [[ -d "${CHROOT}" ]]; then
-		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		ewarn "To enable the old behaviour (without using mount) uncomment the"
-		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		ewarn
-		ewarn "${CHROOT} already exists... some things might become overridden"
-		ewarn "press CTRL+C if you don't want to continue"
-		sleep 10
-	fi
-
-	echo; einfo "Setting up the chroot directory..."
-
-	mkdir -m 0750 -p ${CHROOT}
-	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/{run,log}}
-	mkdir -m 0750 -p ${CHROOT}/etc/bind
-	mkdir -m 0770 -p ${CHROOT}/var/{bind,{run,log}/named}
-	# As of bind 9.8.0
-	if has_version net-dns/bind[gost]; then
-		if [ "$(get_libdir)" = "lib64" ]; then
-			mkdir -m 0755 -p ${CHROOT}/usr/lib64/engines
-			ln -s lib64 ${CHROOT}/usr/lib
-		else
-			mkdir -m 0755 -p ${CHROOT}/usr/lib/engines
-		fi
-	fi
-	chown root:named ${CHROOT} ${CHROOT}/var/{bind,{run,log}/named} ${CHROOT}/etc/bind
-
-	mknod ${CHROOT}/dev/null c 1 3
-	chmod 0666 ${CHROOT}/dev/null
-
-	mknod ${CHROOT}/dev/zero c 1 5
-	chmod 0666 ${CHROOT}/dev/zero
-
-	if use urandom; then
-		mknod ${CHROOT}/dev/urandom c 1 9
-		chmod 0666 ${CHROOT}/dev/urandom
-	else
-		mknod ${CHROOT}/dev/random c 1 8
-		chmod 0666 ${CHROOT}/dev/random
-	fi
-
-	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
-		cp -a /etc/bind ${CHROOT}/etc/
-		cp -a /var/bind ${CHROOT}/var/
-	fi
-
-	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
-		mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP
-	fi
-
-	elog "You may need to add the following line to your syslog-ng.conf:"
-	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
-}
diff --git a/net-dns/bind/bind-9.9.5-r2.ebuild b/net-dns/bind/bind-9.9.5_p1.ebuild
index 156dae8e049e..219340075371 100644
--- a/net-dns/bind/bind-9.9.5-r2.ebuild
+++ b/net-dns/bind/bind-9.9.5_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.5-r2.ebuild,v 1.2 2014/07/06 12:56:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.5_p1.ebuild,v 1.1 2014/08/15 12:05:02 idl0r Exp $
 
 # Re dlz/mysql and threads, needs to be verified..
 # MySQL uses thread local storage in its C api. Thus MySQL
@@ -13,10 +13,9 @@
 
 EAPI="5"
 
-PYTHON_DEPEND="python? 2:2.7 3"
-SUPPORT_PYTHON_ABIS="1"
+PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
 
-inherit python eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
+inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
 
 MY_PV="${PV/_p/-P}"
 MY_PV="${MY_PV/_rc/rc}"
@@ -25,14 +24,14 @@ MY_P="${PN}-${MY_PV}"
 SDB_LDAP_VER="1.1.0-fc14"
 
 # bind-9.8.0-P1-geoip-1.3.patch
-GEOIP_PV=1.3
+GEOIP_PV=1.4
 #GEOIP_PV_AGAINST="${MY_PV}"
-GEOIP_PV_AGAINST="9.9.2"
+GEOIP_PV_AGAINST="9.9.5-P1"
 GEOIP_P="bind-${GEOIP_PV_AGAINST}-geoip-${GEOIP_PV}"
 GEOIP_PATCH_A="${GEOIP_P}.patch"
 GEOIP_DOC_A="bind-geoip-1.3-readme.txt"
 GEOIP_SRC_URI_BASE="http://bind-geoip.googlecode.com/"
-
+# http://web.irridia.com/patches/bind-9.9.5-P1-geoip-1.4.patch
 RRL_PV="${MY_PV}"
 
 # GeoIP: http://bind-geoip.googlecode.com/
@@ -46,7 +45,7 @@ HOMEPAGE="http://www.isc.org/software/bind"
 SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
 	doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 	geoip? ( ${GEOIP_SRC_URI_BASE}/files/${GEOIP_DOC_A}
-			 http://dev.gentoo.org/~idl0r/${P}-geoip.patch )
+			http://web.irridia.com/patches/${GEOIP_PATCH_A} )
 	sdb-ldap? (
 		http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
 	)"
@@ -95,10 +94,6 @@ pkg_setup() {
 	enewgroup named 40
 	enewuser named 40 -1 /etc/bind named
 	eend ${?}
-
-	if use python; then
-		python_pkg_setup
-	fi
 }
 
 src_prepare() {
@@ -243,14 +238,13 @@ src_install() {
 	use geoip && dodoc "${DISTDIR}"/${GEOIP_DOC_A}
 
 	insinto /etc/bind
-	newins "${FILESDIR}"/named.conf-r7 named.conf
+	newins "${FILESDIR}"/named.conf-r8 named.conf
 
 	# ftp://ftp.rs.internic.net/domain/named.cache:
 	insinto /var/bind
 	doins "${FILESDIR}"/named.cache
 
 	insinto /var/bind/pri
-	newins "${FILESDIR}"/127.zone-r1 127.zone
 	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
 
 	newinitd "${FILESDIR}"/named.init-r13 named
@@ -280,16 +274,12 @@ src_install() {
 
 	if use python; then
 		install_python_tools() {
-			python_convert_shebangs $PYTHON_ABI bin/python/dnssec-checkds bin/python/dnssec-coverage
-			exeinto /usr/sbin
-			newexe bin/python/dnssec-checkds dnssec-checkds-${PYTHON_ABI}
-			newexe bin/python/dnssec-coverage dnssec-coverage-${PYTHON_ABI}
+			dosbin bin/python/dnssec-{checkds,coverage}
 		}
-		python_execute_function install_python_tools
+		python_foreach_impl install_python_tools
 
-		rm -f "${D}/usr/sbin/dnssec-"{checkds,coverage}
-		python_generate_wrapper_scripts "${D}usr/sbin/dnssec-checkds"
-		python_generate_wrapper_scripts "${D}usr/sbin/dnssec-coverage"
+		python_replicate_script "${D}usr/sbin/dnssec-checkds"
+		python_replicate_script "${D}usr/sbin/dnssec-coverage"
 	fi
 
 	# bug 450406
@@ -303,13 +293,12 @@ src_install() {
 	dodir /var/log/named
 
 	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
-	fowners root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}
+	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
 	fperms 0750 /etc/bind /var/bind/pri
 	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
 
-	systemd_dounit "${FILESDIR}/named.service"
-	systemd_dotmpfilesd "${FILESDIR}/named.conf"
+	systemd_newunit "${FILESDIR}/named.service-r1" named.service
 	exeinto /usr/libexec
 	doexe "${FILESDIR}/generate-rndc-key.sh"
 }
@@ -354,19 +343,6 @@ pkg_postinst() {
 		elog "/var/bind because bind will now mount the needed directories into"
 		elog "the chroot dir."
 	fi
-
-	ewarn
-	ewarn "NOTE: /var/bind/named.ca has been renamed to /var/bind/named.cache"
-	ewarn "you may need to fix your named.conf!"
-	ewarn
-	ewarn "NOTE: If you upgrade from <net-dns/bind-9.4.3_p5-r1, you may encounter permission problems"
-	ewarn "To fix the permissions do:"
-	ewarn "chown root:named /{etc,var}/bind /run/named/ /var/log/named /var/bind/{sec,pri,dyn}"
-	ewarn "chown root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}"
-	ewarn "chmod 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}"
-	ewarn "chmod 0750 /etc/bind /var/bind/pri"
-	ewarn "chmod 0770 /run/named/ /var/log/named /var/bind/{,sec,dyn}"
-	ewarn
 }
 
 pkg_config() {
diff --git a/net-dns/bind/files/named.conf b/net-dns/bind/files/named.conf
deleted file mode 100644
index 8f896f6b8aa4..000000000000
--- a/net-dns/bind/files/named.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/named 0755 named root -
diff --git a/net-dns/bind/files/named.conf-r6 b/net-dns/bind/files/named.conf-r8
index b24c2e4c5a40..7018c21b0fdd 100644
--- a/net-dns/bind/files/named.conf-r6
+++ b/net-dns/bind/files/named.conf-r8
@@ -1,8 +1,8 @@
 /*
  * Refer to the named.conf(5) and named(8) man pages, and the documentation
- * in /usr/share/doc/bind-9 for more details.
+ * in /usr/share/doc/bind-*/ for more details.
  * Online versions of the documentation can be found here:
- * http://www.isc.org/software/bind/documentation
+ * https://kb.isc.org/article/AA-01031
  *
  * If you are going to set up an authoritative server, make sure you
  * understand the hairy details of how DNS works. Even with simple mistakes,
@@ -28,7 +28,7 @@ acl "trusted" {
 
 options {
 	directory "/var/bind";
-	pid-file "/var/run/named/named.pid";
+	pid-file "/run/named/named.pid";
 
 	/* https://www.isc.org/solutions/dlv >=bind-9.7.x only */
 	//bindkeys-file "/etc/bind/bind.keys";
@@ -87,7 +87,7 @@ options {
 
 */
 
-	//dnssec-enable yes;
+	dnssec-enable yes;
 	//dnssec-validation yes;
 
 	/*
@@ -95,7 +95,7 @@ options {
 	 * "If the root key provided has expired,
 	 * named will log the expiration and validation will not work."
 	 */
-	//dnssec-validation auto;
+	dnssec-validation auto;
 
 	/* if you have problems and are behind a firewall: */
 	//query-source address * port 53;
@@ -131,12 +131,6 @@ zone "localhost" IN {
 	notify no;
 };
 
-zone "127.in-addr.arpa" IN {
-	type master;
-	file "pri/127.zone";
-	notify no;
-};
-
 /*
  * Briefly, a zone which has been declared delegation-only will be effectively
  * limited to containing NS RRs for subdomains, but no actual data beyond its
diff --git a/net-dns/bind/files/named.confd-r6 b/net-dns/bind/files/named.confd-r6
deleted file mode 100644
index 0450d5b66c23..000000000000
--- a/net-dns/bind/files/named.confd-r6
+++ /dev/null
@@ -1,48 +0,0 @@
-# Set various named options here.
-#
-#OPTIONS=""
-
-# Set this to the number of processors you want bind to use.
-# Leave this unchanged if you want bind to automatically detect the number
-#CPU="1"
-
-# If you wish to run bind in a chroot:
-# 1) un-comment the CHROOT= assignment, below. You may use
-#    a different chroot directory but MAKE SURE it's empty.
-# 2) run: emerge --config =<bind-version>
-#
-#CHROOT="/chroot/dns"
-
-# Uncomment to enable binmount of /usr/share/GeoIP
-#CHROOT_GEOIP="1"
-
-# Uncomment the line below to avoid that the init script mounts the needed paths
-# into the chroot directory.
-# You have to copy all needed config files by hand if you say CHROOT_NOMOUNT="1".
-#CHROOT_NOMOUNT="1"
-
-# Uncomment this option if you have setup your own chroot environment and you
-# don't want/need the chroot consistency check
-#CHROOT_NOCHECK=1
-
-# Default pid file location
-PIDFILE="${CHROOT}/var/run/named/named.pid"
-
-# Scheduling priority: 19 is the lowest and -20 is the highest.
-# Default: 0
-#NAMED_NICELEVEL="0"
-
-# Uncomment rc_named_use/rc_named_after for the database you need.
-# Its necessary to ensure the database backend will be started before named.
-
-# MySQL
-#rc_named_use="mysql"
-#rc_named_after="mysql"
-
-# PostgreSQL
-#rc_named_use="pg_autovacuum postgresql"
-#rc_named_after="pg_autovacuum postgresql"
-
-# LDAP
-#rc_named_use="ldap"
-#rc_named_after="ldap"
diff --git a/net-dns/bind/files/named.init-r12 b/net-dns/bind/files/named.init-r12
deleted file mode 100644
index ee209d6369f4..000000000000
--- a/net-dns/bind/files/named.init-r12
+++ /dev/null
@@ -1,248 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r12,v 1.1 2012/08/24 19:01:09 idl0r Exp $
-
-extra_commands="checkconfig checkzones"
-extra_started_commands="reload"
-
-depend() {
-	need net
-	use logger
-	provide dns
-}
-
-NAMED_CONF=${CHROOT}/etc/bind/named.conf
-
-OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}
-MOUNT_CHECK_TIMEOUT=${MOUNT_CHECK_TIMEOUT:-60}
-
-_mount() {
-	local from
-	local to
-	local opts
-	local ret=0
-
-	if [ "${#}" -lt 3 ]; then
-		eerror "_mount(): to few arguments"
-		return 1
-	fi
-
-	from=$1
-	to=$2
-	shift 2
-
-	opts="${*}"
-	shift $#
-
-	if [ -z "$(awk "\$2 == \"${to}\" { print \$2 }" /proc/mounts)" ]; then
-		einfo "mounting ${from} to ${to}"
-		mount ${from} ${to} ${opts}
-		ret=$?
-
-		eend $ret
-		return $ret
-	fi
-
-	return 0
-}
-
-_umount() {
-	local dir=$1
-	local ret=0
-
-	if [ -n "$(awk "\$2 == \"${dir}\" { print \$2 }" /proc/mounts)" ]; then
-		ebegin "umounting ${dir}"
-		umount ${dir}
-		ret=$?
-
-		eend $ret
-		return $ret
-	fi
-
-	return 0
-}
-
-_get_pidfile() {
-	# as suggested in bug #107724, bug 335398#c17
-	[ -n "${PIDFILE}" ] || PIDFILE=${CHROOT}$(\
-			/usr/sbin/named-checkconf -p ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} | grep 'pid-file' | cut -d\" -f2)
-	[ -z "${PIDFILE}" ] && PIDFILE=${CHROOT}/var/run/named/named.pid
-}
-
-check_chroot() {
-	if [ -n "${CHROOT}" ]; then
-		[ ! -d "${CHROOT}" ] && return 1
-		[ ! -d "${CHROOT}/dev" ] || [ ! -d "${CHROOT}/etc" ] || [ ! -d "${CHROOT}/var" ] && return 1
-		[ ! -d "${CHROOT}/var/run" ] || [ ! -d "${CHROOT}/var/log" ] && return 1
-		[ ! -d "${CHROOT}/etc/bind" ] || [ ! -d "${CHROOT}/var/bind" ] && return 1
-		[ ! -d "${CHROOT}/var/log/named" ] && return 1
-		[ ! -c "${CHROOT}/dev/null" ] || [ ! -c "${CHROOT}/dev/zero" ] && return 1
-		[ ! -c "${CHROOT}/dev/random" ] && [ ! -c "${CHROOT}/dev/urandom" ] && return 1
-		[ "${CHROOT_GEOIP:-0}" -eq 1 ] && [ ! -d "${CHROOT}/usr/share/GeoIP" ] && return 1
-		if [ ${OPENSSL_LIBGOST:-0} -eq 1 ]; then
-			if [ -d "/usr/lib64" ]; then
-				[ ! -d "${CHROOT}/usr/lib64/engines" ] && return 1
-			elif [ -d "/usr/lib" ]; then
-				[ ! -d "${CHROOT}/usr/lib/engines" ] && return 1
-			fi
-		fi
-	fi
-
-	return 0
-}
-
-checkconfig() {
-	ebegin "Checking named configuration"
-
-	if [ ! -f "${NAMED_CONF}" ] ; then
-		eerror "No ${NAMED_CONF} file exists!"
-		return 1
-	fi
-
-	/usr/sbin/named-checkconf ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} || {
-		eerror "named-checkconf failed! Please fix your config first."
-		return 1
-	}
-
-	eend 0
-	return 0
-}
-
-checkzones() {
-	ebegin "Checking named configuration and zones"
-	/usr/sbin/named-checkconf -z -j ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}}
-	eend $?
-}
-
-start() {
-	local piddir
-
-	ebegin "Starting ${CHROOT:+chrooted }named"
-
-	if [ -n "${CHROOT}" ]; then
-		if [ ${CHROOT_NOCHECK:-0} -eq 0 ]; then
-			check_chroot || {
-				eend 1
-				eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first"
-				return 1
-			}
-		fi
-
-		if [ ${OPENSSL_LIBGOST:-0} -eq 1 ]; then
-			if [ ! -e /usr/lib/engines/libgost.so ]; then
-				eend 1
-				eerror "Couldn't find /usr/lib/engines/libgost.so but bind has been built with openssl and libgost support"
-				return 1
-			fi
-			cp -Lp /usr/lib/engines/libgost.so "${CHROOT}/usr/lib/engines/libgost.so" || {
-				eend 1
-				eerror "Couldn't copy /usr/lib/engines/libgost.so into '${CHROOT}/usr/lib/engines/'"
-				return 1
-			}
-		fi
-		cp -Lp /etc/localtime "${CHROOT}/etc/localtime"
-
-		if [ "${CHROOT_NOMOUNT:-0}" -eq 0 ]; then
-			einfo "Mounting chroot dirs"
-			_mount /etc/bind ${CHROOT}/etc/bind -o bind
-			_mount /var/bind ${CHROOT}/var/bind -o bind
-			_mount /var/log/named ${CHROOT}/var/log/named -o bind
-			if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
-				_mount /usr/share/GeoIP ${CHROOT}/usr/share/GeoIP -o bind
-			fi
-		fi
-	fi
-
-	checkconfig || { eend 1; return 1; }
-
-	# create piddir (usually /var/run/named) if necessary, bug 334535
-	_get_pidfile
-	piddir="${PIDFILE%/*}"
-	checkpath -q -d -o root:named -m 0770 "${piddir}" || {
-		eend 1
-		return 1
-	}
-
-	# In case someone have $CPU set in /etc/conf.d/named
-	if [ -n "${CPU}" ] && [ "${CPU}" -gt 0 ]; then
-		CPU="-n ${CPU}"
-	fi
-
-	start-stop-daemon --start --pidfile ${PIDFILE} \
-		--nicelevel ${NAMED_NICELEVEL:-0} \
-		--exec /usr/sbin/named \
-		-- -u named ${CPU} ${OPTIONS} ${CHROOT:+-t} ${CHROOT}
-	eend $?
-}
-
-stop() {
-	local reported=0
-
-	ebegin "Stopping ${CHROOT:+chrooted }named"
-
-	# Workaround for now, until openrc's restart has been fixed.
-	# openrc doesn't care about a restart() function in init scripts.
-	if [ "${RC_CMD}" = "restart" ]; then
-		if [ -n "${CHROOT}" -a ${CHROOT_NOCHECK:-0} -eq 0 ]; then
-			check_chroot || {
-				eend 1
-				eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first"
-				return 1
-			}
-		fi
-
-		checkconfig || { eend 1; return 1; }
-	fi
-
-	# -R 10, bug 335398
-	_get_pidfile
-	start-stop-daemon --stop --retry 10 --pidfile $PIDFILE \
-		--exec /usr/sbin/named
-
-	if [ -n "${CHROOT}" ] && [ "${CHROOT_NOMOUNT:-0}" -eq 0 ]; then
-		ebegin "Umounting chroot dirs"
-
-		# just to be sure everything gets clean
-		while fuser -s ${CHROOT} 2>/dev/null; do
-			if [ "${reported}" -eq 0 ]; then
-				einfo "Waiting until all named processes are stopped (max. ${MOUNT_CHECK_TIMEOUT} seconds)"
-			elif [ "${reported}" -eq "${MOUNT_CHECK_TIMEOUT}" ]; then
-				eerror "Waiting until all named processes are stopped failed!"
-				eend 1
-				break
-			fi
-			sleep 1
-			reported=$((reported+1))
-		done
-
-		[ "${CHROOT_GEOIP:-0}" -eq 1 ] && _umount ${CHROOT}/usr/share/GeoIP
-		_umount ${CHROOT}/etc/bind
-		_umount ${CHROOT}/var/log/named
-		_umount ${CHROOT}/var/bind
-	fi
-
-	eend $?
-}
-
-reload() {
-	local ret
-
-	ebegin "Reloading named.conf and zone files"
-
-	checkconfig || { eend 1; return 1; }
-
-	_get_pidfile
-	if [ -n "${PIDFILE}" ]; then
-		start-stop-daemon --pidfile $PIDFILE --signal HUP
-		ret=$?
-	else
-		ewarn "Unable to determine the pidfile... this is"
-		ewarn "a fallback mode. Please check your installation!"
-
-		$RC_SERVICE restart
-		ret=$?
-	fi
-
-	eend $ret
-}
diff --git a/net-dns/bind/files/named.service b/net-dns/bind/files/named.service
deleted file mode 100644
index 5caecd28c44a..000000000000
--- a/net-dns/bind/files/named.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=Berkeley Internet Name Domain (DNS)
-After=network.target
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/named
-PIDFile=/var/run/named/named.pid
-
-ExecStartPre=/usr/libexec/generate-rndc-key.sh
-ExecStartPre=/usr/sbin/named-checkconf -z /etc/bind/named.conf
-ExecStart=/usr/sbin/named -u named $OPTIONS
-
-ExecReload=/bin/sh -c '/usr/sbin/rndc reload > /dev/null 2>&1 || /bin/kill -HUP $MAINPID'
-ExecStop=/bin/sh -c '/usr/sbin/rndc stop > /dev/null 2>&1 || /bin/kill -TERM $MAINPID'
-
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-dns/bind/metadata.xml b/net-dns/bind/metadata.xml
index 150a951b3167..192fcec2f8f0 100644
--- a/net-dns/bind/metadata.xml
+++ b/net-dns/bind/metadata.xml
@@ -12,6 +12,7 @@
 		<flag name="fixed-rrset">Enables fixed rrset-order option</flag>
 		<flag name="gost">Enables gost OpenSSL engine support</flag>
 		<flag name="gssapi">Enable gssapi support</flag>
+		<flag name="nslint">Build and install the nslint util</flag>
 		<flag name="rpz">Enable response policy rewriting (rpz)</flag>
 		<flag name="rrl">Response Rate Limiting (RRL) - Experimental</flag>
 		<flag name="sdb-ldap">Enables ldap-sdb backend</flag>