gentoo resync : 26.11.2017

3 files changed, 221 insertions, 19 deletions

diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 682dd550a94e..f5f073231877 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,18 +1,18 @@
-AUX Remove-distro-version-test.patch 804 SHA256 ba232a084d776b20cfe3a25b7438b4f26af3bf4abbfaa7a28ef954b46056b2bf SHA512 b98005b8a02456d60bdc8085efb4c6fa52386e7b185bf7acefbaf3cd8fe481f87cad68a4d4986f498e35dca1618208032f0a73b04ca0515bbb2703729d3308fe WHIRLPOOL a94c6ae199704ee464cee507cfa394f3f414679caf9b33ba004c30e3621695c87717641661e010a4adedd29c46398bce272414eafc053f9716917be21ada573f
-AUX buildmaster.confd 218 SHA256 bb7f93e3867b32a25e2445a66d40573fa5073a80e73e35ae2a904db715f870c6 SHA512 d9339c30d3a92e92b41b0e3139ec89ecbd1460b0e4ee6c6fe2560c4307b2eb3f29b838c2f2312b9c7049bd95eaf652d09039227c691af805bc25a36999ec1840 WHIRLPOOL 0e258348e5882db063e95b3c508f8d92e2a7598e5f76705da2ebba45b4893ae893b0ed67271a112255d3e5b8f5f1ace17b487fc885db30a774dde44be1944c4d
-AUX buildmaster.initd 1573 SHA256 03ee2ccd319a34192f9d42967211b88e32f573af7472e7e8c5149e3ea43a8bab SHA512 22d58baa3500de63ca3d278c2ed44c78694c8f022a9916b0f35344485dbbbe46b054ba9b0cc9a8c56948ea8726e419cb7e1177036124fc3fc5acc957d56f168c WHIRLPOOL 3f0edeaaa5a35c3eabb332b2e3a043a5b244bde966d04ba625906ffa057c762590e9c903f508fb951decaffa1d4ef37044b71fa7942fb280bb4406cdb34f5079
-AUX buildmaster.target 138 SHA256 f232ac65ec161308092cb4f86c43cba8bb9293cd89fe3a3a6c4ad26936067680 SHA512 c5f56688349af0adcfa644abc699445e2c61bb268d5407f8fc540ac80ea9be6aee615df16bbf0f41db272dd4159762d7be744b3116efc0f9bc7cb1d458edb050 WHIRLPOOL c2596791d8d61966bd5ce60763caf7baca27b579ff657e45c6ab428a1f7100dc8940d401f8fa3260dd532c203f6452d4d1c85f6c05950d4ed18404bdfe02d398
-AUX buildmaster_at.service 375 SHA256 ca2275a74de23c9294187edfff918344f66ed40eba4d9408a5065840a1934727 SHA512 c37f1c461a4c7ee741a839772a5feabf10103542e159c6ae4eddfa37a146732dfc23f91d867d69c3718a21714516a3847485ae4e6580c93a5aa94daec40dd093 WHIRLPOOL dce1174f424ae09a05c3a0e3e04ce547e8b584bf631fe7eae8def80e79b82a76413109e7b6b17cd474f8a623bff3be94528c573617ce71ce24e4105e9d979193
-AUX buildmaster_at.service.conf 150 SHA256 4056f0bf8713ca26e64cd8d3eb6c570156a2e03b8bbf5e6d2c24246e855f8089 SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d WHIRLPOOL dac5dc509c3ccc8d53aa5aec8a39d30618f07729904235306f81b35e85ad8a5bdfb4ed75959260c51329e839082cf8f943bff6c735ad3881dd0407983b3236a1
-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.12.tar.gz 3057832 SHA256 0e8a75059dd8d04112ae77391b979432a3b5efb6e80ec60bbe110d8d9d983835 SHA512 62459918267297b31b2a6416f72794c7a4ebdcb60de04ece1681f6b8be9debf161716cc70ad843fd468b23e02c521c0a0783a5a1e119d75648e107691d6b908d WHIRLPOOL 0e29078f6d67c1996c6fa389790d3c89dbdd13f6926882df16286a33b95e275b6436865815d225d1b243a1cfefe4948ebcaa2700ee7a003b449ccac4a32b62e7
-EBUILD buildbot-0.8.12-r3.ebuild 5490 SHA256 ab180e34963560c3a14df8a5f00f451bb469c25c37bf29a211e5c02eaf8bde24 SHA512 16e5f6ba87559ed9788f4cb7451020cfd0e3b2efe22f5126aca23d0b6e20b9ed6050e4dada0e9e595b28f8ddf4e5446c1217c2e77adfd44dc307fc0b8b5b654a WHIRLPOOL d01753e023dadfc3155308bbf9b41a1d1eea03a57d2ba6a5640989e3491977007dd7fe37ca072c1676dbe87b4a920ae294573770baaf53913f39ed5552108f73
-EBUILD buildbot-0.9.10.ebuild 7272 SHA256 a08e34f4a80d5020ee49f9c742876f05888bb592dbace092286ee5b3bcd6d749 SHA512 173da10076a2a58772abf009cce729a8ea1e7e85a5f5e5ecf46f6220ef60cafc8252c88ab8129479c41e0e3606454921d6da79d925ef6e64cce575db043ae730 WHIRLPOOL 74ac9a1c40907e7db4baf8b24988ae0789f66046f863c1f3d9ef01369f7d0c017549ad53699414fede9738c08c6fa0102984f45a46c25ec9d67a4c898d5085b4
-EBUILD buildbot-0.9.11.ebuild 7046 SHA256 53883db3f3a6255d3568bab66b58f905251982d88fcf3315ed844e27566ab252 SHA512 72223002dc2774a5316623a5e7bc17ba780311af0dcad7766534c4728ab339b87620e0e6285be9aa87cdd076e5f77dba4ba9b66b1395881fc60341140a1ab6d9 WHIRLPOOL 80618630aa08367274b3b2091dff261430fb732ca88fc06c7f91a66fbdf856dbe55d0049992b7664854a85394be20df9a951da7c412fbe4b4b531a419fc55353
-EBUILD buildbot-0.9.12.ebuild 7107 SHA256 822c2885c4df40017bf67a957d12840bb97f2fa1279e32b8db60d172545e8df9 SHA512 0dfd907b7cb5e07ce59ab22664ea535c3010c20602503ff9dddd9c54c2031cde0eef89a5c22fd053fd89e4e3581f174ae21789ffaac45d646442f51e0aa2523f WHIRLPOOL 191595c0b39d63a70596ddd667cd230de7c6765b0c0fa119e6ad6352cee03d25f011050b2cb10c90014829f0ddf9f15e44205e1f8deac12321d87c2482f553e8
-EBUILD buildbot-9999.ebuild 7046 SHA256 8e01dba1d45eb16a702060658f157703bd61c528accfd44dc08ddab4d434b3e1 SHA512 af5e730d60d886e74b59789dd64fcf1025b92f880ebeb54b4e74bb410e441977fb5fe58e2f5737caed8a1cda4420cd0c131524fdf54f2dc1976206b7c3de2be1 WHIRLPOOL 294d26d58339cdce362b0a76d03237ee507d4a57ea3516c7f5a3b4494748a83dc1e0d7d47e360e33a526b67664c76b5aed21f6c6133b566f4bebdf2c4889468e
-MISC ChangeLog 8474 SHA256 f17f98b73101e0c7ef4a57d9de67201ec8cb2e13dad90e31c9ebb4b22d3e8a47 SHA512 a86c113f5d2921f2077e3f69f599255e91ecdf31d4f04965881d7f3167c53084b4178a0dc3c87be499dce7b715b97ec7336aa9f24dbb97f0108a33d337bc6234 WHIRLPOOL 3003bee799a0509b76bd33d855f9addf2433ab05ae2fcc160a50b9a4f4c1974c9f76293bdcea45548b017df2f74c90064ddb8bf347685da5540b2f657ccd376f
-MISC ChangeLog-2015 23687 SHA256 01b29df49e2d44ead407b455fc3fdb5746b6a07fed70c6b91935490c4816200b SHA512 6b6a9680134503958352c40c3ca9ca3acde081b77cedab97e6eccbcba6716cf68101d592bcfcd4bbed226cd038d79d1b20d34e1532a63e30687d04b0e4bad00d WHIRLPOOL 45de95ee421fae3b3052d57e90bfdc49de53c1cafc185d12b0280873cd113bc0432ec253e0ed1e40fea0824c1f261f3907c3c78b9bf53ff147e935c970150952
-MISC metadata.xml 1543 SHA256 204ee06fb9b996162310b5404f2d7edbd3cf12d773f67ae1ce446cd5c207bfc7 SHA512 a5bd8e8b9fe253e2a4bb43c536dc9b0fdccca675d5381ba7f488d1127c73805838ce881b691f8c638f774706c4b025cd5b70145b10d6c3578b68399e1fcb628d WHIRLPOOL 2c9191bb2c0d125c008042702adc70b39ae82105a84c8afc373b37a3e3790fab791d8aac29bf005f6af871085842e6b3a23e4a7a0bd691f24610b2ac3052b644
+AUX Remove-distro-version-test.patch 804 BLAKE2B a568d6daaa349b4bf02b59c5a7ef88e6c3017e45840dc2f93d8459dea0d11924c92255446fa5f3ef851a38daec1e8140275cfaac6876705e7ec3a5fc6815a49d SHA512 b98005b8a02456d60bdc8085efb4c6fa52386e7b185bf7acefbaf3cd8fe481f87cad68a4d4986f498e35dca1618208032f0a73b04ca0515bbb2703729d3308fe
+AUX buildmaster.confd 218 BLAKE2B b921db1ea03c73d4a9c9eddc79c5831dcc755a51d31a334e8b35ec0abacb76dee28185030aeaf5f70f2f660139ce1d5707c43c083d6966790ad136c2c1251860 SHA512 d9339c30d3a92e92b41b0e3139ec89ecbd1460b0e4ee6c6fe2560c4307b2eb3f29b838c2f2312b9c7049bd95eaf652d09039227c691af805bc25a36999ec1840
+AUX buildmaster.initd 1573 BLAKE2B bfd18d13345ab7dacc367867da3d0d70317250a3bec0d772caf40cdb16b0684eafcff6b3858608e2d317b48fb9e72b742dba5c3b0276a4183fc70d3b5aff693e SHA512 22d58baa3500de63ca3d278c2ed44c78694c8f022a9916b0f35344485dbbbe46b054ba9b0cc9a8c56948ea8726e419cb7e1177036124fc3fc5acc957d56f168c
+AUX buildmaster.target 138 BLAKE2B 7570fc327d2e002803f7d6691740f5885e6b54d3df2522c0439d551d0c01161fcd99779df0bff417dd66e1bacde2956bfa7b39f988f2fe204fb2abdb675adfe9 SHA512 c5f56688349af0adcfa644abc699445e2c61bb268d5407f8fc540ac80ea9be6aee615df16bbf0f41db272dd4159762d7be744b3116efc0f9bc7cb1d458edb050
+AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b6356b43b9e0861b00052e3702593a2e2a4764246dd62e52805ba2f2e62a86d0ae8ec4cbed3df42400dc562f74 SHA512 c37f1c461a4c7ee741a839772a5feabf10103542e159c6ae4eddfa37a146732dfc23f91d867d69c3718a21714516a3847485ae4e6580c93a5aa94daec40dd093
+AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d
+DIST buildbot-0.8.12.tar.gz 4834352 BLAKE2B 16d06d6ccbbb90581471cf1727cc9cdd556ab1c0fa1433bbe76475513a7482619b05c28038e956e8724b99a806aec371961302914567fd36caccfe342daa6aaa SHA512 18c5144132fb033f3581d3c494d5e8ff35d3e8b1548764452ce9ae543d710e58a2c6e3e8e46a0ef237804f9a6a45485890ae4616ab655fb00d4ccf328d6f6645
+DIST buildbot-0.9.10.tar.gz 3112750 BLAKE2B f09b1e38a2920ae34f45d946e8d88bc525093f3da703b78d859ec5c612c14f110b5c565a2e8bd9e4885fae22d42e57080272d674725bdc873132225b84e69c8d SHA512 95b489d5f7d0bc00ae5f71cd056b36fe689c4dc9408a7a0e4b1b45e036c9074832c8e3755981520a8c85a791b50f7f40765962c12a71887198dc0bbd0140d0e0
+DIST buildbot-0.9.11.tar.gz 3096455 BLAKE2B 2582fd27e89fc684911926c272630bfdb3fb84e7c18dadff9e66f609a2976d2a70ba0f566af0a7805fe5a7a370e4215ce2ceca4187d418eaa7075414e6974106 SHA512 c68a657213b0f878d8c2b4e6ebe18cfc9b3e19a4eecaf085fd3e5631bbb78dc9bd14e6b3d4b576e78eb1631329c86331371200a350d33696204fb76e7beae81c
+DIST buildbot-0.9.12.tar.gz 3057832 BLAKE2B 8e1748739bacc3c884f353b2a1c798575e3ce5f451a1711ecf88a7c7e517da86d2e791748d31468a2bb07369022e96cb568518b7a8ce1d9e1cece0b6ab77eec8 SHA512 62459918267297b31b2a6416f72794c7a4ebdcb60de04ece1681f6b8be9debf161716cc70ad843fd468b23e02c521c0a0783a5a1e119d75648e107691d6b908d
+DIST buildbot-0.9.13.tar.gz 3061713 BLAKE2B fac74d610bf0ff1cfeea1c59c46e95339d6b080725f6b01258921175b8036daeef23dfd3bf2a71fe838d43b9d7777e3a3141ff9cec0e1c7e609f21c53f51b91d SHA512 b1cf176d01e04bc219be8ffa787a857aec7bcfb930c3e9cabe0410fca60d826c35e74d277cd5764fcd3c6183ea5f19bae195c09ad401cdd948bda500789f2ade
+EBUILD buildbot-0.8.12-r3.ebuild 5490 BLAKE2B fc7f5f839c189a627e44fe9420e33cd20b3755a3be1826cc8e68fc4f942c4cd83a444c936e9570230984ecaac43baf1dcecf4fff5808be5c4d6182fb0f2137d2 SHA512 16e5f6ba87559ed9788f4cb7451020cfd0e3b2efe22f5126aca23d0b6e20b9ed6050e4dada0e9e595b28f8ddf4e5446c1217c2e77adfd44dc307fc0b8b5b654a
+EBUILD buildbot-0.9.10.ebuild 7272 BLAKE2B 4a74378e4f13517d44bf5440b3b0c17fcfb271d79e156e09eefb4eb7e80d99440ab333d097566a1862c6c6b8727a6f3f3197adeac9033eb4905720e3edd2f4d5 SHA512 173da10076a2a58772abf009cce729a8ea1e7e85a5f5e5ecf46f6220ef60cafc8252c88ab8129479c41e0e3606454921d6da79d925ef6e64cce575db043ae730
+EBUILD buildbot-0.9.11.ebuild 7046 BLAKE2B 3f6a809c4d84ec67a7746dcadcbc8b7c2971fe3b98b92dad93eae3bf8b264068128521ff6d5fb7ed8839ac7fe0a9bc7e045fc3505939f0ff6b17b0f094495d7f SHA512 72223002dc2774a5316623a5e7bc17ba780311af0dcad7766534c4728ab339b87620e0e6285be9aa87cdd076e5f77dba4ba9b66b1395881fc60341140a1ab6d9
+EBUILD buildbot-0.9.12.ebuild 7107 BLAKE2B 5b702fa552877ff6297f8c260c7e912c8a8bd48144094381444037a0a5b29447a129530acaea08b3b7bd5e6a0ec37d4be7fd175c091520e2818b28b70e14a157 SHA512 0dfd907b7cb5e07ce59ab22664ea535c3010c20602503ff9dddd9c54c2031cde0eef89a5c22fd053fd89e4e3581f174ae21789ffaac45d646442f51e0aa2523f
+EBUILD buildbot-0.9.13.ebuild 7052 BLAKE2B 495c97bdfe984741eb1533611045c9c6fbc3b0ecde65a527fd4ccfa2a4a1085ab87ca7a1273e453a344f76b35b835dac0439ca9a4cff6682bc9c9af971b034cc SHA512 45908483653c3ae43df933378ba3bba4171b314b8808fc0d1188129302ecb45bb35a7cf50a5986ea7e43b7076cd07024bc36ffae572e9d81a9940b8fb12cbb73
+EBUILD buildbot-9999.ebuild 7052 BLAKE2B 495c97bdfe984741eb1533611045c9c6fbc3b0ecde65a527fd4ccfa2a4a1085ab87ca7a1273e453a344f76b35b835dac0439ca9a4cff6682bc9c9af971b034cc SHA512 45908483653c3ae43df933378ba3bba4171b314b8808fc0d1188129302ecb45bb35a7cf50a5986ea7e43b7076cd07024bc36ffae572e9d81a9940b8fb12cbb73
+MISC metadata.xml 1543 BLAKE2B f455fc2a6337f44a232fc27e2c0696c10ab3ae88615c1f1f6390344c780fadbf95fc859439723e577a314a4db152f2f727e618a0c444604e1ac340cb25cbb48e SHA512 a5bd8e8b9fe253e2a4bb43c536dc9b0fdccca675d5381ba7f488d1127c73805838ce881b691f8c638f774706c4b025cd5b70145b10d6c3578b68399e1fcb628d
diff --git a/dev-util/buildbot/buildbot-0.9.13.ebuild b/dev-util/buildbot/buildbot-0.9.13.ebuild
new file mode 100644
index 000000000000..a9a9d7adf5f6
--- /dev/null
+++ b/dev-util/buildbot/buildbot-0.9.13.ebuild
@@ -0,0 +1,202 @@
+# 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_{4,5,6} )
+
+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
+
+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-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 0b08a8046964..a9a9d7adf5f6 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"