Version bump.

Package-Manager: portage-2.1.3.7

4 files changed, 85 insertions, 16 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 34476a49af41..88d03045c105 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.133 2007/08/04 11:25:19 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.134 2007/08/29 21:26:55 chutzpah Exp $
+
+*dnsmasq-2.40 (29 Aug 2007)
+
+  29 Aug 2007; Patrick McLean <chutzpah@gentoo.org> +dnsmasq-2.40.ebuild:
+  Version bump.
 
   04 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> dnsmasq-2.39.ebuild:
   ppc stable, bug #184881
@@ -34,7 +39,7 @@
 
 *dnsmasq-2.39 (09 May 2007)
 
-  09 May 2007; Patrick McLean <chutz@gentoo.org> +dnsmasq-2.39.ebuild:
+  09 May 2007; Patrick McLean <chutzpah@gentoo.org> +dnsmasq-2.39.ebuild:
   Version bump (bug #177608).
 
   22 Apr 2007; Raúl Porcel <armin76@gentoo.org> dnsmasq-2.38-r1.ebuild:
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 0a513e298d2a..aca9896bdb21 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dnsmasq-fbsd-config.patch 451 RMD160 c9103d329ff429cdadea346db59678815fe3317d SHA1 28f48fc050c3cc964e717a1c09edb47b4438597a SHA256 8973971c4a161f48815c41045cb350394f330276085e9b8f3c578077abc0f359
 MD5 76c037c6372d10106bfaddc92bc6f898 files/dnsmasq-fbsd-config.patch 451
 RMD160 c9103d329ff429cdadea346db59678815fe3317d files/dnsmasq-fbsd-config.patch 451
@@ -21,6 +18,7 @@ DIST dnsmasq-2.31.tar.gz 204338 RMD160 7f45c52a76a1edabb868c42069bc4e7710d414e5
 DIST dnsmasq-2.34.tar.gz 255744 RMD160 36061107fa62c433df6a02a5fffdb30acc4bf893 SHA1 81c445433d95725c23a27ad06cd6a51665d14138 SHA256 8b9d6a277abecff19ae835c7f2e66e21cc9a4d37ceb35716aa655fd899287bc0
 DIST dnsmasq-2.38.tar.gz 272953 RMD160 bfa7ca4a5ededa2aedd708991b8177274b1db8b7 SHA1 267ac7b78e9f48b0d8d65f30fc0faa2a6552ae8c SHA256 54f3e9ac2bd9f622b28ab0d5149e9bc13d62d8826be085c32abc929bc30dda6a
 DIST dnsmasq-2.39.tar.gz 288990 RMD160 7bd7e60b825d070eb588319bdb0f2f9a6dc95d23 SHA1 9c6e3b0739e7b3e55aab14acb2bed81c6fb47db9 SHA256 c290f6af5508ecefe83b50a5a063867b05ab024dd2f5ec5ee4d056b2509190c1
+DIST dnsmasq-2.40.tar.gz 307051 RMD160 f86ee3c5e398b3a8eac103c6598f8f3db60d6955 SHA1 4af93b18c262b83e5f6bd24004483aa2ec6f3d20 SHA256 16517856930074fa4bba739f40ca1dd4a11b80a0623a12f2ae7be701083564e0
 EBUILD dnsmasq-2.31.ebuild 938 RMD160 0dd3943443611e33b7ed363ddf55b2c0d600e1b8 SHA1 d0d3da5c9fc88479a8404fe8f9c24ad0f8012552 SHA256 2e29e0ab17e0f672e5ad3626a5b9bce82cfe24f9c78419a8097703cac293f4c7
 MD5 6719d528864d65dda6e9cb40109f5d2e dnsmasq-2.31.ebuild 938
 RMD160 0dd3943443611e33b7ed363ddf55b2c0d600e1b8 dnsmasq-2.31.ebuild 938
@@ -41,10 +39,14 @@ EBUILD dnsmasq-2.39.ebuild 1588 RMD160 1b8b7395f62afb4792a50da3f3892433f4f13ce2
 MD5 98b0163c16b9bce51721ec7a5924e239 dnsmasq-2.39.ebuild 1588
 RMD160 1b8b7395f62afb4792a50da3f3892433f4f13ce2 dnsmasq-2.39.ebuild 1588
 SHA256 14cdc9adf5706cab1ed57a362975b7a9d4578c8ad491883ae472eccf5e169ec9 dnsmasq-2.39.ebuild 1588
-MISC ChangeLog 16490 RMD160 c1791de92d3bf9bb32f18a2894dcaacc9519e5c9 SHA1 dccc9066a81d8826723122bc31bad9b7ee8f220d SHA256 53765659297416e30a955bcbf5cf6b8e0ecb135f3d3f6eec0ebb28d0dda93389
-MD5 3c2fed0c1b82b8d1264f75f6c3c0ef51 ChangeLog 16490
-RMD160 c1791de92d3bf9bb32f18a2894dcaacc9519e5c9 ChangeLog 16490
-SHA256 53765659297416e30a955bcbf5cf6b8e0ecb135f3d3f6eec0ebb28d0dda93389 ChangeLog 16490
+EBUILD dnsmasq-2.40.ebuild 1597 RMD160 678ee444718822a45223704007ba42ecfe010c23 SHA1 483c0756b0d30f316397c58ea722eba6050cc5bf SHA256 097ad574b1f58e574558b164584af76b50ad4dbd18783c0bc4b144830ac3d515
+MD5 f0a5a7ae8c6e4fdd62989b7d337ef140 dnsmasq-2.40.ebuild 1597
+RMD160 678ee444718822a45223704007ba42ecfe010c23 dnsmasq-2.40.ebuild 1597
+SHA256 097ad574b1f58e574558b164584af76b50ad4dbd18783c0bc4b144830ac3d515 dnsmasq-2.40.ebuild 1597
+MISC ChangeLog 16611 RMD160 a6ea682bdc87a2052375d59cb1dfae9fa2f65553 SHA1 46803fdb83abe7b7cea4b7b8a5bdd0c85501f647 SHA256 d04b763a9d10da8b2e3ce2d4270f211f11c46437e4a178098c8c3c91529466ed
+MD5 cb1370a3fb133adfbc0376745bdc278e ChangeLog 16611
+RMD160 a6ea682bdc87a2052375d59cb1dfae9fa2f65553 ChangeLog 16611
+SHA256 d04b763a9d10da8b2e3ce2d4270f211f11c46437e4a178098c8c3c91529466ed ChangeLog 16611
 MISC metadata.xml 251 RMD160 9f6c5022895c245c7b1fdbaa24ae19cab04502c8 SHA1 4f7b27e3a8043f87fea8d4bc308e4b947f0e8675 SHA256 fd85d2faaf1d0c0eab6a4d2ab9eaa493e087a6108aafd0a5db6436bfc181783b
 MD5 f115572f9475ea98b22ceeb627ba07f0 metadata.xml 251
 RMD160 9f6c5022895c245c7b1fdbaa24ae19cab04502c8 metadata.xml 251
@@ -64,10 +66,6 @@ SHA256 a43f4ec7f3aae182582955b664e8bbf1b567ac8a79dd643573fcd50b7df408a2 files/di
 MD5 eec1d9db1c32759ab9c56b964a4960f0 files/digest-dnsmasq-2.39 238
 RMD160 97ff68a8b2864742489407d7ce093e87b3a86f46 files/digest-dnsmasq-2.39 238
 SHA256 a961e471d55d7fa6c32fd71d72530a576c641f2e146794518df14610d8f8d626 files/digest-dnsmasq-2.39 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD8DBQFG0D2yp/wUKkr7RBoRAkb6AKCqUOwuV5W+/spVhwZwnnHTkaX0VACePXe3
-8mCiHapEMs98QyirrYdvsMs=
-=ebUQ
------END PGP SIGNATURE-----
+MD5 993b98d6a9692b7d75f5fc88e70176e4 files/digest-dnsmasq-2.40 238
+RMD160 427b9d116e36c5c6059b398362dec497a1b3db10 files/digest-dnsmasq-2.40 238
+SHA256 c1ba3d5d359ebd28f12fae081f981d623263b20bcce6a346589aaacc32039f49 files/digest-dnsmasq-2.40 238
diff --git a/net-dns/dnsmasq/dnsmasq-2.40.ebuild b/net-dns/dnsmasq/dnsmasq-2.40.ebuild
new file mode 100644
index 000000000000..1f43328be565
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.40.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.40.ebuild,v 1.1 2007/08/29 21:26:55 chutzpah Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+MY_P="${P/_/}"
+MY_PV="${PV/_rc*/}"
+DESCRIPTION="Small forwarding DNS server"
+HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
+SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="dbus isc resolvconf tftp"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dbus? ( sys-apps/dbus )
+	resolvconf? ( net-dns/resolvconf-gentoo )"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# dnsmasq on FreeBSD wants the config file in a silly location, this fixes
+	epatch "${FILESDIR}/${PN}-fbsd-config.patch"
+}
+
+src_compile() {
+	use tftp || append-flags -DNO_TFTP
+	use dbus && sed -i '$ a #define HAVE_DBUS' src/config.h
+	use isc && sed -i '$ a #define HAVE_ISC_READER' src/config.h
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	make \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		DESTDIR="${D}" \
+		install || 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
+
+	if use resolvconf ; then
+		exeinto /etc/resolvconf/update.d
+		newexe ${FILESDIR}/resolvconf.dnsmasq dnsmasq
+	fi
+}
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.40 b/net-dns/dnsmasq/files/digest-dnsmasq-2.40
new file mode 100644
index 000000000000..7dff16b243f4
--- /dev/null
+++ b/net-dns/dnsmasq/files/digest-dnsmasq-2.40
@@ -0,0 +1,3 @@
+MD5 91b6063ae81146b9d70b4381b2f3e44f dnsmasq-2.40.tar.gz 307051
+RMD160 f86ee3c5e398b3a8eac103c6598f8f3db60d6955 dnsmasq-2.40.tar.gz 307051
+SHA256 16517856930074fa4bba739f40ca1dd4a11b80a0623a12f2ae7be701083564e0 dnsmasq-2.40.tar.gz 307051