Merge updates from master

18 files changed, 1092 insertions, 104 deletions

diff --git a/app-office/taskcoach/taskcoach-1.4.3.ebuild b/app-office/taskcoach/taskcoach-1.4.3-r1.ebuild
index 427fe1fb688a..1f9ddca64caa 100644
--- a/app-office/taskcoach/taskcoach-1.4.3.ebuild
+++ b/app-office/taskcoach/taskcoach-1.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,7 +24,10 @@ DEPEND="
 		>=dev-python/wxpython-2.8.9.2:2.8[${PYTHON_USEDEP}]
 		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
 	)
-	>=dev-python/twisted-core-10.0
+		|| (
+			>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+			>=dev-python/twisted-core-10.0
+		)
 "
 RDEPEND="${DEPEND}
 	x11-libs/libXScrnSaver
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index 7175f911f088..6bc08755d3cb 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,3 +1,3 @@
-DIST buildbot-console-view-0.9.0.post1.tar.gz 630459 SHA256 1415fb5afaa5a450a38349ce799190de34749449f1147ae42b6adf5ccfca8735 SHA512 c209c8dd320df2a7a9ab8bd8276a081c981981645ca85511320e5dc755957623cc051feb57904c5208e6f7e2b9f7c4ac6f204c574445cdff643685a2d5dafe17 WHIRLPOOL c81860f92bc6d55a5fa925d2b415ad640f4150573abfde878cf3e02c8f7cecba60de6e8d87571b8dd8f6d0d7ae24fcf29afbce532bb517e90f93644f4c80ec57
 DIST buildbot-console-view-0.9.1.tar.gz 630486 SHA256 028288d2ba8f7c79043c8b0751a53cfedf50f3134dbf57740d310dc708f71cef SHA512 d5936c0494e626ad8db5b1f75994978805d0e65d57b9c4bcce7b1584f32699b4ca2023504b647b54f91ab669e084b7d18973060b512a316808cd892aca2e8fdd WHIRLPOOL 7476cb96e63da87953a6602ceca3aa75eaa0cb6d10e3d49871d333c476b185a068a0fe17ed07d9715ad7c148d686701a702a5366fdf05d96149a6ffb49ae5839
 DIST buildbot-console-view-0.9.2.tar.gz 630903 SHA256 a5acb36e20410bd8fe7a6a34c3afd83115e80651f92f1705a0641e526344e74a SHA512 6b1e05b7b846ecd5cd0d1f091c5cb2f3fe9a7cb6db5651ad406cf7f62fc04ebe68390b459fab78c166b864305135dee7f982f1fbc02ec67060ac3d64c0b90edc WHIRLPOOL c3796d9b60149592d2c0c1c92f91c11039f47fb0260e3ce549b48f251637c0a49a6b83c69b71383838984fdf6b4aeab3508a93b8303c14bada2de0d87cc4d4e7
+DIST buildbot-console-view-0.9.3.tar.gz 631462 SHA256 b389b4024e52824463e696d3ed9a56de8ea5de60abb01ddbb6e2f402ea547fe6 SHA512 0fc51252e323917f64f175ee2cfd46bdab7dc07a921d0fb74c0b5828cc5212ef5f5d2ae43c1f1fe5e2c32a0dab19a52d6bb7c7bb3ce50bdfdb18af02eaf4de82 WHIRLPOOL 63ad18e39c228226ce2ab5441785b013051c732738e54190c214a0a35476fc78e0f5b3c731ecce520f5920777bf728f20e2f0a42615ea9a4049c6f7fab4956df
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.0_p1.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.3.ebuild
index 1b237f4994ca..452a0f4d4561 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.0_p1.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ inherit distutils-r1
 DESCRIPTION="Buildbot console-view plugin"
 HOMEPAGE="http://trac.buildbot.net/ https://github.com/buildbot/buildbot http://pypi.python.org/pypi/buildbot"
 
-MY_V="0.9.0.post1"
+MY_V="${PV/_p/p}"
 MY_P="${PN}-${MY_V}"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
@@ -27,6 +27,8 @@ else
 	KEYWORDS="~amd64"
 fi
 
+IUSE="test"
+
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
@@ -40,6 +42,12 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 #[[ ${PV} == *9999 ]] && S=${S}/www/base
 
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 }
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index d5396a3d9dea..38f44d1b2e17 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,3 +1,3 @@
-DIST buildbot-pkg-0.9.0.post1.tar.gz 3369 SHA256 7149d8f4d906914b77375855c3de30ec2c9edb26f5da6c654dcceb360eb3353b SHA512 decef481958f4f85797260e00a501a55e6c8f0b3938ca9d8b98f773481a7484f221ceb5eb4e45ed7efc32e88bb16a4431ae0c2e7a8203c384915beea2f32f295 WHIRLPOOL d33a88b2c8ee8f21a62d46eaa8099fb3b579ba9c1c21cbf1cdc8569840cf66f4b8415c7a662344d3a2e472947984bb248c81e761df73d8aa2bb8ee471bc5e8d7
 DIST buildbot-pkg-0.9.1.tar.gz 3800 SHA256 6dab917d6bc689fef1c6bc30d6af041ce4fc56c3dacd0378957c3d606094f3a3 SHA512 28b644c64a38d53305c6955a45596c6a27f988363a0d0bd980922842f3d6712b6ee35d74f7124eae5269b95c8755eb4922546d1ea9237b93f8694f4993baa1e8 WHIRLPOOL 09fed25389b43f2688db2e60b0ea7ad73fabd5acca893f2ed958214ccc5449373e950bacc297e403560ae0cabf9f588dae63763e3d8204b955d0705ecc6f2230
 DIST buildbot-pkg-0.9.2.tar.gz 3803 SHA256 7c9c8e0e9c85d129e2147c596588df81f29aec72411b7284a57ebb7cfdba1a6e SHA512 b64f48fe2fe645282856ac5e720490cdb9af7b0a4763eeeb95777d652d46b8cb5f2b904b8c109ab6bc18a3f9fb01292a3ddc106ef1e89b84059c7ec025bcdda6 WHIRLPOOL 58765b2ef28d774d7b862f240017fe90ca1f519fee61e3f33045569418777c6ffe2c48f1bea0affb7b60846c1b139856857bce10b09ce23416dc6be33c8f03ed
+DIST buildbot-pkg-0.9.3.tar.gz 3799 SHA256 d240d342be4ca01c4597bda039133af8db713ba7b7c2104718d0c357374b2409 SHA512 64fbcd8afee051afe9b76afec63eb463cf7cd2c89c320dafca2f024923a1dbc49fd67dd9f514d8108b85990ca2981be36ed650fcf37486c7b909bd1329efd832 WHIRLPOOL 2bb200ba9b703cec056f3fc1e92130881164193e46a170315bca84b0fac8d743a40e12b0005764b0517133bee973059ce5731a0eb1d5343c28a5bc20556365b1
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.0_p1.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.3.ebuild
index 65e1045bd6ae..0cac89a2bfe1 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.0_p1.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ EGIT_REPO_URI="git://github.com/buildbot/buildbot.git"
 [[ ${PV} == *9999 ]] && inherit git-r3
 inherit distutils-r1
 
-MY_V="0.9.0.post1"
+MY_V="${PV/_p/p}"
 MY_P="${PN}-${MY_V}"
 
 DESCRIPTION="BuildBot common www build tools for packaging releases"
@@ -27,6 +27,9 @@ else
 	KEYWORDS="~amd64"
 fi
 
+# No real integration tests for this pkg.
+# all tests are related to making releases and final checks for distribution
+
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-slave/buildbot-slave-9999.ebuild b/dev-util/buildbot-slave/buildbot-slave-9999.ebuild
deleted file mode 100644
index 352fb295e2c6..000000000000
--- a/dev-util/buildbot-slave/buildbot-slave-9999.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} = 9999 ]] && inherit git-2
-inherit distutils-r1 readme.gentoo user
-
-DESCRIPTION="BuildBot Slave Daemon"
-HOMEPAGE="http://trac.buildbot.net/ https://code.google.com/p/buildbot/ https://pypi.python.org/pypi/buildbot-slave"
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} = 9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux"
-fi
-IUSE="test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/twisted-core[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildslave\" init script has been added
-		to support starting buildslave through Gentoo's init system. To use this,
-		set up your build slave following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}etc/conf.d/buildslave\" at the right location.  The scripts can
-		run as a different user if desired. If you need to run more than one
-		build slave, just copy the scripts."
-}
-
-src_compile() {
-	[[ ${PV} = 9999 ]] && cd slave/
-	distutils-r1_src_compile
-}
-
-src_install() {
-	[[ ${PV} = 9999 ]] && cd slave/
-	distutils-r1_src_install
-
-	doman docs/buildslave.1
-
-	newconfd "${FILESDIR}/buildslave.confd" buildslave
-	newinitd "${FILESDIR}/buildslave.initd" buildslave
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	[[ ${PV} = 9999 ]] && cd slave/
-	readme.gentoo_print_elog
-}
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 2cc824c883a1..fc5b24f70ba9 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,3 +1,3 @@
-DIST buildbot-waterfall-view-0.9.0.post1.tar.gz 704789 SHA256 0f5469dfa30572b5f8f12588003188d68c9541c80876860727f2fd5f02df3b75 SHA512 45e055f694f208f97d11c20db56a107eae3ee7c6308e4e74b5569b46baeb0a24bc3a2d99a30f28c3231570f2bbb3c492d503e7128a569d9d33ec684f8f59b72f WHIRLPOOL bc8ba2e309a6674c0afbb8781e1038d2b693217a45fd8cbdbaceda8cf9fefc705fea23c21ac74c23e87866676df0323e5a3eac4504da91df53dd108a044910b6
 DIST buildbot-waterfall-view-0.9.1.tar.gz 704434 SHA256 b5026f746a0bea9af544f4ad46b21781e4dccaf64bf645ee5dc747e442100fbb SHA512 f97d974aee73cc84c4f9699a1bf4765434e31ed3b6ad2da58fff1da13a59f4cd327b736da19018c7e5ad609da5a3ba87ab9f4f11c28e8d3120d3c1a2796673ef WHIRLPOOL c481e3b8afe3ef7ea071b2259ea5df02e569e468043de58e1dc2eb34a827be8e99eb46bd1f9f9f22b75c2ee9068917b5ecf588c8b06124251b08ba4713dd8b67
 DIST buildbot-waterfall-view-0.9.2.tar.gz 704942 SHA256 1be89234e8555c7c058a4b176e19e751edcbca4e0e415f09bec492668ac0da1e SHA512 b7c20175da7746ea650507dc79eb64fdb8d601ccfa7778120e9aa4653ae14f951d80fa79d016a77d0259ac56a3acb0326dad1325150e5db88bad044c31d79d74 WHIRLPOOL bb3b6560e55c9e4a4b146b8e9bc27e6bf2560b972dfd14fd75ed823cc33250fbf3bcd2e8b86b54ffdbde82010de0d0d1753c72620befef285a24501304473dcc
+DIST buildbot-waterfall-view-0.9.3.tar.gz 705482 SHA256 cf3c83a3bc5682d235800c17dc5cf0fe54c165b5c7004e810c13da0f34137d0c SHA512 8eda91f327c73b674bc474bdd2139e9565482e59b4acc9ee9eb6d940ba8606c1f2985bce53511a827974552708ab1c6e31e64a5874deb4d16dea434c0b11067e WHIRLPOOL 3c57366b27f26b554762eb056ea938384572c0975a873582f54545d5e53d78e3d3d7ed7de1b88a0f5b68ab7fae93e7e59b0c3568e0f346b62a79e8eb1c0a6c09
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.0_p1.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.3.ebuild
index 17decad50dc5..8edb22f3d5b5 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.0_p1.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ inherit distutils-r1
 DESCRIPTION="Buildbot waterfall-view plugin"
 HOMEPAGE="http://trac.buildbot.net/ https://github.com/buildbot/buildbot http://pypi.python.org/pypi/buildbot"
 
-MY_V="0.9.0.post1"
+MY_V="${PV/_p/p}"
 MY_P="${PN}-${MY_V}"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
@@ -27,6 +27,8 @@ else
 	KEYWORDS="~amd64"
 fi
 
+IUSE="test"
+
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
@@ -40,6 +42,12 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 #[[ ${PV} == *9999 ]] && S=${S}/www/base
 
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 }
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 4beea8b09b70..6bed4dfdcbec 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,4 +1,4 @@
-DIST buildbot-worker-0.9.0.post1.tar.gz 95780 SHA256 9da22fdf23462680a37d3995cde75410f204d3cb417491363e3f6561fc9011b9 SHA512 50eb98ad4f870f15b1cc34113db139b3b290bef377b4f66ac7c023590f277c102b8776e3a009f296209cf524377c10f60435b18f47cc39d6c27af04778d3296e WHIRLPOOL 1dd5d4274281fe4f582b5e7b83a99693c41282cb2a5262b8899319d3a1e95888417174b8db4ed9f8dcd52ee66785adac98f0d2ecc8abc158a661dfdfa6cd33da
 DIST buildbot-worker-0.9.1.tar.gz 65852 SHA256 1d8ec4fd51e7a3a7dd4de7c512b282c221951cbacc6b2eaf15a157f371a0e902 SHA512 cf5749c6fd67fb72cd7043392efb502608cd2d11374cd43af351904a1b4e82d790338e5f745b47465b5cbf9501d2454d983648a70246c6ae55603ba51261a0d0 WHIRLPOOL e576879f141688e3f79e3cf746491bcc106cb4851f14d4960b10be45b7b01c33c6850fb856d6f083d8510ff78f73016e11250e9ef8864e33bace1834c315dafc
 DIST buildbot-worker-0.9.2.tar.gz 66043 SHA256 3d05791ac0c556e3e4fe0ef78911ce47eab4fcbb0b5a51a436234ba49b9c236e SHA512 146c2f2b0c44f5c349459edbe61b448e88f9e42eb1c3b7769a0a07260533e4ad40d2d7bc3df2ebecd355d636834108debe8c2d165a9cdc6d849a537cf5743cc4 WHIRLPOOL f786c3a7ac486a2421877082da08a73079b7655ec0941a9509663983c03874bc8b5c12cb990628d0684db757d493528fab9ea3d99d09c22f2d2bbf606c69d0b5
+DIST buildbot-worker-0.9.3.tar.gz 98622 SHA256 57b319a34d0118933e7b2488ee29732bc78c55be978fe34a90ef30f208b8d39c SHA512 a0b6b441eeb71e322a5009d6aa0049cbddc4bd4fc78c14cfd362f80d35385b3ffcf5546614b5920c7cdd574df195f5c510b4acdb925c37ad7e6823f7ab62df33 WHIRLPOOL c349bf7ed402fb90318f89135005976b0dbb8c8fc57679b1d5958ce0fdc52fc7f006aeccc9a3119cdd8c66912a8e6fd7e079471461181effd17d75ce9b16ddba
 DIST buildbot_worker-9-tests.tar.xz 29512 SHA256 9966f1e368fae1ff05a4cdd801167b33fbad620acba79db21a5c28132dec61a3 SHA512 55aa3a5061ba0c9246e5029201a3565c6b20b198ccbf7ad3cad29599bdb8f883e8f33290f0f6fdb2e4a7c04f9132e32d762df8241cda8f689d407bb75d048122 WHIRLPOOL 9200d3676bf9fa56f36cc0bfc229250f6619512574696bde460ea0410462ac9fe030c5222145599ea1a792003c3ab0a8fc729c2294274e85665da47c81d03fb9
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.0_p1.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.3.ebuild
index 20aeca08ed5b..99a27e885c04 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.0_p1.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ inherit readme.gentoo user distutils-r1
 DESCRIPTION="BuildBot Slave Daemon"
 HOMEPAGE="http://trac.buildbot.net/ http://code.google.com/p/buildbot/ http://pypi.python.org/pypi/buildbot-slave"
 
-MY_V="0.9.0.post1"
+MY_V="${PV/_p/p}"
 MY_P="${PN}-${MY_V}"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
@@ -31,9 +31,14 @@ RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
 		>=dev-python/twisted-core-8.0.0[${PYTHON_USEDEP}]
 	)
 	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-0.9.0_rc1"
+	!<dev-util/buildbot-0.9.0_rc1
+"
 DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/setuptools_trial[${PYTHON_USEDEP}]
+	)
+"
 
 S="${WORKDIR}/${MY_P}"
 [[ ${PV} == *9999 ]] && S=${S}/slave
@@ -50,14 +55,19 @@ pkg_setup() {
 		build worker, just copy the scripts."
 }
 
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 
 	doman docs/buildbot-worker.1
 
-	newconfd "${FILESDIR}/buildbot_worker.confd" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd" buildbot_worker
-	systemd_dounit "${FILESDIR}/buildbot_worker.service"
+	newconfd "${FILESDIR}/buildbot_worker.confd" buildslave
+	newinitd "${FILESDIR}/buildbot_worker.initd" buildslave
 
 	readme.gentoo_create_doc
 }
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 3486d87c4080..0b160eae5114 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,3 +1,3 @@
-DIST buildbot-www-0.9.0.post1.tar.gz 687998 SHA256 54b6438d46001b97c09b37490e0359d4515357574a9f3f83b796ce4b74897c11 SHA512 e1ed618c7467ac8d3620a9ab1ff14010ed6826562ef117c893cecaab18c06cc4619d9883a45f85ea22b76259bdc1a5bba050afe112aba9449917b7f4c3b3f5ef WHIRLPOOL 870d349a9a52fc9d12a162cd0b5fa94cb9b44c7aacfbaa1d148151e753c11b9fa906f92b85f2858cdc796a2573694c93f560a5fd99ecd19adaed9be68342ed8e
 DIST buildbot-www-0.9.1.tar.gz 686034 SHA256 795a951f62d5313543d6cdb848dfd6c658cf58871021ac7b33a153b76de773b6 SHA512 0700d73f1b039571082e9209db09d4faa5ffeeff50db5ac1da9cfade70594b680b083d7421244a0d111b80b36699fee4eb01a9fbbd06248e22c1a38d17b8dc11 WHIRLPOOL fcc86e430918876dc45aa12b5d17e976171eb25a1473e18acd91ec045bbc54eeddd2d5e5917b05bde743241560597243ae246173c1be1ac81d086c5cc6fcef18
 DIST buildbot-www-0.9.2.tar.gz 689448 SHA256 063660ff23874e24b713d16d966beaaff5e0d67c437e3627db834f0631c49f82 SHA512 a5edf4da2a7e626b329b75242a5f1588c6ee95f4f242f155e23c4fd4c4ea4e372ba74cd23508f1ff4a3105f8086ed6171f9631d96cffbe8c7216a3ead9ac2320 WHIRLPOOL 58f2273dc425e6c1219a7dfdc25dcd647a7a94aada970777dd97c5607249ace710fda5c8c728feff703fa7976ac14873595ec4497ff1ddccfd958eecf66d74b4
+DIST buildbot-www-0.9.3.tar.gz 690646 SHA256 ff0edacd78702f3b2a2052dc2a51c60eaf5859dd0f1aed17fa5ae91579fafa0e SHA512 3f4d1992ea9da7789a7dbeb06d500e8129d285146ef90e868da2cfc88bdab3de8342befdfd222f0641688353a9dc0a3aedd5324dfd39d1fbca96326176bd9651 WHIRLPOOL 17a0acbca3e1d8333772a8a4567e41851901c0f72ffee451d868756f3a3635aa3f88e6dccf1e3a7f83c1daa6c853caed1bd67eeab4f8479b898bab59059d90e3
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.0_p1.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.3.ebuild
index 38d71b49444b..602ba2877233 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.0_p1.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-0.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ inherit distutils-r1
 DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
 HOMEPAGE="http://trac.buildbot.net/ https://github.com/buildbot/buildbot http://pypi.python.org/pypi/buildbot"
 
-MY_V="0.9.0.post1"
+MY_V="${PV/_p/p}"
 MY_P="${PN}-${MY_V}"
 [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
@@ -27,6 +27,8 @@ else
 	KEYWORDS="~amd64"
 fi
 
+IUSE="test"
+
 RDEPEND=""
 
 DEPEND="${RDEPEND}
@@ -39,6 +41,12 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 #[[ ${PV} == *9999 ]] && S=${S}/www/base
 
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 }
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 623b6d01cd46..8a6793728dc9 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,6 +1,6 @@
 DIST buildbot-0.8.10.tar.gz 4822307 SHA256 c4964d2ebd81cb80a14cb058fb2aab0572a1d8d86672d514e775b42deb08a5f4 SHA512 e148a1670a56837587d858d1697fe117661cbbfedab42bf7be905f9e8e4266e4ff0170b0cd81aed61234d30497a05427061c3084033f09811d0bc306b200661b WHIRLPOOL 26397b6f914266201aba4feb4df7353facad4fd0f51bdf7e35cf25205c45eadcf83f24c265e540b13d327750ce9561362be6a5aa237152cf1298d970c504f76c
 DIST buildbot-0.8.12.tar.gz 4834352 SHA256 c6b66976dff712268566574d57131ec15e5682f6d4390cd5c8559bab0980c4d6 SHA512 18c5144132fb033f3581d3c494d5e8ff35d3e8b1548764452ce9ae543d710e58a2c6e3e8e46a0ef237804f9a6a45485890ae4616ab655fb00d4ccf328d6f6645 WHIRLPOOL 5754b7c0278fb5e7da8a7dd66253f6f4d12f54c125f6a78aa9018a2b6b22fd88a27e79e6821ab05e4cd9e87bf0dd08c3c73c7914d4c499ac13c48ca232ed21c8
-DIST buildbot-0.9.0.post1.tar.gz 3013406 SHA256 afd8229c9fd33daa6d8227cd665c75b1b25c47ffcc4046ab5fd5b290ccd536a3 SHA512 0b171ca6ed15b15b4df23d0618cb7d98f6ae922efaa1e35a9458efaaf676b80a6ff3be36231b8ca31cadf89c3968425c560a0bff3630e8792d179462eba0da67 WHIRLPOOL e440826e4a027b42d28c0f3a0afca3c46ec5dc0b4d629fcef75de4b3350cffa2208e0024983f0ffebd1df38a5d860c6bd541fc1c3e28f8b6669ee93a4d4be8b4
 DIST buildbot-0.9.1.tar.gz 3051975 SHA256 a9f385f66f5cc3021f4cbfce92496673ebf9171578fa9e5ae4f66732276d64ce SHA512 c3b845a3607c5eaa0a5076755bc0e285ba7c6809f9d7934fab7c6cf8299610e921034656cf3792113961176a821138c6d069122d4d1f1698f16badf3ef9a0dea WHIRLPOOL 6767878665f09ff7b6219ddcda73487b441f3e33ce580fc2df2f16d430217d4ac38b93e22a3f3abd9c8380ac6e6c93de6767faec1aa5615f82fbe8d8e20759e1
 DIST buildbot-0.9.2.tar.gz 3026977 SHA256 d33ec059941cf830c8f7b7f336a76e32e7122e2690a27b784efeddc6dbf4564a SHA512 a1c6345bcceb5c8f4ed600542625eee81e59af00a1b12054fe77e3b4ed5536b7004fcbd07cfc96baa3061193eb79e4290e056cf7157b71831370654c057a2c57 WHIRLPOOL 075a00d85df5321180345348a02ac12cc8a1bea36d6e60617ebe54de71ce5a989fcf009822834dad1994a6f83ebb5c6132f350902fd31d5b279c5c13014bb4b9
+DIST buildbot-0.9.3.tar.gz 3031033 SHA256 c2bc6a8139b0f97d304bfa047a4c414e42ea12ba94e34d82ae7cb356a69d87fb SHA512 a6f18e88c33fe1eafe0b9b154fb77f0d93db71145faab527ecd5ce53fcbbff48b915de4a02461da87eefbd58a649a56d3a9b16ba759d978e70a70898a15681b7 WHIRLPOOL b62fd5bea0b647b703674024e50731e7713e9488dec570d8e42beabaa2135a81349b955164cf01898b12ab0123d9a8f3b76e3364f65003b8af85a54755b6ad22
 DIST buildbot-test_templates.tar.xz 304 SHA256 3d581b74c21f88119f7e5f93f381f2004662ca7219aae9a05f0bd3f8cae48317 SHA512 87ba914896d86f70e2e4b24a51248c475bf24fad4c02e3a99d6d7fa41b5a57f369865b20a7c30dafa3162ba50ccb04de1809b0cf9d53e45537738e4821229866 WHIRLPOOL 151dc42ceed8e90c96cdd0b6e937f13019c0d6cd5e2e878ee971cbc69ce4ea56b240b58fa743766bd0d71cafa38279e37be077324eb5ece7b99df46eaf566dfe
diff --git a/dev-util/buildbot/buildbot-0.9.0_p1.ebuild b/dev-util/buildbot/buildbot-0.9.3.ebuild
index c6c4f434678e..915e721730da 100644
--- a/dev-util/buildbot/buildbot-0.9.0_p1.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,8 +11,8 @@ EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
 [[ ${PV} == *9999 ]] && inherit git-r3
 inherit readme.gentoo-r1 user systemd distutils-r1
 
-MY_V="0.9.0.post1"
-MY_P="${PN}-${MY_V}"
+MY_PV="${PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot build automation system"
 HOMEPAGE="http://trac.buildbot.net/ https://github.com/buildbot/buildbot http://pypi.python.org/pypi/buildbot"
@@ -66,7 +66,7 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}] )
 	test? (
 		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		|| (
 			>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
 			(
@@ -102,6 +102,10 @@ pkg_setup() {
 		The scripts can	run as a different user if desired."
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/buildbot-0.9.3-json-import.patch
+	}
+
 src_compile() {
 	distutils-r1_src_compile
 
@@ -138,6 +142,12 @@ src_install() {
 	readme.gentoo_create_doc
 }
 
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
 pkg_postinst() {
 	readme.gentoo_print_elog
 
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 9bf2d9d13b69..2183d7106a41 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -66,7 +66,7 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}] )
 	test? (
 		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		|| (
 			>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
 			(
@@ -138,6 +138,12 @@ src_install() {
 	readme.gentoo_create_doc
 }
 
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
 pkg_postinst() {
 	readme.gentoo_print_elog
 
diff --git a/dev-util/buildbot/files/buildbot-0.9.3-json-import.patch b/dev-util/buildbot/files/buildbot-0.9.3-json-import.patch
new file mode 100644
index 000000000000..6c3cb14ed583
--- /dev/null
+++ b/dev-util/buildbot/files/buildbot-0.9.3-json-import.patch
@@ -0,0 +1,1000 @@
+From 9e7a734c260b4f473eee11ff7a08b5064ff34e22 Mon Sep 17 00:00:00 2001
+From: Tom Prince <tom.prince@twistedmatrix.com>
+Date: Thu, 12 Jan 2017 11:54:19 -0700
+Subject: [PATCH] Import `json` directly.
+
+Emit deprecation warning.
+Update documentation.
+Fix tests.
+Lint fix.
+---
+ master/buildbot/changes/bitbucket.py               |  3 +-
+ master/buildbot/changes/gerritchangesource.py      |  2 +-
+ master/buildbot/clients/tryclient.py               |  3 +-
+ master/buildbot/data/types.py                      |  2 +-
+ master/buildbot/db/builds.py                       |  4 ++-
+ master/buildbot/db/buildsets.py                    |  3 +-
+ master/buildbot/db/changes.py                      |  3 +-
+ master/buildbot/db/state.py                        |  4 ++-
+ master/buildbot/db/steps.py                        |  4 ++-
+ master/buildbot/db/types/json.py                   |  7 +++--
+ master/buildbot/newsfragments/json.removal         |  1 +
+ master/buildbot/process/properties.py              |  2 +-
+ master/buildbot/schedulers/trysched.py             |  3 +-
+ master/buildbot/scripts/dataspec.py                |  3 +-
+ master/buildbot/scripts/processwwwindex.py         |  2 +-
+ master/buildbot/steps/transfer.py                  |  3 +-
+ master/buildbot/test/fake/fakedata.py              |  3 +-
+ master/buildbot/test/fake/fakedb.py                |  2 +-
+ master/buildbot/test/integration/test_www.py       |  4 ++-
+ .../test/unit/test_changes_gerritchangesource.py   |  2 +-
+ .../buildbot/test/unit/test_clients_tryclient.py   |  4 ++-
+ master/buildbot/test/unit/test_db_buildsets.py     |  3 +-
+ master/buildbot/test/unit/test_mq_wamp.py          |  3 +-
+ .../test/unit/test_schedulers_forcesched.py        |  3 +-
+ .../buildbot/test/unit/test_schedulers_trysched.py |  3 +-
+ .../test/unit/test_scripts_processwwwindex.py      |  3 +-
+ master/buildbot/test/unit/test_steps_transfer.py   |  3 +-
+ master/buildbot/test/unit/test_www_oauth.py        |  4 +--
+ master/buildbot/test/unit/test_www_rest.py         |  2 +-
+ master/buildbot/test/unit/test_www_sse.py          |  2 +-
+ master/buildbot/test/unit/test_www_ws.py           |  4 ++-
+ master/buildbot/test/util/validation.py            |  2 +-
+ master/buildbot/test/util/www.py                   |  2 +-
+ master/buildbot/util/__init__.py                   | 32 ++++++++--------------
+ master/buildbot/worker/docker.py                   |  2 +-
+ master/buildbot/www/config.py                      |  3 +-
+ master/buildbot/www/hooks/base.py                  |  3 +-
+ master/buildbot/www/hooks/gitlab.py                |  4 +--
+ master/buildbot/www/hooks/googlecode.py            |  4 +--
+ master/buildbot/www/oauth2.py                      |  2 +-
+ master/buildbot/www/rest.py                        |  2 +-
+ master/buildbot/www/sse.py                         |  3 +-
+ master/buildbot/www/ws.py                          |  3 +-
+ master/docs/developer/utils.rst                    | 12 --------
+ 44 files changed, 91 insertions(+), 77 deletions(-)
+ create mode 100644 master/buildbot/newsfragments/json.removal
+
+diff --git a/master/buildbot/changes/bitbucket.py b/master/buildbot/changes/bitbucket.py
+index 746d85398..3d5b57380 100644
+--- a/master/buildbot/changes/bitbucket.py
++++ b/master/buildbot/changes/bitbucket.py
+@@ -12,6 +12,8 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
++import json
+ import time
+ from datetime import datetime
+ 
+@@ -25,7 +27,6 @@ from buildbot.util import ascii2unicode
+ from buildbot.util import datetime2epoch
+ from buildbot.util import deferredLocked
+ from buildbot.util import epoch2datetime
+-from buildbot.util import json
+ 
+ 
+ class BitbucketPullrequestPoller(base.PollingChangeSource):
+diff --git a/master/buildbot/changes/gerritchangesource.py b/master/buildbot/changes/gerritchangesource.py
+index 036071bbf..5e1dd0e58 100644
+--- a/master/buildbot/changes/gerritchangesource.py
++++ b/master/buildbot/changes/gerritchangesource.py
+@@ -15,6 +15,7 @@
+ from future.utils import iteritems
+ 
+ import datetime
++import json
+ 
+ from twisted.internet import defer
+ from twisted.internet import reactor
+@@ -26,7 +27,6 @@ from buildbot import util
+ from buildbot.changes import base
+ from buildbot.changes.filter import ChangeFilter
+ from buildbot.util import httpclientservice
+-from buildbot.util import json
+ 
+ 
+ class GerritChangeFilter(ChangeFilter):
+diff --git a/master/buildbot/clients/tryclient.py b/master/buildbot/clients/tryclient.py
+index bee4f3462..3f59a3cd6 100644
+--- a/master/buildbot/clients/tryclient.py
++++ b/master/buildbot/clients/tryclient.py
+@@ -12,6 +12,8 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
++import json
+ import os
+ import random
+ import re
+@@ -32,7 +34,6 @@ from twisted.python.procutils import which
+ from twisted.spread import pb
+ 
+ from buildbot.status import builder
+-from buildbot.util import json
+ from buildbot.util import now
+ from buildbot.util.eventual import fireEventually
+ 
+diff --git a/master/buildbot/data/types.py b/master/buildbot/data/types.py
+index 6372303cd..c0dfc3587 100644
+--- a/master/buildbot/data/types.py
++++ b/master/buildbot/data/types.py
+@@ -19,10 +19,10 @@ from future.utils import iteritems
+ from future.utils import text_type
+ 
+ import datetime
++import json
+ import re
+ 
+ from buildbot import util
+-from buildbot.util import json
+ 
+ 
+ class Type(object):
+diff --git a/master/buildbot/db/builds.py b/master/buildbot/db/builds.py
+index a716cb603..cd9dabc5d 100644
+--- a/master/buildbot/db/builds.py
++++ b/master/buildbot/db/builds.py
+@@ -12,6 +12,9 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
++import json
++
+ import sqlalchemy as sa
+ 
+ from twisted.internet import defer
+@@ -20,7 +23,6 @@ from twisted.internet import reactor
+ from buildbot.db import NULL
+ from buildbot.db import base
+ from buildbot.util import epoch2datetime
+-from buildbot.util import json
+ 
+ 
+ class BuildsConnectorComponent(base.DBConnectorComponent):
+diff --git a/master/buildbot/db/buildsets.py b/master/buildbot/db/buildsets.py
+index 4bac6da5c..1288b57f4 100644
+--- a/master/buildbot/db/buildsets.py
++++ b/master/buildbot/db/buildsets.py
+@@ -18,6 +18,8 @@ Support for buildsets in the database
+ from future.utils import integer_types
+ from future.utils import iteritems
+ 
++import json
++
+ import sqlalchemy as sa
+ 
+ from twisted.internet import defer
+@@ -27,7 +29,6 @@ from buildbot.db import NULL
+ from buildbot.db import base
+ from buildbot.util import datetime2epoch
+ from buildbot.util import epoch2datetime
+-from buildbot.util import json
+ 
+ 
+ class BsDict(dict):
+diff --git a/master/buildbot/db/changes.py b/master/buildbot/db/changes.py
+index caa643fa7..004995753 100644
+--- a/master/buildbot/db/changes.py
++++ b/master/buildbot/db/changes.py
+@@ -19,6 +19,8 @@ Support for changes in the database
+ from future.utils import iteritems
+ from future.utils import itervalues
+ 
++import json
++
+ import sqlalchemy as sa
+ 
+ from twisted.internet import defer
+@@ -28,7 +30,6 @@ from twisted.python import log
+ from buildbot.db import base
+ from buildbot.util import datetime2epoch
+ from buildbot.util import epoch2datetime
+-from buildbot.util import json
+ 
+ 
+ class ChDict(dict):
+diff --git a/master/buildbot/db/state.py b/master/buildbot/db/state.py
+index 6ba143cfa..e572eab62 100644
+--- a/master/buildbot/db/state.py
++++ b/master/buildbot/db/state.py
+@@ -12,11 +12,13 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
++import json
++
+ import sqlalchemy as sa
+ import sqlalchemy.exc
+ 
+ from buildbot.db import base
+-from buildbot.util import json
+ 
+ 
+ class _IdNotFoundError(Exception):
+diff --git a/master/buildbot/db/steps.py b/master/buildbot/db/steps.py
+index f5e1c82bd..d0fbb52e3 100644
+--- a/master/buildbot/db/steps.py
++++ b/master/buildbot/db/steps.py
+@@ -12,6 +12,9 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
++import json
++
+ import sqlalchemy as sa
+ 
+ from twisted.internet import defer
+@@ -19,7 +22,6 @@ from twisted.internet import reactor
+ 
+ from buildbot.db import base
+ from buildbot.util import epoch2datetime
+-from buildbot.util import json
+ 
+ 
+ class StepsConnectorComponent(base.DBConnectorComponent):
+diff --git a/master/buildbot/db/types/json.py b/master/buildbot/db/types/json.py
+index ee105269d..932218135 100644
+--- a/master/buildbot/db/types/json.py
++++ b/master/buildbot/db/types/json.py
+@@ -12,11 +12,14 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
++from __future__ import absolute_import
++
++import json
++
+ from sqlalchemy.types import Text
+ from sqlalchemy.types import TypeDecorator
+ 
+-from buildbot.util import json
+-
+ 
+ class JsonObject(TypeDecorator):
+ 
+diff --git a/master/buildbot/newsfragments/json.removal b/master/buildbot/newsfragments/json.removal
+new file mode 100644
+index 000000000..9fc57b91e
+--- /dev/null
++++ b/master/buildbot/newsfragments/json.removal
+@@ -0,0 +1 @@
++:py:data:`buildbot.util.json` has been deprecated in favor of the standard library :py:mod:`json`.
+diff --git a/master/buildbot/process/properties.py b/master/buildbot/process/properties.py
+index 82954a1cb..9b336c2d9 100644
+--- a/master/buildbot/process/properties.py
++++ b/master/buildbot/process/properties.py
+@@ -16,6 +16,7 @@ from future.builtins import range
+ from future.utils import iteritems
+ 
+ import collections
++import json
+ import re
+ import weakref
+ 
+@@ -28,7 +29,6 @@ from buildbot import util
+ from buildbot.interfaces import IProperties
+ from buildbot.interfaces import IRenderable
+ from buildbot.util import flatten
+-from buildbot.util import json
+ from buildbot.worker_transition import reportDeprecatedWorkerNameUsage
+ 
+ 
+diff --git a/master/buildbot/schedulers/trysched.py b/master/buildbot/schedulers/trysched.py
+index 3b700d871..60d17c269 100644
+--- a/master/buildbot/schedulers/trysched.py
++++ b/master/buildbot/schedulers/trysched.py
+@@ -12,8 +12,10 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
+ from future.utils import iteritems
+ 
++import json
+ import os
+ 
+ from twisted.internet import defer
+@@ -25,7 +27,6 @@ from buildbot import pbutil
+ from buildbot.process.properties import Properties
+ from buildbot.schedulers import base
+ from buildbot.util import ascii2unicode
+-from buildbot.util import json
+ from buildbot.util import netstrings
+ from buildbot.util.maildir import MaildirService
+ 
+diff --git a/master/buildbot/scripts/dataspec.py b/master/buildbot/scripts/dataspec.py
+index 047aa297e..a3017db82 100644
+--- a/master/buildbot/scripts/dataspec.py
++++ b/master/buildbot/scripts/dataspec.py
+@@ -12,6 +12,8 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
++import json
+ import os
+ import sys
+ 
+@@ -20,7 +22,6 @@ from twisted.internet import defer
+ from buildbot.data import connector
+ from buildbot.test.fake import fakemaster
+ from buildbot.util import in_reactor
+-from buildbot.util import json
+ 
+ 
+ @in_reactor
+diff --git a/master/buildbot/scripts/processwwwindex.py b/master/buildbot/scripts/processwwwindex.py
+index 57db423c9..e7180f623 100644
+--- a/master/buildbot/scripts/processwwwindex.py
++++ b/master/buildbot/scripts/processwwwindex.py
+@@ -15,6 +15,7 @@
+ from __future__ import division
+ from __future__ import print_function
+ 
++import json
+ import os
+ 
+ import jinja2
+@@ -23,7 +24,6 @@ from twisted.internet import defer
+ 
+ from buildbot.test.fake import fakemaster
+ from buildbot.util import in_reactor
+-from buildbot.util import json
+ from buildbot.www import auth
+ from buildbot.www.config import IndexResource
+ from buildbot.www.service import WWWService
+diff --git a/master/buildbot/steps/transfer.py b/master/buildbot/steps/transfer.py
+index a3d423848..5dfb3b6a9 100644
+--- a/master/buildbot/steps/transfer.py
++++ b/master/buildbot/steps/transfer.py
+@@ -12,6 +12,8 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
++import json
+ import os
+ import stat
+ 
+@@ -26,7 +28,6 @@ from buildbot.process.buildstep import FAILURE
+ from buildbot.process.buildstep import SKIPPED
+ from buildbot.process.buildstep import SUCCESS
+ from buildbot.process.buildstep import BuildStep
+-from buildbot.util import json
+ from buildbot.util.eventual import eventually
+ from buildbot.worker_transition import WorkerAPICompatMixin
+ from buildbot.worker_transition import reportDeprecatedWorkerNameUsage
+diff --git a/master/buildbot/test/fake/fakedata.py b/master/buildbot/test/fake/fakedata.py
+index b5a2ef58c..92bfd5c7b 100644
+--- a/master/buildbot/test/fake/fakedata.py
++++ b/master/buildbot/test/fake/fakedata.py
+@@ -16,6 +16,8 @@ from future.utils import iteritems
+ from future.utils import itervalues
+ from future.utils import text_type
+ 
++import json
++
+ from twisted.internet import defer
+ from twisted.internet import reactor
+ from twisted.python import failure
+@@ -23,7 +25,6 @@ from twisted.python import failure
+ from buildbot.data import connector
+ from buildbot.db.buildrequests import AlreadyClaimedError
+ from buildbot.test.util import validation
+-from buildbot.util import json
+ from buildbot.util import service
+ 
+ 
+diff --git a/master/buildbot/test/fake/fakedb.py b/master/buildbot/test/fake/fakedb.py
+index 740e6b1e3..47340ef63 100644
+--- a/master/buildbot/test/fake/fakedb.py
++++ b/master/buildbot/test/fake/fakedb.py
+@@ -25,6 +25,7 @@ from future.utils import text_type
+ import base64
+ import copy
+ import hashlib
++import json
+ 
+ from twisted.internet import defer
+ from twisted.internet import reactor
+@@ -35,7 +36,6 @@ from buildbot.db import changesources
+ from buildbot.db import schedulers
+ from buildbot.test.util import validation
+ from buildbot.util import datetime2epoch
+-from buildbot.util import json
+ from buildbot.util import service
+ 
+ 
+diff --git a/master/buildbot/test/integration/test_www.py b/master/buildbot/test/integration/test_www.py
+index de8805f35..fcfc6b549 100644
+--- a/master/buildbot/test/integration/test_www.py
++++ b/master/buildbot/test/integration/test_www.py
+@@ -12,6 +12,9 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
++import json
++
+ import mock
+ 
+ from twisted.internet import defer
+@@ -27,7 +30,6 @@ from buildbot.test.fake import fakedb
+ from buildbot.test.fake import fakemaster
+ from buildbot.test.util import db
+ from buildbot.test.util import www
+-from buildbot.util import json
+ from buildbot.www import service as wwwservice
+ from buildbot.www import auth
+ from buildbot.www import authz
+diff --git a/master/buildbot/test/unit/test_changes_gerritchangesource.py b/master/buildbot/test/unit/test_changes_gerritchangesource.py
+index fe00fcf58..b5c939065 100644
+--- a/master/buildbot/test/unit/test_changes_gerritchangesource.py
++++ b/master/buildbot/test/unit/test_changes_gerritchangesource.py
+@@ -15,6 +15,7 @@
+ from future.utils import iteritems
+ 
+ import datetime
++import json
+ import types
+ 
+ from twisted.internet import defer
+@@ -25,7 +26,6 @@ from buildbot.test.fake import httpclientservice as fakehttpclientservice
+ from buildbot.test.fake import fakedb
+ from buildbot.test.fake.change import Change
+ from buildbot.test.util import changesource
+-from buildbot.util import json
+ 
+ 
+ class TestGerritHelpers(unittest.TestCase):
+diff --git a/master/buildbot/test/unit/test_clients_tryclient.py b/master/buildbot/test/unit/test_clients_tryclient.py
+index 765d6444f..13adbf8cd 100644
+--- a/master/buildbot/test/unit/test_clients_tryclient.py
++++ b/master/buildbot/test/unit/test_clients_tryclient.py
+@@ -12,10 +12,12 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
++import json
++
+ from twisted.trial import unittest
+ 
+ from buildbot.clients import tryclient
+-from buildbot.util import json
+ 
+ 
+ class createJobfile(unittest.TestCase):
+diff --git a/master/buildbot/test/unit/test_db_buildsets.py b/master/buildbot/test/unit/test_db_buildsets.py
+index 5acea7a54..49c64790a 100644
+--- a/master/buildbot/test/unit/test_db_buildsets.py
++++ b/master/buildbot/test/unit/test_db_buildsets.py
+@@ -12,7 +12,9 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
+ import datetime
++import json
+ 
+ import mock
+ 
+@@ -30,7 +32,6 @@ from buildbot.test.util import validation
+ from buildbot.util import UTC
+ from buildbot.util import datetime2epoch
+ from buildbot.util import epoch2datetime
+-from buildbot.util import json
+ 
+ 
+ class Tests(interfaces.InterfaceTests):
+diff --git a/master/buildbot/test/unit/test_mq_wamp.py b/master/buildbot/test/unit/test_mq_wamp.py
+index 3ad41ae7d..55a9bf95f 100644
+--- a/master/buildbot/test/unit/test_mq_wamp.py
++++ b/master/buildbot/test/unit/test_mq_wamp.py
+@@ -12,8 +12,10 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
+ from future.builtins import range
+ 
++import json
+ import os
+ import textwrap
+ 
+@@ -26,7 +28,6 @@ from twisted.trial import unittest
+ 
+ from buildbot.mq import wamp
+ from buildbot.test.fake import fakemaster
+-from buildbot.util import json
+ from buildbot.wamp import connector
+ 
+ 
+diff --git a/master/buildbot/test/unit/test_schedulers_forcesched.py b/master/buildbot/test/unit/test_schedulers_forcesched.py
+index 72e19a830..22f3dea31 100644
+--- a/master/buildbot/test/unit/test_schedulers_forcesched.py
++++ b/master/buildbot/test/unit/test_schedulers_forcesched.py
+@@ -16,6 +16,8 @@ from __future__ import division
+ from __future__ import print_function
+ from future.utils import iteritems
+ 
++import json
++
+ from twisted.internet import defer
+ from twisted.trial import unittest
+ 
+@@ -36,7 +38,6 @@ from buildbot.schedulers.forcesched import oneCodebase
+ from buildbot.test.util import scheduler
+ from buildbot.test.util.config import ConfigErrorsMixin
+ from buildbot.test.util.warnings import assertProducesWarning
+-from buildbot.util import json
+ from buildbot.worker_transition import DeprecatedWorkerNameWarning
+ 
+ 
+diff --git a/master/buildbot/test/unit/test_schedulers_trysched.py b/master/buildbot/test/unit/test_schedulers_trysched.py
+index c5f9f347e..439ce5d2d 100644
+--- a/master/buildbot/test/unit/test_schedulers_trysched.py
++++ b/master/buildbot/test/unit/test_schedulers_trysched.py
+@@ -12,7 +12,9 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
+ import cStringIO as StringIO
++import json
+ import os
+ import shutil
+ import sys
+@@ -27,7 +29,6 @@ from twisted.trial import unittest
+ from buildbot.schedulers import trysched
+ from buildbot.test.util import dirs
+ from buildbot.test.util import scheduler
+-from buildbot.util import json
+ 
+ 
+ class TryBase(unittest.TestCase):
+diff --git a/master/buildbot/test/unit/test_scripts_processwwwindex.py b/master/buildbot/test/unit/test_scripts_processwwwindex.py
+index db01a5239..c265b8ab7 100644
+--- a/master/buildbot/test/unit/test_scripts_processwwwindex.py
++++ b/master/buildbot/test/unit/test_scripts_processwwwindex.py
+@@ -12,12 +12,13 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
++import json
+ import tempfile
+ 
+ from twisted.trial import unittest
+ 
+ from buildbot.scripts import processwwwindex
+-from buildbot.util import json
+ 
+ 
+ class TestUsersClient(unittest.TestCase):
+diff --git a/master/buildbot/test/unit/test_steps_transfer.py b/master/buildbot/test/unit/test_steps_transfer.py
+index ee70af830..c91f0dfac 100644
+--- a/master/buildbot/test/unit/test_steps_transfer.py
++++ b/master/buildbot/test/unit/test_steps_transfer.py
+@@ -12,8 +12,10 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
+ from future.utils import iteritems
+ 
++import json
+ import os
+ import shutil
+ import stat
+@@ -38,7 +40,6 @@ from buildbot.test.fake.remotecommand import ExpectRemoteRef
+ from buildbot.test.util import steps
+ from buildbot.test.util.warnings import assertNotProducesWarnings
+ from buildbot.test.util.warnings import assertProducesWarning
+-from buildbot.util import json
+ from buildbot.worker_transition import DeprecatedWorkerAPIWarning
+ from buildbot.worker_transition import DeprecatedWorkerNameWarning
+ 
+diff --git a/master/buildbot/test/unit/test_www_oauth.py b/master/buildbot/test/unit/test_www_oauth.py
+index 177385cb0..ba7310bf8 100644
+--- a/master/buildbot/test/unit/test_www_oauth.py
++++ b/master/buildbot/test/unit/test_www_oauth.py
+@@ -12,6 +12,8 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
++import json
+ import os
+ import webbrowser
+ 
+@@ -26,7 +28,6 @@ from twisted.web.resource import Resource
+ from twisted.web.server import Site
+ 
+ from buildbot.test.util import www
+-from buildbot.util import json
+ 
+ try:
+     import requests
+@@ -277,7 +278,6 @@ class OAuth2AuthGitHubE2E(www.WwwTestMixin, unittest.TestCase):
+             raise unittest.SkipTest(
+                 "Need to pass OAUTHCONF path to json file via environ to run this e2e test")
+ 
+-        import json
+         config = json.load(open(os.environ['OAUTHCONF']))[self.authClass]
+         from buildbot.www import oauth2
+         self.auth = self._instantiateAuth(
+diff --git a/master/buildbot/test/unit/test_www_rest.py b/master/buildbot/test/unit/test_www_rest.py
+index c0e1a2680..2b87e4d0d 100644
+--- a/master/buildbot/test/unit/test_www_rest.py
++++ b/master/buildbot/test/unit/test_www_rest.py
+@@ -18,6 +18,7 @@ from future.utils import itervalues
+ from future.utils import string_types
+ from future.utils import text_type
+ 
++import json
+ import re
+ 
+ import mock
+@@ -27,7 +28,6 @@ from twisted.trial import unittest
+ 
+ from buildbot.test.fake import endpoint
+ from buildbot.test.util import www
+-from buildbot.util import json
+ from buildbot.www import authz
+ from buildbot.www import rest
+ from buildbot.www.rest import JSONRPC_CODES
+diff --git a/master/buildbot/test/unit/test_www_sse.py b/master/buildbot/test/unit/test_www_sse.py
+index ba2a1f0a9..3eac07047 100644
+--- a/master/buildbot/test/unit/test_www_sse.py
++++ b/master/buildbot/test/unit/test_www_sse.py
+@@ -13,13 +13,13 @@
+ #
+ # Copyright Buildbot Team Members
+ import datetime
++import json
+ 
+ from twisted.trial import unittest
+ 
+ from buildbot.test.unit import test_data_changes
+ from buildbot.test.util import www
+ from buildbot.util import datetime2epoch
+-from buildbot.util import json
+ from buildbot.www import sse
+ 
+ 
+diff --git a/master/buildbot/test/unit/test_www_ws.py b/master/buildbot/test/unit/test_www_ws.py
+index a40393556..91051b21d 100644
+--- a/master/buildbot/test/unit/test_www_ws.py
++++ b/master/buildbot/test/unit/test_www_ws.py
+@@ -12,12 +12,14 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
++import json
++
+ from mock import Mock
+ 
+ from twisted.trial import unittest
+ 
+ from buildbot.test.util import www
+-from buildbot.util import json
+ from buildbot.www import ws
+ 
+ 
+diff --git a/master/buildbot/test/util/validation.py b/master/buildbot/test/util/validation.py
+index 13647a63b..292e72bee 100644
+--- a/master/buildbot/test/util/validation.py
++++ b/master/buildbot/test/util/validation.py
+@@ -19,10 +19,10 @@ from future.utils import iteritems
+ from future.utils import text_type
+ 
+ import datetime
++import json
+ import re
+ 
+ from buildbot.util import UTC
+-from buildbot.util import json
+ 
+ # Base class
+ 
+diff --git a/master/buildbot/test/util/www.py b/master/buildbot/test/util/www.py
+index 5fe38e268..d737327dd 100644
+--- a/master/buildbot/test/util/www.py
++++ b/master/buildbot/test/util/www.py
+@@ -17,6 +17,7 @@ from future.utils import integer_types
+ from future.utils import iteritems
+ 
+ import cgi
++import json
+ import os
+ import pkg_resources
+ from cStringIO import StringIO
+@@ -28,7 +29,6 @@ from twisted.internet import defer
+ from twisted.web import server
+ 
+ from buildbot.test.fake import fakemaster
+-from buildbot.util import json
+ from buildbot.www import auth
+ from buildbot.www import authz
+ 
+diff --git a/master/buildbot/util/__init__.py b/master/buildbot/util/__init__.py
+index ed78bf25f..3a9d55ca5 100644
+--- a/master/buildbot/util/__init__.py
++++ b/master/buildbot/util/__init__.py
+@@ -12,6 +12,7 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
+ from __future__ import division
+ from __future__ import print_function
+ 
+@@ -28,9 +29,12 @@ import locale
+ import re
+ import textwrap
+ import time
++import json
+ 
+ from future.utils import text_type
+ from twisted.python import reflect
++from twisted.python.versions import Version
++from twisted.python.deprecate import deprecatedModuleAttribute
+ 
+ from zope.interface import implementer
+ 
+@@ -181,26 +185,14 @@ def ascii2unicode(x):
+         return x
+     return text_type(x, 'ascii')
+ 
++_hush_pyflakes = [json]
+ 
+-# place a working json module at 'buildbot.util.json'.  Code is adapted from
+-# Paul Wise <pabs@debian.org>:
+-#   http://lists.debian.org/debian-python/2010/02/msg00016.html
+-# json doesn't exist as a standard module until python2.6
+-# However python2.6's json module is much slower than simplejson, so we prefer
+-# to use simplejson if available.
+-try:
+-    import simplejson as json
+-    assert json
+-except ImportError:
+-    import json  # python 2.6 or 2.7
+-try:
+-    _tmp = json.loads
+-except AttributeError:
+-    import warnings
+-    import sys
+-    warnings.warn("Use simplejson, not the old json module.")
+-    sys.modules.pop('json')  # get rid of the bad json module
+-    import simplejson as json
++deprecatedModuleAttribute(
++    Version("buildbot", 0, 9, 4),
++    message="Use json from the standard library instead.",
++    moduleName="buildbot.util",
++    name="json",
++)
+ 
+ 
+ def toJson(obj):
+@@ -432,7 +424,7 @@ def dictionary_merge(a, b):
+ 
+ 
+ __all__ = [
+-    'naturalSort', 'now', 'formatInterval', 'ComparableMixin', 'json',
++    'naturalSort', 'now', 'formatInterval', 'ComparableMixin',
+     'safeTranslate', 'none_or_str',
+     'NotABranch', 'deferredLocked', 'UTC',
+     'diffSets', 'makeList', 'in_reactor', 'string2boolean',
+diff --git a/master/buildbot/worker/docker.py b/master/buildbot/worker/docker.py
+index f39132737..a91424f1a 100644
+--- a/master/buildbot/worker/docker.py
++++ b/master/buildbot/worker/docker.py
+@@ -19,6 +19,7 @@ from __future__ import division
+ from __future__ import print_function
+ 
+ import hashlib
++import json
+ import socket
+ from io import BytesIO
+ 
+@@ -28,7 +29,6 @@ from twisted.python import log
+ 
+ from buildbot import config
+ from buildbot.interfaces import LatentWorkerFailedToSubstantiate
+-from buildbot.util import json
+ from buildbot.worker import AbstractLatentWorker
+ 
+ try:
+diff --git a/master/buildbot/www/config.py b/master/buildbot/www/config.py
+index e3f6f6214..4030e8e73 100644
+--- a/master/buildbot/www/config.py
++++ b/master/buildbot/www/config.py
+@@ -12,6 +12,8 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
++import json
+ import os
+ import posixpath
+ 
+@@ -22,7 +24,6 @@ from twisted.python import log
+ from twisted.web.error import Error
+ 
+ from buildbot.interfaces import IConfigured
+-from buildbot.util import json
+ from buildbot.www import resource
+ 
+ 
+diff --git a/master/buildbot/www/hooks/base.py b/master/buildbot/www/hooks/base.py
+index 149c3f925..9255be44a 100644
+--- a/master/buildbot/www/hooks/base.py
++++ b/master/buildbot/www/hooks/base.py
+@@ -17,7 +17,8 @@
+ #  and inspired from code from the Chromium project
+ # otherwise, Andrew Melo <andrew.melo@gmail.com> wrote the rest
+ # but "the rest" is pretty minimal
+-from buildbot.util import json
++
++import json
+ 
+ 
+ def getChanges(request, options=None):
+diff --git a/master/buildbot/www/hooks/gitlab.py b/master/buildbot/www/hooks/gitlab.py
+index c7663a63a..ab1b65690 100644
+--- a/master/buildbot/www/hooks/gitlab.py
++++ b/master/buildbot/www/hooks/gitlab.py
+@@ -12,14 +12,14 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
++import json
+ import re
+ 
+ from dateutil.parser import parse as dateparse
+ 
+ from twisted.python import log
+ 
+-from buildbot.util import json
+-
+ 
+ def _process_change(payload, user, repo, repo_url, project, codebase=None):
+     """
+diff --git a/master/buildbot/www/hooks/googlecode.py b/master/buildbot/www/hooks/googlecode.py
+index b8709bb4d..2a370e4f9 100644
+--- a/master/buildbot/www/hooks/googlecode.py
++++ b/master/buildbot/www/hooks/googlecode.py
+@@ -14,12 +14,12 @@
+ # Copyright 2011, Louis Opter <kalessin@kalessin.fr>
+ #
+ # Quite inspired from the github hook.
++
+ import hmac
++import json
+ 
+ from twisted.python import log
+ 
+-from buildbot.util import json
+-
+ 
+ class GoogleCodeAuthFailed(Exception):
+     pass
+diff --git a/master/buildbot/www/oauth2.py b/master/buildbot/www/oauth2.py
+index 1d1ea4efd..baa9dab25 100644
+--- a/master/buildbot/www/oauth2.py
++++ b/master/buildbot/www/oauth2.py
+@@ -17,6 +17,7 @@ from future.moves.urllib.parse import urlencode
+ from future.utils import iteritems
+ from future.utils import string_types
+ 
++import json
+ from posixpath import join
+ 
+ import requests
+@@ -24,7 +25,6 @@ import requests
+ from twisted.internet import defer
+ from twisted.internet import threads
+ 
+-from buildbot.util import json
+ from buildbot.www import auth
+ from buildbot.www import resource
+ 
+diff --git a/master/buildbot/www/rest.py b/master/buildbot/www/rest.py
+index 3147a33b7..30f79d6ea 100644
+--- a/master/buildbot/www/rest.py
++++ b/master/buildbot/www/rest.py
+@@ -19,6 +19,7 @@ from future.utils import text_type
+ import cgi
+ import datetime
+ import fnmatch
++import json
+ import re
+ from contextlib import contextmanager
+ 
+@@ -28,7 +29,6 @@ from twisted.web.error import Error
+ 
+ from buildbot.data import exceptions
+ from buildbot.data import resultspec
+-from buildbot.util import json
+ from buildbot.util import toJson
+ from buildbot.www import resource
+ from buildbot.www.authz import Forbidden
+diff --git a/master/buildbot/www/sse.py b/master/buildbot/www/sse.py
+index df076195e..741328844 100644
+--- a/master/buildbot/www/sse.py
++++ b/master/buildbot/www/sse.py
+@@ -12,8 +12,10 @@
+ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # Copyright Buildbot Team Members
++
+ from future.utils import itervalues
+ 
++import json
+ import uuid
+ 
+ from twisted.python import log
+@@ -21,7 +23,6 @@ from twisted.web import resource
+ from twisted.web import server
+ 
+ from buildbot.data.exceptions import InvalidPathError
+-from buildbot.util import json
+ from buildbot.util import toJson
+ 
+ 
+diff --git a/master/buildbot/www/ws.py b/master/buildbot/www/ws.py
+index ed7bcad8f..1e48ec553 100644
+--- a/master/buildbot/www/ws.py
++++ b/master/buildbot/www/ws.py
+@@ -15,13 +15,14 @@
+ from future.utils import itervalues
+ from future.utils import string_types
+ 
++import json
++
+ from autobahn.twisted.resource import WebSocketResource
+ from autobahn.twisted.websocket import WebSocketServerFactory
+ from autobahn.twisted.websocket import WebSocketServerProtocol
+ from twisted.internet import defer
+ from twisted.python import log
+ 
+-from buildbot.util import json
+ from buildbot.util import toJson
+ 
+ 
+diff --git a/master/docs/developer/utils.rst b/master/docs/developer/utils.rst
+index e1e64503a..2470330bd 100644
+--- a/master/docs/developer/utils.rst
++++ b/master/docs/developer/utils.rst
+@@ -506,18 +506,6 @@ The ``@poll.method`` decorator makes this behavior easy and reliable.
+         Force a call to the decorated method now.
+         If the decorated method is currently running, another call will begin as soon as it completes.
+ 
+-:py:mod:`buildbot.util.json`
+-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-
+-.. py:module:: buildbot.util.json
+-
+-This package is just an import of the best available JSON module.
+-Use it instead of a more complex conditional import of :mod:`simplejson` or :mod:`json`:
+-
+-.. code-block:: python
+-
+-    from buildbot.util import json
+-
+ :py:mod:`buildbot.util.maildir`
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 
+-- 
+2.11.0
+
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 2db3be8b5e95..68151afae52d 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -288,8 +288,6 @@ distutils_install_for_testing() {
 	PYTHONPATH=${libdir}:${PYTHONPATH}
 
 	local add_args=(
-		egg_info
-			--egg-base="${libdir}"
 		install
 			--home="${TEST_DIR}"
 			--install-lib="${libdir}"
@@ -394,9 +392,6 @@ _distutils-r1_create_setup_cfg() {
 		# make the ebuild writer lives easier
 		build-scripts = %(build-base)s/scripts
 
-		[egg_info]
-		egg-base = ${BUILD_DIR}
-
 		# this is needed by distutils_install_for_testing since
 		# setuptools like to create .egg files for install --home.
 		[bdist_egg]
diff --git a/net-irc/redirbot/redirbot-0.0.5.ebuild b/net-irc/redirbot/redirbot-0.0.5-r1.ebuild
index 56fae74f77d8..a237222e450c 100644
--- a/net-irc/redirbot/redirbot-0.0.5.ebuild
+++ b/net-irc/redirbot/redirbot-0.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/twisted-core-11.1.0
-	dev-python/twisted-words
+	|| (
+		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+		( >=dev-python/twisted-core-11.1.0[${PYTHON_USEDEP}]
+		  dev-python/twisted-words[${PYTHON_USEDEP}]
+		)
+	)
 "
 RDEPEND="${DEPEND}"