gentoo resync : 10.11.2019

25 files changed, 215 insertions, 467 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 131d748fa9c8..25db69f54d06 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index aa1fc7129ed4..1ba4cc8e3508 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,12 +1,8 @@
 AUX autoipd-openrc.sh 700 BLAKE2B e71e5583db890f8ee1bbe9c03fc42285871089b2ea2d4549d553f14a20a3aa97c519b298bfaaccf02346c911f65f8e3f8bab7b2dc8270a5d35c471cc6bf31f6b SHA512 a5dbbac4d6d1959db3a07a63acb7569dbeba33d2274a1dd3253dc27687549371611cf08bad3998d89efb3ace63b5541a4d225e484274450e0c82661f5a1dbc32
 AUX autoipd.sh 1271 BLAKE2B 815c5776afff71489826eb8338535df1af6fbf02f3d42eedb6ebb69e5fff181e7252060818dd2dd67141a40c097ded8b7ac4210cb9929bab4b68ea99533bcf26 SHA512 0bff9ca7e32212aef0246db5baf10ee4f7e93a987b7c591b21ed9f116a1c662a84be9d784fc919205c1fecb5cd8421b81a0eb590c3cc066c6b1b9265b98f1ea3
-AUX avahi-0.6.30-optional-gtk-utils.patch 2422 BLAKE2B 2fb0362fdf6cf150ec92d9912981f59267c3da2b752e75a62409e75b09ce1a63fa6d24c99c0ffad1acec959d47250615b7eb406c34af49c144cfbddd8d87d4d8 SHA512 3ea7f7cd0074286bbe474f783ea9638abef7f68d9466d4f5d4d3a0bc6624a43e48bb293f02f2dd08413d5dcf3f99161e0f45537c5f922b1a326375d40b574596
-AUX avahi-0.6.31-fix-install-avahi-discover.patch 715 BLAKE2B 49cf6f68f0b98685f3f95ae54fbe064850723f5b64e1ca72eb79ac94198481f59f1ba7f226df4914c8efd8fb1bd31327d5177a049a3fa1e4b98d850fef0ccfb4 SHA512 0cdcf41bbd25caea84a62054c4081dfdba1d421cef56babebe33f480a8ba9af1362c7b698803c17132ee78716439ec70cd5d71f7c85b5d49ba9bda471466cb79
-AUX avahi-0.6.31-fix-locale-build.patch 866 BLAKE2B 7c33b13670331ed1d89a88653790f1a15944d766a8edc2b3a674b39fc66ba2efe63dacf57a79fa2ba30915a8e33e01f30d1881d110e04ff12c310fa5ec11c3d2 SHA512 c970cd5d199024699e3345d59fb03d0966b62c859e9dd2107a1adef4cb7433a2ebcf2cd6331f4726d84a3ec973b45d7e93824fb80a8c8dcf3fcf6a610a67b337
+AUX avahi-0.7-CVE-2017-6519.patch 1578 BLAKE2B 87fce922927e1217802ce0f7b2a1a6f22649903a495817e224a37e7fc5c76d0d2a6cfbb50a1373a950a75a45a68bfbcba9f2155ed24940e3ffb994b862c00e4c SHA512 6c30c0d095f42b9bd289a1ac7b42287cd109bf0bad480d13eec70bedb65e7e1ab495600703f39f1caf73c3c0617c72940c33462586d68deb0a416d7c93964997
 AUX avahi-0.7-qt5.patch 6033 BLAKE2B 10c7879f6e28942a32497c84dcf523f742cb13112d9e9c23f74967c2d6c05e6f463406716c144edc1bd4588c8c76693473765d9d678f6517c4a57615d0364b91 SHA512 cd8b900a5a068add3b7aa9080491938d469795c26e1a1869ee581b95d877ded4d120cb4db768fb4d97535a72e66c3fabf6617cdca2c9bdb50ff54e24d17b1f51
-DIST avahi-0.6.32.tar.gz 934004 BLAKE2B 76bbff65075bbc49d52b1e406373c4856622c22364cb5f1a4ccc0bf04a6dc7d54c58753a8cce6622e4fc62dc22086659ffbd157aeb1a6a30de353d08fd08a307 SHA512 e6dc788cc8691288ef001007006719b5eb022d484ee6fc84e68a7d227af5993e4d09484b824998155e5b25fc0ffc014beb8961d312982f63b82b10a6e2edee18
 DIST avahi-0.7.tar.gz 940047 BLAKE2B 8299577bf27ee65fad5d743dbf94202b148a6fc86825cae303f94c44482eea07cf6570d970ca286e81a787d6a64598b7123f2ac17a259ddc50ef431b9c94b530 SHA512 61f656da7614d8cca1862180038f571db3474c84f05db4d3509f614cdbf8b1a1047661b7e24d63682d5b48ed1bfa1b08b3c9e6dbe9222bcd62d99bc168a11abe
-EBUILD avahi-0.6.32.ebuild 5485 BLAKE2B a16979e77772ecf824dd03db48ae39d9c3ad8bba89211cc7c15ed3bec0cb57db0a793b14f3e0d55ff5afb52312fda6b8e5ca77ea17c1830f3be8a21d1cd9e6f6 SHA512 2290435448ddadfd4bc4b48b40e6cd2bce036e0022c20f717d5d782f7622627ff6116cc2057642a8a0291f17afb207182a0fd3ce1ec1c68313f9342350e51c41
-EBUILD avahi-0.7-r1.ebuild 5131 BLAKE2B 39d8cb31c3d9dc4acbeae11177cc0cbf565a51ccb3aa73751bbde3c3c27c9eea2367e184e251659ddbde730f2b6562df3434eda7c318878511e777a004beb054 SHA512 c0190cb01763d64eb386c5fba16c24d42517e2d675655ab1fbc0d55306572f8ad1b0bd9a2c050c21df5f12f248436feb91d7ce4f1b1ab2dcc28051fd36fcef09
-EBUILD avahi-0.7-r2.ebuild 5111 BLAKE2B b2f674e4fc9f52ede41129ad6719b54dffff06bdd5ec235e6a564345210dbbafcf9b8f024fe759233f972634e70a0305d952eddc2d834a281efd58e41b20a141 SHA512 56d6ab16e3d4f3e6093050dbbc9bc64ee9b69f88f3d0d407afa48abc5481b51aadc5aac2556ff2ca1f826b8ab4168d055f0583affeb289b1b839d9601c992cbe
-MISC metadata.xml 1025 BLAKE2B 6a13958a5fafd973058008477fe96575956dde8888c555eb5dfc9382536a637b1f659494a164f7973dadf8a37420cc1b586f63ab2e418b9aea8bd44aa90c0250 SHA512 2f22fbed84d4e1b1f85523f3a2a4b43678ae76b9300e0c43dea561532f392c4370fff25ebfc04537423736e7059f0f606c25ade7e37410449ba9f0c8216c27a3
+EBUILD avahi-0.7-r2.ebuild 5232 BLAKE2B b1d036c72b38470a1fd9c5a20de2331873580cabb37248edaca9198612168279ee4de7f58e7a5cf1e8938e3e248440ec0fbb4974c7d0aa7cb87b1b38b8656f5a SHA512 de200179af1dcc62296982620e8e4c8bebb220f68c10d57feb9aca3243bc44f5a67d6fe041d036b616f8e0f84b6a54228e24297e6242d8f585946a76f968ab9b
+EBUILD avahi-0.7-r3.ebuild 5267 BLAKE2B 556ac806f4e8e9550eb6b0a3a2f54a515f22bec4f0a7be0fc0f753892c4b45911bdffaff19a1a475de259944b3ea6896c22fc9ffb2693e6316633d67b64593c0 SHA512 4d1b7cab60dca6b69dae4918c20dcaabb6c429fde560b762f1ef2f22b1364446f58a1383f1aef9ca4e7137d0840ea27f8cf1d492bbd1053f407c7c631ef30488
+MISC metadata.xml 935 BLAKE2B 890b4a3ab97241ba254dcf68b97a6a8b2ae4af914dc2348b8eb9d6c3182c1d2dfbd5eca8dac009e30f4662b88001c159ac5479a100bfc48a956ac2d603b6343e SHA512 7d2114e25574532405b5ff6db66b833aef68772d5b699d8885e9f1005a1785298e5b71288a858572a1270c6a4d9d2ad98aac7f79f4df6713dea79778280c82d8
diff --git a/net-dns/avahi/avahi-0.6.32.ebuild b/net-dns/avahi/avahi-0.6.32.ebuild
deleted file mode 100644
index a6428d5d20d8..000000000000
--- a/net-dns/avahi/avahi-0.6.32.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="gdbm"
-
-WANT_AUTOMAKE=1.11
-
-inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env python-r1 systemd user
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/"
-SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${P}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="hppa"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python selinux test utils"
-
-REQUIRED_USE="
-	utils? ( || ( gtk gtk3 ) )
-	python? ( dbus gdbm ${PYTHON_REQUIRED_USE} )
-	mono? ( dbus )
-	howl-compat? ( dbus )
-	mdnsresponder-compat? ( dbus )
-"
-
-COMMON_DEPEND="
-	dev-libs/libdaemon
-	dev-libs/expat
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	gdbm? ( sys-libs/gdbm:=[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
-	gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	kernel_linux? ( sys-libs/libcap )
-	introspection? ( dev-libs/gobject-introspection:= )
-	mono? (
-		dev-lang/mono
-		gtk? ( dev-dotnet/gtk-sharp )
-	)
-	python? (
-		${PYTHON_DEPS}
-		gtk? ( dev-python/pygtk )
-		dbus? ( dev-python/dbus-python )
-	)
-	bookmarks? (
-		dev-python/twisted-core
-		dev-python/twisted-web
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	app-doc/xmltoman
-	dev-util/intltool
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )
-	selinux? ( sec-policy/selinux-avahi )
-"
-
-pkg_preinst() {
-	enewgroup netdev
-	enewgroup avahi
-	enewuser avahi -1 -1 -1 avahi
-
-	if use autoipd; then
-		enewgroup avahi-autoipd
-		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
-	fi
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-}
-
-src_prepare() {
-	if ! use ipv6; then
-		sed -i \
-			-e s/use-ipv6=yes/use-ipv6=no/ \
-			avahi-daemon/avahi-daemon.conf || die
-	fi
-
-	sed -i\
-		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
-		doxygen_to_devhelp.xsl || die
-
-	# Make gtk utils optional
-	# https://github.com/lathiat/avahi/issues/24
-	epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
-
-	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
-	# https://github.com/lathiat/avahi/issues/24
-	epatch "${FILESDIR}"/${PN}-0.6.31-fix-install-avahi-discover.patch
-
-	# Fix build under various locales, bug #501664
-	# https://github.com/lathiat/avahi/issues/27
-	epatch "${FILESDIR}"/${PN}-0.6.31-fix-locale-build.patch
-
-	# Bug #525832
-	epatch_user
-
-	# Prevent .pyc files in DESTDIR
-	>py-compile
-
-	eautoreconf
-
-	# bundled manpages
-	multilib_copy_sources
-}
-
-src_configure() {
-	# those steps should be done once-per-ebuild rather than per-ABI
-	use sh && replace-flags -O? -O0
-	use python && python_export_best
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=( --disable-static )
-
-	if use python; then
-		myconf+=(
-			$(multilib_native_use_enable dbus python-dbus)
-			$(multilib_native_use_enable gtk pygtk)
-		)
-	fi
-
-	if use mono; then
-		myconf+=( $(multilib_native_use_enable doc monodoc) )
-	fi
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# used by daemons only
-			--disable-libdaemon
-			--with-xml=none
-		)
-	fi
-
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--enable-manpages \
-		--enable-xmltoman \
-		--disable-monodoc \
-		--enable-glib \
-		--enable-gobject \
-		$(multilib_native_use_enable test tests) \
-		$(multilib_native_use_enable autoipd) \
-		$(use_enable mdnsresponder-compat compat-libdns_sd) \
-		$(use_enable howl-compat compat-howl) \
-		$(multilib_native_use_enable doc doxygen-doc) \
-		$(multilib_native_use_enable mono) \
-		$(use_enable dbus) \
-		$(multilib_native_use_enable python) \
-		$(use_enable gtk) \
-		$(use_enable gtk3) \
-		$(use_enable nls) \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_enable utils gtk-utils) \
-		--disable-qt3 \
-		--disable-qt4 \
-		$(use_enable gdbm) \
-		$(systemd_with_unitdir) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	multilib_is_native_abi && use doc && emake avahi.devhelp
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-	use bookmarks && use python && use dbus && use gtk || \
-		rm -f "${ED}"/usr/bin/avahi-bookmarks
-
-	# https://github.com/lathiat/avahi/issues/28
-	use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h
-
-	if multilib_is_native_abi && use doc; then
-		dohtml -r doxygen/html/. || die
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp || die
-	fi
-}
-
-multilib_src_install_all() {
-	if use autoipd; then
-		insinto /$(get_libdir)/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh
-
-		insinto /$(get_libdir)/netifrc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO}
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use autoipd; then
-		elog
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-		elog
-	fi
-}
diff --git a/net-dns/avahi/avahi-0.7-r2.ebuild b/net-dns/avahi/avahi-0.7-r2.ebuild
index aec964a46ca5..1161dd0f6055 100644
--- a/net-dns/avahi/avahi-0.7-r2.ebuild
+++ b/net-dns/avahi/avahi-0.7-r2.ebuild
@@ -6,16 +6,12 @@ EAPI="6"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="gdbm"
 
-WANT_AUTOMAKE=1.11
-
 inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env python-r1 systemd user
 
 DESCRIPTION="System which facilitates service discovery on a local network"
 HOMEPAGE="http://avahi.org/"
 SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-S="${WORKDIR}/${P}"
-
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
@@ -41,7 +37,7 @@ COMMON_DEPEND="
 	introspection? ( dev-libs/gobject-introspection:= )
 	mono? (
 		dev-lang/mono
-		gtk? ( dev-dotnet/gtk-sharp )
+		gtk? ( dev-dotnet/gtk-sharp:2 )
 	)
 	python? (
 		${PYTHON_DEPS}
@@ -56,6 +52,7 @@ COMMON_DEPEND="
 
 DEPEND="
 	${COMMON_DEPEND}
+	dev-util/glib-utils
 	doc? ( app-doc/doxygen )
 	app-doc/xmltoman
 	dev-util/intltool
@@ -71,7 +68,10 @@ RDEPEND="
 
 MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h )
 
-PATCHES=( "${FILESDIR}/${P}-qt5.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-qt5.patch"
+	"${FILESDIR}/${P}-CVE-2017-6519.patch"
+)
 
 pkg_preinst() {
 	enewgroup netdev
@@ -191,6 +191,9 @@ multilib_src_install() {
 		insinto /usr/share/devhelp/books/avahi
 		doins avahi.devhelp || die
 	fi
+
+	# The build system creates an empty "/run" directory, so we clean it up here
+	rmdir "${ED}"/run
 }
 
 multilib_src_install_all() {
diff --git a/net-dns/avahi/avahi-0.7-r1.ebuild b/net-dns/avahi/avahi-0.7-r3.ebuild
index 9c34a955fcdc..b92db92a4742 100644
--- a/net-dns/avahi/avahi-0.7-r1.ebuild
+++ b/net-dns/avahi/avahi-0.7-r3.ebuild
@@ -1,31 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="gdbm"
 
-WANT_AUTOMAKE=1.11
-
 inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env python-r1 systemd user
 
 DESCRIPTION="System which facilitates service discovery on a local network"
 HOMEPAGE="http://avahi.org/"
 SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-S="${WORKDIR}/${P}"
-
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux systemd test"
 
 REQUIRED_USE="
 	python? ( dbus gdbm ${PYTHON_REQUIRED_USE} )
 	mono? ( dbus )
 	howl-compat? ( dbus )
 	mdnsresponder-compat? ( dbus )
+	systemd? ( dbus )
 "
 
 COMMON_DEPEND="
@@ -41,7 +38,7 @@ COMMON_DEPEND="
 	introspection? ( dev-libs/gobject-introspection:= )
 	mono? (
 		dev-lang/mono
-		gtk? ( dev-dotnet/gtk-sharp )
+		gtk? ( dev-dotnet/gtk-sharp:2 )
 	)
 	python? (
 		${PYTHON_DEPS}
@@ -56,6 +53,7 @@ COMMON_DEPEND="
 
 DEPEND="
 	${COMMON_DEPEND}
+	dev-util/glib-utils
 	doc? ( app-doc/doxygen )
 	app-doc/xmltoman
 	dev-util/intltool
@@ -71,7 +69,10 @@ RDEPEND="
 
 MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h )
 
-PATCHES=( "${FILESDIR}/${P}-qt5.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-qt5.patch"
+	"${FILESDIR}/${P}-CVE-2017-6519.patch"
+)
 
 pkg_preinst() {
 	enewgroup netdev
@@ -191,14 +192,17 @@ multilib_src_install() {
 		insinto /usr/share/devhelp/books/avahi
 		doins avahi.devhelp || die
 	fi
+
+	# The build system creates an empty "/run" directory, so we clean it up here
+	rmdir "${ED}"/run
 }
 
 multilib_src_install_all() {
 	if use autoipd; then
-		insinto /$(get_libdir)/rcscripts/net
+		insinto /lib/rcscripts/net
 		doins "${FILESDIR}"/autoipd.sh
 
-		insinto /$(get_libdir)/netifrc/net
+		insinto /lib/netifrc/net
 		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
 	fi
 
diff --git a/net-dns/avahi/files/avahi-0.6.30-optional-gtk-utils.patch b/net-dns/avahi/files/avahi-0.6.30-optional-gtk-utils.patch
deleted file mode 100644
index 2c615a2b3a0a..000000000000
--- a/net-dns/avahi/files/avahi-0.6.30-optional-gtk-utils.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- avahi-discover-standalone/Makefile.am
-+++ avahi-discover-standalone/Makefile.am
-@@ -23,7 +23,7 @@
- # This cool debug trap works on i386/gcc only
- AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
- 
--if HAVE_GTK2OR3
-+if ENABLE_GTK_UTILS
- if HAVE_GLIB
- bin_PROGRAMS = \
- 	avahi-discover-standalone
---- avahi-ui/Makefile.am
-+++ avahi-ui/Makefile.am
-@@ -76,6 +76,7 @@
- libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
- endif
- 
-+if ENABLE_GTK_UTILS
- bin_PROGRAMS = bssh
- desktop_DATA += bssh.desktop bvnc.desktop
- @INTLTOOL_DESKTOP_RULE@
-@@ -102,6 +103,7 @@
- bvnc.desktop.in: bvnc.desktop.in.in
- 	$(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@
- 
-+endif # ENABLE_GTK_UTILS
- endif # HAVE_GLIB
- endif
- endif
---- configure.ac
-+++ configure.ac
-@@ -564,7 +564,29 @@
- fi
- AM_CONDITIONAL(HAVE_GTK3, test "x$HAVE_GTK3" = "xyes")
- 
--AM_CONDITIONAL(HAVE_GTK2OR3, test "x$HAVE_GTK3" = "xyes" -o "x$HAVE_GTK" = "xyes" )
-+#
-+# Check for GTK+ Utils
-+#
-+AC_ARG_ENABLE(gtk-utils,
-+        AS_HELP_STRING([--disable-gtk-utils],[Disable GTK+ utilities]),
-+        [case "${enableval}" in
-+                yes) WANT_GTK_UTILS=yes ;;
-+                no)  WANT_GTK_UTILS=no ;;
-+                *) AC_MSG_ERROR(bad value ${enableval} for --enable-gtk-utils) ;;
-+        esac],
-+        [WANT_GTK_UTILS=yes])
-+
-+ENABLE_GTK_UTILS=no
-+HAVE_GTK2OR3=no
-+if test "x$HAVE_GTK3" = "xyes" -o "x$HAVE_GTK" = "xyes"; then
-+	HAVE_GTK2OR3=yes
-+	if test "x$WANT_GTK_UTILS" = "xyes"; then
-+		ENABLE_GTK_UTILS=yes
-+	fi
-+fi
-+
-+AM_CONDITIONAL(HAVE_GTK2OR3, test "x$HAVE_GTK2OR3" = "xyes")
-+AM_CONDITIONAL(ENABLE_GTK_UTILS, test "x$ENABLE_GTK_UTILS" = "xyes")
- 
- #
- # D-Bus
-@@ -1199,11 +1221,6 @@
-    ENABLE_AUTOIPD="no   (You need libdaemon!)"
- fi
- 
--HAVE_GTK2OR3=no
--if test "x$HAVE_GTK" = "xyes" -o "x$HAVE_GTK3" = "xyes" ; then
--   HAVE_GTK2OR3=yes
--fi
--
- BUILD_UI="no"
- if test "x$HAVE_GTK2OR3" = "xyes" -a "x$BUILD_CLIENT" = "xyes" ; then
-    BUILD_UI="yes"
-@@ -1223,7 +1240,7 @@
-     Building avahi-python:              ${BUILD_PYTHON}
-     Building libavahi-glib:             ${HAVE_GLIB}
-     Building libavahi-gobject:          ${BUILD_GOBJECT}
--    Building avahi-discover-standalone: ${HAVE_GTK2OR3}
-+    Building avahi-discover-standalone: ${ENABLE_GTK_UTILS}
-     Building libavahi-qt3:              ${HAVE_QT3}
-     Building libavahi-qt4:              ${HAVE_QT4}
-     Building avahi-sharp:               ${HAVE_MONO}
diff --git a/net-dns/avahi/files/avahi-0.6.31-fix-install-avahi-discover.patch b/net-dns/avahi/files/avahi-0.6.31-fix-install-avahi-discover.patch
deleted file mode 100644
index 62ba967c26ff..000000000000
--- a/net-dns/avahi/files/avahi-0.6.31-fix-install-avahi-discover.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- avahi-0.6.30.old/avahi-python/avahi-discover/Makefile.am	2010-06-28 23:30:34.000000000 -0400
-+++ avahi-0.6.30/avahi-python/avahi-discover/Makefile.am	2012-04-21 18:02:01.642934527 -0400
-@@ -22,6 +22,7 @@
- 	avahi-discover.py \
- 	avahi-discover.desktop.in.in
- 
-+if ENABLE_GTK_UTILS
- if HAVE_PYTHON
- if HAVE_PYTHON_DBUS
- if HAVE_PYGTK
-@@ -67,3 +68,4 @@
- endif
- endif
- endif
-+endif
---- avahi-0.6.30.old/man/Makefile.am	2012-04-21 18:10:45.690900742 -0400
-+++ avahi-0.6.30/man/Makefile.am	2012-04-21 18:09:15.146906578 -0400
-@@ -65,11 +65,13 @@
- man_MANS += \
- 	avahi-bookmarks.1
- if HAVE_GTK
-+if ENABLE_GTK_UTILS
- man_MANS += \
- 	avahi-discover.1
- endif
- endif
- endif
-+endif
- 
- if ENABLE_AUTOIPD
- if HAVE_LIBDAEMON
diff --git a/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch b/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch
deleted file mode 100644
index b0e47e907462..000000000000
--- a/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-avahi-gobject fails to build under et_EE and possibly other locales.
-
-The regex for a sed in avahi-gobject/Makefile fails under various locales.
-Forcing LC_ALL=C fixes the issue.
-
-X-Gentoo-Bug: 501664
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/501664
-
-diff -Naur avahi-0.6.31.orig/avahi-gobject/Makefile.am avahi-0.6.31/avahi-gobject/Makefile.am
---- avahi-0.6.31.orig/avahi-gobject/Makefile.am	2010-08-25 20:51:39.007153001 -0400
-+++ avahi-0.6.31/avahi-gobject/Makefile.am	2014-09-07 19:00:05.485657990 -0400
-@@ -76,7 +76,7 @@
- 
- signals-marshal.list: $(CORE_SOURCES) Makefile.am
- 	$(AM_V_GEN)( cd $(srcdir) && \
--	sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
-+	LC_ALL=C sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
- 		$(CORE_SOURCES) ) \
- 		| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp && \
- 	if cmp -s $@.tmp $@; then \
diff --git a/net-dns/avahi/files/avahi-0.7-CVE-2017-6519.patch b/net-dns/avahi/files/avahi-0.7-CVE-2017-6519.patch
new file mode 100644
index 000000000000..5fadfbc28928
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.7-CVE-2017-6519.patch
@@ -0,0 +1,45 @@
+From e111def44a7df4624a4aa3f85fe98054bffb6b4f Mon Sep 17 00:00:00 2001
+From: Trent Lloyd <trent@lloyd.id.au>
+Date: Sat, 22 Dec 2018 09:06:07 +0800
+Subject: [PATCH] Drop legacy unicast queries from address not on local link
+
+When handling legacy unicast queries, ensure that the source IP is
+inside a subnet on the local link, otherwise drop the packet.
+
+Fixes #145
+Fixes #203
+CVE-2017-6519
+CVE-2018-100084
+---
+ avahi-core/server.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/avahi-core/server.c b/avahi-core/server.c
+index a2cb19a..a2580e3 100644
+--- a/avahi-core/server.c
++++ b/avahi-core/server.c
+@@ -930,6 +930,7 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
+ 
+     if (avahi_dns_packet_is_query(p)) {
+         int legacy_unicast = 0;
++        char t[AVAHI_ADDRESS_STR_MAX];
+ 
+         /* For queries EDNS0 might allow ARCOUNT != 0. We ignore the
+          * AR section completely here, so far. Until the day we add
+@@ -947,6 +948,13 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
+             legacy_unicast = 1;
+         }
+ 
++        if (!is_mdns_mcast_address(dst_address) &&
++            !avahi_interface_address_on_link(i, src_address)) {
++
++            avahi_log_debug("Received non-local unicast query from host %s on interface '%s.%i'.", avahi_address_snprint(t, sizeof(t), src_address), i->hardware->name, i->protocol);
++            return;
++        }
++
+         if (legacy_unicast)
+             reflect_legacy_unicast_query_packet(s, p, i, src_address, port);
+ 
+-- 
+2.21.0
+
diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml
index aa917b89cf2f..dab8c0571291 100644
--- a/net-dns/avahi/metadata.xml
+++ b/net-dns/avahi/metadata.xml
@@ -15,8 +15,6 @@
 		avahi utilities under USE=utils</flag>
 		<flag name="mdnsresponder-compat">Enable compat libraries for
 		mDNSResponder</flag>
-		<flag name="utils">Install the avahi gtk+ utils avahi-discover, bssh, and
-		bvnc</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">lathiat/avahi</remote-id>
diff --git a/net-dns/bind-dns-keygen/Manifest b/net-dns/bind-dns-keygen/Manifest
deleted file mode 100644
index 7acd50a1d1b5..000000000000
--- a/net-dns/bind-dns-keygen/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bind-9.3.2-39.fc6.src.rpm 5480548 BLAKE2B ecd2b72e96e889e8009bfa85c5146665afb6ef391cb9da9a88fd50735ec167509c0d4a3a012668783351a4ffa6ac1bb2b15f933def4a78e186fa53c3b7ca8fd8 SHA512 8959274880aca83d0882fcd825627cdf1000536d2c6e08fad83fe6b85aecbbeb404e6bf7fc7f1d718aa17d85465198565adffd3628a615744d828a674a775736
-EBUILD bind-dns-keygen-9.3.2.39-r1.ebuild 687 BLAKE2B d51246d8fb94850f24c0ae4d7195abea0de978a857c7ce32c1a2b7dbb2a395942a23880395e0fb17475a5842d070459bc1d3c6bfab9f1d19d9dd32f805ab751d SHA512 9f084a33673f3b3c3d33d80a02eb926f092069aa6d821ca98fc3b254502afeb5d1fe94d9f2c718c3f86b10a4b1c41ab4c3e7f46e3146b9094d981f550056ade4
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dns/bind-dns-keygen/bind-dns-keygen-9.3.2.39-r1.ebuild b/net-dns/bind-dns-keygen/bind-dns-keygen-9.3.2.39-r1.ebuild
deleted file mode 100644
index 448c59783816..000000000000
--- a/net-dns/bind-dns-keygen/bind-dns-keygen-9.3.2.39-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit rpm toolchain-funcs
-
-# Tag for which Fedora Core version it's from
-FCVER="6"
-
-MY_PV="${PV%.*}-${PV##*.}"
-MY_P="${PN%%-*}-${MY_PV}"
-DESCRIPTION="A simple BIND key generator"
-HOMEPAGE="https://fedora.redhat.com/projects/config-tools/"
-SRC_URI="mirror://gentoo/${MY_P}.fc${FCVER}.src.rpm"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-S="${WORKDIR}"
-
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN#*-} ${PN##*-}.c || die "compile failed"
-}
-
-src_install() {
-	dosbin ${PN#*-} || die "dosbin failed"
-}
diff --git a/net-dns/bind-dns-keygen/metadata.xml b/net-dns/bind-dns-keygen/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-dns/bind-dns-keygen/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index b6007914ce06..42ab1020554c 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -4,5 +4,5 @@ DIST c-ares-1.14.0.tar.gz 1335940 BLAKE2B d62a0b6d5ea4a2926ff8f2f719d267f9a0c97f
 DIST c-ares-1.15.0.tar.gz 1347687 BLAKE2B c4028bb2840af23274b79c73600bfcf73a348c7ab63ae3c215829e0fe2cf149f4ad38a3ec657c3997bad818ced3cacaed0579dd0dd2ef42eaffd074bdc4f22ed SHA512 a1de6c5e7e1a6a13c926aae690e83d5caa51e7313d63da1cf2af6bc757c41d585aad5466bc3ba7b7f7793cb1748fa589f40972b196728851c8b059cfc8c3be50
 EBUILD c-ares-1.13.0.ebuild 969 BLAKE2B 2f23720e95a9be5863ccec52ca054757a30e99241f3e23b699b7eaea3e25fb225b1e541373e3c17086b68a3486f98eb287201e0df4ac6e9eb124270367395818 SHA512 0bb7a95651abbf457d714dad172a81b3175231bfea17d3316b41d3d945d7f3f6e7f2cc181e0b6b742c28f845b295bc7ecc0f6af0bf55d33610b314c92f3844ff
 EBUILD c-ares-1.14.0.ebuild 982 BLAKE2B f44ea3bae649a7e86efe3dd9e27646fa85c769ff8ccfa526e5639b340adc43161fa3e132e24ef36e2a6d8eb38e19835389e18cec67bae3e365aa9ef9827001e6 SHA512 ae1071964f64ba56385d3ab7b0dd5a59c5181ba664615d8ddf55320db2c47322e87c4ae735e845abb271dd8a171cbc742af8fe621d73ab84d2cc0dd077101ca5
-EBUILD c-ares-1.15.0.ebuild 982 BLAKE2B 06db4de7422c7c9e9b6ea94c66c2932f18c218eaa99ac2fe18b41b070601438943ed0f5da09c3f5ed12914e72eb5b6fb862516f8d85b00126a080d803989aaa5 SHA512 edf8c4d4b87f0d77857e0b90bcbc17357bf1b53545ad510dd0e73e1ca1405e7eee566ba09be50580f389150e4f5bebe7369bceff0e72c546aad3db85f5248413
+EBUILD c-ares-1.15.0.ebuild 980 BLAKE2B 24e5bcf54f9d2f7361827d5855295ad03c1ce33a9049fe887f98385ed9283095ab5316ad45e8c3f8d9197fc8fe08caa0a2831f6b20d758a8498c096797855b91 SHA512 16e503fdcf72c08e6a803d6d594c2d4f4dd3272e445c6e3e143d9a66f23d121404897874e5d2bea21c9156f5eec77b4cc77a7636324641872afe353b35ce55d5
 MISC metadata.xml 339 BLAKE2B e32a823a5af6c260cfb7ebc58dfa81bcb97ff1792aca66662e8206ad3bfb5304784e2f9ec800fe1230472510f864edcacec07df97493e1b481c157e3e5fc971b SHA512 fb726c9af8f3b9b104f13f5d7f8c1d38659848afdd619fe8c9242e8d2dea24c21a2654baca4bac96a94cadf68a0f649c87346f296e6b5d2aa5d88a4276c41755
diff --git a/net-dns/c-ares/c-ares-1.15.0.ebuild b/net-dns/c-ares/c-ares-1.15.0.ebuild
index 107056e2fb3d..f7d53e17b5c6 100644
--- a/net-dns/c-ares/c-ares-1.15.0.ebuild
+++ b/net-dns/c-ares/c-ares-1.15.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://c-ares.haxx.se/"
 SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 IUSE="static-libs"
 
 # Subslot = SONAME of libcares.so.2
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index bc071dbdc1f0..a23fb4837197 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,6 +1,6 @@
 AUX config-full-paths-r10.patch 2487 BLAKE2B a0c7ff420a9000903ec8fdf446c463ef367db2ec934147817f08c12277d5e1704db7c7ec89ec068a5cdc26f88eb794f8caf6d9eb318764783ad62e22ce9a2798 SHA512 15a8af5fff20d9f9d7931faf40d2f9ff1a960a764d7330287af65290e85e986892f0b94a6b311e8ae0be60be3b78caa10c71e438275f20d44706850c2a61d407
 AUX dnscrypt-proxy.confd 162 BLAKE2B 4547fc4a4ec00a809bac7b55bd7a7c8efb54e526179a7e2103fdf716711912987961969619e6b6e6b2e201253e90f828ffa5eb011c0870c112a028c4cfd89ce5 SHA512 25ccbc09df7b51bc0fa4587f7a715429ba11517c64db53086dd09df24470da71b81dbacebe227bd41d1f9576b4560dc58729969eb7b33aa233ec6a6a07d573ab
-AUX dnscrypt-proxy.initd 632 BLAKE2B 6f82264977f3ca795d4f92919cf7da606c02a0d10ce601b9634caf9ead02fa96e07d90fea83b90422f2affdbb74ce29c37132384c666fc0553b9d7b45d1e7cf8 SHA512 cd1cd5e4d72d5a19c636abab7cce9f6d61c4053653fc2ace4cf241fa518a916b243e4a8c8c1b6678c0d1b2d017953c367e1e28da6aa7c9c33a60bbdf8768a072
+AUX dnscrypt-proxy.initd-r1 667 BLAKE2B fba1075bd738fc86b50f37bc25e3ef7f54416d5d85cf3e6d088be0707164007b1ff9c01ac2b0a583724f726cde41a96cd77c8beab11082dbc7b5c03a05c8cf95 SHA512 89677b8718c1a45a6d8b1a0501dc5c4ff8c02793181ac84316fe5488807726bc66b40849c2f91da817862997628b3456926f5efc6ede9c25bf3f5e6533fb88ee
 AUX dnscrypt-proxy.logrotate 105 BLAKE2B 892cc2acb621bb2c653f4545ac1c58777cc048b9a2f954eac7d92fdf6109b529884d20e4bc14af6aa6cde4d6e0dcac33347216de33e915f5d1ba850fda361602 SHA512 ef5f9886d7c49334e642fa6b0abd748fcff05e171493998559539f7f48f0241607d4923c7b30ed81b2bae1037ae28e49072170000a5b4cbeb6fb77e9dc3a6546
 AUX dnscrypt-proxy.service 1198 BLAKE2B 14db1a48f94b07622e0f52d8510e6c1634013e66ab5e5cdd7ddf7c0cde4441fd78b71134e4cfb6f122ba4a191ec032d54e92b1be97e4bd49af61a873431ea002 SHA512 c7dfe482a8ea17cb67681b92ac65a2d2d58d2be364351d131b0b689905d80390c5df794f6c7fb944bd508f69af72af96d36c1b7f7c5c70af7ee636423ab77e11
 AUX dnscrypt-proxy.socket 517 BLAKE2B afa07d5a441b55de46059935a0fa9b7f61bcbfced925b24282be27978a507248303a43f32f2785d585e79c6a9f456a9c3118028014cb78cde5df4ea1be150b6c SHA512 9620307006642cd211b8032939b2e4f592f73d041c6a499f1c74160812853b03543ff84619e8060e064b99a3b7c44b794907722fe485233937e3804b49e29a36
@@ -9,11 +9,13 @@ DIST dnscrypt-proxy-2.0.25.tar.gz 2596674 BLAKE2B 10947c9e496c47a565e62fb4ca6ad9
 DIST dnscrypt-proxy-2.0.27.tar.gz 2478887 BLAKE2B e9cabd6bdb330c3174cb904951f9e1a0a5482b642d458dd9fc7cba8d05333e7d91c37d43fbd360d8fbcda1c5febd2e5d577e0e612d9c2211047ba2a047b929ef SHA512 68cecec0228b3f03d5c50576c7dec32c7474a22bd1740d43b29514b5a00f27376ed5236302fa68c493f0c188134855b277fbbbb922222937fa726783af3f7246
 DIST dnscrypt-proxy-2.0.28.tar.gz 2620245 BLAKE2B fe31dd6d8054c4ae3d5892aaef0c8362405e06dba6de32121d9dea5d64d396ec39b1cfa884d5587c21367bb1dc3c1a4b4f994c286d0b8cc2a8bdbd9d247d239e SHA512 45496a02bd19c94def17b621d0843cc93de4467e51ded4c20af91d9b5aa127529d85b8ff2473a88293c726611291a055d466a50258b7587da0e7d4ba7f0f366e
 DIST dnscrypt-proxy-2.0.29.tar.gz 2621844 BLAKE2B 3ebd02b3c9df9dcb41d27d38a9d9f64c01d98f7b1afee7a7c3b1dd3ef26b2104aae650e34ff1b5651007461ee75d28bcfbfa3c7e82c32532f36553740e3dcb50 SHA512 f02abe56e017153e7fc8b4a26b34c90f68554a1b32a16558c05e8113327896dbf7f81aa69c76fa823a4a0a697b4bb2089bdeb1237ad4ef3587121c2d4cdfe78c
+DIST dnscrypt-proxy-2.0.31.tar.gz 2640523 BLAKE2B cf2e2b5557e6fcf59d3d28978db6c5e46f6b7f58aa4c5ae423149ec2f557269e88846dc4f97c6f6f20ff013b14b61b20d2df750d6b07946606293778a31e0ca1 SHA512 500c800213b94bf8ecbea7493716de5fe41afd584c70844519f1f50827b94a28ec982f2c2b85f7a281dca58273ba968113beed6a965c62bb3dc47ab83d7a1629
 EBUILD dnscrypt-proxy-2.0.19.ebuild 3057 BLAKE2B f624c0a34f235f9ed5c7bfd93e4c3f3284387d56ae594e27a51e541bfd56a19ea81fff955df3eb2442bca093c42f56b75759ebd325a972c05023e4e27f2f793e SHA512 6bd9621a4902a3de52b912f4bd3a0653cf42d74538a36328f558ae4d62f734e577ab90041d119fc6587067aa36faf5f52f0447e9c84f84fee873d748180ecdcf
 EBUILD dnscrypt-proxy-2.0.25-r2.ebuild 2818 BLAKE2B 68b69f308ceda1969bbc53f098a1a3ae0a04fe3029e38653993fc4899fe5d84956730ef4cc923ce041cc98cbe15559daa367fe901e125f5d69603ff0e8a40836 SHA512 786ff205b146066fb9d2d97d0d3d4f589a1d9523cc554633a738906a2bda435891af3b421985483d1a0e56731dc803f39e5ae9c8074d4297fae713c3822e4661
 EBUILD dnscrypt-proxy-2.0.25.ebuild 2760 BLAKE2B b5644b87589d113331e0d2bb902313481999e27d135df14ba0991c756eb4ecd3dc22e5d335ab794b980c540aa88c2ab92ad5fb9298e2fac18a397eb65d170065 SHA512 0ef7ddd2a4b6b33eed3bef91c9ef313c1e6d1f432f6d5de36fc4d908478b569e415c1eef4f5d53f3836bc337a8d93926f49526a5f964ae718b450ff17e6e01cc
 EBUILD dnscrypt-proxy-2.0.27.ebuild 2818 BLAKE2B 68b69f308ceda1969bbc53f098a1a3ae0a04fe3029e38653993fc4899fe5d84956730ef4cc923ce041cc98cbe15559daa367fe901e125f5d69603ff0e8a40836 SHA512 786ff205b146066fb9d2d97d0d3d4f589a1d9523cc554633a738906a2bda435891af3b421985483d1a0e56731dc803f39e5ae9c8074d4297fae713c3822e4661
 EBUILD dnscrypt-proxy-2.0.28.ebuild 2845 BLAKE2B 57585992fee08f503d3fb4398e4c57a1b4aec358b2cf7f2f1af28cf29b5b42298c58afcc19fe5dbc4cb255a28c9b56c1bda27e36384a02b17cd7ed8347c9dcf6 SHA512 d203cb7ff9229d75ded91322f86f7e2aa82090cd9a59f7ab18c17a848b092e184083793078e055aa1ce30a478c4e4d105ce587807fd78ec8d8f3723ab5f58d16
 EBUILD dnscrypt-proxy-2.0.29.ebuild 2845 BLAKE2B 57585992fee08f503d3fb4398e4c57a1b4aec358b2cf7f2f1af28cf29b5b42298c58afcc19fe5dbc4cb255a28c9b56c1bda27e36384a02b17cd7ed8347c9dcf6 SHA512 d203cb7ff9229d75ded91322f86f7e2aa82090cd9a59f7ab18c17a848b092e184083793078e055aa1ce30a478c4e4d105ce587807fd78ec8d8f3723ab5f58d16
-EBUILD dnscrypt-proxy-9999.ebuild 2845 BLAKE2B 57585992fee08f503d3fb4398e4c57a1b4aec358b2cf7f2f1af28cf29b5b42298c58afcc19fe5dbc4cb255a28c9b56c1bda27e36384a02b17cd7ed8347c9dcf6 SHA512 d203cb7ff9229d75ded91322f86f7e2aa82090cd9a59f7ab18c17a848b092e184083793078e055aa1ce30a478c4e4d105ce587807fd78ec8d8f3723ab5f58d16
+EBUILD dnscrypt-proxy-2.0.31.ebuild 2848 BLAKE2B 1d29b9ec5b3a6743dbc8e086fbbafd273948083c41b0ed25ff112bed749c7d4cca53386e5d432407d69d4ebf88afe6f5fb4b5f2df062f8d7d37f86d01952d2b7 SHA512 9e3884931614c326f6c4b23305f0669501e1b2c51f54a7981271f5c551c002227f43241ba05dfd3be754d76b0f8c5ed962606d6316e9ed3484b82d8c1a573c74
+EBUILD dnscrypt-proxy-9999.ebuild 2848 BLAKE2B 1d29b9ec5b3a6743dbc8e086fbbafd273948083c41b0ed25ff112bed749c7d4cca53386e5d432407d69d4ebf88afe6f5fb4b5f2df062f8d7d37f86d01952d2b7 SHA512 9e3884931614c326f6c4b23305f0669501e1b2c51f54a7981271f5c551c002227f43241ba05dfd3be754d76b0f8c5ed962606d6316e9ed3484b82d8c1a573c74
 MISC metadata.xml 630 BLAKE2B a20afc1f8db35b9833819322d9845519540f27864a21b743c364a14c70cabb23efca28fe4302a6d995846941ab41a92e3f811898c18281f613f2d44811249d4d SHA512 803fab528ee6776c5c101770a4fb93d021ac8bf4a71e341f99b067df8dceaa413d53604ba616b99cb695fefc25424035a2754fa033a0e62ec5fd7c3e24219d22
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.31.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.31.ebuild
new file mode 100644
index 000000000000..215c07210b28
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.31.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/jedisct1/${PN}"
+
+inherit fcaps golang-build systemd
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+else
+	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+fi
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
+
+LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="pie"
+
+DEPEND=">=dev-lang/go-1.12"
+
+RDEPEND="
+	acct-group/dnscrypt-proxy
+	acct-user/dnscrypt-proxy
+"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
+
+src_prepare() {
+	default
+	# Create directory structure suitable for building
+	mkdir -p "src/${EGO_PN%/*}" || die
+	# fixes $GOPATH/go.mod exists but should not
+	rm go.mod || die
+	mv "${PN}" "src/${EGO_PN}" || die
+	mv "vendor" "src/${EGO_PN}" || die
+}
+
+src_configure() {
+	EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)"
+}
+
+src_install() {
+	dobin dnscrypt-proxy
+
+	insinto /etc/dnscrypt-proxy
+	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
+	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
+
+	insinto /usr/share/dnscrypt-proxy
+	doins -r "utils/generate-domains-blacklists/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r1 dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if ! use filecaps; then
+		ewarn "'filecaps' USE flag is disabled"
+		ewarn "${PN} will fail to listen on port 53"
+		ewarn "please do one the following:"
+		ewarn "1) re-enable 'filecaps'"
+		ewarn "2) change port to > 1024"
+		ewarn "3) configure to run ${PN} as root (not recommended)"
+		ewarn
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "Using systemd socket activation may cause issues with speed"
+		elog "latency and reliability of ${PN} and is discouraged by upstream"
+		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
+		elog "It is disabled by default for new installations"
+		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
+		elog
+
+	fi
+
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	elog "Also see https://github.com/jedisct1/${PN}/wiki"
+}
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
index c2e5ddb01ed9..215c07210b28 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
@@ -57,7 +57,7 @@ src_install() {
 	insinto /usr/share/dnscrypt-proxy
 	doins -r "utils/generate-domains-blacklists/."
 
-	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r1 dnscrypt-proxy
 	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
 	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
 	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r1
index d81a36fc8f85..ce1d1175d707 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r1
@@ -1,11 +1,12 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command="/usr/bin/dnscrypt-proxy"
 command_args="${DNSCRYPT_PROXY_OPTS:--config /etc/dnscrypt-proxy/dnscrypt-proxy.toml}"
 command_user="${DNSCRYPT_PROXY_USER:-dnscrypt-proxy}:${DNSCRYPT_PROXY_GROUP:-dnscrypt-proxy}"
 pidfile="/run/${RC_SVCNAME}.pid"
+retry="SIGTERM/5/SIGTERM/5/SIGKILL/5"
 start_stop_daemon_args="--background --make-pidfile"
 
 depend() {
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index d63530019442..f97f6aa490cd 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -8,6 +8,6 @@ AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8
 DIST dnsmasq-2.79.tar.xz 493036 BLAKE2B 91152c52aef06def74151f6fbae9153d25261ba5e6a728cbab503c074967963e40dce39d93a0fbe4c5497c9313ac24d495cc8233934c00d4ab82aefe83b01ccd SHA512 2c06212696ab55e1584f6133872f5b196013509e4b1822d0457787b456e14341afdde887749e370a2e512124cb4138f012f4601b08690707be4acc7cf2f2876f
 DIST dnsmasq-2.80.tar.xz 501072 BLAKE2B 39c9808df43a22e32286105c9e001b2f817a4f68b92b84282eeb8cfeaa61404d64275bbb3f944bec6fac1b015987fba6aeab7a88201446c0cff67f02c8d88d8c SHA512 58e56beb553fc41311e5dc16d8b0eb3b6801e2bdfbcd0e7a6659703f08960b6ad10d48b0b14a4d727636faf35483e01597cff2ae49e7fe9fa9e214f437b1c068
 EBUILD dnsmasq-2.79.ebuild 4584 BLAKE2B a4d609bb9cc382649994bd612f9777a2edf8e5917689f0172589db8379bace171573bc302962f671d9baee0f4083606fa4ab0d5ed2f05eec4d775f2879464a91 SHA512 5b60f8d1408096c1d1fce3acf9d5cdb2b3f419eabba5d2b768386794eed80242b101f4ea0a8144627bb23b4535f7d59aa66163d02ce1d248d7c1cc7996450fa3
-EBUILD dnsmasq-2.80-r1.ebuild 4786 BLAKE2B 8234835a925aba3801b01ae2a01315d412ed00659e7c9f484b69f634169ae4f82224ab569917759c708ef3d882d5964be5e3752cf5216c447a1fbbc6d61155a7 SHA512 9563cf795df765cf8f973188f2e9e627c58115292c16ffcbbe505baeef5648c36c39a86f7a8ffbc75e504a7f7e46b335802580a5525d49ae247061e0fd4ccd44
+EBUILD dnsmasq-2.80-r1.ebuild 4784 BLAKE2B 3d135c899bc09786357906c7f261bf695bcc6dcbf0d920b5624aa2630214c147c359cd9fa731b570c70d9c22c00892e170e27a5f50edcefbfa6b36074427f493 SHA512 403b373d6fb59279e82b4825f53d0a33c6cf5774ac9f9712949c6f72e3511f2db11a3f1525dd5c244e44d9216282f3c4659cd2a8ce9ce7c8d713f13543fd052e
 EBUILD dnsmasq-2.80.ebuild 4674 BLAKE2B 0aff7f9798e87cd317294e613db1d8a1f59054b1fb72293afe70a00d02dea7b71831eb343b29643105a28c09bf28f514d1851bd30417c74d25d010048bb4ff0b SHA512 1120c8092a229f3f5027502f52aa46d556cf52fc32c4fea0151d18e1d85b210c0d30fb0c72d1c496e7936040d1208166bbc1a9cf44f5d5a609b725af954d8ac0
 MISC metadata.xml 1247 BLAKE2B cdaa193ae5c90b1f833968bafb1e725be1f67d21ee9025552fe2c153d096f2b4b7cd505aabe3713678426bea2a1059de3eeebd58a9d81793520f2690e5bf4851 SHA512 24cd4320dad43122014b0c5ddd5d65a199ef6d0bb378738180e03e4f0410cc1c21ee46b7973bdadca6e6323f3e9c6ce0073a813d4ecfe3e6bac44645dc9970dc
diff --git a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild
index 05a7d3f80915..7e1101f3b4b3 100644
--- a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
 IUSE+=" +inotify ipv6 lua nls script selinux static tftp"
diff --git a/net-dns/dnssec-tools/Manifest b/net-dns/dnssec-tools/Manifest
index c6a7cfad6275..8875e5c99659 100644
--- a/net-dns/dnssec-tools/Manifest
+++ b/net-dns/dnssec-tools/Manifest
@@ -6,5 +6,5 @@ AUX rollerd.confd 234 BLAKE2B 9a360e3c66bbc785b0a925991ae954e16808922b44a597949f
 AUX rollerd.initd 409 BLAKE2B d3f545fa48d061c0bff8d7a73352f4307678e14006ecb51cb78d32854685d422f269a436ab64307295aab700481bf601de5f3315b1677ac594319e341b15c423 SHA512 1d50ea92a5cd63f77bdf3c780cf33f1d540fc5dbcfd0bd5eea5cc1f156a15c872b2f6b3bbfdf57bb72a99527ce0a6d1bded254d153dc28df51bfab8e6dcd4d9d
 AUX rollerd.service 202 BLAKE2B 8d3841fdaa9a8a5503eba707e22ba66d62a5b28fea3ab1b7a689958f66dd4a3ae53a613f622093846f2dbfa1fdb52fc30bfe772def34d6180e88079b5b3d2bd6 SHA512 5eb0786a0fcad3fe88db3d2391a2ec3dd272818aed0c17a664fff7f126da467ef2e47671212c86c7cc27f0e62873c63968cdbdff6c561499639f8a608e93648b
 DIST dnssec-tools-2.2.3.tar.gz 42941393 BLAKE2B b7b6a54113fb5cf030bd60e18f5446b02d1ceba3564ac854b0305225672545e802fecfa1169dc81e68ffe195533e06082dc22500a51b48965aa9c0fc32c915ed SHA512 fd2467f116f77089bddf9311706f356957f4ae735d827d393534e4001b621c9dfc904ff3d4da698d37e8e97b1be9448ab2fd5455c124656399aac30f1f642baf
-EBUILD dnssec-tools-2.2.3.ebuild 1841 BLAKE2B b39a326d15fb4b5c321882f44884812b426c10b0d5cf015dd992edffeebd489e830fdbe20597dcbbb152f5ef2cd9f464ffcca4799e4664cddd0394127af14fc3 SHA512 4a1bcc954ef7363a4558105834abf481829c0f7ff31cde5a6ef8645b4e642a206fc447544ec9e72ee8a97dd73578ee070c2b0721f31fe292e9a4ffca585fb1c7
+EBUILD dnssec-tools-2.2.3-r1.ebuild 1843 BLAKE2B 777cc6ada38ce13c3ca90ba3cd71375839fa9784c6e128f2493993bacaf661393d817f30c159f9aab9ff674468a006e769a08ac896b86f3735dc20c814015b0c SHA512 e1cca26301d6ed2e67a497c3563998f87832e7b0153a1f4185ee038c050bf18304895c1e5dedbd2d6e5c39557eb91a93b9991cc07ab9a7901fcef13e76c2a2bd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dns/dnssec-tools/dnssec-tools-2.2.3.ebuild b/net-dns/dnssec-tools/dnssec-tools-2.2.3-r1.ebuild
index ea911238a3b0..bcddf668c5b3 100644
--- a/net-dns/dnssec-tools/dnssec-tools-2.2.3.ebuild
+++ b/net-dns/dnssec-tools/dnssec-tools-2.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="static-libs"
 
 RDEPEND="
-	dev-lang/perl
+	dev-lang/perl:=
 	dev-perl/CGI
 	dev-perl/Crypt-OpenSSL-Random
 	dev-perl/Getopt-GUI-Long
diff --git a/net-dns/ndu/Manifest b/net-dns/ndu/Manifest
index c633f162c34d..2641e7ecfc51 100644
--- a/net-dns/ndu/Manifest
+++ b/net-dns/ndu/Manifest
@@ -1,4 +1,4 @@
 AUX ndu-0.4-binary-locations.patch 426 BLAKE2B 6d8c5648b0c25129c87e73f3ac47f2baf699890fcf0023dbe801e7c3cfb4f32ca15287e5a70b9b7829364956a89ab9d04bc6088291890c1e4e949972823a76ed SHA512 58e248d48491759c33ae2ee2d57fdca38b718104606c05d965bc7b555cfd72388a906efd692d789d999fe782878e173438cc22f1091d278eed8b4322ec6f6294
 DIST ndu-0.4.tar.gz 16118 BLAKE2B 7355d1d091f4b0865e3692b80a0dd4734e3e13464757adb1b9d712545ff4f827b828070f0bd027b077acb99c8d4ccd2ed645b3c7f114bfac65707ae7853ea3f2 SHA512 cf401f89f1d6ae66c5440e6ef43f1c78e071d13dd2b1d816f1c3bfd2a0b2d7d7a9d2be9025b3d88f3fbd186ff610ac92858e13b4e47b23b9088f91f3e1a40f39
-EBUILD ndu-0.4-r4.ebuild 1769 BLAKE2B fcda9075a22b4df05ed668a8ddc95a344f7743d537e8d337b4f3568644fc1555ff4bc8218023a8aee755ef09f181b4a913ab4bf316c779af626cc39a3dbacf8b SHA512 12f5f9904133ce3026327f5adf5b8653947d3490625c58d823caaf540bda63067e830725e5938d6997b8bf36c671eef2ef3dcec99cc80c7d457a05b37dbd1469
+EBUILD ndu-0.4-r4.ebuild 1732 BLAKE2B 0d1c5e1e15c84be13a9de9db8e20d495192eb3d945e64a25ce1bf34177d1ea6e77deb72c5b0bf12bf3673903011e9c7f79d138f3c1e18cb0c0770ff278f9e489 SHA512 3725905d057960b88921d6fe111317b1200944505a9646d80ce2fdc8e7857244b68b63d03adff834ef1da0011430b81b99e3eb6d622240c15bc68f3d49553ead
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-dns/ndu/ndu-0.4-r4.ebuild b/net-dns/ndu/ndu-0.4-r4.ebuild
index b64497eb415c..78c645acef4f 100644
--- a/net-dns/ndu/ndu-0.4-r4.ebuild
+++ b/net-dns/ndu/ndu-0.4-r4.ebuild
@@ -1,54 +1,54 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="DNS serial number incrementer and reverse zone builder"
 SRC_URI="http://uranus.it.swin.edu.au/~jn/linux/${P}.tar.gz"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
-DEPEND="sys-apps/sed"
+
 RDEPEND="sys-apps/ed" # dnstouch calls ed to do the dirty work
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/${P}-binary-locations.patch
 
-	epatch "${FILESDIR}"/${P}-binary-locations.patch
+	# match our bind config
+	sed -e 's|0.0.127.in-addr.arpa|127.in-addr.arpa|g' -i ndu.conf || die
+	# document the support for the chrooted BIND setup
+	cat >> ndu.conf <<-EOF || die
+		// if you use a chrooted setup, then you need to uncomment these lines:
+		//process "/chroot/dns/named.conf"
+		//chroot "/chroot/dns"
+	EOF
 
-	cd "${S}"/src
+	cd src || die
 	# use the correct compiler
-	sed -e 's|gcc|$(CXX)|g' -i Makefile
+	sed -e 's|gcc|$(CXX)|g' -i Makefile || die
 	# set correct config pathes
-	sed -e 's|#define CONFIG_PATH "/etc/"|#define CONFIG_PATH "/etc/bind/"|g' -i ndu.cpp
-	sed -e 's|"/etc/ndu.conf"|"/etc/bind/ndu.conf"|g' -i dnstouch.cpp
+	sed -e 's|#define CONFIG_PATH "/etc/"|#define CONFIG_PATH "/etc/bind/"|g' \
+		-i ndu.cpp || die
+	sed -e 's|"/etc/ndu.conf"|"/etc/bind/ndu.conf"|g' -i dnstouch.cpp || die
 	# hack up something to work around bug #73858
-	sed -e 's|execlp("ed", "ed", filename, 0);|execlp("ed", "ed", "-s", filename, 0);|g' -i dnstouch.cpp
+	sed -e 's|execlp("ed", "ed", filename, 0);|execlp("ed", "ed", "-s", filename, 0);|g' \
+		-i dnstouch.cpp || die
 	# use the correct editor
-	sed -e 's|VISUAL|EDITOR|g' -i dnsedit
-
-	cd "${S}"
-	# match our bind config
-	sed -e 's|0.0.127.in-addr.arpa|127.in-addr.arpa|g' -i ndu.conf
-	# document the support for the chrooted BIND setup
-	echo '// if you use a chrooted setup, then you need to uncomment these lines:' >>ndu.conf
-	echo '//process "/chroot/dns/named.conf"' >>ndu.conf
-	echo '//chroot "/chroot/dns"' >>ndu.conf
+	sed -e 's|VISUAL|EDITOR|g' -i dnsedit || die
 }
 
 src_compile() {
-	cd "${S}"/src
-	emake CFLAGS="${CFLAGS}" CXX="$(tc-getCXX)"
+	emake -C src CFLAGS="${CFLAGS}" CXX="$(tc-getCXX)"
 }
 
 src_install () {
-	into /usr
 	dobin src/{dnsedit,ndu,dnstouch}
-	into /
 	insinto /etc/bind
 	doins ndu.conf
 	dodoc README INSTALL