Minor fixups to systemd unit (bug #480042). Don't try to remove nonexistant directories.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)

4 files changed, 23 insertions, 5 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index d1f47baa8a25..dfa4592bf925 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.247 2013/12/10 19:46:59 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.248 2013/12/10 19:55:03 chutzpah Exp $
+
+  10 Dec 2013; Patrick McLean <chutzpah@gentoo.org> +files/dnsmasq.service-r1,
+  dnsmasq-2.68.ebuild, files/dnsmasq.service:
+  Minor fixups to systemd unit (bug #480042). Don't try to remove nonexistant
+  directories.
 
 *dnsmasq-2.68 (10 Dec 2013)
 
diff --git a/net-dns/dnsmasq/dnsmasq-2.68.ebuild b/net-dns/dnsmasq/dnsmasq-2.68.ebuild
index e333ebf5ac21..162fe8c3c979 100644
--- a/net-dns/dnsmasq/dnsmasq-2.68.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.68.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.68.ebuild,v 1.1 2013/12/10 19:46:59 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.68.ebuild,v 1.2 2013/12/10 19:55:03 chutzpah Exp $
 
 EAPI=5
 
@@ -105,7 +105,7 @@ src_install() {
 	for lingua in ${DM_LINGUAS}; do
 		use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
 	done
-	rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
+	[[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
 
 	dodoc CHANGELOG CHANGELOG.archive FAQ
 	dodoc -r logo
@@ -129,5 +129,5 @@ src_install() {
 		doman contrib/wrt/{dhcp_release,dhcp_lease_time}.1
 	fi
 
-	systemd_dounit "${FILESDIR}"/dnsmasq.service
+	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
 }
diff --git a/net-dns/dnsmasq/files/dnsmasq.service b/net-dns/dnsmasq/files/dnsmasq.service
index 3f71839ab883..8e313bcfd996 100644
--- a/net-dns/dnsmasq/files/dnsmasq.service
+++ b/net-dns/dnsmasq/files/dnsmasq.service
@@ -1,10 +1,11 @@
 [Unit]
 Description=A lightweight DHCP and caching DNS server
+After=network.target
 
 [Service]
 Type=simple
 ExecStartPre=/usr/sbin/dnsmasq --test
-ExecStart=/usr/sbin/dnsmasq -k
+ExecStart=/usr/sbin/dnsmasq -k --user=dnsmasq --group=dnsmasq
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/net-dns/dnsmasq/files/dnsmasq.service-r1 b/net-dns/dnsmasq/files/dnsmasq.service-r1
new file mode 100644
index 000000000000..8e313bcfd996
--- /dev/null
+++ b/net-dns/dnsmasq/files/dnsmasq.service-r1
@@ -0,0 +1,12 @@
+[Unit]
+Description=A lightweight DHCP and caching DNS server
+After=network.target
+
+[Service]
+Type=simple
+ExecStartPre=/usr/sbin/dnsmasq --test
+ExecStart=/usr/sbin/dnsmasq -k --user=dnsmasq --group=dnsmasq
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target