Adding twisted-mail to deps, making twisted-web unconditional as it is used in the default config. Fixes #258465.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 103 insertions, 2 deletions

diff --git a/dev-util/buildbot/ChangeLog b/dev-util/buildbot/ChangeLog
index 57ee35e7f5da..fbe4998d080a 100644
--- a/dev-util/buildbot/ChangeLog
+++ b/dev-util/buildbot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/buildbot
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.30 2009/02/13 18:50:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.31 2009/02/15 11:53:12 patrick Exp $
+
+*buildbot-0.7.9-r1 (15 Feb 2009)
+
+  15 Feb 2009; Patrick Lauer <patrick@gentoo.org> +buildbot-0.7.9-r1.ebuild:
+  Adding twisted-mail to deps, making twisted-web unconditional as it is
+  used in the default config. Fixes #258465.
 
   13 Feb 2009; Raúl Porcel <armin76@gentoo.org> buildbot-0.7.9.ebuild:
   Add ~arm/~s390/~sh wrt #234894
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 0b4477fa380d..da46fb63f91b 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -13,6 +13,7 @@ EBUILD buildbot-0.7.6.ebuild 3007 RMD160 6d76790abab7a9ba22775f70ed3293647ced354
 EBUILD buildbot-0.7.7-r1.ebuild 2955 RMD160 f0b9ae03e34ee7fb12d41094d812b867cccff959 SHA1 e86fb2f65f7f483d80f811200a9feab8fa388397 SHA256 e1a873f834a2f93bb9c995c45c419c81631e6a50a110077eaa932340b4ef5767
 EBUILD buildbot-0.7.7.ebuild 3004 RMD160 60ebe9d168b18d754a132750cdb901aa2d57df29 SHA1 b570608500590a66dbac7600dfb4352b442ab257 SHA256 7fa51ca5714bae0395a2a93f4f74499825f6af410c11eea5d48e13e839e68641
 EBUILD buildbot-0.7.8.ebuild 2983 RMD160 599abb057709948ef01897a927a6391560d99452 SHA1 8e17f202002370444f530fc1402e0086567cad45 SHA256 896329a1d23077d923e0aea6e6211429d8b6e271256692a116ce83fbd96c70ff
+EBUILD buildbot-0.7.9-r1.ebuild 3019 RMD160 644edfd71e5a51d2f2e421bb013f2d9cd234b2df SHA1 53ce490657e49a2b57f5720dbc2068a02ad1ddcb SHA256 6e3a4b82090979a132fd2fea12243074b41d0ecf2e31212c5e96a6b2f5057763
 EBUILD buildbot-0.7.9.ebuild 3004 RMD160 b16dc8ce50cffd86b018cab7438d195289b81d3d SHA1 5ccd7143effd2e56c8125d720de7c88527afbc64 SHA256 907bfe2f88af84f5d888ffc26df362e344ac9fd67c5f9429c820adba035eea49
-MISC ChangeLog 4324 RMD160 bb1fe7978cf4763f326324970658fee59fdbafa2 SHA1 77a6ec1204ffb9bc8e0355337c97824082ee9d3b SHA256 dbcb4ffd398109932d24d2a9b184c8e8fcde70b089b8e66a5c926f1528687d99
+MISC ChangeLog 4554 RMD160 5377829fd7585f77f1af92bd81a7c86b92bb7d33 SHA1 92aad534cb9d093279f7617b63afcb357bcc6cbd SHA256 9c9a6870aa66c6e057454f5fa0bcbee54044b73cde1177da27d92fb355e1851a
 MISC metadata.xml 1289 RMD160 8b1f435f1f165587a3407dba213b82afd8497f0c SHA1 4287932657bc884970634f3307f72d242a36846e SHA256 6e2e6ac0d9b0ef9df0f7f92c80fb56038779fdd5edbfd312649f24c79430664e
diff --git a/dev-util/buildbot/buildbot-0.7.9-r1.ebuild b/dev-util/buildbot/buildbot-0.7.9-r1.ebuild
new file mode 100644
index 000000000000..8cc941d1f368
--- /dev/null
+++ b/dev-util/buildbot/buildbot-0.7.9-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.7.9-r1.ebuild,v 1.1 2009/02/15 11:53:12 patrick 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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc irc mail manhole test"
+
+CDEPEND=">=dev-python/twisted-2.0.1"
+RDEPEND="${CDEPEND}
+	mail? ( dev-python/twisted-mail )
+	manhole? ( dev-python/twisted-conch )
+	irc? ( dev-python/twisted-words )
+	dev-python/twisted-web
+	dev-python/twisted-mail"
+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."
+}