Install dnsmasq.conf properly in 2.5-r1 and 2.8-r1. Cleaned up old ebuilds.

12 files changed, 24 insertions, 84 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 342b317cdd9d..4207743e6423 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,16 @@
 # 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.35 2004/05/13 22:39:00 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.36 2004/05/14 19:12:07 avenj Exp $
+
+*dnsmasq-2.8-r1 (14 May 2004)
+
+  14 May 2004; Jon Portnoy <avenj@gentoo.org> dnsmasq-2.8-r1.ebuild :
+  Install dnsmasq.conf to /etc. Bug 51016.
+
+*dnsmasq-2.5-r1 (14 May 2004)
+
+  14 May 2004; Jon Portnoy <avenj@gentoo.org> dnsmasq-2.5-r1.ebuild :
+  Install dnsmasq.conf to /etc. Bug 51016.
 
 *dnsmasq-2.8 (13 May 2004)
 
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 1dea5d5e70f4..7a3e8ad07969 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -7,6 +7,8 @@ MD5 5dcac74343acd0b9451a5a74befa1903 dnsmasq-2.6.ebuild 969
 MD5 0aaca7081ddae8a75c1467d0a4bd8703 dnsmasq-2.7.ebuild 969
 MD5 51334b67d2cbed22e0efec4143bc6ff0 metadata.xml 245
 MD5 e5c316eb1299c32a192421c4b9b0b1a3 dnsmasq-2.8.ebuild 969
+MD5 4eaba5507e7f13dbb03732da747339a9 dnsmasq-2.8-r1.ebuild 1025
+MD5 9f4256a92da55cc59658554282b8a222 dnsmasq-2.5-r1.ebuild 1018
 MD5 d5e8dd3af7d243913de2c5a9624d6fc2 files/digest-dnsmasq-1.18 63
 MD5 610fd829ab1c61bc1012d67f5b085065 files/digest-dnsmasq-2.4 62
 MD5 5e027efa4f84b63cf41e3e9865aa0016 files/dnsmasq-init 510
@@ -16,3 +18,5 @@ MD5 9740ffe29b6d012b66cd2e532b8915ce files/digest-dnsmasq-2.5 62
 MD5 909854588c756189875becd57760f721 files/digest-dnsmasq-2.6 62
 MD5 c1cc976385b3ebe0fb4f72e3795e1e4c files/digest-dnsmasq-2.7 62
 MD5 39075dfeab4bbded5f0e8680df29e414 files/digest-dnsmasq-2.8 63
+MD5 39075dfeab4bbded5f0e8680df29e414 files/digest-dnsmasq-2.8-r1 63
+MD5 9740ffe29b6d012b66cd2e532b8915ce files/digest-dnsmasq-2.5-r1 62
diff --git a/net-dns/dnsmasq/dnsmasq-1.18.ebuild b/net-dns/dnsmasq/dnsmasq-1.18.ebuild
deleted file mode 100644
index 3157bb11afe8..000000000000
--- a/net-dns/dnsmasq/dnsmasq-1.18.ebuild
+++ /dev/null
@@ -1,33 +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-1.18.ebuild,v 1.5 2004/03/03 20:56:26 avenj Exp $
-
-DESCRIPTION="Small forwarding DNS server for local networks"
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
-
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.gz"
-DEPEND="virtual/glibc"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc ia64 amd64"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dosbin 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.2-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.2-r1.ebuild
deleted file mode 100644
index ec7bea3f9edf..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.2-r1.ebuild
+++ /dev/null
@@ -1,43 +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-r1.ebuild,v 1.2 2004/03/09 19:42:17 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 ~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.4.ebuild b/net-dns/dnsmasq/dnsmasq-2.5-r1.ebuild
index 5a03eb119711..3e73fce59ece 100644
--- a/net-dns/dnsmasq/dnsmasq-2.4.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.5-r1.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.4.ebuild,v 1.2 2004/03/20 18:49:05 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.5-r1.ebuild,v 1.1 2004/05/14 19:12:07 avenj Exp $
 
 DESCRIPTION="Small forwarding DNS server for local networks"
 HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
@@ -12,7 +12,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.gz"
 SLOT="0"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc sparc ~ia64 ~amd64 ~mips"
+KEYWORDS="x86 ppc sparc ia64 amd64 mips"
 
 DEPEND="virtual/glibc
 	>=sys-apps/sed-4"
@@ -41,4 +41,6 @@ src_install() {
 	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.6.ebuild b/net-dns/dnsmasq/dnsmasq-2.8-r1.ebuild
index cf9b3cb08b3b..b47ccb877ad7 100644
--- a/net-dns/dnsmasq/dnsmasq-2.6.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.8-r1.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.6.ebuild,v 1.2 2004/04/18 01:54:42 randy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.8-r1.ebuild,v 1.1 2004/05/14 19:12:07 avenj Exp $
 
 DESCRIPTION="Small forwarding DNS server for local networks"
 HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
@@ -41,4 +41,6 @@ src_install() {
 	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/files/digest-dnsmasq-1.18 b/net-dns/dnsmasq/files/digest-dnsmasq-1.18
deleted file mode 100644
index 42cf0f3ca7b0..000000000000
--- a/net-dns/dnsmasq/files/digest-dnsmasq-1.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a90478d2248009ada61ed5bee87c034c dnsmasq-1.18.tar.gz 70839
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.2-r1 b/net-dns/dnsmasq/files/digest-dnsmasq-2.2-r1
deleted file mode 100644
index f8f2f1d52232..000000000000
--- a/net-dns/dnsmasq/files/digest-dnsmasq-2.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 577852d339f6adfd15a04e31fbd39e55 dnsmasq-2.2.tar.gz 84682
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.4 b/net-dns/dnsmasq/files/digest-dnsmasq-2.4
deleted file mode 100644
index 6d4546742a83..000000000000
--- a/net-dns/dnsmasq/files/digest-dnsmasq-2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 50a0d6372a31d6637b56fbd65fa90942 dnsmasq-2.4.tar.gz 92529
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.5-r1 b/net-dns/dnsmasq/files/digest-dnsmasq-2.5-r1
new file mode 100644
index 000000000000..8a86002b4707
--- /dev/null
+++ b/net-dns/dnsmasq/files/digest-dnsmasq-2.5-r1
@@ -0,0 +1 @@
+MD5 f993ea53c0d11b4d884deb9229b86b26 dnsmasq-2.5.tar.gz 93186
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.6 b/net-dns/dnsmasq/files/digest-dnsmasq-2.6
deleted file mode 100644
index 595ca41691b5..000000000000
--- a/net-dns/dnsmasq/files/digest-dnsmasq-2.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a542ab5dd352822b37b8b5961f085a65 dnsmasq-2.6.tar.gz 98172
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.8-r1 b/net-dns/dnsmasq/files/digest-dnsmasq-2.8-r1
new file mode 100644
index 000000000000..a4ed8ed6337e
--- /dev/null
+++ b/net-dns/dnsmasq/files/digest-dnsmasq-2.8-r1
@@ -0,0 +1 @@
+MD5 3be23428250d049081364d5b04e819d1 dnsmasq-2.8.tar.gz 101728