Version bump + date updates

5 files changed, 50 insertions, 8 deletions

diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index da2f5ac88b11..733092d4a781 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,8 +1,8 @@
-MD5 d32c6290f18b234cc9953a93bbaa9fa8 ChangeLog 1819
-MD5 03673ac8f5973a74104fc598e5094c57 dnsmasq-1.18.ebuild 856
-MD5 4cc25bb0c0f6b73fad5ed9fb95578049 dnsmasq-2.0_rc1.ebuild 901
+MD5 8eea0c68e15bc94facee4445ba8c8ffd ChangeLog 1939
+MD5 d04df270cdc346fd8fbae36c72f0804e dnsmasq-1.18.ebuild 856
+MD5 41f6d3ff0e0021a88c47408f24e5e2c7 dnsmasq-2.0_rc1.ebuild 960
 MD5 51334b67d2cbed22e0efec4143bc6ff0 metadata.xml 245
-MD5 032fa6740472000be68e54e176ae43b6 dnsmasq-1.17.ebuild 848
+MD5 1829bd3553caea92919fb856187c91fc dnsmasq-1.17.ebuild 848
 MD5 d5e8dd3af7d243913de2c5a9624d6fc2 files/digest-dnsmasq-1.18 63
 MD5 d32bb9a88d1667aeae920e0bc0c23325 files/digest-dnsmasq-2.0_rc1 65
 MD5 c132959cadc793861366b6b45babcb23 files/dnsmasq-init 558
diff --git a/net-dns/dnsmasq/dnsmasq-1.17.ebuild b/net-dns/dnsmasq/dnsmasq-1.17.ebuild
index 7bc3c657b029..9d47f88c0fde 100644
--- a/net-dns/dnsmasq/dnsmasq-1.17.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-1.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-1.17.ebuild,v 1.1 2003/10/11 20:47:46 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-1.17.ebuild,v 1.2 2004/01/04 18:55:20 avenj Exp $
 
 DESCRIPTION="Small forwarding DNS server for local networks"
 HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
diff --git a/net-dns/dnsmasq/dnsmasq-1.18.ebuild b/net-dns/dnsmasq/dnsmasq-1.18.ebuild
index 56ee64f42acf..dcae8226d0c6 100644
--- a/net-dns/dnsmasq/dnsmasq-1.18.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-1.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-1.18.ebuild,v 1.2 2003/12/15 07:15:36 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-1.18.ebuild,v 1.3 2004/01/04 18:55:20 avenj Exp $
 
 DESCRIPTION="Small forwarding DNS server for local networks"
 HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
diff --git a/net-dns/dnsmasq/dnsmasq-2.0_rc1.ebuild b/net-dns/dnsmasq/dnsmasq-2.0_rc1.ebuild
new file mode 100644
index 000000000000..dff1f61b9928
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.0_rc1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.0_rc1.ebuild,v 1.1 2004/01/04 18:55:20 avenj Exp $
+
+DESCRIPTION="Small forwarding DNS server for local networks"
+HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
+
+MY_P="${P/_/}"
+MY_PV="${PV/_rc*/}"
+SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~ia64 ~amd64"
+
+DEPEND="virtual/glibc
+		>=sys-apps/sed-4"
+
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i "s:-O2:\"${CFLAGS}\":" Makefile
+	sed -i "s:-O2:\"${CFLAGS}\":" src/Makefile
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	dosbin src/dnsmasq
+	doman dnsmasq.8
+	dodoc CHANGELOG COPYING FAQ
+	dohtml *.html
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/dnsmasq-init dnsmasq
+	insinto /etc/conf.d
+	newins ${FILESDIR}/dnsmasq.confd dnsmasq
+}
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.0_rc1 b/net-dns/dnsmasq/files/digest-dnsmasq-2.0_rc1
new file mode 100644
index 000000000000..37f6fefae3c8
--- /dev/null
+++ b/net-dns/dnsmasq/files/digest-dnsmasq-2.0_rc1
@@ -0,0 +1 @@
+MD5 066bdc914357cd79013e3c355e26e031 dnsmasq-2.0rc1.tar.gz 80867