Bump to 2.18, cleanup old ebuilds

10 files changed, 24 insertions, 148 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index c3caa9a9b63f..ad7b050740d3 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.58 2004/11/22 00:02:39 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.59 2004/11/22 16:34:37 avenj Exp $
+
+*dnsmasq-2.18 (22 Nov 2004)
+
+  22 Nov 2004; Jon Portnoy <avenj@gentoo.org> dnsmasq-2.18.ebuild :
+  Version bump.
 
   21 Nov 2004; <solar@gentoo.org> dnsmasq-2.15.ebuild, dnsmasq-2.16.ebuild,
   dnsmasq-2.17.ebuild:
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index fd5057a4b5fc..388c2df18339 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,31 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 cda4a1f79a0b97ab668d8bf1a7c9be7b dnsmasq-2.14.ebuild 923
-MD5 e81aa3b951df942dbae435944ddae309 dnsmasq-2.16.ebuild 1003
-MD5 26b4f1cdd80b7aee01db99e5ecf2ec0f dnsmasq-2.5-r1.ebuild 1018
-MD5 7a4b20cff20e1240e4ba113c04e6880b dnsmasq-2.13.ebuild 924
+MD5 46a4e47db292161b11b1846db0e9af0c ChangeLog 7196
 MD5 17ced6f6c41f0105ab28e94b8a7bd4f5 dnsmasq-2.8-r1.ebuild 1024
+MD5 26b4f1cdd80b7aee01db99e5ecf2ec0f dnsmasq-2.5-r1.ebuild 1018
+MD5 cda4a1f79a0b97ab668d8bf1a7c9be7b dnsmasq-2.14.ebuild 923
+MD5 51334b67d2cbed22e0efec4143bc6ff0 metadata.xml 245
 MD5 15b7b0f4e0039895f6b58d7299a38ba0 dnsmasq-2.15.ebuild 939
-MD5 4975daac017af7475926e513d5845e5d dnsmasq-2.17.ebuild 960
-MD5 8b74a5a2168e66def5a5ee2c9241374a ChangeLog 7082
+MD5 7a4b20cff20e1240e4ba113c04e6880b dnsmasq-2.13.ebuild 924
 MD5 2afac01881b13d0907550170a81ccecc dnsmasq-2.9.ebuild 1048
-MD5 51334b67d2cbed22e0efec4143bc6ff0 metadata.xml 245
-MD5 fc1326c5ef78a5ba4a73f6261806579f files/dnsmasq.confd 339
-MD5 6a1f2d0e8629951259975bc9f17ee8b3 files/digest-dnsmasq-2.13 64
+MD5 e81aa3b951df942dbae435944ddae309 dnsmasq-2.16.ebuild 1003
+MD5 4975daac017af7475926e513d5845e5d dnsmasq-2.17.ebuild 960
+MD5 4975daac017af7475926e513d5845e5d dnsmasq-2.18.ebuild 960
 MD5 088c015866ccd21fcb147094476a89cb files/digest-dnsmasq-2.14 64
+MD5 39075dfeab4bbded5f0e8680df29e414 files/digest-dnsmasq-2.8-r1 63
 MD5 8aeaa6fcd017624c86ad1a090cd8598a files/digest-dnsmasq-2.15 64
-MD5 8a37300e75cd9eea55ab1ff9d8146fa5 files/digest-dnsmasq-2.16 64
-MD5 0003eb8af2f7b8f64e1472822d1ff2ff files/digest-dnsmasq-2.17 64
-MD5 ddb2a3e0678cbf7c15d32a020c964b41 files/dnsmasq-2.16-gcc34.diff 928
 MD5 9740ffe29b6d012b66cd2e532b8915ce files/digest-dnsmasq-2.5-r1 62
-MD5 39075dfeab4bbded5f0e8680df29e414 files/digest-dnsmasq-2.8-r1 63
 MD5 51224c4bafcccf490d6de12440f681e5 files/dnsmasq-init 504
+MD5 fc1326c5ef78a5ba4a73f6261806579f files/dnsmasq.confd 339
+MD5 6a1f2d0e8629951259975bc9f17ee8b3 files/digest-dnsmasq-2.13 64
 MD5 d48a297550b42f81be10bd5fcf4e15a7 files/digest-dnsmasq-2.9 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBoSzI94CCfB4KcwwRAiB6AJ9HLiZh9MURweEi6S+us54b61nI1gCeJta5
-noQ0d1PTLeKhOXHnfVLNY+0=
-=vzEd
------END PGP SIGNATURE-----
+MD5 8a37300e75cd9eea55ab1ff9d8146fa5 files/digest-dnsmasq-2.16 64
+MD5 ddb2a3e0678cbf7c15d32a020c964b41 files/dnsmasq-2.16-gcc34.diff 928
+MD5 0003eb8af2f7b8f64e1472822d1ff2ff files/digest-dnsmasq-2.17 64
+MD5 fd57ba5d6351e2f53becbeaa223b8a34 files/digest-dnsmasq-2.18 64
diff --git a/net-dns/dnsmasq/dnsmasq-2.13.ebuild b/net-dns/dnsmasq/dnsmasq-2.13.ebuild
deleted file mode 100644
index cf4c8ed218a9..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.13.ebuild
+++ /dev/null
@@ -1,40 +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.13.ebuild,v 1.2 2004/08/14 19:18:54 vapier Exp $
-
-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=""
-
-DEPEND="virtual/libc
-	>=sys-apps/sed-4"
-
-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.14.ebuild b/net-dns/dnsmasq/dnsmasq-2.14.ebuild
deleted file mode 100644
index 6a19d03773c8..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.14.ebuild
+++ /dev/null
@@ -1,40 +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.14.ebuild,v 1.1 2004/09/12 18:45:13 avenj Exp $
-
-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=""
-
-DEPEND="virtual/libc
-	>=sys-apps/sed-4"
-
-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.16.ebuild b/net-dns/dnsmasq/dnsmasq-2.18.ebuild
index 9be8d40c70f1..a74abdb591c5 100644
--- a/net-dns/dnsmasq/dnsmasq-2.16.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.18.ebuild
@@ -1,8 +1,8 @@
 # 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.16.ebuild,v 1.3 2004/11/22 00:02:39 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.18.ebuild,v 1.1 2004/11/22 16:34:37 avenj Exp $
 
-inherit eutils
+#inherit eutils
 
 MY_P="${P/_/}"
 MY_PV="${PV/_rc*/}"
@@ -21,7 +21,6 @@ DEPEND=">=sys-apps/sed-4 ${RDEPEND}"
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_compile() {
-	epatch ${FILESDIR}/dnsmasq-2.16-gcc34.diff
 	emake || die
 }
 
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.13 b/net-dns/dnsmasq/files/digest-dnsmasq-2.13
deleted file mode 100644
index 7ecc362708d0..000000000000
--- a/net-dns/dnsmasq/files/digest-dnsmasq-2.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ec51ce5b1edc3e1cb743dcbef61ca808 dnsmasq-2.13.tar.gz 122579
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.14 b/net-dns/dnsmasq/files/digest-dnsmasq-2.14
deleted file mode 100644
index f56377a02eb2..000000000000
--- a/net-dns/dnsmasq/files/digest-dnsmasq-2.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1c74004d500fa15a5afea4c1542b4eed dnsmasq-2.14.tar.gz 124658
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.16 b/net-dns/dnsmasq/files/digest-dnsmasq-2.16
deleted file mode 100644
index 9408f13f200e..000000000000
--- a/net-dns/dnsmasq/files/digest-dnsmasq-2.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c838beda51afa45f5bb519a4f311c201 dnsmasq-2.16.tar.gz 131340
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.18 b/net-dns/dnsmasq/files/digest-dnsmasq-2.18
new file mode 100644
index 000000000000..878f0329e349
--- /dev/null
+++ b/net-dns/dnsmasq/files/digest-dnsmasq-2.18
@@ -0,0 +1 @@
+MD5 7a3d4864c97ebf484cd4e76487ad5e3c dnsmasq-2.18.tar.gz 133590
diff --git a/net-dns/dnsmasq/files/dnsmasq-2.16-gcc34.diff b/net-dns/dnsmasq/files/dnsmasq-2.16-gcc34.diff
deleted file mode 100644
index ef3dd144a05d..000000000000
--- a/net-dns/dnsmasq/files/dnsmasq-2.16-gcc34.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- dnsmasq-2.16.orig/src/cache.c
-+++ dnsmasq-2.16/src/cache.c
-@@ -17,7 +17,7 @@
- static int cache_inserted, cache_live_freed, insert_error;
- static union bigname *big_free;
- static int bignames_left, log_queries, cache_size, hash_size;
--static int index;
-+static int uid;
- 
- static void cache_free(struct crec *crecp);
- static void cache_unlink(struct crec *crecp);
-@@ -36,7 +36,7 @@
-   cache_size = size;
-   big_free = NULL;
-   bignames_left = size/10;
--  index = 0;
-+  uid = 0;
- 
-   cache_inserted = cache_live_freed = 0;
- 
-@@ -48,7 +48,7 @@
- 	{
- 	  cache_link(crecp);
- 	  crecp->flags = 0;
--	  crecp->uid = index++;
-+	  crecp->uid = uid++;
- 	}
-     }
-   
-@@ -85,7 +85,7 @@
- {
-   crecp->flags &= ~F_FORWARD;
-   crecp->flags &= ~F_REVERSE;
--  crecp->uid = index++; /* invalidate CNAMES pointing to this. */
-+  crecp->uid = uid++; /* invalidate CNAMES pointing to this. */
-   
-   if (cache_tail)
-     cache_tail->next = crecp;