gentoo auto-resync : 23:09:2022 - 05:29:13

48 files changed, 711 insertions, 954 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b4d2df9d74ec..44fe95f74bdc 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 4e900f59bc77..9f3d97e566a5 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -4,7 +4,9 @@ AUX bazel-4.2.2-absl_numeric_limits.patch 2413 BLAKE2B 3e31f886b3f561faa79255aa6
 DIST bazel-3.7.2-dist.zip 313677756 BLAKE2B cd6363762c68d25739a6bf6c13f10e191302a10b6fb7d97455effbc678d4f0b644c76115cad478aad7c09f703d9e594f4bdb8669ed6ab97d6a559a27723c510c SHA512 e8746ef5ec22feb95e9dbbddb3fb56cf8f49c80f326fc2a4e0ce2619607826fac22f46bfb995daee55bf9ffabb9d646b8454be2bce7b479da5cf2a7e5b3be62b
 DIST bazel-4.2.2-dist.zip 279304631 BLAKE2B 2a32838e50b63c4b6400aced10085c6c9aacf28641ea555a44b9c4ed8991fc29658b4d420b26179e8eed0e00cfe7391e8eec84c7851f17493c74d1c5682427af SHA512 123f73dc87053e37705bb729f82bd722d6d2799fe106f79c51cf5566fb2771d824108cbe275aad55ae590b970c549008b433704cbf1245394769e950796eb8db
 DIST bazel-5.0.0-dist.zip 235894565 BLAKE2B 3798eb9111772809f0345e0c74bef38d8f9d44a7f20844f20aad187a2e177f4999ffa0e1cc1719e4284cdc7c72295bb903d32ce56821c72ee2908f4d939d0769 SHA512 2a9a972d1cce6b50f959fec3d37506914208169c8aa36e5ec5f9a27942e9beff1080a544a18e9bd5eb13dc434c1864cda0594e6da5b78c2f41085abf808c22d7
+DIST bazel-5.1.1-dist.zip 236073335 BLAKE2B dacc98db99a4877bcda743058f8d34c276d893bec14a595155587f9d0a2716caf106e1d08917f8103b9c15c45433285cce2063f15a2653d3d1a4a6b67242876f SHA512 84e2f72df1838fc88a39853afc510bca835fea28590e9aac2138b5416d2f8d9aefd082c81012a2066194fdc440b00b44f9f188b5c896461acebfeb9cd40efc7c
 EBUILD bazel-3.7.2-r1.ebuild 2778 BLAKE2B d24848fe0b5d5cc71cc754e1f7f6e2d5efc14240c55b00af10b93de298646f0bed8994a69a2767986854f4784dfc820e5dd157ef253325049d4c039b3b79bcf7 SHA512 08d18de4c56f733d638c36317c66a7d2afa6b7dde03ca79c106e0285551514ea9558c68c2c13dd33e6448d8d38d233fff423bde434714345c711ee955ca75f98
 EBUILD bazel-4.2.2.ebuild 2368 BLAKE2B 51982c8c7ac6d2d02259c295879a1883f45e83203c8a8ae697697b593dbb5ce7649ee3054ccf624416eba0fae51f942a115c275fbd6d173c6168324a289d933a SHA512 a58e9e1b9df0257806d64df2527d25eea261974de747237b478a009974c492b8f7c414a598029162bf689c6cfe7082660730d72b6d8f78a4620b16d820a885fc
-EBUILD bazel-5.0.0.ebuild 2388 BLAKE2B c6ed6fa24af8f9c0a6ac5a6e841926c34201aba47d035c9b344db62faaf9062a8aa05a537dd73b33ff03b168a66da24b081d181585bf18c81d7ce3b204643ab0 SHA512 e334a3366e452bcb4f846bf5379027287a4432621729bf37240425266facf01ee198be74915842db1d524c7c34620b67eadbf08f81b40fae89f1f476c21821f9
+EBUILD bazel-5.0.0.ebuild 2387 BLAKE2B d178d0ae8503b118b307689c3923e5ea859f3c961b01b4c08453e5efe48e9468feee555a47aaad0fe04b645395212935867c18a66cd59369f21b63b1f46cae44 SHA512 aaab839c67430c578a1b9d1de59013b75f29a40bae902a799428726da49c716534c6fa4e400362793816d8c6dc56b2e7dad68b1e673b85928b950b2fa50d9b28
+EBUILD bazel-5.1.1.ebuild 2388 BLAKE2B c6ed6fa24af8f9c0a6ac5a6e841926c34201aba47d035c9b344db62faaf9062a8aa05a537dd73b33ff03b168a66da24b081d181585bf18c81d7ce3b204643ab0 SHA512 e334a3366e452bcb4f846bf5379027287a4432621729bf37240425266facf01ee198be74915842db1d524c7c34620b67eadbf08f81b40fae89f1f476c21821f9
 MISC metadata.xml 706 BLAKE2B 07f70164b2e809db66f4255b62635e1b93ff58269f323a0efbfd994dd425034e4896599463c900582f0863cebf8f5ee0dd56da01bafbd30c9e27e88ffb99ad46 SHA512 3a335159533ca5f0d7de3b1bde18a737ba2dca2de56121124cdb9cb05009db5fac07bef1d21d5b73bec834b7928e7ec291e2ff3cd964e395431b9deac29bfbe6
diff --git a/dev-util/bazel/bazel-5.0.0.ebuild b/dev-util/bazel/bazel-5.0.0.ebuild
index 36ee3e954ac0..a5719c639bc3 100644
--- a/dev-util/bazel/bazel-5.0.0.ebuild
+++ b/dev-util/bazel/bazel-5.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.z
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples tools"
 # strip corrupts the bazel binary
 # test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
diff --git a/dev-util/bazel/bazel-5.1.1.ebuild b/dev-util/bazel/bazel-5.1.1.ebuild
new file mode 100644
index 000000000000..36ee3e954ac0
--- /dev/null
+++ b/dev-util/bazel/bazel-5.1.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 bazel java-pkg-2 multiprocessing
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="https://bazel.build/"
+
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools"
+# strip corrupts the bazel binary
+# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
+RESTRICT="strip test"
+RDEPEND=">=virtual/jre-11:*"
+DEPEND="
+	virtual/jdk:11
+	app-arch/unzip
+	app-arch/zip"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	if has ccache ${FEATURES}; then
+		ewarn "${PN} usually fails to compile with ccache, you have been warned"
+	fi
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack ${P}-dist.zip
+}
+
+src_prepare() {
+	default
+
+	# F: fopen_wr
+	# S: deny
+	# P: /proc/self/setgroups
+	# A: /proc/self/setgroups
+	# R: /proc/24939/setgroups
+	# C: /usr/lib/systemd/systemd
+	addpredict /proc
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel_get_flags)
+		--java_runtime_version=local_jdk
+		--tool_java_runtime_version=local_jdk"
+	VERBOSE=yes ./compile.sh || die "Failed compiling bazel"
+
+	./scripts/generate_bash_completion.sh \
+		--bazel=output/bazel \
+		--output=bazel-complete.bash \
+		--prepend=scripts/bazel-complete-header.bash \
+		--prepend=scripts/bazel-complete-template.bash || die "Failed to generate bash completions"
+}
+
+src_test() {
+	output/bazel test \
+		--verbose_failures \
+		--spawn_strategy=standalone \
+		--genrule_strategy=standalone \
+		--verbose_test_summary \
+		examples/cpp:hello-success_test || die
+	output/bazel shutdown
+}
+
+src_install() {
+	dobin output/bazel
+	newbashcomp bazel-complete.bash ${PN}
+	bashcomp_alias ${PN} ibazel
+	insinto /usr/share/zsh/site-functions
+	doins scripts/zsh_completion/_bazel
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	# could really build tools but I don't know which ones
+	# are actually used
+	if use tools; then
+		docinto tools
+		dodoc -r tools/*
+		docompress -x /usr/share/doc/${PF}/tools
+		docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
+	fi
+}
diff --git a/dev-util/buildbot-badges/Manifest b/dev-util/buildbot-badges/Manifest
index 1fdd4931c5d8..11dbf92388c4 100644
--- a/dev-util/buildbot-badges/Manifest
+++ b/dev-util/buildbot-badges/Manifest
@@ -1,7 +1,9 @@
 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
+DIST buildbot-badges-3.6.1.tar.gz 3967 BLAKE2B 07763a458c0eb32db13fd7b39a20186c2772ff53ea30e3b199f0dd64008346c218d550b10b238b63deb2ee64064b3f1fb19c95013f6647ec4992b8fee12ca2e5 SHA512 4326f49c2d69d86e9c49250c261c59d67553d6cb63098f19c391f3bfb83c4f99ea783d2351930fcfed40fe83dbfc8466294d77609e39e79e76c6c7b42e557c0f
 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
+EBUILD buildbot-badges-3.6.1.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.1.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.6.1.ebuild
new file mode 100644
index 000000000000..37e3828ead37
--- /dev/null
+++ b/dev-util/buildbot-badges/buildbot-badges-3.6.1.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 5f979d0a43ae..02a8104b1dfa 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,7 +1,9 @@
 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
+DIST buildbot-console-view-3.6.1.tar.gz 18731 BLAKE2B b572b0c2bedfb1149056237a5b7417c933cdd75b8a723edcb5b37cbf33c8d6d1c1fa5d490955a119eb6ca6df7317b89182c45462ceebb310d3b78f44712f4d33 SHA512 3489579c02db7f2b02aaeab8d9cc2eb60d72e5a12eca51c63cf10491c683ba7b99069de6ca2348fcf44dd6ce81d58d437a7d03749815a3fad55162e50df912e0
 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
+EBUILD buildbot-console-view-3.6.1.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.1.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.6.1.ebuild
new file mode 100644
index 000000000000..5b7624cd297c
--- /dev/null
+++ b/dev-util/buildbot-console-view/buildbot-console-view-3.6.1.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 db9bd7bdad1c..ec1e114a2381 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,7 +1,9 @@
 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
+DIST buildbot-grid-view-3.6.1.tar.gz 13706 BLAKE2B 808d663b397459c7dd2d537a1a6eab2a0cc839ef0ba42bf56722ee53628bc9e6d41d03f549f0adb0fa92b0b8f416ca8c0a4bc310d67b4b06823eefe33b1ed02b SHA512 7605a5af1428ff08c96751f9c93fddd7b54f57a8879b85c270338e94eeb4ed55ddcfb7066519a2a3ff6d07b537a6ac28bb388b48eecb81c477aa1b6fbaa361dd
 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
+EBUILD buildbot-grid-view-3.6.1.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.1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.1.ebuild
new file mode 100644
index 000000000000..32ac344a514e
--- /dev/null
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.1.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 3e913bf0e819..35372b3d5259 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,7 +1,9 @@
 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
+DIST buildbot-pkg-3.6.1.tar.gz 4807 BLAKE2B d492d0ca36fa8634e877bbc56ffd06ff6a7bb477c98bde2e3586dfc64f4b9d394ec1e5bb1a113aad9d2905277805b9f8737babcad669e2b73abb67d156d3126c SHA512 5833581b4551dc204a52a8356bdb110d57a9de022c33b09b7efdc14f5f4a7c0b0e26f9f9a6a076945aec3a5b7089c040ddaaad8d94c6e0217c2cb6b7742c1ac2
 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
+EBUILD buildbot-pkg-3.6.1.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.1.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.6.1.ebuild
new file mode 100644
index 000000000000..4d4e95e9196c
--- /dev/null
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.6.1.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 c012463221af..f41f5a1aba7a 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,7 +1,9 @@
 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
+DIST buildbot-waterfall-view-3.6.1.tar.gz 193914 BLAKE2B 401dd8b1c042fe2dc5bc1c696607d3c0ab3188975757feb8a242049fb73c28f1f5f4dc1dc027ccf37f7a942e1a7d3093b917c1c3a4f81d5181bf8f8dffff6196 SHA512 f1bf080fa7b8e1dc17d52367e1e3dc3e4224c2de6db128bc2f061c338ef69c88732b39d487dcf92d06e2855902d6f078d76e97ddd0d38e348d4e83d0728ad634
 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
+EBUILD buildbot-waterfall-view-3.6.1.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.1.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.1.ebuild
new file mode 100644
index 000000000000..591aebc7cf5b
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.1.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 2ba974b294b9..ab97a71f568c 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,11 +1,17 @@
 AUX buildbot.tac.sample 1799 BLAKE2B 25fa4b85b0ad16d51780613b20f89c56e0131d73eb7d8b6cb23cfeee84bcff31b99a6bf2e81bbc467db340a774a43be6a2f7fc3c03068df09dd6164fc9e8050d SHA512 4a1b6d78b51067b5d3efb8de18d91995efb820bf9486c6ad6acd5bf726e39c3a7746cc9fb90b5a07eda8a40b09988490972b11707026d951184660a21fddccc1
-AUX buildbot_worker.confd2 366 BLAKE2B bfd08d2c6ee89c9e9d09e3280ded65765789b701cd4aa31d953b8f87d24ec1d85260b22d978d152191c918c72569e77bdac91de07d3eae4dad9ac529b4c140d4 SHA512 2bcb93b739827566bce295bc508481c50b57c1202d858359733649d4f35f116d994e0285a53a84d1b89d371a6fd23c0a89f4e555c31555bf14783eb5f57f15b0
+AUX buildbot_worker.confd2 366 BLAKE2B 00dd93d421b61eb1bcef669d24ee8d646bf1048bfa4a655cb83c57f7534e84e26a874abd7b71f05cef34e77b89e932f66903ec47e17bb16dd287b35317a00141 SHA512 13c4cd44ec5045849b64392126f39172d4086efdb13e8b39f1aa7334045991c988ba16cc86158c0608931f360989dafc4e7fd2386fdb5b7f4dd7aff7cd08ed5a
 AUX buildbot_worker.initd2 1637 BLAKE2B d29fa6d6596f789af88319300537ef8ba9d51eff452d54afbf27dcc0da358482b73b0c721d537c217ffe01502acb0eb08c31c138042bc39e4d1457091f84a284 SHA512 63ca598dc7d3102cf74166ddc92045cc06f798f17676bcb7166b95bb5b1562bb1ea172afe39ea275783ec7ca7db1c469c7f54dd588a007026e93b3877ba2ada5
+AUX buildbot_worker.service 296 BLAKE2B 2f557007489fa0d7c355dfcd12388c405fca269ca10573489fd9d303f9edfb2900e5505cdf851c464aec7a7e908aecf3d16c2773bea26158c08caae0ab1a9e4b SHA512 936035e92d8bd481b8af93450445a82ccf8eb21d3f6bf99c2a02f52ba71d911940b8a6316b7f8b888443f577d73184bf7e7d99329ffbaa995e32ea3d9cf715bc
+AUX buildbot_worker.target 149 BLAKE2B 93902e53b76a09aac472280df295fd4aafe19aca634c90d170b98030def1f4c9beb1b33cecfe8d917581d4ec39919b6a8fbba7b89d6b745d254dcdabcfbd4b40 SHA512 5c5736b8f5bdff412c57971216b4559ea6582c7a3495762d7896eb89b1839a17827ea5396edfe6e43e7d9ec4d78fa1da34584a4589e38cd38aae26968703ce92
+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.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
+DIST buildbot-worker-3.6.1.tar.gz 120224 BLAKE2B 010893b7b4e5710654299b2541c4cdcdad47b3b763dbc7e2336e5480c841908e04d8350c7cb42edd9ea99d16fd26f36a524a6d6bec8c0f933665a02ded369f89 SHA512 f1e3bf7c0da2f31dd446dc16487e32fddaecc0c2f9c17c469146707322a3d7bb2cc77db4f6145c62530bce58dd61aa19e008e944a7f39a17dc66f1317ee26e1b
 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-3.6.0.ebuild 4820 BLAKE2B b3a98bb98922bd4f02b58e599e836e083ba156493f566ad37cb618d9a998fcfb96c3ed2246c38507ede4db4fcd98a305177b4636371514f1a06e95b96c157291 SHA512 683e621a440a3a7e99dde21bfd9897bf8e35a49dc2cc236a5612f8d45a2d20bf702019ca79146355c7dad1b6a10e5925e0eb25bfff584d27c981465606e902f5
-EBUILD buildbot-worker-9999.ebuild 4723 BLAKE2B dca9bafeed289948c0b026f3511fac8ae7b5b774c059a4d6bf429fb6753a4a6c0a1ec0e5e5ce39b72df073b597cfbeaa43f29191a096280418fd006f1d2c2b27 SHA512 1fbc0a4f0ce37baa439d2ca8824cc46b715b9308b3fd75d3843cbe30fc55760c9fc68dc96a85db9e9d1c48cf5327af9add53f66068f83cc8960bc9244cf7651f
+EBUILD buildbot-worker-3.6.1.ebuild 5280 BLAKE2B 58804ec7aacc6bd6ceb9930c714db5217137cf589df63bc850a9020645e80d137d7e2f1910df5eb174605fc9c561b62a358527add9b4e46b66ca9acd3c744443 SHA512 4172fd249064256bf9d5d06e33f72192d4a090bab89da689c9817923922b91704297140b1ee491e00a3236bcc56ff93aad11aa8e48eb0df9350e21b5c2e78b69
+EBUILD buildbot-worker-9999.ebuild 4937 BLAKE2B a98951fdbe07f022192a007be96cea17828a931ff4ff1be3326a95ed0c34bcda55949109627ed3a54f371ff08efbe02324a9e4aea7e35d23462fcd706de0c628 SHA512 5826a317217af4825f9fc59e57fb851767245a600947742dee28a3c2ec280f3936ac0b4a4f4757434ed16164ac6e3a461775f1a86bba00c477fb3fc7d4684ccc
 MISC metadata.xml 481 BLAKE2B 884b573e537512f10a184b60b3d354ef70aca1200507c74ad4be79ebd0fc81cabeaafc9db05e23edae6cec47b92340febbcb3345c0227a32f95119d607493cae SHA512 d6f00cc040032613bbbc55fd957a0544266b20e54ae30710f7c32847576a91d329c55692a9fdc74e25827c7b8689eb17770b7935bd91ebd8395237e0e8b200ae
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.6.1.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.6.1.ebuild
new file mode 100644
index 000000000000..e2d1ed832b13
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-3.6.1.ebuild
@@ -0,0 +1,141 @@
+# 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 systemd 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."
+
+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 6fb30ec0ecab..e22995dc22fa 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -44,6 +44,14 @@ 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}"
 }
diff --git a/dev-util/buildbot-worker/files/buildbot_worker.confd2 b/dev-util/buildbot-worker/files/buildbot_worker.confd2
index f14e3210ca99..2ce321f522c4 100644
--- a/dev-util/buildbot-worker/files/buildbot_worker.confd2
+++ b/dev-util/buildbot-worker/files/buildbot_worker.confd2
@@ -10,5 +10,5 @@ TWISTD_OPTS=""
 
 # Optional specific python version to run in
 # (if not the system default version)
-# ie: RUNTIME_PYTHON="/usr/bin/python2.7"
+# ie: RUNTIME_PYTHON="/usr/bin/python3.8"
 RUNTIME_PYTHON=""
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-worker/files/buildbot_worker.target b/dev-util/buildbot-worker/files/buildbot_worker.target
new file mode 100644
index 000000000000..4a2b3e2d52f3
--- /dev/null
+++ b/dev-util/buildbot-worker/files/buildbot_worker.target
@@ -0,0 +1,5 @@
+[Unit]
+Description=Buildbot-Worker target that allows to start or stop all buildbot_worker@*.service instances
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dev-util/buildbot-worker/files/buildbot_worker_at.service b/dev-util/buildbot-worker/files/buildbot_worker_at.service
new file mode 100644
index 000000000000..6b8849920f79
--- /dev/null
+++ b/dev-util/buildbot-worker/files/buildbot_worker_at.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=buildbot-worker daemon
+After=local-fs.target network.target
+PartOf=buildbot_worker.target
+
+[Service]
+Environment=BASEDIR=/var/lib/buildbot_worker
+Type=forking
+User=buildbot
+ExecStart=/usr/bin/buildbot-worker start ${BASEDIR}/%i
+ExecStop=/usr/bin/buildbot-worker stop ${BASEDIR}/%i
+
+[Install]
+WantedBy=buildbot_worker.target
diff --git a/dev-util/buildbot-worker/files/buildbot_worker_at.service.conf b/dev-util/buildbot-worker/files/buildbot_worker_at.service.conf
new file mode 100644
index 000000000000..8d37f9412e7d
--- /dev/null
+++ b/dev-util/buildbot-worker/files/buildbot_worker_at.service.conf
@@ -0,0 +1,5 @@
+# Uncomment the following lines to configure the base directory for all buildmaster instances.
+
+#[Service]
+#Environment=BASEDIR=/var/lib/buildbot_worker
+
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index d3ab357b91bd..5f281102d9c6 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,7 +1,9 @@
 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
+DIST buildbot-wsgi-dashboards-3.6.1.tar.gz 5584 BLAKE2B f0b82de52022c3a8a0d0747aa4ade67345af177be70a8767d66163fe98ceff63e0b297ba547619de874a66e381b721c48d864361fdb82a818f2450c339d687cc SHA512 7ecd4fd71786258deab1fb1d96b4999ef929df4486d09404cb1bc3d1a7f831c90f8253f5bf0474258ba472ac9e8f960f4c4eb1f7993a0a8070eaa68e3bbbb4e9
 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
+EBUILD buildbot-wsgi-dashboards-3.6.1.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.1.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.1.ebuild
new file mode 100644
index 000000000000..b67bfb3e65bf
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.1.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 6a858366f816..7449e78dc8e7 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,7 +1,9 @@
 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
+DIST buildbot-www-3.6.1.tar.gz 3210526 BLAKE2B 6db8be32ee85cab63ad3f92d0e24042ed1ebece3b7be1b67e6f72240f61f3af2c31f1b3b31315db0d7ca18dddab1351eacffb92e762d1f1d68ce414349e52eee SHA512 d2fb3f97412e4a1b21fe7637458dffa8e8e005693ad2275222e908d35551ec64f89a88e696859a09f64b2b5be5fbdb386fbd71324356dbe8c2adc92b1c6b9f01
 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
+EBUILD buildbot-www-3.6.1.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.1.ebuild b/dev-util/buildbot-www/buildbot-www-3.6.1.ebuild
new file mode 100644
index 000000000000..7834a034d6b5
--- /dev/null
+++ b/dev-util/buildbot-www/buildbot-www-3.6.1.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 0c9090e27288..7526a7c97ac7 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,4 +1,4 @@
-AUX buildmaster.confd 362 BLAKE2B 72d36c02b825ab26e8d85348c3dc65800e03c8d9439a4ada658764b5f87e83e07eb89b1b5bedc59466135008135733319d8e4a31657c9f3f0c1713d1649ab820 SHA512 5b3e3cc75187d0b44c8e59cdfb605752db20913b025eadc7e673bc7c9c45b33e1a0d19362c0cc0c023cd32255946d510f172090ada9cbf2978f4807de29e2b72
+AUX buildmaster.confd 362 BLAKE2B 97a880c224ad11c15ef7acffa4ffaf961035d06f08d7f360a4da9838c2bd175f942eed4571aa8555f8d941b5e8d672d7701822e6d8637e3d9605311ee4e97a6c SHA512 d2d24f40aee3d98eab24b642d57cf79e54b5d47e4b6ef90de7e3e17c29b0140585a9e4584277c1c169782afd6257b6f421b0235f3efce7ca88603b099081b359
 AUX buildmaster.initd 1651 BLAKE2B 49012bf396862e28af3abcec1669bac93cfa4a60ae889d9c1584f028afe22508db797260615541267d3d501820e2643b2f03f12409b0d2d1c374e20dcebd6030 SHA512 72ea57072291d1eb49a4d567a7bd4931cf2f2d962e1e885183468b73d4052b1f0f4d454a18320969db84d82c144fe47076646f70a7f141f832123465cbba6016
 AUX buildmaster.target 138 BLAKE2B 7570fc327d2e002803f7d6691740f5885e6b54d3df2522c0439d551d0c01161fcd99779df0bff417dd66e1bacde2956bfa7b39f988f2fe204fb2abdb675adfe9 SHA512 c5f56688349af0adcfa644abc699445e2c61bb268d5407f8fc540ac80ea9be6aee615df16bbf0f41db272dd4159762d7be744b3116efc0f9bc7cb1d458edb050
 AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b6356b43b9e0861b00052e3702593a2e2a4764246dd62e52805ba2f2e62a86d0ae8ec4cbed3df42400dc562f74 SHA512 c37f1c461a4c7ee741a839772a5feabf10103542e159c6ae4eddfa37a146732dfc23f91d867d69c3718a21714516a3847485ae4e6580c93a5aa94daec40dd093
@@ -6,8 +6,10 @@ AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f3
 DIST buildbot-3.4.0.tar.gz 2446868 BLAKE2B a58b268fd4569105f1c0ba48c9ed86210a3fee4725f167d6b6847960bbb56a092d0c0db427ecf5932a91d44065da8843fbb4046d289800a019b0b1d8b1f53fea SHA512 92e5085862ac37a6c3c059870a3998fbaac2019c48384295f3e209788ea14bddff6704f1b987a8f3b1550c1b0255d228f8a0b2a20b5cb760b22a513db465863b
 DIST buildbot-3.5.0.tar.gz 2450653 BLAKE2B 0e923f2a3a334241b25c6a151b397356d7ba81ab2ff19c17c50a5996494d0f99fa198b63aa18a27ab60c5ad53c0154494bf4dea4e2bd306f4b709858a64dc3c4 SHA512 9730305540db3cdf166fdfc071142061926bbb895aa941046ad25e8350d3c161d4175f3518cd8a3ab51f320b0a5980517e5e53d9f5ddc342492ee56a0f6f266f
 DIST buildbot-3.6.0.tar.gz 2458029 BLAKE2B 5f41702d4d61fbcbfa878c6febbb89a38da2648403c4fdcab24bde246adc225e9ac3f72eb7dc893e03763f00c2d3548c31b2d6597904032e4b75e660bb1faf72 SHA512 c0bec931d08adb1eec51114619d2a085fbef224944a4c0acf3ab396f84d846fd620b84379affee238d02dd90ca1294fdb2b7fb8ea6e82d95c4cfeae93a0b5e73
+DIST buildbot-3.6.1.tar.gz 2458176 BLAKE2B 4587ed222e2fae424f3c4f275e67e72bf25b0ce88231a29f931582d82fbe93a846f85b14bdc64740939466ccdc3f15dab3774244aa5c0a293250b52b542014ea SHA512 62a993d1acd8bc5cc916f009909b4b099d9f64007fe790dc219104f248bb21e0ab8f1771c354ef61e6d8ba497451cdef5e7a7de17a87cfd1e941b3b49fbf2206
 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
+EBUILD buildbot-3.6.1.ebuild 6646 BLAKE2B 2f48622efa22f8273b976ef88abf888b770de8c2db6fb91b63e07538b50a1dfdff1eebdc62b4176d723969b9f028c048144ced39c0f2427402242f7bdca72b7b SHA512 b901c20cff21d8f4c3c4785690716672b64fc36cbaa6cda4e706aa35c87ca14c43fb6271290bd2fe2846f1fc565b7b8cdec51d08b786cd329c2bc30848b97313
+EBUILD buildbot-9999.ebuild 6525 BLAKE2B b490dc02be9125945d6b8a81f26d433488e0356aa67270ee43716543274979064ff76ceaf3c5eaaba90492108dc3e859ee8c64bfe3ffe8465aa96d54b4c16986 SHA512 4f13b80b3161cc4e60bf195c5668cc8436af9aa25893834816ad20dc5217b4c031df916c575ed7b4aaf7709c8f53b6b66af2efdba2f9bdb6a3099d5e466df22e
 MISC metadata.xml 1360 BLAKE2B 4f54443c55c18288e1cd887528e94c5c258441cbde1579222f141ccba69b241b7163ee5c65056b9ba89794c543342394cd656b5f6d9f8356af47c4681d60bf4f SHA512 3ba99aead69ebc879d9e8a42ed41f250cfea97bdb21147dcefba40b759f87e682f0f416ab6b915afdd4dbe2c4e41ce99aeee23ea8afa349a131f6f450ef7ea95
diff --git a/dev-util/buildbot/buildbot-3.6.1.ebuild b/dev-util/buildbot/buildbot-3.6.1.ebuild
new file mode 100644
index 000000000000..9ca1baf06d21
--- /dev/null
+++ b/dev-util/buildbot/buildbot-3.6.1.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[${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 b0ebb30b9273..17faf70a4028 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	>=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}]
+	dev-util/buildbot-worker[${PYTHON_USEDEP}]
 	crypt? (
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
 		dev-python/service_identity[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot/files/buildmaster.confd b/dev-util/buildbot/files/buildmaster.confd
index eb3185aef358..9bb2eb0328d9 100644
--- a/dev-util/buildbot/files/buildmaster.confd
+++ b/dev-util/buildbot/files/buildmaster.confd
@@ -11,5 +11,5 @@ TWISTD_OPTS=""
 
 # Optional specific python version to run in
 # (if not the system default version)
-# ie: RUNTIME_PYTHON="/usr/bin/python2.7"
+# ie: RUNTIME_PYTHON="/usr/bin/python3.8"
 RUNTIME_PYTHON=""
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 0600529bea96..badd33abc1da 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,22 +1,11 @@
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
 AUX ccache-4.0-objdump.patch 271 BLAKE2B e641f1acef1e439660753c781d5760ab2a2530ce8dbcfacb1c3835523ec41ff35701536698827f11c39c1e06641fcf6b57d374944ecb44888a66c7860f97b813 SHA512 cc53f44b173c1ae66258aa573182ae936304dac9daf8489a20c45dbe3d554df207bd93b370da2c86b22fbc4edf5fd954f84fd18812d97d41a88ea4c7926f117c
 AUX ccache-4.1-avoid-run-user.patch 823 BLAKE2B de70e7b3f687f099e8b6eafb069d725350bb32c1ca39e42223113a5cbd79d6be7edb0560d6f199b0d43d20f4c99a5a5d888d96b8ec74d678e9793011e2463613 SHA512 2f3351af3ee755ff44802239cddd16e5990edd067d44228707ba2cb96f44faf26ce220b2e9e9994a45baac11a54bf778ba48c27fdd526e59a889638a84cfd5c7
-AUX ccache-4.6-avoid-run-user.patch 940 BLAKE2B 2d8e6f4ddef3ca407b9b2054c52ea5b2b2fa19d0ea8de3c88b632b2f3014d2764c8f36270589d8a2b26917be5a59e22107b2bbd75af7938d9d181f303ab1a1fc SHA512 b2c4643f94c6da34641b92b523879d05d0b1d07b2d01d49d3c8f13a8cd208b253eb91b6f1d916ab959c347e67101a3a18a0ef343c754614893999f6781b60ef5
-AUX ccache-4.6.1-avoid-run-user.patch 974 BLAKE2B d2f65369f9a482d2b208ba936a6f069e1efe5d06ef85cec16d9ff37897b2fd3e5d24844685b29f972eded93f966922b08979c20aae72dbeb69472ae1047cc11f SHA512 4ae16226d09259acd630071df5b33aaba9d4ba96b42d69a857603ad23bfad5dae707ad292cb416c94b65e7b3f46df52fe9b2ee216b4582bd8a7c5c8fe3c0f508
 AUX ccache-4.6.2-avoid-run-user.patch 1042 BLAKE2B 192a0c0fa957b8c1e9c12984a898953f84b2ff14b38206e92cf33e6f80d5c25cf4800add72a3e1d38ff0d6a6c22d071bc7e46ca324662e478f2ec75df632f1f2 SHA512 2d2269021e5eab22d144e81318e620ef0191a34e2de15ff78e2019ac13fddc277802df1387b4aa673649662244c0c2c8c76003af7247f00287dafa6c460aa18f
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498 SHA512 267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
-DIST ccache-4.6.1.tar.xz 529040 BLAKE2B b4c1cae8b0c836c9e562488c79524ddbba4c995946e16f87c9b856e32961b454dd205bacdb030c283477be66d357b0fb5e67c9ad38715359b73f714aa73baee9 SHA512 361427ccecd74e8c25ca6a98ef3d3c125d81862196767eb383f6f8159fed8e1695cd5bc8731cb591c23c55352f0114a088b32a673717711efbfbb178a6c08c82
-DIST ccache-4.6.1.tar.xz.asc 833 BLAKE2B 2f9ca555a014cfc9dbc354f43d4db0d79f89a6f84c57a7b9452324854abb39cd21af1071404278c694212f38c3975c7fa702f7cc475e44f75e9b132e53088d5d SHA512 5494844f99232c5bc21f52db461f2a03d706e38bd73e147ebda89a4ce57fc2b80a920e42f7de539b9a5837ac8b515b309a29e045e479910c95a95d3c839b837d
-DIST ccache-4.6.2.tar.xz 530952 BLAKE2B ef0fec6438ea69b109e918decb5e4a768ae0a5350e124b18cf700af7d307ed7a46509d02a9499aee87ed76a8fe5b9e4523ffec1fcc37b9b0a5ad56e5e713f8b8 SHA512 324c09c7cc76425552fd88e7483527c20ae977c817de1f0dff8a0102ae98f1c35d5e08c8a49c83ad76f6564ea912d9a500948051baa028139074913a6e07e452
-DIST ccache-4.6.2.tar.xz.asc 833 BLAKE2B dc4103d15808f044e47e27967df0b3ac063e40c4a40175958c99cf2609549657f4eec761f7d1103d8995ed7a86ad844cadd411fc4a4928901d78191f2dbe291b SHA512 66f42af7fb43ce1e701adaf911829d6690388e69249e6d97e0f51c31510f4198c22a7fdf68489f7b59fa07d311b2391be02d0a6702e8d890401318e4bfafd900
 DIST ccache-4.6.3.tar.xz 531184 BLAKE2B b23c22876cd3f31bcd67b9120fd5e605441508478f40267d654a281c00e28e3021b135cda04ace6da9fb39d3c144c92a259e69287be73043730240f32982b6a9 SHA512 b8cee0a466e76d5551c9785836c66ac5a98b51624e9f919adf820265ec19c3429c99ed332aecdafcd03cf32c71074121c63ec56762259921c3762a011be24966
 DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e SHA512 ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89
-DIST ccache-4.6.tar.xz 526084 BLAKE2B 2e43d0a3a004117e8c535ecb2f09c1273f5bec2b3704710abbc3034749438df33ef27db37d5bfbd48d83d60bdd3f738d3dbf356eff21166fee03780969dd1f24 SHA512 3a53fedfa91034ee876e1a4a672de25498fe53c6c80901bd4976049eb35e0479275ceb6627f0e8cf76d677d041d216f731daf4bad142e454e775b5e7f05e3e4e
-DIST ccache-4.6.tar.xz.asc 833 BLAKE2B e0fc7677087006e3c6ac2bb7285915a56f233b4058c738c9d5967d29baf62b1b072ad2da4bf12f076440c68f39be77333d001d68703c32e26bd88a42b9e3ce71 SHA512 af09ffcdbba5e1e26047c7692dd0cf61f07869720d5849f59cbc0fe0f61c11aa419226d4d05061d23b5a03e8ec995e4d0e5af398af096bd19dbe35bf460eee0c
 EBUILD ccache-4.5.1.ebuild 2295 BLAKE2B 8b89808a850d5bb512a9672d719a800c9f17fd23dddc3bb5b1c0626b4160910bead0ca27137d734340ca9a60783349b97730376d5cb35473698b843203758d7c SHA512 96c0b4dbe479a0383fb28fda5f262e4490625e0ba137e5435ba8ee9702d14fe68c42a04a462792ff96aa176e3676a819602e2e50cb989d5061842c188d8fc5ba
-EBUILD ccache-4.6-r1.ebuild 2581 BLAKE2B 76559b8e1f17ecadc22c35224e1c813d3d5b25d5faf13065c67bf0324a3f84dd5710afad9c9b35f6931ee6d1319a549c112b20622eaf0605ebd11e9ff7136805 SHA512 57f833c8073f7c05da3527db3f0d5cf036de72fb196407c4f19bdbc315b57817bb3b13af6d63c001a84d260bcedfd9438a86234b0a557b1fe304a685ad671a57
-EBUILD ccache-4.6.1.ebuild 2583 BLAKE2B 75ccd4e760f1cb6a6c8bfa25483de39f34de227fa7fd7c2ea1d3924e778262b1c70120836c47daf8b68fc1a46a8b55782827d549cccbbc35dd2c1bd832400138 SHA512 a774cdb3c65262bf298107484f9d9bf0caddf7164596247563056bb9dcb68450aa6406b5537b54e016edfd9b5b17e43e62407d6439bf5bc6df9a0bb34bfd228d
-EBUILD ccache-4.6.2.ebuild 2583 BLAKE2B becd6116917e1e64e1b6d7168cf99af6503196a0d414735f926b72b66757fc649e0f68df851d39eb7733deeb0b339dadea320b2a33fa3976fb1c180a5aa14c5a SHA512 b917373e3f5bf306aad19dba9df0200bf0a20b2a15a16ca91d87fdef05adcc16eb7f87999884bd83751ba3bc9f98c883cb0f0627f28fa740d0403eb7fc915c7c
 EBUILD ccache-4.6.3.ebuild 2583 BLAKE2B becd6116917e1e64e1b6d7168cf99af6503196a0d414735f926b72b66757fc649e0f68df851d39eb7733deeb0b339dadea320b2a33fa3976fb1c180a5aa14c5a SHA512 b917373e3f5bf306aad19dba9df0200bf0a20b2a15a16ca91d87fdef05adcc16eb7f87999884bd83751ba3bc9f98c883cb0f0627f28fa740d0403eb7fc915c7c
 MISC metadata.xml 710 BLAKE2B 0a93cf3dd4222eb2fd500c3cafdff3c01eacecc489a471270922fc5dd1daf58cd1398ddfb7ab4d271a6e84d5a3da5c3e7a341b1e7994af7b10fd432318de7c5e SHA512 dbfa6b8d8f435e25887b25ce25df65184a7f315986ee60a1c723d0e6592ca73bc7414b6650014812eb882e7e39bed953eaa21139a414043c50c018a7b780e6f1
diff --git a/dev-util/ccache/ccache-4.6-r1.ebuild b/dev-util/ccache/ccache-4.6-r1.ebuild
deleted file mode 100644
index 046476bcf614..000000000000
--- a/dev-util/ccache/ccache-4.6-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/"
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="doc redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="app-arch/zstd:=
-	redis? ( dev-libs/hiredis:= )"
-RDEPEND="${DEPEND}
-	dev-util/shadowman
-	sys-apps/gentoo-functions"
-# Needed for eselect calls in pkg_*
-IDEPEND="dev-util/shadowman"
-
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+=" test? ( dev-libs/elfutils )"
-BDEPEND=" doc? ( dev-ruby/asciidoctor )
-	verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-	"${FILESDIR}"/${PN}-4.0-objdump.patch
-	"${FILESDIR}"/${PN}-4.6-avoid-run-user.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_configure() {
-	# Mainly used in tests
-	tc-export CC OBJDUMP
-
-	# Avoid dependency on libstdc++.so. Useful for cases when
-	# we would like to use ccache to build older gcc which injects
-	# into ccache locally built (possibly outdated) libstdc++
-	# See bug #761220 for examples.
-	#
-	# Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
-	use static-c++ && append-ldflags -static-libstdc++
-
-	local mycmakeargs=(
-		-DENABLE_DOCUMENTATION=$(usex doc)
-		-DENABLE_TESTING=$(usex test)
-		-DZSTD_FROM_INTERNET=OFF
-		-DREDIS_STORAGE_BACKEND=$(usex redis)
-	)
-
-	use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	dobin ccache-config
-	insinto /usr/share/shadowman/tools
-	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
-		eselect compiler-shadow remove ccache
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} ]] ; then
-		eselect compiler-shadow update ccache
-	fi
-}
diff --git a/dev-util/ccache/ccache-4.6.1.ebuild b/dev-util/ccache/ccache-4.6.1.ebuild
deleted file mode 100644
index 95ae40faf2de..000000000000
--- a/dev-util/ccache/ccache-4.6.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/"
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="doc redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="app-arch/zstd:=
-	redis? ( dev-libs/hiredis:= )"
-RDEPEND="${DEPEND}
-	dev-util/shadowman
-	sys-apps/gentoo-functions"
-# Needed for eselect calls in pkg_*
-IDEPEND="dev-util/shadowman"
-
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+=" test? ( dev-libs/elfutils )"
-BDEPEND=" doc? ( dev-ruby/asciidoctor )
-	verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-	"${FILESDIR}"/${PN}-4.0-objdump.patch
-	"${FILESDIR}"/${PN}-4.6.1-avoid-run-user.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_configure() {
-	# Mainly used in tests
-	tc-export CC OBJDUMP
-
-	# Avoid dependency on libstdc++.so. Useful for cases when
-	# we would like to use ccache to build older gcc which injects
-	# into ccache locally built (possibly outdated) libstdc++
-	# See bug #761220 for examples.
-	#
-	# Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
-	use static-c++ && append-ldflags -static-libstdc++
-
-	local mycmakeargs=(
-		-DENABLE_DOCUMENTATION=$(usex doc)
-		-DENABLE_TESTING=$(usex test)
-		-DZSTD_FROM_INTERNET=OFF
-		-DREDIS_STORAGE_BACKEND=$(usex redis)
-	)
-
-	use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	dobin ccache-config
-	insinto /usr/share/shadowman/tools
-	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
-		eselect compiler-shadow remove ccache
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} ]] ; then
-		eselect compiler-shadow update ccache
-	fi
-}
diff --git a/dev-util/ccache/ccache-4.6.2.ebuild b/dev-util/ccache/ccache-4.6.2.ebuild
deleted file mode 100644
index e6fd6165c15d..000000000000
--- a/dev-util/ccache/ccache-4.6.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/"
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="doc redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="app-arch/zstd:=
-	redis? ( dev-libs/hiredis:= )"
-RDEPEND="${DEPEND}
-	dev-util/shadowman
-	sys-apps/gentoo-functions"
-# Needed for eselect calls in pkg_*
-IDEPEND="dev-util/shadowman"
-
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+=" test? ( dev-libs/elfutils )"
-BDEPEND=" doc? ( dev-ruby/asciidoctor )
-	verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-	"${FILESDIR}"/${PN}-4.0-objdump.patch
-	"${FILESDIR}"/${PN}-4.6.2-avoid-run-user.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_configure() {
-	# Mainly used in tests
-	tc-export CC OBJDUMP
-
-	# Avoid dependency on libstdc++.so. Useful for cases when
-	# we would like to use ccache to build older gcc which injects
-	# into ccache locally built (possibly outdated) libstdc++
-	# See bug #761220 for examples.
-	#
-	# Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
-	use static-c++ && append-ldflags -static-libstdc++
-
-	local mycmakeargs=(
-		-DENABLE_DOCUMENTATION=$(usex doc)
-		-DENABLE_TESTING=$(usex test)
-		-DZSTD_FROM_INTERNET=OFF
-		-DREDIS_STORAGE_BACKEND=$(usex redis)
-	)
-
-	use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	dobin ccache-config
-	insinto /usr/share/shadowman/tools
-	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
-		eselect compiler-shadow remove ccache
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} ]] ; then
-		eselect compiler-shadow update ccache
-	fi
-}
diff --git a/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch
deleted file mode 100644
index cfdd09f79e66..000000000000
--- a/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Gentoo's sandbox does not whitelist this path by default yet.
-
-(4.1 update:
-https://github.com/ccache/ccache/issues/984
-https://github.com/ccache/ccache/issues/1044
-https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1
-https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68
-... gets us closer, but not there yet.)
-
-https://bugs.gentoo.org/837362 for 4.6 issue.
---- a/src/Config.cpp
-+++ b/src/Config.cpp
-@@ -1031,14 +1031,5 @@ Config::check_key_tables_consistency()
- std::string
- Config::default_temporary_dir(const std::string& cache_dir)
- {
--  static const std::string run_user_tmp_dir = [] {
--#ifdef HAVE_GETEUID
--    auto dir = FMT("/run/user/{}/ccache-tmp", geteuid());
--    if (Util::create_dir(dir)) {
--      return dir;
--    }
--#endif
--    return std::string();
--  }();
--  return !run_user_tmp_dir.empty() ? run_user_tmp_dir : cache_dir + "/tmp";
-+  return cache_dir + "/tmp";
- }
diff --git a/dev-util/ccache/files/ccache-4.6.1-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.6.1-avoid-run-user.patch
deleted file mode 100644
index 9dce69c63518..000000000000
--- a/dev-util/ccache/files/ccache-4.6.1-avoid-run-user.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Gentoo's sandbox does not whitelist this path by default yet.
-
-(4.1 update:
-https://github.com/ccache/ccache/issues/984
-https://github.com/ccache/ccache/issues/1044
-https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1
-https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68
-... gets us closer, but not there yet.)
-
-https://bugs.gentoo.org/837362 for 4.6 issue.
---- a/src/Config.cpp
-+++ b/src/Config.cpp
-@@ -1039,14 +1039,5 @@ Config::check_key_tables_consistency()
- std::string
- Config::default_temporary_dir(const std::string& cache_dir)
- {
--  static const std::string run_user_tmp_dir = [] {
--#ifdef HAVE_GETEUID
--    auto dir = FMT("/run/user/{}/ccache-tmp", geteuid());
--    if (Util::create_dir(dir) && access(dir.c_str(), W_OK) == 0) {
--      return dir;
--    }
--#endif
--    return std::string();
--  }();
--  return !run_user_tmp_dir.empty() ? run_user_tmp_dir : cache_dir + "/tmp";
-+  return cache_dir + "/tmp";
- }
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index f2d6eeb5ee81..3c514d056bf1 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -11,16 +11,11 @@ AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b54345
 DIST cmake-3.23.3-SHA-256.txt 1452 BLAKE2B aa2e2dfb2757210688a5a9131ca1fffdf6617a52219d373fd908c08e52b7d77f0e980086561a083cabaf8d9f3e24b15064bb74ad2737fcbfe11c8aba5814eb4e SHA512 22808c050e8927867fc5d2daa6999d9eed53e99015f89d1f5bef61397d1b2a9888728e86fdca8716c47f8133e02b3fa726d0cc97c0bb4ab5f5ff16a1fc0ae82f
 DIST cmake-3.23.3-SHA-256.txt.asc 833 BLAKE2B 10f61d7cfaa5c86d0e372f33d9ba0dbe7ae9cbfe17669107167b3ae72d0e337c63fb1c27a528dcda804323a1f0d4843b630e15427c33e0f5d5c568e27cea769d SHA512 75ff4b25fdd71bc05a7d6fec3c72ec5b8d6ed7ac980d533e6c820855c74a1a58f52d53c1a454dffe1a15568445c4c1c805891997e5709567c9e7709ba1c5e4d9
 DIST cmake-3.23.3.tar.gz 9988050 BLAKE2B 55105ce380e5e9f1839fc38cc0eaefe505d58bffa60feab9813a36c7cac92f4fb6aa6b6aaad899f1e8d58cfa5ececb9e7335a470244ccc06848d833b1eddf224 SHA512 75f86abe60ef28ba9bd06546c0c24578921621fb4be942171e629366a759cf1469e430945addc85f8ce977920883c063ed26de1b78fd24dfd98d0eb604800632
-DIST cmake-3.24.1-SHA-256.txt 1646 BLAKE2B 0b72b78803e6b6e8055f68895203bcf8e4dfd0fdac43113bcece89d022ae38428c8363e12182f23954ae529a3e98d64c16770ad53f597a6d4100a72053ce10f5 SHA512 6302a8f3370f94415af6a2a1852b15f56fb58a67f895b3d99c6f2a084dd99437a94cf48bccdebed5b96e20aa9f52daff87e1037f1c62aff21b7a138f051375cc
-DIST cmake-3.24.1-SHA-256.txt.asc 833 BLAKE2B 2e77922c732e654b40a40043b85ec4794886107cc09765d0a80ea05efad08711046bafd5ae341fb16904129cc7af75e6f4d2d1103e767a9147cca6a6a975b1fd SHA512 b04a73cc483d51d5eafab7153b53e366220db2bad4b1d78fea9aec82e667434b8a27ae522be96b5f6a38e43c84aa3475f86c55c088a6149b03ec98c682b3cc4a
-DIST cmake-3.24.1-docs.tar.xz 491808 BLAKE2B 5bafdcb5b705581fbb63e9733d37ca10b8fa1803ea471afb723e26421989cb3b204952640438db11425e3bb536267bbb3e0bb6e618bee2cd4662517201aa1196 SHA512 8181dd4cbf066d42af620ee265cbd6eac0d2edf744706ec63909ac819458c1dd3f118129f54255e1f27a61af6a0ae4d72a2dc066ca5fd3e747962b9a8b3f9bee
-DIST cmake-3.24.1.tar.gz 10392868 BLAKE2B 628e2610c01af8e03eb7a201ae56a6e909c63314a993d2066f363d6181cfd2d0a0e5c09e9f74ad5ae3d226e15c2b04be250dc9bf1a273158fa3073bcc05c3a8e SHA512 67bfafcf9ceba617d7ebbb0ac88b689a2d90ab51fea4a83bd073ee082fb55de8962ce7fb283f3db5f455d286f2199843ffa595a1de207d4fa3e4472d951eb289
 DIST cmake-3.24.2-SHA-256.txt 1646 BLAKE2B 3c48226c96844c5ddd8567637a61eca697425021735d5dc8613a1fd7a68887f6707b6030c1e4476af5e4bdb4830cc4ff3d8708f4bdf557ba94508086e0447030 SHA512 f7500d8c9a500c9ad2679a68d6343cbbbae1483014ab2cd48a056e1e9591b6edd0d712e9ff5441e19c05284696e6c52ebdc3cf1efc61432f2764da7703816b49
 DIST cmake-3.24.2-SHA-256.txt.asc 833 BLAKE2B fe6a3caa3db7b6be186e49ee5d86706f2cda9a45858bc964be5407f577195d0af74c10e66ea30faa0a35280f1c9f927732f9cc7fcb9dae8e521882955b6ef617 SHA512 a0fa1a002f2f23e8b3b8fb2689905ac618ca423b96f904bee172d6a62e6fb0c0a46394ce57474be9c9810e1d09abf3b192f595cb0e92d5c62d11b60f0c572b82
 DIST cmake-3.24.2-docs.tar.xz 492188 BLAKE2B 64e0d69ce8e739e6622b0cfde8956cb2bf67f9bf412b8d98afa1657bd30d8a2a1cf874e6422c78c222199616aac85d472ef398c83da29d5d64516384e9ed69aa SHA512 d0ef81dfe37ac2a225fe795fd3e6780e3b8fd5caa472a14ff8d036917172efd13126897c7a2a78d8269aa20e4f35c7b9be7bed14ecbfb24df332c332a4ff16c4
 DIST cmake-3.24.2.tar.gz 10396126 BLAKE2B fcfdbbce94ce6cdb3fa478afe591bc63ba25104a32edc3dd9395d7b6bd16e222f41428ef4f9982061d6d1e69b10efbc2a33cc9df4573400612b4b756b80ec348 SHA512 6f0e8e29bf0336f555ba72c4d83f35d820f8a5159cc999d48795dc57a6627b4ee3966dda84ca97d39906e35dd476ea00cf80023672cc0fad862e2996194c0674
 EBUILD cmake-3.23.3.ebuild 7786 BLAKE2B 5157538dc24bf0f62f89c532d5cefa4725687e875780d10da41ac4c0f7c52e5f9008b8428c40da4a01ca1babc61a6fdde8656572dba67acff515e1477a789c7b SHA512 bad1b24104f29b4997800b775989a82bd5d4d7e3f26382a595f16021b98cd096ac345b4cbe5d67b7a243157d3c1dd0301594673192e06ce02579abd16827a3a2
-EBUILD cmake-3.24.1.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
 EBUILD cmake-3.24.2.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
 EBUILD cmake-9999.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
 MISC metadata.xml 456 BLAKE2B 2dc475cae4d2f65744e25381b1e4fe8b6399225380d0f9fa81870813221d180b1c4b538c3f9249f80e921a1db8afab7071db206898fdec294372811dc456d1f5 SHA512 347c1e13f459dfb9bec9d52ce556526eb74e6c432ff28aed28f05dc17bba17934fff1ce2fc27765b390bb55aaa7b02d0800939eb4382eba6c4b85a62ec136f5a
diff --git a/dev-util/cmake/cmake-3.24.1.ebuild b/dev-util/cmake/cmake-3.24.1.ebuild
deleted file mode 100644
index 9491df325a39..000000000000
--- a/dev-util/cmake/cmake-3.24.1.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${CMAKE_DOCS_PREBUILT:=1}
-
-CMAKE_DOCS_PREBUILT_DEV=sam
-CMAKE_DOCS_VERSION=$(ver_cut 1-3)
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# See bug #784815
-CMAKE_DOCS_USEFLAG="+doc"
-
-# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
-# ... but seems fine as of 3.22.3?
-# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-if [[ ${PV} == 9999 ]] ; then
-	CMAKE_DOCS_PREBUILT=0
-
-	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
-	inherit git-r3
-else
-	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-	if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
-		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
-	fi
-
-	if [[ ${PV} != *_rc* ]] ; then
-		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
-		inherit verify-sig
-
-		SRC_URI+=" verify-sig? (
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
-		)"
-
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
-	fi
-fi
-
-[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="CMake"
-SLOT="0"
-IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/libarchive-3.3.3:=
-	app-crypt/rhash
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/jsoncpp-1.9.2-r2:0=
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND+="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-	test? ( app-arch/libarchive[zstd] )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# Prefix
-	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-	# Handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-	# Next patch needs to be reworked
-	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# Respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in bootstrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then
-		default
-	else
-		cd "${DISTDIR}" || die
-
-		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
-		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
-		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
-
-		cd "${WORKDIR}" || die
-
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Disable Xcode hooks, bug #652134
-		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
-			Source/CMakeLists.txt || die
-		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
-			-e '/cmGlobalXCodeGenerator.h/d' \
-			Source/cmake.cxx || die
-
-		# Disable isysroot usage with GCC, we've properly instructed
-		# where things are via GCC configuration and ldwrapper
-		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-			Modules/Platform/Apple-GNU-*.cmake || die
-		# Disable isysroot usage with clang as well
-		sed -i -e '/_SYSROOT_FLAG/d' \
-			Modules/Platform/Apple-Clang.cmake || die
-		# Don't set a POSIX standard, system headers don't like that, #757426
-		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmLoadCommandCommand.cxx \
-			Source/cmStandardLexer.h \
-			Source/cmSystemTools.cxx \
-			Source/cmTimestamp.cxx
-		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmStandardLexer.h
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
-	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	# ODR warnings, bug #858335
-	# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
-	filter-lto
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-	)
-	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	# Fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    TestUpload, which requires network access
-	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
-	local myctestargs=(
-		--output-on-failure
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
-	)
-
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# If USE=doc, there'll be newly generated docs which we install instead.
-	if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
-		doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index b8f2466d2131..f6ba343e4ecf 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,8 +1,6 @@
-DIST ctags-20190331.tar.gz 1537104 BLAKE2B 354ddf48cdc9421e70d9d37ec7251e51f7f78564dc4f6236d12e2e18519369c39c22585830fd301b7eff4898d550b824776541198b8c4a31425711776b14fde4 SHA512 414faef7628ecaa66fcd5f172781a32194e1d58637dded1f7e55c138239ad777796bb1510bd447af3ad8243b7178e6f4859139305b0c0efe298182408f34524c
 DIST ctags-20211017.0.tar.gz 2542128 BLAKE2B cade7149cb2fd0645f9b7ecd37c8b9acdeae7037fde2bb74aa94d67f04963327429b83dcf5cd658f082bd8ce4c407f69f4924da5f768bec029b4075997bbd882 SHA512 85bfb4d40c1d9045b4ba4dc280ee7108ee2fd4572c92794d5bdc854f3511dad1ecf282428e61161773f7bfaca725d774593a0e83fc767a1bb2e12b229a19bec0
 DIST ctags-20220828.0.tar.gz 2952276 BLAKE2B 2ec3a01646cfb89446604af65387bb5cbf17188177505000f5803a9a535f59799961e8144d3ab36b23114fc093cb487589f52e7186b60041ff3bf2a439f77dab SHA512 4c1289dab24edded85c7ae31c06b0cad5b8f08f7f709a0bdacdf5f9d8ccf722c820d6fef6d46298bb06c48256e80f594dbf2456b91d1c50b3509ce4d3fe3ae9c
-EBUILD ctags-20190331-r1.ebuild 1797 BLAKE2B c7ec6c31a22292ba12294a35749d31b8f36b9ca125a88e1f39db750d2a943c416ff2c7aa675f03d260b0d772c1d9970d5442baa49d390d761d1610af4a9a3d50 SHA512 b6aa285fa71b532584b992bd420b82e3b0bc707691964848b905bcdfba8688544cf8177644ba38a0317bd629d49f80b5bead255b74518c9790f48bac706a6373
 EBUILD ctags-20211017.0.ebuild 1982 BLAKE2B a5b8197924b1f44f349af5a768911ad7ae95e3d08867d7ae724079e78ce5230def73d96465cc27b243bd4d8706e3360b95fca8b9b93b9556028a44b662efb7a0 SHA512 b6e4d30ce386f27cbe42a6a12c60cea65eaf419582456ad5c2b8f955e6d2ced442bd784c80c1fc6b69ee6a14f63c87a2443a0c0c078261ae8d738df394acc53f
-EBUILD ctags-20220828.0.ebuild 2230 BLAKE2B 431d2a4b061d952456105ad19e02cc869cc2d0a3022541a2eeb38919cf91a0790efaa74d1656422f493f4b837f7f7bb1829094c5d0ec1775bb5691c37b1b863e SHA512 4ac94523968a500e47dd93a6d2fca36f60e924e726eea0552abbeb9468c9556a13ff809db9e0997b5cca097c5fb0ffd62a4e27a1f7d20605449ca937547c60af
-EBUILD ctags-99999999.ebuild 2230 BLAKE2B 431d2a4b061d952456105ad19e02cc869cc2d0a3022541a2eeb38919cf91a0790efaa74d1656422f493f4b837f7f7bb1829094c5d0ec1775bb5691c37b1b863e SHA512 4ac94523968a500e47dd93a6d2fca36f60e924e726eea0552abbeb9468c9556a13ff809db9e0997b5cca097c5fb0ffd62a4e27a1f7d20605449ca937547c60af
+EBUILD ctags-20220828.0-r1.ebuild 2298 BLAKE2B 81c99c813eec4274283bfdb249c5fc22b9731c7cb4f496d9d2241499fafd8f202b91a3920d167dbd40b89ffa381afb29f3a3b6bce937c0df6686758414a0af94 SHA512 aa078f3dda89455f94cc648a6d959fd93bc7ec4cbb05dc6ac489ff18e106b154b3871787882921de62fdf1d36c6dac3680ce7a7a66a7ad34090822df69de79d4
+EBUILD ctags-99999999.ebuild 2298 BLAKE2B 81c99c813eec4274283bfdb249c5fc22b9731c7cb4f496d9d2241499fafd8f202b91a3920d167dbd40b89ffa381afb29f3a3b6bce937c0df6686758414a0af94 SHA512 aa078f3dda89455f94cc648a6d959fd93bc7ec4cbb05dc6ac489ff18e106b154b3871787882921de62fdf1d36c6dac3680ce7a7a66a7ad34090822df69de79d4
 MISC metadata.xml 584 BLAKE2B 13de5ebe8bea2b413552eb85af3d3a42c453ad8d7f808b21a5b016bbd3e7890ceabdb924e817c4d841ed2862b7f9dcecad03f7f22c7b738db1c4f88d784fc80d SHA512 c4930de987c3d846c4761d66a191ae2b2800b32234f63ebafee140920faa408cec1b22032c72da01ade807a4187f482bedad3e22058fdffc0af56aabd1deea8f
diff --git a/dev-util/ctags/ctags-20190331-r1.ebuild b/dev-util/ctags/ctags-20190331-r1.ebuild
deleted file mode 100644
index 7eb5ec5879da..000000000000
--- a/dev-util/ctags/ctags-20190331-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-COMMITHASH="95975bd157cc1326120977ce530f0477bcbf43b1"
-
-DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
-HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
-SRC_URI="https://github.com/universal-ctags/ctags/archive/${COMMITHASH}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="json xml yaml"
-
-CDEPEND="
-	json? ( dev-libs/jansson:= )
-	xml? ( dev-libs/libxml2:2 )
-	yaml? ( dev-libs/libyaml )"
-
-RDEPEND="
-	${CDEPEND}
-	app-eselect/eselect-ctags"
-
-DEPEND="
-	${CDEPEND}
-	dev-python/docutils
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${COMMITHASH}"
-
-src_prepare() {
-	default
-	./misc/dist-test-cases > makefiles/test-cases.mak || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable json) \
-		$(use_enable xml) \
-		$(use_enable yaml) \
-		--disable-readlib \
-		--disable-etags \
-		--enable-tmpdir="${EPREFIX}"/tmp
-}
-
-src_install() {
-	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
-
-	# namepace collision with X/Emacs-provided /usr/bin/ctags -- we
-	# rename ctags to exuberant-ctags (Mandrake does this also).
-	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
-	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
-}
-
-pkg_postinst() {
-	eselect ctags update
-
-	if [[ -z "$REPLACING_VERSIONS" ]]; then
-		elog "You can set the version to be started by /usr/bin/ctags through"
-		elog "the ctags eselect module. \"man ctags.eselect\" for details."
-	fi
-}
-
-pkg_postrm() {
-	eselect ctags update
-}
diff --git a/dev-util/ctags/ctags-20220828.0.ebuild b/dev-util/ctags/ctags-20220828.0-r1.ebuild
index ceadc8424f8a..22b038adf5a8 100644
--- a/dev-util/ctags/ctags-20220828.0.ebuild
+++ b/dev-util/ctags/ctags-20220828.0-r1.ebuild
@@ -21,12 +21,13 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="json pcre test xml yaml"
+IUSE="json pcre seccomp test xml yaml"
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	json? ( dev-libs/jansson:= )
 	pcre? ( dev-libs/libpcre2 )
+	seccomp? ( sys-libs/libseccomp )
 	xml? ( dev-libs/libxml2:2 )
 	yaml? ( dev-libs/libyaml )
 "
@@ -57,6 +58,7 @@ src_configure() {
 	econf \
 		$(use_enable json) \
 		$(use_enable pcre pcre2) \
+		$(use_enable seccomp) \
 		$(use_enable xml) \
 		$(use_enable yaml) \
 		--disable-etags \
diff --git a/dev-util/ctags/ctags-99999999.ebuild b/dev-util/ctags/ctags-99999999.ebuild
index ceadc8424f8a..22b038adf5a8 100644
--- a/dev-util/ctags/ctags-99999999.ebuild
+++ b/dev-util/ctags/ctags-99999999.ebuild
@@ -21,12 +21,13 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="json pcre test xml yaml"
+IUSE="json pcre seccomp test xml yaml"
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	json? ( dev-libs/jansson:= )
 	pcre? ( dev-libs/libpcre2 )
+	seccomp? ( sys-libs/libseccomp )
 	xml? ( dev-libs/libxml2:2 )
 	yaml? ( dev-libs/libyaml )
 "
@@ -57,6 +58,7 @@ src_configure() {
 	econf \
 		$(use_enable json) \
 		$(use_enable pcre pcre2) \
+		$(use_enable seccomp) \
 		$(use_enable xml) \
 		$(use_enable yaml) \
 		--disable-etags \
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index 8fbf153b4d60..aa633281596a 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -3,7 +3,6 @@ DIST pkgdev-0.2.1-docs.tar.xz 4156 BLAKE2B d0cae24586dd24d03ae0378205ebf164957a1
 DIST pkgdev-0.2.1.tar.gz 66455 BLAKE2B 6f89b1601813adcb1263a044a096d187d7fa926f116a09dc2b1cec083f8d82da54ae00577c36d64ece5733d8952f8dc5f4dff94aeb695e851f340a30f04b203e SHA512 8277f74f3d9902da295c5436a46302627bdc1cb2a63f29b0603bf9bfa2c8bb812b26f12a54630cbbcba1e2bbac7352146f6ab59fc04cd8b89b46df1fe7c9f8dd
 DIST pkgdev-0.2.2-docs.tar.xz 5496 BLAKE2B 46df2c14370dbe1312e43e08388aa9a3f13e98c5c74b5762f9562cea1d5f6913fc352bc7a4dcce3aae1c3511e3735bc83946bcd0928e56faad32351e811dfbf0 SHA512 e950fa826036ab3cb6fc3ed4b1b5da533d32739ebdc912e77270f4621d378a31b51758801287fd9552c791fbe0f96019b62499ee06950b20f403260e61276237
 DIST pkgdev-0.2.2.tar.gz 66977 BLAKE2B 50b7c06339438ada28ffc9e8e8ba0c472342cbe447790ec7df7506979a1865ebdcd317071833b05091e3749f78857867729e905c1a971bf04e44137337106abe SHA512 f154c7442c40fb1ef5fe9917079db4ddf5bfda4b4d7ca964b9a11fad2a273e79971455142e99905e2293babf73b45d26974480faf0c5c1b25057afc6d658bdc2
-EBUILD pkgdev-0.2.1-r1.ebuild 1655 BLAKE2B edf95d40cb96f7abc2853578c87ff3e8edfeee86844e2ab942d83d55171706806f64f19cb829458f9a312d73d6e385930ab7f439a363f314ae01684e0bee63c5 SHA512 576098e57216e1639827d25aad586465a9c5fde7391e4c0521474c9e1923371903d30de1b835b5d21fd822c5ef3d6a579f2ff0935d6437e998f095d709f7c225
 EBUILD pkgdev-0.2.1-r2.ebuild 2457 BLAKE2B ef4123dd70d265c518f16470bafead9bcf82feb53770a4ac10ee58250b6f1fee890514c6ff6aea84b53e023794d7bd9555d3f72084b361cb3b1005c30a647a1d SHA512 a6620631f757ed0670e76d4ba58eb22a7c4d5831e457b5fdcb92562a9a7fc7754584c9a80610d7bd3de9508ddb81c7756970f7336f0e7d4c86039c51df441ce0
 EBUILD pkgdev-0.2.1-r3.ebuild 2449 BLAKE2B 9d192516dfe71e733ede5dd18e44af663a99e30f7d642e906efca2972393557b9e0bdb8422d10416585026d0ada388ef2adbed98c7112e3edbf96204ee39401f SHA512 5073e5a7a1a8b6982afc448317e71beb5125e4a2393552061b5e2fee0de0c27a255bea635a696b0cbe780efa6c2cf7bdb723d764edd244cf758f0d2d0639e513
 EBUILD pkgdev-0.2.2.ebuild 2392 BLAKE2B c56f5f559c8a4b4b4726c6f92a764069410af473d07aaa44cea78ead6eaa590fd282859eafe7262fc471cd6f42bc5ba9e261e79e96aeefd0ddc70ace9e9d733d SHA512 73f384ed2b5aee56ed5c24ae0b9ed46dfa10b33807d36e36af3208704a02b056df0c9304c3139332f27b2646f9eb30b2290a3ee7c93a4e5e2bc708a0c7d75759
diff --git a/dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild b/dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild
deleted file mode 100644
index d325a89554c8..000000000000
--- a/dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
-fi
-
-DESCRIPTION="Collection of tools for Gentoo development"
-HOMEPAGE="https://github.com/pkgcore/pkgdev"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]] ; then
-	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
-	"
-else
-	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.10.0[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
-	"
-fi
-
-# Uses pytest but we want to use the setup.py runner to get generated modules
-BDEPEND+="test? ( dev-python/pytest )"
-RDEPEND+="dev-vcs/git"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-signoff-example.patch
-)
-
-distutils_enable_sphinx doc
-distutils_enable_tests setup.py
-
-python_compile_all() {
-	# We'll generate man pages ourselves
-	# Revisit when a release is made
-	# to pregenerate them, making USE=doc
-	# for generating the real HTML docs only.
-	use doc && emake -C doc man
-
-	# HTML pages only
-	sphinx_compile_all
-}
-
-python_install_all() {
-	use doc && doman doc/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/seer/Manifest b/dev-util/seer/Manifest
index 0cdd51ddba8e..6390a6d96abd 100644
--- a/dev-util/seer/Manifest
+++ b/dev-util/seer/Manifest
@@ -1,6 +1,4 @@
 DIST seer-1.10.tar.gz 367629 BLAKE2B e09ed500103428d5aee7138beb2cf8b2dafa167e2c6e3e60d0a5e26be358945af8544a9165dda835b2ec44264da4d16a3a44398000392263d690c6080cad914f SHA512 b691b433e206c78b121a48578ac632f236ca8734f9ee6c5e9c0eb3503ac11ee786595d66ef15c46e7ae5b31a58b444b7631cea2ef67389f0be7e292c7d2279ef
-DIST seer-1.9.tar.gz 337520 BLAKE2B 2c5a68cbc9a0530596501d2c92dfaccfe69f9b7fadc033efcb64b66a60a8f67e6e7bc06173bd5fd844ba104364328d30c017187143b2e1ea957b5a59fb3a7723 SHA512 e23a389d624488db445477687ea2129f8ef7364ea22229be6a79653878a73d328a3a7cde0233c951129dbc7478b0b5e3cfe37b694fe3eece030e37ad6a7ce87d
 EBUILD seer-1.10.ebuild 939 BLAKE2B c2e94cfe86db4f938afa2a1262364f71e8299e9a7df6b0b2250713211acee662072b94d2c3b83ec899b9eb26fb4818cca4d93cce6733bce0784c1a3410c5d857 SHA512 6165033e812c43ed711ca73d9fceb650ee8f5561e88221b3374cbb68715a975cf13664d2cdb0032f1a21bebc5830965bde6f8ee1c84e83a693c278841f0b6741
-EBUILD seer-1.9-r2.ebuild 827 BLAKE2B 223afed689bd5796acd44f12cafd687126d1522250ab67ffcde24ffd34169923dba05d09c90111aced86473263ca59b05c10766d8f6f3face7d06ecd05d72766 SHA512 73501710567735d0bf26f6882f7742025b3f8cb1cf58cae64696c238a5af1d34075ca16f664ae727eb771e6a917fdec725abb9606b15cff80f956f9489287834
 EBUILD seer-9999.ebuild 939 BLAKE2B c2e94cfe86db4f938afa2a1262364f71e8299e9a7df6b0b2250713211acee662072b94d2c3b83ec899b9eb26fb4818cca4d93cce6733bce0784c1a3410c5d857 SHA512 6165033e812c43ed711ca73d9fceb650ee8f5561e88221b3374cbb68715a975cf13664d2cdb0032f1a21bebc5830965bde6f8ee1c84e83a693c278841f0b6741
 MISC metadata.xml 318 BLAKE2B a34dc163a2b5e0fc9db7808eaa083a7b978a5578db14c5f33e870a2b73ec21f056c3b287997e8db4c1951e8d56852df746fccc30cf47ad24fdbae13896329014 SHA512 4c3706be2572cfb702b357753b35deb33199ed701d95b37f005919e374712ee5412a8b9214ea4c3c82e8371457b5571ed9a055b1df963196650a64e8c0d67fbd
diff --git a/dev-util/seer/seer-1.9-r2.ebuild b/dev-util/seer/seer-1.9-r2.ebuild
deleted file mode 100644
index b5ad9e01cc7a..000000000000
--- a/dev-util/seer/seer-1.9-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-DESCRIPTION="A GUI frontend to gdb"
-HOMEPAGE="https://github.com/epasveer/seer"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/epasveer/seer"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/epasveer/seer/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-S="${WORKDIR}"/${P}/src
-
-LICENSE="GPL-3"
-SLOT="0"
-
-DEPEND="
-	dev-qt/qtcharts:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="
-	${DEPEND}
-	sys-devel/gdb
-"
-
-src_install() {
-	cmake_src_install
-
-	domenu resources/seergdb.desktop
-
-	local size
-	for size in 32 64 128 256 512 ; do
-		newicon -s ${size} resources/seergdb_${size}x${size}.png seergdb.png
-	done
-}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index eeb53e3627ae..17cfc8459e8d 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,9 +1,7 @@
 AUX strace-5.11-static.patch 5306 BLAKE2B 24150fcdf0ff75c4698542914bcd0fd39df9794f39ce0d16dac6dc3b689365e124d8d77a75a8fe81caff9432679563d84ffd31add74edb4c8f83aec28ff2f078 SHA512 bbeecbfd73109d21732acdaa28d5b4c82b23b7165f09e78e62cad68f9ac63dfb4c7a1c2eb8bdc642dda9f07d62e286ab46a2be236b5f03e1e6f9920f3093ede8
 DIST strace-5.17.tar.xz 2281220 BLAKE2B 27e7dc19302c58144b0a7d8de41f717760b8e3cde4ab56892045727597bbfc894bf8f137aee476548c2d16d1e9c8005f931f31a5d2f8bfc4ce5565c2aa01f1ec SHA512 1b63cf7e6e339333b9d24fa20232409192abc815f2ebe2e336ef4acc039cd06c976b3c12e9ce993491a0e6b86c26b90ceba962f580e894b1ff5ab9863bdfcc44
-DIST strace-5.18.tar.xz 2307412 BLAKE2B 658d17d2137344550ea3c2ece54708387c3b78020dbade45a7ef04905dc9d4703fa8d44802cca5a9448d096a7210d0178d8d78caab7e504fa998d1f9a0b59c65 SHA512 99418b84a5e2049cb6fe32eed19ddcb61bbefb25220550c67d92cd7bc3d44ae5d87ac228b3e1c207166b9bfdae55c624a0f4e603004599fb7ea3143bbccc749e
 DIST strace-5.19.tar.xz 2353276 BLAKE2B 44b9a87f36e66481d8ac2107efbc389fa64c47b2ae7b1cc728241baa1c7d2d5d4d9410622763eb1247b415cad9afdd9f61552d2545388cadf5a33b568ed09af2 SHA512 1ea1c6e12d05bf145bc3c74f8d06b08dfc3eae3a5a21bfe8ab080053dc4c2da8a95be5956652ea62bb083462015a55f9bc1d1023919dcf2929a05211b7dde963
 EBUILD strace-5.17.ebuild 2448 BLAKE2B 99b2514d006878e750d31ea9711581fb5d1980f3091c7ded5d3ac129054f3793bc22ec00657d95ea4f7ac00bf2f6df76f79ba8bbbfc1ce0dd3fb741fe5d9e104 SHA512 496610adfb263912392935a7fea69f79ac98f0339a91719221b615a4ba1e330b6fe9159663f7e9bdc8e3bb58031a62a5c472bf934630cddc851bed65c5e57633
-EBUILD strace-5.18.ebuild 2447 BLAKE2B 88535b5906a24d4b2ccf26777e4a9fddc382187721598b44a6092e6ca7087601e2895575ba0046bd78c1caeeeface1dc52883b7fb30e266129b40bb5ea19b8df SHA512 c29e74848ff20d686ff02acbec5e08a9ad55d5f1970bc30779fde8e609ba88688fee69d6a63e6607c1da32b53676995f29adea9e81498e3feeaeaa0bb7fe6b16
 EBUILD strace-5.19.ebuild 2447 BLAKE2B 88535b5906a24d4b2ccf26777e4a9fddc382187721598b44a6092e6ca7087601e2895575ba0046bd78c1caeeeface1dc52883b7fb30e266129b40bb5ea19b8df SHA512 c29e74848ff20d686ff02acbec5e08a9ad55d5f1970bc30779fde8e609ba88688fee69d6a63e6607c1da32b53676995f29adea9e81498e3feeaeaa0bb7fe6b16
 EBUILD strace-9999.ebuild 2442 BLAKE2B 6cb1e240ee130494e165598f3ab853c0f2541365533ec5ee2b2e17bdc4e7b235ab32e2095699a69f461c2818c653975085604304d875134f1b9958ad11b44e49 SHA512 9a94e1bdeb02a857cba180f2ee23bd0b7c8031f5a533ce496396ed7011e85ae7ac6c96dd6919dab4e8ae70a8cf6c37ec5e07ad142e6f60d86899db7c6fe4a0a3
 MISC metadata.xml 779 BLAKE2B 89b4360e876fbb34a7a766a57ba9ca088a5e03e9ef66fdbe0a2b15df4cfb625daba11dc76920dec405b97cb87df49fd3c9edc0e184e73262b14b616af36fa4dd SHA512 88b2d94fd6efebaa617c8344bff3997f31c6262b9376cbce014bf7f6225f02bd8ee7bcaf98df4477435319bbb92addcdb6756e5d37a137a863f0bef1ecc5fced
diff --git a/dev-util/strace/strace-5.18.ebuild b/dev-util/strace/strace-5.18.ebuild
deleted file mode 100644
index 8d532b61c6c1..000000000000
--- a/dev-util/strace/strace-5.18.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic toolchain-funcs
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/strace/strace.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="https://strace.io/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="aio perl selinux static unwind elfutils"
-REQUIRED_USE="?? ( unwind elfutils )"
-
-BDEPEND="virtual/pkgconfig"
-LIB_DEPEND="
-	unwind? ( sys-libs/libunwind[static-libs(+)] )
-	elfutils? ( dev-libs/elfutils[static-libs(+)] )
-	selinux? ( sys-libs/libselinux[static-libs(+)] )
-"
-# strace only uses the header from libaio to decode structs
-DEPEND="
-	static? ( ${LIB_DEPEND} )
-	aio? ( >=dev-libs/libaio-0.3.106 )
-	sys-kernel/linux-headers
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	perl? ( dev-lang/perl )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.11-static.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	if [[ ! -e configure ]] ; then
-		# git generation
-		sed /autoreconf/d -i bootstrap || die
-		./bootstrap || die
-		eautoreconf
-		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
-	fi
-
-	# Stub out the -k test since it's known to be flaky. bug #545812
-	sed -i '1iexit 77' tests*/strace-k.test || die
-}
-
-src_configure() {
-	# Set up the default build settings, and then use the names strace expects.
-	tc-export_build_env BUILD_{CC,CPP}
-	local v bv
-	for v in CC CPP {C,CPP,LD}FLAGS ; do
-		bv="BUILD_${v}"
-		export "${v}_FOR_BUILD=${!bv}"
-	done
-
-	filter-lfs-flags # configure handles this sanely
-
-	export ac_cv_header_libaio_h=$(usex aio)
-	use elibc_musl && export ac_cv_header_stdc=no
-
-	local myeconfargs=(
-		--disable-gcc-Werror
-
-		# Don't require mpers support on non-multilib systems. #649560
-		--enable-mpers=check
-
-		$(use_enable static)
-		$(use_with unwind libunwind)
-		$(use_with elfutils libdw)
-		$(use_with selinux libselinux)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if has usersandbox ${FEATURES} ; then
-		# bug #643044
-		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..."
-		return 0
-	fi
-
-	default
-}
-
-src_install() {
-	default
-
-	if use perl ; then
-		exeinto /usr/bin
-		doexe src/strace-graph
-	fi
-
-	dodoc CREDITS
-}