Revision bump, add new "dhcp-tools" USE flag that installs extra tools for manually managing dhcp leases.

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

4 files changed, 155 insertions, 16 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 84353c60cdc8..5a5fa9a00acd 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.230 2012/10/08 05:50:08 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.231 2012/11/14 18:31:00 chutzpah Exp $
+
+*dnsmasq-2.63-r1 (14 Nov 2012)
+
+  14 Nov 2012; Patrick McLean <chutzpah@gentoo.org> +dnsmasq-2.63-r1.ebuild,
+  metadata.xml:
+  Revision bump, add new "dhcp-tools" USE flag that installs extra tools for
+  manually managing dhcp leases.
 
   08 Oct 2012; Patrick McLean <chutzpah@gentoo.org> -dnsmasq-2.57.ebuild,
   -dnsmasq-2.61.ebuild, -files/dnsmasq.confd, -files/dnsmasq-init:
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 346aeb4355c0..fdafbb486fd0 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -6,23 +6,24 @@ AUX dnsmasq-init-r2 595 SHA256 bc80bcd171db123a6d02df9ebbfde3fb59078295ff24dea9b
 AUX dnsmasq.confd-r1 170 SHA256 51c0672a70d5d6793d295d82db666d372fb081e8627318f67c88e48d08d254b5 SHA512 9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8 WHIRLPOOL 86f364adcb5576bfb2cc84d13dd087bef987cae70eee1ae7816f0febc58ec637a97fea357c506456781eab116e257d06b1e45f7e2bbd81849251c15067a347ab
 AUX dnsmasq.service 226 SHA256 022df33a4f66c41ea477e59958ebf3d012d314df400acbfdc69c50dc241915cf SHA512 afe0beaff106afe17702a96eca6ff6e4264034ce52f84995b0c39a346af35724a10808ecb872ebc77310dfbeae8342b47c2a0f70753570095d77118517054102 WHIRLPOOL eab0cc195e89d5495713d197f3fbf154a448b2f841dbc6bdc4b7410e1a7a1e0a8ce7ac944703c4b582dd8761fbe19b3ef448739ae59ff76963dc59363101dfdc
 DIST dnsmasq-2.63.tar.xz 378148 SHA256 f5eb1c2dfd47a2c75b0d40a60f85dce2e84c6af6d1cd5318fbe8cd69845ed2d8 SHA512 be057e19062b2eed46fd4677f1419048d4546e0de93a9b0b889417c240a5f7930329d659de41105670c23ca612ce53285875ed64ac56a0cf94ff01d522194cb1 WHIRLPOOL 7e1279efa347c8d69d56c240477f6acc1664b90f05de6a7053f8264d74200afad16389e33ea710e371c0c19c0d7ea9bfdec8d0089ca0fba341bf5e265d4ea783
+EBUILD dnsmasq-2.63-r1.ebuild 2991 SHA256 7daf6ab73da29023627de15e45d4dc9819431641a7b1c11dcad8bf66d9b4815f SHA512 5c52fc4300781f7d780a15543e59ef9b020dda54721bc66a21acce3857418edbe27756f7d9cfbaaee00225bfe05f82b1311bc4122312e44661d86fe1791b9de6 WHIRLPOOL b06d7d1788cc0254529b878fad973c36e5dd91361a596ad2ce063edfa721bff8a57493118da3979871f760e056572a36b8889128731754c1b92e13df9e0402a7
 EBUILD dnsmasq-2.63.ebuild 2676 SHA256 d61e09f2db816dbe4e2c259e3b287ce0a921c81aaba8d0bdc8d53495bd6a7964 SHA512 fa7cc8b51588c4688a6fb7ae76e12858fe5e70429c866ed8448501aa794b38694e96cab7ddbb6288d7314fb7c767d87c46fa0af8f5fedb8ffd149d477b39e871 WHIRLPOOL d78cbef50982f789ff0afd5d214144eec028d5b9cae1c99b15ffb4f4320ff40a579af315f8422e2fd82d1ad7545a04313d42d9c7971787245f0842ec9a43d449
-MISC ChangeLog 30600 SHA256 0ee3de5e687043a6169be2f749225b055c5c18693237a4945159a54aecc7b419 SHA512 0cdaddd7dae3184aef582efcbc23d04813ce9b912a31573b075440fb35d76184b05597a5c80d16ba92e059592a78f8e462206e50fa231277e439de12f448c7d7 WHIRLPOOL 2a3fb060c9336a02baffedfc445de1493b1036e412009c56cc470ec1bfc7b2830fe23c14eb85dbda3fbdcaa02b33617fbace3a287a80dcebe8eb6ff0ebbed8e8
-MISC metadata.xml 553 SHA256 56f56d4e1e01017bf60f2971c8da9c5e536d58fad955413e38ac3428831129ef SHA512 745bbee2cc2ac31c013306e23f616c7abf863d3d6ce00331c77d1c2526f56f0c54f82f95edd925f0793943c1f76ba7539a4396dac91761cbe3f4ea1f84536995 WHIRLPOOL 8d552fa85073ec9df8838a06ddf4d7a5e6a92fef856cbbd2c7c8d542cf593ce390be375f4a4bf3a7f3282b0ad5c2c68e9b80c052eb7ca7019a4fe096c975d629
+MISC ChangeLog 30836 SHA256 7c81203bc0731a6ebbefc12ebc541d3acc74094f7176cf912112785107e8941b SHA512 f68d59654ad4761f2feb97887e7ef71774116b2bb22fa616fb777b4782638da5297392dd47a0f3c05273a0335d30317dc9b83c05c9cb60d9e672e968112e168a WHIRLPOOL 059f306912e610620bd58265277165987764b8a1245cf6c8f7358fd69afdab1d805f87a12a6ce559df8f8bf42806589c7ae641a9daa23c9ec53d20b973906721
+MISC metadata.xml 652 SHA256 f98126bcd65d4e0ad5c9030289ea09d7beb02430ef3520c206e931f41cb2a6f0 SHA512 3d33def0983aa0d789d2eee60d4719ffb811b2283cd089e5b58aab0473114ce88aca3d63877f5178803c4e05392f6a7e354f091de908385db0c149a89b687882 WHIRLPOOL 26d1b7e53f5c7f025d8784a0565bfcf688fd8c6050a54373397fd29f60b401679afa49191606c587f06882dfceedf7b4370e12650151a2750c13d5b55bdc6db7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQcmmhAAoJEHy/RO9cNQiDdcgQAKTQO5v8Z9a00HJTeTciGyqY
-u3XjAIwhTYnQT3698bZcg099yLiv3+VDjwL+wIWV/bdjQEn+NajY7vfEPAKKMUPS
-ZWGC9PkFgbq1MPrOKbYc1BJ8PlRXYGY5eNMxSK6iJtjKF2LMBGkV8YhULYiwHdHK
-91njj1FNitzxGA2nfKrXVKiikOkPidOnxtParoq8NBIuEEaW0BqhEbF9/cCqbR/4
-bH2qum7p3eyhwtaCa+xA8XPYafn1wRA4djv/18NyiUVDvBqY9LqhSAfevRWuL3ra
-K+RqpqLDJ3jSSwBDAN7iaThtQ2E1NMGJ4iIVKdu31UTcHe8YH/135VbB1rH1jdYB
-giUaUWm/ME04knVk8f1Bs3I5aDdCUCShDcs99Ay8hYDDJ9VQjXfqRXDLPY2B+W30
-ZHUm08L/FTE6c3MeqpC2CYEDjpaYpNJYtFPaReReygM7+m0bWVKuo+EL+y2Lewhh
-oLo9Ek3Vm9ydA2dLIiptHbVZ08Y+PjFnCj6Fd6KtlLyIeMH8MfxxoAWpn17/6Wd3
-fuoRMRl3iScKSS9b0wU7Xd4oRY9byM+b14WI1pxa6IZHVKORGqXdXOQDgU3sjVts
-qZHD38k80aPJyP8MVmfmZiXidmyOBLsJz3+6CWyG5vO/34ENC3+irVRCeM36Mt3T
-IkpTIgjNcrDUBcZU0sWg
-=j3vm
+iQIcBAEBCAAGBQJQo+NvAAoJEHy/RO9cNQiDH7sP/0r+Ig31IcZwx9d0FGMftMbi
+LJrxor/vt1fueTauxs2RK0H2BVASkh2VYyZCZNKTnnCfkkc4LTfGdttOFFhY99JD
+/UVBokdte7c7+SEjWOiRyJeiRTp6sde/DyHWPimtOZQGSKG5u96jBwnDvN5chimc
+nrvx4xhV6Z5nRNv1MTMbbTzmapWWznhNVO2e+nYduhbnpcJ8xPyE6UDKAoSU0Sa5
+HKVFQOUtuKPCMpqR+2nAe8D2c59pbtLnFBIs0iBGqcLycxngVz3YDshODtwfuC3Y
+q6qcuZM8QiMZvlFmLrv8AEzHa8qplEYgv1QErhYwZ/toN4sK2rZHweNJ+dYrKHax
+z3sEasynM+l5Skc4jO4sF+4gwxUTPibijV/+eHZi3kIYyP4uXu9s6o9iuIm13nQz
+Xq9G6mlAxKo3BgNqPk/wFtlxgtaA9VaXR4zfDF9mR/JZI1g1B6OIW7bm5n6Yypmz
+vodP4I9GEdvkqvpe1/WQSoLS0wUWwR8z/4HIKSO9szKWbQklQN0Iirb+KkkPZIhf
+g78MqTKWkI+upD8zKqrhvY3VC1OQY3OLLkXf8c/mcs3bAKmH1uOJBzMFMQAn7qVk
+4M7+REbWN74ph13jQr8zdAggsatrnxA3jjYrtxNycEzRPTuchZmW6rcqnIRg81e+
+HL6nNUu39cl9EFAPuu8e
+=XleB
 -----END PGP SIGNATURE-----
diff --git a/net-dns/dnsmasq/dnsmasq-2.63-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.63-r1.ebuild
new file mode 100644
index 000000000000..dbcc0de19558
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.63-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.63-r1.ebuild,v 1.1 2012/11/14 18:31:00 chutzpah Exp $
+
+EAPI=4
+
+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="conntrack dbus +dhcp dhcp-tools idn ipv6 lua nls script 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? ( net-libs/libnetfilter_conntrack )
+	nls? (
+		sys-devel/gettext
+		net-dns/libidn
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-arch/xz-utils"
+
+REQUIRED_USE="lua? ( script ) dhcp-tools? ( dhcp )"
+
+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() {
+	# dnsmasq on FreeBSD wants the config file in a silly location, this fixes
+	epatch "${FILESDIR}/${PN}-2.47-fbsd-config.patch"
+	sed -i -r 's:lua5.[0-9]+:lua:' Makefile
+}
+
+src_configure() {
+	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}" \
+		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/metadata.xml b/net-dns/dnsmasq/metadata.xml
index 50cbff9742b9..f3c01d57a85b 100644
--- a/net-dns/dnsmasq/metadata.xml
+++ b/net-dns/dnsmasq/metadata.xml
@@ -10,6 +10,7 @@
 	<flag name='dhcp'>Enable support for reading ISC DHCPd lease files</flag>
 	<flag name='script'>Enable support for calling scripts when leases change</flag>
 	<flag name='tftp'>Enables built in TFTP server for netbooting</flag>
+	<flag name='dhcp-tools'>Install extra command line tools for manually managing DHCP leases</flag>
 </use>
 </pkgmetadata>