From 42873c0452b56244fb449d8638d507ed78c882ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tiziano=20M=C3=BCller?= Date: Wed, 27 Feb 2008 12:39:38 +0000 Subject: [PATCH] Version bump (bug #211540) with some little fixes. Package-Manager: portage-2.1.4.4 --- dev-util/buildbot/ChangeLog | 11 ++++- dev-util/buildbot/Manifest | 7 ++-- ...bot-0.7.4.ebuild => buildbot-0.7.6.ebuild} | 41 ++++++++++++------- .../files/buildbot-0.7.4-svn-1.4.patch | 38 ----------------- 4 files changed, 38 insertions(+), 59 deletions(-) rename dev-util/buildbot/{buildbot-0.7.4.ebuild => buildbot-0.7.6.ebuild} (61%) delete mode 100644 dev-util/buildbot/files/buildbot-0.7.4-svn-1.4.patch diff --git a/dev-util/buildbot/ChangeLog b/dev-util/buildbot/ChangeLog index 62a721ebeef7..99a9c3acfe9e 100644 --- a/dev-util/buildbot/ChangeLog +++ b/dev-util/buildbot/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-util/buildbot -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.15 2007/09/17 10:30:13 jokey Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.16 2008/02/27 12:39:38 dev-zero Exp $ + +*buildbot-0.7.6 (27 Feb 2008) + + 27 Feb 2008; Tiziano Müller + -files/buildbot-0.7.4-svn-1.4.patch, -buildbot-0.7.4.ebuild, + +buildbot-0.7.6.ebuild: + Version bump (bug #211540) with some little fixes. 17 Sep 2007; Markus Ullmann buildbot-0.7.4.ebuild, buildbot-0.7.5.ebuild: diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest index d87e4ea868ec..d4943cb83cdd 100644 --- a/dev-util/buildbot/Manifest +++ b/dev-util/buildbot/Manifest @@ -1,11 +1,10 @@ -AUX buildbot-0.7.4-svn-1.4.patch 1551 RMD160 43c38ca11f1e1cb24d4f91619f2b02c3deec2ed1 SHA1 c133fdffcfc27a9c712c6915e31cd8f979f21a1e SHA256 5dc4efac0c94baafb22cd102f1b8006db67d62d7a6a02a4c2c0d58cf8dd2b6d0 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 buildmaster.confd 218 RMD160 a8f6893aa83c0c169f493104e1c6f023ec45f787 SHA1 8dc5e868092a8ea90c0cec5650ba85e412295968 SHA256 bb7f93e3867b32a25e2445a66d40573fa5073a80e73e35ae2a904db715f870c6 AUX buildslave.confd 215 RMD160 ffe7545a43c10a9f3e9798f23ba6a32ab47c137b SHA1 8c57893b6ef370a98f4af552d91e1b702b89abd6 SHA256 5d0ab58d0808ccfa2d594b22047dfca9167c855ff749d34523177cefb307f76a -DIST buildbot-0.7.4.tar.gz 862827 RMD160 8b7ec0dd615209b5ab976cb2da195249ce147189 SHA1 d661b0058188ed92cc7ae8e8b0a76704d7581ca5 SHA256 d9b1ff5bfcf746be348d75096e9a4824b9b6f02eccdc8b53402d3944898c298e DIST buildbot-0.7.5.tar.gz 937490 RMD160 3aa6c243536771ed579c050d574fd57c56a96c8c SHA1 ef5c884141b016472b5eaf3a2ff0657f9ef6b221 SHA256 48366fc4032487702dea95b12ddf246ca43942450924c76a60235edf9cd0b004 -EBUILD buildbot-0.7.4.ebuild 2291 RMD160 ee2de9b312c4fb1b16ad910a2a63a4ab16bd9a7a SHA1 825f5bb77cfffa2908ec84ce220c0cf4e9e71c78 SHA256 9fab8e19bf59920845470e48962eada956d77fa3b0c7c8eb3cbe6fbb9cc131de +DIST buildbot-0.7.6.tar.gz 1070806 RMD160 445049911a96e358732a90cf34d13e44139574a4 SHA1 f1c9693fefa6cc882387126e45cb0bdec8bce88c SHA256 e73afc607885133ed4a68f174fe6b43a77c4436bd0923109c5a76f415a2e1b25 EBUILD buildbot-0.7.5.ebuild 2671 RMD160 e1593c8f02590d787794b0f58a32a564eba87310 SHA1 374328233983255596a048c3a967411f8925624f SHA256 064d0eb32ef56508c57d3bf9baf9884540a66a2e3fca9e221e03a87941602763 -MISC ChangeLog 2328 RMD160 1a0616943f58959fdbd3bb19758dd1121f94d949 SHA1 5ba10db2876bdf85cc466728cf06329f2f93ad04 SHA256 d88ec6d655e328aefd90ca24faf4d46e66e2c829486abc72aea27a4069a35d1a +EBUILD buildbot-0.7.6.ebuild 3041 RMD160 a6501ac6d5f20e1c5ff6ef8ad5a32958cbd2a83b SHA1 4cbd2740641a2af66b893d30040f5c2f720879af SHA256 18a0f2aa54b2497d18115c48c1125c3146eef3ba62163b8398cdca6c85d95504 +MISC ChangeLog 2558 RMD160 dcd48711468de38a249fad65bc5d88a80519c269 SHA1 fad8beefa952e5b8665112b63e60e79c44079760 SHA256 e3bd6d197289ae910c8ebbfedccca28d57dbc3ca1311707f0a7f61b481ba0bd0 MISC metadata.xml 958 RMD160 9d7be621968219470c6fb4e66c55e91d3d7765b6 SHA1 d8a978793941a2a566dcbc9364d09e22ae54d256 SHA256 f61483b7976a1fc93cda8f8cc6d23e744f8f3ae765b385d35246be3a2ef87d76 diff --git a/dev-util/buildbot/buildbot-0.7.4.ebuild b/dev-util/buildbot/buildbot-0.7.6.ebuild similarity index 61% rename from dev-util/buildbot/buildbot-0.7.4.ebuild rename to dev-util/buildbot/buildbot-0.7.6.ebuild index a32bef78ca73..f45ef32423e9 100644 --- a/dev-util/buildbot/buildbot-0.7.4.ebuild +++ b/dev-util/buildbot/buildbot-0.7.6.ebuild @@ -1,29 +1,30 @@ -# Copyright 1999-2007 Gentoo Foundation +# 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.4.ebuild,v 1.6 2007/09/17 10:30:13 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.7.6.ebuild,v 1.1 2008/02/27 12:39:38 dev-zero Exp $ + +NEED_PYTHON="2.3" inherit distutils eutils -DESCRIPTION="A Python system to automate the compile/test cycle to validate code changes. Similar to Tinderbox, but simpler." +DESCRIPTION="A Python system to automate the compile/test cycle to validate code changes (similar to Tinderbox, but simpler)" HOMEPAGE="http://buildbot.net/" SRC_URI="mirror://sourceforge/buildbot/${P}.tar.gz" - LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="doc irc mail test web" -commondepend=">=dev-lang/python-2.3 - >=dev-python/twisted-2.0.1" -RDEPEND="${commondepend} +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="${commondepend} - test? ( dev-python/twisted-web ) +DEPEND="${CDEPEND} + test? ( dev-python/twisted-web + dev-python/twisted-mail ) doc? ( dev-python/epydoc )" -pkg_setup(){ +pkg_setup() { enewuser buildbot } @@ -31,7 +32,7 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/${P}-svn-1.4.patch" + epatch "${FILESDIR}/${PN}-0.7.5-root-skip-tests.patch" } src_compile() { @@ -58,14 +59,18 @@ src_install() { insinto /usr/share/doc/${PF} doins -r docs/examples - if use doc; then - doins -r docs/reference - fi + use doc && doins -r docs/reference newconfd "${FILESDIR}/buildslave.confd" buildslave newinitd "${FILESDIR}/buildbot.initd" buildslave newconfd "${FILESDIR}/buildmaster.confd" buildmaster newinitd "${FILESDIR}/buildbot.initd" buildmaster + + # Make it print the right names when you start/stop the script. + sed -i -e '/ebegin/s/Starting buildbot/Starting buildslave/' \ + "${D}/etc/init.d/buildslave" || die "buildslave sed failed" + sed -i -e '/ebegin/s/Starting buildbot/Starting buildmaster/' \ + "${D}/etc/init.d/buildmaster" || die "buildmaster sed failed" } pkg_postinst() { @@ -78,4 +83,10 @@ pkg_postinst() { 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 recommands 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-0.7.4-svn-1.4.patch b/dev-util/buildbot/files/buildbot-0.7.4-svn-1.4.patch deleted file mode 100644 index 993f988c3300..000000000000 --- a/dev-util/buildbot/files/buildbot-0.7.4-svn-1.4.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: test_vc.py -=================================================================== -RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_vc.py,v -retrieving revision 1.68 -retrieving revision 1.69 -diff -u -d -r1.68 -r1.69 ---- buildbot/test/test_vc.py 15 Sep 2006 14:47:41 -0000 1.68 -+++ buildbot/test/test_vc.py 18 Sep 2006 02:14:45 -0000 1.69 -@@ -499,6 +499,15 @@ - self.fail("build did not succeed") - return bs - -+ def printLogs(self, bs): -+ for s in bs.getSteps(): -+ for l in s.getLogs(): -+ print "--- START step %s / log %s ---" % (s.getName(), -+ l.getName()) -+ print l.getTextWithHeaders() -+ print "--- STOP ---" -+ print -+ - def touch(self, d, f): - open(os.path.join(d,f),"w").close() - def shouldExist(self, *args): -@@ -666,7 +675,12 @@ - d.addCallback(self._do_vctest_update_retry_1) - return d - def _do_vctest_update_retry_1(self, bs): -- self.shouldNotExist(self.workdir, "newfile") -+ # SVN-1.4.0 doesn't seem to have any problem with the -+ # file-turned-directory issue (although older versions did). So don't -+ # actually check that the tree was clobbered.. as long as the update -+ # succeeded (checked by doBuild), that should be good enough. -+ #self.shouldNotExist(self.workdir, "newfile") -+ pass - - def _do_vctest_copy(self, res): - d = self.doBuild() # copy rebuild clobbers new files -- 2.26.2