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

Package-Manager: portage-2.1.6.1/cvs/Linux 2.6.27-gentoo-r4 x86_64

6 files changed, 15 insertions, 215 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/Manifest b/net-dns/dnsmasq/Manifest
index d51f2efe4645..ce2e2a7c9e9a 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,26 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dnsmasq-fbsd-config.patch 451 RMD160 c9103d329ff429cdadea346db59678815fe3317d SHA1 28f48fc050c3cc964e717a1c09edb47b4438597a SHA256 8973971c4a161f48815c41045cb350394f330276085e9b8f3c578077abc0f359
 AUX dnsmasq-init 924 RMD160 feb28b270b5656834550e4dcfc1c87eeef88ab77 SHA1 119f112555a19236622637666758ef42d90ad74b SHA256 3803f1b7cb4c9f1c738537d5b5d91b37727572c81056e2fe6546a517ba992f55
 AUX dnsmasq.confd 140 RMD160 33f6370377b38bf33acab72d8de86cba5e197d79 SHA1 83461d2964dc3f0db777fc26141b07f6f3f5a762 SHA256 8bbc2634ab537ed3a17ee98be9c2667013a2b048f6981138017414e54fe90746
 AUX resolvconf.dnsmasq 4078 RMD160 8a290b908cf975e0cbb2b845c5c492d8a3f6e2aa SHA1 70f4ca6e6cbd91b700e7e82696d5508f3c1686dd SHA256 c3cf0b2249267aaf921f335ec10cf140db570b2aa4009be789a215c47323a1d5
-DIST dnsmasq-2.39.tar.gz 288990 RMD160 7bd7e60b825d070eb588319bdb0f2f9a6dc95d23 SHA1 9c6e3b0739e7b3e55aab14acb2bed81c6fb47db9 SHA256 c290f6af5508ecefe83b50a5a063867b05ab024dd2f5ec5ee4d056b2509190c1
-DIST dnsmasq-2.41.tar.gz 361517 RMD160 6f8af9934870d359b4155fca671c07c990c256ed SHA1 18ab4f28a3b9300a04f9a4db9cfc3a5d9bc46c55 SHA256 613d712d54ee38ec72d3effc9fe37e404fdbbad43e66f6689a8c509dc9a0d522
-DIST dnsmasq-2.42.tar.gz 366503 RMD160 d3cbd534f1beb5981f9f12869667832cf6f1ee1b SHA1 85c371ab8951715fbdab01e337e5649705f0b221 SHA256 802699e0543e995ac4953dcef14a5ba39df8158f6c9010de888a90dfd20125c2
-DIST dnsmasq-2.43.tar.lzma 274801 RMD160 8d80de608a55cf58a9d822ac7bdd06e1522626ef SHA1 22f9c1e86bcc8cfff8c2faa47deb91ac081822c3 SHA256 9bdb674336de188ff49cc945fc601030247aa222a5517f64c688bb27f6170fa2
 DIST dnsmasq-2.45.tar.lzma 275407 RMD160 991d5c44a1bb3baad9173d28255a42c8d88fbc02 SHA1 9c613108c3e41ceaa48c176f228439fec241049d SHA256 969ee94223879c4be469b6aba74186ba897fb06eb9872f5996b6b20419b9f31c
-EBUILD dnsmasq-2.39.ebuild 1582 RMD160 f4e5e6691d75a5eeed7e3bb4eef50f4514c03141 SHA1 953117d1e9814b7c5675d27310776f013bbcddba SHA256 4246fdc62f6ebef70e293dd886cffb8567b169acbccdaa9a7907cedbc3ae7853
-EBUILD dnsmasq-2.41.ebuild 1521 RMD160 0dfe63467317d3d7508e82e77894e993c8342727 SHA1 123a9ee5c825440970e6589c44d6a4b412aacb42 SHA256 34d5fb4d62abb4d21b7829033090da6087bc1f75cd873423d585e3991e6dbfcc
-EBUILD dnsmasq-2.42.ebuild 1524 RMD160 0e15365b69c7ec67a775295f254812ec825c76e5 SHA1 ce9492f867a2d4d88fda973883e5fc6a550cba3b SHA256 0bfcce0ebf274139b8037922bc0420d18ea03fdbcf7c91514df36782d9e92516
-EBUILD dnsmasq-2.43.ebuild 1729 RMD160 b47b611b197b0b95703541d0f1a45c98cd089584 SHA1 cd18daacad36452763fc14c5478d1bee4521158d SHA256 b2838864e045cbbca34f5314029cdb79fbaa89fbfec6c4e207b5f6c1d2596cd9
+DIST dnsmasq-2.46.tar.lzma 279718 RMD160 74bd9a1fc4e1e3fd4f3efbf3d9875696fcbf13d2 SHA1 8b41cf957ad9b7c9bec71933db57f0c1e525d90c SHA256 ed3483d6b2d6939d8d0dfe32e473ccbe8a3c7cfb3869f0378e50d814c00f370c
 EBUILD dnsmasq-2.45.ebuild 1729 RMD160 d57a6d872d6cf2aeb72e16702779ee94229df383 SHA1 e32c3722e2c58de9ef7bcc4c708dda0775a0b985 SHA256 cee382efd302a4d32fec76c9fcb059d25799348972ad672c8b71a92cf4dd9060
-MISC ChangeLog 22044 RMD160 303831ed18634f0ba5e9fb85fce951b5276ea484 SHA1 af65f97f618fe0bc6af52adf2b7220893aa9512f SHA256 8bcfd10767a76ca3dacf1286f16696ccab8fa6228884531fe0e59303575c17e0
+EBUILD dnsmasq-2.46.ebuild 1695 RMD160 a05f16ed465792ad16e5847b51f407e17e24f545 SHA1 fbbabfde3982acbec5157eca8eafb329fcc35bcb SHA256 a063a85d722767501fd3a8c2868625e8cad64a80183da26be877556ca79cae78
+MISC ChangeLog 22384 RMD160 660ab21a029ae3e4ec7839df476b9256a132615a SHA1 b960b691aa744a773b34142478684b440e6f2799 SHA256 e5573a5af727f16327ee506ecd2a3b2c42ff5b3fae477586d3a218a43598b819
 MISC metadata.xml 491 RMD160 e86ecc17575c174c48a1a644ea4e8d59ef6914d4 SHA1 33990e85b4265547aa60c52117a45eeb79b855b1 SHA256 a96286220434c2f784dc6757579c5593dbc2192f1aba112764290e022e6a30b2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkQ6swACgkQ67wieSYcaxfjqQCdE5vZrQAhqXsveLZ7GE6/5PjN
-QWsAoKbM+BzFXAgljcMG0spDlX+BglvB
-=WvM1
------END PGP SIGNATURE-----
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 \