gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-ros
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
185 files changed, 3190 insertions, 301 deletions
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index fbce60f7c2ff..60cff2f3b8af 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/ament_cmake_copyright/Manifest b/dev-ros/ament_cmake_copyright/Manifest
index 7d56978dde38..c024cb397933 100644
--- a/dev-ros/ament_cmake_copyright/Manifest
+++ b/dev-ros/ament_cmake_copyright/Manifest
@@ -1,8 +1,10 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
+DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_copyright-0.10.0.ebuild 1654 BLAKE2B 26a9e8d2d6fefbf848866d0e332adc17be234c1b44c8bc46c79ed9f1f010155d4faf2b06b6bfa690b9c7996ecef6cb9c27f825ed03f35771dbfebe7be8fa73cb SHA512 e46fdff6ee8d624b9c68b3c17c8c4bce35705f19f1ed4194f55adcfc2edeaf0337489f5b8bfef2e206502146aef5435664016eabef37df264becc21af3082271
 EBUILD ament_cmake_copyright-0.10.1.ebuild 1654 BLAKE2B dfd67a10a78c30a58adc4b2a5c1669b0c634b315e926ad78ec9125767b7f23d8335da5dd3a4f10cb8400359f79065dcf079eedab713b1950bb7bce74d649e22e SHA512 b804e31c9b537195d93f26ededc1cb1a89a8c4eacf9ca1a7fcdfe60fe0e084f9006de63ce7393461207ce2f72ab6247df582aa63ceb4180694f576d1d9ffc5f2
+EBUILD ament_cmake_copyright-0.10.4.ebuild 1654 BLAKE2B dfd67a10a78c30a58adc4b2a5c1669b0c634b315e926ad78ec9125767b7f23d8335da5dd3a4f10cb8400359f79065dcf079eedab713b1950bb7bce74d649e22e SHA512 b804e31c9b537195d93f26ededc1cb1a89a8c4eacf9ca1a7fcdfe60fe0e084f9006de63ce7393461207ce2f72ab6247df582aa63ceb4180694f576d1d9ffc5f2
 EBUILD ament_cmake_copyright-0.9.5.ebuild 1654 BLAKE2B 26a9e8d2d6fefbf848866d0e332adc17be234c1b44c8bc46c79ed9f1f010155d4faf2b06b6bfa690b9c7996ecef6cb9c27f825ed03f35771dbfebe7be8fa73cb SHA512 e46fdff6ee8d624b9c68b3c17c8c4bce35705f19f1ed4194f55adcfc2edeaf0337489f5b8bfef2e206502146aef5435664016eabef37df264becc21af3082271
 EBUILD ament_cmake_copyright-9999.ebuild 1654 BLAKE2B 26a9e8d2d6fefbf848866d0e332adc17be234c1b44c8bc46c79ed9f1f010155d4faf2b06b6bfa690b9c7996ecef6cb9c27f825ed03f35771dbfebe7be8fa73cb SHA512 e46fdff6ee8d624b9c68b3c17c8c4bce35705f19f1ed4194f55adcfc2edeaf0337489f5b8bfef2e206502146aef5435664016eabef37df264becc21af3082271
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.4.ebuild b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.4.ebuild
new file mode 100644
index 000000000000..5c1ecf570f76
--- /dev/null
+++ b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The auto-magic functions for ease to use of the ament linters"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_copyright
+	dev-ros/ament_cmake_test
+"
+DEPEND=""
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-ros/ament_copyright[${PYTHON_USEDEP}] test? ( dev-ros/ament_lint_cmake[${PYTHON_USEDEP}] )' )
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_test
+	dev-ros/ament_copyright
+	test? (
+		dev-ros/ament_cmake_lint_cmake
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
+		( use !test || has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]" )
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-ros/ament_cmake_core/Manifest b/dev-ros/ament_cmake_core/Manifest
index 6156cfe082d4..8002dec9f14b 100644
--- a/dev-ros/ament_cmake_core/Manifest
+++ b/dev-ros/ament_cmake_core/Manifest
@@ -3,10 +3,12 @@ DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a36089
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
+DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 EBUILD ament_cmake_core-0.9.6.ebuild 1069 BLAKE2B 39540e258b29cfeb4cad0590960f6b2e1175b30471048d125d5f4dac4c2afd7e7a6dd9067b497f817ab4fc4fbcd53746acee892ddf7bc6cba0ac2e9c9b34c10a SHA512 89a546b6066381177ca00620ff9e4a3005ce463ee08170f747809097b7ff7bbbc1dd9cc2b403c0396332eec56d9603f422c9630c764a8e5d49253b917ed3984f
 EBUILD ament_cmake_core-1.0.0.ebuild 1069 BLAKE2B 39540e258b29cfeb4cad0590960f6b2e1175b30471048d125d5f4dac4c2afd7e7a6dd9067b497f817ab4fc4fbcd53746acee892ddf7bc6cba0ac2e9c9b34c10a SHA512 89a546b6066381177ca00620ff9e4a3005ce463ee08170f747809097b7ff7bbbc1dd9cc2b403c0396332eec56d9603f422c9630c764a8e5d49253b917ed3984f
 EBUILD ament_cmake_core-1.0.1.ebuild 1069 BLAKE2B 39540e258b29cfeb4cad0590960f6b2e1175b30471048d125d5f4dac4c2afd7e7a6dd9067b497f817ab4fc4fbcd53746acee892ddf7bc6cba0ac2e9c9b34c10a SHA512 89a546b6066381177ca00620ff9e4a3005ce463ee08170f747809097b7ff7bbbc1dd9cc2b403c0396332eec56d9603f422c9630c764a8e5d49253b917ed3984f
 EBUILD ament_cmake_core-1.0.3.ebuild 1069 BLAKE2B 5339c234a016b26f4b8a70fd90b5ca5a1e7f02875add8a34ca921a3937da60331ea77c98a5b9b624d96f2f717f3eb58d831b5434b3e962eca7588b8ab4bfd48b SHA512 b94263f0aae04755d71882e4b3b2a11c7a1bfd9528c876947252c89aa4022ea00d6789e7f74f0181354e1a52b563f906010a6f4764906f73813c17027b63c210
 EBUILD ament_cmake_core-1.0.4.ebuild 1069 BLAKE2B 5339c234a016b26f4b8a70fd90b5ca5a1e7f02875add8a34ca921a3937da60331ea77c98a5b9b624d96f2f717f3eb58d831b5434b3e962eca7588b8ab4bfd48b SHA512 b94263f0aae04755d71882e4b3b2a11c7a1bfd9528c876947252c89aa4022ea00d6789e7f74f0181354e1a52b563f906010a6f4764906f73813c17027b63c210
+EBUILD ament_cmake_core-1.1.3.ebuild 1069 BLAKE2B 5339c234a016b26f4b8a70fd90b5ca5a1e7f02875add8a34ca921a3937da60331ea77c98a5b9b624d96f2f717f3eb58d831b5434b3e962eca7588b8ab4bfd48b SHA512 b94263f0aae04755d71882e4b3b2a11c7a1bfd9528c876947252c89aa4022ea00d6789e7f74f0181354e1a52b563f906010a6f4764906f73813c17027b63c210
 EBUILD ament_cmake_core-9999.ebuild 1069 BLAKE2B 39540e258b29cfeb4cad0590960f6b2e1175b30471048d125d5f4dac4c2afd7e7a6dd9067b497f817ab4fc4fbcd53746acee892ddf7bc6cba0ac2e9c9b34c10a SHA512 89a546b6066381177ca00620ff9e4a3005ce463ee08170f747809097b7ff7bbbc1dd9cc2b403c0396332eec56d9603f422c9630c764a8e5d49253b917ed3984f
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-1.1.3.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.1.3.ebuild
new file mode 100644
index 000000000000..2074f44599e0
--- /dev/null
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-1.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The core of the ament buildsystem in CMake"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-python/ament_package
+	dev-python/catkin_pkg
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_cppcheck/Manifest b/dev-ros/ament_cmake_cppcheck/Manifest
index 06afc4226143..4427cf2f1c7c 100644
--- a/dev-ros/ament_cmake_cppcheck/Manifest
+++ b/dev-ros/ament_cmake_cppcheck/Manifest
@@ -1,8 +1,10 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
+DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_cppcheck-0.10.0.ebuild 1531 BLAKE2B 079fd406d74a4a9418b0a3c15aa24ebbaebbe097405452cf328dec3c4d82b3e0eb2eacfa3d7c116f3f50c55cb08e0f9187cc8b9cca3d4d8d4805dd8c06ba5a2c SHA512 517ca42684f14960d0ec0c01a47c30bd36c3ed7817a42a6869b49ebf0c003d93aefc430c6680389bf908f9e87313f710d51aee20033232ade8b2632e142f7661
 EBUILD ament_cmake_cppcheck-0.10.1.ebuild 1531 BLAKE2B 8c1a701ac0d96d662281c7edbcbf0f60118de64ac0e461d7e15c661ef6a9890d0807e4852328ff21e2ea47bdf1167776b65aed1c2291c7414979bfd27a23a256 SHA512 81559e08339fe000495c2ec6c103ef2ce395b746083bf4e1f30f803e3d9d5d756ae3add70efbd3910783e7d292a6cb2443bc7a4ba022cf6fecebb92d4eecfc8d
+EBUILD ament_cmake_cppcheck-0.10.4.ebuild 1531 BLAKE2B 8c1a701ac0d96d662281c7edbcbf0f60118de64ac0e461d7e15c661ef6a9890d0807e4852328ff21e2ea47bdf1167776b65aed1c2291c7414979bfd27a23a256 SHA512 81559e08339fe000495c2ec6c103ef2ce395b746083bf4e1f30f803e3d9d5d756ae3add70efbd3910783e7d292a6cb2443bc7a4ba022cf6fecebb92d4eecfc8d
 EBUILD ament_cmake_cppcheck-0.9.5.ebuild 1531 BLAKE2B 079fd406d74a4a9418b0a3c15aa24ebbaebbe097405452cf328dec3c4d82b3e0eb2eacfa3d7c116f3f50c55cb08e0f9187cc8b9cca3d4d8d4805dd8c06ba5a2c SHA512 517ca42684f14960d0ec0c01a47c30bd36c3ed7817a42a6869b49ebf0c003d93aefc430c6680389bf908f9e87313f710d51aee20033232ade8b2632e142f7661
 EBUILD ament_cmake_cppcheck-9999.ebuild 1531 BLAKE2B 079fd406d74a4a9418b0a3c15aa24ebbaebbe097405452cf328dec3c4d82b3e0eb2eacfa3d7c116f3f50c55cb08e0f9187cc8b9cca3d4d8d4805dd8c06ba5a2c SHA512 517ca42684f14960d0ec0c01a47c30bd36c3ed7817a42a6869b49ebf0c003d93aefc430c6680389bf908f9e87313f710d51aee20033232ade8b2632e142f7661
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.10.4.ebuild b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.10.4.ebuild
new file mode 100644
index 000000000000..33c0d35ad478
--- /dev/null
+++ b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.10.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="CMake API for ament_cppcheck to perform static code analysis on C/C++"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cppcheck
+"
+DEPEND=""
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	test? (
+		dev-ros/ament_cmake_copyright
+		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
+		dev-ros/ament_cmake_lint_cmake
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-ros/ament_cmake_cpplint/Manifest b/dev-ros/ament_cmake_cpplint/Manifest
index f55ca7a6c073..bb1b98526252 100644
--- a/dev-ros/ament_cmake_cpplint/Manifest
+++ b/dev-ros/ament_cmake_cpplint/Manifest
@@ -1,8 +1,10 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
+DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_cpplint-0.10.0.ebuild 1497 BLAKE2B afb97f6aa510db683fb58c335538ded3a01c7d2524839b34786a1e8ee9f970aaf4f535cb09a32ccec303c15f71c6ee0e4e62a6775032fa8a7391a00186d5f41b SHA512 c77eb75c3a6468e07ef03d21e31cc1314ac3f0122b2fe91e470717d4c108efa5ba9e210a2c30cd0e3b90250b4ea33d0d3a640424f8d80108bdc3702d1cc00237
 EBUILD ament_cmake_cpplint-0.10.1.ebuild 1497 BLAKE2B 26f65a47ff96981d769730c72be65bf89c789f9fc5b60674198086154c5b4199aef809161c57f63b77c53a4bd662e444d37929b83043bf78758f1118547c5b84 SHA512 1bde22b110f2365a11ffb704be940b98db6701fa1c15324dda65a183ce2ee480e5f7ecf3599b7d2b269f847b61fbc93f2b290b62063de604502221751ee92202
+EBUILD ament_cmake_cpplint-0.10.4.ebuild 1497 BLAKE2B 26f65a47ff96981d769730c72be65bf89c789f9fc5b60674198086154c5b4199aef809161c57f63b77c53a4bd662e444d37929b83043bf78758f1118547c5b84 SHA512 1bde22b110f2365a11ffb704be940b98db6701fa1c15324dda65a183ce2ee480e5f7ecf3599b7d2b269f847b61fbc93f2b290b62063de604502221751ee92202
 EBUILD ament_cmake_cpplint-0.9.5.ebuild 1497 BLAKE2B afb97f6aa510db683fb58c335538ded3a01c7d2524839b34786a1e8ee9f970aaf4f535cb09a32ccec303c15f71c6ee0e4e62a6775032fa8a7391a00186d5f41b SHA512 c77eb75c3a6468e07ef03d21e31cc1314ac3f0122b2fe91e470717d4c108efa5ba9e210a2c30cd0e3b90250b4ea33d0d3a640424f8d80108bdc3702d1cc00237
 EBUILD ament_cmake_cpplint-9999.ebuild 1497 BLAKE2B afb97f6aa510db683fb58c335538ded3a01c7d2524839b34786a1e8ee9f970aaf4f535cb09a32ccec303c15f71c6ee0e4e62a6775032fa8a7391a00186d5f41b SHA512 c77eb75c3a6468e07ef03d21e31cc1314ac3f0122b2fe91e470717d4c108efa5ba9e210a2c30cd0e3b90250b4ea33d0d3a640424f8d80108bdc3702d1cc00237
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.10.4.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.10.4.ebuild
new file mode 100644
index 000000000000..b7bc58e1dcf7
--- /dev/null
+++ b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.10.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="CMake API for ament_cpplint to lint C / C++ code using cpplint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cpplint
+"
+DEPEND=""
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	test? (
+		dev-ros/ament_cmake_copyright
+		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
+		dev-ros/ament_cmake_lint_cmake
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-ros/ament_cmake_export_definitions/Manifest b/dev-ros/ament_cmake_export_definitions/Manifest
index 3a53b183a236..5e243dbbcc38 100644
--- a/dev-ros/ament_cmake_export_definitions/Manifest
+++ b/dev-ros/ament_cmake_export_definitions/Manifest
@@ -3,10 +3,12 @@ DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a36089
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
+DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 EBUILD ament_cmake_export_definitions-0.9.6.ebuild 1151 BLAKE2B 01ac3abd9270533d852873626ef53635c738784274d7ed46ce83168c75ed5187e2f1d7c57157ef7b1bf97b2d74da8f625ce5d302abaa5c1b0803854910ab2a00 SHA512 99624c721c130fa49913d32446f3f3feb1cf16351cbd980486c2ab875cf3bebb22f035c00b387990ad7a92688fc92e0ac4eedcf36c1a971f150044a27542e908
 EBUILD ament_cmake_export_definitions-1.0.0.ebuild 1151 BLAKE2B 01ac3abd9270533d852873626ef53635c738784274d7ed46ce83168c75ed5187e2f1d7c57157ef7b1bf97b2d74da8f625ce5d302abaa5c1b0803854910ab2a00 SHA512 99624c721c130fa49913d32446f3f3feb1cf16351cbd980486c2ab875cf3bebb22f035c00b387990ad7a92688fc92e0ac4eedcf36c1a971f150044a27542e908
 EBUILD ament_cmake_export_definitions-1.0.1.ebuild 1151 BLAKE2B 01ac3abd9270533d852873626ef53635c738784274d7ed46ce83168c75ed5187e2f1d7c57157ef7b1bf97b2d74da8f625ce5d302abaa5c1b0803854910ab2a00 SHA512 99624c721c130fa49913d32446f3f3feb1cf16351cbd980486c2ab875cf3bebb22f035c00b387990ad7a92688fc92e0ac4eedcf36c1a971f150044a27542e908
 EBUILD ament_cmake_export_definitions-1.0.3.ebuild 1151 BLAKE2B b41f3108983fcf5297f89fd2cad1111c0901a51f7685535bd23432645a1ea43fd6a3c00c9a355ebb458ed4bc8c90ad738eef82c7149635c6041a4aca2c72f50f SHA512 467cc40f93b5b6f5c0668e3fc3ca5ae91f0d7c9e7f9abc6f4bc521b2d03dc5453c0eb8109a2d86521aea7808d6e2a8f516c5c83d17d95b704184edfe5cea92d4
 EBUILD ament_cmake_export_definitions-1.0.4.ebuild 1151 BLAKE2B b41f3108983fcf5297f89fd2cad1111c0901a51f7685535bd23432645a1ea43fd6a3c00c9a355ebb458ed4bc8c90ad738eef82c7149635c6041a4aca2c72f50f SHA512 467cc40f93b5b6f5c0668e3fc3ca5ae91f0d7c9e7f9abc6f4bc521b2d03dc5453c0eb8109a2d86521aea7808d6e2a8f516c5c83d17d95b704184edfe5cea92d4
+EBUILD ament_cmake_export_definitions-1.1.3.ebuild 1151 BLAKE2B b41f3108983fcf5297f89fd2cad1111c0901a51f7685535bd23432645a1ea43fd6a3c00c9a355ebb458ed4bc8c90ad738eef82c7149635c6041a4aca2c72f50f SHA512 467cc40f93b5b6f5c0668e3fc3ca5ae91f0d7c9e7f9abc6f4bc521b2d03dc5453c0eb8109a2d86521aea7808d6e2a8f516c5c83d17d95b704184edfe5cea92d4
 EBUILD ament_cmake_export_definitions-9999.ebuild 1151 BLAKE2B 01ac3abd9270533d852873626ef53635c738784274d7ed46ce83168c75ed5187e2f1d7c57157ef7b1bf97b2d74da8f625ce5d302abaa5c1b0803854910ab2a00 SHA512 99624c721c130fa49913d32446f3f3feb1cf16351cbd980486c2ab875cf3bebb22f035c00b387990ad7a92688fc92e0ac4eedcf36c1a971f150044a27542e908
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.3.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.3.ebuild
new file mode 100644
index 000000000000..874cd96f222b
--- /dev/null
+++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export definitions to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_dependencies/Manifest b/dev-ros/ament_cmake_export_dependencies/Manifest
index 3e35ed16a595..1b85e40f59e3 100644
--- a/dev-ros/ament_cmake_export_dependencies/Manifest
+++ b/dev-ros/ament_cmake_export_dependencies/Manifest
@@ -3,10 +3,12 @@ DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a36089
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
+DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 EBUILD ament_cmake_export_dependencies-0.9.6.ebuild 1192 BLAKE2B 3d8dbaab45c9648e19ff5d77369365f822d44ebe0c5ace7bf846c8bfce0c31a2023c92b404c4daa508ad78304051ff92eb02cc37329c7a80c412e91a6bec6e06 SHA512 b602a0077ad1ccf0f8f9652a03824356256150ce0620142393ba1d5b400d5b36093cddba8628de237c18b34338a9fc5cf99c82570b8c3fd18011f0fe7870f8b3
 EBUILD ament_cmake_export_dependencies-1.0.0.ebuild 1192 BLAKE2B 3d8dbaab45c9648e19ff5d77369365f822d44ebe0c5ace7bf846c8bfce0c31a2023c92b404c4daa508ad78304051ff92eb02cc37329c7a80c412e91a6bec6e06 SHA512 b602a0077ad1ccf0f8f9652a03824356256150ce0620142393ba1d5b400d5b36093cddba8628de237c18b34338a9fc5cf99c82570b8c3fd18011f0fe7870f8b3
 EBUILD ament_cmake_export_dependencies-1.0.1.ebuild 1192 BLAKE2B 3d8dbaab45c9648e19ff5d77369365f822d44ebe0c5ace7bf846c8bfce0c31a2023c92b404c4daa508ad78304051ff92eb02cc37329c7a80c412e91a6bec6e06 SHA512 b602a0077ad1ccf0f8f9652a03824356256150ce0620142393ba1d5b400d5b36093cddba8628de237c18b34338a9fc5cf99c82570b8c3fd18011f0fe7870f8b3
 EBUILD ament_cmake_export_dependencies-1.0.3.ebuild 1192 BLAKE2B c472198607f9f431e0f416374e0cd1ab70c6adfd88aeab3120844a062ed66da86a0c480b196d0910885e42d14dbabf7c5933a1be9caff21f2cd154899f14df26 SHA512 3bef4fa5ab7d9931fa67952dfb27c2c8d718ad25e28afc8f40b0389bd5ddab33f2e2aa453a96895185521cabbefb414a5ed0a9e910e1d0641666cd03b7c69ca7
 EBUILD ament_cmake_export_dependencies-1.0.4.ebuild 1192 BLAKE2B c472198607f9f431e0f416374e0cd1ab70c6adfd88aeab3120844a062ed66da86a0c480b196d0910885e42d14dbabf7c5933a1be9caff21f2cd154899f14df26 SHA512 3bef4fa5ab7d9931fa67952dfb27c2c8d718ad25e28afc8f40b0389bd5ddab33f2e2aa453a96895185521cabbefb414a5ed0a9e910e1d0641666cd03b7c69ca7
+EBUILD ament_cmake_export_dependencies-1.1.3.ebuild 1192 BLAKE2B c472198607f9f431e0f416374e0cd1ab70c6adfd88aeab3120844a062ed66da86a0c480b196d0910885e42d14dbabf7c5933a1be9caff21f2cd154899f14df26 SHA512 3bef4fa5ab7d9931fa67952dfb27c2c8d718ad25e28afc8f40b0389bd5ddab33f2e2aa453a96895185521cabbefb414a5ed0a9e910e1d0641666cd03b7c69ca7
 EBUILD ament_cmake_export_dependencies-9999.ebuild 1192 BLAKE2B 3d8dbaab45c9648e19ff5d77369365f822d44ebe0c5ace7bf846c8bfce0c31a2023c92b404c4daa508ad78304051ff92eb02cc37329c7a80c412e91a6bec6e06 SHA512 b602a0077ad1ccf0f8f9652a03824356256150ce0620142393ba1d5b400d5b36093cddba8628de237c18b34338a9fc5cf99c82570b8c3fd18011f0fe7870f8b3
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.3.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.3.ebuild
new file mode 100644
index 000000000000..d44de106feb3
--- /dev/null
+++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export dependencies to downstream packages in the ament buildsystem in CMake"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_include_directories/Manifest b/dev-ros/ament_cmake_export_include_directories/Manifest
index 1f0f55186bc1..1039fd57bd15 100644
--- a/dev-ros/ament_cmake_export_include_directories/Manifest
+++ b/dev-ros/ament_cmake_export_include_directories/Manifest
@@ -3,10 +3,12 @@ DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a36089
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
+DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 EBUILD ament_cmake_export_include_directories-0.9.6.ebuild 1159 BLAKE2B 37c16eddf7ef3a85e583ee73d2499e24d939dea302a365a9876213e48a03ac476280a56694bae1411f8e7966e3dcc4de8d5cf51a69952aaa2c175e53a234f918 SHA512 2919728018dc8eadd11a9678ecf58b71321dcfc973e2d1bca5593901d4e5534494446094a1f0599846d065ebf0c20cf44db5492533a254755a0b0458b422e957
 EBUILD ament_cmake_export_include_directories-1.0.0.ebuild 1159 BLAKE2B 37c16eddf7ef3a85e583ee73d2499e24d939dea302a365a9876213e48a03ac476280a56694bae1411f8e7966e3dcc4de8d5cf51a69952aaa2c175e53a234f918 SHA512 2919728018dc8eadd11a9678ecf58b71321dcfc973e2d1bca5593901d4e5534494446094a1f0599846d065ebf0c20cf44db5492533a254755a0b0458b422e957
 EBUILD ament_cmake_export_include_directories-1.0.1.ebuild 1159 BLAKE2B 37c16eddf7ef3a85e583ee73d2499e24d939dea302a365a9876213e48a03ac476280a56694bae1411f8e7966e3dcc4de8d5cf51a69952aaa2c175e53a234f918 SHA512 2919728018dc8eadd11a9678ecf58b71321dcfc973e2d1bca5593901d4e5534494446094a1f0599846d065ebf0c20cf44db5492533a254755a0b0458b422e957
 EBUILD ament_cmake_export_include_directories-1.0.3.ebuild 1159 BLAKE2B 4049f914e79dca8193527e0a03f1216a68e4b8ed4e17f8badeb4e93ccc8f2a259ba06e10d371d9851c47a53ff1309d723a1d593e106a2835a5cde3c8fe27a04d SHA512 77cc0f5e34ed8149b39498941ad22dbb8d38731893839b3ea2d5a0687af0f6b82d3f9aa96e9446d948f00b077f78e25f70e9aaa99e01a3980ade1ce4f9bb0b61
 EBUILD ament_cmake_export_include_directories-1.0.4.ebuild 1159 BLAKE2B 4049f914e79dca8193527e0a03f1216a68e4b8ed4e17f8badeb4e93ccc8f2a259ba06e10d371d9851c47a53ff1309d723a1d593e106a2835a5cde3c8fe27a04d SHA512 77cc0f5e34ed8149b39498941ad22dbb8d38731893839b3ea2d5a0687af0f6b82d3f9aa96e9446d948f00b077f78e25f70e9aaa99e01a3980ade1ce4f9bb0b61
+EBUILD ament_cmake_export_include_directories-1.1.3.ebuild 1159 BLAKE2B 4049f914e79dca8193527e0a03f1216a68e4b8ed4e17f8badeb4e93ccc8f2a259ba06e10d371d9851c47a53ff1309d723a1d593e106a2835a5cde3c8fe27a04d SHA512 77cc0f5e34ed8149b39498941ad22dbb8d38731893839b3ea2d5a0687af0f6b82d3f9aa96e9446d948f00b077f78e25f70e9aaa99e01a3980ade1ce4f9bb0b61
 EBUILD ament_cmake_export_include_directories-9999.ebuild 1159 BLAKE2B 37c16eddf7ef3a85e583ee73d2499e24d939dea302a365a9876213e48a03ac476280a56694bae1411f8e7966e3dcc4de8d5cf51a69952aaa2c175e53a234f918 SHA512 2919728018dc8eadd11a9678ecf58b71321dcfc973e2d1bca5593901d4e5534494446094a1f0599846d065ebf0c20cf44db5492533a254755a0b0458b422e957
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.1.3.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.1.3.ebuild
new file mode 100644
index 000000000000..2745da488293
--- /dev/null
+++ b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_interfaces/Manifest b/dev-ros/ament_cmake_export_interfaces/Manifest
index 89609f92beaa..3c2b564bb793 100644
--- a/dev-ros/ament_cmake_export_interfaces/Manifest
+++ b/dev-ros/ament_cmake_export_interfaces/Manifest
@@ -3,10 +3,12 @@ DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a36089
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
+DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 EBUILD ament_cmake_export_interfaces-0.9.6.ebuild 1188 BLAKE2B 951c449e89f5d065d0854a37ad7978a05274b22a03527780fbf7d9e4dfb76a8c95ec043181be3c5031e1ef4386b359477bba2e813cdd6a9e3e256725bbb56e0e SHA512 7ffca0640b23c471242d36cdf63a6bcea1b49e3c31904de53b8397c38efc21cd0e51e41ea47d22cd5136c7859f3eebe0561a042f48d024b9285e8642842cc6f7
 EBUILD ament_cmake_export_interfaces-1.0.0.ebuild 1188 BLAKE2B 951c449e89f5d065d0854a37ad7978a05274b22a03527780fbf7d9e4dfb76a8c95ec043181be3c5031e1ef4386b359477bba2e813cdd6a9e3e256725bbb56e0e SHA512 7ffca0640b23c471242d36cdf63a6bcea1b49e3c31904de53b8397c38efc21cd0e51e41ea47d22cd5136c7859f3eebe0561a042f48d024b9285e8642842cc6f7
 EBUILD ament_cmake_export_interfaces-1.0.1.ebuild 1188 BLAKE2B 951c449e89f5d065d0854a37ad7978a05274b22a03527780fbf7d9e4dfb76a8c95ec043181be3c5031e1ef4386b359477bba2e813cdd6a9e3e256725bbb56e0e SHA512 7ffca0640b23c471242d36cdf63a6bcea1b49e3c31904de53b8397c38efc21cd0e51e41ea47d22cd5136c7859f3eebe0561a042f48d024b9285e8642842cc6f7
 EBUILD ament_cmake_export_interfaces-1.0.3.ebuild 1188 BLAKE2B 45e86ba6e158f195a982bf55116ceca83d30a7c84c6fc7f7b6b5ec149eef8c7f6f72701fbfe1db902f8632f8c32023039de56a5ac767feb9333155058afc0e42 SHA512 ce35bced4306c48318fa1c0ec58170f796c0c4479f1af8d2265618dc67c886713a994964bb7cf53ea2b4ea45d3331737bb6e7ea1e0aea41014067905292d34a6
 EBUILD ament_cmake_export_interfaces-1.0.4.ebuild 1188 BLAKE2B 45e86ba6e158f195a982bf55116ceca83d30a7c84c6fc7f7b6b5ec149eef8c7f6f72701fbfe1db902f8632f8c32023039de56a5ac767feb9333155058afc0e42 SHA512 ce35bced4306c48318fa1c0ec58170f796c0c4479f1af8d2265618dc67c886713a994964bb7cf53ea2b4ea45d3331737bb6e7ea1e0aea41014067905292d34a6
+EBUILD ament_cmake_export_interfaces-1.1.3.ebuild 1188 BLAKE2B 45e86ba6e158f195a982bf55116ceca83d30a7c84c6fc7f7b6b5ec149eef8c7f6f72701fbfe1db902f8632f8c32023039de56a5ac767feb9333155058afc0e42 SHA512 ce35bced4306c48318fa1c0ec58170f796c0c4479f1af8d2265618dc67c886713a994964bb7cf53ea2b4ea45d3331737bb6e7ea1e0aea41014067905292d34a6
 EBUILD ament_cmake_export_interfaces-9999.ebuild 1188 BLAKE2B 951c449e89f5d065d0854a37ad7978a05274b22a03527780fbf7d9e4dfb76a8c95ec043181be3c5031e1ef4386b359477bba2e813cdd6a9e3e256725bbb56e0e SHA512 7ffca0640b23c471242d36cdf63a6bcea1b49e3c31904de53b8397c38efc21cd0e51e41ea47d22cd5136c7859f3eebe0561a042f48d024b9285e8642842cc6f7
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.3.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.3.ebuild
new file mode 100644
index 000000000000..6185db69440e
--- /dev/null
+++ b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export interfaces to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_export_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_libraries/Manifest b/dev-ros/ament_cmake_export_libraries/Manifest
index 65649436807c..f2fd794054a1 100644
--- a/dev-ros/ament_cmake_export_libraries/Manifest
+++ b/dev-ros/ament_cmake_export_libraries/Manifest
@@ -3,10 +3,12 @@ DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a36089
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
+DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 EBUILD ament_cmake_export_libraries-0.9.6.ebuild 1149 BLAKE2B 57e3fbec74493851a6c71ec24b7a84e5e0d0ff358b217fe3b0e55595ac8ed66ca32c0b34ea4dc21c9dd18db7727c251ec5004cf90db2373879e0f6a637360aa3 SHA512 1b8852d20a264a0f91e13f0811f194658a6589afbd3f154ae94b6fbd4ea462d4614816da78a6ac891f76ca1b556b9c5d6884df034d4f7e2108374da677233c35
 EBUILD ament_cmake_export_libraries-1.0.0.ebuild 1149 BLAKE2B 57e3fbec74493851a6c71ec24b7a84e5e0d0ff358b217fe3b0e55595ac8ed66ca32c0b34ea4dc21c9dd18db7727c251ec5004cf90db2373879e0f6a637360aa3 SHA512 1b8852d20a264a0f91e13f0811f194658a6589afbd3f154ae94b6fbd4ea462d4614816da78a6ac891f76ca1b556b9c5d6884df034d4f7e2108374da677233c35
 EBUILD ament_cmake_export_libraries-1.0.1.ebuild 1149 BLAKE2B 57e3fbec74493851a6c71ec24b7a84e5e0d0ff358b217fe3b0e55595ac8ed66ca32c0b34ea4dc21c9dd18db7727c251ec5004cf90db2373879e0f6a637360aa3 SHA512 1b8852d20a264a0f91e13f0811f194658a6589afbd3f154ae94b6fbd4ea462d4614816da78a6ac891f76ca1b556b9c5d6884df034d4f7e2108374da677233c35
 EBUILD ament_cmake_export_libraries-1.0.3.ebuild 1149 BLAKE2B ae63df826f391fce2632d44493da40c6115f70d203a132a68653d8022d2ec63e9b55998d8bca1844f3d937afdb6eb42b7e4c8f03cb03db540933ae0dcbaf9e37 SHA512 2492b8455a7d4195eb7c555a0838b76c07a18498853190e267b0995a6b65f2b7594501239a9e6d9ea6469609904536ea3e4de39afac881527a9b8f75621c2e5a
 EBUILD ament_cmake_export_libraries-1.0.4.ebuild 1149 BLAKE2B ae63df826f391fce2632d44493da40c6115f70d203a132a68653d8022d2ec63e9b55998d8bca1844f3d937afdb6eb42b7e4c8f03cb03db540933ae0dcbaf9e37 SHA512 2492b8455a7d4195eb7c555a0838b76c07a18498853190e267b0995a6b65f2b7594501239a9e6d9ea6469609904536ea3e4de39afac881527a9b8f75621c2e5a
+EBUILD ament_cmake_export_libraries-1.1.3.ebuild 1149 BLAKE2B ae63df826f391fce2632d44493da40c6115f70d203a132a68653d8022d2ec63e9b55998d8bca1844f3d937afdb6eb42b7e4c8f03cb03db540933ae0dcbaf9e37 SHA512 2492b8455a7d4195eb7c555a0838b76c07a18498853190e267b0995a6b65f2b7594501239a9e6d9ea6469609904536ea3e4de39afac881527a9b8f75621c2e5a
 EBUILD ament_cmake_export_libraries-9999.ebuild 1149 BLAKE2B 57e3fbec74493851a6c71ec24b7a84e5e0d0ff358b217fe3b0e55595ac8ed66ca32c0b34ea4dc21c9dd18db7727c251ec5004cf90db2373879e0f6a637360aa3 SHA512 1b8852d20a264a0f91e13f0811f194658a6589afbd3f154ae94b6fbd4ea462d4614816da78a6ac891f76ca1b556b9c5d6884df034d4f7e2108374da677233c35
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.3.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.3.ebuild
new file mode 100644
index 000000000000..00ce3f49953c
--- /dev/null
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export libraries to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_link_flags/Manifest b/dev-ros/ament_cmake_export_link_flags/Manifest
index 0cbc115357d5..405f766debbb 100644
--- a/dev-ros/ament_cmake_export_link_flags/Manifest
+++ b/dev-ros/ament_cmake_export_link_flags/Manifest
@@ -3,10 +3,12 @@ DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a36089
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
+DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 EBUILD ament_cmake_export_link_flags-0.9.6.ebuild 1150 BLAKE2B f792483b59decd5c60860169e186f26a9e2375ee2e55275d4e6db0d128cec14efe9b803bc4fb9ed9da545176928d5a1e98a91ee1591b9f0657eccf03d906b199 SHA512 d150ee9827ecbbf8c364138c53630ba9be86e7e465c5f2b4f3b48935bc15508e1dccfc8f1b6727b13626117058cb7f594fd22f1a779e8cc3ae5434b433e3807d
 EBUILD ament_cmake_export_link_flags-1.0.0.ebuild 1150 BLAKE2B f792483b59decd5c60860169e186f26a9e2375ee2e55275d4e6db0d128cec14efe9b803bc4fb9ed9da545176928d5a1e98a91ee1591b9f0657eccf03d906b199 SHA512 d150ee9827ecbbf8c364138c53630ba9be86e7e465c5f2b4f3b48935bc15508e1dccfc8f1b6727b13626117058cb7f594fd22f1a779e8cc3ae5434b433e3807d
 EBUILD ament_cmake_export_link_flags-1.0.1.ebuild 1150 BLAKE2B f792483b59decd5c60860169e186f26a9e2375ee2e55275d4e6db0d128cec14efe9b803bc4fb9ed9da545176928d5a1e98a91ee1591b9f0657eccf03d906b199 SHA512 d150ee9827ecbbf8c364138c53630ba9be86e7e465c5f2b4f3b48935bc15508e1dccfc8f1b6727b13626117058cb7f594fd22f1a779e8cc3ae5434b433e3807d
 EBUILD ament_cmake_export_link_flags-1.0.3.ebuild 1150 BLAKE2B 84fe3750d166c79e46230e71cc018e26a4a92b0f8cfcb3b5ed72d4092c63ead05b6d75622b85a645e6c260e8fa443cb6bb19538f4bbe298758522ce94403c102 SHA512 e03853c514ab47b4ac247e100ab9eeac2d19c6d675d7d9abeccbb28d11585be83a639f1513784c4530db22859bdfb183970c0d34d3dcd575024aaf20ddcd69c8
 EBUILD ament_cmake_export_link_flags-1.0.4.ebuild 1150 BLAKE2B 84fe3750d166c79e46230e71cc018e26a4a92b0f8cfcb3b5ed72d4092c63ead05b6d75622b85a645e6c260e8fa443cb6bb19538f4bbe298758522ce94403c102 SHA512 e03853c514ab47b4ac247e100ab9eeac2d19c6d675d7d9abeccbb28d11585be83a639f1513784c4530db22859bdfb183970c0d34d3dcd575024aaf20ddcd69c8
+EBUILD ament_cmake_export_link_flags-1.1.3.ebuild 1150 BLAKE2B 84fe3750d166c79e46230e71cc018e26a4a92b0f8cfcb3b5ed72d4092c63ead05b6d75622b85a645e6c260e8fa443cb6bb19538f4bbe298758522ce94403c102 SHA512 e03853c514ab47b4ac247e100ab9eeac2d19c6d675d7d9abeccbb28d11585be83a639f1513784c4530db22859bdfb183970c0d34d3dcd575024aaf20ddcd69c8
 EBUILD ament_cmake_export_link_flags-9999.ebuild 1150 BLAKE2B f792483b59decd5c60860169e186f26a9e2375ee2e55275d4e6db0d128cec14efe9b803bc4fb9ed9da545176928d5a1e98a91ee1591b9f0657eccf03d906b199 SHA512 d150ee9827ecbbf8c364138c53630ba9be86e7e465c5f2b4f3b48935bc15508e1dccfc8f1b6727b13626117058cb7f594fd22f1a779e8cc3ae5434b433e3807d
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.1.3.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.1.3.ebuild
new file mode 100644
index 000000000000..ec73128cddf3
--- /dev/null
+++ b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export link flags to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_targets/Manifest b/dev-ros/ament_cmake_export_targets/Manifest
index efb4bb55ac3a..1e879e4891ea 100644
--- a/dev-ros/ament_cmake_export_targets/Manifest
+++ b/dev-ros/ament_cmake_export_targets/Manifest
@@ -3,10 +3,12 @@ DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a36089
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
+DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 EBUILD ament_cmake_export_targets-0.9.6.ebuild 1185 BLAKE2B 3d8fb9f448469df5f8f833d68c6ecbfe78a6d95315bee67469fbe60f21672c348fb7e48f927f06747c04abb825ba91e5b936a0699c51ba7d5c5533482ecfaefc SHA512 8c34e1efdb30c0ca8aa66549b2135eaa600f9f3a588a8c87dd95f0b2fa7a443095f53cd7b208930a81ea4bf5911628ed38cb8e6579941e26fd80d067f166d566
 EBUILD ament_cmake_export_targets-1.0.0.ebuild 1185 BLAKE2B 3d8fb9f448469df5f8f833d68c6ecbfe78a6d95315bee67469fbe60f21672c348fb7e48f927f06747c04abb825ba91e5b936a0699c51ba7d5c5533482ecfaefc SHA512 8c34e1efdb30c0ca8aa66549b2135eaa600f9f3a588a8c87dd95f0b2fa7a443095f53cd7b208930a81ea4bf5911628ed38cb8e6579941e26fd80d067f166d566
 EBUILD ament_cmake_export_targets-1.0.1.ebuild 1185 BLAKE2B 3d8fb9f448469df5f8f833d68c6ecbfe78a6d95315bee67469fbe60f21672c348fb7e48f927f06747c04abb825ba91e5b936a0699c51ba7d5c5533482ecfaefc SHA512 8c34e1efdb30c0ca8aa66549b2135eaa600f9f3a588a8c87dd95f0b2fa7a443095f53cd7b208930a81ea4bf5911628ed38cb8e6579941e26fd80d067f166d566
 EBUILD ament_cmake_export_targets-1.0.3.ebuild 1185 BLAKE2B 0cf0657b95bd399868c504b8a640793b2b57caf54cc7b4f256ada9cf8b4607cd4bf96936f160cd1238700bd6994f5ddfc367b2af09ca716149871c626b650848 SHA512 002f1196d4f7aac0e630e3a316d47d70f8e3b026bb835004f3094397af6406615439304d6bc32c9dd5fe83ecbc8019c7099fe3dc9ca9d87a0af836c050c93baf
 EBUILD ament_cmake_export_targets-1.0.4.ebuild 1185 BLAKE2B 0cf0657b95bd399868c504b8a640793b2b57caf54cc7b4f256ada9cf8b4607cd4bf96936f160cd1238700bd6994f5ddfc367b2af09ca716149871c626b650848 SHA512 002f1196d4f7aac0e630e3a316d47d70f8e3b026bb835004f3094397af6406615439304d6bc32c9dd5fe83ecbc8019c7099fe3dc9ca9d87a0af836c050c93baf
+EBUILD ament_cmake_export_targets-1.1.3.ebuild 1185 BLAKE2B 0cf0657b95bd399868c504b8a640793b2b57caf54cc7b4f256ada9cf8b4607cd4bf96936f160cd1238700bd6994f5ddfc367b2af09ca716149871c626b650848 SHA512 002f1196d4f7aac0e630e3a316d47d70f8e3b026bb835004f3094397af6406615439304d6bc32c9dd5fe83ecbc8019c7099fe3dc9ca9d87a0af836c050c93baf
 EBUILD ament_cmake_export_targets-9999.ebuild 1185 BLAKE2B 3d8fb9f448469df5f8f833d68c6ecbfe78a6d95315bee67469fbe60f21672c348fb7e48f927f06747c04abb825ba91e5b936a0699c51ba7d5c5533482ecfaefc SHA512 8c34e1efdb30c0ca8aa66549b2135eaa600f9f3a588a8c87dd95f0b2fa7a443095f53cd7b208930a81ea4bf5911628ed38cb8e6579941e26fd80d067f166d566
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.3.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.3.ebuild
new file mode 100644
index 000000000000..b91eb36e4adc
--- /dev/null
+++ b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export targets to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_export_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_gmock/Manifest b/dev-ros/ament_cmake_gmock/Manifest
index 6d8c50ba1004..ef8a1c16afb0 100644
--- a/dev-ros/ament_cmake_gmock/Manifest
+++ b/dev-ros/ament_cmake_gmock/Manifest
@@ -2,9 +2,11 @@ DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a36089
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
+DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 EBUILD ament_cmake_gmock-1.0.0.ebuild 1152 BLAKE2B 10a10606988c4038fc54daa697463e165c182bb347ff0338c09551179e9a130913e45b91c4967969e32843097480d4ef546b32f25e367934ceb9724f07e84ff8 SHA512 d01cee2a60943684d581b6b019b6353348817491a9d3a29925d7b2795772d1550670a07c07e7949ca24be818a2c96173c894b8b6668f8c357eaf6abae135c21c
 EBUILD ament_cmake_gmock-1.0.1.ebuild 1152 BLAKE2B 10a10606988c4038fc54daa697463e165c182bb347ff0338c09551179e9a130913e45b91c4967969e32843097480d4ef546b32f25e367934ceb9724f07e84ff8 SHA512 d01cee2a60943684d581b6b019b6353348817491a9d3a29925d7b2795772d1550670a07c07e7949ca24be818a2c96173c894b8b6668f8c357eaf6abae135c21c
 EBUILD ament_cmake_gmock-1.0.3.ebuild 1152 BLAKE2B 6f414e192ac28e09846832c359a73eadf076989555115a830f3ca986e5a72ccc8939065c831852e5d5fb6336044fdf4894d7592b5903f8c8c746f5266ccda916 SHA512 def5421f40f028f3c4ace8aaef1da3af29f09bb710ed73903152571cfa1f1657f68882ed0d45abc5ac69f26b3bbe4439ab01ff5ce270ebbd0c0c5b1fc9d01c28
 EBUILD ament_cmake_gmock-1.0.4.ebuild 1152 BLAKE2B 6f414e192ac28e09846832c359a73eadf076989555115a830f3ca986e5a72ccc8939065c831852e5d5fb6336044fdf4894d7592b5903f8c8c746f5266ccda916 SHA512 def5421f40f028f3c4ace8aaef1da3af29f09bb710ed73903152571cfa1f1657f68882ed0d45abc5ac69f26b3bbe4439ab01ff5ce270ebbd0c0c5b1fc9d01c28
+EBUILD ament_cmake_gmock-1.1.3.ebuild 1152 BLAKE2B 6f414e192ac28e09846832c359a73eadf076989555115a830f3ca986e5a72ccc8939065c831852e5d5fb6336044fdf4894d7592b5903f8c8c746f5266ccda916 SHA512 def5421f40f028f3c4ace8aaef1da3af29f09bb710ed73903152571cfa1f1657f68882ed0d45abc5ac69f26b3bbe4439ab01ff5ce270ebbd0c0c5b1fc9d01c28
 EBUILD ament_cmake_gmock-9999.ebuild 1152 BLAKE2B 10a10606988c4038fc54daa697463e165c182bb347ff0338c09551179e9a130913e45b91c4967969e32843097480d4ef546b32f25e367934ceb9724f07e84ff8 SHA512 d01cee2a60943684d581b6b019b6353348817491a9d3a29925d7b2795772d1550670a07c07e7949ca24be818a2c96173c894b8b6668f8c357eaf6abae135c21c
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.1.3.ebuild b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.1.3.ebuild
new file mode 100644
index 000000000000..385f6a48ae40
--- /dev/null
+++ b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add Google mock-based tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_gtest/Manifest b/dev-ros/ament_cmake_gtest/Manifest
index b27b72257afc..757eb798859a 100644
--- a/dev-ros/ament_cmake_gtest/Manifest
+++ b/dev-ros/ament_cmake_gtest/Manifest
@@ -3,10 +3,12 @@ DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a36089
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
+DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 EBUILD ament_cmake_gtest-0.9.6.ebuild 1146 BLAKE2B 6f387885d2112a368cc1f103c67e9a947b0af1fdd24031fd6da2a1c8ca3e043379fd5b9b3311be0f3a9aeae27bd9974e6622acc9587a43510231fd92a9956de2 SHA512 cdd14e3f3a07579a8f57ad2680d3e87fe368384b451fbf1c5b8c04cf581cd2cc47c6f532a65bef2877b94617cecebe3503b047bb49b7965f01c1300b445c5a5e
 EBUILD ament_cmake_gtest-1.0.0.ebuild 1146 BLAKE2B 6f387885d2112a368cc1f103c67e9a947b0af1fdd24031fd6da2a1c8ca3e043379fd5b9b3311be0f3a9aeae27bd9974e6622acc9587a43510231fd92a9956de2 SHA512 cdd14e3f3a07579a8f57ad2680d3e87fe368384b451fbf1c5b8c04cf581cd2cc47c6f532a65bef2877b94617cecebe3503b047bb49b7965f01c1300b445c5a5e
 EBUILD ament_cmake_gtest-1.0.1.ebuild 1146 BLAKE2B 6f387885d2112a368cc1f103c67e9a947b0af1fdd24031fd6da2a1c8ca3e043379fd5b9b3311be0f3a9aeae27bd9974e6622acc9587a43510231fd92a9956de2 SHA512 cdd14e3f3a07579a8f57ad2680d3e87fe368384b451fbf1c5b8c04cf581cd2cc47c6f532a65bef2877b94617cecebe3503b047bb49b7965f01c1300b445c5a5e
 EBUILD ament_cmake_gtest-1.0.3.ebuild 1146 BLAKE2B 429b4886485b0e6fd6261a373d656178095e86f6d318980b3df2bbc6bfa58ad0e4bf5fa722babc56ae5660b5865c8c5f6f7b6a51e383a924f6e43996327e68e7 SHA512 7eab9405c25a6a4b28454a77bd43952218ebca426226a3cc36767d2cca643ee04d9f851a9a6948be46479350e7e163ef4765403a3f2648b7057685e4e2f1ddd9
 EBUILD ament_cmake_gtest-1.0.4.ebuild 1146 BLAKE2B 429b4886485b0e6fd6261a373d656178095e86f6d318980b3df2bbc6bfa58ad0e4bf5fa722babc56ae5660b5865c8c5f6f7b6a51e383a924f6e43996327e68e7 SHA512 7eab9405c25a6a4b28454a77bd43952218ebca426226a3cc36767d2cca643ee04d9f851a9a6948be46479350e7e163ef4765403a3f2648b7057685e4e2f1ddd9
+EBUILD ament_cmake_gtest-1.1.3.ebuild 1146 BLAKE2B 429b4886485b0e6fd6261a373d656178095e86f6d318980b3df2bbc6bfa58ad0e4bf5fa722babc56ae5660b5865c8c5f6f7b6a51e383a924f6e43996327e68e7 SHA512 7eab9405c25a6a4b28454a77bd43952218ebca426226a3cc36767d2cca643ee04d9f851a9a6948be46479350e7e163ef4765403a3f2648b7057685e4e2f1ddd9
 EBUILD ament_cmake_gtest-9999.ebuild 1146 BLAKE2B 6f387885d2112a368cc1f103c67e9a947b0af1fdd24031fd6da2a1c8ca3e043379fd5b9b3311be0f3a9aeae27bd9974e6622acc9587a43510231fd92a9956de2 SHA512 cdd14e3f3a07579a8f57ad2680d3e87fe368384b451fbf1c5b8c04cf581cd2cc47c6f532a65bef2877b94617cecebe3503b047bb49b7965f01c1300b445c5a5e
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.1.3.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.1.3.ebuild
new file mode 100644
index 000000000000..370bf941137d
--- /dev/null
+++ b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add gtest-based tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_include_directories/Manifest b/dev-ros/ament_cmake_include_directories/Manifest
index 89c7d4345012..0991e5cf7720 100644
--- a/dev-ros/ament_cmake_include_directories/Manifest
+++ b/dev-ros/ament_cmake_include_directories/Manifest
@@ -3,10 +3,12 @@ DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a36089
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
+DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 EBUILD ament_cmake_include_directories-0.9.6.ebuild 1159 BLAKE2B 37c16eddf7ef3a85e583ee73d2499e24d939dea302a365a9876213e48a03ac476280a56694bae1411f8e7966e3dcc4de8d5cf51a69952aaa2c175e53a234f918 SHA512 2919728018dc8eadd11a9678ecf58b71321dcfc973e2d1bca5593901d4e5534494446094a1f0599846d065ebf0c20cf44db5492533a254755a0b0458b422e957
 EBUILD ament_cmake_include_directories-1.0.0.ebuild 1159 BLAKE2B 37c16eddf7ef3a85e583ee73d2499e24d939dea302a365a9876213e48a03ac476280a56694bae1411f8e7966e3dcc4de8d5cf51a69952aaa2c175e53a234f918 SHA512 2919728018dc8eadd11a9678ecf58b71321dcfc973e2d1bca5593901d4e5534494446094a1f0599846d065ebf0c20cf44db5492533a254755a0b0458b422e957
 EBUILD ament_cmake_include_directories-1.0.1.ebuild 1159 BLAKE2B 37c16eddf7ef3a85e583ee73d2499e24d939dea302a365a9876213e48a03ac476280a56694bae1411f8e7966e3dcc4de8d5cf51a69952aaa2c175e53a234f918 SHA512 2919728018dc8eadd11a9678ecf58b71321dcfc973e2d1bca5593901d4e5534494446094a1f0599846d065ebf0c20cf44db5492533a254755a0b0458b422e957
 EBUILD ament_cmake_include_directories-1.0.3.ebuild 1159 BLAKE2B 4049f914e79dca8193527e0a03f1216a68e4b8ed4e17f8badeb4e93ccc8f2a259ba06e10d371d9851c47a53ff1309d723a1d593e106a2835a5cde3c8fe27a04d SHA512 77cc0f5e34ed8149b39498941ad22dbb8d38731893839b3ea2d5a0687af0f6b82d3f9aa96e9446d948f00b077f78e25f70e9aaa99e01a3980ade1ce4f9bb0b61
 EBUILD ament_cmake_include_directories-1.0.4.ebuild 1159 BLAKE2B 4049f914e79dca8193527e0a03f1216a68e4b8ed4e17f8badeb4e93ccc8f2a259ba06e10d371d9851c47a53ff1309d723a1d593e106a2835a5cde3c8fe27a04d SHA512 77cc0f5e34ed8149b39498941ad22dbb8d38731893839b3ea2d5a0687af0f6b82d3f9aa96e9446d948f00b077f78e25f70e9aaa99e01a3980ade1ce4f9bb0b61
+EBUILD ament_cmake_include_directories-1.1.3.ebuild 1159 BLAKE2B 4049f914e79dca8193527e0a03f1216a68e4b8ed4e17f8badeb4e93ccc8f2a259ba06e10d371d9851c47a53ff1309d723a1d593e106a2835a5cde3c8fe27a04d SHA512 77cc0f5e34ed8149b39498941ad22dbb8d38731893839b3ea2d5a0687af0f6b82d3f9aa96e9446d948f00b077f78e25f70e9aaa99e01a3980ade1ce4f9bb0b61
 EBUILD ament_cmake_include_directories-9999.ebuild 1159 BLAKE2B 37c16eddf7ef3a85e583ee73d2499e24d939dea302a365a9876213e48a03ac476280a56694bae1411f8e7966e3dcc4de8d5cf51a69952aaa2c175e53a234f918 SHA512 2919728018dc8eadd11a9678ecf58b71321dcfc973e2d1bca5593901d4e5534494446094a1f0599846d065ebf0c20cf44db5492533a254755a0b0458b422e957
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.3.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.3.ebuild
new file mode 100644
index 000000000000..2745da488293
--- /dev/null
+++ b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_libraries/Manifest b/dev-ros/ament_cmake_libraries/Manifest
index 2620a5c9b22e..5e5e48e884f4 100644
--- a/dev-ros/ament_cmake_libraries/Manifest
+++ b/dev-ros/ament_cmake_libraries/Manifest
@@ -3,10 +3,12 @@ DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a36089
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
+DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 EBUILD ament_cmake_libraries-0.9.6.ebuild 1152 BLAKE2B b196c7ff9cb6164749234f9eeea32194f652f34766443bf91368bf18f476616d6e584326d4eff44523f4f517353b6fce83a50248e5095eba5c5b9ea774daa217 SHA512 e1406d45d89126a05f8a9a8c87ee861deabd868c59826946edfb97f19088bc9d828843da8c856b4b787546e5a778ab7dea772a86ba15a323b3bb8970c60a307e
 EBUILD ament_cmake_libraries-1.0.0.ebuild 1152 BLAKE2B b196c7ff9cb6164749234f9eeea32194f652f34766443bf91368bf18f476616d6e584326d4eff44523f4f517353b6fce83a50248e5095eba5c5b9ea774daa217 SHA512 e1406d45d89126a05f8a9a8c87ee861deabd868c59826946edfb97f19088bc9d828843da8c856b4b787546e5a778ab7dea772a86ba15a323b3bb8970c60a307e
 EBUILD ament_cmake_libraries-1.0.1.ebuild 1152 BLAKE2B b196c7ff9cb6164749234f9eeea32194f652f34766443bf91368bf18f476616d6e584326d4eff44523f4f517353b6fce83a50248e5095eba5c5b9ea774daa217 SHA512 e1406d45d89126a05f8a9a8c87ee861deabd868c59826946edfb97f19088bc9d828843da8c856b4b787546e5a778ab7dea772a86ba15a323b3bb8970c60a307e
 EBUILD ament_cmake_libraries-1.0.3.ebuild 1152 BLAKE2B eada77c5b7f9a60d6f34231c4a768e4590256c804eaa2acab0ac1c20ee5807343a4014741f467a294537b7201631fccf1edb0d854e9208aac5b804326aac8e3a SHA512 cd3749542473e50feb588ed9e0ef7a5e48470592bf4680c6607220b26ec548e2b2ebede5482a644e142e1425e7fc2a27898f65e706ba421bbfba4d733c3610d3
 EBUILD ament_cmake_libraries-1.0.4.ebuild 1152 BLAKE2B eada77c5b7f9a60d6f34231c4a768e4590256c804eaa2acab0ac1c20ee5807343a4014741f467a294537b7201631fccf1edb0d854e9208aac5b804326aac8e3a SHA512 cd3749542473e50feb588ed9e0ef7a5e48470592bf4680c6607220b26ec548e2b2ebede5482a644e142e1425e7fc2a27898f65e706ba421bbfba4d733c3610d3
+EBUILD ament_cmake_libraries-1.1.3.ebuild 1152 BLAKE2B eada77c5b7f9a60d6f34231c4a768e4590256c804eaa2acab0ac1c20ee5807343a4014741f467a294537b7201631fccf1edb0d854e9208aac5b804326aac8e3a SHA512 cd3749542473e50feb588ed9e0ef7a5e48470592bf4680c6607220b26ec548e2b2ebede5482a644e142e1425e7fc2a27898f65e706ba421bbfba4d733c3610d3
 EBUILD ament_cmake_libraries-9999.ebuild 1152 BLAKE2B b196c7ff9cb6164749234f9eeea32194f652f34766443bf91368bf18f476616d6e584326d4eff44523f4f517353b6fce83a50248e5095eba5c5b9ea774daa217 SHA512 e1406d45d89126a05f8a9a8c87ee861deabd868c59826946edfb97f19088bc9d828843da8c856b4b787546e5a778ab7dea772a86ba15a323b3bb8970c60a307e
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.1.3.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.1.3.ebuild
new file mode 100644
index 000000000000..503955156e84
--- /dev/null
+++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The functionality to deduplicate libraries in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_lint_cmake/Manifest b/dev-ros/ament_cmake_lint_cmake/Manifest
index 6feeaaa84ac2..ca71a6d70a60 100644
--- a/dev-ros/ament_cmake_lint_cmake/Manifest
+++ b/dev-ros/ament_cmake_lint_cmake/Manifest
@@ -1,8 +1,10 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
+DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_lint_cmake-0.10.0.ebuild 1254 BLAKE2B 13f8562fe224b99a99bebcee8e6ec64172a9d222aaa4943ed2742d405a1e33b4916fa6d93897858e92e6c92d99a29ed52ab805c2eb372e1dd630456b9372c5bc SHA512 cb2793e0c927ea5c887885ad230af2c9c2c4f47388a0885379609a76963bf2da279eaf1b0df8a2dbb4c7fac23c33eeef8a88b8616409fcd435ec9e289bd052ba
 EBUILD ament_cmake_lint_cmake-0.10.1.ebuild 1254 BLAKE2B d34f035640125f0a67b23877a04c3f1b25fd42f77ba4703fa2ba479f08e5021a0dc42fc10064e30b2951eb247bd5f5eb997201894b15e441dc6bb0afa121ac7d SHA512 81d5de5ab1ad982d029e29d1a8c269f594a15ddbfad5909777ba48074b1d809894419bc9d4b011e912ef7280b3342e76141b1cf9a6522711ff1f244b9a434ed3
+EBUILD ament_cmake_lint_cmake-0.10.4.ebuild 1254 BLAKE2B d34f035640125f0a67b23877a04c3f1b25fd42f77ba4703fa2ba479f08e5021a0dc42fc10064e30b2951eb247bd5f5eb997201894b15e441dc6bb0afa121ac7d SHA512 81d5de5ab1ad982d029e29d1a8c269f594a15ddbfad5909777ba48074b1d809894419bc9d4b011e912ef7280b3342e76141b1cf9a6522711ff1f244b9a434ed3
 EBUILD ament_cmake_lint_cmake-0.9.5.ebuild 1254 BLAKE2B 13f8562fe224b99a99bebcee8e6ec64172a9d222aaa4943ed2742d405a1e33b4916fa6d93897858e92e6c92d99a29ed52ab805c2eb372e1dd630456b9372c5bc SHA512 cb2793e0c927ea5c887885ad230af2c9c2c4f47388a0885379609a76963bf2da279eaf1b0df8a2dbb4c7fac23c33eeef8a88b8616409fcd435ec9e289bd052ba
 EBUILD ament_cmake_lint_cmake-9999.ebuild 1254 BLAKE2B 13f8562fe224b99a99bebcee8e6ec64172a9d222aaa4943ed2742d405a1e33b4916fa6d93897858e92e6c92d99a29ed52ab805c2eb372e1dd630456b9372c5bc SHA512 cb2793e0c927ea5c887885ad230af2c9c2c4f47388a0885379609a76963bf2da279eaf1b0df8a2dbb4c7fac23c33eeef8a88b8616409fcd435ec9e289bd052ba
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.10.4.ebuild b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.10.4.ebuild
new file mode 100644
index 000000000000..93474a6aa424
--- /dev/null
+++ b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.10.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The CMake API for ament_lint_cmake to lint CMake code using cmakelint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_lint_cmake
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]')
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_pytest/Manifest b/dev-ros/ament_cmake_pytest/Manifest
index d04f49758699..def486ceca52 100644
--- a/dev-ros/ament_cmake_pytest/Manifest
+++ b/dev-ros/ament_cmake_pytest/Manifest
@@ -2,9 +2,11 @@ DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a36089
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
+DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 EBUILD ament_cmake_pytest-1.0.0.ebuild 1154 BLAKE2B 17df8a599978f41ba4fa9b9883aaab6f1320210e3e880c2ae96256326f8dcf2404ffc8203c1fd2985757d9fe4249e98cdc81d16e727669fb783a593dc6e4e3aa SHA512 039024b6575791ff7fcbbf7591c4ad26887d7ad84e1950f1779dfe6e853aec2772e002c623a98d1adfeab1aa1fb47279602d75ab97db59d887100ea69e5b78b2
 EBUILD ament_cmake_pytest-1.0.1.ebuild 1154 BLAKE2B 17df8a599978f41ba4fa9b9883aaab6f1320210e3e880c2ae96256326f8dcf2404ffc8203c1fd2985757d9fe4249e98cdc81d16e727669fb783a593dc6e4e3aa SHA512 039024b6575791ff7fcbbf7591c4ad26887d7ad84e1950f1779dfe6e853aec2772e002c623a98d1adfeab1aa1fb47279602d75ab97db59d887100ea69e5b78b2
 EBUILD ament_cmake_pytest-1.0.3.ebuild 1154 BLAKE2B 334a86f88b8fadc51d4db55c96ca39c27312451c6881fc607bcd4f98e8bbd409bed4c4dda169396c57c02f07c0053760672ef12bd18055365d250d0e6fc9ad8c SHA512 5eb244adfff41296c274d566e521fcbf7cb61d64856bf8838939b333d64755bc40aca75bf5740ef325272b0866f2445545c582bccc1c0429989d0b0600bc5b5d
 EBUILD ament_cmake_pytest-1.0.4.ebuild 1154 BLAKE2B 334a86f88b8fadc51d4db55c96ca39c27312451c6881fc607bcd4f98e8bbd409bed4c4dda169396c57c02f07c0053760672ef12bd18055365d250d0e6fc9ad8c SHA512 5eb244adfff41296c274d566e521fcbf7cb61d64856bf8838939b333d64755bc40aca75bf5740ef325272b0866f2445545c582bccc1c0429989d0b0600bc5b5d
+EBUILD ament_cmake_pytest-1.1.3.ebuild 1154 BLAKE2B 334a86f88b8fadc51d4db55c96ca39c27312451c6881fc607bcd4f98e8bbd409bed4c4dda169396c57c02f07c0053760672ef12bd18055365d250d0e6fc9ad8c SHA512 5eb244adfff41296c274d566e521fcbf7cb61d64856bf8838939b333d64755bc40aca75bf5740ef325272b0866f2445545c582bccc1c0429989d0b0600bc5b5d
 EBUILD ament_cmake_pytest-9999.ebuild 1154 BLAKE2B 17df8a599978f41ba4fa9b9883aaab6f1320210e3e880c2ae96256326f8dcf2404ffc8203c1fd2985757d9fe4249e98cdc81d16e727669fb783a593dc6e4e3aa SHA512 039024b6575791ff7fcbbf7591c4ad26887d7ad84e1950f1779dfe6e853aec2772e002c623a98d1adfeab1aa1fb47279602d75ab97db59d887100ea69e5b78b2
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.1.3.ebuild b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.1.3.ebuild
new file mode 100644
index 000000000000..38d82b7f38f4
--- /dev/null
+++ b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to run Python tests using pytest in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_python/Manifest b/dev-ros/ament_cmake_python/Manifest
index 4192b09e9f39..fb38f5e9de56 100644
--- a/dev-ros/ament_cmake_python/Manifest
+++ b/dev-ros/ament_cmake_python/Manifest
@@ -4,10 +4,12 @@ DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a36089
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
+DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 EBUILD ament_cmake_python-0.9.6.ebuild 1175 BLAKE2B 69bd9dcc6fcc74e9d433fc9ea1fc63b8d8a4895e0d812add1c08ab8d3607c8c67fb325c582f8b083a6a903bda742b4f810623e7bf59a324fd62a7e3fbd87700d SHA512 7bf2b508f8b616d97c29f99f88864ef57fe9e86fd5bace22d1b34fe519676d908c2d3c95a47a05d1d986f83e0a636f77314026a3908bee13b599deeef50362bc
 EBUILD ament_cmake_python-1.0.0.ebuild 1175 BLAKE2B 69bd9dcc6fcc74e9d433fc9ea1fc63b8d8a4895e0d812add1c08ab8d3607c8c67fb325c582f8b083a6a903bda742b4f810623e7bf59a324fd62a7e3fbd87700d SHA512 7bf2b508f8b616d97c29f99f88864ef57fe9e86fd5bace22d1b34fe519676d908c2d3c95a47a05d1d986f83e0a636f77314026a3908bee13b599deeef50362bc
 EBUILD ament_cmake_python-1.0.1.ebuild 1175 BLAKE2B 69bd9dcc6fcc74e9d433fc9ea1fc63b8d8a4895e0d812add1c08ab8d3607c8c67fb325c582f8b083a6a903bda742b4f810623e7bf59a324fd62a7e3fbd87700d SHA512 7bf2b508f8b616d97c29f99f88864ef57fe9e86fd5bace22d1b34fe519676d908c2d3c95a47a05d1d986f83e0a636f77314026a3908bee13b599deeef50362bc
 EBUILD ament_cmake_python-1.0.3.ebuild 1175 BLAKE2B 7fe88a4a824c89784242cf6f01dfaccb85616a389085caee7b6ac18b34c49282f731a24caf8899f2867d94ac7c4c154cbf5348f1287a3a64867e04a6ea90558a SHA512 91ad689621affc36351d55882979b6c100d8d44dd275d22bed010a0f71e093e806777887dcc2b78d0b116a2f7a3c37a5627847f84e4d7c00bf7162eda7fd77e5
 EBUILD ament_cmake_python-1.0.4.ebuild 1175 BLAKE2B 7fe88a4a824c89784242cf6f01dfaccb85616a389085caee7b6ac18b34c49282f731a24caf8899f2867d94ac7c4c154cbf5348f1287a3a64867e04a6ea90558a SHA512 91ad689621affc36351d55882979b6c100d8d44dd275d22bed010a0f71e093e806777887dcc2b78d0b116a2f7a3c37a5627847f84e4d7c00bf7162eda7fd77e5
+EBUILD ament_cmake_python-1.1.3.ebuild 1175 BLAKE2B 7fe88a4a824c89784242cf6f01dfaccb85616a389085caee7b6ac18b34c49282f731a24caf8899f2867d94ac7c4c154cbf5348f1287a3a64867e04a6ea90558a SHA512 91ad689621affc36351d55882979b6c100d8d44dd275d22bed010a0f71e093e806777887dcc2b78d0b116a2f7a3c37a5627847f84e4d7c00bf7162eda7fd77e5
 EBUILD ament_cmake_python-9999.ebuild 1175 BLAKE2B 69bd9dcc6fcc74e9d433fc9ea1fc63b8d8a4895e0d812add1c08ab8d3607c8c67fb325c582f8b083a6a903bda742b4f810623e7bf59a324fd62a7e3fbd87700d SHA512 7bf2b508f8b616d97c29f99f88864ef57fe9e86fd5bace22d1b34fe519676d908c2d3c95a47a05d1d986f83e0a636f77314026a3908bee13b599deeef50362bc
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_python/ament_cmake_python-1.1.3.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.1.3.ebuild
new file mode 100644
index 000000000000..78fe12b5149e
--- /dev/null
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-1.1.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to use Python in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+PATCHES=( "${FILESDIR}/destdir.patch" )
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_target_dependencies/Manifest b/dev-ros/ament_cmake_target_dependencies/Manifest
index 1b48fa01c283..65d358d2d80d 100644
--- a/dev-ros/ament_cmake_target_dependencies/Manifest
+++ b/dev-ros/ament_cmake_target_dependencies/Manifest
@@ -3,10 +3,12 @@ DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a36089
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
+DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 EBUILD ament_cmake_target_dependencies-0.9.6.ebuild 1225 BLAKE2B f3e1e476161716243080aa9a4e2d5aa221a95d6fa11e4dd4bd62c61693d0ea918fba815365a06fd819833e1ce9faa92fbc80b6fd27ed552afb8001270dceeb75 SHA512 df1b666a251258bc0c90ead0a08675be6e5c8bf7987339c91b905a248f0f2aa7c2d7720e52a9cf3b2913bf8d0e23993675a004013cd9a046c505133e0729d494
 EBUILD ament_cmake_target_dependencies-1.0.0.ebuild 1225 BLAKE2B f3e1e476161716243080aa9a4e2d5aa221a95d6fa11e4dd4bd62c61693d0ea918fba815365a06fd819833e1ce9faa92fbc80b6fd27ed552afb8001270dceeb75 SHA512 df1b666a251258bc0c90ead0a08675be6e5c8bf7987339c91b905a248f0f2aa7c2d7720e52a9cf3b2913bf8d0e23993675a004013cd9a046c505133e0729d494
 EBUILD ament_cmake_target_dependencies-1.0.1.ebuild 1225 BLAKE2B f3e1e476161716243080aa9a4e2d5aa221a95d6fa11e4dd4bd62c61693d0ea918fba815365a06fd819833e1ce9faa92fbc80b6fd27ed552afb8001270dceeb75 SHA512 df1b666a251258bc0c90ead0a08675be6e5c8bf7987339c91b905a248f0f2aa7c2d7720e52a9cf3b2913bf8d0e23993675a004013cd9a046c505133e0729d494
 EBUILD ament_cmake_target_dependencies-1.0.3.ebuild 1225 BLAKE2B 9b58b8ac241c6ea68c8d02d7af370938464907c6f96f64b8e99d2d4ef2e2a4afcc32f604a19542204a025ae2c6b10065dbe36bda427f68b6cc7924219ee0210e SHA512 ec0da7afdee490ddacbb7d408637a75c6f2fe0ef259b4fe6d513a3f166fb269e178b13f7cf86a9300bd33d4537834dd3ff0c29883e7e984ef5fc7d4b9e46721b
 EBUILD ament_cmake_target_dependencies-1.0.4.ebuild 1225 BLAKE2B 9b58b8ac241c6ea68c8d02d7af370938464907c6f96f64b8e99d2d4ef2e2a4afcc32f604a19542204a025ae2c6b10065dbe36bda427f68b6cc7924219ee0210e SHA512 ec0da7afdee490ddacbb7d408637a75c6f2fe0ef259b4fe6d513a3f166fb269e178b13f7cf86a9300bd33d4537834dd3ff0c29883e7e984ef5fc7d4b9e46721b
+EBUILD ament_cmake_target_dependencies-1.1.3.ebuild 1225 BLAKE2B 9b58b8ac241c6ea68c8d02d7af370938464907c6f96f64b8e99d2d4ef2e2a4afcc32f604a19542204a025ae2c6b10065dbe36bda427f68b6cc7924219ee0210e SHA512 ec0da7afdee490ddacbb7d408637a75c6f2fe0ef259b4fe6d513a3f166fb269e178b13f7cf86a9300bd33d4537834dd3ff0c29883e7e984ef5fc7d4b9e46721b
 EBUILD ament_cmake_target_dependencies-9999.ebuild 1225 BLAKE2B f3e1e476161716243080aa9a4e2d5aa221a95d6fa11e4dd4bd62c61693d0ea918fba815365a06fd819833e1ce9faa92fbc80b6fd27ed552afb8001270dceeb75 SHA512 df1b666a251258bc0c90ead0a08675be6e5c8bf7987339c91b905a248f0f2aa7c2d7720e52a9cf3b2913bf8d0e23993675a004013cd9a046c505133e0729d494
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.1.3.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.1.3.ebuild
new file mode 100644
index 000000000000..f2d4349aceca
--- /dev/null
+++ b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.1.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Add defs, include dirs and libs to a target in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_include_directories
+	dev-ros/ament_cmake_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_test/Manifest b/dev-ros/ament_cmake_test/Manifest
index edfd921396d4..9e0523486898 100644
--- a/dev-ros/ament_cmake_test/Manifest
+++ b/dev-ros/ament_cmake_test/Manifest
@@ -3,10 +3,12 @@ DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a36089
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
+DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 EBUILD ament_cmake_test-0.9.6.ebuild 1224 BLAKE2B 5e091997e35c56e4f1733d2e62b1a1aeea4df95a2fbcafe532f8b775312416a513be8050a2f07e472ec3ab90972c2a389cea1aef6ace3bf306928bcb7147f572 SHA512 58e4d6a6987c1f165c5f02824b4059feb481c1a9f3168b26fc779599944d2b017a02868c81aee9d71a111354cd25e2250b34156eda180e482f291db0305c9be7
 EBUILD ament_cmake_test-1.0.0.ebuild 1224 BLAKE2B 5e091997e35c56e4f1733d2e62b1a1aeea4df95a2fbcafe532f8b775312416a513be8050a2f07e472ec3ab90972c2a389cea1aef6ace3bf306928bcb7147f572 SHA512 58e4d6a6987c1f165c5f02824b4059feb481c1a9f3168b26fc779599944d2b017a02868c81aee9d71a111354cd25e2250b34156eda180e482f291db0305c9be7
 EBUILD ament_cmake_test-1.0.1.ebuild 1224 BLAKE2B 5e091997e35c56e4f1733d2e62b1a1aeea4df95a2fbcafe532f8b775312416a513be8050a2f07e472ec3ab90972c2a389cea1aef6ace3bf306928bcb7147f572 SHA512 58e4d6a6987c1f165c5f02824b4059feb481c1a9f3168b26fc779599944d2b017a02868c81aee9d71a111354cd25e2250b34156eda180e482f291db0305c9be7
 EBUILD ament_cmake_test-1.0.3.ebuild 1224 BLAKE2B 2adee645432de285f14602b1dd7650ffc3ca3c0fd3b0b0ad5950eed5577f37d4f3fb7f7d65fbe3aef4bc7edf79bd00bdda16f2df56b753767120c1ca236939b9 SHA512 7cc4b31d7e25169cb5c6ab369e1e3c1d2f0cf1d018f9d68e3d0d6761907d7066f1bcc1304cab03195bf417ca88fe0ba283a5c853e6ba7441a98468d620f77734
 EBUILD ament_cmake_test-1.0.4.ebuild 1224 BLAKE2B 2adee645432de285f14602b1dd7650ffc3ca3c0fd3b0b0ad5950eed5577f37d4f3fb7f7d65fbe3aef4bc7edf79bd00bdda16f2df56b753767120c1ca236939b9 SHA512 7cc4b31d7e25169cb5c6ab369e1e3c1d2f0cf1d018f9d68e3d0d6761907d7066f1bcc1304cab03195bf417ca88fe0ba283a5c853e6ba7441a98468d620f77734
+EBUILD ament_cmake_test-1.1.3.ebuild 1224 BLAKE2B 2adee645432de285f14602b1dd7650ffc3ca3c0fd3b0b0ad5950eed5577f37d4f3fb7f7d65fbe3aef4bc7edf79bd00bdda16f2df56b753767120c1ca236939b9 SHA512 7cc4b31d7e25169cb5c6ab369e1e3c1d2f0cf1d018f9d68e3d0d6761907d7066f1bcc1304cab03195bf417ca88fe0ba283a5c853e6ba7441a98468d620f77734
 EBUILD ament_cmake_test-9999.ebuild 1224 BLAKE2B 5e091997e35c56e4f1733d2e62b1a1aeea4df95a2fbcafe532f8b775312416a513be8050a2f07e472ec3ab90972c2a389cea1aef6ace3bf306928bcb7147f572 SHA512 58e4d6a6987c1f165c5f02824b4059feb481c1a9f3168b26fc779599944d2b017a02868c81aee9d71a111354cd25e2250b34156eda180e482f291db0305c9be7
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_test/ament_cmake_test-1.1.3.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-1.1.3.ebuild
new file mode 100644
index 000000000000..dbf6bb035b91
--- /dev/null
+++ b/dev-ros/ament_cmake_test/ament_cmake_test-1.1.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+DEPEND="
+	dev-ros/ament_cmake_core
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-ros/ament_cmake_python
+	${PYTHON_DEPS}
+"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	python_foreach_impl cmake_src_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	python_foreach_impl cmake_src_test
+}
+
+src_install() {
+	python_foreach_impl cmake_src_install
+	python_foreach_impl python_optimize
+}
diff --git a/dev-ros/ament_cmake_uncrustify/Manifest b/dev-ros/ament_cmake_uncrustify/Manifest
index 9e03d7695df2..9886ed28f406 100644
--- a/dev-ros/ament_cmake_uncrustify/Manifest
+++ b/dev-ros/ament_cmake_uncrustify/Manifest
@@ -1,8 +1,10 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
+DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_uncrustify-0.10.0.ebuild 1511 BLAKE2B 7ac9f39d3b46d3f919ef3b19b8c751568aeeca04a02937b5bc2524df065cd1803fd2283bffaeb3692a70b6a1057b9882a99310d2975108c77cae75228b789ae5 SHA512 2f902e897196006df8fcf882c9a9876f6aba7bf919cda7c3e9797acf09a7d5003e44e415132540c56818b9325ea6d17cf9c1edff2dc09ba88ac7827406bc5408
 EBUILD ament_cmake_uncrustify-0.10.1.ebuild 1511 BLAKE2B 4ae62c7d3ab5932cd82c92db21dff087881294fe8ad9c240bb2c0c736190272e77e5081f30d5566db236a5fe3416903c2489d5c50c9e7d686b3c404bc2252e4d SHA512 445f4e300753d31be081aeba7111633836c7d2b57d28c861d0b32482f70dc576a46ed6223c565754cf907ccc1b7546bac52b2aa65649dfa52e4a9d3e79c97975
+EBUILD ament_cmake_uncrustify-0.10.4.ebuild 1511 BLAKE2B 4ae62c7d3ab5932cd82c92db21dff087881294fe8ad9c240bb2c0c736190272e77e5081f30d5566db236a5fe3416903c2489d5c50c9e7d686b3c404bc2252e4d SHA512 445f4e300753d31be081aeba7111633836c7d2b57d28c861d0b32482f70dc576a46ed6223c565754cf907ccc1b7546bac52b2aa65649dfa52e4a9d3e79c97975
 EBUILD ament_cmake_uncrustify-0.9.5.ebuild 1511 BLAKE2B 7ac9f39d3b46d3f919ef3b19b8c751568aeeca04a02937b5bc2524df065cd1803fd2283bffaeb3692a70b6a1057b9882a99310d2975108c77cae75228b789ae5 SHA512 2f902e897196006df8fcf882c9a9876f6aba7bf919cda7c3e9797acf09a7d5003e44e415132540c56818b9325ea6d17cf9c1edff2dc09ba88ac7827406bc5408
 EBUILD ament_cmake_uncrustify-9999.ebuild 1511 BLAKE2B 7ac9f39d3b46d3f919ef3b19b8c751568aeeca04a02937b5bc2524df065cd1803fd2283bffaeb3692a70b6a1057b9882a99310d2975108c77cae75228b789ae5 SHA512 2f902e897196006df8fcf882c9a9876f6aba7bf919cda7c3e9797acf09a7d5003e44e415132540c56818b9325ea6d17cf9c1edff2dc09ba88ac7827406bc5408
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.10.4.ebuild b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.10.4.ebuild
new file mode 100644
index 000000000000..ac77dc9fa08f
--- /dev/null
+++ b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.10.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The CMake API for ament_uncrustify to check code against styleconventions"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_uncrustify
+"
+DEPEND=""
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	test? (
+		dev-ros/ament_cmake_copyright
+		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
+		dev-ros/ament_cmake_lint_cmake
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-ros/ament_cmake_version/Manifest b/dev-ros/ament_cmake_version/Manifest
index 8cbde7e156bf..a6020268d2d8 100644
--- a/dev-ros/ament_cmake_version/Manifest
+++ b/dev-ros/ament_cmake_version/Manifest
@@ -3,10 +3,12 @@ DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a36089
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
+DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 EBUILD ament_cmake_version-0.9.6.ebuild 1147 BLAKE2B 1036158be4f0da85c9d3b8065d8ad1f4efc0433531fd5a0038c6207e5305d48a4d96159db23aefb4d15b270c220142042adbb07e0f438f930cfa737969d418eb SHA512 57c97ba1dcaa22c633ebdf765c74efdea3f0a5b184e314e14ac190fe6bbd7806f6ecd34b55f88e0c8f139fb8b76d851fc243fe13f007c1f294991d8ada3b309e
 EBUILD ament_cmake_version-1.0.0.ebuild 1147 BLAKE2B 1036158be4f0da85c9d3b8065d8ad1f4efc0433531fd5a0038c6207e5305d48a4d96159db23aefb4d15b270c220142042adbb07e0f438f930cfa737969d418eb SHA512 57c97ba1dcaa22c633ebdf765c74efdea3f0a5b184e314e14ac190fe6bbd7806f6ecd34b55f88e0c8f139fb8b76d851fc243fe13f007c1f294991d8ada3b309e
 EBUILD ament_cmake_version-1.0.1.ebuild 1147 BLAKE2B 1036158be4f0da85c9d3b8065d8ad1f4efc0433531fd5a0038c6207e5305d48a4d96159db23aefb4d15b270c220142042adbb07e0f438f930cfa737969d418eb SHA512 57c97ba1dcaa22c633ebdf765c74efdea3f0a5b184e314e14ac190fe6bbd7806f6ecd34b55f88e0c8f139fb8b76d851fc243fe13f007c1f294991d8ada3b309e
 EBUILD ament_cmake_version-1.0.3.ebuild 1147 BLAKE2B 96d7915a84aaad39360e36374b83fefc4674991fba2f5a249ac273d53fcb72532eafac6182657bab661e562a98d8d9f7ca7b09e454bf48014aa27a93f8d57b8b SHA512 8407a94d378f5c276f2f2ef232ddca4867a64cf027688e65d305f6b369987089c765528fde562653306b9935090e1a93685ce378b51a8cb27362b79396146309
 EBUILD ament_cmake_version-1.0.4.ebuild 1147 BLAKE2B 96d7915a84aaad39360e36374b83fefc4674991fba2f5a249ac273d53fcb72532eafac6182657bab661e562a98d8d9f7ca7b09e454bf48014aa27a93f8d57b8b SHA512 8407a94d378f5c276f2f2ef232ddca4867a64cf027688e65d305f6b369987089c765528fde562653306b9935090e1a93685ce378b51a8cb27362b79396146309
+EBUILD ament_cmake_version-1.1.3.ebuild 1147 BLAKE2B 96d7915a84aaad39360e36374b83fefc4674991fba2f5a249ac273d53fcb72532eafac6182657bab661e562a98d8d9f7ca7b09e454bf48014aa27a93f8d57b8b SHA512 8407a94d378f5c276f2f2ef232ddca4867a64cf027688e65d305f6b369987089c765528fde562653306b9935090e1a93685ce378b51a8cb27362b79396146309
 EBUILD ament_cmake_version-9999.ebuild 1147 BLAKE2B 1036158be4f0da85c9d3b8065d8ad1f4efc0433531fd5a0038c6207e5305d48a4d96159db23aefb4d15b270c220142042adbb07e0f438f930cfa737969d418eb SHA512 57c97ba1dcaa22c633ebdf765c74efdea3f0a5b184e314e14ac190fe6bbd7806f6ecd34b55f88e0c8f139fb8b76d851fc243fe13f007c1f294991d8ada3b309e
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_version/ament_cmake_version-1.1.3.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-1.1.3.ebuild
new file mode 100644
index 000000000000..8c734e6b7df4
--- /dev/null
+++ b/dev-ros/ament_cmake_version/ament_cmake_version-1.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Override the exported package version in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_xmllint/Manifest b/dev-ros/ament_cmake_xmllint/Manifest
index c2b23723caff..b9c9a7fb8c8b 100644
--- a/dev-ros/ament_cmake_xmllint/Manifest
+++ b/dev-ros/ament_cmake_xmllint/Manifest
@@ -1,8 +1,10 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
+DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_xmllint-0.10.0.ebuild 1447 BLAKE2B 49fdb7b43e6447652f7021c27b32d2ab56c091f4a85a60d5760caf0a5e5c3300e472c332d2521997dd8da6eb5bc7ae11eff014ed8989bbbc5c9e2094f792a6b4 SHA512 a4862a39bdb0239cf83d0ee4ed91d4f90d2846b886807dc8458007d7f8ffff3cc30b7d16ab7396d3c7f524dddc5b00efde1137353207355bb20b25576f3c07d2
 EBUILD ament_cmake_xmllint-0.10.1.ebuild 1447 BLAKE2B 66d9dde6bb0ea0e11a3e5d8d89cb961eff1b815fc73b86cd5c18082a928d576fad8b6db32615a82fa9d94406141ae44c373a80b09090fef623e3b90acfbcf4fc SHA512 2060b66c3f0adfef596d1e9c2e9ba359153934c0b9a690efea04a0652487a48ce7408a27a060b7f14356afe94b15ea6012a3922250ca325dd6601c992727fa1c
+EBUILD ament_cmake_xmllint-0.10.4.ebuild 1447 BLAKE2B 66d9dde6bb0ea0e11a3e5d8d89cb961eff1b815fc73b86cd5c18082a928d576fad8b6db32615a82fa9d94406141ae44c373a80b09090fef623e3b90acfbcf4fc SHA512 2060b66c3f0adfef596d1e9c2e9ba359153934c0b9a690efea04a0652487a48ce7408a27a060b7f14356afe94b15ea6012a3922250ca325dd6601c992727fa1c
 EBUILD ament_cmake_xmllint-0.9.5.ebuild 1447 BLAKE2B 49fdb7b43e6447652f7021c27b32d2ab56c091f4a85a60d5760caf0a5e5c3300e472c332d2521997dd8da6eb5bc7ae11eff014ed8989bbbc5c9e2094f792a6b4 SHA512 a4862a39bdb0239cf83d0ee4ed91d4f90d2846b886807dc8458007d7f8ffff3cc30b7d16ab7396d3c7f524dddc5b00efde1137353207355bb20b25576f3c07d2
 EBUILD ament_cmake_xmllint-9999.ebuild 1447 BLAKE2B 49fdb7b43e6447652f7021c27b32d2ab56c091f4a85a60d5760caf0a5e5c3300e472c332d2521997dd8da6eb5bc7ae11eff014ed8989bbbc5c9e2094f792a6b4 SHA512 a4862a39bdb0239cf83d0ee4ed91d4f90d2846b886807dc8458007d7f8ffff3cc30b7d16ab7396d3c7f524dddc5b00efde1137353207355bb20b25576f3c07d2
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.10.4.ebuild b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.10.4.ebuild
new file mode 100644
index 000000000000..4e164f033962
--- /dev/null
+++ b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.10.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="he CMake API for ament_xmllint to check XML file using xmmlint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_copyright
+"
+DEPEND=""
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-ros/ament_xmllint[${PYTHON_USEDEP}]')
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_copyright
+	test? (
+		dev-ros/ament_cmake_lint_cmake
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version "dev-ros/ament_xmllint[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-ros/ament_copyright/Manifest b/dev-ros/ament_copyright/Manifest
index 82a8db357c62..35f18c152b01 100644
--- a/dev-ros/ament_copyright/Manifest
+++ b/dev-ros/ament_copyright/Manifest
@@ -1,6 +1,8 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
+DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
 EBUILD ament_copyright-0.10.0.ebuild 1140 BLAKE2B 9ec8b335378a72ee8bd87e27a274d53e70b941fd8fa301ebeb0687aa076e4f26e25af1a45ba3d7e9ea6e21998b97bc8e5e12d180c9735d0d340f6e78fea4c6f4 SHA512 048ed0e03cec9761e90c59773626a12347b487c296fd95024113c82ed245f66302016a2ccd85854d4386226b333171a00736d43b92431a2db90ec1e3119c4e26
 EBUILD ament_copyright-0.10.1.ebuild 1140 BLAKE2B 8514e017f9e9964e643f21747b2a12c1aa3c8d3dff3eb7a8882a2015353089d9f79fc95467d5aa391d4ffeefc3817afdb062bfda7cf4eb467f6c5bf34b5e38de SHA512 609663ad2640fdeaf886c66dea0adf6262a73175a2a374d625007d246385076828327e191ab570f1ab2adb7586b7ff7b4a5e9e6be5e6bd07a02463040e48c6a7
+EBUILD ament_copyright-0.10.4.ebuild 1140 BLAKE2B 8514e017f9e9964e643f21747b2a12c1aa3c8d3dff3eb7a8882a2015353089d9f79fc95467d5aa391d4ffeefc3817afdb062bfda7cf4eb467f6c5bf34b5e38de SHA512 609663ad2640fdeaf886c66dea0adf6262a73175a2a374d625007d246385076828327e191ab570f1ab2adb7586b7ff7b4a5e9e6be5e6bd07a02463040e48c6a7
 EBUILD ament_copyright-9999.ebuild 1140 BLAKE2B 9ec8b335378a72ee8bd87e27a274d53e70b941fd8fa301ebeb0687aa076e4f26e25af1a45ba3d7e9ea6e21998b97bc8e5e12d180c9735d0d340f6e78fea4c6f4 SHA512 048ed0e03cec9761e90c59773626a12347b487c296fd95024113c82ed245f66302016a2ccd85854d4386226b333171a00736d43b92431a2db90ec1e3119c4e26
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_copyright/ament_copyright-0.10.4.ebuild b/dev-ros/ament_copyright/ament_copyright-0.10.4.ebuild
new file mode 100644
index 000000000000..e23e04234485
--- /dev/null
+++ b/dev-ros/ament_copyright/ament_copyright-0.10.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to check source files for copyright and license information."
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-ros/ament_cppcheck/Manifest b/dev-ros/ament_cppcheck/Manifest
index 33203839d77a..830ba16ae084 100644
--- a/dev-ros/ament_cppcheck/Manifest
+++ b/dev-ros/ament_cppcheck/Manifest
@@ -1,6 +1,8 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
+DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
 EBUILD ament_cppcheck-0.10.0.ebuild 812 BLAKE2B 485643f05a8e499f3c0ace2a346ec29d804670174d6c98da7932d9c0c73b182c7dea7d4a70d0769c31ee59d94601fd09770dd89ff610c4176818a1d3197af305 SHA512 206edcec6b794621c069fd396d485c4e36fcc03cd6421c08e2388aceb65b3c0ee0e1b03a72e8c57089ed6f0cb4a9f09f7e6e6f2b51ea58f48ca7346d58a6433c
 EBUILD ament_cppcheck-0.10.1.ebuild 812 BLAKE2B ab414a0a9a388b20e9a12c2a50db30e8e36b678381571c876a88fd81db8521aadd786d76c4034ae6a4f9207ccae38ded21abefc9ee5b31f3ed786ac15dec5334 SHA512 0d0d3e6282809b20fdf2fcc6bdfa98d4ede980f3d30262d443bd4c28e3457c965dd5ba59fdfe993bca39855b1cfbe40a67419152f86a83718ec39aceefa9a82a
+EBUILD ament_cppcheck-0.10.4.ebuild 812 BLAKE2B ab414a0a9a388b20e9a12c2a50db30e8e36b678381571c876a88fd81db8521aadd786d76c4034ae6a4f9207ccae38ded21abefc9ee5b31f3ed786ac15dec5334 SHA512 0d0d3e6282809b20fdf2fcc6bdfa98d4ede980f3d30262d443bd4c28e3457c965dd5ba59fdfe993bca39855b1cfbe40a67419152f86a83718ec39aceefa9a82a
 EBUILD ament_cppcheck-9999.ebuild 812 BLAKE2B 485643f05a8e499f3c0ace2a346ec29d804670174d6c98da7932d9c0c73b182c7dea7d4a70d0769c31ee59d94601fd09770dd89ff610c4176818a1d3197af305 SHA512 206edcec6b794621c069fd396d485c4e36fcc03cd6421c08e2388aceb65b3c0ee0e1b03a72e8c57089ed6f0cb4a9f09f7e6e6f2b51ea58f48ca7346d58a6433c
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cppcheck/ament_cppcheck-0.10.4.ebuild b/dev-ros/ament_cppcheck/ament_cppcheck-0.10.4.ebuild
new file mode 100644
index 000000000000..7749ef3ab532
--- /dev/null
+++ b/dev-ros/ament_cppcheck/ament_cppcheck-0.10.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to perform static code analysis on C/C++ code using Cppcheck"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-util/cppcheck
+"
+DEPEND=""
+BDEPEND=""
diff --git a/dev-ros/ament_cpplint/Manifest b/dev-ros/ament_cpplint/Manifest
index 14b014d8accc..66d56691d630 100644
--- a/dev-ros/ament_cpplint/Manifest
+++ b/dev-ros/ament_cpplint/Manifest
@@ -1,6 +1,8 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
+DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
 EBUILD ament_cpplint-0.10.0.ebuild 1019 BLAKE2B 45dfe10090b96ac0d7ed70acc6588c4b2afe9e165669e2a7976c6539d3659ce5d50d1ee1b5d77dc6d83aa39d9b78b530a48a83f64fc92117c97d89c1eb48b1ec SHA512 4ed1572ff1163d907fa8be47cb077746c67aa95b187ab67a0bf8b81e5e08201c0f4d2d423cdd8be735dae51ab8d15fc8363af08178cd2e2212eb5d78ea11c3c4
 EBUILD ament_cpplint-0.10.1.ebuild 1019 BLAKE2B 0bd671d351d7be269682c8a678bc7ba6b278cf94e67a91513ae7e03c93705f957dd82bbe213fc293d41893ee8690a9c29ca56079f986fb46897e07ff8370918b SHA512 c56cbbb4fdd2684d4e9aa706b9a8a672b0661f7af9f676256cf227f94604c2e20c88bfeb2367fd815e3e0ded07f4de58d910524ea9a348e88bbb7cea9ba8c6e2
+EBUILD ament_cpplint-0.10.4.ebuild 1019 BLAKE2B 0bd671d351d7be269682c8a678bc7ba6b278cf94e67a91513ae7e03c93705f957dd82bbe213fc293d41893ee8690a9c29ca56079f986fb46897e07ff8370918b SHA512 c56cbbb4fdd2684d4e9aa706b9a8a672b0661f7af9f676256cf227f94604c2e20c88bfeb2367fd815e3e0ded07f4de58d910524ea9a348e88bbb7cea9ba8c6e2
 EBUILD ament_cpplint-9999.ebuild 1019 BLAKE2B 45dfe10090b96ac0d7ed70acc6588c4b2afe9e165669e2a7976c6539d3659ce5d50d1ee1b5d77dc6d83aa39d9b78b530a48a83f64fc92117c97d89c1eb48b1ec SHA512 4ed1572ff1163d907fa8be47cb077746c67aa95b187ab67a0bf8b81e5e08201c0f4d2d423cdd8be735dae51ab8d15fc8363af08178cd2e2212eb5d78ea11c3c4
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cpplint/ament_cpplint-0.10.4.ebuild b/dev-ros/ament_cpplint/ament_cpplint-0.10.4.ebuild
new file mode 100644
index 000000000000..ad815d52a35a
--- /dev/null
+++ b/dev-ros/ament_cpplint/ament_cpplint-0.10.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to check code against the Google style conventions using cpplint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_copyright[${PYTHON_USEDEP}]
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_flake8/Manifest b/dev-ros/ament_flake8/Manifest
index 874d40ff25f4..c12c5cd85448 100644
--- a/dev-ros/ament_flake8/Manifest
+++ b/dev-ros/ament_flake8/Manifest
@@ -1,6 +1,8 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
+DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
 EBUILD ament_flake8-0.10.0.ebuild 962 BLAKE2B 39349805a37c58370a468a1b92eaf70992de610e72149611ad4c18267fd6b59980f61d4539256e86b8fdb8c75d9ca1f32a94839f912b923023c0db60f2ffb916 SHA512 ce2f1b022641f0d40a910602fc3ca0aa637c8e24de02e725647ead52455856f5fe8c6b42fa9f06222fc1d39c11d7eb177ab9d0f28cd896f664d9e988a62c999e
 EBUILD ament_flake8-0.10.1.ebuild 962 BLAKE2B 4e1c3b0a97cfd91770bd9fa062538709507ae3b28cc90306ac587db3397a3cb34ddc82e31d3da2abd4761780b8768fd06bbab6658aebb059451d5e8f20cce817 SHA512 8670e519924e3d850d3c291a918bdfd73312fe0c398c39c643109afbdb7ffb075546c017fd5029eb7c3fa6813dc5ea441e8c983382ee88b4ab235f436366c9be
+EBUILD ament_flake8-0.10.4.ebuild 962 BLAKE2B 4e1c3b0a97cfd91770bd9fa062538709507ae3b28cc90306ac587db3397a3cb34ddc82e31d3da2abd4761780b8768fd06bbab6658aebb059451d5e8f20cce817 SHA512 8670e519924e3d850d3c291a918bdfd73312fe0c398c39c643109afbdb7ffb075546c017fd5029eb7c3fa6813dc5ea441e8c983382ee88b4ab235f436366c9be
 EBUILD ament_flake8-9999.ebuild 962 BLAKE2B 39349805a37c58370a468a1b92eaf70992de610e72149611ad4c18267fd6b59980f61d4539256e86b8fdb8c75d9ca1f32a94839f912b923023c0db60f2ffb916 SHA512 ce2f1b022641f0d40a910602fc3ca0aa637c8e24de02e725647ead52455856f5fe8c6b42fa9f06222fc1d39c11d7eb177ab9d0f28cd896f664d9e988a62c999e
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_flake8/ament_flake8-0.10.4.ebuild b/dev-ros/ament_flake8/ament_flake8-0.10.4.ebuild
new file mode 100644
index 000000000000..c7e56408c4d7
--- /dev/null
+++ b/dev-ros/ament_flake8/ament_flake8-0.10.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to check code for style and syntax conventions with flake8"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint[${PYTHON_USEDEP}]
+	dev-python/flake8[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint/Manifest b/dev-ros/ament_lint/Manifest
index 79bce8350951..0f895a91460e 100644
--- a/dev-ros/ament_lint/Manifest
+++ b/dev-ros/ament_lint/Manifest
@@ -1,8 +1,10 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
+DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_lint-0.10.0.ebuild 733 BLAKE2B 764ac08267e0737a3c717b5eea930960d996d975e7d40578ca8f6c7851a46d4bf2bba15b51bb27ebfe89d523474900907624d9f65a76f8c4860585301e2d21b8 SHA512 c6ea00f77d3f948a79bcdd9c1bbcfdf579faf72bafa668f8babc507583b6fb6231f43ac2414ac1cf69ae712ada12650930a5829ff9ab7a8f73609527aa2132c7
 EBUILD ament_lint-0.10.1.ebuild 733 BLAKE2B 11c14f50aa849e91ce9c0b9e917fff9911914dd3b150e780ce838c3c9e89cafae7b7675f0d4025200768d7e24e11fc3835af618134ce03263dadc2ff67a0518c SHA512 3ff0b8b58a5c7a0e4db70f15567ecca43a9c3bd5efa9f1f6ad59c1ee59b486d1b25b79ccb192eb3656e7fa1dfeab811909ddc1715ffcf70e74d848e481594649
+EBUILD ament_lint-0.10.4.ebuild 733 BLAKE2B 11c14f50aa849e91ce9c0b9e917fff9911914dd3b150e780ce838c3c9e89cafae7b7675f0d4025200768d7e24e11fc3835af618134ce03263dadc2ff67a0518c SHA512 3ff0b8b58a5c7a0e4db70f15567ecca43a9c3bd5efa9f1f6ad59c1ee59b486d1b25b79ccb192eb3656e7fa1dfeab811909ddc1715ffcf70e74d848e481594649
 EBUILD ament_lint-0.9.5.ebuild 733 BLAKE2B 764ac08267e0737a3c717b5eea930960d996d975e7d40578ca8f6c7851a46d4bf2bba15b51bb27ebfe89d523474900907624d9f65a76f8c4860585301e2d21b8 SHA512 c6ea00f77d3f948a79bcdd9c1bbcfdf579faf72bafa668f8babc507583b6fb6231f43ac2414ac1cf69ae712ada12650930a5829ff9ab7a8f73609527aa2132c7
 EBUILD ament_lint-9999.ebuild 733 BLAKE2B 764ac08267e0737a3c717b5eea930960d996d975e7d40578ca8f6c7851a46d4bf2bba15b51bb27ebfe89d523474900907624d9f65a76f8c4860585301e2d21b8 SHA512 c6ea00f77d3f948a79bcdd9c1bbcfdf579faf72bafa668f8babc507583b6fb6231f43ac2414ac1cf69ae712ada12650930a5829ff9ab7a8f73609527aa2132c7
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_lint/ament_lint-0.10.4.ebuild b/dev-ros/ament_lint/ament_lint-0.10.4.ebuild
new file mode 100644
index 000000000000..0b5c8657415c
--- /dev/null
+++ b/dev-ros/ament_lint/ament_lint-0.10.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Common API for ament linter packages"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+BDEPEND=""
diff --git a/dev-ros/ament_lint_auto/Manifest b/dev-ros/ament_lint_auto/Manifest
index 41ab2cdc8b6f..64c3c8e9a1a2 100644
--- a/dev-ros/ament_lint_auto/Manifest
+++ b/dev-ros/ament_lint_auto/Manifest
@@ -1,8 +1,10 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
+DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_lint_auto-0.10.0.ebuild 1168 BLAKE2B 5754583dfa59136cc22076c91afe0cc51db13ff8229faeed5ca4a925fb4d03bed8c89d4bd2d571cec047b0f23e181144be9b148ac900fbe7ebe9bc55218aba35 SHA512 f658c63670fa711183ac76a41e53aeb90f8e3a19323983a30b4b9a60c8137504514cde564fecdbbd3ac92055e186ae6ef0de828df5f34b86e09cd3cbb3dc7fec
 EBUILD ament_lint_auto-0.10.1.ebuild 1168 BLAKE2B e67767c748044230e19073c88ebb3f069e7ea063974e01db8aeebb358adc0f50953061718df85f268b468aa863c04b1d9f1de2859e378b6bafad9585800c6b09 SHA512 86500f1dcdb9c1687513e65e589797e5b36350075adf09a86d318ad9948a31c8b2fec00b63374b1d975d0387c0da5f6de8985db901d23e99d1a90f4fa0cff00c
+EBUILD ament_lint_auto-0.10.4.ebuild 1168 BLAKE2B e67767c748044230e19073c88ebb3f069e7ea063974e01db8aeebb358adc0f50953061718df85f268b468aa863c04b1d9f1de2859e378b6bafad9585800c6b09 SHA512 86500f1dcdb9c1687513e65e589797e5b36350075adf09a86d318ad9948a31c8b2fec00b63374b1d975d0387c0da5f6de8985db901d23e99d1a90f4fa0cff00c
 EBUILD ament_lint_auto-0.9.5.ebuild 1168 BLAKE2B 5754583dfa59136cc22076c91afe0cc51db13ff8229faeed5ca4a925fb4d03bed8c89d4bd2d571cec047b0f23e181144be9b148ac900fbe7ebe9bc55218aba35 SHA512 f658c63670fa711183ac76a41e53aeb90f8e3a19323983a30b4b9a60c8137504514cde564fecdbbd3ac92055e186ae6ef0de828df5f34b86e09cd3cbb3dc7fec
 EBUILD ament_lint_auto-9999.ebuild 1168 BLAKE2B 5754583dfa59136cc22076c91afe0cc51db13ff8229faeed5ca4a925fb4d03bed8c89d4bd2d571cec047b0f23e181144be9b148ac900fbe7ebe9bc55218aba35 SHA512 f658c63670fa711183ac76a41e53aeb90f8e3a19323983a30b4b9a60c8137504514cde564fecdbbd3ac92055e186ae6ef0de828df5f34b86e09cd3cbb3dc7fec
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_lint_auto/ament_lint_auto-0.10.4.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-0.10.4.ebuild
new file mode 100644
index 000000000000..e28b382d25f1
--- /dev/null
+++ b/dev-ros/ament_lint_auto/ament_lint_auto-0.10.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The auto-magic functions for ease to use of the ament linters"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_test
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_lint_cmake/Manifest b/dev-ros/ament_lint_cmake/Manifest
index 4426400cbfdf..f74c6bb6d87f 100644
--- a/dev-ros/ament_lint_cmake/Manifest
+++ b/dev-ros/ament_lint_cmake/Manifest
@@ -1,6 +1,8 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
+DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
 EBUILD ament_lint_cmake-0.10.0.ebuild 1011 BLAKE2B b1ad74b8e17ea1b5f886ef742e46d174693fa4714ba221f56e0f60cfeeb08117b17d7c8477de5386d745f3acb212e76cbf0e23f7af25631a1931a7216fe0e1ef SHA512 a6a14cdfd85cbd963431911796408d321c9c854dd7feb199045813ef53f917386f8dcb5dfdcf59d0cf5f83743a4442c7fdb7a9a9d2e24f0b11adc167efb4137e
 EBUILD ament_lint_cmake-0.10.1.ebuild 1011 BLAKE2B 311b2e96057f3400d1299e625c304f3796c299b348ee9a6ce85e50fcead38afe231c0038543ee892cbd5ffea5d3732bc2e5555d2ac7d880f4d39fc4f2c1e4593 SHA512 6fd943f7ad4a21c0f4c238a2dd5598f9c2ac6811b554595eff147467f5d67a99efb22a7e3aa9a68d39d75a9e006b33c95f9e47b6d2b3b359c9e490f95ae740ce
+EBUILD ament_lint_cmake-0.10.4.ebuild 1011 BLAKE2B 311b2e96057f3400d1299e625c304f3796c299b348ee9a6ce85e50fcead38afe231c0038543ee892cbd5ffea5d3732bc2e5555d2ac7d880f4d39fc4f2c1e4593 SHA512 6fd943f7ad4a21c0f4c238a2dd5598f9c2ac6811b554595eff147467f5d67a99efb22a7e3aa9a68d39d75a9e006b33c95f9e47b6d2b3b359c9e490f95ae740ce
 EBUILD ament_lint_cmake-9999.ebuild 1011 BLAKE2B b1ad74b8e17ea1b5f886ef742e46d174693fa4714ba221f56e0f60cfeeb08117b17d7c8477de5386d745f3acb212e76cbf0e23f7af25631a1931a7216fe0e1ef SHA512 a6a14cdfd85cbd963431911796408d321c9c854dd7feb199045813ef53f917386f8dcb5dfdcf59d0cf5f83743a4442c7fdb7a9a9d2e24f0b11adc167efb4137e
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_lint_cmake/ament_lint_cmake-0.10.4.ebuild b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.10.4.ebuild
new file mode 100644
index 000000000000..7eb72a8a75a3
--- /dev/null
+++ b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.10.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Lint CMake code using cmakelint and generate xUnit test result files"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-ros/ament_copyright[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_pep257/Manifest b/dev-ros/ament_pep257/Manifest
index 5f21f12db00f..3bc59f5e8938 100644
--- a/dev-ros/ament_pep257/Manifest
+++ b/dev-ros/ament_pep257/Manifest
@@ -1,6 +1,8 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
+DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
 EBUILD ament_pep257-0.10.0.ebuild 1014 BLAKE2B 5a81703962a92ac21544e12395287773fe970456841c1042ef2d655dc4597d86240a990ae322e3406026dd5f921776ef2e310699f7daf92ae402af9b24f01822 SHA512 ff765b32ff0a7e4ec81a55b9590cd66841daafbee029d62343281ef1ecc9887e5ad963fe2f7a51fad838a881fa42463b574e6923385b3dfc8b9d6859e213834d
 EBUILD ament_pep257-0.10.1.ebuild 1014 BLAKE2B 8f4b833434ab1bb56b7920298b1631678fcc906c03164b5a6768c3926f832c401d30394a245cea458a641d5c0549f3d6dcdbfd3728e4d0a3ef247fe67632018a SHA512 8782acb7ad825140abd83f6f674066cb7225dd7166ae6617b33c9edef65258a21f459e7cfe149b8bddb2696f78ccf0af19e6066c3719f0eb7c32e938b18b2830
+EBUILD ament_pep257-0.10.4.ebuild 1014 BLAKE2B 8f4b833434ab1bb56b7920298b1631678fcc906c03164b5a6768c3926f832c401d30394a245cea458a641d5c0549f3d6dcdbfd3728e4d0a3ef247fe67632018a SHA512 8782acb7ad825140abd83f6f674066cb7225dd7166ae6617b33c9edef65258a21f459e7cfe149b8bddb2696f78ccf0af19e6066c3719f0eb7c32e938b18b2830
 EBUILD ament_pep257-9999.ebuild 1014 BLAKE2B 5a81703962a92ac21544e12395287773fe970456841c1042ef2d655dc4597d86240a990ae322e3406026dd5f921776ef2e310699f7daf92ae402af9b24f01822 SHA512 ff765b32ff0a7e4ec81a55b9590cd66841daafbee029d62343281ef1ecc9887e5ad963fe2f7a51fad838a881fa42463b574e6923385b3dfc8b9d6859e213834d
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_pep257/ament_pep257-0.10.4.ebuild b/dev-ros/ament_pep257/ament_pep257-0.10.4.ebuild
new file mode 100644
index 000000000000..08b1b6af9f30
--- /dev/null
+++ b/dev-ros/ament_pep257/ament_pep257-0.10.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Checks code against style conventions in PEP 8 and generate test result files"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint[${PYTHON_USEDEP}]
+	dev-python/pydocstyle[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_uncrustify/Manifest b/dev-ros/ament_uncrustify/Manifest
index a27ccc30e5a5..64cd4f266499 100644
--- a/dev-ros/ament_uncrustify/Manifest
+++ b/dev-ros/ament_uncrustify/Manifest
@@ -1,6 +1,8 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
+DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
 EBUILD ament_uncrustify-0.10.0.ebuild 810 BLAKE2B 787273df2df17c7ab6669d41b03ac4af946e19ab82ac97d151a64f8ae5ebe4cacc5412e52ec230931dcc0c9447f75be645c2ec29285c5f51deb4eeddc4e90c80 SHA512 32b7290e38432c311e67f9721b7f5916179c04f955f35c958d82eb23c15d9aa4280af3755134113a18fb25a19a44baf41a5c76bea074dde37fcdd3cbddd58645
 EBUILD ament_uncrustify-0.10.1.ebuild 810 BLAKE2B feec1feafbe565d7f6da7b29b451d943617481b231b3ed7cd6261a0e362bc2ead74b586c8698d57a80dea23026c36b30db946f904f595b0af9b7d4934206ac2f SHA512 10e69b0263da0e88bc29324cacf4fe0430be35836afea9edf81b64f1ef60597a66965d0aca23e8c6e7ba38b838ba1c1c6730900fcb802f111881d99544fdbaf7
+EBUILD ament_uncrustify-0.10.4.ebuild 810 BLAKE2B feec1feafbe565d7f6da7b29b451d943617481b231b3ed7cd6261a0e362bc2ead74b586c8698d57a80dea23026c36b30db946f904f595b0af9b7d4934206ac2f SHA512 10e69b0263da0e88bc29324cacf4fe0430be35836afea9edf81b64f1ef60597a66965d0aca23e8c6e7ba38b838ba1c1c6730900fcb802f111881d99544fdbaf7
 EBUILD ament_uncrustify-9999.ebuild 810 BLAKE2B 787273df2df17c7ab6669d41b03ac4af946e19ab82ac97d151a64f8ae5ebe4cacc5412e52ec230931dcc0c9447f75be645c2ec29285c5f51deb4eeddc4e90c80 SHA512 32b7290e38432c311e67f9721b7f5916179c04f955f35c958d82eb23c15d9aa4280af3755134113a18fb25a19a44baf41a5c76bea074dde37fcdd3cbddd58645
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-0.10.4.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-0.10.4.ebuild
new file mode 100644
index 000000000000..016aff416aad
--- /dev/null
+++ b/dev-ros/ament_uncrustify/ament_uncrustify-0.10.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to check code against style conventions using uncrustify"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-util/uncrustify
+"
+DEPEND=""
+BDEPEND=""
diff --git a/dev-ros/ament_xmllint/Manifest b/dev-ros/ament_xmllint/Manifest
index 7717708fcb48..a9f116ffbe34 100644
--- a/dev-ros/ament_xmllint/Manifest
+++ b/dev-ros/ament_xmllint/Manifest
@@ -1,6 +1,8 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
+DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
 EBUILD ament_xmllint-0.10.0.ebuild 1080 BLAKE2B c86fcc87bf6e04549e993e5503e50f7f373a26d55333cda855ebe8ad0b74f0d28fcb39db983ae39512ad21a58f877874af74d32ee95329a7fc0c07d4fc330595 SHA512 500020a2efba6390399b1d769cd9d7ed374ac0f246820478ea865984c740e1baa25f52da3795bea9d326b5b2d8f7af9fa097b5e0f3eff8ddf87423925f2418f2
 EBUILD ament_xmllint-0.10.1.ebuild 1080 BLAKE2B 43c6b1dbb4ca5b5fc4eb4998079e32adc8b422c105f4a3af99d4079d2e0f2a13cb50c7a9a14f00d41520ead3237d57c6519da97e11f9ddcedde5d5640678ccbb SHA512 a475cede669417bc62435e0bde392a070cef3cd8552c63d3cf5df19c2321396ab129f3d8f84a819a1e995e9ffe0fff693fbbd3d3b4a86dd0b567bb8d7aea8c4d
+EBUILD ament_xmllint-0.10.4.ebuild 1080 BLAKE2B 43c6b1dbb4ca5b5fc4eb4998079e32adc8b422c105f4a3af99d4079d2e0f2a13cb50c7a9a14f00d41520ead3237d57c6519da97e11f9ddcedde5d5640678ccbb SHA512 a475cede669417bc62435e0bde392a070cef3cd8552c63d3cf5df19c2321396ab129f3d8f84a819a1e995e9ffe0fff693fbbd3d3b4a86dd0b567bb8d7aea8c4d
 EBUILD ament_xmllint-9999.ebuild 1080 BLAKE2B c86fcc87bf6e04549e993e5503e50f7f373a26d55333cda855ebe8ad0b74f0d28fcb39db983ae39512ad21a58f877874af74d32ee95329a7fc0c07d4fc330595 SHA512 500020a2efba6390399b1d769cd9d7ed374ac0f246820478ea865984c740e1baa25f52da3795bea9d326b5b2d8f7af9fa097b5e0f3eff8ddf87423925f2418f2
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_xmllint/ament_xmllint-0.10.4.ebuild b/dev-ros/ament_xmllint/ament_xmllint-0.10.4.ebuild
new file mode 100644
index 000000000000..36ebcfc004b0
--- /dev/null
+++ b/dev-ros/ament_xmllint/ament_xmllint-0.10.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Checks XML files like the package manifest using xmllint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint[${PYTHON_USEDEP}]
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_copyright[${PYTHON_USEDEP}]
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/controller_manager/Manifest b/dev-ros/controller_manager/Manifest
index a89e7ff8be4b..771938bdb745 100644
--- a/dev-ros/controller_manager/Manifest
+++ b/dev-ros/controller_manager/Manifest
@@ -1,10 +1,4 @@
-DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
-DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
-DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
 DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
-EBUILD controller_manager-0.19.1.ebuild 911 BLAKE2B e7289f33666ce614e3f20dffb0a2b73a425deea39a818168e290c97c64b06243430c4a55c65096188cbf81f42cbd1a2dad14492cb673a5c93fab1e7df3a4e2de SHA512 a452d8ed7ffcf8d5bce4176841cde2d336317817a61c8d7eda815e74c25752631bf050f9b243e973cc4bf3171219efad6bc5dd2a85593ebfbeecdba0fac41162
-EBUILD controller_manager-0.19.2.ebuild 911 BLAKE2B e7289f33666ce614e3f20dffb0a2b73a425deea39a818168e290c97c64b06243430c4a55c65096188cbf81f42cbd1a2dad14492cb673a5c93fab1e7df3a4e2de SHA512 a452d8ed7ffcf8d5bce4176841cde2d336317817a61c8d7eda815e74c25752631bf050f9b243e973cc4bf3171219efad6bc5dd2a85593ebfbeecdba0fac41162
-EBUILD controller_manager-0.19.3.ebuild 911 BLAKE2B e7289f33666ce614e3f20dffb0a2b73a425deea39a818168e290c97c64b06243430c4a55c65096188cbf81f42cbd1a2dad14492cb673a5c93fab1e7df3a4e2de SHA512 a452d8ed7ffcf8d5bce4176841cde2d336317817a61c8d7eda815e74c25752631bf050f9b243e973cc4bf3171219efad6bc5dd2a85593ebfbeecdba0fac41162
-EBUILD controller_manager-0.19.4.ebuild 911 BLAKE2B 1c24efd8c358c1f0c76302a0703655f46cf0b81b766ba719ac39f3aeb97a27d6ef62026c43d53fb914405df8482572db56ff0715cb67be9acf44a3d90b2b7bd0 SHA512 22ce81507a1eaf97f8c567456835898b95005bf2dc386d7f083c8dac7425e01a37a89066e4a5f36bf01eda6bbd45ca8355b6bf9609e9b0c21bd9fecf56d52c4d
-EBUILD controller_manager-9999.ebuild 911 BLAKE2B e7289f33666ce614e3f20dffb0a2b73a425deea39a818168e290c97c64b06243430c4a55c65096188cbf81f42cbd1a2dad14492cb673a5c93fab1e7df3a4e2de SHA512 a452d8ed7ffcf8d5bce4176841cde2d336317817a61c8d7eda815e74c25752631bf050f9b243e973cc4bf3171219efad6bc5dd2a85593ebfbeecdba0fac41162
+EBUILD controller_manager-0.19.4.ebuild 1000 BLAKE2B 6f8af83ea608426623327158f2508acfd7d46d38cf9cc92ceecb5d55001baf86d0d5b557cb8683bf53f1819e7ec4a6f4182382c05dc26aabbf4a48e35d5ef957 SHA512 deadf61be20441ff1685fc221b88b24e19fc0112f2be1178a5035b31c70530c64aac4db5ee24383a57131d81e7e4f2cc338ff085e588b43f84e24367a9b08308
+EBUILD controller_manager-9999.ebuild 1000 BLAKE2B 6f8af83ea608426623327158f2508acfd7d46d38cf9cc92ceecb5d55001baf86d0d5b557cb8683bf53f1819e7ec4a6f4182382c05dc26aabbf4a48e35d5ef957 SHA512 deadf61be20441ff1685fc221b88b24e19fc0112f2be1178a5035b31c70530c64aac4db5ee24383a57131d81e7e4f2cc338ff085e588b43f84e24367a9b08308
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager/controller_manager-0.19.1.ebuild b/dev-ros/controller_manager/controller_manager-0.19.1.ebuild
deleted file mode 100644
index 56fe44573d05..000000000000
--- a/dev-ros/controller_manager/controller_manager-0.19.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="The controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/controller_interface-0.15
-	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	>=dev-ros/hardware_interface-0.10.0
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
diff --git a/dev-ros/controller_manager/controller_manager-0.19.2.ebuild b/dev-ros/controller_manager/controller_manager-0.19.2.ebuild
deleted file mode 100644
index 56fe44573d05..000000000000
--- a/dev-ros/controller_manager/controller_manager-0.19.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="The controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/controller_interface-0.15
-	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	>=dev-ros/hardware_interface-0.10.0
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
diff --git a/dev-ros/controller_manager/controller_manager-0.19.3.ebuild b/dev-ros/controller_manager/controller_manager-0.19.3.ebuild
deleted file mode 100644
index 56fe44573d05..000000000000
--- a/dev-ros/controller_manager/controller_manager-0.19.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="The controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/controller_interface-0.15
-	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	>=dev-ros/hardware_interface-0.10.0
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-	)"
diff --git a/dev-ros/controller_manager/controller_manager-0.19.4.ebuild b/dev-ros/controller_manager/controller_manager-0.19.4.ebuild
index e52c6efc4187..e039c57a8218 100644
--- a/dev-ros/controller_manager/controller_manager-0.19.4.ebuild
+++ b/dev-ros/controller_manager/controller_manager-0.19.4.ebuild
@@ -33,3 +33,8 @@ DEPEND="${RDEPEND}
 		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 		dev-cpp/gtest
 	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/controller_manager/controller_manager-9999.ebuild b/dev-ros/controller_manager/controller_manager-9999.ebuild
index 56fe44573d05..e039c57a8218 100644
--- a/dev-ros/controller_manager/controller_manager-9999.ebuild
+++ b/dev-ros/controller_manager/controller_manager-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,3 +33,8 @@ DEPEND="${RDEPEND}
 		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 		dev-cpp/gtest
 	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/diagnostic_aggregator/Manifest b/dev-ros/diagnostic_aggregator/Manifest
index 9b4c74504e3b..5d6ec0d428dc 100644
--- a/dev-ros/diagnostic_aggregator/Manifest
+++ b/dev-ros/diagnostic_aggregator/Manifest
@@ -1,8 +1,10 @@
 DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
 DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
+DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
 EBUILD diagnostic_aggregator-1.10.1.ebuild 808 BLAKE2B 549d495f4cb67958720e274ec39f9ea59145422c12135d6f2b27cb575d40f4a373ee8b5bf8c9e8f95de874795fed4cb33bf3e8b1cd5e05948240bb9940dba198 SHA512 9338038171485e43c1fb6a74dc1dbbd085b753811ae9097ab0ccd12c6a49f602a439fa8ed70ab38df43e5c0f1f966041afefdbb4400a544aaf9a212aa4fc748a
 EBUILD diagnostic_aggregator-1.10.2.ebuild 808 BLAKE2B 549d495f4cb67958720e274ec39f9ea59145422c12135d6f2b27cb575d40f4a373ee8b5bf8c9e8f95de874795fed4cb33bf3e8b1cd5e05948240bb9940dba198 SHA512 9338038171485e43c1fb6a74dc1dbbd085b753811ae9097ab0ccd12c6a49f602a439fa8ed70ab38df43e5c0f1f966041afefdbb4400a544aaf9a212aa4fc748a
 EBUILD diagnostic_aggregator-1.10.3.ebuild 808 BLAKE2B 9892664dec34c98ee9854d5301804e592aa68e6c72d2cc74e6313f9d76af04cf1b626e34c622a6c7c1b756b6090706d69abf0b5eaa2d3b08e0f05286dd3b0d0b SHA512 85ab8ee8c9ade277b7a8db461e8f8e8830f6f2c4dfcf597ce063858d40f44f06be6dfb01d4883ed4b3a12403f68fc5923ffb4c4ec3f51e82bcf4eb2832144b60
+EBUILD diagnostic_aggregator-1.10.4.ebuild 808 BLAKE2B 9892664dec34c98ee9854d5301804e592aa68e6c72d2cc74e6313f9d76af04cf1b626e34c622a6c7c1b756b6090706d69abf0b5eaa2d3b08e0f05286dd3b0d0b SHA512 85ab8ee8c9ade277b7a8db461e8f8e8830f6f2c4dfcf597ce063858d40f44f06be6dfb01d4883ed4b3a12403f68fc5923ffb4c4ec3f51e82bcf4eb2832144b60
 EBUILD diagnostic_aggregator-9999.ebuild 808 BLAKE2B 549d495f4cb67958720e274ec39f9ea59145422c12135d6f2b27cb575d40f4a373ee8b5bf8c9e8f95de874795fed4cb33bf3e8b1cd5e05948240bb9940dba198 SHA512 9338038171485e43c1fb6a74dc1dbbd085b753811ae9097ab0ccd12c6a49f602a439fa8ed70ab38df43e5c0f1f966041afefdbb4400a544aaf9a212aa4fc748a
 MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.4.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.4.ebuild
new file mode 100644
index 000000000000..b43991e89535
--- /dev/null
+++ b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.4.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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Aggregates ROS diagnostics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/pluginlib:=
+		dev-libs/tinyxml2:=
+	dev-ros/roscpp
+	dev-ros/rospy
+	dev-ros/rostest
+	dev-ros/xmlrpcpp
+	dev-ros/bondcpp
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+	dev-ros/bondpy[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
+
+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/diagnostic_analysis/Manifest b/dev-ros/diagnostic_analysis/Manifest
index f954158da77c..960fdb3b5ef6 100644
--- a/dev-ros/diagnostic_analysis/Manifest
+++ b/dev-ros/diagnostic_analysis/Manifest
@@ -1,11 +1,13 @@
 DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
 DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
+DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
 DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
 DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
 EBUILD diagnostic_analysis-1.10.1.ebuild 697 BLAKE2B 12c2797a9981fb9ff82e1e9a9192818a3b4e57237ec274b9908bb19072397b406a2b134074e575e6efd67f40b2159e0ae920a321d84077bf201f403eb8c22ae1 SHA512 6e00030de3792523a6062d4f8f2d9e88681e2e64c026ee15df8646c74d80e746b67b3ca3c0d81ad9946c8e3aafc0ffadbfc6a43a1cadd6d88c8abd36255da778
 EBUILD diagnostic_analysis-1.10.2.ebuild 697 BLAKE2B 12c2797a9981fb9ff82e1e9a9192818a3b4e57237ec274b9908bb19072397b406a2b134074e575e6efd67f40b2159e0ae920a321d84077bf201f403eb8c22ae1 SHA512 6e00030de3792523a6062d4f8f2d9e88681e2e64c026ee15df8646c74d80e746b67b3ca3c0d81ad9946c8e3aafc0ffadbfc6a43a1cadd6d88c8abd36255da778
 EBUILD diagnostic_analysis-1.10.3.ebuild 697 BLAKE2B e8b0db107fec8a77be9bcf76c39fdb2b0a5ea89879c5493bb43cc5a99d93f6bf2c6ad5ab67109f437612ad8fd441c2dd479c44a8b7fc3704b7e613871b43485a SHA512 5b1020bf88de8122ba476e004a3ea13593f12f8aac51022defda9eb7055537696017c820e78b4273e5a271c8466f2a40ac497df207c3dc49bbd9f017e3278f40
+EBUILD diagnostic_analysis-1.10.4.ebuild 697 BLAKE2B e8b0db107fec8a77be9bcf76c39fdb2b0a5ea89879c5493bb43cc5a99d93f6bf2c6ad5ab67109f437612ad8fd441c2dd479c44a8b7fc3704b7e613871b43485a SHA512 5b1020bf88de8122ba476e004a3ea13593f12f8aac51022defda9eb7055537696017c820e78b4273e5a271c8466f2a40ac497df207c3dc49bbd9f017e3278f40
 EBUILD diagnostic_analysis-1.9.4.ebuild 697 BLAKE2B 12c2797a9981fb9ff82e1e9a9192818a3b4e57237ec274b9908bb19072397b406a2b134074e575e6efd67f40b2159e0ae920a321d84077bf201f403eb8c22ae1 SHA512 6e00030de3792523a6062d4f8f2d9e88681e2e64c026ee15df8646c74d80e746b67b3ca3c0d81ad9946c8e3aafc0ffadbfc6a43a1cadd6d88c8abd36255da778
 EBUILD diagnostic_analysis-1.9.6.ebuild 697 BLAKE2B 12c2797a9981fb9ff82e1e9a9192818a3b4e57237ec274b9908bb19072397b406a2b134074e575e6efd67f40b2159e0ae920a321d84077bf201f403eb8c22ae1 SHA512 6e00030de3792523a6062d4f8f2d9e88681e2e64c026ee15df8646c74d80e746b67b3ca3c0d81ad9946c8e3aafc0ffadbfc6a43a1cadd6d88c8abd36255da778
 EBUILD diagnostic_analysis-9999.ebuild 697 BLAKE2B 12c2797a9981fb9ff82e1e9a9192818a3b4e57237ec274b9908bb19072397b406a2b134074e575e6efd67f40b2159e0ae920a321d84077bf201f403eb8c22ae1 SHA512 6e00030de3792523a6062d4f8f2d9e88681e2e64c026ee15df8646c74d80e746b67b3ca3c0d81ad9946c8e3aafc0ffadbfc6a43a1cadd6d88c8abd36255da778
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.4.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.4.ebuild
new file mode 100644
index 000000000000..b96b519a3ed1
--- /dev/null
+++ b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.4.ebuild
@@ -0,0 +1,28 @@
+# 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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Converts diagnostics data into a series of CSV files"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( $(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/diagnostic_common_diagnostics/Manifest b/dev-ros/diagnostic_common_diagnostics/Manifest
index 068652a238b9..6e4c451be8c8 100644
--- a/dev-ros/diagnostic_common_diagnostics/Manifest
+++ b/dev-ros/diagnostic_common_diagnostics/Manifest
@@ -1,11 +1,13 @@
 DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
 DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
+DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
 DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
 DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
 EBUILD diagnostic_common_diagnostics-1.10.1.ebuild 734 BLAKE2B f118826a52ccc510ee9643d6e9ced491271b0b102ed8de211de00e52c1c18af1d1b9e5ab112a98393981cfca26b64f497b25c69c03bad024d2db7bcd351f11b5 SHA512 7f6ad0a636ca21123fac04a084786f5dcc0e9286dcd3a1b62b957adebebb66dfbac78f39c143ca981473ae96d94a591c1bb427bd977e0de5446ff2b0b8c6afc4
 EBUILD diagnostic_common_diagnostics-1.10.2.ebuild 734 BLAKE2B f118826a52ccc510ee9643d6e9ced491271b0b102ed8de211de00e52c1c18af1d1b9e5ab112a98393981cfca26b64f497b25c69c03bad024d2db7bcd351f11b5 SHA512 7f6ad0a636ca21123fac04a084786f5dcc0e9286dcd3a1b62b957adebebb66dfbac78f39c143ca981473ae96d94a591c1bb427bd977e0de5446ff2b0b8c6afc4
 EBUILD diagnostic_common_diagnostics-1.10.3.ebuild 734 BLAKE2B 6f17888cc4985fd26a841725f08fbb6b3e8be96aef218a1278b19f963f6010e1b6bb8ca689a244999b41794fffc3592a0c53c29b032b1cb95aa2ee0fef5b58b0 SHA512 75e937609d08c2390b3943d9fa32029ab1afec87d01881134adab7617f7a92fa30cd0c609e9ae02568e3e2b1c4249ddc85baf3afb4c14a497cff652b56cabcdb
+EBUILD diagnostic_common_diagnostics-1.10.4.ebuild 734 BLAKE2B 6f17888cc4985fd26a841725f08fbb6b3e8be96aef218a1278b19f963f6010e1b6bb8ca689a244999b41794fffc3592a0c53c29b032b1cb95aa2ee0fef5b58b0 SHA512 75e937609d08c2390b3943d9fa32029ab1afec87d01881134adab7617f7a92fa30cd0c609e9ae02568e3e2b1c4249ddc85baf3afb4c14a497cff652b56cabcdb
 EBUILD diagnostic_common_diagnostics-1.9.4.ebuild 734 BLAKE2B f118826a52ccc510ee9643d6e9ced491271b0b102ed8de211de00e52c1c18af1d1b9e5ab112a98393981cfca26b64f497b25c69c03bad024d2db7bcd351f11b5 SHA512 7f6ad0a636ca21123fac04a084786f5dcc0e9286dcd3a1b62b957adebebb66dfbac78f39c143ca981473ae96d94a591c1bb427bd977e0de5446ff2b0b8c6afc4
 EBUILD diagnostic_common_diagnostics-1.9.6.ebuild 734 BLAKE2B f118826a52ccc510ee9643d6e9ced491271b0b102ed8de211de00e52c1c18af1d1b9e5ab112a98393981cfca26b64f497b25c69c03bad024d2db7bcd351f11b5 SHA512 7f6ad0a636ca21123fac04a084786f5dcc0e9286dcd3a1b62b957adebebb66dfbac78f39c143ca981473ae96d94a591c1bb427bd977e0de5446ff2b0b8c6afc4
 EBUILD diagnostic_common_diagnostics-9999.ebuild 734 BLAKE2B f118826a52ccc510ee9643d6e9ced491271b0b102ed8de211de00e52c1c18af1d1b9e5ab112a98393981cfca26b64f497b25c69c03bad024d2db7bcd351f11b5 SHA512 7f6ad0a636ca21123fac04a084786f5dcc0e9286dcd3a1b62b957adebebb66dfbac78f39c143ca981473ae96d94a591c1bb427bd977e0de5446ff2b0b8c6afc4
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.10.4.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.10.4.ebuild
new file mode 100644
index 000000000000..6c5a6781f6eb
--- /dev/null
+++ b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.10.4.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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Generic nodes for monitoring a linux host"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-ros/diagnostic_updater[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
+	app-admin/hddtemp"
+DEPEND="${DEPEND}
+	test? (
+		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	)
+"
diff --git a/dev-ros/diagnostic_updater/Manifest b/dev-ros/diagnostic_updater/Manifest
index 11c5dabcc7ab..d66d5090d7e2 100644
--- a/dev-ros/diagnostic_updater/Manifest
+++ b/dev-ros/diagnostic_updater/Manifest
@@ -1,11 +1,13 @@
 DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
 DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
+DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
 DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
 DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
 EBUILD diagnostic_updater-1.10.1.ebuild 804 BLAKE2B 15686a629b196137fe14c640dc28861258f65ab85cd0108b84ff02f3894128e122ab56e4d3669fa51664ce5e6b915ea717f4856be80ba695606ded59d3d255d3 SHA512 3eaf916f91a57ddc5ba05b599a5605ab3e3b45b815cad4fff386476af1ad0a0b82fad71ff60162a341fa8a64e5239ad9e41805f7f81831b5cbf79ec8067d93cc
 EBUILD diagnostic_updater-1.10.2.ebuild 804 BLAKE2B 15686a629b196137fe14c640dc28861258f65ab85cd0108b84ff02f3894128e122ab56e4d3669fa51664ce5e6b915ea717f4856be80ba695606ded59d3d255d3 SHA512 3eaf916f91a57ddc5ba05b599a5605ab3e3b45b815cad4fff386476af1ad0a0b82fad71ff60162a341fa8a64e5239ad9e41805f7f81831b5cbf79ec8067d93cc
 EBUILD diagnostic_updater-1.10.3.ebuild 804 BLAKE2B 614b2f84980c339de46fbe7cabb641b1f52c6a7bb5316045e45db5a7cddd218d3855a1b24f3f11e3ead8d52b8afb220a6b10ec467b5df200e9c9054debc9b103 SHA512 1f38b6d963c0955eed66b62407e53e377ec7a3a4d577fcd438e8868485f7696dc8055f4103c6e647a9c811343211f44c7d05ff6b552e858023ec64d368f123ad
+EBUILD diagnostic_updater-1.10.4.ebuild 804 BLAKE2B 614b2f84980c339de46fbe7cabb641b1f52c6a7bb5316045e45db5a7cddd218d3855a1b24f3f11e3ead8d52b8afb220a6b10ec467b5df200e9c9054debc9b103 SHA512 1f38b6d963c0955eed66b62407e53e377ec7a3a4d577fcd438e8868485f7696dc8055f4103c6e647a9c811343211f44c7d05ff6b552e858023ec64d368f123ad
 EBUILD diagnostic_updater-1.9.4.ebuild 804 BLAKE2B 15686a629b196137fe14c640dc28861258f65ab85cd0108b84ff02f3894128e122ab56e4d3669fa51664ce5e6b915ea717f4856be80ba695606ded59d3d255d3 SHA512 3eaf916f91a57ddc5ba05b599a5605ab3e3b45b815cad4fff386476af1ad0a0b82fad71ff60162a341fa8a64e5239ad9e41805f7f81831b5cbf79ec8067d93cc
 EBUILD diagnostic_updater-1.9.6.ebuild 804 BLAKE2B 15686a629b196137fe14c640dc28861258f65ab85cd0108b84ff02f3894128e122ab56e4d3669fa51664ce5e6b915ea717f4856be80ba695606ded59d3d255d3 SHA512 3eaf916f91a57ddc5ba05b599a5605ab3e3b45b815cad4fff386476af1ad0a0b82fad71ff60162a341fa8a64e5239ad9e41805f7f81831b5cbf79ec8067d93cc
 EBUILD diagnostic_updater-9999.ebuild 804 BLAKE2B 15686a629b196137fe14c640dc28861258f65ab85cd0108b84ff02f3894128e122ab56e4d3669fa51664ce5e6b915ea717f4856be80ba695606ded59d3d255d3 SHA512 3eaf916f91a57ddc5ba05b599a5605ab3e3b45b815cad4fff386476af1ad0a0b82fad71ff60162a341fa8a64e5239ad9e41805f7f81831b5cbf79ec8067d93cc
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.10.4.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.10.4.ebuild
new file mode 100644
index 000000000000..bf60fb838cfb
--- /dev/null
+++ b/dev-ros/diagnostic_updater/diagnostic_updater-1.10.4.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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for updating diagnostics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/driver_base/Manifest b/dev-ros/driver_base/Manifest
index 08a66796982c..467e78d1a275 100644
--- a/dev-ros/driver_base/Manifest
+++ b/dev-ros/driver_base/Manifest
@@ -1,4 +1,6 @@
 DIST driver_common-1.6.8.tar.gz 15055 BLAKE2B 2d9a4c23d65b8e2f60343f5e3b454e1cc41334d34e0246891b533f216acb743df628d95dd2c0087b06284a85e0ea872baad495a7ed7b59c03e8f8ff32eba4ed8 SHA512 b698143d08785088ac13e62f5b96676bd590a84e4ffb147fa3698be6a8ded510f648d043ecdc1d31ba7b95fb3041d06ee1a39b224c359b8612adebdba259d188
+DIST driver_common-1.6.9.tar.gz 15374 BLAKE2B 88bcba03596d9a641091d37db8329807cfa0d4dd766298a25f8e41b6da567eb246fdd8c4c8a39698b60a47a118b81b15c3ac93154490a1258d93d3e2fbd5c049 SHA512 1a5f7d261a3e754b380824256d35432cee521b7d255a7f152b6a69d5181ea45a2bbca7a7c6d4e0bea753c8f3c59018a63357c87d2535a9cb55ba311f11e5d749
 EBUILD driver_base-1.6.8.ebuild 431 BLAKE2B a1c686c72ad08b5b38eaa150994282ed95a5e8ce5498d009f3288cf82be3347d83794c7a425eb37d9b8c1ee37616e219ce4a79ba4dc247b3543ed2a95fb1759f SHA512 7023a565d9447a317b0411748bc72c1b9d918fcfc834db8a4af4f22584779c428790d648af71f75034104286faf5ca4f4697a76126c1d3b625aae4cc556fe1cb
+EBUILD driver_base-1.6.9.ebuild 431 BLAKE2B 71b0ae02523ba49bc4eb93298c29cd751aea1cef93db9373489d4591d2a06ff1774ecf1e46025fdcb07421085a09916827179b0011eddf3b09ef4e6359c22692 SHA512 72ae8613b9997c486329672ddccee5e6a76be4e5d2557c27f174cad2001debcc5914a2ccf73ec6d23aaecd8e2ef61f67088d45da11318b557eed0e216ece186f
 EBUILD driver_base-9999.ebuild 431 BLAKE2B a1c686c72ad08b5b38eaa150994282ed95a5e8ce5498d009f3288cf82be3347d83794c7a425eb37d9b8c1ee37616e219ce4a79ba4dc247b3543ed2a95fb1759f SHA512 7023a565d9447a317b0411748bc72c1b9d918fcfc834db8a4af4f22584779c428790d648af71f75034104286faf5ca4f4697a76126c1d3b625aae4cc556fe1cb
 MISC metadata.xml 339 BLAKE2B 71ed9f79df6d8528f3d967c077f1d01e0290573400356e3749bd24254281651f09507894d2ca4029b8b8a77b51d31d080d9560d9995d3d9fde848f0d71ec083d SHA512 e24ff4ef526475ad5bff434350abb00afccb4c101ab624ee056c1502719d15ec4889eff9170c534af62ba8719bd5fe4f3cf206353244f56e486a29afea53ee7b
diff --git a/dev-ros/driver_base/driver_base-1.6.9.ebuild b/dev-ros/driver_base/driver_base-1.6.9.ebuild
new file mode 100644
index 000000000000..1931a276ceea
--- /dev/null
+++ b/dev-ros/driver_base/driver_base-1.6.9.ebuild
@@ -0,0 +1,19 @@
+# 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-drivers/driver_common"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Framework for writing drivers"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/boost:="
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gmapping/Manifest b/dev-ros/gmapping/Manifest
index 5a93b29e55cb..cf4de21650df 100644
--- a/dev-ros/gmapping/Manifest
+++ b/dev-ros/gmapping/Manifest
@@ -1,6 +1,16 @@
-DIST slam_gmapping-1.4.1.tar.gz 21258 BLAKE2B 61b6ee8064be43a3f6e1cafba4efb24b9cf9faa471f749539dcf5aaba9a027885f32549f9df465b88cf02a38f7ebca8fdea469880512298ab0ebf221a3e18bfb SHA512 adc458a033ed0c573a1099ff8c8164d5157b5fd94efafa92fc3a45bcde86a0754f582e87743289637c2f6f7632557ac924ed2cf62d89b15f1a47b822773dbdba
+DIST gmapping-1.4.2-basic_localization_stage_groundtruth.pgm 16000058 BLAKE2B 4bf5494b34be09f4dcf63c26c8bcfd29b63e96a11d667dd8083dee6a2f8352b67c84ffa5603ec262a5af3e7fcbb7ca71ca77563df92f8cf72d3e4cdb2f817226 SHA512 32be0d40c84b2a5320215efee317d97e25131aa4ce2f39e6dbdb4481b4782ba8d437dd8d086a60728ee215d6243ea9ff0693c6bffd2cae542977d5bd55c91fad
+DIST gmapping-1.4.2-basic_localization_stage_indexed.bag 8554014 BLAKE2B 56605fc2642ee7dfe93379c620e8888da56260e23155dc68b3026c59d219cbd287ea04e9387bf3105a1089f8d930976d2a9875775d63646def090f2fdfa3f9e5 SHA512 2060ad1f65150043b254f820357eafe179483e3fd12bd0d85721841bfc9a15bf702dfbb34f99cb9b1566bafe64b79b8777d6e7c2ee77bc33ca7e87eb4b6fb240
+DIST gmapping-1.4.2-hallway_slow_2011-03-04-21-41-33.bag 43648223 BLAKE2B 93d733a8ed4e959c0a786369ce95c51698849591de200b99da01cd4a3acd22dd2faeb0e532c0a29add1b04f0de88384df171bcc404cefb772a19171949d71a77 SHA512 dd97fa6a0c22a2802473d343ad9f9b26ba8ebd119c8baa6ae3bcf19e913742a1456aa2879aef64c1bd6aab987d5b164f6cb4c251a3fd0736a290465b7f0f92bc
+DIST gmapping-1.4.2-test_replay_crash.bag 191247 BLAKE2B 348b6b1766cc2e2909106a544936538ced8a7d33536f5a964de03155df531ca57733386834804f81071b40a09c188e32ee23ef6d14f8436849e0d20a84bd7297 SHA512 e94b351d2a3406ee01c14b09237e9108812a0e65f3cbfceeb4b7def514f61ca934545764962b36804e28fc9cac8ce17f3f6d18a7cb7574dcb0a2f169cd7a1014
+DIST gmapping-1.4.2-test_turtlebot.bag 3003517 BLAKE2B d5d9f468aa5ac700bc3a3f819fe3ab1bd2ea7a28fb468dac9ac82c0bbbc1d59146bce132482baf81cfd763c25e82f9fa5cfbac28c6cc2fea6e114063b0daaf17 SHA512 8a9d9a0d63da607a2fc220e15e37ea339a254433dcb9b91e3b3041f032924177078ddeaef50df00e2ca0e5a9bd80ec17eadd8bfb4f0f879faab62de54a0555a4
+DIST gmapping-1.4.2-test_upside_down.bag 9353464 BLAKE2B e4835be6d70595e67c25eac28803857c6d14375b63e5c11991d50b7e47614e093728a628281241cfd5678e4ed84a776890ab68ccf129ddcdcb2b4c693afa4c5c SHA512 c8e193fd65c049b436c24677ba26e1e2e29f5ea744ea4e50f311224c4dbca685ba7da1804bcf3a41cea41ae79a1848158c8fdb0c4954cfa4ec4130089adfc7b4
+DIST gmapping-9999-basic_localization_stage_groundtruth.pgm 16000058 BLAKE2B 4bf5494b34be09f4dcf63c26c8bcfd29b63e96a11d667dd8083dee6a2f8352b67c84ffa5603ec262a5af3e7fcbb7ca71ca77563df92f8cf72d3e4cdb2f817226 SHA512 32be0d40c84b2a5320215efee317d97e25131aa4ce2f39e6dbdb4481b4782ba8d437dd8d086a60728ee215d6243ea9ff0693c6bffd2cae542977d5bd55c91fad
+DIST gmapping-9999-basic_localization_stage_indexed.bag 8554014 BLAKE2B 56605fc2642ee7dfe93379c620e8888da56260e23155dc68b3026c59d219cbd287ea04e9387bf3105a1089f8d930976d2a9875775d63646def090f2fdfa3f9e5 SHA512 2060ad1f65150043b254f820357eafe179483e3fd12bd0d85721841bfc9a15bf702dfbb34f99cb9b1566bafe64b79b8777d6e7c2ee77bc33ca7e87eb4b6fb240
+DIST gmapping-9999-hallway_slow_2011-03-04-21-41-33.bag 43648223 BLAKE2B 93d733a8ed4e959c0a786369ce95c51698849591de200b99da01cd4a3acd22dd2faeb0e532c0a29add1b04f0de88384df171bcc404cefb772a19171949d71a77 SHA512 dd97fa6a0c22a2802473d343ad9f9b26ba8ebd119c8baa6ae3bcf19e913742a1456aa2879aef64c1bd6aab987d5b164f6cb4c251a3fd0736a290465b7f0f92bc
+DIST gmapping-9999-test_replay_crash.bag 191247 BLAKE2B 348b6b1766cc2e2909106a544936538ced8a7d33536f5a964de03155df531ca57733386834804f81071b40a09c188e32ee23ef6d14f8436849e0d20a84bd7297 SHA512 e94b351d2a3406ee01c14b09237e9108812a0e65f3cbfceeb4b7def514f61ca934545764962b36804e28fc9cac8ce17f3f6d18a7cb7574dcb0a2f169cd7a1014
+DIST gmapping-9999-test_turtlebot.bag 3003517 BLAKE2B d5d9f468aa5ac700bc3a3f819fe3ab1bd2ea7a28fb468dac9ac82c0bbbc1d59146bce132482baf81cfd763c25e82f9fa5cfbac28c6cc2fea6e114063b0daaf17 SHA512 8a9d9a0d63da607a2fc220e15e37ea339a254433dcb9b91e3b3041f032924177078ddeaef50df00e2ca0e5a9bd80ec17eadd8bfb4f0f879faab62de54a0555a4
+DIST gmapping-9999-test_upside_down.bag 9353464 BLAKE2B e4835be6d70595e67c25eac28803857c6d14375b63e5c11991d50b7e47614e093728a628281241cfd5678e4ed84a776890ab68ccf129ddcdcb2b4c693afa4c5c SHA512 c8e193fd65c049b436c24677ba26e1e2e29f5ea744ea4e50f311224c4dbca685ba7da1804bcf3a41cea41ae79a1848158c8fdb0c4954cfa4ec4130089adfc7b4
 DIST slam_gmapping-1.4.2.tar.gz 21721 BLAKE2B 63ac4ccc1238cc4fecbf416e2fb716d1b679b4ae4d2d94508887ede8894402d77564af0f60a3b8d0b1661c91d755a5276aabd3894826af436ce11bd6119619b2 SHA512 d21810149ffe09cf57730e8657298f0d5c7aaa2cd6257b4e891ef990e2b6c727f2246d22d7272969a11604e33887e245d8d66980cb0c158f875810f4ff17072a
-EBUILD gmapping-1.4.1.ebuild 531 BLAKE2B d595c9abb5a92e4e48dbdcd8409fdb2e7f9603082c74396c65e880f39e82da0b7c91f04c790162162eea9db6ce36637d62d150a3c7c9bba20e9714000ed0df20 SHA512 5262716319562be75fd623bf4a3b6fb199cb2692ff8b92614c49c56f8f0a04591d88d153b4972f184eecc9cde1be15c36cd7d73c07ff59c809d0d27ab37a8265
-EBUILD gmapping-1.4.2.ebuild 531 BLAKE2B d595c9abb5a92e4e48dbdcd8409fdb2e7f9603082c74396c65e880f39e82da0b7c91f04c790162162eea9db6ce36637d62d150a3c7c9bba20e9714000ed0df20 SHA512 5262716319562be75fd623bf4a3b6fb199cb2692ff8b92614c49c56f8f0a04591d88d153b4972f184eecc9cde1be15c36cd7d73c07ff59c809d0d27ab37a8265
-EBUILD gmapping-9999.ebuild 531 BLAKE2B d595c9abb5a92e4e48dbdcd8409fdb2e7f9603082c74396c65e880f39e82da0b7c91f04c790162162eea9db6ce36637d62d150a3c7c9bba20e9714000ed0df20 SHA512 5262716319562be75fd623bf4a3b6fb199cb2692ff8b92614c49c56f8f0a04591d88d153b4972f184eecc9cde1be15c36cd7d73c07ff59c809d0d27ab37a8265
+EBUILD gmapping-1.4.2.ebuild 1461 BLAKE2B 6d20a4f7a076515fdd49730e6e707ed3da608e2a33837d9e092e03f76ad8c599851a1e87f9e5ffe4fcaf2cf0bb032224e5eab77f8c7b8ca2b38aebb4a1c75355 SHA512 945b40b16a934e12ddf993c732a68797a69039794fa345ea2574b2a6c02780ac7168d6a7241e549e253d3dcfcbbaca082544028456e8bf1347e6c20610e4280a
+EBUILD gmapping-9999.ebuild 1461 BLAKE2B 6d20a4f7a076515fdd49730e6e707ed3da608e2a33837d9e092e03f76ad8c599851a1e87f9e5ffe4fcaf2cf0bb032224e5eab77f8c7b8ca2b38aebb4a1c75355 SHA512 945b40b16a934e12ddf993c732a68797a69039794fa345ea2574b2a6c02780ac7168d6a7241e549e253d3dcfcbbaca082544028456e8bf1347e6c20610e4280a
 MISC metadata.xml 342 BLAKE2B 72a1fe4f1e7971418dbb3f5b1e78de71a77819b9fa7200feb2ce0abec5b50a5435c5e5541d290bfd23c7acee5a6920280934067c84e4716bd9f6bb0cc634544d SHA512 2a5beef664e8c79b9e4d858d0dc093068c6e462456ae6066ea637f4b725e5c7184dd65769906c34e55eb6b03949e957edba34b84a587e1daec784e1f74ea287c
diff --git a/dev-ros/gmapping/gmapping-1.4.1.ebuild b/dev-ros/gmapping/gmapping-1.4.1.ebuild
deleted file mode 100644
index c3d87b4563b2..000000000000
--- a/dev-ros/gmapping/gmapping-1.4.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/slam_gmapping"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS wrapper for OpenSlam's Gmapping"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/openslam_gmapping
-	dev-ros/rosbag_storage
-	dev-ros/gmapping
-"
-DEPEND="${RDEPEND}
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rostest"
diff --git a/dev-ros/gmapping/gmapping-1.4.2.ebuild b/dev-ros/gmapping/gmapping-1.4.2.ebuild
index c3d87b4563b2..b68005106277 100644
--- a/dev-ros/gmapping/gmapping-1.4.2.ebuild
+++ b/dev-ros/gmapping/gmapping-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,8 +19,43 @@ RDEPEND="
 	dev-ros/tf
 	dev-ros/openslam_gmapping
 	dev-ros/rosbag_storage
-	dev-ros/gmapping
+	dev-ros/nodelet
 "
 DEPEND="${RDEPEND}
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rostest"
+	test? (
+		dev-ros/rostest
+		dev-cpp/gtest
+	)
+"
+TEST_DATA="
+	basic_localization_stage_indexed.bag
+	hallway_slow_2011-03-04-21-41-33.bag
+	basic_localization_stage_groundtruth.pgm
+"
+PERCEPTION_TEST_DATA="
+	test_replay_crash.bag
+	test_turtlebot.bag
+	test_upside_down.bag
+"
+SRC_URI="${SRC_URI} test? ( "
+for i in ${TEST_DATA}; do
+	SRC_URI="${SRC_URI} http://download.ros.org/data/gmapping/${i} -> ${P}-${i}"
+done
+for i in ${PERCEPTION_TEST_DATA}; do
+	SRC_URI="${SRC_URI} https://github.com/ros-perception/slam_gmapping_test_data/raw/master/${i} -> ${P}-${i}"
+done
+SRC_URI="${SRC_URI} )"
+
+src_prepare() {
+	ros-catkin_src_prepare
+	if use test; then
+		for i in ${TEST_DATA} ${PERCEPTION_TEST_DATA}; do
+			cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
+		done
+		sed \
+			-e "s#http://download.ros.org/data/gmapping#file://${S}#" \
+			-e "s#https://github.com/ros-perception/slam_gmapping_test_data/raw/master#file://${S}#" \
+			-i CMakeLists.txt || die
+	fi
+}
diff --git a/dev-ros/gmapping/gmapping-9999.ebuild b/dev-ros/gmapping/gmapping-9999.ebuild
index c3d87b4563b2..b68005106277 100644
--- a/dev-ros/gmapping/gmapping-9999.ebuild
+++ b/dev-ros/gmapping/gmapping-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,8 +19,43 @@ RDEPEND="
 	dev-ros/tf
 	dev-ros/openslam_gmapping
 	dev-ros/rosbag_storage
-	dev-ros/gmapping
+	dev-ros/nodelet
 "
 DEPEND="${RDEPEND}
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rostest"
+	test? (
+		dev-ros/rostest
+		dev-cpp/gtest
+	)
+"
+TEST_DATA="
+	basic_localization_stage_indexed.bag
+	hallway_slow_2011-03-04-21-41-33.bag
+	basic_localization_stage_groundtruth.pgm
+"
+PERCEPTION_TEST_DATA="
+	test_replay_crash.bag
+	test_turtlebot.bag
+	test_upside_down.bag
+"
+SRC_URI="${SRC_URI} test? ( "
+for i in ${TEST_DATA}; do
+	SRC_URI="${SRC_URI} http://download.ros.org/data/gmapping/${i} -> ${P}-${i}"
+done
+for i in ${PERCEPTION_TEST_DATA}; do
+	SRC_URI="${SRC_URI} https://github.com/ros-perception/slam_gmapping_test_data/raw/master/${i} -> ${P}-${i}"
+done
+SRC_URI="${SRC_URI} )"
+
+src_prepare() {
+	ros-catkin_src_prepare
+	if use test; then
+		for i in ${TEST_DATA} ${PERCEPTION_TEST_DATA}; do
+			cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
+		done
+		sed \
+			-e "s#http://download.ros.org/data/gmapping#file://${S}#" \
+			-e "s#https://github.com/ros-perception/slam_gmapping_test_data/raw/master#file://${S}#" \
+			-i CMakeLists.txt || die
+	fi
+}
diff --git a/dev-ros/hector_pose_estimation/Manifest b/dev-ros/hector_pose_estimation/Manifest
index dcea85c3a0b5..cf322ca869f2 100644
--- a/dev-ros/hector_pose_estimation/Manifest
+++ b/dev-ros/hector_pose_estimation/Manifest
@@ -1,5 +1,7 @@
 AUX hector_pose_estimation-0.3.0-pluginlib.patch 1010 BLAKE2B 965ccd5e1c74b30d2e5ceae57c10be15762ad8c2a9cc1a542eb8d1d54183feee71aab9f30392e459e9b20edcaa1c07da900d88a06d419f53e94ce5bf4c78976d SHA512 2e5bee3ab8d3a27dc6d68e005d358badbf99a5fb17ff60fd9592ad94a89cdc218cfce5719c7710d9a8cd0725c9df7845334dad55eecea456e886a94d382a4d7f
 DIST hector_localization-0.3.0.tar.gz 73656 BLAKE2B 8e895c760974f8707eb174b3b385f03f07f93f89b470d88140f1134a3cb9fb8e67e65a86484b702dbaed09e4d614f4c6759f1e08b536385f86ec15dc3db6a644 SHA512 5763a98247754b021631c894d44172d7c215d81f556760578f585febf2248da8dfcf10c6f1430cff47800778d39a79ab31a59916ad13c6d5ecf8a17eeac4e8df
+DIST hector_localization-0.4.0.tar.gz 75100 BLAKE2B afb6acb1444299c7ca47f25da7d7ad83a2363c98a6b1ed21756cdd5cf63e758b7e4e9d7ea806c7c748dc5e3606bafbe62df612a42597e86ec556696211dc8af9 SHA512 18fc8cb2f51ec978e309a627f12b896aff984fdbe2f2038c47369bd44479b3c739fad586b325c6962bb17c49e46eb7568f8af5af085fbc87749ddb2616ad34c3
 EBUILD hector_pose_estimation-0.3.0-r1.ebuild 763 BLAKE2B 64a0eec66ca9a4de09f2e63630c32e19f1000d54266316dcd638fe91a9b7b0c68e6636af6bf534728d3e6efcd01e131bc1a5ae1a6cb707a09d39cf6780f55c88 SHA512 fcc228e912fdf46b58489cc455d14cf3ef1734c7a770511add1efe19b0c745d275c8e7b0122cd03c85a1bcae874ab762178c9a0075f472a4ed2e8a0e2b07cf6b
+EBUILD hector_pose_estimation-0.4.0.ebuild 709 BLAKE2B 0de9e9c50939d4dfa4ae7e4ba61509f9470428917aaea6dfd17f5baf8122daf9d1ff054464588195d1387b74a13cdcf9a709fe5ac8aadecc953e063cf1a351e8 SHA512 dc9c8be04ef0a40c4b44720182cac6da306e0fb67f9cbb067bd349d6c8ebf6fc9c56df13a6ccfe4388d2628d4aa18de17c051d763ea8c8576fbf734e0bae28c3
 EBUILD hector_pose_estimation-9999.ebuild 709 BLAKE2B 47c1f5e8aaa989553422e72b3f0e416dc125b9e1dd09e7d93314d94090153cd18df953287829bb62185870252774266c810d2d5eb518ef1dc09d57f0282fab34 SHA512 c058f013576bc391ae21444177d03ec8c63a3719aab9ec0957ac9f9865eaa9b39515c28a796d2dca045c9ea0d1fa30680a5d8a7a6910fd5f8bdfe9921251c47b
 MISC metadata.xml 354 BLAKE2B 8fa87680be83a7fc421afc00fa7e203bd512c42324cee5ce59f08a6acdfacdd09a8427e547982ccff17253589708a0556e51420188c3639ab638df4994e4edb7 SHA512 5efea6ff063bdb92ca5c0c45cbc4c9cc110d4ed800b8631259abdffb771abb183594d9e72920e0daf9948c909a69ab564b70fed83bb2a0a879d5712f3c608420
diff --git a/dev-ros/hector_pose_estimation/hector_pose_estimation-0.4.0.ebuild b/dev-ros/hector_pose_estimation/hector_pose_estimation-0.4.0.ebuild
new file mode 100644
index 000000000000..3b54213a6b1a
--- /dev/null
+++ b/dev-ros/hector_pose_estimation/hector_pose_estimation-0.4.0.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/tu-darmstadt-ros-pkg/hector_localization"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="hector_pose_estimation node and the hector_pose_estimation nodelet"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/hector_pose_estimation_core
+	dev-ros/nodelet
+	dev-ros/tf
+	dev-ros/message_filters
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+# dev-ros/hector_timing
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/hector_pose_estimation_core/Manifest b/dev-ros/hector_pose_estimation_core/Manifest
index 8abee9434c54..1689b5106a57 100644
--- a/dev-ros/hector_pose_estimation_core/Manifest
+++ b/dev-ros/hector_pose_estimation_core/Manifest
@@ -2,6 +2,8 @@ AUX eigen.patch 892 BLAKE2B 68b8df118a6d2a644ee1bd8407144f50fc270bc767984093e146
 AUX gcc6.patch 1597 BLAKE2B 9df1a297741dbcb957ef9bc910332e237a84ffcef87547f0d29573c4a3aa4255a0d65fb0f2eb7b404a8c9ecf4441b2a9dee60dd1d832b7690baceb2b1ae39951 SHA512 7ef60982584cf5021d9a8c084492de84d54dc0150ad0cd5acfc9c709641935c5a9ee649e5546cae6d2da061a0e3a887e5f1ea97e1fa3848ad9dd4de7ff3ee817
 AUX includes.patch 506 BLAKE2B 40b3b640324f8ae1b36f3ee3f760384e4365500f8e29a1111376a0bcb8206e77429565ba9ed9dacb4420543378963d5c6b3798151a3eb4672f28bff6fb5d620c SHA512 2d02b76c2ee1032527582ae32685014b815fcc5cb6fd2e02de84299d2c634a2e54c2d3b7d7307442f972259db44f84d4ae35ca6a38369207e29639fd15cda08f
 DIST hector_localization-0.3.0.tar.gz 73656 BLAKE2B 8e895c760974f8707eb174b3b385f03f07f93f89b470d88140f1134a3cb9fb8e67e65a86484b702dbaed09e4d614f4c6759f1e08b536385f86ec15dc3db6a644 SHA512 5763a98247754b021631c894d44172d7c215d81f556760578f585febf2248da8dfcf10c6f1430cff47800778d39a79ab31a59916ad13c6d5ecf8a17eeac4e8df
+DIST hector_localization-0.4.0.tar.gz 75100 BLAKE2B afb6acb1444299c7ca47f25da7d7ad83a2363c98a6b1ed21756cdd5cf63e758b7e4e9d7ea806c7c748dc5e3606bafbe62df612a42597e86ec556696211dc8af9 SHA512 18fc8cb2f51ec978e309a627f12b896aff984fdbe2f2038c47369bd44479b3c739fad586b325c6962bb17c49e46eb7568f8af5af085fbc87749ddb2616ad34c3
 EBUILD hector_pose_estimation_core-0.3.0-r1.ebuild 800 BLAKE2B 8767f45674f3455c9722432d93f70d364a815f9f74cbee89b6391e79d94ea470576a94f9da228c969e71c9daa47385e087785a78f9cc97ba6d5e92d88637b039 SHA512 5a3906fef2e106c51b06e54e3202e74e58204c1eabdd690a4297acfa66797a587fc7fc5b62c086332cf0044a1b7df754205f7e097e281736f701c65fdba0bf34
+EBUILD hector_pose_estimation_core-0.4.0.ebuild 708 BLAKE2B 482ca9b07d45bd213152e5d11ef41c603cc9087e47b0eeebabd4a17c31a2546e3e1a1c282b25a37f7708961eaad5bf27e288fb80bc50be22984b93dde94f29c4 SHA512 3f616baa90c9c0cb8f299f29169d4554b59f15addc48836473575b4e23ef536c3bacaf4437d80580015090a9fc3a0bea4247fb2fd238f47cb025b7b0dfe74822
 EBUILD hector_pose_estimation_core-9999.ebuild 708 BLAKE2B 4c7dcfb1673f5a3e1c016441ca85ba0000874ee6a9c63296069187841a3b60398787340f793d46103e01462786571484d91b461a344ba37efb73c924477af8a4 SHA512 637c5cdb5da52e3634356e15c70dbc9fe089e8111ac8511bb54af2cf9b9cf4ed3592ad1f104be12b610720ee2b81f19d202e03881f5a05dfc083673646a7ae58
 MISC metadata.xml 354 BLAKE2B 8fa87680be83a7fc421afc00fa7e203bd512c42324cee5ce59f08a6acdfacdd09a8427e547982ccff17253589708a0556e51420188c3639ab638df4994e4edb7 SHA512 5efea6ff063bdb92ca5c0c45cbc4c9cc110d4ed800b8631259abdffb771abb183594d9e72920e0daf9948c909a69ab564b70fed83bb2a0a879d5712f3c608420
diff --git a/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.4.0.ebuild b/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.4.0.ebuild
new file mode 100644
index 000000000000..f40cd89d6546
--- /dev/null
+++ b/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Extended Kalman Filter (EKF) that estimates the 6DOF pose of the robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rostime
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3"
diff --git a/dev-ros/message_filters/Manifest b/dev-ros/message_filters/Manifest
index 7d72d1458af6..e03ce259ab75 100644
--- a/dev-ros/message_filters/Manifest
+++ b/dev-ros/message_filters/Manifest
@@ -1,6 +1,8 @@
 AUX tests.patch 4837 BLAKE2B 2793652865f2d1f8ce1499b37922e480d40ca3931f098156a6cf541ad48985a3bee29364bb09e37c4f15424765dd057875f26dd5290f5747718538bcbeb3aead SHA512 2c778a7e4c7fc6d89ef162fd42d6f1dbd487d885c7ee04f6a8243142aaf949b02bfcd0c08cc8799f7a1ee95d13c8d21aef340abc4a3e6ca3c0f2231118985796
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD message_filters-1.15.10.ebuild 899 BLAKE2B ed7e7e22553be2a10622b5bf807c38dd953e36c0640fdf5a986b3b351ed715f3a155572008f278aa2b629e4d87b8605af99732242403d02ecc88e6e3cd4945c6 SHA512 afd5faa14dd1e830a14a299ce46fe1e201bcbc365dd7bd4a75f1dfd9212a147dbd5bc70cb084c2e199c0605587fcd6e6c97f027807f3477ef153ed3b8e6d709b
 EBUILD message_filters-1.15.8.ebuild 899 BLAKE2B 20aafad99fb0b29bd6d144ea84b9276d24ea8f2a59ddcc2ecedfe6edd61867ed9c8910e2f5372ff6eb3f936f80a5ab4fd16131b73e1aeca156ccac5a3fd81b5e SHA512 c41f37eced863cd5ce31a29e8b37d5d9aca31f8cc108e46e43bb30de83cfeb46b255db0adb3f991166ca014fdf0e1487dc47315cb8019c68768d25f412a97baf
 EBUILD message_filters-1.15.9.ebuild 899 BLAKE2B 20aafad99fb0b29bd6d144ea84b9276d24ea8f2a59ddcc2ecedfe6edd61867ed9c8910e2f5372ff6eb3f936f80a5ab4fd16131b73e1aeca156ccac5a3fd81b5e SHA512 c41f37eced863cd5ce31a29e8b37d5d9aca31f8cc108e46e43bb30de83cfeb46b255db0adb3f991166ca014fdf0e1487dc47315cb8019c68768d25f412a97baf
 EBUILD message_filters-9999.ebuild 899 BLAKE2B 20aafad99fb0b29bd6d144ea84b9276d24ea8f2a59ddcc2ecedfe6edd61867ed9c8910e2f5372ff6eb3f936f80a5ab4fd16131b73e1aeca156ccac5a3fd81b5e SHA512 c41f37eced863cd5ce31a29e8b37d5d9aca31f8cc108e46e43bb30de83cfeb46b255db0adb3f991166ca014fdf0e1487dc47315cb8019c68768d25f412a97baf
diff --git a/dev-ros/message_filters/message_filters-1.15.10.ebuild b/dev-ros/message_filters/message_filters-1.15.10.ebuild
new file mode 100644
index 000000000000..011358d08af6
--- /dev/null
+++ b/dev-ros/message_filters/message_filters-1.15.10.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/message_to_tf/Manifest b/dev-ros/message_to_tf/Manifest
index eba36875515c..7b5af6b6639c 100644
--- a/dev-ros/message_to_tf/Manifest
+++ b/dev-ros/message_to_tf/Manifest
@@ -1,4 +1,6 @@
 DIST hector_localization-0.3.0.tar.gz 73656 BLAKE2B 8e895c760974f8707eb174b3b385f03f07f93f89b470d88140f1134a3cb9fb8e67e65a86484b702dbaed09e4d614f4c6759f1e08b536385f86ec15dc3db6a644 SHA512 5763a98247754b021631c894d44172d7c215d81f556760578f585febf2248da8dfcf10c6f1430cff47800778d39a79ab31a59916ad13c6d5ecf8a17eeac4e8df
+DIST hector_localization-0.4.0.tar.gz 75100 BLAKE2B afb6acb1444299c7ca47f25da7d7ad83a2363c98a6b1ed21756cdd5cf63e758b7e4e9d7ea806c7c748dc5e3606bafbe62df612a42597e86ec556696211dc8af9 SHA512 18fc8cb2f51ec978e309a627f12b896aff984fdbe2f2038c47369bd44479b3c739fad586b325c6962bb17c49e46eb7568f8af5af085fbc87749ddb2616ad34c3
 EBUILD message_to_tf-0.3.0.ebuild 611 BLAKE2B 5c7534594ca539dfc4722359537a546859e0815e4b460eadcead11cd1074654c7a4be9480074b70528a3f4cf429dda0d6c80bb34143ef17943ed18bbdb252060 SHA512 b20087191da892d03baad6aef63f653599c2c26e3475507888a1b2f44eeb36e76c920a77dd79b4a3060da6713aba157ff124510c1332b2645f84f7c1e5c9cdc6
+EBUILD message_to_tf-0.4.0.ebuild 611 BLAKE2B fbc2ee2e48999471f3206d891ae9130f9f0facb4cc84b76161303f087e69b2a41b64c02bfe8d230972a8326b255c58f72f793ecf7c307b05d86bdd36bbbe4a5e SHA512 5c3b8bc11eba91b432169615a6b7f8a8c39b81e618211aae20f0e2453a083a02e7f8fc259a13f096af237a86a69b6246630ef8253c82de51c9ba55ca8e9567fb
 EBUILD message_to_tf-9999.ebuild 611 BLAKE2B 5c7534594ca539dfc4722359537a546859e0815e4b460eadcead11cd1074654c7a4be9480074b70528a3f4cf429dda0d6c80bb34143ef17943ed18bbdb252060 SHA512 b20087191da892d03baad6aef63f653599c2c26e3475507888a1b2f44eeb36e76c920a77dd79b4a3060da6713aba157ff124510c1332b2645f84f7c1e5c9cdc6
 MISC metadata.xml 354 BLAKE2B 8fa87680be83a7fc421afc00fa7e203bd512c42324cee5ce59f08a6acdfacdd09a8427e547982ccff17253589708a0556e51420188c3639ab638df4994e4edb7 SHA512 5efea6ff063bdb92ca5c0c45cbc4c9cc110d4ed800b8631259abdffb771abb183594d9e72920e0daf9948c909a69ab564b70fed83bb2a0a879d5712f3c608420
diff --git a/dev-ros/message_to_tf/message_to_tf-0.4.0.ebuild b/dev-ros/message_to_tf/message_to_tf-0.4.0.ebuild
new file mode 100644
index 000000000000..29d05af7cf53
--- /dev/null
+++ b/dev-ros/message_to_tf/message_to_tf-0.4.0.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/tu-darmstadt-ros-pkg/hector_localization"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Translates pose information from different kind of common message types to tf"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf
+	dev-ros/topic_tools
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/openslam_gmapping/Manifest b/dev-ros/openslam_gmapping/Manifest
index fcf0214351dc..3fbcec70d784 100644
--- a/dev-ros/openslam_gmapping/Manifest
+++ b/dev-ros/openslam_gmapping/Manifest
@@ -1,4 +1,4 @@
 DIST openslam_gmapping-0.2.1.tar.gz 104933 BLAKE2B fbd31e66849ee28b63ac24ec059ebca368f31c8796b229f59fda56af7aceec12d45673651ad05c690da268e8a0fc7ae581b7911ea6e773af833c6374fb83843e SHA512 bb3b1a634ded258f526dd65b1b70c7a0f284810eedb5cfafbc2012a4997793c1e7aeacdca2afeea4ddec13cadb445b994cac07cb0763117c5fa478b3def1cbe6
-EBUILD openslam_gmapping-0.2.1.ebuild 347 BLAKE2B 44a24715b9bf4de958cd1280e2971ae23735f01539e9b7aa69b85fad56276332f40e588c344ea28c4c9a410d34461f17aa045deb5432282054969e5fb22b12a2 SHA512 db0d7d6dcf78291e8670f7a174606f36268f528a1be9788cbdc8b79fe73683ad8c501fc606ec138707fe82ec8ebe3156a18c12dfeb664fd5016b099ef0f4e632
-EBUILD openslam_gmapping-9999.ebuild 347 BLAKE2B 44a24715b9bf4de958cd1280e2971ae23735f01539e9b7aa69b85fad56276332f40e588c344ea28c4c9a410d34461f17aa045deb5432282054969e5fb22b12a2 SHA512 db0d7d6dcf78291e8670f7a174606f36268f528a1be9788cbdc8b79fe73683ad8c501fc606ec138707fe82ec8ebe3156a18c12dfeb664fd5016b099ef0f4e632
+EBUILD openslam_gmapping-0.2.1.ebuild 335 BLAKE2B 1d3bb5e4b713377b23de7ea94e6de22fa813c2f905c5dd5e7db985682561f4ddceebe3cfb891333ee2de2d792de03cc0d305cd484086ee9131988fb13e4de55d SHA512 760139c73e71b38e10f4c8e0065c6e77facfcb617f91a590539b513df000f93765cd9da81ea35696375badb7a6852cc2bd6a548a01177d03f3b4546ace84f851
+EBUILD openslam_gmapping-9999.ebuild 335 BLAKE2B 1d3bb5e4b713377b23de7ea94e6de22fa813c2f905c5dd5e7db985682561f4ddceebe3cfb891333ee2de2d792de03cc0d305cd484086ee9131988fb13e4de55d SHA512 760139c73e71b38e10f4c8e0065c6e77facfcb617f91a590539b513df000f93765cd9da81ea35696375badb7a6852cc2bd6a548a01177d03f3b4546ace84f851
 MISC metadata.xml 346 BLAKE2B c0c8566bd6db8866d91cd1bbdaec66a954eed369e9601a222d5604947d12caca4703b5460e872b9d07cde549c338179b52b391d05172915221d18d49aafdee28 SHA512 74324f6ba9d2217018fb1194b620e3d48c07d8a89654b20c9e08f7aae3c3820fc9a624f2e9c12239ab0a951792270c08b04edae6f8cda4c3edc6c720aa442c22
diff --git a/dev-ros/openslam_gmapping/openslam_gmapping-0.2.1.ebuild b/dev-ros/openslam_gmapping/openslam_gmapping-0.2.1.ebuild
index 972294be7c44..cb126bd33da3 100644
--- a/dev-ros/openslam_gmapping/openslam_gmapping-0.2.1.ebuild
+++ b/dev-ros/openslam_gmapping/openslam_gmapping-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ KEYWORDS="~amd64 ~arm"
 inherit ros-catkin
 
 DESCRIPTION="ROS-ified version of gmapping SLAM"
-LICENSE="CC-BY-NC-SA-2.5"
+LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ros/openslam_gmapping/openslam_gmapping-9999.ebuild b/dev-ros/openslam_gmapping/openslam_gmapping-9999.ebuild
index 972294be7c44..cb126bd33da3 100644
--- a/dev-ros/openslam_gmapping/openslam_gmapping-9999.ebuild
+++ b/dev-ros/openslam_gmapping/openslam_gmapping-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ KEYWORDS="~amd64 ~arm"
 inherit ros-catkin
 
 DESCRIPTION="ROS-ified version of gmapping SLAM"
-LICENSE="CC-BY-NC-SA-2.5"
+LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ros/qt_gui_cpp/Manifest b/dev-ros/qt_gui_cpp/Manifest
index e69ab50651fa..43423a674c9c 100644
--- a/dev-ros/qt_gui_cpp/Manifest
+++ b/dev-ros/qt_gui_cpp/Manifest
@@ -1,6 +1,6 @@
 AUX libdir.patch 864 BLAKE2B c104517d108824d13455565cecbeac0886c60cc042bcab4ffd9961be7096117342157a0da0bb4912e18179bca5c40d8391be8d162ac9f07a7b4a5c8a3d65f4c5 SHA512 16960a3224f982cf3b55904d5c5370a715aed2a7dfd6f98ecc21af1f70fd527e84b1ee10f127e45251a149abb165aed06e595c73f7deda88f84548fb4c7cb717
 AUX rpaths.patch 1008 BLAKE2B 98d940001ca220ecb4078188c6c461e47038ce9bc3b486ee1ccf5dbd13a6d2cd632cdbc684bbce48485da52c04ef460bfd7a069f393cf8879afcd56fe3796c69 SHA512 a3bba92a6309859097be3c0ef8381dc327c43a90645c4c6d22ebf351b8d4cf98df90a6fb91d48a1d12cdaa901a6da5fc273098950d0f80f10b3366305142ec9b
 DIST qt_gui_core-0.4.2.tar.gz 97267 BLAKE2B 631996dd5b2a4e0aa557eb14a9dcb967377fce4923ada280d5894a733827f6f7d1aa240cc28261ee95a39171b03cba4f27f794ca3f9eb488d8b1953d237a9223 SHA512 a8b684d52eb1d4bfcdb6b63a989598d2098462d6fd93f26dd5a7eb0c0c9be9c324cb5d77b5e12c583253da4ce5edc544535bb9dd5a2f7966bf1642a7bd0ca421
-EBUILD qt_gui_cpp-0.4.2-r1.ebuild 800 BLAKE2B b96725aea2b97bc1ae98669a63cbd8f21a493254ab36ce5f60e26294369e9d8987a74cc8571c55b59e49f708ac77f144d260de684bdb56eb151cffeecf983590 SHA512 5bb93b6d3565f38cfc1cd0cb81c4f3be5537a00aa980428f2bed931fb2c36edacef7c88cc62f319e1828343d7271bb0e9e467425c33d5d5757b3d12720d352a0
-EBUILD qt_gui_cpp-9999.ebuild 800 BLAKE2B b96725aea2b97bc1ae98669a63cbd8f21a493254ab36ce5f60e26294369e9d8987a74cc8571c55b59e49f708ac77f144d260de684bdb56eb151cffeecf983590 SHA512 5bb93b6d3565f38cfc1cd0cb81c4f3be5537a00aa980428f2bed931fb2c36edacef7c88cc62f319e1828343d7271bb0e9e467425c33d5d5757b3d12720d352a0
+EBUILD qt_gui_cpp-0.4.2-r1.ebuild 799 BLAKE2B 41074e1276cdeaa6f1262cb5f00c6235a662aed9af6eb81a4cd49c683ad44be561aaf9ba46fd87fddb9611a02f98ec739abd9ff4e74bf2cebe6875847a79e0b0 SHA512 4b9fc5e74caa6a98ab9a962c5dc95044daf95fc6fb1e8aa91b6b0ffec3259d13397801629157c2cdea6a87bb36ace3f2f1842846c01fbef48d19f141967a523d
+EBUILD qt_gui_cpp-9999.ebuild 799 BLAKE2B 41074e1276cdeaa6f1262cb5f00c6235a662aed9af6eb81a4cd49c683ad44be561aaf9ba46fd87fddb9611a02f98ec739abd9ff4e74bf2cebe6875847a79e0b0 SHA512 4b9fc5e74caa6a98ab9a962c5dc95044daf95fc6fb1e8aa91b6b0ffec3259d13397801629157c2cdea6a87bb36ace3f2f1842846c01fbef48d19f141967a523d
 MISC metadata.xml 343 BLAKE2B 518da938afd557552bcb4eec225723207d73325a348640eb5280137715941f95190d8be30f52d1773e97cb80c9ed25b34d60ed7cfdbb5425e6b6d30bb1a2050b SHA512 88a9c15a6f681122449cff3b89c4805a0a9ee5d579e1eb98f4814e6e57d3adafb0e370986a6e68c555880b80fb900d74ffd4cb19a670c15e3d0f5fa383e39810
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2-r1.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2-r1.ebuild
index dac9e5563d61..84d56a89ba1f 100644
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2-r1.ebuild
+++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,6 +7,8 @@ ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 
+# FIXME: fails to build with ninja
+CMAKE_MAKEFILE_GENERATOR=emake
 inherit ros-catkin
 
 DESCRIPTION="C++-bindings for qt_gui and creates bindings for every generator available"
@@ -32,6 +34,3 @@ PATCHES=(
 	"${FILESDIR}/libdir.patch"
 	"${FILESDIR}/rpaths.patch"
 )
-
-# FIXME: fails to build with ninja
-CMAKE_MAKEFILE_GENERATOR=emake
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
index dac9e5563d61..84d56a89ba1f 100644
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
+++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,6 +7,8 @@ ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 
+# FIXME: fails to build with ninja
+CMAKE_MAKEFILE_GENERATOR=emake
 inherit ros-catkin
 
 DESCRIPTION="C++-bindings for qt_gui and creates bindings for every generator available"
@@ -32,6 +34,3 @@ PATCHES=(
 	"${FILESDIR}/libdir.patch"
 	"${FILESDIR}/rpaths.patch"
 )
-
-# FIXME: fails to build with ninja
-CMAKE_MAKEFILE_GENERATOR=emake
diff --git a/dev-ros/rosbag/Manifest b/dev-ros/rosbag/Manifest
index d8d08265a857..ac8d83897dad 100644
--- a/dev-ros/rosbag/Manifest
+++ b/dev-ros/rosbag/Manifest
@@ -1,7 +1,9 @@
 AUX pycrypto.patch 402 BLAKE2B 2f784f93115b205285bb9eb9c910185f84871da7ecc5865304d220df7e1e9bea3799743a1f7a2a274423ec3fa4e367773814bd5fbb5cb074acb7252845ba6e94 SHA512 2343aca88929010f76389f31187b913f92f8d510a18a0d81b20c2c9accc2da68d15fd959404f11d363bdbe98f644ff2e76a70fdca4a718b490fa7f812a1b417e
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD rosbag-1.15.10.ebuild 961 BLAKE2B 41c1b43271318a507cdd6153811ab76908819f0e75dc7c8dcfb1c7c4dcf6ed0e59b673647107caade89e21f6b6700b164053c4ce5b7de7db5fbef5ed8c8a473b SHA512 de5b04faed760e3ae5b12fbd58acdae9168de808f99e023b0f3564eca8dc1118ca30d09a14978c4fedae8c8e6e7a018b1ed0dd12b38df28002088ca8a43674cc
 EBUILD rosbag-1.15.7.ebuild 961 BLAKE2B 1fe92d6cd74a7eb7ce6c002073b82bef14a6bb85042a60cffe28627cb487005d87d5a38c0c8674929c084d81a802b74bbbc22bd73ada7cf11e8f3ee33ba1b57d SHA512 70adb3692fa3e2bfa8f0eac8e12542015a15155129a10361055102459aa16a98041d35ddc3841ade1ff564a0737285d7f100c3088b466bbfa19fbc5775302280
 EBUILD rosbag-1.15.8.ebuild 961 BLAKE2B 1fe92d6cd74a7eb7ce6c002073b82bef14a6bb85042a60cffe28627cb487005d87d5a38c0c8674929c084d81a802b74bbbc22bd73ada7cf11e8f3ee33ba1b57d SHA512 70adb3692fa3e2bfa8f0eac8e12542015a15155129a10361055102459aa16a98041d35ddc3841ade1ff564a0737285d7f100c3088b466bbfa19fbc5775302280
 EBUILD rosbag-1.15.9.ebuild 961 BLAKE2B 1fe92d6cd74a7eb7ce6c002073b82bef14a6bb85042a60cffe28627cb487005d87d5a38c0c8674929c084d81a802b74bbbc22bd73ada7cf11e8f3ee33ba1b57d SHA512 70adb3692fa3e2bfa8f0eac8e12542015a15155129a10361055102459aa16a98041d35ddc3841ade1ff564a0737285d7f100c3088b466bbfa19fbc5775302280
diff --git a/dev-ros/rosbag/rosbag-1.15.10.ebuild b/dev-ros/rosbag/rosbag-1.15.10.ebuild
new file mode 100644
index 000000000000..d6ca262b4d4e
--- /dev/null
+++ b/dev-ros/rosbag/rosbag-1.15.10.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 6f8f4ca1b94e..042cf1aacfcb 100644
--- a/dev-ros/rosbag_storage/Manifest
+++ b/dev-ros/rosbag_storage/Manifest
@@ -1,5 +1,7 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD rosbag_storage-1.15.10.ebuild 909 BLAKE2B b4349a13dd368a337f113770facaff0cf46e699972664f1f657a5155cf28225266d128bc7cd1c8d77e0292756c5143fd771374f7c1fd1473ae2c06e5c769d8b6 SHA512 846a5308cd223c0bea1a691cd73c9ecac8184732b6a766d5b6dcd31504c479f0fdcdd655bcfc905709fa299b160a8cfd3222a123a5eda46d312aa74b392a9aa6
 EBUILD rosbag_storage-1.15.8-r1.ebuild 909 BLAKE2B ff001115ff23dae3f7716ede48c603a57ac58a4d044a42876c6a2a23def35cf6f5d235e0a1a38cecba4fc2c66378fd51e2e995a1525c91768f800b666ad29772 SHA512 11a5e8b06dd0a5febf9d0c67c7ec68ef72b8ddc24636c4d9ef1b9e458074eca3d8f5362cd55a3f2df2d09666dc9e82e5c558608da68a929cdf3a194118df556a
 EBUILD rosbag_storage-1.15.9.ebuild 909 BLAKE2B ff001115ff23dae3f7716ede48c603a57ac58a4d044a42876c6a2a23def35cf6f5d235e0a1a38cecba4fc2c66378fd51e2e995a1525c91768f800b666ad29772 SHA512 11a5e8b06dd0a5febf9d0c67c7ec68ef72b8ddc24636c4d9ef1b9e458074eca3d8f5362cd55a3f2df2d09666dc9e82e5c558608da68a929cdf3a194118df556a
 EBUILD rosbag_storage-9999.ebuild 909 BLAKE2B ff001115ff23dae3f7716ede48c603a57ac58a4d044a42876c6a2a23def35cf6f5d235e0a1a38cecba4fc2c66378fd51e2e995a1525c91768f800b666ad29772 SHA512 11a5e8b06dd0a5febf9d0c67c7ec68ef72b8ddc24636c4d9ef1b9e458074eca3d8f5362cd55a3f2df2d09666dc9e82e5c558608da68a929cdf3a194118df556a
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.10.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.10.ebuild
new file mode 100644
index 000000000000..98d1abfadea8
--- /dev/null
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.15.10.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 a9631c8e32f3..6725b0694c08 100644
--- a/dev-ros/roscpp/Manifest
+++ b/dev-ros/roscpp/Manifest
@@ -1,4 +1,6 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
+EBUILD roscpp-1.15.10.ebuild 606 BLAKE2B b8e78e2ed68bd093f06a3649296603d192b8e2c2632d13146585e5ab506c197ff704a911bf915ee752e67f4dbe24cf5585158d00d06f7014652ab85237003576 SHA512 6066703301141ca2d920c33dcc76e59c8fd4bc8ee428de58490a56989bc91188ed5a52b3df441dca451283a95bdc0f0a9298d5d1ff74649ad753ff1f3964ec7b
 EBUILD roscpp-1.15.9.ebuild 606 BLAKE2B 7c38cba14922e02ec2bbc0c6f0365a66f5c691644f7509ff718cf932b49404c90013156c76a13313c60386a215010b2044fce30f3b3b675575e92717178e8b31 SHA512 3d3c82c30a6dc1195675fa4268a8ce463dfebcdc3e411df45a8222f99554c049a748d18ef2d47fb3d956314414b2e98ae8e913667f5610751b0c023d71fa3236
 EBUILD roscpp-9999.ebuild 606 BLAKE2B 7c38cba14922e02ec2bbc0c6f0365a66f5c691644f7509ff718cf932b49404c90013156c76a13313c60386a215010b2044fce30f3b3b675575e92717178e8b31 SHA512 3d3c82c30a6dc1195675fa4268a8ce463dfebcdc3e411df45a8222f99554c049a748d18ef2d47fb3d956314414b2e98ae8e913667f5610751b0c023d71fa3236
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roscpp/roscpp-1.15.10.ebuild b/dev-ros/roscpp/roscpp-1.15.10.ebuild
new file mode 100644
index 000000000000..7cee4461c7ca
--- /dev/null
+++ b/dev-ros/roscpp/roscpp-1.15.10.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/rosdiagnostic/Manifest b/dev-ros/rosdiagnostic/Manifest
index b36397e3c3fa..9c92fc7c8fe9 100644
--- a/dev-ros/rosdiagnostic/Manifest
+++ b/dev-ros/rosdiagnostic/Manifest
@@ -1,11 +1,13 @@
 DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
 DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
+DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
 DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
 DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
 EBUILD rosdiagnostic-1.10.1.ebuild 467 BLAKE2B 897a7789c638e7e0d54565defbc6f79ca1dc8b669600edb2ba7fbf75a5fc7dda1e2887129d2d87a4348ffb1e337598cdbdc464bae8caf35aa1980021bc40c472 SHA512 8291ea545fc6cd639177c3633cbae271af70ccecd2f7a2fa0c6a375e1852e1c4c94f213caa024fa64560faa88f56ab42328f97f3141bc84e77852bfe80cfff8f
 EBUILD rosdiagnostic-1.10.2.ebuild 467 BLAKE2B 897a7789c638e7e0d54565defbc6f79ca1dc8b669600edb2ba7fbf75a5fc7dda1e2887129d2d87a4348ffb1e337598cdbdc464bae8caf35aa1980021bc40c472 SHA512 8291ea545fc6cd639177c3633cbae271af70ccecd2f7a2fa0c6a375e1852e1c4c94f213caa024fa64560faa88f56ab42328f97f3141bc84e77852bfe80cfff8f
 EBUILD rosdiagnostic-1.10.3.ebuild 467 BLAKE2B 74db2d4dbd883a3d15235d3e26f0bbb545d8cecdfc7a7a9c6f2fade5d1c1ea8db750855662d1d53d535750b408ffc2e492c27f69ca502d9cce359bcc29bed3f3 SHA512 e519a24e329c1676e6fcf97621ba58279017ff4a44294af21c4b97f9585417aca1dbcf87cce97b1cea510dc3aca1dc76e8f21ba57553ec0d0758bf4b23d76f1a
+EBUILD rosdiagnostic-1.10.4.ebuild 467 BLAKE2B 74db2d4dbd883a3d15235d3e26f0bbb545d8cecdfc7a7a9c6f2fade5d1c1ea8db750855662d1d53d535750b408ffc2e492c27f69ca502d9cce359bcc29bed3f3 SHA512 e519a24e329c1676e6fcf97621ba58279017ff4a44294af21c4b97f9585417aca1dbcf87cce97b1cea510dc3aca1dc76e8f21ba57553ec0d0758bf4b23d76f1a
 EBUILD rosdiagnostic-1.9.4.ebuild 467 BLAKE2B 897a7789c638e7e0d54565defbc6f79ca1dc8b669600edb2ba7fbf75a5fc7dda1e2887129d2d87a4348ffb1e337598cdbdc464bae8caf35aa1980021bc40c472 SHA512 8291ea545fc6cd639177c3633cbae271af70ccecd2f7a2fa0c6a375e1852e1c4c94f213caa024fa64560faa88f56ab42328f97f3141bc84e77852bfe80cfff8f
 EBUILD rosdiagnostic-1.9.6.ebuild 467 BLAKE2B 897a7789c638e7e0d54565defbc6f79ca1dc8b669600edb2ba7fbf75a5fc7dda1e2887129d2d87a4348ffb1e337598cdbdc464bae8caf35aa1980021bc40c472 SHA512 8291ea545fc6cd639177c3633cbae271af70ccecd2f7a2fa0c6a375e1852e1c4c94f213caa024fa64560faa88f56ab42328f97f3141bc84e77852bfe80cfff8f
 EBUILD rosdiagnostic-9999.ebuild 467 BLAKE2B 897a7789c638e7e0d54565defbc6f79ca1dc8b669600edb2ba7fbf75a5fc7dda1e2887129d2d87a4348ffb1e337598cdbdc464bae8caf35aa1980021bc40c472 SHA512 8291ea545fc6cd639177c3633cbae271af70ccecd2f7a2fa0c6a375e1852e1c4c94f213caa024fa64560faa88f56ab42328f97f3141bc84e77852bfe80cfff8f
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-1.10.4.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-1.10.4.ebuild
new file mode 100644
index 000000000000..e28046b6462d
--- /dev/null
+++ b/dev-ros/rosdiagnostic/rosdiagnostic-1.10.4.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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command to print aggregated diagnostic contents to the command line"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ros/rosgraph/Manifest b/dev-ros/rosgraph/Manifest
index a3206929c394..9b606f904c9f 100644
--- a/dev-ros/rosgraph/Manifest
+++ b/dev-ros/rosgraph/Manifest
@@ -1,5 +1,7 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD rosgraph-1.15.10.ebuild 710 BLAKE2B bc1be14a2d80c6acf980993059cb6ca0903dc884dddcfbced3d709057f827ba00f5743e99874ea5f0900c837b7f95c05d3ce89c99ce3cf502f226982d901a152 SHA512 3f1a196462ad7125e2384543384e0dfa7909bb974efdb311a9ab6584c8b31eb7fe16099594fb7fd5fa2c7c50e8c0746bf50b4ec3bdcd47f7e1960b203b3c8a9b
 EBUILD rosgraph-1.15.8.ebuild 710 BLAKE2B 950e34d102bc2aa25a4abf3edfe5cc45385467704018fd872354da1b44c1eff914701a0d7c2d3cf8190660fcf0bbff0901217f0009a48472865278defc3a33d0 SHA512 17f5432be62c756cea092e8bafbbcdd5df2d5cbc52b288216b77ec418afca3359812019e5b283edee5a997c4e60bf8413b2edc3f97d9c3841e42b4af4cfd9c92
 EBUILD rosgraph-1.15.9.ebuild 710 BLAKE2B 950e34d102bc2aa25a4abf3edfe5cc45385467704018fd872354da1b44c1eff914701a0d7c2d3cf8190660fcf0bbff0901217f0009a48472865278defc3a33d0 SHA512 17f5432be62c756cea092e8bafbbcdd5df2d5cbc52b288216b77ec418afca3359812019e5b283edee5a997c4e60bf8413b2edc3f97d9c3841e42b4af4cfd9c92
 EBUILD rosgraph-9999.ebuild 710 BLAKE2B 950e34d102bc2aa25a4abf3edfe5cc45385467704018fd872354da1b44c1eff914701a0d7c2d3cf8190660fcf0bbff0901217f0009a48472865278defc3a33d0 SHA512 17f5432be62c756cea092e8bafbbcdd5df2d5cbc52b288216b77ec418afca3359812019e5b283edee5a997c4e60bf8413b2edc3f97d9c3841e42b4af4cfd9c92
diff --git a/dev-ros/rosgraph/rosgraph-1.15.10.ebuild b/dev-ros/rosgraph/rosgraph-1.15.10.ebuild
new file mode 100644
index 000000000000..79863bd48ac7
--- /dev/null
+++ b/dev-ros/rosgraph/rosgraph-1.15.10.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 b06973998de2..8fe934d42c1e 100644
--- a/dev-ros/roslaunch/Manifest
+++ b/dev-ros/roslaunch/Manifest
@@ -4,8 +4,10 @@ AUX roscore.initd 533 BLAKE2B 2ff10e03a6b75128fd72a98022a040b93c32ddba6782912133
 AUX roscore.xml.in 347 BLAKE2B 05c90bd6a2cffeaab16d1fb576e2cbe5768a848c5b6231af930e3e01a32dc3228dfc60aeb4c1d6efe05f8245a948edd2314dcb550f9e80d1acd36461c347ce38 SHA512 fff18b8f4ffdf3f3e6cdc3b33cdb386dabaab769f3bac995cb3c29243c8380b13898cd5892026e9dee459f88f4f05886c052696b2f081fbbb393ade148fda0f6
 AUX roslaunch.confd 46 BLAKE2B 24fcab885cf07185c751da12863e3af0ac8f1097a636c3641be1b6357e26b5178d13ee42d04bbacea27763df075f5436813afc2025dd9013461059b0c5feacd9 SHA512 0a86b0beb7b4bad2c01f3814070d27a3c85a99629ab26fa3aa6cce19d178d500c912665b152403cf7301f210e3cf9e6bd03103c3654b1ef61dae165ba5ac704d
 AUX roslaunch.initd 915 BLAKE2B 11f2c6f2db2ad1084332a1b704a90ed3a3fc9fe671f96f6ca74bbabdab3b7f22bed96c077dd994e3c3fc54eb299e93001167fe16e688eb062033f3da86ac168d SHA512 4f8bb2dfe085d09245ec2343e423e1dacbd02108868c5d9523d63929c939b753f45ce963d5d44b5ad0f547f7d85b82ea6d3a80f8984dfe72ade7f8a5372c850c
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD roslaunch-1.15.10.ebuild 1638 BLAKE2B 0aef70b6a9423d1a01bb703f5bdcb14871d602950c778fc143ac643036645c79b381428ff68db92c23b92a5daa08276ebcde11eb80cab95863bfef49704b3b72 SHA512 889c71478fea43c38557a1e8ab8f3800de5fde0a42479eabff930ad4e0385a6a4c01622e91214fe21c63789e29e5b2a08120076e70da63918f95ec21801f16c2
 EBUILD roslaunch-1.15.8-r1.ebuild 1638 BLAKE2B 3b0bbdda497ad507283016a803a75d67ffaa47c766295f887fcae53ac0cf03622c4497263888b42dc1f705e5699ef443692b1fcad48e950352e2998bea287141 SHA512 2929c876f90e4feb4411f39dc3dabf24bb30858411ca9d5f39f4b956ccbcbaba5cb278d593f9db0b10e69314fdca43c952f4d9b1840d946f6bb01088093f3a8e
 EBUILD roslaunch-1.15.9.ebuild 1638 BLAKE2B 3b0bbdda497ad507283016a803a75d67ffaa47c766295f887fcae53ac0cf03622c4497263888b42dc1f705e5699ef443692b1fcad48e950352e2998bea287141 SHA512 2929c876f90e4feb4411f39dc3dabf24bb30858411ca9d5f39f4b956ccbcbaba5cb278d593f9db0b10e69314fdca43c952f4d9b1840d946f6bb01088093f3a8e
 EBUILD roslaunch-9999.ebuild 1638 BLAKE2B 3b0bbdda497ad507283016a803a75d67ffaa47c766295f887fcae53ac0cf03622c4497263888b42dc1f705e5699ef443692b1fcad48e950352e2998bea287141 SHA512 2929c876f90e4feb4411f39dc3dabf24bb30858411ca9d5f39f4b956ccbcbaba5cb278d593f9db0b10e69314fdca43c952f4d9b1840d946f6bb01088093f3a8e
diff --git a/dev-ros/roslaunch/roslaunch-1.15.10.ebuild b/dev-ros/roslaunch/roslaunch-1.15.10.ebuild
new file mode 100644
index 000000000000..da9d039bce6a
--- /dev/null
+++ b/dev-ros/roslaunch/roslaunch-1.15.10.ebuild
@@ -0,0 +1,61 @@
+# 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 user
+
+DESCRIPTION="Tool for easily launching multiple ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	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
+"
+DEPEND="${RDEPEND}
+	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
+}
+
+pkg_preinst() {
+	enewgroup ros
+	enewuser ros -1 -1 /home/ros ros
+}
diff --git a/dev-ros/roslint/Manifest b/dev-ros/roslint/Manifest
index 0389b3968f66..7c5e36ce8807 100644
--- a/dev-ros/roslint/Manifest
+++ b/dev-ros/roslint/Manifest
@@ -1,4 +1,4 @@
 DIST roslint-0.12.0.tar.gz 103218 BLAKE2B f4396457df4d575a5ffecb5d6aac299c7d614272e5189cd20fcaaf36bc3ac2bbf7aa47806a9b0f7de35d242f93747af5e420d1aea21f69eadc83150b6311aceb SHA512 f533852f193fe0c78940a42bcff0971c3ac71f550a83120414bfcb954ea6c919c50f843e08fb4e3b14f76647676c7adf0fd8bb9dd5f835b4477f3fa8b39f25d7
-EBUILD roslint-0.12.0.ebuild 426 BLAKE2B 1f44c5bd09a34648055e9d36eea98911c3d4df2cbd0b5fcc51fbd87eb2131d1fc42b8dc4a55003e66e9953bd8d6080cd3570c8a9eee1e828ce70fcb1a1bcc67b SHA512 c30285715279a27878d7c4c4579e094233ae00a2169264acb6ca054a112188f9192c92e36705714762c076778e3f7893d3ef502f4336ff58b92756c10a0f3789
-EBUILD roslint-9999.ebuild 426 BLAKE2B 1f44c5bd09a34648055e9d36eea98911c3d4df2cbd0b5fcc51fbd87eb2131d1fc42b8dc4a55003e66e9953bd8d6080cd3570c8a9eee1e828ce70fcb1a1bcc67b SHA512 c30285715279a27878d7c4c4579e094233ae00a2169264acb6ca054a112188f9192c92e36705714762c076778e3f7893d3ef502f4336ff58b92756c10a0f3789
+EBUILD roslint-0.12.0.ebuild 426 BLAKE2B 571e121bf5cd7e77113ad44343c2624ea50bcdaf6d090e601dbb4de49281fef534ecfafdff8ab2c1d0078b8f8749accd2e901469e85b2fc234c20dda78179a2c SHA512 dff00bc170aa30dbbb481791aaa52cd3cabc164c428eea6660395714e1bcaea1b7099d8179e67b0b196f74930097ba21649856fdfb2a7f65ba127aef748d0838
+EBUILD roslint-9999.ebuild 426 BLAKE2B 571e121bf5cd7e77113ad44343c2624ea50bcdaf6d090e601dbb4de49281fef534ecfafdff8ab2c1d0078b8f8749accd2e901469e85b2fc234c20dda78179a2c SHA512 dff00bc170aa30dbbb481791aaa52cd3cabc164c428eea6660395714e1bcaea1b7099d8179e67b0b196f74930097ba21649856fdfb2a7f65ba127aef748d0838
 MISC metadata.xml 325 BLAKE2B f8a1852943299f6b6878c64d48c12ea7f26f8e14cc010cb8153c9c8a69e290c0b08fb3cb04ccc9f7b0fcd36d8acfe6a18df8e7c703235824f1b9adf5c5a4d66a SHA512 e9e099e4c6561ab2d69ce77611b9380b031695d7171fae4abe83cfe370237c03be08c4e54cd7cbbb439fcd3c2a2512a4d2a2a76fc6b9df8218dadd5e2b8d1aea
diff --git a/dev-ros/roslint/roslint-0.12.0.ebuild b/dev-ros/roslint/roslint-0.12.0.ebuild
index 58b60db84260..eff6b00931fb 100644
--- a/dev-ros/roslint/roslint-0.12.0.ebuild
+++ b/dev-ros/roslint/roslint-0.12.0.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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/roslint"
 KEYWORDS="~amd64 ~arm"
 
+CMAKE_MAKEFILE_GENERATOR="emake" # https://bugs.gentoo.org/738584
 inherit ros-catkin
 
 DESCRIPTION="Static checking of Python or C++ source code for errors and standards compliance"
@@ -14,4 +15,3 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
-CMAKE_MAKEFILE_GENERATOR="emake" # https://bugs.gentoo.org/738584
diff --git a/dev-ros/roslint/roslint-9999.ebuild b/dev-ros/roslint/roslint-9999.ebuild
index 58b60db84260..eff6b00931fb 100644
--- a/dev-ros/roslint/roslint-9999.ebuild
+++ b/dev-ros/roslint/roslint-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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/roslint"
 KEYWORDS="~amd64 ~arm"
 
+CMAKE_MAKEFILE_GENERATOR="emake" # https://bugs.gentoo.org/738584
 inherit ros-catkin
 
 DESCRIPTION="Static checking of Python or C++ source code for errors and standards compliance"
@@ -14,4 +15,3 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
-CMAKE_MAKEFILE_GENERATOR="emake" # https://bugs.gentoo.org/738584
diff --git a/dev-ros/roslz4/Manifest b/dev-ros/roslz4/Manifest
index 1ee836473d2e..2784f22fd507 100644
--- a/dev-ros/roslz4/Manifest
+++ b/dev-ros/roslz4/Manifest
@@ -1,5 +1,7 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD roslz4-1.15.10.ebuild 423 BLAKE2B ee04baf38a91a0d5a0cda63d01dd680343998aab1b0d97ad7f5858df17df4189f2565c1c592d2f1c00b317d38f3df4db221970b8ce52fb6ba4cfd58b42029a69 SHA512 5154747f57c5529cd781f3542abe7cbdc4c7a6b94ddfbb2c9521ad00d98ffeaa3ccd9546580e77a6e9aa34e6f3ec15479d0a6c9f23f3a9036a0c1996adff49e2
 EBUILD roslz4-1.15.8.ebuild 423 BLAKE2B 07733e7ff6a8499ee8b776196447a3cf96447c56546e347301460aef88599ef435b0df425485b5cd6a690d087b5f76e4fb63b4f09d638f9d882af859ef6a52e2 SHA512 f3ba822f1e1e7c1bec61e1e3b607fb0db2724c48e84c898e9510731bc96daa5d6bb63abf84fb93d6ced24e74d88370f7ddbfa18a788b08b7a3680df5cc5e1b2e
 EBUILD roslz4-1.15.9.ebuild 423 BLAKE2B 07733e7ff6a8499ee8b776196447a3cf96447c56546e347301460aef88599ef435b0df425485b5cd6a690d087b5f76e4fb63b4f09d638f9d882af859ef6a52e2 SHA512 f3ba822f1e1e7c1bec61e1e3b607fb0db2724c48e84c898e9510731bc96daa5d6bb63abf84fb93d6ced24e74d88370f7ddbfa18a788b08b7a3680df5cc5e1b2e
 EBUILD roslz4-9999.ebuild 423 BLAKE2B 07733e7ff6a8499ee8b776196447a3cf96447c56546e347301460aef88599ef435b0df425485b5cd6a690d087b5f76e4fb63b4f09d638f9d882af859ef6a52e2 SHA512 f3ba822f1e1e7c1bec61e1e3b607fb0db2724c48e84c898e9510731bc96daa5d6bb63abf84fb93d6ced24e74d88370f7ddbfa18a788b08b7a3680df5cc5e1b2e
diff --git a/dev-ros/roslz4/roslz4-1.15.10.ebuild b/dev-ros/roslz4/roslz4-1.15.10.ebuild
new file mode 100644
index 000000000000..bcbd9d65b47d
--- /dev/null
+++ b/dev-ros/roslz4/roslz4-1.15.10.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 77a799d9d2cc..6f4051c73e32 100644
--- a/dev-ros/rosmaster/Manifest
+++ b/dev-ros/rosmaster/Manifest
@@ -1,6 +1,8 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD rosmaster-1.15.10.ebuild 512 BLAKE2B a25499b4aaeb75dab3fa4c4dc78b06dfd06e4f80dd177110d09fb9a2d0f3f4ed79e043173ddcfd2cfd97495fe5e417afb5dd868b7729c521b584f501e30a7ead SHA512 2b85897d594e2b727b977ba1058b1e2e6f359a2491799a04527b1ba3a867636a625c81498a1f892cfab68e987398544362397da19466c9dfc949819e5d12067f
 EBUILD rosmaster-1.15.7.ebuild 512 BLAKE2B 2bc45ed2f61251e6c25fe3caaf50536f5379356d9aacd1840d1011ce17cd8954a5ffd1dfa2e9164afd6c0b03ed77c4e9a6f73ad0f1f071c1e9c086f666d73e01 SHA512 f07ee64c88f466b5bcd95cf59a43340aca286e9367b9a9c4975cbd6cfee013389062b6d08e87828bbd55a6e732bb16dd12b297703aae324d4b158de39d47ce99
 EBUILD rosmaster-1.15.8.ebuild 512 BLAKE2B 2bc45ed2f61251e6c25fe3caaf50536f5379356d9aacd1840d1011ce17cd8954a5ffd1dfa2e9164afd6c0b03ed77c4e9a6f73ad0f1f071c1e9c086f666d73e01 SHA512 f07ee64c88f466b5bcd95cf59a43340aca286e9367b9a9c4975cbd6cfee013389062b6d08e87828bbd55a6e732bb16dd12b297703aae324d4b158de39d47ce99
 EBUILD rosmaster-1.15.9.ebuild 512 BLAKE2B 2bc45ed2f61251e6c25fe3caaf50536f5379356d9aacd1840d1011ce17cd8954a5ffd1dfa2e9164afd6c0b03ed77c4e9a6f73ad0f1f071c1e9c086f666d73e01 SHA512 f07ee64c88f466b5bcd95cf59a43340aca286e9367b9a9c4975cbd6cfee013389062b6d08e87828bbd55a6e732bb16dd12b297703aae324d4b158de39d47ce99
diff --git a/dev-ros/rosmaster/rosmaster-1.15.10.ebuild b/dev-ros/rosmaster/rosmaster-1.15.10.ebuild
new file mode 100644
index 000000000000..44c1207c39a0
--- /dev/null
+++ b/dev-ros/rosmaster/rosmaster-1.15.10.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 f45945b4eb1c..5a9d85d8368a 100644
--- a/dev-ros/rosmsg/Manifest
+++ b/dev-ros/rosmsg/Manifest
@@ -1,5 +1,4 @@
-AUX duplicates.patch 634 BLAKE2B a856eca55e0e293bd61054dfad52f95bee785eb70dcc32018104800241f960702c15547b52836e0080a7b3f46b5961af4ff0aea591cadf46500d64803b24c192 SHA512 e1bc63c9d765b41b6a42d033877ca4b5041729a7e6d19b747c6681b5c84d6e2a6197d8f2812f6243dbff86fc7ffbf6264a09e2f8935e8da1bfd9f92284e42a3e
-DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
-EBUILD rosmsg-1.15.9.ebuild 763 BLAKE2B ab90d989f27cd1a5fa81b9740f48b946466d7527cfe5b94f08cb61dcf36f49952633f8e274def64933d9dd8729ccc947b9f72669d7da9e5ec5cb9392eb3f3801 SHA512 8725f91c7f1a84507c46246af3efb01866f685ac10000b90ee8b32a648dac4c8c6bb0bdd3c162f9aae15baf597c07ceb07a437f7da0eb0614181f819f9de47f7
-EBUILD rosmsg-9999.ebuild 624 BLAKE2B 44c0cc3aef9ef0727ab783de6e4cb92457775ed5fb93f9a22bf395ee48dd0fbdaeac2a2db2c7c62717bdac30c255ca4ba9b45da419671e9fa898726260fbb072 SHA512 0e64f192a34a18baa5d4d9a0e3d1172657d6c2c9bca04238cfaabfbff3344733c2e044796aaf2bb39a25504d1fba2c85b33c414656f27b1cfb6e8668eac80394
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+EBUILD rosmsg-1.15.10.ebuild 1004 BLAKE2B 44fc7c48bd1c7180d2ad189969dc4ae3e7e77009f84361f0f75f328727fc0dfe4f97cf7d5ffbdb686359ecb69e371b45c41a57019d684e72ec3e64fc119141e4 SHA512 c04019456247c996ea0eb2600d28f7d5e298cb37ee784f433b67bff7185d36ec267e9d7d87419f956cfa4c31d42070446d2162049031bbfa071872a0f8e26f5f
+EBUILD rosmsg-9999.ebuild 1004 BLAKE2B 44fc7c48bd1c7180d2ad189969dc4ae3e7e77009f84361f0f75f328727fc0dfe4f97cf7d5ffbdb686359ecb69e371b45c41a57019d684e72ec3e64fc119141e4 SHA512 c04019456247c996ea0eb2600d28f7d5e298cb37ee784f433b67bff7185d36ec267e9d7d87419f956cfa4c31d42070446d2162049031bbfa071872a0f8e26f5f
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosmsg/files/duplicates.patch b/dev-ros/rosmsg/files/duplicates.patch
deleted file mode 100644
index 4705f00d2e85..000000000000
--- a/dev-ros/rosmsg/files/duplicates.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rosmsg/src/rosmsg/__init__.py
-===================================================================
---- rosmsg.orig/src/rosmsg/__init__.py
-+++ rosmsg/src/rosmsg/__init__.py
-@@ -618,7 +618,7 @@ def rosmsg_cmd_show(mode, full, alias='s
-         if '/' in arg: #package specified
-             rosmsg_debug(rospack, mode, arg, options.raw)
-         else:
--            found_msgs = list(rosmsg_search(rospack, mode, arg))
-+            found_msgs = list(dict.fromkeys(rosmsg_search(rospack, mode, arg)))
-             if not found_msgs:
-                 print("Could not find msg '%s'" % arg, file=sys.stderr)
-                 return 1
diff --git a/dev-ros/rosmsg/rosmsg-1.15.9.ebuild b/dev-ros/rosmsg/rosmsg-1.15.10.ebuild
index c750959458b6..d4be4db4044c 100644
--- a/dev-ros/rosmsg/rosmsg-1.15.9.ebuild
+++ b/dev-ros/rosmsg/rosmsg-1.15.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,11 +21,15 @@ RDEPEND="
 	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}] )
+	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}]
+	)
 "
-PATCHES=( "${FILESDIR}/duplicates.patch" )
 
 src_test() {
-	export ROS_PACKAGE_PATH="${S}/../../:${ROS_PACKAGE_PATH}"
+	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/rosmsg/rosmsg-9999.ebuild b/dev-ros/rosmsg/rosmsg-9999.ebuild
index ba0d62bb080b..d4be4db4044c 100644
--- a/dev-ros/rosmsg/rosmsg-9999.ebuild
+++ b/dev-ros/rosmsg/rosmsg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,5 +21,15 @@ RDEPEND="
 	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}] )
+	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 761d6fc13e66..842344a0f487 100644
--- a/dev-ros/rosnode/Manifest
+++ b/dev-ros/rosnode/Manifest
@@ -1,5 +1,7 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD rosnode-1.15.10.ebuild 658 BLAKE2B 5e7abe60f4ee02dbf749d1c39a25bbaceeb379553faa6f4607dcb0459d7fab7f3c81e1a8e702c36002cf764e14012bdf67d1d47d8bed3acb81b57cb18271c82f SHA512 bbc3f5f60cf01ee7e5d5dd69b639ce9464bfecf979c191c648aa531e4e4574fc4a606662d3cc4b13599b69de38b98d4c0d97ee0d4267c5472c2d3b3963e53e04
 EBUILD rosnode-1.15.8.ebuild 658 BLAKE2B e710cb82de78e27e96fd40f3b64b5f519d7330a9b717a34cc5f5f6c8af0939bdbd19a4a0d4171d775c3aa198e6dd7230f14eec2a9136ed999d190480c36a938d SHA512 f0f1f6570efb644397de72efc476af299fe6ff6c7401473890cfac3dac994c80c8c6660268da17067c868cf6ec8f8d39811067e61b0c5ff0e4e13f459fe9e06c
 EBUILD rosnode-1.15.9.ebuild 658 BLAKE2B e710cb82de78e27e96fd40f3b64b5f519d7330a9b717a34cc5f5f6c8af0939bdbd19a4a0d4171d775c3aa198e6dd7230f14eec2a9136ed999d190480c36a938d SHA512 f0f1f6570efb644397de72efc476af299fe6ff6c7401473890cfac3dac994c80c8c6660268da17067c868cf6ec8f8d39811067e61b0c5ff0e4e13f459fe9e06c
 EBUILD rosnode-9999.ebuild 658 BLAKE2B e710cb82de78e27e96fd40f3b64b5f519d7330a9b717a34cc5f5f6c8af0939bdbd19a4a0d4171d775c3aa198e6dd7230f14eec2a9136ed999d190480c36a938d SHA512 f0f1f6570efb644397de72efc476af299fe6ff6c7401473890cfac3dac994c80c8c6660268da17067c868cf6ec8f8d39811067e61b0c5ff0e4e13f459fe9e06c
diff --git a/dev-ros/rosnode/rosnode-1.15.10.ebuild b/dev-ros/rosnode/rosnode-1.15.10.ebuild
new file mode 100644
index 000000000000..991a2183e013
--- /dev/null
+++ b/dev-ros/rosnode/rosnode-1.15.10.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 d176da41d162..6e1e7db5e02d 100644
--- a/dev-ros/rosout/Manifest
+++ b/dev-ros/rosout/Manifest
@@ -1,6 +1,8 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD rosout-1.15.10.ebuild 445 BLAKE2B 93d2a83966d5d04e40a269e47c22afa993f6f4d2380c3d7f90ff32c9c327ec0b22339772e493530bdeb68867038008aadafc9139ac46e33e65cb033a7e8a0aea SHA512 a1b6d7242d722f62132aa155570a41aa2b8c3048ee56676e45357e11361c89b023b67be31b0fef848cd8e448b59f5852849d32e215895cfb9816570c6e126913
 EBUILD rosout-1.15.7.ebuild 445 BLAKE2B 962dda734a0d479db9be66e9413414d687dde713c768b944c66c752bfd313ca6d9c4eab5a888d57e3abec45c638b37b3a5b8730378a54398949c0a00d6dad1dc SHA512 8808989a59d0f18d340a05513d107ce0b11063737e869b20e2f97eb49acd5f967a3229de4fceccb2b0c60beaf76fcfa5aeb8415758ff6ce3fcfb22e9002e715a
 EBUILD rosout-1.15.8.ebuild 445 BLAKE2B 962dda734a0d479db9be66e9413414d687dde713c768b944c66c752bfd313ca6d9c4eab5a888d57e3abec45c638b37b3a5b8730378a54398949c0a00d6dad1dc SHA512 8808989a59d0f18d340a05513d107ce0b11063737e869b20e2f97eb49acd5f967a3229de4fceccb2b0c60beaf76fcfa5aeb8415758ff6ce3fcfb22e9002e715a
 EBUILD rosout-1.15.9.ebuild 445 BLAKE2B 962dda734a0d479db9be66e9413414d687dde713c768b944c66c752bfd313ca6d9c4eab5a888d57e3abec45c638b37b3a5b8730378a54398949c0a00d6dad1dc SHA512 8808989a59d0f18d340a05513d107ce0b11063737e869b20e2f97eb49acd5f967a3229de4fceccb2b0c60beaf76fcfa5aeb8415758ff6ce3fcfb22e9002e715a
diff --git a/dev-ros/rosout/rosout-1.15.10.ebuild b/dev-ros/rosout/rosout-1.15.10.ebuild
new file mode 100644
index 000000000000..f6b95451b596
--- /dev/null
+++ b/dev-ros/rosout/rosout-1.15.10.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 d543f94b35b3..ee4efa984123 100644
--- a/dev-ros/rosparam/Manifest
+++ b/dev-ros/rosparam/Manifest
@@ -1,6 +1,8 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD rosparam-1.15.10.ebuild 492 BLAKE2B 3d8ca72560a2be15028255af1ad9f0e926f43b76bfcf4c0ee1fd43549ea7466fb1b070a421f2bb8e9299c0ba9d54b9ec126b5099b975fa88389976dfc78e80b3 SHA512 f57762ce39deaa4f2698aa3c9f8ae5471b05e4c6eee714f3639bf7a8dfc247a5cbcbc40f7ba99d6faf91d0ea59cc9d052b79c9b687d47f051ee24fae44894469
 EBUILD rosparam-1.15.7.ebuild 492 BLAKE2B acccae97699f0557ba8467d767f476a6ad54bfb5770437f1bab2a302aed2c30b3ec974c428c9077a34c5a997f6843fb9a7151651b74ff9fcc4acf4de1a5b03f1 SHA512 8856c8d723b12d48b6edc4bd4ecc69c9b3f277b38e949e843672a52766ede0c4e6a57c8fdec23cde3f9afa769caffe29acf7a2526496bbd37aabf8794cb3e75e
 EBUILD rosparam-1.15.8.ebuild 492 BLAKE2B acccae97699f0557ba8467d767f476a6ad54bfb5770437f1bab2a302aed2c30b3ec974c428c9077a34c5a997f6843fb9a7151651b74ff9fcc4acf4de1a5b03f1 SHA512 8856c8d723b12d48b6edc4bd4ecc69c9b3f277b38e949e843672a52766ede0c4e6a57c8fdec23cde3f9afa769caffe29acf7a2526496bbd37aabf8794cb3e75e
 EBUILD rosparam-1.15.9.ebuild 492 BLAKE2B acccae97699f0557ba8467d767f476a6ad54bfb5770437f1bab2a302aed2c30b3ec974c428c9077a34c5a997f6843fb9a7151651b74ff9fcc4acf4de1a5b03f1 SHA512 8856c8d723b12d48b6edc4bd4ecc69c9b3f277b38e949e843672a52766ede0c4e6a57c8fdec23cde3f9afa769caffe29acf7a2526496bbd37aabf8794cb3e75e
diff --git a/dev-ros/rosparam/rosparam-1.15.10.ebuild b/dev-ros/rosparam/rosparam-1.15.10.ebuild
new file mode 100644
index 000000000000..61ac1e322a5d
--- /dev/null
+++ b/dev-ros/rosparam/rosparam-1.15.10.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 8ad6535b60be..3334a7f2739c 100644
--- a/dev-ros/rospy/Manifest
+++ b/dev-ros/rospy/Manifest
@@ -1,6 +1,8 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD rospy-1.15.10.ebuild 727 BLAKE2B ed3f1431e8f954adc67a1284d387bd6e5afbbb8380d3f98d5a0308f3192fc743fccda2670a09316f2f03749fd40634190a85671299984cd9fcf62ba9335f0726 SHA512 f4663f6221e330c7d902fc948032daff726f0b78b301eecee22c6a746ba2ae55f9cebc093cf7f875ccb21a0abf178c1cf2da6afda512325d3428908e8fbc6060
 EBUILD rospy-1.15.7.ebuild 727 BLAKE2B 896a986416606452c618e6a5b22900895844158a39f12de9adea1360895efadaf436dbf932373d82dfdf84da62c38b6a0fb53453b7dd47810f49cf1768cac0d5 SHA512 fd0517eebfcf2c58d894ad66e7a99371a942d955f7bf0b8db8e8fc81ce9a2be7abff9e82f66f843739358c8f431d74fa73e9185dcfd037cfc9c55a9804d9eb21
 EBUILD rospy-1.15.8.ebuild 727 BLAKE2B 896a986416606452c618e6a5b22900895844158a39f12de9adea1360895efadaf436dbf932373d82dfdf84da62c38b6a0fb53453b7dd47810f49cf1768cac0d5 SHA512 fd0517eebfcf2c58d894ad66e7a99371a942d955f7bf0b8db8e8fc81ce9a2be7abff9e82f66f843739358c8f431d74fa73e9185dcfd037cfc9c55a9804d9eb21
 EBUILD rospy-1.15.9.ebuild 727 BLAKE2B 896a986416606452c618e6a5b22900895844158a39f12de9adea1360895efadaf436dbf932373d82dfdf84da62c38b6a0fb53453b7dd47810f49cf1768cac0d5 SHA512 fd0517eebfcf2c58d894ad66e7a99371a942d955f7bf0b8db8e8fc81ce9a2be7abff9e82f66f843739358c8f431d74fa73e9185dcfd037cfc9c55a9804d9eb21
diff --git a/dev-ros/rospy/rospy-1.15.10.ebuild b/dev-ros/rospy/rospy-1.15.10.ebuild
new file mode 100644
index 000000000000..47344d9c9de6
--- /dev/null
+++ b/dev-ros/rospy/rospy-1.15.10.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 c6ba5d749e94..c2017eb445ec 100644
--- a/dev-ros/rosservice/Manifest
+++ b/dev-ros/rosservice/Manifest
@@ -1,6 +1,8 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD rosservice-1.15.10.ebuild 526 BLAKE2B 3b9ea5d200f431087ce8fbc675b42adb19818bb100260e5a8128a6ac56c48442bf3629ec434a48bc4531c164194a693111f62fb21c76c0f0adc58c00bd6bf12b SHA512 4ddb1476e18efd87b1fc017222ee64961f9e9417008bc32a6dbc3b1db926c018b7772fbdd78da9cbe229968ecd4fe33f5486fa6d20e51d98a50f61e05d055196
 EBUILD rosservice-1.15.7.ebuild 526 BLAKE2B 8cb13efa66e3c5195c6e068ea35383b2a787cab7bfc194a9e849c9cfd85be0c4f41ff69550acbb98be97ae492fcc515fbf759cffb58b569a1f10973cf30109ff SHA512 52e5e56b6ddbd78c13c94ac71cb159730dcf2ce914c84279b1cbdb2b1ae53bb85d89cb2d93e1e4749f38816faa5fa7dd3a645630c06cea6541a554d48a108105
 EBUILD rosservice-1.15.8.ebuild 526 BLAKE2B 8cb13efa66e3c5195c6e068ea35383b2a787cab7bfc194a9e849c9cfd85be0c4f41ff69550acbb98be97ae492fcc515fbf759cffb58b569a1f10973cf30109ff SHA512 52e5e56b6ddbd78c13c94ac71cb159730dcf2ce914c84279b1cbdb2b1ae53bb85d89cb2d93e1e4749f38816faa5fa7dd3a645630c06cea6541a554d48a108105
 EBUILD rosservice-1.15.9.ebuild 526 BLAKE2B 8cb13efa66e3c5195c6e068ea35383b2a787cab7bfc194a9e849c9cfd85be0c4f41ff69550acbb98be97ae492fcc515fbf759cffb58b569a1f10973cf30109ff SHA512 52e5e56b6ddbd78c13c94ac71cb159730dcf2ce914c84279b1cbdb2b1ae53bb85d89cb2d93e1e4749f38816faa5fa7dd3a645630c06cea6541a554d48a108105
diff --git a/dev-ros/rosservice/rosservice-1.15.10.ebuild b/dev-ros/rosservice/rosservice-1.15.10.ebuild
new file mode 100644
index 000000000000..a7c61cee1d7d
--- /dev/null
+++ b/dev-ros/rosservice/rosservice-1.15.10.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 606717593e37..476087fa1ade 100644
--- a/dev-ros/rostest/Manifest
+++ b/dev-ros/rostest/Manifest
@@ -1,5 +1,7 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD rostest-1.15.10.ebuild 739 BLAKE2B 3d0a3e5597a78cea7f107b15137490b768d6c3f97db7c2559123918cd483c88facec35d5db7b125a97cba46b02a91d07dcddaa35b227e379c087f6ce239cfd50 SHA512 b61d4994d9c504edf4b877406d32b3979e32efd13abb6a0d2d6e0297a41564c5c62ba0635dd53ecb6bfd10ad28cc5fbd1077033a9926879c6113831d20e889cc
 EBUILD rostest-1.15.8.ebuild 739 BLAKE2B 453895ae38b9f9e6a3e2e7512ad64e9c3796a88a9ca571af350e0205e135c20f5a7bfe7efc22d20511cf0ea02da646bc55f34833ca50aa6bf809637bc48bb2e0 SHA512 148e5465bc6de907327105531b669fd30fce4fdeb31de101d3992315272069611bccfa688db08dea45da495b8e2320f1a84420769a439705b0443da9be9e233d
 EBUILD rostest-1.15.9.ebuild 739 BLAKE2B 453895ae38b9f9e6a3e2e7512ad64e9c3796a88a9ca571af350e0205e135c20f5a7bfe7efc22d20511cf0ea02da646bc55f34833ca50aa6bf809637bc48bb2e0 SHA512 148e5465bc6de907327105531b669fd30fce4fdeb31de101d3992315272069611bccfa688db08dea45da495b8e2320f1a84420769a439705b0443da9be9e233d
 EBUILD rostest-9999.ebuild 739 BLAKE2B 453895ae38b9f9e6a3e2e7512ad64e9c3796a88a9ca571af350e0205e135c20f5a7bfe7efc22d20511cf0ea02da646bc55f34833ca50aa6bf809637bc48bb2e0 SHA512 148e5465bc6de907327105531b669fd30fce4fdeb31de101d3992315272069611bccfa688db08dea45da495b8e2320f1a84420769a439705b0443da9be9e233d
diff --git a/dev-ros/rostest/rostest-1.15.10.ebuild b/dev-ros/rostest/rostest-1.15.10.ebuild
new file mode 100644
index 000000000000..8bc19ae4a695
--- /dev/null
+++ b/dev-ros/rostest/rostest-1.15.10.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 62119feacaa3..794f6419a048 100644
--- a/dev-ros/rostopic/Manifest
+++ b/dev-ros/rostopic/Manifest
@@ -1,5 +1,7 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD rostopic-1.15.10.ebuild 661 BLAKE2B 3fb5d2acef06664f880d1af9147943b5384ce44a109e857d0f7f9d70870978e08760b9fb67dc7e65da59ef7c8221652bfa695475a1e6ae1899f7c50f5528e61c SHA512 85a8481a49ae471fcd1c95e4fca5675ef5ba0435c1d0e898cf621a8ccd12cd421922bb12b9b567620c3d3322928698b17683d8966226a4579ad5606b5ba3e213
 EBUILD rostopic-1.15.8.ebuild 661 BLAKE2B d33853c2b2aefa1b73d391d516146c63842c01332ebd99feea7faea2bc842cde957ddb7cab481dfdda934e04a53d567bdb97a3886b76525ddddeb06409ca1551 SHA512 8812788df4dbd5f760cf65238d0482022bab1f2ee421e9614000e843019a5ba7b56f11f0c2f00891c19f203569d840680f8b00079b4b15ea56ef31f2e6f1f7af
 EBUILD rostopic-1.15.9.ebuild 661 BLAKE2B d33853c2b2aefa1b73d391d516146c63842c01332ebd99feea7faea2bc842cde957ddb7cab481dfdda934e04a53d567bdb97a3886b76525ddddeb06409ca1551 SHA512 8812788df4dbd5f760cf65238d0482022bab1f2ee421e9614000e843019a5ba7b56f11f0c2f00891c19f203569d840680f8b00079b4b15ea56ef31f2e6f1f7af
 EBUILD rostopic-9999.ebuild 661 BLAKE2B d33853c2b2aefa1b73d391d516146c63842c01332ebd99feea7faea2bc842cde957ddb7cab481dfdda934e04a53d567bdb97a3886b76525ddddeb06409ca1551 SHA512 8812788df4dbd5f760cf65238d0482022bab1f2ee421e9614000e843019a5ba7b56f11f0c2f00891c19f203569d840680f8b00079b4b15ea56ef31f2e6f1f7af
diff --git a/dev-ros/rostopic/rostopic-1.15.10.ebuild b/dev-ros/rostopic/rostopic-1.15.10.ebuild
new file mode 100644
index 000000000000..9ea612e200ff
--- /dev/null
+++ b/dev-ros/rostopic/rostopic-1.15.10.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 25b2beb62c69..6163990393fc 100644
--- a/dev-ros/roswtf/Manifest
+++ b/dev-ros/roswtf/Manifest
@@ -1,5 +1,7 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD roswtf-1.15.10.ebuild 1251 BLAKE2B 7e1a6dedbaf7d355990c29b1be423dc41528ccc2cd9901d4d517691056e44ec2ba776c1f0c57f21c9ee6f44250507d4872894f62a1480ca357ba63f7a80a3ff5 SHA512 d6b205648ef5482263076bf5344d0628c3f7fca525e4e7b20ba257974fa8f43f1252acb33d7392bd343d32a026c1551676f9f62758a18b01644d2984cbed7b99
 EBUILD roswtf-1.15.8.ebuild 1251 BLAKE2B 303c0c50720d47750aa73ad06e3140fa732339c5ba7c9f848fc883305fc557a24a01a04b272aee46a56a9ffc686990666c3f47fb1e00f643d53dba24e8b1627b SHA512 8f0703e03fba1f02852ca921347733299c7950eecb49be7bd854e4ffd5b0f3996a4cda5d393711f5ca2e6b110420e3438899c1ef75cbd8d668c9c7792b52a64e
 EBUILD roswtf-1.15.9.ebuild 1251 BLAKE2B 303c0c50720d47750aa73ad06e3140fa732339c5ba7c9f848fc883305fc557a24a01a04b272aee46a56a9ffc686990666c3f47fb1e00f643d53dba24e8b1627b SHA512 8f0703e03fba1f02852ca921347733299c7950eecb49be7bd854e4ffd5b0f3996a4cda5d393711f5ca2e6b110420e3438899c1ef75cbd8d668c9c7792b52a64e
 EBUILD roswtf-9999.ebuild 1251 BLAKE2B 303c0c50720d47750aa73ad06e3140fa732339c5ba7c9f848fc883305fc557a24a01a04b272aee46a56a9ffc686990666c3f47fb1e00f643d53dba24e8b1627b SHA512 8f0703e03fba1f02852ca921347733299c7950eecb49be7bd854e4ffd5b0f3996a4cda5d393711f5ca2e6b110420e3438899c1ef75cbd8d668c9c7792b52a64e
diff --git a/dev-ros/roswtf/roswtf-1.15.10.ebuild b/dev-ros/roswtf/roswtf-1.15.10.ebuild
new file mode 100644
index 000000000000..4e877541ab42
--- /dev/null
+++ b/dev-ros/roswtf/roswtf-1.15.10.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/rqt_plot/Manifest b/dev-ros/rqt_plot/Manifest
index 94445d999e42..adafd4a6970c 100644
--- a/dev-ros/rqt_plot/Manifest
+++ b/dev-ros/rqt_plot/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_plot-0.4.12.tar.gz 19862 BLAKE2B b98e9d3c5862674997e6e6792332beae945a798eadb8ca0fd5b9d105fa04e6fe9a36033d48535d1918b5f3ab6d40cc5c3e0babae7e55079f013f4acd998dbdbc SHA512 adb20495b1c7402fda5685afe300d25ea7117fbe540025588c0fc30bf5791f408286a8ba9101dafd97d88a11e5561cd0f1b8c35e868bf979b6c5833b3c9f85e6
-EBUILD rqt_plot-0.4.12.ebuild 1026 BLAKE2B 147f73f1513eb2b0fb0277838264cae156c1f50e13ec4576632b8096bd30f1a4c6f366cb125cba80e91615077b2ca405a17438e6af931dfeef933d32a458dc5b SHA512 471f7cd60e7af6a9c2b6eff17c59ddb88ad99aabff2fcba46a8c567f2aadfe91e480467168248dda80688f2a366e0eec14f945b140d8be1b179de664c2cfb357
+DIST rqt_plot-0.4.13.tar.gz 20082 BLAKE2B 89d3653fddf7db0beae573aefcd115258db5e05e0a41a00fcdcbad70779a0e0e64a6b7fa5aff4b620af2099b6af424f5b235f7e7c25bb64b35b46a0a26c05bff SHA512 dc1a94ec74050313f7c6dcc308f56afff8e4fb31f9f8679e9d6f341e6d77f63ba94fc53c57ecde1a472f9b8c26c8d14307b8451ca7fb6c3fcf77f4b0a4bdcb6a
+EBUILD rqt_plot-0.4.13.ebuild 1026 BLAKE2B 97d48fdaf88711b8acb1d8603a4c864c689e3fe1a85456970b76b2a405588472d4475ec0767d69c6cf5a92bc6ad0e803b39fc6a2fbdc850f9bb061b1d239af86 SHA512 9a321883121d79bbd9b013f5b6fe947f98dfa7b0786b982ea33d29ae8e190f7572c99752fa1d6c8a93792e2c936f3df5771eca590ba25ee34c6c4ba578370d6c
 EBUILD rqt_plot-9999.ebuild 1026 BLAKE2B 147f73f1513eb2b0fb0277838264cae156c1f50e13ec4576632b8096bd30f1a4c6f366cb125cba80e91615077b2ca405a17438e6af931dfeef933d32a458dc5b SHA512 471f7cd60e7af6a9c2b6eff17c59ddb88ad99aabff2fcba46a8c567f2aadfe91e480467168248dda80688f2a366e0eec14f945b140d8be1b179de664c2cfb357
 MISC metadata.xml 340 BLAKE2B ee1e844a5600f4b8d81b5fcba490547da1428d73df295887987360255cce0c90530dd36f6d6cc3b49c7348e1c8f59196c8d812f18b211aa0ae1afc6437058c99 SHA512 50ba9ca4bdbaea86622fdf825491641172ee07f413fed602f8aad0f5f8e3b0dcfdbb88100863a53b9d550dd9d3b038462873b06b8a3012280a57ffe3b35e3421
diff --git a/dev-ros/rqt_plot/rqt_plot-0.4.12.ebuild b/dev-ros/rqt_plot/rqt_plot-0.4.13.ebuild
index 84ec25dcda92..cd9938c0d4f2 100644
--- a/dev-ros/rqt_plot/rqt_plot-0.4.12.ebuild
+++ b/dev-ros/rqt_plot/rqt_plot-0.4.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-ros/rqt_reconfigure/Manifest b/dev-ros/rqt_reconfigure/Manifest
index 88ffa83f39dc..c4d03b062764 100644
--- a/dev-ros/rqt_reconfigure/Manifest
+++ b/dev-ros/rqt_reconfigure/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_reconfigure-0.5.3.tar.gz 31439 BLAKE2B 2af1c2e0fd4c8b57ff0af077bc112198fd9454a11e715492c6ab38c1b3a52833d8257f9a64ebc4ed9e030c09b6154c312969844b3e6200f7a28047a4e1bd03c9 SHA512 c8986dde4094e62b29f0f8699af2ca7cd2b477f34c6e65ae5943162a5d3de7b06a4cc93bdfacfc44f3ea9b750e415cf77f1d5d11c9307bcc13f636378d0a3fc8
-EBUILD rqt_reconfigure-0.5.3.ebuild 703 BLAKE2B a80dc16b6871ed704ecca22a56d6da58f9948b267abf494dbfb5e36d71fe8b610988636885b68efa165b60138be91f8b5cc19020abbfeb581e57bd6d0d119f71 SHA512 c65ffd1692ea623654cba5060d002dfce52f784c01644dd76847a92fc2fba5e990c7c283efa64d643f7d4917fd93f135c3123125051c7b60bd3f598046e3f728
-EBUILD rqt_reconfigure-9999.ebuild 703 BLAKE2B a80dc16b6871ed704ecca22a56d6da58f9948b267abf494dbfb5e36d71fe8b610988636885b68efa165b60138be91f8b5cc19020abbfeb581e57bd6d0d119f71 SHA512 c65ffd1692ea623654cba5060d002dfce52f784c01644dd76847a92fc2fba5e990c7c283efa64d643f7d4917fd93f135c3123125051c7b60bd3f598046e3f728
+DIST rqt_reconfigure-0.5.4.tar.gz 31640 BLAKE2B 6751492454eb4bdf368de771c016cf712042ae1676a3890b819aecf6285aa1937f5f0528651ce7fb0e935e595d8ef3094ecb0a7a282f4b44f8d5107891329b32 SHA512 ae2e2286bfb974b53070359fdaed9345191674142ca11bbc7bc823c166fe2df5c035b6623b6566b189367f77312e08c30b1ba25cfcc5f2d7d49092380a9bc1da
+EBUILD rqt_reconfigure-0.5.4.ebuild 746 BLAKE2B 6ab552a9c5632c55baa9a066bb64fc896198750cc390a43cffcab301ddde49b4f5258371b311f8739035e757b55081eb2b7158f72b40a407022dd5c074a1423f SHA512 65a3caa617e0f04c54ae343deb9860cf078a94feb457fd2d8e831e9a2df11880008097843f6608e10cd80bdc7a559d0ac31f035d13e5b53b73881b5732277ed7
+EBUILD rqt_reconfigure-9999.ebuild 746 BLAKE2B 6ab552a9c5632c55baa9a066bb64fc896198750cc390a43cffcab301ddde49b4f5258371b311f8739035e757b55081eb2b7158f72b40a407022dd5c074a1423f SHA512 65a3caa617e0f04c54ae343deb9860cf078a94feb457fd2d8e831e9a2df11880008097843f6608e10cd80bdc7a559d0ac31f035d13e5b53b73881b5732277ed7
 MISC metadata.xml 347 BLAKE2B 1ff3265b37380e28dd01d7f2ff2c6f2e373717f608c586e88fb7a6a4827d8a345e7181017ba7b2e03b6e1ca5b97960bbcb3a0f38c583510e3ca4ec96988ff2d0 SHA512 bc289c092d712b968ff74ac6e7d92545892a158442b31aba95afd99224a34c993c86e1a65bdbc0043381ee01f051309d35cd216f6316073f81b186dabaedb5ea
diff --git a/dev-ros/rqt_reconfigure/rqt_reconfigure-0.5.3.ebuild b/dev-ros/rqt_reconfigure/rqt_reconfigure-0.5.4.ebuild
index 475a03749044..caa683099283 100644
--- a/dev-ros/rqt_reconfigure/rqt_reconfigure-0.5.3.ebuild
+++ b/dev-ros/rqt_reconfigure/rqt_reconfigure-0.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,6 +6,9 @@ EAPI=7
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_reconfigure"
 
+# Tests fail with ninja
+CMAKE_MAKEFILE_GENERATOR=emake
+
 inherit ros-catkin
 
 DESCRIPTION="Provides the way to view and edit the parameters from dynamic_reconfigure"
@@ -22,7 +25,5 @@ RDEPEND="
 	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? (
-		dev-ros/roslint[${PYTHON_SINGLE_USEDEP}]
-	)
+	dev-ros/roslint[${PYTHON_SINGLE_USEDEP}]
 "
diff --git a/dev-ros/rqt_reconfigure/rqt_reconfigure-9999.ebuild b/dev-ros/rqt_reconfigure/rqt_reconfigure-9999.ebuild
index 475a03749044..caa683099283 100644
--- a/dev-ros/rqt_reconfigure/rqt_reconfigure-9999.ebuild
+++ b/dev-ros/rqt_reconfigure/rqt_reconfigure-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,6 +6,9 @@ EAPI=7
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt_reconfigure"
 
+# Tests fail with ninja
+CMAKE_MAKEFILE_GENERATOR=emake
+
 inherit ros-catkin
 
 DESCRIPTION="Provides the way to view and edit the parameters from dynamic_reconfigure"
@@ -22,7 +25,5 @@ RDEPEND="
 	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? (
-		dev-ros/roslint[${PYTHON_SINGLE_USEDEP}]
-	)
+	dev-ros/roslint[${PYTHON_SINGLE_USEDEP}]
 "
diff --git a/dev-ros/self_test/Manifest b/dev-ros/self_test/Manifest
index d4aed89a7a5f..a8e1f8fb94a0 100644
--- a/dev-ros/self_test/Manifest
+++ b/dev-ros/self_test/Manifest
@@ -1,11 +1,13 @@
 DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
 DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
+DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
 DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
 DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
 EBUILD self_test-1.10.1.ebuild 582 BLAKE2B 526815fa4ca6aae1ecf495401e0f4b577ec7e98fcb80dfc5935451f4bf6787b4640f9360e0045839dc133f3bbe01b61a668b140c1cd4fbc14a64cb6d7defe5e7 SHA512 c68bdd649d682a5bbf07eddd0fafcaf89ea7d916362316d1e5db6ddaaacc50025162652779c033be5c7a31d8c5430400ace3355670f4d56a347ede191eef3162
 EBUILD self_test-1.10.2.ebuild 582 BLAKE2B 526815fa4ca6aae1ecf495401e0f4b577ec7e98fcb80dfc5935451f4bf6787b4640f9360e0045839dc133f3bbe01b61a668b140c1cd4fbc14a64cb6d7defe5e7 SHA512 c68bdd649d682a5bbf07eddd0fafcaf89ea7d916362316d1e5db6ddaaacc50025162652779c033be5c7a31d8c5430400ace3355670f4d56a347ede191eef3162
 EBUILD self_test-1.10.3.ebuild 582 BLAKE2B 64cc2bbde66cc10c801bf0a9996cea7acce9da43d67295a21bf6070e7194aac2c814708e987d73dcf1c5aedc63cddd3a85973f56fe6666b2307d9abf5197da4b SHA512 8996872ea44b1f95fbae607f271bea531e40b203c13994856f277e41ec17866a0c13367531946b3d03d76db878acd2f06071a37b8059573691a7cc801e851dfd
+EBUILD self_test-1.10.4.ebuild 582 BLAKE2B 64cc2bbde66cc10c801bf0a9996cea7acce9da43d67295a21bf6070e7194aac2c814708e987d73dcf1c5aedc63cddd3a85973f56fe6666b2307d9abf5197da4b SHA512 8996872ea44b1f95fbae607f271bea531e40b203c13994856f277e41ec17866a0c13367531946b3d03d76db878acd2f06071a37b8059573691a7cc801e851dfd
 EBUILD self_test-1.9.4.ebuild 582 BLAKE2B 526815fa4ca6aae1ecf495401e0f4b577ec7e98fcb80dfc5935451f4bf6787b4640f9360e0045839dc133f3bbe01b61a668b140c1cd4fbc14a64cb6d7defe5e7 SHA512 c68bdd649d682a5bbf07eddd0fafcaf89ea7d916362316d1e5db6ddaaacc50025162652779c033be5c7a31d8c5430400ace3355670f4d56a347ede191eef3162
 EBUILD self_test-1.9.6.ebuild 582 BLAKE2B 526815fa4ca6aae1ecf495401e0f4b577ec7e98fcb80dfc5935451f4bf6787b4640f9360e0045839dc133f3bbe01b61a668b140c1cd4fbc14a64cb6d7defe5e7 SHA512 c68bdd649d682a5bbf07eddd0fafcaf89ea7d916362316d1e5db6ddaaacc50025162652779c033be5c7a31d8c5430400ace3355670f4d56a347ede191eef3162
 EBUILD self_test-9999.ebuild 582 BLAKE2B 526815fa4ca6aae1ecf495401e0f4b577ec7e98fcb80dfc5935451f4bf6787b4640f9360e0045839dc133f3bbe01b61a668b140c1cd4fbc14a64cb6d7defe5e7 SHA512 c68bdd649d682a5bbf07eddd0fafcaf89ea7d916362316d1e5db6ddaaacc50025162652779c033be5c7a31d8c5430400ace3355670f4d56a347ede191eef3162
diff --git a/dev-ros/self_test/self_test-1.10.4.ebuild b/dev-ros/self_test/self_test-1.10.4.ebuild
new file mode 100644
index 000000000000..36d8eb282d81
--- /dev/null
+++ b/dev-ros/self_test/self_test-1.10.4.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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Robot self-test node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_updater
+	dev-ros/roscpp
+	dev-ros/rostest
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-ros/rostest )"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_diagnostic_aggregator/Manifest b/dev-ros/test_diagnostic_aggregator/Manifest
index 8ebfc77ebc49..25d96bb92622 100644
--- a/dev-ros/test_diagnostic_aggregator/Manifest
+++ b/dev-ros/test_diagnostic_aggregator/Manifest
@@ -2,11 +2,13 @@ AUX gcc6.patch 487 BLAKE2B 9301c9e8e22bb780ea2d91a0055fc0f2f03af1ce3fefeb3bf8c5d
 DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
 DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
+DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
 DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
 DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
 EBUILD test_diagnostic_aggregator-1.10.1.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
 EBUILD test_diagnostic_aggregator-1.10.2.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
 EBUILD test_diagnostic_aggregator-1.10.3.ebuild 649 BLAKE2B c3cbbbf061d69d5a11d888c81701069dc59c927d372d8b5a096df539325962354a3f7b50f2b00e4cdc4dded3d2ab30bf9c39cf8dfd6bbb8aff06dbfffa884c7f SHA512 b32db928704d60159f5802abd8d8a2bada6196803ece3d9ad624b98a1419d0724cf8dc876cdfa8fa7456a773e30c610d3055db7c9446edcc4d03422660166e58
+EBUILD test_diagnostic_aggregator-1.10.4.ebuild 649 BLAKE2B c3cbbbf061d69d5a11d888c81701069dc59c927d372d8b5a096df539325962354a3f7b50f2b00e4cdc4dded3d2ab30bf9c39cf8dfd6bbb8aff06dbfffa884c7f SHA512 b32db928704d60159f5802abd8d8a2bada6196803ece3d9ad624b98a1419d0724cf8dc876cdfa8fa7456a773e30c610d3055db7c9446edcc4d03422660166e58
 EBUILD test_diagnostic_aggregator-1.9.4.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
 EBUILD test_diagnostic_aggregator-1.9.6.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
 EBUILD test_diagnostic_aggregator-9999.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.4.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.4.ebuild
new file mode 100644
index 000000000000..4e25b72d4cd8
--- /dev/null
+++ b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.4.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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="diagnostic_aggregator tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_aggregator
+	dev-ros/diagnostic_msgs
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/rospy
+	dev-ros/rostest
+"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gcc6.patch" )
+
+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/test_rosbag/Manifest b/dev-ros/test_rosbag/Manifest
index 32ae9bd5e7d0..9800a4fcf2ae 100644
--- a/dev-ros/test_rosbag/Manifest
+++ b/dev-ros/test_rosbag/Manifest
@@ -1,5 +1,41 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+DIST test_rosbag-1.15.10-chatter_50hz.bag 28923 BLAKE2B 2a2304b98d33b902fa3b8fc4d2a0fa3da9af600ab9f66ebf74ecb2214160346d10a0ba58d2b8dfb7039dcd7ca05e58bf7b253899238dabab1c29264970b124b7 SHA512 7493e773d678aed10ca274f8a253a412846c90fa238ac7407b04f39355b94285b40b177ae45a0a5b5ae1c2fe2d74284fba1c082550f21dd30cf5e5891ef402e1
+DIST test_rosbag-1.15.10-constants_gen1.bag 4783 BLAKE2B fec06b1016d0a6e616893f050c22072ef01cc4bc944f3778cb45613d699e404b8721b35f9563f22fa87e473f9f439965ba804cc6478c59dbeab95309375046c7 SHA512 724a420e99946a5fba1b092363cb11af11a50e85c4531b57fe64b207ed1e4022e35a870014873919a7bfe3680ae0b5b4275777f3305b8c5d1fdd7316e7d67e7b
+DIST test_rosbag-1.15.10-constants_gen2.bag 4783 BLAKE2B 6db44a7ddc61307f49bb28e276b8a834044b43d79d37ceba0aef21c8dea8a6d3ee32cc156f8bc429f074752dfc5a249b789936a6d8bf5e11397c2ee4f0e7d925 SHA512 a0df68425bf268da7d622ea43fb755dd7161bf3443c5c2499862c8932ce5e86e4edc6746a9f4a6bc4b4bb9c070a2b3af26d26755e18e796600184f280579aedc
+DIST test_rosbag-1.15.10-converged_gen1.bag 5197 BLAKE2B 99b3a9807b2e569f6773b791b008b1430408843037203a257892c82a6f59dd3e688a4f516e91d26fa567b56bececc3f69d69f4999e7a1e1430a9a606686a8de9 SHA512 490677292a7ea95109e7542e1219f51d7de9cf3bfbf90f48836fd80387655752ecb1173cbb65fc40908eb552fe1bae45e821c1b8510a401c7b643d2c0c433881
+DIST test_rosbag-1.15.10-converged_gen2.bag 5197 BLAKE2B e5b620a47c7f44911e5ee44c5787cd9ff753763816535ddaaf64f5e83a27504a5f6d241d900c0c3eacc5b9273113ad05f72cd828a4ebfb6d997df46fbc8b0cc7 SHA512 2779711e7d1223b14223312e1cbb6222ef6fdc32bd28dab6cb830784d5207f5ec7cc826e1336328520a45b15ddc937bf0be7eb8329932b77b9f1f42d162b7795
+DIST test_rosbag-1.15.10-converged_gen3.bag 5209 BLAKE2B f6d3615c771b086220350982c5ff726f263a460a714aaa3abcd683216dbdeaa72ddfd2fa2b42e761f82223af29ffa1bad554a67fc6afab52f08ffd1718fcadf0 SHA512 d896b361c73ba904c1766c9899d03f09d7ce62126378c195c620b659ff06dbdb61783ef7cddd999088a973382e60387a8eadd1d7dbd67af2d7af6c1c1fa87b6f
+DIST test_rosbag-1.15.10-converged_gen4.bag 5207 BLAKE2B d25369cfa2e0f34ab7b344ac56557292ec1b5609802327ade48d60e632900e4d746e15c9a46b700a44c198d1aef1975b042efbb1ca885f4124b5cef4936925ff SHA512 329694efa2dd1ad82a87f1419958bc2cb1edf4d8ae4ffde1c2d3d3b792d1dcba842b82c9f028cf3bb2f85fadbb068e5ed25eaebc8cd6e305c422d40dbeb75775
+DIST test_rosbag-1.15.10-convergent_gen1.bag 5485 BLAKE2B bd906d5ced9d123e04fa8b948834b907530ba2c56f4197f7ff209ec5d6afb18ff42e29d03f883d2d44e89e49c12e3769013f8209e5a674a7fd138d0264083295 SHA512 85a4129f954d4d3a2374c1c2c7fbdd82ee685853763ab62a836ab128b1dd118746984d1c1b8290ac1b522fac18493e1ab825b1a66924151dff608af0a5e07541
+DIST test_rosbag-1.15.10-convergent_gen2.bag 5485 BLAKE2B f5f6c3ed07b8cabca79fe826dcb7dbf0a9e3d7aed1d3bb0767e47a1f269e5c198de90f6e0052911f4148238b99bc3f48ea417d9a1642efb5bee74d5b5f9e7b5f SHA512 09fba991e4efe5758082f9af2501b0bc9ea452b247e3672b8eae5cef3d8d43ebbc0c7307bcb5730f1ec9a94e86506258d04e1cb25fb8d5f680f38b4b73e96c68
+DIST test_rosbag-1.15.10-migrated_addsub_gen1.bag 5031 BLAKE2B eeaff544bc0de8f9d058ebec594318b9ea8ee383f8b5083258de9dcb0068d1d6c0169cf97cc221675509932c8aa630e13958a2e82f413d6e834b3114c4702824 SHA512 b41a4a5651a97f70774c1395c8f9d5b0f4815f7e39052904fe1e89483270f9eb5216a6bd3652c2372c6c64666b4cc5e60d04f390f5ea83f88653035fa1a432fb
+DIST test_rosbag-1.15.10-migrated_explicit_gen1.bag 6172 BLAKE2B 9d5692ed7683a8a426467969488836102c56d51878c1c2d28d60f5a66a3429395cadfff75a177003238e1184ef1ff927479fb205a28e359c9e4efcbd41a1e767 SHA512 e11282b83feef48c039d34400216406537704ea5bcc10e62434bd2917a9ee0942a67315a8667d0ae7e76da178537b01f88a638f5e360663e51a438a4c6049661
+DIST test_rosbag-1.15.10-migrated_explicit_gen2.bag 6212 BLAKE2B 97b231a06d372d813dbfb6c80a6c293dda743ba4ad436ac0e265c37650461bb83315304f25d5a299eb4d82e59e6a776b4c7a66ace154aa6fb9d75bff10e45e06 SHA512 690fdad115ac672617bad2510e139f5cf67599b4e21a56dafd45bfda9f1991f4fc9251dc41c36834931402722261b008ff0ea283afd99daa3eda20bb357810ed
+DIST test_rosbag-1.15.10-migrated_explicit_gen3.bag 6220 BLAKE2B 7f9ba4eade5e2e7c03b2e180f1507cce58331493a2dddc1213a6ed5d8a46d198569ef5d5effe398c97c372adcbfed756649c35c0ae38362f017cf768faebc30e SHA512 35911f4d68eda67a49cfa03ad65c6b6a84e74f161b38839fed7a1ceeadd10715f4d82b124d640f7cfc356f107e376ea6bc9016c1be32592fe2f6865d5bb8f868
+DIST test_rosbag-1.15.10-migrated_explicit_gen4.bag 6359 BLAKE2B 156e06ff065827bea0797c6f55dfaf37cb973ac07085cb56d4f3c85eadf1c994cf859e0e7b85bf65234a52b56cf4632d2ce2c8c05c172f5c838c403fdb83fc42 SHA512 5dccc7f8bd03ce08b584a69d6a9e54969bd014d22d7af3e1a9b09d9c42ab4029cf13205f56ea81913ce47c6a5f383d1c9082feb8857fa0d4f1459f97d2f4460c
+DIST test_rosbag-1.15.10-migrated_implicit_gen1.bag 6690 BLAKE2B b6d9d8dda4bae2d41aa81928daaada62da89a7be38e8f73ed9c2c2bb7c652d194eb7afd201ca0c0283ee88a77e103d8ccb86c60bffa4adcacde7a0f7f3b7f56d SHA512 a09816ef8c00b0005c1ee42b4d33739b776e6b8792f34f3c5e70ffb91ebc4c4e3c92396d733c3fe4314bd646533d71ede9cae57faeb8a311a25e13421731aeb6
+DIST test_rosbag-1.15.10-migrated_implicit_gen2.bag 6740 BLAKE2B 2f3d4a397188454f6ee4f2cfd2438361a3ce83b4e7d124feaa15788f6e49a074db433d8e87b43961984b0c243cd02651abb26ebeca0a51eeda9b61cc7d786f8e SHA512 da0fad58643a06c8c15ae6b13530b3e879269602b6dde750ec2706087206db82bb8f4a386830b36426c98fdc71eb6d2fcf6d2ee8d0be230beb3855447acc3bb3
+DIST test_rosbag-1.15.10-migrated_implicit_gen3.bag 6752 BLAKE2B f5f7c56815dd1e9bd277cde0a91dd53a68c342527578123ad25ec981c30486ddeca774c7d4f8dcf0606d189b14e235f349490f47ceb3a191250cada8f82c32e0 SHA512 2068238ca893201d24ed26b17d8b94e13a82d9f556352572da8c44e2455f75c984454bb09074b688f11ec0a7a5e38791b669f7cdea98863d0c301917ffe5d342
+DIST test_rosbag-1.15.10-migrated_implicit_gen4.bag 6889 BLAKE2B 6f8dbc6f2920d10535c8574470e23d3007033942949ef599437dde5fd64b860139f79a9835e255065fe3c74445ef702c3793f0adfc972f88fa7046c081ec5976 SHA512 4fb2b1f78b4cfd5b155415724ab224b6d619a44af94ade80f8bd6ef30b46e498633a5457d8f939c96902a641e0fd45cac2aa8e4e7f7a26efb6c78109b2dcd4d7
+DIST test_rosbag-1.15.10-migrated_mixed_gen1.bag 7120 BLAKE2B 1788a394a5cef74864071994a97fa0a7df28167531261636b74cbb688e0e62902e2e9577f09d1546b3f3dbb0533332b8c5aee47f01a30606744cdaaa5c573a0e SHA512 a8354f9386fe2b8da148919cc036041570eb999b94be162ee06b2abfd5f0b150fe96af45530c18b86eafda2e0299b8dfa8faf1cf3ab1571a0f62f17e6ba1147c
+DIST test_rosbag-1.15.10-migrated_mixed_gen2.bag 7178 BLAKE2B aa251ca30288b42d91f5bc37e672551a90575b10ecb058042deb88b45d41a9dc38c5e17081780ca75436cee886f71e1405f7970ac1025693fbc94f8444aaed60 SHA512 fd1ffb05ea65a798c07568778da71b6f3d5c7cebd4a541ace4d800b2eff3c9ee3ce1b1b21017e4aab73438ab3005d6cf966993a7b17afce16c5b788354c5d868
+DIST test_rosbag-1.15.10-migrated_mixed_gen3.bag 7252 BLAKE2B 29896d975cd406b525e8e59e24d26817a9a13b84833d9c08733bfc05be392d6e0be6de5bbced5068bed33ae60ce4053922c8092f259a48e23ae796ac43e8e601 SHA512 d0a5fd042c614e6451b9b6518ecd3317a727939db81fa8988c700a657be77f9cc14127cd0595c97a505094df9e96b63f79381be2da3717e34f3481d521905518
+DIST test_rosbag-1.15.10-migrated_mixed_gen4.bag 7387 BLAKE2B 55de46bbc4e115113df7ccac4c08e61308e7c06ddde1f6e69a436b4b32fb296b9f60d029473f46cf37b0894e501040f4e748302a9d7c8c8684911983860519c1 SHA512 5f106b3a64968ced5baeb0f91dac7209af508c6cdc2c3148bd9c86421024051f2bd7d12027af2857dd1e49964babb330333e02bb94a120426763695c06bd31ef
+DIST test_rosbag-1.15.10-partially_migrated_gen1.bag 6568 BLAKE2B c3d16f271e035140ab802123d7d848d4d7c0e00841edd0282c632c92bbe030847bd879e7e7ff24f6384f9f2f34a9dd38bb7b5e281de9df7203d2c43c28600fa3 SHA512 ecec0e8c3ccd4613048d300417218488a3578a131ed0bd346cf07dc6c702abb2354288558e56ffd6c192abb1e2afd7084a856eecd51a935e207936b5e3d52e32
+DIST test_rosbag-1.15.10-partially_migrated_gen2.bag 6616 BLAKE2B 846b84e3d221b490d3f7b90083d5354ea21906b51569fa9c57642c6e52d06e3caa4a68b3f0fffbb5c808bb440fd17507c80a60a87bd0cb8207a14eb01418de24 SHA512 aac71997873669661eaab2d0f463e3e5afb677c9852a572fd9f139a9037d3e26e2d2ae8b9e16c204eae8f494a1a867638e5f7750293ccec27402dbea0804e712
+DIST test_rosbag-1.15.10-partially_migrated_gen3.bag 6707 BLAKE2B 6d5df33b8def73503cc35de95b680607cb7d687a16082558dd95b8b869866837cb584173088ee2a2c2d9f7ca21193eea287bef111103f8bacec2aa635cbe3e68 SHA512 e730b1b0604253286b4e53d917f01bad10cbe81b8b1547984657bd8e90112c20e1b24ba315aedccc1495374070fbbe6f7b8e51cd68e82986f68efd0785b7386d
+DIST test_rosbag-1.15.10-partially_migrated_gen4.bag 6910 BLAKE2B bde0ec1f776c109cd0c21cf4ce87b3f363c50b0eeebe004ff0060713204391f88fdae3a2a801dd6c4530f3eaf0ee74bd51ecb31ef78c34ced7a26f2a6c80de4f SHA512 42e894acacc8e974f495d8c2ca088b89a71506996f10dbfac431e6bd48af2338b2e8b7eee4c5a40098b04086c47e63f2f80f228ed39a0db4c197a47081c69f4a
+DIST test_rosbag-1.15.10-renamed_gen1.bag 4825 BLAKE2B 37b156027af0b490e00611eb31cd407cf576dd2be1abe77f3a2ca01e04e19f0a498163673928bd82fc660e38c7f9b9f7745f0b5bc2c3b5254e3d41f575561510 SHA512 99c6b187a45ac4d56544b163a876107be744d12515ff4baa6195857796d81c3b7fa0f75369c945a2bdf2954429129f5802a8a8ac6ac3a69ac1bd6b7feeb05173
+DIST test_rosbag-1.15.10-renamed_gen2.bag 4825 BLAKE2B 8a1ee3a3e421f0c2b298fcc9a4260dd76cc211c05e5d944f76f3f7d1feb461b439a5a6dc7dc545295237756510383042ab86e590e879ad35b6cdb8131d054ceb SHA512 c64b77c215c08c443d674bb12e9ac50a5fb234442c14cdea77e2936eabfe8c369947902ff6c9a211d8c3b9aa93f5677dadf8bb3b8145fc3a4b80f6c4f235e6f8
+DIST test_rosbag-1.15.10-renamed_gen3.bag 4835 BLAKE2B 8884b8fa15c3698a1d1fb19147fb2023cbd2946441ad9d4df2ef5ded3c455b2bce5a5cf6618f6e47729dc495b20b8f55a1750c4763ab4fb65c25d2a1f01de011 SHA512 67142debaecf05b76a42cf198572a9ff4bddf4c4da0b798e467f02ed5aa8ff2b6fabc248fa5caa33f346560edac1b3f38eb72ebae75b0224f6b281e5c21211a3
+DIST test_rosbag-1.15.10-renamed_gen4.bag 4833 BLAKE2B 72010f49332c337f998c4dd54a3399773e893f4f41ce01f7b130861993684641ff575c65e8bfcf1127a8dd590c0152ffcce08dfcd124e7a43c9ae8443983438e SHA512 2adfd75e05469793eb95ab68ca8403cd78f3a836157b0b1abcf21f11f16633b0e9c840f800ee5d51376fe91a31710d5674deb2c1c6e1a262517ab173550253cc
+DIST test_rosbag-1.15.10-subunmigrated_gen1.bag 5200 BLAKE2B 6786d316f28f7038b961fce5d4094b6948eb1f292dc63c04efdc9459c012acefcc7f962452a11ae53e8de4096c758833d7374ccbfc1a16b626e6c21af92b7979 SHA512 318d921f505ee97ab9ceba536ee48c4d5d5d8aa7d2619864b325d8083582daff43cf9bb61ff5ec3814e815cc334190b11687734e21141fbade9611a98244783b
+DIST test_rosbag-1.15.10-test_future_version_2.1.bag 6051 BLAKE2B 5368be834eaaf7d48519560295406a92ecc6573f7cbcbd5a29c9f05c12322198b1da8209b0316b5d694cdfbde8a9ba26be3a6f529154594e148743f7b618de45 SHA512 9a9870b28d5e0f12ed98fd1df6be21fa37e5db9f9423eb39cbbc7e8f042078210f7ccc8f534a02a5edc51fb61817ddeec705a8687917742648c1fdb70adf88db
+DIST test_rosbag-1.15.10-test_indexed_1.2.bag 142311 BLAKE2B 51e4f41334a4191a02e6cd2723ff7a38ea6b99e272304ff8be83641d31d3c4bc3bbddf835923da447d274d27253d0cf162ff065e6f952799c204a6d3b8a429bc SHA512 8c2b6973e549d1b5c2e1fe5f6873c40b7877fa87e7864d39e86646083baf481ecb3d9c1fc4ca5d44332b3b4b0f41856dd5dd2c71ce9f2281fdc61c9846bcd5b8
+DIST test_rosbag-1.15.10-test_rosbag_latched_pub.bag 4816 BLAKE2B 2a0a90eb46665486ac7a31249d7bc9c3c4f125c934a09e3fb0130bf43b10035552f9de0f0fd8280cec4cb1eb71fc7dc624ba1152724e602a2483a2df63869c3f SHA512 e1655185e8ea6a02aaccce4e819eb6d6aec48032f4f55e17d7c8649aa0d0b56eded659a97e2f83c7d04e221beb8a330bce093300d422c63f3b330f5b2b8bb8ca
+DIST test_rosbag-1.15.10-unmigrated_gen1.bag 4828 BLAKE2B 0fc0e446f8c31fef4b21a669b15a86340d0dcff2406a85f88ccdc84e6f3ff4a71252151d191c30c9879d2ce3031faf9101aaa22834cdd733491a2f92d53a7a04 SHA512 333dbf41976ae732e33f394883965d9d07bfe35d8f3c5be1bd129ff4ded31f8c8201b9fdd8bee7ecaf7f04f49d0ee7c7d2be1ec4c8322d0b0b9cc0a236fe8342
 DIST test_rosbag-1.15.8-chatter_50hz.bag 28923 BLAKE2B 2a2304b98d33b902fa3b8fc4d2a0fa3da9af600ab9f66ebf74ecb2214160346d10a0ba58d2b8dfb7039dcd7ca05e58bf7b253899238dabab1c29264970b124b7 SHA512 7493e773d678aed10ca274f8a253a412846c90fa238ac7407b04f39355b94285b40b177ae45a0a5b5ae1c2fe2d74284fba1c082550f21dd30cf5e5891ef402e1
 DIST test_rosbag-1.15.8-constants_gen1.bag 4783 BLAKE2B fec06b1016d0a6e616893f050c22072ef01cc4bc944f3778cb45613d699e404b8721b35f9563f22fa87e473f9f439965ba804cc6478c59dbeab95309375046c7 SHA512 724a420e99946a5fba1b092363cb11af11a50e85c4531b57fe64b207ed1e4022e35a870014873919a7bfe3680ae0b5b4275777f3305b8c5d1fdd7316e7d67e7b
 DIST test_rosbag-1.15.8-constants_gen2.bag 4783 BLAKE2B 6db44a7ddc61307f49bb28e276b8a834044b43d79d37ceba0aef21c8dea8a6d3ee32cc156f8bc429f074752dfc5a249b789936a6d8bf5e11397c2ee4f0e7d925 SHA512 a0df68425bf268da7d622ea43fb755dd7161bf3443c5c2499862c8932ce5e86e4edc6746a9f4a6bc4b4bb9c070a2b3af26d26755e18e796600184f280579aedc
@@ -105,6 +141,7 @@ DIST test_rosbag-9999-test_future_version_2.1.bag 6051 BLAKE2B 5368be834eaaf7d48
 DIST test_rosbag-9999-test_indexed_1.2.bag 142311 BLAKE2B 51e4f41334a4191a02e6cd2723ff7a38ea6b99e272304ff8be83641d31d3c4bc3bbddf835923da447d274d27253d0cf162ff065e6f952799c204a6d3b8a429bc SHA512 8c2b6973e549d1b5c2e1fe5f6873c40b7877fa87e7864d39e86646083baf481ecb3d9c1fc4ca5d44332b3b4b0f41856dd5dd2c71ce9f2281fdc61c9846bcd5b8
 DIST test_rosbag-9999-test_rosbag_latched_pub.bag 4816 BLAKE2B 2a0a90eb46665486ac7a31249d7bc9c3c4f125c934a09e3fb0130bf43b10035552f9de0f0fd8280cec4cb1eb71fc7dc624ba1152724e602a2483a2df63869c3f SHA512 e1655185e8ea6a02aaccce4e819eb6d6aec48032f4f55e17d7c8649aa0d0b56eded659a97e2f83c7d04e221beb8a330bce093300d422c63f3b330f5b2b8bb8ca
 DIST test_rosbag-9999-unmigrated_gen1.bag 4828 BLAKE2B 0fc0e446f8c31fef4b21a669b15a86340d0dcff2406a85f88ccdc84e6f3ff4a71252151d191c30c9879d2ce3031faf9101aaa22834cdd733491a2f92d53a7a04 SHA512 333dbf41976ae732e33f394883965d9d07bfe35d8f3c5be1bd129ff4ded31f8c8201b9fdd8bee7ecaf7f04f49d0ee7c7d2be1ec4c8322d0b0b9cc0a236fe8342
+EBUILD test_rosbag-1.15.10.ebuild 2436 BLAKE2B 5a00a57e508f17cf48b07499bc07b7582ed7b3686db04d98a498d9ebcefa19137c1d9afe3b1348498e04025087226059e6576e276ea33e1dbd38b46f1c679814 SHA512 d01b4f0d4ee820bec3dcd6b7747533e6af766ede05a0baa5e828fe9102f1d71eeaeb41291cfce2ffd36f269ffd3a1bd2bfcca0fd6e2b86d301c3808639b602d1
 EBUILD test_rosbag-1.15.8.ebuild 2436 BLAKE2B 20fe1864e638a94568a06e323082356e18297f6ecf0cf041092ccbc027f40ab2c209260194a6d69a7aa0f57fd621da5827d1b975d187596e19c84d1169b38657 SHA512 773d00d67cba50371a20cf0120414bc0fd5ce3a7ab2c7100b519ebe63506610653551c516c75b0925f1a012eb599070255ca164b2fc02834f799ec11a78f4cd5
 EBUILD test_rosbag-1.15.9.ebuild 2436 BLAKE2B 20fe1864e638a94568a06e323082356e18297f6ecf0cf041092ccbc027f40ab2c209260194a6d69a7aa0f57fd621da5827d1b975d187596e19c84d1169b38657 SHA512 773d00d67cba50371a20cf0120414bc0fd5ce3a7ab2c7100b519ebe63506610653551c516c75b0925f1a012eb599070255ca164b2fc02834f799ec11a78f4cd5
 EBUILD test_rosbag-9999.ebuild 2436 BLAKE2B 20fe1864e638a94568a06e323082356e18297f6ecf0cf041092ccbc027f40ab2c209260194a6d69a7aa0f57fd621da5827d1b975d187596e19c84d1169b38657 SHA512 773d00d67cba50371a20cf0120414bc0fd5ce3a7ab2c7100b519ebe63506610653551c516c75b0925f1a012eb599070255ca164b2fc02834f799ec11a78f4cd5
diff --git a/dev-ros/test_rosbag/test_rosbag-1.15.10.ebuild b/dev-ros/test_rosbag/test_rosbag-1.15.10.ebuild
new file mode 100644
index 000000000000..d397cd81becd
--- /dev/null
+++ b/dev-ros/test_rosbag/test_rosbag-1.15.10.ebuild
@@ -0,0 +1,104 @@
+# 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/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 b8270f3f2f0e..12cb39283fc5 100644
--- a/dev-ros/test_rosbag_storage/Manifest
+++ b/dev-ros/test_rosbag_storage/Manifest
@@ -1,5 +1,7 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD test_rosbag_storage-1.15.10.ebuild 465 BLAKE2B 34c4c6a5b4dd5994296e0de0caca6e00b04fa44292d6e6c3b4052fa96536f1b02b4a30d5385b0cc7745b64cf3cc38a0da6544ba486b704dde9e18fbe6f2d8d23 SHA512 fec456fe44002bb25f5c0b6377d54e2512a71eed69d7cc1805af28f7e930e067281b718a9fba6769a65fb5f4058953b9b2c8e55cd57d79d1d8528b4d1ba26b63
 EBUILD test_rosbag_storage-1.15.8.ebuild 449 BLAKE2B 211dd15ae3eb1f7aac8829f7e43c60a87f2c0a9fb16deca301ebee0450171d551606cc69264eb0cf7e6ad8453a3d13815b5b29873efb600c3bea51b6eb7f8fd6 SHA512 6e599f7da72c39133a6017fd21c76833a9dde42876839133eefc641362e8c03a18f47c2e3c3c0a7b48cc49f313891fdd6f04fe69c8a11e4642efd8be3fc6805b
 EBUILD test_rosbag_storage-1.15.9.ebuild 465 BLAKE2B 9f68320ee0d3b7e76bc344ca2ee54007efbbc9b7083aac353ce3cf94e74ac10575c79f7f2d41ae8ccdf93e03597e387151c6bdd7487c483652ed2029241ca26c SHA512 be77680f6db9f03bf414540eab944ac5598860b56eb4779e871ad917d9f7c135a2912daf6b2f27318830f1c508c4a08c53da5bf0c42d3562d7afedd2d0354e6b
 EBUILD test_rosbag_storage-9999.ebuild 465 BLAKE2B 9f68320ee0d3b7e76bc344ca2ee54007efbbc9b7083aac353ce3cf94e74ac10575c79f7f2d41ae8ccdf93e03597e387151c6bdd7487c483652ed2029241ca26c SHA512 be77680f6db9f03bf414540eab944ac5598860b56eb4779e871ad917d9f7c135a2912daf6b2f27318830f1c508c4a08c53da5bf0c42d3562d7afedd2d0354e6b
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.10.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.10.ebuild
new file mode 100644
index 000000000000..56f714211def
--- /dev/null
+++ b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.10.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 1403c6316d90..17b72306b135 100644
--- a/dev-ros/test_roscpp/Manifest
+++ b/dev-ros/test_roscpp/Manifest
@@ -1,7 +1,9 @@
 AUX tests.patch 512 BLAKE2B 1744807e87cdf18c3c2d74e971828a3f34986f2aff6c17e663e464a7ad522abdbaf96f20771c0f699ef24a5afd572a4a6431a7f21b851e95408e1c7c57032694 SHA512 2f923f01f7b5c869ff1279e6cb1d82f0699388c16caa615b84dd6b3f914355a79ffddb55491bea227980404ff85b3663f51c84e242d5540e3c88f10d912cdca7
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD test_roscpp-1.15.10.ebuild 904 BLAKE2B 4a76d28e169bc350140917334c504f69411ad759cb4fb621a82f8c7119f8846393a9ceb83a9e9e985b8d7eca69d2ede2a3785a733292ab0cf4efe0906fa6c0b4 SHA512 00264fcf82931ea5fd5bafabb5e4c820fd534508440c27856e6f655b6c6ab35319f39dc5923c279e20eb7b3d91e07c9ba49a85551fe60c1b280b809d2d1065c4
 EBUILD test_roscpp-1.15.7.ebuild 669 BLAKE2B 70791b7e565532c36eb3e6120c1a32824bfcfd46b14e141231f3909ebef51544cec10871114ed60707f42097a78091f48d48f90d65e4c406ae3273bca07161c6 SHA512 36cd0566c4887c7e7545610c83c11501a83a8d120006bf03b7b14f91cf221df1297efe10cc49abd0d8d2fa811542491091a87c1dddee77ab8032f5e2edd15612
 EBUILD test_roscpp-1.15.8.ebuild 904 BLAKE2B e35cf2878ba0a9788757aa1cf212abf2ce28f7f977fde80c35702f45a77ef5c0e279751cf5d7718f15671e574c43d8d1fae3a0704970c5e8a35ba39db4428cfe SHA512 3e0e54eabf80d143a80aa5d07c632f2e3602dfbe2797b50e8c5058ea4e504117782dbf93e4f54b32a24594e8f9958d09ddd8063e2c4c4e3ce0b517ee4a4ff49c
 EBUILD test_roscpp-1.15.9.ebuild 904 BLAKE2B e35cf2878ba0a9788757aa1cf212abf2ce28f7f977fde80c35702f45a77ef5c0e279751cf5d7718f15671e574c43d8d1fae3a0704970c5e8a35ba39db4428cfe SHA512 3e0e54eabf80d143a80aa5d07c632f2e3602dfbe2797b50e8c5058ea4e504117782dbf93e4f54b32a24594e8f9958d09ddd8063e2c4c4e3ce0b517ee4a4ff49c
diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.10.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.10.ebuild
new file mode 100644
index 000000000000..c6722fedf2e7
--- /dev/null
+++ b/dev-ros/test_roscpp/test_roscpp-1.15.10.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 5e493f2b883a..7efbd10baf12 100644
--- a/dev-ros/test_rosgraph/Manifest
+++ b/dev-ros/test_rosgraph/Manifest
@@ -1,6 +1,8 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD test_rosgraph-1.15.10.ebuild 510 BLAKE2B 382d62773752ff15bc623162e895539469b6efd98db83e6dd5ea255bc2417cf850c72cc47cb45e2c9078de708f9b1c22ac9a881fdd6a8ab243e7502c707e3199 SHA512 770669c3faf6acead18da9b7e445a62242b814322d6b69a161839c42e7018467162b6f8ce00bc89122a26935c1bdb1ad9eb0224f2e9b1b8008740bec62f3b8a7
 EBUILD test_rosgraph-1.15.7.ebuild 421 BLAKE2B 511420303458e310ce9aa7247d12fec089f2caf0e73abea4145c7a530c819fe62042cbaf8bcc2f2c13d51fd8b7099234e725e79efd630db2adc01675ac636951 SHA512 b43c9865b12656ec3dbcbc14b29cf258fa7f4093c8a528f6dc68ddbbeeb8fc72579f9d37ef3703e24d27c51dff6a5dde1855837eac1173734ca2cc457b2c1b08
 EBUILD test_rosgraph-1.15.8.ebuild 510 BLAKE2B 50a7d2d46a51ff814ed2723360ee1a20b9b5c62e0a8bff0fd5e4cfb05f6b32669ce835c570401624e3c2b56339e264250d9b52a87b3e4bc605cba5efeb3d48f5 SHA512 01bc68bbe8446b2caa942850e2f7c323e259c04304e87267addac7da987f152382451037167f6fe6c2878437d6b7d0f7658b3915eea5c9cbdf5b4c13e67f580b
 EBUILD test_rosgraph-1.15.9.ebuild 510 BLAKE2B 50a7d2d46a51ff814ed2723360ee1a20b9b5c62e0a8bff0fd5e4cfb05f6b32669ce835c570401624e3c2b56339e264250d9b52a87b3e4bc605cba5efeb3d48f5 SHA512 01bc68bbe8446b2caa942850e2f7c323e259c04304e87267addac7da987f152382451037167f6fe6c2878437d6b7d0f7658b3915eea5c9cbdf5b4c13e67f580b
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.15.10.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.15.10.ebuild
new file mode 100644
index 000000000000..63863b4ad56b
--- /dev/null
+++ b/dev-ros/test_rosgraph/test_rosgraph-1.15.10.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 e1a387a42c20..3c2587b35252 100644
--- a/dev-ros/test_roslaunch/Manifest
+++ b/dev-ros/test_roslaunch/Manifest
@@ -1,5 +1,7 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD test_roslaunch-1.15.10.ebuild 581 BLAKE2B 52ab99c09f873d9e147832a2a64467cba685509112af203c220189ae63f3a049c42e32f9d148c3b67d33edb8955ea81e1995c8ec5a534056a8ebfe1db63e0ea9 SHA512 7b5aadcb55285e7377899cb70f41941d1541d26d9ab221c54553deb017831147823bda1afa71ea90dfff956937d903c7de2d524a40a8474e3e024cdc1430c3e5
 EBUILD test_roslaunch-1.15.8.ebuild 581 BLAKE2B f8a48b9d29f48846193dfa403c0f5578fa90dc5e223f150a51bdcd6d3897585ab4b71ed212d40a4efbdb952ae1b120c9d7c2a7d5c21633fbdc383caf8bde03eb SHA512 7380b34283cfe2d4b920085a021de1de01bac3e298978b805b604e97c6260d416097230d8f77f5fbb56e53001f8df3f91e968e6b9c86aada1791b8cadcddaa32
 EBUILD test_roslaunch-1.15.9.ebuild 581 BLAKE2B f8a48b9d29f48846193dfa403c0f5578fa90dc5e223f150a51bdcd6d3897585ab4b71ed212d40a4efbdb952ae1b120c9d7c2a7d5c21633fbdc383caf8bde03eb SHA512 7380b34283cfe2d4b920085a021de1de01bac3e298978b805b604e97c6260d416097230d8f77f5fbb56e53001f8df3f91e968e6b9c86aada1791b8cadcddaa32
 EBUILD test_roslaunch-9999.ebuild 581 BLAKE2B f8a48b9d29f48846193dfa403c0f5578fa90dc5e223f150a51bdcd6d3897585ab4b71ed212d40a4efbdb952ae1b120c9d7c2a7d5c21633fbdc383caf8bde03eb SHA512 7380b34283cfe2d4b920085a021de1de01bac3e298978b805b604e97c6260d416097230d8f77f5fbb56e53001f8df3f91e968e6b9c86aada1791b8cadcddaa32
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.15.10.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.10.ebuild
new file mode 100644
index 000000000000..b506232d6f4b
--- /dev/null
+++ b/dev-ros/test_roslaunch/test_roslaunch-1.15.10.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 8330d677a3b2..20473b574bd7 100644
--- a/dev-ros/test_roslib_comm/Manifest
+++ b/dev-ros/test_roslib_comm/Manifest
@@ -1,5 +1,7 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD test_roslib_comm-1.15.10.ebuild 706 BLAKE2B d829ac240a72ceb0b2f471cafcef8df98caafb964f353ea0d4bf5faab1eee38b892e3cb738026ce8051ec6057914f4b5a55d93608dca96607f8ebd2c829dd36c SHA512 7135a1d03ad39137581c79d0b473014aa8d27c8f0ac7a9271103fd753ca836d5123fa8b4314fbcc958f975699f82f6e36733de0cd8f7a02692c8d7e340afdacd
 EBUILD test_roslib_comm-1.15.8.ebuild 706 BLAKE2B a432620b8fbed9bad43dbfab3d0b6b438d2a2f1021099f54e9e63643629d0efca42dd4d187d8b675decf58ff89ae2d724cf5669ab0e6544856ac155fe14c9863 SHA512 05b7a3b259f91173395a5eb964b7dcc881d6f1ae2eb0fd44a7e4de1320bd29641454ed8824c94e5327b75abed7757e2b3fa0826d6c08051c5da394e88295d62a
 EBUILD test_roslib_comm-1.15.9.ebuild 706 BLAKE2B a432620b8fbed9bad43dbfab3d0b6b438d2a2f1021099f54e9e63643629d0efca42dd4d187d8b675decf58ff89ae2d724cf5669ab0e6544856ac155fe14c9863 SHA512 05b7a3b259f91173395a5eb964b7dcc881d6f1ae2eb0fd44a7e4de1320bd29641454ed8824c94e5327b75abed7757e2b3fa0826d6c08051c5da394e88295d62a
 EBUILD test_roslib_comm-9999.ebuild 706 BLAKE2B a432620b8fbed9bad43dbfab3d0b6b438d2a2f1021099f54e9e63643629d0efca42dd4d187d8b675decf58ff89ae2d724cf5669ab0e6544856ac155fe14c9863 SHA512 05b7a3b259f91173395a5eb964b7dcc881d6f1ae2eb0fd44a7e4de1320bd29641454ed8824c94e5327b75abed7757e2b3fa0826d6c08051c5da394e88295d62a
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.10.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.10.ebuild
new file mode 100644
index 000000000000..e4dc35ffaea9
--- /dev/null
+++ b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.10.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 247f4d87baa1..52d16a32b7af 100644
--- a/dev-ros/test_rosmaster/Manifest
+++ b/dev-ros/test_rosmaster/Manifest
@@ -1,5 +1,7 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD test_rosmaster-1.15.10.ebuild 783 BLAKE2B 004586236178305c6652839892f87a786efff23a57b6891f42dd5b8fa136a732085dda3860c72e20e300ee09cd9458606f13651eb0c16fcc48b39d4fb5d228ff SHA512 c456107a41e4ee63a7c6d77e71efca13ceeb2c8f793e72c10acaad8d1953405c41363983a6969ca0d48cc7287c4e606402fd85da77635bb5bac816e36fcbcfd1
 EBUILD test_rosmaster-1.15.8.ebuild 783 BLAKE2B 13c70c437a3f2d082ce7f8fde7476b2e02f53d42c2733f2334cc6f9e7d1e08ea07359792992ec772c007bacc9750dbd3de7521480270d3764d3d267e2b550a39 SHA512 8945deb795c584b316d0a9f612f472a5ab60e546293e4c4f633e77a05b4159c145b23f88f488fcb5a19dd9a749bea7cac7fe3a3240a5172320c5b7147c51ea2e
 EBUILD test_rosmaster-1.15.9.ebuild 783 BLAKE2B 13c70c437a3f2d082ce7f8fde7476b2e02f53d42c2733f2334cc6f9e7d1e08ea07359792992ec772c007bacc9750dbd3de7521480270d3764d3d267e2b550a39 SHA512 8945deb795c584b316d0a9f612f472a5ab60e546293e4c4f633e77a05b4159c145b23f88f488fcb5a19dd9a749bea7cac7fe3a3240a5172320c5b7147c51ea2e
 EBUILD test_rosmaster-9999.ebuild 783 BLAKE2B 13c70c437a3f2d082ce7f8fde7476b2e02f53d42c2733f2334cc6f9e7d1e08ea07359792992ec772c007bacc9750dbd3de7521480270d3764d3d267e2b550a39 SHA512 8945deb795c584b316d0a9f612f472a5ab60e546293e4c4f633e77a05b4159c145b23f88f488fcb5a19dd9a749bea7cac7fe3a3240a5172320c5b7147c51ea2e
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.15.10.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.15.10.ebuild
new file mode 100644
index 000000000000..2e62994a05c3
--- /dev/null
+++ b/dev-ros/test_rosmaster/test_rosmaster-1.15.10.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 957c650ddda3..bcbbcfc46532 100644
--- a/dev-ros/test_rosparam/Manifest
+++ b/dev-ros/test_rosparam/Manifest
@@ -1,6 +1,8 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD test_rosparam-1.15.10.ebuild 600 BLAKE2B b51b6d1981df545993b81a00d805e66a65e5d04b2454270192d95e2a7546141fb614b7983ec653baf96ba4f989c2e51f0761e66a80fa2c195393e9c1bcdbdf97 SHA512 4b560c3bd4e5dca6c77c6197e9533bdeaf780832104ec64fb5171754abd09491ec4b102fd7578fc704b4918317ac533e77d081d00f040514c5cf6ebc796a60ae
 EBUILD test_rosparam-1.15.7.ebuild 511 BLAKE2B a324a281705bc80360f1c447f7191aae44dbef988217d13d3addcee32bd91b705aa947a53c778f9cf6e3e442cba7c6e64f8cf46100727be29f99f76bb8c0a8cf SHA512 f1d00655518e6aea60aef0100c357b6526d38354ce03b98c7baaf2d76c1d4cbb6a6c1f11877c1847bf6ecd61393f577c9330814b3876832736ee12f5db1325d5
 EBUILD test_rosparam-1.15.8.ebuild 600 BLAKE2B 4d0797df48efa718a5111e2d1725155b7c177688c7f3384b07594786422c56ba6b1ffecf31bf1841cdb5db38d272ae420f35094a82cf36b7d04e0257b0d220fa SHA512 910aad8bc034550401cf40a46562b197be5294c6e9374dc726fa7f49a298f7ee948671a6523afeec64f443490e48f8c58aec43602fb18ccbda558e67af2a7380
 EBUILD test_rosparam-1.15.9.ebuild 600 BLAKE2B 4d0797df48efa718a5111e2d1725155b7c177688c7f3384b07594786422c56ba6b1ffecf31bf1841cdb5db38d272ae420f35094a82cf36b7d04e0257b0d220fa SHA512 910aad8bc034550401cf40a46562b197be5294c6e9374dc726fa7f49a298f7ee948671a6523afeec64f443490e48f8c58aec43602fb18ccbda558e67af2a7380
diff --git a/dev-ros/test_rosparam/test_rosparam-1.15.10.ebuild b/dev-ros/test_rosparam/test_rosparam-1.15.10.ebuild
new file mode 100644
index 000000000000..108cabfb7564
--- /dev/null
+++ b/dev-ros/test_rosparam/test_rosparam-1.15.10.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 4479ca163784..95b9641e7ea8 100644
--- a/dev-ros/test_rospy/Manifest
+++ b/dev-ros/test_rospy/Manifest
@@ -1,5 +1,7 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD test_rospy-1.15.10.ebuild 1013 BLAKE2B e524efc6aee0a4d784dacd1f80857f0c46f2a44976c52df8a3f949a9dd79b2ee6cea38fdaca917552985c37fbce7fa7a956614c04f7b3f41a4d8737bd4dcc404 SHA512 2d6f0e11e8f25209c4e25c3adf43e5e145b4ed81e4ce61140c72733ac40f05646daed99f8c5b4b4e69c942798408bc832ba94c5d4c18049a3263d86e00a8b559
 EBUILD test_rospy-1.15.8.ebuild 1013 BLAKE2B 37058ad100f52ac127d95444a415b1ffe56408048842e9628a9f0ab31fb82e8911399d169234ee4659d786d6575d80a7ad934a687cacb31f8832ee4c376d43e3 SHA512 a7c6fda6661c18be0d595b5c50c39b6f1428987ece563cb07e8a2c6e1f37ea62472108d0bcdcffd4d0f2c7b6fce763ebcc756df684c1041c37ae5e18452148b2
 EBUILD test_rospy-1.15.9.ebuild 1013 BLAKE2B 37058ad100f52ac127d95444a415b1ffe56408048842e9628a9f0ab31fb82e8911399d169234ee4659d786d6575d80a7ad934a687cacb31f8832ee4c376d43e3 SHA512 a7c6fda6661c18be0d595b5c50c39b6f1428987ece563cb07e8a2c6e1f37ea62472108d0bcdcffd4d0f2c7b6fce763ebcc756df684c1041c37ae5e18452148b2
 EBUILD test_rospy-9999.ebuild 1013 BLAKE2B 37058ad100f52ac127d95444a415b1ffe56408048842e9628a9f0ab31fb82e8911399d169234ee4659d786d6575d80a7ad934a687cacb31f8832ee4c376d43e3 SHA512 a7c6fda6661c18be0d595b5c50c39b6f1428987ece563cb07e8a2c6e1f37ea62472108d0bcdcffd4d0f2c7b6fce763ebcc756df684c1041c37ae5e18452148b2
diff --git a/dev-ros/test_rospy/test_rospy-1.15.10.ebuild b/dev-ros/test_rospy/test_rospy-1.15.10.ebuild
new file mode 100644
index 000000000000..af5f3520b53e
--- /dev/null
+++ b/dev-ros/test_rospy/test_rospy-1.15.10.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 6f944769c332..3285e4e89dda 100644
--- a/dev-ros/test_rosservice/Manifest
+++ b/dev-ros/test_rosservice/Manifest
@@ -1,5 +1,7 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD test_rosservice-1.15.10.ebuild 747 BLAKE2B ee2ed54c8d72484922df3e9d7296d7985eb33ad8c56c5c55ef5a45ffd1267313c762f820d8dc69250727f9a6664c003b2ca0674bca74ff77380d1eb1fcbd3d01 SHA512 e67ba7aae73f2d0794d15fb3a75ffba10f0e8099bda9d457fc08b7365ab3c1931afadb2636d6f8998fa1e81ae18265cfe0a8c18b6663a59b85e902e856ca3ad7
 EBUILD test_rosservice-1.15.8.ebuild 747 BLAKE2B 40c198294cef61fd7b95b91984dc3ee881e7567d97e26862a1263acd65439e132106052dc72cc6b26b77e99f3c08816094daf981496154adb6afe83e7f19def6 SHA512 09fe74b32c6a922eb8822e47645f6c19268dff1338a24b471d0902fc8ba1ea002a6c3a6ff13afdf38d8b4dbb83a32ec8a414ff0485615c9362afc5ce8bb95bfd
 EBUILD test_rosservice-1.15.9.ebuild 747 BLAKE2B 40c198294cef61fd7b95b91984dc3ee881e7567d97e26862a1263acd65439e132106052dc72cc6b26b77e99f3c08816094daf981496154adb6afe83e7f19def6 SHA512 09fe74b32c6a922eb8822e47645f6c19268dff1338a24b471d0902fc8ba1ea002a6c3a6ff13afdf38d8b4dbb83a32ec8a414ff0485615c9362afc5ce8bb95bfd
 EBUILD test_rosservice-9999.ebuild 747 BLAKE2B 40c198294cef61fd7b95b91984dc3ee881e7567d97e26862a1263acd65439e132106052dc72cc6b26b77e99f3c08816094daf981496154adb6afe83e7f19def6 SHA512 09fe74b32c6a922eb8822e47645f6c19268dff1338a24b471d0902fc8ba1ea002a6c3a6ff13afdf38d8b4dbb83a32ec8a414ff0485615c9362afc5ce8bb95bfd
diff --git a/dev-ros/test_rosservice/test_rosservice-1.15.10.ebuild b/dev-ros/test_rosservice/test_rosservice-1.15.10.ebuild
new file mode 100644
index 000000000000..b73420876103
--- /dev/null
+++ b/dev-ros/test_rosservice/test_rosservice-1.15.10.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/timestamp_tools/Manifest b/dev-ros/timestamp_tools/Manifest
index 4eee7f619c6a..20372be0f441 100644
--- a/dev-ros/timestamp_tools/Manifest
+++ b/dev-ros/timestamp_tools/Manifest
@@ -1,6 +1,4 @@
-AUX boost.patch 605 BLAKE2B 21419362bbd7c9835722d815b5f02b8292b827d562c9dad3801044080738bd3efa36bf0c74cbb836a633620b4cb0fa1f28c1cb0b5ad6ad38fbe68d31003f23f2 SHA512 c495e773cfecacb275465e05eb08e64ceb0ae8bb023b8bfe7fd6edfd96abc448ef2652774d510618670f49757fa1baab84cfc7a0d3bbb16ea824899e3ca88091
-AUX tests.patch 620 BLAKE2B db7be143209e2b76695d3ecd93e4a524ca692c768f881f7d5f07a6162e3fc428ff053b2342b20663d408343e491985c573d5ed54ef1aa1b9c4941a303b7a5b6b SHA512 c1fa99bd49c370fd38983971268f374f30232691fcd188ec0a2d6d1b8020d619f9e50a88bff3bd36e7463de9a1074f7ad937dc13e54142e091cd80f6c2385b56
-DIST driver_common-1.6.8.tar.gz 15055 BLAKE2B 2d9a4c23d65b8e2f60343f5e3b454e1cc41334d34e0246891b533f216acb743df628d95dd2c0087b06284a85e0ea872baad495a7ed7b59c03e8f8ff32eba4ed8 SHA512 b698143d08785088ac13e62f5b96676bd590a84e4ffb147fa3698be6a8ded510f648d043ecdc1d31ba7b95fb3041d06ee1a39b224c359b8612adebdba259d188
-EBUILD timestamp_tools-1.6.8-r1.ebuild 474 BLAKE2B 4ca70244c2671f207c0346d91e9c051d176c24b9a02674e9eaef927a6604d73642e3ec7d5e5355f90675232e17c3615049e48240b55e8ec15226b864bfac9020 SHA512 23ed3e2e57002773470ed7f6b4902ca4a630778dbc8e79ca0f8f5e09f24df6236d1fc5ec2d8ee5c64b9bd734e5ae476e8ab5d040ea8eac9e9ff4ae253f01ee38
-EBUILD timestamp_tools-9999.ebuild 448 BLAKE2B 462b0a391f80dbc0e7c760913667f46d25cc8a13ee2b6ca04d4b018ddfd9a9be336d39256a5a513f62b2ee2d78510cd454421a8f2967ef26d0514a8016848ce0 SHA512 13bf57e52507d7d78fa37a42c5501629f9c857ec08d30c2d4f6601a79343c4a6ac0d6fc7aa1fe22d117c4d1c55f6f5d798e2ba3f836169c856ce5243946c1063
+DIST driver_common-1.6.9.tar.gz 15374 BLAKE2B 88bcba03596d9a641091d37db8329807cfa0d4dd766298a25f8e41b6da567eb246fdd8c4c8a39698b60a47a118b81b15c3ac93154490a1258d93d3e2fbd5c049 SHA512 1a5f7d261a3e754b380824256d35432cee521b7d255a7f152b6a69d5181ea45a2bbca7a7c6d4e0bea753c8f3c59018a63357c87d2535a9cb55ba311f11e5d749
+EBUILD timestamp_tools-1.6.9.ebuild 410 BLAKE2B 043eabedd01847e1e1dfa2da8e2538337679e5cb6e09b1898209c34c68c1532933ad87f3320d6b9fc36999b30aec033f956944df9fc6da61e03d35d7323349e9 SHA512 f46612714bc069857e1d1d6dac23b467d7019f6834282b5656ae86a3a7fd2eba35305dda41addc553d9af3f84e644bee35e79108c26ad148eb77657a23debec7
+EBUILD timestamp_tools-9999.ebuild 410 BLAKE2B 043eabedd01847e1e1dfa2da8e2538337679e5cb6e09b1898209c34c68c1532933ad87f3320d6b9fc36999b30aec033f956944df9fc6da61e03d35d7323349e9 SHA512 f46612714bc069857e1d1d6dac23b467d7019f6834282b5656ae86a3a7fd2eba35305dda41addc553d9af3f84e644bee35e79108c26ad148eb77657a23debec7
 MISC metadata.xml 339 BLAKE2B 71ed9f79df6d8528f3d967c077f1d01e0290573400356e3749bd24254281651f09507894d2ca4029b8b8a77b51d31d080d9560d9995d3d9fde848f0d71ec083d SHA512 e24ff4ef526475ad5bff434350abb00afccb4c101ab624ee056c1502719d15ec4889eff9170c534af62ba8719bd5fe4f3cf206353244f56e486a29afea53ee7b
diff --git a/dev-ros/timestamp_tools/files/boost.patch b/dev-ros/timestamp_tools/files/boost.patch
deleted file mode 100644
index de7878ca19b8..000000000000
--- a/dev-ros/timestamp_tools/files/boost.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: timestamp_tools/include/timestamp_tools/trigger_matcher.h
-===================================================================
---- timestamp_tools.orig/include/timestamp_tools/trigger_matcher.h
-+++ timestamp_tools/include/timestamp_tools/trigger_matcher.h
-@@ -266,7 +266,7 @@ public:
-     if (stamp != RetryLater)
-       return stamp;
- 
--    got_trigger_condition_.timed_wait(lock, boost::posix_time::microseconds(timeout * 1e6));
-+    got_trigger_condition_.timed_wait(lock, boost::posix_time::microseconds(static_cast<int>(timeout * 1e6)));
-     
-     return getTimestampNoblockPrelocked(t);
-   }
diff --git a/dev-ros/timestamp_tools/files/tests.patch b/dev-ros/timestamp_tools/files/tests.patch
deleted file mode 100644
index d66118537ed3..000000000000
--- a/dev-ros/timestamp_tools/files/tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: driver_common-1.6.8/timestamp_tools/CMakeLists.txt
-===================================================================
---- driver_common-1.6.8.orig/CMakeLists.txt
-+++ driver_common-1.6.8/CMakeLists.txt
-@@ -17,5 +17,7 @@ install(DIRECTORY include/${PROJECT_NAME
-   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-   FILES_MATCHING PATTERN "*.h")
- 
-+if(CATKIN_ENABLE_TESTING)
- catkin_add_gtest(test_trigger_matcher test/test_trigger_matcher.cpp)
--target_link_libraries(test_trigger_matcher ${catkin_LIBRARIES})
-\ No newline at end of file
-+target_link_libraries(test_trigger_matcher ${catkin_LIBRARIES})
-+endif()
diff --git a/dev-ros/timestamp_tools/timestamp_tools-1.6.8-r1.ebuild b/dev-ros/timestamp_tools/timestamp_tools-1.6.9.ebuild
index 52ab3c68a490..efb32587375a 100644
--- a/dev-ros/timestamp_tools/timestamp_tools-1.6.8-r1.ebuild
+++ b/dev-ros/timestamp_tools/timestamp_tools-1.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,4 +19,3 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/tests.patch" "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild b/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild
index 86be358b9919..efb32587375a 100644
--- a/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild
+++ b/dev-ros/timestamp_tools/timestamp_tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,4 +19,3 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/topic_tools/Manifest b/dev-ros/topic_tools/Manifest
index 36b517bde683..2f5385bafe5d 100644
--- a/dev-ros/topic_tools/Manifest
+++ b/dev-ros/topic_tools/Manifest
@@ -1,6 +1,4 @@
-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
-EBUILD topic_tools-1.15.8.ebuild 832 BLAKE2B e025e1142b4a923027c5d15452c5ce6e310df1f805bdbb14e03f71b5beabd909bc8609f0eea161614e697b6c42ffe101b97f2f6556bc81c1bc05770dbd50d3c7 SHA512 c03f68fce690a2d76b547786532e1bba9a5db6480c780f9a0c4eabd5b607c681e7bb45f86014c61e6ded236cd3a53cb459e06b91da1b0a10bdb55c4ca5b60d8e
-EBUILD topic_tools-1.15.9.ebuild 832 BLAKE2B e025e1142b4a923027c5d15452c5ce6e310df1f805bdbb14e03f71b5beabd909bc8609f0eea161614e697b6c42ffe101b97f2f6556bc81c1bc05770dbd50d3c7 SHA512 c03f68fce690a2d76b547786532e1bba9a5db6480c780f9a0c4eabd5b607c681e7bb45f86014c61e6ded236cd3a53cb459e06b91da1b0a10bdb55c4ca5b60d8e
-EBUILD topic_tools-9999.ebuild 832 BLAKE2B e025e1142b4a923027c5d15452c5ce6e310df1f805bdbb14e03f71b5beabd909bc8609f0eea161614e697b6c42ffe101b97f2f6556bc81c1bc05770dbd50d3c7 SHA512 c03f68fce690a2d76b547786532e1bba9a5db6480c780f9a0c4eabd5b607c681e7bb45f86014c61e6ded236cd3a53cb459e06b91da1b0a10bdb55c4ca5b60d8e
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+EBUILD topic_tools-1.15.10-r1.ebuild 833 BLAKE2B de242b907f1063dec86baadb58aec99b1b1ece5027e253c24bb54207f172778bb5d2819392436fc68651a9715364c6bbe87dbbf9ae3e5122e7f60a15c4eafa64 SHA512 f44b083ee74d4dd855e0fa89c51bee534bb1c93508fb14189f2c1730ad638379c0ff0b0aa1fb508aea8e4d263eb10cb5e6310a043d55ec0b813f38fffd769e92
+EBUILD topic_tools-9999.ebuild 833 BLAKE2B de242b907f1063dec86baadb58aec99b1b1ece5027e253c24bb54207f172778bb5d2819392436fc68651a9715364c6bbe87dbbf9ae3e5122e7f60a15c4eafa64 SHA512 f44b083ee74d4dd855e0fa89c51bee534bb1c93508fb14189f2c1730ad638379c0ff0b0aa1fb508aea8e4d263eb10cb5e6310a043d55ec0b813f38fffd769e92
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/topic_tools/topic_tools-1.15.8.ebuild b/dev-ros/topic_tools/topic_tools-1.15.10-r1.ebuild
index 8c28b2e72861..56e95ed254bf 100644
--- a/dev-ros/topic_tools/topic_tools-1.15.8.ebuild
+++ b/dev-ros/topic_tools/topic_tools-1.15.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,6 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/rostime
 	dev-ros/xmlrpcpp
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? (
@@ -30,6 +29,7 @@ DEPEND="${RDEPEND}
 		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}]")
 	)"
diff --git a/dev-ros/topic_tools/topic_tools-1.15.9.ebuild b/dev-ros/topic_tools/topic_tools-1.15.9.ebuild
deleted file mode 100644
index 8c28b2e72861..000000000000
--- a/dev-ros/topic_tools/topic_tools-1.15.9.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 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
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-"
-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-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/topic_tools/topic_tools-9999.ebuild b/dev-ros/topic_tools/topic_tools-9999.ebuild
index 8c28b2e72861..56e95ed254bf 100644
--- a/dev-ros/topic_tools/topic_tools-9999.ebuild
+++ b/dev-ros/topic_tools/topic_tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,6 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/rostime
 	dev-ros/xmlrpcpp
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? (
@@ -30,6 +29,7 @@ DEPEND="${RDEPEND}
 		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}]")
 	)"
diff --git a/dev-ros/urg_node/Manifest b/dev-ros/urg_node/Manifest
index 6f4e2684a853..4435a7045584 100644
--- a/dev-ros/urg_node/Manifest
+++ b/dev-ros/urg_node/Manifest
@@ -1,4 +1,4 @@
 DIST urg_node-0.1.15.tar.gz 21048 BLAKE2B 1a4db87f40e7f895c5e56d3ea5fa1457dd47ce84dd3a5cf18973a8d246e5e86d6c0492a74b43e3407c54415d6dce61dd696c953328997290ab4ceb26c2135e2c SHA512 df505f6ad1a5ff088870a5bc85cc59e96a19a60be63b278d55a048cb812f49e30be2f7dbaff74aab52863598180dfce3f411cbf09ad5f54f130fce9992baeb87
-EBUILD urg_node-0.1.15.ebuild 771 BLAKE2B 6af564a481e0e867fa6a4d336f3ecfa770dccabd4cb872bbc8c37bef69a46932aae0c7ef81f3354a1451a87160758f17ad2ce47d1b08efb23cf2bdbffae1f6a6 SHA512 25237a0731dbc1942d65116328bb1a303cd79db2f04ed8e47410db6dc14e903128f2e0b891ddb36f25b616fa237cc0227a303605dc5732a3990e996c55dbf9fc
-EBUILD urg_node-9999.ebuild 771 BLAKE2B a78e7957b80f181fca7464b1499a5c686252271eb27494585e9c567648e5e3b140380267226c8dee82bcc9ac536fac178dcbc57f4179f3b2183125183390ec06 SHA512 d33a2914eaf7d953e9305df5862d4d133e23971578bb7c910fcc7b2692b57334d9970e7cf472569fe1fc7be23ef61cfabcb2ae7e51009254702fdbf8afcd5084
+EBUILD urg_node-0.1.15.ebuild 770 BLAKE2B 79c4aec001214a5588a806582308f18cdb66cc981490340086129e58caf858c2b37ad0a0646eb8ed4074b9ac8226447fe756beae02ec4fd439b9ee4bf6b0aa4d SHA512 c8bd72e192dbb407ecb3c9cc595617ac1bfdb93649d63bcb890f012e548b542de894c137ed0d6282c70d7ad2d830ed1e5bd5f89ac870b7e40719d9e9f27d4576
+EBUILD urg_node-9999.ebuild 770 BLAKE2B 79c4aec001214a5588a806582308f18cdb66cc981490340086129e58caf858c2b37ad0a0646eb8ed4074b9ac8226447fe756beae02ec4fd439b9ee4bf6b0aa4d SHA512 c8bd72e192dbb407ecb3c9cc595617ac1bfdb93649d63bcb890f012e548b542de894c137ed0d6282c70d7ad2d830ed1e5bd5f89ac870b7e40719d9e9f27d4576
 MISC metadata.xml 334 BLAKE2B 11f0825fc04fb1be3a7d357977ce3abc4c5d34e8e9924512a2a47cdc00be4153912e5e60f7d3b24e58a1e3942554bf4c2ce015818b32de50d0b25bb3e6db0dbf SHA512 eb832353afafdd96bb0d620bb87a19720451fdffa2150cbf0bf547c6f782c62f395d00e2f675d9da0345a377fd4f22d8e951bb9da7ade108f4e0a51b5af235b5
diff --git a/dev-ros/urg_node/urg_node-0.1.15.ebuild b/dev-ros/urg_node/urg_node-0.1.15.ebuild
index 985c4cbd04ca..0b173d1c9c2f 100644
--- a/dev-ros/urg_node/urg_node-0.1.15.ebuild
+++ b/dev-ros/urg_node/urg_node-0.1.15.ebuild
@@ -6,6 +6,8 @@ ROS_REPO_URI="https://github.com/ros-drivers/urg_node"
 KEYWORDS="~amd64 ~arm"
 CATKIN_HAS_MESSAGES=yes
 
+# https://bugs.gentoo.org/735106
+CMAKE_MAKEFILE_GENERATOR=emake
 inherit ros-catkin
 
 DESCRIPTION="ROS wrapper for the Hokuyo urg_c library"
@@ -32,6 +34,3 @@ DEPEND="${RDEPEND}
 		dev-ros/roslaunch
 	)
 "
-
-# https://bugs.gentoo.org/735106
-CMAKE_MAKEFILE_GENERATOR=emake
diff --git a/dev-ros/urg_node/urg_node-9999.ebuild b/dev-ros/urg_node/urg_node-9999.ebuild
index cd680c30f62e..0b173d1c9c2f 100644
--- a/dev-ros/urg_node/urg_node-9999.ebuild
+++ b/dev-ros/urg_node/urg_node-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,6 +6,8 @@ ROS_REPO_URI="https://github.com/ros-drivers/urg_node"
 KEYWORDS="~amd64 ~arm"
 CATKIN_HAS_MESSAGES=yes
 
+# https://bugs.gentoo.org/735106
+CMAKE_MAKEFILE_GENERATOR=emake
 inherit ros-catkin
 
 DESCRIPTION="ROS wrapper for the Hokuyo urg_c library"
@@ -32,6 +34,3 @@ DEPEND="${RDEPEND}
 		dev-ros/roslaunch
 	)
 "
-
-# https://bugs.gentoo.org/735106
-CMAKE_MAKEFILE_GENERATOR=emake
diff --git a/dev-ros/xacro/Manifest b/dev-ros/xacro/Manifest
index cb5b3c126080..3708d30fa5b5 100644
--- a/dev-ros/xacro/Manifest
+++ b/dev-ros/xacro/Manifest
@@ -1,5 +1,5 @@
 AUX tests.patch 625 BLAKE2B 5ec4d6bca2278f40a4886371abd75beb0ff933d3b7e6e9e4554e7f9d63b521d2ff9d2c91c530177c818de2006bbc7db77e86ce3f4323017f870cb6b2a186ba9c SHA512 10da25011dc5c63d282d45862c35d9f900a90bc61059d6e703e50e2a94bdd4ca9c0f20d3fe6e5b03b3f98059e1bcb74272adcbb7f72d5e5f1d3ad4ce5a5f6bca
-DIST xacro-1.14.5.tar.gz 81184 BLAKE2B 27234030e313c715cdd2fb9cc2e77f8e3591017ac99ca7af35e7ae6a01bab56175f4f512595ee12ca47a7405ad38cec4d77b6cf71172c24444c31da350be6d3c SHA512 5f3bc7507fcd4774c0a00c5715cf96cb4b2b3ca279df70d0158c7d8eae773df962c10319887f867316ea135937249cb6805bd79b78f70f61d7a767b63dfdf3db
-EBUILD xacro-1.14.5.ebuild 773 BLAKE2B cffe52b6159091b8fa0e657680e1c6bde3fe55c60645ba55bb09d14514a066f70b81a690507ccfa29586c809225fc42e173bd643af08e94a56ce5148512efd4b SHA512 66e63f19b3d547f7b0cbfafd7ca6417baafb1dcd25dedffe6e0662f8ca35693d433ce3152b7fdfdca0b3184ffb213ab7a280991717d2790ae5f3a5723def6aa2
+DIST xacro-1.14.6.tar.gz 81362 BLAKE2B b0ec80e8f224f1b31e9f21e1c11669a46da1b13cf82b5d82912196f9f647aa1c45a7084f4ea1e1690c0d969b5e126cd5b6069c9987034898b72d92310b7d565f SHA512 0796c07cbf4d51699ab07d656a42d13fc140406f6dbee3b94554f2aa91e68b64bd5d2c218930edb5b139ac41b5d5c6bffad505d220353d5748f371ec6bb196a3
+EBUILD xacro-1.14.6.ebuild 773 BLAKE2B 2911b685e1a3992014b35541f7d261ea3b744716602211cbcc09df27a892fbd4dfa0576a8b70cebc5d6249fc4e70494be958c4a1cfa081b290b4232130c38cc6 SHA512 792e024feab8a468d906f332dab2806d05c0d4d643b6cbd9d995efede0dfd3a2e909110acd761af34753166a13ddf983793fdaa4bb510c583de3cd4a5ff96bc0
 EBUILD xacro-9999.ebuild 773 BLAKE2B cffe52b6159091b8fa0e657680e1c6bde3fe55c60645ba55bb09d14514a066f70b81a690507ccfa29586c809225fc42e173bd643af08e94a56ce5148512efd4b SHA512 66e63f19b3d547f7b0cbfafd7ca6417baafb1dcd25dedffe6e0662f8ca35693d433ce3152b7fdfdca0b3184ffb213ab7a280991717d2790ae5f3a5723def6aa2
 MISC metadata.xml 323 BLAKE2B d43754a1147a95e3536569c858b3dafecbc9dd4ec06ef00d23d7948de3aaf40d15aabf502f6c1b5579c03139c06579517c86fddc6eaa61f970baf101d9fef68e SHA512 9c6fccac3f7ab699969eb90199aa9690d064f1d66cc003c157bf85bc3147ae42f1433ac1589f57ce5b05ebd78a44c7f1a92f99e3af29bdee58727c1a676afd37
diff --git a/dev-ros/xacro/xacro-1.14.5.ebuild b/dev-ros/xacro/xacro-1.14.6.ebuild
index 8383de0334c5..5c1e6682dc01 100644
--- a/dev-ros/xacro/xacro-1.14.5.ebuild
+++ b/dev-ros/xacro/xacro-1.14.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-ros/xmlrpcpp/Manifest b/dev-ros/xmlrpcpp/Manifest
index 4a3acaaa0b35..cf0715805d76 100644
--- a/dev-ros/xmlrpcpp/Manifest
+++ b/dev-ros/xmlrpcpp/Manifest
@@ -1,5 +1,7 @@
+DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 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
+EBUILD xmlrpcpp-1.15.10.ebuild 444 BLAKE2B 572168dd07de0ab3050a52953d30ad2e3c064ca5376804b4ce8a0d0b82e363b6cb1cfed53d9fe4fa8cfa5e4bba744d4108983f016218b380efb5800845d7d8f2 SHA512 48c4b7756740981e370359e393210182dd75b185d080478a20094789c8dd5d16ea8ae7ff9ad07a2fc2d7ee85375f69b3176f68e5722fc7b98c660bcac9977c08
 EBUILD xmlrpcpp-1.15.8.ebuild 444 BLAKE2B 11b1eda8abe7c6201faa025c584dbc21bd8dd1457932a244b23108aa3fad65fe6f5560c84ed22f8f0822b7bd1635af34faada3870d278eeeef783eca58380fc5 SHA512 8d3039c3406f21a738c324a8cd304fad351e208e9d8570a49c41e92ad2fbf1d7488caa749e53f26aebafdbdec69101c813f430866406f65425d21c42ee655035
 EBUILD xmlrpcpp-1.15.9.ebuild 444 BLAKE2B 11b1eda8abe7c6201faa025c584dbc21bd8dd1457932a244b23108aa3fad65fe6f5560c84ed22f8f0822b7bd1635af34faada3870d278eeeef783eca58380fc5 SHA512 8d3039c3406f21a738c324a8cd304fad351e208e9d8570a49c41e92ad2fbf1d7488caa749e53f26aebafdbdec69101c813f430866406f65425d21c42ee655035
 EBUILD xmlrpcpp-9999.ebuild 444 BLAKE2B 11b1eda8abe7c6201faa025c584dbc21bd8dd1457932a244b23108aa3fad65fe6f5560c84ed22f8f0822b7bd1635af34faada3870d278eeeef783eca58380fc5 SHA512 8d3039c3406f21a738c324a8cd304fad351e208e9d8570a49c41e92ad2fbf1d7488caa749e53f26aebafdbdec69101c813f430866406f65425d21c42ee655035
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.10.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.10.ebuild
new file mode 100644
index 000000000000..aed3f9773547
--- /dev/null
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.10.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]
+	)
+"
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-ros
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)