Add unit file (#486082 by Evgeniy Dushistov)

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

4 files changed, 145 insertions, 18 deletions

diff --git a/dev-util/buildbot/ChangeLog b/dev-util/buildbot/ChangeLog
index 3abd1a47003a..ce5f73bbef8f 100644
--- a/dev-util/buildbot/ChangeLog
+++ b/dev-util/buildbot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/buildbot
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.140 2013/09/21 23:57:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.141 2013/09/28 10:34:03 pacho Exp $
+
+*buildbot-0.8.8-r1 (28 Sep 2013)
+
+  28 Sep 2013; Pacho Ramos <pacho@gentoo.org> +buildbot-0.8.8-r1.ebuild,
+  +files/buildbot.service:
+  Add unit file (#486082 by Evgeniy Dushistov)
 
   21 Sep 2013; Markos Chandras <hwoarang@gentoo.org> -buildbot-0.8.3_p1.ebuild,
   -buildbot-0.8.6_p1.ebuild, -buildbot-0.8.7.ebuild:
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 22b65d05770e..7c33a002c2fa 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,32 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX buildbot.service 365 SHA256 3ddd4425736eb4a58d3b1add3a5cde3f104deef4f6d6a48b5086c939c39b6ff6 SHA512 d3d2cfc2cdd13edb98e28a036c836d4da84dc9d4a3eca86586eab2d15a1c2e0fdcb387b5781e5e6b2d715763b8f19faac5f672c10e6601d189cdf9a10513f87d WHIRLPOOL a6fdb9bba9503a19ca5c1d5d31689513f521c7daba98e69420eb963980407521e2eb4ec0875383d9c94a531f3ceb22afecb30bd009381b7be544f46e7179aeb0
 AUX buildmaster.confd 218 SHA256 bb7f93e3867b32a25e2445a66d40573fa5073a80e73e35ae2a904db715f870c6 SHA512 d9339c30d3a92e92b41b0e3139ec89ecbd1460b0e4ee6c6fe2560c4307b2eb3f29b838c2f2312b9c7049bd95eaf652d09039227c691af805bc25a36999ec1840 WHIRLPOOL 0e258348e5882db063e95b3c508f8d92e2a7598e5f76705da2ebba45b4893ae893b0ed67271a112255d3e5b8f5f1ace17b487fc885db30a774dde44be1944c4d
 AUX buildmaster.initd 1004 SHA256 fbaa7f0c0d33f868b60a8ed0c351df17d4a3e94c5d89d4f1e4bf0e9eeb749334 SHA512 95ad30a7c6eb52f5f9977c3b442d32fca9b7721f31bb6d7934f1a0e94e58bb352f84f8b4c353358897f81edc62494559446bfa5f7423bcc27be0d5b83d74a088 WHIRLPOOL c42e7be6c103cfca7515afd69325522391f04af887083fcf9dc11bd8d6cf60abb2ca2ab11bb0a0730435738230b13d34eb4c901e881aca872518681d939023b4
 DIST buildbot-0.8.7p1.tar.gz 4597202 SHA256 8dee3f887bce55a7f7cf01e6c421a2511898c2f89f55f202f5193a100a9a5776 SHA512 60d5fc6b65ef3fa4a63b1aed8e7ec352c40e13ef90bd55ef1ea580e1bc6beefea856f245ff33b15cd401db747e5e9c3ea36b37d72e5ca611e492e0ae2050ac4f WHIRLPOOL bb7872017634f3daf3569225e3b9e5c6d5b3c039cfef0b31b8b3b8eabbd1b2484d7956f3840306775a991bc41cfece2190f2c65097453c8322cd2cd9f3d50def
 DIST buildbot-0.8.8.tar.gz 4641582 SHA256 5013e3f3d83d2fcac8b5c391e3a740597330015300f0ebb94005ed2f90d739d0 SHA512 bd6f9a7a8bdf53a3f7012af7ec4aa2f1f40479496ca1e95dc1b9e0524dbf3bfcd0fbe09a94f8e68b0fd8018949c841d8b3f6ecc306b388e4b917ad21597d9168 WHIRLPOOL 8eb462502a98c87663eb90c9f6e280bd8c19161ef965424a8a12fe8dbbb481d52cd37bfaa33d6ae874c62fc017cc60d4b83c4f01fdbb2508d0533ec88c1c7f7a
 EBUILD buildbot-0.8.7_p1-r1.ebuild 3521 SHA256 0157de9fe5daf6897ce129b91d8997ace5ea9b14fcff46f7b24fe216b4828b67 SHA512 43cfe5ffba7b91852c89c0ae9ace07770c0079f4386febfcc18d023cb1fa7c635ae26466bfacd4050bb1a1ea8559630ab272d2c3c1ca8c74cb94b92cb77de48c WHIRLPOOL 60dab7b82bbf8164fc415da4d0a554cef88b5f1a34bf940a97a74aea71717655be9921a0098814d84fa63f100cf4f686c67bf8e41dc8e2884fa6b5a2d44246f8
 EBUILD buildbot-0.8.7_p1.ebuild 3489 SHA256 d9ebb08c48abe6bbe443faeec92fb6198bd66181b9fea7ee7ac13f37c3686240 SHA512 8c9c215e824bc3db58c15013a44689ac112cae52961b4761b0467f7de3914aed05b61ce9c1d302435f2fdb6445139e6411e63417990de1d35c78afe2acb9ca93 WHIRLPOOL e14ad7d47d7fbc4170a3e54cab2ae2700ab718a1b5bb8f1cbc1e7905831156bf63c27851550a35f1bfec80764810f8fc9b99c2789ef081525a08237ad2377cf1
+EBUILD buildbot-0.8.8-r1.ebuild 3579 SHA256 ecf9aadf7394c6ad4e48bb43e0f6c7058aefaaffd7fbe71a351282622be9a3f2 SHA512 e64e473d2e67fba05f0cadcc2f434d3ec12b09738c40ea56cce2e522cadb103fb706ca4831b02bc27590c7bbd03c7cce9b29067c07401f836b19f97f832dbf95 WHIRLPOOL efb1e525f14dea5dfb67066730ebcd8c89afdc985327c83cde9a9035892ca698af7c9bb5641cca0783ed0aa2751eeb72cec6904cdb47ef293b335bddc98ed88c
 EBUILD buildbot-0.8.8.ebuild 3527 SHA256 1e6312cc0b434743c56a2be4bce04d7519fddbaec7d660c20804c2457c2f7887 SHA512 1880bdb34a2def80637ebaefce5a8f3b26ed76ff0f2d61d51bcb2e724e313296c6ddd787b133242263810e8e8192a49a6e34bf0e565f2d9077f2fbbcf149f96c WHIRLPOOL c609613c9a80dcc920e8aa974bbd7d24cef140d8ebc43531c4574161cb4b2a89afb6298cd094d5784b398a2deb633c1748977daf1a93c41d477f2a994819b871
 EBUILD buildbot-9999.ebuild 3791 SHA256 6967709ea7898e153c4b4a3079746ea79db8849c5fb2e11501875f6a11368113 SHA512 c421521948a52079479fd1a6bba9bbc439edf98ca9c504089ae59161f3ab9259042c325ceededd69810771675295ed764b55959e25d76098925f7d2d6283b0b3 WHIRLPOOL 026f747781fc0c2d961e665177057852f163a177365ef693730197cb081120d1029c43ed06dca84bd359a77f3635c63a26f591f6812b40a1c9e0347b1727541a
-MISC ChangeLog 18464 SHA256 eca42c67f7bc31feacbdf7d77ff543ab41e027571dcacda7275be95e11a08151 SHA512 2707201e9b34d8db9f865516bbf6d6ed01555450c12720a3dfe6c0d97712b14a9ab7d69b023a7a6191f75c07166dc716e75e9c8550de2081abb04a850592a997 WHIRLPOOL 71a3127e75509db51db4a4d82c70824874515651b099c2013ec12dd47e3fe2978e20753e03ab810fa543cda6793af3fecceae65531dd95669a4f7340633dd6d8
+MISC ChangeLog 18643 SHA256 3bdab96f07721da24bc754a4c5f016e0e4f2f76af661bd82fd9e009fb8f02cdb SHA512 1b7fead2847e32416c08984165089fd46a409eec702a56748073bb6fa57af0b9443907d62e1f5c36416841458dc0a73768d347f4a0a81477c6b62df0af62439b WHIRLPOOL 07d2beb2a2d1dd36a47a465a0ca9f11e4e373c265e10bb908455acb731ee8971a312bb6a031385c6848ef5eae7b32383ffb2f5a60946bcf4770b20b441f7ac5f
 MISC metadata.xml 1439 SHA256 6d6255c1a762a49949170dd854a9f43cf9003e98e00af1344670be0de277f31d SHA512 30ebc4871ecd80c5090687d2e2e8daa75f087e3839c561c6a78d53f90501add995674d3fa577ec4efa1d677552e3e3321a78777b6dca0e96c708ec76634afd89 WHIRLPOOL a7f496ee4120a619e1fe1eb59a1a42c2848a4c4595751ae50b26a2fc3560f23f48c4e27057307b89d7cdb88870561f853f9f8031b55e7a73ce86d1de180c9c3f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSPjIIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88xtQP/1lMrPQ9tDCOGwKTcwR7WlL1
-JfpZa6PDESs0OHmbU//WiqbdWj7gpC1O/CEb93KxBcrHIsNpGXKnVKSouCWkcaED
-7VSwuqOB/NiknKk7ZwIBwLAf6uHMQfUVi7rQzDetW4eX4WDLkLF/xPIsAtuSseq1
-4wBTnRqJHZlLcJfH+vGPiL6oN5pbbFr55mXfDwejyc4aUNtCt9IIurYKCovcA/eS
-k5iujDUd+dA9VX5U86CJ6MBrcTWg2W1lnehkTc39/uaRtHVSWSETNI9PC+QLFVG1
-3mGtEn0flG4DaIM4ZvQuQNAnbYf8/2czlEI8LvH94Y2SWaUb1AjbD2Kz6X3a3rQ2
-dKbzQAp+1NC4BmQqU8cq7rmFxPMP9vFAHUXY9/l+YC0qKYGJoecV8ouklsclMKjs
-SskTfFVQqwAMrvK1vm4FvPdnsBnvbyx1KNCxMaQZO8UKfBJYUcmkLk8EGgfeR6a4
-vT0m5PMZnr/MZWfyZplAi1nIz73f7t4IlhHNsbkXbEYxWVTni4H5VB+GIcFTB/qT
-IU5P9oDhHGPVmlzyZi8VJ1yIVMrgQ+zVH5iHMaI2O0HJy2GwN6Cr+0VBxmFF4m/7
-nBs86wZQ3cuZBYGLas1mAMPzCXPwb/tLVkACMiq05zOVJ5UXTSOtHLftSZHbP7Xy
-N3fCdq2b1+jPYgNku1Wc
-=amVk
+iEYEAREIAAYFAlJGsJwACgkQCaWpQKGI+9RPkwCfUTMxKs/u0cZoMZAOUprg2HWj
+WjoAoIe2VxW+SUBxHIPZXWOFAH8qk1Te
+=8Ot1
 -----END PGP SIGNATURE-----
diff --git a/dev-util/buildbot/buildbot-0.8.8-r1.ebuild b/dev-util/buildbot/buildbot-0.8.8-r1.ebuild
new file mode 100644
index 000000000000..078a2d7e4304
--- /dev/null
+++ b/dev-util/buildbot/buildbot-0.8.8-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.8.8-r1.ebuild,v 1.1 2013/09/28 10:34:03 pacho Exp $
+
+EAPI="5"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+DISTUTILS_SRC_TEST="trial"
+DISTUTILS_DISABLE_TEST_DEPENDENCY="1"
+
+inherit distutils readme.gentoo systemd user
+
+MY_PV="${PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot build automation system"
+HOMEPAGE="http://trac.buildbot.net/ http://code.google.com/p/buildbot/ http://pypi.python.org/pypi/buildbot"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="doc examples irc mail manhole test"
+
+# sqlite3 module of Python 2.5 is not supported.
+RDEPEND=">=dev-python/jinja-2.1
+	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )
+	|| ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-python/pysqlite:2 )
+	>=dev-python/twisted-core-8.0.0
+	dev-python/twisted-web
+	dev-python/sqlalchemy
+	dev-python/sqlalchemy-migrate
+	irc? ( dev-python/twisted-words )
+	mail? ( dev-python/twisted-mail )
+	manhole? ( dev-python/twisted-conch )"
+DEPEND="${DEPEND}
+	dev-python/setuptools
+	doc? ( sys-apps/texinfo )
+	test? (
+		dev-python/mock
+		dev-python/twisted-mail
+		dev-python/twisted-web
+		dev-python/twisted-words
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python_pkg_setup
+	enewuser buildbot
+
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
+		to support starting buildbot through Gentoo's init system. To use this,
+		set up your build master following the documentation, make sure the
+		resulting directories are owned by the \"buildbot\" user and point
+		\"${EROOT}etc/conf.d/buildmaster\" at the right location. The scripts can
+		run as a different user if desired. If you need to run more than one
+		build master, just copy the scripts."
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		einfo "Generation of documentation"
+		pushd docs > /dev/null
+		emake buildbot.html buildbot.info
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	doman docs/buildbot.1
+
+	if use doc; then
+		dohtml -r docs/buildbot.html docs/images
+		doinfo docs/buildbot.info
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib docs/examples
+	fi
+
+	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	# In case of multiple masters, it's possible to edit web files
+	# so all master can share the changes. So protect them!
+	# If something else need to be protected, please open a bug
+	# on http://bugs.gentoo.org
+	local cp
+	add_config_protect() {
+		cp+=" $(python_get_sitedir)/${PN}/status/web"
+	}
+	python_execute_function -q add_config_protect
+	echo "CONFIG_PROTECT=\"${cp}\"" \
+		> 85${PN} || die
+	doenvd 85${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	readme.gentoo_print_elog
+	elog
+	elog "Upstream recommends the following when upgrading:"
+	elog "Each time you install a new version of Buildbot, you should run the"
+	elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
+	elog "This will add files and fix (or at least detect) incompatibilities between"
+	elog "your old config and the new code."
+}
diff --git a/dev-util/buildbot/files/buildbot.service b/dev-util/buildbot/files/buildbot.service
new file mode 100644
index 000000000000..371d6e086de9
--- /dev/null
+++ b/dev-util/buildbot/files/buildbot.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=buildbot master daemon
+After=local-fs.target network.target
+
+[Service]
+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
+
+[Install]
+WantedBy=multi-user.target