Version bump, remove "isc" USE flag as reading of isc leasefiles has been dropped in this version (bug #252248). Clean out some old versions.

(Portage version: 2.1.6.1/cvs/Linux 2.6.27-gentoo-r4 x86_64)

5 files changed, 12 insertions, 196 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index c8bec06a69be..674bdbb302ae 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.174 2008/11/03 12:58:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.175 2008/12/23 16:00:58 chutzpah Exp $
+
+*dnsmasq-2.46 (23 Dec 2008)
+
+  23 Dec 2008; Patrick McLean <chutz@gentoo.org> -dnsmasq-2.39.ebuild,
+  -dnsmasq-2.41.ebuild, -dnsmasq-2.42.ebuild, -dnsmasq-2.43.ebuild,
+  +dnsmasq-2.46.ebuild:
+  Version bump, remove "isc" USE flag as reading of isc leasefiles has been
+  dropped in this version (bug #252248). Clean out some old versions.
 
   03 Nov 2008; Raúl Porcel <armin76@gentoo.org> dnsmasq-2.39.ebuild:
   Remove resolvconf-gentoo dep, as its p.masked and going to be removed
diff --git a/net-dns/dnsmasq/dnsmasq-2.39.ebuild b/net-dns/dnsmasq/dnsmasq-2.39.ebuild
deleted file mode 100644
index 69dc69539a70..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.39.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.39.ebuild,v 1.14 2008/11/03 12:58:17 armin76 Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="dbus isc resolvconf tftp"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dbus? ( sys-apps/dbus )
-	resolvconf? ( net-dns/openresolv )"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# dnsmasq on FreeBSD wants the config file in a silly location, this fixes
-	epatch "${FILESDIR}/${PN}-fbsd-config.patch"
-}
-
-src_compile() {
-	use tftp || append-flags -DNO_TFTP
-	use dbus && sed -i '$ a #define HAVE_DBUS' src/config.h
-	use isc && sed -i '$ a #define HAVE_ISC_READER' src/config.h
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	make \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		DESTDIR="${D}" \
-		install || die
-	dodoc CHANGELOG FAQ
-	dohtml *.html
-
-	newinitd "${FILESDIR}"/dnsmasq-init dnsmasq
-	newconfd "${FILESDIR}"/dnsmasq.confd dnsmasq
-	insinto /etc
-	newins dnsmasq.conf.example dnsmasq.conf
-
-	if use dbus ; then
-		insinto /etc/dbus-1/system.d
-		doins dbus/dnsmasq.conf
-	fi
-
-	if use resolvconf ; then
-		exeinto /etc/resolvconf/update.d
-		newexe "${FILESDIR}"/resolvconf.dnsmasq dnsmasq
-	fi
-}
diff --git a/net-dns/dnsmasq/dnsmasq-2.41.ebuild b/net-dns/dnsmasq/dnsmasq-2.41.ebuild
deleted file mode 100644
index 9adcc097d704..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.41.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.41.ebuild,v 1.10 2008/04/10 21:03:56 vapier Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="dbus ipv6 isc tftp"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dbus? ( sys-apps/dbus )"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i '/^AWK/s:nawk:gawk:' Makefile #214865
-	# dnsmasq on FreeBSD wants the config file in a silly location, this fixes
-	epatch "${FILESDIR}/${PN}-fbsd-config.patch"
-}
-
-src_compile() {
-	use tftp || append-flags -DNO_TFTP
-	use ipv6 || append-flags -DNO_IPV6
-	use isc && append-flags -DHAVE_ISC_READER
-	use dbus && sed -i '$ a #define HAVE_DBUS' src/config.h
-
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		|| die
-}
-
-src_install() {
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		DESTDIR="${D}" \
-		install || die
-
-	dodoc CHANGELOG FAQ
-	dohtml *.html
-
-	newinitd "${FILESDIR}"/dnsmasq-init dnsmasq
-	newconfd "${FILESDIR}"/dnsmasq.confd dnsmasq
-	insinto /etc
-	newins dnsmasq.conf.example dnsmasq.conf
-
-	if use dbus ; then
-		insinto /etc/dbus-1/system.d
-		doins dbus/dnsmasq.conf
-	fi
-}
diff --git a/net-dns/dnsmasq/dnsmasq-2.42.ebuild b/net-dns/dnsmasq/dnsmasq-2.42.ebuild
deleted file mode 100644
index a66084acab1d..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.42.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.42.ebuild,v 1.3 2008/11/05 00:37:25 vapier Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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="alpha ~amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="dbus ipv6 isc tftp"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dbus? ( sys-apps/dbus )"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i '/^AWK/s:nawk:gawk:' Makefile #214865
-	# dnsmasq on FreeBSD wants the config file in a silly location, this fixes
-	epatch "${FILESDIR}/${PN}-fbsd-config.patch"
-}
-
-src_compile() {
-	use tftp || append-flags -DNO_TFTP
-	use ipv6 || append-flags -DNO_IPV6
-	use isc && append-flags -DHAVE_ISC_READER
-	use dbus && sed -i '$ a #define HAVE_DBUS' src/config.h
-
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		|| die
-}
-
-src_install() {
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		DESTDIR="${D}" \
-		install || die
-
-	dodoc CHANGELOG FAQ
-	dohtml *.html
-
-	newinitd "${FILESDIR}"/dnsmasq-init dnsmasq
-	newconfd "${FILESDIR}"/dnsmasq.confd dnsmasq
-	insinto /etc
-	newins dnsmasq.conf.example dnsmasq.conf
-
-	if use dbus ; then
-		insinto /etc/dbus-1/system.d
-		doins dbus/dnsmasq.conf
-	fi
-}
diff --git a/net-dns/dnsmasq/dnsmasq-2.43.ebuild b/net-dns/dnsmasq/dnsmasq-2.46.ebuild
index ab9f9693872c..aeec608205ac 100644
--- a/net-dns/dnsmasq/dnsmasq-2.43.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.46.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.43.ebuild,v 1.9 2008/11/05 00:37:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.46.ebuild,v 1.1 2008/12/23 16:00:58 chutzpah Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -13,8 +13,8 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.lzma"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="dbus ipv6 isc nls tftp"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="dbus ipv6 nls tftp"
 
 RDEPEND="dbus? ( sys-apps/dbus )
 	nls? ( sys-devel/gettext )"
@@ -36,7 +36,6 @@ src_unpack() {
 src_compile() {
 	use tftp || append-flags -DNO_TFTP
 	use ipv6 || append-flags -DNO_IPV6
-	use isc && append-flags -DHAVE_ISC_READER
 	use dbus && sed -i '$ a #define HAVE_DBUS' src/config.h
 
 	emake \