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, 27 insertions, 19 deletions

diff --git a/dev-util/buildbot/ChangeLog b/dev-util/buildbot/ChangeLog
index 74d84efed8ec..ab289e9faf09 100644
--- a/dev-util/buildbot/ChangeLog
+++ b/dev-util/buildbot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/buildbot
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.151 2014/02/24 01:45:39 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.152 2014/04/10 17:19:54 hwoarang Exp $
+
+  10 Apr 2014; Markos Chandras <hwoarang@gentoo.org> files/buildbot.service:
+  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-0.8.8-r2.ebuild:
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 175f2d9efe25..260768a3e75d 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX buildbot.service 365 SHA256 3ddd4425736eb4a58d3b1add3a5cde3f104deef4f6d6a48b5086c939c39b6ff6 SHA512 d3d2cfc2cdd13edb98e28a036c836d4da84dc9d4a3eca86586eab2d15a1c2e0fdcb387b5781e5e6b2d715763b8f19faac5f672c10e6601d189cdf9a10513f87d WHIRLPOOL a6fdb9bba9503a19ca5c1d5d31689513f521c7daba98e69420eb963980407521e2eb4ec0875383d9c94a531f3ceb22afecb30bd009381b7be544f46e7179aeb0
+AUX buildbot.service 435 SHA256 a94170eaac47b72e3fe86eb3fa3e231c2977940fa77b84ab0736a20a7e68639d SHA512 0baf2696efe3843c93f90c4678696ffe1c7d5df2292b5b3ee48a4e30bf213956052f4772c8e7938f541c08c76b39157b246debf376f9fa26a8773be785cddeab WHIRLPOOL bd2802cc78c5a6a6672e8e84c1330c641911c31bc802be222b9e4c87e3be5ca9115f18e90f3a48012619f7e3bbaf9fddaa0af333526aa034b4d0eae2cd9256f8
 AUX buildmaster.confd 218 SHA256 bb7f93e3867b32a25e2445a66d40573fa5073a80e73e35ae2a904db715f870c6 SHA512 d9339c30d3a92e92b41b0e3139ec89ecbd1460b0e4ee6c6fe2560c4307b2eb3f29b838c2f2312b9c7049bd95eaf652d09039227c691af805bc25a36999ec1840 WHIRLPOOL 0e258348e5882db063e95b3c508f8d92e2a7598e5f76705da2ebba45b4893ae893b0ed67271a112255d3e5b8f5f1ace17b487fc885db30a774dde44be1944c4d
 AUX buildmaster.initd 1185 SHA256 ac3b4aeb9fc1447a53150f66d58baf3258d607577e7d34241ec1a86ff19c436e SHA512 19d7c094b55c1444530b55694bbc64d5f49270df0b7a7103b67e498aa97666580fb263a488f8572d66eb83119ad3c9b1d28942d83faa874a70e032e1a50a1547 WHIRLPOOL 6b3ee2335622bf488963214b38a260477f455dbd78fd7e2ce90a50482e05cdd2fd8c61eae76a4ac3ff492efd9832a0ec9dfcc829d3e839882ee0df27983720a5
 DIST buildbot-0.8.7p1.tar.gz 4597202 SHA256 8dee3f887bce55a7f7cf01e6c421a2511898c2f89f55f202f5193a100a9a5776 SHA512 60d5fc6b65ef3fa4a63b1aed8e7ec352c40e13ef90bd55ef1ea580e1bc6beefea856f245ff33b15cd401db747e5e9c3ea36b37d72e5ca611e492e0ae2050ac4f WHIRLPOOL bb7872017634f3daf3569225e3b9e5c6d5b3c039cfef0b31b8b3b8eabbd1b2484d7956f3840306775a991bc41cfece2190f2c65097453c8322cd2cd9f3d50def
@@ -9,22 +9,24 @@ DIST buildbot-0.8.8.tar.gz 4641582 SHA256 5013e3f3d83d2fcac8b5c391e3a74059733001
 EBUILD buildbot-0.8.7_p1-r1.ebuild 3505 SHA256 8d85bb13fe146db9ec5365a20a2507e6c78c811492674b09a50c6a637e398210 SHA512 70264e79155fb92bf176a7411d42770940e540bd55cbbb92b28ce5dc343b47b88795a86646453914caccc44b4a1b7020fbc00820870c1bd395071627368a0b80 WHIRLPOOL 6ec3bf8e7df9d20004bc548977d769681c3f6ad7d930422569b9c82953c1c1633a0e33a6e0368184908882d2e82930cddc0367e0cbe6c2e8f3a6d525346dd5f6
 EBUILD buildbot-0.8.8-r2.ebuild 3592 SHA256 ab5ae6858b371108f7f9a9b663607cc62fc7b8080155969940370ac435754222 SHA512 f7c162e2d7865022e80b8cba5359f3150fcf16bbabe5a8258e88b2deeded7e9a21096fe8760950f6a3c7fcd77b92c9fc36d0ee987e73334e3e9aa1ba7dcd2580 WHIRLPOOL f9ee4e6fcbebba435794287a969c0cfaee01a43a48dc314ef1b10a2a605db1693bd04ad69b11d917ed19dd9082f81ff46e893b096c350b74227528c383b0cc5a
 EBUILD buildbot-9999.ebuild 3854 SHA256 eb731803a73b750178a926a634ec73ead58085089145d62b85219e4fc52294e7 SHA512 691a54a6a4c73a91b97cc17ee1b5c421bc3981205f96004e28fb6c18a79d79030c6c5b5b538bd842d6444c131c9ec246838882f1bb9c3321bf01472e892dcb82 WHIRLPOOL fb528c4a0bd98537646d837ac33ed01b8a7452c9aed464f062f73e7615f2e8e1e9f36701d9a7120797bf9e47a595de0501be64d211ee4367fb15655375e7cd67
-MISC ChangeLog 20295 SHA256 cde05165f6097d5c7a25c2aa20226348e1ec899c7be786e6d5cf226e36dc794f SHA512 3ac5204550d0b44e50070ceee01f00287ab0dd3d92efc727f3a483a8c4b5d5d90e71e3215609d8f411babb5884a92cc3cd728763407ee82902565da602459d4c WHIRLPOOL af582d29dc23cda34efb4a23254265266b1ef24107bebbada6b0732986fa93127717a9a42347d1d38e5dc77715575cd7ee304ea5ef67e1686a2e9d6d29c222c0
+MISC ChangeLog 20517 SHA256 d2169e4527e12f92be47c9e06284ed4bb83ac4b520f4c20020ca62f18a18c09f SHA512 03a3401187072529bac9adb0e99a716dce1943f48b68d0e3152fd11a49671f262d77b9743509e15af8acc0b55ad6bf7cf6c2a6e66fa16d92cfa925db5a4b5500 WHIRLPOOL 88a7bdc28728ce374a23c83ea8610d5007954a05023c3cf42e2d7f408137c722f071efd814bd3dd278435bd8e9d38692b53b2a57956585a1b1014c28faee59d8
 MISC metadata.xml 1439 SHA256 6d6255c1a762a49949170dd854a9f43cf9003e98e00af1344670be0de277f31d SHA512 30ebc4871ecd80c5090687d2e2e8daa75f087e3839c561c6a78d53f90501add995674d3fa577ec4efa1d677552e3e3321a78777b6dca0e96c708ec76634afd89 WHIRLPOOL a7f496ee4120a619e1fe1eb59a1a42c2848a4c4595751ae50b26a2fc3560f23f48c4e27057307b89d7cdb88870561f853f9f8031b55e7a73ce86d1de180c9c3f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTCpY5AAoJEE8aJVXqcZkdGNkP/j+jC6fXy8hPabNDLjuhNtaf
-+kcGt9HMSeXDpGP/zNrckmUeHeCBraBc95URbL9Nh4z2tdNH53ZevzvBwrjMe4Q0
-eG1bL4xm3n81cSwP2GxFVYjgiLoc+gWT1savt/iRwneMrJiqJtH+p+nFbR7BZi7y
-Ax9PpvowYEesxQKnUzYDVD1sG65COolqYtI0U6bMYz0VTvTs3Sh07Vy9R4Z5BrTj
-1K8x52tWX3Q7ee/sdBXaDTUdqRof3RDbMqdQxDPXZjA36/k3W5u8XPnAbEWbGw8s
-UD3ls2UxXz8PJZhnriJr2DugS9YAtsybdg+kXQek6mIUvXiWpQUmUyuY+5BkyBxK
-d/lkWIqEcS262jUua/5cehzWH4BnyICE64R5GwgoqKLRp1T+n1tcVXRsfew96BHq
-hM1oU+NZLNUJ5fBVn9bnrZWnRyu0LIFFGK7GW4D83VvyiekrC+843IvWQLUMRV4r
-VtdN1KdZL4T7vlfVyoRefOr3HdrSAHzcYqNPeLUdtq8kH5yFSlYE3oVIhOSIunUf
-NFr/YztBRX0yp1ZHps18JjXTPNPIe3C/GaatPOjekHWYgA3TQvrNOaBMi4pL4e41
-Hled6DEzrAIkEDNrDGvbct8e73B3Tf7HBRG2u82ejxvgoaEQnWJc5TPlrfgoGHCm
-I7XJasvk1O1NcXy++/ra
-=Nrnj
+iQJ8BAEBCABmBQJTRtJqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88BuAQAJ8E7wlgB9rvkioycBX74EDs
+GhrXNFjy/Q3CinFHRnlD1sm8pwTnoznhc4k/XP6jLut/8enqc+WYi266AF6u8xlB
+YiM7KrD9WLjQstWtb8WzGc/W5FKnHGXQArcscmNf3sK1+tm+4RA+uNBgmge6pmv6
+D/kuz8BPleRL5aF5ybJCBqX8L2pI01X5wY9+NRLL+axZjccZJsrOLs6fEBvLCFZw
+Lw29b2lP5X5ER2XdN6peas4DTXeCLqNgwLXOIxRZJmsitcQi5IAZ/HhKxQYYC79L
+jmUEe6abV63NUPO7OtUmvbjLFcIeAvU5X1c49B/MjeXuZOns4+2juEUNZDHq+lWi
+sREVJZ6Ekn9dJESmOZGH9LOec9ClhYQLirlubesnAMxOIpBUNBZxUgDmIzqTHYkK
+Fo8frEgSUEQou1AmpnY/ov+hs11s16e/1qEhxsbpwZ5mqz4WmCd8669QcU9dNYk/
+av1tlat9Y9wAPCIf+XyMm7qEgOIdkycxSboCOqSssF8EpviDAhMx+krHgITLYCvm
+qxe/K63emHhHzWuXqV2CCVe1Sq4wq9hqqdECFpafJgzgFAYBaDXL1Id9jQqy7KnI
+Fq+nw2TSAn6BeAWh/vZfIswJbQPHmdM61KItjSgmE27aRixNsaDEl2gDv52IUdu3
+3imXCljGSLivO/3ZbTou
+=AWmt
 -----END PGP SIGNATURE-----
diff --git a/dev-util/buildbot/files/buildbot.service b/dev-util/buildbot/files/buildbot.service
index 371d6e086de9..4581a13a0c48 100644
--- a/dev-util/buildbot/files/buildbot.service
+++ b/dev-util/buildbot/files/buildbot.service
@@ -6,9 +6,11 @@ After=local-fs.target network.target
 Type=forking
 User=buildbot
 WorkingDirectory=/var/lib/buildmaster
-ExecStartPre=/usr/bin/buildbot checkconfig /var/lib/buildmaster
-ExecStart=/usr/bin/buildbot start /var/lib/buildmaster
-ExecStop=/usr/bin/buildbot stop /var/lib/buildmaster
+# The following assume there is a 'master' directory
+# in $WorkingDirectory with the master configuration files
+ExecStartPre=/usr/bin/buildbot checkconfig master
+ExecStart=/usr/bin/buildbot start master
+ExecStop=/usr/bin/buildbot stop master
 
 [Install]
 WantedBy=multi-user.target