gentoo resync : 07.08.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-08-07 00:16:33 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-08-07 00:16:33 +0100
commit: d162ba1860a88062f4cd61f8b52fc303ba0b2991 (patch)
tree: 24cd2cf57f3932a24b96e4a0f6666489447e43ba /dev-ros
parent: 590b9b7b03bf4651e099949e318755af7cfa81b8 (diff)
384 files changed, 4347 insertions, 842 deletions
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 806cc9190888..6acd3e00aeeb 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/actionlib/Manifest b/dev-ros/actionlib/Manifest
index 62d2bb889406..9bf6d29eddfe 100644
--- a/dev-ros/actionlib/Manifest
+++ b/dev-ros/actionlib/Manifest
@@ -1,4 +1,4 @@
 DIST actionlib-1.13.2.tar.gz 101040 BLAKE2B 3c48ea46a5a6f91ead92c49870415f2e3addfb21190066a9b7d3e639a1dbe50a696b1cd61dc31dcb92d25a8e5a283a5c6184848ea7270e709a43b444398e4077 SHA512 f6186c8cdff916c5a13e635322fb915867b15fe175da1e0916713e4f2fd3c8e60f59dabc9dd9b31e1f0dcf699118a00e5a2d60db4a15bc65a731ba7a956147d9
-EBUILD actionlib-1.13.2-r1.ebuild 863 BLAKE2B 7a6c2b63a42727e8bee858b3bed0fb7e74a6d7919a891c7d8fa2d3a04b1a5bace96501b15141d38f3a9e700e71fe6ffb6fab80ee2e92dd47075ec7c4ba0f46d3 SHA512 2a140a173f70e556b9914478aff5b483142897abf5e4a663914fb60f51c505bdd7f8a07eb983382c6208973f6d1f236c08b0f399cc151a17705203ab6fbc2837
-EBUILD actionlib-9999.ebuild 863 BLAKE2B 7a6c2b63a42727e8bee858b3bed0fb7e74a6d7919a891c7d8fa2d3a04b1a5bace96501b15141d38f3a9e700e71fe6ffb6fab80ee2e92dd47075ec7c4ba0f46d3 SHA512 2a140a173f70e556b9914478aff5b483142897abf5e4a663914fb60f51c505bdd7f8a07eb983382c6208973f6d1f236c08b0f399cc151a17705203ab6fbc2837
+EBUILD actionlib-1.13.2-r1.ebuild 906 BLAKE2B c397a54658eb8ad27d6a198732e78af66f1b759090a093fcd1a599d8b140af037a6d12e6790239a9e559fc67c3408da17077215461f0a5deda2f756b6d01d9f9 SHA512 b20df58de3983d970f181f7963c8158cdf108f9b0ca2005cb66e4151cfca455cfffcdff0ac99910168cfd0622aa764617edc63df2350ea046e02632b6bfe3019
+EBUILD actionlib-9999.ebuild 906 BLAKE2B c397a54658eb8ad27d6a198732e78af66f1b759090a093fcd1a599d8b140af037a6d12e6790239a9e559fc67c3408da17077215461f0a5deda2f756b6d01d9f9 SHA512 b20df58de3983d970f181f7963c8158cdf108f9b0ca2005cb66e4151cfca455cfffcdff0ac99910168cfd0622aa764617edc63df2350ea046e02632b6bfe3019
 MISC metadata.xml 327 BLAKE2B 007cbc7d1abad4e0f3aaf4509c5c3856044c3ac530924921d0f21d795123c8651001b05d7ec26d9ff22304784bdd5bca25a2fae2474f3c5b5f031b9518a59f3a SHA512 f76c38a1b5699078331b74d7ed7cf40de05e2d24b398589b6dc9fdd03a486c438f2109ddab42de0ad41fb72b8eff87e69cdd7f21e79cabd03a8bbb8a8d3ce7b8
diff --git a/dev-ros/actionlib/actionlib-1.13.2-r1.ebuild b/dev-ros/actionlib/actionlib-1.13.2-r1.ebuild
index 77fa73a7d42f..082ffedaef8d 100644
--- a/dev-ros/actionlib/actionlib-1.13.2-r1.ebuild
+++ b/dev-ros/actionlib/actionlib-1.13.2-r1.ebuild
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}
 	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
 	test? (
 		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
 		dev-cpp/gtest
 	)"
 RDEPEND="${RDEPEND}
diff --git a/dev-ros/actionlib/actionlib-9999.ebuild b/dev-ros/actionlib/actionlib-9999.ebuild
index 77fa73a7d42f..082ffedaef8d 100644
--- a/dev-ros/actionlib/actionlib-9999.ebuild
+++ b/dev-ros/actionlib/actionlib-9999.ebuild
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}
 	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
 	test? (
 		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
 		dev-cpp/gtest
 	)"
 RDEPEND="${RDEPEND}
diff --git a/dev-ros/ament_cmake_copyright/Manifest b/dev-ros/ament_cmake_copyright/Manifest
index d83e4a77c3fd..65e76032f0d3 100644
--- a/dev-ros/ament_cmake_copyright/Manifest
+++ b/dev-ros/ament_cmake_copyright/Manifest
@@ -1,10 +1,6 @@
-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 1660 BLAKE2B 3980914f8813bc3b30914f0dc0bac722be513a78474ad27db8770217c9e1a9996ecd8736f54de04f54b3ea0c1ade7033f083090a8cc1b5817b2d51285121400a SHA512 05d65a67a27999b048cdc3965fe198027443b9d6d79ed5a029c46816922b4517663cce51812c059f8bfb52f4db993db1a930b2fbc20ab293e8bc33f7b5d97ed4
-EBUILD ament_cmake_copyright-0.10.1.ebuild 1660 BLAKE2B 3980914f8813bc3b30914f0dc0bac722be513a78474ad27db8770217c9e1a9996ecd8736f54de04f54b3ea0c1ade7033f083090a8cc1b5817b2d51285121400a SHA512 05d65a67a27999b048cdc3965fe198027443b9d6d79ed5a029c46816922b4517663cce51812c059f8bfb52f4db993db1a930b2fbc20ab293e8bc33f7b5d97ed4
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 EBUILD ament_cmake_copyright-0.10.4.ebuild 1660 BLAKE2B 3980914f8813bc3b30914f0dc0bac722be513a78474ad27db8770217c9e1a9996ecd8736f54de04f54b3ea0c1ade7033f083090a8cc1b5817b2d51285121400a SHA512 05d65a67a27999b048cdc3965fe198027443b9d6d79ed5a029c46816922b4517663cce51812c059f8bfb52f4db993db1a930b2fbc20ab293e8bc33f7b5d97ed4
-EBUILD ament_cmake_copyright-0.9.5.ebuild 1660 BLAKE2B 3980914f8813bc3b30914f0dc0bac722be513a78474ad27db8770217c9e1a9996ecd8736f54de04f54b3ea0c1ade7033f083090a8cc1b5817b2d51285121400a SHA512 05d65a67a27999b048cdc3965fe198027443b9d6d79ed5a029c46816922b4517663cce51812c059f8bfb52f4db993db1a930b2fbc20ab293e8bc33f7b5d97ed4
+EBUILD ament_cmake_copyright-0.11.2.ebuild 1660 BLAKE2B 3980914f8813bc3b30914f0dc0bac722be513a78474ad27db8770217c9e1a9996ecd8736f54de04f54b3ea0c1ade7033f083090a8cc1b5817b2d51285121400a SHA512 05d65a67a27999b048cdc3965fe198027443b9d6d79ed5a029c46816922b4517663cce51812c059f8bfb52f4db993db1a930b2fbc20ab293e8bc33f7b5d97ed4
 EBUILD ament_cmake_copyright-9999.ebuild 1660 BLAKE2B 3980914f8813bc3b30914f0dc0bac722be513a78474ad27db8770217c9e1a9996ecd8736f54de04f54b3ea0c1ade7033f083090a8cc1b5817b2d51285121400a SHA512 05d65a67a27999b048cdc3965fe198027443b9d6d79ed5a029c46816922b4517663cce51812c059f8bfb52f4db993db1a930b2fbc20ab293e8bc33f7b5d97ed4
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.0.ebuild b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.11.2.ebuild
index aedb04bff69e..aedb04bff69e 100644
--- a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.0.ebuild
+++ b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.11.2.ebuild
diff --git a/dev-ros/ament_cmake_core/Manifest b/dev-ros/ament_cmake_core/Manifest
index e02dba12b8e4..051d211ceefb 100644
--- a/dev-ros/ament_cmake_core/Manifest
+++ b/dev-ros/ament_cmake_core/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 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
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_core-0.9.6.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
 EBUILD ament_cmake_core-1.0.0.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
 EBUILD ament_cmake_core-1.0.1.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
 EBUILD ament_cmake_core-1.0.3.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
 EBUILD ament_cmake_core-1.0.4.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
 EBUILD ament_cmake_core-1.1.3.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
+EBUILD ament_cmake_core-1.1.4.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
 EBUILD ament_cmake_core-9999.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-1.1.4.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.1.4.ebuild
new file mode 100644
index 000000000000..a1dc3e627817
--- /dev/null
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-1.1.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} )
+
+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
+	PROPERTIES="live"
+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 0d76a0ebc33d..af4c672e20b1 100644
--- a/dev-ros/ament_cmake_cppcheck/Manifest
+++ b/dev-ros/ament_cmake_cppcheck/Manifest
@@ -1,10 +1,12 @@
 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.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_cppcheck-0.10.0.ebuild 1537 BLAKE2B a53eefde7cae95039d554c2514a5eb0d94c2aadce0cea6e7923b7186909cd84a04fcdd0b59291bec620b20c9e6b6ee06c306ed673ac5ea6f92ebb1b552ab6083 SHA512 45cff84303c29a7d05cb66b25d01c26cf6e84f228aba58ef0119113aff269bdca6822e156f984e766c8835e85b9268c3fbf31f26ef969f9f0dac5290e54af67d
 EBUILD ament_cmake_cppcheck-0.10.1.ebuild 1537 BLAKE2B a53eefde7cae95039d554c2514a5eb0d94c2aadce0cea6e7923b7186909cd84a04fcdd0b59291bec620b20c9e6b6ee06c306ed673ac5ea6f92ebb1b552ab6083 SHA512 45cff84303c29a7d05cb66b25d01c26cf6e84f228aba58ef0119113aff269bdca6822e156f984e766c8835e85b9268c3fbf31f26ef969f9f0dac5290e54af67d
 EBUILD ament_cmake_cppcheck-0.10.4.ebuild 1537 BLAKE2B a53eefde7cae95039d554c2514a5eb0d94c2aadce0cea6e7923b7186909cd84a04fcdd0b59291bec620b20c9e6b6ee06c306ed673ac5ea6f92ebb1b552ab6083 SHA512 45cff84303c29a7d05cb66b25d01c26cf6e84f228aba58ef0119113aff269bdca6822e156f984e766c8835e85b9268c3fbf31f26ef969f9f0dac5290e54af67d
+EBUILD ament_cmake_cppcheck-0.11.2.ebuild 1537 BLAKE2B a53eefde7cae95039d554c2514a5eb0d94c2aadce0cea6e7923b7186909cd84a04fcdd0b59291bec620b20c9e6b6ee06c306ed673ac5ea6f92ebb1b552ab6083 SHA512 45cff84303c29a7d05cb66b25d01c26cf6e84f228aba58ef0119113aff269bdca6822e156f984e766c8835e85b9268c3fbf31f26ef969f9f0dac5290e54af67d
 EBUILD ament_cmake_cppcheck-0.9.5.ebuild 1537 BLAKE2B a53eefde7cae95039d554c2514a5eb0d94c2aadce0cea6e7923b7186909cd84a04fcdd0b59291bec620b20c9e6b6ee06c306ed673ac5ea6f92ebb1b552ab6083 SHA512 45cff84303c29a7d05cb66b25d01c26cf6e84f228aba58ef0119113aff269bdca6822e156f984e766c8835e85b9268c3fbf31f26ef969f9f0dac5290e54af67d
 EBUILD ament_cmake_cppcheck-9999.ebuild 1537 BLAKE2B a53eefde7cae95039d554c2514a5eb0d94c2aadce0cea6e7923b7186909cd84a04fcdd0b59291bec620b20c9e6b6ee06c306ed673ac5ea6f92ebb1b552ab6083 SHA512 45cff84303c29a7d05cb66b25d01c26cf6e84f228aba58ef0119113aff269bdca6822e156f984e766c8835e85b9268c3fbf31f26ef969f9f0dac5290e54af67d
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.9.5.ebuild b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.11.2.ebuild
index aedb04bff69e..db8cbeb51733 100644
--- a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.9.5.ebuild
+++ b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.11.2.ebuild
@@ -18,7 +18,7 @@ else
 	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
 fi
 
-DESCRIPTION="The auto-magic functions for ease to use of the ament linters"
+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"
@@ -32,27 +32,27 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-ros/ament_copyright
 	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cppcheck
 "
 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
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 	dev-ros/ament_cmake_test
-	dev-ros/ament_copyright
+	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() {
-	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}]" )
+	{ 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() {
diff --git a/dev-ros/ament_cmake_cpplint/Manifest b/dev-ros/ament_cmake_cpplint/Manifest
index f74f2af33f8c..90c1d755b3eb 100644
--- a/dev-ros/ament_cmake_cpplint/Manifest
+++ b/dev-ros/ament_cmake_cpplint/Manifest
@@ -1,10 +1,12 @@
 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.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_cpplint-0.10.0.ebuild 1503 BLAKE2B e3393824134e0ad87e9df8c937cd0b00c4263a4a351740ce7f36949be5392b5fbe32296d521503b2efbb3059b0857c51496de10da95498c400d11af601ab9221 SHA512 fe6811b1405e6bb04082648970b11f9292e6c3cdb97125378de9dd8fa52c6424b49e7d9f1e0040e3343a8c72d9a336809c9aea7718d3d6c916a58b1e763cfef7
 EBUILD ament_cmake_cpplint-0.10.1.ebuild 1503 BLAKE2B e3393824134e0ad87e9df8c937cd0b00c4263a4a351740ce7f36949be5392b5fbe32296d521503b2efbb3059b0857c51496de10da95498c400d11af601ab9221 SHA512 fe6811b1405e6bb04082648970b11f9292e6c3cdb97125378de9dd8fa52c6424b49e7d9f1e0040e3343a8c72d9a336809c9aea7718d3d6c916a58b1e763cfef7
 EBUILD ament_cmake_cpplint-0.10.4.ebuild 1503 BLAKE2B e3393824134e0ad87e9df8c937cd0b00c4263a4a351740ce7f36949be5392b5fbe32296d521503b2efbb3059b0857c51496de10da95498c400d11af601ab9221 SHA512 fe6811b1405e6bb04082648970b11f9292e6c3cdb97125378de9dd8fa52c6424b49e7d9f1e0040e3343a8c72d9a336809c9aea7718d3d6c916a58b1e763cfef7
+EBUILD ament_cmake_cpplint-0.11.2.ebuild 1503 BLAKE2B e3393824134e0ad87e9df8c937cd0b00c4263a4a351740ce7f36949be5392b5fbe32296d521503b2efbb3059b0857c51496de10da95498c400d11af601ab9221 SHA512 fe6811b1405e6bb04082648970b11f9292e6c3cdb97125378de9dd8fa52c6424b49e7d9f1e0040e3343a8c72d9a336809c9aea7718d3d6c916a58b1e763cfef7
 EBUILD ament_cmake_cpplint-0.9.5.ebuild 1503 BLAKE2B e3393824134e0ad87e9df8c937cd0b00c4263a4a351740ce7f36949be5392b5fbe32296d521503b2efbb3059b0857c51496de10da95498c400d11af601ab9221 SHA512 fe6811b1405e6bb04082648970b11f9292e6c3cdb97125378de9dd8fa52c6424b49e7d9f1e0040e3343a8c72d9a336809c9aea7718d3d6c916a58b1e763cfef7
 EBUILD ament_cmake_cpplint-9999.ebuild 1503 BLAKE2B e3393824134e0ad87e9df8c937cd0b00c4263a4a351740ce7f36949be5392b5fbe32296d521503b2efbb3059b0857c51496de10da95498c400d11af601ab9221 SHA512 fe6811b1405e6bb04082648970b11f9292e6c3cdb97125378de9dd8fa52c6424b49e7d9f1e0040e3343a8c72d9a336809c9aea7718d3d6c916a58b1e763cfef7
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.11.2.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.11.2.ebuild
new file mode 100644
index 000000000000..c9b636058541
--- /dev/null
+++ b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.11.2.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
+	PROPERTIES="live"
+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 18f075de3b45..f083ab6e012e 100644
--- a/dev-ros/ament_cmake_export_definitions/Manifest
+++ b/dev-ros/ament_cmake_export_definitions/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 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
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_export_definitions-0.9.6.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
 EBUILD ament_cmake_export_definitions-1.0.0.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
 EBUILD ament_cmake_export_definitions-1.0.1.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
 EBUILD ament_cmake_export_definitions-1.0.3.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
 EBUILD ament_cmake_export_definitions-1.0.4.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
 EBUILD ament_cmake_export_definitions-1.1.3.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
+EBUILD ament_cmake_export_definitions-1.1.4.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
 EBUILD ament_cmake_export_definitions-9999.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.4.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.4.ebuild
new file mode 100644
index 000000000000..40a130e4953e
--- /dev/null
+++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.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} )
+
+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
+	PROPERTIES="live"
+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 7235086e6634..6b304bf9253a 100644
--- a/dev-ros/ament_cmake_export_dependencies/Manifest
+++ b/dev-ros/ament_cmake_export_dependencies/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 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
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_export_dependencies-0.9.6.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
 EBUILD ament_cmake_export_dependencies-1.0.0.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
 EBUILD ament_cmake_export_dependencies-1.0.1.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
 EBUILD ament_cmake_export_dependencies-1.0.3.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
 EBUILD ament_cmake_export_dependencies-1.0.4.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
 EBUILD ament_cmake_export_dependencies-1.1.3.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
+EBUILD ament_cmake_export_dependencies-1.1.4.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
 EBUILD ament_cmake_export_dependencies-9999.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.4.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.4.ebuild
new file mode 100644
index 000000000000..6be2a34aa01e
--- /dev/null
+++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.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_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
+	PROPERTIES="live"
+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 d755b9b67237..31b934ecd168 100644
--- a/dev-ros/ament_cmake_export_include_directories/Manifest
+++ b/dev-ros/ament_cmake_export_include_directories/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 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
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_export_include_directories-0.9.6.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_export_include_directories-1.0.0.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_export_include_directories-1.0.1.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_export_include_directories-1.0.3.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_export_include_directories-1.0.4.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_export_include_directories-1.1.3.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
+EBUILD ament_cmake_export_include_directories-1.1.4.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_export_include_directories-9999.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 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.4.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.1.4.ebuild
new file mode 100644
index 000000000000..4a30d0ac2418
--- /dev/null
+++ b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.1.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} )
+
+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
+	PROPERTIES="live"
+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 88f4bfcfea93..1ae1a5e69643 100644
--- a/dev-ros/ament_cmake_export_interfaces/Manifest
+++ b/dev-ros/ament_cmake_export_interfaces/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 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
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_export_interfaces-0.9.6.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
 EBUILD ament_cmake_export_interfaces-1.0.0.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
 EBUILD ament_cmake_export_interfaces-1.0.1.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
 EBUILD ament_cmake_export_interfaces-1.0.3.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
 EBUILD ament_cmake_export_interfaces-1.0.4.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
 EBUILD ament_cmake_export_interfaces-1.1.3.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
+EBUILD ament_cmake_export_interfaces-1.1.4.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
 EBUILD ament_cmake_export_interfaces-9999.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.4.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.4.ebuild
new file mode 100644
index 000000000000..e618a9ad7d4d
--- /dev/null
+++ b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.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_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
+	PROPERTIES="live"
+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 2e65c68f6a4c..a9f0e4ae53d8 100644
--- a/dev-ros/ament_cmake_export_libraries/Manifest
+++ b/dev-ros/ament_cmake_export_libraries/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 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
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_export_libraries-0.9.6.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
 EBUILD ament_cmake_export_libraries-1.0.0.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
 EBUILD ament_cmake_export_libraries-1.0.1.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
 EBUILD ament_cmake_export_libraries-1.0.3.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
 EBUILD ament_cmake_export_libraries-1.0.4.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
 EBUILD ament_cmake_export_libraries-1.1.3.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
+EBUILD ament_cmake_export_libraries-1.1.4.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
 EBUILD ament_cmake_export_libraries-9999.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.4.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.4.ebuild
new file mode 100644
index 000000000000..5a63a39ded54
--- /dev/null
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.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} )
+
+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
+	PROPERTIES="live"
+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 4d08271072ed..1fb98e05cc41 100644
--- a/dev-ros/ament_cmake_export_link_flags/Manifest
+++ b/dev-ros/ament_cmake_export_link_flags/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 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
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_export_link_flags-0.9.6.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
 EBUILD ament_cmake_export_link_flags-1.0.0.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
 EBUILD ament_cmake_export_link_flags-1.0.1.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
 EBUILD ament_cmake_export_link_flags-1.0.3.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
 EBUILD ament_cmake_export_link_flags-1.0.4.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
 EBUILD ament_cmake_export_link_flags-1.1.3.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
+EBUILD ament_cmake_export_link_flags-1.1.4.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
 EBUILD ament_cmake_export_link_flags-9999.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
 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.4.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.1.4.ebuild
new file mode 100644
index 000000000000..e31c09637e5a
--- /dev/null
+++ b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.1.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} )
+
+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
+	PROPERTIES="live"
+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 dd0d3a9a6a2f..deb97f0ca0d3 100644
--- a/dev-ros/ament_cmake_export_targets/Manifest
+++ b/dev-ros/ament_cmake_export_targets/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 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
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_export_targets-0.9.6.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
 EBUILD ament_cmake_export_targets-1.0.0.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
 EBUILD ament_cmake_export_targets-1.0.1.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
 EBUILD ament_cmake_export_targets-1.0.3.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
 EBUILD ament_cmake_export_targets-1.0.4.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
 EBUILD ament_cmake_export_targets-1.1.3.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
+EBUILD ament_cmake_export_targets-1.1.4.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
 EBUILD ament_cmake_export_targets-9999.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.4.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.4.ebuild
new file mode 100644
index 000000000000..50b62c2a317b
--- /dev/null
+++ b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.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_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
+	PROPERTIES="live"
+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 e1a9a3fdb8e4..e3cf038e8d4d 100644
--- a/dev-ros/ament_cmake_gmock/Manifest
+++ b/dev-ros/ament_cmake_gmock/Manifest
@@ -3,10 +3,12 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 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
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_gmock-1.0.0.ebuild 1158 BLAKE2B d97a5089a055c9bbfa733f42d848f01c849cf5a4c5f106305346e9b7bbcd7a3bd93898b334133280a7be9b71911f3ea9c2f4ea62d4db6240b21d27f072a12bec SHA512 3a05e2fc64eccf5c6fa31b015eb86746a2089837cf44ab901b84c1fa80e09cde06459e4f0e4002ca31cbaed367804c8d445edb5bda4ba20940d85afa29b3134e
 EBUILD ament_cmake_gmock-1.0.1.ebuild 1158 BLAKE2B d97a5089a055c9bbfa733f42d848f01c849cf5a4c5f106305346e9b7bbcd7a3bd93898b334133280a7be9b71911f3ea9c2f4ea62d4db6240b21d27f072a12bec SHA512 3a05e2fc64eccf5c6fa31b015eb86746a2089837cf44ab901b84c1fa80e09cde06459e4f0e4002ca31cbaed367804c8d445edb5bda4ba20940d85afa29b3134e
 EBUILD ament_cmake_gmock-1.0.3.ebuild 1158 BLAKE2B d97a5089a055c9bbfa733f42d848f01c849cf5a4c5f106305346e9b7bbcd7a3bd93898b334133280a7be9b71911f3ea9c2f4ea62d4db6240b21d27f072a12bec SHA512 3a05e2fc64eccf5c6fa31b015eb86746a2089837cf44ab901b84c1fa80e09cde06459e4f0e4002ca31cbaed367804c8d445edb5bda4ba20940d85afa29b3134e
 EBUILD ament_cmake_gmock-1.0.4.ebuild 1158 BLAKE2B d97a5089a055c9bbfa733f42d848f01c849cf5a4c5f106305346e9b7bbcd7a3bd93898b334133280a7be9b71911f3ea9c2f4ea62d4db6240b21d27f072a12bec SHA512 3a05e2fc64eccf5c6fa31b015eb86746a2089837cf44ab901b84c1fa80e09cde06459e4f0e4002ca31cbaed367804c8d445edb5bda4ba20940d85afa29b3134e
 EBUILD ament_cmake_gmock-1.1.3.ebuild 1158 BLAKE2B d97a5089a055c9bbfa733f42d848f01c849cf5a4c5f106305346e9b7bbcd7a3bd93898b334133280a7be9b71911f3ea9c2f4ea62d4db6240b21d27f072a12bec SHA512 3a05e2fc64eccf5c6fa31b015eb86746a2089837cf44ab901b84c1fa80e09cde06459e4f0e4002ca31cbaed367804c8d445edb5bda4ba20940d85afa29b3134e
+EBUILD ament_cmake_gmock-1.1.4.ebuild 1158 BLAKE2B d97a5089a055c9bbfa733f42d848f01c849cf5a4c5f106305346e9b7bbcd7a3bd93898b334133280a7be9b71911f3ea9c2f4ea62d4db6240b21d27f072a12bec SHA512 3a05e2fc64eccf5c6fa31b015eb86746a2089837cf44ab901b84c1fa80e09cde06459e4f0e4002ca31cbaed367804c8d445edb5bda4ba20940d85afa29b3134e
 EBUILD ament_cmake_gmock-9999.ebuild 1158 BLAKE2B d97a5089a055c9bbfa733f42d848f01c849cf5a4c5f106305346e9b7bbcd7a3bd93898b334133280a7be9b71911f3ea9c2f4ea62d4db6240b21d27f072a12bec SHA512 3a05e2fc64eccf5c6fa31b015eb86746a2089837cf44ab901b84c1fa80e09cde06459e4f0e4002ca31cbaed367804c8d445edb5bda4ba20940d85afa29b3134e
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.1.4.ebuild b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.1.4.ebuild
new file mode 100644
index 000000000000..17c189d5d54e
--- /dev/null
+++ b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.1.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} )
+
+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
+	PROPERTIES="live"
+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 f39d9e1adbdb..521b01ac9ea7 100644
--- a/dev-ros/ament_cmake_gtest/Manifest
+++ b/dev-ros/ament_cmake_gtest/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 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
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_gtest-0.9.6.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
 EBUILD ament_cmake_gtest-1.0.0.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
 EBUILD ament_cmake_gtest-1.0.1.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
 EBUILD ament_cmake_gtest-1.0.3.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
 EBUILD ament_cmake_gtest-1.0.4.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
 EBUILD ament_cmake_gtest-1.1.3.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
+EBUILD ament_cmake_gtest-1.1.4.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
 EBUILD ament_cmake_gtest-9999.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.1.4.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.1.4.ebuild
new file mode 100644
index 000000000000..b93c7a39772a
--- /dev/null
+++ b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.1.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} )
+
+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
+	PROPERTIES="live"
+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 c29231baff15..6d7d9c64ad13 100644
--- a/dev-ros/ament_cmake_include_directories/Manifest
+++ b/dev-ros/ament_cmake_include_directories/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 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
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_include_directories-0.9.6.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_include_directories-1.0.0.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_include_directories-1.0.1.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_include_directories-1.0.3.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_include_directories-1.0.4.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_include_directories-1.1.3.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
+EBUILD ament_cmake_include_directories-1.1.4.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_include_directories-9999.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.4.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.4.ebuild
new file mode 100644
index 000000000000..4a30d0ac2418
--- /dev/null
+++ b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.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} )
+
+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
+	PROPERTIES="live"
+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 60f453b8bc7d..c6fdbea6090e 100644
--- a/dev-ros/ament_cmake_libraries/Manifest
+++ b/dev-ros/ament_cmake_libraries/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 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
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_libraries-0.9.6.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
 EBUILD ament_cmake_libraries-1.0.0.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
 EBUILD ament_cmake_libraries-1.0.1.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
 EBUILD ament_cmake_libraries-1.0.3.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
 EBUILD ament_cmake_libraries-1.0.4.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
 EBUILD ament_cmake_libraries-1.1.3.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
+EBUILD ament_cmake_libraries-1.1.4.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
 EBUILD ament_cmake_libraries-9999.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.1.4.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.1.4.ebuild
new file mode 100644
index 000000000000..f4eece8f0db0
--- /dev/null
+++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.1.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} )
+
+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
+	PROPERTIES="live"
+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 c93c26485fbc..d3defaa0c95c 100644
--- a/dev-ros/ament_cmake_lint_cmake/Manifest
+++ b/dev-ros/ament_cmake_lint_cmake/Manifest
@@ -1,10 +1,12 @@
 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.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_lint_cmake-0.10.0.ebuild 1260 BLAKE2B d8a066607f3882b1fcfb7309c125ea4918d87e66e77fa1bcbdee4c3f924d9dbe39a332c8c2435ca607d3ce1a7ac69fc1576b1ba894947c36b8fed674fae399f2 SHA512 2e2181f42119a1d2e20167d13dbb42343f6c4b425c729c32d7b9ca8022f9691f591f335edccdaa2e3f01b04b7b84c4116f7e21f71c582ebd4964150da9e0ad56
 EBUILD ament_cmake_lint_cmake-0.10.1.ebuild 1260 BLAKE2B d8a066607f3882b1fcfb7309c125ea4918d87e66e77fa1bcbdee4c3f924d9dbe39a332c8c2435ca607d3ce1a7ac69fc1576b1ba894947c36b8fed674fae399f2 SHA512 2e2181f42119a1d2e20167d13dbb42343f6c4b425c729c32d7b9ca8022f9691f591f335edccdaa2e3f01b04b7b84c4116f7e21f71c582ebd4964150da9e0ad56
 EBUILD ament_cmake_lint_cmake-0.10.4.ebuild 1260 BLAKE2B d8a066607f3882b1fcfb7309c125ea4918d87e66e77fa1bcbdee4c3f924d9dbe39a332c8c2435ca607d3ce1a7ac69fc1576b1ba894947c36b8fed674fae399f2 SHA512 2e2181f42119a1d2e20167d13dbb42343f6c4b425c729c32d7b9ca8022f9691f591f335edccdaa2e3f01b04b7b84c4116f7e21f71c582ebd4964150da9e0ad56
+EBUILD ament_cmake_lint_cmake-0.11.2.ebuild 1260 BLAKE2B d8a066607f3882b1fcfb7309c125ea4918d87e66e77fa1bcbdee4c3f924d9dbe39a332c8c2435ca607d3ce1a7ac69fc1576b1ba894947c36b8fed674fae399f2 SHA512 2e2181f42119a1d2e20167d13dbb42343f6c4b425c729c32d7b9ca8022f9691f591f335edccdaa2e3f01b04b7b84c4116f7e21f71c582ebd4964150da9e0ad56
 EBUILD ament_cmake_lint_cmake-0.9.5.ebuild 1260 BLAKE2B d8a066607f3882b1fcfb7309c125ea4918d87e66e77fa1bcbdee4c3f924d9dbe39a332c8c2435ca607d3ce1a7ac69fc1576b1ba894947c36b8fed674fae399f2 SHA512 2e2181f42119a1d2e20167d13dbb42343f6c4b425c729c32d7b9ca8022f9691f591f335edccdaa2e3f01b04b7b84c4116f7e21f71c582ebd4964150da9e0ad56
 EBUILD ament_cmake_lint_cmake-9999.ebuild 1260 BLAKE2B d8a066607f3882b1fcfb7309c125ea4918d87e66e77fa1bcbdee4c3f924d9dbe39a332c8c2435ca607d3ce1a7ac69fc1576b1ba894947c36b8fed674fae399f2 SHA512 2e2181f42119a1d2e20167d13dbb42343f6c4b425c729c32d7b9ca8022f9691f591f335edccdaa2e3f01b04b7b84c4116f7e21f71c582ebd4964150da9e0ad56
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.ebuild b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.ebuild
new file mode 100644
index 000000000000..d16461b67cd9
--- /dev/null
+++ b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.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
+	PROPERTIES="live"
+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 32a69232f09b..ba13dd289735 100644
--- a/dev-ros/ament_cmake_pytest/Manifest
+++ b/dev-ros/ament_cmake_pytest/Manifest
@@ -3,10 +3,12 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 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
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_pytest-1.0.0.ebuild 1160 BLAKE2B 1e876dd0840295037a3ba7066f6775673196c6946b661647d731e4f6cee928bc70b2abbb680a2a16fc9e42b0209a00a59c0489ed9cf1be34033447897c79b4e1 SHA512 53067e8a88265f8d96ec184411739922d32b000f6d7214ee18c05e080a55d3ba4a46ac1ebec0c008198453992f1f1c004516712d6207e713000e21a801edddde
 EBUILD ament_cmake_pytest-1.0.1.ebuild 1160 BLAKE2B 1e876dd0840295037a3ba7066f6775673196c6946b661647d731e4f6cee928bc70b2abbb680a2a16fc9e42b0209a00a59c0489ed9cf1be34033447897c79b4e1 SHA512 53067e8a88265f8d96ec184411739922d32b000f6d7214ee18c05e080a55d3ba4a46ac1ebec0c008198453992f1f1c004516712d6207e713000e21a801edddde
 EBUILD ament_cmake_pytest-1.0.3.ebuild 1160 BLAKE2B 1e876dd0840295037a3ba7066f6775673196c6946b661647d731e4f6cee928bc70b2abbb680a2a16fc9e42b0209a00a59c0489ed9cf1be34033447897c79b4e1 SHA512 53067e8a88265f8d96ec184411739922d32b000f6d7214ee18c05e080a55d3ba4a46ac1ebec0c008198453992f1f1c004516712d6207e713000e21a801edddde
 EBUILD ament_cmake_pytest-1.0.4.ebuild 1160 BLAKE2B 1e876dd0840295037a3ba7066f6775673196c6946b661647d731e4f6cee928bc70b2abbb680a2a16fc9e42b0209a00a59c0489ed9cf1be34033447897c79b4e1 SHA512 53067e8a88265f8d96ec184411739922d32b000f6d7214ee18c05e080a55d3ba4a46ac1ebec0c008198453992f1f1c004516712d6207e713000e21a801edddde
 EBUILD ament_cmake_pytest-1.1.3.ebuild 1160 BLAKE2B 1e876dd0840295037a3ba7066f6775673196c6946b661647d731e4f6cee928bc70b2abbb680a2a16fc9e42b0209a00a59c0489ed9cf1be34033447897c79b4e1 SHA512 53067e8a88265f8d96ec184411739922d32b000f6d7214ee18c05e080a55d3ba4a46ac1ebec0c008198453992f1f1c004516712d6207e713000e21a801edddde
+EBUILD ament_cmake_pytest-1.1.4.ebuild 1160 BLAKE2B 1e876dd0840295037a3ba7066f6775673196c6946b661647d731e4f6cee928bc70b2abbb680a2a16fc9e42b0209a00a59c0489ed9cf1be34033447897c79b4e1 SHA512 53067e8a88265f8d96ec184411739922d32b000f6d7214ee18c05e080a55d3ba4a46ac1ebec0c008198453992f1f1c004516712d6207e713000e21a801edddde
 EBUILD ament_cmake_pytest-9999.ebuild 1160 BLAKE2B 1e876dd0840295037a3ba7066f6775673196c6946b661647d731e4f6cee928bc70b2abbb680a2a16fc9e42b0209a00a59c0489ed9cf1be34033447897c79b4e1 SHA512 53067e8a88265f8d96ec184411739922d32b000f6d7214ee18c05e080a55d3ba4a46ac1ebec0c008198453992f1f1c004516712d6207e713000e21a801edddde
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.1.4.ebuild b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.1.4.ebuild
new file mode 100644
index 000000000000..cf7e6c682106
--- /dev/null
+++ b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.1.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} )
+
+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
+	PROPERTIES="live"
+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 9c8b2c62a6f9..7f36c461a791 100644
--- a/dev-ros/ament_cmake_python/Manifest
+++ b/dev-ros/ament_cmake_python/Manifest
@@ -5,11 +5,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 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
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_python-0.9.6.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
 EBUILD ament_cmake_python-1.0.0.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
 EBUILD ament_cmake_python-1.0.1.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
 EBUILD ament_cmake_python-1.0.3.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
 EBUILD ament_cmake_python-1.0.4.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
 EBUILD ament_cmake_python-1.1.3.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
+EBUILD ament_cmake_python-1.1.4.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
 EBUILD ament_cmake_python-9999.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_python/ament_cmake_python-1.1.4.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.1.4.ebuild
new file mode 100644
index 000000000000..0e793810f45b
--- /dev/null
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-1.1.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_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
+	PROPERTIES="live"
+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 eb9790f0ee10..358ce31b6969 100644
--- a/dev-ros/ament_cmake_target_dependencies/Manifest
+++ b/dev-ros/ament_cmake_target_dependencies/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 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
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_target_dependencies-0.9.6.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
 EBUILD ament_cmake_target_dependencies-1.0.0.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
 EBUILD ament_cmake_target_dependencies-1.0.1.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
 EBUILD ament_cmake_target_dependencies-1.0.3.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
 EBUILD ament_cmake_target_dependencies-1.0.4.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
 EBUILD ament_cmake_target_dependencies-1.1.3.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
+EBUILD ament_cmake_target_dependencies-1.1.4.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
 EBUILD ament_cmake_target_dependencies-9999.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.1.4.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.1.4.ebuild
new file mode 100644
index 000000000000..cc319e25dd31
--- /dev/null
+++ b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.1.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} )
+
+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
+	PROPERTIES="live"
+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 b9871d40a3fb..f5eccd697667 100644
--- a/dev-ros/ament_cmake_test/Manifest
+++ b/dev-ros/ament_cmake_test/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 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
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_test-0.9.6.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
 EBUILD ament_cmake_test-1.0.0.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
 EBUILD ament_cmake_test-1.0.1.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
 EBUILD ament_cmake_test-1.0.3.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
 EBUILD ament_cmake_test-1.0.4.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
 EBUILD ament_cmake_test-1.1.3.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
+EBUILD ament_cmake_test-1.1.4.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
 EBUILD ament_cmake_test-9999.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_test/ament_cmake_test-1.1.4.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-1.1.4.ebuild
new file mode 100644
index 000000000000..bb59c0de949c
--- /dev/null
+++ b/dev-ros/ament_cmake_test/ament_cmake_test-1.1.4.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
+	PROPERTIES="live"
+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 7e01f9ce2936..9764617cbc1b 100644
--- a/dev-ros/ament_cmake_uncrustify/Manifest
+++ b/dev-ros/ament_cmake_uncrustify/Manifest
@@ -1,10 +1,12 @@
 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.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_uncrustify-0.10.0.ebuild 1517 BLAKE2B 7611ecb510ac8094b3b4878b4dfc83339e198e24910806025d1393477bd3c7d8c7de5afb5a351e021408279d1f16348e1d2cffb3b42c24139ce471b64d5ffd69 SHA512 9df72e736c4e772e75c3131b1774550a03b785e3ee9f4504d6ceea19d18960ac96fd1d8e415a349e8a65d4be33e51022d2618a779cc04e40822720b87125ebc4
 EBUILD ament_cmake_uncrustify-0.10.1.ebuild 1517 BLAKE2B 7611ecb510ac8094b3b4878b4dfc83339e198e24910806025d1393477bd3c7d8c7de5afb5a351e021408279d1f16348e1d2cffb3b42c24139ce471b64d5ffd69 SHA512 9df72e736c4e772e75c3131b1774550a03b785e3ee9f4504d6ceea19d18960ac96fd1d8e415a349e8a65d4be33e51022d2618a779cc04e40822720b87125ebc4
 EBUILD ament_cmake_uncrustify-0.10.4.ebuild 1517 BLAKE2B 7611ecb510ac8094b3b4878b4dfc83339e198e24910806025d1393477bd3c7d8c7de5afb5a351e021408279d1f16348e1d2cffb3b42c24139ce471b64d5ffd69 SHA512 9df72e736c4e772e75c3131b1774550a03b785e3ee9f4504d6ceea19d18960ac96fd1d8e415a349e8a65d4be33e51022d2618a779cc04e40822720b87125ebc4
+EBUILD ament_cmake_uncrustify-0.11.2.ebuild 1517 BLAKE2B 7611ecb510ac8094b3b4878b4dfc83339e198e24910806025d1393477bd3c7d8c7de5afb5a351e021408279d1f16348e1d2cffb3b42c24139ce471b64d5ffd69 SHA512 9df72e736c4e772e75c3131b1774550a03b785e3ee9f4504d6ceea19d18960ac96fd1d8e415a349e8a65d4be33e51022d2618a779cc04e40822720b87125ebc4
 EBUILD ament_cmake_uncrustify-0.9.5.ebuild 1517 BLAKE2B 7611ecb510ac8094b3b4878b4dfc83339e198e24910806025d1393477bd3c7d8c7de5afb5a351e021408279d1f16348e1d2cffb3b42c24139ce471b64d5ffd69 SHA512 9df72e736c4e772e75c3131b1774550a03b785e3ee9f4504d6ceea19d18960ac96fd1d8e415a349e8a65d4be33e51022d2618a779cc04e40822720b87125ebc4
 EBUILD ament_cmake_uncrustify-9999.ebuild 1517 BLAKE2B 7611ecb510ac8094b3b4878b4dfc83339e198e24910806025d1393477bd3c7d8c7de5afb5a351e021408279d1f16348e1d2cffb3b42c24139ce471b64d5ffd69 SHA512 9df72e736c4e772e75c3131b1774550a03b785e3ee9f4504d6ceea19d18960ac96fd1d8e415a349e8a65d4be33e51022d2618a779cc04e40822720b87125ebc4
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.11.2.ebuild b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.11.2.ebuild
new file mode 100644
index 000000000000..ba3ee494af1c
--- /dev/null
+++ b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.11.2.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
+	PROPERTIES="live"
+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 b5ebd62698c9..93bb41c1bd7f 100644
--- a/dev-ros/ament_cmake_version/Manifest
+++ b/dev-ros/ament_cmake_version/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 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
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_version-0.9.6.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
 EBUILD ament_cmake_version-1.0.0.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
 EBUILD ament_cmake_version-1.0.1.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
 EBUILD ament_cmake_version-1.0.3.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
 EBUILD ament_cmake_version-1.0.4.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
 EBUILD ament_cmake_version-1.1.3.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
+EBUILD ament_cmake_version-1.1.4.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
 EBUILD ament_cmake_version-9999.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_version/ament_cmake_version-1.1.4.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-1.1.4.ebuild
new file mode 100644
index 000000000000..a03f6bbe74af
--- /dev/null
+++ b/dev-ros/ament_cmake_version/ament_cmake_version-1.1.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} )
+
+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
+	PROPERTIES="live"
+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 ab5a46372491..35764b1a5d10 100644
--- a/dev-ros/ament_cmake_xmllint/Manifest
+++ b/dev-ros/ament_cmake_xmllint/Manifest
@@ -1,10 +1,12 @@
 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.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_xmllint-0.10.0.ebuild 1453 BLAKE2B adb8a13381da60fda8c430297974c6e53992342984a2f4c7115b3d9370b9397ebabfd3d7944b8e8571a2e0de8e5613f55834e0c3e95922a3a32a096e257a1686 SHA512 f4ce7240407a8dd1eecb4332f25d1fb2ab5d45980b3a101a09521e9507c62d27f3aab18d87c20036060a3012f084d40de5145fe8daa61adb07185e928b302eb3
 EBUILD ament_cmake_xmllint-0.10.1.ebuild 1453 BLAKE2B adb8a13381da60fda8c430297974c6e53992342984a2f4c7115b3d9370b9397ebabfd3d7944b8e8571a2e0de8e5613f55834e0c3e95922a3a32a096e257a1686 SHA512 f4ce7240407a8dd1eecb4332f25d1fb2ab5d45980b3a101a09521e9507c62d27f3aab18d87c20036060a3012f084d40de5145fe8daa61adb07185e928b302eb3
 EBUILD ament_cmake_xmllint-0.10.4.ebuild 1453 BLAKE2B adb8a13381da60fda8c430297974c6e53992342984a2f4c7115b3d9370b9397ebabfd3d7944b8e8571a2e0de8e5613f55834e0c3e95922a3a32a096e257a1686 SHA512 f4ce7240407a8dd1eecb4332f25d1fb2ab5d45980b3a101a09521e9507c62d27f3aab18d87c20036060a3012f084d40de5145fe8daa61adb07185e928b302eb3
+EBUILD ament_cmake_xmllint-0.11.2.ebuild 1453 BLAKE2B adb8a13381da60fda8c430297974c6e53992342984a2f4c7115b3d9370b9397ebabfd3d7944b8e8571a2e0de8e5613f55834e0c3e95922a3a32a096e257a1686 SHA512 f4ce7240407a8dd1eecb4332f25d1fb2ab5d45980b3a101a09521e9507c62d27f3aab18d87c20036060a3012f084d40de5145fe8daa61adb07185e928b302eb3
 EBUILD ament_cmake_xmllint-0.9.5.ebuild 1453 BLAKE2B adb8a13381da60fda8c430297974c6e53992342984a2f4c7115b3d9370b9397ebabfd3d7944b8e8571a2e0de8e5613f55834e0c3e95922a3a32a096e257a1686 SHA512 f4ce7240407a8dd1eecb4332f25d1fb2ab5d45980b3a101a09521e9507c62d27f3aab18d87c20036060a3012f084d40de5145fe8daa61adb07185e928b302eb3
 EBUILD ament_cmake_xmllint-9999.ebuild 1453 BLAKE2B adb8a13381da60fda8c430297974c6e53992342984a2f4c7115b3d9370b9397ebabfd3d7944b8e8571a2e0de8e5613f55834e0c3e95922a3a32a096e257a1686 SHA512 f4ce7240407a8dd1eecb4332f25d1fb2ab5d45980b3a101a09521e9507c62d27f3aab18d87c20036060a3012f084d40de5145fe8daa61adb07185e928b302eb3
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.1.ebuild b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.11.2.ebuild
index aedb04bff69e..91e92ca5ad7d 100644
--- a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.1.ebuild
+++ b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.11.2.ebuild
@@ -18,7 +18,7 @@ else
 	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
 fi
 
-DESCRIPTION="The auto-magic functions for ease to use of the ament linters"
+DESCRIPTION="he CMake API for ament_xmllint to check XML file using xmmlint"
 HOMEPAGE="https://github.com/ament/ament_lint"
 
 LICENSE="Apache-2.0"
@@ -32,16 +32,15 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-ros/ament_copyright
 	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_copyright
 "
 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
+	$(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_copyright
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_copyright
 	test? (
 		dev-ros/ament_cmake_lint_cmake
 	)
@@ -51,8 +50,7 @@ BDEPEND="
 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}]" )
+		has_version "dev-ros/ament_xmllint[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
diff --git a/dev-ros/ament_copyright/Manifest b/dev-ros/ament_copyright/Manifest
index 4cd92ee91b4b..1e0ce41b2b92 100644
--- a/dev-ros/ament_copyright/Manifest
+++ b/dev-ros/ament_copyright/Manifest
@@ -1,8 +1,6 @@
-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 1146 BLAKE2B 2dc60a4dbe7576339ef943632712daa4947ca09fc86d6354c817c9c437f7c27f58f9ea357e8d235437647c6387e373a1439d31c20cb35a8dceab634d41f3e2b0 SHA512 6e9a1dee263be9edf0f7408a31640f43452d3107344c528eb19c9614aa57b66e53783f47ce65d194d0fe8eb4a4154bdc45df7d1baf01b64b2d96cf311ddf2902
-EBUILD ament_copyright-0.10.1.ebuild 1146 BLAKE2B 2dc60a4dbe7576339ef943632712daa4947ca09fc86d6354c817c9c437f7c27f58f9ea357e8d235437647c6387e373a1439d31c20cb35a8dceab634d41f3e2b0 SHA512 6e9a1dee263be9edf0f7408a31640f43452d3107344c528eb19c9614aa57b66e53783f47ce65d194d0fe8eb4a4154bdc45df7d1baf01b64b2d96cf311ddf2902
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 EBUILD ament_copyright-0.10.4.ebuild 1146 BLAKE2B 2dc60a4dbe7576339ef943632712daa4947ca09fc86d6354c817c9c437f7c27f58f9ea357e8d235437647c6387e373a1439d31c20cb35a8dceab634d41f3e2b0 SHA512 6e9a1dee263be9edf0f7408a31640f43452d3107344c528eb19c9614aa57b66e53783f47ce65d194d0fe8eb4a4154bdc45df7d1baf01b64b2d96cf311ddf2902
+EBUILD ament_copyright-0.11.2.ebuild 1146 BLAKE2B 2dc60a4dbe7576339ef943632712daa4947ca09fc86d6354c817c9c437f7c27f58f9ea357e8d235437647c6387e373a1439d31c20cb35a8dceab634d41f3e2b0 SHA512 6e9a1dee263be9edf0f7408a31640f43452d3107344c528eb19c9614aa57b66e53783f47ce65d194d0fe8eb4a4154bdc45df7d1baf01b64b2d96cf311ddf2902
 EBUILD ament_copyright-9999.ebuild 1146 BLAKE2B 2dc60a4dbe7576339ef943632712daa4947ca09fc86d6354c817c9c437f7c27f58f9ea357e8d235437647c6387e373a1439d31c20cb35a8dceab634d41f3e2b0 SHA512 6e9a1dee263be9edf0f7408a31640f43452d3107344c528eb19c9614aa57b66e53783f47ce65d194d0fe8eb4a4154bdc45df7d1baf01b64b2d96cf311ddf2902
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_copyright/ament_copyright-0.10.0.ebuild b/dev-ros/ament_copyright/ament_copyright-0.11.2.ebuild
index dfdc3192ac68..dfdc3192ac68 100644
--- a/dev-ros/ament_copyright/ament_copyright-0.10.0.ebuild
+++ b/dev-ros/ament_copyright/ament_copyright-0.11.2.ebuild
diff --git a/dev-ros/ament_cppcheck/Manifest b/dev-ros/ament_cppcheck/Manifest
index 2febe71b7d15..c4ec08ecf59b 100644
--- a/dev-ros/ament_cppcheck/Manifest
+++ b/dev-ros/ament_cppcheck/Manifest
@@ -1,8 +1,6 @@
-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 818 BLAKE2B 43ed9e32118dd4a0aad9625ab4551284a0f0f24216450b3cb437bf701865e3969c5b27e4f1cb39c11f3d45f4db981b8813a3b937f237fc2b2ec2fb093bfb1640 SHA512 58fb1c31e1fa8caf69485dbe13575f79678aee33a9fb2138d611149d496fa0039e04d6dfcf22a0133097eb8255c1e45ff0a0a935ccbcc75101a37d74e081766d
-EBUILD ament_cppcheck-0.10.1.ebuild 818 BLAKE2B 43ed9e32118dd4a0aad9625ab4551284a0f0f24216450b3cb437bf701865e3969c5b27e4f1cb39c11f3d45f4db981b8813a3b937f237fc2b2ec2fb093bfb1640 SHA512 58fb1c31e1fa8caf69485dbe13575f79678aee33a9fb2138d611149d496fa0039e04d6dfcf22a0133097eb8255c1e45ff0a0a935ccbcc75101a37d74e081766d
-EBUILD ament_cppcheck-0.10.4.ebuild 818 BLAKE2B 43ed9e32118dd4a0aad9625ab4551284a0f0f24216450b3cb437bf701865e3969c5b27e4f1cb39c11f3d45f4db981b8813a3b937f237fc2b2ec2fb093bfb1640 SHA512 58fb1c31e1fa8caf69485dbe13575f79678aee33a9fb2138d611149d496fa0039e04d6dfcf22a0133097eb8255c1e45ff0a0a935ccbcc75101a37d74e081766d
-EBUILD ament_cppcheck-9999.ebuild 818 BLAKE2B 43ed9e32118dd4a0aad9625ab4551284a0f0f24216450b3cb437bf701865e3969c5b27e4f1cb39c11f3d45f4db981b8813a3b937f237fc2b2ec2fb093bfb1640 SHA512 58fb1c31e1fa8caf69485dbe13575f79678aee33a9fb2138d611149d496fa0039e04d6dfcf22a0133097eb8255c1e45ff0a0a935ccbcc75101a37d74e081766d
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
+EBUILD ament_cppcheck-0.10.4.ebuild 933 BLAKE2B cab561ffc7ee22991f8905fa4579b3481a08efd7f67d7975706aa968df1fdf302d7b395137d8d87a6d1fcd72856c22ca1c133f5f6716fb24d5d86471a5e1b944 SHA512 525c5c031e8d70722d2b51d9a108f488c641ba7f85cb4d9720ef6cb89eabdf82162e6e1e5870c5e0a1bf19ef5d2b75e68c154641bfc8443cff7f8c95272d9e1b
+EBUILD ament_cppcheck-0.11.2.ebuild 933 BLAKE2B cab561ffc7ee22991f8905fa4579b3481a08efd7f67d7975706aa968df1fdf302d7b395137d8d87a6d1fcd72856c22ca1c133f5f6716fb24d5d86471a5e1b944 SHA512 525c5c031e8d70722d2b51d9a108f488c641ba7f85cb4d9720ef6cb89eabdf82162e6e1e5870c5e0a1bf19ef5d2b75e68c154641bfc8443cff7f8c95272d9e1b
+EBUILD ament_cppcheck-9999.ebuild 933 BLAKE2B cab561ffc7ee22991f8905fa4579b3481a08efd7f67d7975706aa968df1fdf302d7b395137d8d87a6d1fcd72856c22ca1c133f5f6716fb24d5d86471a5e1b944 SHA512 525c5c031e8d70722d2b51d9a108f488c641ba7f85cb4d9720ef6cb89eabdf82162e6e1e5870c5e0a1bf19ef5d2b75e68c154641bfc8443cff7f8c95272d9e1b
 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
index 2dbf9430dfe6..1ec0564cee82 100644
--- a/dev-ros/ament_cppcheck/ament_cppcheck-0.10.4.ebuild
+++ b/dev-ros/ament_cppcheck/ament_cppcheck-0.10.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -36,3 +36,8 @@ RDEPEND="
 "
 DEPEND=""
 BDEPEND=""
+
+# pytest.ini is there but no tests are ran causing it to fail
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_cppcheck/ament_cppcheck-0.10.0.ebuild b/dev-ros/ament_cppcheck/ament_cppcheck-0.11.2.ebuild
index 2dbf9430dfe6..1ec0564cee82 100644
--- a/dev-ros/ament_cppcheck/ament_cppcheck-0.10.0.ebuild
+++ b/dev-ros/ament_cppcheck/ament_cppcheck-0.11.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -36,3 +36,8 @@ RDEPEND="
 "
 DEPEND=""
 BDEPEND=""
+
+# pytest.ini is there but no tests are ran causing it to fail
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild b/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild
index 2dbf9430dfe6..1ec0564cee82 100644
--- a/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild
+++ b/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -36,3 +36,8 @@ RDEPEND="
 "
 DEPEND=""
 BDEPEND=""
+
+# pytest.ini is there but no tests are ran causing it to fail
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_cpplint/Manifest b/dev-ros/ament_cpplint/Manifest
index 233eac7b8cc0..9cd51a8b9f54 100644
--- a/dev-ros/ament_cpplint/Manifest
+++ b/dev-ros/ament_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.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 EBUILD ament_cpplint-0.10.0.ebuild 1025 BLAKE2B 1a90d417f2c6a3c05a9e8171520b84520c3936d0e7a38abd6a29846b3da00b6972583fed66acd98324766ece259484fd859a1c0746b2afaa71742b54fafa2db8 SHA512 2e43e46d5029a4e213379f2b7a44ee53a6778eb831a12abad119674deccf5f0adec1320ba43a9b1624dfc37f71f2bda0c2f0123123d89cfe8495b7b8e029076e
 EBUILD ament_cpplint-0.10.1.ebuild 1025 BLAKE2B 1a90d417f2c6a3c05a9e8171520b84520c3936d0e7a38abd6a29846b3da00b6972583fed66acd98324766ece259484fd859a1c0746b2afaa71742b54fafa2db8 SHA512 2e43e46d5029a4e213379f2b7a44ee53a6778eb831a12abad119674deccf5f0adec1320ba43a9b1624dfc37f71f2bda0c2f0123123d89cfe8495b7b8e029076e
 EBUILD ament_cpplint-0.10.4.ebuild 1025 BLAKE2B 1a90d417f2c6a3c05a9e8171520b84520c3936d0e7a38abd6a29846b3da00b6972583fed66acd98324766ece259484fd859a1c0746b2afaa71742b54fafa2db8 SHA512 2e43e46d5029a4e213379f2b7a44ee53a6778eb831a12abad119674deccf5f0adec1320ba43a9b1624dfc37f71f2bda0c2f0123123d89cfe8495b7b8e029076e
+EBUILD ament_cpplint-0.11.2.ebuild 1025 BLAKE2B 1a90d417f2c6a3c05a9e8171520b84520c3936d0e7a38abd6a29846b3da00b6972583fed66acd98324766ece259484fd859a1c0746b2afaa71742b54fafa2db8 SHA512 2e43e46d5029a4e213379f2b7a44ee53a6778eb831a12abad119674deccf5f0adec1320ba43a9b1624dfc37f71f2bda0c2f0123123d89cfe8495b7b8e029076e
 EBUILD ament_cpplint-9999.ebuild 1025 BLAKE2B 1a90d417f2c6a3c05a9e8171520b84520c3936d0e7a38abd6a29846b3da00b6972583fed66acd98324766ece259484fd859a1c0746b2afaa71742b54fafa2db8 SHA512 2e43e46d5029a4e213379f2b7a44ee53a6778eb831a12abad119674deccf5f0adec1320ba43a9b1624dfc37f71f2bda0c2f0123123d89cfe8495b7b8e029076e
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_copyright/ament_copyright-0.10.1.ebuild b/dev-ros/ament_cpplint/ament_cpplint-0.11.2.ebuild
index dfdc3192ac68..c8856b376bb5 100644
--- a/dev-ros/ament_copyright/ament_copyright-0.10.1.ebuild
+++ b/dev-ros/ament_cpplint/ament_cpplint-0.11.2.ebuild
@@ -19,7 +19,7 @@ else
 	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
 fi
 
-DESCRIPTION="The ability to check source files for copyright and license information."
+DESCRIPTION="The ability to check code against the Google style conventions using cpplint"
 HOMEPAGE="https://github.com/ament/ament_lint"
 
 LICENSE="Apache-2.0"
@@ -32,11 +32,10 @@ fi
 IUSE="test"
 
 RDEPEND="
-	dev-ros/ament_lint
-	dev-python/importlib_metadata[${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}]
@@ -45,8 +44,3 @@ DEPEND="${RDEPEND}
 BDEPEND=""
 
 distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-ros/ament_flake8/Manifest b/dev-ros/ament_flake8/Manifest
index 31044acb6b44..71733a621de1 100644
--- a/dev-ros/ament_flake8/Manifest
+++ b/dev-ros/ament_flake8/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.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 EBUILD ament_flake8-0.10.0.ebuild 968 BLAKE2B 72fdf816476eda52b369baede1ad220599eef94170efb53e2aafbe21f03e81d332e7552383c643308909f8d05e982954ffd600a1683bc6e442f3191320f5c19b SHA512 fdd06b0c0946e6aa1fbc538c541cacdf40448d606fe3b04d4b968195175200731672d120bb92ea2aa9b8e5805c274cf5551f82b4d174dde7ab62bf2a211c7ff9
 EBUILD ament_flake8-0.10.1.ebuild 968 BLAKE2B 72fdf816476eda52b369baede1ad220599eef94170efb53e2aafbe21f03e81d332e7552383c643308909f8d05e982954ffd600a1683bc6e442f3191320f5c19b SHA512 fdd06b0c0946e6aa1fbc538c541cacdf40448d606fe3b04d4b968195175200731672d120bb92ea2aa9b8e5805c274cf5551f82b4d174dde7ab62bf2a211c7ff9
 EBUILD ament_flake8-0.10.4.ebuild 968 BLAKE2B 72fdf816476eda52b369baede1ad220599eef94170efb53e2aafbe21f03e81d332e7552383c643308909f8d05e982954ffd600a1683bc6e442f3191320f5c19b SHA512 fdd06b0c0946e6aa1fbc538c541cacdf40448d606fe3b04d4b968195175200731672d120bb92ea2aa9b8e5805c274cf5551f82b4d174dde7ab62bf2a211c7ff9
+EBUILD ament_flake8-0.11.2.ebuild 968 BLAKE2B 72fdf816476eda52b369baede1ad220599eef94170efb53e2aafbe21f03e81d332e7552383c643308909f8d05e982954ffd600a1683bc6e442f3191320f5c19b SHA512 fdd06b0c0946e6aa1fbc538c541cacdf40448d606fe3b04d4b968195175200731672d120bb92ea2aa9b8e5805c274cf5551f82b4d174dde7ab62bf2a211c7ff9
 EBUILD ament_flake8-9999.ebuild 968 BLAKE2B 72fdf816476eda52b369baede1ad220599eef94170efb53e2aafbe21f03e81d332e7552383c643308909f8d05e982954ffd600a1683bc6e442f3191320f5c19b SHA512 fdd06b0c0946e6aa1fbc538c541cacdf40448d606fe3b04d4b968195175200731672d120bb92ea2aa9b8e5805c274cf5551f82b4d174dde7ab62bf2a211c7ff9
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cppcheck/ament_cppcheck-0.10.1.ebuild b/dev-ros/ament_flake8/ament_flake8-0.11.2.ebuild
index 2dbf9430dfe6..c2beb0d53809 100644
--- a/dev-ros/ament_cppcheck/ament_cppcheck-0.10.1.ebuild
+++ b/dev-ros/ament_flake8/ament_flake8-0.11.2.ebuild
@@ -19,7 +19,7 @@ else
 	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
 fi
 
-DESCRIPTION="The ability to perform static code analysis on C/C++ code using Cppcheck"
+DESCRIPTION="The ability to check code for style and syntax conventions with flake8"
 HOMEPAGE="https://github.com/ament/ament_lint"
 
 LICENSE="Apache-2.0"
@@ -29,10 +29,17 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
+IUSE="test"
 
 RDEPEND="
-	dev-util/cppcheck
+	dev-ros/ament_lint[${PYTHON_USEDEP}]
+	dev-python/flake8[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
 "
-DEPEND=""
 BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint/Manifest b/dev-ros/ament_lint/Manifest
index 9010cd7eb826..34789ffd5682 100644
--- a/dev-ros/ament_lint/Manifest
+++ b/dev-ros/ament_lint/Manifest
@@ -1,10 +1,6 @@
-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 739 BLAKE2B 97f094a6502949d08eb635c0baf7e7d8f1385ef41e6371790cabfd70b490e2f34b721b59e8a496add7b1c316d397f96fcae1898167c22e8c6eaf2066b389d996 SHA512 9a9db031c397e4d323a3ea4088867713786a8710aea41ef6a30ff207c1960a351ff2c4115f5b79e7ae2ff1f47b5e0aa738c56ee3122dd303b07acb5017a38eb0
-EBUILD ament_lint-0.10.1.ebuild 739 BLAKE2B 97f094a6502949d08eb635c0baf7e7d8f1385ef41e6371790cabfd70b490e2f34b721b59e8a496add7b1c316d397f96fcae1898167c22e8c6eaf2066b389d996 SHA512 9a9db031c397e4d323a3ea4088867713786a8710aea41ef6a30ff207c1960a351ff2c4115f5b79e7ae2ff1f47b5e0aa738c56ee3122dd303b07acb5017a38eb0
-EBUILD ament_lint-0.10.4.ebuild 739 BLAKE2B 97f094a6502949d08eb635c0baf7e7d8f1385ef41e6371790cabfd70b490e2f34b721b59e8a496add7b1c316d397f96fcae1898167c22e8c6eaf2066b389d996 SHA512 9a9db031c397e4d323a3ea4088867713786a8710aea41ef6a30ff207c1960a351ff2c4115f5b79e7ae2ff1f47b5e0aa738c56ee3122dd303b07acb5017a38eb0
-EBUILD ament_lint-0.9.5.ebuild 739 BLAKE2B 97f094a6502949d08eb635c0baf7e7d8f1385ef41e6371790cabfd70b490e2f34b721b59e8a496add7b1c316d397f96fcae1898167c22e8c6eaf2066b389d996 SHA512 9a9db031c397e4d323a3ea4088867713786a8710aea41ef6a30ff207c1960a351ff2c4115f5b79e7ae2ff1f47b5e0aa738c56ee3122dd303b07acb5017a38eb0
-EBUILD ament_lint-9999.ebuild 739 BLAKE2B 97f094a6502949d08eb635c0baf7e7d8f1385ef41e6371790cabfd70b490e2f34b721b59e8a496add7b1c316d397f96fcae1898167c22e8c6eaf2066b389d996 SHA512 9a9db031c397e4d323a3ea4088867713786a8710aea41ef6a30ff207c1960a351ff2c4115f5b79e7ae2ff1f47b5e0aa738c56ee3122dd303b07acb5017a38eb0
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
+EBUILD ament_lint-0.10.4-r1.ebuild 886 BLAKE2B 9ac10e0798fa14239e84f238837eb8f7effe92b8e4d489d02f49573feef22aa42aef2d72efc1cd46f9a95c194a6b7ebd0d46685e12aaa7c87cbedeb0d412a6ee SHA512 21fd9bade417f7c95cffaa6089baa43e5562768746b33129adadbf93cc0a85682d1c4a50a3d1b580301b67e2a7fbad2f31274402cfef7f86699494a6efe04163
+EBUILD ament_lint-0.11.2.ebuild 886 BLAKE2B 9ac10e0798fa14239e84f238837eb8f7effe92b8e4d489d02f49573feef22aa42aef2d72efc1cd46f9a95c194a6b7ebd0d46685e12aaa7c87cbedeb0d412a6ee SHA512 21fd9bade417f7c95cffaa6089baa43e5562768746b33129adadbf93cc0a85682d1c4a50a3d1b580301b67e2a7fbad2f31274402cfef7f86699494a6efe04163
+EBUILD ament_lint-9999.ebuild 886 BLAKE2B 9ac10e0798fa14239e84f238837eb8f7effe92b8e4d489d02f49573feef22aa42aef2d72efc1cd46f9a95c194a6b7ebd0d46685e12aaa7c87cbedeb0d412a6ee SHA512 21fd9bade417f7c95cffaa6089baa43e5562768746b33129adadbf93cc0a85682d1c4a50a3d1b580301b67e2a7fbad2f31274402cfef7f86699494a6efe04163
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_lint/ament_lint-0.10.1.ebuild b/dev-ros/ament_lint/ament_lint-0.10.1.ebuild
deleted file mode 100644
index ea29b12dcd48..000000000000
--- a/dev-ros/ament_lint/ament_lint-0.10.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-BDEPEND=""
diff --git a/dev-ros/ament_lint/ament_lint-0.10.0.ebuild b/dev-ros/ament_lint/ament_lint-0.10.4-r1.ebuild
index ea29b12dcd48..8c8bff8aecc0 100644
--- a/dev-ros/ament_lint/ament_lint-0.10.0.ebuild
+++ b/dev-ros/ament_lint/ament_lint-0.10.4-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -33,3 +34,7 @@ IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}"
 BDEPEND=""
+# pytest.ini is there but no tests are ran causing it to fail
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint/ament_lint-0.10.4.ebuild b/dev-ros/ament_lint/ament_lint-0.11.2.ebuild
index ea29b12dcd48..8c8bff8aecc0 100644
--- a/dev-ros/ament_lint/ament_lint-0.10.4.ebuild
+++ b/dev-ros/ament_lint/ament_lint-0.11.2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -33,3 +34,7 @@ IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}"
 BDEPEND=""
+# pytest.ini is there but no tests are ran causing it to fail
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint/ament_lint-0.9.5.ebuild b/dev-ros/ament_lint/ament_lint-0.9.5.ebuild
deleted file mode 100644
index ea29b12dcd48..000000000000
--- a/dev-ros/ament_lint/ament_lint-0.9.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-BDEPEND=""
diff --git a/dev-ros/ament_lint/ament_lint-9999.ebuild b/dev-ros/ament_lint/ament_lint-9999.ebuild
index ea29b12dcd48..8c8bff8aecc0 100644
--- a/dev-ros/ament_lint/ament_lint-9999.ebuild
+++ b/dev-ros/ament_lint/ament_lint-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -33,3 +34,7 @@ IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}"
 BDEPEND=""
+# pytest.ini is there but no tests are ran causing it to fail
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint_auto/Manifest b/dev-ros/ament_lint_auto/Manifest
index 08173d82dfe2..363ce1c70b46 100644
--- a/dev-ros/ament_lint_auto/Manifest
+++ b/dev-ros/ament_lint_auto/Manifest
@@ -1,10 +1,12 @@
 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.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_lint_auto-0.10.0.ebuild 1174 BLAKE2B 56c7160c249225a87f4614fc1a391ca6b0a4f70a8997a32e52259c60ca39f50aa86d63a51235aaa9f01fbbdbd3f92ba8c015566ec92231267ea1df7c54739eff SHA512 dc3fd294fa9d90a5e64b9d30ef5f042d510d5f9361c5c9ff584122999b654f0ddba2208ac758e1680b93a736b91c77de98e4a61774aefa5885779f5a9cf61b48
 EBUILD ament_lint_auto-0.10.1.ebuild 1174 BLAKE2B 56c7160c249225a87f4614fc1a391ca6b0a4f70a8997a32e52259c60ca39f50aa86d63a51235aaa9f01fbbdbd3f92ba8c015566ec92231267ea1df7c54739eff SHA512 dc3fd294fa9d90a5e64b9d30ef5f042d510d5f9361c5c9ff584122999b654f0ddba2208ac758e1680b93a736b91c77de98e4a61774aefa5885779f5a9cf61b48
 EBUILD ament_lint_auto-0.10.4.ebuild 1174 BLAKE2B 56c7160c249225a87f4614fc1a391ca6b0a4f70a8997a32e52259c60ca39f50aa86d63a51235aaa9f01fbbdbd3f92ba8c015566ec92231267ea1df7c54739eff SHA512 dc3fd294fa9d90a5e64b9d30ef5f042d510d5f9361c5c9ff584122999b654f0ddba2208ac758e1680b93a736b91c77de98e4a61774aefa5885779f5a9cf61b48
+EBUILD ament_lint_auto-0.11.2.ebuild 1174 BLAKE2B 56c7160c249225a87f4614fc1a391ca6b0a4f70a8997a32e52259c60ca39f50aa86d63a51235aaa9f01fbbdbd3f92ba8c015566ec92231267ea1df7c54739eff SHA512 dc3fd294fa9d90a5e64b9d30ef5f042d510d5f9361c5c9ff584122999b654f0ddba2208ac758e1680b93a736b91c77de98e4a61774aefa5885779f5a9cf61b48
 EBUILD ament_lint_auto-0.9.5.ebuild 1174 BLAKE2B 56c7160c249225a87f4614fc1a391ca6b0a4f70a8997a32e52259c60ca39f50aa86d63a51235aaa9f01fbbdbd3f92ba8c015566ec92231267ea1df7c54739eff SHA512 dc3fd294fa9d90a5e64b9d30ef5f042d510d5f9361c5c9ff584122999b654f0ddba2208ac758e1680b93a736b91c77de98e4a61774aefa5885779f5a9cf61b48
 EBUILD ament_lint_auto-9999.ebuild 1174 BLAKE2B 56c7160c249225a87f4614fc1a391ca6b0a4f70a8997a32e52259c60ca39f50aa86d63a51235aaa9f01fbbdbd3f92ba8c015566ec92231267ea1df7c54739eff SHA512 dc3fd294fa9d90a5e64b9d30ef5f042d510d5f9361c5c9ff584122999b654f0ddba2208ac758e1680b93a736b91c77de98e4a61774aefa5885779f5a9cf61b48
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_lint_auto/ament_lint_auto-0.11.2.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-0.11.2.ebuild
new file mode 100644
index 000000000000..99bd8c66a9d9
--- /dev/null
+++ b/dev-ros/ament_lint_auto/ament_lint_auto-0.11.2.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
+	PROPERTIES="live"
+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 685000704d72..4246e5869a0a 100644
--- a/dev-ros/ament_lint_cmake/Manifest
+++ b/dev-ros/ament_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.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 EBUILD ament_lint_cmake-0.10.0.ebuild 1017 BLAKE2B 7fca1803c7fa666a9dc860bb9cd4c474f20d9904f29b0f59f88875b0648f76d1c3737a24d901ed50617032068ccfda4d3841e1f6de62dfd25488ec7d63cd5517 SHA512 679e7f313ecc007a698a3c978ab11718c6fddad57655869a3b81a14cefc7d1d2d60e11311a600b6186ed6c0c13ac84834f1ecfe54dbbc81f8efcf77b4d2b547f
 EBUILD ament_lint_cmake-0.10.1.ebuild 1017 BLAKE2B 7fca1803c7fa666a9dc860bb9cd4c474f20d9904f29b0f59f88875b0648f76d1c3737a24d901ed50617032068ccfda4d3841e1f6de62dfd25488ec7d63cd5517 SHA512 679e7f313ecc007a698a3c978ab11718c6fddad57655869a3b81a14cefc7d1d2d60e11311a600b6186ed6c0c13ac84834f1ecfe54dbbc81f8efcf77b4d2b547f
 EBUILD ament_lint_cmake-0.10.4.ebuild 1017 BLAKE2B 7fca1803c7fa666a9dc860bb9cd4c474f20d9904f29b0f59f88875b0648f76d1c3737a24d901ed50617032068ccfda4d3841e1f6de62dfd25488ec7d63cd5517 SHA512 679e7f313ecc007a698a3c978ab11718c6fddad57655869a3b81a14cefc7d1d2d60e11311a600b6186ed6c0c13ac84834f1ecfe54dbbc81f8efcf77b4d2b547f
+EBUILD ament_lint_cmake-0.11.2.ebuild 1017 BLAKE2B 7fca1803c7fa666a9dc860bb9cd4c474f20d9904f29b0f59f88875b0648f76d1c3737a24d901ed50617032068ccfda4d3841e1f6de62dfd25488ec7d63cd5517 SHA512 679e7f313ecc007a698a3c978ab11718c6fddad57655869a3b81a14cefc7d1d2d60e11311a600b6186ed6c0c13ac84834f1ecfe54dbbc81f8efcf77b4d2b547f
 EBUILD ament_lint_cmake-9999.ebuild 1017 BLAKE2B 7fca1803c7fa666a9dc860bb9cd4c474f20d9904f29b0f59f88875b0648f76d1c3737a24d901ed50617032068ccfda4d3841e1f6de62dfd25488ec7d63cd5517 SHA512 679e7f313ecc007a698a3c978ab11718c6fddad57655869a3b81a14cefc7d1d2d60e11311a600b6186ed6c0c13ac84834f1ecfe54dbbc81f8efcf77b4d2b547f
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_lint_cmake/ament_lint_cmake-0.11.2.ebuild b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.11.2.ebuild
new file mode 100644
index 000000000000..b926d90a9384
--- /dev/null
+++ b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.11.2.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
+	PROPERTIES="live"
+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 6bf84debd651..8767b230bc3f 100644
--- a/dev-ros/ament_pep257/Manifest
+++ b/dev-ros/ament_pep257/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.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 EBUILD ament_pep257-0.10.0.ebuild 1020 BLAKE2B 7f8c5a1e7873b10041b8d416bf3b78c358e53911d74390daaf63377d0d4b27709376a80e09e9e68a10e3cdb25cf27853111aaf88f31a20da7fcc0e709150027b SHA512 405e63b87196f1dbd91358b8c14c39a0a478791bff751c3b78000152c553acf1a712e7425e104e05489e16ad3b8151ec3399b937eaa8db74aad7db9c1c471c81
 EBUILD ament_pep257-0.10.1.ebuild 1020 BLAKE2B 7f8c5a1e7873b10041b8d416bf3b78c358e53911d74390daaf63377d0d4b27709376a80e09e9e68a10e3cdb25cf27853111aaf88f31a20da7fcc0e709150027b SHA512 405e63b87196f1dbd91358b8c14c39a0a478791bff751c3b78000152c553acf1a712e7425e104e05489e16ad3b8151ec3399b937eaa8db74aad7db9c1c471c81
 EBUILD ament_pep257-0.10.4.ebuild 1020 BLAKE2B 7f8c5a1e7873b10041b8d416bf3b78c358e53911d74390daaf63377d0d4b27709376a80e09e9e68a10e3cdb25cf27853111aaf88f31a20da7fcc0e709150027b SHA512 405e63b87196f1dbd91358b8c14c39a0a478791bff751c3b78000152c553acf1a712e7425e104e05489e16ad3b8151ec3399b937eaa8db74aad7db9c1c471c81
+EBUILD ament_pep257-0.11.2.ebuild 1020 BLAKE2B 7f8c5a1e7873b10041b8d416bf3b78c358e53911d74390daaf63377d0d4b27709376a80e09e9e68a10e3cdb25cf27853111aaf88f31a20da7fcc0e709150027b SHA512 405e63b87196f1dbd91358b8c14c39a0a478791bff751c3b78000152c553acf1a712e7425e104e05489e16ad3b8151ec3399b937eaa8db74aad7db9c1c471c81
 EBUILD ament_pep257-9999.ebuild 1020 BLAKE2B 7f8c5a1e7873b10041b8d416bf3b78c358e53911d74390daaf63377d0d4b27709376a80e09e9e68a10e3cdb25cf27853111aaf88f31a20da7fcc0e709150027b SHA512 405e63b87196f1dbd91358b8c14c39a0a478791bff751c3b78000152c553acf1a712e7425e104e05489e16ad3b8151ec3399b937eaa8db74aad7db9c1c471c81
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_pep257/ament_pep257-0.11.2.ebuild b/dev-ros/ament_pep257/ament_pep257-0.11.2.ebuild
new file mode 100644
index 000000000000..d68cc9cf4ecc
--- /dev/null
+++ b/dev-ros/ament_pep257/ament_pep257-0.11.2.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
+	PROPERTIES="live"
+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 d76aeed5a914..8f8c88988efc 100644
--- a/dev-ros/ament_uncrustify/Manifest
+++ b/dev-ros/ament_uncrustify/Manifest
@@ -1,8 +1,6 @@
-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 816 BLAKE2B 7070d46df8adb949d058221bafcd245a33e2c10483423f6353b40ab57f1eb762c84e2c0e830933a03df6c2846034ada3d15062e108c0c4c00ba5758bdc9bc772 SHA512 17a6834ef2910066214e6c651c5ad19bd88e87dedbe62636464fcd27de8a7cd2e3e6aadd5f41e43117420615760be4a3331dd5f02cff3ebdc8068eda291f187f
-EBUILD ament_uncrustify-0.10.1.ebuild 816 BLAKE2B 7070d46df8adb949d058221bafcd245a33e2c10483423f6353b40ab57f1eb762c84e2c0e830933a03df6c2846034ada3d15062e108c0c4c00ba5758bdc9bc772 SHA512 17a6834ef2910066214e6c651c5ad19bd88e87dedbe62636464fcd27de8a7cd2e3e6aadd5f41e43117420615760be4a3331dd5f02cff3ebdc8068eda291f187f
-EBUILD ament_uncrustify-0.10.4.ebuild 816 BLAKE2B 7070d46df8adb949d058221bafcd245a33e2c10483423f6353b40ab57f1eb762c84e2c0e830933a03df6c2846034ada3d15062e108c0c4c00ba5758bdc9bc772 SHA512 17a6834ef2910066214e6c651c5ad19bd88e87dedbe62636464fcd27de8a7cd2e3e6aadd5f41e43117420615760be4a3331dd5f02cff3ebdc8068eda291f187f
-EBUILD ament_uncrustify-9999.ebuild 816 BLAKE2B 7070d46df8adb949d058221bafcd245a33e2c10483423f6353b40ab57f1eb762c84e2c0e830933a03df6c2846034ada3d15062e108c0c4c00ba5758bdc9bc772 SHA512 17a6834ef2910066214e6c651c5ad19bd88e87dedbe62636464fcd27de8a7cd2e3e6aadd5f41e43117420615760be4a3331dd5f02cff3ebdc8068eda291f187f
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
+EBUILD ament_uncrustify-0.10.4.ebuild 931 BLAKE2B 55a9368980aeef9619a836facb642fd13ce5740329376478dd7e53683cc960233666068b4519f677153a578adb0363b907efe6a45b7fc2deabb7dc15c7a2afe1 SHA512 8ca56ff77559f58901428996e93ac6b635f519baa9b6ace0e0d2c17a658513409a448ae6ae7d4cd6f25d04f9a25e2fc9b63d10bacf33e311c09fc857ebfbf8ac
+EBUILD ament_uncrustify-0.11.2.ebuild 931 BLAKE2B 55a9368980aeef9619a836facb642fd13ce5740329376478dd7e53683cc960233666068b4519f677153a578adb0363b907efe6a45b7fc2deabb7dc15c7a2afe1 SHA512 8ca56ff77559f58901428996e93ac6b635f519baa9b6ace0e0d2c17a658513409a448ae6ae7d4cd6f25d04f9a25e2fc9b63d10bacf33e311c09fc857ebfbf8ac
+EBUILD ament_uncrustify-9999.ebuild 931 BLAKE2B 55a9368980aeef9619a836facb642fd13ce5740329376478dd7e53683cc960233666068b4519f677153a578adb0363b907efe6a45b7fc2deabb7dc15c7a2afe1 SHA512 8ca56ff77559f58901428996e93ac6b635f519baa9b6ace0e0d2c17a658513409a448ae6ae7d4cd6f25d04f9a25e2fc9b63d10bacf33e311c09fc857ebfbf8ac
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-0.10.1.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-0.10.1.ebuild
deleted file mode 100644
index 9fbde9ec7c94..000000000000
--- a/dev-ros/ament_uncrustify/ament_uncrustify-0.10.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-util/uncrustify
-"
-DEPEND=""
-BDEPEND=""
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-0.10.4.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-0.10.4.ebuild
index 9fbde9ec7c94..4a530cd280f9 100644
--- a/dev-ros/ament_uncrustify/ament_uncrustify-0.10.4.ebuild
+++ b/dev-ros/ament_uncrustify/ament_uncrustify-0.10.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -36,3 +36,8 @@ RDEPEND="
 "
 DEPEND=""
 BDEPEND=""
+
+# pytest.ini is there but no tests are ran causing it to fail
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-0.10.0.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-0.11.2.ebuild
index 9fbde9ec7c94..4a530cd280f9 100644
--- a/dev-ros/ament_uncrustify/ament_uncrustify-0.10.0.ebuild
+++ b/dev-ros/ament_uncrustify/ament_uncrustify-0.11.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -36,3 +36,8 @@ RDEPEND="
 "
 DEPEND=""
 BDEPEND=""
+
+# pytest.ini is there but no tests are ran causing it to fail
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild
index 9fbde9ec7c94..4a530cd280f9 100644
--- a/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild
+++ b/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -36,3 +36,8 @@ RDEPEND="
 "
 DEPEND=""
 BDEPEND=""
+
+# pytest.ini is there but no tests are ran causing it to fail
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_xmllint/Manifest b/dev-ros/ament_xmllint/Manifest
index f72ddc2df7a0..0b97b511c051 100644
--- a/dev-ros/ament_xmllint/Manifest
+++ b/dev-ros/ament_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.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 EBUILD ament_xmllint-0.10.0.ebuild 1086 BLAKE2B 1aa1586f23b93239b69be21b1cca02453b921f28bb635bcffe173b7d5a3c868ddc366841421f906680799692d48e5d3a5763aee6b31120e19b145f115f169301 SHA512 bde5d7c87301bfe9110faa376623048ec98474fcb35ff5a6eb970196149895725d231e47457e4dbd7d1da40fb912b340f44944be83703b3e80b2ecb62b0b258e
 EBUILD ament_xmllint-0.10.1.ebuild 1086 BLAKE2B 1aa1586f23b93239b69be21b1cca02453b921f28bb635bcffe173b7d5a3c868ddc366841421f906680799692d48e5d3a5763aee6b31120e19b145f115f169301 SHA512 bde5d7c87301bfe9110faa376623048ec98474fcb35ff5a6eb970196149895725d231e47457e4dbd7d1da40fb912b340f44944be83703b3e80b2ecb62b0b258e
 EBUILD ament_xmllint-0.10.4.ebuild 1086 BLAKE2B 1aa1586f23b93239b69be21b1cca02453b921f28bb635bcffe173b7d5a3c868ddc366841421f906680799692d48e5d3a5763aee6b31120e19b145f115f169301 SHA512 bde5d7c87301bfe9110faa376623048ec98474fcb35ff5a6eb970196149895725d231e47457e4dbd7d1da40fb912b340f44944be83703b3e80b2ecb62b0b258e
+EBUILD ament_xmllint-0.11.2.ebuild 1086 BLAKE2B 1aa1586f23b93239b69be21b1cca02453b921f28bb635bcffe173b7d5a3c868ddc366841421f906680799692d48e5d3a5763aee6b31120e19b145f115f169301 SHA512 bde5d7c87301bfe9110faa376623048ec98474fcb35ff5a6eb970196149895725d231e47457e4dbd7d1da40fb912b340f44944be83703b3e80b2ecb62b0b258e
 EBUILD ament_xmllint-9999.ebuild 1086 BLAKE2B 1aa1586f23b93239b69be21b1cca02453b921f28bb635bcffe173b7d5a3c868ddc366841421f906680799692d48e5d3a5763aee6b31120e19b145f115f169301 SHA512 bde5d7c87301bfe9110faa376623048ec98474fcb35ff5a6eb970196149895725d231e47457e4dbd7d1da40fb912b340f44944be83703b3e80b2ecb62b0b258e
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_xmllint/ament_xmllint-0.11.2.ebuild b/dev-ros/ament_xmllint/ament_xmllint-0.11.2.ebuild
new file mode 100644
index 000000000000..dc712bff4c31
--- /dev/null
+++ b/dev-ros/ament_xmllint/ament_xmllint-0.11.2.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
+	PROPERTIES="live"
+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/calibration_estimation/Manifest b/dev-ros/calibration_estimation/Manifest
index 69d9aadbab74..4bdae2875ed9 100644
--- a/dev-ros/calibration_estimation/Manifest
+++ b/dev-ros/calibration_estimation/Manifest
@@ -1,5 +1,7 @@
 AUX py3.patch 3416 BLAKE2B 7f879cee3a10359d5988fe8ee04ccfb9c2d30fff7609e52950c7a61c3f02ad571363094f47e841ef9796c49c0d14f75c275cf3ba7534a5a0c1c0680ec48a2c70 SHA512 6200c57aa4f6f95338eba80342efcdd026b971d3b373a946fd45ce92bddc67f329c1fcafcedc74f2169ce871565a91b1d442a862cd5f87cd99f9aa225304b15f
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
 EBUILD calibration_estimation-0.10.14.ebuild 1371 BLAKE2B 2dd06306d99468d2670da4c706ed3cea54239a01cf3a4311c0364a0f0b50dbc171fc4bac4950d145b15ea6bf720a06fdc2377276b3966f3acc96a569e985b2a9 SHA512 6e001af223d114e5cfbd1ad5f96e4bdaab495e6a6fd766ac4f553670b6d3eb18a05d0665ccb10181cbe7914e088ab73152b9347003c4408697499702820b9afb
-EBUILD calibration_estimation-9999.ebuild 1371 BLAKE2B 2dd06306d99468d2670da4c706ed3cea54239a01cf3a4311c0364a0f0b50dbc171fc4bac4950d145b15ea6bf720a06fdc2377276b3966f3acc96a569e985b2a9 SHA512 6e001af223d114e5cfbd1ad5f96e4bdaab495e6a6fd766ac4f553670b6d3eb18a05d0665ccb10181cbe7914e088ab73152b9347003c4408697499702820b9afb
+EBUILD calibration_estimation-0.10.15.ebuild 1285 BLAKE2B 71e12a96ee250844b0172a6d70913112feed42cdbdebedabe2a33e88c4f68d94c67201ee844b0e2c0616257158de2159c8dfd5003c50682d1efe6fa8abc6742a SHA512 f2a2ea46508e763285bc9f9e6aa15ca905c00f5b09162986f80e0a0ffeba0ec350027be7feedb61152163d6c73298dbcea03a5d6c009bf725fa9ebc456882c51
+EBUILD calibration_estimation-9999.ebuild 1285 BLAKE2B 71e12a96ee250844b0172a6d70913112feed42cdbdebedabe2a33e88c4f68d94c67201ee844b0e2c0616257158de2159c8dfd5003c50682d1efe6fa8abc6742a SHA512 f2a2ea46508e763285bc9f9e6aa15ca905c00f5b09162986f80e0a0ffeba0ec350027be7feedb61152163d6c73298dbcea03a5d6c009bf725fa9ebc456882c51
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/calibration_estimation/calibration_estimation-0.10.15.ebuild b/dev-ros/calibration_estimation/calibration_estimation-0.10.15.ebuild
new file mode 100644
index 000000000000..65951f6a974b
--- /dev/null
+++ b/dev-ros/calibration_estimation/calibration_estimation-0.10.15.ebuild
@@ -0,0 +1,42 @@
+# 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-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Runs an optimization to estimate the a robot's kinematic parameters"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/calibration_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/matplotlib[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/scipy[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/urdf_parser_py[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+
+src_prepare() {
+	ros-catkin_src_prepare
+	sed -e 's/yaml.load/yaml.safe_load/g' -i src/*/*.py -i test/*.py || die
+}
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild b/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
index d445cebc3fda..65951f6a974b 100644
--- a/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
+++ b/dev-ros/calibration_estimation/calibration_estimation-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
@@ -30,12 +30,10 @@ DEPEND="${RDEPEND}
 		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	)"
-PATCHES=( "${FILESDIR}/py3.patch" )
 
 src_prepare() {
 	ros-catkin_src_prepare
 	sed -e 's/yaml.load/yaml.safe_load/g' -i src/*/*.py -i test/*.py || die
-	2to3 -w src/*/*.py src/*/*/*.py test/*.py || die
 }
 
 src_test() {
diff --git a/dev-ros/calibration_launch/Manifest b/dev-ros/calibration_launch/Manifest
index a366ca68a574..94c1febe24ed 100644
--- a/dev-ros/calibration_launch/Manifest
+++ b/dev-ros/calibration_launch/Manifest
@@ -1,4 +1,5 @@
-DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD calibration_launch-0.10.14.ebuild 524 BLAKE2B aed2d59c7dd17a1fa59b3e85482c561ccd420eb4a5c4b251a9533befeb3cfb45892107b4c4f16b8bd96c52da516c26e51644e5f491d9cbc9523646d4895d3b12 SHA512 b4867dba2dbc1d9b66a4a6c3f9ad5ce64ff2e81b35988c8fe2b01718ee534c96d80c1325c2eceab3dda7e66f13defe2d62947e9564fff1be8908ff335c356daa
-EBUILD calibration_launch-9999.ebuild 524 BLAKE2B aed2d59c7dd17a1fa59b3e85482c561ccd420eb4a5c4b251a9533befeb3cfb45892107b4c4f16b8bd96c52da516c26e51644e5f491d9cbc9523646d4895d3b12 SHA512 b4867dba2dbc1d9b66a4a6c3f9ad5ce64ff2e81b35988c8fe2b01718ee534c96d80c1325c2eceab3dda7e66f13defe2d62947e9564fff1be8908ff335c356daa
+AUX py3.patch 608 BLAKE2B 8f9b52a959979d34b939536177d2e3f542046d3013ccaef79e6cc758385d3122fc220bcc81fae50ee73a0cccbab931cd5acbf173ed24ccd13ee6f064883cbd29 SHA512 2fa478d9389676d1d0e1a2a1d7720f871e5eff464be195ada8fc6093958e5bf3d893e8a90a89a60daa5443230b9a10f307e363de16e88206f79c1af60bc04fb2
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
+EBUILD calibration_launch-0.10.15-r1.ebuild 560 BLAKE2B d80874bd54105a9ab2478a2f9f57eb3305455948475b871c591decb96d86de5fae498eca90b0033950ae5f06d214a266ca4477c205990e626652016168cc3b86 SHA512 990416151166bcaa2b77882f0b56ffb895f3f5503fff832a543734d3231092729221b9d2a952cda64979e4c35c7e0f9636ee1aa9caa2a4a87d88aee223ed3c9a
+EBUILD calibration_launch-9999.ebuild 560 BLAKE2B d80874bd54105a9ab2478a2f9f57eb3305455948475b871c591decb96d86de5fae498eca90b0033950ae5f06d214a266ca4477c205990e626652016168cc3b86 SHA512 990416151166bcaa2b77882f0b56ffb895f3f5503fff832a543734d3231092729221b9d2a952cda64979e4c35c7e0f9636ee1aa9caa2a4a87d88aee223ed3c9a
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/calibration_launch/calibration_launch-0.10.14.ebuild b/dev-ros/calibration_launch/calibration_launch-0.10.15-r1.ebuild
index b3b796757277..2ea52c5982a2 100644
--- a/dev-ros/calibration_launch/calibration_launch-0.10.14.ebuild
+++ b/dev-ros/calibration_launch/calibration_launch-0.10.15-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,3 +22,4 @@ RDEPEND="
 	dev-ros/roslaunch
 	dev-libs/urdfdom
 "
+PATCHES=( "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/calibration_launch/calibration_launch-9999.ebuild b/dev-ros/calibration_launch/calibration_launch-9999.ebuild
index b3b796757277..2ea52c5982a2 100644
--- a/dev-ros/calibration_launch/calibration_launch-9999.ebuild
+++ b/dev-ros/calibration_launch/calibration_launch-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,3 +22,4 @@ RDEPEND="
 	dev-ros/roslaunch
 	dev-libs/urdfdom
 "
+PATCHES=( "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/calibration_launch/files/py3.patch b/dev-ros/calibration_launch/files/py3.patch
new file mode 100644
index 000000000000..ee9aa2c41f34
--- /dev/null
+++ b/dev-ros/calibration_launch/files/py3.patch
@@ -0,0 +1,13 @@
+Index: calibration_launch/src/capture_executive/robot_measurement_cache.py
+===================================================================
+--- calibration_launch.orig/src/capture_executive/robot_measurement_cache.py
++++ calibration_launch/src/capture_executive/robot_measurement_cache.py
+@@ -174,7 +174,7 @@ class RobotMeasurementCache:
+            return m
+ 
+         # TODO: eliminate print statement or convert to rospy.log*
+-        print "Received everything!"
++        print("Received everything!")
+ 
+         # Push everything into a RobotMeasurement message
+         m_robot = RobotMeasurement()
diff --git a/dev-ros/calibration_msgs/Manifest b/dev-ros/calibration_msgs/Manifest
index 123720a3fa5f..d472d38999ab 100644
--- a/dev-ros/calibration_msgs/Manifest
+++ b/dev-ros/calibration_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
 EBUILD calibration_msgs-0.10.14.ebuild 506 BLAKE2B 286bea7d10840fe5bcf037a516d1449b8a89af9df43d50a5fb68506b4866751a6ee924f1bb80ca2ae8ec6d6276e93b37396168f6b79ee218ac8ac057d7432be5 SHA512 18c8009c537a446fc318b9120a4fe8c34ab116ad4f3b0fa988399b2cc6c8fae24a3d6b187eb336866b24097ab87485d3cda04635df07ac39193350beb4949ec2
+EBUILD calibration_msgs-0.10.15.ebuild 506 BLAKE2B ab8e3f3d6283667e3363aa212b2339103323650ff8baca68b401b66ebcb859b0adb0bec22fd74c2272469746b8a6c6825dfcbe151effaf776520b18b66f93183 SHA512 52656b1c3d86cbaecb49b10f8a10bcb30c92b2dbe7ddd09fcd4c9329c1c71718eeb3daf613e299e0231f659a4869f98a3f1b8bec072b7cd9ea3a7f006a9d9b68
 EBUILD calibration_msgs-9999.ebuild 506 BLAKE2B 286bea7d10840fe5bcf037a516d1449b8a89af9df43d50a5fb68506b4866751a6ee924f1bb80ca2ae8ec6d6276e93b37396168f6b79ee218ac8ac057d7432be5 SHA512 18c8009c537a446fc318b9120a4fe8c34ab116ad4f3b0fa988399b2cc6c8fae24a3d6b187eb336866b24097ab87485d3cda04635df07ac39193350beb4949ec2
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/calibration_msgs/calibration_msgs-0.10.15.ebuild b/dev-ros/calibration_msgs/calibration_msgs-0.10.15.ebuild
new file mode 100644
index 000000000000..84fc5ca3dc67
--- /dev/null
+++ b/dev-ros/calibration_msgs/calibration_msgs-0.10.15.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-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for storing calibration samples to be used in calibration procedures"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/calibration_setup_helper/Manifest b/dev-ros/calibration_setup_helper/Manifest
index 260e29b51570..f841ea818e5e 100644
--- a/dev-ros/calibration_setup_helper/Manifest
+++ b/dev-ros/calibration_setup_helper/Manifest
@@ -1,4 +1,6 @@
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
 EBUILD calibration_setup_helper-0.10.14.ebuild 403 BLAKE2B 55191eb5632c1dae29ec4af2bd744b6ede7a57252757e93669a209a05cf023ede8e57f9313e4cff53d4709219dc154ba40387c4bca207f033a3d8b5e8cba0888 SHA512 36feae4bb388f2789c49831bb60ea4ee048c3a067f93e2f1692e27d73e529e34a5a4e51ab065a3897dff2a4114cea0bd0a89859f914d154c0ae43dcaf6ea51ab
+EBUILD calibration_setup_helper-0.10.15.ebuild 403 BLAKE2B 707bd613ab618f42e0b1042b77ee019ce7b533e6de779fd35478dd1e255c0cb67846c99371f00853ddfae760790ca086bf3344adef3d9fb56a197f5fab8e9deb SHA512 e738a9467c2a7fb8d981a7a2d7d75e42b0b99613ae037d85857e46840d768c60a0c5c9071d1c11f14fd0515417b94fbea0fd0e8b861b3193683390bfb3263874
 EBUILD calibration_setup_helper-9999.ebuild 403 BLAKE2B 55191eb5632c1dae29ec4af2bd744b6ede7a57252757e93669a209a05cf023ede8e57f9313e4cff53d4709219dc154ba40387c4bca207f033a3d8b5e8cba0888 SHA512 36feae4bb388f2789c49831bb60ea4ee048c3a067f93e2f1692e27d73e529e34a5a4e51ab065a3897dff2a4114cea0bd0a89859f914d154c0ae43dcaf6ea51ab
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.15.ebuild b/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.15.ebuild
new file mode 100644
index 000000000000..6fd09bcbc177
--- /dev/null
+++ b/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.15.ebuild
@@ -0,0 +1,17 @@
+# 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-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Script to generate calibration launch and configurationfiles for your robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-ros/calibration_launch"
diff --git a/dev-ros/clear_costmap_recovery/Manifest b/dev-ros/clear_costmap_recovery/Manifest
index 2693c30ea7d0..4a3928d03fbc 100644
--- a/dev-ros/clear_costmap_recovery/Manifest
+++ b/dev-ros/clear_costmap_recovery/Manifest
@@ -1,6 +1,4 @@
-DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
 DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
-EBUILD clear_costmap_recovery-1.17.0-r1.ebuild 621 BLAKE2B 8d8594ceddca1f908df74bd711e295223bf0b532c45af6fa99ff88b06d3341f560b7a907669c867f1d63ce59107ed520662c4b24081ab210230e8c083f0b76b6 SHA512 2808752157d3a0e52cd5d2a592f2edd4e05003fcc4285982ccfc451d3078c13614bde600ea5f8de444f01adbb2d9aeb1bbc1ce801a89975e3ababe77f2508ba4
-EBUILD clear_costmap_recovery-1.17.1-r1.ebuild 621 BLAKE2B 8d8594ceddca1f908df74bd711e295223bf0b532c45af6fa99ff88b06d3341f560b7a907669c867f1d63ce59107ed520662c4b24081ab210230e8c083f0b76b6 SHA512 2808752157d3a0e52cd5d2a592f2edd4e05003fcc4285982ccfc451d3078c13614bde600ea5f8de444f01adbb2d9aeb1bbc1ce801a89975e3ababe77f2508ba4
-EBUILD clear_costmap_recovery-9999.ebuild 621 BLAKE2B 8d8594ceddca1f908df74bd711e295223bf0b532c45af6fa99ff88b06d3341f560b7a907669c867f1d63ce59107ed520662c4b24081ab210230e8c083f0b76b6 SHA512 2808752157d3a0e52cd5d2a592f2edd4e05003fcc4285982ccfc451d3078c13614bde600ea5f8de444f01adbb2d9aeb1bbc1ce801a89975e3ababe77f2508ba4
+EBUILD clear_costmap_recovery-1.17.1-r1.ebuild 710 BLAKE2B 5835e55c083976e8f4f0fc84e5c2055ff6db2e2aa14188f9fd282a83225029c1b104776c1c4cc03d7fa91fc432ba5e6c3d95c5fafa7c063fa6bc2f02ad664d2e SHA512 ab58af869489d217ad3f1fcb2ad51a162165217b8c8c2f3fab9e2334734a156981720a3857818961c11799d79b5f8a973a6d0d1facef862b458696015d66ecfe
+EBUILD clear_costmap_recovery-9999.ebuild 710 BLAKE2B 5835e55c083976e8f4f0fc84e5c2055ff6db2e2aa14188f9fd282a83225029c1b104776c1c4cc03d7fa91fc432ba5e6c3d95c5fafa7c063fa6bc2f02ad664d2e SHA512 ab58af869489d217ad3f1fcb2ad51a162165217b8c8c2f3fab9e2334734a156981720a3857818961c11799d79b5f8a973a6d0d1facef862b458696015d66ecfe
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.0-r1.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.0-r1.ebuild
deleted file mode 100644
index 385e41ceda38..000000000000
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Recovery behavior that attempts reverting the costmaps to the static map"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.16.3
-	dev-cpp/eigen:3
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=[threads(+)]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-ros/rostest dev-cpp/gtest )
-"
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.1-r1.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.1-r1.ebuild
index 385e41ceda38..3f5cb324e386 100644
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.1-r1.ebuild
+++ b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.1-r1.ebuild
@@ -28,3 +28,8 @@ DEPEND="${RDEPEND}
 	dev-ros/cmake_modules
 	test? ( dev-ros/rostest dev-cpp/gtest )
 "
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
index 385e41ceda38..3f5cb324e386 100644
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
+++ b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
@@ -28,3 +28,8 @@ DEPEND="${RDEPEND}
 	dev-ros/cmake_modules
 	test? ( dev-ros/rostest dev-cpp/gtest )
 "
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/combined_robot_hw/Manifest b/dev-ros/combined_robot_hw/Manifest
index 9222de2e9020..35271b99d61f 100644
--- a/dev-ros/combined_robot_hw/Manifest
+++ b/dev-ros/combined_robot_hw/Manifest
@@ -2,9 +2,11 @@ DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6
 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
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
 EBUILD combined_robot_hw-0.19.1.ebuild 466 BLAKE2B 5bb38127d200a88d822d24fcc6d3f09963c88d48a432873a704489c2cdf30caba2b531cb54731b444c0e551517e8f65de6e3ad45ac2e770be79d551ef7cfac34 SHA512 902bc604b2ea4a2ca32e1244ea33c989c63a9ae3420f85586badcf581f7b88c598766cbd97848e1f691ffa9b8ed30f575cf9d25df3376d889b273cb66786d85f
 EBUILD combined_robot_hw-0.19.2.ebuild 466 BLAKE2B 5bb38127d200a88d822d24fcc6d3f09963c88d48a432873a704489c2cdf30caba2b531cb54731b444c0e551517e8f65de6e3ad45ac2e770be79d551ef7cfac34 SHA512 902bc604b2ea4a2ca32e1244ea33c989c63a9ae3420f85586badcf581f7b88c598766cbd97848e1f691ffa9b8ed30f575cf9d25df3376d889b273cb66786d85f
 EBUILD combined_robot_hw-0.19.3.ebuild 466 BLAKE2B 5bb38127d200a88d822d24fcc6d3f09963c88d48a432873a704489c2cdf30caba2b531cb54731b444c0e551517e8f65de6e3ad45ac2e770be79d551ef7cfac34 SHA512 902bc604b2ea4a2ca32e1244ea33c989c63a9ae3420f85586badcf581f7b88c598766cbd97848e1f691ffa9b8ed30f575cf9d25df3376d889b273cb66786d85f
 EBUILD combined_robot_hw-0.19.4.ebuild 466 BLAKE2B 4fa7e7c8dfbe348f1f925de94af95400525ea76c10bde1b74368a84397dff9fd222c06fb146e3278aaf639569748ecf7b03a75d9d4ba42869556e0a01371be9e SHA512 a25657753c6c449c007e2c8fb05ee817ef3bad069ca0c6f17a3a03bd85427a43f154b34f2f38a75495a0651c863b82115d22d4b79e5e8a54669283355000397b
+EBUILD combined_robot_hw-0.19.5.ebuild 466 BLAKE2B 4fa7e7c8dfbe348f1f925de94af95400525ea76c10bde1b74368a84397dff9fd222c06fb146e3278aaf639569748ecf7b03a75d9d4ba42869556e0a01371be9e SHA512 a25657753c6c449c007e2c8fb05ee817ef3bad069ca0c6f17a3a03bd85427a43f154b34f2f38a75495a0651c863b82115d22d4b79e5e8a54669283355000397b
 EBUILD combined_robot_hw-9999.ebuild 466 BLAKE2B 5bb38127d200a88d822d24fcc6d3f09963c88d48a432873a704489c2cdf30caba2b531cb54731b444c0e551517e8f65de6e3ad45ac2e770be79d551ef7cfac34 SHA512 902bc604b2ea4a2ca32e1244ea33c989c63a9ae3420f85586badcf581f7b88c598766cbd97848e1f691ffa9b8ed30f575cf9d25df3376d889b273cb66786d85f
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/combined_robot_hw/combined_robot_hw-0.19.5.ebuild b/dev-ros/combined_robot_hw/combined_robot_hw-0.19.5.ebuild
new file mode 100644
index 000000000000..d1ef9a1b84bc
--- /dev/null
+++ b/dev-ros/combined_robot_hw/combined_robot_hw-0.19.5.ebuild
@@ -0,0 +1,24 @@
+# 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-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Combined Robot HW class"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/hardware_interface-0.15
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-ros/roscpp
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/combined_robot_hw_tests/Manifest b/dev-ros/combined_robot_hw_tests/Manifest
index 14a9fb1fd477..ec1f3e9e009e 100644
--- a/dev-ros/combined_robot_hw_tests/Manifest
+++ b/dev-ros/combined_robot_hw_tests/Manifest
@@ -2,9 +2,11 @@ DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6
 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
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
 EBUILD combined_robot_hw_tests-0.19.1.ebuild 827 BLAKE2B 2053ebb7a7974d6cfd54b34a041442e3b8e4a7e9c354bf7c0234fcdf18125cd10f373e14b147a7b35f4cbdea4a22590834895c47177ec894be57c51a6ccf47b0 SHA512 078b0482d716cae3cc2d3e8c2bc2357921d77e6430dadb79cd8db16b9876945a060cfd2f37c80316c5427b19fc380cb5d7f85f7ebde221763c86d371e70fb774
 EBUILD combined_robot_hw_tests-0.19.2.ebuild 827 BLAKE2B 2053ebb7a7974d6cfd54b34a041442e3b8e4a7e9c354bf7c0234fcdf18125cd10f373e14b147a7b35f4cbdea4a22590834895c47177ec894be57c51a6ccf47b0 SHA512 078b0482d716cae3cc2d3e8c2bc2357921d77e6430dadb79cd8db16b9876945a060cfd2f37c80316c5427b19fc380cb5d7f85f7ebde221763c86d371e70fb774
 EBUILD combined_robot_hw_tests-0.19.3.ebuild 827 BLAKE2B 2053ebb7a7974d6cfd54b34a041442e3b8e4a7e9c354bf7c0234fcdf18125cd10f373e14b147a7b35f4cbdea4a22590834895c47177ec894be57c51a6ccf47b0 SHA512 078b0482d716cae3cc2d3e8c2bc2357921d77e6430dadb79cd8db16b9876945a060cfd2f37c80316c5427b19fc380cb5d7f85f7ebde221763c86d371e70fb774
 EBUILD combined_robot_hw_tests-0.19.4.ebuild 827 BLAKE2B d7a4eb4a9fb523fe8afdf973b541e04bf608fc51d6d1255f1a4ed4a6f3e05706b88b332b53209cd4bbf1f614e2e5ace3adb2ec41638bca5dd9c9862ec90d343e SHA512 dab4795383815b36ac64319a9397646dabc207768872c489ab1b549982ae5b4e23232ce83d5478161b27c39edde9b315d8a550a6d50ed061a498763acc09d3ed
+EBUILD combined_robot_hw_tests-0.19.5.ebuild 827 BLAKE2B d7a4eb4a9fb523fe8afdf973b541e04bf608fc51d6d1255f1a4ed4a6f3e05706b88b332b53209cd4bbf1f614e2e5ace3adb2ec41638bca5dd9c9862ec90d343e SHA512 dab4795383815b36ac64319a9397646dabc207768872c489ab1b549982ae5b4e23232ce83d5478161b27c39edde9b315d8a550a6d50ed061a498763acc09d3ed
 EBUILD combined_robot_hw_tests-9999.ebuild 827 BLAKE2B 2053ebb7a7974d6cfd54b34a041442e3b8e4a7e9c354bf7c0234fcdf18125cd10f373e14b147a7b35f4cbdea4a22590834895c47177ec894be57c51a6ccf47b0 SHA512 078b0482d716cae3cc2d3e8c2bc2357921d77e6430dadb79cd8db16b9876945a060cfd2f37c80316c5427b19fc380cb5d7f85f7ebde221763c86d371e70fb774
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.5.ebuild
index 44483c86ebe3..b52a335bd58b 100644
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.ebuild
+++ b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.5.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,27 +8,27 @@ ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Tests for the controller manager"
+DESCRIPTION="Combined Robot HW class tests"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/controller_interface
-	dev-ros/control_toolbox
+	dev-ros/combined_robot_hw
+	dev-ros/controller_manager
+	dev-ros/controller_manager_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/controller_manager_tests
+	dev-ros/hardware_interface
+	dev-ros/pluginlib
+	dev-ros/roscpp
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
-	dev-cpp/gtest
 "
 DEPEND="${RDEPEND}
 	test? (
 		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
 	)"
-# needed by combined_robot_hw_tests
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
 
 src_test() {
 	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
diff --git a/dev-ros/control_toolbox/Manifest b/dev-ros/control_toolbox/Manifest
index 731b43d95c14..5d4c871ec049 100644
--- a/dev-ros/control_toolbox/Manifest
+++ b/dev-ros/control_toolbox/Manifest
@@ -1,4 +1,4 @@
 DIST control_toolbox-1.18.2.tar.gz 24244 BLAKE2B 13c4d4d6991db496ea6223c6cc33c9b0b7fa7b3e18c13cc330cf032ac67b185a596ca2eb118678faf6f0a3106458e3ce20635dfd99fbc1acf176ee2844e6ec99 SHA512 0b8bbd0fec88b1679260d9b5d5c5762f52fd14f4156be45ea07a410a7967571136a65115f530ae4f7a84e456e56c363616e23d0b54d8c092a38a80fad691c705
-EBUILD control_toolbox-1.18.2-r1.ebuild 610 BLAKE2B bb11b7d9f0596168911899cb5e1f247f8f8a20a7ede72872b685e0b8e9fac6957d505f8b763cb8937e09fde122d6ba969c2eaa433e8827147c4b7ae3a65c5ef8 SHA512 8e344534cb12d51d5fbd6c1d9e01079c4f5649eaedd69056acd53520db6709453d34e93cca42c36a684baf30fa6356a817d0870aa7a55f9832e884a41f002f2d
-EBUILD control_toolbox-9999.ebuild 610 BLAKE2B bb11b7d9f0596168911899cb5e1f247f8f8a20a7ede72872b685e0b8e9fac6957d505f8b763cb8937e09fde122d6ba969c2eaa433e8827147c4b7ae3a65c5ef8 SHA512 8e344534cb12d51d5fbd6c1d9e01079c4f5649eaedd69056acd53520db6709453d34e93cca42c36a684baf30fa6356a817d0870aa7a55f9832e884a41f002f2d
+EBUILD control_toolbox-1.18.2-r1.ebuild 635 BLAKE2B 454ad473f15cc341bc5c4736164638dd0de96737064ea441b94101beba565c4bd5a0faafc4aa747790102fc0be4955057a80d43dfce7ff05944e7d1add2a79ad SHA512 7b476b5921c98d83f3b0e86ddd72afb7d77a8b9e710a981bf1d7493b275fc8a2f81fa5ffe2f9c551a1eeb8590b34206ead7924cccb0e2c7875186b141582fd15
+EBUILD control_toolbox-9999.ebuild 635 BLAKE2B 454ad473f15cc341bc5c4736164638dd0de96737064ea441b94101beba565c4bd5a0faafc4aa747790102fc0be4955057a80d43dfce7ff05944e7d1add2a79ad SHA512 7b476b5921c98d83f3b0e86ddd72afb7d77a8b9e710a981bf1d7493b275fc8a2f81fa5ffe2f9c551a1eeb8590b34206ead7924cccb0e2c7875186b141582fd15
 MISC metadata.xml 342 BLAKE2B fb0771fe1ae1d9988202a13aa319eca68cde1c129b68b74405ba854416522c81917bd7ecc26dd6ff0d9c32a02c5b089dbbaa4b13eb6ee3e65c050a09ec6731e8 SHA512 81835aefd67c55665a6f7d2a2cdbced84032d83ca35d6924410a62c00021cf7eb0e11e1094e0bb70becb635b480c8e527c7e9bdfaaa17149918552d440539e0c
diff --git a/dev-ros/control_toolbox/control_toolbox-1.18.2-r1.ebuild b/dev-ros/control_toolbox/control_toolbox-1.18.2-r1.ebuild
index 83cfabc81f04..a600c6fd73a7 100644
--- a/dev-ros/control_toolbox/control_toolbox-1.18.2-r1.ebuild
+++ b/dev-ros/control_toolbox/control_toolbox-1.18.2-r1.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
-	dev-ros/dynamic_reconfigure
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/realtime_tools
 	dev-libs/boost:=[threads(+)]
 	dev-libs/tinyxml
diff --git a/dev-ros/control_toolbox/control_toolbox-9999.ebuild b/dev-ros/control_toolbox/control_toolbox-9999.ebuild
index 83cfabc81f04..a600c6fd73a7 100644
--- a/dev-ros/control_toolbox/control_toolbox-9999.ebuild
+++ b/dev-ros/control_toolbox/control_toolbox-9999.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
-	dev-ros/dynamic_reconfigure
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/realtime_tools
 	dev-libs/boost:=[threads(+)]
 	dev-libs/tinyxml
diff --git a/dev-ros/controller_interface/Manifest b/dev-ros/controller_interface/Manifest
index 5185e13792e2..9c2ace1559e1 100644
--- a/dev-ros/controller_interface/Manifest
+++ b/dev-ros/controller_interface/Manifest
@@ -2,9 +2,11 @@ DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6
 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
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
 EBUILD controller_interface-0.19.1-r1.ebuild 433 BLAKE2B 463bd58e5be22fe5defd3c905b67f07c52a695419a6c1cd46f8949dd7b1a84ca51beceb1115f0f6331e5f0019ab69c1442afd5d394df156eaa04bb65bdf324e1 SHA512 fe59bcc4f329a6118219a9764491d2ffd8729a25bbf723f210233807221e527c6146288e987ed545df5da425291136d350d4eb561053c5769fd1cf075e7ac5fc
 EBUILD controller_interface-0.19.2.ebuild 433 BLAKE2B 463bd58e5be22fe5defd3c905b67f07c52a695419a6c1cd46f8949dd7b1a84ca51beceb1115f0f6331e5f0019ab69c1442afd5d394df156eaa04bb65bdf324e1 SHA512 fe59bcc4f329a6118219a9764491d2ffd8729a25bbf723f210233807221e527c6146288e987ed545df5da425291136d350d4eb561053c5769fd1cf075e7ac5fc
 EBUILD controller_interface-0.19.3.ebuild 433 BLAKE2B 463bd58e5be22fe5defd3c905b67f07c52a695419a6c1cd46f8949dd7b1a84ca51beceb1115f0f6331e5f0019ab69c1442afd5d394df156eaa04bb65bdf324e1 SHA512 fe59bcc4f329a6118219a9764491d2ffd8729a25bbf723f210233807221e527c6146288e987ed545df5da425291136d350d4eb561053c5769fd1cf075e7ac5fc
 EBUILD controller_interface-0.19.4.ebuild 433 BLAKE2B b9e597cfaf5fd2201a44d63655609fbcb9f04b334f2ba039321bc6eea08f2d8343a4bf24ea4d753bdb00bf15c416368c6f3d24481a746e4afaa44d52961921be SHA512 fd7dc7cb7e862433cb8791b249677e2de28cab0a781825b642f218974d90bd5ce0b13dfddb3da7458abb02a49ed4e845f8d6953063169441d869826ee89cecbb
+EBUILD controller_interface-0.19.5.ebuild 433 BLAKE2B b9e597cfaf5fd2201a44d63655609fbcb9f04b334f2ba039321bc6eea08f2d8343a4bf24ea4d753bdb00bf15c416368c6f3d24481a746e4afaa44d52961921be SHA512 fd7dc7cb7e862433cb8791b249677e2de28cab0a781825b642f218974d90bd5ce0b13dfddb3da7458abb02a49ed4e845f8d6953063169441d869826ee89cecbb
 EBUILD controller_interface-9999.ebuild 433 BLAKE2B 463bd58e5be22fe5defd3c905b67f07c52a695419a6c1cd46f8949dd7b1a84ca51beceb1115f0f6331e5f0019ab69c1442afd5d394df156eaa04bb65bdf324e1 SHA512 fe59bcc4f329a6118219a9764491d2ffd8729a25bbf723f210233807221e527c6146288e987ed545df5da425291136d350d4eb561053c5769fd1cf075e7ac5fc
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_interface/controller_interface-0.19.5.ebuild b/dev-ros/controller_interface/controller_interface-0.19.5.ebuild
new file mode 100644
index 000000000000..62002566d3e9
--- /dev/null
+++ b/dev-ros/controller_interface/controller_interface-0.19.5.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-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Interface base class for controllers"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/hardware_interface
+	dev-ros/pluginlib:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
diff --git a/dev-ros/controller_manager/Manifest b/dev-ros/controller_manager/Manifest
index 771938bdb745..8a44cea65006 100644
--- a/dev-ros/controller_manager/Manifest
+++ b/dev-ros/controller_manager/Manifest
@@ -1,4 +1,6 @@
 DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
 EBUILD controller_manager-0.19.4.ebuild 1000 BLAKE2B 6f8af83ea608426623327158f2508acfd7d46d38cf9cc92ceecb5d55001baf86d0d5b557cb8683bf53f1819e7ec4a6f4182382c05dc26aabbf4a48e35d5ef957 SHA512 deadf61be20441ff1685fc221b88b24e19fc0112f2be1178a5035b31c70530c64aac4db5ee24383a57131d81e7e4f2cc338ff085e588b43f84e24367a9b08308
+EBUILD controller_manager-0.19.5.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.5.ebuild b/dev-ros/controller_manager/controller_manager-0.19.5.ebuild
new file mode 100644
index 000000000000..e039c57a8218
--- /dev/null
+++ b/dev-ros/controller_manager/controller_manager-0.19.5.ebuild
@@ -0,0 +1,40 @@
+# 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-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
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/controller_manager_msgs/Manifest b/dev-ros/controller_manager_msgs/Manifest
index b98d881c1751..851df24f67e3 100644
--- a/dev-ros/controller_manager_msgs/Manifest
+++ b/dev-ros/controller_manager_msgs/Manifest
@@ -2,9 +2,11 @@ DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6
 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
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
 EBUILD controller_manager_msgs-0.19.1.ebuild 440 BLAKE2B e49c9671a6c3ff79321dc8c9d800c2ae79ef11d6fc240bfa593651230206b9432a0f1bb6a654996c6821aaa2a16048a8e76151e52ca24c87341b8697c9981981 SHA512 2d1850460349c82074fd0d8f503ac7602d4f59100598ee0ee844b07116ea2c40e38a83e27ff743d3845f4073328b449b1a6d7a353a950ac875238360febc57d5
 EBUILD controller_manager_msgs-0.19.2.ebuild 440 BLAKE2B e49c9671a6c3ff79321dc8c9d800c2ae79ef11d6fc240bfa593651230206b9432a0f1bb6a654996c6821aaa2a16048a8e76151e52ca24c87341b8697c9981981 SHA512 2d1850460349c82074fd0d8f503ac7602d4f59100598ee0ee844b07116ea2c40e38a83e27ff743d3845f4073328b449b1a6d7a353a950ac875238360febc57d5
 EBUILD controller_manager_msgs-0.19.3.ebuild 440 BLAKE2B e49c9671a6c3ff79321dc8c9d800c2ae79ef11d6fc240bfa593651230206b9432a0f1bb6a654996c6821aaa2a16048a8e76151e52ca24c87341b8697c9981981 SHA512 2d1850460349c82074fd0d8f503ac7602d4f59100598ee0ee844b07116ea2c40e38a83e27ff743d3845f4073328b449b1a6d7a353a950ac875238360febc57d5
 EBUILD controller_manager_msgs-0.19.4.ebuild 440 BLAKE2B 2c780d5d1e17615eabf6dee08037b0ee99cb17b1737785f2a98be197a60c86f3af1539282d468619237f79a338733345cf44910f9fc627c198a2ba253b452f76 SHA512 84105726da609158ec97a81c41b6c8dafcd3d2a07248c82e1e4d9ca40f203b23d94ce3dcecb68314698af7bbe3da1c12ef54bddd1a5ed8a128290a50b158c543
+EBUILD controller_manager_msgs-0.19.5.ebuild 440 BLAKE2B 2c780d5d1e17615eabf6dee08037b0ee99cb17b1737785f2a98be197a60c86f3af1539282d468619237f79a338733345cf44910f9fc627c198a2ba253b452f76 SHA512 84105726da609158ec97a81c41b6c8dafcd3d2a07248c82e1e4d9ca40f203b23d94ce3dcecb68314698af7bbe3da1c12ef54bddd1a5ed8a128290a50b158c543
 EBUILD controller_manager_msgs-9999.ebuild 440 BLAKE2B e49c9671a6c3ff79321dc8c9d800c2ae79ef11d6fc240bfa593651230206b9432a0f1bb6a654996c6821aaa2a16048a8e76151e52ca24c87341b8697c9981981 SHA512 2d1850460349c82074fd0d8f503ac7602d4f59100598ee0ee844b07116ea2c40e38a83e27ff743d3845f4073328b449b1a6d7a353a950ac875238360febc57d5
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.5.ebuild b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.5.ebuild
new file mode 100644
index 000000000000..dcfdcd21f983
--- /dev/null
+++ b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.5.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-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="The controller manager"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_manager_tests/Manifest b/dev-ros/controller_manager_tests/Manifest
index faea41e74ebd..2ceb027a130a 100644
--- a/dev-ros/controller_manager_tests/Manifest
+++ b/dev-ros/controller_manager_tests/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_tests-0.19.1.ebuild 916 BLAKE2B 2863c87ca0bc54a305777f574d127c53b61580761dabbb5a7b694ec87c2558dedfe38ca4ade4600684991c330a0d38fcb7d35ebc6afc54d06fb9d2f49e953915 SHA512 13364da33088948d81937f9c613920b651f1f19fda2cf256a6ed22a4cce95bc7c40ffc0447936e93e7604064a8be75b58efced3ec6aae50e9f9a77ec7b09183c
-EBUILD controller_manager_tests-0.19.2.ebuild 902 BLAKE2B 60b0543b7f2b092d15eee1adbb089f47f37adaa3682a141bd58b7976dd4b6582856aa90c3e38010b29563f26af44a36fabae61e84d7dd153e4e9525c3c9fd29e SHA512 1f154dfc3a04d0bdfe1534e88ee66c381c4dac76cad042ed69eb9c6a00d91fd73dcaca14cc7836783c70514e83d787276b2e15f614cd0969cde1b09f1a24fc2a
-EBUILD controller_manager_tests-0.19.3.ebuild 902 BLAKE2B 60b0543b7f2b092d15eee1adbb089f47f37adaa3682a141bd58b7976dd4b6582856aa90c3e38010b29563f26af44a36fabae61e84d7dd153e4e9525c3c9fd29e SHA512 1f154dfc3a04d0bdfe1534e88ee66c381c4dac76cad042ed69eb9c6a00d91fd73dcaca14cc7836783c70514e83d787276b2e15f614cd0969cde1b09f1a24fc2a
-EBUILD controller_manager_tests-0.19.4.ebuild 902 BLAKE2B 7b06e897aa15f6c287898a4f0d410ce1f3ad9fb8669a091a4e05cb6964a5fb2afb3ae11d46aa02436d3f62672a94ce7ee19f508bdecb8c8cfe64a879ac9b3a7d SHA512 7c7e4aa58b76b12b9e283bb4a03ba3f550e39bca0b0485a1f6bb895ebf2211ab849af5e2e5ec678b0cd98fce829e4e43b266722eae5372b5b2ff9011d6e225f0
-EBUILD controller_manager_tests-9999.ebuild 902 BLAKE2B 60b0543b7f2b092d15eee1adbb089f47f37adaa3682a141bd58b7976dd4b6582856aa90c3e38010b29563f26af44a36fabae61e84d7dd153e4e9525c3c9fd29e SHA512 1f154dfc3a04d0bdfe1534e88ee66c381c4dac76cad042ed69eb9c6a00d91fd73dcaca14cc7836783c70514e83d787276b2e15f614cd0969cde1b09f1a24fc2a
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
+EBUILD controller_manager_tests-0.19.5.ebuild 932 BLAKE2B 3688839251bbcdcab09703ba8bd395137b84995f397a3f2b0204d3e3c0ead08579bc4c2f48be2b68a5cf5897f57e68a33a408f45da8332c471d924f096c7faf7 SHA512 db2936ee1c76c759a31eca899f1c2d129fce2044335321a00dd80bf7f00d54117d4d15a7a607d7d8874fe0797a55c5df6f1cf976783a3ca87a0c3232b0dea47e
+EBUILD controller_manager_tests-9999.ebuild 932 BLAKE2B 3688839251bbcdcab09703ba8bd395137b84995f397a3f2b0204d3e3c0ead08579bc4c2f48be2b68a5cf5897f57e68a33a408f45da8332c471d924f096c7faf7 SHA512 db2936ee1c76c759a31eca899f1c2d129fce2044335321a00dd80bf7f00d54117d4d15a7a607d7d8874fe0797a55c5df6f1cf976783a3ca87a0c3232b0dea47e
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.2.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.2.ebuild
deleted file mode 100644
index 3c574d1b681b..000000000000
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.2.ebuild
+++ /dev/null
@@ -1,36 +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="Tests for the controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/controller_interface
-	dev-ros/control_toolbox
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-cpp/gtest
-"
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-"
-# needed by combined_robot_hw_tests
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-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/controller_manager_tests/controller_manager_tests-0.19.4.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.5.ebuild
index 976ea1f42e0f..c28c2b9f697c 100644
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.4.ebuild
+++ b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.5.ebuild
@@ -25,6 +25,9 @@ DEPEND="${RDEPEND}
 	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+	test? (
+		dev-ros/rosbash
+	)
 "
 # needed by combined_robot_hw_tests
 mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
index 3c574d1b681b..c28c2b9f697c 100644
--- a/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
+++ b/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,6 +25,9 @@ DEPEND="${RDEPEND}
 	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+	test? (
+		dev-ros/rosbash
+	)
 "
 # needed by combined_robot_hw_tests
 mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/gazebo_plugins/Manifest b/dev-ros/gazebo_plugins/Manifest
index 6b61f3a15cfa..a1f46eec1f07 100644
--- a/dev-ros/gazebo_plugins/Manifest
+++ b/dev-ros/gazebo_plugins/Manifest
@@ -1,6 +1,4 @@
-DIST gazebo_ros_pkgs-2.9.1.tar.gz 1861740 BLAKE2B 56569e73184c767abeea0ac6add8aa19bb70e66f3a41fe9fc5278e540759de945467372c7a0130acdb665924ab803defa22e148a36a624d08c39835dc110e208 SHA512 47510f97060d5434619948899b416a8136545b79cd112051543212abe8ce34a30c1f868c633a3f3288fd6c0ea775162daf2eea15ca539a352c9bdb55ee336b20
 DIST gazebo_ros_pkgs-2.9.2.tar.gz 1864333 BLAKE2B d8a777594624fe6ae38f1ae27ea49f9629a59f507ec5e8512f50dbf8ae551e6b171dd47eff308ab1badc4e07de7183fe512ff8179637169896f6cb1dbf3d50ba SHA512 38ca70b44a229d8ca87bf9cb2ed3e0eaf7855f5711a81891986a985b7ff4218cdd6c914c1d25352da47a3fb52a3df5638af36990264e5241d17bb43ae0fa6f0b
-EBUILD gazebo_plugins-2.9.1.ebuild 1399 BLAKE2B 772438439e62014bad0fe4996181e5020df138a843a61f9396381aa123f34aec150af31157d86a07f94d84f5aa7baafa2815d7d54a9328577b4acc8f3bb374db SHA512 f87939c38cd358d99502b4cdcb6528c03cab2b5fa28468acd9c990157abce6974d44ef25a2fed3aaebbdf329e7fdd3795d79ee095aae9fbad553ad99acb13a29
-EBUILD gazebo_plugins-2.9.2.ebuild 1399 BLAKE2B 0549aeed743dac942b8d1241b202270014b86f9c75f334c8533f19e0e54d42a925aa29b45822e9abb2122202c055d59cbb23fdf3d500af6b0cabbabda2e7b695 SHA512 c64626e04e64138a98d17bf8d23116aa0c9ff0c8ef18f0ebb91230a9b6bc2eae4ae08953564d7e069c6c3068ff20733a7598dfab9282c4b41526be97433db4b4
-EBUILD gazebo_plugins-9999.ebuild 1399 BLAKE2B 772438439e62014bad0fe4996181e5020df138a843a61f9396381aa123f34aec150af31157d86a07f94d84f5aa7baafa2815d7d54a9328577b4acc8f3bb374db SHA512 f87939c38cd358d99502b4cdcb6528c03cab2b5fa28468acd9c990157abce6974d44ef25a2fed3aaebbdf329e7fdd3795d79ee095aae9fbad553ad99acb13a29
+EBUILD gazebo_plugins-2.9.2.ebuild 1458 BLAKE2B 979043bd0e332273d9e9b4d81f0a400ea0fedc259579dcd09f5268c2a7706997439fc1b396c7e958da3537bd94feb783f7e631ac42e1dfbe12600c2adc6f3252 SHA512 5b0043db8076ae7a0d9aad84ca81a608bdfe046f655af2181f5dcdf7b9d67ae01f0d8576245512fad1dd7c950228eda10125786ea784f356ee206fcae61f47eb
+EBUILD gazebo_plugins-9999.ebuild 1458 BLAKE2B 979043bd0e332273d9e9b4d81f0a400ea0fedc259579dcd09f5268c2a7706997439fc1b396c7e958da3537bd94feb783f7e631ac42e1dfbe12600c2adc6f3252 SHA512 5b0043db8076ae7a0d9aad84ca81a608bdfe046f655af2181f5dcdf7b9d67ae01f0d8576245512fad1dd7c950228eda10125786ea784f356ee206fcae61f47eb
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.9.1.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.9.1.ebuild
deleted file mode 100644
index 743965d423ed..000000000000
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.9.1.ebuild
+++ /dev/null
@@ -1,54 +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-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot-independent Gazebo plugins"
-LICENSE="BSD Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/gazebo_dev
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/nodelet
-	dev-ros/angles
-	dev-ros/std_srvs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/urdf
-	dev-ros/tf
-	dev-ros/tf2_ros
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/driver_base[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/pcl_conversions
-	dev-ros/image_transport
-	dev-ros/rosconsole
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/polled_camera
-	dev-ros/diagnostic_updater
-	dev-ros/camera_info_manager
-	dev-libs/libxml2
-	>=sci-electronics/gazebo-7:=
-	dev-libs/protobuf:=
-	dev-games/ogre
-	sci-libs/pcl
-	dev-libs/boost:=
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.9.2.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.9.2.ebuild
index a13320901ff6..de6216b0cc3e 100644
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.9.2.ebuild
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-2.9.2.ebuild
@@ -51,4 +51,5 @@ DEPEND="${RDEPEND}
 	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
index 743965d423ed..de6216b0cc3e 100644
--- a/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-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
@@ -51,4 +51,5 @@ DEPEND="${RDEPEND}
 	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
diff --git a/dev-ros/genpy/Manifest b/dev-ros/genpy/Manifest
index e071cb20be13..a83615e86ce0 100644
--- a/dev-ros/genpy/Manifest
+++ b/dev-ros/genpy/Manifest
@@ -1,7 +1,5 @@
 AUX yaml.patch 543 BLAKE2B c476c582c2363bd5bdf9b472dc784726eb2bd65081d3629f7d822decbb92ecfe0c695691219c661b7bad850521346eb591c9c00498c3ab1e0f85597b8497c3a8 SHA512 4fc53e0c904d5dfa637476b833e8a5038305ebd0672f5acf08f81b2ae97970b0e4996df483ff087a2eb16957b659d0a528545fe8704cc26f1f6029105a2aea87
-DIST genpy-0.6.11.tar.gz 53128 BLAKE2B c0c6d9aa8d713e873a5cbceda8763c23e4b6259f5708be1575c4eae600b3f96bd8f05cda281711c799a0a4e00d69623ed0ddcb7812b4894d7c45717121f51c00 SHA512 267391cce6119085ae974f00fa4a33767b2b62a5d61bd290b3d2164cee275ce88b21d124b2da9ca9d85ac6a3a030ceddef766be34fba9c0d57ba26d6e1e41186
-DIST genpy-0.6.14.tar.gz 53964 BLAKE2B ff1503a56fdb07a5165d2891589450e3b40e85f68d541990828959b8d7f0e440091d77fd0bb4ac70fa0e39114b366c061e8d03979482539d2e5ca6cc3ff15b8c SHA512 5ce357ef41d2c06025ca2a06ca4111baf0d3b92dbdf877ea0ce5515d516d9e0fa46171057293ba96d5b55c5fa32b7c24ef28cfcd45be8bf9c3d73302feec6957
-EBUILD genpy-0.6.11.ebuild 581 BLAKE2B 9db9e3ef13ca81cf25d8aa9018265ae19b8b60801489a6c291163365c50369c6ff2be37924557e270abcdadba0030b093eb1e630501927f80d0dcffa7179e4cb SHA512 0bf566b2fe5fac3e6b17a9b1be2d82fa020b9a901c64f7b9ac06f4163a5bb1ecb468b6c6483957232d6c540efcdeb3089e350cf97c320c1f9f85bcf54c24b7be
-EBUILD genpy-0.6.14.ebuild 581 BLAKE2B 9db9e3ef13ca81cf25d8aa9018265ae19b8b60801489a6c291163365c50369c6ff2be37924557e270abcdadba0030b093eb1e630501927f80d0dcffa7179e4cb SHA512 0bf566b2fe5fac3e6b17a9b1be2d82fa020b9a901c64f7b9ac06f4163a5bb1ecb468b6c6483957232d6c540efcdeb3089e350cf97c320c1f9f85bcf54c24b7be
+DIST genpy-0.6.16.tar.gz 55296 BLAKE2B 061b7c761a8a8892ffbd27073812ffd375bbeabe1606efdd5d43082f693968cad1fbbdf87ec87b0f4ddc6cef81c22c6e562455885a4b8b82519f544bd5d1c672 SHA512 e87a368d6d966ca681d8abfa0fb16ce1f827aaa9cc0649ffd88ccb849fd3c479db0a36f7a82e16e386e83d471e2a75c38afebe33975a1cf6d42b98804ec7a1bd
+EBUILD genpy-0.6.16.ebuild 581 BLAKE2B 4649504ee0d8863077f766a8494d9f0e569c83e6340b20caa07cb341149a3be9ab47e63814e028ce798f10474a9d3099814e7681574dd7cc3bce41e15ab6fb18 SHA512 deb86c987f36e049df1c4da6f8d51808ad051e46ab0a99d4dd1ad9e9483940c6ffc238d47fb210ebcd57dc7226ac5e0e40dc330b1460bb00639a31eb38b6723b
 EBUILD genpy-9999.ebuild 581 BLAKE2B 9db9e3ef13ca81cf25d8aa9018265ae19b8b60801489a6c291163365c50369c6ff2be37924557e270abcdadba0030b093eb1e630501927f80d0dcffa7179e4cb SHA512 0bf566b2fe5fac3e6b17a9b1be2d82fa020b9a901c64f7b9ac06f4163a5bb1ecb468b6c6483957232d6c540efcdeb3089e350cf97c320c1f9f85bcf54c24b7be
 MISC metadata.xml 323 BLAKE2B 025145a67d18622d14ea6ac43585246aac2cdc4f65e63b04dbfd32aa6f04f4e301e22f2e326a486e2fad3c1ef82f9890179a8dc142f4aa551b5b9db155e616da SHA512 523ec83e710fb0b80d731b536c8605a4211bfa176951a1af5ee6f6e60fee1ca3634c0d659b2d3ae71f3bb9d3765cc44cfdada5c7a364cea63f323c462227f364
diff --git a/dev-ros/genpy/genpy-0.6.11.ebuild b/dev-ros/genpy/genpy-0.6.11.ebuild
deleted file mode 100644
index a5796a02b2e9..000000000000
--- a/dev-ros/genpy/genpy-0.6.11.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/genpy"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Python ROS message and service generators"
-HOMEPAGE="https://wiki.ros.org/genpy"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)
-"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/genpy/genpy-0.6.14.ebuild b/dev-ros/genpy/genpy-0.6.16.ebuild
index a5796a02b2e9..e8cda9d3e500 100644
--- a/dev-ros/genpy/genpy-0.6.14.ebuild
+++ b/dev-ros/genpy/genpy-0.6.16.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/geodesy/Manifest b/dev-ros/geodesy/Manifest
index 4dd262bc9ca1..e583bc3843f6 100644
--- a/dev-ros/geodesy/Manifest
+++ b/dev-ros/geodesy/Manifest
@@ -1,5 +1,5 @@
-AUX py3.patch 1627 BLAKE2B 050e4fe368d65e09ff9074c07e430d695fb5d0829ca75716146f861ad13a522bb364d70482840b225a4f71b5fed06f093bc8e5069e7d22c7156c615e6cf2792d SHA512 d2fd39c0c797dee88da86efc1a10e49f3bd8383b0f97e0e0f20461347aeaa2649ca7e426a872c7f2c5f2323d914e1beda5de7022c5cb7561e29b942c1d92ce8f
-DIST geographic_info-0.5.5.tar.gz 27762 BLAKE2B 9235911d6a2b010e47722268f5aa14b2bd10dac73bf4445bcd6585c5094947e9ea43ee2ccb6d6a3b0ae788d149fcc546e6618f0097e4bde32d69ed9baacbf255 SHA512 a1699778cd85960603435e7b7d46831c7c5ac4b57f4a06e9f394933799151a5ebf95c59bc109ca05eeb9376763aae8c77bc9150081c81170f1778730145910ec
-EBUILD geodesy-0.5.5.ebuild 1008 BLAKE2B f5f79e5f165f7277ae83f9fd363c3458c8496d4f9d315f457a22c8e8281089b5d916015d259e9ec4509fb2891580da63b6054ecd06e9c72da50fa2c154bb3696 SHA512 64a105b628a9d5adbb6d1ee222f34736acd065e93c45e2c23922e063fd480364efb165cdc14f022ea789ced48efa744a244246a5bfdd270563e0283f016563f3
+AUX py3.patch 524 BLAKE2B 68d93bc01ddd03660820d5e5ea6284ee595f18d0272423f9ddbb1357e18ecdb6280acfde2e00e62a921225d2a48837f289732b3321877be16102a21ea9e75371 SHA512 f854f820acc878c95bec1eca186c027ec0f3763195f6fd63a4a357aaf7affe3c20c640b3afecfa7ecce1702922904820d2a82c1d9caddfeace022478e4c5e91d
+DIST geographic_info-0.5.6.tar.gz 28130 BLAKE2B 4d7013543db91c02c470c6b6dcb6e00070d5356f91ace20b3bb97aafa71eff2b525fc11994796f2de103b1df40efe8358d19a7e8fc0b1290c73cc28c791f22ce SHA512 d2f41320d2b094c2ea04593941e35d2b5581b84cc2f599099880dd671255dd59bc8787ad4a5640539cc25a13592df2ec7a887e3ea171398cfeafeccc669bd7f0
+EBUILD geodesy-0.5.6.ebuild 1008 BLAKE2B 8861dc85fcfe3ba308c59f377f3804178c0c6e6b07fcb89ab50212eb3865e268f1670eadc4a925ec8a9f598b1ddba55527bf567826cf5059e9fbdfec910ca3c4 SHA512 967203b07343af56ea218548aabe1f3a0ee94c1f8f4d15a8e77d91362ad136837033eafe2266d2eedc21811245a56bf30c75bb610196448a3c883725e3c55ae1
 EBUILD geodesy-9999.ebuild 1008 BLAKE2B f5f79e5f165f7277ae83f9fd363c3458c8496d4f9d315f457a22c8e8281089b5d916015d259e9ec4509fb2891580da63b6054ecd06e9c72da50fa2c154bb3696 SHA512 64a105b628a9d5adbb6d1ee222f34736acd065e93c45e2c23922e063fd480364efb165cdc14f022ea789ced48efa744a244246a5bfdd270563e0283f016563f3
 MISC metadata.xml 349 BLAKE2B f945481736db4b708a82107474a58d9dd6e805eae69557ea08bb80c9bff8913446618bd610ef7cfb69e84a88e6477de9fe4c2c86a1b693c7515114b78820ae1e SHA512 453f7929a678908957bfde47ef0816a11162200a6b5541850320d874b3419155c4efebae51ef2d1b542f73bb4dcb319fdd93098817819cad2a9cb74adf008918
diff --git a/dev-ros/geodesy/files/py3.patch b/dev-ros/geodesy/files/py3.patch
index 08259ee976c1..66ef4e5dd3ca 100644
--- a/dev-ros/geodesy/files/py3.patch
+++ b/dev-ros/geodesy/files/py3.patch
@@ -1,31 +1,3 @@
-Index: geodesy/src/geodesy/wu_point.py
-===================================================================
---- geodesy.orig/src/geodesy/wu_point.py
-+++ geodesy/src/geodesy/wu_point.py
-@@ -159,12 +159,12 @@ class WuPointSet():
-         # Initialize way point information.
-         self.way_point_ids = {}         # points symbol table
-         self.n_points = len(self.points)
--        for wid in xrange(self.n_points):
-+        for wid in range(self.n_points):
-             self.way_point_ids[self.points[wid].id.uuid] = wid
- 
-         # Create empty list of UTM points, corresponding to map points.
-         # They will be evaluated lazily, when first needed.
--        self.utm_points = [None for wid in xrange(self.n_points)]
-+        self.utm_points = [None for wid in range(self.n_points)]
- 
-     def __contains__(self, item):
-         """ Point set membership. """
-@@ -259,7 +259,7 @@ class WuPointSet():
-         """
-         return self.way_point_ids.get(key, default)
- 
--    def next(self):
-+    def __next__(self):
-         """ Next iteration point.
- 
-         :returns: Next :class:`WuPoint`.
 Index: geodesy/tests/test_wu_point.py
 ===================================================================
 --- geodesy.orig/tests/test_wu_point.py
diff --git a/dev-ros/geodesy/geodesy-0.5.5.ebuild b/dev-ros/geodesy/geodesy-0.5.6.ebuild
index 88ea377b0cc7..52d160f557de 100644
--- a/dev-ros/geodesy/geodesy-0.5.5.ebuild
+++ b/dev-ros/geodesy/geodesy-0.5.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/geographic_msgs/Manifest b/dev-ros/geographic_msgs/Manifest
index 7db5efcee3ae..fc205831a73e 100644
--- a/dev-ros/geographic_msgs/Manifest
+++ b/dev-ros/geographic_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST geographic_info-0.5.5.tar.gz 27762 BLAKE2B 9235911d6a2b010e47722268f5aa14b2bd10dac73bf4445bcd6585c5094947e9ea43ee2ccb6d6a3b0ae788d149fcc546e6618f0097e4bde32d69ed9baacbf255 SHA512 a1699778cd85960603435e7b7d46831c7c5ac4b57f4a06e9f394933799151a5ebf95c59bc109ca05eeb9376763aae8c77bc9150081c81170f1778730145910ec
+DIST geographic_info-0.5.6.tar.gz 28130 BLAKE2B 4d7013543db91c02c470c6b6dcb6e00070d5356f91ace20b3bb97aafa71eff2b525fc11994796f2de103b1df40efe8358d19a7e8fc0b1290c73cc28c791f22ce SHA512 d2f41320d2b094c2ea04593941e35d2b5581b84cc2f599099880dd671255dd59bc8787ad4a5640539cc25a13592df2ec7a887e3ea171398cfeafeccc669bd7f0
 EBUILD geographic_msgs-0.5.5.ebuild 483 BLAKE2B b407d4afa03e79e4116527cea8b7b52e7999ec8593158a955b7c1b244475c3316c45fc14b5bb5f5cf108e2ba8491e950fabfea0ec1f39adc79ec5b394792622d SHA512 fc850fd7150f3ee12b02be14bff6cd5a43c65a69485cc2a5584a9b86e75f216b0b1ed03172beb258361e02c44108b642f849a5518bbebfd3367f96d5c78e7747
+EBUILD geographic_msgs-0.5.6.ebuild 483 BLAKE2B a831785a84fc14793883abf78f730e628a2c3da6490bf63c1892e66cb08522fadf5270889921246c68bded3487fbbf19ef956c8b4c70e2c79d39a005ca0d9368 SHA512 5cf66dbdc67beaeb42b48da0955c7cecc912a1d33aa4b0fb54ae59fe31998f6eddf78de32759f5d17645e9b6dfc6e822ecda34fe59113b4f0bf410d53c2d8b44
 EBUILD geographic_msgs-9999.ebuild 483 BLAKE2B b407d4afa03e79e4116527cea8b7b52e7999ec8593158a955b7c1b244475c3316c45fc14b5bb5f5cf108e2ba8491e950fabfea0ec1f39adc79ec5b394792622d SHA512 fc850fd7150f3ee12b02be14bff6cd5a43c65a69485cc2a5584a9b86e75f216b0b1ed03172beb258361e02c44108b642f849a5518bbebfd3367f96d5c78e7747
 MISC metadata.xml 349 BLAKE2B f945481736db4b708a82107474a58d9dd6e805eae69557ea08bb80c9bff8913446618bd610ef7cfb69e84a88e6477de9fe4c2c86a1b693c7515114b78820ae1e SHA512 453f7929a678908957bfde47ef0816a11162200a6b5541850320d874b3419155c4efebae51ef2d1b542f73bb4dcb319fdd93098817819cad2a9cb74adf008918
diff --git a/dev-ros/geographic_msgs/geographic_msgs-0.5.6.ebuild b/dev-ros/geographic_msgs/geographic_msgs-0.5.6.ebuild
new file mode 100644
index 000000000000..a299373688ff
--- /dev/null
+++ b/dev-ros/geographic_msgs/geographic_msgs-0.5.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/std_msgs dev-ros/uuid_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="ROS messages for Geographic Information Systems"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/geometric_shapes/Manifest b/dev-ros/geometric_shapes/Manifest
index ba6ba62d4c42..104813881e9e 100644
--- a/dev-ros/geometric_shapes/Manifest
+++ b/dev-ros/geometric_shapes/Manifest
@@ -1,4 +1,4 @@
-DIST geometric_shapes-0.7.2.tar.gz 84443 BLAKE2B bcfcfeb08cbd60c889a2a801855eddd85a3ac42752991c0721ea0aee19a5650493e390d80a8ed99610a40efb5ca1fe0c1a49329471368b335483f8ceb193ca8a SHA512 5c1a05c0166c32c0d5ac9d22dd6feb784845342d7cde8d642731a08aafa54ed0b1545864f42b7de7641031bf7f0e353a632404799051770d55c7855b57d78027
-EBUILD geometric_shapes-0.7.2.ebuild 962 BLAKE2B 0ff665f8bdd88170d8882ec6f747268db7bc7186443f4df47945e6bae598aa2c4fabbf666aadab7df5eb534d2c666dc9ff8dcc4466222bc84da8a7c77ec782fd SHA512 63443250aa14f3e756ebe334978fe6fee23f7c8de255ab76712f6d0c0b786beace93ffc8a96df5bcd0b5407c366754ad1792a564e191e81224a03804a8581cc6
+DIST geometric_shapes-0.7.3.tar.gz 85830 BLAKE2B 2e5475a55e389ccd0cf2819c268efdf6e8764daadc7adae48d89d636b8155c49b892ec7204f2ecedc2e01948f6fa31fcaa88a14709d2ab63f850aee9352f5b1b SHA512 bd35a3aa23243d1bf85e7c9cc8b2263cbc1e5af626ae80950fd0867222bd5aaa29ac7fed6c1d5e28943916314ab941b182ba343114452b98c6f18b33a570123c
+EBUILD geometric_shapes-0.7.3.ebuild 962 BLAKE2B 840e12d79c63939d8201411beeddcdbadccbd31e99dc22b73370fe2a3f3f9ceb22e41b42b839a19d6cf91c9c5f354bcc3ca8965393aac6984e3836cb95723496 SHA512 e3173b034363be24385dad27b04a894cced4b899972a86e333461cc6c5aaf0d451657bc6cd0fb99cdff31df3ae3ec31ac7012f4b1623ed7e8e388fdca83f826a
 EBUILD geometric_shapes-9999.ebuild 962 BLAKE2B 0ff665f8bdd88170d8882ec6f747268db7bc7186443f4df47945e6bae598aa2c4fabbf666aadab7df5eb534d2c666dc9ff8dcc4466222bc84da8a7c77ec782fd SHA512 63443250aa14f3e756ebe334978fe6fee23f7c8de255ab76712f6d0c0b786beace93ffc8a96df5bcd0b5407c366754ad1792a564e191e81224a03804a8581cc6
 MISC metadata.xml 343 BLAKE2B 583ed67450346fcbca09f5714c29d20e728f827c1448ce275683f600b6f87d3f00337dfbf39b694906787b5db9dfc878a316121eb7922494ce631b9a8b9b3e2c SHA512 10c40ddc16c176ed5503b7d098bc133e85973301631878b36f793df95fe2c55576cacaaf2cbfcc9152cb0659394d7ab7c5fca72cbdba32c5310b4a2ce7b365c8
diff --git a/dev-ros/geometric_shapes/geometric_shapes-0.7.2.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.7.3.ebuild
index 4e9add6e0660..d7890463d7db 100644
--- a/dev-ros/geometric_shapes/geometric_shapes-0.7.2.ebuild
+++ b/dev-ros/geometric_shapes/geometric_shapes-0.7.3.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/hardware_interface/Manifest b/dev-ros/hardware_interface/Manifest
index 11bda41999b5..b27ec67d17b3 100644
--- a/dev-ros/hardware_interface/Manifest
+++ b/dev-ros/hardware_interface/Manifest
@@ -2,9 +2,11 @@ DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6
 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
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
 EBUILD hardware_interface-0.19.1.ebuild 389 BLAKE2B d50230140b3849df3e305428fe4be4b27f38d85b143c29a75b6f5064b75ba847db2c21187e5d85b8340c4bcc3397380044e67cb79ff23eb4687d4998badc0b52 SHA512 d6e1ee1fcfef637ead28b5906246a0435a8bf97a578b580032e390c3dea379104efc46bfa0ce81848a4d73543630abd1248dd63311c2411c765761eb5ad43e52
 EBUILD hardware_interface-0.19.2.ebuild 389 BLAKE2B d50230140b3849df3e305428fe4be4b27f38d85b143c29a75b6f5064b75ba847db2c21187e5d85b8340c4bcc3397380044e67cb79ff23eb4687d4998badc0b52 SHA512 d6e1ee1fcfef637ead28b5906246a0435a8bf97a578b580032e390c3dea379104efc46bfa0ce81848a4d73543630abd1248dd63311c2411c765761eb5ad43e52
 EBUILD hardware_interface-0.19.3.ebuild 389 BLAKE2B d50230140b3849df3e305428fe4be4b27f38d85b143c29a75b6f5064b75ba847db2c21187e5d85b8340c4bcc3397380044e67cb79ff23eb4687d4998badc0b52 SHA512 d6e1ee1fcfef637ead28b5906246a0435a8bf97a578b580032e390c3dea379104efc46bfa0ce81848a4d73543630abd1248dd63311c2411c765761eb5ad43e52
 EBUILD hardware_interface-0.19.4.ebuild 389 BLAKE2B 74cc5e3320c34aa5fe7c11258689e2e95ee506230f0a8d92d5dc6afc0973771214798cb765454f63d76895df4ed151073ba7a0eae1184bd0cbc92f9d7b9b0fa3 SHA512 69e3028d77a905a356cedb5d95bbee836d5d5f3732cbaba71b50dd1cae3fae2e0bf09244bce00959de06f715d87f362917a2b419d678989fa6e9d3d1306b6293
+EBUILD hardware_interface-0.19.5.ebuild 389 BLAKE2B 74cc5e3320c34aa5fe7c11258689e2e95ee506230f0a8d92d5dc6afc0973771214798cb765454f63d76895df4ed151073ba7a0eae1184bd0cbc92f9d7b9b0fa3 SHA512 69e3028d77a905a356cedb5d95bbee836d5d5f3732cbaba71b50dd1cae3fae2e0bf09244bce00959de06f715d87f362917a2b419d678989fa6e9d3d1306b6293
 EBUILD hardware_interface-9999.ebuild 389 BLAKE2B d50230140b3849df3e305428fe4be4b27f38d85b143c29a75b6f5064b75ba847db2c21187e5d85b8340c4bcc3397380044e67cb79ff23eb4687d4998badc0b52 SHA512 d6e1ee1fcfef637ead28b5906246a0435a8bf97a578b580032e390c3dea379104efc46bfa0ce81848a4d73543630abd1248dd63311c2411c765761eb5ad43e52
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/hardware_interface/hardware_interface-0.19.5.ebuild b/dev-ros/hardware_interface/hardware_interface-0.19.5.ebuild
new file mode 100644
index 000000000000..3cbf6c2cb246
--- /dev/null
+++ b/dev-ros/hardware_interface/hardware_interface-0.19.5.ebuild
@@ -0,0 +1,18 @@
+# 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-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Hardware Interface base class"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/roscpp"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest dev-ros/rostest )"
diff --git a/dev-ros/hector_compressed_map_transport/Manifest b/dev-ros/hector_compressed_map_transport/Manifest
index 4cfe6a89e10d..90ed678b1808 100644
--- a/dev-ros/hector_compressed_map_transport/Manifest
+++ b/dev-ros/hector_compressed_map_transport/Manifest
@@ -1,4 +1,6 @@
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_compressed_map_transport-0.5.1.ebuild 678 BLAKE2B 209013a02cf08a9271b4d0ae30d8a8c0b55d6ee831fb8fccf6acf4f96148341478145951e5c7bf9be06667062678bc8f6ef6dc2014ab2c960d38152eca396fdb SHA512 ad68777e963b47bddf6fa20f6b58a4e09d6a457b8a01385fd6a2a4364db521fa35168d61ea311960f7c1f21c087c6f618c209c8fa54dc47a2c5a6e43b9f65a57
+EBUILD hector_compressed_map_transport-0.5.2.ebuild 678 BLAKE2B 209013a02cf08a9271b4d0ae30d8a8c0b55d6ee831fb8fccf6acf4f96148341478145951e5c7bf9be06667062678bc8f6ef6dc2014ab2c960d38152eca396fdb SHA512 ad68777e963b47bddf6fa20f6b58a4e09d6a457b8a01385fd6a2a4364db521fa35168d61ea311960f7c1f21c087c6f618c209c8fa54dc47a2c5a6e43b9f65a57
 EBUILD hector_compressed_map_transport-9999.ebuild 678 BLAKE2B 347105c139dad0aefe18fb25051b778e61e332e15e9a47c6bd5241f2e074d51ec40b4c78f2d5212e78e11390def6ac4a251bf4e3f7e3c3e274d17cc8d4c83e73 SHA512 9f60acb8ecb6fa9dfed30e7bdd986c37941b9c4e8b2bc8dc16503bc68a43ffbaf60a1bad6679e6d67b4698b67ae08661c57b5ebc96a51ab762dd47c955d52c2b
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.5.2.ebuild b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.5.2.ebuild
new file mode 100644
index 000000000000..b17d75bdeaca
--- /dev/null
+++ b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.5.2.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/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Means for transporting compressed map data through the use of image_transport"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	media-libs/opencv:=
+	dev-ros/hector_map_tools
+	dev-ros/image_transport
+	media-libs/opencv
+"
+DEPEND="${RDEPEND}
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_geotiff/Manifest b/dev-ros/hector_geotiff/Manifest
index 875efefe78c1..945e9a21c006 100644
--- a/dev-ros/hector_geotiff/Manifest
+++ b/dev-ros/hector_geotiff/Manifest
@@ -1,4 +1,6 @@
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_geotiff-0.5.1.ebuild 747 BLAKE2B 9fe061390c2fc3a19664b20f70937b5e76d9694451bcea3e47dd89bd86ce32312ece1ccdc6474741369a9fcf79ea656e4dda58e416544c393b50ed98338e2a4e SHA512 8e622813620b6917fa70f745e1b1c331adb4fcfc56de941586db18de1ba011d7daeb9009191b1bc7342cf9a7f51139ead1837e5b37810c4f57970fd7c5871a98
+EBUILD hector_geotiff-0.5.2.ebuild 747 BLAKE2B 9fe061390c2fc3a19664b20f70937b5e76d9694451bcea3e47dd89bd86ce32312ece1ccdc6474741369a9fcf79ea656e4dda58e416544c393b50ed98338e2a4e SHA512 8e622813620b6917fa70f745e1b1c331adb4fcfc56de941586db18de1ba011d7daeb9009191b1bc7342cf9a7f51139ead1837e5b37810c4f57970fd7c5871a98
 EBUILD hector_geotiff-9999.ebuild 747 BLAKE2B 9fe061390c2fc3a19664b20f70937b5e76d9694451bcea3e47dd89bd86ce32312ece1ccdc6474741369a9fcf79ea656e4dda58e416544c393b50ed98338e2a4e SHA512 8e622813620b6917fa70f745e1b1c331adb4fcfc56de941586db18de1ba011d7daeb9009191b1bc7342cf9a7f51139ead1837e5b37810c4f57970fd7c5871a98
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_geotiff/hector_geotiff-0.5.2.ebuild b/dev-ros/hector_geotiff/hector_geotiff-0.5.2.ebuild
new file mode 100644
index 000000000000..5dedc3aec918
--- /dev/null
+++ b/dev-ros/hector_geotiff/hector_geotiff-0.5.2.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/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Saves occupancy grid map, robot trajectory and object data to GeoTiff images"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/hector_map_tools
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-libs/console_bridge:=
+	dev-ros/roscpp
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_geotiff_launch/Manifest b/dev-ros/hector_geotiff_launch/Manifest
index 3c35bba526f3..10faac3dc875 100644
--- a/dev-ros/hector_geotiff_launch/Manifest
+++ b/dev-ros/hector_geotiff_launch/Manifest
@@ -1,4 +1,6 @@
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_geotiff_launch-0.5.1.ebuild 441 BLAKE2B 52fc80a84bfa2030de4acde0c07a230b599708221dbcb862d790d5c9e23ce8393972854927c50262e54093e50ec89b1498e574598f7b2b2e73f16922cc40b1a4 SHA512 74a424701eca68354514ef74c8eeaa9a578bdc55471795b70e1692bb0c9fff54dec6f04a6aa19965ac921b5b702349140716b087a7f230ac7ada87be430dc35d
+EBUILD hector_geotiff_launch-0.5.2.ebuild 441 BLAKE2B 52fc80a84bfa2030de4acde0c07a230b599708221dbcb862d790d5c9e23ce8393972854927c50262e54093e50ec89b1498e574598f7b2b2e73f16922cc40b1a4 SHA512 74a424701eca68354514ef74c8eeaa9a578bdc55471795b70e1692bb0c9fff54dec6f04a6aa19965ac921b5b702349140716b087a7f230ac7ada87be430dc35d
 EBUILD hector_geotiff_launch-9999.ebuild 441 BLAKE2B 52fc80a84bfa2030de4acde0c07a230b599708221dbcb862d790d5c9e23ce8393972854927c50262e54093e50ec89b1498e574598f7b2b2e73f16922cc40b1a4 SHA512 74a424701eca68354514ef74c8eeaa9a578bdc55471795b70e1692bb0c9fff54dec6f04a6aa19965ac921b5b702349140716b087a7f230ac7ada87be430dc35d
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_geotiff_launch/hector_geotiff_launch-0.5.2.ebuild b/dev-ros/hector_geotiff_launch/hector_geotiff_launch-0.5.2.ebuild
new file mode 100644
index 000000000000..1a0d1f94dc3f
--- /dev/null
+++ b/dev-ros/hector_geotiff_launch/hector_geotiff_launch-0.5.2.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/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files for the hector_geotiff mapper"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/hector_geotiff
+	dev-ros/hector_geotiff_plugins
+	dev-ros/hector_trajectory_server
+"
+DEPEND=""
diff --git a/dev-ros/hector_geotiff_plugins/Manifest b/dev-ros/hector_geotiff_plugins/Manifest
index 2e1bc787fcc1..5f84e8fb2ef9 100644
--- a/dev-ros/hector_geotiff_plugins/Manifest
+++ b/dev-ros/hector_geotiff_plugins/Manifest
@@ -1,8 +1,10 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_geotiff_plugins-0.4.1.ebuild 505 BLAKE2B 3d11eb0af1355ae3eeaabd26044ad17faf40497d1e31e72d39efb345bec37d07bb3c67debde2201c447a98f22ca53c4814fffabbfa77918a4ea78b13405a95fe SHA512 5e67812d9ad85f206bf058c79b184210348499493f463a64b996e6a85e0a1f5aea9a0a3dab8e396814860b86880a2b3e55515ff208550bed70b2d38bc7d364e4
 EBUILD hector_geotiff_plugins-0.5.0.ebuild 505 BLAKE2B 5ae7c48da80faee349ba262bd97fc6fed221987f0ded412cfe585a3f910fdcf969528cdeb29f0a138bc5b3b42b9f51049da8d9c0df0f257923ceaf88bf4eb1a8 SHA512 fad10f3ed181bc55434b0700ada45fa62e859e45e9d0727d0b66e9aca058c461e42a7a658cbc0e7aa753c7ae20cb04639972c7cb0f449f70121bc538c3469437
 EBUILD hector_geotiff_plugins-0.5.1.ebuild 505 BLAKE2B 5ae7c48da80faee349ba262bd97fc6fed221987f0ded412cfe585a3f910fdcf969528cdeb29f0a138bc5b3b42b9f51049da8d9c0df0f257923ceaf88bf4eb1a8 SHA512 fad10f3ed181bc55434b0700ada45fa62e859e45e9d0727d0b66e9aca058c461e42a7a658cbc0e7aa753c7ae20cb04639972c7cb0f449f70121bc538c3469437
+EBUILD hector_geotiff_plugins-0.5.2.ebuild 505 BLAKE2B 5ae7c48da80faee349ba262bd97fc6fed221987f0ded412cfe585a3f910fdcf969528cdeb29f0a138bc5b3b42b9f51049da8d9c0df0f257923ceaf88bf4eb1a8 SHA512 fad10f3ed181bc55434b0700ada45fa62e859e45e9d0727d0b66e9aca058c461e42a7a658cbc0e7aa753c7ae20cb04639972c7cb0f449f70121bc538c3469437
 EBUILD hector_geotiff_plugins-9999.ebuild 505 BLAKE2B 3d11eb0af1355ae3eeaabd26044ad17faf40497d1e31e72d39efb345bec37d07bb3c67debde2201c447a98f22ca53c4814fffabbfa77918a4ea78b13405a95fe SHA512 5e67812d9ad85f206bf058c79b184210348499493f463a64b996e6a85e0a1f5aea9a0a3dab8e396814860b86880a2b3e55515ff208550bed70b2d38bc7d364e4
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.5.2.ebuild b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.5.2.ebuild
new file mode 100644
index 000000000000..b45c4e15ac25
--- /dev/null
+++ b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.5.2.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/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Plugins that extend geotiff maps generated by hector_geotiff"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/hector_geotiff
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/hector_imu_attitude_to_tf/Manifest b/dev-ros/hector_imu_attitude_to_tf/Manifest
index ab468a47839a..861ec048fd2d 100644
--- a/dev-ros/hector_imu_attitude_to_tf/Manifest
+++ b/dev-ros/hector_imu_attitude_to_tf/Manifest
@@ -1,4 +1,6 @@
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_imu_attitude_to_tf-0.5.1.ebuild 489 BLAKE2B 87ae6a5a1329bf0dcaac0641fcfd4a51ba389f7c36b25a1cdc65da62787b603c004f54bd357a9c465416a31459da5f12ac7010e8cb743cc2c06819253a59380e SHA512 8ab2f10403298a8b34c849c3156a01c7d8f0fc1e3813f6ec86bd11d8fbd245db8f443bc8192e6b05367b72c402085cb1cf00872eff96c791bf1ed5a138e4bee9
+EBUILD hector_imu_attitude_to_tf-0.5.2.ebuild 489 BLAKE2B 87ae6a5a1329bf0dcaac0641fcfd4a51ba389f7c36b25a1cdc65da62787b603c004f54bd357a9c465416a31459da5f12ac7010e8cb743cc2c06819253a59380e SHA512 8ab2f10403298a8b34c849c3156a01c7d8f0fc1e3813f6ec86bd11d8fbd245db8f443bc8192e6b05367b72c402085cb1cf00872eff96c791bf1ed5a138e4bee9
 EBUILD hector_imu_attitude_to_tf-9999.ebuild 489 BLAKE2B a24246dc0be0680b78059fd194246a0ba24b92ab2b83b087345f2263e5abe7bf319fca117b5af771604a745bc7ef4066cc38af154a25b81fdabc8c089485dd06 SHA512 a448d96cbdc03f40c676489151ef8fdc4197f50f063fe1c3b2b9a07788465155a561502cacd2a17eaef167664aa73b62cca98c1a12fe99cd8a78b627633bbaa1
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.5.2.ebuild b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.5.2.ebuild
new file mode 100644
index 000000000000..bf058d3517e9
--- /dev/null
+++ b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.5.2.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/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Publish the roll/pitch attitude angles reported via a imu message to tf"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/hector_imu_tools/Manifest b/dev-ros/hector_imu_tools/Manifest
index 9346fb0099b6..3af0e17a8a74 100644
--- a/dev-ros/hector_imu_tools/Manifest
+++ b/dev-ros/hector_imu_tools/Manifest
@@ -1,8 +1,10 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_imu_tools-0.4.1.ebuild 554 BLAKE2B 0dfd89a98f03a0e9d388af31d9e0ada1f2e5cd40102df57ad5b5e1ef9abf5b9ddfe02feab1be018ae801780493f40def54e1c7a74787d05e05384aa16d5e3b35 SHA512 74b673fc4d1ccb486020d20c2bca9cf62402df7a8f164c20206746b27bc829c2d5bf165cbc36aab130469fe225ddc6813c3d7f4fb6f7fdb77e5f8ca3b3fcc224
 EBUILD hector_imu_tools-0.5.0.ebuild 554 BLAKE2B bba7ee3b50a7f033a4621aeb15e7373e09d668bfdf514312394d6e3eb2f8470c46c07fb46e97d37c79b66da1d58dbc76e385e3189299d00e7775c7ffb8f35a8e SHA512 25eed480895c7ff02ded5bdef18cc2bffc3b813afbdd8e93e7df4a7b74f8c9e257ef1f4b7d2f77fe9445035b6f03d649cce838331d139ab77f3abce8c7613c80
 EBUILD hector_imu_tools-0.5.1.ebuild 554 BLAKE2B bba7ee3b50a7f033a4621aeb15e7373e09d668bfdf514312394d6e3eb2f8470c46c07fb46e97d37c79b66da1d58dbc76e385e3189299d00e7775c7ffb8f35a8e SHA512 25eed480895c7ff02ded5bdef18cc2bffc3b813afbdd8e93e7df4a7b74f8c9e257ef1f4b7d2f77fe9445035b6f03d649cce838331d139ab77f3abce8c7613c80
+EBUILD hector_imu_tools-0.5.2.ebuild 554 BLAKE2B bba7ee3b50a7f033a4621aeb15e7373e09d668bfdf514312394d6e3eb2f8470c46c07fb46e97d37c79b66da1d58dbc76e385e3189299d00e7775c7ffb8f35a8e SHA512 25eed480895c7ff02ded5bdef18cc2bffc3b813afbdd8e93e7df4a7b74f8c9e257ef1f4b7d2f77fe9445035b6f03d649cce838331d139ab77f3abce8c7613c80
 EBUILD hector_imu_tools-9999.ebuild 554 BLAKE2B 0dfd89a98f03a0e9d388af31d9e0ada1f2e5cd40102df57ad5b5e1ef9abf5b9ddfe02feab1be018ae801780493f40def54e1c7a74787d05e05384aa16d5e3b35 SHA512 74b673fc4d1ccb486020d20c2bca9cf62402df7a8f164c20206746b27bc829c2d5bf165cbc36aab130469fe225ddc6813c3d7f4fb6f7fdb77e5f8ca3b3fcc224
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_imu_tools/hector_imu_tools-0.5.2.ebuild b/dev-ros/hector_imu_tools/hector_imu_tools-0.5.2.ebuild
new file mode 100644
index 000000000000..45f66eda01ab
--- /dev/null
+++ b/dev-ros/hector_imu_tools/hector_imu_tools-0.5.2.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_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for processing IMU messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/hector_map_server/Manifest b/dev-ros/hector_map_server/Manifest
index 41abd0f5d1a3..0897c76039ed 100644
--- a/dev-ros/hector_map_server/Manifest
+++ b/dev-ros/hector_map_server/Manifest
@@ -1,8 +1,10 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_map_server-0.4.1.ebuild 608 BLAKE2B 4dfaecce739d51f09f664ea6aab55d4e5b7c5af6f10ca5b715f430ac5de47427ce354808ff4632d660051450069680ffdf1bbbd02e8108ec1f6c12f4f2593d96 SHA512 38b0ccc36ba5eb4720a75fc580872221c13c786fed08a76ec234549b5369aee94ab44221b22084656bd30c7474b037f5c4770b50c25b28e1a6d5857ea8f9b2b4
 EBUILD hector_map_server-0.5.0.ebuild 608 BLAKE2B a4a7ff8c2624057048dc4c626a9f8f7c070b064bb6806399f07d1ce68f9319793b157df5fe1ab16b1e30f213087a87cb8e7486fe2b401aad23297b088f9b9df7 SHA512 5861f9c1e774934b89f2d4ad70818a63e74d1693a643c38716abd473de926273e84c92c22c515b35cd24ace95b29b516aed1a1c97f1c7fb9111d2f67dc568246
 EBUILD hector_map_server-0.5.1.ebuild 608 BLAKE2B a4a7ff8c2624057048dc4c626a9f8f7c070b064bb6806399f07d1ce68f9319793b157df5fe1ab16b1e30f213087a87cb8e7486fe2b401aad23297b088f9b9df7 SHA512 5861f9c1e774934b89f2d4ad70818a63e74d1693a643c38716abd473de926273e84c92c22c515b35cd24ace95b29b516aed1a1c97f1c7fb9111d2f67dc568246
+EBUILD hector_map_server-0.5.2.ebuild 608 BLAKE2B a4a7ff8c2624057048dc4c626a9f8f7c070b064bb6806399f07d1ce68f9319793b157df5fe1ab16b1e30f213087a87cb8e7486fe2b401aad23297b088f9b9df7 SHA512 5861f9c1e774934b89f2d4ad70818a63e74d1693a643c38716abd473de926273e84c92c22c515b35cd24ace95b29b516aed1a1c97f1c7fb9111d2f67dc568246
 EBUILD hector_map_server-9999.ebuild 608 BLAKE2B 4dfaecce739d51f09f664ea6aab55d4e5b7c5af6f10ca5b715f430ac5de47427ce354808ff4632d660051450069680ffdf1bbbd02e8108ec1f6c12f4f2593d96 SHA512 38b0ccc36ba5eb4720a75fc580872221c13c786fed08a76ec234549b5369aee94ab44221b22084656bd30c7474b037f5c4770b50c25b28e1a6d5857ea8f9b2b4
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_map_server/hector_map_server-0.5.2.ebuild b/dev-ros/hector_map_server/hector_map_server-0.5.2.ebuild
new file mode 100644
index 000000000000..c3cd30cb4ede
--- /dev/null
+++ b/dev-ros/hector_map_server/hector_map_server-0.5.2.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/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Service for retrieving the map, as well as for raycasting based obstacle queries"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/hector_map_tools
+	dev-ros/hector_marker_drawing
+	dev-ros/tf
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/hector_map_tools/Manifest b/dev-ros/hector_map_tools/Manifest
index ae0e72da3b18..2b7b61c99afe 100644
--- a/dev-ros/hector_map_tools/Manifest
+++ b/dev-ros/hector_map_tools/Manifest
@@ -1,8 +1,10 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_map_tools-0.4.1.ebuild 454 BLAKE2B f988377cebb5870bda67ee924fce553976f1d8ed9e387e563e3d2d80b6860eacf176a08134cccf6c64af70db905e38b7941abf2ede5be5a5920f1fe366fce6d1 SHA512 96821180f2533ca08da654b7c371c53f69222fff9fdf35414e45d6070b105594d3fbedf6c1063ec24dafbb14065a5ce39bd3e0c0ec56d267adf8a3d3161b9f44
 EBUILD hector_map_tools-0.5.0.ebuild 454 BLAKE2B 625717054377d325d39ab7c7f3023470cbc82db925d748ac819b71698cfbe9be30a3e1e9ab03186cd42261a3b7a5a53aa60dbee4238c55df326f6d9e76755bd4 SHA512 a82c5e914939b8448f849e244733aea929d1ff55ecb1350bb6dd7101f866b9c5ae3094381eb1b06adec6180de35a3b3cb2f18eaff1bb885f3c5a0e91de767b85
 EBUILD hector_map_tools-0.5.1.ebuild 454 BLAKE2B 625717054377d325d39ab7c7f3023470cbc82db925d748ac819b71698cfbe9be30a3e1e9ab03186cd42261a3b7a5a53aa60dbee4238c55df326f6d9e76755bd4 SHA512 a82c5e914939b8448f849e244733aea929d1ff55ecb1350bb6dd7101f866b9c5ae3094381eb1b06adec6180de35a3b3cb2f18eaff1bb885f3c5a0e91de767b85
+EBUILD hector_map_tools-0.5.2.ebuild 454 BLAKE2B 625717054377d325d39ab7c7f3023470cbc82db925d748ac819b71698cfbe9be30a3e1e9ab03186cd42261a3b7a5a53aa60dbee4238c55df326f6d9e76755bd4 SHA512 a82c5e914939b8448f849e244733aea929d1ff55ecb1350bb6dd7101f866b9c5ae3094381eb1b06adec6180de35a3b3cb2f18eaff1bb885f3c5a0e91de767b85
 EBUILD hector_map_tools-9999.ebuild 454 BLAKE2B f988377cebb5870bda67ee924fce553976f1d8ed9e387e563e3d2d80b6860eacf176a08134cccf6c64af70db905e38b7941abf2ede5be5a5920f1fe366fce6d1 SHA512 96821180f2533ca08da654b7c371c53f69222fff9fdf35414e45d6070b105594d3fbedf6c1063ec24dafbb14065a5ce39bd3e0c0ec56d267adf8a3d3161b9f44
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_map_tools/hector_map_tools-0.5.2.ebuild b/dev-ros/hector_map_tools/hector_map_tools-0.5.2.ebuild
new file mode 100644
index 000000000000..85ada002eff2
--- /dev/null
+++ b/dev-ros/hector_map_tools/hector_map_tools-0.5.2.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/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Functions related to accessing information from OccupancyGridMap maps"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3
+"
diff --git a/dev-ros/hector_mapping/Manifest b/dev-ros/hector_mapping/Manifest
index d7bf758af933..76d1828ff4a3 100644
--- a/dev-ros/hector_mapping/Manifest
+++ b/dev-ros/hector_mapping/Manifest
@@ -1,8 +1,10 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_mapping-0.4.1-r1.ebuild 648 BLAKE2B 9fdd9615a1a25d83d02d7ae441eac222526c48e2b5a4563216a49233033207fb0a11037eae2c398d731183bc2f229bcee43fdcff92ea1d1d00bfcc52831a89dc SHA512 7c68f83d7aa3ff2b3ec24c3e30cd3a88a513a78767dbc6e1ec72ee31b7cd6e8213f284ee47e051d799801396063053063b481cc55d05ea2465be05a2bbbbe936
 EBUILD hector_mapping-0.5.0-r1.ebuild 648 BLAKE2B 9fdd9615a1a25d83d02d7ae441eac222526c48e2b5a4563216a49233033207fb0a11037eae2c398d731183bc2f229bcee43fdcff92ea1d1d00bfcc52831a89dc SHA512 7c68f83d7aa3ff2b3ec24c3e30cd3a88a513a78767dbc6e1ec72ee31b7cd6e8213f284ee47e051d799801396063053063b481cc55d05ea2465be05a2bbbbe936
 EBUILD hector_mapping-0.5.1-r1.ebuild 648 BLAKE2B 9fdd9615a1a25d83d02d7ae441eac222526c48e2b5a4563216a49233033207fb0a11037eae2c398d731183bc2f229bcee43fdcff92ea1d1d00bfcc52831a89dc SHA512 7c68f83d7aa3ff2b3ec24c3e30cd3a88a513a78767dbc6e1ec72ee31b7cd6e8213f284ee47e051d799801396063053063b481cc55d05ea2465be05a2bbbbe936
+EBUILD hector_mapping-0.5.2.ebuild 648 BLAKE2B 9fdd9615a1a25d83d02d7ae441eac222526c48e2b5a4563216a49233033207fb0a11037eae2c398d731183bc2f229bcee43fdcff92ea1d1d00bfcc52831a89dc SHA512 7c68f83d7aa3ff2b3ec24c3e30cd3a88a513a78767dbc6e1ec72ee31b7cd6e8213f284ee47e051d799801396063053063b481cc55d05ea2465be05a2bbbbe936
 EBUILD hector_mapping-9999.ebuild 648 BLAKE2B 9fdd9615a1a25d83d02d7ae441eac222526c48e2b5a4563216a49233033207fb0a11037eae2c398d731183bc2f229bcee43fdcff92ea1d1d00bfcc52831a89dc SHA512 7c68f83d7aa3ff2b3ec24c3e30cd3a88a513a78767dbc6e1ec72ee31b7cd6e8213f284ee47e051d799801396063053063b481cc55d05ea2465be05a2bbbbe936
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_mapping/hector_mapping-0.5.2.ebuild b/dev-ros/hector_mapping/hector_mapping-0.5.2.ebuild
new file mode 100644
index 000000000000..f3266ab2140e
--- /dev/null
+++ b/dev-ros/hector_mapping/hector_mapping-0.5.2.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/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/visualization_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="SLAM that can be used without odometry and on platforms that exhibit roll/pitch"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/message_filters
+	dev-ros/laser_geometry
+	dev-ros/tf_conversions
+	dev-libs/boost:=[threads(+)]
+"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_marker_drawing/Manifest b/dev-ros/hector_marker_drawing/Manifest
index 339dac25ff56..0db0b1157dbf 100644
--- a/dev-ros/hector_marker_drawing/Manifest
+++ b/dev-ros/hector_marker_drawing/Manifest
@@ -1,8 +1,10 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_marker_drawing-0.4.1.ebuild 479 BLAKE2B 3641cecc731f6febb3d0ca4bc5ae00a766f3f81b409aba8071cf0c3efb75e950cea35a92993e553eebc928570866fbd6a4c7857369ec3380020519e939bd002b SHA512 e5cfe9dc3e4ee8a2014f297558da44aa894dfd3bef625dde73177093402bee90d83750f80216ca758aebdce0adebaf726d9cbafb98d3eeee0b049e9a7732efa9
 EBUILD hector_marker_drawing-0.5.0.ebuild 479 BLAKE2B e0f047bd9e77c0d7bbb88edba6ba67da9e663bd30da649ddfbfe43c73c0d46a0da880a98c185301dc22e44a98232806367c64ba20da641dd54c24440c897418a SHA512 3523bea52c2b61ef7f8b6bdb622f7e04bcd3364575877ca91eed533b05cbaaf6e004f735e732628e7756ce5ee1aede1f733d2895efee53593c37390b67216416
 EBUILD hector_marker_drawing-0.5.1.ebuild 479 BLAKE2B e0f047bd9e77c0d7bbb88edba6ba67da9e663bd30da649ddfbfe43c73c0d46a0da880a98c185301dc22e44a98232806367c64ba20da641dd54c24440c897418a SHA512 3523bea52c2b61ef7f8b6bdb622f7e04bcd3364575877ca91eed533b05cbaaf6e004f735e732628e7756ce5ee1aede1f733d2895efee53593c37390b67216416
+EBUILD hector_marker_drawing-0.5.2.ebuild 479 BLAKE2B e0f047bd9e77c0d7bbb88edba6ba67da9e663bd30da649ddfbfe43c73c0d46a0da880a98c185301dc22e44a98232806367c64ba20da641dd54c24440c897418a SHA512 3523bea52c2b61ef7f8b6bdb622f7e04bcd3364575877ca91eed533b05cbaaf6e004f735e732628e7756ce5ee1aede1f733d2895efee53593c37390b67216416
 EBUILD hector_marker_drawing-9999.ebuild 479 BLAKE2B 3641cecc731f6febb3d0ca4bc5ae00a766f3f81b409aba8071cf0c3efb75e950cea35a92993e553eebc928570866fbd6a4c7857369ec3380020519e939bd002b SHA512 e5cfe9dc3e4ee8a2014f297558da44aa894dfd3bef625dde73177093402bee90d83750f80216ca758aebdce0adebaf726d9cbafb98d3eeee0b049e9a7732efa9
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.5.2.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.5.2.ebuild
new file mode 100644
index 000000000000..693076a81b34
--- /dev/null
+++ b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.5.2.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/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Convenience functions for easier publishing of visualization markers"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+"
+DEPEND="${RDEPEND}
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_nav_msgs/Manifest b/dev-ros/hector_nav_msgs/Manifest
index 9cd84bcf9808..a7f4e2b5c5c5 100644
--- a/dev-ros/hector_nav_msgs/Manifest
+++ b/dev-ros/hector_nav_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_nav_msgs-0.5.1.ebuild 483 BLAKE2B 8c8677bd9f062ac3b2a1cfb8ee1e39b116e6e8705854d65cd1a7fd097a71058a4b202c6e11d2f9397c7172e34f08ef7fe3858df23f3e41b05d7da44cc47749e9 SHA512 1e28ec392c967794b94b7a7d76fe7d91f6240536571e11726fa69d057825ecad70a7a4c8c5b17538b8d5e80c1791f3fc4a48fb19e120882b29ffdc01cdb1210e
+EBUILD hector_nav_msgs-0.5.2.ebuild 483 BLAKE2B 8c8677bd9f062ac3b2a1cfb8ee1e39b116e6e8705854d65cd1a7fd097a71058a4b202c6e11d2f9397c7172e34f08ef7fe3858df23f3e41b05d7da44cc47749e9 SHA512 1e28ec392c967794b94b7a7d76fe7d91f6240536571e11726fa69d057825ecad70a7a4c8c5b17538b8d5e80c1791f3fc4a48fb19e120882b29ffdc01cdb1210e
 EBUILD hector_nav_msgs-9999.ebuild 483 BLAKE2B 8c8677bd9f062ac3b2a1cfb8ee1e39b116e6e8705854d65cd1a7fd097a71058a4b202c6e11d2f9397c7172e34f08ef7fe3858df23f3e41b05d7da44cc47749e9 SHA512 1e28ec392c967794b94b7a7d76fe7d91f6240536571e11726fa69d057825ecad70a7a4c8c5b17538b8d5e80c1791f3fc4a48fb19e120882b29ffdc01cdb1210e
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_nav_msgs/hector_nav_msgs-0.5.2.ebuild b/dev-ros/hector_nav_msgs/hector_nav_msgs-0.5.2.ebuild
new file mode 100644
index 000000000000..44844ddc3e42
--- /dev/null
+++ b/dev-ros/hector_nav_msgs/hector_nav_msgs-0.5.2.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/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/geometry_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages and services used in the hector_slam stack"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_slam_launch/Manifest b/dev-ros/hector_slam_launch/Manifest
index 023fffe55981..f25906ae6322 100644
--- a/dev-ros/hector_slam_launch/Manifest
+++ b/dev-ros/hector_slam_launch/Manifest
@@ -1,4 +1,6 @@
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_slam_launch-0.5.1.ebuild 519 BLAKE2B 856ffe79ddd20a5f0615bb9bd3c41472cecf848ee2fb50170b77aeb4f949dcda7a24e34733e6eeb407f9a4824f4e96422f488998785cd8f181b13da499c76709 SHA512 aebddccbb45ffe300f449718a1515eb21324fef3a12a5b67ae969b5a25e0a0dc191a780b3daa6fe24bc7de0204f6f90b1b344f9f6d07cc562cbabffbc1dc50de
+EBUILD hector_slam_launch-0.5.2.ebuild 519 BLAKE2B 856ffe79ddd20a5f0615bb9bd3c41472cecf848ee2fb50170b77aeb4f949dcda7a24e34733e6eeb407f9a4824f4e96422f488998785cd8f181b13da499c76709 SHA512 aebddccbb45ffe300f449718a1515eb21324fef3a12a5b67ae969b5a25e0a0dc191a780b3daa6fe24bc7de0204f6f90b1b344f9f6d07cc562cbabffbc1dc50de
 EBUILD hector_slam_launch-9999.ebuild 519 BLAKE2B 53190caf679c2f36115cb1c74a21ec8d8c967797d708071d14442f60e86fc9ef74d1e091da8f532a79b9f0b6f2763ec2caf7e77b359f4b5ffd1b7400ff3c17b5 SHA512 c718a7784284dc5de1b80f9c3f5ff7813f13fb473beb4defb739a31bd88ebf82b7dd4a095cb78cc2f6186ee8eaae61f0739034579ddef903a38dfb6b96f94720
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_slam_launch/hector_slam_launch-0.5.2.ebuild b/dev-ros/hector_slam_launch/hector_slam_launch-0.5.2.ebuild
new file mode 100644
index 000000000000..aaf43b374170
--- /dev/null
+++ b/dev-ros/hector_slam_launch/hector_slam_launch-0.5.2.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/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files for launching hector_slam with different robot scenarios"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	dev-ros/hector_mapping
+	dev-ros/hector_map_server
+	dev-ros/hector_trajectory_server
+	dev-ros/hector_geotiff
+	dev-ros/hector_geotiff_plugins
+"
diff --git a/dev-ros/hector_trajectory_server/Manifest b/dev-ros/hector_trajectory_server/Manifest
index a45478c3c5df..318ec12f1314 100644
--- a/dev-ros/hector_trajectory_server/Manifest
+++ b/dev-ros/hector_trajectory_server/Manifest
@@ -1,8 +1,10 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_trajectory_server-0.4.1.ebuild 558 BLAKE2B 55da0649badf7ecc0a20d71ae38aedea7e75ea85d89058e637afa9321f121f8375e96c40a6dae2a7602163c4feec91b95228c20e97270463946214f81bd037b5 SHA512 ded21b655ef93b8793c48e9d36fdc4a07499a4e47105c49e65e2b8df07568ef0145d1e2623b54f49152aa37f5be20ff2529ae47bc84f7ba3d91fc14437a490c8
 EBUILD hector_trajectory_server-0.5.0.ebuild 558 BLAKE2B b71f5a989550f8fc6d88f525564cec0d8c4c41bb5d935f02f2d5ec0e0d5b4b424851e43d13a49cd730c30633ba9349e76fdfdbc94b07da4916bff414d962f0fa SHA512 2ac81db7df2c2861e8811f185d7742766be4a104d321784fda100fd16169f80f37d2cc1b93d3908e0eeab767853101f05f539e9965f68adea86591789648271e
 EBUILD hector_trajectory_server-0.5.1.ebuild 558 BLAKE2B b71f5a989550f8fc6d88f525564cec0d8c4c41bb5d935f02f2d5ec0e0d5b4b424851e43d13a49cd730c30633ba9349e76fdfdbc94b07da4916bff414d962f0fa SHA512 2ac81db7df2c2861e8811f185d7742766be4a104d321784fda100fd16169f80f37d2cc1b93d3908e0eeab767853101f05f539e9965f68adea86591789648271e
+EBUILD hector_trajectory_server-0.5.2.ebuild 558 BLAKE2B b71f5a989550f8fc6d88f525564cec0d8c4c41bb5d935f02f2d5ec0e0d5b4b424851e43d13a49cd730c30633ba9349e76fdfdbc94b07da4916bff414d962f0fa SHA512 2ac81db7df2c2861e8811f185d7742766be4a104d321784fda100fd16169f80f37d2cc1b93d3908e0eeab767853101f05f539e9965f68adea86591789648271e
 EBUILD hector_trajectory_server-9999.ebuild 558 BLAKE2B 55da0649badf7ecc0a20d71ae38aedea7e75ea85d89058e637afa9321f121f8375e96c40a6dae2a7602163c4feec91b95228c20e97270463946214f81bd037b5 SHA512 ded21b655ef93b8793c48e9d36fdc4a07499a4e47105c49e65e2b8df07568ef0145d1e2623b54f49152aa37f5be20ff2529ae47bc84f7ba3d91fc14437a490c8
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.5.2.ebuild b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.5.2.ebuild
new file mode 100644
index 000000000000..0a7151550c78
--- /dev/null
+++ b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.5.2.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_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Keeps track of tf trajectories and makes this data accessible"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/hector_map_tools
+	dev-ros/tf
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/image_cb_detector/Manifest b/dev-ros/image_cb_detector/Manifest
index c6c2b6c8b55f..67acad4e901d 100644
--- a/dev-ros/image_cb_detector/Manifest
+++ b/dev-ros/image_cb_detector/Manifest
@@ -1,7 +1,7 @@
-AUX boost170.patch 551 BLAKE2B c98a11a8faa4c22d78e991bfa911b13bcf66fe3b8b8be2efce6ba723eb1a2226de9d73186c05073bf6b12f360a160f9fe00fe24f8c9e71120abbc58252d02a6b SHA512 e75225d990f7c56522b244f95bf812df565394a3a586b4d71032fb164ae77f351f43ed27af29aa4aed0f40e4ec613600f16a10281f47223b5cf65b2860df7777
 AUX c11.patch 587 BLAKE2B 2cf07b3b5eebf9840bd45aa419283cc53e03dc45c5cf4eab6cd5894143983c7cb05146c9242c91ac105c90bba8d878ff8da4776629f04fc3f32b5290aa59fd87 SHA512 1ae09e987fb231400594019832f8a6d42ca1ebd07eafaca151d08812d8a4b62f95d4fadac0227c96d115c69da24bc3889f7d30af27000347ee000a937ae2b498
 AUX gcc6.patch 495 BLAKE2B 50ac60a74148e3e32b2a69750cad6d98ce2ecef22ed4462431821075f6e247290e28b8d57b58b4b86a7cb9600988a8e22ea2aa5508da6dd6ac85a93aac197ad1 SHA512 5b99edada624eabd4830997677ebb4916c6a9a3c631eead6ae723985e3ce5a0f3b77c484777182a34e727dba869181d11002ba38cfb49cf20eb0832aca67f6bb
-DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD image_cb_detector-0.10.14-r2.ebuild 978 BLAKE2B af4bab5f3112e05db7a08a986c45f0452d0d6b664951e41d30f9caffce2009bd252269fb3fcb27011b086e63e83cfc5f5728b617d5c6cfa5ae069f502f6035fb SHA512 18d98b0ed798270184200e4cb351da57de993256e366960a7d87dd5616241f5fcc63e29ff0e0bd83014c33fdc85d29ed3673006a5b1f449ade8301cb11b41e6e
-EBUILD image_cb_detector-9999.ebuild 978 BLAKE2B af4bab5f3112e05db7a08a986c45f0452d0d6b664951e41d30f9caffce2009bd252269fb3fcb27011b086e63e83cfc5f5728b617d5c6cfa5ae069f502f6035fb SHA512 18d98b0ed798270184200e4cb351da57de993256e366960a7d87dd5616241f5fcc63e29ff0e0bd83014c33fdc85d29ed3673006a5b1f449ade8301cb11b41e6e
+AUX py3.patch 747 BLAKE2B 73764cc8fbf4d8bd418a1c632a2b24bd5c1a80c7de94f5e06fb8d8ad30fb62947d7a349a3deb717669ced272c7c88edf5b5aa48ad3101e1ec67c5747cb099bec SHA512 d4009bc0fd12c597356351cb12d0bf95c963c41b9fe339dcd24c0230c21fe2d0b1a17f1de389eed13fc99ac950eeb8446170199c166067f2c7bcfd2daabb34e2
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
+EBUILD image_cb_detector-0.10.15-r1.ebuild 973 BLAKE2B ab907c667d6362cbb1c7f94ed5779e45be611c142eb57ae8982bbb3975c90d549968bbea79c6895e41bb79eef28632f388b439ff171ed0c189589322f75ea215 SHA512 d92b9468016376bc8f1583390ce5e133946f0b9a9b819a3269915f40618578c3d86c45c60099cdebedc6061945c1dd48ae11f6488fc6d7624655c0c8fcc91902
+EBUILD image_cb_detector-9999.ebuild 973 BLAKE2B ab907c667d6362cbb1c7f94ed5779e45be611c142eb57ae8982bbb3975c90d549968bbea79c6895e41bb79eef28632f388b439ff171ed0c189589322f75ea215 SHA512 d92b9468016376bc8f1583390ce5e133946f0b9a9b819a3269915f40618578c3d86c45c60099cdebedc6061945c1dd48ae11f6488fc6d7624655c0c8fcc91902
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/image_cb_detector/files/boost170.patch b/dev-ros/image_cb_detector/files/boost170.patch
deleted file mode 100644
index f8ae562dadc5..000000000000
--- a/dev-ros/image_cb_detector/files/boost170.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: image_cb_detector/CMakeLists.txt
-===================================================================
---- image_cb_detector.orig/CMakeLists.txt
-+++ image_cb_detector/CMakeLists.txt
-@@ -1,7 +1,7 @@
- cmake_minimum_required(VERSION 2.8.3)
- project(image_cb_detector)
- 
--find_package(Boost REQUIRED thread signals)
-+find_package(Boost REQUIRED thread)
- find_package(catkin REQUIRED actionlib actionlib_msgs calibration_msgs cv_bridge genmsg geometry_msgs image_transport message_filters roscpp sensor_msgs std_msgs)
- find_package(OpenCV REQUIRED)
- 
diff --git a/dev-ros/image_cb_detector/files/py3.patch b/dev-ros/image_cb_detector/files/py3.patch
new file mode 100644
index 000000000000..54475afd66dc
--- /dev/null
+++ b/dev-ros/image_cb_detector/files/py3.patch
@@ -0,0 +1,22 @@
+Index: image_cb_detector/src/image_cb_detector/cb_detector.py
+===================================================================
+--- image_cb_detector.orig/src/image_cb_detector/cb_detector.py
++++ image_cb_detector/src/image_cb_detector/cb_detector.py
+@@ -39,7 +39,7 @@ NAME = 'image_cb_detector_node'
+ import roslib; roslib.load_manifest(PKG)
+ 
+ import rospy
+-import cv
++import cv2 as cv
+ import math
+ 
+ from sensor_msgs.msg import Image
+@@ -130,7 +130,7 @@ class ImageCbDetectorNode:
+     #we need to convert the ros image to an opencv image
+     try:
+       image = self.bridge.imgmsg_to_cv(ros_image, "mono8")
+-    except CvBridgeError, e:
++    except CvBridgeError as e:
+       rospy.logerror("Error importing image %s" % e)
+       return
+ 
diff --git a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r2.ebuild b/dev-ros/image_cb_detector/image_cb_detector-0.10.15-r1.ebuild
index 505371176272..3cb98fba9da3 100644
--- a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r2.ebuild
+++ b/dev-ros/image_cb_detector/image_cb_detector-0.10.15-r1.ebuild
@@ -30,4 +30,4 @@ DEPEND="${RDEPEND}
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/boost170.patch" )
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild b/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
index 505371176272..3cb98fba9da3 100644
--- a/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
+++ b/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
@@ -30,4 +30,4 @@ DEPEND="${RDEPEND}
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/boost170.patch" )
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/imu_complementary_filter/Manifest b/dev-ros/imu_complementary_filter/Manifest
index 62ae38a84fe4..85584e19f2d0 100644
--- a/dev-ros/imu_complementary_filter/Manifest
+++ b/dev-ros/imu_complementary_filter/Manifest
@@ -1,4 +1,6 @@
 DIST imu_tools-1.2.2.tar.gz 1654829 BLAKE2B 1cd0ce321f6a9012146da07fc7f24425c1e68a8144b1ec3e5fefda316d07c3bc579f63f14adc4b86fc4f3975ad2d5c575ecfb2ae729d54ae3876a2ce2aa9d7f3 SHA512 d4b746acdf39e5137f54de9ac27f338bf89cd4102af5407ae0b6bb45c830b6a7da9250570000a7ed140187659d93934e5ecc3f2b1722f686a5cc8cbd52e986be
+DIST imu_tools-1.2.3.tar.gz 1656874 BLAKE2B d11a3d706ddd1eaae7562ca55ed25ade02dc79456ef8f99aa772e4dc6c6d38684d47175b3ffca3ca69e89aff1f02353379d2debfd53a03aa9a1eadd216a9dfe4 SHA512 b3c652836c049e096113ac075790ecb03fd8867b5702f83e52e5b97e41b1fecb448835ab9c8846b24104387e9148a1678c4d0b294885bc2472e8694dd090ba82
 EBUILD imu_complementary_filter-1.2.2.ebuild 587 BLAKE2B be25bfb649264fa13df02cb8a1b8a9711fba65c8c4ce8e6cc24cf7463f70860adf064508c5bfe1fbed6267c1708a8b5d093654ab679f93c41f1b6820d0657b0b SHA512 bee1c188cd555a4ac68c4edfb9665b19214bfc06d122cb51e1e2fd41d4fc27bc7c1977ab6b2be35653da842031a5bed1f7a14790bdc5031db564931bb27c696b
+EBUILD imu_complementary_filter-1.2.3.ebuild 587 BLAKE2B d0a18dee8ebd6a76e2402ec699ca2c57664720a0302dd3adb26d511075970046779908bac84a166f1cc444605c7d4e2e864101fc3d30b7d366a90c3bc8bbc422 SHA512 05fda7f83baeca40d3f21f7d0c8f9203782605ac0bac202e26323bf1b02f26aaec41fc3a1390e12718d89b24d0e6131b54567d1907c5dc8dd42e813b5761b1ce
 EBUILD imu_complementary_filter-9999.ebuild 587 BLAKE2B be25bfb649264fa13df02cb8a1b8a9711fba65c8c4ce8e6cc24cf7463f70860adf064508c5bfe1fbed6267c1708a8b5d093654ab679f93c41f1b6820d0657b0b SHA512 bee1c188cd555a4ac68c4edfb9665b19214bfc06d122cb51e1e2fd41d4fc27bc7c1977ab6b2be35653da842031a5bed1f7a14790bdc5031db564931bb27c696b
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.3.ebuild b/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.3.ebuild
new file mode 100644
index 000000000000..6d1597fea89e
--- /dev/null
+++ b/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.3.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/ccny-ros-pkg/imu_tools"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Fuses angular velocities, accelerations, and magnetic readings from an IMU"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/message_filters
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+BDEPEND="
+	dev-ros/cmake_modules
+"
diff --git a/dev-ros/imu_filter_madgwick/Manifest b/dev-ros/imu_filter_madgwick/Manifest
index 017253bbaddf..956c3e9e211d 100644
--- a/dev-ros/imu_filter_madgwick/Manifest
+++ b/dev-ros/imu_filter_madgwick/Manifest
@@ -1,4 +1,6 @@
 DIST imu_tools-1.2.2.tar.gz 1654829 BLAKE2B 1cd0ce321f6a9012146da07fc7f24425c1e68a8144b1ec3e5fefda316d07c3bc579f63f14adc4b86fc4f3975ad2d5c575ecfb2ae729d54ae3876a2ce2aa9d7f3 SHA512 d4b746acdf39e5137f54de9ac27f338bf89cd4102af5407ae0b6bb45c830b6a7da9250570000a7ed140187659d93934e5ecc3f2b1722f686a5cc8cbd52e986be
+DIST imu_tools-1.2.3.tar.gz 1656874 BLAKE2B d11a3d706ddd1eaae7562ca55ed25ade02dc79456ef8f99aa772e4dc6c6d38684d47175b3ffca3ca69e89aff1f02353379d2debfd53a03aa9a1eadd216a9dfe4 SHA512 b3c652836c049e096113ac075790ecb03fd8867b5702f83e52e5b97e41b1fecb448835ab9c8846b24104387e9148a1678c4d0b294885bc2472e8694dd090ba82
 EBUILD imu_filter_madgwick-1.2.2-r2.ebuild 779 BLAKE2B 25cc5ad6c562ec09fafd6d67682f64e35fbb056b737897d3907d356b4f86f621b046228510cea4c3e56f1a424c29bbfe4f6cbb11ebd45a9c98ea2ef63659b59a SHA512 6013ebfb4c8069db28619969ebc9cf5bd94896c6c47784ac236e31ad9f7ed3a6933cd6d4c0992350890703e9254ec32a6a1275987c608b69c3b86fc8a81ec7cb
+EBUILD imu_filter_madgwick-1.2.3.ebuild 779 BLAKE2B 25cc5ad6c562ec09fafd6d67682f64e35fbb056b737897d3907d356b4f86f621b046228510cea4c3e56f1a424c29bbfe4f6cbb11ebd45a9c98ea2ef63659b59a SHA512 6013ebfb4c8069db28619969ebc9cf5bd94896c6c47784ac236e31ad9f7ed3a6933cd6d4c0992350890703e9254ec32a6a1275987c608b69c3b86fc8a81ec7cb
 EBUILD imu_filter_madgwick-9999.ebuild 779 BLAKE2B 25cc5ad6c562ec09fafd6d67682f64e35fbb056b737897d3907d356b4f86f621b046228510cea4c3e56f1a424c29bbfe4f6cbb11ebd45a9c98ea2ef63659b59a SHA512 6013ebfb4c8069db28619969ebc9cf5bd94896c6c47784ac236e31ad9f7ed3a6933cd6d4c0992350890703e9254ec32a6a1275987c608b69c3b86fc8a81ec7cb
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.3.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.3.ebuild
new file mode 100644
index 000000000000..9c8ff8ebace4
--- /dev/null
+++ b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.3.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/ccny-ros-pkg/imu_tools"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Fuses angular velocities, accelerations, and magnetic readings from an IMU"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf2
+	dev-ros/tf2_geometry_msgs
+	dev-ros/tf2_ros
+	dev-ros/nodelet
+	dev-libs/console_bridge:=
+	dev-ros/pluginlib
+	dev-ros/message_filters
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
+	dev-libs/boost:=[threads(+)]
+"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rosunit
+		dev-cpp/gtest
+	)
+"
diff --git a/dev-ros/interval_intersection/Manifest b/dev-ros/interval_intersection/Manifest
index c1bad0344681..261e0e473b49 100644
--- a/dev-ros/interval_intersection/Manifest
+++ b/dev-ros/interval_intersection/Manifest
@@ -1,4 +1,6 @@
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
 EBUILD interval_intersection-0.10.14-r1.ebuild 706 BLAKE2B 1bd3d95736cea60b8971ba06d5c05b30de0e39afd58d56d5ae8beac93f8dfa7d30801fee5adad585c96e5f6365dc81172f11a93743ccbd428b139a786af96f5c SHA512 09615189a77667409d10e69b19859e9367dfc75322294a71c56cfe56dfeed651e460b78e31238d5755a7b745fe147c973ec63f08107a9ef8af2768e6c4e7f4c4
+EBUILD interval_intersection-0.10.15.ebuild 706 BLAKE2B 1bd3d95736cea60b8971ba06d5c05b30de0e39afd58d56d5ae8beac93f8dfa7d30801fee5adad585c96e5f6365dc81172f11a93743ccbd428b139a786af96f5c SHA512 09615189a77667409d10e69b19859e9367dfc75322294a71c56cfe56dfeed651e460b78e31238d5755a7b745fe147c973ec63f08107a9ef8af2768e6c4e7f4c4
 EBUILD interval_intersection-9999.ebuild 706 BLAKE2B 1bd3d95736cea60b8971ba06d5c05b30de0e39afd58d56d5ae8beac93f8dfa7d30801fee5adad585c96e5f6365dc81172f11a93743ccbd428b139a786af96f5c SHA512 09615189a77667409d10e69b19859e9367dfc75322294a71c56cfe56dfeed651e460b78e31238d5755a7b745fe147c973ec63f08107a9ef8af2768e6c4e7f4c4
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/interval_intersection/interval_intersection-0.10.15.ebuild b/dev-ros/interval_intersection/interval_intersection-0.10.15.ebuild
new file mode 100644
index 000000000000..3d821a2d187a
--- /dev/null
+++ b/dev-ros/interval_intersection/interval_intersection-0.10.15.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-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for calculating the intersection of interval messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads(+)]
+	dev-ros/actionlib
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/roscpp_serialization
+	dev-ros/rostime
+"
+DEPEND="${RDEPEND}
+	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/joint_limits_interface/Manifest b/dev-ros/joint_limits_interface/Manifest
index bd62937f1854..eb74c98c74ce 100644
--- a/dev-ros/joint_limits_interface/Manifest
+++ b/dev-ros/joint_limits_interface/Manifest
@@ -2,9 +2,11 @@ DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6
 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
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
 EBUILD joint_limits_interface-0.19.1.ebuild 548 BLAKE2B 82cb562202e8dafa222ce16731fdf3c710af5c26ef2b7ffb10dc65598da75fee4323c9b2c894dd1a3fcda796319b0607f3dc6d01cf3b087427872da98f50d91b SHA512 c6d37bfa6ac8ad51a4fc114e54558f30cb90c7390c876b6dd6c649c29e26e0d40d27f47ac6079a9f27abb7a0aa78322e35a69ac638631122886244eccaa5f944
 EBUILD joint_limits_interface-0.19.2.ebuild 548 BLAKE2B 82cb562202e8dafa222ce16731fdf3c710af5c26ef2b7ffb10dc65598da75fee4323c9b2c894dd1a3fcda796319b0607f3dc6d01cf3b087427872da98f50d91b SHA512 c6d37bfa6ac8ad51a4fc114e54558f30cb90c7390c876b6dd6c649c29e26e0d40d27f47ac6079a9f27abb7a0aa78322e35a69ac638631122886244eccaa5f944
 EBUILD joint_limits_interface-0.19.3.ebuild 548 BLAKE2B 82cb562202e8dafa222ce16731fdf3c710af5c26ef2b7ffb10dc65598da75fee4323c9b2c894dd1a3fcda796319b0607f3dc6d01cf3b087427872da98f50d91b SHA512 c6d37bfa6ac8ad51a4fc114e54558f30cb90c7390c876b6dd6c649c29e26e0d40d27f47ac6079a9f27abb7a0aa78322e35a69ac638631122886244eccaa5f944
 EBUILD joint_limits_interface-0.19.4.ebuild 548 BLAKE2B 590581b099ba0c3a93d8d2681a2bb63f0e1d1a648a4ae03eb34bb5ca3c167315e8b609a4d83cb7d2243715ea95fe7c53bdec11c65dd3fac70dd7512e8391569b SHA512 ea969f5ca1ce2a93b6961ea436318e3ef7af833ac7dafff4b6cdbc1d4d0227d386bfad5b11aa8ab1bbcc2ffc129a6f99a4e74b3bfb1eded44244e7e9edbc997f
+EBUILD joint_limits_interface-0.19.5.ebuild 548 BLAKE2B 590581b099ba0c3a93d8d2681a2bb63f0e1d1a648a4ae03eb34bb5ca3c167315e8b609a4d83cb7d2243715ea95fe7c53bdec11c65dd3fac70dd7512e8391569b SHA512 ea969f5ca1ce2a93b6961ea436318e3ef7af833ac7dafff4b6cdbc1d4d0227d386bfad5b11aa8ab1bbcc2ffc129a6f99a4e74b3bfb1eded44244e7e9edbc997f
 EBUILD joint_limits_interface-9999.ebuild 548 BLAKE2B 82cb562202e8dafa222ce16731fdf3c710af5c26ef2b7ffb10dc65598da75fee4323c9b2c894dd1a3fcda796319b0607f3dc6d01cf3b087427872da98f50d91b SHA512 c6d37bfa6ac8ad51a4fc114e54558f30cb90c7390c876b6dd6c649c29e26e0d40d27f47ac6079a9f27abb7a0aa78322e35a69ac638631122886244eccaa5f944
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.19.5.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.19.5.ebuild
new file mode 100644
index 000000000000..3d396fd3f3f1
--- /dev/null
+++ b/dev-ros/joint_limits_interface/joint_limits_interface-0.19.5.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-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Interface for enforcing joint limits"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/hardware_interface
+	dev-libs/urdfdom
+	dev-ros/urdf
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest dev-cpp/gtest )"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/joint_states_settler/Manifest b/dev-ros/joint_states_settler/Manifest
index f13b901416f3..25cb1ae2c806 100644
--- a/dev-ros/joint_states_settler/Manifest
+++ b/dev-ros/joint_states_settler/Manifest
@@ -1,5 +1,7 @@
 AUX gcc6.patch 459 BLAKE2B eadc7eb78eb79bff30535776516bed691354706192fe196107efd319b357f8b0c361bbd70492f37525137c78399954681e4ab8eaf48cfe71903785b5f889765a SHA512 dca02dec9e53395941bcb263d88b3a96ef1437315431d242ffcfa7768a2b0c4d5ec394db5c7e7d2dbe46750264adce5e7032caa207e912ec7dedbcad9c345519
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
 EBUILD joint_states_settler-0.10.14-r1.ebuild 690 BLAKE2B b2eed3848302174a0b603edf9807ded20c261d8e1d272f00bd959e586e8f8e07098032b876b26873109da10236d277b175d08ee4800a5c67d0b3d1d3dcd6dde8 SHA512 3d3b85004b5f7882a4d1c6c27322f5a8eeff840f0e92a70e64e981be4687c0117788c5d71313a927525fbed553c9ce7fed1d8b4b349e203a702b8b9929df295b
+EBUILD joint_states_settler-0.10.15.ebuild 690 BLAKE2B b2eed3848302174a0b603edf9807ded20c261d8e1d272f00bd959e586e8f8e07098032b876b26873109da10236d277b175d08ee4800a5c67d0b3d1d3dcd6dde8 SHA512 3d3b85004b5f7882a4d1c6c27322f5a8eeff840f0e92a70e64e981be4687c0117788c5d71313a927525fbed553c9ce7fed1d8b4b349e203a702b8b9929df295b
 EBUILD joint_states_settler-9999.ebuild 690 BLAKE2B b2eed3848302174a0b603edf9807ded20c261d8e1d272f00bd959e586e8f8e07098032b876b26873109da10236d277b175d08ee4800a5c67d0b3d1d3dcd6dde8 SHA512 3d3b85004b5f7882a4d1c6c27322f5a8eeff840f0e92a70e64e981be4687c0117788c5d71313a927525fbed553c9ce7fed1d8b4b349e203a702b8b9929df295b
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/joint_states_settler/joint_states_settler-0.10.15.ebuild b/dev-ros/joint_states_settler/joint_states_settler-0.10.15.ebuild
new file mode 100644
index 000000000000..287ce5956f88
--- /dev/null
+++ b/dev-ros/joint_states_settler/joint_states_settler-0.10.15.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-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Reports how long a subset of joints has been settled"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads(+)]
+	dev-ros/actionlib
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/roscpp_serialization
+	dev-ros/settlerlib
+"
+DEPEND="${RDEPEND}
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-cpp/gtest )"
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/laser_cb_detector/Manifest b/dev-ros/laser_cb_detector/Manifest
index 7e4df761d3f6..89dc269eaa12 100644
--- a/dev-ros/laser_cb_detector/Manifest
+++ b/dev-ros/laser_cb_detector/Manifest
@@ -1,8 +1,4 @@
-AUX boost170.patch 539 BLAKE2B 02288b4d5c3de5ef4290ce7ba4f8c46c95148ea2417c172f0ae90ec7604c7c08c3f8b9eebdbb4d9bf26f81011f996148db3fd0243b56ad77be7533282f9ecc0b SHA512 d2185960b22b9539f318c452e5bb95612e21156380183ed795142d87c9d1f8ca74c6bb08a2039138729767800cf6592b6bb64bf12db62166c8c3ee2176aec65d
-AUX gcc6.patch 461 BLAKE2B 2e745eb80783777fb510d763b1c3119e8fb89f2a7defd9a3a62ed902c9f9a5fcf973b032281049499aa7ea4b36569c5cba72ea89d74040580a8a06a2b99d2f5d SHA512 122b897b905cd9212f038887d23c6a4c9648bcdcf64231b400fcaff7aa7c3a4c731ede2d6d69d85949ca20905a3b166451bb4de7a9ad09b3ffc9b94eb2959702
-AUX ocv4-2.patch 1116 BLAKE2B 2de5c0aaf13b30ef81094fe70ca5634de8575817125e36217d3cf1944112b8944231dcef9b075990d113ec6e06b281a14d018328492693007a3ad581621d42ea SHA512 e1f93dcbd8b829bb0ad99d45295f13f4f791c9c92962aa39ef436b6b81b014fb52b022a231a942a28b266763e8374d80543c7c606a4cf7fecbc539930b630077
-AUX ocv4.patch 597 BLAKE2B 0b87de52c3a2fed94c32c47500a69f79d6d6861b5881d5ba357aeb9924be8356b204ceaf7ae9e14055048e7ddc6fb74751cadfd7a6e275b4115e793c5723f007 SHA512 711c26a8539facf376686e619c4a90cc77ae26480f3754edf5b04f0a14aaa861f14d58b19172e37fb4e501eb92883ff4173ae93d8ec5b31379eefb4a0fb2c1a1
-DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD laser_cb_detector-0.10.14-r1.ebuild 946 BLAKE2B ad5220e1d1888fe45724619cfd72cc886c104ef84cb230ed5803eb17ee9751bac0dc0b294b067b6fac321d97df9a2a8ee274dfed51b7deb768aace6839899850 SHA512 e70d4db4218d6b28e6aa026f88a9bc078577831ce5a19fb88728b63276affae0f9158a8c288dc0bc9f25df88152a280572503d1263076bd0de47fc539ab1d20d
-EBUILD laser_cb_detector-9999.ebuild 946 BLAKE2B ad5220e1d1888fe45724619cfd72cc886c104ef84cb230ed5803eb17ee9751bac0dc0b294b067b6fac321d97df9a2a8ee274dfed51b7deb768aace6839899850 SHA512 e70d4db4218d6b28e6aa026f88a9bc078577831ce5a19fb88728b63276affae0f9158a8c288dc0bc9f25df88152a280572503d1263076bd0de47fc539ab1d20d
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
+EBUILD laser_cb_detector-0.10.15.ebuild 828 BLAKE2B 632c1f262f1a40d3b369117e2a50a65f5d2b34d25b34dcd7ac446d43fe7fb10370eebcabd9f5098681b6fa27c8b5f185fbe814c4cdadf805590856edbb94f34e SHA512 602542e11685b5675a362ba2523f0987235d15a92f3538e7c0709ccc6d41f2534fce64ad3e96173ac3be6ca7fd0bd12401a70ebf5aafb857f5049379d33c779e
+EBUILD laser_cb_detector-9999.ebuild 828 BLAKE2B 632c1f262f1a40d3b369117e2a50a65f5d2b34d25b34dcd7ac446d43fe7fb10370eebcabd9f5098681b6fa27c8b5f185fbe814c4cdadf805590856edbb94f34e SHA512 602542e11685b5675a362ba2523f0987235d15a92f3538e7c0709ccc6d41f2534fce64ad3e96173ac3be6ca7fd0bd12401a70ebf5aafb857f5049379d33c779e
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/laser_cb_detector/files/boost170.patch b/dev-ros/laser_cb_detector/files/boost170.patch
deleted file mode 100644
index 019a948be95c..000000000000
--- a/dev-ros/laser_cb_detector/files/boost170.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: laser_cb_detector/CMakeLists.txt
-===================================================================
---- laser_cb_detector.orig/CMakeLists.txt
-+++ laser_cb_detector/CMakeLists.txt
-@@ -1,7 +1,7 @@
- cmake_minimum_required(VERSION 2.8.3)
- project(laser_cb_detector)
- 
--find_package(Boost REQUIRED signals thread)
-+find_package(Boost REQUIRED thread)
- find_package(catkin REQUIRED actionlib actionlib_msgs cv_bridge image_cb_detector message_filters roscpp settlerlib std_msgs)
- 
- add_action_files(DIRECTORY action FILES Config.action)
diff --git a/dev-ros/laser_cb_detector/files/gcc6.patch b/dev-ros/laser_cb_detector/files/gcc6.patch
deleted file mode 100644
index 6580ca5e8453..000000000000
--- a/dev-ros/laser_cb_detector/files/gcc6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: laser_cb_detector/CMakeLists.txt
-===================================================================
---- laser_cb_detector.orig/CMakeLists.txt
-+++ laser_cb_detector/CMakeLists.txt
-@@ -15,7 +15,7 @@ catkin_package(DEPENDS actionlib actionl
- )
- 
- find_package(OpenCV REQUIRED)
--include_directories(SYSTEM ${catkin_INCLUDE_DIRS}
-+include_directories(${catkin_INCLUDE_DIRS}
-                            ${OpenCV_INCLUDE_DIRS}
- )
- include_directories(include)
diff --git a/dev-ros/laser_cb_detector/files/ocv4-2.patch b/dev-ros/laser_cb_detector/files/ocv4-2.patch
deleted file mode 100644
index 3cc51c45d7dd..000000000000
--- a/dev-ros/laser_cb_detector/files/ocv4-2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: laser_cb_detector/test/laser_cb_detector_unittest.cpp
-===================================================================
---- laser_cb_detector.orig/test/laser_cb_detector_unittest.cpp
-+++ laser_cb_detector/test/laser_cb_detector_unittest.cpp
-@@ -37,7 +37,7 @@
- 
- #include <laser_cb_detector/ConfigGoal.h>
- #include <laser_cb_detector/laser_cb_detector.h>
--#include <opencv/highgui.h>
-+#include <opencv2/highgui.hpp>
- 
- using namespace laser_cb_detector;
- using namespace std;
-@@ -55,8 +55,9 @@ static const string test_path = xstr(TES
- 
- calibration_msgs::DenseLaserSnapshot getSnapshot(const string& filename)
- {
--  IplImage* image;
--  image = cvLoadImage(filename.c_str(), 0);         // 0 -> Force image to grayscale
-+  cv::Mat mat = cv::imread(filename.c_str(), 0);
-+  IplImage  image_v = cvIplImage(mat);
-+  IplImage* image = &image_v;
-   EXPECT_TRUE(image) << "could not open image file [" << filename << "]" << endl;
- 
- 
-@@ -92,7 +93,7 @@ calibration_msgs::DenseLaserSnapshot get
-   }
- 
-   cvReleaseImage(&float_image);
--  cvReleaseImage(&image);
-+  //cvReleaseImage(&image);
- 
-   return snapshot;
- }
diff --git a/dev-ros/laser_cb_detector/files/ocv4.patch b/dev-ros/laser_cb_detector/files/ocv4.patch
deleted file mode 100644
index 4bbb0005fda0..000000000000
--- a/dev-ros/laser_cb_detector/files/ocv4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: laser_cb_detector/include/laser_cb_detector/laser_cb_detector.h
-===================================================================
---- laser_cb_detector.orig/include/laser_cb_detector/laser_cb_detector.h
-+++ laser_cb_detector/include/laser_cb_detector/laser_cb_detector.h
-@@ -37,7 +37,7 @@
- #ifndef LASER_CB_DETECTOR_LASER_CB_DETECTOR_H_
- #define LASER_CB_DETECTOR_LASER_CB_DETECTOR_H_
- 
--#include <opencv/cv.h>
-+#include <opencv2/core/core_c.h>
- #include <calibration_msgs/DenseLaserSnapshot.h>
- #include <laser_cb_detector/ConfigAction.h>
- #include <laser_cb_detector/cv_laser_bridge.h>
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14-r1.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.15.ebuild
index 3f7c54d7040d..993633f2ddf1 100644
--- a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14-r1.ebuild
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.15.ebuild
@@ -33,4 +33,3 @@ DEPEND="${RDEPEND}
 		media-libs/opencv[png]
 	)
 "
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" "${FILESDIR}/ocv4-2.patch" )
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
index 3f7c54d7040d..993633f2ddf1 100644
--- a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
@@ -33,4 +33,3 @@ DEPEND="${RDEPEND}
 		media-libs/opencv[png]
 	)
 "
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" "${FILESDIR}/ocv4-2.patch" )
diff --git a/dev-ros/laser_filters/Manifest b/dev-ros/laser_filters/Manifest
index 032c774334a2..ca40c9b99032 100644
--- a/dev-ros/laser_filters/Manifest
+++ b/dev-ros/laser_filters/Manifest
@@ -1,5 +1,5 @@
 AUX eigen.patch 715 BLAKE2B dc12bfbb1eeba06624b70d0cab04a723288fd6740b66e8cba9d2e1108b050ab66efa361bc8a9f0455a338a228389d1b346401b77c94eec8b56dcfd51eabec2cc SHA512 f3cf4f9b2ddb8a6baff879e1eae5520c8db4da0b78b2d5af49b84cdde6b9a502cacb6eabfefb8ac36971ec1e86e673d8d0f7fca4e1c32d46001d2c693595dade
 DIST laser_filters-1.8.11.tar.gz 42303 BLAKE2B e5344b273ebe3f9ad75c32f15f15c69a241273def5b3a4b90e39b5a329f3d3a682f67e687c48da3d41c93db0fc94a39f31153ad23cbe1e4997139f57a4c34f75 SHA512 06833adfa96248e360f4bf1b267ddec6c9263296afe64eac3716014f53071ec8cedd8b73f93438d9072e3785843e2ba345f007036d680ba7f4fbd3b720f40b2e
-EBUILD laser_filters-1.8.11.ebuild 765 BLAKE2B c4208b0d5fcd0df3a66525007e8d33cd3c0bccccf61a29eeb6ee884e12f7b136ea16409f49155f67b84f6e7884e669b78463e23fa3706eb4b5642201bacdf177 SHA512 c55f5f9a74ef2c9384e0e95bba7d7fe72afd08165072270d94672f2a70545de9c826965e97daa87e9815589a88dcb56a6560899a4091c6f1b60bf6d3387fdaf4
-EBUILD laser_filters-9999.ebuild 765 BLAKE2B c4208b0d5fcd0df3a66525007e8d33cd3c0bccccf61a29eeb6ee884e12f7b136ea16409f49155f67b84f6e7884e669b78463e23fa3706eb4b5642201bacdf177 SHA512 c55f5f9a74ef2c9384e0e95bba7d7fe72afd08165072270d94672f2a70545de9c826965e97daa87e9815589a88dcb56a6560899a4091c6f1b60bf6d3387fdaf4
+EBUILD laser_filters-1.8.11.ebuild 790 BLAKE2B f87ec10f35ff25292877140b02ec92c0f0bb07460de6b9a7e9d8ec428c75e8e24c191c454e953a48760cb112e59c7fc1ee47d7539a33ca3e32f199ae0961b73e SHA512 d6f5c0bba524a4cfd1fe1eae580294fa43ddcbb7e14ed3a926144df930111e8413e8f08dfe2501c993ac11c46655094bff111abca7b81583f357df55d3b8fbda
+EBUILD laser_filters-9999.ebuild 790 BLAKE2B f87ec10f35ff25292877140b02ec92c0f0bb07460de6b9a7e9d8ec428c75e8e24c191c454e953a48760cb112e59c7fc1ee47d7539a33ca3e32f199ae0961b73e SHA512 d6f5c0bba524a4cfd1fe1eae580294fa43ddcbb7e14ed3a926144df930111e8413e8f08dfe2501c993ac11c46655094bff111abca7b81583f357df55d3b8fbda
 MISC metadata.xml 342 BLAKE2B 92f4937b0999d701af2eb4810e3d0d9d713fd0238fa57500e7bfdbfc1d602afdd51252b796c3a27c2eb8ea398330b04c3d1f78ca8f5c307bf5adfb4570c3db6b SHA512 4ab282060abc14838675f8d99f245894bec67f8e824191e666671bfc6134383c23853137cff023f59b81141aae204f282d3b40e779627c375609fc4223af8ec5
diff --git a/dev-ros/laser_filters/laser_filters-1.8.11.ebuild b/dev-ros/laser_filters/laser_filters-1.8.11.ebuild
index 6d0bb2a716e2..f673ce90a46a 100644
--- a/dev-ros/laser_filters/laser_filters-1.8.11.ebuild
+++ b/dev-ros/laser_filters/laser_filters-1.8.11.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
@@ -20,7 +20,7 @@ RDEPEND="
 	dev-ros/laser_geometry
 	dev-ros/pluginlib
 	dev-ros/angles
-	dev-ros/dynamic_reconfigure
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 
 	dev-libs/tinyxml2:=
 	dev-libs/console_bridge:=
diff --git a/dev-ros/laser_filters/laser_filters-9999.ebuild b/dev-ros/laser_filters/laser_filters-9999.ebuild
index 6d0bb2a716e2..f673ce90a46a 100644
--- a/dev-ros/laser_filters/laser_filters-9999.ebuild
+++ b/dev-ros/laser_filters/laser_filters-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
@@ -20,7 +20,7 @@ RDEPEND="
 	dev-ros/laser_geometry
 	dev-ros/pluginlib
 	dev-ros/angles
-	dev-ros/dynamic_reconfigure
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 
 	dev-libs/tinyxml2:=
 	dev-libs/console_bridge:=
diff --git a/dev-ros/laser_geometry/Manifest b/dev-ros/laser_geometry/Manifest
index ef716d6c5dc6..3e3b8c0daed7 100644
--- a/dev-ros/laser_geometry/Manifest
+++ b/dev-ros/laser_geometry/Manifest
@@ -1,4 +1,4 @@
-DIST laser_geometry-1.6.6.tar.gz 19050 BLAKE2B 852dc42b9ff3a6e262cac74441999de030f3cd35c0536859ebe253f270065a10a11f855299d81b1319949ff4ec775aa377d34894a1a889b4a0f9c0d8afe8eecf SHA512 4ffef2467c0bd6cfca6022308e97a766ab544705395d13863a1a5d924eda728a7473a58a57492db4ae8d503c0aef38d6747fefad8624a6f4b1b2b1e709919781
-EBUILD laser_geometry-1.6.6-r1.ebuild 917 BLAKE2B 9f2ed6850650978d16828ff2219032d3cb153014bd702d9dbd733704ae957298b31b213e1dbf2321e1beb80797afb57a5ba7ac8ca186328260395922029e5b8c SHA512 50463fda795f2bfadfc0617c1923b5ab2a55d7d63a75ad704f0ca47fb7f90cd783b5ff1aa127f94ad4f504081b749ec6c70d840dadd6e465da9d1303fd49a7c3
+DIST laser_geometry-1.6.7.tar.gz 19095 BLAKE2B 9ac9b1d24f26386e1e23e3ab75e1af18ae306670b5a86af2f547918327cd3fc9ec9140a3479c600ea799158617a9e4ce350f45f71db688aa2446edfaf04a5912 SHA512 7f6f887c3f8c4212adef90812fa877904e1e3fcf679df15cadca34a4ad451135be5086506eafee16682441c70df0d1c89fa90d2b365f5eed4f349ed741974c01
+EBUILD laser_geometry-1.6.7.ebuild 917 BLAKE2B 9f2ed6850650978d16828ff2219032d3cb153014bd702d9dbd733704ae957298b31b213e1dbf2321e1beb80797afb57a5ba7ac8ca186328260395922029e5b8c SHA512 50463fda795f2bfadfc0617c1923b5ab2a55d7d63a75ad704f0ca47fb7f90cd783b5ff1aa127f94ad4f504081b749ec6c70d840dadd6e465da9d1303fd49a7c3
 EBUILD laser_geometry-9999.ebuild 917 BLAKE2B 9f2ed6850650978d16828ff2219032d3cb153014bd702d9dbd733704ae957298b31b213e1dbf2321e1beb80797afb57a5ba7ac8ca186328260395922029e5b8c SHA512 50463fda795f2bfadfc0617c1923b5ab2a55d7d63a75ad704f0ca47fb7f90cd783b5ff1aa127f94ad4f504081b749ec6c70d840dadd6e465da9d1303fd49a7c3
 MISC metadata.xml 343 BLAKE2B a797ebc84630a2db52e772c1d06a4df97d824941660a1e3a1709ba0498c20bbd300e794ee550e47727bb6bfb1d836b08ec63729be7ae439696bfd1035e5ae707 SHA512 7d4f2ddb636794d8d0b493ea1ef5a06b2cfac3bb5fb18f6daf174f16d719d9ceea5eca29762596dca085c94d3e1ab7a49047a8410933505521f0dbceb8c50b9f
diff --git a/dev-ros/laser_geometry/laser_geometry-1.6.6-r1.ebuild b/dev-ros/laser_geometry/laser_geometry-1.6.7.ebuild
index e1b93a17bd7e..e1b93a17bd7e 100644
--- a/dev-ros/laser_geometry/laser_geometry-1.6.6-r1.ebuild
+++ b/dev-ros/laser_geometry/laser_geometry-1.6.7.ebuild
diff --git a/dev-ros/libmavconn/Manifest b/dev-ros/libmavconn/Manifest
index 3b1f4c7762c8..bc6eeff3e259 100644
--- a/dev-ros/libmavconn/Manifest
+++ b/dev-ros/libmavconn/Manifest
@@ -1,8 +1,10 @@
 DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
 DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
 DIST mavros-1.5.2.tar.gz 319006 BLAKE2B 7ae349460f6edd44c716776dacb1014248f2d03fe0aad0a79e832091311f6e553cea714588099e70f3e1b0d8f4ba6a415e7e2554d5a8dedaae537a1955037cb4 SHA512 67aed9c6ef55c486008e1ee7125367f4ec1a6536cc7f28548c3434617a8a7429dd56a4f17af7dbe4678a8499ef69b57d72d4453fd5a2e54d9600b945314d1316
+DIST mavros-1.8.0.tar.gz 330619 BLAKE2B 54b1e925148370a85dc0efdc53447a6443ff5b291e656514df8046ca60b8aa7658ca77dc7731718f5e818fbbcf4631067cb03371d85e8bab95a907ca857a85ee SHA512 e9a0a51480ca45112da98d51e16b2ccc2825acab8a34074ba456d7e760cb2fe6bfd9a37e33fc1dfc6c1b072865fd180aff8e7918788ded95c7776a465cda4da2
 EBUILD libmavconn-1.2.0.ebuild 454 BLAKE2B 2714c2f1b81848d481f64267b025275e129129e03d3f174e1043b7f45b6a1b25fdd3f33e8e4a0b3d1eed837a6ed6bb46b9a5cc82adc8c89d7bacc21039a025ca SHA512 2cbe5315f4c5591cb15d566f82b5b553ff40cb618560ee1f239b0229c4611440206d7631083f463e455e3446ad2d93a1da66c8a6f8414cc28a6c2c267512a79f
 EBUILD libmavconn-1.4.0.ebuild 454 BLAKE2B 2714c2f1b81848d481f64267b025275e129129e03d3f174e1043b7f45b6a1b25fdd3f33e8e4a0b3d1eed837a6ed6bb46b9a5cc82adc8c89d7bacc21039a025ca SHA512 2cbe5315f4c5591cb15d566f82b5b553ff40cb618560ee1f239b0229c4611440206d7631083f463e455e3446ad2d93a1da66c8a6f8414cc28a6c2c267512a79f
 EBUILD libmavconn-1.5.2.ebuild 454 BLAKE2B 271cc373da00c3224c4fe2cc1404ac7726ecbd24650dfea7535180ee38b76652bf85a23a23ac982a4b7ec5829a576e0476654b505f1ea2fc6c2762918fafc2f1 SHA512 f253d391930adf479b0bee734b185ef285dcf760e9c0f602779ff74b6f1a8f42e0800b2be634ed532d055b0eec402e64ead5f499a0341fe44b198ecd3c7aa1fb
+EBUILD libmavconn-1.8.0.ebuild 454 BLAKE2B 271cc373da00c3224c4fe2cc1404ac7726ecbd24650dfea7535180ee38b76652bf85a23a23ac982a4b7ec5829a576e0476654b505f1ea2fc6c2762918fafc2f1 SHA512 f253d391930adf479b0bee734b185ef285dcf760e9c0f602779ff74b6f1a8f42e0800b2be634ed532d055b0eec402e64ead5f499a0341fe44b198ecd3c7aa1fb
 EBUILD libmavconn-9999.ebuild 454 BLAKE2B 2714c2f1b81848d481f64267b025275e129129e03d3f174e1043b7f45b6a1b25fdd3f33e8e4a0b3d1eed837a6ed6bb46b9a5cc82adc8c89d7bacc21039a025ca SHA512 2cbe5315f4c5591cb15d566f82b5b553ff40cb618560ee1f239b0229c4611440206d7631083f463e455e3446ad2d93a1da66c8a6f8414cc28a6c2c267512a79f
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/libmavconn/libmavconn-1.8.0.ebuild b/dev-ros/libmavconn/libmavconn-1.8.0.ebuild
new file mode 100644
index 000000000000..8f7b83354449
--- /dev/null
+++ b/dev-ros/libmavconn/libmavconn-1.8.0.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/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink communication library"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/mavlink-gbp-release-2016.7.7
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
diff --git a/dev-ros/mavlink-gbp-release/Manifest b/dev-ros/mavlink-gbp-release/Manifest
index 50bcd816c0dc..15f605d333d1 100644
--- a/dev-ros/mavlink-gbp-release/Manifest
+++ b/dev-ros/mavlink-gbp-release/Manifest
@@ -1,6 +1,4 @@
 AUX gentoo.patch 708 BLAKE2B ad41a87474f0c542dcab2189e08f744c37ebc0a5993c9ca46633d3f02b3c13b002cd1b1644123694bd0bea756168d29d121eca9cd8071a548ae592f6e81431f1 SHA512 2ab7861c421e630a87924ae4b5f282493be043d1d0a53188ed6ec2938250ac4fb1e402072d4f10afc747271c94cad424bd84ca15d49d38e871b245b5068de698
-DIST mavlink-gbp-release-2020.9.10.tar.gz 4134330 BLAKE2B a8b2ad07ebf67bf19b37d6fefd6e41a5d6c95e9eaac413785943bd88e63f1a8acf4a4ea7d7ecd680e5ff306d46235a8cf0239af724d01d960c96cd8623818a22 SHA512 9c3429b16b0bcd364d89db3817cab76545f799407095cd6d7af5fff552aa4a4314645b6db517389bcdb511e009b4bfce5d62ae6b4aec7b0542bdc892cdf1ebb9
-DIST mavlink-gbp-release-2021.2.2.tar.gz 4266346 BLAKE2B 6f70c9ee4b4140f7478210ba8a31739316a89f890d1412e5d9480d83ca1a186a12855d9b33f254222aa5156333fc74dd5f00988ffe904fad96ef5eaccea6a793 SHA512 1e857093d91c154b0780c530f1ad741120cee31e9ba3373cc047644990e7d58b2b703716d39509c753c41cbaf95a9e330bbc15ed6c970af2ab4d6bbc66de23eb
-EBUILD mavlink-gbp-release-2020.9.10.ebuild 563 BLAKE2B 75b26d4d4d13d45a52cb31a6603a84679093b32b6161d3d03009ea8057a773edd0bcb18ec4d6d21681bf45d793e8d7f7bcff965f9d27829f258fa660e8cfae73 SHA512 36b7e697a6db198c8477a4997d51361c4d5fa3deb826907ab61239c373efdfe0249e0a5d3a1f4c17277e3ebfca739d7788dadf6ca93adb6a36ea9cc5397ceb9a
-EBUILD mavlink-gbp-release-2021.2.2.ebuild 563 BLAKE2B 56d0e10b830789364f5e12ba17baca70f520ec2b0e6cb753a53b081e40e2e726d74b7a62055416c69ba7f18cfe16dcbc6d8a104f82b96501467006754f757043 SHA512 aede556ebe20848f1c246acf61f7fcde3f58ee809b26c9304c9082142b7434962c3ab615bd1acacf1d2a315c491751b04c9f8a90e04dd1e99ea75f600ab267e8
+DIST mavlink-gbp-release-2021.7.7.tar.gz 4280663 BLAKE2B 36fe1f224178ec954866b07c470cebf50fb779eb004911092b24fc380492c6b89b5509fc3b823ab5b355a0957ab113ea4915c94d499667b1e27ee964867e1063 SHA512 b3e7b196ff0e58c3cccfd2ea21f8804732ffbf62bf0288f2c8e0f518e387629fb0260ce9c7cffd94d83b21e8203f2077176d568aa9de4818f2bd6badae9f6a0c
+EBUILD mavlink-gbp-release-2021.7.7.ebuild 563 BLAKE2B 56d0e10b830789364f5e12ba17baca70f520ec2b0e6cb753a53b081e40e2e726d74b7a62055416c69ba7f18cfe16dcbc6d8a104f82b96501467006754f757043 SHA512 aede556ebe20848f1c246acf61f7fcde3f58ee809b26c9304c9082142b7434962c3ab615bd1acacf1d2a315c491751b04c9f8a90e04dd1e99ea75f600ab267e8
 MISC metadata.xml 341 BLAKE2B 1292ea0319edc3c3597165f59f246829e6954b5582e623e92227de5503f35d0f61150a0516998dd1d99942c371291ed623a38112210abac7dd0a050cc810b34c SHA512 0b545da2a0f2d6372e63db33fd5f50497c0de04a69fdb3b94e57418ff617fcebaeed515241c474995efc38bbdf1c099ec67ad6a56dd3ae94b2e24be9f1f72d36
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.9.10.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.9.10.ebuild
deleted file mode 100644
index 86036c60a87e..000000000000
--- a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.9.10.ebuild
+++ /dev/null
@@ -1,21 +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/mavlink/mavlink-gbp-release"
-EGIT_BRANCH="release/noetic/mavlink"
-VER_PREFIX="${EGIT_BRANCH}/"
-VER_SUFFIX=-${PV#*_p}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="MAVLink message marshaling library"
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="$(python_gen_cond_dep "dev-python/future[\${PYTHON_USEDEP}]")"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}-${EGIT_BRANCH//\//-}"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2021.2.2.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2021.7.7.ebuild
index 2b6b1f3ec934..2b6b1f3ec934 100644
--- a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2021.2.2.ebuild
+++ b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2021.7.7.ebuild
diff --git a/dev-ros/mavros/Manifest b/dev-ros/mavros/Manifest
index 60e22e71046c..e172dba37738 100644
--- a/dev-ros/mavros/Manifest
+++ b/dev-ros/mavros/Manifest
@@ -1,8 +1,6 @@
-DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
-DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
 DIST mavros-1.5.2.tar.gz 319006 BLAKE2B 7ae349460f6edd44c716776dacb1014248f2d03fe0aad0a79e832091311f6e553cea714588099e70f3e1b0d8f4ba6a415e7e2554d5a8dedaae537a1955037cb4 SHA512 67aed9c6ef55c486008e1ee7125367f4ec1a6536cc7f28548c3434617a8a7429dd56a4f17af7dbe4678a8499ef69b57d72d4453fd5a2e54d9600b945314d1316
-EBUILD mavros-1.2.0.ebuild 1034 BLAKE2B 4d613cae01fcbc82955bfd139a7d35800f33cd6fe42dfb8c500b52d4bd214d8a6baa23db8c7a64afcd90165dc13e53b6259f91a235e403cf6e571baf6ae771a2 SHA512 fa742657088ad5275af8161b4fd795bd6d9e102fd745299117ae0c8b67b77932abd62445798a1870f6d4273cea660458006b98fcccd5112ecf310423fcfbd3fa
-EBUILD mavros-1.4.0.ebuild 1033 BLAKE2B 7b90ad9b79f3aaa42bb5296c848385bb8e4362af6714cc37ce3a93d93f7adec725a781c76a251f5b2c0232af47d1625af5662a93b6094865251a24a72633860b SHA512 3bd7175c6ca7d74f2f6bbb5c04b7435a9289a957f4b6f3b0c0d20a368381ab923d052bd2a60efc9cd4e6a09e68e70ef9c526eb3aafcb74b12381950bcae38325
-EBUILD mavros-1.5.2.ebuild 1033 BLAKE2B 5caaad992ccd4dc1591792f0e104c44121d0899ce8b2e0099267a079b6ea0809832683acf32f74b14f5401adc2604de2e9c73ae87f6f224e3270f60195590691 SHA512 987266fcaf780b3fcddd3dffb1af6870e3f90fd21c0a8f1508539d2929361adfb5f0e0dd4c4aa5c5039c8c5229503c231f46427aba8fe03fb1671d0913393459
-EBUILD mavros-9999.ebuild 1033 BLAKE2B 7b90ad9b79f3aaa42bb5296c848385bb8e4362af6714cc37ce3a93d93f7adec725a781c76a251f5b2c0232af47d1625af5662a93b6094865251a24a72633860b SHA512 3bd7175c6ca7d74f2f6bbb5c04b7435a9289a957f4b6f3b0c0d20a368381ab923d052bd2a60efc9cd4e6a09e68e70ef9c526eb3aafcb74b12381950bcae38325
+DIST mavros-1.8.0.tar.gz 330619 BLAKE2B 54b1e925148370a85dc0efdc53447a6443ff5b291e656514df8046ca60b8aa7658ca77dc7731718f5e818fbbcf4631067cb03371d85e8bab95a907ca857a85ee SHA512 e9a0a51480ca45112da98d51e16b2ccc2825acab8a34074ba456d7e760cb2fe6bfd9a37e33fc1dfc6c1b072865fd180aff8e7918788ded95c7776a465cda4da2
+EBUILD mavros-1.5.2.ebuild 1089 BLAKE2B dba2a8cd9d10c7ef087d8c017a5d321c4e50067b5937c7615930f39e80a45b191f5976eea11f66c781ad6326cb1a397879274935b342e86e323749b1d1ff6660 SHA512 af4bfe89d2ca3204065fb79173e66700458a68bb0d2bb1c789d24692cf698472fb40926ff3cd52aaab94b89c17ed0db8b2752759c5498010838a3b3e9ae0a598
+EBUILD mavros-1.8.0.ebuild 1089 BLAKE2B dba2a8cd9d10c7ef087d8c017a5d321c4e50067b5937c7615930f39e80a45b191f5976eea11f66c781ad6326cb1a397879274935b342e86e323749b1d1ff6660 SHA512 af4bfe89d2ca3204065fb79173e66700458a68bb0d2bb1c789d24692cf698472fb40926ff3cd52aaab94b89c17ed0db8b2752759c5498010838a3b3e9ae0a598
+EBUILD mavros-9999.ebuild 1089 BLAKE2B dba2a8cd9d10c7ef087d8c017a5d321c4e50067b5937c7615930f39e80a45b191f5976eea11f66c781ad6326cb1a397879274935b342e86e323749b1d1ff6660 SHA512 af4bfe89d2ca3204065fb79173e66700458a68bb0d2bb1c789d24692cf698472fb40926ff3cd52aaab94b89c17ed0db8b2752759c5498010838a3b3e9ae0a598
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/mavros/mavros-1.2.0.ebuild b/dev-ros/mavros/mavros-1.2.0.ebuild
deleted file mode 100644
index 74118adcd502..000000000000
--- a/dev-ros/mavros/mavros-1.2.0.ebuild
+++ /dev/null
@@ -1,39 +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/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="MAVLink extendable communication node for ROS"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/angles
-	dev-ros/libmavconn
-	dev-ros/rosconsole_bridge
-	dev-libs/boost:=
-	dev-ros/eigen_conversions
-	sci-geosciences/GeographicLib
-	>=dev-ros/mavlink-gbp-release-2016.11.11
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	>=dev-ros/mavros_msgs-${PV}[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_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/mavros/mavros-1.5.2.ebuild b/dev-ros/mavros/mavros-1.5.2.ebuild
index 6d42a584d799..b2927fcf9bd2 100644
--- a/dev-ros/mavros/mavros-1.5.2.ebuild
+++ b/dev-ros/mavros/mavros-1.5.2.ebuild
@@ -36,4 +36,5 @@ DEPEND="${RDEPEND}
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
diff --git a/dev-ros/mavros/mavros-1.4.0.ebuild b/dev-ros/mavros/mavros-1.8.0.ebuild
index 12562bf79410..b2927fcf9bd2 100644
--- a/dev-ros/mavros/mavros-1.4.0.ebuild
+++ b/dev-ros/mavros/mavros-1.8.0.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
@@ -36,4 +36,5 @@ DEPEND="${RDEPEND}
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
diff --git a/dev-ros/mavros/mavros-9999.ebuild b/dev-ros/mavros/mavros-9999.ebuild
index 12562bf79410..b2927fcf9bd2 100644
--- a/dev-ros/mavros/mavros-9999.ebuild
+++ b/dev-ros/mavros/mavros-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
@@ -36,4 +36,5 @@ DEPEND="${RDEPEND}
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
diff --git a/dev-ros/mavros_extras/Manifest b/dev-ros/mavros_extras/Manifest
index 6ba9b3aa594d..2fddee804864 100644
--- a/dev-ros/mavros_extras/Manifest
+++ b/dev-ros/mavros_extras/Manifest
@@ -1,8 +1,10 @@
 DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
 DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
 DIST mavros-1.5.2.tar.gz 319006 BLAKE2B 7ae349460f6edd44c716776dacb1014248f2d03fe0aad0a79e832091311f6e553cea714588099e70f3e1b0d8f4ba6a415e7e2554d5a8dedaae537a1955037cb4 SHA512 67aed9c6ef55c486008e1ee7125367f4ec1a6536cc7f28548c3434617a8a7429dd56a4f17af7dbe4678a8499ef69b57d72d4453fd5a2e54d9600b945314d1316
+DIST mavros-1.8.0.tar.gz 330619 BLAKE2B 54b1e925148370a85dc0efdc53447a6443ff5b291e656514df8046ca60b8aa7658ca77dc7731718f5e818fbbcf4631067cb03371d85e8bab95a907ca857a85ee SHA512 e9a0a51480ca45112da98d51e16b2ccc2825acab8a34074ba456d7e760cb2fe6bfd9a37e33fc1dfc6c1b072865fd180aff8e7918788ded95c7776a465cda4da2
 EBUILD mavros_extras-1.2.0.ebuild 937 BLAKE2B d056641e3f9a5dae34c078062d1a103c393e40f1a5cbdca195a296d6d8b42b968627297822a135e2ca8045ad1452f73ea7e25a556fe7ff50f5d1dca22df18764 SHA512 0f487ad55d13c7bb6eb9582db0f5c1df4cef25b686dbd1924e05234715cfbf28277a8e5ba67faa3b62aa8dc655a439bf777fabd72e5895a3f8538427c309a83c
 EBUILD mavros_extras-1.4.0.ebuild 937 BLAKE2B d056641e3f9a5dae34c078062d1a103c393e40f1a5cbdca195a296d6d8b42b968627297822a135e2ca8045ad1452f73ea7e25a556fe7ff50f5d1dca22df18764 SHA512 0f487ad55d13c7bb6eb9582db0f5c1df4cef25b686dbd1924e05234715cfbf28277a8e5ba67faa3b62aa8dc655a439bf777fabd72e5895a3f8538427c309a83c
 EBUILD mavros_extras-1.5.2.ebuild 937 BLAKE2B 93a0e54096dd1473d688e8804e404012644826c24189740799bab7821942fe8db50773789572c19c6e054b8dec4c41f8309dd2bf17e13236d52f7ef42b8fd7d3 SHA512 21d079dbf7abf1cf9114b2acf839cfb599a25738ceb4f4611fa55c6edcb56f3ad17d462d2115f9911d90885995d1286f263555c7e1e035b28a054904dc716ba8
+EBUILD mavros_extras-1.8.0.ebuild 937 BLAKE2B 93a0e54096dd1473d688e8804e404012644826c24189740799bab7821942fe8db50773789572c19c6e054b8dec4c41f8309dd2bf17e13236d52f7ef42b8fd7d3 SHA512 21d079dbf7abf1cf9114b2acf839cfb599a25738ceb4f4611fa55c6edcb56f3ad17d462d2115f9911d90885995d1286f263555c7e1e035b28a054904dc716ba8
 EBUILD mavros_extras-9999.ebuild 937 BLAKE2B d056641e3f9a5dae34c078062d1a103c393e40f1a5cbdca195a296d6d8b42b968627297822a135e2ca8045ad1452f73ea7e25a556fe7ff50f5d1dca22df18764 SHA512 0f487ad55d13c7bb6eb9582db0f5c1df4cef25b686dbd1924e05234715cfbf28277a8e5ba67faa3b62aa8dc655a439bf777fabd72e5895a3f8538427c309a83c
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/mavros_extras/mavros_extras-1.8.0.ebuild b/dev-ros/mavros_extras/mavros_extras-1.8.0.ebuild
new file mode 100644
index 000000000000..4a27f7707f48
--- /dev/null
+++ b/dev-ros/mavros_extras/mavros_extras-1.8.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Extra nodes and plugins for mavros"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_transport
+	dev-ros/cv_bridge
+	dev-ros/mavros
+	dev-ros/roscpp
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/urdf
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/mavros_msgs/Manifest b/dev-ros/mavros_msgs/Manifest
index 53dcf5d8b0cd..b5daaaa18106 100644
--- a/dev-ros/mavros_msgs/Manifest
+++ b/dev-ros/mavros_msgs/Manifest
@@ -1,8 +1,10 @@
 DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
 DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
 DIST mavros-1.5.2.tar.gz 319006 BLAKE2B 7ae349460f6edd44c716776dacb1014248f2d03fe0aad0a79e832091311f6e553cea714588099e70f3e1b0d8f4ba6a415e7e2554d5a8dedaae537a1955037cb4 SHA512 67aed9c6ef55c486008e1ee7125367f4ec1a6536cc7f28548c3434617a8a7429dd56a4f17af7dbe4678a8499ef69b57d72d4453fd5a2e54d9600b945314d1316
+DIST mavros-1.8.0.tar.gz 330619 BLAKE2B 54b1e925148370a85dc0efdc53447a6443ff5b291e656514df8046ca60b8aa7658ca77dc7731718f5e818fbbcf4631067cb03371d85e8bab95a907ca857a85ee SHA512 e9a0a51480ca45112da98d51e16b2ccc2825acab8a34074ba456d7e760cb2fe6bfd9a37e33fc1dfc6c1b072865fd180aff8e7918788ded95c7776a465cda4da2
 EBUILD mavros_msgs-1.2.0.ebuild 460 BLAKE2B ce4027da677ee2a46be25024daf5c835e8de20c2e03213235e6417b17b8ceb734c160a0df0af47c616e9e95678ba8094c326e6a3c09c28358bca7de099a1a603 SHA512 f1fdca8e381f9bb7b9be71d8fae20f8d52f24be3ec734ebd8dcf9ddc2b3f08a5a1fc70bcd3cae2aff6e66e013a8752806bb7cfb1971c3e8a0f1e0d8e4353b96d
 EBUILD mavros_msgs-1.4.0.ebuild 460 BLAKE2B ce4027da677ee2a46be25024daf5c835e8de20c2e03213235e6417b17b8ceb734c160a0df0af47c616e9e95678ba8094c326e6a3c09c28358bca7de099a1a603 SHA512 f1fdca8e381f9bb7b9be71d8fae20f8d52f24be3ec734ebd8dcf9ddc2b3f08a5a1fc70bcd3cae2aff6e66e013a8752806bb7cfb1971c3e8a0f1e0d8e4353b96d
 EBUILD mavros_msgs-1.5.2.ebuild 460 BLAKE2B e65c5f3a1c33f1808bec285c49a4e972cce02d468960449013b9d9778b8e03af75051f1683a61da1704e969e7d14830cfcd953f925cfcb815b1c462cf37d051c SHA512 318126d816e129f964dc2cded761f9d3527782149a451e3d936af8b3441e0112dbf5d50e6461106af8b0e3cb84cdbd8b69cd7992f3421497dd6aceca595226fd
+EBUILD mavros_msgs-1.8.0.ebuild 460 BLAKE2B e65c5f3a1c33f1808bec285c49a4e972cce02d468960449013b9d9778b8e03af75051f1683a61da1704e969e7d14830cfcd953f925cfcb815b1c462cf37d051c SHA512 318126d816e129f964dc2cded761f9d3527782149a451e3d936af8b3441e0112dbf5d50e6461106af8b0e3cb84cdbd8b69cd7992f3421497dd6aceca595226fd
 EBUILD mavros_msgs-9999.ebuild 460 BLAKE2B ce4027da677ee2a46be25024daf5c835e8de20c2e03213235e6417b17b8ceb734c160a0df0af47c616e9e95678ba8094c326e6a3c09c28358bca7de099a1a603 SHA512 f1fdca8e381f9bb7b9be71d8fae20f8d52f24be3ec734ebd8dcf9ddc2b3f08a5a1fc70bcd3cae2aff6e66e013a8752806bb7cfb1971c3e8a0f1e0d8e4353b96d
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/mavros_msgs/mavros_msgs-1.8.0.ebuild b/dev-ros/mavros_msgs/mavros_msgs-1.8.0.ebuild
new file mode 100644
index 000000000000..11b0de2bd004
--- /dev/null
+++ b/dev-ros/mavros_msgs/mavros_msgs-1.8.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geographic_msgs dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for MAVROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/message_filters/Manifest b/dev-ros/message_filters/Manifest
index 3ce79b22371e..489254046c74 100644
--- a/dev-ros/message_filters/Manifest
+++ b/dev-ros/message_filters/Manifest
@@ -1,8 +1,10 @@
 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.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 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-r1.ebuild 902 BLAKE2B 2c3b89f5aa8aecf32580628af9f138050086b6d2b0f4e4b0d1170cc5cf24eb04969b468bb69c095f1dec0f836a47c957750b2393d3763ba6392ee0ea1ed2b36f SHA512 4f0b34f78581432a34f6b1c86eabc6379ad4b8f9a675d82f4170e7ae30c291df573657c783f29c3f483bcf8d499334500d5c4a84d0493268bc540806802a1063
+EBUILD message_filters-1.15.11.ebuild 902 BLAKE2B 2c3b89f5aa8aecf32580628af9f138050086b6d2b0f4e4b0d1170cc5cf24eb04969b468bb69c095f1dec0f836a47c957750b2393d3763ba6392ee0ea1ed2b36f SHA512 4f0b34f78581432a34f6b1c86eabc6379ad4b8f9a675d82f4170e7ae30c291df573657c783f29c3f483bcf8d499334500d5c4a84d0493268bc540806802a1063
 EBUILD message_filters-1.15.8-r1.ebuild 902 BLAKE2B 2c3b89f5aa8aecf32580628af9f138050086b6d2b0f4e4b0d1170cc5cf24eb04969b468bb69c095f1dec0f836a47c957750b2393d3763ba6392ee0ea1ed2b36f SHA512 4f0b34f78581432a34f6b1c86eabc6379ad4b8f9a675d82f4170e7ae30c291df573657c783f29c3f483bcf8d499334500d5c4a84d0493268bc540806802a1063
 EBUILD message_filters-1.15.9-r1.ebuild 902 BLAKE2B 2c3b89f5aa8aecf32580628af9f138050086b6d2b0f4e4b0d1170cc5cf24eb04969b468bb69c095f1dec0f836a47c957750b2393d3763ba6392ee0ea1ed2b36f SHA512 4f0b34f78581432a34f6b1c86eabc6379ad4b8f9a675d82f4170e7ae30c291df573657c783f29c3f483bcf8d499334500d5c4a84d0493268bc540806802a1063
 EBUILD message_filters-9999.ebuild 902 BLAKE2B 2c3b89f5aa8aecf32580628af9f138050086b6d2b0f4e4b0d1170cc5cf24eb04969b468bb69c095f1dec0f836a47c957750b2393d3763ba6392ee0ea1ed2b36f SHA512 4f0b34f78581432a34f6b1c86eabc6379ad4b8f9a675d82f4170e7ae30c291df573657c783f29c3f483bcf8d499334500d5c4a84d0493268bc540806802a1063
diff --git a/dev-ros/message_filters/message_filters-1.15.11.ebuild b/dev-ros/message_filters/message_filters-1.15.11.ebuild
new file mode 100644
index 000000000000..7b93ac1d75aa
--- /dev/null
+++ b/dev-ros/message_filters/message_filters-1.15.11.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/mk/Manifest b/dev-ros/mk/Manifest
index 83fe0d8318d1..2c0575c53004 100644
--- a/dev-ros/mk/Manifest
+++ b/dev-ros/mk/Manifest
@@ -1,8 +1,10 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD mk-1.15.5.ebuild 427 BLAKE2B f2c4fb3f622cae0cc67d230fe3d86f4825ed80af6f16f00012d8fe27fe60e31fb5fcffcf841bfb3d2fadf8ed4a774c24807c2003c367b416b7467ce9497ec770 SHA512 69241cb64aa30288a318141c9a363bb4c23499028ce7b0b83c73298df45644e1d5a8d3da151f81ad9195ba8abff80e13638db2a4bb45924737738997cc476588
 EBUILD mk-1.15.6.ebuild 427 BLAKE2B f2c4fb3f622cae0cc67d230fe3d86f4825ed80af6f16f00012d8fe27fe60e31fb5fcffcf841bfb3d2fadf8ed4a774c24807c2003c367b416b7467ce9497ec770 SHA512 69241cb64aa30288a318141c9a363bb4c23499028ce7b0b83c73298df45644e1d5a8d3da151f81ad9195ba8abff80e13638db2a4bb45924737738997cc476588
 EBUILD mk-1.15.7.ebuild 427 BLAKE2B f2c4fb3f622cae0cc67d230fe3d86f4825ed80af6f16f00012d8fe27fe60e31fb5fcffcf841bfb3d2fadf8ed4a774c24807c2003c367b416b7467ce9497ec770 SHA512 69241cb64aa30288a318141c9a363bb4c23499028ce7b0b83c73298df45644e1d5a8d3da151f81ad9195ba8abff80e13638db2a4bb45924737738997cc476588
+EBUILD mk-1.15.8.ebuild 427 BLAKE2B 9fc29af0db3479c6cf61407838a0efb57f434979c14235dc83bf0f2d45bbcfe84c4d5289ef652720d75e5818d362c0d1c59efaecc4d3d72ff3b241b6428f48fc SHA512 4f5e49f2543bb6b0417653d0c04a22888741cd4b05b751114359a89e305a1c6d82dba9f0af7bc9f96a57fd26558324283033911205cec8bc541053e02f366cc9
 EBUILD mk-9999.ebuild 427 BLAKE2B f2c4fb3f622cae0cc67d230fe3d86f4825ed80af6f16f00012d8fe27fe60e31fb5fcffcf841bfb3d2fadf8ed4a774c24807c2003c367b416b7467ce9497ec770 SHA512 69241cb64aa30288a318141c9a363bb4c23499028ce7b0b83c73298df45644e1d5a8d3da151f81ad9195ba8abff80e13638db2a4bb45924737738997cc476588
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/mk/mk-1.15.8.ebuild b/dev-ros/mk/mk-1.15.8.ebuild
new file mode 100644
index 000000000000..fbe42319472d
--- /dev/null
+++ b/dev-ros/mk/mk-1.15.8.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"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A collection of .mk include files for building ROS architectural elements"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}
+	dev-ros/rospack
+	dev-ros/rosbuild"
diff --git a/dev-ros/monocam_settler/Manifest b/dev-ros/monocam_settler/Manifest
index 8c7bd3a4da7a..a6735968d510 100644
--- a/dev-ros/monocam_settler/Manifest
+++ b/dev-ros/monocam_settler/Manifest
@@ -1,4 +1,6 @@
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
 EBUILD monocam_settler-0.10.14-r1.ebuild 646 BLAKE2B e9805973cec8e06feeea6b4c90b522c175ddd8bdd35b3fffdf44a209c469514fc39b4a6c7d1e024d734d572fd64de0dcfdde48c66fad569ff33bf5a109263795 SHA512 a96f8e49cff1b589cd26626fac69822c16c91b66016a5120f2ef1b19eea44144c7148ec2b3bb4fe229950120f12f1fc4d5b7aeac20074050e39d239f6d7af2bd
+EBUILD monocam_settler-0.10.15.ebuild 646 BLAKE2B e9805973cec8e06feeea6b4c90b522c175ddd8bdd35b3fffdf44a209c469514fc39b4a6c7d1e024d734d572fd64de0dcfdde48c66fad569ff33bf5a109263795 SHA512 a96f8e49cff1b589cd26626fac69822c16c91b66016a5120f2ef1b19eea44144c7148ec2b3bb4fe229950120f12f1fc4d5b7aeac20074050e39d239f6d7af2bd
 EBUILD monocam_settler-9999.ebuild 646 BLAKE2B e9805973cec8e06feeea6b4c90b522c175ddd8bdd35b3fffdf44a209c469514fc39b4a6c7d1e024d734d572fd64de0dcfdde48c66fad569ff33bf5a109263795 SHA512 a96f8e49cff1b589cd26626fac69822c16c91b66016a5120f2ef1b19eea44144c7148ec2b3bb4fe229950120f12f1fc4d5b7aeac20074050e39d239f6d7af2bd
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/monocam_settler/monocam_settler-0.10.15.ebuild b/dev-ros/monocam_settler/monocam_settler-0.10.15.ebuild
new file mode 100644
index 000000000000..6826337aa05f
--- /dev/null
+++ b/dev-ros/monocam_settler/monocam_settler-0.10.15.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-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Listens on a ImageFeatures topic, and waits for the data to settle"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosconsole
+	dev-ros/roscpp_serialization
+	dev-ros/settlerlib
+	dev-libs/boost:=[threads(+)]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/moveit_msgs/Manifest b/dev-ros/moveit_msgs/Manifest
index ab3349593d8c..28faafce062d 100644
--- a/dev-ros/moveit_msgs/Manifest
+++ b/dev-ros/moveit_msgs/Manifest
@@ -1,4 +1,4 @@
-DIST moveit_msgs-0.11.1.tar.gz 20617 BLAKE2B 12b6f6f606d5f3ecaee8bafc5703526020ef60b421e452bb603390236caede4e7fb0d1310d0fc5c38dd63676085a083a76721f97a3548022375b3b2a8b72596c SHA512 b9f99bbae3d13040368ab8fb649682becd194ff91279c7c5a3060104789df91a4d61334a369a46e9d161f9f7386d42b97a189451c2ac0b5f124fb17df92ca680
-EBUILD moveit_msgs-0.11.1.ebuild 585 BLAKE2B 9869f0901d9a7147418fb131865f33bb4f221460eacb9eb635fe50e12d1c436a7b87c841880e1ec28574e739a5a8172894a54b21a13a89771a7871db02108fd6 SHA512 3ff92b8cf23fefac59574aef6a5154a331282fcb78dc355be7bd230b1fd1ecd78a1f9f9e90259272cdad2448dc226bff433c23e14f9fcec8ff4c81510338a5d2
+DIST moveit_msgs-0.11.2.tar.gz 21764 BLAKE2B 9994ae4468e6913a811103d7f107868eac60970016f2dacaf666fadc0c236db583001631a7378e18d97be9ddbe9823dae95ff984f91a3b28b1833412ef905326 SHA512 4b401c47b6d2a5c61c9e69807c4aec7f0aa20ff27de952ea91b2b8e339a5e5f18138f36b9e679601b7471aa0aa78d8d5763af12c44685a201bc4dbc67602857f
+EBUILD moveit_msgs-0.11.2.ebuild 585 BLAKE2B 35fa2b79ff082cc25f06ccf7e9f25e7b99277bc118c85741568e5da43a58b16d4b1565d442ee40aa228935a1151dd4c605dc1a9baad7ce54366190899b4505d5 SHA512 f78ac5466cfac89c96019064f192a9f435b69a92c0bd65e1bd60425b0c235925793428eed8467a71b9b9828589410382bee25daa1a204859badc558bd58674e5
 EBUILD moveit_msgs-9999.ebuild 585 BLAKE2B 9869f0901d9a7147418fb131865f33bb4f221460eacb9eb635fe50e12d1c436a7b87c841880e1ec28574e739a5a8172894a54b21a13a89771a7871db02108fd6 SHA512 3ff92b8cf23fefac59574aef6a5154a331282fcb78dc355be7bd230b1fd1ecd78a1f9f9e90259272cdad2448dc226bff433c23e14f9fcec8ff4c81510338a5d2
 MISC metadata.xml 338 BLAKE2B f91c4144e8f04fe987c5db67b6ebf539420aa3c07bd50c58394bd489a5d6b41f6122a645dd2c182dc6c14d4755d97b89fe444e2a1b48a6b048a6726c36bd31e9 SHA512 232c4c964a3798a5b5aa26692e74b2f71e1a6f4bf89e618c86824d0a6fd97b4064b68ecb380dc505c4cf492fd45671e89bb419d96377e5fced8a665b864fb1a1
diff --git a/dev-ros/moveit_msgs/moveit_msgs-0.11.1.ebuild b/dev-ros/moveit_msgs/moveit_msgs-0.11.2.ebuild
index 6490a10393ef..16c7d7fd966b 100644
--- a/dev-ros/moveit_msgs/moveit_msgs-0.11.1.ebuild
+++ b/dev-ros/moveit_msgs/moveit_msgs-0.11.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
diff --git a/dev-ros/openni2_camera/Manifest b/dev-ros/openni2_camera/Manifest
index 3585eeec5ffd..a176399e5cf3 100644
--- a/dev-ros/openni2_camera/Manifest
+++ b/dev-ros/openni2_camera/Manifest
@@ -1,4 +1,4 @@
-DIST openni2_camera-1.4.2.tar.gz 39789 BLAKE2B e20fe380e4832c7c38ed945e3472867ea7546c675677a89eda216bbaa448538b73a7b546e7182dc493520c9cb60b9cbdd9fb1bd1cd82ac75bf4ba3320a1521aa SHA512 b6dde7b55349e4d3a2f06f07e944208c90ab37f9e0b5366d8eefadda37a96f970de81784fa107ba8eb6a9e6636881279f3a2b3e7d60a9ac64eab4b0c9efccdb3
-EBUILD openni2_camera-1.4.2-r1.ebuild 659 BLAKE2B 01643578fe29b938d19f48d63ff40cf7a0bfdfc26e66a54989c7b6253f3e5f8e2a2d73fc2b4250e482fba2ba27c70a17f425ae8e09c8db604b26c75796450ba3 SHA512 fe9824708d48b26b3bdd8e41a581468c3406c85142eca5838a36ef433d49387ab3f21d2fe63e61562fe72c4c8cee84d67846afc82b0213e77ba1f97adaccc610
+DIST openni2_camera-1.5.1.tar.gz 40518 BLAKE2B 10cee624b9eda0a3d8f45df1fa6ba720a6e1c7f1a36dd0f0b933266854904f3a16f2292a5a51ed5f7e3d6f4ba5b9aaaf5260d7d2f6f012dbba060b5f3e3445f6 SHA512 59ab19bf60f6bd4196374138b68e64dc8aa44a8c451c3e7d5893f1501e83ab1c9034ddea2cbc1eedf12b2b2a13a9ecc4bbf2b87a71ab7fa38cde4c0d6ccc04cc
+EBUILD openni2_camera-1.5.1.ebuild 659 BLAKE2B 01643578fe29b938d19f48d63ff40cf7a0bfdfc26e66a54989c7b6253f3e5f8e2a2d73fc2b4250e482fba2ba27c70a17f425ae8e09c8db604b26c75796450ba3 SHA512 fe9824708d48b26b3bdd8e41a581468c3406c85142eca5838a36ef433d49387ab3f21d2fe63e61562fe72c4c8cee84d67846afc82b0213e77ba1f97adaccc610
 EBUILD openni2_camera-9999.ebuild 659 BLAKE2B 01643578fe29b938d19f48d63ff40cf7a0bfdfc26e66a54989c7b6253f3e5f8e2a2d73fc2b4250e482fba2ba27c70a17f425ae8e09c8db604b26c75796450ba3 SHA512 fe9824708d48b26b3bdd8e41a581468c3406c85142eca5838a36ef433d49387ab3f21d2fe63e61562fe72c4c8cee84d67846afc82b0213e77ba1f97adaccc610
 MISC metadata.xml 340 BLAKE2B a66fd18f61874c90197221e853b05c28502cf38118807b51616c9feb0db670945ffe31bd325aa9092dc22c226f214ec2259276c7bc11ee731a694fa200cdfd03 SHA512 c8b9dc967e3e6de3bcae15894d39b3701e4bd223565660284c0b2a41d4b7e475935b9342296644e620b63a8c99098c8bf65363aa4899e7e5de3ad92059a4b064
diff --git a/dev-ros/openni2_camera/openni2_camera-1.4.2-r1.ebuild b/dev-ros/openni2_camera/openni2_camera-1.5.1.ebuild
index ee182d23620f..ee182d23620f 100644
--- a/dev-ros/openni2_camera/openni2_camera-1.4.2-r1.ebuild
+++ b/dev-ros/openni2_camera/openni2_camera-1.5.1.ebuild
diff --git a/dev-ros/openni2_launch/Manifest b/dev-ros/openni2_launch/Manifest
index 0736e40c490b..aedf569d04c1 100644
--- a/dev-ros/openni2_launch/Manifest
+++ b/dev-ros/openni2_launch/Manifest
@@ -1,4 +1,4 @@
-DIST openni2_camera-1.4.2.tar.gz 39789 BLAKE2B e20fe380e4832c7c38ed945e3472867ea7546c675677a89eda216bbaa448538b73a7b546e7182dc493520c9cb60b9cbdd9fb1bd1cd82ac75bf4ba3320a1521aa SHA512 b6dde7b55349e4d3a2f06f07e944208c90ab37f9e0b5366d8eefadda37a96f970de81784fa107ba8eb6a9e6636881279f3a2b3e7d60a9ac64eab4b0c9efccdb3
-EBUILD openni2_launch-1.4.2.ebuild 558 BLAKE2B a7999520b80a7acfc5ca55731aa174254522d9d78af34ef134db203341d076f117b98cb1f8a94e487c7047a5bb6330b3544faea142ffa029b48fad7c6010c691 SHA512 66a88ea7c2b75d8a38c1d8a427cef83050cd0a4d75f88e02c02a500905b28d64d59c935c0de0363d7d1df76880f1801d1b29c67818402a1ce65f6e07cbc657b7
+DIST openni2_camera-1.5.1.tar.gz 40518 BLAKE2B 10cee624b9eda0a3d8f45df1fa6ba720a6e1c7f1a36dd0f0b933266854904f3a16f2292a5a51ed5f7e3d6f4ba5b9aaaf5260d7d2f6f012dbba060b5f3e3445f6 SHA512 59ab19bf60f6bd4196374138b68e64dc8aa44a8c451c3e7d5893f1501e83ab1c9034ddea2cbc1eedf12b2b2a13a9ecc4bbf2b87a71ab7fa38cde4c0d6ccc04cc
+EBUILD openni2_launch-1.5.1.ebuild 558 BLAKE2B 24b984bc6ca8234b4b10cf216e64c31c76496ae5117559b8e576ffd9f9deb7372440402f7e40d695a8218dc7eb409fa901058458d532e095913ec7be5402ee22 SHA512 11705ad41bbf7163c27d0b772030f3c8bb847f7e2825b0669e4f174f746deb33b7e09bca034e8f3b789242ce11cbc74d61642416f92b46a5b907d7abc576e786
 EBUILD openni2_launch-9999.ebuild 558 BLAKE2B a7999520b80a7acfc5ca55731aa174254522d9d78af34ef134db203341d076f117b98cb1f8a94e487c7047a5bb6330b3544faea142ffa029b48fad7c6010c691 SHA512 66a88ea7c2b75d8a38c1d8a427cef83050cd0a4d75f88e02c02a500905b28d64d59c935c0de0363d7d1df76880f1801d1b29c67818402a1ce65f6e07cbc657b7
 MISC metadata.xml 340 BLAKE2B 666c2530cabfb6d86f6fb1e45072133c9a3826254a42b7713ca3b0506b09adb38be616e281a8e19fab3f6540133a9eee6c9605accbc7b7444715faf38e199b97 SHA512 5fdcf4ac865e7456967ef7e20b7694a7dd04eed9658eab3dbaa1754538a843e499ca1671189d444730b47ff85267d643518c6f1faa708f374fabfeb4d7af7caa
diff --git a/dev-ros/openni2_launch/openni2_launch-1.4.2.ebuild b/dev-ros/openni2_launch/openni2_launch-1.5.1.ebuild
index 227a922039f1..230a0150b089 100644
--- a/dev-ros/openni2_launch/openni2_launch-1.4.2.ebuild
+++ b/dev-ros/openni2_launch/openni2_launch-1.5.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
diff --git a/dev-ros/pcl_conversions/Manifest b/dev-ros/pcl_conversions/Manifest
index b4df79390c1a..74942491e811 100644
--- a/dev-ros/pcl_conversions/Manifest
+++ b/dev-ros/pcl_conversions/Manifest
@@ -1,6 +1,5 @@
-DIST perception_pcl-1.7.1.tar.gz 80899 BLAKE2B 2898d88efa1b27a27eea06fb949254127cf92eb2c788ae914a40f0000fa8204202c4823c69ab5fa9bd83c2426289a4897a56fab9ec3df61e3ab0a184fc068c41 SHA512 97e9240c660adde84976860ed9c94cf8c127615526641dbcdb729ffbda4cda4dfb9f351cc2d471988732ad61e6508bfa5906c8b4503c31172e7f4e4dfc31260e
+AUX pcl.patch 2427 BLAKE2B ec9099ea6b6c39054df19aba957c6503db864190b4704445440b5e0cc93065b269d070d21b3cdd18a392dbd4acc2380b924efae34f4e3d70f96da7733ef80979 SHA512 33fdf3284c4c34fe0e7f4f36e2c6328eba471b2f2d7a30bf9bf44c82b81ff4c68a522404eafea81546d7be0d07988fa6b94e2e6d5ec96278bb11ae68177bb741
 DIST perception_pcl-1.7.2.tar.gz 81897 BLAKE2B 692f000337090c7a2354bf9626d391aa0fe390041042718e7dde7335c750137e7e1b6f939728ad1e2af3411e535ba63b42bc17f74b3535e38628f2b6c1c87036 SHA512 228b1d7d589bfd1460e8c58448b0d9257e86c1796b009853aeceeb1da20d8f46462d8c273a95804003ce3c43326c6575553d19b319aa9effcef4854347d5c3f9
-EBUILD pcl_conversions-1.7.1.ebuild 602 BLAKE2B 488cfb2ca76f22ae02c751d2b4936cedc2cb0e5f48189e2cb08df5039459e52b3e77cd642db191271cabf7cd6b38033ee8bb332be35b98c6b697c7e2d1504ce9 SHA512 e04e58d53feb53a00ec9628ce4bad4911ff3095c20394807bc7af4357b40903b0be52e68e759067431eb2a08706f49cf4b2779246c1030b705d587150d47bee6
-EBUILD pcl_conversions-1.7.2.ebuild 602 BLAKE2B 488cfb2ca76f22ae02c751d2b4936cedc2cb0e5f48189e2cb08df5039459e52b3e77cd642db191271cabf7cd6b38033ee8bb332be35b98c6b697c7e2d1504ce9 SHA512 e04e58d53feb53a00ec9628ce4bad4911ff3095c20394807bc7af4357b40903b0be52e68e759067431eb2a08706f49cf4b2779246c1030b705d587150d47bee6
+EBUILD pcl_conversions-1.7.2-r1.ebuild 636 BLAKE2B 41739024596fccb8ea978f74c4f7b57552766f23c05a556e6726b3aa78fc26d9dae54f7d469dc6ceb664325fd3f30a0f5b23910478847d8b80dd15de3ded8030 SHA512 b558b33311491e1fcc409c39c37640bae397de978a333654817a0ac6255a2a6d0545193cb908e3414b5681ccd5d93e62630eaf031d9fd30c2ca38a8581bb21ac
 EBUILD pcl_conversions-9999.ebuild 602 BLAKE2B 488cfb2ca76f22ae02c751d2b4936cedc2cb0e5f48189e2cb08df5039459e52b3e77cd642db191271cabf7cd6b38033ee8bb332be35b98c6b697c7e2d1504ce9 SHA512 e04e58d53feb53a00ec9628ce4bad4911ff3095c20394807bc7af4357b40903b0be52e68e759067431eb2a08706f49cf4b2779246c1030b705d587150d47bee6
 MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/dev-ros/pcl_conversions/files/pcl.patch b/dev-ros/pcl_conversions/files/pcl.patch
new file mode 100644
index 000000000000..fc0ef8866863
--- /dev/null
+++ b/dev-ros/pcl_conversions/files/pcl.patch
@@ -0,0 +1,68 @@
+From 6900f7cf650e6c0df2aef45e0011833905b0ba9e Mon Sep 17 00:00:00 2001
+From: Markus Vieth <39675748+mvieth@users.noreply.github.com>
+Date: Fri, 6 Nov 2020 19:13:16 +0100
+Subject: [PATCH] Change conversions of Vertices for new PCL versions (#313)
+
+In https://github.com/PointCloudLibrary/pcl/commit/ad00c7bee2fad0391649479d90eee4461a2e74e7, the vertices field of pcl::Vertices changed from std::vector<std::uint32_t> to std::vector<pcl::index_t>, where index_t is an index type with configurable size (currently by default int). This commit makes conversions from and to pcl_msgs::Vertices possible again, moving the vector contents if possible.
+---
+ .../include/pcl_conversions/pcl_conversions.h | 23 +++++++++++++++----
+ 1 file changed, 19 insertions(+), 4 deletions(-)
+
+diff --git a/pcl_conversions/include/pcl_conversions/pcl_conversions.h b/pcl_conversions/include/pcl_conversions/pcl_conversions.h
+index a5671c25..5ac0a41a 100644
+--- a/include/pcl_conversions/pcl_conversions.h
++++ b/include/pcl_conversions/pcl_conversions.h
+@@ -350,10 +350,25 @@ namespace pcl_conversions {
+ 
+   /** pcl::Vertices <=> pcl_msgs::Vertices **/
+ 
++  namespace internal
++  {
++    template <class T>
++    inline void move(std::vector<T> &a, std::vector<T> &b)
++    {
++      b.swap(a);
++    }
++
++    template <class T1, class T2>
++    inline void move(std::vector<T1> &a, std::vector<T2> &b)
++    {
++      b.assign(a.cbegin(), a.cend());
++    }
++  }
++
+   inline
+   void fromPCL(const pcl::Vertices &pcl_vert, pcl_msgs::Vertices &vert)
+   {
+-    vert.vertices = pcl_vert.vertices;
++    vert.vertices.assign(pcl_vert.vertices.cbegin(), pcl_vert.vertices.cend());
+   }
+ 
+   inline
+@@ -370,7 +385,7 @@ namespace pcl_conversions {
+   inline
+   void moveFromPCL(pcl::Vertices &pcl_vert, pcl_msgs::Vertices &vert)
+   {
+-    vert.vertices.swap(pcl_vert.vertices);
++    internal::move(pcl_vert.vertices, vert.vertices);
+   }
+ 
+   inline
+@@ -387,7 +402,7 @@ namespace pcl_conversions {
+   inline
+   void toPCL(const pcl_msgs::Vertices &vert, pcl::Vertices &pcl_vert)
+   {
+-    pcl_vert.vertices = vert.vertices;
++    pcl_vert.vertices.assign(vert.vertices.cbegin(), vert.vertices.cend());
+   }
+ 
+   inline
+@@ -404,7 +419,7 @@ namespace pcl_conversions {
+   inline
+   void moveToPCL(pcl_msgs::Vertices &vert, pcl::Vertices &pcl_vert)
+   {
+-    pcl_vert.vertices.swap(vert.vertices);
++    internal::move(vert.vertices, pcl_vert.vertices);
+   }
+ 
+   inline
diff --git a/dev-ros/pcl_conversions/pcl_conversions-1.7.1.ebuild b/dev-ros/pcl_conversions/pcl_conversions-1.7.1.ebuild
deleted file mode 100644
index 2aa2de1919aa..000000000000
--- a/dev-ros/pcl_conversions/pcl_conversions-1.7.1.ebuild
+++ /dev/null
@@ -1,25 +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/perception_pcl"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides conversions from PCL data types and ROS message types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	sci-libs/pcl:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/pcl_conversions/pcl_conversions-1.7.2.ebuild b/dev-ros/pcl_conversions/pcl_conversions-1.7.2-r1.ebuild
index 2aa2de1919aa..ec80ff5fa28b 100644
--- a/dev-ros/pcl_conversions/pcl_conversions-1.7.2.ebuild
+++ b/dev-ros/pcl_conversions/pcl_conversions-1.7.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
@@ -23,3 +23,4 @@ DEPEND="${RDEPEND}
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-cpp/eigen:3
 	test? ( dev-cpp/gtest )"
+PATCHES=("${FILESDIR}/pcl.patch")
diff --git a/dev-ros/pcl_ros/Manifest b/dev-ros/pcl_ros/Manifest
index 528574068c64..9f46917ee2db 100644
--- a/dev-ros/pcl_ros/Manifest
+++ b/dev-ros/pcl_ros/Manifest
@@ -1,5 +1,6 @@
+AUX pcl.patch 2215 BLAKE2B ff38d380d743c69de3c7377c52af5df23cb89ccb7011b12b34f921fa1a3bf10ec3ec72e8c8b7fe1ade282a8b926467895198db8c6545ba33b0434dbcdd533bba SHA512 82cc5101f2545262f966acfa238b2d630a31da621840beabb670ba3ab9a988a4a29d80c81739fff259d98004579e3fe1f0a3221fd6253f7cfed94bf0024e395b
 AUX tests.patch 526 BLAKE2B 6a4c015707096bea03a5921387286a70289e8933ff75300aee8f070fec7a2870932e35f5b4a4ddbe2131611716c2493b99ed63f93fa34880c36fd918a04eb158 SHA512 fdcba450c84e92aaa5f7263b02f118d4d3832725cd3aa30b218f3ff1af4439406ae930ccba8c601b757173572d99a26c12a670b33ad7600e71695a165461459d
 DIST perception_pcl-1.7.2.tar.gz 81897 BLAKE2B 692f000337090c7a2354bf9626d391aa0fe390041042718e7dde7335c750137e7e1b6f939728ad1e2af3411e535ba63b42bc17f74b3535e38628f2b6c1c87036 SHA512 228b1d7d589bfd1460e8c58448b0d9257e86c1796b009853aeceeb1da20d8f46462d8c273a95804003ce3c43326c6575553d19b319aa9effcef4854347d5c3f9
-EBUILD pcl_ros-1.7.2-r1.ebuild 1035 BLAKE2B 965a9c0d963c84e4d7391af07cfdad5c21f08cdeeb782807cf4c7ae7e33d1841f06d6d1a680794f42657c13bfdade9db38db25a53055fa41fdb3ff96acb3e6c7 SHA512 ebc4f6eca8b9c9e899417fb27b0f7eca004015d5a3a88f03b578ec9b182ac8ca5c65cb18352f6294544ab19dc8fe03cd8bd70d8e8ec6fec1297b49bcfb7f8e81
-EBUILD pcl_ros-9999.ebuild 1035 BLAKE2B 965a9c0d963c84e4d7391af07cfdad5c21f08cdeeb782807cf4c7ae7e33d1841f06d6d1a680794f42657c13bfdade9db38db25a53055fa41fdb3ff96acb3e6c7 SHA512 ebc4f6eca8b9c9e899417fb27b0f7eca004015d5a3a88f03b578ec9b182ac8ca5c65cb18352f6294544ab19dc8fe03cd8bd70d8e8ec6fec1297b49bcfb7f8e81
+EBUILD pcl_ros-1.7.2-r1.ebuild 1219 BLAKE2B 202836a530955dd41a4e6cc62b7a85a9f086d7a11d741ef7c0877939fa3e32da648315aa715b2762e2932489cf7348ed97115ae3b4d76533a73860a84ca29550 SHA512 b42b4c26000a31c78ce98b57c2ec9770ed2627447b99a121d58f3f08bc940cecdd923e4c784d29543f9b1c361e7b6c5bcc3cc4e4a772e1015dca62eb6b443ddf
+EBUILD pcl_ros-9999.ebuild 1195 BLAKE2B 6e8600e3aa5583c00092d01a2be8011aae8ac50c47666a0115aa2cabc315af0bb8454229bdd1a8487ed6d9cf7a3284c28165ed94dcd5da487076d07f7090f983 SHA512 95a1295ff0d50a4ea60dae18174d4b620254308359f4d9a84ef78f11f22d90b9449f694cecd3a7c0a7dd1d6e82d2d337fa6f5fd98b63a1312907aa01049100f8
 MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/dev-ros/pcl_ros/files/pcl.patch b/dev-ros/pcl_ros/files/pcl.patch
new file mode 100644
index 000000000000..6847fff9c4ce
--- /dev/null
+++ b/dev-ros/pcl_ros/files/pcl.patch
@@ -0,0 +1,51 @@
+From bd21be2cb8ec6ad70a282c61b14aa9dd43edf9ff Mon Sep 17 00:00:00 2001
+From: Markus Vieth <39675748+mvieth@users.noreply.github.com>
+Date: Mon, 21 Jun 2021 19:42:58 +0200
+Subject: [PATCH] Use complete namespace for traits members (#330)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This prevents errors like this: error: ‘name’ is not a member of ‘pcl::detail::traits’; did you mean ‘pcl::traits::name’?
+The error appears for newer PCL versions (everything after commit https://github.com/PointCloudLibrary/pcl/commit/d39d3d3300746b952997e5bd2742dac7482aa5ab), but this change should also be fully compatible with older PCL versions.
+---
+ pcl_ros/include/pcl_ros/point_cloud.h | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/include/pcl_ros/point_cloud.h b/pcl_ros/include/pcl_ros/point_cloud.h
+index 93df7365..3c57f298 100644
+--- a/include/pcl_ros/point_cloud.h
++++ b/include/pcl_ros/point_cloud.h
+@@ -23,19 +23,19 @@ namespace pcl
+ 
+       template<typename U> void operator() ()
+       {
+-        const char* name = traits::name<PointT, U>::value;
++        const char* name = pcl::traits::name<PointT, U>::value;
+         std::uint32_t name_length = strlen(name);
+         stream_.next(name_length);
+         if (name_length > 0)
+           memcpy(stream_.advance(name_length), name, name_length);
+ 
+-        std::uint32_t offset = traits::offset<PointT, U>::value;
++        std::uint32_t offset = pcl::traits::offset<PointT, U>::value;
+         stream_.next(offset);
+ 
+-        std::uint8_t datatype = traits::datatype<PointT, U>::value;
++        std::uint8_t datatype = pcl::traits::datatype<PointT, U>::value;
+         stream_.next(datatype);
+ 
+-        std::uint32_t count = traits::datatype<PointT, U>::size;
++        std::uint32_t count = pcl::traits::datatype<PointT, U>::size;
+         stream_.next(count);
+       }
+ 
+@@ -49,7 +49,7 @@ namespace pcl
+ 
+       template<typename U> void operator() ()
+       {
+-        std::uint32_t name_length = strlen(traits::name<PointT, U>::value);
++        std::uint32_t name_length = strlen(pcl::traits::name<PointT, U>::value);
+         length += name_length + 13;
+       }
+ 
diff --git a/dev-ros/pcl_ros/pcl_ros-1.7.2-r1.ebuild b/dev-ros/pcl_ros/pcl_ros-1.7.2-r1.ebuild
index 8dc162b3fa11..274b509a8358 100644
--- a/dev-ros/pcl_ros/pcl_ros-1.7.2-r1.ebuild
+++ b/dev-ros/pcl_ros/pcl_ros-1.7.2-r1.ebuild
@@ -42,4 +42,10 @@ DEPEND="${RDEPEND}
 		dev-cpp/gtest
 	)
 "
-PATCHES=( "${FILESDIR}/tests.patch" )
+PATCHES=( "${FILESDIR}/tests.patch" "${FILESDIR}/pcl.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/pcl_ros/pcl_ros-9999.ebuild b/dev-ros/pcl_ros/pcl_ros-9999.ebuild
index 8dc162b3fa11..ca03876062f6 100644
--- a/dev-ros/pcl_ros/pcl_ros-9999.ebuild
+++ b/dev-ros/pcl_ros/pcl_ros-9999.ebuild
@@ -43,3 +43,9 @@ DEPEND="${RDEPEND}
 	)
 "
 PATCHES=( "${FILESDIR}/tests.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/poco_vendor/Manifest b/dev-ros/poco_vendor/Manifest
index 6e3b476efe5a..ed2a3ed72b96 100644
--- a/dev-ros/poco_vendor/Manifest
+++ b/dev-ros/poco_vendor/Manifest
@@ -1,4 +1,4 @@
-DIST poco_vendor-1.2.0.tar.gz 3145 BLAKE2B 6143f73ec9f741ff72147ac43d4876cb17553d8a4ba33d54b60f546cd2988389de4cbc1b3fcb0300f507f91610ba64284515a3d736417f611c3ffa6eb32d5aba SHA512 f38f00028ad1b6b236305761f53748597f1203e267488ba2a08b8c06ad155338a2c413b3e5e5501becdb09aec4600ae700d95765a5b4d0861b163e4f2a9ee413
-EBUILD poco_vendor-1.2.0.ebuild 874 BLAKE2B 2c66e812eca126879da8570ec0accd48dd4ee953451841da9648079975a7b213898b2c89dfa737abf338bd4a3616fd65e40ed157e9fbb10d1bd3799ac2b2a566 SHA512 cb26e5b21f294ea8fee595dfdb553075c121f77826aa9a679c921194c597cdac2d372c5c06b3e0e495957d6c17a75ecbb8849269340a80eefe6a63f8d9d0484f
+DIST poco_vendor-1.2.1.tar.gz 3156 BLAKE2B 3f9714c81046892463d043642eee5295a6d6436730a22f7b2e114e4d9163d11e50afab895b32b31b1985373d51ea10290b5b22176643890b2f9a2f82ac9ed4f3 SHA512 21dfa72bb413e710f1ac51bbeca18b6ae111078ca06d3aba456628071f6763a386794334d0565b5111e907bb9012dbb124b73fc141002cd77717931009fa1161
+EBUILD poco_vendor-1.2.1.ebuild 874 BLAKE2B 2c66e812eca126879da8570ec0accd48dd4ee953451841da9648079975a7b213898b2c89dfa737abf338bd4a3616fd65e40ed157e9fbb10d1bd3799ac2b2a566 SHA512 cb26e5b21f294ea8fee595dfdb553075c121f77826aa9a679c921194c597cdac2d372c5c06b3e0e495957d6c17a75ecbb8849269340a80eefe6a63f8d9d0484f
 EBUILD poco_vendor-9999.ebuild 1143 BLAKE2B 692aa6060f50c0ba8ce02a6c80511c5070f634a6f9815a658816c7dca5d272d42a6f5ec1467ff7f61d332a848150e1fae9e6c48d7f70e84d55f01423abbc59a8 SHA512 734cadbe328d4dde925282c0f72f1a99b4337531919ed3803f17867c910c0bbe52f8c77a5a44004c01ce7c2dc8bd99ec800185f80b2f6040346e3973f3abf7e2
 MISC metadata.xml 330 BLAKE2B 7880b16541c752a5d4fb5e729d4305ca3f6430a4fddb36ced24cbf6f2c75964cfbbc34ea8a16cd306b8d49412c822a17d4cf44639f1e2cb7218c437aa2500830 SHA512 b9af45457315c529a21cf6d3ca9711513aa662cf21b9de1eba6a4a0498c28525cd6175878836d5c90c72afcef201bea2ef54e50a2103d4c7c07156b6bbfbc908
diff --git a/dev-ros/poco_vendor/poco_vendor-1.2.0.ebuild b/dev-ros/poco_vendor/poco_vendor-1.2.1.ebuild
index 8665d91b1561..8665d91b1561 100644
--- a/dev-ros/poco_vendor/poco_vendor-1.2.0.ebuild
+++ b/dev-ros/poco_vendor/poco_vendor-1.2.1.ebuild
diff --git a/dev-ros/python_cmake_module/Manifest b/dev-ros/python_cmake_module/Manifest
index 754d0c045691..7b89963a8435 100644
--- a/dev-ros/python_cmake_module/Manifest
+++ b/dev-ros/python_cmake_module/Manifest
@@ -1,4 +1,4 @@
-DIST python_cmake_module-0.8.0.tar.gz 7026 BLAKE2B 38946d2499ee2d2d6bbdc261453ca9b1d3d3743a5e7b5facd88ce6fc1cd310a475b9a388039ef3a1c6f1990d987b1e7e121bab8b2c993b6cd2034835f4430671 SHA512 8c19ea65c6848c5df1efdbb4134e410af00ffdc9e980f761b448eaee04259fd6faa511c2b7fa8ee1ba2a8c5e3bd0c4a20cc7cdeba534512592a2809cf64f3ab7
-EBUILD python_cmake_module-0.8.0.ebuild 1113 BLAKE2B e7d8580459b468295c8a801b74b8079c7987ec0cde60d10761765a49bba31d6fef0945760048dbb6762fee722b94d9f1553a5fb5e92e2a7261f8a3e42a61d782 SHA512 09d97095ff454ea8f046b4dc6afddb65eae195508b1bfce94f83aa74554afac255d7e44906559b73df7aee23a3612661d88706d23bc948e8af8800c3c806db00
+DIST python_cmake_module-0.8.1.tar.gz 7047 BLAKE2B 79f6259913d42381443f3d93d48f67fb325abf423baf054465d83f641ca40f5bfad0acab0f19560968a280eaacecf56df253c90688d75144e25e27e28f3646b0 SHA512 f513031c9d0bbd5d05a1711074287a5ffd0c30be79d2f4849599ff539584f950c2e7c2322763358c8a1ac266da325f40fe9cd4d3a127cd6a9e4dfd83a3e4149c
+EBUILD python_cmake_module-0.8.1.ebuild 1113 BLAKE2B e7d8580459b468295c8a801b74b8079c7987ec0cde60d10761765a49bba31d6fef0945760048dbb6762fee722b94d9f1553a5fb5e92e2a7261f8a3e42a61d782 SHA512 09d97095ff454ea8f046b4dc6afddb65eae195508b1bfce94f83aa74554afac255d7e44906559b73df7aee23a3612661d88706d23bc948e8af8800c3c806db00
 EBUILD python_cmake_module-9999.ebuild 1113 BLAKE2B e7d8580459b468295c8a801b74b8079c7987ec0cde60d10761765a49bba31d6fef0945760048dbb6762fee722b94d9f1553a5fb5e92e2a7261f8a3e42a61d782 SHA512 09d97095ff454ea8f046b4dc6afddb65eae195508b1bfce94f83aa74554afac255d7e44906559b73df7aee23a3612661d88706d23bc948e8af8800c3c806db00
 MISC metadata.xml 338 BLAKE2B 09f1c53f00178afd4738a502187b87c5df6d08de21ed2495715cbab52073b307ce335fa2b29e5c4d77d84def4edaa04efa37add566b8d9a7d40a122d44b0e769 SHA512 b1de856f11f458954837430045b05058912bde28badc8c7e9082a66d72e5ded51a5914acbb50adbada11ee123137d25dec76132b17d2ced01d4cea1e67ea30e0
diff --git a/dev-ros/python_cmake_module/python_cmake_module-0.8.0.ebuild b/dev-ros/python_cmake_module/python_cmake_module-0.8.1.ebuild
index 150095c180f0..150095c180f0 100644
--- a/dev-ros/python_cmake_module/python_cmake_module-0.8.0.ebuild
+++ b/dev-ros/python_cmake_module/python_cmake_module-0.8.1.ebuild
diff --git a/dev-ros/python_qt_binding/Manifest b/dev-ros/python_qt_binding/Manifest
index c5d42cfd8e2d..4258752c6db7 100644
--- a/dev-ros/python_qt_binding/Manifest
+++ b/dev-ros/python_qt_binding/Manifest
@@ -1,4 +1,4 @@
-DIST python_qt_binding-0.4.3.tar.gz 12632 BLAKE2B 1403602262a18ce359d153234bb01ff3a6a90e91f9f4a84ddcd0551723c04c493526f51b81f750c90f78005d2c5b78cf77396ecd3132f1c505038bad8639b63d SHA512 103f791a27f8e8dad668a63c0bfc96facd93cbb043541bd036355d62c787759724fe0d66788c587c3cb68486e6d2732039d7c27f567ed48f2ecf21ce98d275af
-EBUILD python_qt_binding-0.4.3-r1.ebuild 462 BLAKE2B 11287745485473ecee2f88bf531b9193e90c0136cea9312364b3f12cdeaaa32314864a838371ec5d3b786dc121af8b9eaed62c14a54d6a4100ea7d74f8355a2c SHA512 66d6ec04d1f79dc79b1dc4097a0169ea1ece1e5cc0949f4a4db685eaf0731d0f7eb34e22448f3a5e3f1c8a1a8a0bfd085b3929a5686064d575bc0d3b23fec3a5
+DIST python_qt_binding-0.4.4.tar.gz 12776 BLAKE2B 519b10d2995fa508c1a2013740c82fe834f069b944c02b78168a51b8a87a86952189ea92bf214b13becd81454ba2120a644adf08527cf76db51bd9e459d24884 SHA512 db3f60c72bbce012b598ede1ad2e8beafb495dbd4ef2be15a6e75daec0ae97a618061849995cfac2b71af14d6e858febbf6b3b07e9acfeca3630af15cd24c1dc
+EBUILD python_qt_binding-0.4.4.ebuild 462 BLAKE2B 212a2f8978ed89e6c9ca7dcff9f7d71f64f0cc7734aa1d2c9698d7600a8dfd47f5384c8d7cde39a571c428352573657394611e84f4f82ef3718175594674de34 SHA512 a22195eacc02d1bb9b5edf36d10e21728e813f0fa10ad4e84d834f4ac0d1e670d5f6d80bb3d848d36b41bb2f2690774f238cecbc8fb0e136fe5c0aa0c7a7dbd7
 EBUILD python_qt_binding-9999.ebuild 462 BLAKE2B 11287745485473ecee2f88bf531b9193e90c0136cea9312364b3f12cdeaaa32314864a838371ec5d3b786dc121af8b9eaed62c14a54d6a4100ea7d74f8355a2c SHA512 66d6ec04d1f79dc79b1dc4097a0169ea1ece1e5cc0949f4a4db685eaf0731d0f7eb34e22448f3a5e3f1c8a1a8a0bfd085b3929a5686064d575bc0d3b23fec3a5
 MISC metadata.xml 349 BLAKE2B bc205c9c90eab1ea292d3e90f9f4a1d769c5202af60c57371152eaf80a50bdf6257cb2bb0ad6070a8443f0d19cc64e8493d5ec43e2701085f96c90ec6187a705 SHA512 f388f612a53c2de0a6cdece5a03d08e583f848592da6763b7995ff80e60756caca49da4318ded57ba09141facf717442141066142ed0691172f4e6b98a5ee266
diff --git a/dev-ros/python_qt_binding/python_qt_binding-0.4.3-r1.ebuild b/dev-ros/python_qt_binding/python_qt_binding-0.4.4.ebuild
index 09f3528474a0..a5642194ace7 100644
--- a/dev-ros/python_qt_binding/python_qt_binding-0.4.3-r1.ebuild
+++ b/dev-ros/python_qt_binding/python_qt_binding-0.4.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
diff --git a/dev-ros/robot_localization/Manifest b/dev-ros/robot_localization/Manifest
index 76833a8cb1be..d3fe5d81e992 100644
--- a/dev-ros/robot_localization/Manifest
+++ b/dev-ros/robot_localization/Manifest
@@ -1,5 +1,5 @@
 AUX nowerror.patch 478 BLAKE2B 9e2d2079524b14db178bebce4dac0471dee662ffc208d97ba0e4a2327b38800d077dc751db28220079cc274b25738b853f0d0302442a72acf2879ceca3c7d05f SHA512 11543749935449cf98dd92724adedcc0396dddff00a01fed0bf8ea53d53f7e96a7b1824771761137b531cf39fed2aed34c44c4841f2b5f129d34dddbea73ef05
-DIST robot_localization-2.7.2.tar.gz 6525425 BLAKE2B 6074f24731bce065639a29507bd330a391a60025381ccd5a90be2b4c4c1087deca9fce58fd9e623051be3b7ca0234c14430be973e6b57087a77fad449c3f3749 SHA512 02a0a555e81285c3062dd229d23daf2b9af02902f3ed7f5d35bdea8a08a1046befb035fb2a0f2e5ebb8c11998d8ecbd16e5aeb9f82757241e4c3f44fce3499f5
-EBUILD robot_localization-2.7.2.ebuild 1378 BLAKE2B 33b893a9ee237559bcc6260e8290e328ef93287b17a21482dcb3e59273b1176a5e6b1feaf83b092dccc2bf0a017220016bdb089b886450efdbcfb762083fca9a SHA512 40340340eea28c31436b040da28d171dcc480ea528c993af7772354aa329dde4eb80a6f83c6af8118eee5dce7a96fe36aaa816415374019152631b9d40b640da
-EBUILD robot_localization-9999.ebuild 1378 BLAKE2B 33b893a9ee237559bcc6260e8290e328ef93287b17a21482dcb3e59273b1176a5e6b1feaf83b092dccc2bf0a017220016bdb089b886450efdbcfb762083fca9a SHA512 40340340eea28c31436b040da28d171dcc480ea528c993af7772354aa329dde4eb80a6f83c6af8118eee5dce7a96fe36aaa816415374019152631b9d40b640da
+DIST robot_localization-2.7.3.tar.gz 6525696 BLAKE2B 74003020bb9e4ba84664ac60f5ba5122e77c55581b6e8f395bae92ef50b74cc0c6339d97c97e80a503a737d092454dace14707e73531a755b151e2c3c058b356 SHA512 2d0d7d029e01424eb35126bbe98b23b687f34331d177e4f7f5ee27a75382b72a27f1cdf90062b59ea4a471338cea57545c858479e04b0e1dd964cb04f4df7bfa
+EBUILD robot_localization-2.7.3.ebuild 1392 BLAKE2B 7d1948639ef236582dca668cba40b09c017691158e74ac253abad95165ecfb6e9eb6fb7910b27dbbc37fda6e40416c49033bfde6cd5da802e7b90d37dee3d819 SHA512 10f60a07af450854e5fff49b7ca668c82901859ff075c3559e58cbf1180633c42a41fff2e9cf1f072d4aef20c8f9fcd86954cb71f23b9b738f9ebaf88ba76f04
+EBUILD robot_localization-9999.ebuild 1392 BLAKE2B 7d1948639ef236582dca668cba40b09c017691158e74ac253abad95165ecfb6e9eb6fb7910b27dbbc37fda6e40416c49033bfde6cd5da802e7b90d37dee3d819 SHA512 10f60a07af450854e5fff49b7ca668c82901859ff075c3559e58cbf1180633c42a41fff2e9cf1f072d4aef20c8f9fcd86954cb71f23b9b738f9ebaf88ba76f04
 MISC metadata.xml 344 BLAKE2B 96e3dfb26e972a619ecd9e986e67272c46186bf0fe88721d42fcce8f94329417a30ddfb0b3b7a5f6b4dee8094bdeb842ba74da67a46db1270c4932dd3548d8d3 SHA512 682ee23502ff9b98b82cc8edb5dffafb1bde520ffa42ce8ab417e9c5dabab929286bb572e0988108201e29363315d12c8a5f55f841324fa339effe82ac1595c1
diff --git a/dev-ros/robot_localization/robot_localization-2.7.2.ebuild b/dev-ros/robot_localization/robot_localization-2.7.3.ebuild
index de42590f0e81..043bb3e92385 100644
--- a/dev-ros/robot_localization/robot_localization-2.7.2.ebuild
+++ b/dev-ros/robot_localization/robot_localization-2.7.3.ebuild
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-cpp/eigen:3
-	test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit )
+	test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit dev-cpp/gtest )
 "
 BDEPEND="dev-ros/roslint"
 
diff --git a/dev-ros/robot_localization/robot_localization-9999.ebuild b/dev-ros/robot_localization/robot_localization-9999.ebuild
index de42590f0e81..043bb3e92385 100644
--- a/dev-ros/robot_localization/robot_localization-9999.ebuild
+++ b/dev-ros/robot_localization/robot_localization-9999.ebuild
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-cpp/eigen:3
-	test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit )
+	test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit dev-cpp/gtest )
 "
 BDEPEND="dev-ros/roslint"
 
diff --git a/dev-ros/rosbag/Manifest b/dev-ros/rosbag/Manifest
index ac8d83897dad..717683d00929 100644
--- a/dev-ros/rosbag/Manifest
+++ b/dev-ros/rosbag/Manifest
@@ -1,9 +1,11 @@
 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.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 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.11.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.11.ebuild b/dev-ros/rosbag/rosbag-1.15.11.ebuild
new file mode 100644
index 000000000000..d6ca262b4d4e
--- /dev/null
+++ b/dev-ros/rosbag/rosbag-1.15.11.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 042cf1aacfcb..1a6c6f8f57dd 100644
--- a/dev-ros/rosbag_storage/Manifest
+++ b/dev-ros/rosbag_storage/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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.11.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.11.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.11.ebuild
new file mode 100644
index 000000000000..98d1abfadea8
--- /dev/null
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.15.11.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/rosbash/Manifest b/dev-ros/rosbash/Manifest
index 975980f04b31..dd89cb01bb64 100644
--- a/dev-ros/rosbash/Manifest
+++ b/dev-ros/rosbash/Manifest
@@ -2,8 +2,10 @@ AUX catkin_prefix.patch 443 BLAKE2B 4b366a582a5ebda3cfd644fb0319cd6cd07e9e983db9
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD rosbash-1.15.5.ebuild 408 BLAKE2B f1cd0b3d8f4b45b02da8d8e2416514af39d5c06eb92f4d6d798747db255227f5b7f47a527cf95889e6a3570912d1afef17ea8a26d05c8c9e97fb354f4c1fb980 SHA512 8fe645a744e36f11f80cb5d4d4fd8ac5e80426decb33e552aa26ab263d274a14a16bbd7c70de243ab7fba3470597473ba4735f51e078be515e1636448300f009
 EBUILD rosbash-1.15.6.ebuild 408 BLAKE2B f1cd0b3d8f4b45b02da8d8e2416514af39d5c06eb92f4d6d798747db255227f5b7f47a527cf95889e6a3570912d1afef17ea8a26d05c8c9e97fb354f4c1fb980 SHA512 8fe645a744e36f11f80cb5d4d4fd8ac5e80426decb33e552aa26ab263d274a14a16bbd7c70de243ab7fba3470597473ba4735f51e078be515e1636448300f009
 EBUILD rosbash-1.15.7.ebuild 408 BLAKE2B f1cd0b3d8f4b45b02da8d8e2416514af39d5c06eb92f4d6d798747db255227f5b7f47a527cf95889e6a3570912d1afef17ea8a26d05c8c9e97fb354f4c1fb980 SHA512 8fe645a744e36f11f80cb5d4d4fd8ac5e80426decb33e552aa26ab263d274a14a16bbd7c70de243ab7fba3470597473ba4735f51e078be515e1636448300f009
+EBUILD rosbash-1.15.8.ebuild 408 BLAKE2B 128f53622cac97f22f89acc18820facfa2994ee5da8dc99edf722f0b08098ccb971541502925ec7d1dbea6beae97a7060644e64278127125a9b1fd05917db21a SHA512 7ef15abeea17af2acd308d2457841f53b38f0f693d4a9749ce97733f1be1c057d3639015254496b951025b09737678e8e442c56d54c20d0d260b237b5cc605cf
 EBUILD rosbash-9999.ebuild 408 BLAKE2B f1cd0b3d8f4b45b02da8d8e2416514af39d5c06eb92f4d6d798747db255227f5b7f47a527cf95889e6a3570912d1afef17ea8a26d05c8c9e97fb354f4c1fb980 SHA512 8fe645a744e36f11f80cb5d4d4fd8ac5e80426decb33e552aa26ab263d274a14a16bbd7c70de243ab7fba3470597473ba4735f51e078be515e1636448300f009
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosbash/rosbash-1.15.8.ebuild b/dev-ros/rosbash/rosbash-1.15.8.ebuild
new file mode 100644
index 000000000000..2177afe2fcf5
--- /dev/null
+++ b/dev-ros/rosbash/rosbash-1.15.8.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/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Assorted shell commands for using ros with bash"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rospack"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
diff --git a/dev-ros/rosboost_cfg/Manifest b/dev-ros/rosboost_cfg/Manifest
index dce8a4532d98..58adc740c37e 100644
--- a/dev-ros/rosboost_cfg/Manifest
+++ b/dev-ros/rosboost_cfg/Manifest
@@ -1,8 +1,10 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD rosboost_cfg-1.15.5.ebuild 363 BLAKE2B 33ab4b86cebcd6c3ae2af1991c22159c54f49c9c83fda291683cab5df3ce2a98ed574d054df63574a20f693ac199b21d16735a5daaf544cfda4b5a4d2578cc09 SHA512 a9f65adaf5dbcdead5dbc662f7de8b729f00d52885bb4f86ae2bc5b55312abe0cc7d801c0cd7560fdfe04304914552fc4c428e18824bb25af38f6d6b8d071da6
 EBUILD rosboost_cfg-1.15.6.ebuild 363 BLAKE2B 33ab4b86cebcd6c3ae2af1991c22159c54f49c9c83fda291683cab5df3ce2a98ed574d054df63574a20f693ac199b21d16735a5daaf544cfda4b5a4d2578cc09 SHA512 a9f65adaf5dbcdead5dbc662f7de8b729f00d52885bb4f86ae2bc5b55312abe0cc7d801c0cd7560fdfe04304914552fc4c428e18824bb25af38f6d6b8d071da6
 EBUILD rosboost_cfg-1.15.7.ebuild 363 BLAKE2B 33ab4b86cebcd6c3ae2af1991c22159c54f49c9c83fda291683cab5df3ce2a98ed574d054df63574a20f693ac199b21d16735a5daaf544cfda4b5a4d2578cc09 SHA512 a9f65adaf5dbcdead5dbc662f7de8b729f00d52885bb4f86ae2bc5b55312abe0cc7d801c0cd7560fdfe04304914552fc4c428e18824bb25af38f6d6b8d071da6
+EBUILD rosboost_cfg-1.15.8.ebuild 363 BLAKE2B da3ac96f4bb836728226d82b7202f88ac210592d950a05f3980a97cc9b89a7cd42469a4e3a7068fa509994d7cd0b06f794073a72e95859cb380d4162ae64f91e SHA512 f7b7b23f0cb18d32cbd0af6e66a1a575398e1022af1de99408829676703d824d89e33cde8cd7ffcb8d6f27c118e7511c9f1350cc26ac103db90f07ba4b5b0a3d
 EBUILD rosboost_cfg-9999.ebuild 363 BLAKE2B 33ab4b86cebcd6c3ae2af1991c22159c54f49c9c83fda291683cab5df3ce2a98ed574d054df63574a20f693ac199b21d16735a5daaf544cfda4b5a4d2578cc09 SHA512 a9f65adaf5dbcdead5dbc662f7de8b729f00d52885bb4f86ae2bc5b55312abe0cc7d801c0cd7560fdfe04304914552fc4c428e18824bb25af38f6d6b8d071da6
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosboost_cfg/rosboost_cfg-1.15.8.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.15.8.ebuild
new file mode 100644
index 000000000000..68c0316e8510
--- /dev/null
+++ b/dev-ros/rosboost_cfg/rosboost_cfg-1.15.8.ebuild
@@ -0,0 +1,18 @@
+# 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"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for determining cflags/lflags/etc. of boost on your system"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbuild/Manifest b/dev-ros/rosbuild/Manifest
index 8c809d9c36a3..c91a52c75afe 100644
--- a/dev-ros/rosbuild/Manifest
+++ b/dev-ros/rosbuild/Manifest
@@ -1,8 +1,10 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD rosbuild-1.15.5.ebuild 356 BLAKE2B a3f80a31d0bfb733854ac89fa0435a9e084db5f05b32e8cb3132ee94d21ecf67f7025c1ba457706e5374aa7bee060895541a328763dcf95c7677f1d76fd9cae2 SHA512 aa88a7718ccb741df3c06d422790b9c0e01d27a23bb27de9a71935157b32766bfa67406135e6c51dde4265ba5b9693111b5e34d660a67cfa1d1b0769f86b55ea
 EBUILD rosbuild-1.15.6.ebuild 356 BLAKE2B a3f80a31d0bfb733854ac89fa0435a9e084db5f05b32e8cb3132ee94d21ecf67f7025c1ba457706e5374aa7bee060895541a328763dcf95c7677f1d76fd9cae2 SHA512 aa88a7718ccb741df3c06d422790b9c0e01d27a23bb27de9a71935157b32766bfa67406135e6c51dde4265ba5b9693111b5e34d660a67cfa1d1b0769f86b55ea
 EBUILD rosbuild-1.15.7.ebuild 356 BLAKE2B a3f80a31d0bfb733854ac89fa0435a9e084db5f05b32e8cb3132ee94d21ecf67f7025c1ba457706e5374aa7bee060895541a328763dcf95c7677f1d76fd9cae2 SHA512 aa88a7718ccb741df3c06d422790b9c0e01d27a23bb27de9a71935157b32766bfa67406135e6c51dde4265ba5b9693111b5e34d660a67cfa1d1b0769f86b55ea
+EBUILD rosbuild-1.15.8.ebuild 356 BLAKE2B 2b5a012d6c007b90fb8154678e6a5db9153b043a9c4601b1bfce6caefb51a208865e70798b452e192be6b0fd942b62c43c8e41a81433f36a01bc115e5b8ba040 SHA512 6ec6204e743e60e3a2dc7db1c69402e833ea4e3e8604bcdd9d241a352732ac0a5b850be7c56793b00fd51679f2a01a900bfd57fdac9891dfb092d967dbdc415d
 EBUILD rosbuild-9999.ebuild 356 BLAKE2B a3f80a31d0bfb733854ac89fa0435a9e084db5f05b32e8cb3132ee94d21ecf67f7025c1ba457706e5374aa7bee060895541a328763dcf95c7677f1d76fd9cae2 SHA512 aa88a7718ccb741df3c06d422790b9c0e01d27a23bb27de9a71935157b32766bfa67406135e6c51dde4265ba5b9693111b5e34d660a67cfa1d1b0769f86b55ea
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosbuild/rosbuild-1.15.8.ebuild b/dev-ros/rosbuild/rosbuild-1.15.8.ebuild
new file mode 100644
index 000000000000..a66d7458c4dc
--- /dev/null
+++ b/dev-ros/rosbuild/rosbuild-1.15.8.ebuild
@@ -0,0 +1,18 @@
+# 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"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Scripts for managing the CMake-based build system for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosclean/Manifest b/dev-ros/rosclean/Manifest
index 161390d525c9..9e7f4903bc09 100644
--- a/dev-ros/rosclean/Manifest
+++ b/dev-ros/rosclean/Manifest
@@ -1,8 +1,10 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD rosclean-1.15.5.ebuild 478 BLAKE2B dd60994c921a1667e9f6c29bb0a151bcf886887386ccc555f58b6daf77c0cb62413f4b6eea2982dd1cf29180097584c5ba588c059911e76b6a153b89f76fa305 SHA512 9ff32db2c13c6163cb7d303c2f4dcc0650486f8d79617f7c28841db4af7e7f8489396b3e27610c41fdf0f9fc45ca13bccf7a65e2b184fce462beb55d2eeb7378
 EBUILD rosclean-1.15.6.ebuild 478 BLAKE2B dd60994c921a1667e9f6c29bb0a151bcf886887386ccc555f58b6daf77c0cb62413f4b6eea2982dd1cf29180097584c5ba588c059911e76b6a153b89f76fa305 SHA512 9ff32db2c13c6163cb7d303c2f4dcc0650486f8d79617f7c28841db4af7e7f8489396b3e27610c41fdf0f9fc45ca13bccf7a65e2b184fce462beb55d2eeb7378
 EBUILD rosclean-1.15.7.ebuild 478 BLAKE2B dd60994c921a1667e9f6c29bb0a151bcf886887386ccc555f58b6daf77c0cb62413f4b6eea2982dd1cf29180097584c5ba588c059911e76b6a153b89f76fa305 SHA512 9ff32db2c13c6163cb7d303c2f4dcc0650486f8d79617f7c28841db4af7e7f8489396b3e27610c41fdf0f9fc45ca13bccf7a65e2b184fce462beb55d2eeb7378
+EBUILD rosclean-1.15.8.ebuild 478 BLAKE2B 5203b3ef3612407db9bf3d4e202569dabcbefab768a38c74b7b403a553d32e37c5a215f93382221f57f8113d730eb29ec4209726b9b6f21f0c9e5450f3eba280 SHA512 ba2ffb59731adbe0d7ac11b0af63bcdb12e3d6eacad46176a119d292807f404bc31ec6eeeaa1dfca1e2faf776603eec7ac79639e0d0521e2f0f73e1b980ecd3d
 EBUILD rosclean-9999.ebuild 478 BLAKE2B dd60994c921a1667e9f6c29bb0a151bcf886887386ccc555f58b6daf77c0cb62413f4b6eea2982dd1cf29180097584c5ba588c059911e76b6a153b89f76fa305 SHA512 9ff32db2c13c6163cb7d303c2f4dcc0650486f8d79617f7c28841db4af7e7f8489396b3e27610c41fdf0f9fc45ca13bccf7a65e2b184fce462beb55d2eeb7378
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosclean/rosclean-1.15.8.ebuild b/dev-ros/rosclean/rosclean-1.15.8.ebuild
new file mode 100644
index 000000000000..ab620eea3d8f
--- /dev/null
+++ b/dev-ros/rosclean/rosclean-1.15.8.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"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Cleanup filesystem resources (e.g. log files)"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
+"
diff --git a/dev-ros/roscpp/Manifest b/dev-ros/roscpp/Manifest
index 6725b0694c08..c4399fc9dd06 100644
--- a/dev-ros/roscpp/Manifest
+++ b/dev-ros/roscpp/Manifest
@@ -1,6 +1,8 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD roscpp-1.15.10.ebuild 606 BLAKE2B b8e78e2ed68bd093f06a3649296603d192b8e2c2632d13146585e5ab506c197ff704a911bf915ee752e67f4dbe24cf5585158d00d06f7014652ab85237003576 SHA512 6066703301141ca2d920c33dcc76e59c8fd4bc8ee428de58490a56989bc91188ed5a52b3df441dca451283a95bdc0f0a9298d5d1ff74649ad753ff1f3964ec7b
+EBUILD roscpp-1.15.11.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.11.ebuild b/dev-ros/roscpp/roscpp-1.15.11.ebuild
new file mode 100644
index 000000000000..7cee4461c7ca
--- /dev/null
+++ b/dev-ros/roscpp/roscpp-1.15.11.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/roscreate/Manifest b/dev-ros/roscreate/Manifest
index b274e5babfde..0a21c82add64 100644
--- a/dev-ros/roscreate/Manifest
+++ b/dev-ros/roscreate/Manifest
@@ -1,6 +1,8 @@
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD roscreate-1.15.6.ebuild 626 BLAKE2B c880b48ff7e31fb2325430bc6598fc183494f5b70c57c01daed20b5748dda199f288ef41991a1829d5a0730b8ca9788dcae36f566d55214ac4c370894d60bcb7 SHA512 b50345e9763f4e56bd789c723e29eb53403c4ee859ae39c4d9470ab2b7ab8fbf564ce83c34fd54faacbefc72f964588e879f212fd4d441038eb62a0c8001be26
 EBUILD roscreate-1.15.7.ebuild 626 BLAKE2B c880b48ff7e31fb2325430bc6598fc183494f5b70c57c01daed20b5748dda199f288ef41991a1829d5a0730b8ca9788dcae36f566d55214ac4c370894d60bcb7 SHA512 b50345e9763f4e56bd789c723e29eb53403c4ee859ae39c4d9470ab2b7ab8fbf564ce83c34fd54faacbefc72f964588e879f212fd4d441038eb62a0c8001be26
+EBUILD roscreate-1.15.8.ebuild 626 BLAKE2B c693496ae70386c6223d046e07448cfa8c6f1d50546f4c1a3f70a5821aae386f5c23b0a80b231855f5c2b226f4cb1f9733708e929dc19b3ff980620344ebbaf5 SHA512 787dd7bf22f32415830805254742c4bf7847544167aa71433233196a07225e4f25ed410a8bcddf05c9bd59ca0bed5354b2765d72456f434473c2ef0b362c188e
 EBUILD roscreate-9999.ebuild 626 BLAKE2B c880b48ff7e31fb2325430bc6598fc183494f5b70c57c01daed20b5748dda199f288ef41991a1829d5a0730b8ca9788dcae36f566d55214ac4c370894d60bcb7 SHA512 b50345e9763f4e56bd789c723e29eb53403c4ee859ae39c4d9470ab2b7ab8fbf564ce83c34fd54faacbefc72f964588e879f212fd4d441038eb62a0c8001be26
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roscreate/roscreate-1.15.8.ebuild b/dev-ros/roscreate/roscreate-1.15.8.ebuild
new file mode 100644
index 000000000000..fdca9421e8ab
--- /dev/null
+++ b/dev-ros/roscreate/roscreate-1.15.8.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"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roslib[${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/rosgraph/Manifest b/dev-ros/rosgraph/Manifest
index 9b606f904c9f..3a7c685c6968 100644
--- a/dev-ros/rosgraph/Manifest
+++ b/dev-ros/rosgraph/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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.11.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.11.ebuild b/dev-ros/rosgraph/rosgraph-1.15.11.ebuild
new file mode 100644
index 000000000000..79863bd48ac7
--- /dev/null
+++ b/dev-ros/rosgraph/rosgraph-1.15.11.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/roslang/Manifest b/dev-ros/roslang/Manifest
index 4785dc06f276..06c0b7cb773c 100644
--- a/dev-ros/roslang/Manifest
+++ b/dev-ros/roslang/Manifest
@@ -1,8 +1,10 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD roslang-1.15.5.ebuild 342 BLAKE2B ce1b9ba89906a027900c3c42de9cae98313517b93debbdaeb55855880791556c5747fafbfb08b55890644e46f784cb94e3f44f8cbd2ada1f47705993368d33f9 SHA512 694b372d7f0ac31cf86fc4cd55e8539a6d66cd245d8c301b20724dd22127cf098fa6f75595a3ed444d6058cb9de9a30b891fd13f4c911a4f903bdd1cd741fc50
 EBUILD roslang-1.15.6.ebuild 342 BLAKE2B ce1b9ba89906a027900c3c42de9cae98313517b93debbdaeb55855880791556c5747fafbfb08b55890644e46f784cb94e3f44f8cbd2ada1f47705993368d33f9 SHA512 694b372d7f0ac31cf86fc4cd55e8539a6d66cd245d8c301b20724dd22127cf098fa6f75595a3ed444d6058cb9de9a30b891fd13f4c911a4f903bdd1cd741fc50
 EBUILD roslang-1.15.7.ebuild 342 BLAKE2B ce1b9ba89906a027900c3c42de9cae98313517b93debbdaeb55855880791556c5747fafbfb08b55890644e46f784cb94e3f44f8cbd2ada1f47705993368d33f9 SHA512 694b372d7f0ac31cf86fc4cd55e8539a6d66cd245d8c301b20724dd22127cf098fa6f75595a3ed444d6058cb9de9a30b891fd13f4c911a4f903bdd1cd741fc50
+EBUILD roslang-1.15.8.ebuild 342 BLAKE2B ed208da62480d0e5ae90fe19496d9c3ee27e97e38b27d0c3f6921893e27db1369b8d7cdaf3d9a9ca5b97c21d792b651a1e7b4b1b2e45cde54cca4ac7f34424bb SHA512 aecdf1dec4b31407eacbf8c5ce0db4b421fe884293a135499226d31651271f1c6b267e31583ee7d0370c1fd7f4be74823792dc8c9177570c5d7b0270554c141e
 EBUILD roslang-9999.ebuild 342 BLAKE2B ce1b9ba89906a027900c3c42de9cae98313517b93debbdaeb55855880791556c5747fafbfb08b55890644e46f784cb94e3f44f8cbd2ada1f47705993368d33f9 SHA512 694b372d7f0ac31cf86fc4cd55e8539a6d66cd245d8c301b20724dd22127cf098fa6f75595a3ed444d6058cb9de9a30b891fd13f4c911a4f903bdd1cd741fc50
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roslang/roslang-1.15.8.ebuild b/dev-ros/roslang/roslang-1.15.8.ebuild
new file mode 100644
index 000000000000..a2c65f71cd37
--- /dev/null
+++ b/dev-ros/roslang/roslang-1.15.8.ebuild
@@ -0,0 +1,18 @@
+# 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"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common package for all ROS client libraries"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/roslaunch/Manifest b/dev-ros/roslaunch/Manifest
index 83939db14de7..c8014eabbc59 100644
--- a/dev-ros/roslaunch/Manifest
+++ b/dev-ros/roslaunch/Manifest
@@ -5,6 +5,8 @@ AUX roscore.xml.in 347 BLAKE2B 05c90bd6a2cffeaab16d1fb576e2cbe5768a848c5b6231af9
 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.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 EBUILD roslaunch-1.15.10-r1.ebuild 1615 BLAKE2B 520bb52d2fd22675c70bc5b78160016f00c5c3ecaed2fee42f111067c5c01699ec120b88fe7e150331b6b08d25705e79149734fbe07245d5879f41d37a6baf48 SHA512 61313cb9c6d97ed313577208471f4fe589213f8eb7bd04d9333de017175a17f7cf47ec77574204b4c91db7774c9ce5b470d8d67395225c502aa8baec6a7e985a
+EBUILD roslaunch-1.15.11.ebuild 1615 BLAKE2B 520bb52d2fd22675c70bc5b78160016f00c5c3ecaed2fee42f111067c5c01699ec120b88fe7e150331b6b08d25705e79149734fbe07245d5879f41d37a6baf48 SHA512 61313cb9c6d97ed313577208471f4fe589213f8eb7bd04d9333de017175a17f7cf47ec77574204b4c91db7774c9ce5b470d8d67395225c502aa8baec6a7e985a
 EBUILD roslaunch-9999.ebuild 1615 BLAKE2B 520bb52d2fd22675c70bc5b78160016f00c5c3ecaed2fee42f111067c5c01699ec120b88fe7e150331b6b08d25705e79149734fbe07245d5879f41d37a6baf48 SHA512 61313cb9c6d97ed313577208471f4fe589213f8eb7bd04d9333de017175a17f7cf47ec77574204b4c91db7774c9ce5b470d8d67395225c502aa8baec6a7e985a
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roslaunch/roslaunch-1.15.11.ebuild b/dev-ros/roslaunch/roslaunch-1.15.11.ebuild
new file mode 100644
index 000000000000..2cc8912dd83a
--- /dev/null
+++ b/dev-ros/roslaunch/roslaunch-1.15.11.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for easily launching multiple ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+
+CDEPEND="
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosout
+"
+
+RDEPEND="
+	${CDEPEND}
+	acct-group/ros
+	acct-user/ros
+"
+DEPEND="
+	${CDEPEND}
+	test? (
+		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/test_rosmaster
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${S}/../rosmaster/:${EPREFIX}/usr/share/ros_packages/rosparam:${EPREFIX}/usr/share/ros_packages/roslib:${EPREFIX}/usr/share/ros_packages/rosout"
+	ros-catkin_src_test
+}
+
+src_install() {
+	ros-catkin_src_install
+
+	dodir /etc/ros
+	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
+
+	newinitd "${FILESDIR}/roscore.initd" roscore
+	newconfd "${FILESDIR}/roscore.confd" roscore
+
+	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
+	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
+
+	doenvd "${FILESDIR}/40roslaunch"
+
+	# Needed by test_roslaunch
+	insinto /usr/share/${PN}
+	doins test/xml/noop.launch
+}
diff --git a/dev-ros/roslib/Manifest b/dev-ros/roslib/Manifest
index 089d358e74d4..da3e9648d2c3 100644
--- a/dev-ros/roslib/Manifest
+++ b/dev-ros/roslib/Manifest
@@ -1,6 +1,8 @@
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD roslib-1.15.6-r1.ebuild 657 BLAKE2B 1a0ad9cf1e77b2c99d5a07c2354b1dd1788398726cf62aa9a3b1e4650271fa92b02629f600c8f382a4fd42e80fb14b51f096c20a6b989b8f555126b5f8332279 SHA512 797943c61df32a63597d047d143a14dcd02bebc76a2d9f2a25d8ce930eea21cdc565fe180070147239b4a9b24fc8202089eaaa1e5b963ea097db01454e2d0294
 EBUILD roslib-1.15.7-r1.ebuild 657 BLAKE2B 1a0ad9cf1e77b2c99d5a07c2354b1dd1788398726cf62aa9a3b1e4650271fa92b02629f600c8f382a4fd42e80fb14b51f096c20a6b989b8f555126b5f8332279 SHA512 797943c61df32a63597d047d143a14dcd02bebc76a2d9f2a25d8ce930eea21cdc565fe180070147239b4a9b24fc8202089eaaa1e5b963ea097db01454e2d0294
+EBUILD roslib-1.15.8.ebuild 657 BLAKE2B 1a0ad9cf1e77b2c99d5a07c2354b1dd1788398726cf62aa9a3b1e4650271fa92b02629f600c8f382a4fd42e80fb14b51f096c20a6b989b8f555126b5f8332279 SHA512 797943c61df32a63597d047d143a14dcd02bebc76a2d9f2a25d8ce930eea21cdc565fe180070147239b4a9b24fc8202089eaaa1e5b963ea097db01454e2d0294
 EBUILD roslib-9999.ebuild 657 BLAKE2B 1a0ad9cf1e77b2c99d5a07c2354b1dd1788398726cf62aa9a3b1e4650271fa92b02629f600c8f382a4fd42e80fb14b51f096c20a6b989b8f555126b5f8332279 SHA512 797943c61df32a63597d047d143a14dcd02bebc76a2d9f2a25d8ce930eea21cdc565fe180070147239b4a9b24fc8202089eaaa1e5b963ea097db01454e2d0294
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roslib/roslib-1.15.8.ebuild b/dev-ros/roslib/roslib-1.15.8.ebuild
new file mode 100644
index 000000000000..ce412cbff520
--- /dev/null
+++ b/dev-ros/roslib/roslib-1.15.8.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"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Base dependencies and support libraries for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep ">=dev-python/rospkg-1.0.37[\${PYTHON_USEDEP}]")
+	dev-libs/boost:=[threads(+)]
+	dev-ros/rospack
+	dev-ros/ros_environment
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}/../../"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/roslz4/Manifest b/dev-ros/roslz4/Manifest
index 2784f22fd507..2503bcaffc09 100644
--- a/dev-ros/roslz4/Manifest
+++ b/dev-ros/roslz4/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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.11.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.11.ebuild b/dev-ros/roslz4/roslz4-1.15.11.ebuild
new file mode 100644
index 000000000000..bcbd9d65b47d
--- /dev/null
+++ b/dev-ros/roslz4/roslz4-1.15.11.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/rosmake/Manifest b/dev-ros/rosmake/Manifest
index cfb343bb9235..ce06e2f25a67 100644
--- a/dev-ros/rosmake/Manifest
+++ b/dev-ros/rosmake/Manifest
@@ -1,8 +1,10 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD rosmake-1.15.5.ebuild 464 BLAKE2B 79d72e2052108d28c39977c1cbebe80821dc836d3a9e709ac78fdf519b9e9cb9b90402890e5c2921418508c6e8f251004e861b992b71e897384d7c6bf346a49a SHA512 0e7c3bbf085636584863eddd17761d537647ec7beaa9f80a801ece101e6626afe8600d5c84b6770ed8028831fee2809f5ff7ddea279ef5c63d76aa4740ba7c79
 EBUILD rosmake-1.15.6.ebuild 464 BLAKE2B 79d72e2052108d28c39977c1cbebe80821dc836d3a9e709ac78fdf519b9e9cb9b90402890e5c2921418508c6e8f251004e861b992b71e897384d7c6bf346a49a SHA512 0e7c3bbf085636584863eddd17761d537647ec7beaa9f80a801ece101e6626afe8600d5c84b6770ed8028831fee2809f5ff7ddea279ef5c63d76aa4740ba7c79
 EBUILD rosmake-1.15.7.ebuild 464 BLAKE2B 79d72e2052108d28c39977c1cbebe80821dc836d3a9e709ac78fdf519b9e9cb9b90402890e5c2921418508c6e8f251004e861b992b71e897384d7c6bf346a49a SHA512 0e7c3bbf085636584863eddd17761d537647ec7beaa9f80a801ece101e6626afe8600d5c84b6770ed8028831fee2809f5ff7ddea279ef5c63d76aa4740ba7c79
+EBUILD rosmake-1.15.8.ebuild 464 BLAKE2B f9144487971d8fa50862515420d0ce69dea3635744a73086d236baaa91dc5598fd78b1e14dd9b650f47386a083b6566e9d6182a1dce530e9fabf3c75c42741c9 SHA512 18a9a93645dec8fdebf0719cab37245395618c204878c333c01dc4f2233086c763ccc27bf8ff18b5db027a6cea19de31b6735f12efc72aa4863b6393555e7b91
 EBUILD rosmake-9999.ebuild 464 BLAKE2B 79d72e2052108d28c39977c1cbebe80821dc836d3a9e709ac78fdf519b9e9cb9b90402890e5c2921418508c6e8f251004e861b992b71e897384d7c6bf346a49a SHA512 0e7c3bbf085636584863eddd17761d537647ec7beaa9f80a801ece101e6626afe8600d5c84b6770ed8028831fee2809f5ff7ddea279ef5c63d76aa4740ba7c79
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosmake/rosmake-1.15.8.ebuild b/dev-ros/rosmake/rosmake-1.15.8.ebuild
new file mode 100644
index 000000000000..8081da39d9a8
--- /dev/null
+++ b/dev-ros/rosmake/rosmake-1.15.8.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"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS dependency aware build tool"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
+"
diff --git a/dev-ros/rosmaster/Manifest b/dev-ros/rosmaster/Manifest
index 6f4051c73e32..90c0883341ae 100644
--- a/dev-ros/rosmaster/Manifest
+++ b/dev-ros/rosmaster/Manifest
@@ -1,8 +1,10 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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.11.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.11.ebuild b/dev-ros/rosmaster/rosmaster-1.15.11.ebuild
new file mode 100644
index 000000000000..44c1207c39a0
--- /dev/null
+++ b/dev-ros/rosmaster/rosmaster-1.15.11.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 5a9d85d8368a..d1e595d420e3 100644
--- a/dev-ros/rosmsg/Manifest
+++ b/dev-ros/rosmsg/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 EBUILD rosmsg-1.15.10.ebuild 1004 BLAKE2B 44fc7c48bd1c7180d2ad189969dc4ae3e7e77009f84361f0f75f328727fc0dfe4f97cf7d5ffbdb686359ecb69e371b45c41a57019d684e72ec3e64fc119141e4 SHA512 c04019456247c996ea0eb2600d28f7d5e298cb37ee784f433b67bff7185d36ec267e9d7d87419f956cfa4c31d42070446d2162049031bbfa071872a0f8e26f5f
+EBUILD rosmsg-1.15.11.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/rosmsg-1.15.11.ebuild b/dev-ros/rosmsg/rosmsg-1.15.11.ebuild
new file mode 100644
index 000000000000..d4be4db4044c
--- /dev/null
+++ b/dev-ros/rosmsg/rosmsg-1.15.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tools for displaying information about message and services"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	)
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}/../..:${EPREFIX}/usr/share/ros_packages/diagnostic_msgs:${EPREFIX}/usr/share/ros_packages/std_msgs:${EPREFIX}/usr/share/ros_packages/std_srvs"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/rosnode/Manifest b/dev-ros/rosnode/Manifest
index 842344a0f487..5dbc924b7f4f 100644
--- a/dev-ros/rosnode/Manifest
+++ b/dev-ros/rosnode/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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.11.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.11.ebuild b/dev-ros/rosnode/rosnode-1.15.11.ebuild
new file mode 100644
index 000000000000..991a2183e013
--- /dev/null
+++ b/dev-ros/rosnode/rosnode-1.15.11.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 6e1e7db5e02d..08a8004fdb73 100644
--- a/dev-ros/rosout/Manifest
+++ b/dev-ros/rosout/Manifest
@@ -1,8 +1,10 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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.11.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.11.ebuild b/dev-ros/rosout/rosout-1.15.11.ebuild
new file mode 100644
index 000000000000..f6b95451b596
--- /dev/null
+++ b/dev-ros/rosout/rosout-1.15.11.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 ee4efa984123..14e6eba5c77e 100644
--- a/dev-ros/rosparam/Manifest
+++ b/dev-ros/rosparam/Manifest
@@ -1,8 +1,10 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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.11.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.11.ebuild b/dev-ros/rosparam/rosparam-1.15.11.ebuild
new file mode 100644
index 000000000000..61ac1e322a5d
--- /dev/null
+++ b/dev-ros/rosparam/rosparam-1.15.11.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 3334a7f2739c..3598ed9a8490 100644
--- a/dev-ros/rospy/Manifest
+++ b/dev-ros/rospy/Manifest
@@ -1,8 +1,10 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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.11.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.11.ebuild b/dev-ros/rospy/rospy-1.15.11.ebuild
new file mode 100644
index 000000000000..47344d9c9de6
--- /dev/null
+++ b/dev-ros/rospy/rospy-1.15.11.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/rosserial_arduino/Manifest b/dev-ros/rosserial_arduino/Manifest
index d7df19e7d286..09a5095fb536 100644
--- a/dev-ros/rosserial_arduino/Manifest
+++ b/dev-ros/rosserial_arduino/Manifest
@@ -1,6 +1,8 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
 DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
+DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
 EBUILD rosserial_arduino-0.8.0.ebuild 548 BLAKE2B 27d998f1f8a5d3c23db89c917c6e87f41a98a39f6c58fac15aec0263b87ec59c04e0cfb12ebd7e0ba8f76a01d67d4b1828091fca1c095b8ca601c92366c9eed8 SHA512 e79b4cf7b54d944a8c818ef0696645833351cd6588d1db7cf476b260819bcf5c91a9578c1f6d0d34f7cd3529a62cec9d32199b36a5f9976914c28ce533150e6b
 EBUILD rosserial_arduino-0.9.1.ebuild 548 BLAKE2B 27d998f1f8a5d3c23db89c917c6e87f41a98a39f6c58fac15aec0263b87ec59c04e0cfb12ebd7e0ba8f76a01d67d4b1828091fca1c095b8ca601c92366c9eed8 SHA512 e79b4cf7b54d944a8c818ef0696645833351cd6588d1db7cf476b260819bcf5c91a9578c1f6d0d34f7cd3529a62cec9d32199b36a5f9976914c28ce533150e6b
+EBUILD rosserial_arduino-0.9.2.ebuild 548 BLAKE2B a1271d513c2460988419b0f2ec3bc35d47dcc44b73c187e7eb1de5bf2ec97afce57ffd77097e25020be5b7686873c45ddc6a8ca67a61178a092f73ca1fa6ca5c SHA512 748b80c3f90b7313fcb94f25e086f5ed9fe52981c3e6b5972f3931130ee5b25a2cd61337c7b1acc4dd5627c63bf09d427ffb008fa0d0439adb533ac3f90e8484
 EBUILD rosserial_arduino-9999.ebuild 548 BLAKE2B 27d998f1f8a5d3c23db89c917c6e87f41a98a39f6c58fac15aec0263b87ec59c04e0cfb12ebd7e0ba8f76a01d67d4b1828091fca1c095b8ca601c92366c9eed8 SHA512 e79b4cf7b54d944a8c818ef0696645833351cd6588d1db7cf476b260819bcf5c91a9578c1f6d0d34f7cd3529a62cec9d32199b36a5f9976914c28ce533150e6b
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_arduino/rosserial_arduino-0.9.2.ebuild b/dev-ros/rosserial_arduino/rosserial_arduino-0.9.2.ebuild
new file mode 100644
index 000000000000..0da31aca2d16
--- /dev/null
+++ b/dev-ros/rosserial_arduino/rosserial_arduino-0.9.2.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-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Arduino/AVR Platforms"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_client/Manifest b/dev-ros/rosserial_client/Manifest
index 702acbc8b63c..14832f666847 100644
--- a/dev-ros/rosserial_client/Manifest
+++ b/dev-ros/rosserial_client/Manifest
@@ -1,6 +1,8 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
 DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
+DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
 EBUILD rosserial_client-0.8.0.ebuild 539 BLAKE2B da74557635d36b5eca90c602c08fd019adb016983e8020ed323494364d72e04ad8a0a9ec10c656385a4b6007c19a6f317071d1867cefb54ef3287bcfc1fa838e SHA512 652104de1796d68783793fee30369672263acd9d22263aee7171399dfec0fc2dc82561b54784e4e5dfd68251fbd51e22f33980b10370741c9aabc4be2fb4baf3
 EBUILD rosserial_client-0.9.1.ebuild 539 BLAKE2B da74557635d36b5eca90c602c08fd019adb016983e8020ed323494364d72e04ad8a0a9ec10c656385a4b6007c19a6f317071d1867cefb54ef3287bcfc1fa838e SHA512 652104de1796d68783793fee30369672263acd9d22263aee7171399dfec0fc2dc82561b54784e4e5dfd68251fbd51e22f33980b10370741c9aabc4be2fb4baf3
+EBUILD rosserial_client-0.9.2.ebuild 539 BLAKE2B ac54f0f24ff772c2ff086530b72b5e31c850e78dcdbba2992284c59142efa9644a89dc81665f0b6bb6fe1128872c6cc4541e3da6df7b8ad1ba7e95e67f730a17 SHA512 39e8c838aca0de10ddcf112864acf79cab09aa8604310deb2be42b957d89d31d60c2c5059ad449a8a1150b32127e71efd36256edeb15f9af6d1f3f4c91cc632f
 EBUILD rosserial_client-9999.ebuild 539 BLAKE2B da74557635d36b5eca90c602c08fd019adb016983e8020ed323494364d72e04ad8a0a9ec10c656385a4b6007c19a6f317071d1867cefb54ef3287bcfc1fa838e SHA512 652104de1796d68783793fee30369672263acd9d22263aee7171399dfec0fc2dc82561b54784e4e5dfd68251fbd51e22f33980b10370741c9aabc4be2fb4baf3
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_client/rosserial_client-0.9.2.ebuild b/dev-ros/rosserial_client/rosserial_client-0.9.2.ebuild
new file mode 100644
index 000000000000..96de6ddc1bce
--- /dev/null
+++ b/dev-ros/rosserial_client/rosserial_client-0.9.2.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-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Generalized client side source for rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_embeddedlinux/Manifest b/dev-ros/rosserial_embeddedlinux/Manifest
index 9ce8403b8368..d4dde7b95f5a 100644
--- a/dev-ros/rosserial_embeddedlinux/Manifest
+++ b/dev-ros/rosserial_embeddedlinux/Manifest
@@ -1,6 +1,8 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
 DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
+DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
 EBUILD rosserial_embeddedlinux-0.8.0.ebuild 687 BLAKE2B b3b7e24440c0d323fa83f59638b18260e491b33f1956077d35b023a329d2a9d6b70af75e08d624ead4b07be8e7cf5d5081081336c90b5a669f7ea4fcc311318f SHA512 439b2dfdba81bef226851cf69fc56481d72b107ebf5437b46bc3a716417c4af2def56d4e78b345c9c4651fb7037c6c011079d4a24ed7abaec3bfb09319b51b97
 EBUILD rosserial_embeddedlinux-0.9.1.ebuild 687 BLAKE2B b3b7e24440c0d323fa83f59638b18260e491b33f1956077d35b023a329d2a9d6b70af75e08d624ead4b07be8e7cf5d5081081336c90b5a669f7ea4fcc311318f SHA512 439b2dfdba81bef226851cf69fc56481d72b107ebf5437b46bc3a716417c4af2def56d4e78b345c9c4651fb7037c6c011079d4a24ed7abaec3bfb09319b51b97
+EBUILD rosserial_embeddedlinux-0.9.2.ebuild 687 BLAKE2B 46e551d2047b5abffec7252d9c717f28704e858c78fa189a9571f662474522ee43ec202bc0b4d01e743cdf9fb32bc35092dc7787379dbf19bd1f76e245ee5f58 SHA512 32682365867fca82b12fd2e4f92b6c2518c8fcec44d97057922475b762fba5c0c3458bc7f1333ab7e532eafecc94296c42db1c1798e7e029051f806f5a24a606
 EBUILD rosserial_embeddedlinux-9999.ebuild 687 BLAKE2B b3b7e24440c0d323fa83f59638b18260e491b33f1956077d35b023a329d2a9d6b70af75e08d624ead4b07be8e7cf5d5081081336c90b5a669f7ea4fcc311318f SHA512 439b2dfdba81bef226851cf69fc56481d72b107ebf5437b46bc3a716417c4af2def56d4e78b345c9c4651fb7037c6c011079d4a24ed7abaec3bfb09319b51b97
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.9.2.ebuild b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.9.2.ebuild
new file mode 100644
index 000000000000..152ee753e375
--- /dev/null
+++ b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.9.2.ebuild
@@ -0,0 +1,24 @@
+# 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/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Embedded Linux Enviroments"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_msgs/Manifest b/dev-ros/rosserial_msgs/Manifest
index 86803e8d22f6..828f3a83f678 100644
--- a/dev-ros/rosserial_msgs/Manifest
+++ b/dev-ros/rosserial_msgs/Manifest
@@ -1,6 +1,8 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
 DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
+DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
 EBUILD rosserial_msgs-0.8.0.ebuild 389 BLAKE2B 234bcf626bfc4630ee1f5b8f51f2ad1b647d2f5192f90963f857199e1e19ae71d1ecec963903b0b9b094c85630f83eb1bc51a17b54d12431c127a3bd4b31d4a1 SHA512 2ab9b776da7d158a66da5f46bd4237df51d4e3a6a469839a84b9aabcf5c9ee5e1b295eddbeff926b7e1ba1bd1e6baf7d09a9dfbf46da21fbb6c55e51ec020e1a
 EBUILD rosserial_msgs-0.9.1.ebuild 389 BLAKE2B 234bcf626bfc4630ee1f5b8f51f2ad1b647d2f5192f90963f857199e1e19ae71d1ecec963903b0b9b094c85630f83eb1bc51a17b54d12431c127a3bd4b31d4a1 SHA512 2ab9b776da7d158a66da5f46bd4237df51d4e3a6a469839a84b9aabcf5c9ee5e1b295eddbeff926b7e1ba1bd1e6baf7d09a9dfbf46da21fbb6c55e51ec020e1a
+EBUILD rosserial_msgs-0.9.2.ebuild 389 BLAKE2B 77bcabc8d7d8e37eeb3df5b94e7500f4ab454e842cc0d846c7ba54cc35c27e8fd93f11c6fd210a10bb1c3690f1a33874b124f42356ba6d464df7fe918fb46c29 SHA512 8f4627ef74b0f1596aed71088e5f82a12866cb314d8e67800dfcb47df1dba150ded7bb6dd0a97a6c8093044da3e0b959ec7c752d93dd90048324ebd308961def
 EBUILD rosserial_msgs-9999.ebuild 389 BLAKE2B 234bcf626bfc4630ee1f5b8f51f2ad1b647d2f5192f90963f857199e1e19ae71d1ecec963903b0b9b094c85630f83eb1bc51a17b54d12431c127a3bd4b31d4a1 SHA512 2ab9b776da7d158a66da5f46bd4237df51d4e3a6a469839a84b9aabcf5c9ee5e1b295eddbeff926b7e1ba1bd1e6baf7d09a9dfbf46da21fbb6c55e51ec020e1a
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_msgs/rosserial_msgs-0.9.2.ebuild b/dev-ros/rosserial_msgs/rosserial_msgs-0.9.2.ebuild
new file mode 100644
index 000000000000..cb49f6afd33e
--- /dev/null
+++ b/dev-ros/rosserial_msgs/rosserial_msgs-0.9.2.ebuild
@@ -0,0 +1,18 @@
+# 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/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for automatic topic configuration using rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_python/Manifest b/dev-ros/rosserial_python/Manifest
index e4e6f9c14518..340367b9438a 100644
--- a/dev-ros/rosserial_python/Manifest
+++ b/dev-ros/rosserial_python/Manifest
@@ -1,6 +1,8 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
 DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
+DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
 EBUILD rosserial_python-0.8.0.ebuild 586 BLAKE2B 0cae58d4cf90d4a0f43961f61bfd5b3446a536354ec02a36adfbccca8c87e6ad1ad53ada5b8f6133b2d90fdfc3e51ced9189fda0e1a01692767eb8972d1dee29 SHA512 a94d8dacfb76b95f725552e8ff07155b849ff82a9abb37c96239b8930c838526e8fc8655d32ea70a6368d81e643f9c57895fa5bad7fc5527e4994b05d8e838b6
 EBUILD rosserial_python-0.9.1.ebuild 586 BLAKE2B 0cae58d4cf90d4a0f43961f61bfd5b3446a536354ec02a36adfbccca8c87e6ad1ad53ada5b8f6133b2d90fdfc3e51ced9189fda0e1a01692767eb8972d1dee29 SHA512 a94d8dacfb76b95f725552e8ff07155b849ff82a9abb37c96239b8930c838526e8fc8655d32ea70a6368d81e643f9c57895fa5bad7fc5527e4994b05d8e838b6
+EBUILD rosserial_python-0.9.2.ebuild 586 BLAKE2B d40520623148d422e46a3bfc6b72bdb16506c0cf584f063f4bbcf929cab5f0c0932352475ff57e16a43639eb04696b78e6369c78604d8f3d5a0e67e7066ccf96 SHA512 de09e5dc1a1b70b4a375be0b9204750db412deff7da347f6a31afb93415b08e34346faf924d9b11fea73c55dc151e51cb78ce732cf8be0df1b0efaae9ba66683
 EBUILD rosserial_python-9999.ebuild 586 BLAKE2B 0cae58d4cf90d4a0f43961f61bfd5b3446a536354ec02a36adfbccca8c87e6ad1ad53ada5b8f6133b2d90fdfc3e51ced9189fda0e1a01692767eb8972d1dee29 SHA512 a94d8dacfb76b95f725552e8ff07155b849ff82a9abb37c96239b8930c838526e8fc8655d32ea70a6368d81e643f9c57895fa5bad7fc5527e4994b05d8e838b6
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_python/rosserial_python-0.9.2.ebuild b/dev-ros/rosserial_python/rosserial_python-0.9.2.ebuild
new file mode 100644
index 000000000000..29c26a180d10
--- /dev/null
+++ b/dev-ros/rosserial_python/rosserial_python-0.9.2.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-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A Python-based implementation of the ROS serial protocol"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyserial[\${PYTHON_USEDEP}]")
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_server/Manifest b/dev-ros/rosserial_server/Manifest
index d40e21ed47dc..0f96af5e24a4 100644
--- a/dev-ros/rosserial_server/Manifest
+++ b/dev-ros/rosserial_server/Manifest
@@ -1,4 +1,6 @@
 DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
+DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
 EBUILD rosserial_server-0.9.1-r1.ebuild 478 BLAKE2B 40aafdcd8a78e1ae39fcecf43793d4531fc537e360d08c24cf66ca2e6e271e106cfdf1a55789cb46ffc6095010dd7e137620362bb30e82e78da61e999062d4fb SHA512 b625be0970b7c8775aff820ecfe249d457175eec8a7783af881a8b8979f379e3fe94d5f3b25531a14b25e1f99ecae33249158365e66d67274788dd53df3c87be
+EBUILD rosserial_server-0.9.2.ebuild 478 BLAKE2B 40aafdcd8a78e1ae39fcecf43793d4531fc537e360d08c24cf66ca2e6e271e106cfdf1a55789cb46ffc6095010dd7e137620362bb30e82e78da61e999062d4fb SHA512 b625be0970b7c8775aff820ecfe249d457175eec8a7783af881a8b8979f379e3fe94d5f3b25531a14b25e1f99ecae33249158365e66d67274788dd53df3c87be
 EBUILD rosserial_server-9999.ebuild 478 BLAKE2B 40aafdcd8a78e1ae39fcecf43793d4531fc537e360d08c24cf66ca2e6e271e106cfdf1a55789cb46ffc6095010dd7e137620362bb30e82e78da61e999062d4fb SHA512 b625be0970b7c8775aff820ecfe249d457175eec8a7783af881a8b8979f379e3fe94d5f3b25531a14b25e1f99ecae33249158365e66d67274788dd53df3c87be
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_server/rosserial_server-0.9.2.ebuild b/dev-ros/rosserial_server/rosserial_server-0.9.2.ebuild
new file mode 100644
index 000000000000..dbc6e13e84e2
--- /dev/null
+++ b/dev-ros/rosserial_server/rosserial_server-0.9.2.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-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of the rosserial server side"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/topic_tools
+	dev-libs/boost:=[threads(+)]
+"
+DEPEND="${RDEPEND}
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/rosserial_tivac/Manifest b/dev-ros/rosserial_tivac/Manifest
index eb54ca6bfffc..77d595d36a86 100644
--- a/dev-ros/rosserial_tivac/Manifest
+++ b/dev-ros/rosserial_tivac/Manifest
@@ -1,6 +1,8 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
 DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
+DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
 EBUILD rosserial_tivac-0.8.0.ebuild 496 BLAKE2B a5a535ad4c877c8fb72eb7fa298b7f02c1ce52faecf9aa6a4a8bc9d59c86c9d494b75abfafd8003f060c1cf6fd93895e0496e7a1989365953b155bc1bc5e71a8 SHA512 cfc3d38a7ad8dab2b095df719a9cd4d108b4425858b3ab7cb2834545a3066c1f3faa5be0ed2c044829d16495eca3d5d66b8f3811c1c39c0a3268d0c135840e51
 EBUILD rosserial_tivac-0.9.1.ebuild 496 BLAKE2B a5a535ad4c877c8fb72eb7fa298b7f02c1ce52faecf9aa6a4a8bc9d59c86c9d494b75abfafd8003f060c1cf6fd93895e0496e7a1989365953b155bc1bc5e71a8 SHA512 cfc3d38a7ad8dab2b095df719a9cd4d108b4425858b3ab7cb2834545a3066c1f3faa5be0ed2c044829d16495eca3d5d66b8f3811c1c39c0a3268d0c135840e51
+EBUILD rosserial_tivac-0.9.2.ebuild 496 BLAKE2B 55adc1544d5ff023753681476d365ae0c6cf14588e0d85ef6b5d6dcff6868955432aacc2861612f6c7256ab1f01afa5143c7958eaf556ec80c32d6a4d50e6dbe SHA512 862d87900f990a70d6e882718f0d974e3be5f20a0ca805f1d8214c135a0cdc1c77f7a47cf580ff55a1b3da5655234d0b6c7714aaf827f66cfbd95e6853dc7bed
 EBUILD rosserial_tivac-9999.ebuild 496 BLAKE2B a5a535ad4c877c8fb72eb7fa298b7f02c1ce52faecf9aa6a4a8bc9d59c86c9d494b75abfafd8003f060c1cf6fd93895e0496e7a1989365953b155bc1bc5e71a8 SHA512 cfc3d38a7ad8dab2b095df719a9cd4d108b4425858b3ab7cb2834545a3066c1f3faa5be0ed2c044829d16495eca3d5d66b8f3811c1c39c0a3268d0c135840e51
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_tivac/rosserial_tivac-0.9.2.ebuild b/dev-ros/rosserial_tivac/rosserial_tivac-0.9.2.ebuild
new file mode 100644
index 000000000000..2010ac8ddba2
--- /dev/null
+++ b/dev-ros/rosserial_tivac/rosserial_tivac-0.9.2.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-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Definitions for rosserial_client targets for TivaC Launchpad evaluation boards."
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_windows/Manifest b/dev-ros/rosserial_windows/Manifest
index c305869a592e..f8c48fa00515 100644
--- a/dev-ros/rosserial_windows/Manifest
+++ b/dev-ros/rosserial_windows/Manifest
@@ -1,6 +1,8 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
 DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
+DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
 EBUILD rosserial_windows-0.8.0.ebuild 702 BLAKE2B d93f97f30b94f86ea7b5fd0342e4e9cf51fab2e1b5b0008e4ff7f4e1a12f6a5a24c50c7e2ddba0c79abb692bb9a7a71bef20ac7e8c719f7cedc960f0c814ce42 SHA512 dd6fcb093c3973180c29c29f159c09b4984d0a761df8700aca2cb0dc139c322e6376da9ff9433b17ef659cfdfe23a1bc0714159f013e3f928bdad4fac283fb09
 EBUILD rosserial_windows-0.9.1.ebuild 702 BLAKE2B d93f97f30b94f86ea7b5fd0342e4e9cf51fab2e1b5b0008e4ff7f4e1a12f6a5a24c50c7e2ddba0c79abb692bb9a7a71bef20ac7e8c719f7cedc960f0c814ce42 SHA512 dd6fcb093c3973180c29c29f159c09b4984d0a761df8700aca2cb0dc139c322e6376da9ff9433b17ef659cfdfe23a1bc0714159f013e3f928bdad4fac283fb09
+EBUILD rosserial_windows-0.9.2.ebuild 702 BLAKE2B 8ef037819bdc4433357d06665e2be29c1b3a175d1084f2b15bf2d75e46ceadcb19e7c6c0077a1d5e209ed7e686688ed7a5dd0e5149127c9a503afbc0677ce156 SHA512 5cb1a8537b9c61bbcf1f8aad9090440bdda81a18cff2c13545dedf239cd037c1c54c895b98a9acdddacfeb01e74a8261bb276a6d27dd3416a0e872a5c3b93125
 EBUILD rosserial_windows-9999.ebuild 702 BLAKE2B d93f97f30b94f86ea7b5fd0342e4e9cf51fab2e1b5b0008e4ff7f4e1a12f6a5a24c50c7e2ddba0c79abb692bb9a7a71bef20ac7e8c719f7cedc960f0c814ce42 SHA512 dd6fcb093c3973180c29c29f159c09b4984d0a761df8700aca2cb0dc139c322e6376da9ff9433b17ef659cfdfe23a1bc0714159f013e3f928bdad4fac283fb09
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_windows/rosserial_windows-0.9.2.ebuild b/dev-ros/rosserial_windows/rosserial_windows-0.9.2.ebuild
new file mode 100644
index 000000000000..5741c715553c
--- /dev/null
+++ b/dev-ros/rosserial_windows/rosserial_windows-0.9.2.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-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Windows Platforms"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_xbee/Manifest b/dev-ros/rosserial_xbee/Manifest
index d4790999caba..2613eeaaf889 100644
--- a/dev-ros/rosserial_xbee/Manifest
+++ b/dev-ros/rosserial_xbee/Manifest
@@ -1,6 +1,8 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
 DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
+DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
 EBUILD rosserial_xbee-0.8.0.ebuild 649 BLAKE2B fbd016a5c96d7c313f2aa06aaf1efa36d71f637e5924339a001bb501673dacae88ea0522267dfd11657fde1f1e1cccd3f0df80e50aaee0dbdb31ec5698efda5d SHA512 32e5ac40d57fc52b2eb1288dddb8361360f2f698fe7e313e719fe047abc5411e5f0fbc66566ca6922c4dff73eb11147e54765988b202983d6418edb74ce145c6
 EBUILD rosserial_xbee-0.9.1.ebuild 649 BLAKE2B fbd016a5c96d7c313f2aa06aaf1efa36d71f637e5924339a001bb501673dacae88ea0522267dfd11657fde1f1e1cccd3f0df80e50aaee0dbdb31ec5698efda5d SHA512 32e5ac40d57fc52b2eb1288dddb8361360f2f698fe7e313e719fe047abc5411e5f0fbc66566ca6922c4dff73eb11147e54765988b202983d6418edb74ce145c6
+EBUILD rosserial_xbee-0.9.2.ebuild 649 BLAKE2B 2caf4bfb3d9312fe8442f067844432e8a6049547009ec307b53fd572c141e45a1521b5f584d2c9783e3b674915e03944bb34c103d8657377aceddf170694bcdb SHA512 18debed2bad910dc9ed37389e29e0fe0de390f4cff492e991bc174f2add0ad9e6a0010d4397ead40d02d34032e18e1f5d48376e5999b7a39706afb8105e2279c
 EBUILD rosserial_xbee-9999.ebuild 649 BLAKE2B fbd016a5c96d7c313f2aa06aaf1efa36d71f637e5924339a001bb501673dacae88ea0522267dfd11657fde1f1e1cccd3f0df80e50aaee0dbdb31ec5698efda5d SHA512 32e5ac40d57fc52b2eb1288dddb8361360f2f698fe7e313e719fe047abc5411e5f0fbc66566ca6922c4dff73eb11147e54765988b202983d6418edb74ce145c6
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_xbee/rosserial_xbee-0.9.2.ebuild b/dev-ros/rosserial_xbee/rosserial_xbee-0.9.2.ebuild
new file mode 100644
index 000000000000..0c7384c1e7c8
--- /dev/null
+++ b/dev-ros/rosserial_xbee/rosserial_xbee-0.9.2.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-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools to do communicate between rosserial nodes connected to an xbee"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyserial[\${PYTHON_USEDEP}]")
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosserial_python[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/Manifest b/dev-ros/rosservice/Manifest
index c2017eb445ec..9de2d2a86ed7 100644
--- a/dev-ros/rosservice/Manifest
+++ b/dev-ros/rosservice/Manifest
@@ -1,8 +1,10 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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.11.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.11.ebuild b/dev-ros/rosservice/rosservice-1.15.11.ebuild
new file mode 100644
index 000000000000..a7c61cee1d7d
--- /dev/null
+++ b/dev-ros/rosservice/rosservice-1.15.11.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 2cbe12251465..a992d4a1e2a9 100644
--- a/dev-ros/rostest/Manifest
+++ b/dev-ros/rostest/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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-r1.ebuild 742 BLAKE2B 34a90031dea413cd529733e0a9bd2146d30a7409e69005299922dad54e3abd9276a3fcb7e3a2146ab9759e5295d502e4b3b108feedde0303ddab25c41c39741c SHA512 f6cf32c8a596f1c0035b42ce9851570b5262b04f19e53af13b0685e384d83d1e019a2f36018917db14b0f2b933761801a9742db44cc2fcd178c29926ea2348f6
+EBUILD rostest-1.15.11.ebuild 742 BLAKE2B 34a90031dea413cd529733e0a9bd2146d30a7409e69005299922dad54e3abd9276a3fcb7e3a2146ab9759e5295d502e4b3b108feedde0303ddab25c41c39741c SHA512 f6cf32c8a596f1c0035b42ce9851570b5262b04f19e53af13b0685e384d83d1e019a2f36018917db14b0f2b933761801a9742db44cc2fcd178c29926ea2348f6
 EBUILD rostest-1.15.8-r1.ebuild 742 BLAKE2B 34a90031dea413cd529733e0a9bd2146d30a7409e69005299922dad54e3abd9276a3fcb7e3a2146ab9759e5295d502e4b3b108feedde0303ddab25c41c39741c SHA512 f6cf32c8a596f1c0035b42ce9851570b5262b04f19e53af13b0685e384d83d1e019a2f36018917db14b0f2b933761801a9742db44cc2fcd178c29926ea2348f6
 EBUILD rostest-1.15.9-r1.ebuild 742 BLAKE2B 34a90031dea413cd529733e0a9bd2146d30a7409e69005299922dad54e3abd9276a3fcb7e3a2146ab9759e5295d502e4b3b108feedde0303ddab25c41c39741c SHA512 f6cf32c8a596f1c0035b42ce9851570b5262b04f19e53af13b0685e384d83d1e019a2f36018917db14b0f2b933761801a9742db44cc2fcd178c29926ea2348f6
 EBUILD rostest-9999.ebuild 742 BLAKE2B 34a90031dea413cd529733e0a9bd2146d30a7409e69005299922dad54e3abd9276a3fcb7e3a2146ab9759e5295d502e4b3b108feedde0303ddab25c41c39741c SHA512 f6cf32c8a596f1c0035b42ce9851570b5262b04f19e53af13b0685e384d83d1e019a2f36018917db14b0f2b933761801a9742db44cc2fcd178c29926ea2348f6
diff --git a/dev-ros/rostest/rostest-1.15.11.ebuild b/dev-ros/rostest/rostest-1.15.11.ebuild
new file mode 100644
index 000000000000..1f8991fc0261
--- /dev/null
+++ b/dev-ros/rostest/rostest-1.15.11.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 794f6419a048..2979f1d2b4e5 100644
--- a/dev-ros/rostopic/Manifest
+++ b/dev-ros/rostopic/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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.11.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.11.ebuild b/dev-ros/rostopic/rostopic-1.15.11.ebuild
new file mode 100644
index 000000000000..9ea612e200ff
--- /dev/null
+++ b/dev-ros/rostopic/rostopic-1.15.11.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/rosunit/Manifest b/dev-ros/rosunit/Manifest
index 8c40b4064786..e62ab365fe7c 100644
--- a/dev-ros/rosunit/Manifest
+++ b/dev-ros/rosunit/Manifest
@@ -1,8 +1,10 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD rosunit-1.15.5.ebuild 505 BLAKE2B 4f9b26d7728fbcb21ce6fe3aa70982afc65c2de19d86f5a828f4b1b8d5c07d19cd1b3187dff03bb3cc3cbd84515b3267c1dfa18676d4ed9ab7c9f31a29d556cc SHA512 35952c146d24201c3d3c7244aa788465b10d2d8c1e84f7708a4d3b58e1697987d315e619f51f2d83c4820f83d75d9317d6eeb5fdb369a460ba06b1e0c37731e2
 EBUILD rosunit-1.15.6.ebuild 505 BLAKE2B 4f9b26d7728fbcb21ce6fe3aa70982afc65c2de19d86f5a828f4b1b8d5c07d19cd1b3187dff03bb3cc3cbd84515b3267c1dfa18676d4ed9ab7c9f31a29d556cc SHA512 35952c146d24201c3d3c7244aa788465b10d2d8c1e84f7708a4d3b58e1697987d315e619f51f2d83c4820f83d75d9317d6eeb5fdb369a460ba06b1e0c37731e2
 EBUILD rosunit-1.15.7.ebuild 505 BLAKE2B 4f9b26d7728fbcb21ce6fe3aa70982afc65c2de19d86f5a828f4b1b8d5c07d19cd1b3187dff03bb3cc3cbd84515b3267c1dfa18676d4ed9ab7c9f31a29d556cc SHA512 35952c146d24201c3d3c7244aa788465b10d2d8c1e84f7708a4d3b58e1697987d315e619f51f2d83c4820f83d75d9317d6eeb5fdb369a460ba06b1e0c37731e2
+EBUILD rosunit-1.15.8.ebuild 505 BLAKE2B 24f9e9888beb7f14d7b08467eab826897ea50429d71774e55cea157c574cfcbb4ff8054b46490421936a3d1135bd2b5c12ff3fc389ee4ef246a904ace94af8e4 SHA512 deee7e57754944cc2a4cfe88b236ea7670c523b52970b419670fbdb7c8d0b270f2f0a831d2db664cb9005f457ec11912d17394c94af5f44b626c2b88abc013ae
 EBUILD rosunit-9999.ebuild 505 BLAKE2B 4f9b26d7728fbcb21ce6fe3aa70982afc65c2de19d86f5a828f4b1b8d5c07d19cd1b3187dff03bb3cc3cbd84515b3267c1dfa18676d4ed9ab7c9f31a29d556cc SHA512 35952c146d24201c3d3c7244aa788465b10d2d8c1e84f7708a4d3b58e1697987d315e619f51f2d83c4820f83d75d9317d6eeb5fdb369a460ba06b1e0c37731e2
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosunit/rosunit-1.15.8.ebuild b/dev-ros/rosunit/rosunit-1.15.8.ebuild
new file mode 100644
index 000000000000..5e1930ae53d6
--- /dev/null
+++ b/dev-ros/rosunit/rosunit-1.15.8.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"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit-testing package for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
+"
diff --git a/dev-ros/roswtf/Manifest b/dev-ros/roswtf/Manifest
index 6163990393fc..919366dcd491 100644
--- a/dev-ros/roswtf/Manifest
+++ b/dev-ros/roswtf/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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.11.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.11.ebuild b/dev-ros/roswtf/roswtf-1.15.11.ebuild
new file mode 100644
index 000000000000..4e877541ab42
--- /dev/null
+++ b/dev-ros/roswtf/roswtf-1.15.11.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_bag/Manifest b/dev-ros/rqt_bag/Manifest
index 81e11ea9828e..88b5a413e4a4 100644
--- a/dev-ros/rqt_bag/Manifest
+++ b/dev-ros/rqt_bag/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_bag-0.4.15.tar.gz 51549 BLAKE2B 87e1a5b997efa6e0b460edd11b14608ba35a49e3b404c2df32fa6f5bf442bca271e9329a2a7eea5b21b07488e0b06b7a23e706fa631dc4146c8911a29ddf36eb SHA512 01df2bf2626057ad05a52f0c069b013fd2f9ef00afa57e76b696fc7b66c6b6766a8ae6f880b1fa5493759b53deb87ac4d12bd5c22fe81ea9192f5ae6f91aa976
-EBUILD rqt_bag-0.4.15.ebuild 670 BLAKE2B c7233f8c285eb728e0314dd7a99a18a0572b93b392f89441934158fb83cc5997b5160c080e1f1138a895f35b18222a3a8cd1f5b7738f5d745b4c05687a1f9681 SHA512 adc55e129b7e78eadcf77b0c2c1426740e40695ed12982dc3e3438ebd080d4332f405833c0888c0cce4a8c13d9aa88071272a24cfb23243fd9bb16f2b3b82843
+DIST rqt_bag-0.5.1.tar.gz 53151 BLAKE2B 4165c2596fa77f059e211f9f760ce4c0634b4f5a1582be34ee40400a2715f1a5c09b2ea3b0aabaf7cf9a75eea1baec8b07220f9297d86b30e58155da05d66234 SHA512 e1b4c15cb085f285911bc8077465616923e6c2954553779c62d7cfb889b56ef88ca0bdf4e3e280fc1f489e3aac49de5d0567703d37f8ef8b1d55aa1e47e92d4f
+EBUILD rqt_bag-0.5.1.ebuild 670 BLAKE2B 4b34e7f81278ecc511795adad21e7257e71b7dd4992b77ce340b10cabafa6954117f9d26c87b1544bb56ad53eebf301c0d7fa06132eef0b50a83acfba795dfab SHA512 c5b33a0f75a8dd934895f912ff4a8059e807e1b8ce3ca0d2d30e4a799f6f85f786ab28adbf56d008b6d82ade019b4bd790da28bfbec45e42a56c8102de637d63
 EBUILD rqt_bag-9999.ebuild 670 BLAKE2B c7233f8c285eb728e0314dd7a99a18a0572b93b392f89441934158fb83cc5997b5160c080e1f1138a895f35b18222a3a8cd1f5b7738f5d745b4c05687a1f9681 SHA512 adc55e129b7e78eadcf77b0c2c1426740e40695ed12982dc3e3438ebd080d4332f405833c0888c0cce4a8c13d9aa88071272a24cfb23243fd9bb16f2b3b82843
 MISC metadata.xml 339 BLAKE2B 0ab275c9533eaf810c3fd33f5fcfbab2de7d7258604b431cc7a90a5ac63127bf048188835d89237de809b314fc5bff2a3afbea2dae6a7299ada7dbb0183ec262 SHA512 4925d508214e10ae0538559a9d17ed336e721ac3b25375cd4cf94e4437b7f509ccb60aa4865a89cc482817230de827c5adb4c83fbfd63c697c833d19b7da8e16
diff --git a/dev-ros/rqt_bag/rqt_bag-0.4.15.ebuild b/dev-ros/rqt_bag/rqt_bag-0.5.1.ebuild
index 51bedaaa5154..9e3b5a9ca419 100644
--- a/dev-ros/rqt_bag/rqt_bag-0.4.15.ebuild
+++ b/dev-ros/rqt_bag/rqt_bag-0.5.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
diff --git a/dev-ros/rqt_bag_plugins/Manifest b/dev-ros/rqt_bag_plugins/Manifest
index 2c8173cb79ff..e13a4f863c09 100644
--- a/dev-ros/rqt_bag_plugins/Manifest
+++ b/dev-ros/rqt_bag_plugins/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_bag-0.4.15.tar.gz 51549 BLAKE2B 87e1a5b997efa6e0b460edd11b14608ba35a49e3b404c2df32fa6f5bf442bca271e9329a2a7eea5b21b07488e0b06b7a23e706fa631dc4146c8911a29ddf36eb SHA512 01df2bf2626057ad05a52f0c069b013fd2f9ef00afa57e76b696fc7b66c6b6766a8ae6f880b1fa5493759b53deb87ac4d12bd5c22fe81ea9192f5ae6f91aa976
-EBUILD rqt_bag_plugins-0.4.15.ebuild 903 BLAKE2B 3758a7b809b257d62052f25602c116973ad72dfcc4f2205e8110804fb3149fae848f1c400d15522ab3af613c622218540d9a8fc399d5116c61ec94f1e43c25ce SHA512 58db500bb8bce1318b64cc656e67b70f833647c19bad1f83dcef607e4949e73555b6ebe7373f1ce9ef7c151fec197c7b0c28b1df2bcda89fac315bdc501046a3
+DIST rqt_bag-0.5.1.tar.gz 53151 BLAKE2B 4165c2596fa77f059e211f9f760ce4c0634b4f5a1582be34ee40400a2715f1a5c09b2ea3b0aabaf7cf9a75eea1baec8b07220f9297d86b30e58155da05d66234 SHA512 e1b4c15cb085f285911bc8077465616923e6c2954553779c62d7cfb889b56ef88ca0bdf4e3e280fc1f489e3aac49de5d0567703d37f8ef8b1d55aa1e47e92d4f
+EBUILD rqt_bag_plugins-0.5.1.ebuild 903 BLAKE2B 274671bfa03909424fb05f7cfd88c964d3125bdcde1517097753559f1c422314f2a03a40d41bc4a56dfbc80d93912866d3dac6f38597dd56a5399cb213230c68 SHA512 e4866686ecfd2289129bf4fe01a5e91f60e671e50ae24ba57c61b9a3563f281dc0ba014c50af4734ad6cee3480067175cfdedeb07a90d017f70ed215645d964e
 EBUILD rqt_bag_plugins-9999.ebuild 903 BLAKE2B 3758a7b809b257d62052f25602c116973ad72dfcc4f2205e8110804fb3149fae848f1c400d15522ab3af613c622218540d9a8fc399d5116c61ec94f1e43c25ce SHA512 58db500bb8bce1318b64cc656e67b70f833647c19bad1f83dcef607e4949e73555b6ebe7373f1ce9ef7c151fec197c7b0c28b1df2bcda89fac315bdc501046a3
 MISC metadata.xml 339 BLAKE2B 0ab275c9533eaf810c3fd33f5fcfbab2de7d7258604b431cc7a90a5ac63127bf048188835d89237de809b314fc5bff2a3afbea2dae6a7299ada7dbb0183ec262 SHA512 4925d508214e10ae0538559a9d17ed336e721ac3b25375cd4cf94e4437b7f509ccb60aa4865a89cc482817230de827c5adb4c83fbfd63c697c833d19b7da8e16
diff --git a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.15.ebuild b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.5.1.ebuild
index f0c32428d755..0a3df3567f5a 100644
--- a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.15.ebuild
+++ b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.5.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
diff --git a/dev-ros/rqt_controller_manager/Manifest b/dev-ros/rqt_controller_manager/Manifest
index 224ea3147c28..60eb69b5f623 100644
--- a/dev-ros/rqt_controller_manager/Manifest
+++ b/dev-ros/rqt_controller_manager/Manifest
@@ -2,9 +2,11 @@ DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6
 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
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
 EBUILD rqt_controller_manager-0.19.1.ebuild 427 BLAKE2B 3ecf12e6658ea615e3eef0b7fb0e521714a4aa8460f0c3d01685f4837b9783ba2f4a8cadce0d9f51c950c640588d05a0534399a743725029d1399e004df91ec0 SHA512 38034063d79e54980873015db92326b57021cb42604045ce3d7ef621077114feeac1b9bfade11e37055423b9ab2c11f26e1ba36ff0e9ac3ff8c88dc2eeba883c
 EBUILD rqt_controller_manager-0.19.2.ebuild 427 BLAKE2B 3ecf12e6658ea615e3eef0b7fb0e521714a4aa8460f0c3d01685f4837b9783ba2f4a8cadce0d9f51c950c640588d05a0534399a743725029d1399e004df91ec0 SHA512 38034063d79e54980873015db92326b57021cb42604045ce3d7ef621077114feeac1b9bfade11e37055423b9ab2c11f26e1ba36ff0e9ac3ff8c88dc2eeba883c
 EBUILD rqt_controller_manager-0.19.3.ebuild 427 BLAKE2B 3ecf12e6658ea615e3eef0b7fb0e521714a4aa8460f0c3d01685f4837b9783ba2f4a8cadce0d9f51c950c640588d05a0534399a743725029d1399e004df91ec0 SHA512 38034063d79e54980873015db92326b57021cb42604045ce3d7ef621077114feeac1b9bfade11e37055423b9ab2c11f26e1ba36ff0e9ac3ff8c88dc2eeba883c
 EBUILD rqt_controller_manager-0.19.4.ebuild 427 BLAKE2B 756425c7f23b938e0911cf846f3ae8e198a4e75cc6e214bdfae8fbacb8cc994aa67d7332122a0343e9e83095814b3b29f86b5c6493c4ed2a6c078e9e9c6e9ff9 SHA512 c58b4cdf26c2cd4e5f9b7f4de3d54491f854901e9ff3d47f5d25e195142cd36de63a817d4b428c330dc6c697a0b4096b1743b488007a1fc79481b0dc3dfe1edf
+EBUILD rqt_controller_manager-0.19.5.ebuild 427 BLAKE2B 756425c7f23b938e0911cf846f3ae8e198a4e75cc6e214bdfae8fbacb8cc994aa67d7332122a0343e9e83095814b3b29f86b5c6493c4ed2a6c078e9e9c6e9ff9 SHA512 c58b4cdf26c2cd4e5f9b7f4de3d54491f854901e9ff3d47f5d25e195142cd36de63a817d4b428c330dc6c697a0b4096b1743b488007a1fc79481b0dc3dfe1edf
 EBUILD rqt_controller_manager-9999.ebuild 427 BLAKE2B 3ecf12e6658ea615e3eef0b7fb0e521714a4aa8460f0c3d01685f4837b9783ba2f4a8cadce0d9f51c950c640588d05a0534399a743725029d1399e004df91ec0 SHA512 38034063d79e54980873015db92326b57021cb42604045ce3d7ef621077114feeac1b9bfade11e37055423b9ab2c11f26e1ba36ff0e9ac3ff8c88dc2eeba883c
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.5.ebuild b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.5.ebuild
new file mode 100644
index 000000000000..5325e3799433
--- /dev/null
+++ b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.5.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-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="RQT control manager plugin"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_dep/Manifest b/dev-ros/rqt_dep/Manifest
index 93b1e208ffef..4b3893c0229f 100644
--- a/dev-ros/rqt_dep/Manifest
+++ b/dev-ros/rqt_dep/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_dep-0.4.10.tar.gz 12730 BLAKE2B dfb0624433086a005f3a0c85dc9e5ff92e018a47d541a039a29f9b39bcf1bd99a99ef1abac847b73b643ad043f8732ecb2f34c8adbb128e95339d1625a8527ba SHA512 6cd590e991a786f3017956a25fc8a977ab581ee931710637a9b4e4cff5f2f863e67c1923dbaf66ad203ae12e484a124d822ccbdc7dde57856e4011e6cc722221
-EBUILD rqt_dep-0.4.10.ebuild 768 BLAKE2B d37dc8a7bfc7fc8dbb13fdad59418f9d5181b1447e9f60199a20b8f950627f63a7f9e8cc5643f9a429b18e36efe77ff7efb73224e8d3e960590748c974cac72c SHA512 0304c38f7007bc09267939a72b8f1eadd9ac4ac32a152c8ccd72f3e23b2ca2245011a74d4e90172af4781297b48d43955ebe09c45461aacfb4e92995371be5f3
+DIST rqt_dep-0.4.12.tar.gz 12888 BLAKE2B a265b54a52a9dea66c7e5f35583150da84891ca90298bee0c9ae236ed833d6d305d15f705729335db956a7fd9602260547258f7ed6c3acd3ecb668a3255d028f SHA512 7df25801662cf6eaaf5ab17a4639ce784b4e1886d5f5c9e83ec7daaf212ffef06e9ef192ae41faf8751e6ff87278e6b679b37628f527db46a6bbc7fd915df499
+EBUILD rqt_dep-0.4.12.ebuild 768 BLAKE2B cce2323a9b8a8024502074ff65afdaf5b7616d002cd65b1546d61c17064361b3bfdc4facf8b9bf6f299213032f978adb32487e2c23533beebae2b97a92b8a402 SHA512 763b9e92765fd9eee1d7781baa4ec53329dff01e9812d235806e0b7d71167b7bf7566d45cde18e9d75f3d4263169dbab8d4f0820ebac1850e682f8fbd7f7225a
 EBUILD rqt_dep-9999.ebuild 768 BLAKE2B d37dc8a7bfc7fc8dbb13fdad59418f9d5181b1447e9f60199a20b8f950627f63a7f9e8cc5643f9a429b18e36efe77ff7efb73224e8d3e960590748c974cac72c SHA512 0304c38f7007bc09267939a72b8f1eadd9ac4ac32a152c8ccd72f3e23b2ca2245011a74d4e90172af4781297b48d43955ebe09c45461aacfb4e92995371be5f3
 MISC metadata.xml 339 BLAKE2B 88e2a45dbf383c5addb2bc4ad4d83ec4b75ce5eaa525f40422964e12df5a35b402cc5b36d3a579ae37608c3d9ee17bcdda88e605cce24b85edaa103c47da0245 SHA512 9634570bb6226eea78ab642d0645516e9c523e4669fbd42b1a375f3f56e37ce9a87dff464fcc0c956c21606066bd71378ab4dc11a7590282ac8b011223d1ec96
diff --git a/dev-ros/rqt_dep/rqt_dep-0.4.10.ebuild b/dev-ros/rqt_dep/rqt_dep-0.4.12.ebuild
index 0f0d8315777a..315de5e38656 100644
--- a/dev-ros/rqt_dep/rqt_dep-0.4.10.ebuild
+++ b/dev-ros/rqt_dep/rqt_dep-0.4.12.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_msg/Manifest b/dev-ros/rqt_msg/Manifest
index 3823279a5e79..872503d33821 100644
--- a/dev-ros/rqt_msg/Manifest
+++ b/dev-ros/rqt_msg/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_msg-0.4.9.tar.gz 6920 BLAKE2B 5187c050972045401f76546f3e5abc9cfd9fd58d2a42cc0ae317e0f689ca7c3b73ae6f160777510a522670cd03d2553e195157ea51af81c73334c99f705c619c SHA512 a0d36bf30dbd3582d93c3d89d495b4b5aa25d76895b61eed70cc8878ced43e407a72d593e8b38194522d56cbfc2a5622c30179116dcd86de4d3e7b49dc24a9ff
-EBUILD rqt_msg-0.4.9.ebuild 781 BLAKE2B d1af9204bc0c781008668acd5dd22e3596305966c479488c7846d06d4ceeb4cd5e7c465c0bd7490c409003ba4877db495aabedec59ca4286bbef50ba0736e070 SHA512 42a0b1bc7b8ee75d9d958ac3fc5b8c43684068fb189c225e6aea003d5954268d144e2d24644cd007ad4c15b29d4d8e629ec77bfeb3a3dad8e440a915d9ead06a
+DIST rqt_msg-0.4.10.tar.gz 7042 BLAKE2B d095dca56f59c85554882a5272d2cab9bea002a4e78652c62bcde6c145e00b16afef4d061ab53d7684824211ed782476aff1ec0a91a07c0d92a743aeb49ee3aa SHA512 6a4a67ebb51f7a488efb8560366a47eb594be46615cf6f16d302608f07d51a7606d3e276bc82faa0bedf340fec1748a56c071543a26130adbe5233117b396ee8
+EBUILD rqt_msg-0.4.10.ebuild 781 BLAKE2B 414479c6f491c2d2b285bee415c025ee37264f5ad9fb157cd2ab1783b8bee2aee719492ad33c74261e14ba4ac3c728c46b64e61900d542da08d93bd04c7a8700 SHA512 57ddca92f2cea7ba94aa3b357effb96f8ffbbc710bae50ffa5e0544df7287c7ff9e2029e68ffa11dc2a229fba1d6f8d0a40c41297dc740bf114f668d2f92e57a
 EBUILD rqt_msg-9999.ebuild 781 BLAKE2B d1af9204bc0c781008668acd5dd22e3596305966c479488c7846d06d4ceeb4cd5e7c465c0bd7490c409003ba4877db495aabedec59ca4286bbef50ba0736e070 SHA512 42a0b1bc7b8ee75d9d958ac3fc5b8c43684068fb189c225e6aea003d5954268d144e2d24644cd007ad4c15b29d4d8e629ec77bfeb3a3dad8e440a915d9ead06a
 MISC metadata.xml 339 BLAKE2B acb4a2863a4c506310686a1977f1637d738296860abaa3c3b3be8978e292ed4308fc2b6ced16161320f705b1d38558182861fcd273c8d43ed8472ea58856bf71 SHA512 0b20862cd86ae1fa79707986d39c0f33008fd7848fe9dafb0323dea6ebfa75634fd05befe068b72927d7188448ea2f3471cc0b78fad36a87b895b2b59d5ed726
diff --git a/dev-ros/rqt_msg/rqt_msg-0.4.9.ebuild b/dev-ros/rqt_msg/rqt_msg-0.4.10.ebuild
index d88c80ad96cd..6f493e14862b 100644
--- a/dev-ros/rqt_msg/rqt_msg-0.4.9.ebuild
+++ b/dev-ros/rqt_msg/rqt_msg-0.4.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
diff --git a/dev-ros/rqt_pose_view/Manifest b/dev-ros/rqt_pose_view/Manifest
index 8a95c2d140c6..f9682d148e94 100644
--- a/dev-ros/rqt_pose_view/Manifest
+++ b/dev-ros/rqt_pose_view/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_pose_view-0.5.10.tar.gz 8508 BLAKE2B 39436926caa82a6ffd15161429081f2c101da802b802ebf798b3e474d0b977dce58d0ed00da87674ad1c2dfbab1c0e58a49b83b1c93163b1dc6c731c7fb4de19 SHA512 53874a7782ba8338accda84643a8103d23de24b175a6ec373ac7cbbbc3f158c08dc07ad8d82755a06da80740f3354759c076e082bfef081fc5d403c16e420ced
-EBUILD rqt_pose_view-0.5.10.ebuild 824 BLAKE2B 44c14e4297f6ddf62fbb9f0f0d4d8a64a02ac6f8538d5bfd2a8392a14539a8d58efc919b49ab8a784d20f96868fd3308145c051144e277845fa447cabf85d9a8 SHA512 5a6285018588f9d7d52f4524d9b537f3e48b08eb0c1f991a10b638708f270166da3137a1e81d39ec5b46644484e0c0a4945f04d52a657f0b170c6362ac0719de
+DIST rqt_pose_view-0.5.11.tar.gz 8572 BLAKE2B 38529a9153b713a1893f3c3d9e4a275c7506fd7e17dc3cf78b18e789c658d3e64775f51f3d9310cb1b1ea3546c189583478a82bc4b324d692244efaea8191247 SHA512 da6f3c670c84b360320e5e49a35d7f24776f004f8ec15141b8ea6c10ff3b98748cd7fbaada7a11b6aff8a7bcb13ca83d641e6ca446ad2e712e3a6d367223e322
+EBUILD rqt_pose_view-0.5.11.ebuild 824 BLAKE2B a2cf32894e9eacfd2463ef659a9388b6437c51c348b476e1abbfe1f32fd9ab6dd6cd3242ad543a4878182c75a5f18d82f9b98800940db9a066de92401771d3dc SHA512 e74fd52ed56a854cb02a29d2dd4db18329da4f05c517752136690688dd1ef54f3c10e591ee97d15a90bdc453505b7701e8683967b4de1e26bbb96ca98a18a2df
 EBUILD rqt_pose_view-9999.ebuild 824 BLAKE2B 44c14e4297f6ddf62fbb9f0f0d4d8a64a02ac6f8538d5bfd2a8392a14539a8d58efc919b49ab8a784d20f96868fd3308145c051144e277845fa447cabf85d9a8 SHA512 5a6285018588f9d7d52f4524d9b537f3e48b08eb0c1f991a10b638708f270166da3137a1e81d39ec5b46644484e0c0a4945f04d52a657f0b170c6362ac0719de
 MISC metadata.xml 345 BLAKE2B 0e6b4a4d3b8d1ff17491fe1cd16adb738771381f2e6d1279f68cc826f0931575864a63e6d2fa36af6a3897016125bce96df83ed43f5ef11df47cb955c0667ba0 SHA512 774daed773f2070d016eb616daa80e65f300c69ab1d436edf5aab5cc256f7e2ebdadf66a3c0fc5571ddb3dc496fd7353eed9dbf85cae48ae4f468dd4be95f22d
diff --git a/dev-ros/rqt_pose_view/rqt_pose_view-0.5.10.ebuild b/dev-ros/rqt_pose_view/rqt_pose_view-0.5.11.ebuild
index 903a748d5bfa..cd3b6a564f73 100644
--- a/dev-ros/rqt_pose_view/rqt_pose_view-0.5.10.ebuild
+++ b/dev-ros/rqt_pose_view/rqt_pose_view-0.5.11.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_publisher/Manifest b/dev-ros/rqt_publisher/Manifest
index 6ebd675251d6..3271c67eab53 100644
--- a/dev-ros/rqt_publisher/Manifest
+++ b/dev-ros/rqt_publisher/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_publisher-0.4.9.tar.gz 10662 BLAKE2B aa5911433152237e1a0c11b382ca825bee1f4309fccd9b674f0ca7a24215fa94515bbae3c29afad5ce9f8b0f0afc254e92b36cfccd0687980562771e73a3a4d2 SHA512 5828edebe19bbb0e771628ba53e73d5c6a2c58d7b54cd278c956bb926f51e17662d2bbb4d4000aa85140ee33612917a8e3f95a203dd97c1abba6d0f495000adb
-EBUILD rqt_publisher-0.4.9.ebuild 769 BLAKE2B 9486a720d528505fce4ccca7d4a09760c184783edaababc513b42503da39993da9e8ba80a5abfb8e33c4007ae4706a92a47c4a94a2d561c8d313e43b16b76b89 SHA512 d21e0a36a12e3549d96529a78023546da818ee460a5b786f4a07f8da5e88f24fbef3f38965aab5c2a5729ab56503d265df6b51562f1842ee6eae514b04e06b22
+DIST rqt_publisher-0.4.10.tar.gz 10726 BLAKE2B b8b06570bd74c80de5227b5ba5e9b08716a53cb91627f033767f3e4e39df5aae071ef6a215f15b1cb25aa397f558641edc88eac69a9291288975eca005cc882e SHA512 b3786a9431691419155f8ac6e865d65b6c4cbae1189a7d2ac66338399285d266cf860a4ccfe49cb45d361a57333136afc1d96a655f13265cf054868efccf3a07
+EBUILD rqt_publisher-0.4.10.ebuild 769 BLAKE2B 1ad8246893f0653f79b574316a82076327b877b3ca6ab240b3de6aab5b2dcbaf72fe43d8195032aec1defb37091db79b685841378dac8e9bade69a07e28e13f3 SHA512 a27c66d936ee4934ed5bad453a97adfe3e47e0fd56347a243403eef9ab08cc81e48a4cdb7177c6e8859dd95173b66d477ab7a5894d85e1a8e9af10b5f4bf8b4b
 EBUILD rqt_publisher-9999.ebuild 769 BLAKE2B 9486a720d528505fce4ccca7d4a09760c184783edaababc513b42503da39993da9e8ba80a5abfb8e33c4007ae4706a92a47c4a94a2d561c8d313e43b16b76b89 SHA512 d21e0a36a12e3549d96529a78023546da818ee460a5b786f4a07f8da5e88f24fbef3f38965aab5c2a5729ab56503d265df6b51562f1842ee6eae514b04e06b22
 MISC metadata.xml 345 BLAKE2B 64fc91bbd538f31ef418ae121fafc1ce9cb7cf8f5372883954025473563996800c4ebb5a04126ad897eab0f3393a477eac23d58fe1a702c915b6354c67f47e0f SHA512 8483076bb71220bf91931889a48412b23865e964fbf05182b726e498add7bfddfab59c2cf56161ad39af79628bfbb69be25e18a2aa7535b97bfbdada7dd21cb6
diff --git a/dev-ros/rqt_publisher/rqt_publisher-0.4.9.ebuild b/dev-ros/rqt_publisher/rqt_publisher-0.4.10.ebuild
index 5320800e2fde..87a23cd47743 100644
--- a/dev-ros/rqt_publisher/rqt_publisher-0.4.9.ebuild
+++ b/dev-ros/rqt_publisher/rqt_publisher-0.4.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
diff --git a/dev-ros/rqt_py_console/Manifest b/dev-ros/rqt_py_console/Manifest
index 908bad822652..6fc690baf926 100644
--- a/dev-ros/rqt_py_console/Manifest
+++ b/dev-ros/rqt_py_console/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_py_console-0.4.9.tar.gz 5523 BLAKE2B 6cd717e2311a913179eb3257d504494f9aa03d91a3f5416c3df80c43299aaee9ddb044692331f4b5317a16d8fd9900087b729bfd40cd01d8584d4e6163c0d2e7 SHA512 74f66797752c863f1204548fee0dec5e83a1e168c5e0063b7d7e56a4fe543d4c9f1f559accecea42a4e0390c74c13c11056867d361616c4beb962fe5abb75a11
-EBUILD rqt_py_console-0.4.9.ebuild 637 BLAKE2B 77e4ed1b48ae9073f7980c96aab255ce931e919de2dfe9684944f7efddd652f1f5bce83ea12c967721d2bfffe3a6738295a1bcf607de64d69334c2e4730659ab SHA512 61cf5bcf9f4607fd28537972825503f53f3497a0d3def0ce9c46fe030c99c613a18eaeaa0dc9f341673b0a2119675bbf65ce3202e92c674c7110ffd74a830d54
+DIST rqt_py_console-0.4.10.tar.gz 5658 BLAKE2B 837f172c250a6a12bb56b1b5b7640ddff2a573a5299c2165b597e1ded542992463006ac8b0a051d63d61e0431a5bbdea151ea3dd6693b5b93386bf02d4fbf8d4 SHA512 d121e166f88a54f70b27b6d44f2159ccdd3b862afd7adab57f3532fb6376709a9ce193628a912c839b5dae5e72e346317f6dc457832493d6b74e8fb2b78cb708
+EBUILD rqt_py_console-0.4.10.ebuild 637 BLAKE2B b06b32bd908753ce365e3716bb28854d9c23b706bd3408dd327df54687a7857e1c43ae782b598819f3065c782e89cd5742449a921037c4f1b3b82f1ac8b6ece7 SHA512 5f98ac49d9c7e5667decc0006e2f9afe4084a2910575f2da4619836acf38e32c1fd2ebb44e583feb9ce1dd893431b9d877cc50884ccb4e881474694a77ce1f18
 EBUILD rqt_py_console-9999.ebuild 637 BLAKE2B 77e4ed1b48ae9073f7980c96aab255ce931e919de2dfe9684944f7efddd652f1f5bce83ea12c967721d2bfffe3a6738295a1bcf607de64d69334c2e4730659ab SHA512 61cf5bcf9f4607fd28537972825503f53f3497a0d3def0ce9c46fe030c99c613a18eaeaa0dc9f341673b0a2119675bbf65ce3202e92c674c7110ffd74a830d54
 MISC metadata.xml 346 BLAKE2B b161c9a69ca70a509d52e7944fd08411f14a1cd414e7e7b2f8c33e73a32a60c6256251e6f3f7400e450ed454f9f4c36e9f189d81fae535c106df178f7bbfb8ea SHA512 a49aa6af8d730d2eb71df70b58570704a8f9b0b800c44b02e695732b2e318818c073973664882986b23b743b7fe039e9dd30d3b43e918b7ba4732114c69c4bfa
diff --git a/dev-ros/rqt_py_console/rqt_py_console-0.4.9.ebuild b/dev-ros/rqt_py_console/rqt_py_console-0.4.10.ebuild
index 46f53c8850d9..474d032774d8 100644
--- a/dev-ros/rqt_py_console/rqt_py_console-0.4.9.ebuild
+++ b/dev-ros/rqt_py_console/rqt_py_console-0.4.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
diff --git a/dev-ros/rqt_runtime_monitor/Manifest b/dev-ros/rqt_runtime_monitor/Manifest
index fb84b7461ccc..a09b4d61cc9e 100644
--- a/dev-ros/rqt_runtime_monitor/Manifest
+++ b/dev-ros/rqt_runtime_monitor/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_runtime_monitor-0.5.8.tar.gz 6899 BLAKE2B 62babadaca55ba6bbd4cdca9f1b1e716e95539bf5ab4132f8f3344adc9b557ded5061f5f4ba6eb9aa97ef32ca647646450a5ac6688abe2fe85f6f4837a6d9ec1 SHA512 d0c73dab65553be6dc5a2bb098266ea1e4b65ff8cd933777f11b894fea247eacd3f4bdb0b3ec373c012b10ca36b17e09b49617415f005921d14e9cb6a6af7fae
-EBUILD rqt_runtime_monitor-0.5.8.ebuild 637 BLAKE2B 94ad53d4be80ee8de9755b5ff94804a9768cbccda2fed8ef6008d1442954635f20218b01a0e37116e918097fdf797ca9844bd87bb940e2f5b3c07220276448f8 SHA512 1500ad24cacbb54f4921e87e70cb47c498aab25d7dd4b98068e21875d4ba639ccdcfb344340d86d76491cd48534a2ebdd3752154a13313384dd3662b9fab3617
+DIST rqt_runtime_monitor-0.5.9.tar.gz 6943 BLAKE2B 51e96d0463909bf6648de9f75b687b18bba76249aba3ccbfaa1671604e07cc61d2d0744e23bea8452e26bb5297a99543c2714231aa236fc46dc5a9b37fe53bda SHA512 fd6cfb1dae53f7278c1c0ebb8a1ef331640d235cc29a8a3f056004a0a6a420ced912d2c3114fca441e29e9066c0f33b6534b404a70b7a5560e5fbaba046e2672
+EBUILD rqt_runtime_monitor-0.5.9.ebuild 637 BLAKE2B b8f07558e73894e7b8f558bf6711ff0f852df340b2445f2fd4bc2f102a4dc655789f93875aadac1b6b4c1736a8594459694d1412b4e6858715681c20157bb5f6 SHA512 bedbf21328126eebad51e5b83360375cd0eef04e4b88a1ca3da20fa98164391cc961f2c817504b83ac5df5bea592804fe652e20ec79702b342b25036440d53cd
 EBUILD rqt_runtime_monitor-9999.ebuild 637 BLAKE2B 94ad53d4be80ee8de9755b5ff94804a9768cbccda2fed8ef6008d1442954635f20218b01a0e37116e918097fdf797ca9844bd87bb940e2f5b3c07220276448f8 SHA512 1500ad24cacbb54f4921e87e70cb47c498aab25d7dd4b98068e21875d4ba639ccdcfb344340d86d76491cd48534a2ebdd3752154a13313384dd3662b9fab3617
 MISC metadata.xml 351 BLAKE2B 85adf905d433b2678752fe3469b6c6e44e8161c1064846283ebd0554e42a51f82ab2e89c7597e630baa8337b0d7d4901dc70a39d7340ccec5b267946c1e2fdeb SHA512 a532ef4a335611ffe8fc2f79b4bb1f3de29f500fcd52a6067b3ad17cbd44f4037aaa7b5c8c0dde04f56039692c25f2f146ff72f62e968786a8e7f8840c174244
diff --git a/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.8.ebuild b/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.9.ebuild
index f15b3cdd299d..5e331b7e803c 100644
--- a/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.8.ebuild
+++ b/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.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
diff --git a/dev-ros/rqt_rviz/Manifest b/dev-ros/rqt_rviz/Manifest
index 522bbe58451a..1709d56d46ba 100644
--- a/dev-ros/rqt_rviz/Manifest
+++ b/dev-ros/rqt_rviz/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_rviz-0.6.1.tar.gz 7455 BLAKE2B b4f64e076c584e741640fb23a337e43b1b81b9898a75acf52ad946272551f8b47cfb91156952fbbd474a247ad218e78cf2656a5a896bf366236e6c791c0b382b SHA512 e9281603bab5ac7b71870e769eb6648945f33e2f2f5c320d506a51d4c5e7f5a680edd6133532e28b8b829d023404290f5bb65565fa5b87f6299cdda2c6a9e73b
-EBUILD rqt_rviz-0.6.1.ebuild 529 BLAKE2B b269fd2402f60dfb8e6d84c293faaf5cfaf56696e9cdafa7ee7b4c8d0b8fb21222b920f16306b2f551be02109a4037845932fd337a5bc54ae5b4a6ace7dedfe6 SHA512 631e9128f4462460af3bff1cb3e6b91198947763135df23a50d175ea0ee282276369ad68c6c8f789177ebdab3be521604a1871c70a17d5b365de661eadabd085
+DIST rqt_rviz-0.7.0.tar.gz 7569 BLAKE2B 0024c333c6337892b6aba745c527c2ccc3426b5220dd89cf60c2daf381f23a817c89b372c6c7957545d5cad115c07f059fdea00981487987c3c1508b709c5e42 SHA512 efbff6163b26ef43a27dd3c6a1a013f691856c816f3f85b3fb39c7f373aa6d88876259aac2b94afac90bf3d16c56f329376fcbef7defc2d3bf745bb85c380fda
+EBUILD rqt_rviz-0.7.0.ebuild 529 BLAKE2B f831d78a77c74e315a77b345e0c6af21768e73e54c1da2827d54c4d37a9f270d1c0d54551c2392d5c7b82975e3cb755b344f6b674dd1345d37e56392d221d9c2 SHA512 18441832d04a2438b240ac45e829d01979aa4c0451dc500a26e72f14f75867d99be0702d06a6086a8502638e8128db74b60bb68ccd71b9d6e050fc5cd428764b
 EBUILD rqt_rviz-9999.ebuild 529 BLAKE2B b269fd2402f60dfb8e6d84c293faaf5cfaf56696e9cdafa7ee7b4c8d0b8fb21222b920f16306b2f551be02109a4037845932fd337a5bc54ae5b4a6ace7dedfe6 SHA512 631e9128f4462460af3bff1cb3e6b91198947763135df23a50d175ea0ee282276369ad68c6c8f789177ebdab3be521604a1871c70a17d5b365de661eadabd085
 MISC metadata.xml 340 BLAKE2B 4172ee0043191333587f0531f753f03f9aceed8cf29a81ac12b6833adb1be0a1583a542ad97775b0bc19e2ea4ba87edda2654eef085c49285b5ce2176daa2303 SHA512 81d265770fdf37279c8d815459f7b365d1bff1e8d18758565adecba21599878edfa3be3a0bcfed0afe1157fb373edc4e0f3087aadffd1736569be937538115da
diff --git a/dev-ros/rqt_rviz/rqt_rviz-0.6.1.ebuild b/dev-ros/rqt_rviz/rqt_rviz-0.7.0.ebuild
index 86e0acc0c884..47315bb2d7e1 100644
--- a/dev-ros/rqt_rviz/rqt_rviz-0.6.1.ebuild
+++ b/dev-ros/rqt_rviz/rqt_rviz-0.7.0.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_service_caller/Manifest b/dev-ros/rqt_service_caller/Manifest
index 1be797c3da7e..2ba93288f513 100644
--- a/dev-ros/rqt_service_caller/Manifest
+++ b/dev-ros/rqt_service_caller/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_service_caller-0.4.9.tar.gz 7287 BLAKE2B fb65fc9375ca5690ef82c31949a4157d2f6dac420e7d3c62aa4e9abb9fd6ff370e8edc41fa5e1181d0dc35b58b3663a5f0225e2ba23d14f657bcac236c8cc4b3 SHA512 803c5803236bff6e482753aa994adbc60492aec92696c09ac49538601eb42d79b781e80e92fc3e528ab8767338e799252d51418708dbdfdc71314aada39e5259
-EBUILD rqt_service_caller-0.4.9.ebuild 586 BLAKE2B a56f23f70f70d55d125cee3a8acb14ebef9158be8f7d6452d8f0193143d50de8be5c71837c9fbfc0282bd5b8dd32f26b82971b567023b257eec659667d71fcf1 SHA512 1b65b030ce144ac25bd9167f7a3b4e49a0a06a70a077186b7715dafd8f870bbf630c95260b872a5d7d70baaa9bfdd26b351f2f0937b1ecf54d3b4657050b4342
+DIST rqt_service_caller-0.4.10.tar.gz 7402 BLAKE2B bbba811d0833edd7173c0c66a88e8ab30959a67e4f1108a552ed69f1fffc0415b5cb862f4ff1daa5dcb2251c7da8b7caa0d68ec4c061374b953d71b52af4467b SHA512 015b843db3a07f043a62f95a66fa17bffff80c13fb3577095d3f38229f414b662ffa5c2c3c629425d2373d965f40cca842cbc78b1dd79bc3fa3e40f06eddce7b
+EBUILD rqt_service_caller-0.4.10.ebuild 586 BLAKE2B 21c6017408da6bf249a36e566a15939216b37ba915216091b284d35e7189587edb8f35bede3a66b6bd5661eb597e490badbe43aa4e2a32ab5101704c9dfc45c0 SHA512 5b6652e30efb753ffed7ce352ddfcc6287eb9910ee3094956b11d1a5a4bd6b7da31637e2db9d1526644952046a4730ad5c52ece069e8bb9870ff3dac4eada1bf
 EBUILD rqt_service_caller-9999.ebuild 586 BLAKE2B a56f23f70f70d55d125cee3a8acb14ebef9158be8f7d6452d8f0193143d50de8be5c71837c9fbfc0282bd5b8dd32f26b82971b567023b257eec659667d71fcf1 SHA512 1b65b030ce144ac25bd9167f7a3b4e49a0a06a70a077186b7715dafd8f870bbf630c95260b872a5d7d70baaa9bfdd26b351f2f0937b1ecf54d3b4657050b4342
 MISC metadata.xml 350 BLAKE2B 4cc51a8225389126a5fc973fd489a13347a71275f7b759499b7761d0f176666f690614e873af4172df5bd56622589bba378d7777f01c6b77c5e3e6f150ab2bef SHA512 1b2e245248e936b9fddb4738972a70eb7df62244938f671517bceeb952d50956b8de74072d05421d274291baf3a3803a4a1c4d47f1c5bc3ff81def938be01a27
diff --git a/dev-ros/rqt_service_caller/rqt_service_caller-0.4.9.ebuild b/dev-ros/rqt_service_caller/rqt_service_caller-0.4.10.ebuild
index 68e3fdbd40e2..256f3a0fafa8 100644
--- a/dev-ros/rqt_service_caller/rqt_service_caller-0.4.9.ebuild
+++ b/dev-ros/rqt_service_caller/rqt_service_caller-0.4.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
diff --git a/dev-ros/rqt_shell/Manifest b/dev-ros/rqt_shell/Manifest
index c7c0ef8f5e2e..1611c485c7f3 100644
--- a/dev-ros/rqt_shell/Manifest
+++ b/dev-ros/rqt_shell/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_shell-0.4.10.tar.gz 6966 BLAKE2B 51e42222083ec64cdd991f9a3b0096bca19cd4b7f9083a4286d7ded0f2695382c132edd90af47c59c69e1ed1f9e35e5ade4469c40e8a072855d63f17ac4f0da9 SHA512 7562ac0aba35ad75dc884a81a737669e473516cdbc3c7207657d6fb24ea82aacb340eee68eed346fed57bca33bc878008fdd4569d6113df2609012dfedcaecc6
-EBUILD rqt_shell-0.4.10.ebuild 576 BLAKE2B 38a6240bfe600dc4a283a20a1a8f1c3a02a009d96e696455a7391d27016f293fb13dae6c39e606a821f0e79bf29630f57055bdc880a198e8563ca90117edcedc SHA512 67ebfd21a2515d63c6f8bcca5081fff4de821105620cc9f25a1df185a7b760fac39ed3ebcbcce0c4b751b08875262d115df5199bb8b339e731f2b6725c42072a
+DIST rqt_shell-0.4.11.tar.gz 7077 BLAKE2B 23a9ffb0903dc912a7a995d308234def49698c9db430b7195ed6a95b5876f2bb73c28c1a1214ec6e74f6ca6bd8c292dd3140ddd5b08880414672d8a7177dc6e3 SHA512 d8e72b136515b1ad2dae6cddbf308cce52512430610455cbcf5963c91d22616844b720658c8658227d44525b62b00d4bc43caf16fbc733be4088991f404591dc
+EBUILD rqt_shell-0.4.11.ebuild 576 BLAKE2B 2873bf7c0d1fec2be6aa7d48b021254f862a9f161ee81bd636459698509f8e1c15a95111e8e13daa44b260294cb9c9cc0e42f45ed5ace82473df978a5826b29c SHA512 435c629d4ad7bec72dadb9e9a7196d04f6d81856a43944f28e0583579f330d62bff6d6a03d8ff058e91be79e051e635733355e5932285fb4d470659079722a3a
 EBUILD rqt_shell-9999.ebuild 576 BLAKE2B 38a6240bfe600dc4a283a20a1a8f1c3a02a009d96e696455a7391d27016f293fb13dae6c39e606a821f0e79bf29630f57055bdc880a198e8563ca90117edcedc SHA512 67ebfd21a2515d63c6f8bcca5081fff4de821105620cc9f25a1df185a7b760fac39ed3ebcbcce0c4b751b08875262d115df5199bb8b339e731f2b6725c42072a
 MISC metadata.xml 341 BLAKE2B 37d602b430bbbbedaa984412c5773768475f9c29aa636896dc923729aab5536ac5effe75aaa207d3ef3aef85d6ecc9e009be0c705115bc39b46ee6e99e7ddd7e SHA512 ff2e33aac7330f2c74a047d052ecf393f7d04ce951a573ba799951be199291c028fd37f13aed3e2a2485cd0688b76ba0e4baa655576a68010aecffc9e7b4b206
diff --git a/dev-ros/rqt_shell/rqt_shell-0.4.10.ebuild b/dev-ros/rqt_shell/rqt_shell-0.4.11.ebuild
index 8e1d4bb5ae68..556657691279 100644
--- a/dev-ros/rqt_shell/rqt_shell-0.4.10.ebuild
+++ b/dev-ros/rqt_shell/rqt_shell-0.4.11.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_srv/Manifest b/dev-ros/rqt_srv/Manifest
index 6c14dbcf7ea8..bb9c25bcdccd 100644
--- a/dev-ros/rqt_srv/Manifest
+++ b/dev-ros/rqt_srv/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_srv-0.4.8.tar.gz 3518 BLAKE2B 9a6a592c611ac01d3aedb3c211bfe629b0eccae9c5081b8872fbe2af77b4750b152ce18bea15fa47ed979533648bea51690bdb68585624920b71b2d7c090f06e SHA512 dc3712e3f84d3baae7ccddf55a64b3543698dabb828273a2cd99af06fb8d6155941c277ac48023aa37eff2873d11cf150f2b4e2fc616d01576703f69f5a4289e
-EBUILD rqt_srv-0.4.8.ebuild 557 BLAKE2B 628b12c13742dc1d55fb32af5a66810c11aff1462c688440d6a45889f7c0c98da56b642e0139f7f4029bba32a0198d0f6d7e9463e44b66e9875baf17b36efd28 SHA512 c1494231b631bba4f93240ef17f86ed917a3a390cf44b7c79a06501c1bca998fc0c02ea76abb1e01c45f8ec962babd4d69b58b94f1ff734f46b964350f529dca
+DIST rqt_srv-0.4.9.tar.gz 3712 BLAKE2B a8f8493e9ca15150153d0a7df2eca63d93b1bc730273d15b4a03edbb532979f2c9635c6138ce1612b295e069af24b25b1cdf95b98f7c734cda333ceea5264926 SHA512 42c2e9bc9a45c960b51adce98d18d0f6d2821d2dea3d1d586522e273b04158a3a0df6e7b1bcadceb8052bdc8cf4f9c19ce73b7d415e015468247ea94a73a23dd
+EBUILD rqt_srv-0.4.9.ebuild 557 BLAKE2B 24ab8f5dd40c477684fd05e21f781530af88e6736854a379a002ac9a43db307e70a1262d700cddbaace6a230ab5263e0f299e90114aae8b7a94a05ab53c2e05a SHA512 003a567f79ee8d3faba17c8016a810bf8b5974f4d7ac8c423f7d13f7ee7c52cfcce0e68be1d8aa2f1eb779504ea499e6d7a581bbf54f44f1895abfe28122fee1
 EBUILD rqt_srv-9999.ebuild 557 BLAKE2B 628b12c13742dc1d55fb32af5a66810c11aff1462c688440d6a45889f7c0c98da56b642e0139f7f4029bba32a0198d0f6d7e9463e44b66e9875baf17b36efd28 SHA512 c1494231b631bba4f93240ef17f86ed917a3a390cf44b7c79a06501c1bca998fc0c02ea76abb1e01c45f8ec962babd4d69b58b94f1ff734f46b964350f529dca
 MISC metadata.xml 339 BLAKE2B 0eb9310139bad173fe8a8189d38a07b6b515c15b8a8e4539112ece7f26d2b24f1e30feb0ddb50a3a2170af13e495f89eebb58456e160f995216ac8d8eff06a64 SHA512 885828f3661bc17a6fbe23243df8fd984e595c6b83d11f5139f1e3140bc4095bef3e348212c101de50b890ec9f11fb185644fb50902c6a0d4191de9ac110b6e7
diff --git a/dev-ros/rqt_srv/rqt_srv-0.4.8.ebuild b/dev-ros/rqt_srv/rqt_srv-0.4.9.ebuild
index 03edbbca41b5..3793ad4f32ee 100644
--- a/dev-ros/rqt_srv/rqt_srv-0.4.8.ebuild
+++ b/dev-ros/rqt_srv/rqt_srv-0.4.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
diff --git a/dev-ros/rqt_top/Manifest b/dev-ros/rqt_top/Manifest
index 057b526f7ef3..c233640e0536 100644
--- a/dev-ros/rqt_top/Manifest
+++ b/dev-ros/rqt_top/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_top-0.4.9.tar.gz 6507 BLAKE2B 4c0fd53073a91e45de7fdc27c037c002976da0d5bc8d1e6f85d1d50d2c821b9a96968ed4189b2c17e6bbdc2ca0b4eab55e70f5f86bd24a18d32986ba153028e6 SHA512 42eb45d0a4ac271be150ee67fc1b0911a977ae636f4fec90240bec83ac024543ab9dec194f69c46873122efcf64f7c1a43328afbcde3e41f56274a87e8bc0b77
-EBUILD rqt_top-0.4.9.ebuild 520 BLAKE2B 69f6b7b448850c8021078fe43de32d904c165fd09633a5de0263cd524b17b1ac61ee48ec575d86c73fde894fcb606c731e7e51fb54a1e06d1454337f2bafcd20 SHA512 8c54187fdf31f5e8b48774314bec119952c3236bfb7d1860c1f60dd8c6e9d6e0d203ba1a7098b32a6bfe01d43f3ca6e74f474f0e879ce9c5b4bf4f371f82dca2
+DIST rqt_top-0.4.10.tar.gz 6662 BLAKE2B 23de23cf8685b4dd2d118c3b47d941695872c4a0e44538a4e6dec95cd95ce70f4c5361d65123e6cffa872d6b00166839d03ee4eb6b4ff03314cfbd5b4299fac7 SHA512 719fb16be898e37014167c31987e3f54bab7526e54bbed09bbb264f32b28f998c8b3341850c7eaf49201eaa29fcf19df7407543fc8d1511ddefb73696295d29c
+EBUILD rqt_top-0.4.10.ebuild 520 BLAKE2B f7c9c197c581edf5f5f879d7b37de26498c9e26574f7ce0bfe224cdf6014fcecca1914ab618a39be51326b5ec4ae98d093b537d9a7375b13e38c62757e96f1ca SHA512 a99d36519aba45ea7ac2e71a04d10c767c3707d08e07088a34bffeacf58eae365671abda3b153d8a68f2f64a937e1589aedb45abe67859ac2faea70de16d97df
 EBUILD rqt_top-9999.ebuild 520 BLAKE2B 69f6b7b448850c8021078fe43de32d904c165fd09633a5de0263cd524b17b1ac61ee48ec575d86c73fde894fcb606c731e7e51fb54a1e06d1454337f2bafcd20 SHA512 8c54187fdf31f5e8b48774314bec119952c3236bfb7d1860c1f60dd8c6e9d6e0d203ba1a7098b32a6bfe01d43f3ca6e74f474f0e879ce9c5b4bf4f371f82dca2
 MISC metadata.xml 339 BLAKE2B 2ba9b45f7390efddf6043ca229f7ad5c4b5f1630e2dc6cec28cddb9bba0f35731421972fac8e1d82b095e133503fa4c53127bd323fc20be2bade7f1de2368ee9 SHA512 b988663d3571ef8b2a6825063c37526249e53cec0b32924eec6c8a55205cfc2501747281ecbdfceaf9ad9693dcd913582091d8493be963c7dd1471c612644368
diff --git a/dev-ros/rqt_top/rqt_top-0.4.9.ebuild b/dev-ros/rqt_top/rqt_top-0.4.10.ebuild
index 1ef0fdf3d25e..b312ed9dd5a4 100644
--- a/dev-ros/rqt_top/rqt_top-0.4.9.ebuild
+++ b/dev-ros/rqt_top/rqt_top-0.4.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
diff --git a/dev-ros/rqt_web/Manifest b/dev-ros/rqt_web/Manifest
index 57edff1b49f4..feb4ca056f94 100644
--- a/dev-ros/rqt_web/Manifest
+++ b/dev-ros/rqt_web/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_web-0.4.9.tar.gz 6055 BLAKE2B 4366be2be307c4a565a8eced30144e094d7bb1958d09c313d81771bba8eb8911fc625809a3f43344cdd3c171a2484de1b66f04f34c4e07e90ac95710fd2639de SHA512 c6b67e34e9bb844d9eea17accf570b439b58f4665ecca3625c520b4546b958404b257025d79ce06833ebfcecce029c88bb375b7271df19a351a6692c35a0ab8f
-EBUILD rqt_web-0.4.9.ebuild 555 BLAKE2B 205a357c9326b7b1c6b0cfccee5752955cee49d815e3466ff52721c33ba9f86079b4ec4d197bc4b29abdb15521a3e0942ae41dbe587ef2bcf41695de1d0a7372 SHA512 a4a23a3fb7008a3e5df093377a6dfab81877d1fe813ae13944b4edb1bfed78bcae8b0f1adfff64f3cb7b8e3d72d726dc2d642ebcd72308f73748b1c14a15a877
+DIST rqt_web-0.4.10.tar.gz 6119 BLAKE2B 6afc8392d799eee835ec2b7d99b6254735a0756937f25021e3b1754380ce17c903288b854ef2cd87fd67613d6ca2759144edb03ba08a7bb8adf0aefde9624e9b SHA512 bdb3c2c241d7e4a9fb363e38d8776ce05affbb7b5d2d798e2ca9cb48532258d95af03adf9fce693fe7df0ea66034482537ff931d62edded3704eb48b3fd47d33
+EBUILD rqt_web-0.4.10.ebuild 555 BLAKE2B f411b556512923afe2999c1145bca2ae430673cd345a43bf15582edb7a1720961bdd30121b90d6a3fb0216255859985fa84be4a9e3324089f33e0a2018bcc5d3 SHA512 a3eeebf8943ae12103a4bf2dec2ed4b6d47d18c2eea10f580cd76ecf1e27f350cf901bd0a5ebdfba37869356867b3e6f0173867a6ba5d2b559e8be952b1be47b
 EBUILD rqt_web-9999.ebuild 555 BLAKE2B 205a357c9326b7b1c6b0cfccee5752955cee49d815e3466ff52721c33ba9f86079b4ec4d197bc4b29abdb15521a3e0942ae41dbe587ef2bcf41695de1d0a7372 SHA512 a4a23a3fb7008a3e5df093377a6dfab81877d1fe813ae13944b4edb1bfed78bcae8b0f1adfff64f3cb7b8e3d72d726dc2d642ebcd72308f73748b1c14a15a877
 MISC metadata.xml 339 BLAKE2B 404fb427a6076397a1ea41e275bfa3c921e48140b5a418e0c00e7898dff5633a314385e2b1594b88b100b61e897f2a0c1f8056e028ab0316607fa1d5aec3ab11 SHA512 e5bf773a7f2deff19d4041ee2f8374be10f1fa6ff57ee94c7d455ffcbb9ae09046ba2907346c19f9a47a0726c9f225e9f170ae7a2cf3da53e97569a9d3df1523
diff --git a/dev-ros/rqt_web/rqt_web-0.4.9.ebuild b/dev-ros/rqt_web/rqt_web-0.4.10.ebuild
index 60b0b9016d48..a60dd51d9372 100644
--- a/dev-ros/rqt_web/rqt_web-0.4.9.ebuild
+++ b/dev-ros/rqt_web/rqt_web-0.4.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
diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest
index b90c1629af9e..b89580b90e8b 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1,4 +1,4 @@
-DIST rviz-1.14.4.tar.gz 5121671 BLAKE2B f691b80d0240c7b09100c6cae8f25839969547654b7b974191e8ebbacf73a6e996cf69593910a1bb38a9db182446f6f89917115e9923805cd054e8dd25356786 SHA512 a7ae0d4196d7fa9c6b5e461d7cb9d044e09b8620b256d2cbccd8975266b81eeafd5693b01b0ae6fa21a73b7329cad335f8179bb7c90295da495da5552c304d33
-EBUILD rviz-1.14.4-r1.ebuild 1802 BLAKE2B 0b191ec76e3d8d02a18b12b8a306041cdab9a2a3c0f20acad89945a81fdfb275d15f6829a9fbe895cff765e0639be7f9d2ebcd6c6977d7a311e206e92dca0085 SHA512 a05fd274e14b2fd5e6a9a09ca5f86ebb14d4712d433c92c8b305735ea76a3d4a2399ee692ba206c387bcc173b893ed6188d8ed8901a5d95a7c44f05af1368107
+DIST rviz-1.14.8.tar.gz 5127738 BLAKE2B 317d38e73f078e043984aac465bc3284f92febe2693f80871e9bf3ec55c800b42fbc87f0adedd888c3c62f526157846fe61ad6a33d97314b36fb89d8e305fe0b SHA512 a6e5d08be925f7df1f11eed72905447f30f829ddc4e9f39b957c1af284f0533814f29affa5105bafd2a31aa894c3700687401cef8bc36d31b28923f95da53904
+EBUILD rviz-1.14.8.ebuild 1802 BLAKE2B 0b191ec76e3d8d02a18b12b8a306041cdab9a2a3c0f20acad89945a81fdfb275d15f6829a9fbe895cff765e0639be7f9d2ebcd6c6977d7a311e206e92dca0085 SHA512 a05fd274e14b2fd5e6a9a09ca5f86ebb14d4712d433c92c8b305735ea76a3d4a2399ee692ba206c387bcc173b893ed6188d8ed8901a5d95a7c44f05af1368107
 EBUILD rviz-9999.ebuild 1802 BLAKE2B 0b191ec76e3d8d02a18b12b8a306041cdab9a2a3c0f20acad89945a81fdfb275d15f6829a9fbe895cff765e0639be7f9d2ebcd6c6977d7a311e206e92dca0085 SHA512 a05fd274e14b2fd5e6a9a09ca5f86ebb14d4712d433c92c8b305735ea76a3d4a2399ee692ba206c387bcc173b893ed6188d8ed8901a5d95a7c44f05af1368107
 MISC metadata.xml 336 BLAKE2B 8cba61f66f05c578aa056805cff5c5f9b79f4cc9a36001a5c332b048958039e049e8003b4c6a6cbe44a10973b5094daf880f25f9a124a2967069687762a492d0 SHA512 5621623b90d64245ec73b1ff7cace103dd809ac9da8b4614cd8b5931854ed159e8b5de867f1a6e83949376b99e41c181def0569f90f128c4c85e97cd42659120
diff --git a/dev-ros/rviz/rviz-1.14.4-r1.ebuild b/dev-ros/rviz/rviz-1.14.8.ebuild
index e25c75bee058..e25c75bee058 100644
--- a/dev-ros/rviz/rviz-1.14.4-r1.ebuild
+++ b/dev-ros/rviz/rviz-1.14.8.ebuild
diff --git a/dev-ros/rviz_imu_plugin/Manifest b/dev-ros/rviz_imu_plugin/Manifest
index 1c9c052434c9..6ce52acc70fd 100644
--- a/dev-ros/rviz_imu_plugin/Manifest
+++ b/dev-ros/rviz_imu_plugin/Manifest
@@ -1,4 +1,6 @@
 DIST imu_tools-1.2.2.tar.gz 1654829 BLAKE2B 1cd0ce321f6a9012146da07fc7f24425c1e68a8144b1ec3e5fefda316d07c3bc579f63f14adc4b86fc4f3975ad2d5c575ecfb2ae729d54ae3876a2ce2aa9d7f3 SHA512 d4b746acdf39e5137f54de9ac27f338bf89cd4102af5407ae0b6bb45c830b6a7da9250570000a7ed140187659d93934e5ecc3f2b1722f686a5cc8cbd52e986be
+DIST imu_tools-1.2.3.tar.gz 1656874 BLAKE2B d11a3d706ddd1eaae7562ca55ed25ade02dc79456ef8f99aa772e4dc6c6d38684d47175b3ffca3ca69e89aff1f02353379d2debfd53a03aa9a1eadd216a9dfe4 SHA512 b3c652836c049e096113ac075790ecb03fd8867b5702f83e52e5b97e41b1fecb448835ab9c8846b24104387e9148a1678c4d0b294885bc2472e8694dd090ba82
 EBUILD rviz_imu_plugin-1.2.2.ebuild 466 BLAKE2B 5c124c4c7a1d71f90b84f08308d5b0283d89fc65195237fab77809bddade3ec22861c8e4742fcc959601a05c36fe7e80244f5916264e769ec7dae3bf01b28220 SHA512 a5b0edf3e1ad60fb88f38d5777c9b05abc9b797a6f40f002ce06ee1d0d48b1336ae03b8f244befa553aeac1c5aede8f0d816d6602aba8a2a8d73eb3afa74de60
+EBUILD rviz_imu_plugin-1.2.3.ebuild 466 BLAKE2B 0f3fbc1f3eb677bcc3fbadf4b395ae778e951182e623d6f7cb790e22f18e0fd098cd315ac23ef87357608a21d310f793b448c9910f80e269fc52a87cea525e89 SHA512 9a54e21791e387a418c570381343585d0973e96c9736edb6e9917d84d14c047d14fcd7666a93a1ecdb33b2350e91713697cebd5ed7fa587de11fa9e712713f5d
 EBUILD rviz_imu_plugin-9999.ebuild 466 BLAKE2B 5c124c4c7a1d71f90b84f08308d5b0283d89fc65195237fab77809bddade3ec22861c8e4742fcc959601a05c36fe7e80244f5916264e769ec7dae3bf01b28220 SHA512 a5b0edf3e1ad60fb88f38d5777c9b05abc9b797a6f40f002ce06ee1d0d48b1336ae03b8f244befa553aeac1c5aede8f0d816d6602aba8a2a8d73eb3afa74de60
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.3.ebuild b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.3.ebuild
new file mode 100644
index 000000000000..c30e89f04cff
--- /dev/null
+++ b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.3.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/ccny-ros-pkg/imu_tools"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="RVIZ plugin for IMU visualization"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-ros/roscpp
+	dev-ros/rviz
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/settlerlib/Manifest b/dev-ros/settlerlib/Manifest
index 1790d262891e..4ed5281a13ff 100644
--- a/dev-ros/settlerlib/Manifest
+++ b/dev-ros/settlerlib/Manifest
@@ -1,4 +1,6 @@
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
 EBUILD settlerlib-0.10.14.ebuild 519 BLAKE2B 53246e5baa6fcaa5d1fb8578a74aaa532fda40e5093b8de596584ce7c1db4d0ff0e73e812fa06f4385ebb24a3fb9dcab7587af3d5d41fa03660e232696ebdfaa SHA512 ee1c139abc9566e14fe8c451eda97bdb6267de7c4e13c052066a966418b87e5895b1a3e7ae04bfeac3c36517a0ffa7223863ae223889f5aea308998aa23173af
+EBUILD settlerlib-0.10.15.ebuild 519 BLAKE2B 6ff2d710bd16ff3188e2dad5176a78ad87af0e98e8ef79dbf3c0d7958bb025497d2c9b1bd710a9262bb2beba98e4caabc794e82a7b7a49c3fd62611eea528561 SHA512 29163c9967448c89d20433bb63bbdb15ec3428b1acb8ebd271ff943239c09edaff20b5dc31ddf22d2bb576a20c638c67b045b453838d3abe2b3535965c5035ce
 EBUILD settlerlib-9999.ebuild 519 BLAKE2B 53246e5baa6fcaa5d1fb8578a74aaa532fda40e5093b8de596584ce7c1db4d0ff0e73e812fa06f4385ebb24a3fb9dcab7587af3d5d41fa03660e232696ebdfaa SHA512 ee1c139abc9566e14fe8c451eda97bdb6267de7c4e13c052066a966418b87e5895b1a3e7ae04bfeac3c36517a0ffa7223863ae223889f5aea308998aa23173af
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/settlerlib/settlerlib-0.10.15.ebuild b/dev-ros/settlerlib/settlerlib-0.10.15.ebuild
new file mode 100644
index 000000000000..f002fa2984e2
--- /dev/null
+++ b/dev-ros/settlerlib/settlerlib-0.10.15.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-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Helper functions for creating a settler for a specific sensor channel"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-ros/rosconsole
+	dev-ros/rostime
+"
+DEPEND="${RDEPEND}
+	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/stage_ros/Manifest b/dev-ros/stage_ros/Manifest
index 05a7d1155c11..95de009f899b 100644
--- a/dev-ros/stage_ros/Manifest
+++ b/dev-ros/stage_ros/Manifest
@@ -1,4 +1,5 @@
+AUX tests.patch 362 BLAKE2B 1c57128de8575dbdcdbb09717eb839998ab9efe3c8dc796702773fe68661353324d3359ebc2e7725bc8ba673e7f460b82b255aae8125302265eed59c74e5d212 SHA512 b0a7afe2fdfe4af6a79039f6580bf584e67b34b10eb4cca90ef7d4433e0b84658f9fa60a3f3dc4014333406e4b97b74e28b453b0259e59df1558d7ffe371313e
 DIST stage_ros-1.8.0.tar.gz 59891 BLAKE2B a70708ce0e30418116a1b7b4a2f6b9bfa1e8f03b6562013f51a49e3a349ab0d7d8c090f61d620e4ef7c8d2e19f77165c04b05fb5ceeab061e9d88895cbb6eef7 SHA512 d953e819d1955e7b1f0ca5a3d91e5b052b485045c057ecfe210e8b31dd3b4aa3418ac642dbad87ce8925e74295661a9fee9b10d826c2b1a2a17f8ec478a87927
-EBUILD stage_ros-1.8.0-r1.ebuild 650 BLAKE2B 14c2dc850afb86e05c87324409e13bc8c1ccdc26ba5e04df85afc510dbb4bd1db8d9cc2d0911c0cff658016d8310914cc4a0e6228a3194d0f8cfaa5cccb042c4 SHA512 c7fa2549a25abe1f1936e32b71e5a01f8ba57c26d02f94400e1e48f874c77b4305d69da257ee7f5304e960f10d5b2de4b14b333ec9a1b94881ee84853d01fc0e
-EBUILD stage_ros-9999.ebuild 650 BLAKE2B 14c2dc850afb86e05c87324409e13bc8c1ccdc26ba5e04df85afc510dbb4bd1db8d9cc2d0911c0cff658016d8310914cc4a0e6228a3194d0f8cfaa5cccb042c4 SHA512 c7fa2549a25abe1f1936e32b71e5a01f8ba57c26d02f94400e1e48f874c77b4305d69da257ee7f5304e960f10d5b2de4b14b333ec9a1b94881ee84853d01fc0e
+EBUILD stage_ros-1.8.0-r1.ebuild 689 BLAKE2B 216331e2053e89d4d14dd4e8414f79053309ed16907420c45f85f47b6c29b80a85af311085309b0a311e7e03bbbc124b773c6add606d3b4dc3107a59c31a7649 SHA512 5c9901f71a205e585c0275d8f3b5f3eb12a21056b059a6e917dfe796b29fe87a18bbbf59b6fdca28a6bc3b31fd3438ea6c26797d6ce783bc0029ac840094299b
+EBUILD stage_ros-9999.ebuild 689 BLAKE2B 216331e2053e89d4d14dd4e8414f79053309ed16907420c45f85f47b6c29b80a85af311085309b0a311e7e03bbbc124b773c6add606d3b4dc3107a59c31a7649 SHA512 5c9901f71a205e585c0275d8f3b5f3eb12a21056b059a6e917dfe796b29fe87a18bbbf59b6fdca28a6bc3b31fd3438ea6c26797d6ce783bc0029ac840094299b
 MISC metadata.xml 338 BLAKE2B be113ba641978d842732dba943269bfbecda305f280a1e594e66e80432987e754f04e83f1da5a94ba941e21900bd626f7dbfd0371dfd68077cd6f74b5531aab6 SHA512 60d3c473f35f325bd591eb4b81993b474b9477904362c8459266eed6c4da08c0bfdcf46deb8c9ab77dd28f11a07870374da80c49469b6a824d3d467d23455b7c
diff --git a/dev-ros/stage_ros/files/tests.patch b/dev-ros/stage_ros/files/tests.patch
new file mode 100644
index 000000000000..e3cf108bbef5
--- /dev/null
+++ b/dev-ros/stage_ros/files/tests.patch
@@ -0,0 +1,13 @@
+Index: stage_ros-1.8.0/test/intensity_test.py
+===================================================================
+--- stage_ros-1.8.0.orig/test/intensity_test.py
++++ stage_ros-1.8.0/test/intensity_test.py
+@@ -3,7 +3,7 @@
+ import unittest
+ import rospy
+ import time
+-import Queue as queue
++import queue
+ from sensor_msgs.msg import LaserScan
+ 
+ PKG = "stage_ros"
diff --git a/dev-ros/stage_ros/stage_ros-1.8.0-r1.ebuild b/dev-ros/stage_ros/stage_ros-1.8.0-r1.ebuild
index f5c232a1c22e..0fbed9fbfb07 100644
--- a/dev-ros/stage_ros/stage_ros-1.8.0-r1.ebuild
+++ b/dev-ros/stage_ros/stage_ros-1.8.0-r1.ebuild
@@ -31,3 +31,5 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
 	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/stage_ros/stage_ros-9999.ebuild b/dev-ros/stage_ros/stage_ros-9999.ebuild
index f5c232a1c22e..0fbed9fbfb07 100644
--- a/dev-ros/stage_ros/stage_ros-9999.ebuild
+++ b/dev-ros/stage_ros/stage_ros-9999.ebuild
@@ -31,3 +31,5 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
 	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/test_rosbag/Manifest b/dev-ros/test_rosbag/Manifest
index e19e18782e98..ee10d5daab1e 100644
--- a/dev-ros/test_rosbag/Manifest
+++ b/dev-ros/test_rosbag/Manifest
@@ -1,4 +1,5 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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
@@ -36,6 +37,41 @@ DIST test_rosbag-1.15.10-test_future_version_2.1.bag 6051 BLAKE2B 5368be834eaaf7
 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.11-chatter_50hz.bag 28923 BLAKE2B 2a2304b98d33b902fa3b8fc4d2a0fa3da9af600ab9f66ebf74ecb2214160346d10a0ba58d2b8dfb7039dcd7ca05e58bf7b253899238dabab1c29264970b124b7 SHA512 7493e773d678aed10ca274f8a253a412846c90fa238ac7407b04f39355b94285b40b177ae45a0a5b5ae1c2fe2d74284fba1c082550f21dd30cf5e5891ef402e1
+DIST test_rosbag-1.15.11-constants_gen1.bag 4783 BLAKE2B fec06b1016d0a6e616893f050c22072ef01cc4bc944f3778cb45613d699e404b8721b35f9563f22fa87e473f9f439965ba804cc6478c59dbeab95309375046c7 SHA512 724a420e99946a5fba1b092363cb11af11a50e85c4531b57fe64b207ed1e4022e35a870014873919a7bfe3680ae0b5b4275777f3305b8c5d1fdd7316e7d67e7b
+DIST test_rosbag-1.15.11-constants_gen2.bag 4783 BLAKE2B 6db44a7ddc61307f49bb28e276b8a834044b43d79d37ceba0aef21c8dea8a6d3ee32cc156f8bc429f074752dfc5a249b789936a6d8bf5e11397c2ee4f0e7d925 SHA512 a0df68425bf268da7d622ea43fb755dd7161bf3443c5c2499862c8932ce5e86e4edc6746a9f4a6bc4b4bb9c070a2b3af26d26755e18e796600184f280579aedc
+DIST test_rosbag-1.15.11-converged_gen1.bag 5197 BLAKE2B 99b3a9807b2e569f6773b791b008b1430408843037203a257892c82a6f59dd3e688a4f516e91d26fa567b56bececc3f69d69f4999e7a1e1430a9a606686a8de9 SHA512 490677292a7ea95109e7542e1219f51d7de9cf3bfbf90f48836fd80387655752ecb1173cbb65fc40908eb552fe1bae45e821c1b8510a401c7b643d2c0c433881
+DIST test_rosbag-1.15.11-converged_gen2.bag 5197 BLAKE2B e5b620a47c7f44911e5ee44c5787cd9ff753763816535ddaaf64f5e83a27504a5f6d241d900c0c3eacc5b9273113ad05f72cd828a4ebfb6d997df46fbc8b0cc7 SHA512 2779711e7d1223b14223312e1cbb6222ef6fdc32bd28dab6cb830784d5207f5ec7cc826e1336328520a45b15ddc937bf0be7eb8329932b77b9f1f42d162b7795
+DIST test_rosbag-1.15.11-converged_gen3.bag 5209 BLAKE2B f6d3615c771b086220350982c5ff726f263a460a714aaa3abcd683216dbdeaa72ddfd2fa2b42e761f82223af29ffa1bad554a67fc6afab52f08ffd1718fcadf0 SHA512 d896b361c73ba904c1766c9899d03f09d7ce62126378c195c620b659ff06dbdb61783ef7cddd999088a973382e60387a8eadd1d7dbd67af2d7af6c1c1fa87b6f
+DIST test_rosbag-1.15.11-converged_gen4.bag 5207 BLAKE2B d25369cfa2e0f34ab7b344ac56557292ec1b5609802327ade48d60e632900e4d746e15c9a46b700a44c198d1aef1975b042efbb1ca885f4124b5cef4936925ff SHA512 329694efa2dd1ad82a87f1419958bc2cb1edf4d8ae4ffde1c2d3d3b792d1dcba842b82c9f028cf3bb2f85fadbb068e5ed25eaebc8cd6e305c422d40dbeb75775
+DIST test_rosbag-1.15.11-convergent_gen1.bag 5485 BLAKE2B bd906d5ced9d123e04fa8b948834b907530ba2c56f4197f7ff209ec5d6afb18ff42e29d03f883d2d44e89e49c12e3769013f8209e5a674a7fd138d0264083295 SHA512 85a4129f954d4d3a2374c1c2c7fbdd82ee685853763ab62a836ab128b1dd118746984d1c1b8290ac1b522fac18493e1ab825b1a66924151dff608af0a5e07541
+DIST test_rosbag-1.15.11-convergent_gen2.bag 5485 BLAKE2B f5f6c3ed07b8cabca79fe826dcb7dbf0a9e3d7aed1d3bb0767e47a1f269e5c198de90f6e0052911f4148238b99bc3f48ea417d9a1642efb5bee74d5b5f9e7b5f SHA512 09fba991e4efe5758082f9af2501b0bc9ea452b247e3672b8eae5cef3d8d43ebbc0c7307bcb5730f1ec9a94e86506258d04e1cb25fb8d5f680f38b4b73e96c68
+DIST test_rosbag-1.15.11-migrated_addsub_gen1.bag 5031 BLAKE2B eeaff544bc0de8f9d058ebec594318b9ea8ee383f8b5083258de9dcb0068d1d6c0169cf97cc221675509932c8aa630e13958a2e82f413d6e834b3114c4702824 SHA512 b41a4a5651a97f70774c1395c8f9d5b0f4815f7e39052904fe1e89483270f9eb5216a6bd3652c2372c6c64666b4cc5e60d04f390f5ea83f88653035fa1a432fb
+DIST test_rosbag-1.15.11-migrated_explicit_gen1.bag 6172 BLAKE2B 9d5692ed7683a8a426467969488836102c56d51878c1c2d28d60f5a66a3429395cadfff75a177003238e1184ef1ff927479fb205a28e359c9e4efcbd41a1e767 SHA512 e11282b83feef48c039d34400216406537704ea5bcc10e62434bd2917a9ee0942a67315a8667d0ae7e76da178537b01f88a638f5e360663e51a438a4c6049661
+DIST test_rosbag-1.15.11-migrated_explicit_gen2.bag 6212 BLAKE2B 97b231a06d372d813dbfb6c80a6c293dda743ba4ad436ac0e265c37650461bb83315304f25d5a299eb4d82e59e6a776b4c7a66ace154aa6fb9d75bff10e45e06 SHA512 690fdad115ac672617bad2510e139f5cf67599b4e21a56dafd45bfda9f1991f4fc9251dc41c36834931402722261b008ff0ea283afd99daa3eda20bb357810ed
+DIST test_rosbag-1.15.11-migrated_explicit_gen3.bag 6220 BLAKE2B 7f9ba4eade5e2e7c03b2e180f1507cce58331493a2dddc1213a6ed5d8a46d198569ef5d5effe398c97c372adcbfed756649c35c0ae38362f017cf768faebc30e SHA512 35911f4d68eda67a49cfa03ad65c6b6a84e74f161b38839fed7a1ceeadd10715f4d82b124d640f7cfc356f107e376ea6bc9016c1be32592fe2f6865d5bb8f868
+DIST test_rosbag-1.15.11-migrated_explicit_gen4.bag 6359 BLAKE2B 156e06ff065827bea0797c6f55dfaf37cb973ac07085cb56d4f3c85eadf1c994cf859e0e7b85bf65234a52b56cf4632d2ce2c8c05c172f5c838c403fdb83fc42 SHA512 5dccc7f8bd03ce08b584a69d6a9e54969bd014d22d7af3e1a9b09d9c42ab4029cf13205f56ea81913ce47c6a5f383d1c9082feb8857fa0d4f1459f97d2f4460c
+DIST test_rosbag-1.15.11-migrated_implicit_gen1.bag 6690 BLAKE2B b6d9d8dda4bae2d41aa81928daaada62da89a7be38e8f73ed9c2c2bb7c652d194eb7afd201ca0c0283ee88a77e103d8ccb86c60bffa4adcacde7a0f7f3b7f56d SHA512 a09816ef8c00b0005c1ee42b4d33739b776e6b8792f34f3c5e70ffb91ebc4c4e3c92396d733c3fe4314bd646533d71ede9cae57faeb8a311a25e13421731aeb6
+DIST test_rosbag-1.15.11-migrated_implicit_gen2.bag 6740 BLAKE2B 2f3d4a397188454f6ee4f2cfd2438361a3ce83b4e7d124feaa15788f6e49a074db433d8e87b43961984b0c243cd02651abb26ebeca0a51eeda9b61cc7d786f8e SHA512 da0fad58643a06c8c15ae6b13530b3e879269602b6dde750ec2706087206db82bb8f4a386830b36426c98fdc71eb6d2fcf6d2ee8d0be230beb3855447acc3bb3
+DIST test_rosbag-1.15.11-migrated_implicit_gen3.bag 6752 BLAKE2B f5f7c56815dd1e9bd277cde0a91dd53a68c342527578123ad25ec981c30486ddeca774c7d4f8dcf0606d189b14e235f349490f47ceb3a191250cada8f82c32e0 SHA512 2068238ca893201d24ed26b17d8b94e13a82d9f556352572da8c44e2455f75c984454bb09074b688f11ec0a7a5e38791b669f7cdea98863d0c301917ffe5d342
+DIST test_rosbag-1.15.11-migrated_implicit_gen4.bag 6889 BLAKE2B 6f8dbc6f2920d10535c8574470e23d3007033942949ef599437dde5fd64b860139f79a9835e255065fe3c74445ef702c3793f0adfc972f88fa7046c081ec5976 SHA512 4fb2b1f78b4cfd5b155415724ab224b6d619a44af94ade80f8bd6ef30b46e498633a5457d8f939c96902a641e0fd45cac2aa8e4e7f7a26efb6c78109b2dcd4d7
+DIST test_rosbag-1.15.11-migrated_mixed_gen1.bag 7120 BLAKE2B 1788a394a5cef74864071994a97fa0a7df28167531261636b74cbb688e0e62902e2e9577f09d1546b3f3dbb0533332b8c5aee47f01a30606744cdaaa5c573a0e SHA512 a8354f9386fe2b8da148919cc036041570eb999b94be162ee06b2abfd5f0b150fe96af45530c18b86eafda2e0299b8dfa8faf1cf3ab1571a0f62f17e6ba1147c
+DIST test_rosbag-1.15.11-migrated_mixed_gen2.bag 7178 BLAKE2B aa251ca30288b42d91f5bc37e672551a90575b10ecb058042deb88b45d41a9dc38c5e17081780ca75436cee886f71e1405f7970ac1025693fbc94f8444aaed60 SHA512 fd1ffb05ea65a798c07568778da71b6f3d5c7cebd4a541ace4d800b2eff3c9ee3ce1b1b21017e4aab73438ab3005d6cf966993a7b17afce16c5b788354c5d868
+DIST test_rosbag-1.15.11-migrated_mixed_gen3.bag 7252 BLAKE2B 29896d975cd406b525e8e59e24d26817a9a13b84833d9c08733bfc05be392d6e0be6de5bbced5068bed33ae60ce4053922c8092f259a48e23ae796ac43e8e601 SHA512 d0a5fd042c614e6451b9b6518ecd3317a727939db81fa8988c700a657be77f9cc14127cd0595c97a505094df9e96b63f79381be2da3717e34f3481d521905518
+DIST test_rosbag-1.15.11-migrated_mixed_gen4.bag 7387 BLAKE2B 55de46bbc4e115113df7ccac4c08e61308e7c06ddde1f6e69a436b4b32fb296b9f60d029473f46cf37b0894e501040f4e748302a9d7c8c8684911983860519c1 SHA512 5f106b3a64968ced5baeb0f91dac7209af508c6cdc2c3148bd9c86421024051f2bd7d12027af2857dd1e49964babb330333e02bb94a120426763695c06bd31ef
+DIST test_rosbag-1.15.11-partially_migrated_gen1.bag 6568 BLAKE2B c3d16f271e035140ab802123d7d848d4d7c0e00841edd0282c632c92bbe030847bd879e7e7ff24f6384f9f2f34a9dd38bb7b5e281de9df7203d2c43c28600fa3 SHA512 ecec0e8c3ccd4613048d300417218488a3578a131ed0bd346cf07dc6c702abb2354288558e56ffd6c192abb1e2afd7084a856eecd51a935e207936b5e3d52e32
+DIST test_rosbag-1.15.11-partially_migrated_gen2.bag 6616 BLAKE2B 846b84e3d221b490d3f7b90083d5354ea21906b51569fa9c57642c6e52d06e3caa4a68b3f0fffbb5c808bb440fd17507c80a60a87bd0cb8207a14eb01418de24 SHA512 aac71997873669661eaab2d0f463e3e5afb677c9852a572fd9f139a9037d3e26e2d2ae8b9e16c204eae8f494a1a867638e5f7750293ccec27402dbea0804e712
+DIST test_rosbag-1.15.11-partially_migrated_gen3.bag 6707 BLAKE2B 6d5df33b8def73503cc35de95b680607cb7d687a16082558dd95b8b869866837cb584173088ee2a2c2d9f7ca21193eea287bef111103f8bacec2aa635cbe3e68 SHA512 e730b1b0604253286b4e53d917f01bad10cbe81b8b1547984657bd8e90112c20e1b24ba315aedccc1495374070fbbe6f7b8e51cd68e82986f68efd0785b7386d
+DIST test_rosbag-1.15.11-partially_migrated_gen4.bag 6910 BLAKE2B bde0ec1f776c109cd0c21cf4ce87b3f363c50b0eeebe004ff0060713204391f88fdae3a2a801dd6c4530f3eaf0ee74bd51ecb31ef78c34ced7a26f2a6c80de4f SHA512 42e894acacc8e974f495d8c2ca088b89a71506996f10dbfac431e6bd48af2338b2e8b7eee4c5a40098b04086c47e63f2f80f228ed39a0db4c197a47081c69f4a
+DIST test_rosbag-1.15.11-renamed_gen1.bag 4825 BLAKE2B 37b156027af0b490e00611eb31cd407cf576dd2be1abe77f3a2ca01e04e19f0a498163673928bd82fc660e38c7f9b9f7745f0b5bc2c3b5254e3d41f575561510 SHA512 99c6b187a45ac4d56544b163a876107be744d12515ff4baa6195857796d81c3b7fa0f75369c945a2bdf2954429129f5802a8a8ac6ac3a69ac1bd6b7feeb05173
+DIST test_rosbag-1.15.11-renamed_gen2.bag 4825 BLAKE2B 8a1ee3a3e421f0c2b298fcc9a4260dd76cc211c05e5d944f76f3f7d1feb461b439a5a6dc7dc545295237756510383042ab86e590e879ad35b6cdb8131d054ceb SHA512 c64b77c215c08c443d674bb12e9ac50a5fb234442c14cdea77e2936eabfe8c369947902ff6c9a211d8c3b9aa93f5677dadf8bb3b8145fc3a4b80f6c4f235e6f8
+DIST test_rosbag-1.15.11-renamed_gen3.bag 4835 BLAKE2B 8884b8fa15c3698a1d1fb19147fb2023cbd2946441ad9d4df2ef5ded3c455b2bce5a5cf6618f6e47729dc495b20b8f55a1750c4763ab4fb65c25d2a1f01de011 SHA512 67142debaecf05b76a42cf198572a9ff4bddf4c4da0b798e467f02ed5aa8ff2b6fabc248fa5caa33f346560edac1b3f38eb72ebae75b0224f6b281e5c21211a3
+DIST test_rosbag-1.15.11-renamed_gen4.bag 4833 BLAKE2B 72010f49332c337f998c4dd54a3399773e893f4f41ce01f7b130861993684641ff575c65e8bfcf1127a8dd590c0152ffcce08dfcd124e7a43c9ae8443983438e SHA512 2adfd75e05469793eb95ab68ca8403cd78f3a836157b0b1abcf21f11f16633b0e9c840f800ee5d51376fe91a31710d5674deb2c1c6e1a262517ab173550253cc
+DIST test_rosbag-1.15.11-subunmigrated_gen1.bag 5200 BLAKE2B 6786d316f28f7038b961fce5d4094b6948eb1f292dc63c04efdc9459c012acefcc7f962452a11ae53e8de4096c758833d7374ccbfc1a16b626e6c21af92b7979 SHA512 318d921f505ee97ab9ceba536ee48c4d5d5d8aa7d2619864b325d8083582daff43cf9bb61ff5ec3814e815cc334190b11687734e21141fbade9611a98244783b
+DIST test_rosbag-1.15.11-test_future_version_2.1.bag 6051 BLAKE2B 5368be834eaaf7d48519560295406a92ecc6573f7cbcbd5a29c9f05c12322198b1da8209b0316b5d694cdfbde8a9ba26be3a6f529154594e148743f7b618de45 SHA512 9a9870b28d5e0f12ed98fd1df6be21fa37e5db9f9423eb39cbbc7e8f042078210f7ccc8f534a02a5edc51fb61817ddeec705a8687917742648c1fdb70adf88db
+DIST test_rosbag-1.15.11-test_indexed_1.2.bag 142311 BLAKE2B 51e4f41334a4191a02e6cd2723ff7a38ea6b99e272304ff8be83641d31d3c4bc3bbddf835923da447d274d27253d0cf162ff065e6f952799c204a6d3b8a429bc SHA512 8c2b6973e549d1b5c2e1fe5f6873c40b7877fa87e7864d39e86646083baf481ecb3d9c1fc4ca5d44332b3b4b0f41856dd5dd2c71ce9f2281fdc61c9846bcd5b8
+DIST test_rosbag-1.15.11-test_rosbag_latched_pub.bag 4816 BLAKE2B 2a0a90eb46665486ac7a31249d7bc9c3c4f125c934a09e3fb0130bf43b10035552f9de0f0fd8280cec4cb1eb71fc7dc624ba1152724e602a2483a2df63869c3f SHA512 e1655185e8ea6a02aaccce4e819eb6d6aec48032f4f55e17d7c8649aa0d0b56eded659a97e2f83c7d04e221beb8a330bce093300d422c63f3b330f5b2b8bb8ca
+DIST test_rosbag-1.15.11-unmigrated_gen1.bag 4828 BLAKE2B 0fc0e446f8c31fef4b21a669b15a86340d0dcff2406a85f88ccdc84e6f3ff4a71252151d191c30c9879d2ce3031faf9101aaa22834cdd733491a2f92d53a7a04 SHA512 333dbf41976ae732e33f394883965d9d07bfe35d8f3c5be1bd129ff4ded31f8c8201b9fdd8bee7ecaf7f04f49d0ee7c7d2be1ec4c8322d0b0b9cc0a236fe8342
 DIST test_rosbag-1.15.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
@@ -142,6 +178,7 @@ DIST test_rosbag-9999-test_indexed_1.2.bag 142311 BLAKE2B 51e4f41334a4191a02e6cd
 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-r1.ebuild 2439 BLAKE2B 653d07ff7c4f18d6b0e8544b66d83e51dc6e96857a8424fea088c1bea757a1f0ecfc85a93b58b6937b9e3c6c6a58208bfaf957d4bdcde3e60a589267ff61849c SHA512 81cb0d3c642622af052e82db014b7614f77ca5c536648588ae797c9463be3218f917907417a8fba2761ed9db2fcd522312ab4aed982b2fd13d931c46d844995c
+EBUILD test_rosbag-1.15.11.ebuild 2439 BLAKE2B 653d07ff7c4f18d6b0e8544b66d83e51dc6e96857a8424fea088c1bea757a1f0ecfc85a93b58b6937b9e3c6c6a58208bfaf957d4bdcde3e60a589267ff61849c SHA512 81cb0d3c642622af052e82db014b7614f77ca5c536648588ae797c9463be3218f917907417a8fba2761ed9db2fcd522312ab4aed982b2fd13d931c46d844995c
 EBUILD test_rosbag-1.15.8-r1.ebuild 2439 BLAKE2B 653d07ff7c4f18d6b0e8544b66d83e51dc6e96857a8424fea088c1bea757a1f0ecfc85a93b58b6937b9e3c6c6a58208bfaf957d4bdcde3e60a589267ff61849c SHA512 81cb0d3c642622af052e82db014b7614f77ca5c536648588ae797c9463be3218f917907417a8fba2761ed9db2fcd522312ab4aed982b2fd13d931c46d844995c
 EBUILD test_rosbag-1.15.9-r1.ebuild 2439 BLAKE2B 653d07ff7c4f18d6b0e8544b66d83e51dc6e96857a8424fea088c1bea757a1f0ecfc85a93b58b6937b9e3c6c6a58208bfaf957d4bdcde3e60a589267ff61849c SHA512 81cb0d3c642622af052e82db014b7614f77ca5c536648588ae797c9463be3218f917907417a8fba2761ed9db2fcd522312ab4aed982b2fd13d931c46d844995c
 EBUILD test_rosbag-9999.ebuild 2439 BLAKE2B 653d07ff7c4f18d6b0e8544b66d83e51dc6e96857a8424fea088c1bea757a1f0ecfc85a93b58b6937b9e3c6c6a58208bfaf957d4bdcde3e60a589267ff61849c SHA512 81cb0d3c642622af052e82db014b7614f77ca5c536648588ae797c9463be3218f917907417a8fba2761ed9db2fcd522312ab4aed982b2fd13d931c46d844995c
diff --git a/dev-ros/test_rosbag/test_rosbag-1.15.11.ebuild b/dev-ros/test_rosbag/test_rosbag-1.15.11.ebuild
new file mode 100644
index 000000000000..ac4873bb7e45
--- /dev/null
+++ b/dev-ros/test_rosbag/test_rosbag-1.15.11.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 12cb39283fc5..7acab8f0ab7c 100644
--- a/dev-ros/test_rosbag_storage/Manifest
+++ b/dev-ros/test_rosbag_storage/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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.11.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.11.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.11.ebuild
new file mode 100644
index 000000000000..56f714211def
--- /dev/null
+++ b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.11.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 f97712762545..8a333988d332 100644
--- a/dev-ros/test_roscpp/Manifest
+++ b/dev-ros/test_roscpp/Manifest
@@ -1,9 +1,11 @@
 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.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 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-r1.ebuild 907 BLAKE2B 635d95284f78606deb6325567446894e49fe976b2f5df6cbfa35302bd1dfef3da7ccf314f4f56f56709b6d5c88dfd88a84ed48fe459cc00debfe16ce0edcfb67 SHA512 2c8684327c4a5c5406f2d46ae3fb25de89fc0ba8a8d29393327533965f738c4bef49feaa8573f1f98e1a825fa6ec90d43ed02a04a376ce623ee8c5f086a7332f
+EBUILD test_roscpp-1.15.11.ebuild 907 BLAKE2B 635d95284f78606deb6325567446894e49fe976b2f5df6cbfa35302bd1dfef3da7ccf314f4f56f56709b6d5c88dfd88a84ed48fe459cc00debfe16ce0edcfb67 SHA512 2c8684327c4a5c5406f2d46ae3fb25de89fc0ba8a8d29393327533965f738c4bef49feaa8573f1f98e1a825fa6ec90d43ed02a04a376ce623ee8c5f086a7332f
 EBUILD test_roscpp-1.15.7-r1.ebuild 672 BLAKE2B d667af1a1b0809ac52691ff4defb6468497dd523927c9938a18f5daa223abf082bf062c7a9b80859a3175ff9f6cd94132ae6ec30f362c864285fbcb9900bd5b1 SHA512 73b3d9b3d53934885fa4fc3c3516a5782b3490f9b14907a7c1ea581dbc89a5b68d1f201c054cbec5b090d2ea0c5c6be72b97c9766b9da317c35d4ef2d1238bda
 EBUILD test_roscpp-1.15.8-r1.ebuild 907 BLAKE2B 635d95284f78606deb6325567446894e49fe976b2f5df6cbfa35302bd1dfef3da7ccf314f4f56f56709b6d5c88dfd88a84ed48fe459cc00debfe16ce0edcfb67 SHA512 2c8684327c4a5c5406f2d46ae3fb25de89fc0ba8a8d29393327533965f738c4bef49feaa8573f1f98e1a825fa6ec90d43ed02a04a376ce623ee8c5f086a7332f
 EBUILD test_roscpp-1.15.9-r1.ebuild 907 BLAKE2B 635d95284f78606deb6325567446894e49fe976b2f5df6cbfa35302bd1dfef3da7ccf314f4f56f56709b6d5c88dfd88a84ed48fe459cc00debfe16ce0edcfb67 SHA512 2c8684327c4a5c5406f2d46ae3fb25de89fc0ba8a8d29393327533965f738c4bef49feaa8573f1f98e1a825fa6ec90d43ed02a04a376ce623ee8c5f086a7332f
diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.11.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.11.ebuild
new file mode 100644
index 000000000000..38c3002a2918
--- /dev/null
+++ b/dev-ros/test_roscpp/test_roscpp-1.15.11.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 7efbd10baf12..d7b8fe497590 100644
--- a/dev-ros/test_rosgraph/Manifest
+++ b/dev-ros/test_rosgraph/Manifest
@@ -1,8 +1,10 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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.11.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.11.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.15.11.ebuild
new file mode 100644
index 000000000000..63863b4ad56b
--- /dev/null
+++ b/dev-ros/test_rosgraph/test_rosgraph-1.15.11.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 3c2587b35252..96af9ff82079 100644
--- a/dev-ros/test_roslaunch/Manifest
+++ b/dev-ros/test_roslaunch/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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.11.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.11.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.11.ebuild
new file mode 100644
index 000000000000..b506232d6f4b
--- /dev/null
+++ b/dev-ros/test_roslaunch/test_roslaunch-1.15.11.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 20473b574bd7..b403b4e5d4e8 100644
--- a/dev-ros/test_roslib_comm/Manifest
+++ b/dev-ros/test_roslib_comm/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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.11.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.11.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.11.ebuild
new file mode 100644
index 000000000000..e4dc35ffaea9
--- /dev/null
+++ b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.11.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 52d16a32b7af..d4a604494e92 100644
--- a/dev-ros/test_rosmaster/Manifest
+++ b/dev-ros/test_rosmaster/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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.11.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.11.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.15.11.ebuild
new file mode 100644
index 000000000000..2e62994a05c3
--- /dev/null
+++ b/dev-ros/test_rosmaster/test_rosmaster-1.15.11.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 bcbbcfc46532..b7e6445c1590 100644
--- a/dev-ros/test_rosparam/Manifest
+++ b/dev-ros/test_rosparam/Manifest
@@ -1,8 +1,10 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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.11.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.11.ebuild b/dev-ros/test_rosparam/test_rosparam-1.15.11.ebuild
new file mode 100644
index 000000000000..108cabfb7564
--- /dev/null
+++ b/dev-ros/test_rosparam/test_rosparam-1.15.11.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 95b9641e7ea8..7c282ef5a672 100644
--- a/dev-ros/test_rospy/Manifest
+++ b/dev-ros/test_rospy/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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.11.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.11.ebuild b/dev-ros/test_rospy/test_rospy-1.15.11.ebuild
new file mode 100644
index 000000000000..af5f3520b53e
--- /dev/null
+++ b/dev-ros/test_rospy/test_rospy-1.15.11.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 3285e4e89dda..c125384491eb 100644
--- a/dev-ros/test_rosservice/Manifest
+++ b/dev-ros/test_rosservice/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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.11.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.11.ebuild b/dev-ros/test_rosservice/test_rosservice-1.15.11.ebuild
new file mode 100644
index 000000000000..b73420876103
--- /dev/null
+++ b/dev-ros/test_rosservice/test_rosservice-1.15.11.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/test_tf2/Manifest b/dev-ros/test_tf2/Manifest
index 405d078c7512..03fb1812372b 100644
--- a/dev-ros/test_tf2/Manifest
+++ b/dev-ros/test_tf2/Manifest
@@ -1,8 +1,4 @@
-DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
-DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
 DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
-EBUILD test_tf2-0.7.2-r1.ebuild 785 BLAKE2B b92918a03825820a52346023d23de27f05856976a5075cde41b1489984a55185b79241af1b2af838cf2817772d199f5331ac8b2ef71f55989e1d06c6ebb1b2c3 SHA512 f2012a7302f342209758e43d178e96aedf361bbbde55bc692135de14bbfbcc57157bc9a4d17235d8b0767daf6af5a25b944e393c837ab618b0015d0f55b35d16
-EBUILD test_tf2-0.7.3-r1.ebuild 785 BLAKE2B b92918a03825820a52346023d23de27f05856976a5075cde41b1489984a55185b79241af1b2af838cf2817772d199f5331ac8b2ef71f55989e1d06c6ebb1b2c3 SHA512 f2012a7302f342209758e43d178e96aedf361bbbde55bc692135de14bbfbcc57157bc9a4d17235d8b0767daf6af5a25b944e393c837ab618b0015d0f55b35d16
-EBUILD test_tf2-0.7.5-r1.ebuild 785 BLAKE2B b92918a03825820a52346023d23de27f05856976a5075cde41b1489984a55185b79241af1b2af838cf2817772d199f5331ac8b2ef71f55989e1d06c6ebb1b2c3 SHA512 f2012a7302f342209758e43d178e96aedf361bbbde55bc692135de14bbfbcc57157bc9a4d17235d8b0767daf6af5a25b944e393c837ab618b0015d0f55b35d16
-EBUILD test_tf2-9999.ebuild 785 BLAKE2B b92918a03825820a52346023d23de27f05856976a5075cde41b1489984a55185b79241af1b2af838cf2817772d199f5331ac8b2ef71f55989e1d06c6ebb1b2c3 SHA512 f2012a7302f342209758e43d178e96aedf361bbbde55bc692135de14bbfbcc57157bc9a4d17235d8b0767daf6af5a25b944e393c837ab618b0015d0f55b35d16
+EBUILD test_tf2-0.7.5-r1.ebuild 804 BLAKE2B c8c1c45ecdc87cc9f8e06fc48f91f84a7e913ec4a7c95b64e915503082b67d696e291e0bfb94d873132a236ebe8b7a2fa18ad304438a18d043b554a627b74f4a SHA512 076119e5f25702e1f57e7ecda23e762e5e313a9f17221f88f11f2a79b9717dde8327182352f11ba0515f1213789d8471354d6949f19a613b7bffdc39ac5d6e0d
+EBUILD test_tf2-9999.ebuild 804 BLAKE2B c8c1c45ecdc87cc9f8e06fc48f91f84a7e913ec4a7c95b64e915503082b67d696e291e0bfb94d873132a236ebe8b7a2fa18ad304438a18d043b554a627b74f4a SHA512 076119e5f25702e1f57e7ecda23e762e5e313a9f17221f88f11f2a79b9717dde8327182352f11ba0515f1213789d8471354d6949f19a613b7bffdc39ac5d6e0d
 MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/test_tf2/test_tf2-0.7.2-r1.ebuild b/dev-ros/test_tf2/test_tf2-0.7.2-r1.ebuild
deleted file mode 100644
index 6c0d24e8c5f9..000000000000
--- a/dev-ros/test_tf2/test_tf2-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf
-	dev-ros/tf2
-	dev-ros/tf2_bullet
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_kdl[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_msgs
-	dev-ros/rosbash
-	sci-libs/orocos_kdl
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	dev-libs/boost:=[threads(+)]
-	dev-cpp/gtest
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/test_tf2/test_tf2-0.7.3-r1.ebuild b/dev-ros/test_tf2/test_tf2-0.7.3-r1.ebuild
deleted file mode 100644
index 6c0d24e8c5f9..000000000000
--- a/dev-ros/test_tf2/test_tf2-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf
-	dev-ros/tf2
-	dev-ros/tf2_bullet
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_kdl[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_msgs
-	dev-ros/rosbash
-	sci-libs/orocos_kdl
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	dev-libs/boost:=[threads(+)]
-	dev-cpp/gtest
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/test_tf2/test_tf2-0.7.5-r1.ebuild b/dev-ros/test_tf2/test_tf2-0.7.5-r1.ebuild
index 6c0d24e8c5f9..24c879237de4 100644
--- a/dev-ros/test_tf2/test_tf2-0.7.5-r1.ebuild
+++ b/dev-ros/test_tf2/test_tf2-0.7.5-r1.ebuild
@@ -21,6 +21,7 @@ DEPEND="
 	dev-ros/tf
 	dev-ros/tf2
 	dev-ros/tf2_bullet
+	dev-ros/tf2_eigen
 	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/tf2_geometry_msgs[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/tf2_kdl[${PYTHON_SINGLE_USEDEP}]
diff --git a/dev-ros/test_tf2/test_tf2-9999.ebuild b/dev-ros/test_tf2/test_tf2-9999.ebuild
index 6c0d24e8c5f9..24c879237de4 100644
--- a/dev-ros/test_tf2/test_tf2-9999.ebuild
+++ b/dev-ros/test_tf2/test_tf2-9999.ebuild
@@ -21,6 +21,7 @@ DEPEND="
 	dev-ros/tf
 	dev-ros/tf2
 	dev-ros/tf2_bullet
+	dev-ros/tf2_eigen
 	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/tf2_geometry_msgs[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/tf2_kdl[${PYTHON_SINGLE_USEDEP}]
diff --git a/dev-ros/tf/Manifest b/dev-ros/tf/Manifest
index 09ff5b3bc83c..529d423fa4fa 100644
--- a/dev-ros/tf/Manifest
+++ b/dev-ros/tf/Manifest
@@ -1,5 +1,5 @@
 AUX yaml.patch 559 BLAKE2B 228004c7cc268ebe011dfc8f83aeec9a32e98566c970b7e94b8fcd19879ad1974038fdee9b850ca7bebc770e96cf8b81a92ae9583188191de86e7d5a4100b835 SHA512 67f8aeee746fc3137310fc5eb127d8dc12be2c33b38b2237b6889f7837d2637125394ebe5d22c6dfee28787fecf0cf48be3168c09a50c435dde7040eed39dfc3
 DIST geometry-1.13.2.tar.gz 188225 BLAKE2B b08e78b298c94c38baa5d25a878be703d7d3a310277b66690b9fe4da1d0cd3f9083cf3bf6dc1d59149599b6fb0ec10feaf668206da245ed7e0cb9cf1878b620c SHA512 504de0e7ebf1dd73e918ab4fa39967cc9e39a53d487072430106b391d669ddfc7e530b66b38f4f73d1787e4a73acdad8e707c6757afe2e235157d4aa19f28af2
-EBUILD tf-1.13.2-r2.ebuild 1116 BLAKE2B b8fccd23423a0fa60b14756c1bfed2f5fe135b96d1a6a391f3c0b7c174bb0c8bc6792e35507c0244a761f3458d377fab542d53cac8d9189c877ba78aeb3d350c SHA512 3b169604503c08c89c27c685e54abd3d628c1cd2b346e6ef7a11cdd09d1580dccfd3037a4b96f008e158386bf966e862bf551e66f96ad90e6210dde12575d82f
-EBUILD tf-9999.ebuild 1116 BLAKE2B b8fccd23423a0fa60b14756c1bfed2f5fe135b96d1a6a391f3c0b7c174bb0c8bc6792e35507c0244a761f3458d377fab542d53cac8d9189c877ba78aeb3d350c SHA512 3b169604503c08c89c27c685e54abd3d628c1cd2b346e6ef7a11cdd09d1580dccfd3037a4b96f008e158386bf966e862bf551e66f96ad90e6210dde12575d82f
+EBUILD tf-1.13.2-r3.ebuild 1178 BLAKE2B cf6928da6e8f5f50955df7d362cb6ad621776da87ce566c95be7b5f286e2f2bd1c400937e3052e3c63242e6bf47adc1dbec0e8586163426951f20ebfb25dc25c SHA512 6d8612891200e740a07dddcfcbab2ba06d0cf4bc3691a5676c4d5decde6e29c8d50c87c182d11daac8b5216a0820b091239b42ff3e9550994b9926909e3f4334
+EBUILD tf-9999.ebuild 1178 BLAKE2B cf6928da6e8f5f50955df7d362cb6ad621776da87ce566c95be7b5f286e2f2bd1c400937e3052e3c63242e6bf47adc1dbec0e8586163426951f20ebfb25dc25c SHA512 6d8612891200e740a07dddcfcbab2ba06d0cf4bc3691a5676c4d5decde6e29c8d50c87c182d11daac8b5216a0820b091239b42ff3e9550994b9926909e3f4334
 MISC metadata.xml 326 BLAKE2B 5dc7af91da7fdb7ea5fc3057f3d536db449ab74936a1d7d5fc8db12e7ee77f575df3607e4cb4be025a297c16ff2396fe7b8ee18d3024278059c3a9acf59485ba SHA512 2a6fb539ad45610d9ece5d96d9dfdcc90a0e11723e2a2747dd49a4b15fedda8afc369e5d9a1a4337f9216a983a4d8f3c9fe6b1054c8dafedd83ced92fd8381ae
diff --git a/dev-ros/tf/tf-1.13.2-r2.ebuild b/dev-ros/tf/tf-1.13.2-r3.ebuild
index 0a1e2df469df..1bca719cd3f7 100644
--- a/dev-ros/tf/tf-1.13.2-r2.ebuild
+++ b/dev-ros/tf/tf-1.13.2-r3.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
diff --git a/dev-ros/tf/tf-9999.ebuild b/dev-ros/tf/tf-9999.ebuild
index 0a1e2df469df..1bca719cd3f7 100644
--- a/dev-ros/tf/tf-9999.ebuild
+++ b/dev-ros/tf/tf-9999.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
diff --git a/dev-ros/topic_tools/Manifest b/dev-ros/topic_tools/Manifest
index 2f5385bafe5d..e0ed222435d7 100644
--- a/dev-ros/topic_tools/Manifest
+++ b/dev-ros/topic_tools/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 EBUILD topic_tools-1.15.10-r1.ebuild 833 BLAKE2B de242b907f1063dec86baadb58aec99b1b1ece5027e253c24bb54207f172778bb5d2819392436fc68651a9715364c6bbe87dbbf9ae3e5122e7f60a15c4eafa64 SHA512 f44b083ee74d4dd855e0fa89c51bee534bb1c93508fb14189f2c1730ad638379c0ff0b0aa1fb508aea8e4d263eb10cb5e6310a043d55ec0b813f38fffd769e92
+EBUILD topic_tools-1.15.11.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.11.ebuild b/dev-ros/topic_tools/topic_tools-1.15.11.ebuild
new file mode 100644
index 000000000000..56e95ed254bf
--- /dev/null
+++ b/dev-ros/topic_tools/topic_tools-1.15.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=tools/${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for directing, throttling and selecting ROS topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostime
+	dev-ros/xmlrpcpp
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosbash[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
diff --git a/dev-ros/transmission_interface/Manifest b/dev-ros/transmission_interface/Manifest
index bd96a1aae76c..d17dd4e91f13 100644
--- a/dev-ros/transmission_interface/Manifest
+++ b/dev-ros/transmission_interface/Manifest
@@ -2,9 +2,11 @@ DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6
 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
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
 EBUILD transmission_interface-0.19.1.ebuild 693 BLAKE2B 4ad32954a9822e3a44c676e602745356d7ce4c03b19cce04bcdf6cdac58d0bbc33d591ed4e8e1411d846b41802cb615819698bbf91cca51b4165548f490d085e SHA512 2ca6e1bfa6fd74625e91e52e647216565ec1999b42ea820179ff0ab0ca3b57b83486b56943d90cfeb495effd00a02f78cbc5c7c7690cf80e369c0e92096dfddd
 EBUILD transmission_interface-0.19.2.ebuild 693 BLAKE2B 4ad32954a9822e3a44c676e602745356d7ce4c03b19cce04bcdf6cdac58d0bbc33d591ed4e8e1411d846b41802cb615819698bbf91cca51b4165548f490d085e SHA512 2ca6e1bfa6fd74625e91e52e647216565ec1999b42ea820179ff0ab0ca3b57b83486b56943d90cfeb495effd00a02f78cbc5c7c7690cf80e369c0e92096dfddd
 EBUILD transmission_interface-0.19.3.ebuild 693 BLAKE2B 4ad32954a9822e3a44c676e602745356d7ce4c03b19cce04bcdf6cdac58d0bbc33d591ed4e8e1411d846b41802cb615819698bbf91cca51b4165548f490d085e SHA512 2ca6e1bfa6fd74625e91e52e647216565ec1999b42ea820179ff0ab0ca3b57b83486b56943d90cfeb495effd00a02f78cbc5c7c7690cf80e369c0e92096dfddd
 EBUILD transmission_interface-0.19.4.ebuild 693 BLAKE2B 7bc97259441054d58c554ad12d24e47d84e7a998b4d5a938ee444620c4034c1c607b0b1e6843aed82d76eb2ec701889ffc00babd0cd7101b4b2fefb1a3a35142 SHA512 c36a887ee7a82ac3b282d06e3a87ff0252e41fdecb8ed3ac134af45360bccf50c87a9b2aef379e6d7a5710babb56065398521b74cf497f26f2fc16597f3d8f9f
+EBUILD transmission_interface-0.19.5.ebuild 693 BLAKE2B 7bc97259441054d58c554ad12d24e47d84e7a998b4d5a938ee444620c4034c1c607b0b1e6843aed82d76eb2ec701889ffc00babd0cd7101b4b2fefb1a3a35142 SHA512 c36a887ee7a82ac3b282d06e3a87ff0252e41fdecb8ed3ac134af45360bccf50c87a9b2aef379e6d7a5710babb56065398521b74cf497f26f2fc16597f3d8f9f
 EBUILD transmission_interface-9999.ebuild 693 BLAKE2B 4ad32954a9822e3a44c676e602745356d7ce4c03b19cce04bcdf6cdac58d0bbc33d591ed4e8e1411d846b41802cb615819698bbf91cca51b4165548f490d085e SHA512 2ca6e1bfa6fd74625e91e52e647216565ec1999b42ea820179ff0ab0ca3b57b83486b56943d90cfeb495effd00a02f78cbc5c7c7690cf80e369c0e92096dfddd
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.3.ebuild b/dev-ros/transmission_interface/transmission_interface-0.19.5.ebuild
index 3c574d1b681b..92d38e504c33 100644
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.3.ebuild
+++ b/dev-ros/transmission_interface/transmission_interface-0.19.5.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,26 +8,26 @@ ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Tests for the controller manager"
+DESCRIPTION="Transmission Interface"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/controller_interface
-	dev-ros/control_toolbox
-	dev-libs/boost:=
+	dev-ros/hardware_interface
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
 	dev-libs/console_bridge:=
-	dev-cpp/gtest
+	dev-ros/resource_retriever
+	dev-ros/roscpp
+	dev-libs/tinyxml
+	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+	test? (
+		dev-cpp/gtest
+	)
 "
-# needed by combined_robot_hw_tests
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
 
 src_test() {
 	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
diff --git a/dev-ros/visp_auto_tracker/Manifest b/dev-ros/visp_auto_tracker/Manifest
index 14a419f9517e..0b87d9edd6c4 100644
--- a/dev-ros/visp_auto_tracker/Manifest
+++ b/dev-ros/visp_auto_tracker/Manifest
@@ -1,6 +1,4 @@
-AUX boost170.patch 497 BLAKE2B 3ff7f23fe562d9597bd379123721a24a6b949d38ceddce49c4dd0a12d4e6597704511c31fc133ce4d3bb8897c725c6ab207d9330482287ecb44830fb16765e65 SHA512 489454810cb6fa313ac24668c655e59e9a520c32548f9df3b7d0529f0e6a7fc83691a0f2b48d9b1f3f74fc77738e79e06fb0f32fce427c3aff3fa76886b71be7
-AUX ocv4.patch 980 BLAKE2B 9e2ab8f0bb49c3f18191ecba66853ac23de278069c0493b74db0d1f368959d91499a57a36cd8ccac85fd7c86ed0a828da4f857785c9ea9951ac23b54e9739aab SHA512 f9f5b2060e0a780dc4ef09a79685c0698c097b248cfa0bd651572f7446f3e382913a9040ec3209991fc5b641cb1c482597ad8cd84ab7f4d88d42c14e78bf11c2
-DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
-EBUILD visp_auto_tracker-0.11.1-r2.ebuild 912 BLAKE2B 232d7b2d964c93d85aaa5c5fca83aa2cd44153adc20197ab5f2f1960307cf4940290d1ba87463ac129982237eae84a81c1a5aadfe971c2091dcd56864be5ba3f SHA512 d374ed710dae20e546cfac6165c53bf3c8be86b8dc8a8eb0e30adecfaa48c764106936fdf1061e9f33858dad7c604b0174c5cfd5702577a951dd66e7f0405708
-EBUILD visp_auto_tracker-9999.ebuild 912 BLAKE2B 232d7b2d964c93d85aaa5c5fca83aa2cd44153adc20197ab5f2f1960307cf4940290d1ba87463ac129982237eae84a81c1a5aadfe971c2091dcd56864be5ba3f SHA512 d374ed710dae20e546cfac6165c53bf3c8be86b8dc8a8eb0e30adecfaa48c764106936fdf1061e9f33858dad7c604b0174c5cfd5702577a951dd66e7f0405708
+DIST vision_visp-0.12.1.tar.gz 1014707 BLAKE2B 0c482268761f75e4e36260bb8a98c32677e500f322b3807eda7e24c35681d5fee628e422b67ab9ae73c6a27b467d600ca5ba72220a09e93b146b97273b5d0d54 SHA512 9e050009a335bd8d7f3c024e460087139b43e5b4c44c2048409176b8503aa81193916e767ce06df48fa5d0f0ca23ac551df7201e92e7de65967b9f2df5a1bf7c
+EBUILD visp_auto_tracker-0.12.1.ebuild 843 BLAKE2B 8c8e24c40f9f2864ded53828a0df224c9f29597fab03376dca06bba79499ff1d30b261fd605c8ceb7511d53e75ee43ec790775730ddb9673a169303afd4c4a8e SHA512 f3fcf0ff36688fae58d28c16262221f158011e0a9a172d2e49de3466d9b485b5aa01d161ec98ff005204a44f2bc3928a47655d9c3f87f9faf96852ecfd30ec14
+EBUILD visp_auto_tracker-9999.ebuild 843 BLAKE2B 8c8e24c40f9f2864ded53828a0df224c9f29597fab03376dca06bba79499ff1d30b261fd605c8ceb7511d53e75ee43ec790775730ddb9673a169303afd4c4a8e SHA512 f3fcf0ff36688fae58d28c16262221f158011e0a9a172d2e49de3466d9b485b5aa01d161ec98ff005204a44f2bc3928a47655d9c3f87f9faf96852ecfd30ec14
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_auto_tracker/files/boost170.patch b/dev-ros/visp_auto_tracker/files/boost170.patch
deleted file mode 100644
index 47f04d4989a3..000000000000
--- a/dev-ros/visp_auto_tracker/files/boost170.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: visp_auto_tracker/CMakeLists.txt
-===================================================================
---- visp_auto_tracker.orig/CMakeLists.txt
-+++ visp_auto_tracker/CMakeLists.txt
-@@ -36,7 +36,7 @@ find_package(catkin REQUIRED COMPONENTS
- find_package(VISP)
- 
- find_package(Boost REQUIRED
--  COMPONENTS filesystem system signals regex date_time program_options thread)
-+  COMPONENTS filesystem system regex date_time program_options thread)
- 
- include_directories(
-   ${Boost_INCLUDE_DIRS}
diff --git a/dev-ros/visp_auto_tracker/files/ocv4.patch b/dev-ros/visp_auto_tracker/files/ocv4.patch
deleted file mode 100644
index 79a6970af9f7..000000000000
--- a/dev-ros/visp_auto_tracker/files/ocv4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: visp_auto_tracker/flashcode_mbt/libauto_tracker/states.hpp
-===================================================================
---- visp_auto_tracker.orig/flashcode_mbt/libauto_tracker/states.hpp
-+++ visp_auto_tracker/flashcode_mbt/libauto_tracker/states.hpp
-@@ -1,6 +1,6 @@
- #ifndef __EVENTS_H__
- #define __EVENTS_H__
--#include "cv.h"
-+#include <opencv2/core/core_c.h>
- // back-end
- #include <boost/msm/back/state_machine.hpp>
- //front-end
-Index: visp_auto_tracker/flashcode_mbt/libauto_tracker/tracking.cpp
-===================================================================
---- visp_auto_tracker.orig/flashcode_mbt/libauto_tracker/tracking.cpp
-+++ visp_auto_tracker/flashcode_mbt/libauto_tracker/tracking.cpp
-@@ -1,6 +1,6 @@
- #include "ros/ros.h"
--#include "cv.h"
--#include "highgui.h"
-+#include <opencv2/core/core_c.h>
-+#include <opencv2/highgui/highgui_c.h>
- #include "tracking.h"
- #include <visp3/core/vpImageConvert.h>
- #include <visp3/core/vpPixelMeterConversion.h>
diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1-r2.ebuild b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.12.1.ebuild
index 8867c1fe5284..5932c11a16e9 100644
--- a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1-r2.ebuild
+++ b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.12.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 ROS_REPO_URI="https://github.com/lagadic/vision_visp"
 KEYWORDS="~amd64 ~arm"
-VER_PREFIX="kinetic-"
+VER_PREFIX="noetic-"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -30,7 +30,5 @@ DEPEND="${RDEPEND}
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
 fi
-
-PATCHES=( "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild b/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild
index 8867c1fe5284..5932c11a16e9 100644
--- a/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild
+++ b/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 ROS_REPO_URI="https://github.com/lagadic/vision_visp"
 KEYWORDS="~amd64 ~arm"
-VER_PREFIX="kinetic-"
+VER_PREFIX="noetic-"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -30,7 +30,5 @@ DEPEND="${RDEPEND}
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
 fi
-
-PATCHES=( "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/visp_bridge/Manifest b/dev-ros/visp_bridge/Manifest
index 09410af7059b..d8b94e663f67 100644
--- a/dev-ros/visp_bridge/Manifest
+++ b/dev-ros/visp_bridge/Manifest
@@ -1,5 +1,7 @@
 AUX gcc6.patch 362 BLAKE2B 07aa55e77c23987add38afbb9612a4ac17d4295a51deff3986c9fa4eacf2604815d2cb654169c03c2943c7e6e0d8041ab1a3f380656643f660f176abfa347e67 SHA512 b4fc5219f35ac7ce1a81cf7b82ce0aebaef61b6e20cf42e62a1811c996dd0a68fe92dc49642ff38454c5d1f5496dbe954ba4029c93791f8ddefe71118377a03f
 DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
+DIST vision_visp-0.12.1.tar.gz 1014707 BLAKE2B 0c482268761f75e4e36260bb8a98c32677e500f322b3807eda7e24c35681d5fee628e422b67ab9ae73c6a27b467d600ca5ba72220a09e93b146b97273b5d0d54 SHA512 9e050009a335bd8d7f3c024e460087139b43e5b4c44c2048409176b8503aa81193916e767ce06df48fa5d0f0ca23ac551df7201e92e7de65967b9f2df5a1bf7c
 EBUILD visp_bridge-0.11.1.ebuild 762 BLAKE2B 5ef20780ecd532b788613af374bae30f4d80377b37b36d50a12ed4cbc95833319f86e98b6fcc0b8681bd7544a410576578bc709afe9615882d92a35640e7a5c8 SHA512 56078ac8cdae3b6bb5dabceb26576dba868f5c7f671135d0d778f145bb6112bd52b3391ed7fd79f7476996d59a4bf635474acd20f7e4bed9a5c26d06067579c4
-EBUILD visp_bridge-9999.ebuild 762 BLAKE2B 5ef20780ecd532b788613af374bae30f4d80377b37b36d50a12ed4cbc95833319f86e98b6fcc0b8681bd7544a410576578bc709afe9615882d92a35640e7a5c8 SHA512 56078ac8cdae3b6bb5dabceb26576dba868f5c7f671135d0d778f145bb6112bd52b3391ed7fd79f7476996d59a4bf635474acd20f7e4bed9a5c26d06067579c4
+EBUILD visp_bridge-0.12.1.ebuild 760 BLAKE2B ddcf1687ccddff262c4d300546216ded28d23254dbcc96e599c85cb5f6bd65a7c61f1e63b5caf672294ea67553807ddec9dc3b8839c2929a45eac9c4cd286079 SHA512 13c7150afcc6f650f4e485f580635ff1195c78668f1d19c6bf307e9f0088e58e6b4477ad9054375447270ccacbf1a5ab9e0fd9bcacb50ecfbfb8b0701a8add1c
+EBUILD visp_bridge-9999.ebuild 760 BLAKE2B ddcf1687ccddff262c4d300546216ded28d23254dbcc96e599c85cb5f6bd65a7c61f1e63b5caf672294ea67553807ddec9dc3b8839c2929a45eac9c4cd286079 SHA512 13c7150afcc6f650f4e485f580635ff1195c78668f1d19c6bf307e9f0088e58e6b4477ad9054375447270ccacbf1a5ab9e0fd9bcacb50ecfbfb8b0701a8add1c
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_bridge/visp_bridge-0.12.1.ebuild b/dev-ros/visp_bridge/visp_bridge-0.12.1.ebuild
new file mode 100644
index 000000000000..897184ef36a1
--- /dev/null
+++ b/dev-ros/visp_bridge/visp_bridge-0.12.1.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/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="noetic-"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Converts between ROS structures and ViSP structures"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	sci-libs/ViSP:=[xml]
+	dev-ros/roscpp
+	dev-ros/camera_calibration_parsers
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
+fi
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_bridge/visp_bridge-9999.ebuild b/dev-ros/visp_bridge/visp_bridge-9999.ebuild
index ad50242778c0..897184ef36a1 100644
--- a/dev-ros/visp_bridge/visp_bridge-9999.ebuild
+++ b/dev-ros/visp_bridge/visp_bridge-9999.ebuild
@@ -1,10 +1,10 @@
-# 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/lagadic/vision_visp"
 KEYWORDS="~amd64 ~arm"
-VER_PREFIX="kinetic-"
+VER_PREFIX="noetic-"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -26,6 +26,6 @@ DEPEND="${RDEPEND}
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
 fi
 PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_camera_calibration/Manifest b/dev-ros/visp_camera_calibration/Manifest
index 922c29dd1d2c..fa0e6f0d04e1 100644
--- a/dev-ros/visp_camera_calibration/Manifest
+++ b/dev-ros/visp_camera_calibration/Manifest
@@ -1,5 +1,7 @@
 AUX gcc6.patch 421 BLAKE2B cf5b648dbd6d5121db22cee0aaddd9a359a87e9305e3887b4ec15b148e2921baf2562c9c377abb6c848088ce9592952bf537469fbe68cc025ad6e32db8817c61 SHA512 a4ed8165e1a8099d79bfe48563558bbb6de20b90dcc7def4b9dbb46a6c1115cbacfe09ed0c3ddb2b654914fe3b49554f11453fc3d2c87c8841b6755a24f08c4e
 DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
+DIST vision_visp-0.12.1.tar.gz 1014707 BLAKE2B 0c482268761f75e4e36260bb8a98c32677e500f322b3807eda7e24c35681d5fee628e422b67ab9ae73c6a27b467d600ca5ba72220a09e93b146b97273b5d0d54 SHA512 9e050009a335bd8d7f3c024e460087139b43e5b4c44c2048409176b8503aa81193916e767ce06df48fa5d0f0ca23ac551df7201e92e7de65967b9f2df5a1bf7c
 EBUILD visp_camera_calibration-0.11.1.ebuild 792 BLAKE2B db393f726d448787244777fe03c8f5d1c0f3d7bbae3167b4c8be442a36c7c18967f9db73d1397da68ae5114f191aec69279ec35819b92936cd2456a5af50fa9b SHA512 1c5d49edccab9e4831dc742661e9060835d4af2e57ecb75abff215068f29aa136dc0be33f4770a159bb5f1ebee77aa738cf4aa9f9e32aab86ad5581d7dd54f98
-EBUILD visp_camera_calibration-9999.ebuild 792 BLAKE2B db393f726d448787244777fe03c8f5d1c0f3d7bbae3167b4c8be442a36c7c18967f9db73d1397da68ae5114f191aec69279ec35819b92936cd2456a5af50fa9b SHA512 1c5d49edccab9e4831dc742661e9060835d4af2e57ecb75abff215068f29aa136dc0be33f4770a159bb5f1ebee77aa738cf4aa9f9e32aab86ad5581d7dd54f98
+EBUILD visp_camera_calibration-0.12.1.ebuild 790 BLAKE2B ec466d93cb7d09767206de7f1acdc684fbdba7d3e05f567fe36d0f5d4654d7236e52cb8810eb68c0ecfcaa3fa9b2a962202eb61d54ac305b13d3ba02386b91be SHA512 44d964629d1f0f45f2ece96f014a4f1ba587ed57028042ec75f3fbad01d78d1df2e0d1746a0fbd709bbe1541828f9861ab448148edbe061c3052f5e83d221268
+EBUILD visp_camera_calibration-9999.ebuild 790 BLAKE2B ec466d93cb7d09767206de7f1acdc684fbdba7d3e05f567fe36d0f5d4654d7236e52cb8810eb68c0ecfcaa3fa9b2a962202eb61d54ac305b13d3ba02386b91be SHA512 44d964629d1f0f45f2ece96f014a4f1ba587ed57028042ec75f3fbad01d78d1df2e0d1746a0fbd709bbe1541828f9861ab448148edbe061c3052f5e83d221268
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_camera_calibration/visp_camera_calibration-0.12.1.ebuild b/dev-ros/visp_camera_calibration/visp_camera_calibration-0.12.1.ebuild
new file mode 100644
index 000000000000..7e2b91a99ee2
--- /dev/null
+++ b/dev-ros/visp_camera_calibration/visp_camera_calibration-0.12.1.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/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="noetic-"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Calibration of cameras using a customizable pattern and ViSP library"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/camera_calibration_parsers
+	dev-ros/roscpp
+	dev-ros/visp_bridge
+	sci-libs/ViSP:=[X]
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
+fi
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild b/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild
index c68c3131f198..7e2b91a99ee2 100644
--- a/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild
+++ b/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild
@@ -1,10 +1,10 @@
-# 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/lagadic/vision_visp"
 KEYWORDS="~amd64 ~arm"
-VER_PREFIX="kinetic-"
+VER_PREFIX="noetic-"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
@@ -27,6 +27,6 @@ DEPEND="${RDEPEND}
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
 fi
 PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_hand2eye_calibration/Manifest b/dev-ros/visp_hand2eye_calibration/Manifest
index ae8b5626937a..323c8a076971 100644
--- a/dev-ros/visp_hand2eye_calibration/Manifest
+++ b/dev-ros/visp_hand2eye_calibration/Manifest
@@ -1,4 +1,6 @@
 DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
+DIST vision_visp-0.12.1.tar.gz 1014707 BLAKE2B 0c482268761f75e4e36260bb8a98c32677e500f322b3807eda7e24c35681d5fee628e422b67ab9ae73c6a27b467d600ca5ba72220a09e93b146b97273b5d0d54 SHA512 9e050009a335bd8d7f3c024e460087139b43e5b4c44c2048409176b8503aa81193916e767ce06df48fa5d0f0ca23ac551df7201e92e7de65967b9f2df5a1bf7c
 EBUILD visp_hand2eye_calibration-0.11.1.ebuild 709 BLAKE2B 5a1c93863cc2608c6030d419b95786b221fc4805af01788631664fc65aa8f755bd638f93b39ec13417bc31e592513856a10d16c1b170aa0744e1e5ca65c04fa1 SHA512 e4731b6b68149f26e8e7f93614ffbd7f5eef997905c9d68131c1ee0981aa8130052915b649a613a086b2fad7b8a73185c5d2db5f51d7ba8dd1222145245cfece
-EBUILD visp_hand2eye_calibration-9999.ebuild 709 BLAKE2B 5a1c93863cc2608c6030d419b95786b221fc4805af01788631664fc65aa8f755bd638f93b39ec13417bc31e592513856a10d16c1b170aa0744e1e5ca65c04fa1 SHA512 e4731b6b68149f26e8e7f93614ffbd7f5eef997905c9d68131c1ee0981aa8130052915b649a613a086b2fad7b8a73185c5d2db5f51d7ba8dd1222145245cfece
+EBUILD visp_hand2eye_calibration-0.12.1.ebuild 707 BLAKE2B bd4e7297978f1004ee8ac249e18d3de727d4aa2ef54195b6200dd00e787da79b9927c4abb1ebf45fa726aee6525cb453a2a510b9ceadf8fe8aab7af4ef18a063 SHA512 bc3f3ec2ef481f6bcbc5bca8600021f60bb25e19b7ed56fc332f93af6bf3b3cf2d4f6be28afc5fb9348ee475ec8069526cb97f064a72e96566e2ea6d3c82ae12
+EBUILD visp_hand2eye_calibration-9999.ebuild 707 BLAKE2B bd4e7297978f1004ee8ac249e18d3de727d4aa2ef54195b6200dd00e787da79b9927c4abb1ebf45fa726aee6525cb453a2a510b9ceadf8fe8aab7af4ef18a063 SHA512 bc3f3ec2ef481f6bcbc5bca8600021f60bb25e19b7ed56fc332f93af6bf3b3cf2d4f6be28afc5fb9348ee475ec8069526cb97f064a72e96566e2ea6d3c82ae12
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.12.1.ebuild b/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.12.1.ebuild
new file mode 100644
index 000000000000..edbae8378ad0
--- /dev/null
+++ b/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.12.1.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/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="noetic-"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Estimates the camera position with respect to its effector using ViSP"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_proc
+	dev-ros/roscpp
+	dev-ros/sensor_msgs
+	dev-ros/visp_bridge
+	dev-ros/visp_tracker
+	sci-libs/ViSP:=
+"
+DEPEND="${RDEPEND}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
+fi
diff --git a/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-9999.ebuild b/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-9999.ebuild
index 4f14eac92f13..edbae8378ad0 100644
--- a/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-9999.ebuild
+++ b/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-9999.ebuild
@@ -1,10 +1,10 @@
-# 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/lagadic/vision_visp"
 KEYWORDS="~amd64 ~arm"
-VER_PREFIX="kinetic-"
+VER_PREFIX="noetic-"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
@@ -26,5 +26,5 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
 fi
diff --git a/dev-ros/visp_tracker/Manifest b/dev-ros/visp_tracker/Manifest
index 30d027aa01ab..e8d1de9c83cd 100644
--- a/dev-ros/visp_tracker/Manifest
+++ b/dev-ros/visp_tracker/Manifest
@@ -1,5 +1,7 @@
 AUX gcc6.patch 350 BLAKE2B 5e0f54319cc37bf0a4cf46e3b96f37bdb059af0f0e4a2b7219363504c96a2ed43121f4028c4d264959f1cf78e10d329ac67ee85d6a2868212b0cbcf924e2f93d SHA512 b1647cca84792212a1fe20685e83ee28fc225fb7272ed892fdbc4faae809059ce955cf5df1d8b3543c1248a741ad9a0bcb263a547aa21be2cebd8608dfba457e
 DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
+DIST vision_visp-0.12.1.tar.gz 1014707 BLAKE2B 0c482268761f75e4e36260bb8a98c32677e500f322b3807eda7e24c35681d5fee628e422b67ab9ae73c6a27b467d600ca5ba72220a09e93b146b97273b5d0d54 SHA512 9e050009a335bd8d7f3c024e460087139b43e5b4c44c2048409176b8503aa81193916e767ce06df48fa5d0f0ca23ac551df7201e92e7de65967b9f2df5a1bf7c
 EBUILD visp_tracker-0.11.1-r1.ebuild 1059 BLAKE2B 00e115d602728ebcd542d5673fe0ffdcf23a9711a673aff1525b9174d1a5931346ff3e81114300d2390d45a266a7bafa0fdc6bc90ca8e8ccb95ee1eb3375b157 SHA512 601529cbb921b96349c998525f186fa541a56c64251d7401451a481201e5dd47c24b491d45148ccea9c16e4b78c0f435292900173082d2d7ec087ba21f98c1b2
-EBUILD visp_tracker-9999.ebuild 1059 BLAKE2B 00e115d602728ebcd542d5673fe0ffdcf23a9711a673aff1525b9174d1a5931346ff3e81114300d2390d45a266a7bafa0fdc6bc90ca8e8ccb95ee1eb3375b157 SHA512 601529cbb921b96349c998525f186fa541a56c64251d7401451a481201e5dd47c24b491d45148ccea9c16e4b78c0f435292900173082d2d7ec087ba21f98c1b2
+EBUILD visp_tracker-0.12.1.ebuild 1057 BLAKE2B bdaa61a26af4da88ddf813996c46203ee8ee63cb056d64c0b73e809dd75a71c33b96774bed8d5af369bfd9c31d9a6ce4e9930f904c10c67afd4a31a230e1f48b SHA512 9422a71751ee39f203bce5cb2762a7038fb07e8f31e9e6583c64ecefb0bdfbc57d1c51a9c22af493a208a5f5228893004e6b2de283c17cfb330e80ea9eff9ac1
+EBUILD visp_tracker-9999.ebuild 1057 BLAKE2B bdaa61a26af4da88ddf813996c46203ee8ee63cb056d64c0b73e809dd75a71c33b96774bed8d5af369bfd9c31d9a6ce4e9930f904c10c67afd4a31a230e1f48b SHA512 9422a71751ee39f203bce5cb2762a7038fb07e8f31e9e6583c64ecefb0bdfbc57d1c51a9c22af493a208a5f5228893004e6b2de283c17cfb330e80ea9eff9ac1
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_tracker/visp_tracker-0.12.1.ebuild b/dev-ros/visp_tracker/visp_tracker-0.12.1.ebuild
new file mode 100644
index 000000000000..81537d67935a
--- /dev/null
+++ b/dev-ros/visp_tracker/visp_tracker-0.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="noetic-"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Wraps the ViSP moving edge tracker provided by the ViSP library"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads(+)]
+	dev-ros/dynamic_reconfigure
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/image_proc
+	dev-ros/image_transport
+	dev-ros/nodelet
+	dev-ros/resource_retriever
+	dev-ros/roscpp
+	dev-ros/sensor_msgs
+	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
+	sci-libs/ViSP:=[opencv,X]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
+fi
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_tracker/visp_tracker-9999.ebuild b/dev-ros/visp_tracker/visp_tracker-9999.ebuild
index ccb52c00e4db..81537d67935a 100644
--- a/dev-ros/visp_tracker/visp_tracker-9999.ebuild
+++ b/dev-ros/visp_tracker/visp_tracker-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 ROS_REPO_URI="https://github.com/lagadic/vision_visp"
 KEYWORDS="~amd64 ~arm"
-VER_PREFIX="kinetic-"
+VER_PREFIX="noetic-"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
@@ -34,6 +34,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
 fi
 PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/xacro/Manifest b/dev-ros/xacro/Manifest
index 3708d30fa5b5..d5a5ef53eaca 100644
--- a/dev-ros/xacro/Manifest
+++ b/dev-ros/xacro/Manifest
@@ -1,5 +1,7 @@
 AUX tests.patch 625 BLAKE2B 5ec4d6bca2278f40a4886371abd75beb0ff933d3b7e6e9e4554e7f9d63b521d2ff9d2c91c530177c818de2006bbc7db77e86ce3f4323017f870cb6b2a186ba9c SHA512 10da25011dc5c63d282d45862c35d9f900a90bc61059d6e703e50e2a94bdd4ca9c0f20d3fe6e5b03b3f98059e1bcb74272adcbb7f72d5e5f1d3ad4ce5a5f6bca
 DIST xacro-1.14.6.tar.gz 81362 BLAKE2B b0ec80e8f224f1b31e9f21e1c11669a46da1b13cf82b5d82912196f9f647aa1c45a7084f4ea1e1690c0d969b5e126cd5b6069c9987034898b72d92310b7d565f SHA512 0796c07cbf4d51699ab07d656a42d13fc140406f6dbee3b94554f2aa91e68b64bd5d2c218930edb5b139ac41b5d5c6bffad505d220353d5748f371ec6bb196a3
+DIST xacro-1.14.8.tar.gz 81831 BLAKE2B 6ad5c8545f5b7167faea122834cb1226e2935f0e40dbd0da1a3e63dc5981adabf83b9d72bf0b51842e82bb31ed469c72a63d4dcbb3dd79b6c8f91fdfdf75b202 SHA512 a372dc3a9e62a9eb1a0cf6b2491c45685e8f5f7442da86f7767b47c8122ec67780aee4e76a4b9278046b85a16000b1ffe72e44a9ac04f39da21c5bc1cf788b0b
 EBUILD xacro-1.14.6.ebuild 773 BLAKE2B 2911b685e1a3992014b35541f7d261ea3b744716602211cbcc09df27a892fbd4dfa0576a8b70cebc5d6249fc4e70494be958c4a1cfa081b290b4232130c38cc6 SHA512 792e024feab8a468d906f332dab2806d05c0d4d643b6cbd9d995efede0dfd3a2e909110acd761af34753166a13ddf983793fdaa4bb510c583de3cd4a5ff96bc0
+EBUILD xacro-1.14.8.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.8.ebuild b/dev-ros/xacro/xacro-1.14.8.ebuild
new file mode 100644
index 000000000000..5c1e6682dc01
--- /dev/null
+++ b/dev-ros/xacro/xacro-1.14.8.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/xacro"
+KEYWORDS="~amd64"
+
+inherit ros-catkin
+
+DESCRIPTION="XML macro language"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/roslint[${PYTHON_SINGLE_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)
+"
+RDEPEND="${RDEPEND}
+	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]"
+PATCHES=( "${FILESDIR}/tests.patch" )
+
+src_test() {
+	local sd="$(python_get_sitedir)"
+	local local_sd="${BUILD_DIR}/devel/${sd#${EPREFIX}/usr}"
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	PYTHONPATH="${local_sd}:${PYTHONPATH}" ros-catkin_src_test
+}
diff --git a/dev-ros/xmlrpcpp/Manifest b/dev-ros/xmlrpcpp/Manifest
index dc77a671e12b..40f2b4019e1f 100644
--- a/dev-ros/xmlrpcpp/Manifest
+++ b/dev-ros/xmlrpcpp/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.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-r1.ebuild 447 BLAKE2B 335e1857bcf0a4d9b19809e53371d9d10ca0eb1addbcadb99d4342189dc15de4a222bbe9d70721e4e4d1de2eceee8e2397051aef2153d5b05e54d352138895a0 SHA512 467551d8ba0d0b471df55f7903cf18d85fbf489ea10b5128d798d78bd376f139c6b69fa17a2314a2e9c082c629e2870cf42022c95123dad922c1f5384754ed90
+EBUILD xmlrpcpp-1.15.11.ebuild 447 BLAKE2B 335e1857bcf0a4d9b19809e53371d9d10ca0eb1addbcadb99d4342189dc15de4a222bbe9d70721e4e4d1de2eceee8e2397051aef2153d5b05e54d352138895a0 SHA512 467551d8ba0d0b471df55f7903cf18d85fbf489ea10b5128d798d78bd376f139c6b69fa17a2314a2e9c082c629e2870cf42022c95123dad922c1f5384754ed90
 EBUILD xmlrpcpp-1.15.8-r1.ebuild 447 BLAKE2B 335e1857bcf0a4d9b19809e53371d9d10ca0eb1addbcadb99d4342189dc15de4a222bbe9d70721e4e4d1de2eceee8e2397051aef2153d5b05e54d352138895a0 SHA512 467551d8ba0d0b471df55f7903cf18d85fbf489ea10b5128d798d78bd376f139c6b69fa17a2314a2e9c082c629e2870cf42022c95123dad922c1f5384754ed90
 EBUILD xmlrpcpp-1.15.9-r1.ebuild 447 BLAKE2B 335e1857bcf0a4d9b19809e53371d9d10ca0eb1addbcadb99d4342189dc15de4a222bbe9d70721e4e4d1de2eceee8e2397051aef2153d5b05e54d352138895a0 SHA512 467551d8ba0d0b471df55f7903cf18d85fbf489ea10b5128d798d78bd376f139c6b69fa17a2314a2e9c082c629e2870cf42022c95123dad922c1f5384754ed90
 EBUILD xmlrpcpp-9999.ebuild 447 BLAKE2B 335e1857bcf0a4d9b19809e53371d9d10ca0eb1addbcadb99d4342189dc15de4a222bbe9d70721e4e4d1de2eceee8e2397051aef2153d5b05e54d352138895a0 SHA512 467551d8ba0d0b471df55f7903cf18d85fbf489ea10b5128d798d78bd376f139c6b69fa17a2314a2e9c082c629e2870cf42022c95123dad922c1f5384754ed90
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.11.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.11.ebuild
new file mode 100644
index 000000000000..f3fb15501966
--- /dev/null
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.11.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-08-07 00:16:33 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-08-07 00:16:33 +0100
commit	d162ba1860a88062f4cd61f8b52fc303ba0b2991 (patch)
tree	24cd2cf57f3932a24b96e4a0f6666489447e43ba /dev-ros
parent	590b9b7b03bf4651e099949e318755af7cfa81b8 (diff)