Merge updates from master

48 files changed, 855 insertions, 73 deletions

diff --git a/dev-ml/logs/Manifest b/dev-ml/logs/Manifest
index 136aad2e16fb..c3d5031ecb42 100644
--- a/dev-ml/logs/Manifest
+++ b/dev-ml/logs/Manifest
@@ -1 +1,2 @@
-DIST logs-0.6.2.tbz 18558 BLAKE2B 824bad0b568c3cc08343cb99eab3848d6e8f7deca548599caf12a05f5980e5ecf78978480e5fd95e938ca4b06fb94cee8b4ecf241f4a0238c3d3851c4be8c9f5 SHA512 a669e373652bac6789626ad1d58e414c6d156c646bf0706c9d55b04151850113d45a5c28077707514d1a27d46fcc0f90b39b8652ce7a3980f79675e9874db8b4
+DIST logs-0.6.3.tbz 17670 BLAKE2B bea90590913c83ef0ac32bb63551542d52cdc63f761e0198ff747f9e03987dcbfacd1b1e351a826218f71768020df8ebe1caa7272fd79e2c1b634645d728bdd6 SHA512 6cdcb3ee19eadb824500e90235a62326194ff5d2a44dca598d2727f2ad358273a79240197965b682aa80986870bb859ee1e57f2cb29c684c92ca146cac8094d1
+DIST logs-0.7.0.tbz 18458 BLAKE2B 091d1778166af0b67e17e932a775a73e31e5d167b94b1b378063a7112c21bf1ac935c7e51fe29bcc0121cd5e60ea46ed3c7381f4db5df400b463feedfbe89663 SHA512 657f66eeaf5788947a3ff4b2a179f7e192ad4ce086fc8968286066d4b83af476523b3befce50ee58abf2d9b8c8dc65573ba8ed62f9c5e7933db29a7fb769646a
diff --git a/dev-ml/logs/logs-0.6.2.ebuild b/dev-ml/logs/logs-0.6.3.ebuild
index 707b897d9688..7e256da93be1 100644
--- a/dev-ml/logs/logs-0.6.2.ebuild
+++ b/dev-ml/logs/logs-0.6.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit findlib
 
diff --git a/dev-ml/logs/logs-0.7.0.ebuild b/dev-ml/logs/logs-0.7.0.ebuild
new file mode 100644
index 000000000000..7e256da93be1
--- /dev/null
+++ b/dev-ml/logs/logs-0.7.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="Logging infrastructure for OCaml"
+HOMEPAGE="https://erratique.ch/software/logs https://github.com/dbuenzli/logs"
+SRC_URI="https://erratique.ch/software/logs/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="javascript +fmt cli +lwt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ml/result:=[ocamlopt]
+	dev-lang/ocaml:=[ocamlopt]
+	javascript? ( dev-ml/js_of_ocaml:= )
+	fmt? ( dev-ml/fmt:= )
+	cli? ( dev-ml/cmdliner:=[ocamlopt] )
+	lwt? ( dev-ml/lwt:= )
+"
+DEPEND="${RDEPEND}
+	dev-ml/opam
+	dev-ml/topkg
+	dev-ml/ocamlbuild
+	dev-ml/findlib
+	test? ( dev-ml/mtime )
+"
+
+src_compile() {
+	ocaml pkg/pkg.ml build \
+		--with-js_of_ocaml $(usex javascript true false) \
+		--with-fmt $(usex fmt true false) \
+		--with-cmdliner $(usex cli true false) \
+		--with-lwt $(usex fmt true false) \
+		--tests $(usex test true false) \
+		|| die
+}
+
+src_test() {
+	ocaml pkg/pkg.ml test || die
+}
+
+src_install() {
+	opam-installer -i \
+		--prefix="${ED}/usr" \
+		--libdir="${D}/$(ocamlc -where)" \
+		--docdir="${ED}/usr/share/doc/${PF}" \
+		${PN}.install || die
+	dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/logs/metadata.xml b/dev-ml/logs/metadata.xml
index d304229c0718..c409d1b308a9 100644
--- a/dev-ml/logs/metadata.xml
+++ b/dev-ml/logs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<use>
 		<flag name="cli">Enables the Logs_cli library that provides command line support for controlling Logs.</flag>
 		<flag name="fmt">Enables the Logs_fmt reporter.</flag>
diff --git a/dev-python/pypugjs/Manifest b/dev-python/pypugjs/Manifest
index 98169a79706d..3ebdcced9e02 100644
--- a/dev-python/pypugjs/Manifest
+++ b/dev-python/pypugjs/Manifest
@@ -1 +1,2 @@
 DIST pypugjs-5.9.5.tar.gz 48925 BLAKE2B 4487799759e5090a9ef20da5af2d94d6f2d0139409cb5b963153ca949160bdf3f8f5ec8a3dd2949913b80f77b454ce4aeca00d9df10716c7202e105823db8f8b SHA512 f38ced5a908a4353aa1e48df605ebd80da418ecd2f5f554bf8e7788275a13ed82bc5b420656e5ba88862e033e339c5118d097d0ca7c1237aadd5049a15976aa8
+DIST pypugjs-5.9.8.tar.gz 49012 BLAKE2B c072f834127011edd81eab3d141a107592ee305739bee3bf116c9e0782009ecfbbfbb0cf5c10a04b6abdd303c18f79a0fb167f4dbfa2a4ca39664faef66d9f31 SHA512 5f02b2fd4355a489badb0ff09053438d5cd4a2a1d21da84fc276efe496492e384e55aea33d7ba715cc68437a1292ea30e39700e5f7bbff9dfe174d1cedca9fef
diff --git a/dev-python/pypugjs/pypugjs-5.9.5.ebuild b/dev-python/pypugjs/pypugjs-5.9.5.ebuild
index a33f3361bf73..3a786dfd0f74 100644
--- a/dev-python/pypugjs/pypugjs-5.9.5.ebuild
+++ b/dev-python/pypugjs/pypugjs-5.9.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS="bdepend"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
diff --git a/dev-python/pypugjs/pypugjs-5.9.8.ebuild b/dev-python/pypugjs/pypugjs-5.9.8.ebuild
new file mode 100644
index 000000000000..3a786dfd0f74
--- /dev/null
+++ b/dev-python/pypugjs/pypugjs-5.9.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Pug (Jade) syntax adapter for Django, Jinja2 and Mako templates"
+HOMEPAGE="https://github.com/kakulukia/pypugjs"
+SRC_URI="https://github.com/kakulukia/pypugjs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/chardet
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/treq/Manifest b/dev-python/treq/Manifest
index 7097f0c1084b..88277f8c26c6 100644
--- a/dev-python/treq/Manifest
+++ b/dev-python/treq/Manifest
@@ -1 +1,2 @@
 DIST treq-20.9.0.tar.gz 60142 BLAKE2B a495b73221ee86163a5fefd03c8019f4b671a1f32d2ab304b89566339a36aaec7245d33b738b646fa48c42f4db9744938637ece058e067ee3f747e53ce442ab8 SHA512 c595ad69d5a9c688ca966cc897db669a57d14027e0bdc345d550f791390099743749be4a41294e61428cdc7bc0fa197474be780323b00f17a712505e081e7073
+DIST treq-21.1.0.tar.gz 71018 BLAKE2B 44223c0ad618f4a57283db60063ee2fd263f958ff18d90b055733fc3bb24c87483a7b833e2210197a4edd003cb3f86647bbb636a9692e5535908b19e0186dba8 SHA512 b68ded90021cb801b276d6310e729a985205bb0701b1d0576b00c6c4efd97400625efffa35763ceef8f0f8d94172cae6fc1abdd3de1c0a4871223d4f06758d89
diff --git a/dev-python/treq/treq-21.1.0.ebuild b/dev-python/treq/treq-21.1.0.ebuild
new file mode 100644
index 000000000000..8ba0d791aae3
--- /dev/null
+++ b/dev-python/treq/treq-21.1.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="A requests-like API built on top of twisted.web's Agent"
+HOMEPAGE="https://github.com/twisted/treq https://pypi.org/project/treq/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-python/incremental[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
+"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/twisted-18.7.0[crypt,${PYTHON_USEDEP}]
+	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+"
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( dev-python/sphinx
+		${RDEPEND} )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/httpbin[${PYTHON_USEDEP}]
+	)"
+
+python_compile_all() {
+	use doc && emake -C "${S}/docs" html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/ )
+
+	distutils-r1_python_install_all
+}
+
+test_instructions(){
+	ewarn "The 'test' USE flag and FEATURE only ensures that the correct"
+	ewarn "dependenciess are installed for this package."
+	ewarn "Please run eg:"
+	ewarn "$ python3.7 /usr/bin/trial treq"
+	ewarn "as a user for each of the python versions it is installed to"
+	ewarn "to correctly test this package."
+}
+
+python_test() {
+	# Tests fail when run via emerge
+	# they need proper network access
+	test_instructions
+}
diff --git a/dev-util/buildbot-badges/Manifest b/dev-util/buildbot-badges/Manifest
index 96466fbbec54..3b21c8fde549 100644
--- a/dev-util/buildbot-badges/Manifest
+++ b/dev-util/buildbot-badges/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-badges-2.10.0.tar.gz 3989 BLAKE2B d158aaab8b61146bd02470619ffcb7eb1809c8a6370ad8546119590faf9e9408dff76ba0457cce432a2bd709e36437ecc973eff38bf0a69cde45abf19c49fd21 SHA512 f0179ed0cec4611022affdefbee67ea59545cb3325cf96d532a6825171cc46cc7ea062512681ab0e93d34ae96988e41a4ec5bb91629a02e094c40fa3a37cfcc7
+DIST buildbot-badges-2.10.1.tar.gz 3980 BLAKE2B 5c538bfd75102ed0bfe6d1a282882e31cb8790dd13270193db902d5ee660888909c2b9b4267fd7533eac0161263a26fb3c8e3b6593e4491a59f00d78c6bfcf5c SHA512 1a3bd3ee99288f11304cf9ecc1a202a98bc8b4b668cb7b361fc327aeb805796a1425d417d53938ee430873704dfc9b395ced7084ef68b59c720b75d8e57c1bfb
 DIST buildbot-badges-2.8.2.tar.gz 3982 BLAKE2B d2320979c3c8530089ddad3c9c57e9f77576da8979b5834ab7f4e6766c5d210c822e7ab582103e897591db0efc63139dc7cb9f9d834bf81ae199dd25929c6b49 SHA512 e2f6ca0178428db90812633c9af47e8f5c40220f506e62745a150a5572a95f99d3a4115621c29b8188b4b5d48aa3b0bac1862b6c5793cd87a4971798a5aae28a
 DIST buildbot-badges-2.8.4.tar.gz 3983 BLAKE2B 24d77c179a2f3287f80b46b66abcc42897016f1094a0b5cfa36dc691be1e7d3c3c709f2c7f13c789bfcecb50d59788e5c8d660f45414855831f31892d34b63af SHA512 bfd11c0dedcf4586e73eff3cc158953d2d3eb8f75c7d900354381e962b5215ca52d2e14c5f20d558c3ae6068a680a4af17967ee7dd7d677a2ba8af2d9cf4e725
diff --git a/dev-util/buildbot-badges/buildbot-badges-2.10.1.ebuild b/dev-util/buildbot-badges/buildbot-badges-2.10.1.ebuild
new file mode 100644
index 000000000000..0e2cd427a538
--- /dev/null
+++ b/dev-util/buildbot-badges/buildbot-badges-2.10.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+
+inherit distutils-r1
+
+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/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	~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}]
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index 4264458d1645..7158bc312ffc 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-console-view-2.10.0.tar.gz 18720 BLAKE2B 00ae39bbd4ec9ee13dea161e4ee853fc65ed61c5aef11ece5766c2ca17db292fedf8c636726c5616c7e2f76edbe6c0c9e2cd442da3d52311857c13947dc6f9b1 SHA512 cb1899179e14df9076224d33d8a0364cde4c74825c5ba1c281dabb1cdab976c7eb4fcb8a1e73274a3198d36b8e24a85e4736dde1ae8f42244e4001a340536785
+DIST buildbot-console-view-2.10.1.tar.gz 18737 BLAKE2B 4423f37a63de3d708ab05d7a1e91a8731d79edf36821ab8e3646447b03d382903bc553dff5396b6d50d5f89e35f85cd67b543fceb47da64a95be72481dcd2332 SHA512 7cef67ebdc49760df0861f5af6cbdf33ba179063647655dda562a06047d7a246c1e56c501dbc5a8b57f3cb3b0a552bc9a56cd2376b913288ccc52b8fa7f5a756
 DIST buildbot-console-view-2.8.2.tar.gz 17575 BLAKE2B e036429dd40fdfdadd65a10d4f6fc025b00d9a61153aecd4f31e0c6c133ba1e546b1c810254ec1fb83913cd4434db223c3cd782481ef5785ec48162a2f111682 SHA512 dbec358933865aa79ad86754ef454d89fa369fc64f3df54eb079c0f1ebadb027131d4bd7ac14dd29a16d34aa416e21f90cbecc873944a7ab8ef7da637e20c999
 DIST buildbot-console-view-2.8.4.tar.gz 18531 BLAKE2B 8d997e34eefea4be6bbbb33902b992a4864b601ef689cedbd7051667e5cab1ee45b13e2d5ad888af4a805ab1a60f0bc79439580583b3c3e233d321b52b28e0d9 SHA512 ccaa8b9ab18bd6e6609ab017ce4f2d447f99310b3448584decb8a572c573426bf84e6b86837f68b715863c66de013a8cad546e35dbbfb051c1c8d32a3825fe7f
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-2.10.1.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-2.10.1.ebuild
new file mode 100644
index 000000000000..1fe0ebf129ac
--- /dev/null
+++ b/dev-util/buildbot-console-view/buildbot-console-view-2.10.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot console-view plugin"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index 9ab810f7ceb2..cbd01a4d2ddf 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-grid-view-2.10.0.tar.gz 13685 BLAKE2B 56c871b24c48ce6723e8fba803f82b1c751b7a3ca61b8d7ec8adc50aa87f9d64d04ff6551b0a99535c04cbaf9b18763cf6469eadbd115d2f20c060cb97a3a27c SHA512 4e5099922e3e08f18a77aede09b25ee60ee629c7c94d76149164d3e1e4ea1cdb0bd1cb6689bad060c55f55f9a3527d3f49e9a99b963479e39c076e62c5ade085
+DIST buildbot-grid-view-2.10.1.tar.gz 13697 BLAKE2B 1fa5f213fff4190773328c946b8e4aac0c5118fb2ee7d7ebcca41656abda98e89b4061f959d3378d1f05fd0c0f4f14e9b37980e204818b99b0b6a4b48ac56fc3 SHA512 14c60642c5fc9924d1670c9faa27288c58763c06a7eea580851e0853b25e272f371fedd8016cba9c5e04c51206781359c08e99664fcc6e9006191deb3bcf862f
 DIST buildbot-grid-view-2.8.2.tar.gz 13373 BLAKE2B 0a7a73011655e9a57574575943a3560c395ca4358c0f2169def8413a60f8381644512a227b54f016b23e6dcd18641d1ea7a3295f6c0a983c6f3caa9ab1dda60d SHA512 9b136d96f5a38f0d28f6c37db6269e039eca0cff5bbc7d75d43346566ba2e9f7924e453098f4777792429a7a9bbbb5e02c34a9b81e131d40dc3e339f4dd377f1
 DIST buildbot-grid-view-2.8.4.tar.gz 13510 BLAKE2B 97816ae90c06cbc3ac63920da4dd2e1152750181a5c23c59d3f227f46131228140e676328aa80741626ff071679dd8c9385f3895ce92d27ce6d0264afe299872 SHA512 dfeb454f9d9162e30e0ea8555a0978ecfad2266e1a9412e0633924ad44ae404144ae4a51b58fdca31fa54b67fe53bab57cac1f54926fee346decf90623f91f89
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-2.10.1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-2.10.1.ebuild
new file mode 100644
index 000000000000..3e0ec624a814
--- /dev/null
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-2.10.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="BuildBot grid view web interface"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index f6c995b59786..b1372bc98f7a 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-pkg-2.10.0.tar.gz 4777 BLAKE2B 59f37eb1765b47d3b912b98e9d1483bb6360ec06aa35bb015018c17ebdb4e44143367e926c09c218b6c93500069238dc18e2e07b3902e15ac1fbb0d78425e558 SHA512 0f4ffa6a3d1b0a14a80c17ba573d51e6a719a6172f8ff528c19088ba2fba9ddef6ec6d82d42c280f7eda2f4260df3e5f0bbe273978fc253f4776346d3f207080
+DIST buildbot-pkg-2.10.1.tar.gz 4777 BLAKE2B 5c0244146176e45cb30431c6716bf8fbc327b939ed7b997ef1a33d86d25eab1b3106293498b5c12fa07412c590503981ebef8d0bb140ba9535469ff187caea51 SHA512 b65d139696cbab7df9f52894c5571ecbfa715b3b593ee25f5174d4b2dbb864e5d62265ab8c611ca7a439e761735e20fa03273bf2ddfbfb71b6c01e00bbb21036
 DIST buildbot-pkg-2.8.2.tar.gz 4736 BLAKE2B afbd5213b51240845f8becfcc727dc3280aa1510dd62305a5e029099da4f8e7cbbf749365baba568a2205354205e97dbdbff78a1740e464164e0c2bbc3148194 SHA512 611b5600df181adfbbe203947c36ad64a99c10c6c63c0f4e65ffd2ae4551f2d879559007b59302434cd1a2ae915a2a7125afb90f6c896110ebf514212434a2a7
 DIST buildbot-pkg-2.8.4.tar.gz 4772 BLAKE2B 08e1bdf7db8a4b1f007b12475937638575afa3e16511c28f24dab59fda88d83b03420b84d4e674aaf8e2e7962e80291f759fc7083424d3d96df2643946e8d2d5 SHA512 c5ca0c36315807bb458e16f4bdc015659b32e0c6047a067d5717251e6054249aa8a162873aa196b4fb6367c68a9a99ec3a698e861a5c70de1f81e90601b3467f
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-2.10.1.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-2.10.1.ebuild
new file mode 100644
index 000000000000..6cc42eedb5f3
--- /dev/null
+++ b/dev-util/buildbot-pkg/buildbot-pkg-2.10.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+# No real integration tests for this pkg.
+# all tests are related to making releases and final checks for distribution
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index bc4447434100..ef3bfbe7c225 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-waterfall-view-2.10.0.tar.gz 191695 BLAKE2B 910cff873d4b3ecbfd37ebb9035f4ac967ef55f64a0840467ff49176220b7982c71596aede3553b88345ad66586903cc08ad5856070fb7ee547369ed01e09c6c SHA512 e671cc1582f4944bad8b5f56daf04a0aeffe2ee55437f22f4ff0d20c4a82887e3635f79b3a3fa09295495293d34a1fd43b695c790796ee683f0febdf9b56a260
+DIST buildbot-waterfall-view-2.10.1.tar.gz 191700 BLAKE2B b48460fd8df381b909c7a8bccaf8a2efaec169d5539f127b1ae6e0e5d8a89866ce09c19cae07dafdd9050f605ea70ae42acfb959777a0df6722a3fe016c526a5 SHA512 fed605f06acb906adf45251e7e037d0409ab081521f942948577fd8a2dec577c3e66ed94c21e7ed3fa53b51504d6967aa5c2e4793cfa8d4bf3fe952b7592e0e7
 DIST buildbot-waterfall-view-2.8.2.tar.gz 190551 BLAKE2B 9db81d1cf17357a57c34eb8f3b1e4412635c4804708d3d99646a68293af52594952884f96f7d528c6a87302c3563a8d4f4411ed410da2fe1043b4439d4113d73 SHA512 e252874745a623c1ec8fefcfb10c742a783ec677f172d20ef8165687ec5981f4df09092096f7922381e886f4ea7ba4c795997ad8ff8fd58fd6aa40d8bc057b00
 DIST buildbot-waterfall-view-2.8.4.tar.gz 191026 BLAKE2B f81dea767bf881182eeb6eb750cdcf4bc289ac92097b9b8e13a5b5a237873aa4ea16f48625e56de2dc69fe849e5602d96a3d7991cdeb427dae169de5740f0bcb SHA512 c15b7bd23193742b50deaceb1810f8dbeedb77768f0d8a3d0a7bf72c89d914b963aa2141475464f9f3701881da6abed49e730ccb39d824a755ad9c567590dd7f
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.10.1.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.10.1.ebuild
new file mode 100644
index 000000000000..144ff0696de0
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.10.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot waterfall-view plugin"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+	KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 8dadd0a69a98..86b2b49ce726 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-worker-2.10.0.tar.gz 107279 BLAKE2B 415b950b81862ac4c08ca00217e27351152b74c19e0395451e6cb965a039ccc8d16d3a63534053c15783cb904c279e8c80354f8b33d956cd3c45c5d5c1f5c1f4 SHA512 94b96abdad97d306998b995409f5220c967b0f7a2e33d1310fc99723bb3d54aa055e0ae2e6b771cd53340b132eb95515c266f08bf08e10bede29e2a93fe72b0a
+DIST buildbot-worker-2.10.1.tar.gz 107656 BLAKE2B 8b94ecacc18f1e1f2e58d64f223f77af31454a3b199de9ee4c5a174b2cb645a970614674f5917415c4ab6d1ee0180ff99fbf4f121339eb05fcd80b363bfad3c0 SHA512 93f684c36e7c07c90e24a666084734df33d30376436b50db74ae8bd3b3a5e306799d15bd03d93b02f723bdf878adbfe17bbc59fd9f49f43431aea90612113ed7
 DIST buildbot-worker-2.8.2.tar.gz 101707 BLAKE2B 451dff979c6934bf6dd4e1579abbe18e9cf43551c906bd516c788a6a5f6170650a5468927bec0a8d4ab242e5886247406b2e098e1908a8d9b5777744982c7be6 SHA512 0628825ac023a66cd249dc6b42ff2f3ad3b5c0cb97561fd332ce4775abaa5368a8b7b636115259ab4aa842c811178c9b641ef4453b06167315eb81117ffef815
 DIST buildbot-worker-2.8.4.tar.gz 101175 BLAKE2B 23077305d26ab282eaa4c633ebee7ca7c502285862604ecafe25d6b666ce802729c5478d676e6834bf9a2e27ccf48e1ad0e69449e55532aa81b0dcd3c6780011 SHA512 16ad9a0e5e9c875f90383fc90c359ee843e0b82a7878f87f2ac9e7091d8d907707c69210876f25b4fdf7148bcaafab10d10a8a0a8865c73808db707320757107
diff --git a/dev-util/buildbot-worker/buildbot-worker-2.10.1.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.10.1.ebuild
new file mode 100644
index 000000000000..523e6755f973
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-2.10.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit readme.gentoo-r1 distutils-r1
+
+DESCRIPTION="BuildBot Worker (slave) Daemon"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
+
+MY_V="${PV/_p/.post}"
+MY_P="${PN}-${MY_V}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	!<dev-util/buildbot-1.0.0
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/setuptools_trial[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	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."
+}
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/buildbot-worker.1
+
+	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
+	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
+
+	dodir /var/lib/buildbot_worker
+	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
+		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
+		ewarn "is now the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
+		ewarn "    rc-update add buildbot_worker.myinstance default"
+		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildbot_worker@myinstance.service"
+		ewarn "    systemctl enable buildbot_worker.target"
+		ewarn "    systemctl start buildbot_worker.target"
+	fi
+}
+
+pkg_config() {
+	local buildworker_path="/var/lib/buildbot_worker"
+	local log_path="/var/log/buildbot_worker"
+
+	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${buildworker_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	if [[ ! -d "${instance_path}" ]]; then
+		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
+	fi
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
+	fi
+	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
+	einfo "To change the default settings edit the buildbot.tac file in this directory."
+}
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index ca1467cc7bca..d51ac1796f8c 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-wsgi-dashboards-2.10.0.tar.gz 5582 BLAKE2B 84b8ba49d967e40ab5cee28cac49d58ef97f794b07dff2eba5b27ddd712a4c34ae50d0b948f345fafe23549d1ab5d19aa0a5d799b6fb3eceb66591e70061cadd SHA512 15388a7acdacd22e8aa99e13f2a3bef75f097e64767751b246cdc5a72e19270928d61325217224cdb196eafffde0cda1dcc6a33d69cca5ef05f0d8b9836ccf72
+DIST buildbot-wsgi-dashboards-2.10.1.tar.gz 5590 BLAKE2B 3a138b7f150370d8ca63c0830985a4d0a85f0de45d33fe64e729c5e2df733468fe031fa54d6c794917eba91f53b87d7a479af30893e73c283d0fb208355fc90a SHA512 2b4ee561f7a4e10ecc26449035b4a49734caf46fc1207ac78a50cf34e7a52e928be548c6ea66f2ab2f7b1a53395b59cebdaa3a73308a780b4bdda8fad2b6e68e
 DIST buildbot-wsgi-dashboards-2.8.2.tar.gz 5566 BLAKE2B 487b816862366acae9e55c39cb440a21c8e5c438299c43e2d6fad049ff946ece5ab647390955fbbad403ad1d7c0a2707a7612129442dc398cc7210d831aa49ef SHA512 2b75a61331aa457b3f168e1955b8905f95d11008ab6bee611ac92488f988cb0cf73fbf92321e594ac0a6e5ae03b82dfa05daab5a0647ae636a96922c0f4e8eff
 DIST buildbot-wsgi-dashboards-2.8.4.tar.gz 5588 BLAKE2B 3298edaebe2f9eb5e31f8298598e892d64d653648843e3c107710d4df3a24977bd3e77db06f7edecdf8d85bbbdeedfc66a75c6f3eef93ec8374d0df1973790dc SHA512 656f0626c8cad2c21d64ebc3eb4d6e1ac24a10909afc28819e54046be8e843a7383f3648a00a908cfddd9543767e1c3293825170d7c6c64c40a61bdcd55245bd
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.10.1.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.10.1.ebuild
new file mode 100644
index 000000000000..6a3f2fda7faa
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.10.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+
+inherit distutils-r1
+
+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/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 5565bb732495..bf4af9d97e7a 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-www-2.10.0.tar.gz 3179700 BLAKE2B e9a8324c483896ee6f27468ce4658495277bc4e8e7b920bfc371440378d537473db1053373b8294e89519932eab486fb036743c8d069604c4646bb95c0680d41 SHA512 3ca30f65eb191451a718f102344c2230026cc252fa2a8a780cab20be309f1191567f5816c4f894e2e3b6c462f70b5bb8d22c96c9bb372818d4673a11e42c69ec
+DIST buildbot-www-2.10.1.tar.gz 3180266 BLAKE2B ccc5beb12a8bd3684cbd90767794f70848023600ec0851df06c1e4dd356e5774a10fabe31721eeac9c67514ecbb44d22a8983d552975e654f332ab0deb8b3bdc SHA512 c1bc1f3c9154c7d96d7d3f25f6ce89fffd1f98b4fccf8f9499d230cd81d3f67f25e4a01dca04723a838065368d1256933fce26fa252f136285f6d617f68e6f7b
 DIST buildbot-www-2.8.2.tar.gz 3172352 BLAKE2B 8ead9e9eb046bf773bd70d312ae612dced839b263b02d300f600d066fcf21ef98a7884fef36c494bdc8eb26129d5bf7897c319256f0fe6ef8e1515dc8507a26e SHA512 22d0ccb3e5b3badeb5a59db18dd7b0b925fe84936c1be1773437e899122df95bc9b0a4205a0c87182cf6be4ca4275ab20cb86a4da6098c9d9c73927cb9b3c784
 DIST buildbot-www-2.8.4.tar.gz 3170166 BLAKE2B d3d5c8a6b4b963cffaa75035e2f4a076af27c9f816a8e80b346bdeade55f01c7c8403612b8e6d12036261dabe6ab4f05ddb7ffce4e7369565d361fe7b062f691 SHA512 8b698b8b99b3f9b51df0ce230c3d6e5dea8d1c1278cb7372edd170844ec46f7fe213be20db628da244cd38daaa53b1e2fcbffd3ab3980eee35ccc6a9824c7ae5
diff --git a/dev-util/buildbot-www/buildbot-www-2.10.1.ebuild b/dev-util/buildbot-www/buildbot-www-2.10.1.ebuild
new file mode 100644
index 000000000000..d81233cd01ad
--- /dev/null
+++ b/dev-util/buildbot-www/buildbot-www-2.10.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+
+inherit distutils-r1
+
+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/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+DEPEND="
+	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 74a160173e34..2a3e13d4e5ff 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,4 +1,5 @@
 DIST buildbot-2.10.0.tar.gz 2270072 BLAKE2B 467c774bb50076e16731edeced969366b3960a8032da2ebed56baf2c7de8affa730482878e45aca1523ff4b7e16b6bd913bb83e3cded274faeb75148f2b6fb8f SHA512 086864dd67b883a11ba565ae3e6530c1f396e35fcb8d4346f751c05de684bc3bfd7e709a428781be79e7e6a2e0eda1eefcd7140efd529d85ed336acfb398b262
+DIST buildbot-2.10.1.tar.gz 2271357 BLAKE2B 8320f12137b938b1a795857c2cc1e7427a19ebbb8fcd84f22142d2a37e92cf8211aa67afe42ec9f53ea2da3db621ababddb95794bdf5a0795de231a58f256cbb SHA512 6dd0bfb0d4747f3953cfbf73de6079f6fe5a75f4d7d072161f4de1209549df7732e216c859f7df69d6155e2df7c09c1667453973607ce3c8d0524c0433832873
 DIST buildbot-2.8.0-fakedb.tar.xz 16204 BLAKE2B 741676e2c9117b1ab174ce49747bdfcd07766ad3e471e308398dff476f167fd231b7772c2f02002cbafb27e2ef535242d84d5aa84f4bc8942d4d216b2d5bf1f6 SHA512 c2b00d8621b3a1e521f6c17e902ae331b606dda3d319187895f26629dbdaf50caefc5d49fb150fb780e682ae431515c7ded4950d62448e8a73b8efba821c0fa1
 DIST buildbot-2.8.2.tar.gz 3181035 BLAKE2B 40a3e424cc03c982549f25993a4abd2fe04bdc089ad22288af4d25724972f9f3541ef32549d2761c808845df44a972b00cf631adfc564bf4852c4b6b6ab14404 SHA512 7d7f15becc7fc1803ae4e9f1906d547c89dfe1efaa51e8fda0674a3d9b060bafbaae4cb671ec844750313247edb73f17c9014c545bce58070df0ca322a0fd9a2
 DIST buildbot-2.8.4.tar.gz 3134447 BLAKE2B 67052a060c9951e584a5e94f36b92262b9a1956c22efbce7ac17d83f93edde3d9443b00a7bc3afc5918006d68cc023ea0ae913e7bbf0e7cede0d9345992f83ae SHA512 45a6e6116ab5fec18b9b3a6d54886bcf86d3a821a79fd151f9311c8c3646c61051a194250395e203f02b9aa0161e12a9ca54b623897c74eee6133df752f1742c
diff --git a/dev-util/buildbot/buildbot-2.10.1.ebuild b/dev-util/buildbot/buildbot-2.10.1.ebuild
new file mode 100644
index 000000000000..e6a2c5107e87
--- /dev/null
+++ b/dev-util/buildbot/buildbot-2.10.1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+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
+	https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
+
+IUSE="crypt doc docker examples irc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.13[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
+	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+	crypt? (
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+	)
+	irc? (
+		dev-python/txrequests[${PYTHON_USEDEP}]
+	)
+	docker? (
+		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-python/sphinx-3.2.0[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		dev-python/pyenchant[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/pypugjs[${PYTHON_USEDEP}]
+		dev-python/txrequests[${PYTHON_USEDEP}]
+		dev-python/lz4[${PYTHON_USEDEP}]
+		dev-python/treq[${PYTHON_USEDEP}]
+		dev-python/setuptools_trial[${PYTHON_USEDEP}]
+		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+distutils_enable_tests setup.py
+
+pkg_setup() {
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
+		to support starting buildbot through Gentoo's init system. To use this,
+		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+		The scripts can	run as a different user if desired."
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	# missing files, so skip building
+	if use doc; then
+		einfo "Generation of documentation"
+		pushd docs > /dev/null
+		#'man' target is currently broken
+		emake html || die "Docs generation failed"
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman docs/buildbot.1
+
+	if use doc; then
+		HTML_DOCS=( docs/_build/html/ )
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r docs/examples
+	fi
+
+	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
+	systemd_dounit "${FILESDIR}/buildmaster.target"
+	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
+	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
+
+	readme.gentoo_create_doc
+}
+
+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/lldb/lldb-12.0.0.9999.ebuild b/dev-util/lldb/lldb-12.0.0.9999.ebuild
index 6498e428b6b7..df3f9a17e7f1 100644
--- a/dev-util/lldb/lldb-12.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-12.0.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -73,6 +73,8 @@ src_configure() {
 		# of -ltinfo)
 		-DCURSES_NEED_NCURSES=ON
 
+		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${PV%_*}"
+
 		-DPython3_EXECUTABLE="${PYTHON}"
 	)
 	use test && mycmakeargs+=(
diff --git a/dev-util/lldb/lldb-12.0.0_rc1.ebuild b/dev-util/lldb/lldb-12.0.0_rc1.ebuild
index 00b5d55d6be5..df3f9a17e7f1 100644
--- a/dev-util/lldb/lldb-12.0.0_rc1.ebuild
+++ b/dev-util/lldb/lldb-12.0.0_rc1.ebuild
@@ -73,6 +73,8 @@ src_configure() {
 		# of -ltinfo)
 		-DCURSES_NEED_NCURSES=ON
 
+		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${PV%_*}"
+
 		-DPython3_EXECUTABLE="${PYTHON}"
 	)
 	use test && mycmakeargs+=(
diff --git a/dev-util/lldb/lldb-13.0.0.9999.ebuild b/dev-util/lldb/lldb-13.0.0.9999.ebuild
index 00b5d55d6be5..df3f9a17e7f1 100644
--- a/dev-util/lldb/lldb-13.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-13.0.0.9999.ebuild
@@ -73,6 +73,8 @@ src_configure() {
 		# of -ltinfo)
 		-DCURSES_NEED_NCURSES=ON
 
+		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${PV%_*}"
+
 		-DPython3_EXECUTABLE="${PYTHON}"
 	)
 	use test && mycmakeargs+=(
diff --git a/games-board/cockatrice/files/cockatrice-20190304-qt-5.15.patch b/games-board/cockatrice/files/cockatrice-20190304-qt-5.15.patch
deleted file mode 100644
index 878a8d428246..000000000000
--- a/games-board/cockatrice/files/cockatrice-20190304-qt-5.15.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 7fa1936d0f4efffa16ae28d6bd3f9e727e207046 Mon Sep 17 00:00:00 2001
-From: ebbit1q <ebbit1q@gmail.com>
-Date: Fri, 19 Jun 2020 16:50:09 +0200
-Subject: [PATCH] qt 5.15 compatibility (#4027)
-
----
- cockatrice/src/replay_timeline_widget.cpp      |  1 +
- 27 files changed, 101 insertions(+), 39 deletions(-)
-
-diff --git a/cockatrice/src/replay_timeline_widget.cpp b/cockatrice/src/replay_timeline_widget.cpp
-index 6d04dce80..e79ad5f5c 100644
---- a/cockatrice/src/replay_timeline_widget.cpp
-+++ b/cockatrice/src/replay_timeline_widget.cpp
-@@ -1,6 +1,7 @@
- #include "replay_timeline_widget.h"
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPalette>
- #include <QTimer>
- #include <cmath>
diff --git a/games-board/cockatrice/files/use-ccache.patch b/games-board/cockatrice/files/use-ccache.patch
deleted file mode 100644
index 16deeaf0bb73..000000000000
--- a/games-board/cockatrice/files/use-ccache.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 494501bbc88d30d9f1ceb6fb3fbd428eeb58ddee Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Wed, 13 Mar 2019 22:18:45 +0000
-Subject: [PATCH] Add USE_CCACHE option to CMake so that ccache can be forcibly
- disabled
-
----
- CMakeLists.txt | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cc39e77..59eec3d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,12 +25,15 @@ ELSE()
- ENDIF()
- 
- # Early detect ccache
-+OPTION(USE_CCACHE "Cache the build results with ccache" ON)
-+if(USE_CCACHE)
- find_program(CCACHE_PROGRAM ccache)
- if(CCACHE_PROGRAM)
-     # Support Unix Makefiles and Ninja
-     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
-     MESSAGE(STATUS "Found CCache ${CCACHE_PROGRAM}")
- endif()
-+endif()
- 
- # A project name is needed for CPack
- # Version can be overriden by git tags, see cmake/getversion.cmake
--- 
-2.20.1
-
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 2e1ab42bf147..8c2a5a42a7fb 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -27,7 +27,7 @@ net-misc/asterisk -blocks
 sys-libs/compiler-rt-sanitizers -asan -dfsan -lsan -msan -hwasan -tsan
 sys-libs/compiler-rt-sanitizers -ubsan -safestack -cfi -scudo
 sys-libs/compiler-rt-sanitizers -gwp-asan
-sys-libs/compiler-rt-sanitizers -libfuzzer -profile -xray
+sys-libs/compiler-rt-sanitizers -libfuzzer -memprof -profile -xray
 
 # Sam James <sam@gentoo.org> (2020-10-24)
 # asm redc is only available on amd64,
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 11f27d681344..f60d134fb6eb 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -10,7 +10,7 @@ net-misc/asterisk blocks
 sys-libs/compiler-rt-sanitizers asan dfsan lsan msan hwasan tsan
 sys-libs/compiler-rt-sanitizers ubsan safestack cfi scudo
 sys-libs/compiler-rt-sanitizers shadowcallstack gwp-asan
-sys-libs/compiler-rt-sanitizers libfuzzer profile xray
+sys-libs/compiler-rt-sanitizers libfuzzer memprof profile xray
 
 # Sam James <sam@gentoo.org> (2020-10-24)
 # asm redc is only available on amd64,
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild
index 14dbd46a8dbc..52b037500853 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SLOT="$(ver_cut 1-3)"
 KEYWORDS=""
 IUSE="+clang test elibc_glibc"
 # base targets
-IUSE+=" +libfuzzer +profile +xray"
+IUSE+=" +libfuzzer +memprof +profile +xray"
 # sanitizer targets, keep in sync with config-ix.cmake
 # NB: ubsan, scudo deliberately match two entries
 SANITIZER_FLAGS=(
@@ -123,6 +123,7 @@ src_configure() {
 		-DCOMPILER_RT_BUILD_BUILTINS=OFF
 		-DCOMPILER_RT_BUILD_CRT=OFF
 		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
 		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
 		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
 		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0_rc1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0_rc1.ebuild
index 4261329f9d3c..52b037500853 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0_rc1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0_rc1.ebuild
@@ -14,7 +14,7 @@ SLOT="$(ver_cut 1-3)"
 KEYWORDS=""
 IUSE="+clang test elibc_glibc"
 # base targets
-IUSE+=" +libfuzzer +profile +xray"
+IUSE+=" +libfuzzer +memprof +profile +xray"
 # sanitizer targets, keep in sync with config-ix.cmake
 # NB: ubsan, scudo deliberately match two entries
 SANITIZER_FLAGS=(
@@ -123,6 +123,7 @@ src_configure() {
 		-DCOMPILER_RT_BUILD_BUILTINS=OFF
 		-DCOMPILER_RT_BUILD_CRT=OFF
 		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
 		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
 		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
 		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild
index 4261329f9d3c..52b037500853 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild
@@ -14,7 +14,7 @@ SLOT="$(ver_cut 1-3)"
 KEYWORDS=""
 IUSE="+clang test elibc_glibc"
 # base targets
-IUSE+=" +libfuzzer +profile +xray"
+IUSE+=" +libfuzzer +memprof +profile +xray"
 # sanitizer targets, keep in sync with config-ix.cmake
 # NB: ubsan, scudo deliberately match two entries
 SANITIZER_FLAGS=(
@@ -123,6 +123,7 @@ src_configure() {
 		-DCOMPILER_RT_BUILD_BUILTINS=OFF
 		-DCOMPILER_RT_BUILD_CRT=OFF
 		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
 		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
 		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
 		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
diff --git a/sys-libs/compiler-rt-sanitizers/metadata.xml b/sys-libs/compiler-rt-sanitizers/metadata.xml
index 5f139415fce4..a5d8a2f90b20 100644
--- a/sys-libs/compiler-rt-sanitizers/metadata.xml
+++ b/sys-libs/compiler-rt-sanitizers/metadata.xml
@@ -8,6 +8,7 @@
 		<flag name='clang'>Force building using installed clang (rather
 			than the default CC/CXX).</flag>
 		<flag name='libfuzzer'>Build fuzzing runtime.</flag>
+		<flag name='memprof'>Build memory profiler runtime.</flag>
 		<flag name='profile'>Build profiling runtime.</flag>
 		<flag name='sanitize'>Build sanitizer runtimes.</flag>
 		<flag name='xray'>Build XRay runtime.</flag>
diff --git a/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
index 07412646ab2a..bdd3598e804f 100644
--- a/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
@@ -85,6 +85,7 @@ src_configure() {
 
 		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
 		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_MEMPROF=OFF
 		-DCOMPILER_RT_BUILD_PROFILE=OFF
 		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
 		-DCOMPILER_RT_BUILD_XRAY=OFF
diff --git a/sys-libs/compiler-rt/compiler-rt-12.0.0_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.0_rc1.ebuild
index 07412646ab2a..bdd3598e804f 100644
--- a/sys-libs/compiler-rt/compiler-rt-12.0.0_rc1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-12.0.0_rc1.ebuild
@@ -85,6 +85,7 @@ src_configure() {
 
 		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
 		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_MEMPROF=OFF
 		-DCOMPILER_RT_BUILD_PROFILE=OFF
 		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
 		-DCOMPILER_RT_BUILD_XRAY=OFF
diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild
index 07412646ab2a..bdd3598e804f 100644
--- a/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild
@@ -85,6 +85,7 @@ src_configure() {
 
 		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
 		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_MEMPROF=OFF
 		-DCOMPILER_RT_BUILD_PROFILE=OFF
 		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
 		-DCOMPILER_RT_BUILD_XRAY=OFF
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.9999.ebuild
index 38385b9304f5..94322eadc932 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,8 +25,8 @@ BDEPEND="
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 	)"
 
-LLVM_COMPONENTS=( libunwind )
-LLVM_TEST_COMPONENTS=( libcxx{,abi} llvm/cmake )
+LLVM_COMPONENTS=( libunwind libcxx llvm/cmake/modules )
+LLVM_TEST_COMPONENTS=( libcxxabi )
 llvm.org_set_globals
 
 python_check_deps() {
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0_rc1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0_rc1.ebuild
index 37357781fb44..94322eadc932 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0_rc1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0_rc1.ebuild
@@ -25,8 +25,8 @@ BDEPEND="
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 	)"
 
-LLVM_COMPONENTS=( libunwind )
-LLVM_TEST_COMPONENTS=( libcxx{,abi} llvm/cmake )
+LLVM_COMPONENTS=( libunwind libcxx llvm/cmake/modules )
+LLVM_TEST_COMPONENTS=( libcxxabi )
 llvm.org_set_globals
 
 python_check_deps() {
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.9999.ebuild
index 37357781fb44..94322eadc932 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.9999.ebuild
@@ -25,8 +25,8 @@ BDEPEND="
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 	)"
 
-LLVM_COMPONENTS=( libunwind )
-LLVM_TEST_COMPONENTS=( libcxx{,abi} llvm/cmake )
+LLVM_COMPONENTS=( libunwind libcxx llvm/cmake/modules )
+LLVM_TEST_COMPONENTS=( libcxxabi )
 llvm.org_set_globals
 
 python_check_deps() {
diff --git a/x11-misc/screenkey/Manifest b/x11-misc/screenkey/Manifest
new file mode 100644
index 000000000000..b702d58e8ad6
--- /dev/null
+++ b/x11-misc/screenkey/Manifest
@@ -0,0 +1 @@
+DIST screenkey-1.3.tar.gz 82732 BLAKE2B 53cf700f7211783c360552667d5bc77dfa467137476c4ae57944fe7a1e3e9da9b4488cade9c2f091b2be51cb393e063509ae858f6cca1b34ceadd3e158586e05 SHA512 16aceeb1e1a0ed5add06ed2bfd1eca04b9909537bbb979f531a98270c33af3d5e667534e73546a85c3f58ef837795a35891f00f8cf41e5ea10c45b7992334e96
diff --git a/x11-misc/screenkey/metadata.xml b/x11-misc/screenkey/metadata.xml
new file mode 100644
index 000000000000..dc5be68e2b19
--- /dev/null
+++ b/x11-misc/screenkey/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>xgqt@protonmail.com</email>
+        <name>Maciej Barć</name>
+    </maintainer>
+    <maintainer type="person">
+        <email>sultan@gentoo.org</email>
+        <name>Stephan Hartmann</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="gitlab">screenkey/screenkey</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/x11-misc/screenkey/screenkey-1.3.ebuild b/x11-misc/screenkey/screenkey-1.3.ebuild
new file mode 100644
index 000000000000..5aded2be34d6
--- /dev/null
+++ b/x11-misc/screenkey/screenkey-1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="A screencast tool to display your keys inspired by Screenflick"
+HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git"
+else
+	SRC_URI="https://gitlab.com/screenkey/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+RESTRICT="test"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="appindicator"
+
+BDEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	sys-devel/gettext
+"
+RDEPEND="
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	media-fonts/fontawesome
+	x11-libs/gtk+:3[X,introspection]
+	x11-misc/slop
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+"
+
+src_prepare() {
+	# Change the doc install path
+	sed -i "s|share/doc/screenkey|share/doc/${PF}|g" setup.py || die
+
+	default
+}
diff --git a/x11-misc/screenkey/screenkey-9999.ebuild b/x11-misc/screenkey/screenkey-9999.ebuild
new file mode 100644
index 000000000000..0b52f31fef09
--- /dev/null
+++ b/x11-misc/screenkey/screenkey-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="A screencast tool to display your keys inspired by Screenflick"
+HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git"
+else
+	SRC_URI="https://gitlab.com/screenkey/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+RESTRICT="test"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="appindicator"
+
+BDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	media-fonts/fontawesome
+	x11-libs/gtk+:3[X,introspection]
+	x11-misc/slop
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+"
+
+src_prepare() {
+	# Change the doc install path
+	sed -i "s|share/doc/screenkey|share/doc/${PF}|g" setup.py || die
+
+	default
+}