gentoo auto-resync : 25:08:2023 - 03:53:16

42 files changed, 766 insertions, 33 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a0451a944645..79d4821e14c9 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 2297f683c283..7cdd83b1362c 100644
--- a/dev-util/buildbot-badges/Manifest
+++ b/dev-util/buildbot-badges/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-badges-3.6.1.tar.gz 3967 BLAKE2B 07763a458c0eb32db13fd7b39a20186c2772ff53ea30e3b199f0dd64008346c218d550b10b238b63deb2ee64064b3f1fb19c95013f6647ec4992b8fee12ca2e5 SHA512 4326f49c2d69d86e9c49250c261c59d67553d6cb63098f19c391f3bfb83c4f99ea783d2351930fcfed40fe83dbfc8466294d77609e39e79e76c6c7b42e557c0f
+DIST buildbot-badges-3.9.0.tar.gz 4677 BLAKE2B acbeb9b1dc850c77caa2d8cec67da2649dd79b4da27f0cb224e007919b12571f5766fe8c0652ef63a98ced8f8f3385b06479cd008e50e98f3f16f1efa17d60e6 SHA512 f718a9c9b44296cb4636106945fc0f214f1bbef494cfdc65f14b415f4f36b746659751778e13104145aa1d771b969d176e67930a49a0f9fc30385e47e20bdab1
 EBUILD buildbot-badges-3.6.1.ebuild 831 BLAKE2B 8cafdda6e5b22bd6f79e30a160ecd8295872e0c442c15d4606696f6adfec1d3fb7a90c72d102d243922d3e82b0321b0f1a55a7f2279fbf2aa42bc17961f0b4ca SHA512 5a3d6cb96747267718965078bc378a19996e95ec13662b989b35991596d450797852aa228d63ef339ddba1407aec3b0f0b044f47b99a93c6ab2d5cb9ab50208f
-MISC metadata.xml 762 BLAKE2B bad3590966f17a1a4f25b1b382be72f6e2a1ce77c5a0a806fb878b9d20d9c30dec6ea493a530e0aedaefe2dcc964fe7397e752f38a00f9feb2c8ee372d541c9a SHA512 f3936f9cedb5c400740e691833ee030996e61f0f9e6e7661adc5ace37f415c2d456092137a5d14cf792089387177499a36be0bdd53188676b699a829bfc21c24
+EBUILD buildbot-badges-3.9.0.ebuild 831 BLAKE2B 8cafdda6e5b22bd6f79e30a160ecd8295872e0c442c15d4606696f6adfec1d3fb7a90c72d102d243922d3e82b0321b0f1a55a7f2279fbf2aa42bc17961f0b4ca SHA512 5a3d6cb96747267718965078bc378a19996e95ec13662b989b35991596d450797852aa228d63ef339ddba1407aec3b0f0b044f47b99a93c6ab2d5cb9ab50208f
+MISC metadata.xml 870 BLAKE2B 176eaf41cd376273ac0ee848667673e6f0d80c8b5363df63d5826b43496849703e9bcaf844dee7b886d440fcff67fd0b6654272c099aaf77bd120f51c2ea0027 SHA512 8ea2799afadb1e164dfe746d733ae18c6a0661ebebc74ea562fe911492b935d900b1749d7ae196df845df8cdf357a0add7b10cc8338a078f6b11b2732df5cde4
diff --git a/dev-util/buildbot-badges/buildbot-badges-3.9.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.9.0.ebuild
new file mode 100644
index 000000000000..ad7526a97942
--- /dev/null
+++ b/dev-util/buildbot-badges/buildbot-badges-3.9.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 pypi
+
+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/"
+
+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-badges/metadata.xml b/dev-util/buildbot-badges/metadata.xml
index d15725c28e1b..450a2d29b98e 100644
--- a/dev-util/buildbot-badges/metadata.xml
+++ b/dev-util/buildbot-badges/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>zorry@gentoo.org</email>
+		<name>Magnus Granberg</name>
+	</maintainer>
 	<longdescription lang="en">
 		The Buildbot badges plugin produces an image in SVG or PNG format with
 		information about the last build for the given builder name. PNG
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index 0bbf106d343e..139d3d580af6 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-console-view-3.6.1.tar.gz 18731 BLAKE2B b572b0c2bedfb1149056237a5b7417c933cdd75b8a723edcb5b37cbf33c8d6d1c1fa5d490955a119eb6ca6df7317b89182c45462ceebb310d3b78f44712f4d33 SHA512 3489579c02db7f2b02aaeab8d9cc2eb60d72e5a12eca51c63cf10491c683ba7b99069de6ca2348fcf44dd6ce81d58d437a7d03749815a3fad55162e50df912e0
+DIST buildbot-console-view-3.9.0.tar.gz 19013 BLAKE2B 8e4adcbbe1aa545dfe314e31a13ec5b50dfb074e7c7c945f30a099937307fe4b76b058cde35e9726e030ea925670b570f8fbb8489e2162c7d0594d0f4227a557 SHA512 4cff6c23f3b8959b49db9d04447730eabdf3794050c2a8602f111c7b7a144de6fb53f2ee4035a63e27f25954034af04e39e81db1b1b9c785168670aa8660a631
 EBUILD buildbot-console-view-3.6.1.ebuild 622 BLAKE2B 29819ec608141cd258328f7b798f09f8682cecd7537adf18ce9ac4f631fd1ef85f0ce62661c2dc9ae40558bbb55519bf3563c7cb5adc50f5a948a3afd53e3533 SHA512 becb332377c97318a8f71da57dea296cbefd70f3e8e371bce1aa1761b6dddc77adf5b71fccdd4772615c8a34212c00c36c36b4fc9d8568c7918f5c2f088ccc1c
-MISC metadata.xml 661 BLAKE2B 00812636b1e2bf2b7d604a540ed1982e891894f38d8fa256bd954a693f6ff4b203c9a6cf8a2d4b67288b489a362a661b072de042dd3f62cf3d596ef14049e35c SHA512 1f905f5810e7a216e73e942fe2cb42302010fdb19078f20ee95a20555e2b2f0e13e29b3cf326d0a546bfc78e4d610d402199acbb915fc0b57ff55be3c402ec2b
+EBUILD buildbot-console-view-3.9.0.ebuild 622 BLAKE2B 29819ec608141cd258328f7b798f09f8682cecd7537adf18ce9ac4f631fd1ef85f0ce62661c2dc9ae40558bbb55519bf3563c7cb5adc50f5a948a3afd53e3533 SHA512 becb332377c97318a8f71da57dea296cbefd70f3e8e371bce1aa1761b6dddc77adf5b71fccdd4772615c8a34212c00c36c36b4fc9d8568c7918f5c2f088ccc1c
+MISC metadata.xml 769 BLAKE2B e3770506cd5b6047cdcbf93304aa4fd8e95ea2824318a4ec69d4e4f6cc9600bd3f3bc620b4ce7d22748e560babb1cbf2141344ac35f0ca0c6ac73812621bca0a SHA512 39746a8d5399ac776f5f5a48a7a5aca993221da5a5fe8f090cdab41107d612ec3ad655168025b4281afcc8a718d2dea16da1b5279363955103615bb493aa1df1
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.9.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.9.0.ebuild
new file mode 100644
index 000000000000..d8b774611b0b
--- /dev/null
+++ b/dev-util/buildbot-console-view/buildbot-console-view-3.9.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="Buildbot console-view plugin"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-console-view/"
+
+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-console-view/metadata.xml b/dev-util/buildbot-console-view/metadata.xml
index a2c9ebf97a34..8ab57748face 100644
--- a/dev-util/buildbot-console-view/metadata.xml
+++ b/dev-util/buildbot-console-view/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>zorry@gentoo.org</email>
+		<name>Magnus Granberg</name>
+	</maintainer>
 	<longdescription lang="en">
 		The buildbot-console-view plugin is the user interface code used to
 		display information about the builds to the console.
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index 51fc195ab797..085f6400242d 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-grid-view-3.6.1.tar.gz 13706 BLAKE2B 808d663b397459c7dd2d537a1a6eab2a0cc839ef0ba42bf56722ee53628bc9e6d41d03f549f0adb0fa92b0b8f416ca8c0a4bc310d67b4b06823eefe33b1ed02b SHA512 7605a5af1428ff08c96751f9c93fddd7b54f57a8879b85c270338e94eeb4ed55ddcfb7066519a2a3ff6d07b537a6ac28bb388b48eecb81c477aa1b6fbaa361dd
+DIST buildbot-grid-view-3.9.0.tar.gz 14091 BLAKE2B f598e0718ad80d439d15a9b88205d3aef448bd350da8ed3fe3260b1f71770c530c1a0d8cc2a18516cf5e1f5e97f5836c540e578749aa1ad3be2088e62705a750 SHA512 e7ec9e082a3339f72fb2089f727de009db2b155069aad1ce073235ad4b36701d27c2f77ccbe2b02862f52cb1512620797705d32d317588db17431477b02e897c
 EBUILD buildbot-grid-view-3.6.1.ebuild 602 BLAKE2B 173015c4d4f4f141c9eb78441b92c3a3a5f8e3c44921a6a4e99538dc523066b5697e9a1beccf9cca07bc4b95ec22705dd850a198a2974f5d4568de895500371c SHA512 f5544807d7c60476c27fb94b7e2d885c23f358a114ea9878a8ac5c42beb55c32d7c3c92ceefde5aaffcac270b1817c51f4c46385b2cb948e65939d730a434478
-MISC metadata.xml 640 BLAKE2B 22ccf767dae88664f3da52b44a6cc1d7abe93e282db0bccd6fc7bcd20bad2719b3cbc0ae75a7a72baf6a542908e7155026d7fdf1fa6976b165129110e348e11a SHA512 d6c7605dc32e3fc40690a45b8bfc70fd73e82e07ddcd49d94503254c25f5d532fc21ce79b94a37fc0a1fd023f5632065c35e946f0d48bc802c051f04a5dcaf81
+EBUILD buildbot-grid-view-3.9.0.ebuild 602 BLAKE2B 173015c4d4f4f141c9eb78441b92c3a3a5f8e3c44921a6a4e99538dc523066b5697e9a1beccf9cca07bc4b95ec22705dd850a198a2974f5d4568de895500371c SHA512 f5544807d7c60476c27fb94b7e2d885c23f358a114ea9878a8ac5c42beb55c32d7c3c92ceefde5aaffcac270b1817c51f4c46385b2cb948e65939d730a434478
+MISC metadata.xml 748 BLAKE2B 2f643ed95c58b92504be9e7a837e35fa397241e11c94923550bd1aa6980ad84e6d84e30122230eeec137e132bd0a3a2ef473da8c3fd4f67d4986da004f05886c SHA512 c5e33d9ec95c77fa2692a14685a950f9762a31024868bb295555cbc4ab260fa16bb9fc6277669c15918ae4f9e85edc400f5aa74ded0e23766c510aead4c13dcc
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.9.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.9.0.ebuild
new file mode 100644
index 000000000000..fdfb25b728e9
--- /dev/null
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-3.9.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="BuildBot grid view web interface"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-grid-view/"
+
+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-grid-view/metadata.xml b/dev-util/buildbot-grid-view/metadata.xml
index b9d2a9d72fb9..cb9cabd2f221 100644
--- a/dev-util/buildbot-grid-view/metadata.xml
+++ b/dev-util/buildbot-grid-view/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>zorry@gentoo.org</email>
+		<name>Magnus Granberg</name>
+	</maintainer>
 	<longdescription lang="en">
 		The buildbot-grid-view plugin is the user interface code used to
 		display information about the builds.
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index 9de0cc923138..3d9dccb167a6 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-pkg-3.6.1.tar.gz 4807 BLAKE2B d492d0ca36fa8634e877bbc56ffd06ff6a7bb477c98bde2e3586dfc64f4b9d394ec1e5bb1a113aad9d2905277805b9f8737babcad669e2b73abb67d156d3126c SHA512 5833581b4551dc204a52a8356bdb110d57a9de022c33b09b7efdc14f5f4a7c0b0e26f9f9a6a076945aec3a5b7089c040ddaaad8d94c6e0217c2cb6b7742c1ac2
+DIST buildbot-pkg-3.9.0.tar.gz 4987 BLAKE2B b7a05d0401efbecbab718c60e40e87d154e42d0a1b3e298d738f291853fd3a96ae984474e55b52b34eb43959bc2399aaaef90582a7bb2fef7e9b60943076ea13 SHA512 96500b53bdcb955146bd3115a93c7b96019da62f81baf81cd736eb0b236b1cec8e2c24c8048c54bd298c15147b807f6e6c6a90bd71fc0dc95a50fffe3aa9f07b
 EBUILD buildbot-pkg-3.6.1.ebuild 812 BLAKE2B 5cfdb492543ca8d8b403a9d0ce0b65814d629ee84522f31d84396a3e15941dbb463fa5cd97fd6055d1cd8f238439a3a4e00cddbc2a7f06b191887350527fe6e8 SHA512 def043f39dffb2ab1cf518733e9cdcca031ec023a453bc5cba09dc02f9c3c10d15d089df8dd307457469e8c41e69de68956244e35529c2d6c409b3eb5ccb2df9
-MISC metadata.xml 1199 BLAKE2B 1eb102f71e83b2d11adff2f92f08614715428508b83042358d054babd4cd7f5bb63ef0e289fd9e60360111dccbd734422215b6f8a9811198f62c30cb82612566 SHA512 545c227af17fe4492aff85837e948769001d281dc40cbfdb5a74663dc5fde6989df632aab9a6f5cda644fd20f385d36469ec38b930bb42bfb61483c1c5e46faa
+EBUILD buildbot-pkg-3.9.0.ebuild 812 BLAKE2B 5cfdb492543ca8d8b403a9d0ce0b65814d629ee84522f31d84396a3e15941dbb463fa5cd97fd6055d1cd8f238439a3a4e00cddbc2a7f06b191887350527fe6e8 SHA512 def043f39dffb2ab1cf518733e9cdcca031ec023a453bc5cba09dc02f9c3c10d15d089df8dd307457469e8c41e69de68956244e35529c2d6c409b3eb5ccb2df9
+MISC metadata.xml 1307 BLAKE2B 715d3f42e862476a33dc5fc722d35050a013004cbe846a264ddecf826b307274bc39207f9e361400c47e810460a64f7d70de7fccfb87a8b6220a79d3fd61c883 SHA512 6d02ac596f43996205726e9229d676ee760c78adebd76b76bb9bc7a1defc2f3d0fcc41edeb7c667d567197bda71b6fe0266d48074c35b645b9c37ecec31fc958
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.9.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.9.0.ebuild
new file mode 100644
index 000000000000..552d4880c8f3
--- /dev/null
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.9.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="BuildBot common www build tools for packaging releases"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-pkg/"
+
+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/=.*$/=\"${PV/_p/.post}\",/" -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-util/buildbot-pkg/metadata.xml b/dev-util/buildbot-pkg/metadata.xml
index 1e3ebf4755df..843974e6055d 100644
--- a/dev-util/buildbot-pkg/metadata.xml
+++ b/dev-util/buildbot-pkg/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>zorry@gentoo.org</email>
+		<name>Magnus Granberg</name>
+	</maintainer>
 	<longdescription lang="en">
 	BuildBot is a system to automate the compile/test cycle required
 	by most software projects to validate code changes.
diff --git a/dev-util/buildbot-react-console-view/Manifest b/dev-util/buildbot-react-console-view/Manifest
new file mode 100644
index 000000000000..1504dde83754
--- /dev/null
+++ b/dev-util/buildbot-react-console-view/Manifest
@@ -0,0 +1,3 @@
+DIST buildbot-react-console-view-3.9.0.tar.gz 25184 BLAKE2B 672e80e9bfd04232a292da0807b1bbc024be2bdcaadec54ecf4ab9f2ee562a2bada92a48965339b3f56f2ceade127faf0903ed09f5e064e0a1f604c2aaba626c SHA512 51d398dadf7e0874061efefc62e3b0d08ce2d29fc8bd686a4f700d12858edc733e114e99d44d2fc97cd891f32faa0751a423be5bce2ae06ebd6ce0c6903e1a0d
+EBUILD buildbot-react-console-view-3.9.0.ebuild 646 BLAKE2B 38d43789a738a5fda2a0ff97bbb7ea0fb21eb589ed298723c5754f49f0b4081ddddb0ec57209f8bd49d1125a0445c810493dff5047f26e5670cdde52f88c9ece SHA512 a39040a88597485440a69cd56563b0e046f6a825f09b02a22f3a347715507bfbfe56296456a33b6fd0a537089dc96e0f58a4f88fd4ef06debe5bb3e3d9e82e54
+MISC metadata.xml 797 BLAKE2B 4e5179da129eb399094fa5e1e365d90ee8d2016da9088d499da46ccbb650a1b5a8127db912efd58a5918febac8c6ac0e8c8c7c9af2febcd3b42167344b46ad68 SHA512 fe6054de95652736af666b085840252f07142b7edad62c6c5c1604a2bd98da8a6232a9b7d7ccb74a34b66c6180deb654074078e119bdd43c61e207bb6642e25a
diff --git a/dev-util/buildbot-react-console-view/buildbot-react-console-view-3.9.0.ebuild b/dev-util/buildbot-react-console-view/buildbot-react-console-view-3.9.0.ebuild
new file mode 100644
index 000000000000..f822a2f76023
--- /dev/null
+++ b/dev-util/buildbot-react-console-view/buildbot-react-console-view-3.9.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="Buildbot react based console-view plugin"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-react-console-view/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-react-${PV}[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-react-console-view/metadata.xml b/dev-util/buildbot-react-console-view/metadata.xml
new file mode 100644
index 000000000000..f49f90b24118
--- /dev/null
+++ b/dev-util/buildbot-react-console-view/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>zorry@gentoo.org</email>
+		<name>Magnus Granberg</name>
+	</maintainer>
+	<longdescription lang="en">
+		The buildbot-react-console-view plugin is the new react based user interface
+		code used to display information about the builds to the console.
+	</longdescription>
+	<upstream>
+		<maintainer>
+			<email>devel@buildbot.net</email>
+			<name>Developers List</name>
+		</maintainer>
+		<remote-id type="pypi">buildbot-react-console-view</remote-id>
+		<remote-id type="github">buildbot/buildbot</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/buildbot-react-grid-view/Manifest b/dev-util/buildbot-react-grid-view/Manifest
new file mode 100644
index 000000000000..8049aed9d5dd
--- /dev/null
+++ b/dev-util/buildbot-react-grid-view/Manifest
@@ -0,0 +1,3 @@
+DIST buildbot-react-grid-view-3.9.0.tar.gz 13096 BLAKE2B 8999df8e3e8b389769003b6694fb22eafc31ebeedbfd559eadfa38fb7ac152c968b3de278c51b54a35372d3d90b5df39ee121a74e44e68bc51777dd058e2e0bc SHA512 22624e5be3b638de4a0f826770a249d4da7fb47109586a2f4a3bada76202a639cdd98be62c9a108b48fddb41294b3c0a8594c0cb4b8cc33cae4b198607924d81
+EBUILD buildbot-react-grid-view-3.9.0.ebuild 626 BLAKE2B d10e065bdb247e2c87fd473e682a2c2f689abb7a97cd1e07f4cb2f969cb0f6b5afa6a5c8dc11cd20e2294c1d9f80ff470e2478510026452efe314918a6daa7f5 SHA512 051c19d5a119317ad62d6165267360cbd70c238179419db43b9f9eb38baf0a6ccc446d3fcf07e9ab0e330de5a89bfe9b1d53b5918ee0a04b7824f4dc7cda35cd
+MISC metadata.xml 776 BLAKE2B 61839cc517bfc86db3ec20fdfa8e99a606c529dcb3ed576d279153c53f07ed721399e5929ca897247238ebd3e7e063cbfbc2d572a9af9fbc0f31539108424a1f SHA512 9dcc6bda1d2cdacab81bd81d1d99bb70fbab7e1eb66baf754240d6e3354d04584e98d0f6a5498ec8a898f7c29b371c6e547d5da9b2c30320b9067c227b52edb0
diff --git a/dev-util/buildbot-react-grid-view/buildbot-react-grid-view-3.9.0.ebuild b/dev-util/buildbot-react-grid-view/buildbot-react-grid-view-3.9.0.ebuild
new file mode 100644
index 000000000000..3ca04b7da413
--- /dev/null
+++ b/dev-util/buildbot-react-grid-view/buildbot-react-grid-view-3.9.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="BuildBot react based grid view web interface"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-react-grid-view/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-react-${PV}[${PYTHON_USEDEP}]
+"
diff --git a/dev-util/buildbot-react-grid-view/metadata.xml b/dev-util/buildbot-react-grid-view/metadata.xml
new file mode 100644
index 000000000000..2834b84c3a3b
--- /dev/null
+++ b/dev-util/buildbot-react-grid-view/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>zorry@gentoo.org</email>
+		<name>Magnus Granberg</name>
+	</maintainer>
+	<longdescription lang="en">
+		The buildbot-react-grid-view plugin is the new react based user interface
+		code used to display information about the builds.
+	</longdescription>
+	<upstream>
+		<maintainer>
+			<email>devel@buildbot.net</email>
+			<name>Developers List</name>
+		</maintainer>
+		<remote-id type="pypi">buildbot-react-grid-view</remote-id>
+		<remote-id type="github">buildbot/buildbot</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 1f3a248b56d3..2e95330fe1a6 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-waterfall-view-3.6.1.tar.gz 193914 BLAKE2B 401dd8b1c042fe2dc5bc1c696607d3c0ab3188975757feb8a242049fb73c28f1f5f4dc1dc027ccf37f7a942e1a7d3093b917c1c3a4f81d5181bf8f8dffff6196 SHA512 f1bf080fa7b8e1dc17d52367e1e3dc3e4224c2de6db128bc2f061c338ef69c88732b39d487dcf92d06e2855902d6f078d76e97ddd0d38e348d4e83d0728ad634
+DIST buildbot-waterfall-view-3.9.0.tar.gz 194360 BLAKE2B 30aeaee85bfcaf2b6079decca6c976d0dd13a83962a3b5c95fc9f2ec2b9601b58830ca9d9293647d05a94f3d0b16d8b57827f0f3d07b58aa2039fdeef5536e20 SHA512 815926d177de53048c39442639d85ae3ff4f861f181882896be187962464dcc51e7ff4a9e25e9cc1c31de6eb70442efb0dc20567e26316c5941ae7daa4572e6d
 EBUILD buildbot-waterfall-view-3.6.1.ebuild 661 BLAKE2B 065eecad59a187d752fdc7226b9657d8ec8f92a766f712d4834f5d62066b06b2321528e3b22fa5052be8871346cdf8dcaedf5cbdab26d57629c9c815770e1025 SHA512 043ed5010bb8875378c35e42253693e9d5d18fd5a7e868a564da06a194d8068b285aa21bf1751585606beb8e8d4854e11f6a15b9817b82224cf545b5d884f4a1
-MISC metadata.xml 681 BLAKE2B f74bd19772210f0ffbc45a54aa06a05c97c11bcc18a76ca621e4761d36f690bd0d1ce926b744e3b6c0dc83fd3bd709a2bbc7dc53c63c0364cd0e82bafaf0620f SHA512 37b2205043cbbfdf019b0a827494d28693e3e0537cad6fca6a1e46cccd3a6779f5b9244f2b9523953ae07238e8b8c90da00cf5061f8e6d54895c06c447137fb4
+EBUILD buildbot-waterfall-view-3.9.0.ebuild 661 BLAKE2B 065eecad59a187d752fdc7226b9657d8ec8f92a766f712d4834f5d62066b06b2321528e3b22fa5052be8871346cdf8dcaedf5cbdab26d57629c9c815770e1025 SHA512 043ed5010bb8875378c35e42253693e9d5d18fd5a7e868a564da06a194d8068b285aa21bf1751585606beb8e8d4854e11f6a15b9817b82224cf545b5d884f4a1
+MISC metadata.xml 789 BLAKE2B 3e673b8c52b222162bbb9c7c955d7823abbd8c166703c9bbbe3c25c93077eb7b7cddd02cff9d002154b3f27598cf2a9eb90d89c96cdd1fc3e3e43bdcadf37775 SHA512 16b1fd29b5d9f840f2fb387a7fc4236b839d774f8786d773bb9033295199927c6c178cd736ea1f67f3377fea7c17492029d999b044113b835609d8da41298300
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.9.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.9.0.ebuild
new file mode 100644
index 000000000000..03d3f4022a46
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.9.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="Buildbot waterfall-view plugin"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-waterfall-view/"
+
+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-waterfall-view/metadata.xml b/dev-util/buildbot-waterfall-view/metadata.xml
index ec70a5ff22f4..1226a6380d96 100644
--- a/dev-util/buildbot-waterfall-view/metadata.xml
+++ b/dev-util/buildbot-waterfall-view/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>zorry@gentoo.org</email>
+		<name>Magnus Granberg</name>
+	</maintainer>
 	<longdescription lang="en">
 		The buildbot-waterfall-view plugin is the user interface code used to
 		generate the web pages used to display information about the builds.
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 6ae309f3761f..62fddef105f1 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -6,6 +6,8 @@ AUX buildbot_worker.target 149 BLAKE2B 93902e53b76a09aac472280df295fd4aafe19aca6
 AUX buildbot_worker_at.service 343 BLAKE2B 6fed117fe1e5478ef3d2fb1bfeac92fd9b9e9b50c6d184b05f13a8847acc74d461eb4ea7797c01366c1c340950dbd07e06683897095b992c3d01e263dd7b7192 SHA512 41c250e31ad0fdbb13830ed4ae0563572ac7edd7c037728cbad943e1d3f82559c41529993edddb922d46c20f7eaa7e7781f5ed1c548f7ed07bb7520e5e3019f8
 AUX buildbot_worker_at.service.conf 154 BLAKE2B 20323a777b44200c5a73278a10804169c64e07a5c2fc8695eb49339d1ba415b06324db6ae3084aa4fa6cfd1a684e4f41fb4b73436fa4305314faf9e5da485a9c SHA512 5fd61d4436652a927af9788799bb9f8b7a66baadc0bf486c9bbe171a5cd9ec8457719bdda45f911d5b0620db8fb4c494c75e2b2fd69951ee4dc83119dd7d6628
 DIST buildbot-worker-3.6.1.tar.gz 120224 BLAKE2B 010893b7b4e5710654299b2541c4cdcdad47b3b763dbc7e2336e5480c841908e04d8350c7cb42edd9ea99d16fd26f36a524a6d6bec8c0f933665a02ded369f89 SHA512 f1e3bf7c0da2f31dd446dc16487e32fddaecc0c2f9c17c469146707322a3d7bb2cc77db4f6145c62530bce58dd61aa19e008e944a7f39a17dc66f1317ee26e1b
+DIST buildbot-worker-3.9.0.tar.gz 125913 BLAKE2B e053cd150cf21cc0e5dfb2d49c186c49d340670429b760ce9f697aa97a245d0e6a12f0ea84eb1256a610891042096877c89244b1f2862bf74160502170f9124c SHA512 08b74d6f019ca85f65c598a34c81bc47fdf873abad17205072788d938fcd5450f80aa6ca9d324edc01893947f4ac8e2968889dd73be854a82b4ea54e4730613b
 EBUILD buildbot-worker-3.6.1-r2.ebuild 5191 BLAKE2B 67702aedccac19aaabed0aaf9857caa1b12746ee50fea70e33580f87f36466f508a7981cbf1f36933c9d3ca2dea399f8282953920cc72d154610ae405ad81004 SHA512 6b1cfc2c6905279ad45d8d1fd3111f716351bef2d887f9adc71eb65c36ec01333199c0d8e0ba6340498bac766d705fa92bead0fc5b4b0a488065822e4c71daf2
-EBUILD buildbot-worker-9999.ebuild 4938 BLAKE2B b2afc823d259ef4f97725b4db785e80d6080cd5295aef79b1cd10471a06e1f122caf12c7b66617e7871fcc4f3543a228db48fa37e102546c8be0b9215daff1c7 SHA512 e18fe5b541e3506134ea678d7e81f8d0a80b37ae2b6163e08db57eeed767c7e81b4693ec6e81d5f3bf8844d84a952f3f4c46a7c2a0f6d9b5b93ff53dfc725fc0
-MISC metadata.xml 481 BLAKE2B 884b573e537512f10a184b60b3d354ef70aca1200507c74ad4be79ebd0fc81cabeaafc9db05e23edae6cec47b92340febbcb3345c0227a32f95119d607493cae SHA512 d6f00cc040032613bbbc55fd957a0544266b20e54ae30710f7c32847576a91d329c55692a9fdc74e25827c7b8689eb17770b7935bd91ebd8395237e0e8b200ae
+EBUILD buildbot-worker-3.9.0.ebuild 5192 BLAKE2B a64ab78e69f0168aacc555cd0844230c751be873c30dd57031a404a63cac2488c3fe94b7fba32e89ee9b642677dfe1d2741dc8844fb1e30b4ffe3b1f9da64b22 SHA512 d2cdd5c03bb00a52ad981c6a90a39c79b627e36787a53cce3d98a37e7980ff4feecca52b1ca24d252f5855f3f8a1ec870a9f091c77ce2dd2c4779fc6677ee403
+EBUILD buildbot-worker-9999.ebuild 5177 BLAKE2B 1a24a9eff0a97860ef0c6c666e9465dc0b59f4edc5c9d56c6fee4d7043a808ac0f4466aff0b16da5e7b27ef23fa89ca8cfc6716af5c750ec55c041b2df6958a2 SHA512 bc8c7a7095a39f8bf4405ab986a1c6cf3e707ec4bbfbfa219d36677f1ef9090d027663b77b41223a223d556a7ad72c6224222556084aad5adcf88681713f1adc
+MISC metadata.xml 589 BLAKE2B 97e4047671ab199256b50061698e8c9030e2d6618436b4338080adae1f5d53572215d7c6edfd3878c0d42ddc8f9a5b70acb4fbdc8fdfee37d96d6e70e931f752 SHA512 87a93213d11d2fadef014e9c71185539e850d49e31b79a45de75f78dc4238e62d22a04d4356ea5afee061223865acecd3e29846705b8a9e7e2fe2292f9f23ea6
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.9.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.9.0.ebuild
new file mode 100644
index 000000000000..7c7f0082d67e
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-3.9.0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+inherit readme.gentoo-r1 systemd distutils-r1 pypi
+
+DESCRIPTION="BuildBot Worker (slave) Daemon"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-worker/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~sparc ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	!<dev-util/buildbot-1.0.0
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
+"
+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."
+
+src_prepare() {
+	# Remove shipped windows start script
+	sed -e "/'buildbot_worker_windows_service=buildbot_worker.scripts.windows_service:HandleCommandLine',/d" \
+		-i setup.py || die
+
+	distutils-r1_src_prepare
+}
+
+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
+	systemd_dounit "${FILESDIR}/buildbot_worker.target"
+	systemd_newunit "${FILESDIR}/buildbot_worker_at.service" "buildbot_worker@.service"
+	systemd_install_serviced "${FILESDIR}/buildbot_worker_at.service.conf" "buildbot_worker@.service"
+
+	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 d399f27dd277..d641ad6870ee 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..11} )
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-inherit readme.gentoo-r1 git-r3 distutils-r1
+inherit readme.gentoo-r1 systemd distutils-r1
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
 HOMEPAGE="https://buildbot.net/
@@ -21,13 +21,13 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/buildbot
+	!<dev-util/buildbot-1.0.0
 	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
 	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
+	>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
@@ -57,12 +57,16 @@ python_test() {
 }
 
 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
+	systemd_dounit "${FILESDIR}/buildbot_worker.target"
+	systemd_newunit "${FILESDIR}/buildbot_worker_at.service" "buildbot_worker@.service"
+	systemd_install_serviced "${FILESDIR}/buildbot_worker_at.service.conf" "buildbot_worker@.service"
 
 	dodir /var/lib/buildbot_worker
 	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
diff --git a/dev-util/buildbot-worker/metadata.xml b/dev-util/buildbot-worker/metadata.xml
index 8987b1c0b79c..866f0d75fdbb 100644
--- a/dev-util/buildbot-worker/metadata.xml
+++ b/dev-util/buildbot-worker/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>zorry@gentoo.org</email>
+		<name>Magnus Granberg</name>
+	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>devel@buildbot.net</email>
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index 340e899dd67a..5d668f02d0ac 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-wsgi-dashboards-3.6.1.tar.gz 5584 BLAKE2B f0b82de52022c3a8a0d0747aa4ade67345af177be70a8767d66163fe98ceff63e0b297ba547619de874a66e381b721c48d864361fdb82a818f2450c339d687cc SHA512 7ecd4fd71786258deab1fb1d96b4999ef929df4486d09404cb1bc3d1a7f831c90f8253f5bf0474258ba472ac9e8f960f4c4eb1f7993a0a8070eaa68e3bbbb4e9
+DIST buildbot-wsgi-dashboards-3.9.0.tar.gz 6224 BLAKE2B 462dc93c1334ba8daba5eb01b85eb7747a2ce4a9dfc17f5e96f1fd4dc8c5d54d1740d4a041d667cd38e67d1d4e25c44845a90758e3d3a7925f12802d78152ed0 SHA512 fbdf567fe08d83b62ad0b4a5eca35a01567a1bdccd749adced1dad89805c102fdb6d6a35d8d7b07b2b47b9762a411c62a86aaa28c28b370363383a9130091352
 EBUILD buildbot-wsgi-dashboards-3.6.1.ebuild 646 BLAKE2B 61b959e5e57a0822392afcd4defbcdb0333b51ba3c1f441f7fab1bef2a1b3215392007031bc7aa12bdc6d5dd89e2e9eb1cd4c1fb4f95e106ee287849af5fed19 SHA512 6a5b50a8780b800665d72aa88d998dcc0a50efee4c10219071c01ea52f198de6226d459712c48cdf049758c8177e67b01118cdc329ba3f8eebd944e71a85d43d
-MISC metadata.xml 680 BLAKE2B b3fea763f6f493b0fb8be5e0408f80b295a5d205c5d01443e3a47965a5c982dbcc8e1f806978b0d8939e31ffeaa425590f9be8d5b563f0c064d700b1f33343be SHA512 01aeda23d466d40dc4c2bf7668595795fb6f743930c168549f259fd2a6e0f3491044079ef039096d030dec48ebb2bf3977bb5084264381675984cf43e063e083
+EBUILD buildbot-wsgi-dashboards-3.9.0.ebuild 646 BLAKE2B 61b959e5e57a0822392afcd4defbcdb0333b51ba3c1f441f7fab1bef2a1b3215392007031bc7aa12bdc6d5dd89e2e9eb1cd4c1fb4f95e106ee287849af5fed19 SHA512 6a5b50a8780b800665d72aa88d998dcc0a50efee4c10219071c01ea52f198de6226d459712c48cdf049758c8177e67b01118cdc329ba3f8eebd944e71a85d43d
+MISC metadata.xml 788 BLAKE2B 31b16cf01ccea5130b459a192d320c209471b20172b5b2bb0077d24d101c6eab1eb5bac057f63c44eebfa4b5888aa1ba6ead36d8d8e2a809b1c2fac08f4a719b SHA512 38c6aeb4cd64b2f16856d9d8b5d2af0cc157107f954003ca5224556196479cffcb5216a386c8df470e523faeb20c5e6de01c4a016c60cd8d345b7869f1dcf871
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.9.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.9.0.ebuild
new file mode 100644
index 000000000000..05f2c64c59fd
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.9.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 pypi
+
+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/"
+
+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-wsgi-dashboards/metadata.xml b/dev-util/buildbot-wsgi-dashboards/metadata.xml
index f58ca0f337a8..2fcfc2398316 100644
--- a/dev-util/buildbot-wsgi-dashboards/metadata.xml
+++ b/dev-util/buildbot-wsgi-dashboards/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>zorry@gentoo.org</email>
+		<name>Magnus Granberg</name>
+	</maintainer>
 	<longdescription lang="en">
 		The buildbot-wsgi-dashboards plugin is the user interface code used to
 		integrate flask or bottle dashboards to buildbot's web interface.
diff --git a/dev-util/buildbot-www-react/Manifest b/dev-util/buildbot-www-react/Manifest
new file mode 100644
index 000000000000..4893c4ba8a12
--- /dev/null
+++ b/dev-util/buildbot-www-react/Manifest
@@ -0,0 +1,3 @@
+DIST buildbot-www-react-3.9.0.tar.gz 38431 BLAKE2B e32edbd846c131670f8bc3c84fbc9456bd5757a09ed1e3b145f8cbb13707a31866527b3d1d16b7d77a2cf05d90923037841034c835ba5d7bc92ee47d9a00be92 SHA512 bdc1db5a21ff47b8f8c416e1eae38b561b2480d7643b91b598ae25bf6ffa362e6eeadf90c6a0e109dca6b80c15400562529d7b4dfe9e0ed1588e33a69b8c132f
+EBUILD buildbot-www-react-3.9.0.ebuild 624 BLAKE2B a4f3ec7e873318f873c6b2f6e42ca080c2065dd2ec710f62c74f52973641170c270aba6fe661b8212465b660abfc55ae54b4049760e35b30eec0b721ea346bac SHA512 15f0934a7d74855d39ab462c2d69ec42a8be3b558da1e3097aeccf4e7eeb3f7fece05a176b43c0df748aa9e5db32b001d787af65d7034c55e78270751936e70a
+MISC metadata.xml 794 BLAKE2B b924538a54cfdf084312cef30854b5000ceac6bfe2f0fabf945642f7aedf78970741d352ee0405be9f2db6c922e81ff2539e4abfa392737439c90e469c38bb64 SHA512 5ae2d44f39f61e8189d3def94f6cf7a54503f663b21ccdc9a9fdf0fd7ca2c0f8fb02506da84f1ea7bde76ed00d8286c09fd10dad07eddf870b3d9948dc763455
diff --git a/dev-util/buildbot-www-react/buildbot-www-react-3.9.0.ebuild b/dev-util/buildbot-www-react/buildbot-www-react-3.9.0.ebuild
new file mode 100644
index 000000000000..086a404d6277
--- /dev/null
+++ b/dev-util/buildbot-www-react/buildbot-www-react-3.9.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="BuildBot base web interface, use with buildbot-react-{console-view,grid-view}..."
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-www-react/"
+
+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-www-react/metadata.xml b/dev-util/buildbot-www-react/metadata.xml
new file mode 100644
index 000000000000..b15ec83b52fd
--- /dev/null
+++ b/dev-util/buildbot-www-react/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>zorry@gentoo.org</email>
+		<name>Magnus Granberg</name>
+	</maintainer>
+	<longdescription lang="en">
+		The BuildBot-www-react package is the base or common code used for the other
+		react based user interface packages such as the grid and console views.
+	</longdescription>
+	<upstream>
+		<maintainer>
+			<email>devel@buildbot.net</email>
+			<name>Developers List</name>
+		</maintainer>
+		<remote-id type="pypi">buildbot-www-react</remote-id>
+		<remote-id type="github">buildbot/buildbot</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 7dd652d2121f..1e08929c1055 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-www-3.6.1.tar.gz 3210526 BLAKE2B 6db8be32ee85cab63ad3f92d0e24042ed1ebece3b7be1b67e6f72240f61f3af2c31f1b3b31315db0d7ca18dddab1351eacffb92e762d1f1d68ce414349e52eee SHA512 d2fb3f97412e4a1b21fe7637458dffa8e8e005693ad2275222e908d35551ec64f89a88e696859a09f64b2b5be5fbdb386fbd71324356dbe8c2adc92b1c6b9f01
+DIST buildbot-www-3.9.0.tar.gz 3211620 BLAKE2B d5a75845941b456537be50484d341e450f545cf14ccafdc245d4b4d296df154e333d2797f8e5f5dc42c872a83360c675b0e747564cbcc3c182c4c1c0138205fb SHA512 2c88e0f41d5f4de37eecebc43b21f5f741771e0ecaed79865744503b939335f1f1dd426cd2e1cdbcf75a7573aa89ab5913e4c64aa6dea9e13fa19646dd717c0b
 EBUILD buildbot-www-3.6.1.ebuild 617 BLAKE2B 13719e517ca0606e093f511cde5d63d0ce7106552226acdec10e1ee44c9949292edee7570846bf2ea13722ffe5b00cf19854cc7fc8a94ef7c1e0aff64befb7e4 SHA512 7bc67c8f23058a2367bd477775ea6e83248e371d367454a40a05e649a89a85a0c4a99fe2dd2beff4225bf8c7ffae53fa8aabfdfdc741b69bc69e8879b4d382e3
-MISC metadata.xml 667 BLAKE2B 10cb0032009c616e55be86ca788abf9b643890605d456b71636b40b0b9591136270a2d30227d3b06854ddce18a7697a3326233cf6da0e1386af4f8102d8d53bc SHA512 d024b9e5148003c7d0d20c82d25bd376006d4c2d8bdd8d58c865f6f35a252333618ec3964a5af1baf63ba9ac7fd5b49fca4c65438066512a016804ef85032256
+EBUILD buildbot-www-3.9.0.ebuild 617 BLAKE2B 13719e517ca0606e093f511cde5d63d0ce7106552226acdec10e1ee44c9949292edee7570846bf2ea13722ffe5b00cf19854cc7fc8a94ef7c1e0aff64befb7e4 SHA512 7bc67c8f23058a2367bd477775ea6e83248e371d367454a40a05e649a89a85a0c4a99fe2dd2beff4225bf8c7ffae53fa8aabfdfdc741b69bc69e8879b4d382e3
+MISC metadata.xml 775 BLAKE2B cceefe166b3b5f19e62609bbe7c69b318f3e7cd1802a2ebd83fd403063aa1895308e4a95d92f0920e4ee4c7a997810afeac5885c570f55d0efc8fda60f37f9e6 SHA512 e5ce362bff7811c197cc832a833e28f4cf3fc142f72fb71ac6ce0cb3c702c6c17934c502fb8cdedee878b7e4731d26b885f35093b44d9ac26bcde6a7fd86e9f8
diff --git a/dev-util/buildbot-www/buildbot-www-3.9.0.ebuild b/dev-util/buildbot-www/buildbot-www-3.9.0.ebuild
new file mode 100644
index 000000000000..4d6c55e0d5ca
--- /dev/null
+++ b/dev-util/buildbot-www/buildbot-www-3.9.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 pypi
+
+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/"
+
+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-www/metadata.xml b/dev-util/buildbot-www/metadata.xml
index c438d214f139..f12a732fccff 100644
--- a/dev-util/buildbot-www/metadata.xml
+++ b/dev-util/buildbot-www/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>zorry@gentoo.org</email>
+		<name>Magnus Granberg</name>
+	</maintainer>
 	<longdescription lang="en">
 		The BuildBot-www package is the base or common code used for the other
 		user interface packages such as the waterfall and console views.
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 9fb3447ace30..bfef3d237b15 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -4,6 +4,8 @@ AUX buildmaster.target 138 BLAKE2B 7570fc327d2e002803f7d6691740f5885e6b54d3df252
 AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b6356b43b9e0861b00052e3702593a2e2a4764246dd62e52805ba2f2e62a86d0ae8ec4cbed3df42400dc562f74 SHA512 c37f1c461a4c7ee741a839772a5feabf10103542e159c6ae4eddfa37a146732dfc23f91d867d69c3718a21714516a3847485ae4e6580c93a5aa94daec40dd093
 AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d
 DIST buildbot-3.6.1.tar.gz 2458176 BLAKE2B 4587ed222e2fae424f3c4f275e67e72bf25b0ce88231a29f931582d82fbe93a846f85b14bdc64740939466ccdc3f15dab3774244aa5c0a293250b52b542014ea SHA512 62a993d1acd8bc5cc916f009909b4b099d9f64007fe790dc219104f248bb21e0ab8f1771c354ef61e6d8ba497451cdef5e7a7de17a87cfd1e941b3b49fbf2206
+DIST buildbot-3.9.0.tar.gz 2505725 BLAKE2B 144a16655a8ec23d74ba190a7867a2dce9c65ea6009aa53ea11494be6f03f8d45bc6568a36511812e7664bcc7de9540728b91264251a46301cbd7ebec04c2069 SHA512 9103c5e08f9d5335c0281403d81fc939cc91b81e8051d4590f29e00779392ac706934d209312e51aafc44a35ab768ad54cbd251afe50e326c52e2f1b0d72196b
 EBUILD buildbot-3.6.1.ebuild 6527 BLAKE2B 018d623d64da66c0ad38277634d697078c48cd295dafb042b26f9ef2e89a4e4640718cb87961b66c23e419643fff9ca573708400ad010e8ae6e52b588e80d08e SHA512 c558f8a1b4a4e3ecc8d5bd5339b6c0d3e1f6bacf320bca95da4aadef923cf5642e5126429b76ec41c70b8be2ebe228d1f782d9d00f59c12968b7bb1c2cc9d29c
-EBUILD buildbot-9999.ebuild 6523 BLAKE2B fcd7c657d1945cd3d521eb39191f3971bdc5a2a01b7fe682af3da87652972526c2dadf931c77f29a215a5302c98418ee3132898f75645fd73930040b318639a0 SHA512 80689e98aacb72c54451444415e2e7d5805fb20cf0061850a57c8c9dca52dec0bcd8fa2158b30b753828009c4128f6eeb028f9f5b9f14fece067c14947fefc92
-MISC metadata.xml 1360 BLAKE2B 4f54443c55c18288e1cd887528e94c5c258441cbde1579222f141ccba69b241b7163ee5c65056b9ba89794c543342394cd656b5f6d9f8356af47c4681d60bf4f SHA512 3ba99aead69ebc879d9e8a42ed41f250cfea97bdb21147dcefba40b759f87e682f0f416ab6b915afdd4dbe2c4e41ce99aeee23ea8afa349a131f6f450ef7ea95
+EBUILD buildbot-3.9.0.ebuild 6567 BLAKE2B 62e66249d99f0bb7cc00cf8f6b6e74a9e2dd1b4342964d5074788b13f24dc82d3d8735d5239419723348ee4188c8f17fa6871e5118beaa534b1616957640c052 SHA512 bf341792896efb861b0fa5ed98d501da16bf6dc93ad2221be7311e7faf17c8129d344e0793cee68c7e87601d9585efdb126e82391606127052d1e6167a7d91df
+EBUILD buildbot-9999.ebuild 6654 BLAKE2B cab351d00d1579efdc891037f88f30b22fbbd35625c77a8f33479cd4c0f8572642cf70af0d4de3721611a9785a459d2e8e569805598410338e15910127e954dd SHA512 df202f70e39b240b5b9bb642806636813fb51e6c90226277e478d21518088e0440a189ba1046aac25c5629fb20522438f8f32db10e1045c92d67e2db818f101a
+MISC metadata.xml 1468 BLAKE2B fc826dba410f22d62ff460ea2d35906a2934935131b3a308def9c4f01f05bb3ba95161f80ed95eb9fd701a20ab28e2a74112ac3c0fe763e5614dee59394e2602 SHA512 ad3e77e96805644b25968b8475251b8e11360e60734fc330259139beaee0011bd1ef49bfbe54177f15ed270e3c7260aee5a79d11a949b5392526d3f09a0073de
diff --git a/dev-util/buildbot/buildbot-3.9.0.ebuild b/dev-util/buildbot/buildbot-3.9.0.ebuild
new file mode 100644
index 000000000000..29e65c350941
--- /dev/null
+++ b/dev-util/buildbot/buildbot-3.9.0.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2023 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_{10..11} )
+inherit readme.gentoo-r1 systemd distutils-r1 pypi
+
+DESCRIPTION="BuildBot build automation system"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot/"
+
+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-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/alembic-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.1[${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-2.2.0[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+		dev-util/buildbot-worker[${PYTHON_USEDEP}]
+		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
+		dev-python/lz4[${PYTHON_USEDEP}]
+		dev-python/ldap3[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/pypugjs[${PYTHON_USEDEP}]
+		dev-python/treq[${PYTHON_USEDEP}]
+		dev-python/txrequests[${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 98d27d9c50ca..55859be4f7d5 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -22,17 +22,19 @@ 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/crontiter[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
 	dev-python/pyjwt[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
 	dev-util/buildbot-worker[${PYTHON_USEDEP}]
 	crypt? (
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
@@ -54,18 +56,19 @@ RDEPEND="
 BDEPEND="
 	test? (
 		${RDEPEND}
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/pypugjs[${PYTHON_USEDEP}]
+		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+		dev-util/buildbot-worker[${PYTHON_USEDEP}]
+		~dev-util/buildbot-www-${PV}[${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/msgpack-0.6.0[${PYTHON_USEDEP}]
 		dev-python/lz4[${PYTHON_USEDEP}]
 		dev-python/ldap3[${PYTHON_USEDEP}]
-		dev-util/buildbot-pkg[${PYTHON_USEDEP}]
-		dev-util/buildbot-worker[${PYTHON_USEDEP}]
-		dev-util/buildbot-www[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/pypugjs[${PYTHON_USEDEP}]
+		dev-python/treq[${PYTHON_USEDEP}]
+		dev-python/txrequests[${PYTHON_USEDEP}]
 	)"
 
 DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
diff --git a/dev-util/buildbot/metadata.xml b/dev-util/buildbot/metadata.xml
index 000fb8c0184c..05893c16e7f3 100644
--- a/dev-util/buildbot/metadata.xml
+++ b/dev-util/buildbot/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>zorry@gentoo.org</email>
+		<name>Magnus Granberg</name>
+	</maintainer>
 	<longdescription lang="en">
 	BuildBot is a system to automate the compile/test cycle required
 	by most software projects to validate code changes.
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
index 21f012eaa6a3..85317c16697c 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -1,4 +1,6 @@
 AUX patchelf-glibc-dt-mips-xhash.patch 250 BLAKE2B da297064604c0258ff10515e6ad55b22803ac0c8da215da782ca46433c703a67c3b91dbe573e211886aaa54b1921dfd24a35e395f73cf90935ec456e6607e14f SHA512 d76b9b137c182b5541576834f54d9c89033c4ec1cf7d08fd910eb0d091da32c3a5d8719966c5a7547b77325210bf8696b14bc17a60b2fac608d2eb62208989f6
+DIST patchelf-0.17.2.tar.gz 143954 BLAKE2B 7ed684c63955a0b9cfe293fb966f7f08a90c76e8efb2b493eaf3705c57767b31b31e48ab59f39ff1d91b7a4501e6d203e32a40040625a44a7d44113b1320530c SHA512 e5545416d32248d023759457d0a5cd4841d69f39366eb0aa9cfd8a43d2ce372c6e05995bf60ba62bd85c6d98fdece2dbd1e20872e338ef5ac75f11b82ae091b3
 DIST patchelf-0.18.0.tar.gz 331312 BLAKE2B e6ce4ec3bd89c280bb37230dbeb566b803f09900006e79f7dba74f138f66e17746d331baea4def6a43163024b3d86aa8dbac9b2c6545ac146298a8b84373d03b SHA512 6a917d7336b1e8c59f42d4cd1dc725df1378d77657fce13cb31547da1d4805b9df8a834a7b8408fda8aa1dbeb37d0cdca74d8698844ea2f44149f800b802dea6
-EBUILD patchelf-0.18.0.ebuild 658 BLAKE2B 36dcdef326071ce90fe2841d7aa6ed25b01eed3be6c07ae251e994b22636011f203de4e9ea7a1e904629b32b2033e414dba8fc003f0fbca4c7d77ed31019a662 SHA512 aea2bf204b7de2ccf5607182c6a9e22cfa5ac13721fa22d9c97d17b2a5a13d02533727be20764cdbfc9fa48908eeef0ed1276703c502ae389d4ae60b30ce4801
+EBUILD patchelf-0.17.2.ebuild 605 BLAKE2B c2700a0b30a9e6456b60dad02c385ac2766132a18c6c0594075536f41aef74f567f7e64d0ad45c09a0fa5f0589ac8ec69d4775e871387ffbfcfd5d0670fef79f SHA512 8e7773568076052a9c06f2d6ecb8efe11f8c867d1163bcabba1e15cace9117eac1dfd45c18ca1fec319f2da8da879c26b2d5431fa6fcce0ec4831d13b8fb7300
+EBUILD patchelf-0.18.0.ebuild 652 BLAKE2B 7df6cdee3a01030bf2a58b6f24fbc24e2bbc1a3181f2a81e0c3d2e6b0ffa7c861433b21fe6788b52a34b8d9b475e208d6040d134a0ffd1e6a19274b9696dd328 SHA512 e6229c8a24069700ebdfc67218a012cc7dd4f635b96f16ace8885ed4f3d8fc0bb0b2c7801485e321c91c3c3cee680a0aa5584f6c74f3265272301e413c83ac8f
 MISC metadata.xml 304 BLAKE2B f3c4f3a80192390cdeff546ea23f4a03454f17e4900799e10740420f2e158146a6fd8e02b8f77d07fe38646e23eff734d4a7a8571fa23d738e6c000fbe347ec3 SHA512 4a52dc190d6576ddf580830240cbe20c826b609228cc3ca8014f94ff1759a2b1382294b7d5a0c8e3160e7e7e26d055f82855e40076de3b7e410290e119333927
diff --git a/dev-util/patchelf/patchelf-0.17.2.ebuild b/dev-util/patchelf/patchelf-0.17.2.ebuild
new file mode 100644
index 000000000000..968fd2dbe7bd
--- /dev/null
+++ b/dev-util/patchelf/patchelf-0.17.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables"
+HOMEPAGE="https://github.com/NixOS/patchelf"
+SRC_URI="https://github.com/NixOS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux"
+LICENSE="GPL-3"
+
+src_prepare() {
+	default
+	rm src/elf.h || die
+
+	sed -i \
+		-e 's:-Werror::g' \
+		configure.ac || die
+
+	eautoreconf
+}
diff --git a/dev-util/patchelf/patchelf-0.18.0.ebuild b/dev-util/patchelf/patchelf-0.18.0.ebuild
index 115eb04b1519..19d9351a66a2 100644
--- a/dev-util/patchelf/patchelf-0.18.0.ebuild
+++ b/dev-util/patchelf/patchelf-0.18.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executa
 HOMEPAGE="https://github.com/NixOS/patchelf"
 SRC_URI="https://github.com/NixOS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~riscv-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~riscv-linux ~x86-linux"
 LICENSE="GPL-3"
 
 PATCHES=(