9 files changed, 23 insertions, 125 deletions
diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 7eba610dcfd6..1cdf00838822 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.44 2004/07/23 21:23:15 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.45 2004/07/27 21:32:57 avenj Exp $
+
+*dnsmasq-2.10 (27 Jul 2004)
+
+  27 Jul 2004; Jon Portnoy <avenj@gentoo.org> dnsmasq-2.10.ebuild :
+  Version bump. Also cleaned out unneeded ebuilds: 2.5, 2.7, 2.8
 
   23 Jul 2004; Ciaran McCreesh <ciaranm@gentoo.org> dnsmasq-2.9.ebuild:
   Stable on sparc, mips
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index a8b1893e2765..17993e32ba20 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,26 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d75d475bf3c0f4dca15a4b97bef8254e dnsmasq-2.8.ebuild 970
 MD5 9275e645adae9001012c9d26839c58e1 ChangeLog 5100
-MD5 fa3cc9b3e71bac3b5d4b9330a40ccade dnsmasq-2.9.ebuild 1023
 MD5 23413334748a2b9bb5bee14e1bd2e231 dnsmasq-2.8-r1.ebuild 1027
-MD5 51334b67d2cbed22e0efec4143bc6ff0 metadata.xml 245
-MD5 b35ce45591ac4fcd6ced25486a5a2c90 dnsmasq-2.7.ebuild 970
 MD5 26b4f1cdd80b7aee01db99e5ecf2ec0f dnsmasq-2.5-r1.ebuild 1018
-MD5 5bd9d2da09d4793b6c5fe71229f92842 dnsmasq-2.5.ebuild 961
-MD5 39075dfeab4bbded5f0e8680df29e414 files/digest-dnsmasq-2.8 63
-MD5 51224c4bafcccf490d6de12440f681e5 files/dnsmasq-init 504
-MD5 d48a297550b42f81be10bd5fcf4e15a7 files/digest-dnsmasq-2.9 63
-MD5 fc1326c5ef78a5ba4a73f6261806579f files/dnsmasq.confd 339
-MD5 9740ffe29b6d012b66cd2e532b8915ce files/digest-dnsmasq-2.5 62
+MD5 51334b67d2cbed22e0efec4143bc6ff0 metadata.xml 245
+MD5 fa3cc9b3e71bac3b5d4b9330a40ccade dnsmasq-2.9.ebuild 1023
+MD5 fa3cc9b3e71bac3b5d4b9330a40ccade dnsmasq-2.10.ebuild 1023
+MD5 05fdf84273db94d557ca7b639c44f1f0 files/digest-dnsmasq-2.10 64
 MD5 39075dfeab4bbded5f0e8680df29e414 files/digest-dnsmasq-2.8-r1 63
-MD5 c1cc976385b3ebe0fb4f72e3795e1e4c files/digest-dnsmasq-2.7 62
 MD5 9740ffe29b6d012b66cd2e532b8915ce files/digest-dnsmasq-2.5-r1 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBAYE9LLFUmVNQ7rkRAmHlAKCxSn0bFYgP+z7dNU/5JXddnMA05ACglH6U
-UMEpmF9A+Ys7DiEPyeftUHs=
-=74+Y
------END PGP SIGNATURE-----
+MD5 51224c4bafcccf490d6de12440f681e5 files/dnsmasq-init 504
+MD5 fc1326c5ef78a5ba4a73f6261806579f files/dnsmasq.confd 339
+MD5 d48a297550b42f81be10bd5fcf4e15a7 files/digest-dnsmasq-2.9 63
diff --git a/net-dns/dnsmasq/dnsmasq-2.5.ebuild b/net-dns/dnsmasq/dnsmasq-2.10.ebuild
index dec717fa1802..53ef977b79cc 100644
--- a/net-dns/dnsmasq/dnsmasq-2.5.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.10.ebuild
@@ -1,24 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.5.ebuild,v 1.6 2004/07/14 23:24:50 agriffis Exp $
-
-DESCRIPTION="Small forwarding DNS server for local networks"
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.10.ebuild,v 1.1 2004/07/27 21:32:57 avenj Exp $
 
 MY_P="${P/_/}"
 MY_PV="${PV/_rc*/}"
+DESCRIPTION="Small forwarding DNS server for local networks"
+HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
 SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.gz"
 
-SLOT="0"
-
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc ~ia64 amd64 mips"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~arm ~amd64 ~ia64 ~s390"
 IUSE=""
 
 DEPEND="virtual/libc
 	>=sys-apps/sed-4"
 
-
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_unpack() {
@@ -33,13 +30,15 @@ src_compile() {
 }
 
 src_install() {
-	dosbin src/dnsmasq
+	dosbin src/dnsmasq || die
 	doman dnsmasq.8
-	dodoc CHANGELOG COPYING FAQ
+	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.7.ebuild b/net-dns/dnsmasq/dnsmasq-2.7.ebuild
deleted file mode 100644
index d2346b570395..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.7.ebuild,v 1.4 2004/07/14 23:24:50 agriffis 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 s390"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=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.8.ebuild b/net-dns/dnsmasq/dnsmasq-2.8.ebuild
deleted file mode 100644
index 6e0b87a0e032..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.8.ebuild,v 1.4 2004/07/14 23:24:50 agriffis 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 s390"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=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.10 b/net-dns/dnsmasq/files/digest-dnsmasq-2.10
new file mode 100644
index 000000000000..251c6e61bf87
--- /dev/null
+++ b/net-dns/dnsmasq/files/digest-dnsmasq-2.10
@@ -0,0 +1 @@
+MD5 b82043d0f349c5b417b17a4184048a91 dnsmasq-2.10.tar.gz 121097
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.5 b/net-dns/dnsmasq/files/digest-dnsmasq-2.5
deleted file mode 100644
index 8a86002b4707..000000000000
--- a/net-dns/dnsmasq/files/digest-dnsmasq-2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f993ea53c0d11b4d884deb9229b86b26 dnsmasq-2.5.tar.gz 93186
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.7 b/net-dns/dnsmasq/files/digest-dnsmasq-2.7
deleted file mode 100644
index 879fa5089d8e..000000000000
--- a/net-dns/dnsmasq/files/digest-dnsmasq-2.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f526e81e11627177e9949b72d5424f7a dnsmasq-2.7.tar.gz 99948
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.8 b/net-dns/dnsmasq/files/digest-dnsmasq-2.8
deleted file mode 100644
index a4ed8ed6337e..000000000000
--- a/net-dns/dnsmasq/files/digest-dnsmasq-2.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3be23428250d049081364d5b04e819d1 dnsmasq-2.8.tar.gz 101728