Version bump for 2.24, removed 2.17 and 2.20

(Portage version: 2.0.53_rc6)

7 files changed, 34 insertions, 71 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 23f53dd3dd22..437e949a0747 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.79 2005/09/15 22:49:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.80 2005/11/28 10:14:21 avenj Exp $
+
+*dnsmasq-2.24 (28 Nov 2005)
+
+  29 Nov 2005; Jon Portnoy <avenj@gentoo.org> dnsmasq-2.24.ebuild :
+  Version bump. Removed 2.17, 2.20
 
   15 Sep 2005; Aron Griffis <agriffis@gentoo.org> dnsmasq-2.22.ebuild:
   Mark 2.22 stable on alpha
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index ccc9bfa77b89..29e6c6d20ff8 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,27 +1,29 @@
-MD5 91e1e478444aa0c1e3f5aee27037d747 dnsmasq-2.17.ebuild 960
+MD5 cf624a028a1473f5686744f997ea25a3 ChangeLog 9578
 MD5 48d634c6abc444cac5d45d17b2a7bdee dnsmasq-2.15.ebuild 936
+MD5 91e1e478444aa0c1e3f5aee27037d747 dnsmasq-2.17.ebuild 960
+MD5 24757d5e7ba1c0fd1705e59434bfe994 dnsmasq-2.18.ebuild 985
+MD5 91d3ec6ef54e14402be5dba829d3687e dnsmasq-2.19.ebuild 985
 MD5 631b22b97b4bf5bb6f716c61a494b3c8 dnsmasq-2.20.ebuild 985
-MD5 51334b67d2cbed22e0efec4143bc6ff0 metadata.xml 245
-MD5 cf624a028a1473f5686744f997ea25a3 ChangeLog 9578
+MD5 84a14040e0961e3a8dc9c702a7384a0b dnsmasq-2.21.ebuild 1004
+MD5 0a447ac8c0c6f3a6d325a7bc615a9804 dnsmasq-2.22.ebuild 966
+MD5 91788f74c8f25d8bcab3e74be3496204 dnsmasq-2.23.ebuild 973
+MD5 91788f74c8f25d8bcab3e74be3496204 dnsmasq-2.24.ebuild 973
 MD5 4916f0d0bb6efa3c999a009a99c45e81 dnsmasq-2.5-r1.ebuild 1015
-MD5 24757d5e7ba1c0fd1705e59434bfe994 dnsmasq-2.18.ebuild 985
 MD5 66903e37cdb9d33fbc05e5d7f7901cd1 dnsmasq-2.8-r1.ebuild 1021
-MD5 91788f74c8f25d8bcab3e74be3496204 dnsmasq-2.23.ebuild 973
-MD5 84a14040e0961e3a8dc9c702a7384a0b dnsmasq-2.21.ebuild 1004
 MD5 808494889b8278715196a9ee62ab3bfc dnsmasq-2.9.ebuild 1048
-MD5 0a447ac8c0c6f3a6d325a7bc615a9804 dnsmasq-2.22.ebuild 966
-MD5 91d3ec6ef54e14402be5dba829d3687e dnsmasq-2.19.ebuild 985
-MD5 9740ffe29b6d012b66cd2e532b8915ce files/digest-dnsmasq-2.5-r1 62
-MD5 0d0ee462e594bdd083a898470c87db6d files/digest-dnsmasq-2.20 64
-MD5 d1c7a35f0fe7e1e17d98990eec175b06 files/dnsmasq221-netlink.diff 337
-MD5 51224c4bafcccf490d6de12440f681e5 files/dnsmasq-init 504
-MD5 eb645b7c57fc7e7eae70cbdb2d0d2686 files/digest-dnsmasq-2.21 64
-MD5 d48a297550b42f81be10bd5fcf4e15a7 files/digest-dnsmasq-2.9 63
 MD5 8aeaa6fcd017624c86ad1a090cd8598a files/digest-dnsmasq-2.15 64
-MD5 39075dfeab4bbded5f0e8680df29e414 files/digest-dnsmasq-2.8-r1 63
 MD5 0003eb8af2f7b8f64e1472822d1ff2ff files/digest-dnsmasq-2.17 64
-MD5 d4699f33bca669027a10af5b4520911a files/digest-dnsmasq-2.19 64
 MD5 fd57ba5d6351e2f53becbeaa223b8a34 files/digest-dnsmasq-2.18 64
-MD5 aa5c1892e6294eb7d660518ee85b6435 files/digest-dnsmasq-2.23 64
+MD5 d4699f33bca669027a10af5b4520911a files/digest-dnsmasq-2.19 64
+MD5 0d0ee462e594bdd083a898470c87db6d files/digest-dnsmasq-2.20 64
+MD5 eb645b7c57fc7e7eae70cbdb2d0d2686 files/digest-dnsmasq-2.21 64
 MD5 a00c1f68d8cfa18ee5eedc14e4e95c13 files/digest-dnsmasq-2.22 64
+MD5 aa5c1892e6294eb7d660518ee85b6435 files/digest-dnsmasq-2.23 64
+MD5 4b5657f628105447730b0fc0f5ac00be files/digest-dnsmasq-2.24 64
+MD5 9740ffe29b6d012b66cd2e532b8915ce files/digest-dnsmasq-2.5-r1 62
+MD5 39075dfeab4bbded5f0e8680df29e414 files/digest-dnsmasq-2.8-r1 63
+MD5 d48a297550b42f81be10bd5fcf4e15a7 files/digest-dnsmasq-2.9 63
+MD5 51224c4bafcccf490d6de12440f681e5 files/dnsmasq-init 504
 MD5 fc1326c5ef78a5ba4a73f6261806579f files/dnsmasq.confd 339
+MD5 d1c7a35f0fe7e1e17d98990eec175b06 files/dnsmasq221-netlink.diff 337
+MD5 51334b67d2cbed22e0efec4143bc6ff0 metadata.xml 245
diff --git a/net-dns/dnsmasq/dnsmasq-2.17.ebuild b/net-dns/dnsmasq/dnsmasq-2.17.ebuild
deleted file mode 100644
index 0467c46a9fe1..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.17.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.17.ebuild,v 1.3 2005/02/07 02:53:17 kumba Exp $
-
-#inherit eutils
-
-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="~x86 ~ppc ~sparc ~mips ~arm ~amd64 ~ia64 ~s390"
-IUSE=""
-
-RDEPEND="virtual/libc"
-DEPEND=">=sys-apps/sed-4 ${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	make \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		DESTDIR=${D} \
-		install || die
-	dodoc CHANGELOG FAQ
-	dohtml *.html
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/dnsmasq-init dnsmasq
-	insinto /etc/conf.d
-	newins ${FILESDIR}/dnsmasq.confd dnsmasq
-	insinto /etc
-	newins dnsmasq.conf.example dnsmasq.conf
-}
diff --git a/net-dns/dnsmasq/dnsmasq-2.20.ebuild b/net-dns/dnsmasq/dnsmasq-2.24.ebuild
index a66b165e09a4..750f0340e012 100644
--- a/net-dns/dnsmasq/dnsmasq-2.20.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.24.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.20.ebuild,v 1.1 2005/01/25 00:32:24 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.24.ebuild,v 1.1 2005/11/28 10:14:21 avenj Exp $
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 MY_P="${P/_/}"
 MY_PV="${PV/_rc*/}"
@@ -12,15 +12,14 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~alpha"
 IUSE=""
 
-RDEPEND="virtual/libc"
+RDEPEND=""
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
 	>=sys-apps/portage-2.0.51"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
+S=${WORKDIR}/${PN}-${MY_PV}
 
 src_compile() {
 	emake CC="$(tc-getCC)" || die
@@ -30,13 +29,13 @@ src_install() {
 	make \
 		PREFIX=/usr \
 		MANDIR=/usr/share/man \
-		DESTDIR=${D} \
+		DESTDIR="${D}" \
 		install || die
 	dodoc CHANGELOG FAQ
 	dohtml *.html
 
-	newinitd ${FILESDIR}/dnsmasq-init dnsmasq
-	newconfd ${FILESDIR}/dnsmasq.confd dnsmasq
+	newinitd "${FILESDIR}"/dnsmasq-init dnsmasq
+	newconfd "${FILESDIR}"/dnsmasq.confd dnsmasq
 	insinto /etc
 	newins dnsmasq.conf.example dnsmasq.conf
 }
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.17 b/net-dns/dnsmasq/files/digest-dnsmasq-2.17
deleted file mode 100644
index beff508754b0..000000000000
--- a/net-dns/dnsmasq/files/digest-dnsmasq-2.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c66ded2740975cf05040934ed4427f6a dnsmasq-2.17.tar.gz 132911
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.20 b/net-dns/dnsmasq/files/digest-dnsmasq-2.20
deleted file mode 100644
index 0b78810b0c1e..000000000000
--- a/net-dns/dnsmasq/files/digest-dnsmasq-2.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a1501ff96a2925d9c1d44388892cd5af dnsmasq-2.20.tar.gz 139194
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.24 b/net-dns/dnsmasq/files/digest-dnsmasq-2.24
new file mode 100644
index 000000000000..cce3e832aace
--- /dev/null
+++ b/net-dns/dnsmasq/files/digest-dnsmasq-2.24
@@ -0,0 +1 @@
+MD5 d269531be1f130ab642c71c593138d31 dnsmasq-2.24.tar.gz 188961