Version bump. Add USE flag for dhcp which is now optional and change to EAPI=2 for default USE flag support.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 84 insertions, 6 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 75950a27270f..96ed1437145e 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.176 2009/03/30 04:14:34 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.177 2009/07/20 19:56:47 chutzpah Exp $
+
+*dnsmasq-2.49 (20 Jul 2009)
+
+  20 Jul 2009; Patrick McLean <chutzpah@gentoo.org> +dnsmasq-2.49.ebuild:
+  Version bump. Add USE flag for dhcp which is now optional and change to
+  EAPI=2 for default USE flag support.
 
 *dnsmasq-2.47 (30 Mar 2009)
 
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 8cd2b509d0ef..acf81e4b97ef 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -9,15 +9,17 @@ AUX resolvconf.dnsmasq 4078 RMD160 8a290b908cf975e0cbb2b845c5c492d8a3f6e2aa SHA1
 DIST dnsmasq-2.45.tar.lzma 275407 RMD160 991d5c44a1bb3baad9173d28255a42c8d88fbc02 SHA1 9c613108c3e41ceaa48c176f228439fec241049d SHA256 969ee94223879c4be469b6aba74186ba897fb06eb9872f5996b6b20419b9f31c
 DIST dnsmasq-2.46.tar.lzma 279718 RMD160 74bd9a1fc4e1e3fd4f3efbf3d9875696fcbf13d2 SHA1 8b41cf957ad9b7c9bec71933db57f0c1e525d90c SHA256 ed3483d6b2d6939d8d0dfe32e473ccbe8a3c7cfb3869f0378e50d814c00f370c
 DIST dnsmasq-2.47.tar.lzma 286597 RMD160 54042262cf559a97837e0099d8dd2a312312fbbb SHA1 796be70a5c4f1cdff383594d0d170d5d1bab63f7 SHA256 23f977f55da5c1bbfdcf5db9ada641cfd94819f7452113c3be40fd7dfe200a46
+DIST dnsmasq-2.49.tar.lzma 294598 RMD160 a8015a645f81fc8616314de9155710054eb86a34 SHA1 1a9f8ad0f4664c4962cf0fbf9b7ce18721e176cb SHA256 111896723071d16f4f83dea3b1df953ded4ac19f280c4beec8ad853d3c43ede4
 EBUILD dnsmasq-2.45.ebuild 1729 RMD160 d57a6d872d6cf2aeb72e16702779ee94229df383 SHA1 e32c3722e2c58de9ef7bcc4c708dda0775a0b985 SHA256 cee382efd302a4d32fec76c9fcb059d25799348972ad672c8b71a92cf4dd9060
 EBUILD dnsmasq-2.46.ebuild 1695 RMD160 a05f16ed465792ad16e5847b51f407e17e24f545 SHA1 fbbabfde3982acbec5157eca8eafb329fcc35bcb SHA256 a063a85d722767501fd3a8c2868625e8cad64a80183da26be877556ca79cae78
 EBUILD dnsmasq-2.47.ebuild 1694 RMD160 de9f4a3e84f604f34694730c4f4693469c71da46 SHA1 9b10900fadb64204019922d18bce5dc5c93b1d2a SHA256 6dd44d3473711e0dd6f9aab37d206d758cb1ee72e4d1bd39ac60dd1b5bd3ff93
-MISC ChangeLog 22559 RMD160 e55158783ad002662caf7f3d2148b5ebb2256544 SHA1 138bd8ad656f8265b53572cf54f19c144bd85754 SHA256 b4bbe16a724a8f210198d27362795f1ceed22e6a8e61e5f3246cbadc26cfa0bd
-MISC metadata.xml 408 RMD160 c75b690031bb68347071ca314ca6495b0e312e72 SHA1 75fda60866e74fd8eb0b311b3537a069103ead61 SHA256 771c336677378f809c748a08400a870c401aae5ecbe39aa3e0e60df99272766c
+EBUILD dnsmasq-2.49.ebuild 1663 RMD160 44c2b4c53b61ba9ea4184dbb28833188531d4ff3 SHA1 90203dad4af49801ac062048f9c98ad32122750a SHA256 a6d9c0647125015556bd40744705b08618b1decd5b29fdabf4d8eafef8820668
+MISC ChangeLog 22776 RMD160 c9341ca24ccc56286b80012ee468660d4feede0e SHA1 ba6cb804234d874064cbd7cd029ea7d028f394fe SHA256 73b7f08b70bd7c561de440f21913d459e85493fc1316f6e7b874fceffcc5414c
+MISC metadata.xml 483 RMD160 fffea034d4552fce6f4b39f1b3fdb7dacd76fdf3 SHA1 512653c18b5c558651fc36432776a4e7d3be63d7 SHA256 37b49df8ce4dcced6eb48c6b777a01d5c2d8dc156772a055b29b643f3ee95daf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknQRzYACgkQWt/XSf2CZdlbcgCgiKvn4GDZ1Yc3yiry0aEjEQu7
-l+sAoJkwbSMocZ5RPmkzEWJ/Ed/qkd04
-=v597
+iEYEARECAAYFAkpkzE8ACgkQWt/XSf2CZdmK8wCeMe2SV8cSPVQR19XS0F1VE6z4
+q+kAnAngMseNr4efEBO4IaL+dEtyAFIS
+=FpVb
 -----END PGP SIGNATURE-----
diff --git a/net-dns/dnsmasq/dnsmasq-2.49.ebuild b/net-dns/dnsmasq/dnsmasq-2.49.ebuild
new file mode 100644
index 000000000000..38804784913a
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.49.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.49.ebuild,v 1.1 2009/07/20 19:56:47 chutzpah Exp $
+
+EAPI=2
+
+inherit eutils toolchain-funcs flag-o-matic
+
+MY_P="${P/_/}"
+MY_PV="${PV/_/}"
+DESCRIPTION="Small forwarding DNS server"
+HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
+SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.lzma"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="dbus +dhcp ipv6 nls tftp"
+
+RDEPEND="dbus? ( sys-apps/dbus )
+	nls? ( sys-devel/gettext )"
+
+DEPEND="${RDEPEND}
+	app-arch/lzma-utils"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	sed -i '/^AWK/s:nawk:gawk:' Makefile #214865
+
+	# dnsmasq on FreeBSD wants the config file in a silly location, this fixes
+	epatch "${FILESDIR}/${PN}-2.47-fbsd-config.patch"
+}
+
+src_configure() {
+	use tftp || append-flags -DNO_TFTP
+	use dhcp || append-flags -DNO_DHCP
+	use ipv6 || append-flags -DNO_IPV6
+	use dbus && sed -i '$ a #define HAVE_DBUS' src/config.h
+}
+
+src_compile() {
+	emake \
+		PREFIX=/usr \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		all$(use nls && echo "-i18n") || die
+}
+
+src_install() {
+	emake \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		DESTDIR="${D}" \
+		install$(use nls && echo "-i18n") || die
+
+	dodoc CHANGELOG FAQ
+	dohtml *.html
+
+	newinitd "${FILESDIR}"/dnsmasq-init dnsmasq
+	newconfd "${FILESDIR}"/dnsmasq.confd dnsmasq
+	insinto /etc
+	newins dnsmasq.conf.example dnsmasq.conf
+
+	if use dbus ; then
+		insinto /etc/dbus-1/system.d
+		doins dbus/dnsmasq.conf
+	fi
+}
diff --git a/net-dns/dnsmasq/metadata.xml b/net-dns/dnsmasq/metadata.xml
index 1b1c2743b300..b9446fe6c3c9 100644
--- a/net-dns/dnsmasq/metadata.xml
+++ b/net-dns/dnsmasq/metadata.xml
@@ -7,6 +7,7 @@
 <name>Patrick McLean</name>
 </maintainer>
 <use>
+	<flag name='dhcp'>Enable support for reading ISC DHCPd lease files</flag>
 	<flag name='isc'>Enable support for reading ISC DHCPd lease files</flag>
 	<flag name='tftp'>Enables built in TFTP server for netbooting</flag>
 </use>