Version bump, some cleanups suggested by Jan Psota <jasiu@kkfsa.pl>. Remove sed workaround for bug #214865 as the Makefile no longer calls any form of awk.

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

3 files changed, 99 insertions, 15 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index e0ffa0f4b269..3943fc68030e 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.200 2011/02/16 19:33:07 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.201 2011/02/24 16:44:26 chutzpah Exp $
+
+*dnsmasq-2.57 (24 Feb 2011)
+
+  24 Feb 2011; Patrick McLean <chutzpah@gentoo.org> +dnsmasq-2.57.ebuild:
+  Version bump, some cleanups suggested by Jan Psota <jasiu@kkfsa.pl>. Remove
+  sed workaround for bug #214865 as the Makefile no longer calls any form of
+  awk.
 
 *dnsmasq-2.56 (16 Feb 2011)
 
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index c1807b3c35f4..39dd6cccd3d3 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -9,25 +9,27 @@ AUX resolvconf.dnsmasq 4078 RMD160 8a290b908cf975e0cbb2b845c5c492d8a3f6e2aa SHA1
 DIST dnsmasq-2.52.tar.lzma 304860 RMD160 38e05bfd746d618c0ac51ae245540b008474bde7 SHA1 5f4a7b52b3459a4f98ef25f3c95aef910c89dc21 SHA256 1f7834618181ef2a2feadb65a8a71e6fb75f5dfa07759df295726c2db765cca0
 DIST dnsmasq-2.55.tar.lzma 320116 RMD160 2e6f623da3f453a2c6086dc80315a9308a4245ef SHA1 0bd62b3846bad2ed5e243b1b8aae59c2e0e20da5 SHA256 ae36d8031640b3202d196170025ee13e6d9240cb6d523a2a3e4f7ab1289e1473
 DIST dnsmasq-2.56.tar.lzma 331543 RMD160 448787766684dc354582423e234825c808df557f SHA1 f6e6f488798c5b0d84698abf4801f922ff78e36c SHA256 36341d2534801cae3463489b79d912f9db8b5dbf5527efd69821a7984def2c33
+DIST dnsmasq-2.57.tar.lzma 333348 RMD160 e78d2f87804e88b2021da3c593191338d0deaed4 SHA1 cbf0c22a7b856746b23f2d894070c60d32c4a97e SHA256 b35c5a31afce2b7c4bd62566d5dc87e1ce62d0d2ebd9c2baf15b5ea16bcc279d
 EBUILD dnsmasq-2.52.ebuild 1697 RMD160 059361530d2c65008fc39757a96c0f70ee9ab18d SHA1 a09dd2685ddc664e3f2b8065be82afcd61082250 SHA256 4dcd5cafff159a8377381a28b438b7604fed1e959d4d120d8f0175665e7e55ae
 EBUILD dnsmasq-2.55.ebuild 1728 RMD160 87ab8a4440f21c7ae141f25fa06e9606e1971b4d SHA1 e5b69d5a3dbce4ef3f117d0107e6bdb8291472d3 SHA256 c9cc19c5ab05fe73e028a34c6d5456f7032d04b77c86f497a70a07002fcadfd3
 EBUILD dnsmasq-2.56.ebuild 1728 RMD160 31d2a20a181e719ec84c176c53577e125a293ffa SHA1 83df230db44bdfe939d0f7046eb7000876d0965a SHA256 de365c3cbd2b0deea2cd5ddac0570f91c12da8e5a69f1905133a3bbe358b9bbc
-MISC ChangeLog 25805 RMD160 462322451f2a2acbb4c2740333ecdfbaa8b18189 SHA1 251d3073d63baf70ea30a3d315899924e92b4f7d SHA256 018d39063aeef53da1c522efe44f756cab31106ce8fc7cc334bd6f13b09b1364
+EBUILD dnsmasq-2.57.ebuild 1744 RMD160 6707b31d961965de53c66409466f5fe99ac0ddc9 SHA1 a3bf5710c2aa0ee8b891079b429c3a428cd13023 SHA256 4fae7fb168eb1cf96f978090482f969ef357c913d34c4c4834b187e70c5a4eaf
+MISC ChangeLog 26071 RMD160 88167a6792852c4a280f438459e215cac17142b7 SHA1 9b5c25b647f8908e4492adccf714da04d4405199 SHA256 cdcacc229062f442ac7f5db19997579fd40250f930562af4f0a3dabc439be3b0
 MISC metadata.xml 409 RMD160 059cae7fc03f12c391df3954a25b50b98f8fd616 SHA1 3b262afb2f3281150f03de7e7ee5019d1ddf3a32 SHA256 b8cb70c6cedee588056993ffa8a720fcb3248dc8d10bf6397910cf8fed07b4e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNXCaEAAoJEHy/RO9cNQiDAC0P/R8GYg9djpaiPAjg4QPBHDYB
-Lb5Fc26LF2/jos/0LRMPCBszCZFJAZuxlbao6RaZfC+nFjOYSbjQPCHKgv+aPvtB
-d1dQpfodl64yUsx7IBuRl8VZJ8Wr70FjrxW5PPJDbMExnBFuQw7+LnqrBKkrM8YG
-BlASe9VJ6H/pTSvaYZP0ecL/mNSyJcr2ln5WCyEuf5apnEst861afkUqYF4Ekw0z
-qaLqDULGavmRIURIUxu9TRKCrUUNa8wtjEfe+l7y4GxTO6XUHwbMYI+saAcsuWsW
-GKPv+IGABr+/fGqUvdwAiGOYlH4TPTr6tg00dhs5rMACj2vnSx34+4uyPtpmfUn9
-NF0xyfC2cE6ORyd2RRYqdMdr33oZSUp/n37TpVEmKq4jovlbXiH7UWfQGP8IqTx6
-sDz/Fl9emM0EHIJ/HsOWsMLNdoClOjcN/HuX80FeID2J46RypelUrcC0G8+qjq9o
-9rbrK828OF2BMfVUoPutVgt0SbgnoBYQqyIalnDsoJghV4lVXiMXmlZ6JxNuWpTb
-PnYvMWFcAI30EWLyAtnXNozqOXSDciPMvvZYi5trjM8kfN0beUUkOx1rYRR09o8n
-GvZTDqbdO23452Sfd8ReOrCvnMCpBc8a0zUmmaaOdGo4ipg2ij0ZW1Q/HMlBKive
-LG3yESqDNftEhwNtkqHj
-=0KZ3
+iQIcBAEBAgAGBQJNZor6AAoJEHy/RO9cNQiDMSwP+wUgqPUpIq9sXcF+Fd5AKjvi
+FFFCHwouMt5CSAVYXwMY2J9UPsE8h5nYqVdzibZCTjiz32NWfKsX6gMOckuTcs4W
+IEnT9RPFwVjIjD8AKL1x0Ocf9znNvlXFo2X3ap9MQBVbIZQu5ynJv8W4VlGBL152
+BNl02xf/fWQMgppEj7fC6CrETfMCBg4xgGiLaPxcFv6wfjzMPYgeMHvB5IuQGslB
+/YsGcD3fLn6WmhjQYZtfW9Lwm8eNZ015MmvG97FUsXXIBAIhundYSMyng/JfstmO
+iwhHcx1WeB/c3L1OIL1I+vahfGIXxJ5s0+TaeWyoth/Sk+ju6aG3qO47f2eGZ4nV
+T/u1LfXuPbyFZUpsJJ1tBtBvMkUN9tWxm6fvriBi0x6uqT8sc8i25V3K9N8ujbf2
+KOFW1Q4JTh5gdZPHAlmG890OGnjSFndwCC2467vTfDGMCr0X/M8m9+67n0S1OofZ
+Tgl8LQbT1MBno9JEXWDaUYspA8p5B9PCHLkNfpEvtqceomyRoOQ9YcJ3pxBel5h8
+TO4oBTNEI9Nl8e+waUk0W4ycuXdivRyuLo03SzyLmKDHfkc66WfdTKeOToykq466
+Yw/UoS2kV95vzYHIzWIcn1KUdhAzSJb03Ez+0VAnIfCXN7xLrxyzNW+BSrIaWNYV
+JErmz3af1X1d1s/OezXv
+=7iq2
 -----END PGP SIGNATURE-----
diff --git a/net-dns/dnsmasq/dnsmasq-2.57.ebuild b/net-dns/dnsmasq/dnsmasq-2.57.ebuild
new file mode 100644
index 000000000000..c6d019a03518
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.57.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.57.ebuild,v 1.1 2011/02/24 16:44:26 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 idn ipv6 nls tftp"
+
+RDEPEND="dbus? ( sys-apps/dbus )
+	idn? ( net-dns/libidn )
+	nls? (
+		sys-devel/gettext
+		net-dns/libidn
+	)"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	|| ( app-arch/xz-utils app-arch/lzma-utils )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	# dnsmasq on FreeBSD wants the config file in a silly location, this fixes
+	epatch "${FILESDIR}/${PN}-2.47-fbsd-config.patch"
+}
+
+src_configure() {
+	COPTS=""
+	use tftp || COPTS+=" -DNO_TFTP"
+	use dhcp || COPTS+=" -DNO_DHCP"
+	use ipv6 || COPTS+=" -DNO_IPV6"
+	use dbus && COPTS+=" -DHAVE_DBUS"
+	use idn  && COPTS+=" -DHAVE_IDN"
+}
+
+src_compile() {
+	emake \
+		PREFIX=/usr \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		COPTS="${COPTS}" \
+		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
+}