Version bump.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 14 insertions, 88 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 8577214fa618..5d26876355fd 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.196 2010/05/24 18:53:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.197 2010/06/10 00:06:40 chutzpah Exp $
+
+*dnsmasq-2.55 (10 Jun 2010)
+
+  10 Jun 2010; Patrick McLean <chutzpah@gentoo.org> -dnsmasq-2.50.ebuild,
+  -dnsmasq-2.51.ebuild, +dnsmasq-2.55.ebuild:
+  Version bump.
 
   24 May 2010; Pacho Ramos <pacho@gentoo.org> dnsmasq-2.52.ebuild:
   stable amd64, bug 316715
diff --git a/net-dns/dnsmasq/dnsmasq-2.51.ebuild b/net-dns/dnsmasq/dnsmasq-2.51.ebuild
deleted file mode 100644
index 729868955966..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.51.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.51.ebuild,v 1.3 2010/01/14 18:46:16 chutzpah Exp $
-
-EAPI=2
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_P="${P/_/}"
-MY_PV="${PV/_/}"
-DESCRIPTION="Small forwarding DNS server"
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
-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 ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="dbus +dhcp ipv6 nls tftp"
-
-RDEPEND="dbus? ( sys-apps/dbus )
-	nls? (
-		sys-devel/gettext
-		net-dns/libidn
-	)"
-
-DEPEND="${RDEPEND}
-	|| ( app-arch/xz-utils app-arch/lzma-utils )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-pkg_setup() {
-	# quick-and-dirty workaround for bug #296204 until 2.52 comes out.
-	if use dbus; then
-		if ! use dhcp; then
-			eerror "Currently DBus support requires DHCP to be enabled. Please"
-			eerror "enable DHCP or disable DBUS (see bug #296204)."
-			die "DHCP required for DBUS support"
-		fi
-	fi
-}
-
-src_prepare() {
-	sed -i '/^AWK/s:nawk:gawk:' Makefile #214865
-
-	# dnsmasq on FreeBSD wants the config file in a silly location, this fixes
-	epatch "${FILESDIR}/${PN}-2.47-fbsd-config.patch"
-}
-
-src_configure() {
-	use tftp || append-flags -DNO_TFTP
-	use dhcp || append-flags -DNO_DHCP
-	use ipv6 || append-flags -DNO_IPV6
-	use dbus && sed -i '$ a #define HAVE_DBUS' src/config.h
-}
-
-src_compile() {
-	emake \
-		PREFIX=/usr \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		all$(use nls && echo "-i18n") || die
-}
-
-src_install() {
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		DESTDIR="${D}" \
-		install$(use nls && echo "-i18n") || 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.50.ebuild b/net-dns/dnsmasq/dnsmasq-2.55.ebuild
index 44d480c4d551..9ec5b20b3ac0 100644
--- a/net-dns/dnsmasq/dnsmasq-2.50.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.55.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.50.ebuild,v 1.8 2009/09/20 18:53:48 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.55.ebuild,v 1.1 2010/06/10 00:06:40 chutzpah Exp $
 
 EAPI=2
 
@@ -14,11 +14,14 @@ 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 x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="dbus +dhcp ipv6 nls tftp"
 
 RDEPEND="dbus? ( sys-apps/dbus )
-	nls? ( sys-devel/gettext )"
+	nls? (
+		sys-devel/gettext
+		net-dns/libidn
+	)"
 
 DEPEND="${RDEPEND}
 	|| ( app-arch/xz-utils app-arch/lzma-utils )"