Fix init script I broke - sorry

  Install a dbus config file in /etc/dbus-1/system.d

(Portage version: 2.1.2.2)

4 files changed, 78 insertions, 3 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 20f863b24a84..9b49d18a3002 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.116 2007/03/22 15:08:11 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.117 2007/03/23 10:44:02 uberlord Exp $
+
+*dnsmasq-2.38-r1 (23 Mar 2007)
+
+  23 Mar 2007; Roy Marples <uberlord@gentoo.org> files/dnsmasq-init,
+  +dnsmasq-2.38-r1.ebuild:
+  Fix init script I broke - sorry
+  Install a dbus config file in /etc/dbus-1/system.d
 
   22 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org> dnsmasq-2.38.ebuild:
   Stable on sparc
diff --git a/net-dns/dnsmasq/dnsmasq-2.38-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.38-r1.ebuild
new file mode 100644
index 000000000000..c245c71582d9
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.38-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.38-r1.ebuild,v 1.1 2007/03/23 10:44:02 uberlord 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 x86 ~x86-fbsd"
+IUSE="dbus isc resolvconf tftp"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51
+	dbus? ( sys-apps/dbus )
+	resolvconf? ( net-dns/resolvconf-gentoo )"
+
+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/files/digest-dnsmasq-2.38-r1 b/net-dns/dnsmasq/files/digest-dnsmasq-2.38-r1
new file mode 100644
index 000000000000..a7cfe1f59890
--- /dev/null
+++ b/net-dns/dnsmasq/files/digest-dnsmasq-2.38-r1
@@ -0,0 +1,3 @@
+MD5 ab066a97c226066485ad20e5ad5ce424 dnsmasq-2.38.tar.gz 272953
+RMD160 bfa7ca4a5ededa2aedd708991b8177274b1db8b7 dnsmasq-2.38.tar.gz 272953
+SHA256 54f3e9ac2bd9f622b28ab0d5149e9bc13d62d8826be085c32abc929bc30dda6a dnsmasq-2.38.tar.gz 272953
diff --git a/net-dns/dnsmasq/files/dnsmasq-init b/net-dns/dnsmasq/files/dnsmasq-init
index e25d45fe21ab..1343973ddf54 100644
--- a/net-dns/dnsmasq/files/dnsmasq-init
+++ b/net-dns/dnsmasq/files/dnsmasq-init
@@ -1,19 +1,20 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/files/dnsmasq-init,v 1.9 2007/02/23 11:09:41 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/files/dnsmasq-init,v 1.10 2007/03/23 10:44:02 uberlord Exp $
 
 opts="reload"
 
 depend() {
 	provide dns
 	need net
+	use dbus
 }
 
 start() {
 	ebegin "Starting dnsmasq"
 	start-stop-daemon --start --exec /usr/sbin/dnsmasq \
-	    -- pidfile /var/run/dnsmasq.pid \
+	    --pidfile /var/run/dnsmasq.pid \
 	    -- -x /var/run/dnsmasq.pid ${DNSMASQ_OPTS}
 	eend $?
 }