From 6728c73b7a88f1cc229ae0715a72671178d17e8d Mon Sep 17 00:00:00 2001
From: Brian Dolbec <dolsen@gentoo.org>
Date: Thu, 26 Oct 2017 18:50:33 -0700
Subject: dev-util/buildbot: Version bump, remove old versions, fix bug 634716

Remove no longer shipped docker example.
Remove old versions.
Update 9999 deps
Bump eapi.

Package-Manager: Portage-2.3.12, Repoman-2.3.4
---
 dev-util/buildbot/Manifest                         |   5 +-
 dev-util/buildbot/buildbot-0.9.10.ebuild           |   2 +-
 dev-util/buildbot/buildbot-0.9.11.ebuild           |   2 +-
 dev-util/buildbot/buildbot-0.9.12.ebuild           | 206 ++++++++++++++++++++
 dev-util/buildbot/buildbot-0.9.4.ebuild            | 216 ---------------------
 dev-util/buildbot/buildbot-0.9.7.ebuild            | 193 ------------------
 dev-util/buildbot/buildbot-0.9.8.ebuild            | 194 ------------------
 dev-util/buildbot/buildbot-9999.ebuild             |   8 +-
 .../files/Remove-distro-version-test.patch         |  21 ++
 9 files changed, 234 insertions(+), 613 deletions(-)
 create mode 100644 dev-util/buildbot/buildbot-0.9.12.ebuild
 delete mode 100644 dev-util/buildbot/buildbot-0.9.4.ebuild
 delete mode 100644 dev-util/buildbot/buildbot-0.9.7.ebuild
 delete mode 100644 dev-util/buildbot/buildbot-0.9.8.ebuild
 create mode 100644 dev-util/buildbot/files/Remove-distro-version-test.patch

diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 22d255baed04..1891ffcf2571 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,7 +1,4 @@
 DIST buildbot-0.8.12.tar.gz 4834352 SHA256 c6b66976dff712268566574d57131ec15e5682f6d4390cd5c8559bab0980c4d6 SHA512 18c5144132fb033f3581d3c494d5e8ff35d3e8b1548764452ce9ae543d710e58a2c6e3e8e46a0ef237804f9a6a45485890ae4616ab655fb00d4ccf328d6f6645 WHIRLPOOL 5754b7c0278fb5e7da8a7dd66253f6f4d12f54c125f6a78aa9018a2b6b22fd88a27e79e6821ab05e4cd9e87bf0dd08c3c73c7914d4c499ac13c48ca232ed21c8
 DIST buildbot-0.9.10.tar.gz 3112750 SHA256 8c5ed75f3f16f4ff0f2c9e3f9b091acb5e6e1c0ef68ffa8f687a55413a833143 SHA512 95b489d5f7d0bc00ae5f71cd056b36fe689c4dc9408a7a0e4b1b45e036c9074832c8e3755981520a8c85a791b50f7f40765962c12a71887198dc0bbd0140d0e0 WHIRLPOOL 8d62d0aecdea4122709693ce48c72d5dbac2e946a6923a7ea41842dc759369a678e21a8abb0b4ff825e1ba559a9d490bcc4ff56fc5568a4f7f2d94b4f6c5f027
 DIST buildbot-0.9.11.tar.gz 3096455 SHA256 9be352c0aab5d1520fedac8d6b19aadda4f48763ac7f72bb00e5f8cc51107ee8 SHA512 c68a657213b0f878d8c2b4e6ebe18cfc9b3e19a4eecaf085fd3e5631bbb78dc9bd14e6b3d4b576e78eb1631329c86331371200a350d33696204fb76e7beae81c WHIRLPOOL 3b1804d7920e110ca1ae1d04e7a7c38fef0db4a2c7b448a21175a0f2693ba8725d228d27720ffdad976071d143e4158b41dc527d120e2c4928df3fdbd765285f
-DIST buildbot-0.9.4.docs.tar.xz 69224 SHA256 69fc33762a885568b02c42954a64d62d28bcb750b3aed011c3da8a9f84c13371 SHA512 906e551e0db32c8a0b4010b3b8b00c4776e3d1b7d7381e4dc0ccf01d361184e4605c3ab0ecaf4e42207bd73c3e72f8a570a4d4c29db72f4d68241abf48741d7e WHIRLPOOL 95f263e0b9ab22a649118f362d866b08cbdf62511f2a1f9bd6a7265103f174e35d0c8d86ad6a3b7dd5fd0b4277d60dbd25801c5e6f7e414e7fa634c241dae987
-DIST buildbot-0.9.4.tar.gz 3020851 SHA256 068161cd9ada10b87f40117c768a37ce796ebf5e7bf08f224f4c7ded88cd7472 SHA512 938a94192560b989a277d9650c50781d7e7c116bc5e2010ccb2e655df757de0ee254369531b2f432c835c0285c724e52d999a393d0ce1b104d4b9dcc5c6687da WHIRLPOOL 0ffe61b82ee93b78cdb3cb74ef96d5a3547e0fcab9ec8093b59a7212c5e2a1ad16eff046306bffcc0ea63b2e0bf2df1e54b5a0874dc78e27744db2088ccac804
-DIST buildbot-0.9.7.tar.gz 3092434 SHA256 8fcbf0e6536e5d60407f59d14f96d5f8386cd91846a4fa47b4336d71551a9e33 SHA512 3fd2b488cabac37e297bb1a475cdb115f261324a22ec4d6fbcf8dc5bfb6ee135fab3763998433be8795581d476f69e2adb6f42d248bf2131a42eecfc1667202a WHIRLPOOL 427d4c1c452f767550a3d2731b2e34480c399dcf50e57d4fb69f0a350f381e3e7ecc47d712fc8fbb99afcf8b230c7bd3afe8437ec3b24bf9ddbf7d35b4d1caad
-DIST buildbot-0.9.8.tar.gz 3101418 SHA256 39a2f7df458ec9be1009cf90a02d732d142a2ec3fbc0404e4f3fce4b8a4c3af7 SHA512 88800bad542d26aee6df348021faf5f76f36c250e9fb85c9abe3af7f13ec87fcae5727c8633772205f5c024709fd39b05d1d9c3aa1374b4ca72a528b5ec3ba83 WHIRLPOOL fafb46f6d6bc10f6073567cd6a6894cd67d61c4ff537b342060319874eb22ea45d816f6b764f0b9f841f9b7a5e127481a85dbb4abbacd228a8168a5e3e948b2b
+DIST buildbot-0.9.12.tar.gz 3057832 SHA256 0e8a75059dd8d04112ae77391b979432a3b5efb6e80ec60bbe110d8d9d983835 SHA512 62459918267297b31b2a6416f72794c7a4ebdcb60de04ece1681f6b8be9debf161716cc70ad843fd468b23e02c521c0a0783a5a1e119d75648e107691d6b908d WHIRLPOOL 0e29078f6d67c1996c6fa389790d3c89dbdd13f6926882df16286a33b95e275b6436865815d225d1b243a1cfefe4948ebcaa2700ee7a003b449ccac4a32b62e7
diff --git a/dev-util/buildbot/buildbot-0.9.10.ebuild b/dev-util/buildbot/buildbot-0.9.10.ebuild
index 0f493ccb8ffc..ec293dba8932 100644
--- a/dev-util/buildbot/buildbot-0.9.10.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.10.ebuild
@@ -121,7 +121,7 @@ src_install() {
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}
-		doins -r docker docs/examples
+		doins -r docs/examples
 	fi
 
 	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
diff --git a/dev-util/buildbot/buildbot-0.9.11.ebuild b/dev-util/buildbot/buildbot-0.9.11.ebuild
index 694b31c8f116..e0acf382b491 100644
--- a/dev-util/buildbot/buildbot-0.9.11.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.11.ebuild
@@ -112,7 +112,7 @@ src_install() {
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}
-		doins -r docker docs/examples
+		doins -r docs/examples
 	fi
 
 	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
diff --git a/dev-util/buildbot/buildbot-0.9.12.ebuild b/dev-util/buildbot/buildbot-0.9.12.ebuild
new file mode 100644
index 000000000000..1db6439d370b
--- /dev/null
+++ b/dev-util/buildbot/buildbot-0.9.12.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit readme.gentoo-r1 user systemd distutils-r1
+
+MY_PV="${PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot build automation system"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot"
+[[ ${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="~amd64"
+fi
+
+IUSE="crypt doc examples irc test"
+
+RDEPEND="
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
+	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+	crypt? (
+		>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+	)
+	irc? (
+		dev-python/txrequests[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/pyenchant[${PYTHON_USEDEP}]
+		>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
+		<dev-python/docutils-0.13.0[${PYTHON_USEDEP}]
+		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
+		dev-python/ramlfications[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/boto3[${PYTHON_USEDEP}]
+		dev-python/ramlfications[${PYTHON_USEDEP}]
+		dev-python/pyjade[${PYTHON_USEDEP}]
+		dev-python/txgithub[${PYTHON_USEDEP}]
+		dev-python/txrequests[${PYTHON_USEDEP}]
+		dev-python/lz4[${PYTHON_USEDEP}]
+		dev-python/treq[${PYTHON_USEDEP}]
+		dev-python/setuptools_trial[${PYTHON_USEDEP}]
+		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+	)"
+
+S=${WORKDIR}/${MY_P}
+[[ ${PV} == *9999 ]] && S=${S}/master
+
+PATCHES=(
+	"${FILESDIR}/Remove-distro-version-test.patch"
+)
+
+pkg_setup() {
+	enewuser buildbot
+
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
+		to support starting buildbot through Gentoo's init system. To use this,
+		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+		The scripts can	run as a different user if desired."
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if use doc; then
+		einfo "Generation of documentation"
+		pushd docs > /dev/null
+		#'man' target is currently broken
+		emake html
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman docs/buildbot.1
+
+	if use doc; then
+		dohtml -r docs/_build/html/
+		# TODO: install man pages
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r docs/examples
+	fi
+
+	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
+	systemd_dounit "${FILESDIR}/buildmaster.target"
+	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
+	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
+
+	readme.gentoo_create_doc
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
+		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
+		ewarn "is now the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
+		ewarn "    rc-update add buildmaster.myinstance default"
+		ewarn "    /etc/init.d/buildmaster.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildmaster@myinstance.service"
+		ewarn "    systemctl enable buildmaster.target"
+		ewarn "    systemctl start buildmaster.target"
+		elog
+		elog "Upstream recommends the following when upgrading:"
+		elog "Each time you install a new version of Buildbot, you should run the"
+		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
+		elog "This will add files and fix (or at least detect) incompatibilities between"
+		elog "your old config and the new code."
+	fi
+	elog
+	elog "In order to create a new instance of buildmaster, execute:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_config() {
+	local buildmaster_path="/var/lib/buildmaster"
+	local log_path="/var/log/buildmaster"
+
+	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${buildmaster_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	local buildbot="/usr/bin/buildbot"
+	if [[ ! -d "${buildmaster_path}" ]]; then
+		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
+	fi
+	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
+	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+	fi
+	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a buildmaster instance at ${instance_path}."
+	einfo "To change the default settings edit the master.cfg file in this directory."
+}
diff --git a/dev-util/buildbot/buildbot-0.9.4.ebuild b/dev-util/buildbot/buildbot-0.9.4.ebuild
deleted file mode 100644
index 4ee67e152c9c..000000000000
--- a/dev-util/buildbot/buildbot-0.9.4.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 )
-
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
-
-inherit readme.gentoo-r1 user systemd distutils-r1
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~dolsen/distfiles/buildbot-0.9.4.docs.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="crypt doc examples irc mail manhole test"
-
-RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	|| (
-		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-		>=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}]
-	)
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-			>=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}]
-		)
-	)
-	mail? (
-		|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-			>=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}]
-		)
-	)
-	manhole? (
-		|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-			>=dev-python/twisted-conch-14.0.1[${PYTHON_USEDEP}]
-		)
-	)
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		|| (
-			>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-			(
-				>=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}]
-				>=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}]
-				>=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}]
-			)
-		)
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${PYTHON_USEDEP}]
-		dev-python/pyjade[${PYTHON_USEDEP}]
-		dev-python/txgithub[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	cd ${MY_P}
-	unpack buildbot-0.9.4.docs.tar.xz
-}
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-python_prepare_all() {
-	if use doc; then
-		epatch "${FILESDIR}/buildbot-0.9.4.docs.patch"
-	fi
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		EPYTHON="python2.7" emake html
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-		# TODO: install man pages
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r contrib docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-0.9.7.ebuild b/dev-util/buildbot/buildbot-0.9.7.ebuild
deleted file mode 100644
index b82986878383..000000000000
--- a/dev-util/buildbot/buildbot-0.9.7.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user systemd distutils-r1
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot"
-[[ ${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="~amd64"
-fi
-
-IUSE="crypt doc examples irc test"
-
-RDEPEND="
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.1.0[${PYTHON_USEDEP}]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/twisted-17.1.0[${PYTHON_USEDEP},crypt]
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
-		<dev-python/docutils-0.13.0[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${PYTHON_USEDEP}]
-		dev-python/pyjade[${PYTHON_USEDEP}]
-		dev-python/txgithub[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-[[ ${PV} == *9999 ]] && S=${S}/master
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-		# TODO: install man pages
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docker docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-python_test() {
-	distutils_install_for_testing
-	export TEST_HYPER=1
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-0.9.8.ebuild b/dev-util/buildbot/buildbot-0.9.8.ebuild
deleted file mode 100644
index 7ab416edb5b3..000000000000
--- a/dev-util/buildbot/buildbot-0.9.8.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user systemd distutils-r1
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot"
-[[ ${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="~amd64"
-fi
-
-IUSE="crypt doc examples irc test"
-
-RDEPEND="
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.5.0[${PYTHON_USEDEP}]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/twisted-17.5.0[${PYTHON_USEDEP},crypt]
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
-		<dev-python/docutils-0.13.0[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${PYTHON_USEDEP}]
-		dev-python/pyjade[${PYTHON_USEDEP}]
-		dev-python/txgithub[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-[[ ${PV} == *9999 ]] && S=${S}/master
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-		# TODO: install man pages
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docker docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-python_test() {
-	distutils_install_for_testing
-	export TEST_HYPER=1
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 694b31c8f116..0b08a8046964 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python2_7 python3_5 )
 
@@ -29,7 +29,7 @@ IUSE="crypt doc examples irc test"
 
 RDEPEND="
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.5.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
 	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
@@ -40,7 +40,7 @@ RDEPEND="
 	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
 	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
 	crypt? (
-		>=dev-python/twisted-17.5.0[${PYTHON_USEDEP},crypt]
+		>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
 		dev-python/idna[${PYTHON_USEDEP}]
 		dev-python/service_identity[${PYTHON_USEDEP}]
@@ -112,7 +112,7 @@ src_install() {
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}
-		doins -r docker docs/examples
+		doins -r docs/examples
 	fi
 
 	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
diff --git a/dev-util/buildbot/files/Remove-distro-version-test.patch b/dev-util/buildbot/files/Remove-distro-version-test.patch
new file mode 100644
index 000000000000..c489be25c1c3
--- /dev/null
+++ b/dev-util/buildbot/files/Remove-distro-version-test.patch
@@ -0,0 +1,21 @@
+From b7201f706f9238d642dfe96da89006b437e3760d Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <bdolbec@gaikai.com>
+Date: Thu, 26 Oct 2017 12:00:37 -0700
+Subject: [PATCH] Remove distro version test
+
+---
+ buildbot/test/unit/test_buildbot_net_usage_data.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/buildbot/test/unit/test_buildbot_net_usage_data.py b/master/buildbot/test/unit/test_buildbot_net_usage_data.py
+index 709c804..7885d1b 100644
+--- a/buildbot/test/unit/test_buildbot_net_usage_data.py
++++ b/buildbot/test/unit/test_buildbot_net_usage_data.py
+@@ -153,4 +153,3 @@ class Tests(unittest.TestCase):
+         distro = linux_distribution()
+         self.assertEqual(len(distro), 2)
+         self.assertNotIn("unknown", distro[0])
+-        self.assertNotIn("unknown", distro[1])
+--
+libgit2 0.26.0
+
-- 
cgit v1.2.3-65-gdbad