gentoo auto-resync : 26:08:2022 - 02:51:21

24 files changed, 557 insertions, 11 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e68acc2a6b42..6280040709de 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/buildbot-badges/Manifest b/dev-util/buildbot-badges/Manifest
index 45a48d848709..1fdd4931c5d8 100644
--- a/dev-util/buildbot-badges/Manifest
+++ b/dev-util/buildbot-badges/Manifest
@@ -1,5 +1,7 @@
 DIST buildbot-badges-3.4.0.tar.gz 3966 BLAKE2B cb94a63dec1e16bb52f5f84174d204137e7da582d3a62effa2d298fbc5f1c25541a8a96d8366efac650488b3810b37eadf9e650db277d6d04c33c1ff9cab32b1 SHA512 3b440b9d36f4e5d310886fd4b0e11607574d312093ce8c9654f07650c2ccf90b27c078c950fb7008f9d834d1cf4f15813c113b85c2d0d1181fac370f7a3472f6
 DIST buildbot-badges-3.5.0.tar.gz 3962 BLAKE2B 48f4865136845300e447835c348736ee15a3d520db03b4e6e70b45366e723f10eeff3d7e37a1f166682374dc6c1dabb051ad6f15c9730da969a846b606bc5730 SHA512 7817e0c2127892ee32a8c14e1f4204d724ce1c584f15c55b77902cdadfe9c2ff0e0df92d282fd8157aebcab067605c56ac776c7f8e37dae0a53672c14e002e19
+DIST buildbot-badges-3.6.0.tar.gz 3964 BLAKE2B e11db574b7245396c6532a3427b7494fbfcb68762b7a76b3f63ec49a2f460a2e1d8023ea1d54d7a27714990b9c8d2a0895442c41d8b65584e178f2af02b4ade3 SHA512 d133efad8d7171d122279f4e32fd7b0fa7d84bdeb66660d40b175d94d64f4344044dda186d2f1f6d5d2f2f6654461f7333339c90450a51843ce6314b457edc75
 EBUILD buildbot-badges-3.4.0.ebuild 929 BLAKE2B 4d55fd1681ffde007d5d7c0447ca0996d3a65f4640ee9680fc7f9073b62301c85590c408bc7e47234a9ad4f1320ec128c57776bed60e15c90cfa79b6d62c13cf SHA512 7f51477aaac9468a6010a3481efe7a10eec3033aac36b5b0dbd9e2498bb4b359311590a833633dc02ac9a64d69ff9b84e83b5bdd4ebaa6fae318bdeb2803fb1b
 EBUILD buildbot-badges-3.5.0.ebuild 929 BLAKE2B 4d55fd1681ffde007d5d7c0447ca0996d3a65f4640ee9680fc7f9073b62301c85590c408bc7e47234a9ad4f1320ec128c57776bed60e15c90cfa79b6d62c13cf SHA512 7f51477aaac9468a6010a3481efe7a10eec3033aac36b5b0dbd9e2498bb4b359311590a833633dc02ac9a64d69ff9b84e83b5bdd4ebaa6fae318bdeb2803fb1b
+EBUILD buildbot-badges-3.6.0.ebuild 929 BLAKE2B 4d55fd1681ffde007d5d7c0447ca0996d3a65f4640ee9680fc7f9073b62301c85590c408bc7e47234a9ad4f1320ec128c57776bed60e15c90cfa79b6d62c13cf SHA512 7f51477aaac9468a6010a3481efe7a10eec3033aac36b5b0dbd9e2498bb4b359311590a833633dc02ac9a64d69ff9b84e83b5bdd4ebaa6fae318bdeb2803fb1b
 MISC metadata.xml 762 BLAKE2B bad3590966f17a1a4f25b1b382be72f6e2a1ce77c5a0a806fb878b9d20d9c30dec6ea493a530e0aedaefe2dcc964fe7397e752f38a00f9feb2c8ee372d541c9a SHA512 f3936f9cedb5c400740e691833ee030996e61f0f9e6e7661adc5ace37f415c2d456092137a5d14cf792089387177499a36be0bdd53188676b699a829bfc21c24
diff --git a/dev-util/buildbot-badges/buildbot-badges-3.6.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.6.0.ebuild
new file mode 100644
index 000000000000..37e3828ead37
--- /dev/null
+++ b/dev-util/buildbot-badges/buildbot-badges-3.6.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-grid-view/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+	dev-python/cairocffi[${PYTHON_USEDEP}]
+	media-gfx/cairosvg[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	dev-python/klein[${PYTHON_USEDEP}]
+"
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index cd78484b12be..5f979d0a43ae 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,5 +1,7 @@
 DIST buildbot-console-view-3.4.0.tar.gz 18732 BLAKE2B caeb78d4d3cc616edafccc5f78c1104469f77ead6ec31e7b9a741e43cb8d7140f8c44b57449bd6d97e35912787cbbeee5617bdf90ce7a15ebd023721160edc06 SHA512 072a4ca8d5677e68d2893684d68d4742d7a5546e128ae99bbec0385772a5df6c885bb62b855484543a42c95471aa828f8f3375770fc079997e5183cf3eda9db8
 DIST buildbot-console-view-3.5.0.tar.gz 18741 BLAKE2B a2c4043bdc9eef6189cc15617212aefd7cbdf6db6d4c547c191e0a07bacc9d0cb3e9898867af207d969b294ab15664132636dec4a3c16e620fea9872ae4d0f57 SHA512 4a86a2e803dd4547b3cc3018e1284e4fa9eaf1b29ccb78035a1823fd44fd873acb0a746882e8b961f10e8dc533043383c4a6e60622027a248c10766dab7ac266
+DIST buildbot-console-view-3.6.0.tar.gz 18728 BLAKE2B 0a206e80a311deed2666a297394b7d4e31e47c703fed2040d2d6340be0cb81a6977ac54e2d215dcad02b14ec21db58dd6e677a9d2155e84110cdf37d99ae1401 SHA512 8d03b0c640b72d986e48bc5cfd1decf91f4b7bd46889d16a76ea71972e17f9504b377762e1c589448431d7c26446c01208b5f8e1b63c86bdbfb6dbc063b94472
 EBUILD buildbot-console-view-3.4.0.ebuild 720 BLAKE2B a3f51e619f183f83855fd10efac13e7f3c2e182788ada0089f56dac4559319f63ba4d91df34de4802aa1140a4d4d0b68fec87ef427ec395c89f302bc9d92cec8 SHA512 9809463fedb463807372b89228cc648f427196e463ce213def6c14ab36b05a1bc58197ae5367cb027887971075d8b970f16f32fe747c5a4d12feb35184986981
 EBUILD buildbot-console-view-3.5.0.ebuild 720 BLAKE2B a3f51e619f183f83855fd10efac13e7f3c2e182788ada0089f56dac4559319f63ba4d91df34de4802aa1140a4d4d0b68fec87ef427ec395c89f302bc9d92cec8 SHA512 9809463fedb463807372b89228cc648f427196e463ce213def6c14ab36b05a1bc58197ae5367cb027887971075d8b970f16f32fe747c5a4d12feb35184986981
+EBUILD buildbot-console-view-3.6.0.ebuild 720 BLAKE2B a3f51e619f183f83855fd10efac13e7f3c2e182788ada0089f56dac4559319f63ba4d91df34de4802aa1140a4d4d0b68fec87ef427ec395c89f302bc9d92cec8 SHA512 9809463fedb463807372b89228cc648f427196e463ce213def6c14ab36b05a1bc58197ae5367cb027887971075d8b970f16f32fe747c5a4d12feb35184986981
 MISC metadata.xml 661 BLAKE2B 00812636b1e2bf2b7d604a540ed1982e891894f38d8fa256bd954a693f6ff4b203c9a6cf8a2d4b67288b489a362a661b072de042dd3f62cf3d596ef14049e35c SHA512 1f905f5810e7a216e73e942fe2cb42302010fdb19078f20ee95a20555e2b2f0e13e29b3cf326d0a546bfc78e4d610d402199acbb915fc0b57ff55be3c402ec2b
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.6.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.6.0.ebuild
new file mode 100644
index 000000000000..5b7624cd297c
--- /dev/null
+++ b/dev-util/buildbot-console-view/buildbot-console-view-3.6.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot console-view plugin"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-console-view/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index cf1e52ecf914..db9bd7bdad1c 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,5 +1,7 @@
 DIST buildbot-grid-view-3.4.0.tar.gz 13698 BLAKE2B bc819f87db76ec217dd91cf1f43d2ad18e1aa27c661f37db893946b22e87a3de752f67fe04df8a10499e0659b618e24c3a15de18dd3f3e93523cdf4234d6907f SHA512 69369694e993365644416ea8223b546e147930dac41c74d000e8b1419e6b889158999cdf5cfb7079c3456a9135071f2d1983472faaed82ad410e7cd873c8c77f
 DIST buildbot-grid-view-3.5.0.tar.gz 13704 BLAKE2B 3b577c4108abb65677015a29f9af1410588f962a572e31518ac981e937e6a9bb9c7ce7f4435d573d82c5b337331eed2e9dee5c3e0722ebda6591d19e2b30b76f SHA512 a97c5df81b7ff670b26f170895a5a59b9324b7bc1c3714d58c9294848067b0387c93c295db91fd735a3aaa68bd70875aae45b8d6c1549592ad2b066c40ddc2f1
+DIST buildbot-grid-view-3.6.0.tar.gz 13701 BLAKE2B c877439926a6862aba51d4ef7d4326f66967bbd9c43dff44554c9346d0beb4b890c5e9cdd20998ca9796ab86030445776ff67f85ce27e87b1fdefaeaf0895d98 SHA512 6810b5be3649e38648b1205742bb24f1d63eded41f5fb420dd3f65734fba74a1ad350d68cf750f6be752f178e6d09dba56d5b42f46c20808212f72c8c4d7326d
 EBUILD buildbot-grid-view-3.4.0.ebuild 700 BLAKE2B 5786d88489beefb9743c24bb8358a15fa727abff3db1c1e3b74bf433b958fe8d89491c2a2080981ac3549afd8318646ee295295d9365a8210e25d6b16f959657 SHA512 fe5efc116d6eb48fd16addc7f360949d672d68f24f11843d588e2e396f7a7b8951c581e2aab140d1c5458295e5bc45368439112094f2be8aebe04256c537f12d
 EBUILD buildbot-grid-view-3.5.0.ebuild 700 BLAKE2B 5786d88489beefb9743c24bb8358a15fa727abff3db1c1e3b74bf433b958fe8d89491c2a2080981ac3549afd8318646ee295295d9365a8210e25d6b16f959657 SHA512 fe5efc116d6eb48fd16addc7f360949d672d68f24f11843d588e2e396f7a7b8951c581e2aab140d1c5458295e5bc45368439112094f2be8aebe04256c537f12d
+EBUILD buildbot-grid-view-3.6.0.ebuild 700 BLAKE2B 5786d88489beefb9743c24bb8358a15fa727abff3db1c1e3b74bf433b958fe8d89491c2a2080981ac3549afd8318646ee295295d9365a8210e25d6b16f959657 SHA512 fe5efc116d6eb48fd16addc7f360949d672d68f24f11843d588e2e396f7a7b8951c581e2aab140d1c5458295e5bc45368439112094f2be8aebe04256c537f12d
 MISC metadata.xml 640 BLAKE2B 22ccf767dae88664f3da52b44a6cc1d7abe93e282db0bccd6fc7bcd20bad2719b3cbc0ae75a7a72baf6a542908e7155026d7fdf1fa6976b165129110e348e11a SHA512 d6c7605dc32e3fc40690a45b8bfc70fd73e82e07ddcd49d94503254c25f5d532fc21ce79b94a37fc0a1fd023f5632065c35e946f0d48bc802c051f04a5dcaf81
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.0.ebuild
new file mode 100644
index 000000000000..32ac344a514e
--- /dev/null
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot grid view web interface"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-grid-view/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index 6c08fff2309f..3e913bf0e819 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,5 +1,7 @@
 DIST buildbot-pkg-3.4.0.tar.gz 4809 BLAKE2B 6d3e549e7b44b5ad95bb7520ef8765828da587e3940a9f352ede63346b3303127313fe4b71338ff65ef9ab2c0ac6258793bd9ef664153a0b45b0b6d7d2d92943 SHA512 ca1ef22fb6113bfe0106360ba1eacb167a8335ba15f94a0635bc4d00f999818704f8cfebd7889b6b3df5e1ca7ab79b96f4656e481d6b1f25f5fb7404af0d7ff6
 DIST buildbot-pkg-3.5.0.tar.gz 4806 BLAKE2B 41e217bc029bb8dbdb0f95218640d57d9f9ecabfbc0310118898042bbb543d9d4e5ba88075e934a9be9b1653e2a3d3d1e159547b832f9cde08c262713a817968 SHA512 08b3ec93dfbef87d90cfd4b7b1402003df785ceff8c43bf0320de79ff0efcb74f4cb4f0ec736e0d7231b54a82761d40df66e21540f1756fe74f68bb550850b1c
+DIST buildbot-pkg-3.6.0.tar.gz 4807 BLAKE2B 3b632ef4c0c1f2dc9c39fbe37ba6165a01162e41e77e28c08b9c820425cceac08d20193e0cc74d83c35cb6ff89e9576194cf35b8cac803e9b1f04076c9f96532 SHA512 0145a7ff7dddfb139f502193e0b04ab10a39b325ae65ca01c0f0d88c251c18798ebe4713a3ff1aa376c72aa8d3155a5edb58055a50f5f9ccd1bb43de0ff8e63e
 EBUILD buildbot-pkg-3.4.0.ebuild 904 BLAKE2B 1cc28b279fabe652fa139e915877b970b93f3f9be1a7c565957995cc66de1f1c0bf49b091befbf403812a24241b23d3fc382f0de0cdc7f18de6c574939b565f6 SHA512 63d6097dcb833f15518feec342e99ea1127ad6e9084556799dbae55871555c96c6929750beb00c97feb81a733ce418d260663aaee8c2bccb8f1b7f5c5276b05c
 EBUILD buildbot-pkg-3.5.0.ebuild 904 BLAKE2B 1cc28b279fabe652fa139e915877b970b93f3f9be1a7c565957995cc66de1f1c0bf49b091befbf403812a24241b23d3fc382f0de0cdc7f18de6c574939b565f6 SHA512 63d6097dcb833f15518feec342e99ea1127ad6e9084556799dbae55871555c96c6929750beb00c97feb81a733ce418d260663aaee8c2bccb8f1b7f5c5276b05c
+EBUILD buildbot-pkg-3.6.0.ebuild 904 BLAKE2B 1cc28b279fabe652fa139e915877b970b93f3f9be1a7c565957995cc66de1f1c0bf49b091befbf403812a24241b23d3fc382f0de0cdc7f18de6c574939b565f6 SHA512 63d6097dcb833f15518feec342e99ea1127ad6e9084556799dbae55871555c96c6929750beb00c97feb81a733ce418d260663aaee8c2bccb8f1b7f5c5276b05c
 MISC metadata.xml 1199 BLAKE2B 1eb102f71e83b2d11adff2f92f08614715428508b83042358d054babd4cd7f5bb63ef0e289fd9e60360111dccbd734422215b6f8a9811198f62c30cb82612566 SHA512 545c227af17fe4492aff85837e948769001d281dc40cbfdb5a74663dc5fde6989df632aab9a6f5cda644fd20f385d36469ec38b930bb42bfb61483c1c5e46faa
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.6.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.6.0.ebuild
new file mode 100644
index 000000000000..4d4e95e9196c
--- /dev/null
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.6.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot common www build tools for packaging releases"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-pkg/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+# No real integration tests for this pkg.
+# all tests are related to making releases and final checks for distribution
+RESTRICT="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -e "/version/s/=.*$/=\"${MY_PV}\",/" -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 4df00eb9f91f..c012463221af 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,5 +1,7 @@
 DIST buildbot-waterfall-view-3.4.0.tar.gz 192456 BLAKE2B 7375e22b86b4dfe2cde88d4190accea50bf49c9615358ec55b341e6720551b4605015938ed15bfac6bf80805a32457081389bd150d762e90132af4f18295cfe5 SHA512 a9a381e8b520919f71011083face8760f864f5bbe5080446c64c0a63c38d787e486cddd20c3548b01d78534a206221ed2bec85bb78681fe3dceaef2bc1f172d9
 DIST buildbot-waterfall-view-3.5.0.tar.gz 192440 BLAKE2B 46ef4e839dabb5006c740c6f04235b123be420b4d0108cf59bab075fde3dbf6bbe0b4fdfc37fd8606da3696d15f45ee4363f8c35434f944af70f884e2de1edff SHA512 381ce3bb976aa0e1cadd541af44ab0bf1450a3e47351a55b32bda24ad824dbba0f075ee8204a3f26c3ab62a5a615c6ca5027b1894852f8d5308fb27b64e9c177
+DIST buildbot-waterfall-view-3.6.0.tar.gz 193903 BLAKE2B 3029015580dedd9003ae7b723ce79b335d58fd198c4d294483377c34bb88eaade53cd704652c240670c1bab488ab60056e03aba698dcb294f09fe62def59d5f8 SHA512 520e5e1653ceb92a4eb144530fa3cc6d893c4baae15f5ffcc29f2bc66ef02f1a41d287b3d85864a5ddf0a127c0fcf2d19a0ae136e39e394228713112487af8c2
 EBUILD buildbot-waterfall-view-3.4.0.ebuild 759 BLAKE2B 0c1b064d404368d586b8f558e80465cc6dc055f048c1d8415854370b82eaf31677199c770281f8aab61bbc411e2f7454d1b638757aff10ff354842dacf58f295 SHA512 ad93403e653dc3a347717758ef2241a2bc2d345f0bda249ca914d3e93f156c805a8db7ffa3e6ef4fdbcdcf461bb9861a270c05dc60428f769d44df842b3972e5
 EBUILD buildbot-waterfall-view-3.5.0.ebuild 759 BLAKE2B 0c1b064d404368d586b8f558e80465cc6dc055f048c1d8415854370b82eaf31677199c770281f8aab61bbc411e2f7454d1b638757aff10ff354842dacf58f295 SHA512 ad93403e653dc3a347717758ef2241a2bc2d345f0bda249ca914d3e93f156c805a8db7ffa3e6ef4fdbcdcf461bb9861a270c05dc60428f769d44df842b3972e5
+EBUILD buildbot-waterfall-view-3.6.0.ebuild 759 BLAKE2B 0c1b064d404368d586b8f558e80465cc6dc055f048c1d8415854370b82eaf31677199c770281f8aab61bbc411e2f7454d1b638757aff10ff354842dacf58f295 SHA512 ad93403e653dc3a347717758ef2241a2bc2d345f0bda249ca914d3e93f156c805a8db7ffa3e6ef4fdbcdcf461bb9861a270c05dc60428f769d44df842b3972e5
 MISC metadata.xml 681 BLAKE2B f74bd19772210f0ffbc45a54aa06a05c97c11bcc18a76ca621e4761d36f690bd0d1ce926b744e3b6c0dc83fd3bd709a2bbc7dc53c63c0364cd0e82bafaf0620f SHA512 37b2205043cbbfdf019b0a827494d28693e3e0537cad6fca6a1e46cccd3a6779f5b9244f2b9523953ae07238e8b8c90da00cf5061f8e6d54895c06c447137fb4
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.0.ebuild
new file mode 100644
index 000000000000..591aebc7cf5b
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot waterfall-view plugin"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-waterfall-view/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 86f48068ccf2..a1bf3070b155 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,9 +1,12 @@
 AUX buildbot.tac.sample 1799 BLAKE2B 25fa4b85b0ad16d51780613b20f89c56e0131d73eb7d8b6cb23cfeee84bcff31b99a6bf2e81bbc467db340a774a43be6a2f7fc3c03068df09dd6164fc9e8050d SHA512 4a1b6d78b51067b5d3efb8de18d91995efb820bf9486c6ad6acd5bf726e39c3a7746cc9fb90b5a07eda8a40b09988490972b11707026d951184660a21fddccc1
 AUX buildbot_worker.confd2 366 BLAKE2B bfd08d2c6ee89c9e9d09e3280ded65765789b701cd4aa31d953b8f87d24ec1d85260b22d978d152191c918c72569e77bdac91de07d3eae4dad9ac529b4c140d4 SHA512 2bcb93b739827566bce295bc508481c50b57c1202d858359733649d4f35f116d994e0285a53a84d1b89d371a6fd23c0a89f4e555c31555bf14783eb5f57f15b0
 AUX buildbot_worker.initd2 1637 BLAKE2B d29fa6d6596f789af88319300537ef8ba9d51eff452d54afbf27dcc0da358482b73b0c721d537c217ffe01502acb0eb08c31c138042bc39e4d1457091f84a284 SHA512 63ca598dc7d3102cf74166ddc92045cc06f798f17676bcb7166b95bb5b1562bb1ea172afe39ea275783ec7ca7db1c469c7f54dd588a007026e93b3877ba2ada5
+AUX buildbot_worker.service 296 BLAKE2B 2f557007489fa0d7c355dfcd12388c405fca269ca10573489fd9d303f9edfb2900e5505cdf851c464aec7a7e908aecf3d16c2773bea26158c08caae0ab1a9e4b SHA512 936035e92d8bd481b8af93450445a82ccf8eb21d3f6bf99c2a02f52ba71d911940b8a6316b7f8b888443f577d73184bf7e7d99329ffbaa995e32ea3d9cf715bc
 DIST buildbot-worker-3.4.0.tar.gz 102910 BLAKE2B c38a806e8d0475a8c18176310f628b829fc359f013b315e82715e71071213fe4a0cdf38273ad7df39a66675f4ebc9fb1881fb990290f2bbedf4c8777ec93d4dc SHA512 411a2bf496622c2b9a3e0dea1ea8a71b347566010086c57ffc5d1114546cc5052af39a8ff7b10ffe6e7afdb6fc8ff73a9ffba23b96a76ff1cc0e3eff81cc59a7
 DIST buildbot-worker-3.5.0.tar.gz 111349 BLAKE2B 90d193fb89ac65ca03274e0ad5c7fde8fc478bb932ccc4240495437f79171d49f623f50731c7619336386b7d1d7df3f955e10bf006ad86b8dcf294d75c874774 SHA512 1df67b6332753f91179863cca76b0578e4f36954e0aa4eb9c28f98d6451d6972e247849fb9d4e20b753b5702d100406b306ce4982181510ad81de0d35a9828ed
+DIST buildbot-worker-3.6.0.tar.gz 120158 BLAKE2B c762237d802f6eff1c6b74f0ed364ecf085d762c80f6cc90edc1fed0084c7bf6a0b74b6fcaf8611b9c21b6249bde547d5a10bc7ff5b4588d138b2ebf76e823a3 SHA512 6b5f50694fe1559dacba599f8641c6b370cad4b68c8182e8a6e31528ffbeeed81c405fd764e3718003913fe5fe8d9faa920a2ad81373fbd028cbf046ed0d3136
 EBUILD buildbot-worker-3.4.0.ebuild 4644 BLAKE2B a934c87f28b81ab622e0ffcfb3e0e0636722b6d6ea0066fb9aedeb57b9f61857891007584bbcbcc1306b8454616f8a8c241def5467732818e54988e234ef4905 SHA512 a08935e46cb9bcd9ecf76a0e5e4cf94a31f5a27a4d22d94d9ab19e86e6ed163082b36d507d76be8e3692ae4278081d0d60aa8ed0d09b44e53939ad9050be6c0a
 EBUILD buildbot-worker-3.5.0-r1.ebuild 4820 BLAKE2B d56eb4bda74894de2a6130c5c87db55242e686f4ecc54d718a2c51f24500a61af92bbdf4e0c35b146f766ddcf6f065397158783d9da0ca4f493ab48fbd2e831c SHA512 33344be29c8aed20cc78a82563959d3881de5a3d1bc102018dc9539c39539cf3854cc2182d2534a4c671179ea54d27f179270c1708efdb97a454c125fa3e6683
-EBUILD buildbot-worker-9999.ebuild 4723 BLAKE2B 624265dba845045056b7c7b6a58fe070141ea043e8e0b713650e83bf6d1e3ce78389001f831990843df149f2cfab0c02128ab4494310ffea19fadae3560dc4c5 SHA512 680b8c0f51a9a02f8f57dc48af1928084519b5d14a319f0090b0cbe9d7b40a5eb730e4e46ae21ccddb8f1e412450cb09c765cd9689b8bc31f178663701bd4683
+EBUILD buildbot-worker-3.6.0.ebuild 4820 BLAKE2B b3a98bb98922bd4f02b58e599e836e083ba156493f566ad37cb618d9a998fcfb96c3ed2246c38507ede4db4fcd98a305177b4636371514f1a06e95b96c157291 SHA512 683e621a440a3a7e99dde21bfd9897bf8e35a49dc2cc236a5612f8d45a2d20bf702019ca79146355c7dad1b6a10e5925e0eb25bfff584d27c981465606e902f5
+EBUILD buildbot-worker-9999.ebuild 4723 BLAKE2B dca9bafeed289948c0b026f3511fac8ae7b5b774c059a4d6bf429fb6753a4a6c0a1ec0e5e5ce39b72df073b597cfbeaa43f29191a096280418fd006f1d2c2b27 SHA512 1fbc0a4f0ce37baa439d2ca8824cc46b715b9308b3fd75d3843cbe30fc55760c9fc68dc96a85db9e9d1c48cf5327af9add53f66068f83cc8960bc9244cf7651f
 MISC metadata.xml 481 BLAKE2B 884b573e537512f10a184b60b3d354ef70aca1200507c74ad4be79ebd0fc81cabeaafc9db05e23edae6cec47b92340febbcb3345c0227a32f95119d607493cae SHA512 d6f00cc040032613bbbc55fd957a0544266b20e54ae30710f7c32847576a91d329c55692a9fdc74e25827c7b8689eb17770b7935bd91ebd8395237e0e8b200ae
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.6.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.6.0.ebuild
new file mode 100644
index 000000000000..34360f39c453
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-3.6.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit readme.gentoo-r1 distutils-r1
+
+MY_V="${PV/_p/.post}"
+MY_P="${PN}-${MY_V}"
+
+DESCRIPTION="BuildBot Worker (slave) Daemon"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-worker/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	!<dev-util/buildbot-1.0.0
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
+to support starting buildbot_worker through Gentoo's init system. To use this,
+execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+Set up your build worker following the documentation, make sure the
+resulting directories are owned by the \"buildbot\" user and point
+\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
+The scripts can	run as a different user if desired."
+
+python_test() {
+	"${EPYTHON}" -m twisted.trial buildbot_worker || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/buildbot-worker.1
+
+	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
+	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
+
+	dodir /var/lib/buildbot_worker
+	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
+		ewarn " Note that \"BASEDIR\" in the buildbot_worker 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 buildbot_worker 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/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
+		ewarn "    rc-update add buildbot_worker.myinstance default"
+		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildbot_worker@myinstance.service"
+		ewarn "    systemctl enable buildbot_worker.target"
+		ewarn "    systemctl start buildbot_worker.target"
+	fi
+}
+
+pkg_config() {
+	local buildworker_path="/var/lib/buildbot_worker"
+	local log_path="/var/log/buildbot_worker"
+
+	einfo "This will prepare a new buildbot_worker instance in ${buildworker_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="${buildworker_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
+
+	if [[ ! -d "${instance_path}" ]]; then
+		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
+	fi
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${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}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
+	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 buildbot_worker instance at ${instance_path}."
+	einfo "To change the default settings edit the buildbot.tac file in this directory."
+}
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index 3c8df2e78a33..6fb30ec0ecab 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -22,7 +22,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	acct-user/buildbot
 	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
 	dev-python/future[${PYTHON_USEDEP}]
 	!<dev-util/buildbot-1.0.0
 "
diff --git a/dev-util/buildbot-worker/files/buildbot_worker.service b/dev-util/buildbot-worker/files/buildbot_worker.service
new file mode 100644
index 000000000000..e75a2d51e4f3
--- /dev/null
+++ b/dev-util/buildbot-worker/files/buildbot_worker.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=buildbot worker (slave) instances
+After=local-fs.target network.target
+
+[Service]
+Type=forking
+User=buildbot
+ExecStart=/usr/bin/buildbot_worker start /var/lib/buildbot_worker
+ExecStop=/usr/bin/buildbot_worker stop /var/lib/buildbot_worker
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index 50aa91f84774..d3ab357b91bd 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,5 +1,7 @@
 DIST buildbot-wsgi-dashboards-3.4.0.tar.gz 5583 BLAKE2B 0eed4a375330d58bd6caf95f8cdc2ebfaebc9c123450461d4e0f938745bb1b6afe0e9786bd886c6e6cb6a522da2b645bf1ad3237b2049f86bc1bca83829b15a1 SHA512 56411bb34a1f40d02a814e8d33dcd3c6de65627728c3bb9cad776c43c48707e648ccdbb4a58cbfb8ed080c219fc37252304c88ab363eb6deb6057b2debde1071
 DIST buildbot-wsgi-dashboards-3.5.0.tar.gz 5585 BLAKE2B 94c365d4140de539a0ea85b78e24acd5d789fe022eb5ff2474ebc07554d139d964c9625b684b312b2134c3fd4bf3a6628178ac72d52283bb6fcfd7b7820d51f1 SHA512 d233273c05f9c2f6d81091dd620469dd19377848d5958c26cc746b6340ea9451c49aff8f8a36986741b3775fcc60065e0fbc402183f60f43d4afce238b907fd0
+DIST buildbot-wsgi-dashboards-3.6.0.tar.gz 5585 BLAKE2B 91de620cdb911b75ad745549e6fa7d1589206d8b17878b1779b40b84633dc9788d3dca46a34866c40d2403ed1a16c20d6159d0f0ce69d3e10f35d132cba06f35 SHA512 8377ef27f46b65ebb5e5dc638cab0e251070b940386b4681ea410562e6eaef04d4a76bfd3be229c081edb2f9df01c1385aad34a7763dcd5ce607fb0061b741e4
 EBUILD buildbot-wsgi-dashboards-3.4.0.ebuild 744 BLAKE2B 3fd09fab4929e3bb190370108cc583fe2df25514c79d60b16a332f516782a32cad2ea1c0a0e52a8e7b3c1e9e1327b536d18269cdb21d61c7f4bd16edf9303958 SHA512 b3a3e3e987888f539f2374e698042ad4f2a1ebb9c77f4921c75255964b469a393859220b56eae830830f5575ce58fcb2b5ae9dd627b81a5e3a203799ada10346
 EBUILD buildbot-wsgi-dashboards-3.5.0.ebuild 744 BLAKE2B 3fd09fab4929e3bb190370108cc583fe2df25514c79d60b16a332f516782a32cad2ea1c0a0e52a8e7b3c1e9e1327b536d18269cdb21d61c7f4bd16edf9303958 SHA512 b3a3e3e987888f539f2374e698042ad4f2a1ebb9c77f4921c75255964b469a393859220b56eae830830f5575ce58fcb2b5ae9dd627b81a5e3a203799ada10346
+EBUILD buildbot-wsgi-dashboards-3.6.0.ebuild 744 BLAKE2B 3fd09fab4929e3bb190370108cc583fe2df25514c79d60b16a332f516782a32cad2ea1c0a0e52a8e7b3c1e9e1327b536d18269cdb21d61c7f4bd16edf9303958 SHA512 b3a3e3e987888f539f2374e698042ad4f2a1ebb9c77f4921c75255964b469a393859220b56eae830830f5575ce58fcb2b5ae9dd627b81a5e3a203799ada10346
 MISC metadata.xml 680 BLAKE2B b3fea763f6f493b0fb8be5e0408f80b295a5d205c5d01443e3a47965a5c982dbcc8e1f806978b0d8939e31ffeaa425590f9be8d5b563f0c064d700b1f33343be SHA512 01aeda23d466d40dc4c2bf7668595795fb6f743930c168549f259fd2a6e0f3491044079ef039096d030dec48ebb2bf3977bb5084264381675984cf43e063e083
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.0.ebuild
new file mode 100644
index 000000000000..b67bfb3e65bf
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-wsgi-dashboards/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 070b0b3a65a8..6a858366f816 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,5 +1,7 @@
 DIST buildbot-www-3.4.0.tar.gz 3182445 BLAKE2B 350606158ae68aba1b82c43d202e6140f433905e9913c7f4fcd3f4ebd328f7b70940f0a4e76a4a1f89731f6364dd285f08052bd1d96badac4e69cd1e16643d4e SHA512 7be83f35b6042accae77db1133d54282d0d27ce15a9b34220cc015255935d7463c1a327ee289740325bbb73d6a6a162f384da2b3cc731719e7f99a911faf86cd
 DIST buildbot-www-3.5.0.tar.gz 3182531 BLAKE2B dcdd6487eff9d9a0429554d79f9ee83a9086dee3524b49fa8362085dddb969e088373a843a9d872e16d18350e1623ba65258799b9b93327e218f760540ece4fa SHA512 f40101624cf14f88f2796855845d13ee81471d7a1b4911461747aa073735352f21294c17f3a011229c5e1c99867013ff4b306bf32c2c37b3c57d530a6fccc01e
+DIST buildbot-www-3.6.0.tar.gz 3210526 BLAKE2B ab54213c457a9f5777075d00adb96863b4327cbbbc489c97609f29182fb8630cc77479ffa7e324d0d20e453bbcdc70f8ad0537a8bf55fd23d8410b8003e1399f SHA512 77a0671caa5c8a240301c7f3a2c2a26ecc69924546b7b7e641577e0f46c84380a80de43271dced0fa24a24b58b32d485d70d9af1d41a31af78af22a380653910
 EBUILD buildbot-www-3.4.0.ebuild 715 BLAKE2B 0335bd4910cbfa25181f900c9ccdc1d4c16f9e71e097b246e1450359b7b38c118e871cd904d3bc921d7ce315d6180aa653a8269c5866807d1099de6b079edb0c SHA512 b6cc81a73694d0cbedc22945708c1ebd391389e3492dd9ab4441d44b88fcd0d5c8b16936b70bba3a3dcf5bba5c659d2047e9bd149c581ba61f4b17b654966275
 EBUILD buildbot-www-3.5.0.ebuild 715 BLAKE2B 0335bd4910cbfa25181f900c9ccdc1d4c16f9e71e097b246e1450359b7b38c118e871cd904d3bc921d7ce315d6180aa653a8269c5866807d1099de6b079edb0c SHA512 b6cc81a73694d0cbedc22945708c1ebd391389e3492dd9ab4441d44b88fcd0d5c8b16936b70bba3a3dcf5bba5c659d2047e9bd149c581ba61f4b17b654966275
+EBUILD buildbot-www-3.6.0.ebuild 715 BLAKE2B 0335bd4910cbfa25181f900c9ccdc1d4c16f9e71e097b246e1450359b7b38c118e871cd904d3bc921d7ce315d6180aa653a8269c5866807d1099de6b079edb0c SHA512 b6cc81a73694d0cbedc22945708c1ebd391389e3492dd9ab4441d44b88fcd0d5c8b16936b70bba3a3dcf5bba5c659d2047e9bd149c581ba61f4b17b654966275
 MISC metadata.xml 667 BLAKE2B 10cb0032009c616e55be86ca788abf9b643890605d456b71636b40b0b9591136270a2d30227d3b06854ddce18a7697a3326233cf6da0e1386af4f8102d8d53bc SHA512 d024b9e5148003c7d0d20c82d25bd376006d4c2d8bdd8d58c865f6f35a252333618ec3964a5af1baf63ba9ac7fd5b49fca4c65438066512a016804ef85032256
diff --git a/dev-util/buildbot-www/buildbot-www-3.6.0.ebuild b/dev-util/buildbot-www/buildbot-www-3.6.0.ebuild
new file mode 100644
index 000000000000..7834a034d6b5
--- /dev/null
+++ b/dev-util/buildbot-www/buildbot-www-3.6.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-www/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 893db0e4ee62..0c9090e27288 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -5,7 +5,9 @@ AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b63
 AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d
 DIST buildbot-3.4.0.tar.gz 2446868 BLAKE2B a58b268fd4569105f1c0ba48c9ed86210a3fee4725f167d6b6847960bbb56a092d0c0db427ecf5932a91d44065da8843fbb4046d289800a019b0b1d8b1f53fea SHA512 92e5085862ac37a6c3c059870a3998fbaac2019c48384295f3e209788ea14bddff6704f1b987a8f3b1550c1b0255d228f8a0b2a20b5cb760b22a513db465863b
 DIST buildbot-3.5.0.tar.gz 2450653 BLAKE2B 0e923f2a3a334241b25c6a151b397356d7ba81ab2ff19c17c50a5996494d0f99fa198b63aa18a27ab60c5ad53c0154494bf4dea4e2bd306f4b709858a64dc3c4 SHA512 9730305540db3cdf166fdfc071142061926bbb895aa941046ad25e8350d3c161d4175f3518cd8a3ab51f320b0a5980517e5e53d9f5ddc342492ee56a0f6f266f
-EBUILD buildbot-3.4.0-r1.ebuild 6684 BLAKE2B 6aa2c72d62cbcd3f33ef9cdffa26762aa6a1600b3747f9e0070b9f3f098143ee32083a528a4b9331c866ecca36297d591019ac8d02718588a328eeeb567430e5 SHA512 033dd139371dc1ac260f71ce54a01dd9d59a085011b4ff6b9bc08d8bc60fd9af34aeb636b966e6cdce8104c70af03b85769b626464da0632046f2b15f1b7ccd6
-EBUILD buildbot-3.5.0-r1.ebuild 6684 BLAKE2B 96a17e28885f24c6270c39e01eeba4c5b06bef0ad9a5f0cfed6296dcd567f9a62ea624ee23ed511b933f6aac5471ffff12f8c2a44433aaa9415465080485bc07 SHA512 3d1a89cb2cd325d8e01fcf62358bf70c47bf2188f856dfc007c92c8e804f149da2b0265213a6fdb8c37b71439f960205deb904486cfe0cd1e40e8d2230a5ab17
-EBUILD buildbot-9999.ebuild 6563 BLAKE2B fe2a4112637a6b633bd20ff4971f9d0755e60c369c0ff4a52edad6cda54dd4286a73e2e9e3383b1b074b9199fc587434ec33f5eb3441725c8fcaca293023aa2c SHA512 903bd9ff7cd3a949701a3f719645e8d86114c8c441e6e1f869941be3e7ea18fd4c282ef36ad268df3ecc2d8ebea048ebd86367813b9cd01d968d0e99972c5f6d
+DIST buildbot-3.6.0.tar.gz 2458029 BLAKE2B 5f41702d4d61fbcbfa878c6febbb89a38da2648403c4fdcab24bde246adc225e9ac3f72eb7dc893e03763f00c2d3548c31b2d6597904032e4b75e660bb1faf72 SHA512 c0bec931d08adb1eec51114619d2a085fbef224944a4c0acf3ab396f84d846fd620b84379affee238d02dd90ca1294fdb2b7fb8ea6e82d95c4cfeae93a0b5e73
+EBUILD buildbot-3.4.0-r1.ebuild 6653 BLAKE2B 8fc9cb4df5e6581771e89e91084d6679c67eb0b73c166c4a564920895767d7e9ec6fae53bd2631a56220baefb32e2d8cc8e686a36f29734702a88f107f37da57 SHA512 63dd31de86215b66f24cdcfd109e85ad3736060cae8439f04478a56d2bc53a5aa31e70faa0c7beb56dcce2dd6b1e79906e3d31846ff63795d9e9a093f8f38131
+EBUILD buildbot-3.5.0-r1.ebuild 6653 BLAKE2B e85f66fb8b27f230f24b932f348c2cd858d1b36ef8ca71f1db49747b85b407a4aef5e1c672f516315a5d118798cedc0bc84ecd85db9728cc4ca8489616eba76c SHA512 871cdc749948f80c7913e1d74f2b2341ef6688332be9979559acee835b0a6537d54897006ef1dea3b81feec74b7e90c7a1dd349626d1f8c70028741123cbb62f
+EBUILD buildbot-3.6.0.ebuild 6653 BLAKE2B 833bbcc0185d9ff6edba1807e3b79f6a7c3ff5ff08e914dfae925805b07b4eca0795f2ea69eb37550ebc3b2533cd841ca7fad5cec542224744a2df97a3b7ffb6 SHA512 f45af0cbcb10ea496301dd4329d2c394122ba5e3c3169a85c1daf083742de481c0ab44f7a624a5545a20daeb99b2b18d11cabe3a13d0ff7c49e19a10a42c31ec
+EBUILD buildbot-9999.ebuild 6532 BLAKE2B 1c926776771eabfc7c6d1a559f845da991d065f23092f64e7b0213458a6619225cc0fa410a320f1abb189da9044ab5435dae6620dc1d36c88a7316570b461f1b SHA512 0a2b2b5b2f09b728bd6fbb02328bfb618916275d0cf37ac9aca584e7ac14f1178a0b79c4dff9ab97831a6c158a91077fc7aed4b477e02985a5631da7d88d7c54
 MISC metadata.xml 1360 BLAKE2B 4f54443c55c18288e1cd887528e94c5c258441cbde1579222f141ccba69b241b7163ee5c65056b9ba89794c543342394cd656b5f6d9f8356af47c4681d60bf4f SHA512 3ba99aead69ebc879d9e8a42ed41f250cfea97bdb21147dcefba40b759f87e682f0f416ab6b915afdd4dbe2c4e41ce99aeee23ea8afa349a131f6f450ef7ea95
diff --git a/dev-util/buildbot/buildbot-3.4.0-r1.ebuild b/dev-util/buildbot/buildbot-3.4.0-r1.ebuild
index 48e0f782f784..2805b245be55 100644
--- a/dev-util/buildbot/buildbot-3.4.0-r1.ebuild
+++ b/dev-util/buildbot/buildbot-3.4.0-r1.ebuild
@@ -86,7 +86,6 @@ src_prepare() {
 }
 
 python_test() {
-	distutils_install_for_testing
 	"${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with ${EPYTHON}"
 }
 
diff --git a/dev-util/buildbot/buildbot-3.5.0-r1.ebuild b/dev-util/buildbot/buildbot-3.5.0-r1.ebuild
index e6a1f69bd613..38fdc881f1a2 100644
--- a/dev-util/buildbot/buildbot-3.5.0-r1.ebuild
+++ b/dev-util/buildbot/buildbot-3.5.0-r1.ebuild
@@ -86,7 +86,6 @@ src_prepare() {
 }
 
 python_test() {
-	distutils_install_for_testing
 	"${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with ${EPYTHON}"
 }
 
diff --git a/dev-util/buildbot/buildbot-3.6.0.ebuild b/dev-util/buildbot/buildbot-3.6.0.ebuild
new file mode 100644
index 000000000000..63802dfa22aa
--- /dev/null
+++ b/dev-util/buildbot/buildbot-3.6.0.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit readme.gentoo-r1 systemd distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot build automation system"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+IUSE="crypt docker examples irc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+	crypt? (
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		|| (
+			>=dev-python/twisted-18.7.0[${PYTHON_USEDEP},ssl(-)]
+			>=dev-python/twisted-18.7.0[${PYTHON_USEDEP},crypt(-)]
+		)
+		dev-python/idna[${PYTHON_USEDEP}]
+	)
+	irc? (
+		dev-python/txrequests[${PYTHON_USEDEP}]
+	)
+	docker? (
+		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/treq[${PYTHON_USEDEP}]
+		dev-python/txrequests[${PYTHON_USEDEP}]
+		dev-python/pypugjs[${PYTHON_USEDEP}]
+		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/lz4[${PYTHON_USEDEP}]
+		dev-python/ldap3[${PYTHON_USEDEP}]
+		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+	)"
+
+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_prepare() {
+	# disable all warnings as errors
+	sed -e "/warnings.filterwarnings('error')/d" -i buildbot/test/__init__.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman docs/buildbot.1
+
+	if use examples; then
+		dodoc -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
+}
+
+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: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}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
+	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 2f299e4c1c37..b0ebb30b9273 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -22,7 +22,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
 	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
@@ -38,8 +38,8 @@ RDEPEND="
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
 		dev-python/service_identity[${PYTHON_USEDEP}]
 		|| (
-			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},ssl(-)]
-			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt(-)]
+			>=dev-python/twisted-18.7.0[${PYTHON_USEDEP},ssl(-)]
+			>=dev-python/twisted-18.7.0[${PYTHON_USEDEP},crypt(-)]
 		)
 		dev-python/idna[${PYTHON_USEDEP}]
 	)
@@ -81,7 +81,6 @@ src_prepare() {
 }
 
 python_test() {
-	distutils_install_for_testing
 	"${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with ${EPYTHON}"
 }