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

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)

3 files changed, 139 insertions, 1 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/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>