Version bump (bug #301978). Remove workaround for bug #296204 as it is no longer needed.

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

3 files changed, 85 insertions, 5 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 4c8b8e384a16..3d98c2ca286c 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.189 2010/01/14 18:46:16 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.190 2010/02/10 14:55:06 chutzpah Exp $
+
+*dnsmasq-2.52 (10 Feb 2010)
+
+  10 Feb 2010; Patrick McLean <chutzpah@gentoo.org> +dnsmasq-2.52.ebuild:
+  Version bump (bug #301978). Remove workaround for bug #296204 as it is no
+  longer needed.
 
   14 Jan 2010; Patrick McLean <chutzpah@gentoo.org> dnsmasq-2.51.ebuild:
   Add a die call if DBUS USE flag is enable with DHCP off, this is a
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 006c81c378a7..42b4d5f13aa7 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -8,14 +8,16 @@ AUX dnsmasq.confd 140 RMD160 33f6370377b38bf33acab72d8de86cba5e197d79 SHA1 83461
 AUX resolvconf.dnsmasq 4078 RMD160 8a290b908cf975e0cbb2b845c5c492d8a3f6e2aa SHA1 70f4ca6e6cbd91b700e7e82696d5508f3c1686dd SHA256 c3cf0b2249267aaf921f335ec10cf140db570b2aa4009be789a215c47323a1d5
 DIST dnsmasq-2.50.tar.lzma 295295 RMD160 383976e5222755c636ea5c18a3c62ca7e674eff9 SHA1 3bfc67b54a10807676a91f611c4a357fac7ce54b SHA256 052377b13b31caf416988185688f5258ddbf9517313fa9796a8fcd0ff6c4bb39
 DIST dnsmasq-2.51.tar.lzma 298629 RMD160 5025fcbf5588670d0d5858b5e0165378c6530da3 SHA1 930d020eec18c540d63171efb10d17d25e13b51c SHA256 09d0a8a97f99d846161e2c286f495b4d4b9d423512a5c78834e934b9f16c4629
+DIST dnsmasq-2.52.tar.lzma 304860 RMD160 38e05bfd746d618c0ac51ae245540b008474bde7 SHA1 5f4a7b52b3459a4f98ef25f3c95aef910c89dc21 SHA256 1f7834618181ef2a2feadb65a8a71e6fb75f5dfa07759df295726c2db765cca0
 EBUILD dnsmasq-2.50.ebuild 1675 RMD160 ec38e2664217fbad8e6490ecbf23183f7ed13343 SHA1 f62a2429640bbd900327f6440a6b6a2eb1fc4cef SHA256 06b0f4e67d092dfee7106d24831b77530f3db9fa4f00a3b3711e18f75c2942cd
 EBUILD dnsmasq-2.51.ebuild 2013 RMD160 f2378011751420abedf364642745d3496ca4df0e SHA1 d4c9af6272626022e5b15701c12f5b4a13d542f8 SHA256 a55d3e4acb1ec0758f0cc3b8be254ccb6fcbc0be318e604307af4b6f2323c64e
-MISC ChangeLog 24386 RMD160 8236959398995f77ee71d2924c7ccb9e9cca8307 SHA1 87f2ee94659a34aafd3d5f654735a684db7928ac SHA256 bfcfee9c15e8c2fb910678c8ba2f263d54df78d14cff5658df49b2c1aef33f1a
+EBUILD dnsmasq-2.52.ebuild 1708 RMD160 baefe98ecc335ad66adb0063f508c3485adcade2 SHA1 3fb282aeea87f6be09c79dbec7427894002fbfb4 SHA256 6a2f6d71291f2d9d24f62ece5524353acc4a6d0d0a5021278ea51d696c665981
+MISC ChangeLog 24583 RMD160 0afce16149569418459414601b356454e2709391 SHA1 8be5edaabb0d18b7550ddfa5fe90c22187cf41ba SHA256 a12685002ad025094d655470eb7c2c61d60bb92307ef9c0a925672d870776d7f
 MISC metadata.xml 409 RMD160 059cae7fc03f12c391df3954a25b50b98f8fd616 SHA1 3b262afb2f3281150f03de7e7ee5019d1ddf3a32 SHA256 b8cb70c6cedee588056993ffa8a720fcb3248dc8d10bf6397910cf8fed07b4e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktPZoYACgkQWt/XSf2CZdk5IwCeOoPe7K5P++mNVAFEbyigZcwl
-0lIAni6VGD4KiOUu+Ttlk8/xNDxkIfPO
-=RAGJ
+iEYEARECAAYFAktyyO4ACgkQWt/XSf2CZdkOnQCeNfGSSpASGFRe78p5Ma8lKl6g
+JvwAn3sSYzLYjdUYl8q/chhLhLDeQqd2
+=un23
 -----END PGP SIGNATURE-----
diff --git a/net-dns/dnsmasq/dnsmasq-2.52.ebuild b/net-dns/dnsmasq/dnsmasq-2.52.ebuild
new file mode 100644
index 000000000000..f2c0b4831ec8
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.52.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.52.ebuild,v 1.1 2010/02/10 14:55:06 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 ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="dbus +dhcp ipv6 nls tftp"
+
+RDEPEND="dbus? ( sys-apps/dbus )
+	nls? (
+		sys-devel/gettext
+		net-dns/libidn
+	)"
+
+DEPEND="${RDEPEND}
+	|| ( app-arch/xz-utils 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
+}