gentoo resync : 29.01.2021

7 files changed, 50 insertions, 223 deletions

diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 21ea88b050bc..2c86030baf8d 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,14 +1,13 @@
+AUX dnsmasq-2.84-version-string.patch 419 BLAKE2B a33ca6fcf0c52f057e94a716611a8a51708033b5664f6d747f8db25eea1c52524e2caff721a4eb553a42e9f5ebe497975b27c9cb16abf7248a7de32f0f911700 SHA512 b8928513a96a72d1e1aa8a232492dce9dcb589b6d74fa1ebd61018d8ed948769a11d95784adc2dd64278a7656fa2f0a9403e23eb66f7fc32d2eec78987169830
 AUX dnsmasq-init-dhcp-r3 721 BLAKE2B 94a7542419e2c931149edbd5a5167c7fcbe0233e48f3ed854dfe26090b596c4f2549e37d2680bfceb1c6d21f475012f81a2102bde85e7cd609979e555dbcfa3d SHA512 f7a64fb84a7877b5ec629f9ed92419799913b8f2f73594c510aedc083d72c5c1862da7e5aed4485102c3b89ca7217bcca88e7cdde82f5a65d4cd4bb19017c2fe
 AUX dnsmasq-init-r4 613 BLAKE2B 7ea82e879f8770c3f4b764a9044ef585cc6e91de793c56733a6af1d9e138ca6e55813ad1720a70d0a5a61f6815d094574ae04f9761b2e2846c6267c6a4e97780 SHA512 72ae659a62c61495dc575fa590cbf1352c4bd4f374a6e0a56fce9c641c163b882d8b8097d27605d102e47df49eb68c456baf7b11009a7bb7db98e99429bd80a6
 AUX dnsmasq.confd-r1 170 BLAKE2B 84d5cdb15236c9e1c83fa53d0e401df90e86c6687cc88f9ebba3e2a0987cad2ccf9bb82ac7b1fcd77a81fa6058a3cd3276fb8a8a76e13983628e92be95b39af1 SHA512 9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8
 AUX dnsmasq.logrotate 176 BLAKE2B 4932be8c2a4ba37e0ed61361cdfae6e6cd498e5292f9002a3426c05632896a5f94a84ada168d672cb38e236cbde72b59201c970e348ba052dff655be1a9a57b4 SHA512 b59b299849487dcdfc18ab30ded0605e2df4876cb778b2d1cd03b740406a5580001028eb33f1ecf0dc910f393c58b7cad7c28801aa4641c3fa376e3dac997abf
 AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8fce1f7360928a374fe4c429df1f8ec2ffc093752234f9e2ccc717a887fa2557e3efd99ab6bd58f9ac0f SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1
-DIST dnsmasq-2.81.tar.xz 510648 BLAKE2B 07861888df11f6e2e02d1b80f4e82a407b558ddb34e016f7bda5cb449ee870db000683264b2e36987ece16d50ab773f239bf12dd3468b9529ae4dccd77ecb8ee SHA512 85550c9782fef9b0710d0e233523ed1fe26e877a8bc53fcea3f7cf1fb17c3a79c46f284a99dab2bdaf6a107ea3f1a71cec476ab6d4e1b936da6591aaef42c88e
-DIST dnsmasq-2.82.tar.xz 509904 BLAKE2B 4df3778b2ec6775a6147f66d53b8dd7068d97872c6e5d3a16716faeb0ca489331560c77d6fa9cc913af0d7e0320a6ef463c690bb9e3fdbd8c266ed273e5a5403 SHA512 faf36efdaa3abe84994e46aea018b0a324218d42814baac056ca635f6d03f1301e7b4d958f92b272a8e3a7ac358f3a4e2606129a217587b471aedb3ce23e903b
 DIST dnsmasq-2.83.tar.xz 513880 BLAKE2B 16220fd7eac03f3ba70b014ace3c9775a85b31cdbabd7680d88a87697453a54bfec4c553207477f416032e679dbdaf3ca6c8bb56b72ee423540e0bedf0621865 SHA512 1eaade775dc19658afe825407c10456ab954b82034644bb19af2594d737ceae17ff2cee7f1f917e8e8b2dadbfbcb83dd8b842c0693fcac71487a5fade1eb4b05
-EBUILD dnsmasq-2.81.ebuild 4664 BLAKE2B 9c5d670638f9abdac6434eeca42d8bfe98e8c32fab116b4cab8664911edb7a5cf3d09c7ca5a4e46126d83281d606b75033bf6f8c73b9c5302e55864fc1af9591 SHA512 55dcebad2f617b296c2d801a4b799d4b17afcbdf0feae014682aa18562a957588e9d49e244aa5c8af6deec7374164b977e3dd3b16587c84294823f0a3ed3264d
-EBUILD dnsmasq-2.82-r100.ebuild 4550 BLAKE2B b309ffaa1c8c9c429121b9c326bf5e21ac8f4c844d4eeb98e4f61e7e37766e7b80255a2e81cc5a309d5705b0514be74067cf0761de5715b30a02faae3eb5cf24 SHA512 effa2a7ac49918e2767cb259e0958814eef69bd3fa7f778b027b8d5425b04b32f566cc168a269ec5b731ed614ba789d48b268d8b95bea600246c42be9c961d50
-EBUILD dnsmasq-2.82.ebuild 4476 BLAKE2B e7721e1cbba16b9a1b256b6b0b7577d1669f2626fd9e14f404a640f77d69390008d8d42d37fdefa90a532563b5e93b547a3127a7e22a04b4c2bf1f38972f4853 SHA512 89972130807a66f347f57f2c6d43825c5cc7a2f4d3bbd57bc69fbc8dd92d52e5c02492f9f2adc029f47d315adddb6a5fc328e6a6fba827eeb812ba3584913c28
-EBUILD dnsmasq-2.83-r1.ebuild 4544 BLAKE2B 8634ddf00ac9b01045250fbae2da476615967e90d415b84a97350df60085e0f5319767ac0bed1fe69b585fe24c6618585c9f7c4cf48b0a67aa46cdc8de504967 SHA512 d3fab6e7bad2d907e7867c67adc9349c20651ecb8fe89c0f50ae885a550bc31d588731fa402bd9988f042ef4ce79c3f33ba91108eb743c0baecae199f2efffdd
-EBUILD dnsmasq-2.83-r101.ebuild 4612 BLAKE2B 5ec34bfe7813a885a5aff5dab4900439aa0799ef493895e72c26f5ecc8577a09e1aff61e560a53bf18ac67685fbefe2fc990e010d6f37ccdeb3320498d6be18b SHA512 5007eae1d2e5764473fca1767bfa887ed52eab4cbd59b06a848deac75f0168939948d17805fd8febfa4e20f0d596dc4d4b07e49689f9af4201927f668505fe0a
+DIST dnsmasq-2.84.tar.xz 514216 BLAKE2B 2bca97c16bcf32e0126eb50dc14b82a1f37e1635ebd1dc205e9a92455640fcbb98c093be725768ba9ced84443e451775f8556a164c82967e09e1df4bf7fc901b SHA512 e84bdcdf3cf35f08e8492eb5aa89ee6543233bdb821d01f164783bd6d0913ec01c513e85e2109352c77e77142a1a94bedcd3361f37d7b2a9a5d35a02448e85c6
+EBUILD dnsmasq-2.83-r1.ebuild 4541 BLAKE2B 5fe6d22819e8cc778381cb16afa282ab02078c074de49b45ebdcdcbee9dbf8352fdd6d48876fb2773014ccd62226c265f5bfbe273dfe07d85f80280a1438846d SHA512 8b3f16fcd6792df8a3294e71730dcc3c0d4a3aa526934091a916c72eccfb3aebf2e65afdb550050845d9272ce212f43e378b040590ae94a7715ac2295fbb306c
+EBUILD dnsmasq-2.83-r101.ebuild 4655 BLAKE2B ee0df2583a57fc499f5e9846522064c496967a25168bfcb945cd04b3b8131a5230dead8009898cb632bfa05898be1c4eab358f6025c85359c4db556d9fbdf4b8 SHA512 3424bff3bb3993c9ed8146ec8075d58c27289981c8a85dfa978529b579e5a0d438c80af6d12a0bb8d921a064fabc58f52994b24d6af18335009e95e2dbb4323c
+EBUILD dnsmasq-2.84-r101.ebuild 4724 BLAKE2B cd611e17b8494a7b6c67474996ac061b1255c4213e5174771c3d5cd1984e748d57beb45a23f8e43c3da0783175f0487bb5c2a7f45bf6501ca7e2e2f012a77386 SHA512 ec8b31735e3e2057bdefb4c8ed2ff562655986abebf9c539bbd4d93077e732a1146050fcc0249110af6087c9245fe1734d983dbc5c24d31dd9364a6add5e0e34
+EBUILD dnsmasq-2.84.ebuild 4607 BLAKE2B 670907a683f534052a83f78cb82ef2c905644e820a0047645bf1490cc35015a2b00bd12b13aef26509df41ed6fb10836e705539385080c0a0dcec37f9954133c SHA512 392774a7b3fa71278fd2e713eadf26035bd920e489d4cba6f441c8c6c3f29994b8fd25808163828c439d110fbea3eec5405767c53ef08b556ac1ced73580a7a5
 MISC metadata.xml 1355 BLAKE2B 4441a99669977dd0a5464b4de4f0a46a1a69aea4438916dcf5e55db529b8ca05c1f652af58d0dae4c7dd7542f0748515929f493a328dd8c19a2e436d39351eec SHA512 e2fbb896d5842833cefd014e80ba20bed7f0560479f8fbf05d87dfe6ae09780c648eb588caca2e1b558c27e085e842c09784e7942903e4ab57d1fdcda26b830f
diff --git a/net-dns/dnsmasq/dnsmasq-2.81.ebuild b/net-dns/dnsmasq/dnsmasq-2.81.ebuild
deleted file mode 100644
index 65d59e4c5c94..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.81.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic systemd
-
-DESCRIPTION="Small forwarding DNS server"
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html"
-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 sparc x86"
-
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
-IUSE+=" +inotify ipv6 lua nls script selinux static tftp"
-
-DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
-
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-COMMON_DEPEND="
-	acct-group/dnsmasq
-	acct-user/dnsmasq
-	dbus? ( sys-apps/dbus:= )
-	idn? (
-		!libidn2? ( net-dns/libidn:0= )
-		libidn2? ( >=net-dns/libidn2-2.0:= )
-	)
-	lua? ( dev-lang/lua:0= )
-	conntrack? ( net-libs/libnetfilter_conntrack:= )
-	nls? ( sys-devel/gettext )
-"
-
-DEPEND="${COMMON_DEPEND}
-	dnssec? (
-		dev-libs/nettle:=[gmp]
-		static? ( >=dev-libs/nettle-3.4[static-libs(+)] )
-	)
-"
-
-RDEPEND="${COMMON_DEPEND}
-	dnssec? (
-		!static? ( >=dev-libs/nettle-3.4:=[gmp] )
-	)
-	selinux? ( sec-policy/selinux-dnsmasq )
-"
-
-REQUIRED_USE="
-	dhcp-tools? ( dhcp )
-	lua? ( script )
-	libidn2? ( idn )"
-
-use_have() {
-	local useflag no_only uword
-	if [[ ${1} == '-n' ]]; then
-		no_only=1
-		shift
-	fi
-	useflag="${1}"
-	shift
-
-	uword="${1:-${useflag}}"
-	shift
-
-	while [[ ${uword} ]]; do
-		uword="${uword^^}"
-
-		if ! use "${useflag}"; then
-			printf -- " -DNO_%s" "${uword}"
-		elif [[ -z "${no_only}" ]]; then
-			printf -- " -DHAVE_%s" "${uword}"
-		fi
-		uword="${1}"
-		shift
-	done
-}
-
-pkg_pretend() {
-	if use static; then
-		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
-		use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense;" \
-			"in this case the static USE flag does nothing."
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -r 's:lua5.[0-9]+:lua:' Makefile || die
-	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" \
-		dnsmasq.conf.example || die
-}
-
-src_configure() {
-	COPTS=(
-		"$(use_have -n auth-dns auth)"
-		"$(use_have conntrack)"
-		"$(use_have dbus)"
-		"$(use libidn2 || use_have idn)"
-		"$(use_have libidn2)"
-		"$(use_have -n inotify)"
-		"$(use_have -n dhcp dhcp dhcp6)"
-		"$(use_have -n ipv6 ipv6 dhcp6)"
-		"$(use_have -n id id)"
-		"$(use_have lua luascript)"
-		"$(use_have -n script)"
-		"$(use_have -n tftp)"
-		"$(use_have dnssec)"
-		"$(use_have static dnssec_static)"
-		"$(use_have -n dumpfile)"
-	)
-}
-
-src_compile() {
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		COPTS="${COPTS[*]}" \
-		CONFFILE="/etc/${PN}.conf" \
-		all$(use nls && printf -- "-i18n\n")
-
-	use dhcp-tools && emake -C contrib/lease-tools \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		all
-}
-
-src_install() {
-	local lingua puid
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		COPTS="${COPTS[*]}" \
-		DESTDIR="${ED}" \
-		install$(use nls && printf -- "-i18n\n")
-
-	for lingua in "${DM_LINGUAS[@]}"; do
-		has ${lingua} ${LINGUAS-${lingua}} \
-			|| rm -rf "${ED}"/usr/share/locale/${lingua}
-	done
-	[[ -d "${D}"/usr/share/locale/ ]] && \
-		rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/locale/
-
-	dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
-	dodoc -r logo
-
-	docinto html/
-	dodoc *.html
-
-	newinitd "${FILESDIR}"/dnsmasq-init-r4 ${PN}
-	newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/dnsmasq.logrotate ${PN}
-
-	insinto /etc
-	newins dnsmasq.conf.example dnsmasq.conf
-
-	insinto /usr/share/dnsmasq
-	doins trust-anchors.conf
-
-	if use dhcp; then
-		keepdir /var/lib/misc
-		newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r3 ${PN}
-	fi
-	if use dbus; then
-		insinto /etc/dbus-1/system.d
-		doins dbus/dnsmasq.conf
-	fi
-
-	if use dhcp-tools; then
-		dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time}
-		doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1
-		if use ipv6; then
-			dosbin contrib/lease-tools/dhcp_release6
-			doman contrib/lease-tools/dhcp_release6.1
-		fi
-	fi
-
-	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
-}
-
-pkg_preinst() {
-	# temporary workaround to (hopefully) prevent leases file from being removed
-	[[ -f /var/lib/misc/dnsmasq.leases ]] && \
-		cp /var/lib/misc/dnsmasq.leases "${T}"
-}
-
-pkg_postinst() {
-	# temporary workaround to (hopefully) prevent leases file from being removed
-	[[ -f "${T}"/dnsmasq.leases ]] && \
-		cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
-}
diff --git a/net-dns/dnsmasq/dnsmasq-2.83-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.83-r1.ebuild
index 0aac87161b78..1035fe01ff50 100644
--- a/net-dns/dnsmasq/dnsmasq-2.83-r1.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.83-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 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
 
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
 IUSE+=" +inotify ipv6 lua nettlehash nls script selinux static tftp"
diff --git a/net-dns/dnsmasq/dnsmasq-2.83-r101.ebuild b/net-dns/dnsmasq/dnsmasq-2.83-r101.ebuild
index 17dff7c71fc1..d1c269b7660c 100644
--- a/net-dns/dnsmasq/dnsmasq-2.83-r101.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.83-r101.ebuild
@@ -13,7 +13,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 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
 IUSE+=" +inotify ipv6 lua nettlehash nls script selinux static tftp"
@@ -88,6 +88,10 @@ use_have() {
 	done
 }
 
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
 pkg_pretend() {
 	if use static; then
 		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
diff --git a/net-dns/dnsmasq/dnsmasq-2.82-r100.ebuild b/net-dns/dnsmasq/dnsmasq-2.84-r101.ebuild
index d15dc1803370..3ca7420ed504 100644
--- a/net-dns/dnsmasq/dnsmasq-2.82-r100.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.84-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
-IUSE+=" +inotify ipv6 lua nls script selinux static tftp"
+IUSE+=" +inotify ipv6 lua nettlehash nls script selinux static tftp"
 
 DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
 
@@ -55,11 +55,17 @@ RDEPEND="${COMMON_DEPEND}
 
 REQUIRED_USE="
 	dhcp-tools? ( dhcp )
+	dnssec? ( !nettlehash )
 	lua? (
 		script
 		${LUA_REQUIRED_USE}
 	)
-	libidn2? ( idn )"
+	libidn2? ( idn )
+"
+
+PATCHES=(
+	"${FILESDIR}/dnsmasq-2.84-version-string.patch"
+)
 
 use_have() {
 	local no_only
@@ -86,6 +92,10 @@ use_have() {
 	done
 }
 
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
 pkg_pretend() {
 	if use static; then
 		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
@@ -117,6 +127,7 @@ src_configure() {
 		$(use_have -n script)
 		$(use_have -n tftp)
 		$(use_have dnssec)
+		$(use_have nettlehash)
 		$(use_have static dnssec_static)
 		$(use_have -n dumpfile)
 	)
diff --git a/net-dns/dnsmasq/dnsmasq-2.82.ebuild b/net-dns/dnsmasq/dnsmasq-2.84.ebuild
index d361cafdfba6..eee292c64aca 100644
--- a/net-dns/dnsmasq/dnsmasq-2.82.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.84.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,10 +11,10 @@ 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 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
-IUSE+=" +inotify ipv6 lua nls script selinux static tftp"
+IUSE+=" +inotify ipv6 lua nettlehash nls script selinux static tftp"
 
 DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
 
@@ -53,8 +53,14 @@ RDEPEND="${COMMON_DEPEND}
 
 REQUIRED_USE="
 	dhcp-tools? ( dhcp )
+	dnssec? ( !nettlehash )
 	lua? ( script )
-	libidn2? ( idn )"
+	libidn2? ( idn )
+"
+
+PATCHES=(
+	"${FILESDIR}/dnsmasq-2.84-version-string.patch"
+)
 
 use_have() {
 	local no_only
@@ -112,6 +118,7 @@ src_configure() {
 		$(use_have -n script)
 		$(use_have -n tftp)
 		$(use_have dnssec)
+		$(use_have nettlehash)
 		$(use_have static dnssec_static)
 		$(use_have -n dumpfile)
 	)
diff --git a/net-dns/dnsmasq/files/dnsmasq-2.84-version-string.patch b/net-dns/dnsmasq/files/dnsmasq-2.84-version-string.patch
new file mode 100644
index 000000000000..bd37dbbfe751
--- /dev/null
+++ b/net-dns/dnsmasq/files/dnsmasq-2.84-version-string.patch
@@ -0,0 +1,13 @@
+diff --git a/bld/get-version b/bld/get-version
+index e472aab..3bf0b87 100755
+--- a/bld/get-version
++++ b/bld/get-version
+@@ -28,7 +28,7 @@ else
+      vers=`cat $1/VERSION | sed 's/[(), ]/,/ g' | tr ',' '\n' | grep ^v[0-9]`
+ 
+      if [ $? -eq 0 ]; then
+-         echo "${vers}" | sort -r | head -n 1 | sed 's/^v//'
++         echo "${vers}" | sort | head -n 1 | sed 's/^v//'
+      else
+          cat $1/VERSION
+      fi