devel/buildbot devel/buildbot-slave: Update to 0.8.8

- Update to 0.8.8
- Update pkg-plist
- Add extract target to regression-test:
- Tweak TESTS option description
- master: Update RUN and BUILD DEPENDS versions
- slave: Remove patch that is now upstream

Changes:

https://github.com/buildbot/buildbot/blob/master/master/docs/relnotes/0.8.8.rst

7 files changed, 80 insertions, 45 deletions

diff --git a/devel/buildbot-slave/Makefile b/devel/buildbot-slave/Makefile
index 0d41cce0d9ef..b1a62fd72b1a 100644
--- a/devel/buildbot-slave/Makefile
+++ b/devel/buildbot-slave/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	buildbot-slave
-PORTVERSION=	0.8.7p1
+PORTVERSION=	0.8.8
 CATEGORIES=	devel python
 MASTER_SITES=	GOOGLE_CODE
 
@@ -23,8 +23,7 @@ USE_TWISTED_RUN=	runner
 MAKE_ENV+=		NO_INSTALL_REQS=1
 
 OPTIONS_DEFINE=		TESTS
-TESTS_DESC=		Install py-mock for unit tests
-# Ports infrastructure bug
+TESTS_DESC=		Install py-mock for test suite
 OPTIONSFILE?=		${PORT_DBDIR}/py-${PORTNAME}/options
 
 .include <bsd.port.options.mk>
@@ -38,7 +37,7 @@ MAN1=	buildslave.1
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/buildslave.1 ${MANPREFIX}/man/man1
 
-regression-test:
+regression-test: extract
 	@cd ${WRKSRC} && trial buildslave.test
 
 .include <bsd.port.mk>
diff --git a/devel/buildbot-slave/distinfo b/devel/buildbot-slave/distinfo
index 13ba4c097721..d571499ab4c0 100644
--- a/devel/buildbot-slave/distinfo
+++ b/devel/buildbot-slave/distinfo
@@ -1,2 +1,2 @@
-SHA256 (buildbot-slave-0.8.7p1.tar.gz) = bbdb07a3847efa186f942142a09394b467d7375745c49da0a42e9aa5b206eadc
-SIZE (buildbot-slave-0.8.7p1.tar.gz) = 104575
+SHA256 (buildbot-slave-0.8.8.tar.gz) = 8b7532d4d34527aea41e353d1bc3c35291ec335d3224c27800d2cc0cfc9837cc
+SIZE (buildbot-slave-0.8.8.tar.gz) = 107470
diff --git a/devel/buildbot-slave/files/patch-buildslave__test____init__.py b/devel/buildbot-slave/files/patch-buildslave__test____init__.py
deleted file mode 100644
index 79f601ca7317..000000000000
--- a/devel/buildbot-slave/files/patch-buildslave__test____init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./buildslave/test/__init__.py.orig	2012-12-07 22:20:33.655375165 +1100
-+++ ./buildslave/test/__init__.py	2012-12-07 22:21:11.070790866 +1100
-@@ -58,6 +58,6 @@
-     import mock
-     mock = mock
- except ImportError:
--    print >>sys.stderr, ("\nBuildbot tests require the 'mock' module; "
--                         "try 'pip install mock'")
--    os._exit(1)
-+    raise ImportError("Buildbot tests require the 'mock' module; "
-+                      "try 'pip install mock'")
-+
diff --git a/devel/buildbot-slave/pkg-plist b/devel/buildbot-slave/pkg-plist
index e83880859838..bf02a8848987 100644
--- a/devel/buildbot-slave/pkg-plist
+++ b/devel/buildbot-slave/pkg-plist
@@ -78,6 +78,9 @@ bin/buildslave
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/monkeypatches/bug5079.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/monkeypatches/bug5079.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/monkeypatches/bug5079.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/monkeypatches/testcase_assert.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/monkeypatches/testcase_assert.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/monkeypatches/testcase_assert.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/pbutil.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/pbutil.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/pbutil.pyo
@@ -87,6 +90,9 @@ bin/buildslave
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/scripts/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/scripts/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/scripts/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/scripts/base.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/scripts/base.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/scripts/base.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/scripts/logwatcher.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/scripts/logwatcher.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/scripts/logwatcher.pyo
@@ -174,6 +180,12 @@ bin/buildslave
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_runprocess.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_runprocess.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_runprocess.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_scripts_base.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_scripts_base.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_scripts_base.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_scripts_runner.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_scripts_runner.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_scripts_runner.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_util.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_util.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_util.pyo
diff --git a/devel/buildbot/Makefile b/devel/buildbot/Makefile
index 94f13eedc44f..baf316a703c2 100644
--- a/devel/buildbot/Makefile
+++ b/devel/buildbot/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	buildbot
-PORTVERSION=	0.8.7p1
+PORTVERSION=	0.8.8
 CATEGORIES=	devel python
 MASTER_SITES=	GOOGLE_CODE
 
@@ -14,14 +14,14 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:${PORTSDIR}/devel/py-Jinja2 \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:${PORTSDIR}/devel/py-dateutil \
 		${PYTHON_PKGNAMEPREFIX}migrate>=0.6.1:${PORTSDIR}/databases/py-migrate \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.6.1:${PORTSDIR}/databases/py-sqlalchemy \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.6:${PORTSDIR}/databases/py-sqlalchemy \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 
 TEST_DEPENDS:=	${RUN_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
 		trial:${PORTSDIR}/devel/py-twistedCore \
-		${PYTHON_PKGNAMEPREFIX}twistedWeb>9.0.0:${PORTSDIR}/www/py-twistedWeb \
-		${PYTHON_PKGNAMEPREFIX}twistedWords>9.0.0:${PORTSDIR}/net-im/py-twistedWords
+		${PYTHON_PKGNAMEPREFIX}twistedWeb>=9.0.0:${PORTSDIR}/www/py-twistedWeb \
+		${PYTHON_PKGNAMEPREFIX}twistedWords>=9.0.0:${PORTSDIR}/net-im/py-twistedWords
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	easy_install
@@ -30,8 +30,7 @@ USE_TWISTED_RUN=	conch mail web words
 MAKE_ENV+=		NO_INSTALL_REQS=1
 
 OPTIONS_DEFINE=		TESTS
-TESTS_DESC=		Install py-mock for unit tests
-# Ports infrastructure bug
+TESTS_DESC=		Install py-mock for test suite
 OPTIONSFILE?=		${PORT_DBDIR}/py-${PORTNAME}/options
 
 .include <bsd.port.options.mk>
@@ -45,7 +44,7 @@ post-patch:
 		's|/usr/bin/python|${PYTHON_CMD}|g'
 	@${FIND} ${WRKSRC} -name \*.bak -delete
 
-regression-test:
+regression-test: extract
 	@cd ${WRKSRC} && trial buildbot
 
 .include <bsd.port.mk>
diff --git a/devel/buildbot/distinfo b/devel/buildbot/distinfo
index e85b25c2bba9..050b30433bc6 100644
--- a/devel/buildbot/distinfo
+++ b/devel/buildbot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (buildbot-0.8.7p1.tar.gz) = 8dee3f887bce55a7f7cf01e6c421a2511898c2f89f55f202f5193a100a9a5776
-SIZE (buildbot-0.8.7p1.tar.gz) = 4597202
+SHA256 (buildbot-0.8.8.tar.gz) = 5013e3f3d83d2fcac8b5c391e3a740597330015300f0ebb94005ed2f90d739d0
+SIZE (buildbot-0.8.8.tar.gz) = 4641582
diff --git a/devel/buildbot/pkg-plist b/devel/buildbot/pkg-plist
index 06ab84fddd0d..ec3a908ab590 100644
--- a/devel/buildbot/pkg-plist
+++ b/devel/buildbot/pkg-plist
@@ -13,9 +13,21 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildrequest.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildrequest.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildrequest.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildslave.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildslave.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildslave.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildslave/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildslave/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildslave/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildslave/base.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildslave/base.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildslave/base.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildslave/ec2.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildslave/ec2.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildslave/ec2.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildslave/libvirt.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildslave/libvirt.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildslave/libvirt.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildslave/openstack.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildslave/openstack.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildslave/openstack.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/changes/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/changes/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/changes/__init__.pyo
@@ -234,6 +246,9 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/monkeypatches/bug5079.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/monkeypatches/bug5079.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/monkeypatches/bug5079.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/monkeypatches/gatherResults.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/monkeypatches/gatherResults.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/monkeypatches/gatherResults.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/monkeypatches/servicechecks.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/monkeypatches/servicechecks.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/monkeypatches/servicechecks.pyo
@@ -270,6 +285,9 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/process/buildrequest.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/process/buildrequest.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/process/buildrequest.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/process/buildrequestdistributor.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/process/buildrequestdistributor.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/process/buildrequestdistributor.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/process/buildstep.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/process/buildstep.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/process/buildstep.pyo
@@ -604,9 +622,6 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/blocker.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/blocker.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/blocker.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/master.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/master.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/master.pyo
@@ -673,6 +688,12 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/source/oldsource.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/source/oldsource.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/source/oldsource.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/source/p4.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/source/p4.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/source/p4.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/source/repo.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/source/repo.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/source/repo.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/source/svn.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/source/svn.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/steps/source/svn.pyo
@@ -709,12 +730,18 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/fake/libvirt.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/fake/libvirt.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/fake/libvirt.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/fake/openstack.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/fake/openstack.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/fake/openstack.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/fake/pbmanager.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/fake/pbmanager.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/fake/pbmanager.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/fake/remotecommand.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/fake/remotecommand.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/fake/remotecommand.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/fake/slave.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/fake/slave.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/fake/slave.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/fake/state.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/fake/state.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/fake/state.pyo
@@ -751,9 +778,15 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_buildslave.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_buildslave.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_buildslave.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_buildslave_base.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_buildslave_base.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_buildslave_base.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_buildslave_libvirt.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_buildslave_libvirt.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_buildslave_libvirt.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_buildslave_openstack.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_buildslave_openstack.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_buildslave_openstack.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_changes_base.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_changes_base.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_changes_base.pyo
@@ -877,9 +910,6 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_db_users.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_db_users.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_db_users.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_libvirtbuildslave.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_libvirtbuildslave.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_libvirtbuildslave.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_master.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_master.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_master.pyo
@@ -889,9 +919,6 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_process_botmaster_BotMaster.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_process_botmaster_BotMaster.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_process_botmaster_BotMaster.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_process_botmaster_BuildRequestDistributor.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_process_botmaster_BuildRequestDistributor.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_process_botmaster_BuildRequestDistributor.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_process_botmaster_DuplicateSlaveArbitrator.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_process_botmaster_DuplicateSlaveArbitrator.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_process_botmaster_DuplicateSlaveArbitrator.pyo
@@ -904,6 +931,9 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_process_buildrequest.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_process_buildrequest.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_process_buildrequest.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_process_buildrequestdistributor_BuildRequestDistributor.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_process_buildrequestdistributor_BuildRequestDistributor.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_process_buildrequestdistributor_BuildRequestDistributor.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_process_buildstep.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_process_buildstep.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_process_buildstep.pyo
@@ -1069,9 +1099,6 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_status_words.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_status_words.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_status_words.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_steps_blocker.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_steps_blocker.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_steps_blocker.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_steps_master.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_steps_master.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_steps_master.pyo
@@ -1129,6 +1156,12 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_steps_source_oldsource_Repo.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_steps_source_oldsource_Repo.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_steps_source_oldsource_Repo.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_steps_source_p4.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_steps_source_p4.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_steps_source_p4.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_steps_source_repo.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_steps_source_repo.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_steps_source_repo.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_steps_source_svn.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_steps_source_svn.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/unit/test_steps_source_svn.pyo
@@ -1210,6 +1243,9 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/util/interfaces.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/util/interfaces.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/util/interfaces.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/util/logging.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/util/logging.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/util/logging.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/util/migration.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/util/migration.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/test/util/migration.pyo
@@ -1293,6 +1329,7 @@ bin/buildbot
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/db
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/changes
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/clients
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot/buildslave
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildbot
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO