diff --git a/Manifest.files.gz b/Manifest.files.gz
index 4131a1b79e4f..bccd843b09aa 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 16225846802b..f70394032d93 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/ruffle/ruffle-0_p20211214.ebuild b/app-emulation/ruffle/ruffle-0_p20211214.ebuild
index fd3e952ec3bb..f55ac59a9cc7 100644
--- a/app-emulation/ruffle/ruffle-0_p20211214.ebuild
+++ b/app-emulation/ruffle/ruffle-0_p20211214.ebuild
@@ -388,6 +388,7 @@ CRATES="
 	xml-rs-0.8.4"
 # python is needed by xcb-0.8.2 until update to >=0.10
 PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
 inherit cargo desktop flag-o-matic python-any-r1 xdg
 
 # 0(github) 1(repo) 2(commit hash) 3(crate:workspace,...) [see core/Cargo.toml]
diff --git a/app-emulation/ruffle/ruffle-9999.ebuild b/app-emulation/ruffle/ruffle-9999.ebuild
index 085d64c07400..4371c33e066a 100644
--- a/app-emulation/ruffle/ruffle-9999.ebuild
+++ b/app-emulation/ruffle/ruffle-9999.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 # python is needed by xcb-0.8.2 until update to >=0.10
 PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
 inherit cargo desktop flag-o-matic git-r3 python-any-r1 xdg
 
 DESCRIPTION="Flash Player emulator written in Rust"
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index ac542e8ef73c..309281d878ba 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/scribus/scribus-1.5.7.ebuild b/app-office/scribus/scribus-1.5.7.ebuild
index 806085da0d11..6a826be1e707 100644
--- a/app-office/scribus/scribus-1.5.7.ebuild
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="tk?"
 inherit cmake desktop flag-o-matic python-single-r1 xdg
 
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 9ee1a1dcf524..a926bffff40a 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="tk?"
 inherit cmake desktop flag-o-matic python-single-r1 subversion xdg
 
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 80c4c9baea28..1c66b4b332fc 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/ksh/ksh-1.0.0_beta1.ebuild b/app-shells/ksh/ksh-1.0.0_beta1.ebuild
index 3069f591bc44..1975fc029304 100644
--- a/app-shells/ksh/ksh-1.0.0_beta1.ebuild
+++ b/app-shells/ksh/ksh-1.0.0_beta1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"
 LICENSE="EPL-1.0"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
 
 PATCHES=(
 	"${FILESDIR}/ksh-1.0.0-beta.1-regre-tests.patch"
diff --git a/app-shells/ksh/ksh-9999.ebuild b/app-shells/ksh/ksh-9999.ebuild
new file mode 100644
index 000000000000..15fbc5bb62c7
--- /dev/null
+++ b/app-shells/ksh/ksh-9999.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ksh93/ksh"
+else
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv"
+	MY_PV=$(ver_rs 3 - 4 .)
+	SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+DESCRIPTION="The Original ATT Korn Shell"
+HOMEPAGE="http://www.kornshell.com/"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+
+src_prepare() {
+	default
+
+	# disable register for debugging
+	sed -i 1i"#define register" src/lib/libast/include/ast.h || die
+}
+
+src_compile() {
+	local extraflags=(
+		"-Wno-unknown-pragmas"
+		"-Wno-missing-braces"
+		"-Wno-unused-result"
+		"-Wno-return-type"
+		"-Wno-int-to-pointer-cast"
+		"-Wno-parentheses"
+		"-Wno-unused"
+		"-Wno-unused-but-set-variable"
+		"-Wno-cpp"
+		"-Wno-maybe-uninitialized"
+		"-Wno-lto-type-mismatch"
+		"-P"
+	)
+	append-cflags $(test-flags-CC ${extraflags[@]})
+	filter-flags '-fdiagnostics-color=always' # https://github.com/ksh93/ksh/issues/379
+	export CCFLAGS="${CFLAGS} -fno-strict-aliasing"
+
+	tc-export AR CC LD NM
+
+	sh bin/package make SHELL="${BROOT}"/bin/sh || die
+}
+
+src_test() {
+	# test tries to catch IO error
+	addwrite /proc/self/mem
+
+	# arith.sh uses A for tests
+	unset A
+
+	sh bin/shtests --compile || die
+}
+
+src_install() {
+	local myhost="$(sh bin/package host)"
+	cd "arch/${myhost}" || die
+
+	dodir /bin
+	mv bin/ksh "${ED}"/bin/ || die
+	dosym ksh /bin/rksh
+
+	newman man/man1/sh.1 ksh.1
+}
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index b1ac3c382c1e..c44211ab76a7 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/platformio/platformio-5.2.3-r1.ebuild b/dev-embedded/platformio/platformio-5.2.3-r1.ebuild
index 9acf0d537f4d..14d85de3ff59 100644
--- a/dev-embedded/platformio/platformio-5.2.3-r1.ebuild
+++ b/dev-embedded/platformio/platformio-5.2.3-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}-core-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 1111463f9350..b6332217263b 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/sdformat/Manifest b/dev-libs/sdformat/Manifest
index 0d28ad2a3a10..ecf8c86634a7 100644
--- a/dev-libs/sdformat/Manifest
+++ b/dev-libs/sdformat/Manifest
@@ -1,3 +1,4 @@
 DIST sdformat-9.2.0.tar.bz2 644484 BLAKE2B 2f6382414bd7d47bfafb66c8352e5a90cd236bdfcfc7c3119eab154b8d0bb5fddf2127b16e222bb90326dbf91f95b111643eede17ebe38f27bb164cf31d7f263 SHA512 bc9422207f56d7fd5f53249f856be5fe00f078e168d7e93ab10f5544e4963888cb7c0a1b1f449739e2490b0d5aad3c5a72d8408333dd6ae550b5d66f6bcde42a
 DIST sdformat-9.3.0.tar.bz2 648239 BLAKE2B 3dfedbcb7b52d3c9384f7a4b119b3e664b9e6bd6bd93bc5ad7a5db4228474bd3e6f8d98d1fd761f49386175e45b7083b57cee02cf4a930e19ba8ef78187af71b SHA512 16ff7643baf5738a1a833f1484c79566960c9093c4a3842ae82a14faca14feef34e7293fbc78c0fea78e8a1b1b9710414587ca5260c17562759df245d458b942
 DIST sdformat-9.5.0.tar.bz2 651125 BLAKE2B 08ca0e9df9620345905e5307b555fd72c106a59090b7d2fd8fb9cc32198d07fa31fa64e60a25dc47844ebc279bb6e3ad78e457e6ba563158404a3198222d08e9 SHA512 b96797df2a7f43b4d426673fad7dbc0a5e20a846a66d804c7c3eb01ec008b52f8bc119ae1e6062a4a748240fb7172c909fd1e66ac3b52f3d01bc5a347d734908
+DIST sdformat-9.7.0.tar.bz2 699483 BLAKE2B a7f831fa42cc6371afaee47876bee5d2b8e9ef3b05a9fa8281e1746d0b038fb75b0f96d5e84b615b114a25424de65be08dbea052a53813d01b07ca8a1c0d08b9 SHA512 8b05dfaa47dea7cf55dafbed828b3c361f1c13f368fd4ac50cd35c1be859e401bdbd500a79286f7b8b0e6bac04f92a4c406e910a22aa1a9583aa8ffb660c1f89
diff --git a/dev-libs/sdformat/sdformat-9.7.0.ebuild b/dev-libs/sdformat/sdformat-9.7.0.ebuild
new file mode 100644
index 000000000000..7e9289e7fc28
--- /dev/null
+++ b/dev-libs/sdformat/sdformat-9.7.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Simulation Description Format (SDF) parser"
+HOMEPAGE="http://sdformat.org/"
+SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+# subslot = libsdformat major
+SLOT="0/9"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/urdfdom-1:=
+	dev-libs/tinyxml
+	dev-libs/boost:=
+	sci-libs/ignition-math:6=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/ruby:*
+	virtual/pkgconfig
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_configure() {
+	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
+	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
+	local mycmakeargs=(
+		"-DUSE_INTERNAL_URDF=OFF"
+		"-DUSE_EXTERNAL_TINYXML=ON"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/urdfdom/Manifest b/dev-libs/urdfdom/Manifest
index ebe027c44e07..4b1b4150ca85 100644
--- a/dev-libs/urdfdom/Manifest
+++ b/dev-libs/urdfdom/Manifest
@@ -1 +1,2 @@
 DIST urdfdom-1.0.4.tar.gz 276958 BLAKE2B 19353c38d8fa8f1d6d752302bc8b7b84b13cc6c6f83af31dba677184fa09fd42d7de0c00e6927f085c3d013d2bde664dd7ea69d3c69de4c14130c08d256e6f87 SHA512 2a7a0ec61445132b3e8f6ba8b2268b9fd7c035a72b3e4d61b5ed665d07e902a02b87d2c60c53fc9b0c385a871cd8d87f278bd4833f1f904635ec46755a544003
+DIST urdfdom-3.0.0.tar.gz 285706 BLAKE2B ef9cc251c67f20458c9038a738dd8b7a91d49b0180bbffe9cd12e793f12f4f1f10b5322a82f94bc36a5a46db7e015b157c84cda73535b7a60417f2f4bb389fe5 SHA512 1fa3372d5beed6b119444ef99d50991a417d42bc7a3152e4697dc26e1bd1e351d45edd4c56f9dfff6f2c8480b3f43c6dfe246d22890db0f676d68591a5c0aaf6
diff --git a/dev-libs/urdfdom/urdfdom-3.0.0.ebuild b/dev-libs/urdfdom/urdfdom-3.0.0.ebuild
new file mode 100644
index 000000000000..37c71100352c
--- /dev/null
+++ b/dev-libs/urdfdom/urdfdom-3.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros/urdfdom"
+fi
+
+inherit ${SCM} cmake
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/ros/urdfdom/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="URDF (U-Robot Description Format) library"
+HOMEPAGE="http://ros.org/wiki/urdf"
+LICENSE="BSD"
+SLOT="0/3"
+IUSE=""
+
+RDEPEND=">=dev-libs/urdfdom_headers-1.0.0
+	>=dev-libs/console_bridge-0.3:=
+	dev-libs/tinyxml[stl]"
+DEPEND="${RDEPEND}"
diff --git a/dev-libs/urdfdom/urdfdom-9999.ebuild b/dev-libs/urdfdom/urdfdom-9999.ebuild
index 1f7a6d0de978..37c71100352c 100644
--- a/dev-libs/urdfdom/urdfdom-9999.ebuild
+++ b/dev-libs/urdfdom/urdfdom-9999.ebuild
@@ -21,16 +21,10 @@ fi
 DESCRIPTION="URDF (U-Robot Description Format) library"
 HOMEPAGE="http://ros.org/wiki/urdf"
 LICENSE="BSD"
-SLOT="0/1"
+SLOT="0/3"
 IUSE=""
 
 RDEPEND=">=dev-libs/urdfdom_headers-1.0.0
 	>=dev-libs/console_bridge-0.3:=
-	dev-libs/tinyxml[stl]
-	dev-libs/boost:=[threads(+)]"
+	dev-libs/tinyxml[stl]"
 DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e 's/set(CMAKE_INSTALL_LIBDIR/#/' CMakeLists.txt || die
-	cmake_src_prepare
-}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d75493504e88..01d4791a96af 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/starlette/starlette-0.17.1.ebuild b/dev-python/starlette/starlette-0.17.1.ebuild
index ddc0f7326ba1..81bb333e77d0 100644
--- a/dev-python/starlette/starlette-0.17.1.ebuild
+++ b/dev-python/starlette/starlette-0.17.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/encode/starlette/archive/refs/tags/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 # Needs fixing with trio deprecations (dies on ModuleWithDeprecations)
 RESTRICT="test"
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 0c820468be8d..63044fe5b005 100644
Binary files a/dev-ros/Manifest.gz and b/dev-ros/Manifest.gz differ
diff --git a/dev-ros/message_filters/Manifest b/dev-ros/message_filters/Manifest
index 6c3e46551df7..4f62a8b412f2 100644
--- a/dev-ros/message_filters/Manifest
+++ b/dev-ros/message_filters/Manifest
@@ -1,4 +1,5 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/message_filters/message_filters-1.15.13.ebuild b/dev-ros/message_filters/message_filters-1.15.13.ebuild
new file mode 100644
index 000000000000..7b93ac1d75aa
--- /dev/null
+++ b/dev-ros/message_filters/message_filters-1.15.13.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Set of message filters which take in messages and outputs those at a later time"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-libs/boost:=[threads(+)]
+	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+PATCHES=( "${FILESDIR}/tests.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/rosbag/Manifest b/dev-ros/rosbag/Manifest
index 55fd9527ede7..28078a1fcec5 100644
--- a/dev-ros/rosbag/Manifest
+++ b/dev-ros/rosbag/Manifest
@@ -1,5 +1,6 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/rosbag/rosbag-1.15.13.ebuild b/dev-ros/rosbag/rosbag-1.15.13.ebuild
new file mode 100644
index 000000000000..d6ca262b4d4e
--- /dev/null
+++ b/dev-ros/rosbag/rosbag-1.15.13.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Set of tools for recording from and playing back to ROS topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE="lz4"
+
+RDEPEND="
+	>=dev-ros/rosbag_storage-1.14
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/topic_tools
+	dev-ros/xmlrpcpp
+	dev-libs/boost:=
+	app-arch/bzip2
+	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-libs/console_bridge:=
+	$(python_gen_cond_dep "dev-python/pycryptodome[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/python-gnupg[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	lz4? ( dev-ros/roslz4[${PYTHON_SINGLE_USEDEP}] )"
+PATCHES=( "${FILESDIR}/pycrypto.patch" )
diff --git a/dev-ros/rosbag_storage/Manifest b/dev-ros/rosbag_storage/Manifest
index 6c3e46551df7..4f62a8b412f2 100644
--- a/dev-ros/rosbag_storage/Manifest
+++ b/dev-ros/rosbag_storage/Manifest
@@ -1,4 +1,5 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.13.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.13.ebuild
new file mode 100644
index 000000000000..98d1abfadea8
--- /dev/null
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.15.13.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Set of tools for recording from and playing back ROS message"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/console_bridge
+
+	dev-ros/cpp_common
+	>=dev-ros/pluginlib-1.13.0-r2:=
+	dev-ros/roscpp_serialization
+	dev-ros/roscpp_traits
+	dev-ros/rostime
+	dev-ros/roslz4
+
+	dev-libs/boost:=
+	app-arch/bzip2
+	dev-libs/console_bridge:=
+	dev-libs/tinyxml2:=
+
+	dev-libs/openssl:0=
+	app-crypt/gpgme
+"
+DEPEND="${RDEPEND}
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest
+		dev-cpp/gtest
+	)
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/roscpp/Manifest b/dev-ros/roscpp/Manifest
index 3a8eb58ae823..3e342ed2139f 100644
--- a/dev-ros/roscpp/Manifest
+++ b/dev-ros/roscpp/Manifest
@@ -1,3 +1,4 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/roscpp/roscpp-1.15.13.ebuild b/dev-ros/roscpp/roscpp-1.15.13.ebuild
new file mode 100644
index 000000000000..7cee4461c7ca
--- /dev/null
+++ b/dev-ros/roscpp/roscpp-1.15.13.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=clients/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rosconsole
+	dev-ros/roscpp_serialization
+	dev-ros/roscpp_traits
+	dev-ros/rostime
+	dev-ros/xmlrpcpp
+	dev-libs/boost:=
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosgraph/Manifest b/dev-ros/rosgraph/Manifest
index 6c3e46551df7..4f62a8b412f2 100644
--- a/dev-ros/rosgraph/Manifest
+++ b/dev-ros/rosgraph/Manifest
@@ -1,4 +1,5 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/rosgraph/rosgraph-1.15.13.ebuild b/dev-ros/rosgraph/rosgraph-1.15.13.ebuild
new file mode 100644
index 000000000000..79863bd48ac7
--- /dev/null
+++ b/dev-ros/rosgraph/rosgraph-1.15.13.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Prints information about the ROS Computation Graph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/netifaces[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/roslaunch/Manifest b/dev-ros/roslaunch/Manifest
index 0b655414b752..6fb3a372cf4e 100644
--- a/dev-ros/roslaunch/Manifest
+++ b/dev-ros/roslaunch/Manifest
@@ -1,2 +1,3 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
diff --git a/dev-ros/roslaunch/roslaunch-1.15.13.ebuild b/dev-ros/roslaunch/roslaunch-1.15.13.ebuild
new file mode 100644
index 000000000000..2cc8912dd83a
--- /dev/null
+++ b/dev-ros/roslaunch/roslaunch-1.15.13.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for easily launching multiple ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+
+CDEPEND="
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosout
+"
+
+RDEPEND="
+	${CDEPEND}
+	acct-group/ros
+	acct-user/ros
+"
+DEPEND="
+	${CDEPEND}
+	test? (
+		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/test_rosmaster
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${S}/../rosmaster/:${EPREFIX}/usr/share/ros_packages/rosparam:${EPREFIX}/usr/share/ros_packages/roslib:${EPREFIX}/usr/share/ros_packages/rosout"
+	ros-catkin_src_test
+}
+
+src_install() {
+	ros-catkin_src_install
+
+	dodir /etc/ros
+	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
+
+	newinitd "${FILESDIR}/roscore.initd" roscore
+	newconfd "${FILESDIR}/roscore.confd" roscore
+
+	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
+	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
+
+	doenvd "${FILESDIR}/40roslaunch"
+
+	# Needed by test_roslaunch
+	insinto /usr/share/${PN}
+	doins test/xml/noop.launch
+}
diff --git a/dev-ros/roslz4/Manifest b/dev-ros/roslz4/Manifest
index 6c3e46551df7..4f62a8b412f2 100644
--- a/dev-ros/roslz4/Manifest
+++ b/dev-ros/roslz4/Manifest
@@ -1,4 +1,5 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/roslz4/roslz4-1.15.13.ebuild b/dev-ros/roslz4/roslz4-1.15.13.ebuild
new file mode 100644
index 000000000000..bcbd9d65b47d
--- /dev/null
+++ b/dev-ros/roslz4/roslz4-1.15.13.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-arch/lz4
+	dev-ros/cpp_common"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/rosmaster/Manifest b/dev-ros/rosmaster/Manifest
index 55fd9527ede7..28078a1fcec5 100644
--- a/dev-ros/rosmaster/Manifest
+++ b/dev-ros/rosmaster/Manifest
@@ -1,5 +1,6 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/rosmaster/rosmaster-1.15.13.ebuild b/dev-ros/rosmaster/rosmaster-1.15.13.ebuild
new file mode 100644
index 000000000000..44c1207c39a0
--- /dev/null
+++ b/dev-ros/rosmaster/rosmaster-1.15.13.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS Master implementation"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/defusedxml[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
diff --git a/dev-ros/rosmsg/Manifest b/dev-ros/rosmsg/Manifest
index 0b655414b752..6fb3a372cf4e 100644
--- a/dev-ros/rosmsg/Manifest
+++ b/dev-ros/rosmsg/Manifest
@@ -1,2 +1,3 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
diff --git a/dev-ros/rosmsg/rosmsg-1.15.13.ebuild b/dev-ros/rosmsg/rosmsg-1.15.13.ebuild
new file mode 100644
index 000000000000..d4be4db4044c
--- /dev/null
+++ b/dev-ros/rosmsg/rosmsg-1.15.13.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tools for displaying information about message and services"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	)
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}/../..:${EPREFIX}/usr/share/ros_packages/diagnostic_msgs:${EPREFIX}/usr/share/ros_packages/std_msgs:${EPREFIX}/usr/share/ros_packages/std_srvs"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/rosnode/Manifest b/dev-ros/rosnode/Manifest
index 6c3e46551df7..4f62a8b412f2 100644
--- a/dev-ros/rosnode/Manifest
+++ b/dev-ros/rosnode/Manifest
@@ -1,4 +1,5 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/rosnode/rosnode-1.15.13.ebuild b/dev-ros/rosnode/rosnode-1.15.13.ebuild
new file mode 100644
index 000000000000..991a2183e013
--- /dev/null
+++ b/dev-ros/rosnode/rosnode-1.15.13.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	)"
diff --git a/dev-ros/rosout/Manifest b/dev-ros/rosout/Manifest
index 55fd9527ede7..28078a1fcec5 100644
--- a/dev-ros/rosout/Manifest
+++ b/dev-ros/rosout/Manifest
@@ -1,5 +1,6 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/rosout/rosout-1.15.13.ebuild b/dev-ros/rosout/rosout-1.15.13.ebuild
new file mode 100644
index 000000000000..f6b95451b596
--- /dev/null
+++ b/dev-ros/rosout/rosout-1.15.13.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+"
+DEPEND="${RDEPEND}
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/rosparam/Manifest b/dev-ros/rosparam/Manifest
index 55fd9527ede7..28078a1fcec5 100644
--- a/dev-ros/rosparam/Manifest
+++ b/dev-ros/rosparam/Manifest
@@ -1,5 +1,6 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/rosparam/rosparam-1.15.13.ebuild b/dev-ros/rosparam/rosparam-1.15.13.ebuild
new file mode 100644
index 000000000000..61ac1e322a5d
--- /dev/null
+++ b/dev-ros/rosparam/rosparam-1.15.13.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rospy/Manifest b/dev-ros/rospy/Manifest
index 55fd9527ede7..28078a1fcec5 100644
--- a/dev-ros/rospy/Manifest
+++ b/dev-ros/rospy/Manifest
@@ -1,5 +1,6 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/rospy/rospy-1.15.13.ebuild b/dev-ros/rospy/rospy-1.15.13.ebuild
new file mode 100644
index 000000000000..47344d9c9de6
--- /dev/null
+++ b/dev-ros/rospy/rospy-1.15.13.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=clients/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python client library for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roscpp[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	ros-catkin_src_install
+	# Other tests need these nodes
+	exeinto /usr/share/${PN}
+	doexe test_nodes/*
+}
diff --git a/dev-ros/rosservice/Manifest b/dev-ros/rosservice/Manifest
index 55fd9527ede7..28078a1fcec5 100644
--- a/dev-ros/rosservice/Manifest
+++ b/dev-ros/rosservice/Manifest
@@ -1,5 +1,6 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/rosservice/rosservice-1.15.13.ebuild b/dev-ros/rosservice/rosservice-1.15.13.ebuild
new file mode 100644
index 000000000000..a7c61cee1d7d
--- /dev/null
+++ b/dev-ros/rosservice/rosservice-1.15.13.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for listing and querying ROS Services"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rostest/Manifest b/dev-ros/rostest/Manifest
index 6c3e46551df7..4f62a8b412f2 100644
--- a/dev-ros/rostest/Manifest
+++ b/dev-ros/rostest/Manifest
@@ -1,4 +1,5 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/rostest/rostest-1.15.13.ebuild b/dev-ros/rostest/rostest-1.15.13.ebuild
new file mode 100644
index 000000000000..1f8991fc0261
--- /dev/null
+++ b/dev-ros/rostest/rostest-1.15.13.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Integration test suite based on roslaunch compatible with xUnit frameworks"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+	dev-libs/boost:=[threads(+)]
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]"
+DEPEND="${DEPEND}
+	test? (
+		${RDEPEND}
+		dev-ros/rosservice
+		dev-cpp/gtest
+		dev-ros/rostopic
+	)"
diff --git a/dev-ros/rostopic/Manifest b/dev-ros/rostopic/Manifest
index 6c3e46551df7..4f62a8b412f2 100644
--- a/dev-ros/rostopic/Manifest
+++ b/dev-ros/rostopic/Manifest
@@ -1,4 +1,5 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/rostopic/rostopic-1.15.13.ebuild b/dev-ros/rostopic/rostopic-1.15.13.ebuild
new file mode 100644
index 000000000000..9ea612e200ff
--- /dev/null
+++ b/dev-ros/rostopic/rostopic-1.15.13.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/roswtf/Manifest b/dev-ros/roswtf/Manifest
index 6c3e46551df7..4f62a8b412f2 100644
--- a/dev-ros/roswtf/Manifest
+++ b/dev-ros/roswtf/Manifest
@@ -1,4 +1,5 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/roswtf/roswtf-1.15.13.ebuild b/dev-ros/roswtf/roswtf-1.15.13.ebuild
new file mode 100644
index 000000000000..4e877541ab42
--- /dev/null
+++ b/dev-ros/roswtf/roswtf-1.15.13.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for diagnosing issues with a running ROS system"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/paramiko[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rosbuild[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/roslang[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+BDEPEND="
+	test? (
+		dev-ros/cmake_modules
+	)
+"
+
+src_test() {
+	# Needed for tests to find internal launch file
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_rosbag/Manifest b/dev-ros/test_rosbag/Manifest
index 7bf04ee9cd93..4772cf5a1840 100644
--- a/dev-ros/test_rosbag/Manifest
+++ b/dev-ros/test_rosbag/Manifest
@@ -1,4 +1,5 @@
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST test_rosbag-1.15.11-chatter_50hz.bag 28923 BLAKE2B 2a2304b98d33b902fa3b8fc4d2a0fa3da9af600ab9f66ebf74ecb2214160346d10a0ba58d2b8dfb7039dcd7ca05e58bf7b253899238dabab1c29264970b124b7 SHA512 7493e773d678aed10ca274f8a253a412846c90fa238ac7407b04f39355b94285b40b177ae45a0a5b5ae1c2fe2d74284fba1c082550f21dd30cf5e5891ef402e1
 DIST test_rosbag-1.15.11-constants_gen1.bag 4783 BLAKE2B fec06b1016d0a6e616893f050c22072ef01cc4bc944f3778cb45613d699e404b8721b35f9563f22fa87e473f9f439965ba804cc6478c59dbeab95309375046c7 SHA512 724a420e99946a5fba1b092363cb11af11a50e85c4531b57fe64b207ed1e4022e35a870014873919a7bfe3680ae0b5b4275777f3305b8c5d1fdd7316e7d67e7b
 DIST test_rosbag-1.15.11-constants_gen2.bag 4783 BLAKE2B 6db44a7ddc61307f49bb28e276b8a834044b43d79d37ceba0aef21c8dea8a6d3ee32cc156f8bc429f074752dfc5a249b789936a6d8bf5e11397c2ee4f0e7d925 SHA512 a0df68425bf268da7d622ea43fb755dd7161bf3443c5c2499862c8932ce5e86e4edc6746a9f4a6bc4b4bb9c070a2b3af26d26755e18e796600184f280579aedc
@@ -34,6 +35,41 @@ DIST test_rosbag-1.15.11-test_future_version_2.1.bag 6051 BLAKE2B 5368be834eaaf7
 DIST test_rosbag-1.15.11-test_indexed_1.2.bag 142311 BLAKE2B 51e4f41334a4191a02e6cd2723ff7a38ea6b99e272304ff8be83641d31d3c4bc3bbddf835923da447d274d27253d0cf162ff065e6f952799c204a6d3b8a429bc SHA512 8c2b6973e549d1b5c2e1fe5f6873c40b7877fa87e7864d39e86646083baf481ecb3d9c1fc4ca5d44332b3b4b0f41856dd5dd2c71ce9f2281fdc61c9846bcd5b8
 DIST test_rosbag-1.15.11-test_rosbag_latched_pub.bag 4816 BLAKE2B 2a0a90eb46665486ac7a31249d7bc9c3c4f125c934a09e3fb0130bf43b10035552f9de0f0fd8280cec4cb1eb71fc7dc624ba1152724e602a2483a2df63869c3f SHA512 e1655185e8ea6a02aaccce4e819eb6d6aec48032f4f55e17d7c8649aa0d0b56eded659a97e2f83c7d04e221beb8a330bce093300d422c63f3b330f5b2b8bb8ca
 DIST test_rosbag-1.15.11-unmigrated_gen1.bag 4828 BLAKE2B 0fc0e446f8c31fef4b21a669b15a86340d0dcff2406a85f88ccdc84e6f3ff4a71252151d191c30c9879d2ce3031faf9101aaa22834cdd733491a2f92d53a7a04 SHA512 333dbf41976ae732e33f394883965d9d07bfe35d8f3c5be1bd129ff4ded31f8c8201b9fdd8bee7ecaf7f04f49d0ee7c7d2be1ec4c8322d0b0b9cc0a236fe8342
+DIST test_rosbag-1.15.13-chatter_50hz.bag 28923 BLAKE2B 2a2304b98d33b902fa3b8fc4d2a0fa3da9af600ab9f66ebf74ecb2214160346d10a0ba58d2b8dfb7039dcd7ca05e58bf7b253899238dabab1c29264970b124b7 SHA512 7493e773d678aed10ca274f8a253a412846c90fa238ac7407b04f39355b94285b40b177ae45a0a5b5ae1c2fe2d74284fba1c082550f21dd30cf5e5891ef402e1
+DIST test_rosbag-1.15.13-constants_gen1.bag 4783 BLAKE2B fec06b1016d0a6e616893f050c22072ef01cc4bc944f3778cb45613d699e404b8721b35f9563f22fa87e473f9f439965ba804cc6478c59dbeab95309375046c7 SHA512 724a420e99946a5fba1b092363cb11af11a50e85c4531b57fe64b207ed1e4022e35a870014873919a7bfe3680ae0b5b4275777f3305b8c5d1fdd7316e7d67e7b
+DIST test_rosbag-1.15.13-constants_gen2.bag 4783 BLAKE2B 6db44a7ddc61307f49bb28e276b8a834044b43d79d37ceba0aef21c8dea8a6d3ee32cc156f8bc429f074752dfc5a249b789936a6d8bf5e11397c2ee4f0e7d925 SHA512 a0df68425bf268da7d622ea43fb755dd7161bf3443c5c2499862c8932ce5e86e4edc6746a9f4a6bc4b4bb9c070a2b3af26d26755e18e796600184f280579aedc
+DIST test_rosbag-1.15.13-converged_gen1.bag 5197 BLAKE2B 99b3a9807b2e569f6773b791b008b1430408843037203a257892c82a6f59dd3e688a4f516e91d26fa567b56bececc3f69d69f4999e7a1e1430a9a606686a8de9 SHA512 490677292a7ea95109e7542e1219f51d7de9cf3bfbf90f48836fd80387655752ecb1173cbb65fc40908eb552fe1bae45e821c1b8510a401c7b643d2c0c433881
+DIST test_rosbag-1.15.13-converged_gen2.bag 5197 BLAKE2B e5b620a47c7f44911e5ee44c5787cd9ff753763816535ddaaf64f5e83a27504a5f6d241d900c0c3eacc5b9273113ad05f72cd828a4ebfb6d997df46fbc8b0cc7 SHA512 2779711e7d1223b14223312e1cbb6222ef6fdc32bd28dab6cb830784d5207f5ec7cc826e1336328520a45b15ddc937bf0be7eb8329932b77b9f1f42d162b7795
+DIST test_rosbag-1.15.13-converged_gen3.bag 5209 BLAKE2B f6d3615c771b086220350982c5ff726f263a460a714aaa3abcd683216dbdeaa72ddfd2fa2b42e761f82223af29ffa1bad554a67fc6afab52f08ffd1718fcadf0 SHA512 d896b361c73ba904c1766c9899d03f09d7ce62126378c195c620b659ff06dbdb61783ef7cddd999088a973382e60387a8eadd1d7dbd67af2d7af6c1c1fa87b6f
+DIST test_rosbag-1.15.13-converged_gen4.bag 5207 BLAKE2B d25369cfa2e0f34ab7b344ac56557292ec1b5609802327ade48d60e632900e4d746e15c9a46b700a44c198d1aef1975b042efbb1ca885f4124b5cef4936925ff SHA512 329694efa2dd1ad82a87f1419958bc2cb1edf4d8ae4ffde1c2d3d3b792d1dcba842b82c9f028cf3bb2f85fadbb068e5ed25eaebc8cd6e305c422d40dbeb75775
+DIST test_rosbag-1.15.13-convergent_gen1.bag 5485 BLAKE2B bd906d5ced9d123e04fa8b948834b907530ba2c56f4197f7ff209ec5d6afb18ff42e29d03f883d2d44e89e49c12e3769013f8209e5a674a7fd138d0264083295 SHA512 85a4129f954d4d3a2374c1c2c7fbdd82ee685853763ab62a836ab128b1dd118746984d1c1b8290ac1b522fac18493e1ab825b1a66924151dff608af0a5e07541
+DIST test_rosbag-1.15.13-convergent_gen2.bag 5485 BLAKE2B f5f6c3ed07b8cabca79fe826dcb7dbf0a9e3d7aed1d3bb0767e47a1f269e5c198de90f6e0052911f4148238b99bc3f48ea417d9a1642efb5bee74d5b5f9e7b5f SHA512 09fba991e4efe5758082f9af2501b0bc9ea452b247e3672b8eae5cef3d8d43ebbc0c7307bcb5730f1ec9a94e86506258d04e1cb25fb8d5f680f38b4b73e96c68
+DIST test_rosbag-1.15.13-migrated_addsub_gen1.bag 5031 BLAKE2B eeaff544bc0de8f9d058ebec594318b9ea8ee383f8b5083258de9dcb0068d1d6c0169cf97cc221675509932c8aa630e13958a2e82f413d6e834b3114c4702824 SHA512 b41a4a5651a97f70774c1395c8f9d5b0f4815f7e39052904fe1e89483270f9eb5216a6bd3652c2372c6c64666b4cc5e60d04f390f5ea83f88653035fa1a432fb
+DIST test_rosbag-1.15.13-migrated_explicit_gen1.bag 6172 BLAKE2B 9d5692ed7683a8a426467969488836102c56d51878c1c2d28d60f5a66a3429395cadfff75a177003238e1184ef1ff927479fb205a28e359c9e4efcbd41a1e767 SHA512 e11282b83feef48c039d34400216406537704ea5bcc10e62434bd2917a9ee0942a67315a8667d0ae7e76da178537b01f88a638f5e360663e51a438a4c6049661
+DIST test_rosbag-1.15.13-migrated_explicit_gen2.bag 6212 BLAKE2B 97b231a06d372d813dbfb6c80a6c293dda743ba4ad436ac0e265c37650461bb83315304f25d5a299eb4d82e59e6a776b4c7a66ace154aa6fb9d75bff10e45e06 SHA512 690fdad115ac672617bad2510e139f5cf67599b4e21a56dafd45bfda9f1991f4fc9251dc41c36834931402722261b008ff0ea283afd99daa3eda20bb357810ed
+DIST test_rosbag-1.15.13-migrated_explicit_gen3.bag 6220 BLAKE2B 7f9ba4eade5e2e7c03b2e180f1507cce58331493a2dddc1213a6ed5d8a46d198569ef5d5effe398c97c372adcbfed756649c35c0ae38362f017cf768faebc30e SHA512 35911f4d68eda67a49cfa03ad65c6b6a84e74f161b38839fed7a1ceeadd10715f4d82b124d640f7cfc356f107e376ea6bc9016c1be32592fe2f6865d5bb8f868
+DIST test_rosbag-1.15.13-migrated_explicit_gen4.bag 6359 BLAKE2B 156e06ff065827bea0797c6f55dfaf37cb973ac07085cb56d4f3c85eadf1c994cf859e0e7b85bf65234a52b56cf4632d2ce2c8c05c172f5c838c403fdb83fc42 SHA512 5dccc7f8bd03ce08b584a69d6a9e54969bd014d22d7af3e1a9b09d9c42ab4029cf13205f56ea81913ce47c6a5f383d1c9082feb8857fa0d4f1459f97d2f4460c
+DIST test_rosbag-1.15.13-migrated_implicit_gen1.bag 6690 BLAKE2B b6d9d8dda4bae2d41aa81928daaada62da89a7be38e8f73ed9c2c2bb7c652d194eb7afd201ca0c0283ee88a77e103d8ccb86c60bffa4adcacde7a0f7f3b7f56d SHA512 a09816ef8c00b0005c1ee42b4d33739b776e6b8792f34f3c5e70ffb91ebc4c4e3c92396d733c3fe4314bd646533d71ede9cae57faeb8a311a25e13421731aeb6
+DIST test_rosbag-1.15.13-migrated_implicit_gen2.bag 6740 BLAKE2B 2f3d4a397188454f6ee4f2cfd2438361a3ce83b4e7d124feaa15788f6e49a074db433d8e87b43961984b0c243cd02651abb26ebeca0a51eeda9b61cc7d786f8e SHA512 da0fad58643a06c8c15ae6b13530b3e879269602b6dde750ec2706087206db82bb8f4a386830b36426c98fdc71eb6d2fcf6d2ee8d0be230beb3855447acc3bb3
+DIST test_rosbag-1.15.13-migrated_implicit_gen3.bag 6752 BLAKE2B f5f7c56815dd1e9bd277cde0a91dd53a68c342527578123ad25ec981c30486ddeca774c7d4f8dcf0606d189b14e235f349490f47ceb3a191250cada8f82c32e0 SHA512 2068238ca893201d24ed26b17d8b94e13a82d9f556352572da8c44e2455f75c984454bb09074b688f11ec0a7a5e38791b669f7cdea98863d0c301917ffe5d342
+DIST test_rosbag-1.15.13-migrated_implicit_gen4.bag 6889 BLAKE2B 6f8dbc6f2920d10535c8574470e23d3007033942949ef599437dde5fd64b860139f79a9835e255065fe3c74445ef702c3793f0adfc972f88fa7046c081ec5976 SHA512 4fb2b1f78b4cfd5b155415724ab224b6d619a44af94ade80f8bd6ef30b46e498633a5457d8f939c96902a641e0fd45cac2aa8e4e7f7a26efb6c78109b2dcd4d7
+DIST test_rosbag-1.15.13-migrated_mixed_gen1.bag 7120 BLAKE2B 1788a394a5cef74864071994a97fa0a7df28167531261636b74cbb688e0e62902e2e9577f09d1546b3f3dbb0533332b8c5aee47f01a30606744cdaaa5c573a0e SHA512 a8354f9386fe2b8da148919cc036041570eb999b94be162ee06b2abfd5f0b150fe96af45530c18b86eafda2e0299b8dfa8faf1cf3ab1571a0f62f17e6ba1147c
+DIST test_rosbag-1.15.13-migrated_mixed_gen2.bag 7178 BLAKE2B aa251ca30288b42d91f5bc37e672551a90575b10ecb058042deb88b45d41a9dc38c5e17081780ca75436cee886f71e1405f7970ac1025693fbc94f8444aaed60 SHA512 fd1ffb05ea65a798c07568778da71b6f3d5c7cebd4a541ace4d800b2eff3c9ee3ce1b1b21017e4aab73438ab3005d6cf966993a7b17afce16c5b788354c5d868
+DIST test_rosbag-1.15.13-migrated_mixed_gen3.bag 7252 BLAKE2B 29896d975cd406b525e8e59e24d26817a9a13b84833d9c08733bfc05be392d6e0be6de5bbced5068bed33ae60ce4053922c8092f259a48e23ae796ac43e8e601 SHA512 d0a5fd042c614e6451b9b6518ecd3317a727939db81fa8988c700a657be77f9cc14127cd0595c97a505094df9e96b63f79381be2da3717e34f3481d521905518
+DIST test_rosbag-1.15.13-migrated_mixed_gen4.bag 7387 BLAKE2B 55de46bbc4e115113df7ccac4c08e61308e7c06ddde1f6e69a436b4b32fb296b9f60d029473f46cf37b0894e501040f4e748302a9d7c8c8684911983860519c1 SHA512 5f106b3a64968ced5baeb0f91dac7209af508c6cdc2c3148bd9c86421024051f2bd7d12027af2857dd1e49964babb330333e02bb94a120426763695c06bd31ef
+DIST test_rosbag-1.15.13-partially_migrated_gen1.bag 6568 BLAKE2B c3d16f271e035140ab802123d7d848d4d7c0e00841edd0282c632c92bbe030847bd879e7e7ff24f6384f9f2f34a9dd38bb7b5e281de9df7203d2c43c28600fa3 SHA512 ecec0e8c3ccd4613048d300417218488a3578a131ed0bd346cf07dc6c702abb2354288558e56ffd6c192abb1e2afd7084a856eecd51a935e207936b5e3d52e32
+DIST test_rosbag-1.15.13-partially_migrated_gen2.bag 6616 BLAKE2B 846b84e3d221b490d3f7b90083d5354ea21906b51569fa9c57642c6e52d06e3caa4a68b3f0fffbb5c808bb440fd17507c80a60a87bd0cb8207a14eb01418de24 SHA512 aac71997873669661eaab2d0f463e3e5afb677c9852a572fd9f139a9037d3e26e2d2ae8b9e16c204eae8f494a1a867638e5f7750293ccec27402dbea0804e712
+DIST test_rosbag-1.15.13-partially_migrated_gen3.bag 6707 BLAKE2B 6d5df33b8def73503cc35de95b680607cb7d687a16082558dd95b8b869866837cb584173088ee2a2c2d9f7ca21193eea287bef111103f8bacec2aa635cbe3e68 SHA512 e730b1b0604253286b4e53d917f01bad10cbe81b8b1547984657bd8e90112c20e1b24ba315aedccc1495374070fbbe6f7b8e51cd68e82986f68efd0785b7386d
+DIST test_rosbag-1.15.13-partially_migrated_gen4.bag 6910 BLAKE2B bde0ec1f776c109cd0c21cf4ce87b3f363c50b0eeebe004ff0060713204391f88fdae3a2a801dd6c4530f3eaf0ee74bd51ecb31ef78c34ced7a26f2a6c80de4f SHA512 42e894acacc8e974f495d8c2ca088b89a71506996f10dbfac431e6bd48af2338b2e8b7eee4c5a40098b04086c47e63f2f80f228ed39a0db4c197a47081c69f4a
+DIST test_rosbag-1.15.13-renamed_gen1.bag 4825 BLAKE2B 37b156027af0b490e00611eb31cd407cf576dd2be1abe77f3a2ca01e04e19f0a498163673928bd82fc660e38c7f9b9f7745f0b5bc2c3b5254e3d41f575561510 SHA512 99c6b187a45ac4d56544b163a876107be744d12515ff4baa6195857796d81c3b7fa0f75369c945a2bdf2954429129f5802a8a8ac6ac3a69ac1bd6b7feeb05173
+DIST test_rosbag-1.15.13-renamed_gen2.bag 4825 BLAKE2B 8a1ee3a3e421f0c2b298fcc9a4260dd76cc211c05e5d944f76f3f7d1feb461b439a5a6dc7dc545295237756510383042ab86e590e879ad35b6cdb8131d054ceb SHA512 c64b77c215c08c443d674bb12e9ac50a5fb234442c14cdea77e2936eabfe8c369947902ff6c9a211d8c3b9aa93f5677dadf8bb3b8145fc3a4b80f6c4f235e6f8
+DIST test_rosbag-1.15.13-renamed_gen3.bag 4835 BLAKE2B 8884b8fa15c3698a1d1fb19147fb2023cbd2946441ad9d4df2ef5ded3c455b2bce5a5cf6618f6e47729dc495b20b8f55a1750c4763ab4fb65c25d2a1f01de011 SHA512 67142debaecf05b76a42cf198572a9ff4bddf4c4da0b798e467f02ed5aa8ff2b6fabc248fa5caa33f346560edac1b3f38eb72ebae75b0224f6b281e5c21211a3
+DIST test_rosbag-1.15.13-renamed_gen4.bag 4833 BLAKE2B 72010f49332c337f998c4dd54a3399773e893f4f41ce01f7b130861993684641ff575c65e8bfcf1127a8dd590c0152ffcce08dfcd124e7a43c9ae8443983438e SHA512 2adfd75e05469793eb95ab68ca8403cd78f3a836157b0b1abcf21f11f16633b0e9c840f800ee5d51376fe91a31710d5674deb2c1c6e1a262517ab173550253cc
+DIST test_rosbag-1.15.13-subunmigrated_gen1.bag 5200 BLAKE2B 6786d316f28f7038b961fce5d4094b6948eb1f292dc63c04efdc9459c012acefcc7f962452a11ae53e8de4096c758833d7374ccbfc1a16b626e6c21af92b7979 SHA512 318d921f505ee97ab9ceba536ee48c4d5d5d8aa7d2619864b325d8083582daff43cf9bb61ff5ec3814e815cc334190b11687734e21141fbade9611a98244783b
+DIST test_rosbag-1.15.13-test_future_version_2.1.bag 6051 BLAKE2B 5368be834eaaf7d48519560295406a92ecc6573f7cbcbd5a29c9f05c12322198b1da8209b0316b5d694cdfbde8a9ba26be3a6f529154594e148743f7b618de45 SHA512 9a9870b28d5e0f12ed98fd1df6be21fa37e5db9f9423eb39cbbc7e8f042078210f7ccc8f534a02a5edc51fb61817ddeec705a8687917742648c1fdb70adf88db
+DIST test_rosbag-1.15.13-test_indexed_1.2.bag 142311 BLAKE2B 51e4f41334a4191a02e6cd2723ff7a38ea6b99e272304ff8be83641d31d3c4bc3bbddf835923da447d274d27253d0cf162ff065e6f952799c204a6d3b8a429bc SHA512 8c2b6973e549d1b5c2e1fe5f6873c40b7877fa87e7864d39e86646083baf481ecb3d9c1fc4ca5d44332b3b4b0f41856dd5dd2c71ce9f2281fdc61c9846bcd5b8
+DIST test_rosbag-1.15.13-test_rosbag_latched_pub.bag 4816 BLAKE2B 2a0a90eb46665486ac7a31249d7bc9c3c4f125c934a09e3fb0130bf43b10035552f9de0f0fd8280cec4cb1eb71fc7dc624ba1152724e602a2483a2df63869c3f SHA512 e1655185e8ea6a02aaccce4e819eb6d6aec48032f4f55e17d7c8649aa0d0b56eded659a97e2f83c7d04e221beb8a330bce093300d422c63f3b330f5b2b8bb8ca
+DIST test_rosbag-1.15.13-unmigrated_gen1.bag 4828 BLAKE2B 0fc0e446f8c31fef4b21a669b15a86340d0dcff2406a85f88ccdc84e6f3ff4a71252151d191c30c9879d2ce3031faf9101aaa22834cdd733491a2f92d53a7a04 SHA512 333dbf41976ae732e33f394883965d9d07bfe35d8f3c5be1bd129ff4ded31f8c8201b9fdd8bee7ecaf7f04f49d0ee7c7d2be1ec4c8322d0b0b9cc0a236fe8342
 DIST test_rosbag-9999-chatter_50hz.bag 28923 BLAKE2B 2a2304b98d33b902fa3b8fc4d2a0fa3da9af600ab9f66ebf74ecb2214160346d10a0ba58d2b8dfb7039dcd7ca05e58bf7b253899238dabab1c29264970b124b7 SHA512 7493e773d678aed10ca274f8a253a412846c90fa238ac7407b04f39355b94285b40b177ae45a0a5b5ae1c2fe2d74284fba1c082550f21dd30cf5e5891ef402e1
 DIST test_rosbag-9999-constants_gen1.bag 4783 BLAKE2B fec06b1016d0a6e616893f050c22072ef01cc4bc944f3778cb45613d699e404b8721b35f9563f22fa87e473f9f439965ba804cc6478c59dbeab95309375046c7 SHA512 724a420e99946a5fba1b092363cb11af11a50e85c4531b57fe64b207ed1e4022e35a870014873919a7bfe3680ae0b5b4275777f3305b8c5d1fdd7316e7d67e7b
 DIST test_rosbag-9999-constants_gen2.bag 4783 BLAKE2B 6db44a7ddc61307f49bb28e276b8a834044b43d79d37ceba0aef21c8dea8a6d3ee32cc156f8bc429f074752dfc5a249b789936a6d8bf5e11397c2ee4f0e7d925 SHA512 a0df68425bf268da7d622ea43fb755dd7161bf3443c5c2499862c8932ce5e86e4edc6746a9f4a6bc4b4bb9c070a2b3af26d26755e18e796600184f280579aedc
diff --git a/dev-ros/test_rosbag/test_rosbag-1.15.13.ebuild b/dev-ros/test_rosbag/test_rosbag-1.15.13.ebuild
new file mode 100644
index 000000000000..8dc8f933b1fc
--- /dev/null
+++ b/dev-ros/test_rosbag/test_rosbag-1.15.13.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+TEST_DATA="constants_gen1.bag
+constants_gen2.bag
+converged_gen1.bag
+converged_gen2.bag
+converged_gen3.bag
+converged_gen4.bag
+convergent_gen1.bag
+convergent_gen2.bag
+migrated_addsub_gen1.bag
+migrated_explicit_gen1.bag
+migrated_explicit_gen2.bag
+migrated_explicit_gen3.bag
+migrated_explicit_gen4.bag
+migrated_implicit_gen1.bag
+migrated_implicit_gen2.bag
+migrated_implicit_gen3.bag
+migrated_implicit_gen4.bag
+migrated_mixed_gen1.bag
+migrated_mixed_gen2.bag
+migrated_mixed_gen3.bag
+migrated_mixed_gen4.bag
+partially_migrated_gen1.bag
+partially_migrated_gen2.bag
+partially_migrated_gen3.bag
+partially_migrated_gen4.bag
+renamed_gen1.bag
+renamed_gen2.bag
+renamed_gen3.bag
+renamed_gen4.bag
+subunmigrated_gen1.bag
+unmigrated_gen1.bag
+"
+ROSBAG_DATA="
+test_indexed_1.2.bag
+chatter_50hz.bag
+test_future_version_2.1.bag
+test_rosbag_latched_pub.bag
+"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosbag"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+for i in ${TEST_DATA}; do
+	SRC_URI="${SRC_URI}
+		http://download.ros.org/data/test_rosbag/${i} -> ${P}-${i}"
+done
+for i in ${ROSBAG_DATA}; do
+	SRC_URI="${SRC_URI}
+		http://download.ros.org/data/rosbag/${i} -> ${P}-${i}"
+done
+
+RDEPEND="
+	dev-ros/message_generation
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/topic_tools[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/xmlrpcpp
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/boost[threads(+)]
+		app-arch/bzip2
+		dev-ros/rosout
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)
+"
+
+src_prepare() {
+	ros-catkin_src_prepare
+	for i in ${TEST_DATA} ${ROSBAG_DATA}; do
+		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
+	done
+	sed -e "s#http://download.ros.org/data/test_rosbag/#file://${S}/#g" \
+		-i bag_migration_tests/CMakeLists.txt \
+		-i CMakeLists.txt || die
+	sed -e "s#http://download.ros.org/data/rosbag/#file://${S}/#g" \
+		-i bag_migration_tests/CMakeLists.txt \
+		-i CMakeLists.txt || die
+}
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_rosbag_storage/Manifest b/dev-ros/test_rosbag_storage/Manifest
index 6c3e46551df7..4f62a8b412f2 100644
--- a/dev-ros/test_rosbag_storage/Manifest
+++ b/dev-ros/test_rosbag_storage/Manifest
@@ -1,4 +1,5 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.13.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.13.ebuild
new file mode 100644
index 000000000000..56f714211def
--- /dev/null
+++ b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.13.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosbag_storage"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rosbag_storage
+	dev-ros/rosbag
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_roscpp/Manifest b/dev-ros/test_roscpp/Manifest
index 55fd9527ede7..28078a1fcec5 100644
--- a/dev-ros/test_roscpp/Manifest
+++ b/dev-ros/test_roscpp/Manifest
@@ -1,5 +1,6 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.13.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.13.ebuild
new file mode 100644
index 000000000000..38c3002a2918
--- /dev/null
+++ b/dev-ros/test_roscpp/test_roscpp-1.15.13.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roscpp"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=[threads(+)]
+	test? (
+		dev-cpp/gtest
+	)
+"
+REQUIRED_USE="test? ( ros_messages_cxx )"
+PATCHES=( "${FILESDIR}/tests.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	# Sometimes high number of tests running in parallel make them fail
+	# https://bugs.gentoo.org/738620
+	ros-catkin_src_test -j 1
+}
diff --git a/dev-ros/test_rosgraph/Manifest b/dev-ros/test_rosgraph/Manifest
index 55fd9527ede7..28078a1fcec5 100644
--- a/dev-ros/test_rosgraph/Manifest
+++ b/dev-ros/test_rosgraph/Manifest
@@ -1,5 +1,6 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.15.13.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.15.13.ebuild
new file mode 100644
index 000000000000..63863b4ad56b
--- /dev/null
+++ b/dev-ros/test_rosgraph/test_rosgraph-1.15.13.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosgraph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}] )
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_roslaunch/Manifest b/dev-ros/test_roslaunch/Manifest
index 6c3e46551df7..4f62a8b412f2 100644
--- a/dev-ros/test_roslaunch/Manifest
+++ b/dev-ros/test_roslaunch/Manifest
@@ -1,4 +1,5 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.15.13.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.13.ebuild
new file mode 100644
index 000000000000..b506232d6f4b
--- /dev/null
+++ b/dev-ros/test_roslaunch/test_roslaunch-1.15.13.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roslaunch"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	test? (
+		dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	)
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_roslib_comm/Manifest b/dev-ros/test_roslib_comm/Manifest
index 6c3e46551df7..4f62a8b412f2 100644
--- a/dev-ros/test_roslib_comm/Manifest
+++ b/dev-ros/test_roslib_comm/Manifest
@@ -1,4 +1,5 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.13.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.13.ebuild
new file mode 100644
index 000000000000..e4dc35ffaea9
--- /dev/null
+++ b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.13.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roslib"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/test_rosmaster
+		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	)
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_rosmaster/Manifest b/dev-ros/test_rosmaster/Manifest
index 6c3e46551df7..4f62a8b412f2 100644
--- a/dev-ros/test_rosmaster/Manifest
+++ b/dev-ros/test_rosmaster/Manifest
@@ -1,4 +1,5 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.15.13.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.15.13.ebuild
new file mode 100644
index 000000000000..2e62994a05c3
--- /dev/null
+++ b/dev-ros/test_rosmaster/test_rosmaster-1.15.13.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosmaster"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}] )
+"
+
+mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
+
+src_install() {
+	ros-catkin_src_install
+	dodir /usr/share/${PN}
+	cp -a test "${ED}//usr/share/${PN}/" || die
+}
diff --git a/dev-ros/test_rosparam/Manifest b/dev-ros/test_rosparam/Manifest
index 55fd9527ede7..28078a1fcec5 100644
--- a/dev-ros/test_rosparam/Manifest
+++ b/dev-ros/test_rosparam/Manifest
@@ -1,5 +1,6 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/test_rosparam/test_rosparam-1.15.13.ebuild b/dev-ros/test_rosparam/test_rosparam-1.15.13.ebuild
new file mode 100644
index 000000000000..108cabfb7564
--- /dev/null
+++ b/dev-ros/test_rosparam/test_rosparam-1.15.13.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosparam"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	test? (
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_rospy/Manifest b/dev-ros/test_rospy/Manifest
index 6c3e46551df7..4f62a8b412f2 100644
--- a/dev-ros/test_rospy/Manifest
+++ b/dev-ros/test_rospy/Manifest
@@ -1,4 +1,5 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/test_rospy/test_rospy-1.15.13.ebuild b/dev-ros/test_rospy/test_rospy-1.15.13.ebuild
new file mode 100644
index 000000000000..af5f3520b53e
--- /dev/null
+++ b/dev-ros/test_rospy/test_rospy-1.15.13.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rospy"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+	test? (
+		$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
+		dev-ros/rosbuild
+		dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
+	)"
diff --git a/dev-ros/test_rosservice/Manifest b/dev-ros/test_rosservice/Manifest
index 6c3e46551df7..4f62a8b412f2 100644
--- a/dev-ros/test_rosservice/Manifest
+++ b/dev-ros/test_rosservice/Manifest
@@ -1,4 +1,5 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/test_rosservice/test_rosservice-1.15.13.ebuild b/dev-ros/test_rosservice/test_rosservice-1.15.13.ebuild
new file mode 100644
index 000000000000..b73420876103
--- /dev/null
+++ b/dev-ros/test_rosservice/test_rosservice-1.15.13.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rospy"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	test? (
+		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
diff --git a/dev-ros/topic_tools/Manifest b/dev-ros/topic_tools/Manifest
index dafdc0f92db0..9a010b111286 100644
--- a/dev-ros/topic_tools/Manifest
+++ b/dev-ros/topic_tools/Manifest
@@ -1 +1,2 @@
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
diff --git a/dev-ros/topic_tools/topic_tools-1.15.13.ebuild b/dev-ros/topic_tools/topic_tools-1.15.13.ebuild
new file mode 100644
index 000000000000..d5d3a70a1518
--- /dev/null
+++ b/dev-ros/topic_tools/topic_tools-1.15.13.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=tools/${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for directing, throttling and selecting ROS topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostime
+	dev-ros/xmlrpcpp
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosbash[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
+	)"
diff --git a/dev-ros/urdf/urdf-1.13.2-r1.ebuild b/dev-ros/urdf/urdf-1.13.2-r2.ebuild
similarity index 97%
rename from dev-ros/urdf/urdf-1.13.2-r1.ebuild
rename to dev-ros/urdf/urdf-1.13.2-r2.ebuild
index 637c9accd610..6d44db72d056 100644
--- a/dev-ros/urdf/urdf-1.13.2-r1.ebuild
+++ b/dev-ros/urdf/urdf-1.13.2-r2.ebuild
@@ -15,7 +15,7 @@ IUSE=""
 
 RDEPEND="
 	dev-libs/boost:=[threads(+)]
-	dev-libs/urdfdom
+	dev-libs/urdfdom:=
 	dev-libs/urdfdom_headers
 	dev-ros/urdf_parser_plugin
 	dev-ros/pluginlib
diff --git a/dev-ros/urdf/urdf-9999.ebuild b/dev-ros/urdf/urdf-9999.ebuild
index 637c9accd610..6d44db72d056 100644
--- a/dev-ros/urdf/urdf-9999.ebuild
+++ b/dev-ros/urdf/urdf-9999.ebuild
@@ -15,7 +15,7 @@ IUSE=""
 
 RDEPEND="
 	dev-libs/boost:=[threads(+)]
-	dev-libs/urdfdom
+	dev-libs/urdfdom:=
 	dev-libs/urdfdom_headers
 	dev-ros/urdf_parser_plugin
 	dev-ros/pluginlib
diff --git a/dev-ros/xmlrpcpp/Manifest b/dev-ros/xmlrpcpp/Manifest
index 6c3e46551df7..4f62a8b412f2 100644
--- a/dev-ros/xmlrpcpp/Manifest
+++ b/dev-ros/xmlrpcpp/Manifest
@@ -1,4 +1,5 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.13.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.13.ebuild
new file mode 100644
index 000000000000..f3fb15501966
--- /dev/null
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.13.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of the XML-RPC protocol"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rostime
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+		dev-libs/boost[threads(+)]
+	)
+"
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 4854a4b3361d..04570ed9018b 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.89.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.89.0-r1.ebuild
similarity index 90%
rename from kde-frameworks/breeze-icons/breeze-icons-5.89.0.ebuild
rename to kde-frameworks/breeze-icons/breeze-icons-5.89.0-r1.ebuild
index ef153169884c..86ca0137188a 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.89.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.89.0-r1.ebuild
@@ -23,6 +23,11 @@ BDEPEND="${PYTHON_DEPS}
 	test? ( app-misc/fdupes )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-improv-install-of-light-fallback-icons.patch
+	"${FILESDIR}"/${P}-fix-icon_files-list.patch
+)
+
 python_check_deps() {
 	has_version "dev-python/lxml[${PYTHON_USEDEP}]"
 }
diff --git a/kde-frameworks/breeze-icons/files/breeze-icons-5.89.0-fix-icon_files-list.patch b/kde-frameworks/breeze-icons/files/breeze-icons-5.89.0-fix-icon_files-list.patch
new file mode 100644
index 000000000000..b294711e3aac
--- /dev/null
+++ b/kde-frameworks/breeze-icons/files/breeze-icons-5.89.0-fix-icon_files-list.patch
@@ -0,0 +1,41 @@
+From 08bf45db9b883b4201ac3cbb666821472f17ad97 Mon Sep 17 00:00:00 2001
+From: Rodney Dawes <dobey.pwns@gmail.com>
+Date: Mon, 6 Dec 2021 15:13:22 -0500
+Subject: [PATCH] Include "*@*" in the icon_files list for installation
+
+As some of the directories of the theme are symlinks for scaled sizes
+we need to include them in the list of files to install as well.
+---
+ icons-dark/CMakeLists.txt | 2 +-
+ icons/CMakeLists.txt      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/icons-dark/CMakeLists.txt b/icons-dark/CMakeLists.txt
+index ab582c13..6ceddc5c 100644
+--- a/icons-dark/CMakeLists.txt
++++ b/icons-dark/CMakeLists.txt
+@@ -22,7 +22,7 @@ if(NOT WIN32)
+ endif()
+ 
+ if(NOT SKIP_INSTALL_ICONS)
+-    file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg")
++    file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg" "${CMAKE_CURRENT_SOURCE_DIR}/*@*")
+     foreach (icon_file ${icon_files})
+         install(FILES ${icon_file} DESTINATION ${BREEZE_INSTALL_DIR} RENAME ${icon_file})
+     endforeach()
+diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
+index 8f31db4a..b48852eb 100644
+--- a/icons/CMakeLists.txt
++++ b/icons/CMakeLists.txt
+@@ -23,7 +23,7 @@ endif()
+ 
+ if(NOT SKIP_INSTALL_ICONS)
+     # collect all our icons we need to install, will be used by dark icon set as fallback icons if not there, too
+-    file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg")
++    file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg" "${CMAKE_CURRENT_SOURCE_DIR}/*@*")
+     set(BREEZE_LIGHT_ICONS ${icon_files} PARENT_SCOPE)
+     foreach (icon_file ${icon_files})
+         install(FILES ${icon_file} DESTINATION ${BREEZE_INSTALL_DIR} RENAME ${icon_file})
+-- 
+GitLab
+
diff --git a/kde-frameworks/breeze-icons/files/breeze-icons-5.89.0-improv-install-of-light-fallback-icons.patch b/kde-frameworks/breeze-icons/files/breeze-icons-5.89.0-improv-install-of-light-fallback-icons.patch
new file mode 100644
index 000000000000..30bc17dd60be
--- /dev/null
+++ b/kde-frameworks/breeze-icons/files/breeze-icons-5.89.0-improv-install-of-light-fallback-icons.patch
@@ -0,0 +1,125 @@
+From 05f11af435edc57650d0221ed8a74ecfb997e576 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Mon, 6 Dec 2021 18:12:46 +0000
+Subject: [PATCH] improve installation of light fallback icons
+
+icon install works now like this:
+
+* collect all light icons
+* install them just for light theme
+
+* install dark icons
+* install all missing ones from light theme we collected before
+---
+ icons-dark/CMakeLists.txt | 45 +++++++++++----------------------------
+ icons/CMakeLists.txt      | 18 ++++++----------
+ 2 files changed, 20 insertions(+), 43 deletions(-)
+
+diff --git a/icons-dark/CMakeLists.txt b/icons-dark/CMakeLists.txt
+index 40590a8b..ab582c13 100644
+--- a/icons-dark/CMakeLists.txt
++++ b/icons-dark/CMakeLists.txt
+@@ -4,10 +4,6 @@ endif()
+ 
+ ########### install files ###############
+ 
+-set(breeze_icon_dark_dirs
+-    actions animations applets apps devices emblems
+-    mimetypes places status)
+-
+ set(BREEZE_INSTALL_DIR ${KDE_INSTALL_FULL_ICONDIR}/breeze-dark)
+ 
+ if(WITH_ICON_GENERATION)
+@@ -26,36 +22,21 @@ if(NOT WIN32)
+ endif()
+ 
+ if(NOT SKIP_INSTALL_ICONS)
+-    # In order to ensure the dark icons are copied over the light icons which
+-    # are installed into the dark theme for BUG:444095, we need to execute the
+-    # copy command ourselves rather than using CMake's internal copy mechanism
+-    # used by the normal install command, so we use CODE mode of install to
+-    # execute_process and print an appropriate status message.
+-    # See https://bugs.kde.org/show_bug.cgi?id=445489
+-    set(COPY_CMD "cp -a")
+-    set(XCOPY_ARGS "")
+-    if(WIN32)
+-        set(COPY_CMD "xcopy")
+-        set(XCOPY_ARGS "/q /e /y")
+-    endif(WIN32)
+-    install(CODE "cmake_policy(VERSION 3.6)
+-        foreach(CAT_DIR ${breeze_icon_dark_dirs})
+-            execute_process(COMMAND ${COPY_CMD} \${CAT_DIR} \$ENV{DESTDIR}${BREEZE_INSTALL_DIR} ${XCOPY_ARGS} ERROR_QUIET WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+-        endforeach()
+-        file(GLOB_RECURSE ICON_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} LIST_DIRECTORIES false ${CMAKE_CURRENT_SOURCE_DIR}/*.svg)
+-        foreach(ICON_FILE IN LISTS ICON_FILES)
+-            message(STATUS \"Installing: \$ENV{DESTDIR}${BREEZE_INSTALL_DIR}/\${ICON_FILE}\")
+-        endforeach()")
++    file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg")
++    foreach (icon_file ${icon_files})
++        install(FILES ${icon_file} DESTINATION ${BREEZE_INSTALL_DIR} RENAME ${icon_file})
++    endforeach()
++
++    # install for all missing icons the light icons as fallback
++    foreach (icon_file ${BREEZE_LIGHT_ICONS})
++        if (NOT ${icon_file} IN_LIST icon_files)
++            install(FILES ${CMAKE_SOURCE_DIR}/icons/${icon_file} DESTINATION ${BREEZE_INSTALL_DIR} RENAME ${icon_file})
++        endif()
++    endforeach()
++
+     install(FILES index.theme DESTINATION ${BREEZE_INSTALL_DIR})
+     if(WITH_ICON_GENERATION)
+-        install(CODE "cmake_policy(VERSION 3.6)
+-            foreach(GEN_DIR ${breeze_icon_dark_dirs})
+-                execute_process(COMMAND ${COPY_CMD} \${GEN_DIR} \$ENV{DESTDIR}${BREEZE_INSTALL_DIR} ${XCOPY_ARGS} ERROR_QUIET WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated)
+-            endforeach()
+-            file(GLOB_RECURSE ICON_FILES RELATIVE ${CMAKE_CURRENT_BINARY_DIR}/generated LIST_DIRECTORIES false ${CMAKE_CURRENT_BINARY_DIR}/generated/*.svg)
+-            foreach(ICON_FILE IN LISTS ICON_FILES)
+-                message(STATUS \"Installing: \$ENV{DESTDIR}${BREEZE_INSTALL_DIR}/\${ICON_FILE}\")
+-            endforeach()")
++        install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated/ DESTINATION ${BREEZE_INSTALL_DIR})
+     endif()
+ endif()
+ 
+diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
+index 220b81e9..8f31db4a 100644
+--- a/icons/CMakeLists.txt
++++ b/icons/CMakeLists.txt
+@@ -4,10 +4,6 @@ endif()
+ 
+ ########### install files ###############
+ 
+-set(breeze_icon_dirs
+-    actions animations applets apps categories preferences devices emblems
+-    emotes mimetypes places status)
+-
+ set(BREEZE_INSTALL_DIR ${KDE_INSTALL_FULL_ICONDIR}/breeze)
+ 
+ if(WITH_ICON_GENERATION)
+@@ -26,17 +22,17 @@ if(NOT WIN32)
+ endif()
+ 
+ if(NOT SKIP_INSTALL_ICONS)
+-    install(DIRECTORY ${breeze_icon_dirs} DESTINATION ${BREEZE_INSTALL_DIR})
++    # collect all our icons we need to install, will be used by dark icon set as fallback icons if not there, too
++    file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg")
++    set(BREEZE_LIGHT_ICONS ${icon_files} PARENT_SCOPE)
++    foreach (icon_file ${icon_files})
++        install(FILES ${icon_file} DESTINATION ${BREEZE_INSTALL_DIR} RENAME ${icon_file})
++    endforeach()
++
+     install(FILES index.theme DESTINATION ${BREEZE_INSTALL_DIR})
+     if(WITH_ICON_GENERATION)
+         install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated/ DESTINATION ${BREEZE_INSTALL_DIR})
+     endif()
+-
+-    # Install the colored icon sizes into breeze-dark theme as well, to ensure
+-    # that icons are available on alternate environments which do not support
+-    # colorized symbolic icons which are not named as "-symbolic"
+-    # NOTE: icons-dark will install /some/ files over top of these
+-    install(DIRECTORY ${breeze_icon_dirs} DESTINATION ${BREEZE_INSTALL_DIR}-dark)
+ endif()
+ 
+ gtk_update_icon_cache(${BREEZE_INSTALL_DIR})
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-svg-smaller-mask-to-hide-glitches.patch b/kde-frameworks/plasma/files/plasma-5.88.0-svg-smaller-mask-to-hide-glitches.patch
new file mode 100644
index 000000000000..f735b392667b
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.88.0-svg-smaller-mask-to-hide-glitches.patch
@@ -0,0 +1,42 @@
+From 9ba4ed4da72a3d1bbec8920d93a547cf633cfacd Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Wed, 10 Nov 2021 15:50:10 +0100
+Subject: [PATCH] smaller mask to hide glitches
+
+This makes the mask slightly maller than the frame. Since the svg will have antialiasing and the mask not,
+there will be artifacts at the corners, if they go under the svg they're less evident
+
+CCBUG:438644
+---
+ src/plasmaquick/dialog.cpp | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
+index 3254b8320..6b3963303 100644
+--- a/src/plasmaquick/dialog.cpp
++++ b/src/plasmaquick/dialog.cpp
+@@ -237,14 +237,19 @@ void DialogPrivate::updateTheme()
+             frameSvgItem->setImagePath(prefix + QStringLiteral("dialogs/background"));
+         }
+ 
+-        KWindowEffects::enableBlurBehind(q, theme.blurBehindEnabled(), frameSvgItem->mask());
++        // This makes the mask slightly maller than the frame. Since the svg will have antialiasing and the mask not,
++        // there will be artifacts at the corners, if they go under the svg they're less evident
++        frameSvgItem->frameSvg()->resizeFrame(q->size() - QSize(2,2));
++        const QRegion mask = frameSvgItem->frameSvg()->mask().translated(1,1);
++        KWindowEffects::enableBlurBehind(q, theme.blurBehindEnabled(), mask);
+ 
+         KWindowEffects::enableBackgroundContrast(q,
+                                                  theme.backgroundContrastEnabled(),
+                                                  theme.backgroundContrast(),
+                                                  theme.backgroundIntensity(),
+                                                  theme.backgroundSaturation(),
+-                                                 frameSvgItem->mask());
++                                                 mask);
++        frameSvgItem->frameSvg()->resizeFrame(q->size());
+ 
+         if (KWindowSystem::compositingActive()) {
+             if (hasMask) {
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.88.0-r3.ebuild b/kde-frameworks/plasma/plasma-5.88.0-r3.ebuild
new file mode 100644
index 000000000000..987c2970f561
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.88.0-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gles2-only man wayland X"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kactivities-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kdeclarative-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	!gles2-only? ( media-libs/libglvnd[X?] )
+	wayland? (
+		=kde-frameworks/kwayland-${PVCUT}*:5
+		media-libs/libglvnd
+	)
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-make-OSD-an-actual-wayland-OSD.patch
+	"${FILESDIR}"/${P}-fix-misrenderings-with-transparency.patch # KDE-bug 305247
+	"${FILESDIR}"/${P}-fix-centered-text.patch # KDE-bug 442830
+	"${FILESDIR}"/${P}-reload-shared-renderers-if-changed-on-disk.patch # KDE-bug 445516
+	"${FILESDIR}"/${P}-no-double-delete.patch # KDE-bug 446195
+	"${FILESDIR}"/${P}-update-after-clearing-actions.patch # KDE-bug 446195
+	"${FILESDIR}"/${P}-svg-smaller-mask-to-hide-glitches.patch # KDE-bug 438644
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package !gles2-only OpenGL)
+		$(cmake_use_find_package man KF5DocTools)
+		$(cmake_use_find_package wayland EGL)
+		$(cmake_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X XCB)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 74004a6a032d..306a08a88c8e 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/kwin/files/kwin-5.23.4-fix-memory-leak-caching-QSGTexture.patch b/kde-plasma/kwin/files/kwin-5.23.4-fix-memory-leak-caching-QSGTexture.patch
new file mode 100644
index 000000000000..5abcfa49969c
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.23.4-fix-memory-leak-caching-QSGTexture.patch
@@ -0,0 +1,50 @@
+From 8accc777a5b3ab1e53341f1838ed636652dc1221 Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Mon, 13 Dec 2021 12:53:32 +0200
+Subject: [PATCH] Fix memory leak in some plasma components
+
+A few plasma components cache QSGTexture. Those components rely on
+texture references going away with QSGNode users. However, with the
+current tear down logic, OffscreenQuickView won't destroy any paint
+nodes.
+
+Destroy QQuickRenderControl before QQuickWindow to ensure that are no
+paint nodes left alive after OffscreenQuickView.
+
+BUG: 444429
+BUG: 444381
+BUG: 444077
+BUG: 444306
+(cherry picked from commit 64f2cdf9ed290a1fb7c2bf41753613078eb023c4)
+---
+ src/libkwineffects/kwineffectquickview.cpp | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/libkwineffects/kwineffectquickview.cpp b/src/libkwineffects/kwineffectquickview.cpp
+index ca5a025729..14be1e1b25 100644
+--- a/src/libkwineffects/kwineffectquickview.cpp
++++ b/src/libkwineffects/kwineffectquickview.cpp
+@@ -160,13 +160,15 @@ EffectQuickView::EffectQuickView(QObject *parent, QWindow *renderWindow, ExportM
+ EffectQuickView::~EffectQuickView()
+ {
+     if (d->m_glcontext) {
+-        d->m_glcontext->makeCurrent(d->m_offscreenSurface.data());
+         // close the view whilst we have an active GL context
+-        delete d->m_view;
+-        d->m_view = nullptr;
+-        d->m_renderControl->invalidate();
+-        d->m_glcontext->doneCurrent();
++        d->m_glcontext->makeCurrent(d->m_offscreenSurface.data());
+     }
++
++    delete d->m_renderControl; // Always delete render control first.
++    d->m_renderControl = nullptr;
++
++    delete d->m_view;
++    d->m_view = nullptr;
+ }
+ 
+ bool EffectQuickView::automaticRepaint() const
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.23.4-xdgshell-protect-from-invalid-frameGeometry.patch b/kde-plasma/kwin/files/kwin-5.23.4-xdgshell-protect-from-invalid-frameGeometry.patch
new file mode 100644
index 000000000000..a80348be3562
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.23.4-xdgshell-protect-from-invalid-frameGeometry.patch
@@ -0,0 +1,36 @@
+From 77b678c522cce0e8e7b39087f74e2ac591cd28d0 Mon Sep 17 00:00:00 2001
+From: Ismael Asensio <isma.af@gmail.com>
+Date: Sun, 12 Dec 2021 15:16:28 +0100
+Subject: [PATCH] XDGShellClient: Protect from invalid frameGeometry on
+ updateDecoration
+
+When updating window decoration do not try to restore the previous frameGeometry
+if it was invalid.
+
+This fixes the case when applying a `noBorder=true` rule on a newly created
+client would set it to a minimal window size
+
+Targeted at 5.23 only, since this codepath is being reworked for 5.24
+
+BUG: 445140
+FIXED-IN: 5.23.5
+---
+ src/xdgshellclient.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/xdgshellclient.cpp b/src/xdgshellclient.cpp
+index b4427b8cf7..75c4031498 100644
+--- a/src/xdgshellclient.cpp
++++ b/src/xdgshellclient.cpp
+@@ -637,7 +637,7 @@ void XdgToplevelClient::updateDecoration(bool check_workspace_pos, bool force)
+         scheduleConfigure();
+     }
+     updateShadow();
+-    if (check_workspace_pos) {
++    if (check_workspace_pos && oldFrameGeometry.isValid()) {
+         const QRect oldGeometryRestore = geometryRestore();
+         setGeometryRestore(frameGeometry());
+         checkWorkspacePosition(oldFrameGeometry, oldClientGeometry);
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/kwin-5.23.4-r2.ebuild b/kde-plasma/kwin/kwin-5.23.4-r2.ebuild
new file mode 100644
index 000000000000..dcbd921d6a07
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.23.4-r2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="accessibility caps gles2-only multimedia plasma screencast"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/libinput-1.14
+	>=dev-libs/wayland-1.2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=,libinput]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5=
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5=[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	>=kde-plasma/kwayland-server-${PVCUT}:5
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/lcms:2
+	media-libs/libepoxy
+	>=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X]
+	virtual/libudev:=
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libdrm
+	>=x11-libs/libxcb-1.10
+	>=x11-libs/libxkbcommon-0.7.0
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	accessibility? ( media-libs/libqaccessibilityclient:5 )
+	caps? ( sys-libs/libcap )
+	gles2-only? ( media-libs/mesa[gles2] )
+	plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
+	screencast? ( >=media-video/pipewire-0.3:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+	sys-apps/hwdata
+	x11-base/xwayland
+	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	x11-base/xorg-proto
+	test? (
+		>=dev-libs/wayland-protocols-1.19
+		>=dev-qt/qtwayland-${QTMIN}:5
+	)
+"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-wayland-resize-to-last-requested-client-size.patch # KDE-bug 444962
+	"${FILESDIR}"/${P}-scripting-fix-KWinComponents-Workspace-type.patch
+	"${FILESDIR}"/${P}-drm-remove-dpms-filter-when-outputs-are-added.patch # KDE-bug 446699
+	"${FILESDIR}"/${P}-xdgshell-protect-from-invalid-frameGeometry.patch # KDE-bug 445140
+	"${FILESDIR}"/${P}-fix-memory-leak-caching-QSGTexture.patch # KDE-bug 444077 +more
+)
+
+src_prepare() {
+	ecm_src_prepare
+	use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
+
+	# TODO: try to get a build switch upstreamed
+	if ! use screencast; then
+		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package accessibility QAccessibilityClient)
+		$(cmake_use_find_package caps Libcap)
+		$(cmake_use_find_package plasma KF5Runner)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	optfeature "color management support" x11-misc/colord
+	elog
+	elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
+	elog "windows to the end of the list was changed so that it remains in the"
+	elog "original order. To revert to the well established behavior:"
+	elog
+	elog " - Edit ~/.config/kwinrc"
+	elog " - Find [TabBox] section"
+	elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
+}
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch b/kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch
new file mode 100644
index 000000000000..f37fbf60bf81
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch
@@ -0,0 +1,76 @@
+From 311faef0ef0e5f60eebed2a5a00c43f5cb60aab1 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Tue, 7 Dec 2021 22:23:17 +0100
+Subject: [PATCH] Handle process parent changes in ProcessDataModel
+
+When the PPID of a process changes, it moves around in the model, changing the
+layout. This needs to be announced properly, otherwise users of the model get
+confused, leading to weird behaviour and crashes.
+
+The added code is pretty much a direct copy from ProcessModel.
+
+BUG: 446534
+
+
+(cherry picked from commit a0d70929a1b5e38bd8bf61e1895321124acf03a7)
+---
+ processcore/process_data_model.cpp | 29 +++++++++++++++++++++++++++++
+ 1 file changed, 29 insertions(+)
+
+diff --git a/processcore/process_data_model.cpp b/processcore/process_data_model.cpp
+index 172ce7f..f776372 100644
+--- a/processcore/process_data_model.cpp
++++ b/processcore/process_data_model.cpp
+@@ -24,6 +24,8 @@ public:
+     Private(ProcessDataModel *q);
+     void beginInsertRow(KSysGuard::Process *parent);
+     void endInsertRow();
++    void beginMoveProcess(KSysGuard::Process *process, KSysGuard::Process *new_parent);
++    void endMoveProcess();
+     void beginRemoveRow(KSysGuard::Process *process);
+     void endRemoveRow();
+ 
+@@ -65,6 +67,12 @@ ProcessDataModel::Private::Private(ProcessDataModel *_q)
+     connect(m_processes.get(), &KSysGuard::Processes::endAddProcess, q, [this]() {
+         endInsertRow();
+     });
++    connect(m_processes.get(), &KSysGuard::Processes::beginMoveProcess, q, [this](KSysGuard::Process *process, KSysGuard::Process *new_parent) {
++        beginMoveProcess(process, new_parent);
++    });
++    connect(m_processes.get(), &KSysGuard::Processes::endMoveProcess, q, [this]() {
++        endMoveProcess();
++    });
+     connect(m_processes.get(), &KSysGuard::Processes::beginRemoveProcess, q, [this](KSysGuard::Process *process) {
+         beginRemoveRow(process);
+     });
+@@ -335,6 +343,27 @@ void ProcessDataModel::Private::endRemoveRow()
+     q->endRemoveRows();
+ }
+ 
++void ProcessDataModel::Private::beginMoveProcess(KSysGuard::Process *process, KSysGuard::Process *new_parent)
++{
++    if (m_flatList)
++        return; // We don't need to move processes when in simple mode
++
++    int current_row = process->parent()->children().indexOf(process);
++    Q_ASSERT(current_row != -1);
++    int new_row = new_parent->children().count();
++    QModelIndex sourceParent = getQModelIndex(process->parent(), 0);
++    QModelIndex destinationParent = getQModelIndex(new_parent, 0);
++    q->beginMoveRows(sourceParent, current_row, current_row, destinationParent, new_row);
++}
++
++void ProcessDataModel::Private::endMoveProcess()
++{
++    if (m_flatList)
++        return; // We don't need to move processes when in simple mode
++
++    q->endMoveRows();
++}
++
+ void ProcessDataModel::Private::update()
+ {
+     Processes::UpdateFlags flags;
+-- 
+GitLab
+
diff --git a/kde-plasma/libksysguard/libksysguard-5.23.4-r1.ebuild b/kde-plasma/libksysguard/libksysguard-5.23.4-r1.ebuild
new file mode 100644
index 000000000000..a2127dcf2c23
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.23.4-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="true"
+KFMIN=5.86.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Task management and system monitoring library"
+
+LICENSE="LGPL-2+"
+SLOT="5/9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="webengine X"
+
+COMMON_DEPEND="
+	dev-libs/libnl:3
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	net-libs/libpcap
+	sys-apps/lm-sensors:=
+	sys-libs/libcap
+	sys-libs/zlib
+	webengine? (
+		>=dev-qt/qtwebchannel-${QTMIN}:5
+		>=dev-qt/qtwebengine-${QTMIN}:5
+	)
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libXres
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/ksysguard-5.21.90:5
+	!<kde-plasma/plasma-workspace-5.18.80:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" # downstream
+	"${FILESDIR}/${P}-fix-segfault.patch" # KDE-bug 446534
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package webengine Qt5WebChannel)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	LC_NUMERIC="C" ecm_src_test # bug 695514
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index e32e08dbfef3..95731b62677c 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index 2891222742f2..4fdc2c890216 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -1 +1,2 @@
 DIST imv-4.3.0.tar.gz 79031 BLAKE2B f620e1d05827f93eae03a01f62cbb1426a623b4ef2e758a5fea2539193292fada0b8bf34276443d787b5a1537e92cd66e94b574a646319c3c37fbf2557bda4eb SHA512 1735c03c48888004b11b3aaf0215a9530c035468a8efdb210d856551ebb75030c906eee2b6ab80e5d3646206e6051a73a8c5e15c010dd09bca7f9e90f9b0e34b
+DIST imv-4.3.1.tar.gz 79123 BLAKE2B 9c818a5a29457313c3d0ed1a8558555b2069aec837939dc1d2b71668ec2fd39867c8ad4fcf8605243ded96e27d346af4307d83c8854538981b62c968e9ec0ede SHA512 f70b95f3f99d7d6a9276370650cef0885938464e3a40ab1768231292ba35d9040f7196a5853ea1268fe6d47cf08d129b3fbae1ca215df96d12ccd85b7efd1ee6
diff --git a/media-gfx/imv/imv-4.3.1.ebuild b/media-gfx/imv/imv-4.3.1.ebuild
new file mode 100644
index 000000000000..55cdc69ad90e
--- /dev/null
+++ b/media-gfx/imv/imv-4.3.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~exec64/imv/"
+else
+	SRC_URI="https://git.sr.ht/~exec64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Minimal image viewer designed for tiling window manager users"
+HOMEPAGE="https://sr.ht/~exec64/imv/"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+IUSE="+X +freeimage gif heif jpeg png svg test tiff wayland"
+REQUIRED_USE="|| ( X wayland )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/icu:=
+	dev-libs/inih
+	media-libs/libglvnd[X?]
+	x11-libs/cairo
+	x11-libs/libxkbcommon[X?]
+	x11-libs/pango
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb:=
+	)
+	freeimage? ( media-libs/freeimage )
+	gif? ( media-libs/libnsgif )
+	heif? ( media-libs/libheif:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( media-libs/libpng:= )
+	svg? ( >=gnome-base/librsvg-2.44:2 )
+	tiff? ( media-libs/tiff )
+	wayland? ( dev-libs/wayland )
+	!sys-apps/renameutils"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	test? ( dev-util/cmocka )"
+BDEPEND="
+	app-text/asciidoc
+	wayland? ( dev-util/wayland-scanner )"
+
+src_prepare() {
+	default
+
+	# if wayland-only, don't automagic on libGL and force libOpenGL
+	if ! use X; then
+		sed -i "/dependency('gl'/{s/'gl'/'opengl'/;s/false/true/}" meson.build || die
+	fi
+
+	# glu isn't used by anything
+	sed -i "/dependency('glu')/d" meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature freeimage)
+		$(meson_feature gif libnsgif)
+		$(meson_feature heif libheif)
+		$(meson_feature jpeg libjpeg)
+		$(meson_feature png libpng)
+		$(meson_feature svg librsvg)
+		$(meson_feature test)
+		$(meson_feature tiff libtiff)
+		-Dwindows=$(usex X $(usex wayland all x11) wayland)
+	)
+
+	meson_src_configure
+}
diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild
index 992772d5dd6e..55cdc69ad90e 100644
--- a/media-gfx/imv/imv-9999.ebuild
+++ b/media-gfx/imv/imv-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson xdg
 
@@ -9,7 +9,8 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~exec64/imv/"
 else
-	SRC_URI="https://github.com/eXeC64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://git.sr.ht/~exec64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -39,7 +40,7 @@ RDEPEND="
 	heif? ( media-libs/libheif:= )
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	png? ( media-libs/libpng:= )
-	svg? ( >=gnome-base/librsvg-2.44 )
+	svg? ( >=gnome-base/librsvg-2.44:2 )
 	tiff? ( media-libs/tiff )
 	wayland? ( dev-libs/wayland )
 	!sys-apps/renameutils"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 959f6d7604f0..856437da2330 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ddf66cf0b03a..10f43f0d30dc 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 15 Dec 2021 07:09:04 +0000
+Wed, 15 Dec 2021 12:09:04 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ddf66cf0b03a..10f43f0d30dc 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 15 Dec 2021 07:09:04 +0000
+Wed, 15 Dec 2021 12:09:04 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 7362bf07530b..7b9438d36266 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 3d5cfb68f8a1..b748599ee7c7 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/ruffle-0_p20211214 b/metadata/md5-cache/app-emulation/ruffle-0_p20211214
index 13d5675644e0..bdeaa210e88a 100644
--- a/metadata/md5-cache/app-emulation/ruffle-0_p20211214
+++ b/metadata/md5-cache/app-emulation/ruffle-0_p20211214
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/pkgconfig >=virtual/rust-1.56 >=virtual/rust-1.53
+BDEPEND=|| ( dev-lang/python:3.10[xml] dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) virtual/pkgconfig >=virtual/rust-1.56 >=virtual/rust-1.53
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
 DEPEND=dev-libs/openssl:= media-libs/alsa-lib sys-libs/zlib:= x11-libs/libxcb:=
 DESCRIPTION=Flash Player emulator written in Rust
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/openssl:= media-libs/alsa-lib sys-libs/zlib:= x11-libs/libxcb:=
 SLOT=0
 SRC_URI=https://github.com/ruffle-rs/ruffle/archive/refs/tags/nightly-2021-12-14.tar.gz -> ruffle-nightly-2021-12-14.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/alsa/0.5.0/download -> alsa-0.5.0.crate https://crates.io/api/v1/crates/alsa-sys/0.3.1/download -> alsa-sys-0.3.1.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/approx/0.5.0/download -> approx-0.5.0.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/arrayvec/0.7.2/download -> arrayvec-0.7.2.crate https://crates.io/api/v1/crates/ash/0.33.3+1.2.191/download -> ash-0.33.3+1.2.191.crate https://crates.io/api/v1/crates/async-channel/1.6.1/download -> async-channel-1.6.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bindgen/0.56.0/download -> bindgen-0.56.0.crate https://crates.io/api/v1/crates/bit-set/0.5.2/download -> bit-set-0.5.2.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bitflags_serde_shim/0.2.2/download -> bitflags_serde_shim-0.2.2.crate https://crates.io/api/v1/crates/bitstream-io/1.2.0/download -> bitstream-io-1.2.0.crate https://crates.io/api/v1/crates/bitvec/0.19.6/download -> bitvec-0.19.6.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/block-buffer/0.10.0/download -> block-buffer-0.10.0.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/build_const/0.2.2/download -> build_const-0.2.2.crate https://crates.io/api/v1/crates/bumpalo/3.8.0/download -> bumpalo-3.8.0.crate https://crates.io/api/v1/crates/bytemuck/1.7.2/download -> bytemuck-1.7.2.crate https://crates.io/api/v1/crates/bytemuck_derive/1.0.1/download -> bytemuck_derive-1.0.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.1.0/download -> bytes-1.1.0.crate https://crates.io/api/v1/crates/cache-padded/1.1.1/download -> cache-padded-1.1.1.crate https://crates.io/api/v1/crates/calloop/0.9.1/download -> calloop-0.9.1.crate https://crates.io/api/v1/crates/castaway/0.1.1/download -> castaway-0.1.1.crate https://crates.io/api/v1/crates/cc/1.0.72/download -> cc-1.0.72.crate https://crates.io/api/v1/crates/cesu8/1.1.0/download -> cesu8-1.1.0.crate https://crates.io/api/v1/crates/cexpr/0.4.0/download -> cexpr-0.4.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/cfg_aliases/0.1.1/download -> cfg_aliases-0.1.1.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clang-sys/1.3.0/download -> clang-sys-1.3.0.crate https://crates.io/api/v1/crates/clap/3.0.0-beta.5/download -> clap-3.0.0-beta.5.crate https://crates.io/api/v1/crates/clap_derive/3.0.0-beta.5/download -> clap_derive-3.0.0-beta.5.crate https://crates.io/api/v1/crates/clipboard/0.5.0/download -> clipboard-0.5.0.crate https://crates.io/api/v1/crates/clipboard-win/2.2.0/download -> clipboard-win-2.2.0.crate https://crates.io/api/v1/crates/cocoa/0.24.0/download -> cocoa-0.24.0.crate https://crates.io/api/v1/crates/cocoa-foundation/0.1.0/download -> cocoa-foundation-0.1.0.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.crate https://crates.io/api/v1/crates/color_quant/1.1.0/download -> color_quant-1.1.0.crate https://crates.io/api/v1/crates/combine/4.6.2/download -> combine-4.6.2.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/console/0.15.0/download -> console-0.15.0.crate https://crates.io/api/v1/crates/console_error_panic_hook/0.1.7/download -> console_error_panic_hook-0.1.7.crate https://crates.io/api/v1/crates/console_log/0.2.0/download -> console_log-0.2.0.crate https://crates.io/api/v1/crates/cookie-factory/0.3.2/download -> cookie-factory-0.3.2.crate https://crates.io/api/v1/crates/copyless/0.1.5/download -> copyless-0.1.5.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.2/download -> core-foundation-0.9.2.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/core-graphics/0.19.2/download -> core-graphics-0.19.2.crate https://crates.io/api/v1/crates/core-graphics/0.22.3/download -> core-graphics-0.22.3.crate https://crates.io/api/v1/crates/core-graphics-types/0.1.1/download -> core-graphics-types-0.1.1.crate https://crates.io/api/v1/crates/core-video-sys/0.1.4/download -> core-video-sys-0.1.4.crate https://crates.io/api/v1/crates/coreaudio-rs/0.10.0/download -> coreaudio-rs-0.10.0.crate https://crates.io/api/v1/crates/coreaudio-sys/0.2.8/download -> coreaudio-sys-0.2.8.crate https://crates.io/api/v1/crates/cpal/0.13.4/download -> cpal-0.13.4.crate https://crates.io/api/v1/crates/cpufeatures/0.2.1/download -> cpufeatures-0.2.1.crate https://crates.io/api/v1/crates/crc/1.8.1/download -> crc-1.8.1.crate https://crates.io/api/v1/crates/crc32fast/1.3.0/download -> crc32fast-1.3.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.1/download -> crossbeam-channel-0.5.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.5/download -> crossbeam-epoch-0.9.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.5/download -> crossbeam-utils-0.8.5.crate https://crates.io/api/v1/crates/crypto-common/0.1.0/download -> crypto-common-0.1.0.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/ctor/0.1.21/download -> ctor-0.1.21.crate https://crates.io/api/v1/crates/cty/0.2.2/download -> cty-0.2.2.crate https://crates.io/api/v1/crates/curl/0.4.41/download -> curl-0.4.41.crate https://crates.io/api/v1/crates/curl-sys/0.4.51+curl-7.80.0/download -> curl-sys-0.4.51+curl-7.80.0.crate https://crates.io/api/v1/crates/d3d12/0.4.1/download -> d3d12-0.4.1.crate https://crates.io/api/v1/crates/darling/0.10.2/download -> darling-0.10.2.crate https://crates.io/api/v1/crates/darling/0.13.0/download -> darling-0.13.0.crate https://crates.io/api/v1/crates/darling_core/0.10.2/download -> darling_core-0.10.2.crate https://crates.io/api/v1/crates/darling_core/0.13.0/download -> darling_core-0.13.0.crate https://crates.io/api/v1/crates/darling_macro/0.10.2/download -> darling_macro-0.10.2.crate https://crates.io/api/v1/crates/darling_macro/0.13.0/download -> darling_macro-0.13.0.crate https://crates.io/api/v1/crates/deflate/0.8.6/download -> deflate-0.8.6.crate https://crates.io/api/v1/crates/deflate/0.9.1/download -> deflate-0.9.1.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/derive-try-from-primitive/1.0.0/download -> derive-try-from-primitive-1.0.0.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/digest/0.10.0/download -> digest-0.10.0.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.5.0/download -> dlib-0.5.0.crate https://crates.io/api/v1/crates/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/embed-resource/1.6.5/download -> embed-resource-1.6.5.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/encoding_rs/0.8.30/download -> encoding_rs-0.8.30.crate https://crates.io/api/v1/crates/enum-map/1.1.1/download -> enum-map-1.1.1.crate https://crates.io/api/v1/crates/enum-map-derive/0.6.0/download -> enum-map-derive-0.6.0.crate https://crates.io/api/v1/crates/enumset/1.0.8/download -> enumset-1.0.8.crate https://crates.io/api/v1/crates/enumset_derive/0.5.5/download -> enumset_derive-0.5.5.crate https://crates.io/api/v1/crates/env_logger/0.9.0/download -> env_logger-0.9.0.crate https://crates.io/api/v1/crates/euclid/0.22.6/download -> euclid-0.22.6.crate https://crates.io/api/v1/crates/event-listener/2.5.1/download -> event-listener-2.5.1.crate https://crates.io/api/v1/crates/fastrand/1.5.0/download -> fastrand-1.5.0.crate https://crates.io/api/v1/crates/flate2/1.0.22/download -> flate2-1.0.22.crate https://crates.io/api/v1/crates/float_next_after/0.1.5/download -> float_next_after-0.1.5.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/funty/1.1.0/download -> funty-1.1.0.crate https://crates.io/api/v1/crates/futures/0.3.18/download -> futures-0.3.18.crate https://crates.io/api/v1/crates/futures-channel/0.3.18/download -> futures-channel-0.3.18.crate https://crates.io/api/v1/crates/futures-core/0.3.18/download -> futures-core-0.3.18.crate https://crates.io/api/v1/crates/futures-executor/0.3.18/download -> futures-executor-0.3.18.crate https://crates.io/api/v1/crates/futures-io/0.3.18/download -> futures-io-0.3.18.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.18/download -> futures-macro-0.3.18.crate https://crates.io/api/v1/crates/futures-sink/0.3.18/download -> futures-sink-0.3.18.crate https://crates.io/api/v1/crates/futures-task/0.3.18/download -> futures-task-0.3.18.crate https://crates.io/api/v1/crates/futures-util/0.3.18/download -> futures-util-0.3.18.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/generational-arena/0.2.8/download -> generational-arena-0.2.8.crate https://crates.io/api/v1/crates/generic-array/0.14.4/download -> generic-array-0.14.4.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gif/0.11.3/download -> gif-0.11.3.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/glow/0.11.0/download -> glow-0.11.0.crate https://crates.io/api/v1/crates/gpu-alloc/0.5.2/download -> gpu-alloc-0.5.2.crate https://crates.io/api/v1/crates/gpu-alloc-types/0.2.0/download -> gpu-alloc-types-0.2.0.crate https://crates.io/api/v1/crates/gpu-descriptor/0.2.2/download -> gpu-descriptor-0.2.2.crate https://crates.io/api/v1/crates/gpu-descriptor-types/0.1.1/download -> gpu-descriptor-types-0.1.1.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hexf-parse/0.2.1/download -> hexf-parse-0.2.1.crate https://crates.io/api/v1/crates/http/0.2.5/download -> http-0.2.5.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/image/0.23.14/download -> image-0.23.14.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/indicatif/0.16.2/download -> indicatif-0.16.2.crate https://crates.io/api/v1/crates/inplace_it/0.3.3/download -> inplace_it-0.3.3.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/isahc/1.6.0/download -> isahc-1.6.0.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/jni/0.19.0/download -> jni-0.19.0.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.0.crate https://crates.io/api/v1/crates/jobserver/0.1.24/download -> jobserver-0.1.24.crate https://crates.io/api/v1/crates/jpeg-decoder/0.1.22/download -> jpeg-decoder-0.1.22.crate https://crates.io/api/v1/crates/jpeg-decoder/0.2.1/download -> jpeg-decoder-0.2.1.crate https://crates.io/api/v1/crates/js-sys/0.3.55/download -> js-sys-0.3.55.crate https://crates.io/api/v1/crates/json/0.12.4/download -> json-0.12.4.crate https://crates.io/api/v1/crates/khronos-egl/4.1.0/download -> khronos-egl-4.1.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lexical-core/0.7.6/download -> lexical-core-0.7.6.crate https://crates.io/api/v1/crates/libc/0.2.109/download -> libc-0.2.109.crate https://crates.io/api/v1/crates/libflate/1.1.1/download -> libflate-1.1.1.crate https://crates.io/api/v1/crates/libflate_lz77/1.1.0/download -> libflate_lz77-1.1.0.crate https://crates.io/api/v1/crates/libloading/0.7.2/download -> libloading-0.7.2.crate https://crates.io/api/v1/crates/libnghttp2-sys/0.1.7+1.45.0/download -> libnghttp2-sys-0.1.7+1.45.0.crate https://crates.io/api/v1/crates/libz-sys/1.1.3/download -> libz-sys-1.1.3.crate https://crates.io/api/v1/crates/lock_api/0.4.5/download -> lock_api-0.4.5.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/lyon/0.17.10/download -> lyon-0.17.10.crate https://crates.io/api/v1/crates/lyon_algorithms/0.17.7/download -> lyon_algorithms-0.17.7.crate https://crates.io/api/v1/crates/lyon_geom/0.17.6/download -> lyon_geom-0.17.6.crate https://crates.io/api/v1/crates/lyon_path/0.17.7/download -> lyon_path-0.17.7.crate https://crates.io/api/v1/crates/lyon_tessellation/0.17.10/download -> lyon_tessellation-0.17.10.crate https://crates.io/api/v1/crates/lzma-rs/0.2.0/download -> lzma-rs-0.2.0.crate https://crates.io/api/v1/crates/mach/0.3.2/download -> mach-0.3.2.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memmap2/0.3.1/download -> memmap2-0.3.1.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/metal/0.23.1/download -> metal-0.23.1.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/minimp3/0.5.1/download -> minimp3-0.5.1.crate https://crates.io/api/v1/crates/minimp3-sys/0.3.2/download -> minimp3-sys-0.3.2.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/mio/0.8.0/download -> mio-0.8.0.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/naga/0.7.2/download -> naga-0.7.2.crate https://crates.io/api/v1/crates/ndk/0.3.0/download -> ndk-0.3.0.crate https://crates.io/api/v1/crates/ndk/0.4.0/download -> ndk-0.4.0.crate https://crates.io/api/v1/crates/ndk/0.5.0/download -> ndk-0.5.0.crate https://crates.io/api/v1/crates/ndk-glue/0.3.0/download -> ndk-glue-0.3.0.crate https://crates.io/api/v1/crates/ndk-glue/0.4.0/download -> ndk-glue-0.4.0.crate https://crates.io/api/v1/crates/ndk-glue/0.5.0/download -> ndk-glue-0.5.0.crate https://crates.io/api/v1/crates/ndk-macro/0.2.0/download -> ndk-macro-0.2.0.crate https://crates.io/api/v1/crates/ndk-macro/0.3.0/download -> ndk-macro-0.3.0.crate https://crates.io/api/v1/crates/ndk-sys/0.2.2/download -> ndk-sys-0.2.2.crate https://crates.io/api/v1/crates/nix/0.20.0/download -> nix-0.20.0.crate https://crates.io/api/v1/crates/nix/0.22.0/download -> nix-0.22.0.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/nom/6.1.2/download -> nom-6.1.2.crate https://crates.io/api/v1/crates/nom/7.1.0/download -> nom-7.1.0.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num-complex/0.3.1/download -> num-complex-0.3.1.crate https://crates.io/api/v1/crates/num-derive/0.3.3/download -> num-derive-0.3.3.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/num_enum/0.5.4/download -> num_enum-0.5.4.crate https://crates.io/api/v1/crates/num_enum_derive/0.5.4/download -> num_enum_derive-0.5.4.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_exception/0.1.2/download -> objc_exception-0.1.2.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/oboe/0.4.4/download -> oboe-0.4.4.crate https://crates.io/api/v1/crates/oboe-sys/0.4.4/download -> oboe-sys-0.4.4.crate https://crates.io/api/v1/crates/once_cell/1.8.0/download -> once_cell-1.8.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.4/download -> openssl-probe-0.1.4.crate https://crates.io/api/v1/crates/openssl-sys/0.9.71/download -> openssl-sys-0.9.71.crate https://crates.io/api/v1/crates/os_str_bytes/4.2.0/download -> os_str_bytes-4.2.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/path-slash/0.1.4/download -> path-slash-0.1.4.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pin-project/1.0.8/download -> pin-project-1.0.8.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.8/download -> pin-project-internal-1.0.8.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.7/download -> pin-project-lite-0.2.7.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.22/download -> pkg-config-0.3.22.crate https://crates.io/api/v1/crates/png/0.16.8/download -> png-0.16.8.crate https://crates.io/api/v1/crates/png/0.17.2/download -> png-0.17.2.crate https://crates.io/api/v1/crates/polling/2.2.0/download -> polling-2.2.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.15/download -> ppv-lite86-0.2.15.crate https://crates.io/api/v1/crates/pretty_assertions/1.0.0/download -> pretty_assertions-1.0.0.crate https://crates.io/api/v1/crates/primal-check/0.3.1/download -> primal-check-0.3.1.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.5/download -> proc-macro-crate-0.1.5.crate https://crates.io/api/v1/crates/proc-macro-crate/1.1.0/download -> proc-macro-crate-1.1.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.32/download -> proc-macro2-1.0.32.crate https://crates.io/api/v1/crates/profiling/1.0.4/download -> profiling-1.0.4.crate https://crates.io/api/v1/crates/quote/1.0.10/download -> quote-1.0.10.crate https://crates.io/api/v1/crates/radium/0.5.3/download -> radium-0.5.3.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/range-alloc/0.1.2/download -> range-alloc-0.1.2.crate https://crates.io/api/v1/crates/raw-window-handle/0.3.4/download -> raw-window-handle-0.3.4.crate https://crates.io/api/v1/crates/raw-window-handle/0.4.2/download -> raw-window-handle-0.4.2.crate https://crates.io/api/v1/crates/rayon/1.5.1/download -> rayon-1.5.1.crate https://crates.io/api/v1/crates/rayon-core/1.9.1/download -> rayon-core-1.9.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.10/download -> redox_syscall-0.2.10.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/regress/0.4.1/download -> regress-0.4.1.crate https://crates.io/api/v1/crates/renderdoc-sys/0.7.1/download -> renderdoc-sys-0.7.1.crate https://crates.io/api/v1/crates/rle-decode-fast/1.0.1/download -> rle-decode-fast-1.0.1.crate https://crates.io/api/v1/crates/ron/0.6.6/download -> ron-0.6.6.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustdct/0.6.0/download -> rustdct-0.6.0.crate https://crates.io/api/v1/crates/rustfft/5.1.1/download -> rustfft-5.1.1.crate https://crates.io/api/v1/crates/ryu/1.0.6/download -> ryu-1.0.6.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.131/download -> serde-1.0.131.crate https://crates.io/api/v1/crates/serde_derive/1.0.131/download -> serde_derive-1.0.131.crate https://crates.io/api/v1/crates/serde_json/1.0.72/download -> serde_json-1.0.72.crate https://crates.io/api/v1/crates/sha2/0.10.0/download -> sha2-0.10.0.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/sid/0.6.1/download -> sid-0.6.1.crate https://crates.io/api/v1/crates/slab/0.4.5/download -> slab-0.4.5.crate https://crates.io/api/v1/crates/slice-deque/0.3.0/download -> slice-deque-0.3.0.crate https://crates.io/api/v1/crates/slotmap/1.0.6/download -> slotmap-1.0.6.crate https://crates.io/api/v1/crates/sluice/0.5.5/download -> sluice-0.5.5.crate https://crates.io/api/v1/crates/smallvec/1.7.0/download -> smallvec-1.7.0.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.15.2/download -> smithay-client-toolkit-0.15.2.crate https://crates.io/api/v1/crates/socket2/0.4.2/download -> socket2-0.4.2.crate https://crates.io/api/v1/crates/spirv/0.2.0+1.5.4/download -> spirv-0.2.0+1.5.4.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/stdweb/0.1.3/download -> stdweb-0.1.3.crate https://crates.io/api/v1/crates/strength_reduce/0.2.3/download -> strength_reduce-0.2.3.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.crate https://crates.io/api/v1/crates/svg/0.10.0/download -> svg-0.10.0.crate https://crates.io/api/v1/crates/symphonia/0.4.0/download -> symphonia-0.4.0.crate https://crates.io/api/v1/crates/symphonia-bundle-mp3/0.4.0/download -> symphonia-bundle-mp3-0.4.0.crate https://crates.io/api/v1/crates/symphonia-core/0.4.0/download -> symphonia-core-0.4.0.crate https://crates.io/api/v1/crates/symphonia-metadata/0.4.0/download -> symphonia-metadata-0.4.0.crate https://crates.io/api/v1/crates/syn/1.0.82/download -> syn-1.0.82.crate https://crates.io/api/v1/crates/synstructure/0.12.6/download -> synstructure-0.12.6.crate https://crates.io/api/v1/crates/tap/1.0.1/download -> tap-1.0.1.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/textwrap/0.14.2/download -> textwrap-0.14.2.crate https://crates.io/api/v1/crates/thiserror/1.0.30/download -> thiserror-1.0.30.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.30/download -> thiserror-impl-1.0.30.crate https://crates.io/api/v1/crates/tiff/0.6.1/download -> tiff-0.6.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyfiledialogs/3.8.3/download -> tinyfiledialogs-3.8.3.crate https://crates.io/api/v1/crates/tinyvec/1.5.1/download -> tinyvec-1.5.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/tracing/0.1.29/download -> tracing-0.1.29.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.18/download -> tracing-attributes-0.1.18.crate https://crates.io/api/v1/crates/tracing-core/0.1.21/download -> tracing-core-0.1.21.crate https://crates.io/api/v1/crates/tracing-futures/0.2.5/download -> tracing-futures-0.2.5.crate https://crates.io/api/v1/crates/transpose/0.2.1/download -> transpose-0.2.1.crate https://crates.io/api/v1/crates/typenum/1.14.0/download -> typenum-1.14.0.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.7/download -> unicode-bidi-0.3.7.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-segmentation/1.8.0/download -> unicode-segmentation-1.8.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.0/download -> vswhom-sys-0.1.0.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.78/download -> wasm-bindgen-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.78/download -> wasm-bindgen-backend-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.28/download -> wasm-bindgen-futures-0.4.28.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.78/download -> wasm-bindgen-macro-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.78/download -> wasm-bindgen-macro-support-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.78/download -> wasm-bindgen-shared-0.2.78.crate https://crates.io/api/v1/crates/wayland-client/0.29.1/download -> wayland-client-0.29.1.crate https://crates.io/api/v1/crates/wayland-commons/0.29.1/download -> wayland-commons-0.29.1.crate https://crates.io/api/v1/crates/wayland-cursor/0.29.1/download -> wayland-cursor-0.29.1.crate https://crates.io/api/v1/crates/wayland-protocols/0.29.1/download -> wayland-protocols-0.29.1.crate https://crates.io/api/v1/crates/wayland-scanner/0.29.1/download -> wayland-scanner-0.29.1.crate https://crates.io/api/v1/crates/wayland-sys/0.29.1/download -> wayland-sys-0.29.1.crate https://crates.io/api/v1/crates/weak-table/0.3.2/download -> weak-table-0.3.2.crate https://crates.io/api/v1/crates/web-sys/0.3.55/download -> web-sys-0.3.55.crate https://crates.io/api/v1/crates/webbrowser/0.5.5/download -> webbrowser-0.5.5.crate https://crates.io/api/v1/crates/weezl/0.1.5/download -> weezl-0.1.5.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/wgpu/0.11.1/download -> wgpu-0.11.1.crate https://crates.io/api/v1/crates/wgpu-core/0.11.3/download -> wgpu-core-0.11.3.crate https://crates.io/api/v1/crates/wgpu-hal/0.11.5/download -> wgpu-hal-0.11.5.crate https://crates.io/api/v1/crates/wgpu-types/0.11.0/download -> wgpu-types-0.11.0.crate https://crates.io/api/v1/crates/widestring/0.4.3/download -> widestring-0.4.3.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winit/0.26.0/download -> winit-0.26.0.crate https://crates.io/api/v1/crates/winreg/0.10.1/download -> winreg-0.10.1.crate https://crates.io/api/v1/crates/wyz/0.2.0/download -> wyz-0.2.0.crate https://crates.io/api/v1/crates/x11-clipboard/0.3.3/download -> x11-clipboard-0.3.3.crate https://crates.io/api/v1/crates/x11-dl/2.19.1/download -> x11-dl-2.19.1.crate https://crates.io/api/v1/crates/xcb/0.8.2/download -> xcb-0.8.2.crate https://crates.io/api/v1/crates/xcursor/0.3.4/download -> xcursor-0.3.4.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://github.com/RustAudio/dasp/archive/f05a703d247bb504d7e812b51e95f3765d9c5e94.tar.gz -> dasp-f05a703d247bb504d7e812b51e95f3765d9c5e94.tar.gz https://github.com/ruffle-rs/gc-arena/archive/4931b3bc25b2b74174ff5eb9c34ae0dda732778b.tar.gz -> gc-arena-4931b3bc25b2b74174ff5eb9c34ae0dda732778b.tar.gz https://github.com/ruffle-rs/h263-rs/archive/03dcd486e88381635647a7386105cb802921b69c.tar.gz -> h263-rs-03dcd486e88381635647a7386105cb802921b69c.tar.gz https://github.com/ruffle-rs/nellymoser/archive/77000f763b58021295429ca5740e3dc3b5228cbd.tar.gz -> nellymoser-77000f763b58021295429ca5740e3dc3b5228cbd.tar.gz https://github.com/ruffle-rs/nihav-vp6/archive/9416fcc9fc8aab8f4681aa9093b42922214abbd3.tar.gz -> nihav-vp6-9416fcc9fc8aab8f4681aa9093b42922214abbd3.tar.gz https://github.com/ruffle-rs/quick-xml/archive/8496365ec1412eb5ba5de350937b6bce352fa0ba.tar.gz -> quick-xml-8496365ec1412eb5ba5de350937b6bce352fa0ba.tar.gz https://github.com/ruffle-rs/rust-flash-lso/archive/19fecd07b9888c4bdaa66771c468095783b52bed.tar.gz -> rust-flash-lso-19fecd07b9888c4bdaa66771c468095783b52bed.tar.gz
 _eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=c76565131ed381194940d11c6578b3e9
+_md5_=faef2abb6fcec4b1744c070f4cb25c05
diff --git a/metadata/md5-cache/app-emulation/ruffle-9999 b/metadata/md5-cache/app-emulation/ruffle-9999
index 59c33853a2cd..89b6160c270d 100644
--- a/metadata/md5-cache/app-emulation/ruffle-9999
+++ b/metadata/md5-cache/app-emulation/ruffle-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/pkgconfig >=virtual/rust-1.56 >=virtual/rust-1.53 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.10[xml] dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) virtual/pkgconfig >=virtual/rust-1.56 >=virtual/rust-1.53 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst setup test unpack
 DEPEND=dev-libs/openssl:= media-libs/alsa-lib sys-libs/zlib:= x11-libs/libxcb:=
 DESCRIPTION=Flash Player emulator written in Rust
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/openssl:= media-libs/alsa-lib sys-libs/zlib:= x11-libs/libxcb:= gui? ( || ( gnome-extra/zenity kde-apps/kdialog ) )
 SLOT=0
 _eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=22ecc16c1fc9fe4eb99ad10fb3368952
+_md5_=61096c4cc11f1482b1b17190b274241a
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index e4e3298d6ef0..0f08ae4606f3 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/scribus-1.5.7 b/metadata/md5-cache/app-office/scribus-1.5.7
index 7349d8379322..df4667521a97 100644
--- a/metadata/md5-cache/app-office/scribus-1.5.7
+++ b/metadata/md5-cache/app-office/scribus-1.5.7
@@ -1,15 +1,15 @@
 BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen dev-libs/icu:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= x11-libs/cairo[X,svg] boost? ( dev-libs/boost:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_8? ( dev-python/pillow[tk?,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[tk?,python_targets_python3_9(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen dev-libs/icu:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= x11-libs/cairo[X,svg] boost? ( dev-libs/boost:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_8? ( dev-python/pillow[tk?,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[tk?,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[tk?,python_targets_python3_10(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Desktop publishing (DTP) and layout program
 EAPI=7
 HOMEPAGE=https://www.scribus.net/
-IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk python_single_target_python3_8 python_single_target_python3_9
+IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen dev-libs/icu:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= x11-libs/cairo[X,svg] boost? ( dev-libs/boost:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_8? ( dev-python/pillow[tk?,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[tk?,python_targets_python3_9(-)] ) ) app-text/ghostscript-gpl
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) tk? ( scripts )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen dev-libs/icu:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= x11-libs/cairo[X,svg] boost? ( dev-libs/boost:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_8? ( dev-python/pillow[tk?,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[tk?,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[tk?,python_targets_python3_10(-)] ) ) app-text/ghostscript-gpl
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) tk? ( scripts )
 SLOT=0
 SRC_URI=https://pilotfiber.dl.sourceforge.net/project/scribus/scribus-devel/1.5.7/scribus-1.5.7.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=7be33102e0b05d163cd677b654d21070
+_md5_=4730027eb6dc40a703be4a946193da84
diff --git a/metadata/md5-cache/app-office/scribus-9999 b/metadata/md5-cache/app-office/scribus-9999
index 803ff7c761b1..a29b22cf4b12 100644
--- a/metadata/md5-cache/app-office/scribus-9999
+++ b/metadata/md5-cache/app-office/scribus-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 dev-vcs/subversion[http(+)] net-misc/rsync
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen dev-libs/icu:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= x11-libs/cairo[X,svg] boost? ( dev-libs/boost:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_8? ( dev-python/pillow[tk?,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[tk?,python_targets_python3_9(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen dev-libs/icu:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= x11-libs/cairo[X,svg] boost? ( dev-libs/boost:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_8? ( dev-python/pillow[tk?,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[tk?,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[tk?,python_targets_python3_10(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Desktop publishing (DTP) and layout program
 EAPI=7
 HOMEPAGE=https://www.scribus.net/
-IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk python_single_target_python3_8 python_single_target_python3_9
+IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen dev-libs/icu:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= x11-libs/cairo[X,svg] boost? ( dev-libs/boost:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_8? ( dev-python/pillow[tk?,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[tk?,python_targets_python3_9(-)] ) ) app-text/ghostscript-gpl
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) tk? ( scripts )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen dev-libs/icu:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= x11-libs/cairo[X,svg] boost? ( dev-libs/boost:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_8? ( dev-python/pillow[tk?,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[tk?,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[tk?,python_targets_python3_10(-)] ) ) app-text/ghostscript-gpl
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) tk? ( scripts )
 SLOT=0
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	subversion	c74febd1baf21b1229704d6a953c27db	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=9789ff883c32c703f14f62642a27f747
+_md5_=fe2dce096f3155697e88ea45e3ab0207
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index c966941bbabc..c938a3384410 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/ksh-1.0.0_beta1 b/metadata/md5-cache/app-shells/ksh-1.0.0_beta1
index b4fb449ab4f8..e4c918e34e5b 100644
--- a/metadata/md5-cache/app-shells/ksh-1.0.0_beta1
+++ b/metadata/md5-cache/app-shells/ksh-1.0.0_beta1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare test
 DESCRIPTION=The Original ATT Korn Shell
 EAPI=7
 HOMEPAGE=http://www.kornshell.com/
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=EPL-1.0
 SLOT=0
 SRC_URI=https://github.com/ksh93/ksh/archive/v1.0.0-beta.1/ksh-v1.0.0-beta.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c70311c653460b1f582476dfca57e066
+_md5_=8b2eb6ec55bf09e3eb7d78e1bc28d17d
diff --git a/metadata/md5-cache/app-shells/ksh-9999 b/metadata/md5-cache/app-shells/ksh-9999
new file mode 100644
index 000000000000..8ce4023be4aa
--- /dev/null
+++ b/metadata/md5-cache/app-shells/ksh-9999
@@ -0,0 +1,10 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install prepare test unpack
+DESCRIPTION=The Original ATT Korn Shell
+EAPI=7
+HOMEPAGE=http://www.kornshell.com/
+LICENSE=EPL-1.0
+PROPERTIES=live
+SLOT=0
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=557a7d29fa1808c5cb95aa6e31d94577
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 95513cfe9997..2eef0febdbe4 100644
Binary files a/metadata/md5-cache/dev-embedded/Manifest.gz and b/metadata/md5-cache/dev-embedded/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-embedded/platformio-5.2.3-r1 b/metadata/md5-cache/dev-embedded/platformio-5.2.3-r1
index 4d0f69b97fb2..ed8b6665135b 100644
--- a/metadata/md5-cache/dev-embedded/platformio-5.2.3-r1
+++ b/metadata/md5-cache/dev-embedded/platformio-5.2.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=An open source ecosystem for IoT development
 EAPI=8
 HOMEPAGE=https://platformio.org/
 IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_single_target_python3_8? ( =dev-python/aiofiles-0.7.0*[python_targets_python3_8(-)] <dev-python/bottle-0.13[python_targets_python3_8(-)] >=dev-python/click-7.1.2[python_targets_python3_8(-)] <dev-python/click-9[python_targets_python3_8(-)] dev-python/colorama[python_targets_python3_8(-)] >=dev-python/pyserial-3[python_targets_python3_8(-)] <dev-python/pyserial-4[python_targets_python3_8(-)] >=dev-python/requests-2.4[python_targets_python3_8(-)] <dev-python/requests-3[python_targets_python3_8(-)] >=dev-python/semantic_version-2.8.1[python_targets_python3_8(-)] <dev-python/semantic_version-3[python_targets_python3_8(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_8(-)] <dev-python/tabulate-1[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] >=dev-python/pyelftools-0.25[python_targets_python3_8(-)] <dev-python/pyelftools-1[python_targets_python3_8(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_8(-)] dev-python/starlette[python_targets_python3_8(-)] =dev-python/uvicorn-0.15*[python_targets_python3_8(-)] dev-python/wsproto[python_targets_python3_8(-)] dev-python/zeroconf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( =dev-python/aiofiles-0.7.0*[python_targets_python3_9(-)] <dev-python/bottle-0.13[python_targets_python3_9(-)] >=dev-python/click-7.1.2[python_targets_python3_9(-)] <dev-python/click-9[python_targets_python3_9(-)] dev-python/colorama[python_targets_python3_9(-)] >=dev-python/pyserial-3[python_targets_python3_9(-)] <dev-python/pyserial-4[python_targets_python3_9(-)] >=dev-python/requests-2.4[python_targets_python3_9(-)] <dev-python/requests-3[python_targets_python3_9(-)] >=dev-python/semantic_version-2.8.1[python_targets_python3_9(-)] <dev-python/semantic_version-3[python_targets_python3_9(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_9(-)] <dev-python/tabulate-1[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] >=dev-python/pyelftools-0.25[python_targets_python3_9(-)] <dev-python/pyelftools-1[python_targets_python3_9(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_9(-)] dev-python/starlette[python_targets_python3_9(-)] =dev-python/uvicorn-0.15*[python_targets_python3_9(-)] dev-python/wsproto[python_targets_python3_9(-)] dev-python/zeroconf[python_targets_python3_9(-)] ) python_single_target_python3_10? ( =dev-python/aiofiles-0.7.0*[python_targets_python3_10(-)] <dev-python/bottle-0.13[python_targets_python3_10(-)] >=dev-python/click-7.1.2[python_targets_python3_10(-)] <dev-python/click-9[python_targets_python3_10(-)] dev-python/colorama[python_targets_python3_10(-)] >=dev-python/pyserial-3[python_targets_python3_10(-)] <dev-python/pyserial-4[python_targets_python3_10(-)] >=dev-python/requests-2.4[python_targets_python3_10(-)] <dev-python/requests-3[python_targets_python3_10(-)] >=dev-python/semantic_version-2.8.1[python_targets_python3_10(-)] <dev-python/semantic_version-3[python_targets_python3_10(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_10(-)] <dev-python/tabulate-1[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] >=dev-python/pyelftools-0.25[python_targets_python3_10(-)] <dev-python/pyelftools-1[python_targets_python3_10(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_10(-)] dev-python/starlette[python_targets_python3_10(-)] =dev-python/uvicorn-0.15*[python_targets_python3_10(-)] dev-python/wsproto[python_targets_python3_10(-)] dev-python/zeroconf[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/platformio/platformio-core/archive/refs/tags/v5.2.3.tar.gz -> platformio-5.2.3.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=c2cf9e90774fc3610d7995eee6473dcc
+_md5_=cbcb9921694614b032046a1e76e61fcb
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index b4ce923dbe43..487c503c5f9b 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/sdformat-9.7.0 b/metadata/md5-cache/dev-libs/sdformat-9.7.0
new file mode 100644
index 000000000000..ba1bae30c9be
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/sdformat-9.7.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/ruby:* virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/urdfdom-1:= dev-libs/tinyxml dev-libs/boost:= sci-libs/ignition-math:6=
+DESCRIPTION=Simulation Description Format (SDF) parser
+EAPI=7
+HOMEPAGE=http://sdformat.org/
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/urdfdom-1:= dev-libs/tinyxml dev-libs/boost:= sci-libs/ignition-math:6=
+SLOT=0/9
+SRC_URI=http://osrf-distributions.s3.amazonaws.com/sdformat/releases/sdformat-9.7.0.tar.bz2
+_eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=2068d81b3643bc0629bcd88b9b322da4
diff --git a/metadata/md5-cache/dev-libs/urdfdom-3.0.0 b/metadata/md5-cache/dev-libs/urdfdom-3.0.0
new file mode 100644
index 000000000000..2b7e6ae977c4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/urdfdom-3.0.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl]
+DESCRIPTION=URDF (U-Robot Description Format) library
+EAPI=7
+HOMEPAGE=http://ros.org/wiki/urdf
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl]
+SLOT=0/3
+SRC_URI=https://github.com/ros/urdfdom/archive/3.0.0.tar.gz -> urdfdom-3.0.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=af69cbc9f45210752e22bd2a942d3a44
diff --git a/metadata/md5-cache/dev-libs/urdfdom-9999 b/metadata/md5-cache/dev-libs/urdfdom-9999
index 0756441b5a4d..17f9973bd0b1 100644
--- a/metadata/md5-cache/dev-libs/urdfdom-9999
+++ b/metadata/md5-cache/dev-libs/urdfdom-9999
@@ -1,12 +1,12 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl] dev-libs/boost:=[threads(+)]
+DEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl]
 DESCRIPTION=URDF (U-Robot Description Format) library
 EAPI=7
 HOMEPAGE=http://ros.org/wiki/urdf
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl] dev-libs/boost:=[threads(+)]
-SLOT=0/1
+RDEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl]
+SLOT=0/3
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=420f784b52f04dc8257223a0bf3dfa63
+_md5_=af69cbc9f45210752e22bd2a942d3a44
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 1f9142fa0d8b..1b335d449c93 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/starlette-0.17.1 b/metadata/md5-cache/dev-python/starlette-0.17.1
index e503c6876b88..29ac6d3d8ed7 100644
--- a/metadata/md5-cache/dev-python/starlette-0.17.1
+++ b/metadata/md5-cache/dev-python/starlette-0.17.1
@@ -4,7 +4,7 @@ DESCRIPTION=The little ASGI framework that shines
 EAPI=8
 HOMEPAGE=https://www.starlette.io/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/anyio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/encode/starlette/archive/refs/tags/0.17.1.tar.gz -> starlette-0.17.1.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=021246a45da5c1737dbb5060f2b00abd
+_md5_=7888ba11bcaffa0e7c941f2d3b92b6da
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index 54166acbe02e..948f50d9970b 100644
Binary files a/metadata/md5-cache/dev-ros/Manifest.gz and b/metadata/md5-cache/dev-ros/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.15.13 b/metadata/md5-cache/dev-ros/message_filters-1.15.13
new file mode 100644
index 000000000000..aa89b3827b23
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/message_filters-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads(+)] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/rospkg[python_targets_python3_10(-)] ) test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/nose[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=Set of message filters which take in messages and outputs those at a later time
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/message_filters https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads(+)] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/rospkg[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=53f82687c7bf60a8bba4e0069246471f
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.15.13 b/metadata/md5-cache/dev-ros/rosbag-1.15.13
new file mode 100644
index 000000000000..1bc9c4d0c431
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosbag-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycryptodome[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/python-gnupg[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=Set of tools for recording from and playing back to ROS topics
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosbag https://github.com/ros/ros_comm
+IUSE=lz4 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycryptodome[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/python-gnupg[python_targets_python3_10(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=f69a57cb2804ceabb4b528d248d6b3df
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.13 b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.13
new file mode 100644
index 000000000000..f7f759b1d9a6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=Set of tools for recording from and playing back ROS message
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosbag_storage https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=be2b4df857505e0abeb2fb26d6867948
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.15.13 b/metadata/md5-cache/dev-ros/roscpp-1.15.13
new file mode 100644
index 000000000000..290f30d017bb
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roscpp-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?]
+DESCRIPTION=C++ implementation of ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/roscpp https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=ca4f21893334635ec7222c8610909db0
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.15.13 b/metadata/md5-cache/dev-ros/rosgraph-1.15.13
new file mode 100644
index 000000000000..c05b1c4a4012
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/netifaces[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/rospkg[python_targets_python3_10(-)] ) test? ( python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mock[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/nose[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=Prints information about the ROS Computation Graph
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosgraph https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/netifaces[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/rospkg[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=c94e55405c83a8d6ff4749f59a7f8b47
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.15.13 b/metadata/md5-cache/dev-ros/roslaunch-1.15.13
new file mode 100644
index 000000000000..c4a4d56ef56c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/rospkg[python_targets_python3_10(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosout test? ( python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/rosdep[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/nose[python_targets_python3_10(-)] ) dev-ros/test_rosmaster ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=Tool for easily launching multiple ROS nodes
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/rospkg[python_targets_python3_10(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosout acct-group/ros acct-user/ros python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=87eba313416f3262435dc2c38d0dd06e
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.15.13 b/metadata/md5-cache/dev-ros/roslz4-1.15.13
new file mode 100644
index 000000000000..1dc138875277
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roslz4-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-arch/lz4 dev-ros/cpp_common test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=app-arch/lz4 dev-ros/cpp_common python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=3e0b581d158722e9949e18f83d0d50a0
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.15.13 b/metadata/md5-cache/dev-ros/rosmaster-1.15.13
new file mode 100644
index 000000000000..9cbd472a3932
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/defusedxml[python_targets_python3_10(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/nose[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=ROS Master implementation
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/defusedxml[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=0e205dc75b0a56073fed3c1288c618e4
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.15.13 b/metadata/md5-cache/dev-ros/rosmsg-1.15.13
new file mode 100644
index 000000000000..3821b18f288b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/rospkg[python_targets_python3_10(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=Command-line tools for displaying information about message and services
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosmsg https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/rospkg[python_targets_python3_10(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=0ea1d7c50077f11431ab63ee1f424714
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.15.13 b/metadata/md5-cache/dev-ros/rosnode-1.15.13
new file mode 100644
index 000000000000..5cbdbabe70cc
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosnode-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/rospkg[python_targets_python3_10(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/rospkg[python_targets_python3_10(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=2a4b4d748e32d49ffd046c74de9d70fc
diff --git a/metadata/md5-cache/dev-ros/rosout-1.15.13 b/metadata/md5-cache/dev-ros/rosout-1.15.13
new file mode 100644
index 000000000000..27ac19ab9cd3
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosout-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=9ea485ff62f635b8500ccb41ea5b8d8c
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.15.13 b/metadata/md5-cache/dev-ros/rosparam-1.15.13
new file mode 100644
index 000000000000..adc210f46f97
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosparam-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosparam https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=e2621e724f434235874d8ae18426e3b8
diff --git a/metadata/md5-cache/dev-ros/rospy-1.15.13 b/metadata/md5-cache/dev-ros/rospy-1.15.13
new file mode 100644
index 000000000000..b3ac8394984e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rospy-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/rospkg[python_targets_python3_10(-)] ) dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?]
+DESCRIPTION=Python client library for ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rospy https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/rospkg[python_targets_python3_10(-)] ) dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=8fe0773b54ce794b8630d1adf97bf984
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.15.13 b/metadata/md5-cache/dev-ros/rosservice-1.15.13
new file mode 100644
index 000000000000..73d76cddf546
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosservice-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=Command-line tool for listing and querying ROS Services
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosservice https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=0e317eb81ea9b47fa74e480cbec5bece
diff --git a/metadata/md5-cache/dev-ros/rostest-1.15.13 b/metadata/md5-cache/dev-ros/rostest-1.15.13
new file mode 100644
index 000000000000..0713bf1d51f9
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rostest-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-libs/boost:=[threads(+)] test? ( dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-libs/boost:=[threads(+)] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosservice dev-cpp/gtest dev-ros/rostopic ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=Integration test suite based on roslaunch compatible with xUnit frameworks
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-libs/boost:=[threads(+)] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=d9c908544b1ce2a23a44122f45f261fc
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.15.13 b/metadata/md5-cache/dev-ros/rostopic-1.15.13
new file mode 100644
index 000000000000..7e557267b4c9
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rostopic-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/nose[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rostopic https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=a0684bbc1ebda4bb46c6642dd3f0595c
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.15.13 b/metadata/md5-cache/dev-ros/roswtf-1.15.13
new file mode 100644
index 000000000000..0b0719bd0a35
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roswtf-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-ros/cmake_modules ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/paramiko[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/rospkg[python_targets_python3_10(-)] ) dev-ros/rosbuild[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/roslang[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/rosdep[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/nose[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=Tool for diagnosing issues with a running ROS system
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/paramiko[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/rospkg[python_targets_python3_10(-)] ) dev-ros/rosbuild[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=9dd1da9e592b4bca303e7d1b46c0d636
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.15.13 b/metadata/md5-cache/dev-ros/test_rosbag-1.15.13
new file mode 100644
index 000000000000..f3326ca216d0
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/topic_tools[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads(+)] app-arch/bzip2 dev-ros/rosout python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/nose[python_targets_python3_10(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
+DESCRIPTION=Unit tests for rosbag
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/topic_tools[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/xmlrpcpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz http://download.ros.org/data/test_rosbag/constants_gen1.bag -> test_rosbag-1.15.13-constants_gen1.bag http://download.ros.org/data/test_rosbag/constants_gen2.bag -> test_rosbag-1.15.13-constants_gen2.bag http://download.ros.org/data/test_rosbag/converged_gen1.bag -> test_rosbag-1.15.13-converged_gen1.bag http://download.ros.org/data/test_rosbag/converged_gen2.bag -> test_rosbag-1.15.13-converged_gen2.bag http://download.ros.org/data/test_rosbag/converged_gen3.bag -> test_rosbag-1.15.13-converged_gen3.bag http://download.ros.org/data/test_rosbag/converged_gen4.bag -> test_rosbag-1.15.13-converged_gen4.bag http://download.ros.org/data/test_rosbag/convergent_gen1.bag -> test_rosbag-1.15.13-convergent_gen1.bag http://download.ros.org/data/test_rosbag/convergent_gen2.bag -> test_rosbag-1.15.13-convergent_gen2.bag http://download.ros.org/data/test_rosbag/migrated_addsub_gen1.bag -> test_rosbag-1.15.13-migrated_addsub_gen1.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen1.bag -> test_rosbag-1.15.13-migrated_explicit_gen1.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen2.bag -> test_rosbag-1.15.13-migrated_explicit_gen2.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen3.bag -> test_rosbag-1.15.13-migrated_explicit_gen3.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen4.bag -> test_rosbag-1.15.13-migrated_explicit_gen4.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen1.bag -> test_rosbag-1.15.13-migrated_implicit_gen1.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen2.bag -> test_rosbag-1.15.13-migrated_implicit_gen2.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen3.bag -> test_rosbag-1.15.13-migrated_implicit_gen3.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen4.bag -> test_rosbag-1.15.13-migrated_implicit_gen4.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen1.bag -> test_rosbag-1.15.13-migrated_mixed_gen1.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen2.bag -> test_rosbag-1.15.13-migrated_mixed_gen2.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen3.bag -> test_rosbag-1.15.13-migrated_mixed_gen3.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen4.bag -> test_rosbag-1.15.13-migrated_mixed_gen4.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen1.bag -> test_rosbag-1.15.13-partially_migrated_gen1.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen2.bag -> test_rosbag-1.15.13-partially_migrated_gen2.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen3.bag -> test_rosbag-1.15.13-partially_migrated_gen3.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen4.bag -> test_rosbag-1.15.13-partially_migrated_gen4.bag http://download.ros.org/data/test_rosbag/renamed_gen1.bag -> test_rosbag-1.15.13-renamed_gen1.bag http://download.ros.org/data/test_rosbag/renamed_gen2.bag -> test_rosbag-1.15.13-renamed_gen2.bag http://download.ros.org/data/test_rosbag/renamed_gen3.bag -> test_rosbag-1.15.13-renamed_gen3.bag http://download.ros.org/data/test_rosbag/renamed_gen4.bag -> test_rosbag-1.15.13-renamed_gen4.bag http://download.ros.org/data/test_rosbag/subunmigrated_gen1.bag -> test_rosbag-1.15.13-subunmigrated_gen1.bag http://download.ros.org/data/test_rosbag/unmigrated_gen1.bag -> test_rosbag-1.15.13-unmigrated_gen1.bag http://download.ros.org/data/rosbag/test_indexed_1.2.bag -> test_rosbag-1.15.13-test_indexed_1.2.bag http://download.ros.org/data/rosbag/chatter_50hz.bag -> test_rosbag-1.15.13-chatter_50hz.bag http://download.ros.org/data/rosbag/test_future_version_2.1.bag -> test_rosbag-1.15.13-test_future_version_2.1.bag http://download.ros.org/data/rosbag/test_rosbag_latched_pub.bag -> test_rosbag-1.15.13-test_rosbag_latched_pub.bag
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=05190eff3406a5018ac5bb43241350b6
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.13 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.13
new file mode 100644
index 000000000000..ff3fc32eb5f7
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosbag_storage dev-ros/rosbag dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=Unit tests for rosbag_storage
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=8aa0308acf31852a70c05368f2c453d1
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.15.13 b/metadata/md5-cache/dev-ros/test_roscpp-1.15.13
new file mode 100644
index 000000000000..0c79077aedbf
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads(+)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
+DESCRIPTION=Unit tests for roscpp
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_roscpp https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
+REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=f220c7653e48f8aea8e394976fbad048
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.15.13 b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.13
new file mode 100644
index 000000000000..ef35d2c01a89
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=Unit tests for rosgraph
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=d5ec0cd6d7ac649d99c21dd046d2fc81
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.15.13 b/metadata/md5-cache/dev-ros/test_roslaunch-1.15.13
new file mode 100644
index 000000000000..3803089a1f52
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] test? ( dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/rospkg[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=Unit tests for roslaunch
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=d38f6dcc0781238b36494372990a343c
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.13 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.13
new file mode 100644
index 000000000000..b9cbf1e07d8f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=test? ( dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/nose[python_targets_python3_10(-)] ) dev-ros/test_rosmaster dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
+DESCRIPTION=Unit tests for roslib
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_roslib_comm https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=1a544e91c28ccf172862adfd1b27be93
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.15.13 b/metadata/md5-cache/dev-ros/test_rosmaster-1.15.13
new file mode 100644
index 000000000000..34915d11c637
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] test? ( dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?]
+DESCRIPTION=Unit tests for rosmaster
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosmaster https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=d7be6188cf0136d537fa2cdfcce199b8
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.15.13 b/metadata/md5-cache/dev-ros/test_rosparam-1.15.13
new file mode 100644
index 000000000000..6082d999605d
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/nose[python_targets_python3_10(-)] ) dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?]
+DESCRIPTION=Unit tests for rosparam
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosparam https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=0963ae93ba4f06ca0bac13ea1a3242ce
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.15.13 b/metadata/md5-cache/dev-ros/test_rospy-1.15.13
new file mode 100644
index 000000000000..f74a26445da2
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] test? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) dev-ros/rosbuild dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/nose[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psutil[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
+DESCRIPTION=Unit tests for rospy
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rospy https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=f10b7fbd53c7075ed84cdff064407f3a
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.15.13 b/metadata/md5-cache/dev-ros/test_rosservice-1.15.13
new file mode 100644
index 000000000000..4bb3c8aae9c4
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/nose[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
+DESCRIPTION=Unit tests for rospy
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosservice https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=ab4a106114d2b4c730f079dc3a858097
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.15.13 b/metadata/md5-cache/dev-ros/topic_tools-1.15.13
new file mode 100644
index 000000000000..f37c113549df
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosbash[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/nose[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
+DESCRIPTION=Tools for directing, throttling and selecting ROS topics
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/topic_tools https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=d0194cfcde2e3e1cb9ef3fdab879b7c5
diff --git a/metadata/md5-cache/dev-ros/urdf-1.13.2-r1 b/metadata/md5-cache/dev-ros/urdf-1.13.2-r1
deleted file mode 100644
index fd101563889e..000000000000
--- a/metadata/md5-cache/dev-ros/urdf-1.13.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads(+)] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
-DESCRIPTION=C++ parser for the Unified Robot Description Format (URDF)
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/urdf https://github.com/ros/urdf
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads(+)] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/urdf/archive/1.13.2.tar.gz -> urdf-1.13.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=1f65831f11e1c9f4d30f3f5cecd294bc
diff --git a/metadata/md5-cache/dev-ros/urdf-1.13.2-r2 b/metadata/md5-cache/dev-ros/urdf-1.13.2-r2
new file mode 100644
index 000000000000..e05fdc16d7c7
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/urdf-1.13.2-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:=[threads(+)] dev-libs/urdfdom:= dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=C++ parser for the Unified Robot Description Format (URDF)
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/urdf https://github.com/ros/urdf
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads(+)] dev-libs/urdfdom:= dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/urdf/archive/1.13.2.tar.gz -> urdf-1.13.2.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=44329c5bae23e31167dcc4da6cd2ac83
diff --git a/metadata/md5-cache/dev-ros/urdf-9999 b/metadata/md5-cache/dev-ros/urdf-9999
index 3efec7b09008..b01dc201e70e 100644
--- a/metadata/md5-cache/dev-ros/urdf-9999
+++ b/metadata/md5-cache/dev-ros/urdf-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads(+)] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DEPEND=dev-libs/boost:=[threads(+)] dev-libs/urdfdom:= dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
 DESCRIPTION=C++ parser for the Unified Robot Description Format (URDF)
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf https://github.com/ros/urdf
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads(+)] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+RDEPEND=dev-libs/boost:=[threads(+)] dev-libs/urdfdom:= dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=1f65831f11e1c9f4d30f3f5cecd294bc
+_md5_=44329c5bae23e31167dcc4da6cd2ac83
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.13 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.13
new file mode 100644
index 000000000000..a64dc979cd2a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/cpp_common dev-ros/rostime test? ( dev-cpp/gtest dev-libs/boost[threads(+)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=C++ implementation of the XML-RPC protocol
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=be1f0480a49a177b1cda1d053f218e76
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index e2d00049fe7e..6b544b9a5f61 100644
Binary files a/metadata/md5-cache/kde-frameworks/Manifest.gz and b/metadata/md5-cache/kde-frameworks/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.89.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.89.0-r1
similarity index 97%
rename from metadata/md5-cache/kde-frameworks/breeze-icons-5.89.0
rename to metadata/md5-cache/kde-frameworks/breeze-icons-5.89.0-r1
index 20774250a4be..866b928f9987 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.89.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.89.0-r1
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=5/5.89
 SRC_URI=mirror://kde/stable/frameworks/5.89/breeze-icons-5.89.0.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	10ca734e4845124395fc126944c8d053	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=de1a90eb45047492cafc77e3b6d09150
+_md5_=52dc704fa8bd9d3e2de940b312d6e525
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.88.0-r3 b/metadata/md5-cache/kde-frameworks/plasma-5.88.0-r3
new file mode 100644
index 000000000000..c178f465e130
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.88.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.88:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.88:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=,X=] >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kactivities-5.88*:5 =kde-frameworks/karchive-5.88*:5 =kde-frameworks/kconfig-5.88*:5 =kde-frameworks/kconfigwidgets-5.88*:5 =kde-frameworks/kcoreaddons-5.88*:5 =kde-frameworks/kdeclarative-5.88*:5 =kde-frameworks/kglobalaccel-5.88*:5 =kde-frameworks/kguiaddons-5.88*:5 =kde-frameworks/ki18n-5.88*:5 =kde-frameworks/kiconthemes-5.88*:5 =kde-frameworks/kio-5.88*:5 =kde-frameworks/kirigami-5.88*:5 =kde-frameworks/knotifications-5.88*:5 =kde-frameworks/kpackage-5.88*:5 =kde-frameworks/kservice-5.88*:5 =kde-frameworks/kwidgetsaddons-5.88*:5 =kde-frameworks/kwindowsystem-5.88*:5 =kde-frameworks/kxmlgui-5.88*:5 !gles2-only? ( media-libs/libglvnd[X?] ) wayland? ( =kde-frameworks/kwayland-5.88*:5 media-libs/libglvnd ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma framework
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=gles2-only man wayland X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=,X=] >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kactivities-5.88*:5 =kde-frameworks/karchive-5.88*:5 =kde-frameworks/kconfig-5.88*:5 =kde-frameworks/kconfigwidgets-5.88*:5 =kde-frameworks/kcoreaddons-5.88*:5 =kde-frameworks/kdeclarative-5.88*:5 =kde-frameworks/kglobalaccel-5.88*:5 =kde-frameworks/kguiaddons-5.88*:5 =kde-frameworks/ki18n-5.88*:5 =kde-frameworks/kiconthemes-5.88*:5 =kde-frameworks/kio-5.88*:5 =kde-frameworks/kirigami-5.88*:5 =kde-frameworks/knotifications-5.88*:5 =kde-frameworks/kpackage-5.88*:5 =kde-frameworks/kservice-5.88*:5 =kde-frameworks/kwidgetsaddons-5.88*:5 =kde-frameworks/kwindowsystem-5.88*:5 =kde-frameworks/kxmlgui-5.88*:5 !gles2-only? ( media-libs/libglvnd[X?] ) wayland? ( =kde-frameworks/kwayland-5.88*:5 media-libs/libglvnd ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.88
+SRC_URI=mirror://kde/stable/frameworks/5.88/plasma-framework-5.88.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	3efe514b4cd196a075e50ab6552a203d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	10ca734e4845124395fc126944c8d053	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=145f2958b0552c2eebea04b9549c7905
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index ccd020036a0e..83f33263fee4 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.23.4-r2 b/metadata/md5-cache/kde-plasma/kwin-5.23.4-r2
new file mode 100644
index 000000000000..d35c2861c2d0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwin-5.23.4-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5= >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5= >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5=[X] >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/breeze-5.23.4:5 >=kde-plasma/kdecoration-5.23.4:5 >=kde-plasma/kscreenlocker-5.23.4:5 >=kde-plasma/kwayland-server-5.23.4:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.86.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/designer-5.15.2:5 >=dev-qt/qtconcurrent-5.15.2:5 x11-base/xorg-proto test? ( >=dev-libs/wayland-protocols-1.19 >=dev-qt/qtwayland-5.15.2:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=accessibility caps gles2-only multimedia plasma screencast test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+PDEPEND=>=kde-plasma/kde-cli-tools-5.23.4:5
+RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5= >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5= >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5=[X] >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/breeze-5.23.4:5 >=kde-plasma/kdecoration-5.23.4:5 >=kde-plasma/kscreenlocker-5.23.4:5 >=kde-plasma/kwayland-server-5.23.4:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.86.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtvirtualkeyboard-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5[qml] sys-apps/hwdata x11-base/xwayland multimedia? ( >=dev-qt/qtmultimedia-5.15.2:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.4/kwin-5.23.4.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	3efe514b4cd196a075e50ab6552a203d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	10ca734e4845124395fc126944c8d053	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=273813c34dc5322e88eada461f81f33b
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.23.4-r1 b/metadata/md5-cache/kde-plasma/libksysguard-5.23.4-r1
new file mode 100644
index 000000000000..266ef98ef714
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.23.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.86.0:5 X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Task management and system monitoring library
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=webengine X test debug designer test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXres ) !<kde-plasma/ksysguard-5.21.90:5 !<kde-plasma/plasma-workspace-5.18.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/9
+SRC_URI=mirror://kde/stable/plasma/5.23.4/libksysguard-5.23.4.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	3efe514b4cd196a075e50ab6552a203d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	10ca734e4845124395fc126944c8d053	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=5d32c872d132ba83cf215e2bc3df0949
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index a08149ccb4c4..4c450e44f658 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/imv-4.3.1 b/metadata/md5-cache/media-gfx/imv-4.3.1
new file mode 100644
index 000000000000..0e9703135755
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imv-4.3.1
@@ -0,0 +1,16 @@
+BDEPEND=app-text/asciidoc wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/glib:2 dev-libs/icu:= dev-libs/inih media-libs/libglvnd[X?] x11-libs/cairo x11-libs/libxkbcommon[X?] x11-libs/pango X? ( x11-libs/libX11 x11-libs/libxcb:= ) freeimage? ( media-libs/freeimage ) gif? ( media-libs/libnsgif ) heif? ( media-libs/libheif:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) svg? ( >=gnome-base/librsvg-2.44:2 ) tiff? ( media-libs/tiff ) wayland? ( dev-libs/wayland ) !sys-apps/renameutils X? ( x11-base/xorg-proto ) test? ( dev-util/cmocka )
+DESCRIPTION=Minimal image viewer designed for tiling window manager users
+EAPI=8
+HOMEPAGE=https://sr.ht/~exec64/imv/
+IUSE=+X +freeimage gif heif jpeg png svg test tiff wayland
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT-with-advertising
+RDEPEND=dev-libs/glib:2 dev-libs/icu:= dev-libs/inih media-libs/libglvnd[X?] x11-libs/cairo x11-libs/libxkbcommon[X?] x11-libs/pango X? ( x11-libs/libX11 x11-libs/libxcb:= ) freeimage? ( media-libs/freeimage ) gif? ( media-libs/libnsgif ) heif? ( media-libs/libheif:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) svg? ( >=gnome-base/librsvg-2.44:2 ) tiff? ( media-libs/tiff ) wayland? ( dev-libs/wayland ) !sys-apps/renameutils
+REQUIRED_USE=|| ( X wayland )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://git.sr.ht/~exec64/imv/archive/v4.3.1.tar.gz -> imv-4.3.1.tar.gz
+_eclasses_=meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=e8e3735bbb85dd80244cb2dd0aef4476
diff --git a/metadata/md5-cache/media-gfx/imv-9999 b/metadata/md5-cache/media-gfx/imv-9999
index 96abfc477737..81166c46b799 100644
--- a/metadata/md5-cache/media-gfx/imv-9999
+++ b/metadata/md5-cache/media-gfx/imv-9999
@@ -1,15 +1,15 @@
 BDEPEND=app-text/asciidoc wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-libs/glib:2 dev-libs/icu:= dev-libs/inih media-libs/libglvnd[X?] x11-libs/cairo x11-libs/libxkbcommon[X?] x11-libs/pango X? ( x11-libs/libX11 x11-libs/libxcb:= ) freeimage? ( media-libs/freeimage ) gif? ( media-libs/libnsgif ) heif? ( media-libs/libheif:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) svg? ( >=gnome-base/librsvg-2.44 ) tiff? ( media-libs/tiff ) wayland? ( dev-libs/wayland ) !sys-apps/renameutils X? ( x11-base/xorg-proto ) test? ( dev-util/cmocka ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-libs/glib:2 dev-libs/icu:= dev-libs/inih media-libs/libglvnd[X?] x11-libs/cairo x11-libs/libxkbcommon[X?] x11-libs/pango X? ( x11-libs/libX11 x11-libs/libxcb:= ) freeimage? ( media-libs/freeimage ) gif? ( media-libs/libnsgif ) heif? ( media-libs/libheif:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) svg? ( >=gnome-base/librsvg-2.44:2 ) tiff? ( media-libs/tiff ) wayland? ( dev-libs/wayland ) !sys-apps/renameutils X? ( x11-base/xorg-proto ) test? ( dev-util/cmocka )
 DESCRIPTION=Minimal image viewer designed for tiling window manager users
-EAPI=7
+EAPI=8
 HOMEPAGE=https://sr.ht/~exec64/imv/
 IUSE=+X +freeimage gif heif jpeg png svg test tiff wayland
 LICENSE=MIT-with-advertising
 PROPERTIES=live
-RDEPEND=dev-libs/glib:2 dev-libs/icu:= dev-libs/inih media-libs/libglvnd[X?] x11-libs/cairo x11-libs/libxkbcommon[X?] x11-libs/pango X? ( x11-libs/libX11 x11-libs/libxcb:= ) freeimage? ( media-libs/freeimage ) gif? ( media-libs/libnsgif ) heif? ( media-libs/libheif:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) svg? ( >=gnome-base/librsvg-2.44 ) tiff? ( media-libs/tiff ) wayland? ( dev-libs/wayland ) !sys-apps/renameutils
+RDEPEND=dev-libs/glib:2 dev-libs/icu:= dev-libs/inih media-libs/libglvnd[X?] x11-libs/cairo x11-libs/libxkbcommon[X?] x11-libs/pango X? ( x11-libs/libX11 x11-libs/libxcb:= ) freeimage? ( media-libs/freeimage ) gif? ( media-libs/libnsgif ) heif? ( media-libs/libheif:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) svg? ( >=gnome-base/librsvg-2.44:2 ) tiff? ( media-libs/tiff ) wayland? ( dev-libs/wayland ) !sys-apps/renameutils
 REQUIRED_USE=|| ( X wayland )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=ac20217b6cd582548587685b942ceb11
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=e8e3735bbb85dd80244cb2dd0aef4476
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index a7f89db20490..56a52c47d0a1 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/element-desktop-bin-1.9.5 b/metadata/md5-cache/net-im/element-desktop-bin-1.9.7
similarity index 97%
rename from metadata/md5-cache/net-im/element-desktop-bin-1.9.5
rename to metadata/md5-cache/net-im/element-desktop-bin-1.9.7
index 24f0ea5bf43a..092c6dcd4dc1 100644
--- a/metadata/md5-cache/net-im/element-desktop-bin-1.9.5
+++ b/metadata/md5-cache/net-im/element-desktop-bin-1.9.7
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=app-accessibility/at-spi2-atk:2 app-crypt/libsecret dev-db/sqlcipher dev-libs/atk dev-libs/expat dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver x11-libs/pango emoji? ( media-fonts/noto-emoji )
 RESTRICT=splitdebug
 SLOT=0
-SRC_URI=https://packages.riot.im/debian/pool/main/e/element-desktop/element-desktop_1.9.5_amd64.deb
+SRC_URI=https://packages.riot.im/debian/pool/main/e/element-desktop/element-desktop_1.9.7_amd64.deb
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
 _md5_=35784b7ee9f74ce7a1b96905a437da17
diff --git a/metadata/md5-cache/ros-meta/Manifest.gz b/metadata/md5-cache/ros-meta/Manifest.gz
index a65f0abc4cf0..dd9eeef18854 100644
Binary files a/metadata/md5-cache/ros-meta/Manifest.gz and b/metadata/md5-cache/ros-meta/Manifest.gz differ
diff --git a/metadata/md5-cache/ros-meta/ros_comm-1.15.13 b/metadata/md5-cache/ros-meta/ros_comm-1.15.13
new file mode 100644
index 000000000000..fab488922f4b
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/ros_comm-1.15.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters dev-ros/rosbag dev-ros/rosbag_storage dev-ros/rosgraph dev-ros/roslaunch dev-ros/rosmaster dev-ros/rosmsg dev-ros/rosnode dev-ros/rosout dev-ros/rosparam dev-ros/rosservice dev-ros/rostest dev-ros/rostopic dev-ros/topic_tools dev-ros/roscpp dev-ros/rospy dev-ros/test_rosbag dev-ros/test_rosbag_storage dev-ros/test_roscpp dev-ros/test_rosgraph dev-ros/test_roslaunch dev-ros/test_roslib_comm dev-ros/test_rosmaster dev-ros/test_rosparam dev-ros/test_rospy dev-ros/test_rosservice python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/catkin[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/empy[python_targets_python3_10(-)] )
+DESCRIPTION=ROS communications-related packages
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/ros_comm https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters dev-ros/rosbag dev-ros/rosbag_storage dev-ros/rosgraph dev-ros/roslaunch dev-ros/rosmaster dev-ros/rosmsg dev-ros/rosnode dev-ros/rosout dev-ros/rosparam dev-ros/rosservice dev-ros/rostest dev-ros/rostopic dev-ros/topic_tools dev-ros/roscpp dev-ros/rospy dev-ros/test_rosbag dev-ros/test_rosbag_storage dev-ros/test_roscpp dev-ros/test_rosgraph dev-ros/test_roslaunch dev-ros/test_roslib_comm dev-ros/test_rosmaster dev-ros/test_rosparam dev-ros/test_rospy dev-ros/test_rosservice python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.13.tar.gz -> ros_comm-1.15.13.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ros-catkin	e10b1f447d884628e248f14e649b4c66	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=7060d240592be0aeb3fcb9ed94835689
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 895836232815..b268a6022b0c 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-3.1.1_p20210225 b/metadata/md5-cache/sci-chemistry/openbabel-3.1.1_p20210225
new file mode 100644
index 000000000000..1a07857bcdd2
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/openbabel-3.1.1_p20210225
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl doc? ( app-doc/doxygen dev-texlive/texlive-latex ) perl? ( >=dev-lang/swig-2 ) python? ( >=dev-lang/swig-2 ) test? ( dev-lang/python ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-cpp/eigen:3 dev-libs/libxml2:2 sys-libs/zlib:= inchi? ( sci-libs/inchi ) json? ( >=dev-libs/rapidjson-1.1.0 ) png? ( x11-libs/cairo ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] ) perl? ( dev-lang/perl )
+DESCRIPTION=Interconverts file formats used in molecular modeling
+EAPI=8
+HOMEPAGE=https://openbabel.org/
+IUSE=cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_2 doc examples +inchi json minimal openmp perl png python test wxwidgets python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=dev-cpp/eigen:3 dev-libs/libxml2:2 sys-libs/zlib:= inchi? ( sci-libs/inchi ) json? ( >=dev-libs/rapidjson-1.1.0 ) png? ( x11-libs/cairo ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] ) perl? ( dev-lang/perl:= !sci-chemistry/openbabel-perl )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) test? ( inchi json !minimal wxwidgets )
+RESTRICT=!test? ( test )
+SLOT=0/7.0.0
+SRC_URI=https://github.com/openbabel/openbabel/archive/08e23f39b0cc39b4eebd937a5a2ffc1a7bac3e1b.tar.gz -> openbabel-3.1.1_p20210225.tar.gz https://openbabel.org/docs/dev/_static/babel130.png -> openbabel.png http://openbabel.org/OBTitle.jpg -> openbabel.jpg
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=c1db8254fc197741d3851ea56e2659ef
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-9999 b/metadata/md5-cache/sci-chemistry/openbabel-9999
new file mode 100644
index 000000000000..df0b76ead009
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/openbabel-9999
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl doc? ( app-doc/doxygen dev-texlive/texlive-latex ) perl? ( >=dev-lang/swig-2 ) python? ( >=dev-lang/swig-2 ) test? ( dev-lang/python ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=dev-cpp/eigen:3 dev-libs/libxml2:2 sys-libs/zlib:= inchi? ( sci-libs/inchi ) json? ( >=dev-libs/rapidjson-1.1.0 ) png? ( x11-libs/cairo ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] ) perl? ( dev-lang/perl )
+DESCRIPTION=Interconverts file formats used in molecular modeling
+EAPI=8
+HOMEPAGE=https://openbabel.org/
+IUSE=cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_2 doc examples +inchi json minimal openmp perl png python test wxwidgets python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+LICENSE=GPL-2
+PROPERTIES=live
+RDEPEND=dev-cpp/eigen:3 dev-libs/libxml2:2 sys-libs/zlib:= inchi? ( sci-libs/inchi ) json? ( >=dev-libs/rapidjson-1.1.0 ) png? ( x11-libs/cairo ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] ) perl? ( dev-lang/perl:= !sci-chemistry/openbabel-perl )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) test? ( inchi json !minimal wxwidgets )
+RESTRICT=!test? ( test )
+SLOT=0/7.0.0
+SRC_URI=https://openbabel.org/docs/dev/_static/babel130.png -> openbabel.png http://openbabel.org/OBTitle.jpg -> openbabel.jpg
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=36b243b87a68fd519b12cfd66f824eb6
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index e097652d13e7..fd87a5cfaa95 100644
Binary files a/metadata/md5-cache/sci-electronics/Manifest.gz and b/metadata/md5-cache/sci-electronics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-electronics/gazebo-11.9.1 b/metadata/md5-cache/sci-electronics/gazebo-11.9.1
new file mode 100644
index 000000000000..72b785b181f3
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/gazebo-11.9.1
@@ -0,0 +1,15 @@
+BDEPEND=app-text/ronn app-arch/gzip virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar <dev-cpp/tbb-2021:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.1:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= <x11-libs/qwt-6.2.0:6=[qt5(+)] dev-qt/qttest:5 x11-apps/mesa-progs test? ( dev-libs/libxslt )
+DESCRIPTION=A 3D multiple robot simulator with dynamics
+EAPI=7
+HOMEPAGE=http://gazebosim.org/
+IUSE=cpu_flags_x86_sse2 test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar <dev-cpp/tbb-2021:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.1:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= <x11-libs/qwt-6.2.0:6=[qt5(+)]
+RESTRICT=!test? ( test )
+SLOT=0/11
+SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-11.9.1.tar.bz2
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=4dfef66e08f3eb5f9c7b3419c3a4910a
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 9c53bee2cfba..2e1da4c69db9 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/bliss-0.77 b/metadata/md5-cache/sci-libs/bliss-0.77
new file mode 100644
index 000000000000..4dec72b78ede
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/bliss-0.77
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=gmp? ( dev-libs/gmp:0= )
+DESCRIPTION=Compute Automorphism Groups and Canonical Labelings of Graphs
+EAPI=8
+HOMEPAGE=https://users.aalto.fi/~tjunttil/bliss/index.html
+IUSE=gmp
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3
+RDEPEND=gmp? ( dev-libs/gmp:0= )
+SLOT=0/1
+SRC_URI=https://users.aalto.fi/~tjunttil/bliss/downloads/bliss-0.77.zip
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=66a740ff0740c5b666c7aca916959968
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 6b0d37c57756..1cd96cb64b96 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.2.1-r1 b/metadata/md5-cache/sci-mathematics/singular-4.2.1-r1
new file mode 100644
index 000000000000..659ef4a5fceb
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/singular-4.2.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-lang/perl dev-libs/gmp:0 dev-libs/ntl:= sci-libs/cddlib sci-mathematics/flint emacs? ( >=app-editors/emacs-23.1:* ) julia? ( dev-lang/julia ) polymake? ( sci-mathematics/polymake ) readline? ( sys-libs/readline )
+DESCRIPTION=Computer algebra system for polynomial computations
+EAPI=8
+HOMEPAGE=https://www.singular.uni-kl.de/ https://github.com/Singular/Singular
+IUSE=emacs examples julia polymake +readline static-libs
+KEYWORDS=~amd64 ~x86 ~x86-linux
+LICENSE=BSD GPL-2 GPL-3
+RDEPEND=dev-lang/perl dev-libs/gmp:0 dev-libs/ntl:= sci-libs/cddlib sci-mathematics/flint emacs? ( >=app-editors/emacs-23.1:* ) julia? ( dev-lang/julia ) polymake? ( sci-mathematics/polymake ) readline? ( sys-libs/readline )
+SLOT=0
+SRC_URI=ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/4-2-1/singular-4.2.1.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	elisp-common	cf4fd1b0835b9f3e638724840468064a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=b8b87297df44b76b2fc04e6bd65c2eea
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 690876fbeb08..54b45c8d78cb 100644
Binary files a/metadata/md5-cache/sci-physics/Manifest.gz and b/metadata/md5-cache/sci-physics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-physics/geant-4.11.0.0 b/metadata/md5-cache/sci-physics/geant-4.11.0.0
index 5fe47acda666..3b2bcfdc34ad 100644
--- a/metadata/md5-cache/sci-physics/geant-4.11.0.0
+++ b/metadata/md5-cache/sci-physics/geant-4.11.0.0
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( c++17 c++20 ) inventor? ( opengl ) motif? ( opengl ) python? (
 SLOT=4
 SRC_URI=https://geant4-data.web.cern.ch/geant4-data/releases/geant4-v11.0.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=8b82816d59ffc3aa12b233a0b11d5a28
+_md5_=fb36a8c31e75456fbfdb3812ca36909e
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index f27df8bb2a7d..4e32a8ed0961 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/csync2-2.0 b/metadata/md5-cache/sys-cluster/csync2-2.0
deleted file mode 100644
index 604eec5c7e7f..000000000000
--- a/metadata/md5-cache/sys-cluster/csync2-2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=config configure install postinst
-DEPEND=>=net-libs/librsync-0.9.5 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3.0 ) ssl? ( >=net-libs/gnutls-2.7.3 ) xinetd? ( sys-apps/xinetd ) virtual/pkgconfig
-DESCRIPTION=Cluster synchronization tool
-EAPI=5
-HOMEPAGE=http://oss.linbit.com/csync2/
-IUSE=mysql postgres sqlite ssl xinetd
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/librsync-0.9.5 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3.0 ) ssl? ( >=net-libs/gnutls-2.7.3 ) xinetd? ( sys-apps/xinetd )
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=0
-SRC_URI=http://oss.linbit.com/csync2/csync2-2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e4fb0397a054c4f9f1cb63f97608908e
diff --git a/metadata/md5-cache/sys-cluster/csync2-2.0-r2 b/metadata/md5-cache/sys-cluster/csync2-2.0-r2
index f57a807c060f..c0c7dd35e668 100644
--- a/metadata/md5-cache/sys-cluster/csync2-2.0-r2
+++ b/metadata/md5-cache/sys-cluster/csync2-2.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Cluster synchronization tool
 EAPI=7
 HOMEPAGE=https://github.com/LINBIT/csync2
 IUSE=mysql postgres sqlite ssl xinetd
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/librsync-0.9.5 mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3.0 ) ssl? ( >=net-libs/gnutls-2.7.3 ) xinetd? ( sys-apps/xinetd )
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=0
 SRC_URI=https://github.com/LINBIT/csync2/archive/csync2-2.0.tar.gz -> csync2-2.0-github.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=3ced10e337286b17ea2ab021c1f5bb57
+_md5_=24471175e2bb77371adb73d214134e78
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index c038796d19fb..4be71f65125f 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/mold-9999 b/metadata/md5-cache/sys-devel/mold-9999
index 8c67c8a41ec2..c7222b939726 100644
--- a/metadata/md5-cache/sys-devel/mold-9999
+++ b/metadata/md5-cache/sys-devel/mold-9999
@@ -10,4 +10,4 @@ RDEPEND=>=dev-cpp/tbb-2021.4.0:= dev-libs/xxhash:= sys-libs/zlib !kernel_Darwin?
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=0e3498ca350c8af6cefb5be2e16e3630
+_md5_=00a2895664f17a908093040f0f46aede
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index d35f6fbe98f1..0ee127ca5887 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/bcache-tools-1.1-r1 b/metadata/md5-cache/sys-fs/bcache-tools-1.1-r1
index 30172b0cfd35..3828d3be595a 100644
--- a/metadata/md5-cache/sys-fs/bcache-tools-1.1-r1
+++ b/metadata/md5-cache/sys-fs/bcache-tools-1.1-r1
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install postinst prepare
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-apps/util-linux virtual/udev
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/util-linux virtual/udev
 DESCRIPTION=Tools for bcache
-EAPI=7
-HOMEPAGE=https://bcache.evilpiepirate.org/
-IUSE=python_targets_python3_8 python_targets_python3_9
+EAPI=8
+HOMEPAGE=https://bcache.evilpiepirate.org/ https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-apps/util-linux virtual/udev
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/util-linux virtual/udev
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/snapshot/bcache-tools-1.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=63e4852763b7bdad23e6e8c334745091
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=c3b0633ce3bdc5f829ec13df57f74ab0
diff --git a/metadata/md5-cache/sys-fs/bcache-tools-9999 b/metadata/md5-cache/sys-fs/bcache-tools-9999
index d5fec0153aec..9fcc0cee9e5a 100644
--- a/metadata/md5-cache/sys-fs/bcache-tools-9999
+++ b/metadata/md5-cache/sys-fs/bcache-tools-9999
@@ -2,13 +2,13 @@ BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install postinst prepare unpack
 DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/util-linux virtual/udev
 DESCRIPTION=Tools for bcache
-EAPI=7
-HOMEPAGE=https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/
+EAPI=8
+HOMEPAGE=https://bcache.evilpiepirate.org/ https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/util-linux virtual/udev
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bd6111b4141c6b5d491125887e7ec705
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=980e302575adda8840356428db1da50d
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index eb609dccea21..9f5a56ffa596 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/element-1.9.5 b/metadata/md5-cache/www-apps/element-1.9.5
deleted file mode 100644
index d3947d79b233..000000000000
--- a/metadata/md5-cache/www-apps/element-1.9.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A glossy Matrix collaboration client for the web
-EAPI=7
-HOMEPAGE=https://element.io/
-IUSE=vhosts
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-admin/webapp-config-1.50.15
-SLOT=1.9.5
-SRC_URI=https://github.com/vector-im/element-web/releases/download/v1.9.5/element-v1.9.5.tar.gz
-_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=162eb12efcdb368044c72d136d0c95ba
diff --git a/metadata/md5-cache/www-apps/element-1.9.6 b/metadata/md5-cache/www-apps/element-1.9.6
deleted file mode 100644
index b2b1525c1696..000000000000
--- a/metadata/md5-cache/www-apps/element-1.9.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A glossy Matrix collaboration client for the web
-EAPI=7
-HOMEPAGE=https://element.io/
-IUSE=vhosts
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-admin/webapp-config-1.50.15
-SLOT=1.9.6
-SRC_URI=https://github.com/vector-im/element-web/releases/download/v1.9.6/element-v1.9.6.tar.gz
-_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=162eb12efcdb368044c72d136d0c95ba
diff --git a/metadata/md5-cache/www-apps/element-1.9.4 b/metadata/md5-cache/www-apps/element-1.9.7
similarity index 92%
rename from metadata/md5-cache/www-apps/element-1.9.4
rename to metadata/md5-cache/www-apps/element-1.9.7
index c0386b61c7dd..4cafd7c9fefe 100644
--- a/metadata/md5-cache/www-apps/element-1.9.4
+++ b/metadata/md5-cache/www-apps/element-1.9.7
@@ -7,7 +7,7 @@ IUSE=vhosts
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=app-admin/webapp-config-1.50.15
-SLOT=1.9.4
-SRC_URI=https://github.com/vector-im/element-web/releases/download/v1.9.4/element-v1.9.4.tar.gz
+SLOT=1.9.7
+SRC_URI=https://github.com/vector-im/element-web/releases/download/v1.9.7/element-v1.9.7.tar.gz
 _eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
 _md5_=162eb12efcdb368044c72d136d0c95ba
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index c9b303bc1496..ec6cc45d3c14 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-96.0.4664.110 b/metadata/md5-cache/www-client/chromium-96.0.4664.110
index 09bfb5b19e01..022b6fee841a 100644
--- a/metadata/md5-cache/www-client/chromium-96.0.4664.110
+++ b/metadata/md5-cache/www-client/chromium-96.0.4664.110
@@ -5,11 +5,11 @@ DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=8
 HOMEPAGE=https://chromium.org/
 IUSE=component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 ~x86
 LICENSE=BSD
 RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm(+)] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
 REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
 SLOT=0/stable
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-96.0.4664.110.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-96-patchset-4/chromium-96-patchset-4.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/chromium-96-ppc64le-1.tar.xz )
 _eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=5dc1d4d4f46ec02d1849b3cdbd00e6bc
+_md5_=75a27c2b612cb22fee509c035be0dda1
diff --git a/metadata/md5-cache/www-client/chromium-96.0.4664.93 b/metadata/md5-cache/www-client/chromium-96.0.4664.93
deleted file mode 100644
index e12c2ed2d81e..000000000000
--- a/metadata/md5-cache/www-client/chromium-96.0.4664.93
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10[xml] dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) || ( ( dev-lang/python:3.10[xml] dev-python/setuptools[python_targets_python3_10(-)] ) ( dev-lang/python:3.9[xml] dev-python/setuptools[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[xml] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] ) media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm(+)] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=8
-HOMEPAGE=https://chromium.org/
-IUSE=component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=amd64 arm64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] ) media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm(+)] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
-REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
-SLOT=0/stable
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-96.0.4664.93.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-96-patchset-4/chromium-96-patchset-4.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/chromium-96-ppc64le-1.tar.xz )
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=1f54e6f6b29cf64377a6f05e1fcfb827
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 89f4bbfde418..11321f98e972 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.13-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.13-r1
deleted file mode 100644
index 65154db4af63..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.13-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-misc/pax-utils sys-devel/m4 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc:= tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=7
-HOMEPAGE=https://www.nvidia.com/download/index.aspx
-IUSE=+X +driver static-libs +tools wayland kernel_linux kernel_linux kernel_linux dist-kernel driver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=-* ~amd64
-LICENSE=GPL-2 MIT NVIDIA-r2 ZLIB
-RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc:= tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( ~gui-libs/egl-wayland-1.1.7 media-libs/libglvnd ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
-SLOT=0/vulkan
-SRC_URI=https://developer.nvidia.com/vulkan-beta-4706213-linux -> NVIDIA-Linux-x86_64-470.62.13.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.63.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.63.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.63.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.63.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.63.01.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	1c03540c81548283580ab5526ab0978c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=93f7dd7f7769ac97710a8662b5ed1d77
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.16 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.16
new file mode 100644
index 000000000000..8b9b3d06229d
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.16
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/m4 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
+DEPEND=acct-group/video persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=7
+HOMEPAGE=https://developer.nvidia.com/vulkan-driver
+IUSE=+X abi_x86_32 abi_x86_64 +driver persistenced static-libs +tools wayland kernel_linux kernel_linux dist-kernel driver
+KEYWORDS=-* ~amd64
+LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
+RDEPEND=acct-group/video persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( ~gui-libs/egl-wayland-1.1.7 media-libs/libglvnd ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
+SLOT=0/vulkan
+SRC_URI=https://developer.nvidia.com/vulkan-beta-4706216-linux -> NVIDIA-Linux-x86_64-470.62.16.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.86.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.86.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.86.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.86.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.86.tar.bz2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	1c03540c81548283580ab5526ab0978c	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=903e60ebe8725dc29a736d3170d4560e
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 6e6581f91fdb..a0fba45d2fe7 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/i3-4.19.1 b/metadata/md5-cache/x11-wm/i3-4.19.1
deleted file mode 100644
index 5bdf6dbd3597..000000000000
--- a/metadata/md5-cache/x11-wm/i3-4.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config x11-libs/cairo[X,xcb(+)] x11-libs/pango[X] test? ( dev-perl/AnyEvent dev-perl/X11-XCB dev-perl/Inline dev-perl/Inline-C dev-perl/IPC-Run dev-perl/ExtUtils-PkgConfig dev-perl/local-lib virtual/perl-Test-Simple x11-base/xorg-server[xephyr] x11-misc/xvfb-run ) doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
-DESCRIPTION=An improved dynamic tiling window manager
-EAPI=7
-HOMEPAGE=https://i3wm.org/
-IUSE=doc test test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config x11-libs/cairo[X,xcb(+)] x11-libs/pango[X] dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://i3wm.org/downloads/i3-4.19.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=cf45c91ca2afb79f7d5bb4f4c2844133
diff --git a/metadata/md5-cache/x11-wm/i3-4.19.2 b/metadata/md5-cache/x11-wm/i3-4.19.2
deleted file mode 100644
index 8ef511bfe03d..000000000000
--- a/metadata/md5-cache/x11-wm/i3-4.19.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config test? ( dev-perl/AnyEvent dev-perl/ExtUtils-PkgConfig dev-perl/Inline dev-perl/Inline-C dev-perl/IPC-Run dev-perl/local-lib dev-perl/X11-XCB virtual/perl-Test-Simple x11-base/xorg-server[xephyr] x11-misc/xvfb-run ) doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
-DESCRIPTION=An improved dynamic tiling window manager
-EAPI=7
-HOMEPAGE=https://i3wm.org/
-IUSE=doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://i3wm.org/downloads/i3-4.19.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=d655ec438d92c0d3d2f5cb3a93e8c6b5
diff --git a/metadata/md5-cache/x11-wm/i3-4.20 b/metadata/md5-cache/x11-wm/i3-4.20
deleted file mode 100644
index 045ee12315b3..000000000000
--- a/metadata/md5-cache/x11-wm/i3-4.20
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config test? ( dev-perl/AnyEvent dev-perl/ExtUtils-PkgConfig dev-perl/Inline dev-perl/Inline-C dev-perl/IPC-Run dev-perl/local-lib dev-perl/X11-XCB virtual/perl-Test-Simple x11-base/xorg-server[xephyr] x11-misc/xvfb-run ) doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
-DESCRIPTION=An improved dynamic tiling window manager
-EAPI=8
-HOMEPAGE=https://i3wm.org/
-IUSE=doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://i3wm.org/downloads/i3-4.20.tar.xz
-_eclasses_=meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=353ce361e122b1cc41ca0e641455c456
diff --git a/metadata/md5-cache/x11-wm/i3-4.20.1 b/metadata/md5-cache/x11-wm/i3-4.20.1
index e6196b491b61..c81f4bbc5493 100644
--- a/metadata/md5-cache/x11-wm/i3-4.20.1
+++ b/metadata/md5-cache/x11-wm/i3-4.20.1
@@ -5,11 +5,11 @@ DESCRIPTION=An improved dynamic tiling window manager
 EAPI=8
 HOMEPAGE=https://i3wm.org/
 IUSE=doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=BSD
 RDEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://i3wm.org/downloads/i3-4.20.1.tar.xz
 _eclasses_=meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=fd1fc5b7ec3f6636bf7d2056d0615002
+_md5_=dd4c29bedfcd9585e5bf5c223dae4167
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ddf66cf0b03a..10f43f0d30dc 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 15 Dec 2021 07:09:04 +0000
+Wed, 15 Dec 2021 12:09:04 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 2d9d25087fe9..99341683ddb4 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Dec 15 07:09:04 AM UTC 2021
+Wed Dec 15 12:09:04 PM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index dd37777ab94c..035278b4f025 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 15 Dec 2021 07:30:01 +0000
+Wed, 15 Dec 2021 12:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index ddcb8e9c52d2..743241c6f1ca 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-afb488c2a68d3c405c3b6ea0c3257c151b6be8b4 1639551316 2021-12-15T06:55:16+00:00
+0e8530b49fe16e3fc5e669843ba77bd8837838a1 1639569399 2021-12-15T11:56:39+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 54bbf22d5acb..0ab8df411e6c 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1639551901 Wed 15 Dec 2021 07:05:01 AM UTC
+1639569901 Wed 15 Dec 2021 12:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index ddf66cf0b03a..10f43f0d30dc 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 15 Dec 2021 07:09:04 +0000
+Wed, 15 Dec 2021 12:09:04 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index a3e6d7c656e9..7c439534b50e 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index b4b358d0ed04..0f18e251b950 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1 +1 @@
-DIST element-desktop_1.9.5_amd64.deb 81353792 BLAKE2B ef965955b54b9b9ce9af5ab8539e91bba4878c53d200143a82e47dbb946981d96df7b5a94f77aadb493fb46904794c6d73d04ee2d09b45c2b8922405b921f437 SHA512 f9e5cfcb81568dd4763279ccc0375ac45d9ff02cb0f897b35fda79d0b33a5dcbd529111972faed59e1f05d07f38653f57a324c1055b0da8839dd6a669e3e6d07
+DIST element-desktop_1.9.7_amd64.deb 81377812 BLAKE2B 41d271827ad0e2f12f1e79813c06c179741f7a938017bb2f8a893f92ae351c732c62d250aa645ddccadcddb1310c1bd0a1567c785483ad3048a9907a18bf9f8c SHA512 d04bc76344e8648f1ba872f83133f01753a346616adf172e3588e54ef50caf1aaa16268aa5da6e28d14cfc94f2c2e1017707478a8b76b55e46962811520917e7
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.9.5.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.9.7.ebuild
similarity index 100%
rename from net-im/element-desktop-bin/element-desktop-bin-1.9.5.ebuild
rename to net-im/element-desktop-bin/element-desktop-bin-1.9.7.ebuild
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 514d495cb397..49e04dac54ec 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index d798f3f41a14..0a4b7c2a80de 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2021-12-15)
+# Unstable dependencies (dev-libs/libnl, sys-cluster/rdma-core)
+net-libs/libpcap netlink rdma
+
 # Sam James <sam@gentoo.org> (2021-11-17)
 # x11-libs/libXvMC is not marked stable on HPPA
 # media-libs/mesa is not marked stable on HPPA
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 31cb43ecea00..9cf4bdb9865f 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -7119,6 +7119,8 @@ sci-chemistry/molequeue:client - Build the client application
 sci-chemistry/molequeue:server - Build the serve application
 sci-chemistry/molequeue:zeromq - Build with net-libs/zeromq support
 sci-chemistry/mopac7:gmxmopac7 - Add support library for gromacs
+sci-chemistry/openbabel:inchi - Build support for IUPAC International Chemical Identifier format
+sci-chemistry/openbabel:json - Build support for JSON formats (ChemDoodle, PubChem, etc...)
 sci-chemistry/pymol:web - Install Pymodule needed for web app support
 sci-chemistry/raster3d:gd - libgd support for PNG and JPEG output
 sci-chemistry/vmd:cuda - Use nvidia cuda toolkit for speeding up computations
@@ -7528,6 +7530,8 @@ sci-mathematics/polymake:normaliz - Build the bundled extension for lattice comp
 sci-mathematics/polymake:ppl - Enable dev-libs/ppl interface for convex hull computations.
 sci-mathematics/polymake:singular - Enable the interface to sci-mathematics/singular for ideal related computations.
 sci-mathematics/rstudio:server - Build and install the RStudio server
+sci-mathematics/singular:julia - Enables interface for Singular to julia
+sci-mathematics/singular:polymake - Enable the interface to TOPCOM
 sci-mathematics/slepc:complex-scalars - Make scalars complex
 sci-mathematics/unuran:prng - Use sci-mathematics/prng library
 sci-mathematics/unuran:rngstreams - Use sci-mathematics/rngstreams library
diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index 947630015dc4..7e8e3cc69fa2 100644
Binary files a/ros-meta/Manifest.gz and b/ros-meta/Manifest.gz differ
diff --git a/ros-meta/ros_comm/Manifest b/ros-meta/ros_comm/Manifest
index 3a8eb58ae823..3e342ed2139f 100644
--- a/ros-meta/ros_comm/Manifest
+++ b/ros-meta/ros_comm/Manifest
@@ -1,3 +1,4 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
+DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
diff --git a/ros-meta/ros_comm/ros_comm-1.15.13.ebuild b/ros-meta/ros_comm/ros_comm-1.15.13.ebuild
new file mode 100644
index 000000000000..00b04a0107d9
--- /dev/null
+++ b/ros-meta/ros_comm/ros_comm-1.15.13.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS communications-related packages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+# utilities subdir
+RDEPEND="
+	dev-ros/roslz4
+	dev-ros/xmlrpcpp
+	dev-ros/roswtf
+	dev-ros/message_filters
+"
+# tools subdir
+RDEPEND="${RDEPEND}
+	dev-ros/rosbag
+	dev-ros/rosbag_storage
+	dev-ros/rosgraph
+	dev-ros/roslaunch
+	dev-ros/rosmaster
+	dev-ros/rosmsg
+	dev-ros/rosnode
+	dev-ros/rosout
+	dev-ros/rosparam
+	dev-ros/rosservice
+	dev-ros/rostest
+	dev-ros/rostopic
+	dev-ros/topic_tools
+"
+# clients subdir
+RDEPEND="${RDEPEND}
+	dev-ros/roscpp
+	dev-ros/rospy
+"
+# test subdir
+RDEPEND="${RDEPEND}
+	dev-ros/test_rosbag
+	dev-ros/test_rosbag_storage
+	dev-ros/test_roscpp
+	dev-ros/test_rosgraph
+	dev-ros/test_roslaunch
+	dev-ros/test_roslib_comm
+	dev-ros/test_rosmaster
+	dev-ros/test_rosparam
+	dev-ros/test_rospy
+	dev-ros/test_rosservice
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 7940614ab228..21e04c289cce 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/openbabel/Manifest b/sci-chemistry/openbabel/Manifest
index b22751d4a860..11fe53f8f9de 100644
--- a/sci-chemistry/openbabel/Manifest
+++ b/sci-chemistry/openbabel/Manifest
@@ -1,2 +1,4 @@
 DIST openbabel-2.4.1.tar.gz 11618304 BLAKE2B 8fc051e83add9be6456e281a109bd6bbec282a64ffc83309819f0decbf167b4914fbb7f1966e95e103f268754045b804317f51c79a952ace707c6af2bd320125 SHA512 427e678f0a911bd27b9a8a05e60b6e09f113be4e5dd180daaf80c28d06368e52b57501261755ab3817a8d31f2754db24471fd0ceee706d029386d6f70800e9c6
+DIST openbabel-3.1.1_p20210225.tar.gz 36674527 BLAKE2B bb82fc96f704249d211bd86c73de0cf4e7cfe5e2ba5c745aa8b4f6f19583837e2181d85101377810095f6b71fc3b91bf2f6f5636726fc8271c6905f1f8c59e7b SHA512 9ff7cb4acbfad7a9c5c8d0dd8930ac0390d0d0f2758d1a6120009071f47ffe718f92ad620d37f26f196babb14649c52b5eb7bb161c342ef36aec655e0a172de4
+DIST openbabel.jpg 12159 BLAKE2B b701df2b8c29df607dc2bd3997a282aa9a726d56c789ff2db900d33234dc691f76b6af12a4c9ccda4f09984504b863c40c39e8bf91058939996714ede2dd37c7 SHA512 998ea526c8c92f87dd203527fdd9f4e001357e951409209f41ab68e0b730fe12d97f9079c12ca289be413854ea2abcf8bb691ae5af823a6f29d6a590e1a3e2b0
 DIST openbabel.png 29060 BLAKE2B 8d217d92125cc73462437411dd4e0cc05179cb0934f5ed15a307acc6b549b8ebab250a48a05ef7657f48c6df394f37da9b659de61efb1477b79b573a5b393ad3 SHA512 bbcaaa37663b526c9038ccb9edaf05ccc3ad1a861739a737f05f363098d8402a10b36e341fcc0aca636e809c6c32db99bf987b41719a0c756bf5e31444d3eb70
diff --git a/sci-chemistry/openbabel/files/openbabel-python.cmake b/sci-chemistry/openbabel/files/openbabel-python.cmake
new file mode 100644
index 000000000000..425b4656a9d2
--- /dev/null
+++ b/sci-chemistry/openbabel/files/openbabel-python.cmake
@@ -0,0 +1,104 @@
+# The following is a cmake fragment taken from scripts/CMakeLists.txt and
+# edited for Gentoo python multibuild compatibility.
+
+if (PYTHON_BINDINGS)
+	# Tags should be edited to reflect the active python implementation
+	set(EPYTHON @@EPYTHON@@)
+	set(PYTHON_INCUDE_DIR @@PYTHON_INCUDE_DIR@@)
+	set(PYTHON_LIBS @@PYTHON_LIBS@@)
+	set(PYTHON_SITEDIR @@PYTHON_SITEDIR@@)
+
+	include_directories(${PYTHON_INCUDE_DIR})
+
+	add_custom_command(
+		OUTPUT ${CMAKE_SOURCE_DIR}/scripts/${EPYTHON}/openbabel-python.cpp ${CMAKE_SOURCE_DIR}/scripts/${EPYTHON}/openbabel.py
+		COMMAND ${SWIG_EXECUTABLE} -python -c++ -small -O -templatereduce -naturalvar -I${CMAKE_SOURCE_DIR}/include -I${CMAKE_BINARY_DIR}/include -o ${CMAKE_SOURCE_DIR}/scripts/${EPYTHON}/openbabel-python.cpp ${eigen_define} -outdir ${CMAKE_SOURCE_DIR}/scripts/${EPYTHON} ${CMAKE_SOURCE_DIR}/scripts/openbabel-python.i
+		MAIN_DEPENDENCY openbabel-python.i
+		VERBATIM
+	)
+
+	configure_file(${CMAKE_SOURCE_DIR}/scripts/python/openbabel/__init__.py.in
+		${CMAKE_BINARY_DIR}/scripts/${EPYTHON}/openbabel/__init__.py)
+
+	add_library(bindings_python_${EPYTHON} MODULE ${CMAKE_SOURCE_DIR}/scripts/${EPYTHON}/openbabel-python.cpp)
+	target_link_libraries(bindings_python_${EPYTHON} ${PYTHON_LIBS} ${BABEL_LIBRARY})
+
+	set_target_properties(bindings_python_${EPYTHON}
+		PROPERTIES
+		OUTPUT_NAME _openbabel
+		LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/scripts/${EPYTHON}/openbabel
+		PREFIX ""
+		SUFFIX .so )
+
+	add_dependencies(bindings_python_${EPYTHON} openbabel)
+
+	install(TARGETS bindings_python_${EPYTHON}
+		LIBRARY DESTINATION ${PYTHON_SITEDIR}/openbabel
+		COMPONENT bindings_python)
+	install(FILES ${CMAKE_BINARY_DIR}/scripts/${EPYTHON}/openbabel/__init__.py
+		DESTINATION ${PYTHON_SITEDIR}/openbabel
+		COMPONENT bindings_python)
+	install(FILES ${CMAKE_SOURCE_DIR}/scripts/${EPYTHON}/openbabel.py
+		DESTINATION ${PYTHON_SITEDIR}/openbabel
+		COMPONENT bindings_python)
+	install(FILES ${CMAKE_SOURCE_DIR}/scripts/python/openbabel/pybel.py
+		DESTINATION ${PYTHON_SITEDIR}/openbabel
+		COMPONENT bindings_python)
+
+	if (ENABLE_TESTS)
+		# Make sure all module files are together in the same directory for testing
+		add_custom_command(TARGET bindings_python_${EPYTHON} POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/scripts/${EPYTHON}/openbabel.py ${CMAKE_BINARY_DIR}/scripts/${EPYTHON}/openbabel/
+			COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/scripts/python/openbabel/pybel.py ${CMAKE_BINARY_DIR}/scripts/${EPYTHON}/openbabel/)
+		set(TEST_SOURCE_DIR ${CMAKE_SOURCE_DIR}/test)
+		# define TESTDATADIR for tests that need input files
+		add_definitions(-DTESTDATADIR="${TEST_SOURCE_DIR}/files/")
+		# define FORMATDIR for location of format plugin binaries
+		set(FORMATDIR "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/")
+		add_definitions(-DFORMATDIR="${FORMATDIR}/")
+		include_directories(${TEST_SOURCE_DIR})
+
+		# The macro is modified from cmake/modules/UsePythonTest.cmake
+		MACRO(ADD_PYTHON_TEST TESTNAME FILENAME)
+			GET_SOURCE_FILE_PROPERTY(loc ${FILENAME} LOCATION)
+			STRING(REGEX REPLACE ";" " " wo_semicolumn "${ARGN}")
+			FILE(WRITE ${CMAKE_BINARY_DIR}/test/${TESTNAME}.cmake
+"
+	MESSAGE(\"${PYTHONPATH}\")
+	EXECUTE_PROCESS(
+		COMMAND ${EPYTHON} ${loc} ${wo_semicolumn}
+		RESULT_VARIABLE import_res
+		OUTPUT_VARIABLE import_output
+		ERROR_VARIABLE  import_output
+	)
+
+	# Pass the output back to ctest
+	IF(import_output)
+		MESSAGE(\${import_output})
+	ENDIF(import_output)
+	IF(import_res)
+		MESSAGE(SEND_ERROR \${import_res})
+	ENDIF(import_res)
+"
+			)
+			ADD_TEST(${TESTNAME} ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/test/${TESTNAME}.cmake)
+		ENDMACRO(ADD_PYTHON_TEST)
+
+		set(pybindtests
+			bindings
+			_pybel
+			example 
+			obconv_writers
+			cdjsonformat
+			pcjsonformat
+			roundtrip
+			)
+		foreach(pybindtest ${pybindtests})
+			ADD_PYTHON_TEST(pybindtest_${pybindtest}_${EPYTHON} ${TEST_SOURCE_DIR}/test${pybindtest}.py)
+			set_tests_properties(pybindtest_${pybindtest}_${EPYTHON} PROPERTIES
+				ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/scripts/${EPYTHON}:${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX};LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/scripts/${EPYTHON}:${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}:\$ENV{LD_LIBRARY_PATH};BABEL_LIBDIR=${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/;BABEL_DATADIR=${CMAKE_SOURCE_DIR}/data"
+				FAIL_REGULAR_EXPRESSION "ERROR;FAIL;Test failed"
+			)
+		endforeach(pybindtest ${pybindtests})
+	endif (ENABLE_TESTS)
+endif(PYTHON_BINDINGS)
diff --git a/sci-chemistry/openbabel/metadata.xml b/sci-chemistry/openbabel/metadata.xml
index 88ffa5eb106b..f31c73d435ac 100644
--- a/sci-chemistry/openbabel/metadata.xml
+++ b/sci-chemistry/openbabel/metadata.xml
@@ -14,4 +14,8 @@
 	<upstream>
 		<remote-id type="sourceforge">openbabel</remote-id>
 	</upstream>
+	<use>
+		<flag name="inchi">Build support for IUPAC International Chemical Identifier format</flag>
+		<flag name="json">Build support for JSON formats (ChemDoodle, PubChem, etc...)</flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-chemistry/openbabel/openbabel-3.1.1_p20210225.ebuild b/sci-chemistry/openbabel/openbabel-3.1.1_p20210225.ebuild
new file mode 100644
index 000000000000..67ac61c1741b
--- /dev/null
+++ b/sci-chemistry/openbabel/openbabel-3.1.1_p20210225.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+WX_GTK_VER=3.0-gtk3
+
+inherit cmake desktop flag-o-matic perl-functions python-r1 toolchain-funcs wxwidgets xdg-utils
+
+DESCRIPTION="Interconverts file formats used in molecular modeling"
+HOMEPAGE="https://openbabel.org/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openbabel/${PN}.git"
+else
+	if [[ "${PV}" == *_p* ]]; then	# eg., openbabel-3.1.1_p20210325
+		# Set to commit hash
+		OPENBABEL_COMMIT=08e23f39b0cc39b4eebd937a5a2ffc1a7bac3e1b
+		SRC_URI="https://github.com/${PN}/${PN}/archive/${OPENBABEL_COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN}-${OPENBABEL_COMMIT}"
+	else
+		MY_P="${PN}-$(ver_rs 1- -)"
+		SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN}-${MY_P}"
+	fi
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+SRC_URI="${SRC_URI}
+	https://openbabel.org/docs/dev/_static/babel130.png -> ${PN}.png
+	http://openbabel.org/OBTitle.jpg ->  ${PN}.jpg"
+
+# See src/CMakeLists.txt for LIBRARY_VERSION
+SLOT="0/7.0.0"
+LICENSE="GPL-2"
+IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_2 doc examples +inchi json minimal openmp perl png python test wxwidgets"
+
+RESTRICT="!test? ( test )"
+
+# Inaccurate dependency logic upstream
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( inchi json !minimal wxwidgets )
+"
+
+BDEPEND="
+	dev-lang/perl
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-latex
+	)
+	perl? ( >=dev-lang/swig-2 )
+	python? ( >=dev-lang/swig-2 )
+	test? ( dev-lang/python )
+"
+
+COMMON_DEPEND="
+	dev-cpp/eigen:3
+	dev-libs/libxml2:2
+	sys-libs/zlib:=
+	inchi? ( sci-libs/inchi )
+	json? ( >=dev-libs/rapidjson-1.1.0 )
+	png? ( x11-libs/cairo )
+	python? ( ${PYTHON_DEPS} )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	perl? ( dev-lang/perl )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		dev-lang/perl:=
+		!sci-chemistry/openbabel-perl
+	)
+"
+
+pkg_setup() {
+	use openmp && tc-check-openmp
+}
+
+prepare_python_bindings() {
+	mkdir -p scripts/${EPYTHON} || die
+	# Appends to scripts/CMakeLists.txt, substituting the correct tags, for
+	# each valid python implementation,
+	cat "${FILESDIR}"/${PN}-python.cmake | \
+		sed -e "s|@@EPYTHON@@|${EPYTHON}|" \
+			-e "s|@@PYTHON_INCUDE_DIR@@|$(python_get_includedir)|" \
+			-e "s|@@PYTHON_LIBS@@|$(python_get_LIBS)|" \
+			-e "s|@@PYTHON_SITEDIR@@|$(python_get_sitedir)|" >> \
+				scripts/CMakeLists.txt || die
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use perl; then
+		perl_set_version
+
+		sed -e "/\${LIB_INSTALL_DIR}\/auto/s|\${LIB_INSTALL_DIR}|${VENDOR_ARCH}|" \
+			-e "/\${LIB_INSTALL_DIR}\/Chemistry/s|\${LIB_INSTALL_DIR}|${VENDOR_ARCH}|" \
+			-i scripts/CMakeLists.txt || die
+	fi
+
+	if use python; then
+		# Skip the python bindings sections as we'll append our own
+		sed -e '/^if (PYTHON_BINDINGS)$/s|PYTHON_BINDINGS|false|' \
+			-i {scripts,test}/CMakeLists.txt || die
+		if use test; then
+			# Problems with testbindings built with -O2
+			local test_skip="@unittest.skip('Similar to Issue #2138')"
+			sed -e "/def testTemplates/s|^|    ${test_skip}\\n|" \
+				-i test/testbindings.py || die
+			test_skip="@unittest.skip('Similar to Issue #2246')"
+			sed -e "/^def test_write_string/s|^|${test_skip}\\n|" \
+				-i test/testobconv_writers.py || die
+			fi
+		python_foreach_impl prepare_python_bindings
+	fi
+
+	# Remove dependency automagic
+	if ! use png; then
+		sed -e '/^find_package(Cairo/d' -i CMakeLists.txt || die
+	fi
+	if ! use wxwidgets; then
+		sed -e '/^find_package(wxWidgets/d' -i CMakeLists.txt || die
+	fi
+	if ! use inchi; then
+		sed -e '/^else()$/s|else\(\)|elseif\(false\)|' \
+			-i cmake/modules/FindInchi.cmake || die
+	fi
+
+	# Don't install example bins to /usr/bin
+	if use examples; then
+		sed -e "/RUNTIME DESTINATION/s|bin|share/doc/${PF}/examples|" \
+			-i doc/examples/CMakeLists.txt || die
+	fi
+
+	# boost is only used if building with gcc-3.x, which isn't supported in
+	# Gentoo. Still, it shouldn't look for, and include, its headers
+	sed -e '/find_package(Boost/d' -i {{tools,src}/,}CMakeLists.txt || die
+}
+
+src_configure() {
+	if use json; then
+		# -DOPTIMIZE_NATIVE=ON also forces -march=native so use
+		# cpu_flags to set defines instead
+		use cpu_flags_x86_sse2 && append-cppflags -DRAPIDJSON_SSE2
+		use cpu_flags_x86_sse4_2 && append-cppflags -DRAPIDJSON_SSE42
+		use cpu_flags_arm_neon && append-cppflags -DRAPIDJSON_NEON
+	fi
+
+	use wxwidgets && setup-wxwidgets
+
+	use_bindings() {
+		(use perl || use python) && (echo 'yes' || die) || (echo 'no' || die)
+	}
+
+	local mycmakeargs=(
+		-DBUILD_DOCS=$(usex doc)
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_GUI=$(usex wxwidgets)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_TESTS=$(usex test)
+		-DMINIMAL_BUILD=$(usex minimal)
+		# Set this, otherwise it defaults to true and forces WITH_INCHI=true
+		-DOPENBABEL_USE_SYSTEM_INCHI=$(usex inchi)
+		-DOPTIMIZE_NATIVE=OFF
+		-DPERL_BINDINGS=$(usex perl)
+		-DPYTHON_BINDINGS=$(usex python)
+		-DRUN_SWIG=$(use_bindings)
+		-DWITH_COORDGEN=false
+		-DWITH_INCHI=$(usex inchi)
+		-DWITH_JSON=$(usex json)
+		-DWITH_MAEPARSER=false
+	)
+
+	if use test; then
+		# Help cmake find the python interpreter when dev-lang/python-exec is built 
+		# without native-symlinks support.
+		python_setup
+		mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Wierd deadlock causes system_load to keep rising
+	cmake_src_test -j1
+}
+
+openbabel-optimize() {
+	python_optimize "${D}/$(python_get_sitedir)"/openbabel || die
+}
+
+src_install() {
+	cmake_src_install
+
+	docinto html
+	for x in doc/*.html; do
+		[[ ${x} != doc/api*.html ]] && dodoc ${x}
+	done
+	# Rendered in some html pages
+	newdoc "${DISTDIR}"/${PN}.png babel130.png
+	newdoc "${DISTDIR}"/${PN}.jpg OBTitle.jpg
+
+	if use doc; then
+		cmake_src_install docs
+		docinto html/API
+		dodoc -r doc/API/html/.
+	fi
+
+	if use examples; then
+		# no compression since we want ready-to-run scripts
+		docompress -x /usr/share/doc/${PF}/examples
+
+		# ${PV} doesn't correspond to the internal BABEL_VERSION for
+		# live or patch release builds so we grep it
+		local babel_ver=$(
+			grep '^#define BABEL_VERSION' < \
+				"${BUILD_DIR}"/include/openbabel/babelconfig.h | \
+				cut -d \" -f 2 || die
+		)
+		docinto examples/povray
+		dodoc doc/dioxin.* doc/README*.pov*
+		# Needed by the povray example
+		dosym ../../../../${PN}/${babel_ver}/babel_povray3.inc \
+			/usr/share/doc/${PF}/examples/povray/babel31.inc
+
+	fi
+
+	if use perl; then
+		docinto /
+		newdoc scripts/perl/Changes Changes.perl
+		newdoc scripts/perl/README README.perl
+		if use examples; then
+			docinto examples/perl
+			dodoc -r scripts/perl/examples/.
+		fi
+	fi
+
+	if use python; then
+		python_foreach_impl openbabel-optimize
+		docinto /
+		newdoc scripts/python/README.rst README.python.rst
+		docinto html
+		dodoc scripts/python/*.html
+		if use examples; then
+			docinto examples/python
+			dodoc -r scripts/python/examples/.
+		fi
+	fi
+
+	if use wxwidgets; then
+		make_desktop_entry obgui "Open Babel" ${PN}
+		doicon "${DISTDIR}"/${PN}.png
+	fi
+}
+
+pkg_postinst() {
+	use wxwidgets && xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	use wxwidgets && xdg_desktop_database_update
+}
diff --git a/sci-chemistry/openbabel/openbabel-9999.ebuild b/sci-chemistry/openbabel/openbabel-9999.ebuild
new file mode 100644
index 000000000000..baf793cb651c
--- /dev/null
+++ b/sci-chemistry/openbabel/openbabel-9999.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+WX_GTK_VER=3.0-gtk3
+
+inherit cmake desktop flag-o-matic perl-functions python-r1 toolchain-funcs wxwidgets xdg-utils
+
+DESCRIPTION="Interconverts file formats used in molecular modeling"
+HOMEPAGE="https://openbabel.org/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openbabel/${PN}.git"
+else
+	if [[ "${PV}" == *_p* ]]; then	# eg., openbabel-3.1.1_p20210325
+		# Set to commit hash
+		OPENBABEL_COMMIT=
+		SRC_URI="https://github.com/${PN}/${PN}/archive/${OPENBABEL_COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN}-${OPENBABEL_COMMIT}"
+	else
+		MY_P="${PN}-$(ver_rs 1- -)"
+		SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN}-${MY_P}"
+	fi
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+SRC_URI="${SRC_URI}
+	https://openbabel.org/docs/dev/_static/babel130.png -> ${PN}.png
+	http://openbabel.org/OBTitle.jpg ->  ${PN}.jpg"
+
+# See src/CMakeLists.txt for LIBRARY_VERSION
+SLOT="0/7.0.0"
+LICENSE="GPL-2"
+IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_2 doc examples +inchi json minimal openmp perl png python test wxwidgets"
+
+RESTRICT="!test? ( test )"
+
+# Inaccurate dependency logic upstream
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( inchi json !minimal wxwidgets )
+"
+
+BDEPEND="
+	dev-lang/perl
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-latex
+	)
+	perl? ( >=dev-lang/swig-2 )
+	python? ( >=dev-lang/swig-2 )
+	test? ( dev-lang/python )
+"
+
+COMMON_DEPEND="
+	dev-cpp/eigen:3
+	dev-libs/libxml2:2
+	sys-libs/zlib:=
+	inchi? ( sci-libs/inchi )
+	json? ( >=dev-libs/rapidjson-1.1.0 )
+	png? ( x11-libs/cairo )
+	python? ( ${PYTHON_DEPS} )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	perl? ( dev-lang/perl )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		dev-lang/perl:=
+		!sci-chemistry/openbabel-perl
+	)
+"
+
+pkg_setup() {
+	use openmp && tc-check-openmp
+}
+
+prepare_python_bindings() {
+	mkdir -p scripts/${EPYTHON} || die
+	# Appends to scripts/CMakeLists.txt, substituting the correct tags, for
+	# each valid python implementation,
+	cat "${FILESDIR}"/${PN}-python.cmake | \
+		sed -e "s|@@EPYTHON@@|${EPYTHON}|" \
+			-e "s|@@PYTHON_INCUDE_DIR@@|$(python_get_includedir)|" \
+			-e "s|@@PYTHON_LIBS@@|$(python_get_LIBS)|" \
+			-e "s|@@PYTHON_SITEDIR@@|$(python_get_sitedir)|" >> \
+				scripts/CMakeLists.txt || die
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use perl; then
+		perl_set_version
+
+		sed -e "/\${LIB_INSTALL_DIR}\/auto/s|\${LIB_INSTALL_DIR}|${VENDOR_ARCH}|" \
+			-e "/\${LIB_INSTALL_DIR}\/Chemistry/s|\${LIB_INSTALL_DIR}|${VENDOR_ARCH}|" \
+			-i scripts/CMakeLists.txt || die
+	fi
+
+	if use python; then
+		# Skip the python bindings sections as we'll append our own
+		sed -e '/^if (PYTHON_BINDINGS)$/s|PYTHON_BINDINGS|false|' \
+			-i {scripts,test}/CMakeLists.txt || die
+		if use test; then
+			# Problems with testbindings built with -O2
+			local test_skip="@unittest.skip('Similar to Issue #2138')"
+			sed -e "/def testTemplates/s|^|    ${test_skip}\\n|" \
+				-i test/testbindings.py || die
+			test_skip="@unittest.skip('Similar to Issue #2246')"
+			sed -e "/^def test_write_string/s|^|${test_skip}\\n|" \
+				-i test/testobconv_writers.py || die
+			fi
+		python_foreach_impl prepare_python_bindings
+	fi
+
+	# Remove dependency automagic
+	if ! use png; then
+		sed -e '/^find_package(Cairo/d' -i CMakeLists.txt || die
+	fi
+	if ! use wxwidgets; then
+		sed -e '/^find_package(wxWidgets/d' -i CMakeLists.txt || die
+	fi
+	if ! use inchi; then
+		sed -e '/^else()$/s|else\(\)|elseif\(false\)|' \
+			-i cmake/modules/FindInchi.cmake || die
+	fi
+
+	# Don't install example bins to /usr/bin
+	if use examples; then
+		sed -e "/RUNTIME DESTINATION/s|bin|share/doc/${PF}/examples|" \
+			-i doc/examples/CMakeLists.txt || die
+	fi
+
+	# boost is only used if building with gcc-3.x, which isn't supported in
+	# Gentoo. Still, it shouldn't look for, and include, its headers
+	sed -e '/find_package(Boost/d' -i {{tools,src}/,}CMakeLists.txt || die
+}
+
+src_configure() {
+	if use json; then
+		# -DOPTIMIZE_NATIVE=ON also forces -march=native so use
+		# cpu_flags to set defines instead
+		use cpu_flags_x86_sse2 && append-cppflags -DRAPIDJSON_SSE2
+		use cpu_flags_x86_sse4_2 && append-cppflags -DRAPIDJSON_SSE42
+		use cpu_flags_arm_neon && append-cppflags -DRAPIDJSON_NEON
+	fi
+
+	use wxwidgets && setup-wxwidgets
+
+	use_bindings() {
+		(use perl || use python) && (echo 'yes' || die) || (echo 'no' || die)
+	}
+
+	local mycmakeargs=(
+		-DBUILD_DOCS=$(usex doc)
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_GUI=$(usex wxwidgets)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_TESTS=$(usex test)
+		-DMINIMAL_BUILD=$(usex minimal)
+		# Set this, otherwise it defaults to true and forces WITH_INCHI=true
+		-DOPENBABEL_USE_SYSTEM_INCHI=$(usex inchi)
+		-DOPTIMIZE_NATIVE=OFF
+		-DPERL_BINDINGS=$(usex perl)
+		-DPYTHON_BINDINGS=$(usex python)
+		-DRUN_SWIG=$(use_bindings)
+		-DWITH_COORDGEN=false
+		-DWITH_INCHI=$(usex inchi)
+		-DWITH_JSON=$(usex json)
+		-DWITH_MAEPARSER=false
+	)
+
+	if use test; then
+		# Help cmake find the python interpreter when dev-lang/python-exec is built 
+		# without native-symlinks support.
+		python_setup
+		mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Wierd deadlock causes system_load to keep rising
+	cmake_src_test -j1
+}
+
+openbabel-optimize() {
+	python_optimize "${D}/$(python_get_sitedir)"/openbabel || die
+}
+
+src_install() {
+	cmake_src_install
+
+	docinto html
+	for x in doc/*.html; do
+		[[ ${x} != doc/api*.html ]] && dodoc ${x}
+	done
+	# Rendered in some html pages
+	newdoc "${DISTDIR}"/${PN}.png babel130.png
+	newdoc "${DISTDIR}"/${PN}.jpg OBTitle.jpg
+
+	if use doc; then
+		cmake_src_install docs
+		docinto html/API
+		dodoc -r doc/API/html/.
+	fi
+
+	if use examples; then
+		# no compression since we want ready-to-run scripts
+		docompress -x /usr/share/doc/${PF}/examples
+
+		# ${PV} doesn't correspond to the internal BABEL_VERSION for
+		# live or patch release builds so we grep it
+		local babel_ver=$(
+			grep '^#define BABEL_VERSION' < \
+				"${BUILD_DIR}"/include/openbabel/babelconfig.h | \
+				cut -d \" -f 2 || die
+		)
+		docinto examples/povray
+		dodoc doc/dioxin.* doc/README*.pov*
+		# Needed by the povray example
+		dosym ../../../../${PN}/${babel_ver}/babel_povray3.inc \
+			/usr/share/doc/${PF}/examples/povray/babel31.inc
+
+	fi
+
+	if use perl; then
+		docinto /
+		newdoc scripts/perl/Changes Changes.perl
+		newdoc scripts/perl/README README.perl
+		if use examples; then
+			docinto examples/perl
+			dodoc -r scripts/perl/examples/.
+		fi
+	fi
+
+	if use python; then
+		python_foreach_impl openbabel-optimize
+		docinto /
+		newdoc scripts/python/README.rst README.python.rst
+		docinto html
+		dodoc scripts/python/*.html
+		if use examples; then
+			docinto examples/python
+			dodoc -r scripts/python/examples/.
+		fi
+	fi
+
+	if use wxwidgets; then
+		make_desktop_entry obgui "Open Babel" ${PN}
+		doicon "${DISTDIR}"/${PN}.png
+	fi
+}
+
+pkg_postinst() {
+	use wxwidgets && xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	use wxwidgets && xdg_desktop_database_update
+}
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index bcd0ecc520a6..660bcf174713 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index a45f1992f390..6ec5847ce800 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,3 +1,4 @@
 DIST gazebo-11.3.0.tar.bz2 56778002 BLAKE2B d466556c834935d8b3694461ddf6d7a7872b00d2f8f58d50d70cceb8bca3ab4ada1e72e7bb14b79404d45c48f95419e3dedd9019ecc3a8c1623afda077bcbeb2 SHA512 2e219655e45a787aeda50065dcec5d90954c18223f134d6da90b8cb43e119268262e515e527547d0b0b5ed1f73b5083d279551a01faa3d3c34ba7a580c077970
 DIST gazebo-11.5.1.tar.bz2 56486174 BLAKE2B c1bffc5067f2739a8eb2e178bb2209d9c7b5a58d0589710cc515c4bcbbca281fb94ddf16de977f3771bc4b64fb6afe8e86327dde00d19ef62754e4d7634bb65f SHA512 7c922963881cf079e926c239f510e722fc6cabd07ef5e846a4b78772364a3aecb0b68f2b690ff451d42ceb11e88e2f831c30515e5a228f12826516ecad10e53a
 DIST gazebo-11.7.0.tar.bz2 56394312 BLAKE2B 2da58a2702113c1954f0202bb779b723ad8e59cab678f9ca6fe64908785198b996ef71c845a1a85f00e2f4eddb9ed5683f815ada850917b2af4afad214eac77d SHA512 7de40908a021655b2a200a73cf979585f4bdb245064f7e9a853998f87df329223252c73882aa1e2b705bc7de5841e2a87d67f772dfef18e5735c1b06c2663192
+DIST gazebo-11.9.1.tar.bz2 56472954 BLAKE2B c7a1c3c4a03112a90e8a0cb35dde32f5bb478dafb0d8c582d8cbad15ff1f43699782df3d69a75c47efec44d8a15ad96730f1ae9c1b5b0b1ff2099fbc6b8f2e4e SHA512 51af82305ef0758950e2752624cd98bd31abe55469a1cad6432b1edde1a8f896798a554c672f8694c080f7076d13fe1aa91b182227e26f04cb99e9e0f3907694
diff --git a/sci-electronics/gazebo/gazebo-11.9.1.ebuild b/sci-electronics/gazebo/gazebo-11.9.1.ebuild
new file mode 100644
index 000000000000..c6602d9de1c3
--- /dev/null
+++ b/sci-electronics/gazebo/gazebo-11.9.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="A 3D multiple robot simulator with dynamics"
+HOMEPAGE="http://gazebosim.org/"
+SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+# Subslot = major version = soname of libs
+SLOT="0/11"
+KEYWORDS="~amd64"
+IUSE="cpu_flags_x86_sse2 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/protobuf-2:=
+	virtual/opengl
+	media-libs/openal
+	net-misc/curl
+	dev-libs/tinyxml
+	>=dev-libs/tinyxml2-6:=
+	dev-libs/libtar
+	<dev-cpp/tbb-2021:=
+	>=dev-games/ogre-1.7.4:=[freeimage]
+	<dev-games/ogre-1.10
+	>=media-libs/freeimage-3.15.4[png]
+	sci-libs/libccd
+	>=media-video/ffmpeg-2.6:0=
+	sci-libs/gts
+	>=sci-physics/bullet-2.82:=
+	>=dev-libs/sdformat-9.1:=
+	dev-qt/qtwidgets:5
+	dev-qt/qtcore:5
+	dev-qt/qtopengl:5
+	dev-libs/boost:=[threads(+)]
+	sci-libs/gdal:=
+	virtual/libusb:1
+	dev-libs/libspnav
+	media-libs/freeimage
+	sci-libs/hdf5:=[cxx]
+	sys-apps/util-linux
+	media-gfx/graphviz
+	net-libs/ignition-msgs:5=
+	sci-libs/ignition-math:6=
+	net-libs/ignition-transport:8=
+	sci-libs/ignition-common:3=
+	sci-libs/ignition-fuel-tools:4=
+	<x11-libs/qwt-6.2.0:6=[qt5(+)]
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+	x11-apps/mesa-progs
+	test? ( dev-libs/libxslt )
+"
+BDEPEND="
+	app-text/ronn
+	app-arch/gzip
+	virtual/pkgconfig
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+PATCHES=(
+	"${FILESDIR}/qwt.patch"
+	"${FILESDIR}/cmake.patch"
+)
+
+src_configure() {
+	# find OGRE properly
+	sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
+
+	local mycmakeargs=(
+		"-DUSE_UPSTREAM_CFLAGS=OFF"
+		"-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
+		"-DUSE_HOST_CFLAGS=FALSE"
+		"-DBUILD_TESTING=$(usex test TRUE FALSE)"
+		"-DENABLE_SCREEN_TESTS=FALSE"
+		"-DUSE_EXTERNAL_TINYXML2=TRUE"
+	)
+	cmake_src_configure
+}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index a7052b5e7163..11e8aa1218d8 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/bliss/Manifest b/sci-libs/bliss/Manifest
index 827342cdd284..69758a8152ae 100644
--- a/sci-libs/bliss/Manifest
+++ b/sci-libs/bliss/Manifest
@@ -1 +1,2 @@
 DIST bliss-0.73.zip 94108 BLAKE2B 836184b31fa28db3328c21e7563366a93cf1645b02b96e185838e3c2513393b1d0a54783ca14c6d7f1a1d5055800bc3d7acde3c584e61e66c9ab93936824353b SHA512 30f505945c577d8bcb265a349f5bc9d4dcd96555fa3add285199cdd95ea2710f04409008ff06432daffab62c132e884845eae7f823191407906202862509e05d
+DIST bliss-0.77.zip 117888 BLAKE2B ce4b2fa568c5520fe41748bf59a493af1c33ec9cc0732aca5e5ba657ca726e118e26763355778e3def5716d62e7d3aceceb592ef67e5e148c250d3ffffab67d7 SHA512 d210f137e614bca7cf0d88851d0c62292bf479b687bca6a25d9e42661825f882a4ff8c74c96a965bd9d4f246a1bda6b90cef64894914e6f7b17db6bf4a8f4b17
diff --git a/sci-libs/bliss/bliss-0.77.ebuild b/sci-libs/bliss/bliss-0.77.ebuild
new file mode 100644
index 000000000000..88a4d042c220
--- /dev/null
+++ b/sci-libs/bliss/bliss-0.77.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+SRC_URI="https://users.aalto.fi/~tjunttil/${PN}/downloads/${P}.zip"
+DESCRIPTION="Compute Automorphism Groups and Canonical Labelings of Graphs"
+HOMEPAGE="https://users.aalto.fi/~tjunttil/bliss/index.html"
+
+LICENSE="LGPL-3"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="gmp"
+
+RDEPEND="gmp? ( dev-libs/gmp:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
+PATCHES=( "${FILESDIR}/${PN}-0.77-install.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_GMP="$(usex gmp)"
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/bliss/files/bliss-0.77-install.patch b/sci-libs/bliss/files/bliss-0.77-install.patch
new file mode 100644
index 000000000000..caab14aa40f6
--- /dev/null
+++ b/sci-libs/bliss/files/bliss-0.77-install.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 01ed093..cfdb0a6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -62,3 +62,27 @@ if(USE_GMP)
+   target_link_libraries(bliss-executable ${GMP_LIBRARIES})
+ endif(USE_GMP)
+ set_target_properties(bliss-executable PROPERTIES OUTPUT_NAME bliss)
++
++include(GNUInstallDirs)
++
++set(
++  BLISS_HEADERS
++  src/bliss_C.h
++  src/uintseqhash.hh
++  src/abstractgraph.hh
++  src/stats.hh
++  src/digraph.hh
++  src/defs.hh
++  src/heap.hh
++  src/graph.hh
++  src/partition.hh
++  src/kqueue.hh
++  src/utils.hh
++  src/orbit.hh
++  src/timer.hh
++  src/bignum.hh
++)
++
++install(TARGETS bliss-executable RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
++install(TARGETS bliss LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(FILES ${BLISS_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bliss)
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 3be0e052c2a6..22566e16c891 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/singular/metadata.xml b/sci-mathematics/singular/metadata.xml
index 098312eeb426..5d46057110ae 100644
--- a/sci-mathematics/singular/metadata.xml
+++ b/sci-mathematics/singular/metadata.xml
@@ -5,4 +5,12 @@
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>
+  <use>
+    <flag name="julia">Enables interface for Singular to julia</flag>
+    <flag name="polymake">Enable the interface to TOPCOM</flag>
+  </use>
+  <upstream>
+    <bugs-to>https://github.com/Singular/Singular/issues</bugs-to>
+    <remote-id type="github">Singular/Singular</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/singular/singular-4.2.1-r1.ebuild b/sci-mathematics/singular/singular-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..96abef3a90a3
--- /dev/null
+++ b/sci-mathematics/singular/singular-4.2.1-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic
+
+MY_PN=Singular
+MY_PV=$(ver_rs 3 '')
+# Consistency is different...
+MY_DIR2=$(ver_cut 1-3 ${PV})
+MY_DIR=$(ver_rs 1- '-' ${MY_DIR2})
+
+DESCRIPTION="Computer algebra system for polynomial computations"
+HOMEPAGE="https://www.singular.uni-kl.de/ https://github.com/Singular/Singular"
+SRC_URI="ftp://jim.mathematik.uni-kl.de/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_DIR2}"
+
+LICENSE="BSD GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="emacs examples julia polymake +readline static-libs"
+
+RDEPEND="
+	dev-lang/perl
+	dev-libs/gmp:0
+	dev-libs/ntl:=
+	sci-libs/cddlib
+	sci-mathematics/flint
+	emacs? ( >=app-editors/emacs-23.1:* )
+	julia? ( dev-lang/julia )
+	polymake? ( sci-mathematics/polymake )
+	readline? ( sys-libs/readline )
+"
+DEPEND="${RDEPEND}"
+
+SITEFILE=60${PN}-gentoo.el
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-doc_install-v2.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Needed to avoid segfaults in the test suite until
+	#
+	#   https://github.com/Singular/Singular/issues/1105
+	#
+	# makes its way into a release.
+	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	local myconf=(
+		--disable-debug
+		--disable-doc
+		--disable-optimizationflags
+		--disable-pyobject-module
+		--disable-python
+		--disable-python-module
+		--disable-python_module
+		--enable-factory
+		--enable-gfanlib
+		--enable-libfac
+		--with-flint
+		--with-gmp
+		--with-libparse
+		--with-ntl
+		--without-python
+		--without-pythonmodule
+		$(use_enable emacs)
+		$(use_enable julia)
+		$(use_enable polymake polymake-module)
+		$(use_enable static-libs static)
+		$(use_with readline)
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs; then
+		pushd "${S}"/emacs
+		elisp-compile *.el || die "elisp-compile failed"
+		popd
+	fi
+}
+
+src_install() {
+	# Do not compress singular's info file (singular.hlp)
+	# some consumer of that file do not know how to deal with compression
+	docompress -x /usr/share/info
+
+	default
+
+	dosym Singular /usr/bin/"${PN}"
+
+	# purge .la file
+	find "${ED}" -name '*.la' -delete || die
+}
+
+src_test() {
+	# SINGULAR_PROCS_DIR need to be set to "" otherwise plugins from
+	# an already installed version of singular may be used and cause segfault
+	# See https://github.com/Singular/Sources/issues/980
+	SINGULAR_PROCS_DIR="" emake check
+}
+
+pkg_postinst() {
+	einfo "Additional functionality can be enabled by installing"
+	einfo "sci-mathematics/4ti2"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 780509101ae0..d801e844acb0 100644
Binary files a/sci-physics/Manifest.gz and b/sci-physics/Manifest.gz differ
diff --git a/sci-physics/geant/geant-4.11.0.0.ebuild b/sci-physics/geant/geant-4.11.0.0.ebuild
index ebf046d14758..589a2cd089b5 100644
--- a/sci-physics/geant/geant-4.11.0.0.ebuild
+++ b/sci-physics/geant/geant-4.11.0.0.ebuild
@@ -80,8 +80,6 @@ S="${WORKDIR}/${MY_P}"
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
-		-DCMAKE_INSTALL_PYTHONDIR="${EPREFIX}/usr/lib/${EPYTHON}/site-packages"
-		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
 		-DCMAKE_CXX_STANDARD=$((usev c++17 || usev c++20) | cut -c4-)
 		-DGEANT4_BUILD_BUILTIN_BACKTRACE=$(usex debug)
 		-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
@@ -108,8 +106,17 @@ src_configure() {
 		-DGEANT4_USE_XM=$(usex motif)
 		-DGEANT4_USE_VTK=$(usex vtk)
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		${EXTRA_ECONF}
 	)
+
+	if use python; then
+		mycmakeargs+=(
+			-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
+			-DCMAKE_INSTALL_PYTHONDIR="${EPREFIX}/usr/lib/${EPYTHON}/site-packages"
+		)
+	fi
+
+	[ -v EXTRA_ECONF ] && mycmakeargs+=( ${EXTRA_ECONF} )
+
 	cmake_src_configure
 }
 
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 0744a5372ce0..49f57af4fb28 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/csync2/Manifest b/sys-cluster/csync2/Manifest
index 84048b643a72..bf90ba165632 100644
--- a/sys-cluster/csync2/Manifest
+++ b/sys-cluster/csync2/Manifest
@@ -1,2 +1 @@
 DIST csync2-2.0-github.tar.gz 108299 BLAKE2B ec06cf1284adfe63abd6c329deb4e53474d8f97998e4e6f7f6404321a6970f783d38e9feb46c02925c947834227516d40c928a457d2b43bd2b353ab3385fd150 SHA512 7555e2d958d6213e29cfa8b3b7415eea9a9868036865c519d724ae404006d913fba4aeeb61a916d3fc95669a6ca12160d4f52dc7d15bd59403e8a7de50ee8094
-DIST csync2-2.0.tar.gz 411013 BLAKE2B b5c3da3a46168f8b9835e349a8d56070cd0e5aef3b951ba1cfe7e958f6c830336141a2d1eca6a2485d23f745b9ae907d46282aa8cc3078a60582dac8c3f286b8 SHA512 f91fd222f67affe9634471d341b43ff67854a6ed25b620301a454e98a79a9fb80b2a66eb8713546758fd08300d52751e5ca7472c696daa20ee11779b87a830f8
diff --git a/sys-cluster/csync2/csync2-2.0-r2.ebuild b/sys-cluster/csync2/csync2-2.0-r2.ebuild
index f79215144a1f..6f71f731e737 100644
--- a/sys-cluster/csync2/csync2-2.0-r2.ebuild
+++ b/sys-cluster/csync2/csync2-2.0-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/LINBIT/csync2"
 SRC_URI="https://github.com/LINBIT/${PN}/archive/${P}.tar.gz -> ${P}-github.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 IUSE="mysql postgres sqlite ssl xinetd"
 
diff --git a/sys-cluster/csync2/csync2-2.0.ebuild b/sys-cluster/csync2/csync2-2.0.ebuild
deleted file mode 100644
index 727751fad472..000000000000
--- a/sys-cluster/csync2/csync2-2.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Cluster synchronization tool"
-HOMEPAGE="http://oss.linbit.com/csync2/"
-SRC_URI="http://oss.linbit.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm x86"
-
-IUSE="mysql postgres sqlite ssl xinetd"
-
-RDEPEND=">=net-libs/librsync-0.9.5
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( >=dev-db/sqlite-3.0 )
-	ssl? ( >=net-libs/gnutls-2.7.3 )
-	xinetd? ( sys-apps/xinetd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-SLOT="0"
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${P} \
-		--localstatedir=/var \
-		--sysconfdir=/etc/csync2 \
-		$(use_enable mysql) \
-		$(use_enable postgres) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable ssl gnutls)
-}
-
-src_install() {
-	# Parallel install fails, bug #561382
-	emake -j1 DESTDIR="${D}" install
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/${PN}.xinetd ${PN}
-	fi
-
-	keepdir /var/lib/csync2
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-}
-
-pkg_postinst() {
-	if use xinetd; then
-		echo
-		einfo "After you setup your conf file, edit the xinetd"
-		einfo "entry in /etc/xinetd.d/${PN} to enable, then"
-		einfo "start xinetd: /etc/init.d/xinetd start"
-	fi
-	echo
-	einfo "To add ${PN} to your services file"
-	if use ssl; then
-		einfo "and to generate the SSL certificates,"
-	fi
-	einfo "just run this command after you install:"
-	echo
-	einfo "emerge  --config =${PF}"
-	echo
-	einfo "Now you can find csync2.cfg under /etc/${PN}"
-	einfo "Please move you old config to the right location"
-	echo
-	einfo "To start csync2 as a standalone daemon, simply run:"
-	einfo "/etc/init.d/csync2 start"
-	echo
-}
-
-pkg_config() {
-	einfo "Updating ${ROOT}/etc/services"
-	{ grep -v ^${PN} "${ROOT}"/etc/services;
-	echo "csync2  30865/tcp"
-	} > "${ROOT}"/etc/services.new
-	mv -f "${ROOT}"/etc/services.new "${ROOT}"/etc/services
-
-	if use ssl; then
-		if [ ! -f "${ROOT}"/etc/${PN}/csync2_ssl_key.pem ]; then
-			einfo "Creating default certificate in ${ROOT}/etc/${PN}"
-
-			openssl genrsa -out "${ROOT}"/etc/${PN}/csync2_ssl_key.pem 1024 &> /dev/null
-
-			yes '' | \
-			openssl req -new \
-				-key "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \
-				-out "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \
-				&> "${ROOT}"/dev/null
-
-			openssl x509 -req -days 600 \
-				-in "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \
-				-signkey "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \
-				-out "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem \
-				&> "${ROOT}"/dev/null
-
-			rm "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr
-			chmod 400 "${ROOT}"/etc/${PN}/csync2_ssl_key.pem "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem
-		fi
-	fi
-}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 8ab7a7ceec65..aa117eb51ce3 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/mold/mold-9999.ebuild b/sys-devel/mold/mold-9999.ebuild
index 3f25d6ac3628..da4500cc160d 100644
--- a/sys-devel/mold/mold-9999.ebuild
+++ b/sys-devel/mold/mold-9999.ebuild
@@ -19,6 +19,7 @@ LICENSE="AGPL-3"
 SLOT="0"
 
 # Try again after 1.0 (nearly there, but path-related issues)
+# https://github.com/rui314/mold/issues/137
 RESTRICT="test"
 
 RDEPEND=">=dev-cpp/tbb-2021.4.0:=
@@ -48,7 +49,10 @@ src_compile() {
 }
 
 src_test() {
-	emake -C test -f Makefile.linux test
+	emake \
+		SYSTEM_TBB=1 \
+		SYSTEM_MIMALLOC=1 \
+		check
 }
 
 src_install() {
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 1259d1f8bd1d..924363e17f77 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild b/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild
index d1da43785931..e5cb403dba17 100644
--- a/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit flag-o-matic python-r1 toolchain-funcs udev
 
 DESCRIPTION="Tools for bcache"
-HOMEPAGE="https://bcache.evilpiepirate.org/"
+HOMEPAGE="https://bcache.evilpiepirate.org/ https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/"
 SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/${PN}.git/snapshot/${P}.tar.gz"
 
 SLOT="0"
diff --git a/sys-fs/bcache-tools/bcache-tools-9999.ebuild b/sys-fs/bcache-tools/bcache-tools-9999.ebuild
index 5cb77851e552..31a8bc178342 100644
--- a/sys-fs/bcache-tools/bcache-tools-9999.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7..10} )
 
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="Tools for bcache"
-HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/"
+HOMEPAGE="https://bcache.evilpiepirate.org/ https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -46,7 +46,7 @@ src_install() {
 	dosbin bcache make-bcache bcache-super-show
 
 	exeinto $(get_udevdir)
-	doexe bcache-register probe-bcache
+	doexe bcache-register probe-bcache bcache-export-cached
 
 	python_foreach_impl python_doscript bcache-status
 
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 474bcd0abfdb..d36c0173604e 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/element/Manifest b/www-apps/element/Manifest
index 00768aa1f875..8a8b1d71159b 100644
--- a/www-apps/element/Manifest
+++ b/www-apps/element/Manifest
@@ -1,3 +1 @@
-DIST element-v1.9.4.tar.gz 15530299 BLAKE2B ec0628f047ccd58498d1a048cc21acd847c69ebf8c7f39f5d5a272a8ebdbea68363a3c8817c8b42d17f15cee1ba322d25f4d1a59be826c35bdec83396eafe5a0 SHA512 c3c96244a5253450d44f899ca45fc654ae196494d3c5f2185cfa8d4414d6a9181ff1d31dfac4a15377715a97346e0c7f8d9e899484fafc7e3f5e35636427af6e
-DIST element-v1.9.5.tar.gz 15576128 BLAKE2B ce9d8ec04aa085559366c6335a910fb2d2a984bb46e1072d7003479b3dd7d28225bdba2951cdbb95d61d7b422242f894212d43f1b8f8ddd40b5c6cc07d2c2fad SHA512 07fc0db7c059969de6ee5444b1a3d4081a91f265879f95d4c42e4260db6be92163c6a821c113db5771b490eddaa232501903cfcbe858af3427766e5295337635
-DIST element-v1.9.6.tar.gz 15613416 BLAKE2B 5366775a8579762bfbc99846394a060a6aba7eb6c768d2767b5ebdf45ab3f77a3ecf652741b945d49dcc6705a202fe240dd065828d8fb59c4ca673a802296b84 SHA512 68a48c5be5b10b1eef75c66f23bcf750ef49897dd1e9fd6cf51e6f838849544dd292023d0b623695d2f806c166bfdd815ffdb69a8e63d3dd1d701f945a87ca2d
+DIST element-v1.9.7.tar.gz 15626084 BLAKE2B f07e8e8d5ce9b9b24aa91c29807f4f402c96f4ec062d5bba1b0b3ef05e839a002bb8b9fd311b2d7beb5dda435d5dfbc3a392be6330dc74fad601909c717e00df SHA512 5bf678d048d38dd887b73c2b00b7f4ca0aa3c93e836462a50d357b04a61f8e943beb56f5368fa748ef02bced5b4c1f19e45efa77875f1a87540d717440ecd2bc
diff --git a/www-apps/element/element-1.9.5.ebuild b/www-apps/element/element-1.9.5.ebuild
deleted file mode 100644
index 0d6f2e6d2cb4..000000000000
--- a/www-apps/element/element-1.9.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="A glossy Matrix collaboration client for the web"
-HOMEPAGE="https://element.io/"
-SRC_URI="https://github.com/vector-im/element-web/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-need_httpd
-
-S=${WORKDIR}/${PN}-v${PV}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/home
-	dodir "${MY_HTDOCSDIR}"/sites
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/home
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites
-	#webapp_configfile "${MY_HTDOCSDIR}"/config.json
-
-	webapp_src_install
-}
diff --git a/www-apps/element/element-1.9.6.ebuild b/www-apps/element/element-1.9.6.ebuild
deleted file mode 100644
index 0d6f2e6d2cb4..000000000000
--- a/www-apps/element/element-1.9.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="A glossy Matrix collaboration client for the web"
-HOMEPAGE="https://element.io/"
-SRC_URI="https://github.com/vector-im/element-web/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-need_httpd
-
-S=${WORKDIR}/${PN}-v${PV}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/home
-	dodir "${MY_HTDOCSDIR}"/sites
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/home
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites
-	#webapp_configfile "${MY_HTDOCSDIR}"/config.json
-
-	webapp_src_install
-}
diff --git a/www-apps/element/element-1.9.4.ebuild b/www-apps/element/element-1.9.7.ebuild
similarity index 100%
rename from www-apps/element/element-1.9.4.ebuild
rename to www-apps/element/element-1.9.7.ebuild
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index d5d413b6fff9..19ff216ed0eb 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ec25a023d011..58e9187924b1 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,7 +1,6 @@
 DIST chromium-96-patchset-4.tar.xz 4812 BLAKE2B 5d82d212b8ec1689be6f4a7a0646256311d06c17e74ee0e5b2035c32125a5235e4b6b7605cefffa367cc53e651be17b75f5e339149b4c80dca50cd959b1623f1 SHA512 a72c1bb2c58e9e2912a641093c153f01ad7239dc971c7c96481ba4164204afe41741f3253e8af03070dab8276179784dc6a11761b39ad7902ed2553016778282
 DIST chromium-96-ppc64le-1.tar.xz 29224 BLAKE2B 3369a3b15eb4f42761e01758135995a1f34e40cecbfc0372a4bc17b393d50b276ea5a0813d1c57f73f0dd34cf2a021356d25c2b4dcaa95998ffc082545dc915c SHA512 256d64fbf192e55d77c6580d36766a67dadfbd0f1e34e49bfc6d55114da7f2252d783db0dd09123996a71a01ec4a3d5c70fd1a5c8852db135857b8495f7cfbf1
 DIST chromium-96.0.4664.110.tar.xz 1209944416 BLAKE2B 1cec11b248b9225e47caf6bf8ec243e301bb63df2b0a070fb55b829b712e513b2510944f72306cebde3715704cae5b2c6be83847e91b358cb5135b56d55255b3 SHA512 7db962dc7016f531c33e915408303f06f429b53d1c5a69b281e64f6204d4bdb413fd281c3d891bb696d846f80f6182289c10f4b19b3b4c2c8b7fd72070de3f02
-DIST chromium-96.0.4664.93.tar.xz 1209670724 BLAKE2B ebc99f6232fb65874dc73af6157c7175c1b7bf98f800819c343bdb37c42f49369b6af0146a093663a09a2588652eeb196526e9de776098f69e5ba8d75d205e69 SHA512 3441380372014dc338418f494fcd7407dd3888cea07af3415c9e8ff2c3547abbd516ae03eb4b831b89923817046a6d1549fb9558db9aa271aa0ba397e514c0b3
 DIST chromium-97-patchset-4.tar.xz 4240 BLAKE2B 450d013b6fd68f7e0bcb21a2b0828d531eda86965e636fe24fc36c2e7e1f74fe93f27f0d4b1d03e67c605797e28db37de4949ff78d5106e07b0362bec4bc5d8a SHA512 181c706c83bdbe07b2e7f02b654922a860aea761ad267e6545fb7d56b66373b003c1c79fae5cd45eeb3be8917782fa45df1c05bbb00e170f0146e7385f4246c4
 DIST chromium-97.0.4692.45.tar.xz 1213732240 BLAKE2B cd722330f4f84f29331974a0663fc39b021fb4cc7b1e96e4c355397bf7e37386938e5be05618c37692d29e8cfb514fdd069cbdf9ca44073d8da10fafaba598f8 SHA512 bac8367c7494dea46477d70af9dc2f8fa360936c4996cea92c623a503f2965a24afc1f83c15ccfa10bb3d331d21ed65f9c73799c0efe5b6180767ae36c17c2e1
 DIST chromium-98-patchset-3.tar.xz 6164 BLAKE2B be4fa2997e13e89a0c8db1e99fa80adb937c0c02f1e18bd0ec93bdbdd484da4a8507baf13c5e6e602d5f5ecb2921f33bc3afdc3c3103b1b5314b62f59c1a71ad SHA512 47026635ca5c2e1d3965c82a449077380e6518b33e16b83bd105085cca50f512d08027eebd34d7ce5ce39d988f0120deccfb72697abac0d41e4502b6ad8abdf3
diff --git a/www-client/chromium/chromium-96.0.4664.110.ebuild b/www-client/chromium/chromium-96.0.4664.110.ebuild
index c04d39356207..9acfaae12a4c 100644
--- a/www-client/chromium/chromium-96.0.4664.110.ebuild
+++ b/www-client/chromium/chromium-96.0.4664.110.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0/stable"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
 REQUIRED_USE="
 	component-build? ( !suid )
diff --git a/www-client/chromium/chromium-96.0.4664.93.ebuild b/www-client/chromium/chromium-96.0.4664.93.ebuild
deleted file mode 100644
index 54fa89993303..000000000000
--- a/www-client/chromium/chromium-96.0.4664.93.ebuild
+++ /dev/null
@@ -1,963 +0,0 @@
-# Copyright 2009-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://chromium.org/"
-PATCHSET="4"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-PPC64LE_PATCHSET="1"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
-	ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-$(ver_cut 1)-ppc64le-${PPC64LE_PATCHSET}.tar.xz )"
-
-LICENSE="BSD"
-SLOT="0/stable"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine"
-REQUIRED_USE="
-	component-build? ( !suid )
-	screencast? ( wayland )
-"
-
-COMMON_X_DEPEND="
-	media-libs/mesa:=[gbm(+)]
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libxcb:=
-	x11-libs/libxshmfence:=
-	vaapi? ( >=x11-libs/libva-2.7:=[X,drm] )
-"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	dev-libs/expat:=
-	dev-libs/glib:2
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2.11.0-r1:=
-	system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] )
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4.3:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		>=media-libs/opus-1.3.1:=
-	)
-	net-misc/curl[ssl]
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libxkbcommon:=
-	x11-libs/pango:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-	!headless? (
-		${COMMON_X_DEPEND}
-		>=app-accessibility/at-spi2-atk-2.26:2
-		>=app-accessibility/at-spi2-core-2.26:2
-		>=dev-libs/atk-2.26
-		x11-libs/gtk+:3[X]
-		wayland? (
-			dev-libs/wayland:=
-			screencast? ( media-video/pipewire:0/0.3 )
-			x11-libs/gtk+:3[wayland,X]
-			x11-libs/libdrm:=
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-"
-DEPEND="${COMMON_DEPEND}
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=app-arch/gzip-1.7
-	dev-lang/perl
-	>=dev-util/gn-0.1807
-	dev-vcs/git
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-7.6.0[inspector]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	js-type-check? ( virtual/jre )
-"
-
-# These are intended for ebuild maintainer use to force clang if GCC is broken.
-: ${CHROMIUM_FORCE_CLANG=no}
-: ${CHROMIUM_FORCE_LIBCXX=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-12"
-fi
-
-if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-	RDEPEND+=" >=sys-libs/libcxx-12"
-	DEPEND+=" >=sys-libs/libcxx-12"
-else
-	COMMON_DEPEND="
-		dev-libs/libxslt:=
-		>=dev-libs/re2-0.2019.08.01:=
-		>=media-libs/openh264-1.6.0:=
-		system-icu? ( >=dev-libs/icu-69.1:= )
-	"
-	RDEPEND+="${COMMON_DEPEND}"
-	DEPEND+="${COMMON_DEPEND}"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
-	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
-			die "At least gcc 9.2 is required"
-		fi
-		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
-			CPP="${CHOST}-clang++ -E"
-			if ! ver_test "$(clang-major-version)" -ge 12; then
-				die "At least clang 12 is required"
-			fi
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="4G"
-	CHECKREQS_DISK_BUILD="9G"
-	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
-		if use custom-cflags || use component-build; then
-			CHECKREQS_DISK_BUILD="25G"
-		fi
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-
-	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
-	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
-		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
-		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local PATCHES=(
-		"${WORKDIR}/patches"
-		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-96-EnumTable-crash.patch"
-		"${FILESDIR}/chromium-96-freetype-unbundle.patch"
-		"${FILESDIR}/chromium-glibc-2.34.patch"
-		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
-		"${FILESDIR}/chromium-shim_headers.patch"
-	)
-
-	use ppc64 && PATCHES+=( "${WORKDIR}/${PN}-ppc64le" )
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	# adjust python interpreter version
-	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/double_conversion
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/angle/src/third_party/volk
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4-4.9.3
-		third_party/catapult/third_party/html5lib-1.1
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/dav1d
-		third_party/dawn
-		third_party/dawn/third_party/khronos
-		third_party/dawn/third_party/tint
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/axe-core
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/diff
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit-html
-		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
-		third_party/devtools-frontend/src/third_party
-		third_party/distributed_point_functions
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		third_party/fdlibm
-		third_party/fft2d
-		third_party/flatbuffers
-		third_party/freetype
-		third_party/fusejs
-		third_party/highway
-		third_party/libgifcodec
-		third_party/liburlpattern
-		third_party/libzip
-		third_party/gemmlowp
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/fastfeat
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libavif
-		third_party/libgav1
-		third_party/libjingle
-		third_party/libjxl
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libudev
-		third_party/libva_protected_content
-		third_party/libvpx
-		third_party/libvpx/source/libvpx/third_party/x86inc
-		third_party/libwebm
-		third_party/libx11
-		third_party/libxcb-keysyms
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/llvm
-		third_party/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/maldoca
-		third_party/maldoca/src/third_party/tensorflow_protos
-		third_party/maldoca/src/third_party/zlibwrapper
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/minigbm
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/neon_2_sse
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/one_euro_filter
-		third_party/opencv
-		third_party/openscreen
-		third_party/openscreen/src/third_party/mozilla
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/skia_shared
-		third_party/perfetto
-		third_party/perfetto/protos/third_party/chromium
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private-join-and-compute
-		third_party/private_membership
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/pyjson5
-		third_party/qcms
-		third_party/rnnoise
-		third_party/s2cellid
-		third_party/securemessage
-		third_party/shell-encryption
-		third_party/simplejson
-		third_party/skia
-		third_party/skia/include/third_party/skcms
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/skcms
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/snappy
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/subzero
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
-		third_party/tcmalloc
-		third_party/tensorflow-text
-		third_party/tflite
-		third_party/tflite/src/third_party/eigen3
-		third_party/tflite/src/third_party/fft2d
-		third_party/ruy
-		third_party/six
-		third_party/ukey2
-		third_party/unrar
-		third_party/usrsctp
-		third_party/utf
-		third_party/vulkan
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webgpu-cts
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/ooura
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/wuffs
-		third_party/x11proto
-		third_party/xcbproto
-		third_party/zxcvbn-cpp
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/valgrind
-		v8/src/third_party/utf8-decoder
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if use system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng/utils )
-	else
-		keeplibs+=( third_party/harfbuzz-ng )
-	fi
-	if use wayland && ! use headless ; then
-		keeplibs+=( third_party/wayland )
-	fi
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		keeplibs+=( third_party/libxml )
-		keeplibs+=( third_party/libxslt )
-		keeplibs+=( third_party/openh264 )
-		keeplibs+=( third_party/re2 )
-		if use system-icu; then
-			keeplibs+=( third_party/icu )
-		fi
-	fi
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	# it has to be done before unbundling.
-	if use ppc64; then
-		pushd third_party/libvpx >/dev/null || die
-		mkdir -p source/config/linux/ppc64 || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
-	if use js-type-check; then
-		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
-	fi
-
-	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
-	mkdir -p buildtools/third_party/eu-strip/bin || die
-	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-src_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
-		# Force clang since gcc is pretty broken at the moment.
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-			die "Compiling with sys-libs/libcxx requires clang."
-		fi
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
-	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
-	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
-	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libpng
-		libwebp
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
-		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
-		gn_system_libraries+=( libxml )
-		gn_system_libraries+=( libxslt )
-		gn_system_libraries+=( openh264 )
-		gn_system_libraries+=( re2 )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
-
-	# Disable deprecated libgnome-keyring dependency, bug #713012
-	myconf_gn+=" use_gnome_keyring=false"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" disable_fieldtrial_testing_config=true"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
-
-	# Disable forced lld, bug 641556
-	myconf_gn+=" use_lld=false"
-
-	# Disable pseudolocales, only used for testing
-	myconf_gn+=" enable_pseudolocales=false"
-
-	# Disable code formating of generated files
-	myconf_gn+=" blink_enable_generated_code_formatting=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info. The OAuth2 credentials, however, have been left out.
-	# Those OAuth2 credentials have been broken for quite some time anyway.
-	# Instead we apply a patch to use the --oauth2-client-id= and
-	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
-	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
-	# Chromium without baked-in values.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		if ! use component-build || use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
-		fi
-	fi
-
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		append-flags -stdlib=libc++
-		append-ldflags -stdlib=libc++
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
-	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
-
-	# highway/libjxl fail on ppc64 without extra patches, disable for now.
-	use ppc64 && myconf_gn+=" enable_jxl_decoder=false"
-
-	# Disable unknown warning message from clang.
-	tc-is-clang && append-flags -Wno-unknown-warning-option
-
-	# Explicitly disable ICU data file support for system-icu builds.
-	if use system-icu; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	myconf_gn+=" ozone_platform_x11=$(usex headless false true)"
-	if use wayland || use headless; then
-		if use headless; then
-			myconf_gn+=" ozone_platform=\"headless\""
-			myconf_gn+=" use_x11=false"
-		else
-			myconf_gn+=" ozone_platform_wayland=true"
-			myconf_gn+=" use_system_libdrm=true"
-			myconf_gn+=" use_system_minigbm=true"
-			myconf_gn+=" use_xkbcommon=true"
-			myconf_gn+=" ozone_platform=\"wayland\""
-		fi
-	else
-		myconf_gn+=" ozone_platform=\"x11\""
-	fi
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	myconf_gn+=" use_thin_lto=false"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		# Disable CFI: unsupported for GCC, requires clang+lto+lld
-		myconf_gn+=" is_cfi=false"
-		# Disable PGO, because profile data is only compatible with >=clang-11
-		myconf_gn+=" chrome_pgo_phase=0"
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
-	local -x PYTHONPATH=
-
-	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-
-	mv out/Release/chromedriver{.unstripped,} || die
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-
-	# Build vk_swiftshader_icd.json; bug #827861
-	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
-		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
-		out/Release/vk_swiftshader_icd.json || die
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-	doexe out/Release/chrome_crashpad_handler
-
-	ozone_auto_session () {
-		use wayland && ! use headless && echo true || echo false
-	}
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so out/Release/*.so.[0-9])
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	if ! use system-icu; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-	doins -r out/Release/MEIPreload
-
-	# Install vk_swiftshader_icd.json; bug #827861
-	doins out/Release/vk_swiftshader_icd.json
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-
-	if use vaapi; then
-		elog "VA-API is disabled by default at runtime. You have to enable it"
-		elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
-		elog "in /etc/chromium/default."
-	fi
-	if use screencast; then
-		elog "Screencast is disabled by default at runtime. Either enable it"
-		elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
-		elog "inside Chromium or add --enable-webrtc-pipewire-capturer"
-		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-	fi
-}
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index d8d9b04ce0a4..6de90eee6920 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 14fbc50c3c47..e057bf7105cc 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -6,42 +6,37 @@ DIST NVIDIA-Linux-aarch64-495.46.run 211122869 BLAKE2B 2193f9de186b727af4f22999f
 DIST NVIDIA-Linux-x86-390.144.run 49210937 BLAKE2B b7e6edb55af88be74e4322ff1d270388a60a9d9809314c3a0502f86ed97edb99dfcdd3c81c5f51e681c8fcc47ecbfecd124b4d733141d23726226a3965b4c1f1 SHA512 d962c7e7b4b9c4635a887767d34a49c401a89e5975a5e57fa83366ca824ab70d5b8a81f3dce2e05e0528afddc72d70b2fcd69a216bd16d75e7b88ec704390546
 DIST NVIDIA-Linux-x86_64-390.144.run 85000417 BLAKE2B 8ecfa768fb8fe92170ff5b82698a7fb22da8bc557ab2036464bf5650b6fffc7028e25a68e1f5638f6bc171eb45a4aba459465490c7a99aacd36dc769994062e8 SHA512 9503ebf41037a14deba995288a364768cb03fb682de8653a4b0c05955b23603443c41c4216c93eac7d7efc301734416012864ede728324ab47b93ff167d93da4
 DIST NVIDIA-Linux-x86_64-460.91.03.run 178201292 BLAKE2B 4d407b7bb3a99ab71c62c3cd18dc3549c98a24e7af28276e6e6a21dd33efcab017fed3f782f6dfb060c4437cd718f19c2f9900de367cc47bf19fa2718a18ad55 SHA512 4ac11130fe5a8f1c26f459e9c19660b3ff6f23011e9f77b09ca948fc42609e523ecea70d3bf6def50a75b4a3079ab280018753fb6e53875d9bb8093a033e3b70
-DIST NVIDIA-Linux-x86_64-470.62.13.run 272974366 BLAKE2B 08f8e5828adf3823f0988abb67c0a2b92b80637b2a28e24f056884aabad69c7ac929c8c32594c3d63d8a1ee69f58f9a99cadab9b1a2bc3e42ddab3146ab7376c SHA512 5228bdb88a005bec9cd66f23197b0f1ee8b9d7c5c68b3d13352102125d21da67c6800cbe18215d77f2b3dc59a7ab9cdaf78f42b21e87b7eb8123bbc9f3b6a42e
+DIST NVIDIA-Linux-x86_64-470.62.16.run 270377842 BLAKE2B 6f6263a8652c07e8da7dfc6663f31125ecb605620cd2da05e0972c0787cd43f49779b5354c38f55dafe468b7adb5ddccbdad1a5a361a599f26175156aca8410f SHA512 bb541d59eb908d6b2a255f11af01257f34fe4d7e6807ba19de957da8f0a3b428854bf5b97c71134d3a705ea27598fe0b940bd1c4055026bd90ffe04c1880ca9b
 DIST NVIDIA-Linux-x86_64-470.86.run 273149806 BLAKE2B c7f5a64dfb6547856d5bccdce0fcce0f6180966961245508cdc96e672ae500940f35fad0a9b8e8e9692b5cc67d68504371e041364e3a367deb4e1c3c75222c20 SHA512 e541549967ee992b8e6812cb6a294307217e66c7380ec17ff143ddc637f6e3a5b6c807ba8e29bf4c3d6813d7589a41aa124e8a5709a484ecf7fedfe420598a06
 DIST NVIDIA-Linux-x86_64-470.94.run 272262854 BLAKE2B 23785ec9d434f48793547a3a0d8708c0928b1926f9d8973d872f1745291095cba494310b2fa25a62f3d29bfb4f660fa1ef78d49da651d8a094a23d64ca110e8a SHA512 b70542af04691da623b494d49fcbd58c58b83388fdb1c7ea6dcc779755b595444a324f613840ccbba0d9029456668376fe6049a3e4496c6054efbbf1e0a59c0f
 DIST NVIDIA-Linux-x86_64-495.44.run 282259831 BLAKE2B ca11406a5b1b25d9691ec61d4125457c22438b8f0af0651043235f72ee75c4b264cfde7b04840bbec15c22bc5eb657a46326b49941e6c776a8990430cf052818 SHA512 bc9054e6028ba172906e6eb9a0b8f5cfc3ae74d57f3e95e0f9057879e3af07a4b19479e80d81e948872bc47bbd674f77f5f81d4debd2e2c3ce45058cd9211802
 DIST NVIDIA-Linux-x86_64-495.46.run 280886811 BLAKE2B 156917245f37a5da9121cf570616d6367eec66998a50136f1db0c521fc725e68db27acd5741a9fc3e3d502a2c7e90ccde68a7e56346cb8f5fc65ea419c2f0576 SHA512 859548fa81478acb994b40434fc85824976b1f83bc15846290898854db84ea3c6550586a1d7e89ff3afa248310d2bcf4d2d52d5d8e91cf74e3f7e4108a7002ad
 DIST nvidia-installer-390.144.tar.bz2 150017 BLAKE2B 1a633594ecb9b54ee5a1e3620263a95db30c1ddebf547ecc7f267e1f0b799bcdb44cc3ddd6c96eda085d9be5c8f691e92556296f250495d80eec0c2f155f5bd5 SHA512 e4c624afc18bd1d61264f93bdcbc72afe42687baadf31683a6dd11a45c6257f6a5185b91f4b3d4c0316b8eb03ed79511f9ad260ee9e6f299fc136f5dc2178e42
 DIST nvidia-installer-460.91.03.tar.bz2 144463 BLAKE2B b8c381158f614331fbfd04dcfdd7227fcb3eb16cbe4e3cbcbb34ba6af2370b05ebd72dc46375b2099b950817e6a0565c418e62b6364f1d7269f78c1dce5f5535 SHA512 10c873597202a1d8aa0dc4629b1e64f8c1f65a68c91f6babe312cf9fabbb9257b77d03a3917c0f4f5d6994e90cf58c6c7d9a802a675ea3ef60b571c9b7abc391
-DIST nvidia-installer-470.63.01.tar.bz2 146093 BLAKE2B 49f16fd7b27552013067410e3cfc80d44a4ec9c454d5db542caaa84b34e20cddabdeba2391d451aab39c832745fc2fbfc5bda3876a67859027d83b482d55118f SHA512 92d680d845abb39d77a51ccc47f1102825387b664e87fb2f5d976a0a4cc6baee508fe86bc92f5f0c77f1cec61506826b155ca1ef02708c39d145c9d897868397
 DIST nvidia-installer-470.86.tar.bz2 146359 BLAKE2B e1df27887ef7168dc50d54fd688fa04e80f79065c26386aa8f5f2b0726302a0dde51093d93c24d4145d0ff72cea14e76eee4fb9503c16a562c211dab9b2fdeaf SHA512 8bcc9a32d9f6c3cb778838124be5b112edf1b38753842bb436db74ae6448b4b7a367b79585f28bee9f2a41844e71083cea9b59beab99c14598a8d855ac432113
 DIST nvidia-installer-470.94.tar.gz 201064 BLAKE2B e8cdace018638567094e377731eaa324a2650c1ecded96f71dc9c0381112b300fa24b1c07d3051944483533fbe0605265fc963b8fd9f0fbf00a4089a9d68cffe SHA512 31b304aa2e94c716c75afbf7b5ec7d04c51958bb7ef7ced1fbad8bb8d208a93428b8318628bb1c5ee44f49476a5fee8a13137fc48eb9c2ae79207f1e79850844
 DIST nvidia-installer-495.44.tar.bz2 147036 BLAKE2B a340d1629ab133d072cd7d673a474ec834c2cd71f35b2e98d837deaa6535a784c93978ec484c5060ff28cf845d5cffa08b368b3b8b18a7ddabb4a7cb1c7a0ad0 SHA512 9f9f592b2d73515a484720eb421774a28b39af0ba3fbea127d1987533ed0f42104f640da6211f9eee63cc1063aad68dddfe8d378e3ef590c7f77d54e56bbb8bd
 DIST nvidia-installer-495.46.tar.gz 202462 BLAKE2B 2ad427e0c4df3ba1ef2faa7b92c4a21465961b6fb6d5f6f1997a8d1039b35341789168f82c0b9397f57f1574cb97418b69823fe5b5d321188a841e7347bb0f8c SHA512 c2fc5935e6736ea6e146a711ff05267ec42da6b1f7286589556a77f97fa02e30dacf098f9e23319ebf70808ae93275bdf3309740c6210a7d57636b483f11be74
 DIST nvidia-modprobe-390.144.tar.bz2 35308 BLAKE2B 1930c315aeb0e296c0d4795170d44a275da5ff8838fd8230559227852001b679fbca2830142ca7abcfa9c84626c9d9f222f7ab0cb3984d8d517f5ce431e5a9ea SHA512 d542c1a7634a8c5ff803ca79f2fc02b17b129185177226ad60625a4d246bbaf740719ff024dbde0f5aa8273949446561261d700a27cf88217c2572e69882142c
 DIST nvidia-modprobe-460.91.03.tar.bz2 38144 BLAKE2B 660b381f8757fe8862f7c4a971e44d3124afa3783d52af29543b8ed67486ba03b76c0b5d8dfadc5da8fdcc2c8799ec5f9c3016fd58e9c209fcc3ae897fb0436b SHA512 aa47a9c0744b8e11e87d2c0f300b13fee435cd5225444be7fb0b6bea49af33811dfa723a9ccfe904c7de2b5a8da36b707c1024eb495e3f0b587e3231a4bc4f39
-DIST nvidia-modprobe-470.63.01.tar.bz2 38357 BLAKE2B 906f966df5aafe5478550bb30b4d624247c2c621ecc5e21fa9aa0e37f1ffe39b3e44d70f24864d49c99c63d5a5045057f46b9b364f6f662bd5676b242fa3c265 SHA512 f41a168fe4b2278cd4cc53dd0e334e7e7dfccc91abd818b7e2b5d67c3a806d2ce5d1b11cd3cdc2f4507cc0baf42c3c5985784e19665c7a3bafb9ab433132271e
 DIST nvidia-modprobe-470.86.tar.bz2 38361 BLAKE2B eacef469888392d5993d018421e50cc594fadfcbe1367f13b68519c15d097759a91d3e294e3dc7391d2e3f93783fcd2e696ef25a7b4aad90abd18d992c480623 SHA512 5478bdd01aa7af79fcc6264b347b78bf68d2ade77eac388eb6968db72056859443778d0aad7bae1d5d63c01af332a21504fff13ac3e226446c8a71beef777860
 DIST nvidia-modprobe-470.94.tar.gz 43366 BLAKE2B b8e5fa22ab229eab0107f89b4f8f19e489b19e83044909e637fb1a2ea2692be55f8c5b264d89f9acce0617d8f0e37d02686be472e3f8c246b7545a906614990f SHA512 6940ee2ac676cb9da2c7dabff9c23ca3f7e4dff9b7010fb442f56e9f9fe0bccde5b777e1f7f492c72d85b1a58bd142492b95aa9fb177a36b61c6142a051d888a
 DIST nvidia-modprobe-495.44.tar.bz2 38377 BLAKE2B f1695c778c25d41795b1bda43df68a1dea9c3d16fc00acebe5948aeffd8aef174cb864d85260565fad8ac8c454ad3ad0cfb76529d9f88c3f10547de11492c61c SHA512 cdf7331609ce2a400f2b0e987bdbd2450a07e837971ac94b5ab746874259e6e7a4bff5eb8b9518f786365af74e8650f1c5ddfb745f867a6777825f550a6a74c0
 DIST nvidia-modprobe-495.46.tar.gz 43480 BLAKE2B 32b6592ca1df822227adc9a05848e98b09cfbde676b152d432aaea43ba753ccd8451515b37e275ef58159c468502b7e6d8020ce82d140c63176cd2bbdc65d1aa SHA512 1b6ba93ea72a6dbe345d360fc189ab3be038e2bf1bc93c8be2656aaaf0a81cd3a71aeefc244a71ad20db42a9e5f3145934a6c4cae70f0e8935d9891fe784676b
 DIST nvidia-persistenced-390.144.tar.bz2 48672 BLAKE2B 82a92a33eb40971e56b772ffab121214f5675d0a8c618e356e7b55bc38ff9605fd2701d740d00a1e26c158c9df0ab38d0ba10891a3850f8e8cbee8fb231ba52d SHA512 4432f2dd18c7c91fd0d59e4f2bdf7254f58ed2a6b652d319c4f7ce674522da1797a68dd6939c38e71710dcd3b754ae7cc8c6e7acb47a76e13d2091e8a8ee99c8
 DIST nvidia-persistenced-460.91.03.tar.bz2 46160 BLAKE2B f7f34cc12de2a4d69184c60caf7a8e8025b58005ade0a3e9a1a0e95856055f7211a710a1145d674d8a2e97cf70a43175cbc5c9a5dabc49ce378623be1720c6ea SHA512 c3ff5875353c264cb224b3f512ff8308bf1b0b95282e34500d88da2574719c3c514581e5900841b089c2e6f0fe29198fa06a11668de8e21c59f9f96244a74757
-DIST nvidia-persistenced-470.63.01.tar.bz2 46544 BLAKE2B c2bbc76bc06db1dc963ed34731fc9ca9ad2145dad4326586a7e37a395ff8ffac940800138bec08cdfafa9eb8ab5b79412e66e78cb5ef58aca4ee476d31ce0c89 SHA512 6ae699cae67911f92ac2dae82856e0a4d31a8d47a3d2e8e6fbae6469f28960caab4a56aae1a1ac3de0339c78dedc344c09136ec922690abd9fb5abc96afba5ca
 DIST nvidia-persistenced-470.86.tar.bz2 46523 BLAKE2B 29b60ff1a4e7db8ff8a2b32ab6ff2efd5d5010cb66ba1678e76a55fbe4b9f51ced06f9939ee2b44d5e073d7cc5b7b246fd2a531d9607b452a9a85cf6519c783e SHA512 6194ebc246d305ad5cc4276c1d2fa06c383e28ee8accef0e39ef3dedf637684837c10b78ee2b96a0b77d3e6e5e3c3555fe12629984f8ebc6358b96e303cb81a2
 DIST nvidia-persistenced-470.94.tar.gz 53991 BLAKE2B 461fd202d58036f205ef4ad80a5584e7081f4bfd8ee2637764dca2965e00a7488661b6247f6eb3a1980c2e23c39227a545545dc08381e52662bb8411e593b76a SHA512 998aa4c6ff9966fce893c5b6cdffce93703fec2c48382e13411a1d8c64eb9eacf567afe87d8bdd0b5d33426a73be1f01e3f84a3bda0f71ad855c221411297c2d
 DIST nvidia-persistenced-495.44.tar.bz2 46259 BLAKE2B ed34bb3b82a24fe7e651eaf671469988f32a9fa4782f0a8d8f08499b85cee596996611f08fe8e26a295a3073ae6a5bd59c44a1d9c6db41138339656e932aa7df SHA512 d295caaad65336495e22ebf890f6a1d323b9fabd0fb4900c8d4e37044f472836327743fceb6d433bd1ef61dffe8a84a655ddf81b2eff085c7e913105a05cb47e
 DIST nvidia-persistenced-495.46.tar.gz 53692 BLAKE2B 0c449f2a870d3e29d7119250ecab962dca55a81f6cbbd110be05a7b8a739ca1f130ba255712425fe7f3d770a83f819c40c2464df2ca4c03b94df075d33f034b5 SHA512 402db637fff090dfea2bf26d44060297e21f53c23bb2abdd22e945f90d2fb5141621fa73b732257bb2fab488522b669af9b03c821467dc23f6b9f4dc00998917
 DIST nvidia-settings-390.144.tar.bz2 1109104 BLAKE2B 6724f49c7e469f580206fc17308190bd346b6167348a8b8b3886209f58aca61b65eff30658484c1fee40af8c0d89fb62f73329b05a6ac45178ea4a6870e5aa85 SHA512 90afe201361d492c3152057d3ec46d68c0cd722fe0ea0587aa1156718017d59fb5f26f3db89d91d4680b2390617867dbe93bd14e1fb3dc70402527bfacf0ae5c
 DIST nvidia-settings-460.91.03.tar.bz2 1061093 BLAKE2B 13f1da07eda3a0e7e96ac69091e4a34fcd75a8f459a4db3840c64272dd54080694c4df3b7c326884ff032eb1b8708b5e19107b112afee2c80eed242281292b02 SHA512 172ea3366065aa30e71a5a47b31366d076477b8801a8a37e0d76972406e69c8872daa80011ee020960bc5e00163c4e9e5f63aa4f0dc726065671d76851b4ad71
-DIST nvidia-settings-470.63.01.tar.bz2 1062399 BLAKE2B b3193ef94cf3cde41cf2b5f38cc39c090e54b5c0f980bdf6bff318554d155cb3639d5d65baf7148b5a5d378f483b3235aaa4ffa0cd625b44e7dd4ffcb7156f00 SHA512 d8458f8e103de0a5026857009da6cd55e969fbc2481d526b7e22fac92e865f9f226a2670bd984b743be093acd0fcd1970c1a20819ca736b0582b645a5c4c6e1e
 DIST nvidia-settings-470.86.tar.bz2 1062317 BLAKE2B 348c0346cb224eacceb570c833d74dbafc79be0fa54cf1953a96ba4198e0c76784e482284fc6790edab31bdcff3a70fe870e4634c5442b455db9c92332b28747 SHA512 4a53f4d3f52e569c4957890fbc4a4c7b2429bbca5ec07901ebb20f1848cc9a5da3e36e206719419462076793bba0b51d37a11e0856be371a19f5b7f0f2da26e7
 DIST nvidia-settings-470.94.tar.gz 1235132 BLAKE2B 7f46d7225b18c2e287d1d6aa72408dcfbd2a6afacb02679c6d229de02518aa3d584a1987841914079a23b424eb18ff9b13d6ca28d63b3d539c7b271213fb6b26 SHA512 d8a8a1574d27ec77e25e13bbfff60b3e673b125c2053788c83481c3684af8cb51c2ae19267b01827bb4c53eef84645a9d9a4ea840159414bf51162148067652d
 DIST nvidia-settings-495.44.tar.bz2 1062420 BLAKE2B 98d5ac73f279bc3d415e3902946eca15fe4d61978dde5b21a96e9e1367129b9949078bd2c3778d344237ff4b9cf65a2921025a6410394f007dd97f441dc320f4 SHA512 e69bb32e47a43368de1959a0c8a877281bba0139119b1a34f6da86e006a8b0dce5bafe0fd017221be40a6bddcd93934e9479cbb8f04fb979b84f5f206835118e
 DIST nvidia-settings-495.46.tar.gz 1235052 BLAKE2B aa4396b56a41f19f0876a135b6c2de0f74b3d8a50fb7ad51b00394868c3354cb85d0cb54dac146537010ea4d091daf02149e5ffc5d59f8ca27f2e08b9d798dd3 SHA512 f9019d651f482aa35ccade111dabcc6d21e2dcb229a6102d5b8c9c72df648fa053a01bf0d3efef27d974aed2a23cbfc5022ebb6e9a93eba309b0863068d2423a
 DIST nvidia-xconfig-390.144.tar.bz2 107147 BLAKE2B 1b6ea6dfbe33474cd3e9409a7559a38716c4ce8d2583354232225a2a7ec10c7dbc2163f07c6849f4929e16c2fad179d583daad8a67d9cba950a62209b8ebebfa SHA512 09bb3558be178deda4b26031560ebad4e98e68b6186e247d4638cbcb4bb5dc05937c6baeaf1cd4db5a7b7433af97c3150c526ed972ff51b6e1c7552235ec6b51
 DIST nvidia-xconfig-460.91.03.tar.bz2 108477 BLAKE2B d95505e508ca16d8ebe8c22c445a1b686c32a626c379b1b48e2a8101969fc03b90446953cc30e945da9388237fa1b9e5f83417aba1fb062d58866a523c256769 SHA512 4bb8f7fc42e7fa5e3897884bd7e722c4fe8ab1e4a87cad4136e1764cdd91d4795f817dcee63a20279315b4839d92fe5244d073ea2310c704f8aacd38bacb28a4
-DIST nvidia-xconfig-470.63.01.tar.bz2 109078 BLAKE2B 786d4be4e1aa23ecdd51b0c5628e27a42472f4f119979acc62d100e094d077be6c7b893353d7d31ea4a47fe99135c01ea4ca0b539da62379295644fcd7b38c79 SHA512 5a3b599cba4be7e272fb1fc3c1dc31c09b1f101f81e7d24a27cf88d96746d42c84ba89f5ebeb4f602e012e0aa04804015cab5cf24947e60131652f1e010e96e2
 DIST nvidia-xconfig-470.86.tar.bz2 108946 BLAKE2B 8711d46e18db89c94fe9986e3ea296504d1d4795be745f9ab9eac35e499220335fe882258bc52c1a9dedd7848c9715f8bf481e3690913204db71584b0913b85e SHA512 ea658567b7532ae3a33a1783ef224b7f57db34391280f529352cce042b8104ee8092b3585b7eef8cd5b295e4f8246e872d935c32edf746ca38651b2df21e7e6a
 DIST nvidia-xconfig-470.94.tar.gz 142577 BLAKE2B 0687d78a05d4b990bad18a27544874dc79fdef7a7d5e7f5393f10ad7e874cfe51b27919ab61e2c7670e0d89848f80f68660eac0294bab27f004b8c98b650a102 SHA512 88611ed7a0894c218ad536a9819182a1f94d85c24bc3ef1b2959134147ba8d623bf1b35bd8f30ad2367704b3846f23d84ebe5b94f08936ec97ed26ac63d40add
 DIST nvidia-xconfig-495.44.tar.bz2 108699 BLAKE2B 8027d9b14f16c792e0839746c549979017e52724a5826cad3b53cda0fa2638b6f7dfe72353e36b84084f4a56a004cd91f87ff1d1d9e542b5d760e47092268993 SHA512 624aa71f319d7d8e3383580eda5c6cfc986ef4c3a9c14493cd561cd3ba758763d79731bb7e7e03fc89d3b8a3a8b65cee324de1d9980b5725678ccd50cb26175e
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.13-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.16.ebuild
similarity index 55%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-470.62.13-r1.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-470.62.16.ebuild
index f165b973dae9..3d69f2220850 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.13-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.16.ebuild
@@ -4,38 +4,37 @@
 EAPI=7
 
 MODULES_OPTIONAL_USE="driver"
-inherit desktop linux-info linux-mod multilib-build \
-	readme.gentoo-r1 systemd toolchain-funcs unpacker
+inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
+	systemd toolchain-funcs unpacker
 
 NV_KERNEL_MAX="5.15"
 NV_URI="https://download.nvidia.com/XFree86/"
-NV_PIN="470.63.01"
+NV_PIN="470.86"
 
 DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx"
+HOMEPAGE="https://developer.nvidia.com/vulkan-driver"
 SRC_URI="
-	https://developer.nvidia.com/vulkan-beta-${PV//./}-linux -> NVIDIA-Linux-x86_64-${PV}.run
-	${NV_URI}nvidia-installer/nvidia-installer-${NV_PIN}.tar.bz2
-	${NV_URI}nvidia-modprobe/nvidia-modprobe-${NV_PIN}.tar.bz2
-	${NV_URI}nvidia-persistenced/nvidia-persistenced-${NV_PIN}.tar.bz2
-	${NV_URI}nvidia-settings/nvidia-settings-${NV_PIN}.tar.bz2
-	${NV_URI}nvidia-xconfig/nvidia-xconfig-${NV_PIN}.tar.bz2"
+	https://developer.nvidia.com/vulkan-beta-${PV//.}-linux -> NVIDIA-Linux-x86_64-${PV}.run
+	$(printf "${NV_URI}%s/%s-${NV_PIN}.tar.bz2 " \
+		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})"
 # nvidia-installer is unused but here for GPL-2's "distribute sources"
 S="${WORKDIR}"
 
-LICENSE="GPL-2 MIT NVIDIA-r2 ZLIB"
+LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
 SLOT="0/vulkan"
 KEYWORDS="-* ~amd64"
-IUSE="+X +driver static-libs +tools wayland"
+IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced static-libs +tools wayland"
 
 COMMON_DEPEND="
 	acct-group/video
-	acct-user/nvpd
-	net-libs/libtirpc:=
+	persistenced? (
+		acct-user/nvpd
+		net-libs/libtirpc:=
+	)
 	tools? (
 		dev-libs/atk
 		dev-libs/glib:2
-		dev-libs/jansson
+		dev-libs/jansson:=
 		media-libs/harfbuzz:=
 		x11-libs/cairo
 		x11-libs/gdk-pixbuf:2
@@ -48,9 +47,9 @@ COMMON_DEPEND="
 RDEPEND="
 	${COMMON_DEPEND}
 	X? (
-		media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
+		media-libs/libglvnd[X,abi_x86_32(-)?]
+		x11-libs/libX11[abi_x86_32(-)?]
+		x11-libs/libXext[abi_x86_32(-)?]
 	)
 	wayland? (
 		~gui-libs/egl-wayland-1.1.7
@@ -71,7 +70,6 @@ DEPEND="
 		x11-libs/libvdpau
 	)"
 BDEPEND="
-	app-misc/pax-utils
 	sys-devel/m4
 	virtual/pkgconfig"
 
@@ -79,14 +77,11 @@ QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 
 PATCHES=(
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
+	"${FILESDIR}"/nvidia-settings-390.144-desktop.patch
+	"${FILESDIR}"/nvidia-settings-390.144-no-gtk2.patch
+	"${FILESDIR}"/nvidia-settings-390.144-raw-ldflags.patch
 )
 
-DOCS=(
-	README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
-	nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
-)
-HTML_DOCS=( html/. )
-
 pkg_setup() {
 	use driver || return
 
@@ -105,7 +100,7 @@ pkg_setup() {
 	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in.
 	Note: DRM_SIMPLEDRM may cause issues and is better disabled for now."
 
-	kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
+	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 
 	MODULE_NAMES="
 		nvidia(video:kernel)
@@ -119,10 +114,10 @@ pkg_setup() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
 	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
-	BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules
+	BUILD_TARGETS="modules"
 
 	if linux_chkconfig_present CC_IS_CLANG; then
-		ewarn "Warning: building ${PN} with a clang-built kernel is experimental."
+		ewarn "Warning: building ${PN} with a clang-built kernel is experimental"
 
 		BUILD_PARAMS+=' CC=${CHOST}-clang'
 		if linux_chkconfig_present LD_IS_LLD; then
@@ -135,7 +130,7 @@ pkg_setup() {
 	fi
 
 	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
-		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of nvidia-drivers"
+		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of ${PN}"
 		ewarn "or was not tested with it. It is recommended to use one of:"
 		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
 		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
@@ -148,7 +143,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# make user patches usable across versions
+	# make patches usable across versions
 	rm nvidia-modprobe && mv nvidia-modprobe{-${NV_PIN},} || die
 	rm nvidia-persistenced && mv nvidia-persistenced{-${NV_PIN},} || die
 	rm nvidia-settings && mv nvidia-settings{-${NV_PIN},} || die
@@ -160,123 +155,105 @@ src_prepare() {
 	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
 		-i kernel/conftest.sh || die
 
-	sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
-		-e '/Categories=/s/_.*/System;Settings;/' \
-		-i nvidia-settings/doc/nvidia-settings.desktop || die
-
-	# remove gtk2 support (bug #592730)
-	sed '/^GTK2LIB = /d;/INSTALL.*GTK2LIB/,+1d' \
-		-i nvidia-settings/src/Makefile || die
-
 	sed 's/__USER__/nvpd/' \
 		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-		> nvidia-persistenced.service || die
+		> "${T}"/nvidia-persistenced.service || die
 
 	# enable nvidia-drm.modeset=1 by default with USE=wayland
 	cp "${FILESDIR}"/nvidia-470.conf "${T}"/nvidia.conf || die
-	if use wayland; then
-		sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
-	fi
-
-	gzip -d nvidia-{cuda-mps-control,smi}.1.gz || die
+	use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
 }
 
 src_compile() {
-	nvidia-drivers_make() {
-		emake -C nvidia-${1} ${2} \
-			PREFIX="${EPREFIX}/usr" \
-			HOST_CC="$(tc-getBUILD_CC)" \
-			HOST_LD="$(tc-getBUILD_LD)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 DO_STRIP= OUTPUTDIR=out
-	}
-
 	tc-export AR CC LD OBJCOPY
 
-	# may no longer be relevant but kept as a safety
-	export DISTCC_DISABLE=1 CCACHE_DISABLE=1
+	NV_ARGS=(
+		PREFIX="${EPREFIX}"/usr
+		HOST_CC="$(tc-getBUILD_CC)"
+		HOST_LD="$(tc-getBUILD_LD)"
+		NV_USE_BUNDLED_LIBJANSSON=0
+		NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
+	)
 
 	use driver && linux-mod_src_compile
 
-	nvidia-drivers_make modprobe
-	nvidia-drivers_make persistenced
-	use X && nvidia-drivers_make xconfig
+	emake "${NV_ARGS[@]}" -C nvidia-modprobe
+	use persistenced && emake "${NV_ARGS[@]}" -C nvidia-persistenced
+	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
 
 	if use tools; then
-		nvidia-drivers_make settings
+		# cflags: avoid noisy logs, only use here and set first to let override
+		# ldflags: abi currently needed if LD=ld.lld
+		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
+			RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" \
+			emake "${NV_ARGS[@]}" -C nvidia-settings
 	elif use static-libs; then
-		nvidia-drivers_make settings/src out/libXNVCtrl.a
+		emake "${NV_ARGS[@]}" -C nvidia-settings/src out/libXNVCtrl.a
 	fi
 }
 
 src_install() {
-	nvidia-drivers_make_install() {
-		emake -C nvidia-${1} install \
-			DESTDIR="${D}" \
-			PREFIX="${EPREFIX}/usr" \
-			LIBDIR="${ED}/usr/$(get_libdir)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
-	}
-
-	nvidia-drivers_libs_install() {
-		local libs=(
-			EGL_nvidia
-			GLESv1_CM_nvidia
-			GLESv2_nvidia
-			cuda
-			nvcuvid
-			nvidia-allocator
-			nvidia-compiler
-			nvidia-eglcore
-			nvidia-encode
-			nvidia-glcore
-			nvidia-glsi
-			nvidia-glvkspirv
-			nvidia-ml
-			nvidia-opencl
-			nvidia-opticalflow
-			nvidia-ptxjitcompiler
-			nvidia-tls
-		)
-
-		if use X; then
-			libs+=(
-				GLX_nvidia
-				nvidia-fbc
-				nvidia-ifr
-				vdpau_nvidia
-			)
-		fi
+	local libdir=$(get_libdir) libdir32=$(ABI=x86 get_libdir)
+
+	NV_ARGS+=( DESTDIR="${D}" LIBDIR="${ED}"/usr/${libdir} )
+
+	local -A paths=(
+		[APPLICATION_PROFILE]=/usr/share/nvidia
+		[CUDA_ICD]=/etc/OpenCL/vendors
+		[EGL_EXTERNAL_PLATFORM_JSON]=/usr/share/egl/egl_external_platform.d
+		[FIRMWARE]=/lib/firmware/nvidia/${PV}
+		[GLVND_EGL_ICD_JSON]=/usr/share/glvnd/egl_vendor.d
+		[VULKAN_ICD_JSON]=/usr/share/vulkan
+		[WINE_LIB]=/usr/${libdir}/nvidia/wine
+		[XORG_OUTPUTCLASS_CONFIG]=/usr/share/X11/xorg.conf.d
+
+		[GLX_MODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules/extensions
+		[GLX_MODULE_SYMLINK]=/usr/${libdir}/xorg/modules
+		[XMODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules
+	)
 
-		local libdir=.
-		if [[ ${ABI} == x86 ]]; then
-			libdir+=/32
-		else
-			libs+=(
-				libnvidia-nvvm.so.4.0.0
-				nvidia-cfg
-				nvidia-ngx
-				nvidia-rtcore
-				nvoptix
-			)
-			use wayland && libs+=( nvidia-vulkan-producer )
-		fi
+	local skip_files=(
+		$(usex X '' '
+			libGLX_nvidia libglxserver_nvidia
+			libnvidia-ifr
+			nvidia_icd.json nvidia_layers.json')
+		$(usex wayland '' 'libnvidia-vulkan-producer')
+		libGLX_indirect # non-glvnd unused fallback
+		libnvidia-gtk nvidia-{settings,xconfig} # built from source
+		libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
+	)
+	local skip_modules=(
+		$(usex X '' 'nvfbc vdpau xdriver')
+		$(usex driver '' 'gsp')
+		installer nvpd # handled separately / built from source
+	)
+	local skip_types=(
+		GLVND_LIB GLVND_SYMLINK EGL_CLIENT.\* GLX_CLIENT.\* # media-libs/libglvnd
+		OPENCL_WRAPPER.\* # virtual/opencl
+		DOCUMENTATION DOT_DESKTOP .\*_SRC DKMS_CONF # handled separately / unused
+	)
 
-		local lib soname
-		for lib in "${libs[@]}"; do
-			[[ ${lib:0:3} != lib ]] && lib=lib${lib}.so.${PV}
+	local DOCS=(
+		README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
+		nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
+	)
+	local HTML_DOCS=( html/. )
+	einstalldocs
 
-			# auto-detect soname and create appropriate symlinks
-			soname=$(scanelf -qF'%S#F' ${lib}) || die "Scanning ${lib} failed"
-			if [[ ${soname} && ${soname} != ${lib} ]]; then
-				ln -s ${lib} ${libdir}/${soname} || die
-			fi
-			ln -s ${lib} ${libdir}/${lib%.so*}.so || die
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Trusted users should be in the 'video' group to use NVIDIA devices.
+You can add yourself by using: gpasswd -a my-user video
+
+See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.\
+$(use amd64 && usex abi_x86_32 '' "
+
+Note that without USE=abi_x86_32 on ${PN}, 32bit applications
+(typically using wine / steam) will not be able to use GPU acceleration.")
 
-			dolib.so ${libdir}/${lib%.so*}*
-		done
-	}
+For general information on using ${PN}, please see:
+https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
+	readme.gentoo_create_doc
 
 	if use driver; then
 		linux-mod_src_install
@@ -284,61 +261,28 @@ src_install() {
 		insinto /etc/modprobe.d
 		doins "${T}"/nvidia.conf
 
-		insinto /lib/firmware/nvidia/${PV}
-		doins firmware/gsp.bin
-
-		# used for gpu verification with binpkgs (not kept)
+		# used for gpu verification with binpkgs (not kept, see pkg_preinst)
 		insinto /usr/share/nvidia
 		doins supported-gpus/supported-gpus.json
 	fi
 
-	if use X; then
-		exeinto /usr/$(get_libdir)/xorg/modules/drivers
-		doexe nvidia_drv.so
-
-		exeinto /usr/$(get_libdir)/xorg/modules/extensions
-		newexe libglxserver_nvidia.so{.${PV},}
-
-		insinto /usr/share/X11/xorg.conf.d
-		newins {,50-}nvidia-drm-outputclass.conf
-
-		# vulkan icd uses libGLX_nvidia.so and so requires X
-		insinto /usr/share/vulkan/icd.d
-		doins nvidia_icd.json
-		insinto /usr/share/vulkan/implicit_layer.d
-		doins nvidia_layers.json
-	fi
-
-	insinto /usr/share/glvnd/egl_vendor.d
-	doins 10_nvidia.json
-
-	insinto /etc/OpenCL/vendors
-	doins nvidia.icd
-
-	insinto /etc/nvidia
-	newins nvidia-application-profiles{-${PV},}-rc
-
-	# install built helpers
-	nvidia-drivers_make_install modprobe
-	# allow video group to load mods and create devs (bug #505092)
-	fowners :video /usr/bin/nvidia-modprobe
+	emake "${NV_ARGS[@]}" -C nvidia-modprobe install
+	fowners :video /usr/bin/nvidia-modprobe #505092
 	fperms 4710 /usr/bin/nvidia-modprobe
 
-	nvidia-drivers_make_install persistenced
-	newconfd "${FILESDIR}/nvidia-persistenced.confd" nvidia-persistenced
-	newinitd "${FILESDIR}/nvidia-persistenced.initd" nvidia-persistenced
-	systemd_dounit nvidia-persistenced.service
-
-	use X && nvidia-drivers_make_install xconfig
+	if use persistenced; then
+		emake "${NV_ARGS[@]}" -C nvidia-persistenced install
+		newconfd "${FILESDIR}"/nvidia-persistenced.confd nvidia-persistenced
+		newinitd "${FILESDIR}"/nvidia-persistenced.initd nvidia-persistenced
+		systemd_dounit "${T}"/nvidia-persistenced.service
+	fi
 
 	if use tools; then
-		nvidia-drivers_make_install settings
+		emake "${NV_ARGS[@]}" -C nvidia-settings install
+
 		doicon nvidia-settings/doc/nvidia-settings.png
 		domenu nvidia-settings/doc/nvidia-settings.desktop
 
-		insinto /usr/share/nvidia
-		newins nvidia-application-profiles{-${PV},}-key-documentation
-
 		exeinto /etc/X11/xinit/xinitrc.d
 		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
 	fi
@@ -350,50 +294,66 @@ src_install() {
 		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
 	fi
 
-	# install prebuilt-only helpers
-	exeinto /opt/bin
-
-	doexe nvidia-cuda-mps-control
-	doman nvidia-cuda-mps-control.1
-	doexe nvidia-cuda-mps-server
-
-	doexe nvidia-debugdump
-	dobin nvidia-bug-report.sh
-
-	doexe nvidia-smi
-	doman nvidia-smi.1
+	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig install
+
+	# mimic nvidia-installer by reading .manifest to install files
+	# 0:file 1:perms 2:type 3+:subtype/arguments -:module
+	local m into
+	while IFS=' ' read -ra m; do
+		! [[ ${#m[@]} -ge 2 && ${m[-1]} =~ MODULE: ]] ||
+			eval '[[ " ${m[0]##*/}" =~ ^(\ '${skip_files[*]/%/.*|\\}' )$ ]]' ||
+			eval '[[ " ${m[2]}" =~ ^(\ '${skip_types[*]/%/|\\}' )$ ]]' ||
+			has ${m[-1]#MODULE:} "${skip_modules[@]}" && continue
+
+		case ${m[2]} in
+			MANPAGE)
+				gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert
+				continue
+			;;
+			VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/
+		esac
+
+		if [[ -v paths[${m[2]}] ]]; then
+			into=${paths[${m[2]}]}
+		elif [[ ${m[2]} =~ _BINARY$ ]]; then
+			into=/opt/bin
+		elif [[ ${m[3]} == COMPAT32 ]]; then
+			use abi_x86_32 || continue
+			into=/usr/${libdir32}
+		elif [[ ${m[2]} =~ _LIB$|_SYMLINK$ ]]; then
+			into=/usr/${libdir}
+		else
+			die "No known installation path for ${m[0]}"
+		fi
+		[[ ${m[3]: -2} == ?/ ]] && into+=/${m[3]%/}
+		[[ ${m[4]: -2} == ?/ ]] && into+=/${m[4]%/}
 
-	# install prebuilt-only libraries
-	multilib_foreach_abi nvidia-drivers_libs_install
+		if [[ ${m[2]} =~ _SYMLINK$ ]]; then
+			[[ ${m[4]: -1} == / ]] && m[4]=${m[5]}
+			dosym ${m[4]} ${into}/${m[0]}
+			continue
+		fi
+		[[ ${m[0]} =~ ^libnvidia-ngx.so ]] &&
+			dosym ${m[0]} ${into}/${m[0]%.so*}.so.1 # soname not in .manifest
 
-	# install dlls for optional use with proton/wine
-	insinto /usr/$(get_libdir)/nvidia/wine
-	doins {_,}nvngx.dll
+		printf -v m[1] %o $((m[1] | 0200)) # 444->644
+		insopts -m${m[1]}
+		insinto ${into}
+		doins ${m[0]}
+	done < .manifest || die
 
-	# install systemd sleep services
+	# MODULE:installer non-skipped extras
 	exeinto /lib/systemd/system-sleep
 	doexe systemd/system-sleep/nvidia
 	dobin systemd/nvidia-sleep.sh
 	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
 
-	# create README.gentoo
-	local DISABLE_AUTOFORMATTING="yes"
-	local DOC_CONTENTS=\
-"Trusted users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video
-
-See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.
-
-For general information on using nvidia-drivers, please see:
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
-	readme.gentoo_create_doc
-
-	einstalldocs
+	dobin nvidia-bug-report.sh
 }
 
 pkg_preinst() {
-	has_version "${CATEGORY}/${PN}[abi_x86_32]" && NV_HAD_ABI32=1
-	has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND=1
+	has_version "${CATEGORY}/${PN}[abi_x86_32]" && NV_HAD_ABI32=
+	has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND=
 
 	use driver || return
 	linux-mod_pkg_preinst
@@ -424,9 +384,9 @@ pkg_postinst() {
 	readme.gentoo_print_elog
 
 	if [[ -r /proc/driver/nvidia/version &&
-		$(grep -o '  [0-9.]*  ' /proc/driver/nvidia/version) != "  ${PV}  " ]]; then
+		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
 		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
-		ewarn "libraries and will lead to GPU-using application issues."
+		ewarn "libraries and may prevent launching GPU-accelerated applications."
 		use driver && ewarn "The easiest way to fix this is usually to reboot."
 	fi
 
@@ -436,9 +396,11 @@ pkg_postinst() {
 		ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
 	fi
 
-	if [[ ${NV_LEGACY_MASK} ]]; then
+	if [[ -v NV_LEGACY_MASK ]]; then
+		ewarn
 		ewarn "***WARNING***"
-		ewarn "You are installing a version of nvidia-drivers known not to work"
+		ewarn
+		ewarn "You are installing a version of ${PN} known not to work"
 		ewarn "with a GPU of the current system. If unwanted, add the mask:"
 		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
 			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
@@ -449,27 +411,24 @@ pkg_postinst() {
 		ewarn "https://www.nvidia.com/object/IO_32667.html"
 	fi
 
-	if use !abi_x86_32 && [[ ${NV_HAD_ABI32} ]]; then
+	if use !abi_x86_32 && [[ -v NV_HAD_ABI32 ]]; then
 		elog
 		elog "USE=abi_x86_32 is disabled, 32bit applications will not be able to"
 		elog "use nvidia-drivers for acceleration without it (e.g. commonly used"
-		elog "with app-emulation/wine-*). Re-enable if needed."
+		elog "with app-emulation/wine-* or steam). Re-enable if needed."
 	fi
 
-	if use wayland && use driver && [[ ! ${NV_HAD_WAYLAND} ]]; then
+	if use wayland && use driver && [[ ! -v NV_HAD_WAYLAND ]]; then
 		elog
 		elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
 		elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is considered"
-		elog "experimental but is required for EGLStream (used for wayland acceleration"
-		elog "in compositors that support it)."
+		elog "experimental but is required for wayland."
 		elog
-		elog "If you experience issues, please comment out the option from nvidia.conf."
+		elog "If you experience issues, either disable wayland or edit nvidia.conf."
 		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
-		if has_version "gnome-base/gdm[wayland]"; then
-			elog
-			elog "This also cause gnome-base/gdm to use a wayland session by default,"
-			elog "select 'GNOME on Xorg' if you wish to continue using it."
-		fi
+		elog
+		elog "This version of ${PN} only supports EGLStream which is only"
+		elog "supported by a few wayland compositors (e.g. kwin / mutter, not sway)."
 	fi
 
 	# Try to show this message only to users that may really need it
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index a9dae1c14674..e88cbc7c2e0c 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 04c70f7a3795..127a1bc23e2e 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,4 +1 @@
-DIST i3-4.19.1.tar.xz 1277648 BLAKE2B a4d01d10c076da092faef2111ba0fadb481257c0011419cc911be0b63c0ff78053a39ff4a2887f6344794ea895190ebf1ac3585b598dbb90ff77d4de8fad7c53 SHA512 7a73d005e4ec438a7cf92ab719e17701948c5043cc431740b16e028e9771d1478fa539aebd1a8198fff6bec664f8bcecc17c3bd1ff35d53077d50d3ad1a8f7dc
-DIST i3-4.19.2.tar.xz 1277396 BLAKE2B 28d4dba50ae30cb620dcbd759e0ba29e284071234261aca2a217b6eef9194f72eca67d3632dc1e6a9b9879925e55c18b7a42676eaed41dd1354f772e48309d45 SHA512 58f08228d842cd3c2bc417b72f6279fcd7050879e5fd4064b2cb00edaf98b6605d5b2361608f9534991a0f8357d3294e881c7e314f33dc075241cc45ca5ed94d
 DIST i3-4.20.1.tar.xz 1284984 BLAKE2B a7943b3bc680eb3df596b008d751d034fc6ccf2b6891db731b9af5164fdcfc2872c0756c81c3f11f94a30aa9bdc4ecf4b47d20022a214bb6eb6c06fd78458fb3 SHA512 c0f6b991d46180ca470cbb7ab4cf5492552beb9dbf2631c61c8d92d0647106885481962381682e9129f3993d70bc6e5de506da1d32c3710fca64a66d51e8c8ce
-DIST i3-4.20.tar.xz 1286300 BLAKE2B 297c97032bd91e3086be8f72d476321bc48f9dbea6e45d1313229c569592c9a64bd9c19393d75a9c8abcaaf93d009709a81007b523fe5c3bae52fc1d7e4e7836 SHA512 7b184116664d2c3e097341e8008fea91bdc446a05177f50f5472890289e862fb41a11edc1d2b8d004347ce312219cb3d80c75840d3427330e3f0ee256163c198
diff --git a/x11-wm/i3/i3-4.19.1.ebuild b/x11-wm/i3/i3-4.19.1.ebuild
deleted file mode 100644
index b3fcd0ed53ef..000000000000
--- a/x11-wm/i3/i3-4.19.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson optfeature virtualx
-if [[ "${PV}" = *9999 ]]; then
-	inherit git-r3
-fi
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-if [[ "${PV}" = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/i3/i3"
-	EGIT_BRANCH="next"
-else
-	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-
-COMMON_DEPEND="dev-libs/libev
-	dev-libs/libpcre
-	dev-libs/yajl
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbcommon[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-	x11-misc/xkeyboard-config
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/pango[X]"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		dev-perl/AnyEvent
-		dev-perl/X11-XCB
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/IPC-Run
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/local-lib
-		virtual/perl-Test-Simple
-		x11-base/xorg-server[xephyr]
-		x11-misc/xvfb-run
-	)
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-		dev-lang/perl
-	)"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
-)
-
-src_prepare() {
-	default
-
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(meson_use doc docs)
-		$(meson_use doc mans)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/i3wm
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	optfeature_header "There are several packages that may be useful with i3:"
-	optfeature "application launcher" x11-misc/dmenu
-	optfeature "simple screen locker" x11-misc/i3lock
-	optfeature "status bar generator" x11-misc/i3status
-}
diff --git a/x11-wm/i3/i3-4.19.2.ebuild b/x11-wm/i3/i3-4.19.2.ebuild
deleted file mode 100644
index 280591df10c5..000000000000
--- a/x11-wm/i3/i3-4.19.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson optfeature virtualx
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-if [[ "${PV}" = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/i3/i3"
-	EGIT_BRANCH="next"
-	inherit git-r3
-else
-	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/libev
-	dev-libs/libpcre
-	dev-libs/yajl
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-	x11-misc/xkeyboard-config
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? (
-		dev-perl/AnyEvent
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/IPC-Run
-		dev-perl/local-lib
-		dev-perl/X11-XCB
-		virtual/perl-Test-Simple
-		x11-base/xorg-server[xephyr]
-		x11-misc/xvfb-run
-	)
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-		dev-lang/perl
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.16-musl-GLOB_TILDE.patch
-)
-
-src_prepare() {
-	default
-
-	cat > "${T}"/i3wm <<- EOF || die
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_use doc docs)
-		$(meson_use doc mans)
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-src_install() {
-	meson_src_install
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/i3wm
-}
-
-pkg_postinst() {
-	optfeature_header "There are several packages that may be useful with i3:"
-	optfeature "application launcher" x11-misc/dmenu
-	optfeature "simple screen locker" x11-misc/i3lock
-	optfeature "status bar generator" x11-misc/i3status
-}
diff --git a/x11-wm/i3/i3-4.20.1.ebuild b/x11-wm/i3/i3-4.20.1.ebuild
index d7224e00a088..e8ed20dd1b37 100644
--- a/x11-wm/i3/i3-4.20.1.ebuild
+++ b/x11-wm/i3/i3-4.20.1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 LICENSE="BSD"
diff --git a/x11-wm/i3/i3-4.20.ebuild b/x11-wm/i3/i3-4.20.ebuild
deleted file mode 100644
index 406be38b4f28..000000000000
--- a/x11-wm/i3/i3-4.20.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson optfeature virtualx
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-if [[ "${PV}" = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/i3/i3"
-	EGIT_BRANCH="next"
-	inherit git-r3
-else
-	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/libev
-	dev-libs/libpcre
-	dev-libs/yajl
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-	x11-misc/xkeyboard-config
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? (
-		dev-perl/AnyEvent
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/IPC-Run
-		dev-perl/local-lib
-		dev-perl/X11-XCB
-		virtual/perl-Test-Simple
-		x11-base/xorg-server[xephyr]
-		x11-misc/xvfb-run
-	)
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-		dev-lang/perl
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.16-musl-GLOB_TILDE.patch
-)
-
-src_prepare() {
-	default
-
-	cat > "${T}"/i3wm <<- EOF || die
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_use doc docs)
-		$(meson_use doc mans)
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-src_install() {
-	meson_src_install
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/i3wm
-}
-
-pkg_postinst() {
-	optfeature_header "There are several packages that may be useful with i3:"
-	optfeature "application launcher" x11-misc/dmenu
-	optfeature "simple screen locker" x11-misc/i3lock
-	optfeature "status bar generator" x11-misc/i3status
-}