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

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF

5 files changed, 40 insertions, 21 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/Manifest b/net-dns/dnsmasq/Manifest
index 150e60299208..37dac29aa067 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -5,29 +5,30 @@ AUX dnsmasq-2.47-fbsd-config.patch 505 SHA256 4e05e46b59254e718550cda505986b9b57
 AUX dnsmasq-2.66-dhcp-option-zero.patch 4084 SHA256 8d51ddd44560ef96a2e880997e8d337ed9c8aff0747e22b82444f87aed3d6ac4 SHA512 afee1cbed8fdb64cf73e92e68ed051433ee00adcce279826b251dcebd0fbb5b8044aff95da6d5bd544034f7797330321eb2339347409b75baf0ab1133358b33b WHIRLPOOL a222586e7e64707e57dfd80ba509d28a3f9031d58ede163fa5e95ace6a1b9f8db5ca9c5f32e8515c9851627a23490291d37097c230ba89fbfddb9469061ea011
 AUX dnsmasq-init-r2 595 SHA256 bc80bcd171db123a6d02df9ebbfde3fb59078295ff24dea9b9777bc4ee86db14 SHA512 1ebd8f61a11b3d05f754ef30c4b9f83df80892335b49b5b949d3c17277dc0ccc1929e77459aa2fcd193f55c65c2c3431cd049e4e0e5bfb4a35750c4fa845146a WHIRLPOOL 7a6ce7def99d58d7a01556fa811ae6f2dba2a20af30c9e770bd30dec5e052729768c9113f10e21bb3bfe2c6a1e45efd0e1d18f72dab22ad9fceef201db4c1a16
 AUX dnsmasq.confd-r1 170 SHA256 51c0672a70d5d6793d295d82db666d372fb081e8627318f67c88e48d08d254b5 SHA512 9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8 WHIRLPOOL 86f364adcb5576bfb2cc84d13dd087bef987cae70eee1ae7816f0febc58ec637a97fea357c506456781eab116e257d06b1e45f7e2bbd81849251c15067a347ab
-AUX dnsmasq.service 226 SHA256 022df33a4f66c41ea477e59958ebf3d012d314df400acbfdc69c50dc241915cf SHA512 afe0beaff106afe17702a96eca6ff6e4264034ce52f84995b0c39a346af35724a10808ecb872ebc77310dfbeae8342b47c2a0f70753570095d77118517054102 WHIRLPOOL eab0cc195e89d5495713d197f3fbf154a448b2f841dbc6bdc4b7410e1a7a1e0a8ce7ac944703c4b582dd8761fbe19b3ef448739ae59ff76963dc59363101dfdc
+AUX dnsmasq.service 278 SHA256 2cca1e7ec70aee80c9d1f59e7f17b515e5fa66b08835ed0fddbe799d2b39db04 SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1 WHIRLPOOL efbb77d8a3ec69bd030f219ffb975ec0a5680f0d4da8b05bbb896db26c444c861fb47d96dfe8201f21acf5085fb465892ef33263de677390308b2328a8a7e33e
+AUX dnsmasq.service-r1 278 SHA256 2cca1e7ec70aee80c9d1f59e7f17b515e5fa66b08835ed0fddbe799d2b39db04 SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1 WHIRLPOOL efbb77d8a3ec69bd030f219ffb975ec0a5680f0d4da8b05bbb896db26c444c861fb47d96dfe8201f21acf5085fb465892ef33263de677390308b2328a8a7e33e
 DIST dnsmasq-2.66.tar.xz 401056 SHA256 5e143947527bcdc46a30f4b1bbdfbfa96333dd98bcecdac3b5b1d6cacfe06c75 SHA512 f0bde09f178ca15f4c28efb06901213af9a009b4476daa8a08bafc7682b9ffed13ac65c5c232acdf828382f321137de08b4a33108d22613b198fe30695b3362c WHIRLPOOL e749d24017c35fdbaaaf417decdf9316e235cf7f96f031caceee14d06b982c285b0e561f50597cd12b6a31ef554f7f2e22ca6234f44a6d8bb066dede99461166
 DIST dnsmasq-2.67.tar.xz 418484 SHA256 a8f1cec9d3f38d19c7c54e2879703d42748ace0f62c32e695b082051bdd2705d SHA512 32946fb01fca7f635b6164e0b06392d3377031c0f3fefbcd52bee74939ae527ba5abe494db7dd9d4afdd39faa044c0e82f0bec0b1137b7768013601bceb8a6b3 WHIRLPOOL d9d22e47a9e36962f87df3a76e38fd18415a00fdf60241861d8b29417c4d0f404cb6797e3a4688b95d4bc4cff86cb2cb3b3b0f405286c312300a54a0a61a2591
 DIST dnsmasq-2.68.tar.xz 420968 SHA256 055904f39a65bf651ccbe0f25922c88cf6e7e1b85e8b1905804253b6957ec7a0 SHA512 c67605f21fc5e64fe70ac4349c45a246575ebdb07ada14602c453b9a1152a12c3a7f3a01d5749db9f7a24a9f281a7fb9fd24bfaff1ec35e9ab0d213ae14cac07 WHIRLPOOL 9a69feedd8982dd70053df270fbd5523acc9a5b6e74d03e68363adb111d3ffe87f22dfb0f6f16f7159f717cb5d2de0bc142e585e26e2961068b0e3cc50734c03
 EBUILD dnsmasq-2.66.ebuild 3154 SHA256 62ffc1af6d4021fba25f7d9f6c36f71d291661c3988de2501b8a394b4bf6342e SHA512 049e94034f89e3a91c3b875a9e1c87ec014e5678c8c53708e17c8dcc858c418525ef550c4d4bc6201a235a0a66a3d9380b66dc8fc559d3a742d24666072ccd2d WHIRLPOOL d268b4ebaa126c73215b7cc6cf623a1eb085b4242ca04b08ce1cf89f9f5f60f078bc0f3dff5109053712048830c43793115d27cb6c144e5fc4e7d7a8f3b56654
 EBUILD dnsmasq-2.67.ebuild 3041 SHA256 22e5fca1aaac67e68e7f04de1eeff0547b46d682cd1ce0e629d404a158a782e2 SHA512 19a08db447e7cc58a6c4d3092b5e8e6bbc436683911bf819777d36697311fad4fbe38938261358f9a426e05caa68643aa287a3bfcb9e6630a3f2740c34f15836 WHIRLPOOL 547fbb5416e1ba8cf13c305d1ebceb43a8739431f63da30b393b4017a35c6c3ee220b2dae9b866850fa956f85960bf1a910102e99ca110213c08100bc42bfd43
-EBUILD dnsmasq-2.68.ebuild 3041 SHA256 c1b4f7e41d453a85b2b277e16ab8f07c9dba8c0fc8021c517c1c68c0b7945627 SHA512 8efad9d17383102f910603e5c30a1c56459fe8f65c7198ccfccfa0a12a66fadee0e7421fb3c3a4be766b52519fe8cfd0bd3976b96a1afaaf897c56bb3efcfbed WHIRLPOOL 9d4106c152d5637bb94152977c61de889e45c3d6015bbccc54f3df702d457af77a85509aac20392f17c2ae1a1e7bf57e7e61f9915bb65074339e7375e4dc59b1
-MISC ChangeLog 33062 SHA256 a1a55f458d621e42469414b629f2357581d999f793aebe11d272d4c4d3b07b87 SHA512 a7ae5e230dc1f032bd11008465d707d5752e4ac530bf39738673b6ea97ec35908dc06163972f11ca9f9421c677bdfcb9365705f5d08779b0e02532beadee1193 WHIRLPOOL 0f379c42a5ed716fc52e0f1f723285e196d79e3c22a0a6ead7b97d1b2483fd63d650b872efdbd4a12fb0543c3f94758b2e885287192a4b675fda40a805cde1fc
+EBUILD dnsmasq-2.68.ebuild 3094 SHA256 9446bfc330242c7f381c361d3848c354c8d9bd90cf1f57e03910cd82297f0834 SHA512 7e85593b89eb636fe3cd520909cd25f283d004b69baffc840be096572c7a241a6f4283b414c93884376703e4ec78b7141c283c858afa540bf51bba0f1575637c WHIRLPOOL b267228927d2f11a967f0385c821fa098a10d46c0cf57878f617cb733263acf1ee4ae47455ac951dda57b836f3d2bdfaf1772fa5dc3411f89b3566dbcf278735
+MISC ChangeLog 33281 SHA256 0e25c9770ab64903a21d2bc9a67b47260a1916e26086601c9852b085de1890fb SHA512 b2acc72581110e9563d08dd408a7fb37ae23254b367256c9a05118c11d5a839085be67d8b2cf7b64059c934b39b7627d21484c33874c42c2227ce12cab4ef5b3 WHIRLPOOL 835adc7ca263f5a2e44dd333a1845f6a3e10e5fa0edc138f9cb6ebb194f009fd12694289bdb0b0f8d67a66fea1d8a7b9b855784303010dc97c7ebc1701170db6
 MISC metadata.xml 735 SHA256 ac74dd1039502a798c295934e7f94b42ea4576dec58b157a28f1406ced7cb00f SHA512 bb083c9077d9a4304e1d851c1c3e0eae827673ce81314f58542b3bb515691bab2ea5aedd35f93726d4f9225e4b51be10e73b67dc9d027985bcd7caeceb0e938f WHIRLPOOL 4cb58f7b294625a5f768124261f30a3e76094778b74b45e3cbbe3908309332ffbcd9382c5e5a0a160187d6e77ebe56162f275dae16e31285dfd99fb4cfbc0ce5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSp2+0AAoJEHy/RO9cNQiD620P/jx1t14W3RSZ2BXRnnM16UG2
-PpRx8QRhIfs5+tXaJ/2L2BRqbQNBxbJKhXEhcpp0zUCkxZhKg9bXJlHitcpx9JFJ
-/Lf9hEeBp2hOkd3zrSnf0t4dmU1hcODRFGVVub5XYeu0PkMKmppZVx0hFFK4aXrp
-kkR/czCqf8F9qbGaguwUcjIljjU/CcfdxIQY/DaVQQEnCa1OKlJ9BVennNe/lm2t
-YxkdpBI4OOX3Ax1FrUBgmpWgxKEjaOh+ntx1yvGLwNSSDyWDYjT8pn0vXPPZ0MQC
-ZYo/xbz4lpSkt14j8Xo96bK70FbCAGyX0gmkgAaSP204Wl0LhwvW5z1zTkZzeufz
-lDxQb7r6CE/DjUPD8iQ8Hhb8MxW3//+ws79VXmRtAohdyoXiKvcUdaYdLPkjZ88A
-d0DhfoVic+paJ9+dl6g8bUQxJIjYCslxAWIG0ihKiAHzPouucVTzFasICjCMv1Rq
-I7BLNJBz2OseXNXC5tufvV1wTb0CvrvsOWUJ+cJYfSTTpInr4cGHjPhVGyfThmft
-hiX6t+ZGGS+xBhnD4pAxL73dPutR0SMOinn9Wtiyw8VvMI6NdiWg9scZYGkE+Srf
-3jvHqx2CqjUuUBTc3RzgcGTTf4omoyoeb+y3BMh8p5m5RiP2+sNOI77Q0WfTqvjy
-yjBvM/M9RzlJ1bwscXKG
-=xAoF
+iQIcBAEBCAAGBQJSp3GZAAoJEHy/RO9cNQiDyGcP/0Kuwad4Q1Vrzdcd+G6gCDKp
+S9P/vG3PbK1UHINlMScexa2rdFCeJL9N8iFqwRVntUfSdZQZnE6NIW3r4LRQBT5l
+4crKSmFrX9iuC7+wJ7ByQNcjYj4TKnJ/DVujV/qoQGv5POXoJLAMNjjpbHjxUTOh
+CBVUsgFLCpNOtvdt9SQ1wq5ey0C0JyaaLKiKNjvIyV3mY2kXFa+mdemowPcS9pya
+B3WmzDmzyBJpun97UClZ1yZh/+FF65XL/FMhOLmxVw4ZmZcu7KWW670nwuai7YcT
+EIWCqd5ekMMmycQ+JV/XC0s4Plc6c5f2G/Odh9+t1JXhy4sG4IagfKQpKwuLSSnK
+2fQXKmWq7VkSCQANQGw1ouj5TDD6eMT2bE1tcgBGH+84Z5GP0Si+yHw3AE2I0k23
+GUhUnl+IIJUQFdXvgG91gL+fzcPVs+l/OT2RIl7lKS1Ok4bZPm4oIn9iblmaEHZb
+C98hLMXprGvvpi+/H0vTxStfDke3apDT9WMNu7BA/blkjeBgfIL7YR8fe0PxBRse
+z0CzJFB08UkjGKy+UrGHkbbKI3QJdL9oV62OyLkKKc0N1NMXBEO+AN8FwkSfSN1R
+kejKVfiy5Q+dlHiFDOP8mR8bct4XSF3JDYn4tOhhO3x8FXqZT+4f5JKjaU4lo63H
+QoTFW59m9u+RyY2XRu5R
+=gkKv
 -----END PGP SIGNATURE-----
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