Revision bump. Fixed initscript #223853.

Package-Manager: portage-2.1.5.2

4 files changed, 160 insertions, 2 deletions

diff --git a/dev-util/buildbot/ChangeLog b/dev-util/buildbot/ChangeLog
index cbe0a55c7186..2bb1c66feb95 100644
--- a/dev-util/buildbot/ChangeLog
+++ b/dev-util/buildbot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/buildbot
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.20 2008/05/27 16:45:29 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.21 2008/05/27 18:02:47 hawking Exp $
+
+*buildbot-0.7.7-r1 (27 May 2008)
+
+  27 May 2008; Ali Polatel <hawking@gentoo.org> +files/buildbot.initd-r1,
+  +buildbot-0.7.7-r1.ebuild:
+  Revision bump. Fixed initscript #223853.
 
   27 May 2008; Markus Rothe <corsair@gentoo.org> buildbot-0.7.6.ebuild:
   Stable on ppc64; bug #223437
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index d62079871c40..c9d385a54c29 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX buildbot-0.7.5-root-skip-tests.patch 430 RMD160 696badc78f800a535996550977fa9a433a0ad7ae SHA1 f774027e049544bb241548914b7ff393aa0a4ee4 SHA256 ca953c4edeaac73fd8de49d9e936621efb2e9c6dead31f276db9b1cdb8488ebd
 AUX buildbot.initd 1207 RMD160 3bc054c15b8c530f8f4012026319d3f5c6264079 SHA1 1eefb47a1872b578a6b47b01c79662cb8890fa6e SHA256 0774ae5c3cfd67e537251a6e3c4bdd4bc6c948fadf7e15bd137ad977e21475fb
+AUX buildbot.initd-r1 1230 RMD160 16a9fc902f09d5c73d68df8970e7491af9002594 SHA1 341384a6bb5e817914d26da4d854dcacfb8c9b25 SHA256 2caac58f72af711c54adaa7dcdfb1417255d26d07cf9f3388fd5267ee7fc7c47
 AUX buildmaster.confd 218 RMD160 a8f6893aa83c0c169f493104e1c6f023ec45f787 SHA1 8dc5e868092a8ea90c0cec5650ba85e412295968 SHA256 bb7f93e3867b32a25e2445a66d40573fa5073a80e73e35ae2a904db715f870c6
 AUX buildslave.confd 215 RMD160 ffe7545a43c10a9f3e9798f23ba6a32ab47c137b SHA1 8c57893b6ef370a98f4af552d91e1b702b89abd6 SHA256 5d0ab58d0808ccfa2d594b22047dfca9167c855ff749d34523177cefb307f76a
 DIST buildbot-0.7.5.tar.gz 937490 RMD160 3aa6c243536771ed579c050d574fd57c56a96c8c SHA1 ef5c884141b016472b5eaf3a2ff0657f9ef6b221 SHA256 48366fc4032487702dea95b12ddf246ca43942450924c76a60235edf9cd0b004
@@ -7,6 +11,14 @@ DIST buildbot-0.7.6.tar.gz 1070806 RMD160 445049911a96e358732a90cf34d13e44139574
 DIST buildbot-0.7.7.tar.gz 1109613 RMD160 4ff3fa7e9b3fef26c85f716de231e5241768a7a6 SHA1 47201c3e0d98f7b4a2bc5a4d959ebdc1be0634d7 SHA256 71f31925b9108a460345ab5cee975c28a28b4ce894a8877004f956617555f42c
 EBUILD buildbot-0.7.5.ebuild 2637 RMD160 f9ee0eb764e14ca34240c0e1085e1191e1649872 SHA1 ff58372798c6bfb9027f760ccb79ceaf81a5f6d2 SHA256 d468c59078dae6ffce2f884d17150df20a9416ef2f88039f4b831c8518acf274
 EBUILD buildbot-0.7.6.ebuild 3007 RMD160 6d76790abab7a9ba22775f70ed3293647ced3548 SHA1 554614e6c2cd91106c68219301f4a686adb1fb13 SHA256 fc272e62288989434d034d405bd89536e32b3b8a40a947e4ac279630d04b63e4
+EBUILD buildbot-0.7.7-r1.ebuild 2966 RMD160 30e4631645516636d5333c15c580db421b001dc4 SHA1 8ecfb5813ead7c2b25f46e8afa6c261268d4d141 SHA256 3d74a0e18d7a67e2499dc2acdefe57c3fac5ae61b7d79ebd17a5175dce03f6b1
 EBUILD buildbot-0.7.7.ebuild 3004 RMD160 60ebe9d168b18d754a132750cdb901aa2d57df29 SHA1 b570608500590a66dbac7600dfb4352b442ab257 SHA256 7fa51ca5714bae0395a2a93f4f74499825f6af410c11eea5d48e13e839e68641
-MISC ChangeLog 3109 RMD160 364f52cd4e6e734c9986954dd3e648b0183abb58 SHA1 93c15a0fd6190ef156edfde2878cedefb615f708 SHA256 b12458afd6ee05b087222b1280ae4dda04e073a97cc8963993b7ee16033c193c
+MISC ChangeLog 3290 RMD160 98aee0db9b515c5c32bc71f9ce3019a554f503ed SHA1 e2eb044280ab38c669d64b4eb955c7217d887991 SHA256 7632dcca87c1f522474f9a8aafcd9d3122b1008a786db28f154d54e94674f3dc
 MISC metadata.xml 985 RMD160 ac82b87dc8352663146a168722de95ab93858333 SHA1 0ee906c099e89fcf6bd1a2901e40d3fde2456e24 SHA256 5ddbc6e30244e993b9b60f379a8974e82511670b5d52f0d4b50a3cd24b526658
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkg8TM4ACgkQQU4yORhF8iCL2wCgr5+D16wYAptTwxbmPQq10tlv
+1rAAnRAXGMj2K9jgEsnFktU5ElGVokL4
+=cbDu
+-----END PGP SIGNATURE-----
diff --git a/dev-util/buildbot/buildbot-0.7.7-r1.ebuild b/dev-util/buildbot/buildbot-0.7.7-r1.ebuild
new file mode 100644
index 000000000000..8f399f4eee30
--- /dev/null
+++ b/dev-util/buildbot/buildbot-0.7.7-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.7.7-r1.ebuild,v 1.1 2008/05/27 18:02:47 hawking Exp $
+
+NEED_PYTHON="2.3"
+
+inherit distutils eutils
+
+DESCRIPTION="A Python system to automate the compile/test cycle to validate code changes"
+HOMEPAGE="http://buildbot.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc irc mail test web"
+
+CDEPEND=">=dev-python/twisted-2.0.1"
+RDEPEND="${CDEPEND}
+	mail? ( dev-python/twisted-mail )
+	irc? ( dev-python/twisted-words )
+	web? ( dev-python/twisted-web )"
+DEPEND="${CDEPEND}
+	test? ( dev-python/twisted-web
+		dev-python/twisted-mail )
+	doc? ( =dev-python/epydoc-2* )"
+
+pkg_setup() {
+	enewuser buildbot
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-0.7.5-root-skip-tests.patch"
+}
+
+src_compile() {
+	distutils_src_compile
+	if use doc; then
+		PYTHONPATH=. "${python}" docs/epyrun -o docs/reference || \
+			die "epyrun failed"
+	fi
+}
+
+src_test() {
+	local trialopts
+	if ! has_version ">=dev-python/twisted-2.2"; then
+		trialopts=-R
+	fi
+	PYTHONPATH=. trial ${trialopts} buildbot || die "tests failed!"
+}
+
+src_install() {
+	distutils_src_install
+	doinfo docs/buildbot.info
+	dohtml -r docs/buildbot.html docs/images
+
+	insinto /usr/share/doc/${PF}
+	doins -r docs/examples
+
+	use doc && doins -r docs/reference
+
+	newconfd "${FILESDIR}/buildslave.confd" buildslave
+	newinitd "${FILESDIR}/buildbot.initd-r1" buildslave
+	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+	newinitd "${FILESDIR}/buildbot.initd-r1" buildmaster
+
+	# Make it print the right names when you start/stop the script.
+	sed -i -e 's/@buildbot@/buildslave/' \
+		"${D}/etc/init.d/buildslave" || die "buildslave sed failed"
+	sed -i -e 's/@buildbot@/buildmaster/' \
+		"${D}/etc/init.d/buildmaster" || die "buildmaster sed failed"
+}
+
+pkg_postinst() {
+	elog 'The "buildbot" user and the "buildmaster" and "buildslave" init'
+	elog "scripts were added to support starting buildbot through gentoo's"
+	elog "init system.  To use this set up your build master or build slave"
+	elog "following the buildbot documentation, make sure the resulting"
+	elog 'directories are owned by the "buildbot" user and point'
+	elog "${ROOT}etc/conf.d/buildmaster or ${ROOT}etc/conf.d/buildslave"
+	elog "at the right location.  The scripts can run as a different user"
+	elog "if desired.  If you need to run more than one master or slave"
+	elog "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 new"
+	elog "'buildbot upgrade-master' command on each of your pre-existing buildmasters."
+	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.initd-r1 b/dev-util/buildbot/files/buildbot.initd-r1
new file mode 100644
index 000000000000..167e4279d2a6
--- /dev/null
+++ b/dev-util/buildbot/files/buildbot.initd-r1
@@ -0,0 +1,48 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/files/buildbot.initd-r1,v 1.1 2008/05/27 18:02:47 hawking Exp $
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ -z "${BASEDIR}" ]; then
+		eerror "BASEDIR not set"
+		return 1
+	fi
+	if [ -z "${USERNAME}" ]; then
+		eerror "USERNAME not set"
+		return 1
+	fi
+	if [ ! -d "${BASEDIR}" ]; then
+		eerror "${BASEDIR} is not a directory"
+		return 1
+	fi
+	if [ ! -e "${BASEDIR}/buildbot.tac" ]; then
+		eerror "${BASEDIR} does not contain buildbot.tac"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting @buildbot@ in ${BASEDIR}"
+	# We set HOME here to make something valid show up in the env of child
+	# processes spawned by the buildslave.
+	start-stop-daemon --start -c "${USERNAME}" --quiet \
+		--env HOME="${BASEDIR}" \
+		--exec /usr/bin/python -- /usr/bin/twistd \
+		--no_save \
+		--logfile="${BASEDIR}/twistd.log" \
+		--pidfile="${BASEDIR}/@buildbot@.pid" \
+		--python="${BASEDIR}/buildbot.tac"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping @buildbot@ in ${BASEDIR}"
+	start-stop-daemon --stop --quiet --pidfile "${BASEDIR}/@buildbot@.pid"
+	eend $?
+}