Add WorkingDirectory and fix arguments for systemd's unit start/stop options

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

3 files changed, 28 insertions, 18 deletions

diff --git a/dev-util/buildbot-slave/ChangeLog b/dev-util/buildbot-slave/ChangeLog
index 9f7febea3b58..257c22c130c0 100644
--- a/dev-util/buildbot-slave/ChangeLog
+++ b/dev-util/buildbot-slave/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/buildbot-slave
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot-slave/ChangeLog,v 1.57 2014/02/24 01:46:07 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot-slave/ChangeLog,v 1.58 2014/04/10 17:22:57 hwoarang Exp $
+
+  10 Apr 2014; Markos Chandras <hwoarang@gentoo.org> files/buildslave.service:
+  Add WorkingDirectory and fix arguments for systemd's unit start/stop
+  options. This will be removed in the next version bump since upstream has
+  their own systemd files
 
   24 Feb 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   buildbot-slave-0.8.8-r1.ebuild:
diff --git a/dev-util/buildbot-slave/Manifest b/dev-util/buildbot-slave/Manifest
index f907736d363f..81d390ebf7d0 100644
--- a/dev-util/buildbot-slave/Manifest
+++ b/dev-util/buildbot-slave/Manifest
@@ -3,29 +3,31 @@ Hash: SHA256
 
 AUX buildslave.confd 217 SHA256 c324eee07561afd8be623b46cd8f50cbbac5f1e42f2c493aa75dbaace6dcfa6f SHA512 54fc03a82cebf874c18d1bd739a6640677cfcd540b47a9929e6f5d63a83bd64bee615b033a72b49ab5fa3da69b16ff657805392ab0a68e0d33e48581fc8bb017 WHIRLPOOL 9e352aaf7b2388f23b2f346f86c92904a9dbcb1bb263c517243169a14250d19b8d934939ec3fac36a2300c73d9e3b727d5edeb4df628d5fbf13ef6f6e3346bce
 AUX buildslave.initd 1139 SHA256 9f4c8d6946ebda59966256856a58dc0eae8581aa072dc0a018fe2f6b50af4170 SHA512 b891240feaea7e96f5912f87ad88e45b9a877a1cb48d4dcac701f76ff5df212de52b84e5319df1d5064bce0c8aaf1ceac4af9b81d0fdb57a3840c6aefe0a3d6f WHIRLPOOL 9000081f73778bb94c915066d60ad5293b9c717d6392c3129be59de5d8ff207c7b493347e41f92c7628c10e569acd3dfdef701578ab2edd7fa82c0223d3d60c2
-AUX buildslave.service 267 SHA256 a58459949d6eee6f75afc699ce6f1b480225a87e412d33325a5e6aab931584f1 SHA512 9f1cc321d79cd8f8cf4496e88cc99ca15724b63cb0464930bf429090ade235e67b553b0966f9a2d844baeb18bba1294cde4093ab06b9343eb79b45b63f50a2e7 WHIRLPOOL 1fbd7adfbf7c6c85049d4b1e5e0cb1199ce69fdf629a063958268ed01d4410a950d89eb9bc9eec04cc30cf7e3329cb4c7f69158900b4ba43d4b245e64621fa6d
+AUX buildslave.service 386 SHA256 64f70fb7e06c65a2e9eac3fac7e37aca98eec04f69f4e1b344b5d0671725cab3 SHA512 53d9ac95006fb4e43e0bfa82c935e17c577cd292c8fea373247e4cd9bb21843f2f82971ffd37f50aa16fe258139c22adbe24570e3017fa529f2258a1d395d8dd WHIRLPOOL 1ad2b4a0723a5aed1116dafcaf5090f2984b6b6a97cb6ba3c65070e1e4743de0ad4e72a1b23a15f3f2bb4eb574fa44d6eb86e67dbac13d1b8f1eba174f8da879
 DIST buildbot-slave-0.8.7p1.tar.gz 104575 SHA256 bbdb07a3847efa186f942142a09394b467d7375745c49da0a42e9aa5b206eadc SHA512 ee9a119461915716167a258d9c022956e239e21ed524c2ae148b6682dd1410b5d918723e8e51002bc1fc27f67cb59da15cb2293e4939ee5ba08d1e5e067e11fe WHIRLPOOL c523849db5cb743f3b4d93f33305a46682710afcf66fdda3ab807dd412171c5e40e1089849b0f3c901dd75525fe97995a791bf9c15f01f47fdb18d0456b17de3
 DIST buildbot-slave-0.8.8.tar.gz 107470 SHA256 8b7532d4d34527aea41e353d1bc3c35291ec335d3224c27800d2cc0cfc9837cc SHA512 1a5b02298696016a8743bc81e7e899a8bc11a09481f6c911cf4d3e016d111d707ca393d102635c4841d5f2ec5f3a0c9413dc0768170415a59c7523a3bc680fd1 WHIRLPOOL 6c387dbe61c2c3223312e3456afa07bcaab345e69667b9aabd600d8abdf93df955d592283dee423eee40596ee90133688c6c0f26f73fe9e4c8d5cced205c0f24
 EBUILD buildbot-slave-0.8.7_p1.ebuild 1841 SHA256 faa4389a58b59cd8096d381de20a428ed4594520e74ced614ec9c41ff0bf646b SHA512 5bb99bfaf6a676f76887dc3c03d4e2020be64553b6cca10e3f50cbc5f00c0483454530060c6757346e496e8dd6a6cca076e7f3af719da6bc2da05aada5860745 WHIRLPOOL 9859f857e2ff1fcfaee1df9b37ea0f10ce71adcf151dc67f7c6575ddc0660fe674bf71a41aa66a58976979ada43a90674a924fe77435e647d81dfb83cc41a8db
 EBUILD buildbot-slave-0.8.8-r1.ebuild 1908 SHA256 665ecda48eece8763642fa1090c0b2286d8740d6da9ef7deb803179663096bd0 SHA512 ccbca385c399084a0ebb4f5df37fb19e6167d237d570e4491de7fd133bdd06c678928da27469bba3784e2ec53a06b0c90caba9e0a842f9b06ea7c36599900353 WHIRLPOOL 66e08f2273c534800eb5cd7a40dabd621771891ff5e8278520b52909cd4bcfa8e81ebb97034c41cef1056009762b2a8ae1f56655d0fef4d361bdcc33be7f3ad9
 EBUILD buildbot-slave-0.8.8.ebuild 1850 SHA256 791263a8cf38d15db89c402503cc9d422b1cd344dd9a13223ae330fa2eb8daff SHA512 5b2ad6bd6384404578679c96a3b2df18b6c99c86657ba9272df9e448819e5ba42f371317afef7e1bc83b04a8cb19beffe8e99a9e303cf7565048e4b756aa62b4 WHIRLPOOL 36fd8065cdafe6dc1c32fbb360bf1c90e62b93ac402e34c21c633b7951d544194e2e2224c601a5b07b742527907cef74dd687d4eb970f8d6599ecd8f4e75d7e7
 EBUILD buildbot-slave-9999.ebuild 2156 SHA256 230a3c21d95d956591f72c9c89eba060f7f37483c65a38bc169cdeba1a914489 SHA512 1187ff3970b78d306a25d86c403323862c8a88c775b477ac8904fa931ec1d375c07d00f3d05bd42e60e0b8a5ce1e5d42c3fb68b835a03d796966d058b76e9c4e WHIRLPOOL ab956c6730a2209146305b289bcbdb557b8009db2a15c65253a097fbfa56afc61efb5948b5b4f8c317136ae41014bcca5d1f808886250cc39f1a0a186354f3e1
-MISC ChangeLog 7680 SHA256 1e6d0d5e6c027ebe7c76c3e7c84494464ff0f5cff3678a3a52407b096b370a42 SHA512 f4670a4503ee877e8b15eefa163221174273079821b340b576ebf3ae89cb0d218559a01f94ae0533fb5c694ae96dc564800be2d3972547497c587554aa74486d WHIRLPOOL b30ae0dd3a05df6d8e504fcb6f1b12747a07bb88981f609753b1631edeafb37495eb8d604a06f69690d6d2c16c646552bc278403e4228cb30855c7f1d6cb1e0c
+MISC ChangeLog 7931 SHA256 8967193cac394702f1610f4966791ec398f5ed3e0ae1387a4faf583d49588d9f SHA512 ece314e4e19504300d950d580b7aa4c5679cb04f501454c9e8d117504b835c160fa0dfa04751f20da4df67efdb298d8016789519da128acb5f16d7c2ef3a81af WHIRLPOOL 184cd1c3b78d513370a52cb74e7b62ce981179dba9c0dab1a3993fa27db90d00c25e2611499a3c7cdaafdc9d57c385b72f0339e417c8151d4c477c27bf2e118a
 MISC metadata.xml 334 SHA256 c16b48529b158cd93ef72456bf35a1b51617ab6a8210f4ba4a034ffd26cdc7a0 SHA512 23d3a3a3d00fca47e2eca7716e93a5ed59ea7eb0a8ab9c83ad99eadcea3b631f56e49b08b7e363be0039fa7fce13a4a49122998c6c8436c9d0632a5e496b3d12 WHIRLPOOL 5fe6808a39fbc26a8cc94b7ef355a1bb08280c32ffbc45e0baf8efd2ee77a1ece0f0d0b75a024abd569987af64fa20a966c62d13350ffeda9eae1d5bc25c7188
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTCpZVAAoJEE8aJVXqcZkdO7oP/iW0GBInQuET5veeDqDCFzmd
-RQKliSJKkoN8KkKSYi7RL600gKbLQjeJrKbhAPCWLFmm3b0QbzPlPh8BNPVcMDi6
-6hAky7oKzD2Sfm7abHPdC659Y9KErd1TFrMiooByBG8rgWY9JuVLB4HHq3i/Fjjh
-gt6Chhd7B50JMOz/Z2aK/Gi51h3OKRyaHadqWOCrz+ehAHA3nqCqpMsQlVpk4XH0
-+/I2vmbRzb56vyU/7VpGNs/UQfRzhnjN2Mv9WE7GKPtWozavd64AyhduLWFqiPwD
-q9f3V/CrRGuzgt+ChPyX2A1rLaiuZD0ID5YwUu/1NTbiqfdASKsYf5oQu4RDFYil
-Wi2qXVxaXKEpkVVg/BtUbzEa81R0eLTfqtNFkJV9xJ1CKIPVBXVVLwVvIcSCnqwg
-72w2+Vt67KbFBuB6W6A2vyCzfUgf20cNZ4JEfeX+pIRd1klsqjOJXtIwttl6RdGm
-EOyZenFcWXH31i3iaQWZPe8Wcwj9KaOlw07uhvUA6kz6ifdlYcNNMgpmUSMPbyiL
-Gyjt2LVxf5g5LE2EMTfBu0kHBtvsK/U+WLPyLN1PCX759ReF6QDln9rfvxMsnpnp
-V/HiSOIj0SwxV1Gm11NsIzNKitKWBb4aAeTBCuJfQxczMwZ7g7Of2WgzxSBsmRKk
-M0iLnca8ajRq56J0WBEG
-=LSRQ
+iQJ8BAEBCABmBQJTRtMgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88R/gQAIb5+bEUuK78GRz+SHNvDeWc
+Y7T2rfl2RMLoultJxjMJJRln/X+CMGW5VY/CoiUns6SxPx7oP6FxoYiimGoposfC
+c6Ny4feZHXS+JybS5g5+c06Gogp+xEUjxr1sb6AwVbzikQ2iiDkw4IynsX8CS0CI
+6ax4OFzG/Px1Qn7E9u5FHcld1577oW00hpwRYwQK1jbinYNRB5Y044rO0lSJwBlZ
+G5099QRwCxkEiMDovAZIJeMLNAKnNW7Hv8nuIYBfopbpLqfWB0+6ozeo03ZUcd/j
+AsQIpTivCxXETamooA+KxSwJyhzSmKo+2DE0q7qDd+qeZpStPFybeESmwJn+8F+x
+d0Lkj2T0UMQLRUQPS/+qoS8OjC+7RQaNq4JQlHhi6Cz7CqBJCeeC9TeKZ8XfFYoZ
+4muAGC5ADQKfzyxyJ+df1j2DOD+uFB16/i2DiGrh4/mYG4/bfciZkBZRXaGx+UKM
+6CFKFj5SZKJgPcXXyKLZhFoeAqwSgFW84niErQrtOb2B9qxiDtNYpmIHTN4wjuvV
+Iag+xobH2wnUIjNC1OMciII9Kvxj2XUmdNm7SkfhJyL9TgzhebNBqVNf6V/OAX86
+qvwMf2R+MTEyC7sGILOAjGmjwcpGrocxIxcpnYEFyp13lDbHEcpXlMooOHi6jowv
+q+bjdos90BB3JAPgXJ0T
+=E5sv
 -----END PGP SIGNATURE-----
diff --git a/dev-util/buildbot-slave/files/buildslave.service b/dev-util/buildbot-slave/files/buildslave.service
index 8d54619fbad6..5c8e483fe83a 100644
--- a/dev-util/buildbot-slave/files/buildslave.service
+++ b/dev-util/buildbot-slave/files/buildslave.service
@@ -5,8 +5,11 @@ After=local-fs.target network.target
 [Service]
 Type=forking
 User=buildbot
-ExecStart=/usr/bin/buildslave start /var/lib/buildslave
-ExecStop=/usr/bin/buildslave stop /var/lib/buildslave
+WorkingDirectory=/var/lib/buildslave
+# The following assume there is a 'slave' directory
+# in $WorkingDirectory with the slave configuration files
+ExecStart=/usr/bin/buildslave start slave
+ExecStop=/usr/bin/buildslave stop slave
 
 [Install]
 WantedBy=multi-user.target