Version bump.

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

3 files changed, 181 insertions, 15 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index c186e1fffaea..371f28726ef5 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,11 @@
 # 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.250 2014/04/24 18:18:22 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.251 2014/05/20 00:41:35 chutzpah Exp $
+
+*dnsmasq-2.71 (20 May 2014)
+
+  20 May 2014; Patrick McLean <chutzpah@gentoo.org> +dnsmasq-2.71.ebuild:
+  Version bump.
 
 *dnsmasq-2.70 (24 Apr 2014)
 
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 1aeb46bb3cec..db7ffd3562d3 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -11,26 +11,28 @@ DIST dnsmasq-2.66.tar.xz 401056 SHA256 5e143947527bcdc46a30f4b1bbdfbfa96333dd98b
 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 3154 SHA256 62ffc1af6d4021fba25f7d9f6c36f71d291661c3988de2501b8a394b4bf6342e SHA512 049e94034f89e3a91c3b875a9e1c87ec014e5678c8c53708e17c8dcc858c418525ef550c4d4bc6201a235a0a66a3d9380b66dc8fc559d3a742d24666072ccd2d WHIRLPOOL d268b4ebaa126c73215b7cc6cf623a1eb085b4242ca04b08ce1cf89f9f5f60f078bc0f3dff5109053712048830c43793115d27cb6c144e5fc4e7d7a8f3b56654
 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
-MISC ChangeLog 33678 SHA256 7664d6dbe60709336b7be2efabae3a8af5eeb4b035d04528dcbce70cbf09f7db SHA512 b70b74dfa9236f7ea8a77f20b1aeaef68a5f806e1068aa1c10459bfc02e66e5a459e67de065cdbb8ad7163ac2f27cd06a857e7e67b5b4c7b9254d26944c865a5 WHIRLPOOL d6d4d3d27f19019dc760142f14a3cf20a4e13b607d2e800a94725961c1d1f891f94d8010f25c422c624ba55ddd43f376d1256806cf22644e5ac6bcbf366b3c7f
+EBUILD dnsmasq-2.71.ebuild 3685 SHA256 afdb849af2e7dfb5a9094d9bd3180b9342187c8561a165686f57b8f017aa598d SHA512 d52c3e00edaf01828855bbc3e645e9b007685eb65f3a96f19f6da6cf5586d4aa32af4f9973384fdec733ace150b51b4592719df3f4a8b05173ea3a6039b4ef97 WHIRLPOOL 90da73ef62e57ffa4276834930d98baeda66f24e2a54dfefc0153f460818b6b48cc97414706ac8a502956ceb9d175664f44ada4e34f1208369d633a2ed4cba53
+MISC ChangeLog 33798 SHA256 eda43b38c904db1aca2d9b85f270e9d96ce8c294a9bb33b246e40601b5724350 SHA512 318bd4f7d5de7659b9b72cf410abe8b2fcde1d6a2fe437294adf8a5e33d0df22dff3e6c173df1124cc653536e8bed1fe80be57b46d12ff31298a4421bfb43359 WHIRLPOOL 598883ed01b35fdc839ce32b3b55896b372e5065f5f585f0bd633d9ef70d23f6340cf04ec1133a885b72e41f04dc44f235555da3920e22523479abd453aca569
 MISC metadata.xml 807 SHA256 6fb95e16dba00e7466dd6f5fb4820c799a2f54fbc05e5b4a0791b0ac11520359 SHA512 593d4c571ec9e3927988aeb5072af21b7c5f4fc6b55a1a7ebbd1d03c14aa0a0cfa026eb5ba6547370105792485b74f8d9c8350e4b606dbe1bcf4a89aa6d73359 WHIRLPOOL e7690f451f0c10784b6d6b0902c97aac877c0d76ffe66954daa79294c1e74665e9b5d28749a594a6a1dd7c7f755a88fd942fed4619c2bf2b31e75ef5b762dd6f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTWVV8AAoJEHy/RO9cNQiDZcgQAJdDUMufTtZbA3o3H6Yoxn4E
-B6Wl6Ic+a0v6G+vZNUluwAb/nO+AeFsphrJQSDM3vniH2alZW3sGazRnElXY115h
-g5KrEiIhnKwPQaP3rgDYXAdLibQxxxX9lYTbQu56CPy8HT9EtrbesERmjjnSBjhM
-nMD/prXCJaUAmfv48fBJJv6sRejUgMOAwTP+BNAow5GFj3fhwecArNt3ZPqVxYBt
-qLgbo6ILgtQIxEuBmLoyFcmmeSQUgrkJ+YK9nmxDYSR3f90iUXClFUFxZLy49p4V
-dEB27t0d94+g+I3eFT9rMoNliDWMCqrVDoFMqMTJ7euDD3m5Ix+g6fLfk7g/w3ZJ
-e6r5Iu4CmT8ea1H+9TiwVcsZOwKrR7h50G0Ch2xQleCZVO2MKawUL3SSQ/0Xf7ye
-FqI/B58O4kblkO6fx58vNZOHRoVa229v1eS9UaJPpQkH4pf/a8a0NWBY4weTp3U+
-uaP6mjgj6skzHZQQSNXYMMfxHyAav9e2CQs3H+Jup3MsiDorFPcyxhZhVD9evAhf
-95MgLCTxc0rdMWpk8B1Hf8Tz/ezb4MuEknO6PpsG8qo+CgzUDQ7AKbNmVKxRjZQw
-0ec1a+YT1CbKbVdzuHttNirzVMrj5zvv2sYcD1eyAULE9B3IAJrk34byW8PdVPsp
-x7sSZbbRJuTFXqtE1mqs
-=XDZ2
+iQIcBAEBCAAGBQJTeqTMAAoJEHy/RO9cNQiDD4EP/jxLO6ABUhnrk76QvNhoE4kv
+wnqekJjJhoiLPzR8yB+Z+f3P6G2cpAf2xM/YTmdhooSXACSRF2VnZNZOlbYhgxVJ
+a7x51ynDf5BjPJdLNSehZEPFZd2JNMTlH5qSMiMOgUFxlp1zlv/gDYsO1JLx/gkD
+5OFuvflgqCDoWUqj11LuPnKTERAJnK1zLROvYZQaexZvD6wIX7E3G1O7l+qPNfae
+9GOGWoXvfmIZveZrEuVmJltbs9NZIydThMRc2OAkM1dh6CBRueyS3UZgHRDJ7qfo
+96Vt4OXnXTUY1kWIFRyNFde+FBEFycKrzNkK9XOurUlYobmHi3FT0dP4x4K8RMAN
+aVJwqZKxp0oh09BqWbWtHtG6hkMyhKfPysbqcZkVXuZp20ihO59ka1z9we8HyJTT
+eZK16iK/d/uvpvA2hRJALzE5mWK9Znq/61sTKIhckqQDCAOC9tILMVZ78xyMqhcg
+7qBodDQH3lyGxIC3T0iVuwFD7Gi8D4YsPKCQs1CqAW1Mpslq3Tf+U2eQ7nSeY9JJ
+OOPn92LdrgmjmRxIHMZVofyHCWEraSqbHstC7k2cYZ7IDMm3UoTTnEumglff/OlC
+MUlwkeVY8qXSw0E/n+qqox10csX9KychYDQMT+KasX056zEMrJalSKjTNBAVHaXs
+H8M/07CEAkMmSNjGiq1b
+=O4Zj
 -----END PGP SIGNATURE-----
diff --git a/net-dns/dnsmasq/dnsmasq-2.71.ebuild b/net-dns/dnsmasq/dnsmasq-2.71.ebuild
new file mode 100644
index 000000000000..458fa4a10537
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.71.ebuild
@@ -0,0 +1,159 @@
+# 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.71.ebuild,v 1.1 2014/05/20 00:41:35 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 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
+	IUSE+=" linguas_${dm_lingua}"
+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 )"
+
+DEPEND="${CDEPEND}
+		app-arch/xz-utils
+		dnssec? (
+			dev-libs/nettle[gmp]
+			static? (
+				dev-libs/nettle[static-libs(+)]
+			)
+		)
+		virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+		dnssec? (
+			!static? (
+				dev-libs/nettle[gmp]
+			)
+		)"
+
+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_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; the static USE flag is ignored."
+	fi
+}
+
+pkg_setup() {
+	enewgroup dnsmasq
+	enewuser dnsmasq -1 -1 /dev/null dnsmasq
+}
+
+src_prepare() {
+	sed -i -r 's:lua5.[0-9]+:lua:' Makefile
+	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
+}
+
+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")"
+	COPTS+="$(use_have dnssec)"
+	COPTS+="$(use_have static dnssec_static)"
+}
+
+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
+
+	insinto /usr/share/dnsmasq
+	doins trust-anchors.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
+}