Version bump

7 files changed, 11 insertions, 51 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index c88ff19f19ff..be1d7e8bb548 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.26 2004/03/12 01:43:23 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.27 2004/03/16 19:47:40 avenj Exp $
+
+*dnsmasq-2.5 (15 Mar 2004)
+
+  15 Mar 2004; Jon Portnoy <avenj@gentoo.org> dnsmasq-2.5.ebuild :
+  Version bump.
 
 *dnsmasq-2.4 (11 Mar 2004)
 
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 7ed399a8126b..ba83fbb9ec52 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,14 +1,12 @@
-MD5 4c773d83a0daded65361173cbbb65b1f ChangeLog 3192
+MD5 47398b2ef1f1f1c1271a7a25b0735156 ChangeLog 3304
 MD5 e3974e9a4fb89d4806e61d8dd8a6fd8c dnsmasq-2.2-r1.ebuild 966
-MD5 bbe8c341e23fff9ed405c7a055594655 dnsmasq-2.3.ebuild 964
 MD5 2974bcbddb2c5d14479d66e648111d23 dnsmasq-2.4.ebuild 964
 MD5 c1439e462802c578708845e5d52ce834 dnsmasq-1.18.ebuild 854
 MD5 51334b67d2cbed22e0efec4143bc6ff0 metadata.xml 245
-MD5 4294f79235823494f12f7f14e9926211 dnsmasq-2.2.ebuild 964
+MD5 63aeb18564487d855d6328c5b0d001fc dnsmasq-2.5.ebuild 964
 MD5 479deaff1695c413df3b06cf45d3f610 files/digest-dnsmasq-2.2-r1 62
-MD5 bc23b5d7db397d7ddb26d755f6477254 files/digest-dnsmasq-2.3 62
 MD5 610fd829ab1c61bc1012d67f5b085065 files/digest-dnsmasq-2.4 62
+MD5 9740ffe29b6d012b66cd2e532b8915ce files/digest-dnsmasq-2.5 62
 MD5 d5e8dd3af7d243913de2c5a9624d6fc2 files/digest-dnsmasq-1.18 63
 MD5 5e027efa4f84b63cf41e3e9865aa0016 files/dnsmasq-init 510
 MD5 16d59635b60089542c398b2b76af09de files/dnsmasq.confd 348
-MD5 479deaff1695c413df3b06cf45d3f610 files/digest-dnsmasq-2.2 62
diff --git a/net-dns/dnsmasq/dnsmasq-2.2.ebuild b/net-dns/dnsmasq/dnsmasq-2.2.ebuild
deleted file mode 100644
index fba46db7d503..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.2.ebuild,v 1.3 2004/02/27 20:49:29 ciaranm 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 ~mips"
-
-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/dnsmasq-2.3.ebuild b/net-dns/dnsmasq/dnsmasq-2.5.ebuild
index 70863af6ad95..08a513ce16c3 100644
--- a/net-dns/dnsmasq/dnsmasq-2.3.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.5.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.2 2004/03/10 23:35:55 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.5.ebuild,v 1.1 2004/03/16 19:47:40 avenj Exp $
 
 DESCRIPTION="Small forwarding DNS server for local networks"
 HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.2 b/net-dns/dnsmasq/files/digest-dnsmasq-2.2
deleted file mode 100644
index f8f2f1d52232..000000000000
--- a/net-dns/dnsmasq/files/digest-dnsmasq-2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 577852d339f6adfd15a04e31fbd39e55 dnsmasq-2.2.tar.gz 84682
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.3 b/net-dns/dnsmasq/files/digest-dnsmasq-2.3
deleted file mode 100644
index 900d24fac8f4..000000000000
--- a/net-dns/dnsmasq/files/digest-dnsmasq-2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7ba98fa092bf989d0258403cd1935e9f dnsmasq-2.3.tar.gz 91558
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.5 b/net-dns/dnsmasq/files/digest-dnsmasq-2.5
new file mode 100644
index 000000000000..8a86002b4707
--- /dev/null
+++ b/net-dns/dnsmasq/files/digest-dnsmasq-2.5
@@ -0,0 +1 @@
+MD5 f993ea53c0d11b4d884deb9229b86b26 dnsmasq-2.5.tar.gz 93186