Revision bump, clean up USE flag handling a bit. Install example configuration file as a doc as well as the default config. Make sure /var/lib/misc/dnsmasq.leases exists and is owned by dnsmasq (bug #520396). Clean out some old versions.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF

5 files changed, 77 insertions, 327 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index beb834822482..ef6e607a5663 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.252 2014/08/03 16:59:53 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.253 2014/08/22 18:38:14 chutzpah Exp $
+
+*dnsmasq-2.71-r1 (22 Aug 2014)
+
+  22 Aug 2014; Patrick McLean <chutzpah@gentoo.org> -dnsmasq-2.67.ebuild,
+  -dnsmasq-2.68.ebuild, -dnsmasq-2.70.ebuild, +dnsmasq-2.71-r1.ebuild:
+  Revision bump, clean up USE flag handling a bit. Install example
+  configuration file as a doc as well as the default config. Make sure
+  /var/lib/misc/dnsmasq.leases exists and is owned by dnsmasq (bug #520396).
+  Clean out some old versions.
 
   03 Aug 2014;  <tgall@gentoo.org> dnsmasq-2.66.ebuild, dnsmasq-2.71.ebuild:
   arm64, initial support
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index b3c6ea185569..c59ecee4a633 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -8,32 +8,26 @@ AUX dnsmasq.confd-r1 170 SHA256 51c0672a70d5d6793d295d82db666d372fb081e8627318f6
 AUX dnsmasq.service 278 SHA256 2cca1e7ec70aee80c9d1f59e7f17b515e5fa66b08835ed0fddbe799d2b39db04 SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1 WHIRLPOOL efbb77d8a3ec69bd030f219ffb975ec0a5680f0d4da8b05bbb896db26c444c861fb47d96dfe8201f21acf5085fb465892ef33263de677390308b2328a8a7e33e
 AUX dnsmasq.service-r1 278 SHA256 2cca1e7ec70aee80c9d1f59e7f17b515e5fa66b08835ed0fddbe799d2b39db04 SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1 WHIRLPOOL efbb77d8a3ec69bd030f219ffb975ec0a5680f0d4da8b05bbb896db26c444c861fb47d96dfe8201f21acf5085fb465892ef33263de677390308b2328a8a7e33e
 DIST dnsmasq-2.66.tar.xz 401056 SHA256 5e143947527bcdc46a30f4b1bbdfbfa96333dd98bcecdac3b5b1d6cacfe06c75 SHA512 f0bde09f178ca15f4c28efb06901213af9a009b4476daa8a08bafc7682b9ffed13ac65c5c232acdf828382f321137de08b4a33108d22613b198fe30695b3362c WHIRLPOOL e749d24017c35fdbaaaf417decdf9316e235cf7f96f031caceee14d06b982c285b0e561f50597cd12b6a31ef554f7f2e22ca6234f44a6d8bb066dede99461166
-DIST dnsmasq-2.67.tar.xz 418484 SHA256 a8f1cec9d3f38d19c7c54e2879703d42748ace0f62c32e695b082051bdd2705d SHA512 32946fb01fca7f635b6164e0b06392d3377031c0f3fefbcd52bee74939ae527ba5abe494db7dd9d4afdd39faa044c0e82f0bec0b1137b7768013601bceb8a6b3 WHIRLPOOL d9d22e47a9e36962f87df3a76e38fd18415a00fdf60241861d8b29417c4d0f404cb6797e3a4688b95d4bc4cff86cb2cb3b3b0f405286c312300a54a0a61a2591
-DIST dnsmasq-2.68.tar.xz 420968 SHA256 055904f39a65bf651ccbe0f25922c88cf6e7e1b85e8b1905804253b6957ec7a0 SHA512 c67605f21fc5e64fe70ac4349c45a246575ebdb07ada14602c453b9a1152a12c3a7f3a01d5749db9f7a24a9f281a7fb9fd24bfaff1ec35e9ab0d213ae14cac07 WHIRLPOOL 9a69feedd8982dd70053df270fbd5523acc9a5b6e74d03e68363adb111d3ffe87f22dfb0f6f16f7159f717cb5d2de0bc142e585e26e2961068b0e3cc50734c03
-DIST dnsmasq-2.70.tar.xz 446984 SHA256 19d55bddc541271ad5271e3946f94e2cdf4491913aa5fb1ca9c6b23d5925f026 SHA512 69af462979ccb362efea028ee77aed953d20ed35c4f4f62126f92fe083384c6920efe22db866885293279ef34b8ba99fe5ba042f4df5bc4759259c5a19f67946 WHIRLPOOL b67d9949d0557b6fe7ac9eb79a7bca8036e074a29b73dbee185f887f523ec105fd9424f99a7866124f89b3837b0d452c4253329a2c945c071b5e28a85007b46a
 DIST dnsmasq-2.71.tar.xz 448380 SHA256 4919fb572fed5c6205de1d384f8661c25c19358904c2e6265928e3a3e4bfffba SHA512 b0f1b8633b4560cb9a4fe6d98b8c0db40182c989e698964a9153ea3a96663dcaaa33848dd0876e8f9a93e8a24fc4bd91120335291871712ad6b9e9e97fa3baa1 WHIRLPOOL e8175e48f0d1569a1ca08fb108bbe9593d32b8f1263dcf2995349f5f4dd4b8b19e517aea8d64f038b5ebf3a1d81c101b0153959115df6f0af65175af44f0147e
 EBUILD dnsmasq-2.66.ebuild 3160 SHA256 1d5f3919f2083ebc89d410f19ddcaf7c2239d7f1610ba28652ba8023def0c179 SHA512 1d920858d6bf50e5e750bbb796f8b4c7e9f1ac5c1be3478ce8ba2d69e2f2b90b1bf02462f82ea75ec27ec0dca46d195ab95620c39beb75e111df8588ed52187b WHIRLPOOL c57c65120a0c6e9d3f6f5d4bbde84ccade4a3750f155e376a1a4c75d7a59998f59a2b2a34ec1e2f5f16dde365849f0a94063096b1b6cc21d865623a29c1d999f
-EBUILD dnsmasq-2.67.ebuild 3041 SHA256 22e5fca1aaac67e68e7f04de1eeff0547b46d682cd1ce0e629d404a158a782e2 SHA512 19a08db447e7cc58a6c4d3092b5e8e6bbc436683911bf819777d36697311fad4fbe38938261358f9a426e05caa68643aa287a3bfcb9e6630a3f2740c34f15836 WHIRLPOOL 547fbb5416e1ba8cf13c305d1ebceb43a8739431f63da30b393b4017a35c6c3ee220b2dae9b866850fa956f85960bf1a910102e99ca110213c08100bc42bfd43
-EBUILD dnsmasq-2.68.ebuild 3094 SHA256 9446bfc330242c7f381c361d3848c354c8d9bd90cf1f57e03910cd82297f0834 SHA512 7e85593b89eb636fe3cd520909cd25f283d004b69baffc840be096572c7a241a6f4283b414c93884376703e4ec78b7141c283c858afa540bf51bba0f1575637c WHIRLPOOL b267228927d2f11a967f0385c821fa098a10d46c0cf57878f617cb733263acf1ee4ae47455ac951dda57b836f3d2bdfaf1772fa5dc3411f89b3566dbcf278735
-EBUILD dnsmasq-2.70.ebuild 3685 SHA256 f5d6c60460dcb241676e01aa21010df3de6094f78885b4d5b18b36871a21ffd9 SHA512 49edaa2448b548e21ea0861c2c2da2681ef10f0552303d6b2d85c32baaec0e919da081b6f27969460df2110541215ef42a8816a2ca98cc1dcc4a42a6d90a6ba2 WHIRLPOOL d9bb237846350ecf98ba89e0c96d4ab331f853d103eabacfc2c245a0934171269bb9761296fcb640ed8cbf64b5b822f35c1a3e2d1e0b6c70c3d435d487d2a92a
+EBUILD dnsmasq-2.71-r1.ebuild 3923 SHA256 17fa4dcd3bfd926797a46dac16a7a5ebcdff79bf8726ca07c8c00450fe74c5a2 SHA512 9717c63059727e8bbb37ccf91f49aeb411a7df404de5f99cd81e4e694fb3551170f1c37ae0d5b1bf8d436bbde77d6168329f5b2353f9535193c98e7d66a4c8fc WHIRLPOOL 6ce2018de682c6fabce7200ce1fd3bfc8fb97ffca98c3f5ffc3491d28cfd894323c27f247e8e530d29224247bb62f0f38499992611138c7aac96692f615f833a
 EBUILD dnsmasq-2.71.ebuild 3689 SHA256 5a40a6890ba7fd8bce01a09070ced1fe016233bd7b2064bf83e30feaf99fa66d SHA512 367bd0e700c76a4122dc42df67ba20ad19efd2a5ef7e4cc758e23636b468e52365612927cfe634effb2170d983f114874f0a167455532802888e124ca07d50e1 WHIRLPOOL 87b724dfb66a3cfa678846027d94617833771cb027d9e6af013b7f8d75c60f35543462cda80a08b64ca9f273199a5581f9092f243ff817c2e383ed5e4ec67c48
-MISC ChangeLog 33898 SHA256 4d6c52e17a79a4531f2f9fec523ddf0f0a64028fc0432c474df34b4c4aebbcf3 SHA512 ee63da25d7e6842a318152af6f13d9e566cf80f4afa01da5228a9acefa32fd730a89039e976b29a0e5a9b226204360c03146a565e1c9b381a2ad3cfe23b7d235 WHIRLPOOL cd6b04aee2e53aaea85d3a1eb7aa70d217794986e5d5c58ceca63dc7d9e98dffa4c5bfa502983506a2301105fd83fe8441e24fc8137e34a8679e2a41f4071e20
+MISC ChangeLog 34325 SHA256 67cafc722a12067a0cffbc7b97aaeeaa89d9dc50375876edd6c00fe9e2b4e4da SHA512 192f78c2a2505a214f97ded3119d27bfc70d551280308a2ec854ee96d20b28d10e9bf6c92448b2e306016ea3b3c7b99e046e7ac3f4c9eda5b39ae55557a5591b WHIRLPOOL 476e177a0c7574a247789026c3d6b448bf47ea4abbb02c7ef686f413fc0404559d76278db0961af0e661997863554fef7e4cf3d2eec3f0ba05348efd745aa784
 MISC metadata.xml 807 SHA256 6fb95e16dba00e7466dd6f5fb4820c799a2f54fbc05e5b4a0791b0ac11520359 SHA512 593d4c571ec9e3927988aeb5072af21b7c5f4fc6b55a1a7ebbd1d03c14aa0a0cfa026eb5ba6547370105792485b74f8d9c8350e4b606dbe1bcf4a89aa6d73359 WHIRLPOOL e7690f451f0c10784b6d6b0902c97aac877c0d76ffe66954daa79294c1e74665e9b5d28749a594a6a1dd7c7f755a88fd942fed4619c2bf2b31e75ef5b762dd6f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
-Comment: GPGTools - https://gpgtools.org
 
-iQIcBAEBCAAGBQJT3msuAAoJED/EDWHtqUmqdaIP/RO/4KAOB2BYK30JG6x2LK3e
-JVovoKB7vtDuZbAhGuH+bLR7EdoQlTpmyMAYeifalpU7lWgxAtCInrPqQbOdoEbe
-L1oNE5xUJh3uj8UcAOVu8CfI1yYVfIyQtCg5/nagPiEEQE0BkSnkh49hgn8pqKU+
-ys66ttgD9belLLXCdm/T54hW7i5AigjQ7CtP7DvVdRJvAKS+sIS4aKLRWN1yW6Pk
-/FYYZ2j5sskNtW7dkcQmkK0GCPNnOa77mwg75a5puHu9Ugw/17pixrUr80I4maWX
-9yRF1p14pwwNDeRHjfxTzDhi26cgFrTXeUPi1b/jE5SvHCfJotBreJgDxaOsZu1P
-339x54KyoIXsazP2BVkGYGsZegr8SQcmGuzowlB7lij9xJMbh/V7UW3A2Xu1mVQW
-ed11cIR5lN7aYHeYKL7PhU9wsSclGQO3CiCZpp6wOwGOXyaBLPypFFN6KiHsqeSA
-M4/RxLZjXFAcz9M6I+Vv6F6JXa+y995l3SaLN/5I5eHBKu4ytatm4a+W/Pgc15Gb
-TgXqlq0W0OOmg9veepXsAHKzZAjotsn3cNoTzsfdYrJgVmJrjkrwBLOXOpwo9uUL
-G0rVznLWrANKboovGtYzYn1v2umEzf12kXtonMpvLmuvuoIBYKDrqg5HwLggQ1Xj
-Qn85Xn1ja3ZMlcwLGi6m
-=VIs2
+iQIcBAEBCAAGBQJT944XAAoJEHy/RO9cNQiD+isQAKiejF2Q/BYIHN/vWiG+gl0E
+R+4kPSXU7k1kUoDm4MGgkYkCXBo+C0Jkh8hP2lFSt8+FwFb9Wxp1QGE0hfdByCxJ
+z+E8JdfCKJqwtVoQk1yORLQiKvcERZdk34lgmoOzVIO+oQ+vicjtHFlCFPwqZTNi
+VSTl63d9mkCnJP/R1L6ygy2t10E2bJZkvbJuMTvmSImjIVwgEggauMhD+S+8EyHO
+FoRq2K+6F2HacCEh1dzvsXQJug5KSvmTB1og2tAzUJs1XBBzh7mnwyY5KsNWkxt1
+uU/hECWSdy7BVJkoL5K2XKgsh06yS94Y7zE6X8H0+/Igl2wd2ddZrCEOovn2Ne02
+XBVCCBGdsWyLu2rsvsdVTpp34BP7bl01CIVn21V1hniQ5DG7epsI3TY5QxiFtXpz
+IcDtWlURWLND+H1+QNlAzEPRfHX40Ch91n6ClQ2QgSl+yHFbUtQIcc3GtHFBtEiW
+1zKhbTaqGxINWgToPPICyuI7zq2tbnrvOztfIJrT6r3B7wH6pbjEC+q15No3CDFZ
+kcxGAPVrMdm3j+Rleoi2pRtl1RuP1Bthn1KwBiZxcr+qH+0XXFgIzEyvSEgApuOD
+gRYzjlTi4QgqSXQxJ/gQtDr4ayee2F4nwN/5jJCssSpG3ZZiCpi4e+is++6/GS0N
+McglV7gC0qyUfA4e7cEu
+=njqU
 -----END PGP SIGNATURE-----
diff --git a/net-dns/dnsmasq/dnsmasq-2.67.ebuild b/net-dns/dnsmasq/dnsmasq-2.67.ebuild
deleted file mode 100644
index 6247dd7801e9..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.67.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.67.ebuild,v 1.1 2013/10/25 18:23:51 chutzpah Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs flag-o-matic user systemd
-
-DESCRIPTION="Small forwarding DNS server"
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools idn ipv6 lua nls script selinux tftp"
-DM_LINGUAS="de es fi fr id it no pl pt_BR ro"
-for dm_lingua in ${DM_LINGUAS}; do
-	IUSE+=" linguas_${dm_lingua}"
-done
-
-RDEPEND="dbus? ( sys-apps/dbus )
-		idn? ( net-dns/libidn )
-		lua? ( dev-lang/lua )
-		conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) )
-		nls? (
-			sys-devel/gettext
-			net-dns/libidn
-		)
-		selinux? ( sec-policy/selinux-dnsmasq )"
-
-DEPEND="${RDEPEND}
-		virtual/pkgconfig
-		app-arch/xz-utils"
-
-REQUIRED_USE="dhcp-tools? ( dhcp )
-			  lua? ( script )
-			  s390? ( !conntrack )"
-
-use_have() {
-	local NO_ONLY=""
-	if [ $1 == '-n' ]; then
-		NO_ONLY=1
-		shift
-	fi
-
-	local UWORD=${2:-$1}
-	UWORD=${UWORD^^*}
-
-	if ! use ${1}; then
-		echo " -DNO_${UWORD}"
-	elif [ -z "${NO_ONLY}" ]; then
-		echo " -DHAVE_${UWORD}"
-	fi
-}
-
-pkg_setup() {
-	enewgroup dnsmasq
-	enewuser dnsmasq -1 -1 /dev/null dnsmasq
-}
-
-src_prepare() {
-	sed -i -r 's:lua5.[0-9]+:lua:' Makefile
-}
-
-src_configure() {
-	COPTS="$(use_have -n auth-dns auth)"
-	COPTS+="$(use_have conntrack)"
-	COPTS+="$(use_have dbus)"
-	COPTS+="$(use_have -n dhcp)"
-	COPTS+="$(use_have idn)"
-	COPTS+="$(use_have -n ipv6)"
-	COPTS+="$(use_have lua luascript)"
-	COPTS+="$(use_have -n script)"
-	COPTS+="$(use_have -n tftp)"
-	COPTS+="$(use ipv6 && use dhcp || echo " -DNO_DHCP6")"
-}
-
-src_compile() {
-	emake \
-		PREFIX=/usr \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		COPTS="${COPTS}" \
-		CONFFILE="/etc/${PN}.conf" \
-		all$(use nls && echo "-i18n")
-
-	use dhcp-tools && emake -C contrib/wrt \
-		PREFIX=/usr \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		all
-}
-
-src_install() {
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		DESTDIR="${D}" \
-		install$(use nls && echo "-i18n")
-
-	local lingua
-	for lingua in ${DM_LINGUAS}; do
-		use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
-	done
-	rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
-
-	dodoc CHANGELOG CHANGELOG.archive FAQ
-	dodoc -r logo
-
-	dodoc CHANGELOG FAQ
-	dohtml *.html
-
-	newinitd "${FILESDIR}"/dnsmasq-init-r2 dnsmasq
-	newconfd "${FILESDIR}"/dnsmasq.confd-r1 dnsmasq
-
-	insinto /etc
-	newins dnsmasq.conf.example dnsmasq.conf
-
-	if use dbus; then
-		insinto /etc/dbus-1/system.d
-		doins dbus/dnsmasq.conf
-	fi
-
-	if use dhcp-tools; then
-		dosbin contrib/wrt/{dhcp_release,dhcp_lease_time}
-		doman contrib/wrt/{dhcp_release,dhcp_lease_time}.1
-	fi
-
-	systemd_dounit "${FILESDIR}"/dnsmasq.service
-}
diff --git a/net-dns/dnsmasq/dnsmasq-2.68.ebuild b/net-dns/dnsmasq/dnsmasq-2.68.ebuild
deleted file mode 100644
index 162fe8c3c979..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.68.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.68.ebuild,v 1.2 2013/12/10 19:55:03 chutzpah Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs flag-o-matic user systemd
-
-DESCRIPTION="Small forwarding DNS server"
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools idn ipv6 lua nls script selinux tftp"
-DM_LINGUAS="de es fi fr id it no pl pt_BR ro"
-for dm_lingua in ${DM_LINGUAS}; do
-	IUSE+=" linguas_${dm_lingua}"
-done
-
-RDEPEND="dbus? ( sys-apps/dbus )
-		idn? ( net-dns/libidn )
-		lua? ( dev-lang/lua )
-		conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) )
-		nls? (
-			sys-devel/gettext
-			net-dns/libidn
-		)
-		selinux? ( sec-policy/selinux-dnsmasq )"
-
-DEPEND="${RDEPEND}
-		virtual/pkgconfig
-		app-arch/xz-utils"
-
-REQUIRED_USE="dhcp-tools? ( dhcp )
-			  lua? ( script )
-			  s390? ( !conntrack )"
-
-use_have() {
-	local NO_ONLY=""
-	if [ $1 == '-n' ]; then
-		NO_ONLY=1
-		shift
-	fi
-
-	local UWORD=${2:-$1}
-	UWORD=${UWORD^^*}
-
-	if ! use ${1}; then
-		echo " -DNO_${UWORD}"
-	elif [ -z "${NO_ONLY}" ]; then
-		echo " -DHAVE_${UWORD}"
-	fi
-}
-
-pkg_setup() {
-	enewgroup dnsmasq
-	enewuser dnsmasq -1 -1 /dev/null dnsmasq
-}
-
-src_prepare() {
-	sed -i -r 's:lua5.[0-9]+:lua:' Makefile
-}
-
-src_configure() {
-	COPTS="$(use_have -n auth-dns auth)"
-	COPTS+="$(use_have conntrack)"
-	COPTS+="$(use_have dbus)"
-	COPTS+="$(use_have -n dhcp)"
-	COPTS+="$(use_have idn)"
-	COPTS+="$(use_have -n ipv6)"
-	COPTS+="$(use_have lua luascript)"
-	COPTS+="$(use_have -n script)"
-	COPTS+="$(use_have -n tftp)"
-	COPTS+="$(use ipv6 && use dhcp || echo " -DNO_DHCP6")"
-}
-
-src_compile() {
-	emake \
-		PREFIX=/usr \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		COPTS="${COPTS}" \
-		CONFFILE="/etc/${PN}.conf" \
-		all$(use nls && echo "-i18n")
-
-	use dhcp-tools && emake -C contrib/wrt \
-		PREFIX=/usr \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		all
-}
-
-src_install() {
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		DESTDIR="${D}" \
-		install$(use nls && echo "-i18n")
-
-	local lingua
-	for lingua in ${DM_LINGUAS}; do
-		use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
-	done
-	[[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
-
-	dodoc CHANGELOG CHANGELOG.archive FAQ
-	dodoc -r logo
-
-	dodoc CHANGELOG FAQ
-	dohtml *.html
-
-	newinitd "${FILESDIR}"/dnsmasq-init-r2 dnsmasq
-	newconfd "${FILESDIR}"/dnsmasq.confd-r1 dnsmasq
-
-	insinto /etc
-	newins dnsmasq.conf.example dnsmasq.conf
-
-	if use dbus; then
-		insinto /etc/dbus-1/system.d
-		doins dbus/dnsmasq.conf
-	fi
-
-	if use dhcp-tools; then
-		dosbin contrib/wrt/{dhcp_release,dhcp_lease_time}
-		doman contrib/wrt/{dhcp_release,dhcp_lease_time}.1
-	fi
-
-	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
-}
diff --git a/net-dns/dnsmasq/dnsmasq-2.70.ebuild b/net-dns/dnsmasq/dnsmasq-2.71-r1.ebuild
index 5860c06c3f70..38b9effdad39 100644
--- a/net-dns/dnsmasq/dnsmasq-2.70.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.71-r1.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/dnsmasq/dnsmasq-2.70.ebuild,v 1.1 2014/04/24 18:18:22 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.71-r1.ebuild,v 1.1 2014/08/22 18:38:14 chutzpah Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn ipv6 lua nls script selinux static tftp"
 DM_LINGUAS="de es fi fr id it no pl pt_BR ro"
 for dm_lingua in ${DM_LINGUAS}; do
@@ -20,51 +20,59 @@ for dm_lingua in ${DM_LINGUAS}; do
 done
 
 CDEPEND="dbus? ( sys-apps/dbus )
-		idn? ( net-dns/libidn )
-		lua? ( dev-lang/lua )
-		conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) )
-		nls? (
-			sys-devel/gettext
-			net-dns/libidn
-		)
-		selinux? ( sec-policy/selinux-dnsmasq )"
+	idn? ( net-dns/libidn )
+	lua? ( dev-lang/lua )
+	conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) )
+	nls? (
+		sys-devel/gettext
+		net-dns/libidn
+	)
+	selinux? ( sec-policy/selinux-dnsmasq )"
 
 DEPEND="${CDEPEND}
-		app-arch/xz-utils
-		dnssec? (
-			dev-libs/nettle[gmp]
-			static? (
-				dev-libs/nettle[static-libs(+)]
-			)
+	app-arch/xz-utils
+	dnssec? (
+		dev-libs/nettle[gmp]
+		static? (
+			dev-libs/nettle[static-libs(+)]
 		)
-		virtual/pkgconfig"
+	)
+	virtual/pkgconfig"
 
 RDEPEND="${CDEPEND}
-		dnssec? (
-			!static? (
-				dev-libs/nettle[gmp]
-			)
-		)"
+	dnssec? (
+		!static? (
+			dev-libs/nettle[gmp]
+		)
+	)"
 
 REQUIRED_USE="dhcp-tools? ( dhcp )
-			  lua? ( script )
-			  s390? ( !conntrack )"
+	lua? ( script )
+	s390? ( !conntrack )"
 
 use_have() {
-	local NO_ONLY=""
-	if [ $1 == '-n' ]; then
-		NO_ONLY=1
+	local useflag no_only uword
+	if [[ $1 == '-n' ]]; then
+		no_only=1
 		shift
 	fi
+	useflag="${1}"
+	shift
 
-	local UWORD=${2:-$1}
-	UWORD=${UWORD^^*}
+	uword="${1:-${useflag}}"
+	shift
 
-	if ! use ${1}; then
-		echo " -DNO_${UWORD}"
-	elif [ -z "${NO_ONLY}" ]; then
-		echo " -DHAVE_${UWORD}"
-	fi
+	while [[ ${uword} ]]; do
+		uword=${uword^^*}
+
+		if ! use "${useflag}"; then
+			echo -n " -DNO_${uword}"
+		elif [[ -z "${no_only}" ]]; then
+			echo -n " -DHAVE_${uword}"
+		fi
+		uword="${1}"
+		shift
+	done
 }
 
 pkg_pretend() {
@@ -88,13 +96,12 @@ src_configure() {
 	COPTS="$(use_have -n auth-dns auth)"
 	COPTS+="$(use_have conntrack)"
 	COPTS+="$(use_have dbus)"
-	COPTS+="$(use_have -n dhcp)"
 	COPTS+="$(use_have idn)"
-	COPTS+="$(use_have -n ipv6)"
+	COPTS+="$(use_have -n dhcp dhcp dhcp6)"
+	COPTS+="$(use_have -n ipv6 ipv6 dhcp6)"
 	COPTS+="$(use_have lua luascript)"
 	COPTS+="$(use_have -n script)"
 	COPTS+="$(use_have -n tftp)"
-	COPTS+="$(use ipv6 && use dhcp || echo " -DNO_DHCP6")"
 	COPTS+="$(use_have dnssec)"
 	COPTS+="$(use_have static dnssec_static)"
 }
@@ -118,19 +125,19 @@ src_compile() {
 }
 
 src_install() {
+	local lingua puid
 	emake \
 		PREFIX=/usr \
 		MANDIR=/usr/share/man \
 		DESTDIR="${D}" \
 		install$(use nls && echo "-i18n")
 
-	local lingua
 	for lingua in ${DM_LINGUAS}; do
 		use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
 	done
 	[[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
 
-	dodoc CHANGELOG CHANGELOG.archive FAQ
+	dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
 	dodoc -r logo
 
 	dodoc CHANGELOG FAQ
@@ -145,6 +152,12 @@ src_install() {
 	insinto /usr/share/dnsmasq
 	doins trust-anchors.conf
 
+	if use dhcp; then
+		dodir /var/lib/misc
+		touch "${D}"/var/lib/misc/${PN}.leases
+		fowners dnsmasq:dnsmasq /var/lib/misc/${PN}.leases
+	fi
+
 	if use dbus; then
 		insinto /etc/dbus-1/system.d
 		doins dbus/dnsmasq.conf