Version bump buildbot to 0.8.4_p2.

Package-Manager: portage-2.1.10.12/cvs/Linux x86_64

4 files changed, 121 insertions, 4 deletions

diff --git a/dev-util/buildbot/ChangeLog b/dev-util/buildbot/ChangeLog
index 6ac84fa1d964..e74046ecd46a 100644
--- a/dev-util/buildbot/ChangeLog
+++ b/dev-util/buildbot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/buildbot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.91 2011/03/23 21:30:05 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.92 2011/09/03 19:34:00 djc Exp $
+
+*buildbot-0.8.4_p2 (03 Sep 2011)
+
+  03 Sep 2011; Dirkjan Ochtman <djc@gentoo.org> +buildbot-0.8.4_p2.ebuild:
+  Version bump to 0.8.4_p2 (fixes bug 373927).
 
   23 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> buildbot-0.8.3_p1.ebuild:
   ppc/ppc64 stable wrt #352741
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 210ba50e509f..25978340fbef 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX buildmaster.confd 218 RMD160 a8f6893aa83c0c169f493104e1c6f023ec45f787 SHA1 8dc5e868092a8ea90c0cec5650ba85e412295968 SHA256 bb7f93e3867b32a25e2445a66d40573fa5073a80e73e35ae2a904db715f870c6
-AUX buildmaster.initd 961 RMD160 cb59a212a7a9768a61832f023d51a2d1be2b0abe SHA1 625003cae83bdaacdce60b7554ae4d6da13f65be SHA256 4ac3b6ebe9fe83f4c9a94afc0ce51d20ffe99307a98686e9b56d90535a12dbaf
+AUX buildmaster.initd 961 RMD160 1ec2320628c6606acd0245d01c0e2517b7846c55 SHA1 b5f53fb77ac06753996a328441c6117374d833cd SHA256 3e2dd960fef216d85f4bddbc55dc250c09af162407dbd1d2df4af3ce937468af
 DIST buildbot-0.8.3p1.tar.gz 4068355 RMD160 737e4863c371d3e9d30063564ae62e35eb70a856 SHA1 7b0c2d3a7c2acc66c3c95fc7a92acb2bc2627409 SHA256 0a49d35a75524a54dbbb875730fdf7abd8b96cae160af0457b4f5239b1fefa37
+DIST buildbot-0.8.4p2.tar.gz 4555528 RMD160 063855eef00fc91094d022f7e09681566e7bf75e SHA1 475a077133f3df37ccddc9275989a03c75f14229 SHA256 1db52ef162f16965151be6f6641eb6ee03656041679182c8749e96f17393e8fe
 EBUILD buildbot-0.8.3_p1.ebuild 3090 RMD160 083de527023edb7fc094d8fefe91b951ab4f88bf SHA1 a6ec2971d637d808db2036b0038fd5dca2015a9c SHA256 ccd6c3a61188a5313d54027a2c457265f8761337184207c7561c5491ee4693a7
-MISC ChangeLog 12048 RMD160 0ce5874479cd46737891144d372297ba4e93b9ed SHA1 84259a190f1020e6e6e97b9a9ce1e2b930d1d591 SHA256 a9ac06d959665c624456d91ec34736c75b06f0cfb5e1963f932a5eae785eb1bd
+EBUILD buildbot-0.8.4_p2.ebuild 3095 RMD160 3661c3fbb6cb36fd926c5413349ae4d36f1dcad2 SHA1 7fcb8bb8f6995e8494d6e38c60443beb587455c1 SHA256 e3ca49d29a5483f2d7163efe29bd98b333705cc357c82e32854d233c95a03fac
+MISC ChangeLog 12198 RMD160 8e66f70cfbf0074be2c7edf4f0d5a35eeaf65b71 SHA1 407b8bec48214d933d8b39fd18680885596e5fc0 SHA256 f8887616ed4dec78c97b905bf4b4c6f9abbfd558fd9ef6a71891b36f8a725160
 MISC metadata.xml 1292 RMD160 87e781b71385afcd20ae84320394fecf27fee917 SHA1 66be097e7db1e17218cf906f4876bda684d779bf SHA256 24c59ac7a6f85e11cd776e636b8e9ebd95350acdd0a3329ad4d584d294b6523a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREKAAYFAk5igTAACgkQxeMuLWsGW/tMXgCghUyp0ekf15akVmmbZ/ZJg4qF
+2JIAn09KfI5nZmELgDmPMDRi99yeYN8y
+=ugal
+-----END PGP SIGNATURE-----
diff --git a/dev-util/buildbot/buildbot-0.8.4_p2.ebuild b/dev-util/buildbot/buildbot-0.8.4_p2.ebuild
new file mode 100644
index 000000000000..9fc3d4db6a50
--- /dev/null
+++ b/dev-util/buildbot/buildbot-0.8.4_p2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.8.4_p2.ebuild,v 1.1 2011/09/03 19:34:00 djc Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+DISTUTILS_SRC_TEST="trial"
+DISTUTILS_DISABLE_TEST_DEPENDENCY="1"
+
+inherit distutils eutils
+
+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="~amd64 ~x86"
+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-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
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		einfo "Generation of documentation"
+		pushd docs > /dev/null
+		emake buildbot.html buildbot.info || die "Generation of documentation failed"
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	doman docs/buildbot.1 || die "doman failed"
+
+	if use doc; then
+		dohtml -r docs/buildbot.html docs/images || die "dohtml failed"
+		doinfo docs/buildbot.info || die "doinfo failed"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib docs/examples || die "doins failed"
+	fi
+
+	newconfd "${FILESDIR}/buildmaster.confd" buildmaster || die "newconfd failed"
+	newinitd "${FILESDIR}/buildmaster.initd" buildmaster || die "newinitd failed"
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	elog "The \"buildbot\" user and the \"buildmaster\" init script has been added"
+	elog "to support starting buildbot through Gentoo's init system. To use this,"
+	elog "set up your build master following the documentation, make sure the"
+	elog "resulting directories are owned by the \"buildbot\" user and point"
+	elog "\"${ROOT}etc/conf.d/buildmaster\" at the right location. The scripts can"
+	elog "run as a different user if desired. If you need to run more than one"
+	elog "build master, just copy the scripts."
+	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/buildmaster.initd b/dev-util/buildbot/files/buildmaster.initd
index 67f22dea399a..ff0ab0d37641 100644
--- a/dev-util/buildbot/files/buildmaster.initd
+++ b/dev-util/buildbot/files/buildmaster.initd
@@ -28,7 +28,7 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting buildmaster in ${BASEDIR}"
-	start-stop-daemon --start -c "${USERNAME}" \
+	start-stop-daemon --start -u "${USERNAME}" \
 		--exec /usr/bin/python -- /usr/bin/twistd \
 		--no_save \
 		--logfile="${BASEDIR}/twistd.log" \