gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /dev-ros
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
311 files changed, 2181 insertions, 6013 deletions
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index c6e3e2d1bd65..98fd1b0ab396 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/ament_cmake_copyright/Manifest b/dev-ros/ament_cmake_copyright/Manifest
index fe3b2a27496d..0be3d7f9d37a 100644
--- a/dev-ros/ament_cmake_copyright/Manifest
+++ b/dev-ros/ament_cmake_copyright/Manifest
@@ -1,6 +1,6 @@
-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_cmake_copyright-0.10.4.ebuild 1660 BLAKE2B 3980914f8813bc3b30914f0dc0bac722be513a78474ad27db8770217c9e1a9996ecd8736f54de04f54b3ea0c1ade7033f083090a8cc1b5817b2d51285121400a SHA512 05d65a67a27999b048cdc3965fe198027443b9d6d79ed5a029c46816922b4517663cce51812c059f8bfb52f4db993db1a930b2fbc20ab293e8bc33f7b5d97ed4
+DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
 EBUILD ament_cmake_copyright-0.11.2.ebuild 1584 BLAKE2B 8e6d4ceacbf5eef73735a962b0a7122798ef6ca5c1f0a63b93c7f673b4feeea16f612001848cddcab0e6536ac02dc77606c3acab2e8442e2caf9bd4b955bd71b SHA512 e7d0a0308ee9810b70859d33a01cd2109b5bab01cac740efc020cc74dedcf168eaf820be4e3256f3dde48f1d3c8b8099ba71222b9b46e45f2f1a30ea6bad22b0
+EBUILD ament_cmake_copyright-0.12.1.ebuild 1584 BLAKE2B 86c264708c8c39a0788ac8b2de4d0c4316c510514b729bbe4bec879e4ef1572d0e9a87df06520fed4701e582bfcef84717f0c7ed48b8afde77e7ba6ec446df31 SHA512 3c9281af951a09f65e75dcf8e8c535db5a19ed779bcc0a3953c7afa67092a3289681e914d6dd6701e9c70d2990e8cbdb28e75ff8ffb0fda05df87b3cf01dd036
 EBUILD ament_cmake_copyright-9999.ebuild 1584 BLAKE2B 8e6d4ceacbf5eef73735a962b0a7122798ef6ca5c1f0a63b93c7f673b4feeea16f612001848cddcab0e6536ac02dc77606c3acab2e8442e2caf9bd4b955bd71b SHA512 e7d0a0308ee9810b70859d33a01cd2109b5bab01cac740efc020cc74dedcf168eaf820be4e3256f3dde48f1d3c8b8099ba71222b9b46e45f2f1a30ea6bad22b0
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.4.ebuild b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.12.1.ebuild
index aedb04bff69e..dd36342b121c 100644
--- a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.4.ebuild
+++ b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
@@ -11,11 +11,11 @@ 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}
+	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}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="The auto-magic functions for ease to use of the ament linters"
@@ -23,11 +23,6 @@ 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 )"
 
@@ -35,10 +30,13 @@ RDEPEND="
 	dev-ros/ament_copyright
 	dev-ros/ament_cmake_test
 "
-DEPEND=""
 # Deps here are transitive from ament_cmake_core to have matching python support
 BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-ros/ament_copyright[${PYTHON_USEDEP}] test? ( dev-ros/ament_lint_cmake[${PYTHON_USEDEP}] )' )
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]
+		dev-ros/ament_copyright[${PYTHON_USEDEP}]
+		test? ( dev-ros/ament_lint_cmake[${PYTHON_USEDEP}] )' )
 	dev-ros/ament_cmake_core
 	dev-ros/ament_cmake_test
 	dev-ros/ament_copyright
diff --git a/dev-ros/ament_cmake_core/Manifest b/dev-ros/ament_cmake_core/Manifest
index fd9ac81ee83d..59c672a2a9c1 100644
--- a/dev-ros/ament_cmake_core/Manifest
+++ b/dev-ros/ament_cmake_core/Manifest
@@ -1,16 +1,6 @@
-DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
-DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
-DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
-DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
-DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
-DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 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
+DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
 EBUILD ament_cmake_core-1.1.4.ebuild 1075 BLAKE2B ff884eddba246893586a32fd06e24bd72119d430d3191b1c3e88de924f8994dea0063299946e3a1ab3bf484e696f610f636833d67fe3db1abc0fad18c55d0367 SHA512 d9f881098dfbee87dd5c4c387641353856aa37a4de85019943b4f1dce4bd2e6e04e43fadc5ef9ad5f40c91b35a5ca7e9f8054b8911962541681519f2d7a363b4
+EBUILD ament_cmake_core-1.3.0.ebuild 1075 BLAKE2B b316f88d4917bcd603d931c4dbf322910332d87a787e4eb004e3cac909ef0d9dbccc903a35d5b39534cf7b740c5da917d131ecaf80cac9a1702839b1d94d8eb3 SHA512 31c22b3cc6e68423f3f23aa3b0605fae6d6304c4fa194f621035fee473121a5df90eb7a29f6926a265174816dd67e88d556a54f2976c05d44e1287d84957e2ed
 EBUILD ament_cmake_core-9999.ebuild 1075 BLAKE2B ff884eddba246893586a32fd06e24bd72119d430d3191b1c3e88de924f8994dea0063299946e3a1ab3bf484e696f610f636833d67fe3db1abc0fad18c55d0367 SHA512 d9f881098dfbee87dd5c4c387641353856aa37a4de85019943b4f1dce4bd2e6e04e43fadc5ef9ad5f40c91b35a5ca7e9f8054b8911962541681519f2d7a363b4
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-0.9.6.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-0.9.6.ebuild
deleted file mode 100644
index a1dc3e627817..000000000000
--- a/dev-ros/ament_cmake_core/ament_cmake_core-0.9.6.ebuild
+++ /dev/null
@@ -1,46 +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 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_core/ament_cmake_core-1.0.0.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.0.0.ebuild
deleted file mode 100644
index a1dc3e627817..000000000000
--- a/dev-ros/ament_cmake_core/ament_cmake_core-1.0.0.ebuild
+++ /dev/null
@@ -1,46 +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 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_core/ament_cmake_core-1.0.1.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.0.1.ebuild
deleted file mode 100644
index a1dc3e627817..000000000000
--- a/dev-ros/ament_cmake_core/ament_cmake_core-1.0.1.ebuild
+++ /dev/null
@@ -1,46 +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 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_core/ament_cmake_core-1.0.4.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.0.4.ebuild
deleted file mode 100644
index a1dc3e627817..000000000000
--- a/dev-ros/ament_cmake_core/ament_cmake_core-1.0.4.ebuild
+++ /dev/null
@@ -1,46 +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 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_core/ament_cmake_core-1.1.3.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.1.3.ebuild
deleted file mode 100644
index a1dc3e627817..000000000000
--- a/dev-ros/ament_cmake_core/ament_cmake_core-1.1.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_core/ament_cmake_core-1.0.3.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0.ebuild
index a1dc3e627817..102deab4e5c7 100644
--- a/dev-ros/ament_cmake_core/ament_cmake_core-1.0.3.ebuild
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
diff --git a/dev-ros/ament_cmake_cppcheck/Manifest b/dev-ros/ament_cmake_cppcheck/Manifest
index 0cd0ea508978..27ab17697b5e 100644
--- a/dev-ros/ament_cmake_cppcheck/Manifest
+++ b/dev-ros/ament_cmake_cppcheck/Manifest
@@ -1,12 +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.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
+DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
 EBUILD ament_cmake_cppcheck-0.11.2.ebuild 1457 BLAKE2B 4d33712fae1347ae211d98b265300ef2a833c65868ad51b2ef2a72339b2b6f239724dea4fc0e51d7533ef74d7d0520c9577b7905b849d71a218c713891e2e59f SHA512 483e99eb874bf9c3b959b10446d3e92311acbf01ef11aca2458f027428bf128e516ac230a9c6ab2cae863f2842091301da294c610e532ce24807200ab05af225
-EBUILD ament_cmake_cppcheck-0.9.5.ebuild 1537 BLAKE2B a53eefde7cae95039d554c2514a5eb0d94c2aadce0cea6e7923b7186909cd84a04fcdd0b59291bec620b20c9e6b6ee06c306ed673ac5ea6f92ebb1b552ab6083 SHA512 45cff84303c29a7d05cb66b25d01c26cf6e84f228aba58ef0119113aff269bdca6822e156f984e766c8835e85b9268c3fbf31f26ef969f9f0dac5290e54af67d
+EBUILD ament_cmake_cppcheck-0.12.1.ebuild 1457 BLAKE2B 5d5f4a0a4e49a9a0dc4a1378fb1cc1c415b8de52b186ddf1d8385612950a55daf1f6c2493f53c7157dbee90a10e44c66f414c1477b56702af38a76be53dbb5c6 SHA512 67dea1e4e71a7e804f9fdce7853ba989f375337becc86ac12520bf4930643367b85842a664a5043bba6812be476824e6893c9c427bef0c60580c7c757913f0b1
 EBUILD ament_cmake_cppcheck-9999.ebuild 1457 BLAKE2B 4d33712fae1347ae211d98b265300ef2a833c65868ad51b2ef2a72339b2b6f239724dea4fc0e51d7533ef74d7d0520c9577b7905b849d71a218c713891e2e59f SHA512 483e99eb874bf9c3b959b10446d3e92311acbf01ef11aca2458f027428bf128e516ac230a9c6ab2cae863f2842091301da294c610e532ce24807200ab05af225
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.10.0.ebuild b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.10.0.ebuild
deleted file mode 100644
index db8cbeb51733..000000000000
--- a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.10.0.ebuild
+++ /dev/null
@@ -1,63 +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 cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="CMake API for ament_cppcheck to perform static code analysis on C/C++"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cppcheck
-"
-DEPEND=""
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	test? (
-		dev-ros/ament_cmake_copyright
-		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.10.1.ebuild b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.10.1.ebuild
deleted file mode 100644
index db8cbeb51733..000000000000
--- a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.10.1.ebuild
+++ /dev/null
@@ -1,63 +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 cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="CMake API for ament_cppcheck to perform static code analysis on C/C++"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cppcheck
-"
-DEPEND=""
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	test? (
-		dev-ros/ament_cmake_copyright
-		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.10.4.ebuild b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.10.4.ebuild
deleted file mode 100644
index db8cbeb51733..000000000000
--- a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.10.4.ebuild
+++ /dev/null
@@ -1,63 +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 cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="CMake API for ament_cppcheck to perform static code analysis on C/C++"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cppcheck
-"
-DEPEND=""
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	test? (
-		dev-ros/ament_cmake_copyright
-		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.9.5.ebuild b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.12.1.ebuild
index db8cbeb51733..db187d2408e7 100644
--- a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.9.5.ebuild
+++ b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
@@ -11,11 +11,11 @@ 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}
+	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}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="CMake API for ament_cppcheck to perform static code analysis on C/C++"
@@ -23,11 +23,6 @@ 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 )"
 
@@ -36,9 +31,10 @@ RDEPEND="
 	dev-ros/ament_cmake_core
 	dev-ros/ament_cppcheck
 "
-DEPEND=""
 BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	$(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? (
diff --git a/dev-ros/ament_cmake_cpplint/Manifest b/dev-ros/ament_cmake_cpplint/Manifest
index d7de5d09a7d0..7d44e0b7f3cb 100644
--- a/dev-ros/ament_cmake_cpplint/Manifest
+++ b/dev-ros/ament_cmake_cpplint/Manifest
@@ -1,12 +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.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
+DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
 EBUILD ament_cmake_cpplint-0.11.2.ebuild 1423 BLAKE2B 1899b520512daa0a778d66e7ecbfc838f4ced3f048808bf1d9dd588963832808dfdbacca2018b83fe625a9a02e085476f5531db5fca490aadddd10965a41d7e5 SHA512 d202937e66c0d111bfd8d80971a7eb46be25fca44fcf1c0e821948571b0fab6e0d315fff9f5b029a92d41720cb47ae8fd8878fb5c29f9f3d7f5fc3c8a70e06e6
-EBUILD ament_cmake_cpplint-0.9.5.ebuild 1503 BLAKE2B e3393824134e0ad87e9df8c937cd0b00c4263a4a351740ce7f36949be5392b5fbe32296d521503b2efbb3059b0857c51496de10da95498c400d11af601ab9221 SHA512 fe6811b1405e6bb04082648970b11f9292e6c3cdb97125378de9dd8fa52c6424b49e7d9f1e0040e3343a8c72d9a336809c9aea7718d3d6c916a58b1e763cfef7
+EBUILD ament_cmake_cpplint-0.12.1.ebuild 1423 BLAKE2B b4b2bf7d19ff82080e26daa373b16f7b2ca302cfc5115c9f2af8927d53d00c509535af99a1ed147a113bd7b54066ad946c31db632801667b56ca19ce296ed45b SHA512 58fd31f70f6489b9b3f473b1132d2bc08e9c624c97007376995b9243a3d8f68d690f45c2edd1931dfdbd69ac54826d176374152e7a7191a3b7644329d6f9bc50
 EBUILD ament_cmake_cpplint-9999.ebuild 1423 BLAKE2B 1899b520512daa0a778d66e7ecbfc838f4ced3f048808bf1d9dd588963832808dfdbacca2018b83fe625a9a02e085476f5531db5fca490aadddd10965a41d7e5 SHA512 d202937e66c0d111bfd8d80971a7eb46be25fca44fcf1c0e821948571b0fab6e0d315fff9f5b029a92d41720cb47ae8fd8878fb5c29f9f3d7f5fc3c8a70e06e6
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.10.1.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.10.1.ebuild
deleted file mode 100644
index c9b636058541..000000000000
--- a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.10.1.ebuild
+++ /dev/null
@@ -1,62 +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 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_cpplint/ament_cmake_cpplint-0.10.4.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.10.4.ebuild
deleted file mode 100644
index c9b636058541..000000000000
--- a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.10.4.ebuild
+++ /dev/null
@@ -1,62 +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 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_cpplint/ament_cmake_cpplint-0.10.0.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.12.1.ebuild
index c9b636058541..7052cdbb4a60 100644
--- a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.10.0.ebuild
+++ b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
@@ -11,11 +11,11 @@ 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}
+	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}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="CMake API for ament_cpplint to lint C / C++ code using cpplint"
@@ -23,11 +23,6 @@ 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 )"
 
@@ -35,9 +30,10 @@ 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}]')
+	$(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? (
diff --git a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.9.5.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.9.5.ebuild
deleted file mode 100644
index c9b636058541..000000000000
--- a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.9.5.ebuild
+++ /dev/null
@@ -1,62 +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 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 fc21d82695fa..50b7aebcaa0d 100644
--- a/dev-ros/ament_cmake_export_definitions/Manifest
+++ b/dev-ros/ament_cmake_export_definitions/Manifest
@@ -1,16 +1,6 @@
-DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
-DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
-DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
-DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
-DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
-DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 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
+DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
 EBUILD ament_cmake_export_definitions-1.1.4.ebuild 1157 BLAKE2B 6efd9fde227b076997fbdd8a5bc4c03059c4be887bdf95d1e571d0d8132a73d7a8a652bff4a61d1b2dc9c87aba5ec01a146a653967004f9e07837a8c757647e5 SHA512 5299442c841458865b988e54f9223d6da27df0ac81a8187c1a4f40e5802c99f2da86c0f3d035c9bc2489c718979217e45a08a3e9bb739a972336fb18a01a3655
+EBUILD ament_cmake_export_definitions-1.3.0.ebuild 1157 BLAKE2B 0d65047b840c2171c3a84e09c78f4d5fe87032fd7fc8458e647bbd893a82be3bd659795f81c0338b02958d865d47d1a868800309f2c601a0e708e966cbab5be0 SHA512 c874d2dc21e2ab429e8cdf72b36604c95ea4cc915c4ae4206c5b7cf40ea64088a7e7d5fe7ed8bf982a45b6669e6f89db62b591b46c5f6dfc75a11e3a91af64b4
 EBUILD ament_cmake_export_definitions-9999.ebuild 1157 BLAKE2B 6efd9fde227b076997fbdd8a5bc4c03059c4be887bdf95d1e571d0d8132a73d7a8a652bff4a61d1b2dc9c87aba5ec01a146a653967004f9e07837a8c757647e5 SHA512 5299442c841458865b988e54f9223d6da27df0ac81a8187c1a4f40e5802c99f2da86c0f3d035c9bc2489c718979217e45a08a3e9bb739a972336fb18a01a3655
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.0.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.0.ebuild
deleted file mode 100644
index 40a130e4953e..000000000000
--- a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.0.ebuild
+++ /dev/null
@@ -1,46 +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 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_definitions/ament_cmake_export_definitions-1.0.1.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.1.ebuild
deleted file mode 100644
index 40a130e4953e..000000000000
--- a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.1.ebuild
+++ /dev/null
@@ -1,46 +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 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_definitions/ament_cmake_export_definitions-1.0.3.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.3.ebuild
deleted file mode 100644
index 40a130e4953e..000000000000
--- a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_definitions/ament_cmake_export_definitions-1.0.4.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.4.ebuild
deleted file mode 100644
index 40a130e4953e..000000000000
--- a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.4.ebuild
+++ /dev/null
@@ -1,46 +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 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_definitions/ament_cmake_export_definitions-1.1.3.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.3.ebuild
deleted file mode 100644
index 40a130e4953e..000000000000
--- a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_definitions/ament_cmake_export_definitions-0.9.6.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.3.0.ebuild
index 40a130e4953e..b9c7aa31c087 100644
--- a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.9.6.ebuild
+++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
diff --git a/dev-ros/ament_cmake_export_dependencies/Manifest b/dev-ros/ament_cmake_export_dependencies/Manifest
index e6a39d3aac5e..a19f5b09ab1f 100644
--- a/dev-ros/ament_cmake_export_dependencies/Manifest
+++ b/dev-ros/ament_cmake_export_dependencies/Manifest
@@ -1,16 +1,6 @@
-DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
-DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
-DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
-DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
-DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
-DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 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
+DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
 EBUILD ament_cmake_export_dependencies-1.1.4.ebuild 1198 BLAKE2B 2b43718be095690973e7fbab299a1eaf0d1db9f6afc32e0d3c4bae35b28c8a1cc1eefaa78b104f21448b7ae3fcfe98a20d90fdb113cd36d7b17586d78f9cc731 SHA512 55c3736c2ec7d266b2dcbbccf04d4e9483deb979c3a8289864434165332bf4005a3e2344a9cc171261318045a36dd7ad69e1ed6576b8d73afa4a12382a5faa2e
+EBUILD ament_cmake_export_dependencies-1.3.0.ebuild 1198 BLAKE2B 05fc84bbeb12c1a605d557eec50919341f009dfa5ec344a27822dd2328aebb4a28b9552b317d5eae09009cd60f0c8ca677f5b3c3eb83d276add5aa701be72eb9 SHA512 ee9d810cb989a23475f9e02f02a5a196ca31743aa493c2ed8a8c6ab7a66a6e2efc1f465a629b13526d8352b39ccd249d3a95d78e640495316776a76124c3eb8f
 EBUILD ament_cmake_export_dependencies-9999.ebuild 1198 BLAKE2B 2b43718be095690973e7fbab299a1eaf0d1db9f6afc32e0d3c4bae35b28c8a1cc1eefaa78b104f21448b7ae3fcfe98a20d90fdb113cd36d7b17586d78f9cc731 SHA512 55c3736c2ec7d266b2dcbbccf04d4e9483deb979c3a8289864434165332bf4005a3e2344a9cc171261318045a36dd7ad69e1ed6576b8d73afa4a12382a5faa2e
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.0.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.0.ebuild
deleted file mode 100644
index 6be2a34aa01e..000000000000
--- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.0.ebuild
+++ /dev/null
@@ -1,47 +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 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_dependencies/ament_cmake_export_dependencies-1.0.1.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.1.ebuild
deleted file mode 100644
index 6be2a34aa01e..000000000000
--- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.1.ebuild
+++ /dev/null
@@ -1,47 +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 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_dependencies/ament_cmake_export_dependencies-1.0.3.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.3.ebuild
deleted file mode 100644
index 6be2a34aa01e..000000000000
--- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.3.ebuild
+++ /dev/null
@@ -1,47 +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 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_dependencies/ament_cmake_export_dependencies-1.0.4.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.4.ebuild
deleted file mode 100644
index 6be2a34aa01e..000000000000
--- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.4.ebuild
+++ /dev/null
@@ -1,47 +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 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_dependencies/ament_cmake_export_dependencies-1.1.3.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.3.ebuild
deleted file mode 100644
index 6be2a34aa01e..000000000000
--- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.3.ebuild
+++ /dev/null
@@ -1,47 +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 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_dependencies/ament_cmake_export_dependencies-0.9.6.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.3.0.ebuild
index 6be2a34aa01e..461092148168 100644
--- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.9.6.ebuild
+++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
diff --git a/dev-ros/ament_cmake_export_include_directories/Manifest b/dev-ros/ament_cmake_export_include_directories/Manifest
index 07df2cb25323..283a416a4af7 100644
--- a/dev-ros/ament_cmake_export_include_directories/Manifest
+++ b/dev-ros/ament_cmake_export_include_directories/Manifest
@@ -1,16 +1,6 @@
-DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
-DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
-DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
-DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
-DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
-DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 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
+DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
 EBUILD ament_cmake_export_include_directories-1.1.4.ebuild 1165 BLAKE2B be53d0a66e037552ddbdcbbc272e9663f99339f3498cf240a87342331cebce37eb1de7e2264f606e9554e0f5b1f579981bceed1c073ae0ea86a3a464838dc619 SHA512 258fbee4d5189c517e1e03d35129d1e294697b8ef863fbd2d1b9b56f04f3c2a4fefdafc3698a6ce487e69c0f33a2f807a842fa518c00ba3d6da3270b02dd6c2a
+EBUILD ament_cmake_export_include_directories-1.3.0.ebuild 1165 BLAKE2B 98de7dd1c74f24c2997d06be9d370afd68a5c8de33bb59c9a3b9df6bdb87cab31e70173e9c18df7f1a0bd0863386cf96ea9e141904e36892c7d15091cb29f693 SHA512 370fad510608f711b4db3b3edaf207d8f1e68847d18698f3ce3b36af3ecf30761886e9fc8545e8c8a4eb2d6c0b66b8bddd0dbbc62b29526a2ae0915a40914bbe
 EBUILD ament_cmake_export_include_directories-9999.ebuild 1165 BLAKE2B be53d0a66e037552ddbdcbbc272e9663f99339f3498cf240a87342331cebce37eb1de7e2264f606e9554e0f5b1f579981bceed1c073ae0ea86a3a464838dc619 SHA512 258fbee4d5189c517e1e03d35129d1e294697b8ef863fbd2d1b9b56f04f3c2a4fefdafc3698a6ce487e69c0f33a2f807a842fa518c00ba3d6da3270b02dd6c2a
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.1.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.1.ebuild
deleted file mode 100644
index 4a30d0ac2418..000000000000
--- a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.1.ebuild
+++ /dev/null
@@ -1,46 +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 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_include_directories/ament_cmake_export_include_directories-1.0.3.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.3.ebuild
deleted file mode 100644
index 4a30d0ac2418..000000000000
--- a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_include_directories/ament_cmake_export_include_directories-1.0.4.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.4.ebuild
deleted file mode 100644
index 4a30d0ac2418..000000000000
--- a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.4.ebuild
+++ /dev/null
@@ -1,46 +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 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_include_directories/ament_cmake_export_include_directories-1.1.3.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.1.3.ebuild
deleted file mode 100644
index 4a30d0ac2418..000000000000
--- a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.1.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_include_directories/ament_cmake_export_include_directories-0.9.6.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.3.0.ebuild
index 4a30d0ac2418..4f7e319646d6 100644
--- a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-0.9.6.ebuild
+++ b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
diff --git a/dev-ros/ament_cmake_export_interfaces/Manifest b/dev-ros/ament_cmake_export_interfaces/Manifest
index 786666cdb274..c7da829d25f4 100644
--- a/dev-ros/ament_cmake_export_interfaces/Manifest
+++ b/dev-ros/ament_cmake_export_interfaces/Manifest
@@ -1,16 +1,6 @@
-DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
-DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
-DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
-DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
-DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
-DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 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
+DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
 EBUILD ament_cmake_export_interfaces-1.1.4.ebuild 1194 BLAKE2B be8f4b0fb704923f485013230245678df7fed19dcef44e777de663686ecf6e6199ca09fef39d7179b66493bd51203b824ecf6fd274b5a4adfc6f23f227d258e4 SHA512 b48be94ef1c80a7699f77a4aa5fd1e4e130d317494a3e40e276568ada7ea45316d3dff6166b869e63f5d80d49d42c198721fafdb0c10ee1654ec321e08ebfa69
+EBUILD ament_cmake_export_interfaces-1.3.0.ebuild 1194 BLAKE2B c23d297e4572e024fc9f35fa0a42694d8dd78b811c2ff94bca7a5eb748e9b7d9befd34e929e4fb3fe13438b439bd1b427d5d8ce3da2f942f3fd5720a2114dffb SHA512 1259e13f359c029de5c60be039869387298d9e2aaf472aa9453031a76c719573da8a3e2afbc1809472eddb14275998636daa847f66b3915d71b7a1dc44f915b8
 EBUILD ament_cmake_export_interfaces-9999.ebuild 1194 BLAKE2B be8f4b0fb704923f485013230245678df7fed19dcef44e777de663686ecf6e6199ca09fef39d7179b66493bd51203b824ecf6fd274b5a4adfc6f23f227d258e4 SHA512 b48be94ef1c80a7699f77a4aa5fd1e4e130d317494a3e40e276568ada7ea45316d3dff6166b869e63f5d80d49d42c198721fafdb0c10ee1654ec321e08ebfa69
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.0.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.0.ebuild
deleted file mode 100644
index e618a9ad7d4d..000000000000
--- a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.0.ebuild
+++ /dev/null
@@ -1,47 +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 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_interfaces/ament_cmake_export_interfaces-1.0.1.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.1.ebuild
deleted file mode 100644
index e618a9ad7d4d..000000000000
--- a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.1.ebuild
+++ /dev/null
@@ -1,47 +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 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_interfaces/ament_cmake_export_interfaces-1.0.3.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.3.ebuild
deleted file mode 100644
index e618a9ad7d4d..000000000000
--- a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.3.ebuild
+++ /dev/null
@@ -1,47 +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 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_interfaces/ament_cmake_export_interfaces-1.0.4.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.4.ebuild
deleted file mode 100644
index e618a9ad7d4d..000000000000
--- a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.4.ebuild
+++ /dev/null
@@ -1,47 +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 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_interfaces/ament_cmake_export_interfaces-1.1.3.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.3.ebuild
deleted file mode 100644
index e618a9ad7d4d..000000000000
--- a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.3.ebuild
+++ /dev/null
@@ -1,47 +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 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_interfaces/ament_cmake_export_interfaces-0.9.6.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.3.0.ebuild
index e618a9ad7d4d..622ff31823d0 100644
--- a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-0.9.6.ebuild
+++ b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
diff --git a/dev-ros/ament_cmake_export_libraries/Manifest b/dev-ros/ament_cmake_export_libraries/Manifest
index fff7f8169e31..8adafea6eb0b 100644
--- a/dev-ros/ament_cmake_export_libraries/Manifest
+++ b/dev-ros/ament_cmake_export_libraries/Manifest
@@ -1,16 +1,6 @@
-DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
-DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
-DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
-DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
-DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
-DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 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
+DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
 EBUILD ament_cmake_export_libraries-1.1.4.ebuild 1155 BLAKE2B c47ab427ad295d5533feae449695d683d8cd3249631e3eacce2efadc83576c13d0eb7cf5fa94e4c3f87f03bb985bd58be931203cf565886cb32dec9c3c4295fe SHA512 23ccf249fbf1e80d711924acbfa5573f51c232f90248ac50628f36943562efa830dbfb70b48c97bd0687343152984eb6ae4616e2746d5fd493af5062301322f0
+EBUILD ament_cmake_export_libraries-1.3.0.ebuild 1155 BLAKE2B 4504538b49872446ed5da72b4f593345b1e4226dff5db70f1a5db69b438f7cf48b37d29ca50fa4921c9fde627614390f02a8bfc78931eabd6ea54180b08a7c5a SHA512 62dee1632bdc90df2abc16ccb8e341cd871ca4eefc10e8e1e00ab7f83360b9f81c847823a55e8ab9bdd344a0c09d8da66af95d935f1b494be4b872cb7a1860e9
 EBUILD ament_cmake_export_libraries-9999.ebuild 1155 BLAKE2B c47ab427ad295d5533feae449695d683d8cd3249631e3eacce2efadc83576c13d0eb7cf5fa94e4c3f87f03bb985bd58be931203cf565886cb32dec9c3c4295fe SHA512 23ccf249fbf1e80d711924acbfa5573f51c232f90248ac50628f36943562efa830dbfb70b48c97bd0687343152984eb6ae4616e2746d5fd493af5062301322f0
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.0.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.0.ebuild
deleted file mode 100644
index 5a63a39ded54..000000000000
--- a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.0.ebuild
+++ /dev/null
@@ -1,46 +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 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_libraries/ament_cmake_export_libraries-1.0.1.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.1.ebuild
deleted file mode 100644
index 5a63a39ded54..000000000000
--- a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.1.ebuild
+++ /dev/null
@@ -1,46 +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 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_libraries/ament_cmake_export_libraries-1.0.3.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.3.ebuild
deleted file mode 100644
index 5a63a39ded54..000000000000
--- a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_libraries/ament_cmake_export_libraries-1.0.4.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.4.ebuild
deleted file mode 100644
index 5a63a39ded54..000000000000
--- a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.4.ebuild
+++ /dev/null
@@ -1,46 +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 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_libraries/ament_cmake_export_libraries-1.1.3.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.3.ebuild
deleted file mode 100644
index 5a63a39ded54..000000000000
--- a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_libraries/ament_cmake_export_libraries-0.9.6.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.3.0.ebuild
index 5a63a39ded54..c22c1ee30534 100644
--- a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-0.9.6.ebuild
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
diff --git a/dev-ros/ament_cmake_export_link_flags/Manifest b/dev-ros/ament_cmake_export_link_flags/Manifest
index be8a63383a7a..82e87fb6e552 100644
--- a/dev-ros/ament_cmake_export_link_flags/Manifest
+++ b/dev-ros/ament_cmake_export_link_flags/Manifest
@@ -1,16 +1,6 @@
-DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
-DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
-DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
-DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
-DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
-DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 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
+DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
 EBUILD ament_cmake_export_link_flags-1.1.4.ebuild 1156 BLAKE2B 24e9bfecb942336afcf433357c4f2ee5a65a0ed19c6a67cacf0521f63cfaf7807122d4b75718435c0c7c7289156b0428ca0385be58f0473fc1e9005630bc2342 SHA512 6d61cca22131dee38ccf39363172ddb21ba52c7b7ed04cba64e4eafaffed5edc2a9bcc9a675a1da1069c9ae00f8427b63b2a1ceb78eebfdfb2f088548434e33b
+EBUILD ament_cmake_export_link_flags-1.3.0.ebuild 1156 BLAKE2B 91f922ce535e0b65d4358038919cf65121bc81605f62243cbb4a3de5e5b765f1608cf8573a928baf534b3f91dfb14ad77533b372745399226268b211ff27abd7 SHA512 a5e43d7a551c695e6df228c26d14e8d2f559e948e81318cf5c1c3563d42ab0e7b8774661ea4017f76b4b63783dafaefa8206d9c3d40ecd9f3f8a01bad196688f
 EBUILD ament_cmake_export_link_flags-9999.ebuild 1156 BLAKE2B 24e9bfecb942336afcf433357c4f2ee5a65a0ed19c6a67cacf0521f63cfaf7807122d4b75718435c0c7c7289156b0428ca0385be58f0473fc1e9005630bc2342 SHA512 6d61cca22131dee38ccf39363172ddb21ba52c7b7ed04cba64e4eafaffed5edc2a9bcc9a675a1da1069c9ae00f8427b63b2a1ceb78eebfdfb2f088548434e33b
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.0.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.0.ebuild
deleted file mode 100644
index e31c09637e5a..000000000000
--- a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.0.ebuild
+++ /dev/null
@@ -1,46 +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 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_link_flags/ament_cmake_export_link_flags-1.0.1.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.1.ebuild
deleted file mode 100644
index e31c09637e5a..000000000000
--- a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.1.ebuild
+++ /dev/null
@@ -1,46 +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 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_link_flags/ament_cmake_export_link_flags-1.0.3.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.3.ebuild
deleted file mode 100644
index e31c09637e5a..000000000000
--- a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_link_flags/ament_cmake_export_link_flags-1.0.4.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.4.ebuild
deleted file mode 100644
index e31c09637e5a..000000000000
--- a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.4.ebuild
+++ /dev/null
@@ -1,46 +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 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_link_flags/ament_cmake_export_link_flags-1.1.3.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.1.3.ebuild
deleted file mode 100644
index e31c09637e5a..000000000000
--- a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.1.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_link_flags/ament_cmake_export_link_flags-0.9.6.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.3.0.ebuild
index e31c09637e5a..5e5b6c223c05 100644
--- a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-0.9.6.ebuild
+++ b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
diff --git a/dev-ros/ament_cmake_export_targets/Manifest b/dev-ros/ament_cmake_export_targets/Manifest
index 30eed86f1c47..18468e761c5a 100644
--- a/dev-ros/ament_cmake_export_targets/Manifest
+++ b/dev-ros/ament_cmake_export_targets/Manifest
@@ -1,16 +1,6 @@
-DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
-DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
-DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
-DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
-DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
-DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 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
+DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
 EBUILD ament_cmake_export_targets-1.1.4.ebuild 1191 BLAKE2B 3824e2885661361cfa637c50120171a45eac6218d67e53ca728ede0819998b49c1602517240a39248d1d380e0bdb0454b7c59b6e1385ce92e74603a80ff20137 SHA512 d78c8c1abab179257b6af86bb5c008902a34f27c40aeb6155b27e866e5a45dfeb0f16f4c3a94227a36c1f2974bf839c55a173a3323435f7960c34cd84577c635
+EBUILD ament_cmake_export_targets-1.3.0.ebuild 1191 BLAKE2B 92d1202aa597bd86ba6009a99de4f5e0aa4d98ac0b555fa690b9608adebea9726a5a16507996b2d2dc38b2391a8ee297e770ea53d7816f3c7803e10e6bd2ef87 SHA512 d0915b62a92b99e7cc4ae574460a69973e0b6434ee02d070b3aa54861e9fd7a8cac2d326fb78d44addaed001032705b393e6426ae2262fb9fe6459360f722f04
 EBUILD ament_cmake_export_targets-9999.ebuild 1191 BLAKE2B 3824e2885661361cfa637c50120171a45eac6218d67e53ca728ede0819998b49c1602517240a39248d1d380e0bdb0454b7c59b6e1385ce92e74603a80ff20137 SHA512 d78c8c1abab179257b6af86bb5c008902a34f27c40aeb6155b27e866e5a45dfeb0f16f4c3a94227a36c1f2974bf839c55a173a3323435f7960c34cd84577c635
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.0.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.0.ebuild
deleted file mode 100644
index 50b62c2a317b..000000000000
--- a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.0.ebuild
+++ /dev/null
@@ -1,47 +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 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_export_targets/ament_cmake_export_targets-1.0.1.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.1.ebuild
deleted file mode 100644
index 50b62c2a317b..000000000000
--- a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.1.ebuild
+++ /dev/null
@@ -1,47 +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 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_export_targets/ament_cmake_export_targets-1.0.3.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.3.ebuild
deleted file mode 100644
index 50b62c2a317b..000000000000
--- a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.3.ebuild
+++ /dev/null
@@ -1,47 +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 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_export_targets/ament_cmake_export_targets-1.0.4.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.4.ebuild
deleted file mode 100644
index 50b62c2a317b..000000000000
--- a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.4.ebuild
+++ /dev/null
@@ -1,47 +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 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_export_targets/ament_cmake_export_targets-1.1.3.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.3.ebuild
deleted file mode 100644
index 50b62c2a317b..000000000000
--- a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.3.ebuild
+++ /dev/null
@@ -1,47 +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 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_export_targets/ament_cmake_export_targets-0.9.6.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.3.0.ebuild
index 50b62c2a317b..a509591e9cdc 100644
--- a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-0.9.6.ebuild
+++ b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
diff --git a/dev-ros/ament_cmake_gmock/Manifest b/dev-ros/ament_cmake_gmock/Manifest
index 0353cedd0747..55f761c9b323 100644
--- a/dev-ros/ament_cmake_gmock/Manifest
+++ b/dev-ros/ament_cmake_gmock/Manifest
@@ -1,14 +1,6 @@
-DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
-DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
-DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
-DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
-DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 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
+DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
 EBUILD ament_cmake_gmock-1.1.4.ebuild 1158 BLAKE2B 07c83c2da9b8c4e06edfa3febae11ae24f30c7f5e6bf7a25d1dd70e4d6a9325635446f1a52d624a256216771481b915f66cd8323cf4908f9bfe1752ef5396e12 SHA512 f4cef787bdf811dca6c9ac95657c0425bd105e8b40575e24b3fbe452a6ce7890543e0df2641926bd961d4f3dcd88facb47380b63c124d2e211fc11e3c4d47c71
+EBUILD ament_cmake_gmock-1.3.0.ebuild 1158 BLAKE2B 1806c40832468a0515b5688ee84331357cbdd84eccc6b02b59143efe3243fa8c92ac7f6dc3b2fce5cbe22342177762d71aff0affdd562b7a1ad29c3e25dc65e0 SHA512 9d12071a4183bdfbc9ccf168d4cbb2d04537b573496a7304d5459d7fa522212524a1724ae0b22b17554cc21afd1909954574d6015629bb7349b449cfebf04fa7
 EBUILD ament_cmake_gmock-9999.ebuild 1158 BLAKE2B 07c83c2da9b8c4e06edfa3febae11ae24f30c7f5e6bf7a25d1dd70e4d6a9325635446f1a52d624a256216771481b915f66cd8323cf4908f9bfe1752ef5396e12 SHA512 f4cef787bdf811dca6c9ac95657c0425bd105e8b40575e24b3fbe452a6ce7890543e0df2641926bd961d4f3dcd88facb47380b63c124d2e211fc11e3c4d47c71
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.1.ebuild b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.1.ebuild
deleted file mode 100644
index 17c189d5d54e..000000000000
--- a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.1.ebuild
+++ /dev/null
@@ -1,46 +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 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_gmock/ament_cmake_gmock-1.0.3.ebuild b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.3.ebuild
deleted file mode 100644
index 17c189d5d54e..000000000000
--- a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_gmock/ament_cmake_gmock-1.0.4.ebuild b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.4.ebuild
deleted file mode 100644
index 17c189d5d54e..000000000000
--- a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.4.ebuild
+++ /dev/null
@@ -1,46 +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 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_gmock/ament_cmake_gmock-1.1.3.ebuild b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.1.3.ebuild
deleted file mode 100644
index 17c189d5d54e..000000000000
--- a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.1.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_gmock/ament_cmake_gmock-1.0.0.ebuild b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.3.0.ebuild
index 17c189d5d54e..5e1f522f8d71 100644
--- a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.0.ebuild
+++ b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
diff --git a/dev-ros/ament_cmake_gtest/Manifest b/dev-ros/ament_cmake_gtest/Manifest
index 4863c605f3ca..ee9cd8b4a0e1 100644
--- a/dev-ros/ament_cmake_gtest/Manifest
+++ b/dev-ros/ament_cmake_gtest/Manifest
@@ -1,16 +1,6 @@
-DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
-DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
-DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
-DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
-DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
-DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 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
+DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
 EBUILD ament_cmake_gtest-1.1.4.ebuild 1152 BLAKE2B 1ea1f103891adc023dcc4f516a5b73f89518d20de4d194bd2ae7352830fff29394de9597e636a742f394db9165a30ff023b3ccf585d089ebc255f1759768d581 SHA512 24738bccb2230f15e80c062a8daddef7a16fae867794d4d621d96594779dc9be51e08dbfd5e972535ab925e954c0e242e6f0a7c8048e47fc11e241873d2ae125
+EBUILD ament_cmake_gtest-1.3.0.ebuild 1152 BLAKE2B 16117619434ecc963e0cccb4e12bea83bf8b1a1bd8bbfecc0e300ee4e6a08c7ff6212c53a09e226c83b5f2526842fa6031f1925baa2313f2c6e11e6d8240bc0a SHA512 4f478be4f24152bd6974ef35ba490ba5a8c2016fc8126103592bcdde1613b58799d12c09aeae8183206e2291d48698c200b7f56bf43ba20844acce2cba844acd
 EBUILD ament_cmake_gtest-9999.ebuild 1152 BLAKE2B 1ea1f103891adc023dcc4f516a5b73f89518d20de4d194bd2ae7352830fff29394de9597e636a742f394db9165a30ff023b3ccf585d089ebc255f1759768d581 SHA512 24738bccb2230f15e80c062a8daddef7a16fae867794d4d621d96594779dc9be51e08dbfd5e972535ab925e954c0e242e6f0a7c8048e47fc11e241873d2ae125
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.0.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.0.ebuild
deleted file mode 100644
index b93c7a39772a..000000000000
--- a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.0.ebuild
+++ /dev/null
@@ -1,46 +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 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_gtest/ament_cmake_gtest-1.0.1.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.1.ebuild
deleted file mode 100644
index b93c7a39772a..000000000000
--- a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.1.ebuild
+++ /dev/null
@@ -1,46 +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 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_gtest/ament_cmake_gtest-1.0.3.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.3.ebuild
deleted file mode 100644
index b93c7a39772a..000000000000
--- a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_gtest/ament_cmake_gtest-1.0.4.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.4.ebuild
deleted file mode 100644
index b93c7a39772a..000000000000
--- a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.4.ebuild
+++ /dev/null
@@ -1,46 +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 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_gtest/ament_cmake_gtest-1.1.3.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.1.3.ebuild
deleted file mode 100644
index b93c7a39772a..000000000000
--- a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.1.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_gtest/ament_cmake_gtest-0.9.6.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.3.0.ebuild
index b93c7a39772a..141f05b4c322 100644
--- a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-0.9.6.ebuild
+++ b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
diff --git a/dev-ros/ament_cmake_include_directories/Manifest b/dev-ros/ament_cmake_include_directories/Manifest
index 36bec7f21587..ab7289fceedf 100644
--- a/dev-ros/ament_cmake_include_directories/Manifest
+++ b/dev-ros/ament_cmake_include_directories/Manifest
@@ -1,16 +1,6 @@
-DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
-DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
-DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
-DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
-DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
-DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 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
+DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
 EBUILD ament_cmake_include_directories-1.1.4.ebuild 1165 BLAKE2B be53d0a66e037552ddbdcbbc272e9663f99339f3498cf240a87342331cebce37eb1de7e2264f606e9554e0f5b1f579981bceed1c073ae0ea86a3a464838dc619 SHA512 258fbee4d5189c517e1e03d35129d1e294697b8ef863fbd2d1b9b56f04f3c2a4fefdafc3698a6ce487e69c0f33a2f807a842fa518c00ba3d6da3270b02dd6c2a
+EBUILD ament_cmake_include_directories-1.3.0.ebuild 1165 BLAKE2B 98de7dd1c74f24c2997d06be9d370afd68a5c8de33bb59c9a3b9df6bdb87cab31e70173e9c18df7f1a0bd0863386cf96ea9e141904e36892c7d15091cb29f693 SHA512 370fad510608f711b4db3b3edaf207d8f1e68847d18698f3ce3b36af3ecf30761886e9fc8545e8c8a4eb2d6c0b66b8bddd0dbbc62b29526a2ae0915a40914bbe
 EBUILD ament_cmake_include_directories-9999.ebuild 1165 BLAKE2B be53d0a66e037552ddbdcbbc272e9663f99339f3498cf240a87342331cebce37eb1de7e2264f606e9554e0f5b1f579981bceed1c073ae0ea86a3a464838dc619 SHA512 258fbee4d5189c517e1e03d35129d1e294697b8ef863fbd2d1b9b56f04f3c2a4fefdafc3698a6ce487e69c0f33a2f807a842fa518c00ba3d6da3270b02dd6c2a
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-0.9.6.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-0.9.6.ebuild
deleted file mode 100644
index 4a30d0ac2418..000000000000
--- a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-0.9.6.ebuild
+++ /dev/null
@@ -1,46 +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 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_include_directories/ament_cmake_include_directories-1.0.0.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.0.ebuild
deleted file mode 100644
index 4a30d0ac2418..000000000000
--- a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.0.ebuild
+++ /dev/null
@@ -1,46 +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 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_include_directories/ament_cmake_include_directories-1.0.1.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.1.ebuild
deleted file mode 100644
index 4a30d0ac2418..000000000000
--- a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.1.ebuild
+++ /dev/null
@@ -1,46 +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 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_include_directories/ament_cmake_include_directories-1.0.3.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.3.ebuild
deleted file mode 100644
index 4a30d0ac2418..000000000000
--- a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_include_directories/ament_cmake_include_directories-1.0.4.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.4.ebuild
deleted file mode 100644
index 4a30d0ac2418..000000000000
--- a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.4.ebuild
+++ /dev/null
@@ -1,46 +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 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_include_directories/ament_cmake_include_directories-1.1.3.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.3.ebuild
deleted file mode 100644
index 4a30d0ac2418..000000000000
--- a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_include_directories/ament_cmake_export_include_directories-1.0.0.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.3.0.ebuild
index 4a30d0ac2418..4f7e319646d6 100644
--- a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.0.ebuild
+++ b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
diff --git a/dev-ros/ament_cmake_libraries/Manifest b/dev-ros/ament_cmake_libraries/Manifest
index 5051b60543d8..2f4d6709a8c5 100644
--- a/dev-ros/ament_cmake_libraries/Manifest
+++ b/dev-ros/ament_cmake_libraries/Manifest
@@ -1,16 +1,6 @@
-DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
-DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
-DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
-DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
-DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
-DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 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
+DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
 EBUILD ament_cmake_libraries-1.1.4.ebuild 1158 BLAKE2B e824c3cf4d7e666b09565e39d52b264a017d3b387b1124596e2bcadb8e09be6609c36ab11e2fd5fd5b53d80ee7a17c88eeab94a37da2b6b3d004b9b7d2a3c931 SHA512 202b404faec56a83893879705152ec7f22eafd9ef47e94aaf88d6143e2095729204135fa4138e3d9cfb4e6add074d61025333f1e81558786101cac401f5e6ebb
+EBUILD ament_cmake_libraries-1.3.0.ebuild 1158 BLAKE2B fefc9e85ea6e65b21260a145f06f9ea81677bcf6a4b17e4dcb5fd775969ff09b5891b3d5b6287608ff4198cc72320e895aceaac7169c28a6f8fdc066a8b993a6 SHA512 4b8d20363072fef4c90cf293db5f4b68159028c49c44d1c780f2e2dd1c938eeeb33e44cbd07102040f245bf753c363141d8ee1c6062a7e748ce32caa095b0337
 EBUILD ament_cmake_libraries-9999.ebuild 1158 BLAKE2B e824c3cf4d7e666b09565e39d52b264a017d3b387b1124596e2bcadb8e09be6609c36ab11e2fd5fd5b53d80ee7a17c88eeab94a37da2b6b3d004b9b7d2a3c931 SHA512 202b404faec56a83893879705152ec7f22eafd9ef47e94aaf88d6143e2095729204135fa4138e3d9cfb4e6add074d61025333f1e81558786101cac401f5e6ebb
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.0.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.0.ebuild
deleted file mode 100644
index f4eece8f0db0..000000000000
--- a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.0.ebuild
+++ /dev/null
@@ -1,46 +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 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_libraries/ament_cmake_libraries-1.0.1.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.1.ebuild
deleted file mode 100644
index f4eece8f0db0..000000000000
--- a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.1.ebuild
+++ /dev/null
@@ -1,46 +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 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_libraries/ament_cmake_libraries-1.0.3.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.3.ebuild
deleted file mode 100644
index f4eece8f0db0..000000000000
--- a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_libraries/ament_cmake_libraries-1.0.4.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.4.ebuild
deleted file mode 100644
index f4eece8f0db0..000000000000
--- a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.4.ebuild
+++ /dev/null
@@ -1,46 +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 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_libraries/ament_cmake_libraries-1.1.3.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.1.3.ebuild
deleted file mode 100644
index f4eece8f0db0..000000000000
--- a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.1.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_libraries/ament_cmake_libraries-0.9.6.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.3.0.ebuild
index f4eece8f0db0..70e39d4a9658 100644
--- a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-0.9.6.ebuild
+++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
diff --git a/dev-ros/ament_cmake_lint_cmake/Manifest b/dev-ros/ament_cmake_lint_cmake/Manifest
index e3a9644879fe..9b219c8b271f 100644
--- a/dev-ros/ament_cmake_lint_cmake/Manifest
+++ b/dev-ros/ament_cmake_lint_cmake/Manifest
@@ -1,12 +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.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
+DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
 EBUILD ament_cmake_lint_cmake-0.11.2.ebuild 1183 BLAKE2B 15dccefa38faffe8474da12b0323d9fd033c8421d49e16f2ea4d009837390471a105af4921b07c35fa5c9b1ab307ddee09fd1e531d92674447fa3a7c3d765464 SHA512 ae0c5f835d74aef05f8d707419e9c36fd83dec86be4a882d2be23a46e29ba8e87fb0da9f2ad81fa940c411785ebb0560ee54baf8a166c1a6cf728f791cd0e4f7
-EBUILD ament_cmake_lint_cmake-0.9.5.ebuild 1260 BLAKE2B d8a066607f3882b1fcfb7309c125ea4918d87e66e77fa1bcbdee4c3f924d9dbe39a332c8c2435ca607d3ce1a7ac69fc1576b1ba894947c36b8fed674fae399f2 SHA512 2e2181f42119a1d2e20167d13dbb42343f6c4b425c729c32d7b9ca8022f9691f591f335edccdaa2e3f01b04b7b84c4116f7e21f71c582ebd4964150da9e0ad56
+EBUILD ament_cmake_lint_cmake-0.12.1.ebuild 1183 BLAKE2B bc7a687becfeab20ba15ecf4cfa07a4ed171acebf4968d01c6d1a1a9b5f0267d1fa9ea21eb10904af27387f582e6ce114216cbf3d202dbd03e752ab999b5dc39 SHA512 90f7b6fc0abc1232bcae4e7133783e8fc7145e32e2ee117c3ee36c899747839617b1362c3ef77a75949901d22439d39ac3bb3e36c2c3dedcb8f15202b4a9cf3c
 EBUILD ament_cmake_lint_cmake-9999.ebuild 1183 BLAKE2B 15dccefa38faffe8474da12b0323d9fd033c8421d49e16f2ea4d009837390471a105af4921b07c35fa5c9b1ab307ddee09fd1e531d92674447fa3a7c3d765464 SHA512 ae0c5f835d74aef05f8d707419e9c36fd83dec86be4a882d2be23a46e29ba8e87fb0da9f2ad81fa940c411785ebb0560ee54baf8a166c1a6cf728f791cd0e4f7
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.10.0.ebuild b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.10.0.ebuild
deleted file mode 100644
index d16461b67cd9..000000000000
--- a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.10.0.ebuild
+++ /dev/null
@@ -1,49 +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 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_lint_cmake/ament_cmake_lint_cmake-0.10.1.ebuild b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.10.1.ebuild
deleted file mode 100644
index d16461b67cd9..000000000000
--- a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.10.1.ebuild
+++ /dev/null
@@ -1,49 +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 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_lint_cmake/ament_cmake_lint_cmake-0.10.4.ebuild b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.10.4.ebuild
deleted file mode 100644
index d16461b67cd9..000000000000
--- a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.10.4.ebuild
+++ /dev/null
@@ -1,49 +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 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_lint_cmake/ament_cmake_lint_cmake-0.9.5.ebuild b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.12.1.ebuild
index d16461b67cd9..8f2ff312efbc 100644
--- a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.9.5.ebuild
+++ b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.12.1.ebuild
@@ -1,21 +1,20 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
-
+PYTHON_COMPAT=( python3_{8..10} )
 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}
+	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}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="The CMake API for ament_lint_cmake to lint CMake code using cmakelint"
@@ -23,12 +22,6 @@ 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
@@ -36,7 +29,10 @@ RDEPEND="
 "
 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}]')
+	$(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}
diff --git a/dev-ros/ament_cmake_pytest/Manifest b/dev-ros/ament_cmake_pytest/Manifest
index 9700a791c940..19bf11b245f1 100644
--- a/dev-ros/ament_cmake_pytest/Manifest
+++ b/dev-ros/ament_cmake_pytest/Manifest
@@ -1,14 +1,6 @@
-DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
-DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
-DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
-DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
-DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 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
+DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
 EBUILD ament_cmake_pytest-1.1.4.ebuild 1160 BLAKE2B f5ffa5668f5aed0f52555d643e277468aa81201497a3a419a64e6910a2ed78972733717407288755e211f57a11514e189b6e971351cb3cc38a4968ba27f9652e SHA512 9ce4f2b32d4d5ffd9916bae4347265e343af1b8115930091caa67b5a7afa319177100d9e1bd5ec849a192840724bbf53ebc23a25015e42c7ac77a27099dd1655
+EBUILD ament_cmake_pytest-1.3.0.ebuild 1160 BLAKE2B 4894668140b5b4ecb5234c965233954efc0da6952f317fa407cc50f981306cfb5813032e56b5c8e478f857fb2a1bcadc53e228781faaf0c3697d3547e962b103 SHA512 d394a4ef005b47275e566ccd4013598aa0fe1fa4d905543d2d9afa92c19ae0d021eba7f271e37dd4f763138f899ba51bc2d5396b325c05049d5bd421a62224e2
 EBUILD ament_cmake_pytest-9999.ebuild 1160 BLAKE2B f5ffa5668f5aed0f52555d643e277468aa81201497a3a419a64e6910a2ed78972733717407288755e211f57a11514e189b6e971351cb3cc38a4968ba27f9652e SHA512 9ce4f2b32d4d5ffd9916bae4347265e343af1b8115930091caa67b5a7afa319177100d9e1bd5ec849a192840724bbf53ebc23a25015e42c7ac77a27099dd1655
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.1.ebuild b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.1.ebuild
deleted file mode 100644
index cf7e6c682106..000000000000
--- a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.1.ebuild
+++ /dev/null
@@ -1,46 +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 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_pytest/ament_cmake_pytest-1.0.3.ebuild b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.3.ebuild
deleted file mode 100644
index cf7e6c682106..000000000000
--- a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_pytest/ament_cmake_pytest-1.0.4.ebuild b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.4.ebuild
deleted file mode 100644
index cf7e6c682106..000000000000
--- a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.4.ebuild
+++ /dev/null
@@ -1,46 +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 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_pytest/ament_cmake_pytest-1.1.3.ebuild b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.1.3.ebuild
deleted file mode 100644
index cf7e6c682106..000000000000
--- a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.1.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_pytest/ament_cmake_pytest-1.0.0.ebuild b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.3.0.ebuild
index cf7e6c682106..cd735bfb3be2 100644
--- a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.0.ebuild
+++ b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
diff --git a/dev-ros/ament_cmake_python/Manifest b/dev-ros/ament_cmake_python/Manifest
index 892be9eae254..16b838bce653 100644
--- a/dev-ros/ament_cmake_python/Manifest
+++ b/dev-ros/ament_cmake_python/Manifest
@@ -1,17 +1,8 @@
 AUX destdir.patch 1203 BLAKE2B fe4e783ea9d4802752d79d489e5b05d0ca9688a76d678521af41f232005da611c0286f594d15045dcae5610362ccc1bb878d29bddbeb86a9452b0289af347d67 SHA512 85e196c9777a6cc8b8b693e3825d5027c7a5db0a74008ad34d9be3714a088a9e651bb99ce53ee2bd95c47b2c1f8c2c657fa18cce0f13b11e4ea437cdd03ef0b3
-DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
-DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
-DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
-DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
-DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
-DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
+AUX destdir2.patch 1174 BLAKE2B dcf78cd8e36565677fbc688876a19a24a0df23b8dffbfa6dd230b935740c1ca4a6c57e3d9ad264b9b1b20be9794fafe1e3f59211f249f710016a9ce57058810e SHA512 75847abed87ee4e629682139f9cae789cfa0b02e6a08d941a6e1490ec966062f20326501d704afbfbd71dc24ab1e99479a02345a8118f14ba1264d171e85aeb0
 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
+DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
 EBUILD ament_cmake_python-1.1.4.ebuild 1181 BLAKE2B 651152b5ead7ad7112dd08c6b533b7451f908ff97abc2dad7f04b38cc3c6ddc9f76e2f0c2e1348f6bacb634b847e4030618120f678823d972963dd4368ca702c SHA512 30dcac9098507e41151db00824a188f266a8abab566fe5a9e9c7b865dfd3c67da8c3569bc70a433e7a329f2eacf512d6766665b6141fd3d6e9554e42fac605b2
-EBUILD ament_cmake_python-9999.ebuild 1181 BLAKE2B 651152b5ead7ad7112dd08c6b533b7451f908ff97abc2dad7f04b38cc3c6ddc9f76e2f0c2e1348f6bacb634b847e4030618120f678823d972963dd4368ca702c SHA512 30dcac9098507e41151db00824a188f266a8abab566fe5a9e9c7b865dfd3c67da8c3569bc70a433e7a329f2eacf512d6766665b6141fd3d6e9554e42fac605b2
+EBUILD ament_cmake_python-1.3.0.ebuild 1182 BLAKE2B fddba91ce1baeeac2c00e0e7d9ca3ff4a4821886d81e0cc5af5604a43698f81aa4cd223e6130b31f5127d27866dbd1c253dabede25b04292836c06e2d82c2d58 SHA512 332ce76b974cb7ebf8de2034d0b568ac6dde41c83d32141171816e38a2508967900c22fe179766d6194f36a599d0b67e6634507d026020d77c4d5680fbf0d044
+EBUILD ament_cmake_python-9999.ebuild 1182 BLAKE2B fddba91ce1baeeac2c00e0e7d9ca3ff4a4821886d81e0cc5af5604a43698f81aa4cd223e6130b31f5127d27866dbd1c253dabede25b04292836c06e2d82c2d58 SHA512 332ce76b974cb7ebf8de2034d0b568ac6dde41c83d32141171816e38a2508967900c22fe179766d6194f36a599d0b67e6634507d026020d77c4d5680fbf0d044
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_python/ament_cmake_python-1.0.0.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.0.0.ebuild
deleted file mode 100644
index 0e793810f45b..000000000000
--- a/dev-ros/ament_cmake_python/ament_cmake_python-1.0.0.ebuild
+++ /dev/null
@@ -1,47 +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 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_python/ament_cmake_python-1.0.1.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.0.1.ebuild
deleted file mode 100644
index 0e793810f45b..000000000000
--- a/dev-ros/ament_cmake_python/ament_cmake_python-1.0.1.ebuild
+++ /dev/null
@@ -1,47 +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 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_python/ament_cmake_python-1.0.3.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.0.3.ebuild
deleted file mode 100644
index 0e793810f45b..000000000000
--- a/dev-ros/ament_cmake_python/ament_cmake_python-1.0.3.ebuild
+++ /dev/null
@@ -1,47 +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 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_python/ament_cmake_python-1.0.4.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.0.4.ebuild
deleted file mode 100644
index 0e793810f45b..000000000000
--- a/dev-ros/ament_cmake_python/ament_cmake_python-1.0.4.ebuild
+++ /dev/null
@@ -1,47 +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 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_python/ament_cmake_python-1.1.3.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.1.3.ebuild
deleted file mode 100644
index 0e793810f45b..000000000000
--- a/dev-ros/ament_cmake_python/ament_cmake_python-1.1.3.ebuild
+++ /dev/null
@@ -1,47 +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 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_python/ament_cmake_python-0.9.6.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.3.0.ebuild
index 0e793810f45b..d4b1a4488aca 100644
--- a/dev-ros/ament_cmake_python/ament_cmake_python-0.9.6.ebuild
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
@@ -39,7 +39,7 @@ BDEPEND="
 	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 	${PYTHON_DEPS}
 "
-PATCHES=( "${FILESDIR}/destdir.patch" )
+PATCHES=( "${FILESDIR}/destdir2.patch" )
 
 python_check_deps() {
 	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
diff --git a/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild
index d6ff5f678382..d4b1a4488aca 100644
--- a/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,7 +39,7 @@ BDEPEND="
 	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 	${PYTHON_DEPS}
 "
-PATCHES=( "${FILESDIR}/destdir.patch" )
+PATCHES=( "${FILESDIR}/destdir2.patch" )
 
 python_check_deps() {
 	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
diff --git a/dev-ros/ament_cmake_python/files/destdir2.patch b/dev-ros/ament_cmake_python/files/destdir2.patch
new file mode 100644
index 000000000000..5278b6e17073
--- /dev/null
+++ b/dev-ros/ament_cmake_python/files/destdir2.patch
@@ -0,0 +1,26 @@
+Index: ament_cmake_python/cmake/ament_python_install_module.cmake
+===================================================================
+--- ament_cmake_python.orig/cmake/ament_python_install_module.cmake
++++ ament_cmake_python/cmake/ament_python_install_module.cmake
+@@ -65,7 +65,7 @@ function(_ament_cmake_python_install_mod
+       "execute_process(
+         COMMAND
+         \"${python_interpreter}\" \"-m\" \"compileall\"
+-        \"${CMAKE_INSTALL_PREFIX}/${destination}/${module_file}\"
++	\"\$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${destination}/${module_file}\"
+       )"
+     )
+   endif()
+Index: ament_cmake_python/cmake/ament_python_install_package.cmake
+===================================================================
+--- ament_cmake_python.orig/cmake/ament_python_install_package.cmake
++++ ament_cmake_python/cmake/ament_python_install_package.cmake
+@@ -192,7 +192,7 @@ setup(
+       "execute_process(
+         COMMAND
+         \"${python_interpreter_config}\" \"-m\" \"compileall\"
+-        \"${CMAKE_INSTALL_PREFIX}/${ARG_DESTINATION}/${package_name}\"
++	\"\$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${ARG_DESTINATION}/${package_name}\"
+       )"
+     )
+   endif()
diff --git a/dev-ros/ament_cmake_target_dependencies/Manifest b/dev-ros/ament_cmake_target_dependencies/Manifest
index 8a7e2e110354..5f0a000853a7 100644
--- a/dev-ros/ament_cmake_target_dependencies/Manifest
+++ b/dev-ros/ament_cmake_target_dependencies/Manifest
@@ -1,16 +1,6 @@
-DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
-DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
-DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
-DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
-DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
-DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 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
+DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
 EBUILD ament_cmake_target_dependencies-1.1.4.ebuild 1231 BLAKE2B 8766429812e518e70112916979a0eb6cf536bdb27c4e04ff42b5d30309daf582ef30658579e6810df9210641bcbeaa37c85a8cb0d9dadc7ffcb30a462b1f5c76 SHA512 8952dba6e8ba12f5313bd622bc24e215c51a9204fa84b025138b90c10a786cc5341a6eadfacd36849bc5174b05b8902714fe816466146ca3f87ccb6a184a4c15
+EBUILD ament_cmake_target_dependencies-1.3.0.ebuild 1231 BLAKE2B 828a85783d01b1846d69912a8d9496dc0e36d0115e86ee2661ae14091105ed7a42a51bc25b4bc6abe98faf2c5140b5ff45b0bcb327d8ede6503de80b787a0807 SHA512 d52753cae176d11a725eb231605a7fc9cceffd2b2939d87cf27995287304e7e89a6b8147c96abf737eab3d6019881af12fbccd6062619957c9f8ce7f490cd38e
 EBUILD ament_cmake_target_dependencies-9999.ebuild 1231 BLAKE2B 8766429812e518e70112916979a0eb6cf536bdb27c4e04ff42b5d30309daf582ef30658579e6810df9210641bcbeaa37c85a8cb0d9dadc7ffcb30a462b1f5c76 SHA512 8952dba6e8ba12f5313bd622bc24e215c51a9204fa84b025138b90c10a786cc5341a6eadfacd36849bc5174b05b8902714fe816466146ca3f87ccb6a184a4c15
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.0.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.0.ebuild
deleted file mode 100644
index cc319e25dd31..000000000000
--- a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.0.ebuild
+++ /dev/null
@@ -1,48 +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 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_target_dependencies/ament_cmake_target_dependencies-1.0.1.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.1.ebuild
deleted file mode 100644
index cc319e25dd31..000000000000
--- a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.1.ebuild
+++ /dev/null
@@ -1,48 +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 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_target_dependencies/ament_cmake_target_dependencies-1.0.3.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.3.ebuild
deleted file mode 100644
index cc319e25dd31..000000000000
--- a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.3.ebuild
+++ /dev/null
@@ -1,48 +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 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_target_dependencies/ament_cmake_target_dependencies-1.0.4.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.4.ebuild
deleted file mode 100644
index cc319e25dd31..000000000000
--- a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.4.ebuild
+++ /dev/null
@@ -1,48 +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 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_target_dependencies/ament_cmake_target_dependencies-1.1.3.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.1.3.ebuild
deleted file mode 100644
index cc319e25dd31..000000000000
--- a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.1.3.ebuild
+++ /dev/null
@@ -1,48 +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 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_target_dependencies/ament_cmake_target_dependencies-0.9.6.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.3.0.ebuild
index cc319e25dd31..57d0a18f4f66 100644
--- a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-0.9.6.ebuild
+++ b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
diff --git a/dev-ros/ament_cmake_test/Manifest b/dev-ros/ament_cmake_test/Manifest
index f0547cdb8abb..ea09cc99320f 100644
--- a/dev-ros/ament_cmake_test/Manifest
+++ b/dev-ros/ament_cmake_test/Manifest
@@ -1,16 +1,6 @@
-DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
-DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
-DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
-DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
-DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
-DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 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
+DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
 EBUILD ament_cmake_test-1.1.4.ebuild 1230 BLAKE2B d99da03c7ca02f1f3590469878855ee5f337f0e34820cac05e71c91395143e60059f194aa6e676bf76caf4041d22ed93c586089f1e48b66e23ae1f9ec5c35610 SHA512 f8c786793bfa4dea5e4b42bbaa30a12eb35ddf0c951a62907ef9b350f0ea784bd10d16c9efd468f30a77f7678b944886247992d6d20260967d95cf7169a306da
+EBUILD ament_cmake_test-1.3.0.ebuild 1230 BLAKE2B 0eff171e1c1649fd6cbf025b91307aafb76a00fb8cfd79591fea2dddda80c95529468c37de9b22918063763fd6e901cd27c5a5dfbb0287ef4c5648a227e481e0 SHA512 99040c08f781354338e54b81d36008ef01666f2dcaed8f4ccae2d8e8e722c2658e5549a64d0208561925aab54b3e63777239e78df22e933c04707e0239dd6ed4
 EBUILD ament_cmake_test-9999.ebuild 1230 BLAKE2B d99da03c7ca02f1f3590469878855ee5f337f0e34820cac05e71c91395143e60059f194aa6e676bf76caf4041d22ed93c586089f1e48b66e23ae1f9ec5c35610 SHA512 f8c786793bfa4dea5e4b42bbaa30a12eb35ddf0c951a62907ef9b350f0ea784bd10d16c9efd468f30a77f7678b944886247992d6d20260967d95cf7169a306da
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_test/ament_cmake_test-1.0.0.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-1.0.0.ebuild
deleted file mode 100644
index bb59c0de949c..000000000000
--- a/dev-ros/ament_cmake_test/ament_cmake_test-1.0.0.ebuild
+++ /dev/null
@@ -1,59 +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 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_test/ament_cmake_test-1.0.1.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-1.0.1.ebuild
deleted file mode 100644
index bb59c0de949c..000000000000
--- a/dev-ros/ament_cmake_test/ament_cmake_test-1.0.1.ebuild
+++ /dev/null
@@ -1,59 +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 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_test/ament_cmake_test-1.0.3.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-1.0.3.ebuild
deleted file mode 100644
index bb59c0de949c..000000000000
--- a/dev-ros/ament_cmake_test/ament_cmake_test-1.0.3.ebuild
+++ /dev/null
@@ -1,59 +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 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_test/ament_cmake_test-1.0.4.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-1.0.4.ebuild
deleted file mode 100644
index bb59c0de949c..000000000000
--- a/dev-ros/ament_cmake_test/ament_cmake_test-1.0.4.ebuild
+++ /dev/null
@@ -1,59 +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 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_test/ament_cmake_test-1.1.3.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-1.1.3.ebuild
deleted file mode 100644
index bb59c0de949c..000000000000
--- a/dev-ros/ament_cmake_test/ament_cmake_test-1.1.3.ebuild
+++ /dev/null
@@ -1,59 +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 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_test/ament_cmake_test-0.9.6.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-1.3.0.ebuild
index bb59c0de949c..09ab66781bf4 100644
--- a/dev-ros/ament_cmake_test/ament_cmake_test-0.9.6.ebuild
+++ b/dev-ros/ament_cmake_test/ament_cmake_test-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-r1
 
diff --git a/dev-ros/ament_cmake_uncrustify/Manifest b/dev-ros/ament_cmake_uncrustify/Manifest
index 1cbaceca0588..fbdebdc6f588 100644
--- a/dev-ros/ament_cmake_uncrustify/Manifest
+++ b/dev-ros/ament_cmake_uncrustify/Manifest
@@ -1,12 +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.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
+DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
 EBUILD ament_cmake_uncrustify-0.11.2.ebuild 1437 BLAKE2B 833be5fc6329f99dc99f8994b0fc7f15cd3e7ace0defaddf2e339c78909911359fc07c867429911aee846e6a4658bc8a9645b7f3908343f95a0a1c2ab50256fd SHA512 96c36c4d0d4e159301528bdc8d21c816c9baffc186449f6d262c64dc4c4d90f0cda80ac1e33e8ab68344f44c64a7b0d5cc2c84b2f82ebef9d1d2ec9d55668f9d
-EBUILD ament_cmake_uncrustify-0.9.5.ebuild 1517 BLAKE2B 7611ecb510ac8094b3b4878b4dfc83339e198e24910806025d1393477bd3c7d8c7de5afb5a351e021408279d1f16348e1d2cffb3b42c24139ce471b64d5ffd69 SHA512 9df72e736c4e772e75c3131b1774550a03b785e3ee9f4504d6ceea19d18960ac96fd1d8e415a349e8a65d4be33e51022d2618a779cc04e40822720b87125ebc4
+EBUILD ament_cmake_uncrustify-0.12.1.ebuild 1437 BLAKE2B b9c66e573d21196c119c5bd063c0655a89ee23353531a8bff5871f0aa9a76842934ec98d1810b9631f67e7759528e4abf93f9b62a4d06e05d0973081131b0f0f SHA512 86a0991f643755d907d8da3d2136a50904f279cf04c342cea2fac2e41df7609c30d906a401d1eb28ae6dd9548c88f8ff32426ab02cb9267ad29a0657ddb4b0a3
 EBUILD ament_cmake_uncrustify-9999.ebuild 1437 BLAKE2B 833be5fc6329f99dc99f8994b0fc7f15cd3e7ace0defaddf2e339c78909911359fc07c867429911aee846e6a4658bc8a9645b7f3908343f95a0a1c2ab50256fd SHA512 96c36c4d0d4e159301528bdc8d21c816c9baffc186449f6d262c64dc4c4d90f0cda80ac1e33e8ab68344f44c64a7b0d5cc2c84b2f82ebef9d1d2ec9d55668f9d
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.10.1.ebuild b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.10.1.ebuild
deleted file mode 100644
index ba3ee494af1c..000000000000
--- a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.10.1.ebuild
+++ /dev/null
@@ -1,62 +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 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_uncrustify/ament_cmake_uncrustify-0.10.4.ebuild b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.10.4.ebuild
deleted file mode 100644
index ba3ee494af1c..000000000000
--- a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.10.4.ebuild
+++ /dev/null
@@ -1,62 +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 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_uncrustify/ament_cmake_uncrustify-0.10.0.ebuild b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.12.1.ebuild
index ba3ee494af1c..c2d582d94104 100644
--- a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.10.0.ebuild
+++ b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
@@ -11,11 +11,11 @@ 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}
+	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}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="The CMake API for ament_uncrustify to check code against styleconventions"
@@ -23,11 +23,6 @@ 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 )"
 
@@ -35,9 +30,10 @@ 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}]')
+	$(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? (
diff --git a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.9.5.ebuild b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.9.5.ebuild
deleted file mode 100644
index ba3ee494af1c..000000000000
--- a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.9.5.ebuild
+++ /dev/null
@@ -1,62 +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 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 6a398c045d25..e7ab8e8e66a3 100644
--- a/dev-ros/ament_cmake_version/Manifest
+++ b/dev-ros/ament_cmake_version/Manifest
@@ -1,16 +1,6 @@
-DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
-DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
-DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
-DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
-DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
-DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
 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
+DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
 EBUILD ament_cmake_version-1.1.4.ebuild 1153 BLAKE2B bda2e52ba32026d66475180792b557e32daf7c4bfe519fb2b4eb373ae936fbf96523860561f1c6ae97c85e677153e501b06c7b6ff30a952d15cd6226f1b25947 SHA512 ead48b4ca1e50612ce46f9f753c729d6b32a7174faff6a4292f31b980d4cff5843236446fe4215e38612cd9c113e68b00da36ea4bcb00c09d7d5fe636d2b1a2e
+EBUILD ament_cmake_version-1.3.0.ebuild 1153 BLAKE2B 1c0130525a99f8f7f0172099fd04881207a703492ab83811191fa9fe0f46e62386cc49c924be2c98e1f8bfd43445c377a94fe28ebffd5b45fcbb7d41fa615896 SHA512 a6fb939305b9084ab0c2f92b03dfcb78fe6b78f74e5517da342d8c8146e313f3ddac4db9a36aa727acc34d94cfa31970827ec113513228ab2830d2e2eeedefa3
 EBUILD ament_cmake_version-9999.ebuild 1153 BLAKE2B bda2e52ba32026d66475180792b557e32daf7c4bfe519fb2b4eb373ae936fbf96523860561f1c6ae97c85e677153e501b06c7b6ff30a952d15cd6226f1b25947 SHA512 ead48b4ca1e50612ce46f9f753c729d6b32a7174faff6a4292f31b980d4cff5843236446fe4215e38612cd9c113e68b00da36ea4bcb00c09d7d5fe636d2b1a2e
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_version/ament_cmake_version-1.0.0.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-1.0.0.ebuild
deleted file mode 100644
index a03f6bbe74af..000000000000
--- a/dev-ros/ament_cmake_version/ament_cmake_version-1.0.0.ebuild
+++ /dev/null
@@ -1,46 +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 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_version/ament_cmake_version-1.0.1.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-1.0.1.ebuild
deleted file mode 100644
index a03f6bbe74af..000000000000
--- a/dev-ros/ament_cmake_version/ament_cmake_version-1.0.1.ebuild
+++ /dev/null
@@ -1,46 +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 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_version/ament_cmake_version-1.0.3.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-1.0.3.ebuild
deleted file mode 100644
index a03f6bbe74af..000000000000
--- a/dev-ros/ament_cmake_version/ament_cmake_version-1.0.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_version/ament_cmake_version-1.0.4.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-1.0.4.ebuild
deleted file mode 100644
index a03f6bbe74af..000000000000
--- a/dev-ros/ament_cmake_version/ament_cmake_version-1.0.4.ebuild
+++ /dev/null
@@ -1,46 +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 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_version/ament_cmake_version-1.1.3.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-1.1.3.ebuild
deleted file mode 100644
index a03f6bbe74af..000000000000
--- a/dev-ros/ament_cmake_version/ament_cmake_version-1.1.3.ebuild
+++ /dev/null
@@ -1,46 +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 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_version/ament_cmake_version-0.9.6.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-1.3.0.ebuild
index a03f6bbe74af..b70cd7b77686 100644
--- a/dev-ros/ament_cmake_version/ament_cmake_version-0.9.6.ebuild
+++ b/dev-ros/ament_cmake_version/ament_cmake_version-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
diff --git a/dev-ros/ament_cmake_xmllint/Manifest b/dev-ros/ament_cmake_xmllint/Manifest
index a96802c735af..b1727b4dd951 100644
--- a/dev-ros/ament_cmake_xmllint/Manifest
+++ b/dev-ros/ament_cmake_xmllint/Manifest
@@ -1,12 +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.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 1372 BLAKE2B a67d9919583c2aaecc588a64fd6029b56441961cc2125f47447d3de961fe61470a35c4886c0c22fa6b6b713e42ddb0ce9750565895b6e0ce11f847824d314850 SHA512 512e1499562d581c7a3c3908a60c426220e81eb70739f8de041d7e2561c1a92abc7fb24cff2369516d1fc5d7e8a0c8909fad89ed7c22fbe113edb8fc09e8c896
-EBUILD ament_cmake_xmllint-0.9.5.ebuild 1453 BLAKE2B adb8a13381da60fda8c430297974c6e53992342984a2f4c7115b3d9370b9397ebabfd3d7944b8e8571a2e0de8e5613f55834e0c3e95922a3a32a096e257a1686 SHA512 f4ce7240407a8dd1eecb4332f25d1fb2ab5d45980b3a101a09521e9507c62d27f3aab18d87c20036060a3012f084d40de5145fe8daa61adb07185e928b302eb3
-EBUILD ament_cmake_xmllint-9999.ebuild 1372 BLAKE2B a67d9919583c2aaecc588a64fd6029b56441961cc2125f47447d3de961fe61470a35c4886c0c22fa6b6b713e42ddb0ce9750565895b6e0ce11f847824d314850 SHA512 512e1499562d581c7a3c3908a60c426220e81eb70739f8de041d7e2561c1a92abc7fb24cff2369516d1fc5d7e8a0c8909fad89ed7c22fbe113edb8fc09e8c896
+DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
+EBUILD ament_cmake_xmllint-0.11.2.ebuild 1373 BLAKE2B a87f242d504ec01baab3883ac83b3b1d78c750217837dddb33de0bde601b440ea5b2e68c7c711d2b90c6daa98b1f57dbf7a343f1a5e381dca6c5e3cc7950eb1d SHA512 ee3a7f5d718b509b199174edb86f444b9124667655edd870eddb8eeb3027efc32d16dab65a70c8dba114084475683c18b4fc659ad224e613cb4270e13b367c8f
+EBUILD ament_cmake_xmllint-0.12.1.ebuild 1373 BLAKE2B a87f242d504ec01baab3883ac83b3b1d78c750217837dddb33de0bde601b440ea5b2e68c7c711d2b90c6daa98b1f57dbf7a343f1a5e381dca6c5e3cc7950eb1d SHA512 ee3a7f5d718b509b199174edb86f444b9124667655edd870eddb8eeb3027efc32d16dab65a70c8dba114084475683c18b4fc659ad224e613cb4270e13b367c8f
+EBUILD ament_cmake_xmllint-9999.ebuild 1373 BLAKE2B a87f242d504ec01baab3883ac83b3b1d78c750217837dddb33de0bde601b440ea5b2e68c7c711d2b90c6daa98b1f57dbf7a343f1a5e381dca6c5e3cc7950eb1d SHA512 ee3a7f5d718b509b199174edb86f444b9124667655edd870eddb8eeb3027efc32d16dab65a70c8dba114084475683c18b4fc659ad224e613cb4270e13b367c8f
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.10.0.ebuild b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.10.0.ebuild
deleted file mode 100644
index 91e92ca5ad7d..000000000000
--- a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.10.0.ebuild
+++ /dev/null
@@ -1,61 +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 cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="he CMake API for ament_xmllint to check XML file using xmmlint"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_copyright
-"
-DEPEND=""
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-ros/ament_xmllint[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_copyright
-	test? (
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version "dev-ros/ament_xmllint[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.10.1.ebuild b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.10.1.ebuild
deleted file mode 100644
index 91e92ca5ad7d..000000000000
--- a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.10.1.ebuild
+++ /dev/null
@@ -1,61 +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 cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="he CMake API for ament_xmllint to check XML file using xmmlint"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_copyright
-"
-DEPEND=""
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-ros/ament_xmllint[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_copyright
-	test? (
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version "dev-ros/ament_xmllint[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.10.4.ebuild b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.10.4.ebuild
deleted file mode 100644
index 91e92ca5ad7d..000000000000
--- a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.10.4.ebuild
+++ /dev/null
@@ -1,61 +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 cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="he CMake API for ament_xmllint to check XML file using xmmlint"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_copyright
-"
-DEPEND=""
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-ros/ament_xmllint[${PYTHON_USEDEP}]')
-	dev-ros/ament_cmake_test
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_copyright
-	test? (
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version "dev-ros/ament_xmllint[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.11.2.ebuild b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.11.2.ebuild
index 72cc39d41939..7657d4a383e2 100644
--- a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.11.2.ebuild
+++ b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.11.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
diff --git a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.9.5.ebuild b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.12.1.ebuild
index 91e92ca5ad7d..7657d4a383e2 100644
--- a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.9.5.ebuild
+++ b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
@@ -11,11 +11,11 @@ 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}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="he CMake API for ament_xmllint to check XML file using xmmlint"
@@ -23,11 +23,6 @@ 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 )"
 
@@ -35,9 +30,11 @@ RDEPEND="
 	dev-ros/ament_cmake_test
 	dev-ros/ament_cmake_copyright
 "
-DEPEND=""
 BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-ros/ament_xmllint[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]
+		dev-ros/ament_xmllint[${PYTHON_USEDEP}]')
 	dev-ros/ament_cmake_test
 	dev-ros/ament_cmake_core
 	dev-ros/ament_cmake_copyright
diff --git a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-9999.ebuild b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-9999.ebuild
index 72cc39d41939..7657d4a383e2 100644
--- a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-9999.ebuild
+++ b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
diff --git a/dev-ros/ament_copyright/Manifest b/dev-ros/ament_copyright/Manifest
index df4789eea648..5b6ac2513b98 100644
--- a/dev-ros/ament_copyright/Manifest
+++ b/dev-ros/ament_copyright/Manifest
@@ -1,6 +1,6 @@
-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_copyright-0.10.4.ebuild 1145 BLAKE2B 0c0c04f6b9a5b8c82bf41b34ea062af7f6f8016f15f7ed32425b77ad1a035b125d7e9d0749123b303980cea6aa3ee6d94f5d96e113c28e0d7c5230452a2ba012 SHA512 496781e43c25c30b81269d0e96514f36116884dd2f016fb23414a49187be2a3ec00ae2dc42a051e7f3b81daa18196d9060cc956105e7f29d954e200f94de955a
+DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
 EBUILD ament_copyright-0.11.2.ebuild 930 BLAKE2B cf0f89dc11cf78a8799150f959c0d9036a5d1a0c1324b7933ea7859cc663a003b514af12a24cde86959999abadc57331fcf1d6e9dfe7eaff8493ecfc5b9b6c7d SHA512 2f2cab51b30a845538c9a317b22146bcbeb714299a3178cc9fe7fe105fc874b1f0acb72bc8f9937bcd06f7ee326d3de7748c322f6e99004d382edcfb5f4654fe
+EBUILD ament_copyright-0.12.1.ebuild 930 BLAKE2B 37579b34897a327cec1a45702b4747a0768101ad16260a99600e62af39ce5e168b4f60e38f9fd4fcf0e9ee0103c8e01a0c7a25f76e5ae340debabc03c87d579c SHA512 5666062ae91d1e8819cb187644977482636e6a472666a893fef1fd1edac9e9992b8578493be8fdd206c299fc24c3fa9bbf56fd58d7a1c7f34172feb4ce073064
 EBUILD ament_copyright-9999.ebuild 930 BLAKE2B cf0f89dc11cf78a8799150f959c0d9036a5d1a0c1324b7933ea7859cc663a003b514af12a24cde86959999abadc57331fcf1d6e9dfe7eaff8493ecfc5b9b6c7d SHA512 2f2cab51b30a845538c9a317b22146bcbeb714299a3178cc9fe7fe105fc874b1f0acb72bc8f9937bcd06f7ee326d3de7748c322f6e99004d382edcfb5f4654fe
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_copyright/ament_copyright-0.10.4.ebuild b/dev-ros/ament_copyright/ament_copyright-0.12.1.ebuild
index 6b424f154092..0a795908f8f5 100644
--- a/dev-ros/ament_copyright/ament_copyright-0.10.4.ebuild
+++ b/dev-ros/ament_copyright/ament_copyright-0.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -12,11 +12,11 @@ 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}
+	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}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="The ability to check source files for copyright and license information"
@@ -24,29 +24,17 @@ 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
 	dev-python/importlib_metadata[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	test? (
 		dev-ros/ament_flake8[${PYTHON_USEDEP}]
 		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 "
-BDEPEND=""
-
-distutils_enable_tests pytest
 
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
+distutils_enable_tests --install pytest
diff --git a/dev-ros/ament_cppcheck/Manifest b/dev-ros/ament_cppcheck/Manifest
index d46b0b08dbaa..e569264ca415 100644
--- a/dev-ros/ament_cppcheck/Manifest
+++ b/dev-ros/ament_cppcheck/Manifest
@@ -1,6 +1,6 @@
-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_cppcheck-0.10.4.ebuild 933 BLAKE2B cab561ffc7ee22991f8905fa4579b3481a08efd7f67d7975706aa968df1fdf302d7b395137d8d87a6d1fcd72856c22ca1c133f5f6716fb24d5d86471a5e1b944 SHA512 525c5c031e8d70722d2b51d9a108f488c641ba7f85cb4d9720ef6cb89eabdf82162e6e1e5870c5e0a1bf19ef5d2b75e68c154641bfc8443cff7f8c95272d9e1b
+DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
 EBUILD ament_cppcheck-0.11.2.ebuild 933 BLAKE2B cab561ffc7ee22991f8905fa4579b3481a08efd7f67d7975706aa968df1fdf302d7b395137d8d87a6d1fcd72856c22ca1c133f5f6716fb24d5d86471a5e1b944 SHA512 525c5c031e8d70722d2b51d9a108f488c641ba7f85cb4d9720ef6cb89eabdf82162e6e1e5870c5e0a1bf19ef5d2b75e68c154641bfc8443cff7f8c95272d9e1b
+EBUILD ament_cppcheck-0.12.1.ebuild 933 BLAKE2B 0d70179bbe29406906cfbe31a84ee0c61b6dbe8cbd57488876f22f118be7e6ede323556f6040fe18ac764ab8f25906bc163c40c70e7fdd13aeb7605e27d41daf SHA512 335aa1e8f4201a0116a56024d744dbb3f516d399d050ed555de55745f5add8f008e300d3baa65c0871f7e18ddd12de45807ad7bcac5cf644ed1d803bd8cabcd7
 EBUILD ament_cppcheck-9999.ebuild 933 BLAKE2B cab561ffc7ee22991f8905fa4579b3481a08efd7f67d7975706aa968df1fdf302d7b395137d8d87a6d1fcd72856c22ca1c133f5f6716fb24d5d86471a5e1b944 SHA512 525c5c031e8d70722d2b51d9a108f488c641ba7f85cb4d9720ef6cb89eabdf82162e6e1e5870c5e0a1bf19ef5d2b75e68c154641bfc8443cff7f8c95272d9e1b
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_cppcheck/ament_cppcheck-0.10.4.ebuild b/dev-ros/ament_cppcheck/ament_cppcheck-0.12.1.ebuild
index 1ec0564cee82..2bd0035ecab5 100644
--- a/dev-ros/ament_cppcheck/ament_cppcheck-0.10.4.ebuild
+++ b/dev-ros/ament_cppcheck/ament_cppcheck-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-ros/ament_cpplint/Manifest b/dev-ros/ament_cpplint/Manifest
index beba5a2c137e..1a4625d99cbb 100644
--- a/dev-ros/ament_cpplint/Manifest
+++ b/dev-ros/ament_cpplint/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.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
+DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
 EBUILD ament_cpplint-0.11.2.ebuild 868 BLAKE2B 6827a856e030d854e417cdd2c27f98b7a522ab310ee4c117eaae9c188bee3ebe35f0dfe85c216331989b75b0107b0b088a6ee08e9807aeb5ca2b18dc87509363 SHA512 f26b89bdfd541736c625e22b331960d9fe9f3da3282680548a904637deedf4f4356f993221705f7a1593262f9c3eab45370f4d8e2060dc3038cf46d5875844b0
+EBUILD ament_cpplint-0.12.1.ebuild 868 BLAKE2B 1c60e7f0a344e1e1359c27df844809eaff846ad097d3a14d596e3fbbe25e5fa0ac0dba302f4288207522cc07a619acd3c0a6d5ca93dc27924129335c9dc6a77a SHA512 9f931dc616e4610c1c92c47d5545a1f697217feb2ae498b8f1549d385485c3d3c77004afd3abae83636b1c2921f94e913bf2844475653a509651874c6ab103c7
 EBUILD ament_cpplint-9999.ebuild 868 BLAKE2B 6827a856e030d854e417cdd2c27f98b7a522ab310ee4c117eaae9c188bee3ebe35f0dfe85c216331989b75b0107b0b088a6ee08e9807aeb5ca2b18dc87509363 SHA512 f26b89bdfd541736c625e22b331960d9fe9f3da3282680548a904637deedf4f4356f993221705f7a1593262f9c3eab45370f4d8e2060dc3038cf46d5875844b0
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_cpplint/ament_cpplint-0.10.0.ebuild b/dev-ros/ament_cpplint/ament_cpplint-0.10.0.ebuild
deleted file mode 100644
index c8856b376bb5..000000000000
--- a/dev-ros/ament_cpplint/ament_cpplint-0.10.0.ebuild
+++ /dev/null
@@ -1,46 +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 the Google style conventions 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"
-
-RDEPEND="
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/ament_copyright[${PYTHON_USEDEP}]
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND=""
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_cpplint/ament_cpplint-0.10.1.ebuild b/dev-ros/ament_cpplint/ament_cpplint-0.10.1.ebuild
deleted file mode 100644
index c8856b376bb5..000000000000
--- a/dev-ros/ament_cpplint/ament_cpplint-0.10.1.ebuild
+++ /dev/null
@@ -1,46 +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 the Google style conventions 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"
-
-RDEPEND="
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/ament_copyright[${PYTHON_USEDEP}]
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND=""
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_cpplint/ament_cpplint-0.10.4.ebuild b/dev-ros/ament_cpplint/ament_cpplint-0.12.1.ebuild
index c8856b376bb5..80348b906df3 100644
--- a/dev-ros/ament_cpplint/ament_cpplint-0.10.4.ebuild
+++ b/dev-ros/ament_cpplint/ament_cpplint-0.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -12,11 +12,11 @@ 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}
+	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}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="The ability to check code against the Google style conventions using cpplint"
@@ -24,23 +24,13 @@ 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}
+BDEPEND="
 	test? (
 		dev-ros/ament_copyright[${PYTHON_USEDEP}]
 		dev-ros/ament_flake8[${PYTHON_USEDEP}]
 		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 "
-BDEPEND=""
 
 distutils_enable_tests pytest
diff --git a/dev-ros/ament_flake8/Manifest b/dev-ros/ament_flake8/Manifest
index 74b0383f4030..29da6836d055 100644
--- a/dev-ros/ament_flake8/Manifest
+++ b/dev-ros/ament_flake8/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.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
+DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
 EBUILD ament_flake8-0.11.2.ebuild 819 BLAKE2B 1c28ed70fc17fd1f204c658544ceffbfa867a51473c94a9d04064ead508d0683718392e4ab9e532a52d43d514b799cae09f6ce164e512479662515c417df9f73 SHA512 ee7d194283ec63a69b0eb82b24b09c090367f0b6e4857b12dc829152ccd81b0bbe3fa715716303a0ee98bd65725f63687f7e035e7ecfc0a92e45c89948096c8f
+EBUILD ament_flake8-0.12.1.ebuild 819 BLAKE2B 09ecb08fcf242cf2882d9fa05c9908247d25129526578a46491546651d82563b5cbcc4c9d575af7f9a7ba957d990fb14c0795f3cf4f5ed7144a2415cf5a92c97 SHA512 f031cc18f7d5a6f094f91c01e4c7ed2b34b86108ce638a1d230dd81516df618e4f4d8cc44dc6668cf9eb629df4d65e5377a60d7bad09353a132b51b44ac1c93d
 EBUILD ament_flake8-9999.ebuild 819 BLAKE2B 1c28ed70fc17fd1f204c658544ceffbfa867a51473c94a9d04064ead508d0683718392e4ab9e532a52d43d514b799cae09f6ce164e512479662515c417df9f73 SHA512 ee7d194283ec63a69b0eb82b24b09c090367f0b6e4857b12dc829152ccd81b0bbe3fa715716303a0ee98bd65725f63687f7e035e7ecfc0a92e45c89948096c8f
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_flake8/ament_flake8-0.10.1.ebuild b/dev-ros/ament_flake8/ament_flake8-0.10.1.ebuild
deleted file mode 100644
index c2beb0d53809..000000000000
--- a/dev-ros/ament_flake8/ament_flake8-0.10.1.ebuild
+++ /dev/null
@@ -1,45 +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 for style and syntax conventions with flake8"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-
-RDEPEND="
-	dev-ros/ament_lint[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND=""
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_flake8/ament_flake8-0.10.4.ebuild b/dev-ros/ament_flake8/ament_flake8-0.10.4.ebuild
deleted file mode 100644
index c2beb0d53809..000000000000
--- a/dev-ros/ament_flake8/ament_flake8-0.10.4.ebuild
+++ /dev/null
@@ -1,45 +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 for style and syntax conventions with flake8"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-
-RDEPEND="
-	dev-ros/ament_lint[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND=""
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_flake8/ament_flake8-0.10.0.ebuild b/dev-ros/ament_flake8/ament_flake8-0.12.1.ebuild
index c2beb0d53809..c75310936c1e 100644
--- a/dev-ros/ament_flake8/ament_flake8-0.10.0.ebuild
+++ b/dev-ros/ament_flake8/ament_flake8-0.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -12,11 +12,11 @@ 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}
+	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}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="The ability to check code for style and syntax conventions with flake8"
@@ -24,22 +24,11 @@ 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/flake8[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND=""
+DEPEND="${RDEPEND}"
 
 distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint/Manifest b/dev-ros/ament_lint/Manifest
index d5323591bc4c..3f22f3d80391 100644
--- a/dev-ros/ament_lint/Manifest
+++ b/dev-ros/ament_lint/Manifest
@@ -1,6 +1,6 @@
-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-0.10.4-r1.ebuild 886 BLAKE2B 9ac10e0798fa14239e84f238837eb8f7effe92b8e4d489d02f49573feef22aa42aef2d72efc1cd46f9a95c194a6b7ebd0d46685e12aaa7c87cbedeb0d412a6ee SHA512 21fd9bade417f7c95cffaa6089baa43e5562768746b33129adadbf93cc0a85682d1c4a50a3d1b580301b67e2a7fbad2f31274402cfef7f86699494a6efe04163
+DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
 EBUILD ament_lint-0.11.2.ebuild 886 BLAKE2B 9ac10e0798fa14239e84f238837eb8f7effe92b8e4d489d02f49573feef22aa42aef2d72efc1cd46f9a95c194a6b7ebd0d46685e12aaa7c87cbedeb0d412a6ee SHA512 21fd9bade417f7c95cffaa6089baa43e5562768746b33129adadbf93cc0a85682d1c4a50a3d1b580301b67e2a7fbad2f31274402cfef7f86699494a6efe04163
+EBUILD ament_lint-0.12.1.ebuild 886 BLAKE2B 5dceb356d86362d5d79fe476f5a693e5f7e9caaec79eb9f53016868ae17419dabf0fd003db855e55020ea52777c264d63541ed5817902892cef57e97e8d09f12 SHA512 be103938a91644b9a16366f62394c2846b6b1d063adc068ff85609e4bea3e9eefa2b03c9ba11a1d6a315e78145ba4aa254af674f0c834a91c692cebd17f25f8c
 EBUILD ament_lint-9999.ebuild 886 BLAKE2B 9ac10e0798fa14239e84f238837eb8f7effe92b8e4d489d02f49573feef22aa42aef2d72efc1cd46f9a95c194a6b7ebd0d46685e12aaa7c87cbedeb0d412a6ee SHA512 21fd9bade417f7c95cffaa6089baa43e5562768746b33129adadbf93cc0a85682d1c4a50a3d1b580301b67e2a7fbad2f31274402cfef7f86699494a6efe04163
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_lint/ament_lint-0.10.4-r1.ebuild b/dev-ros/ament_lint/ament_lint-0.12.1.ebuild
index 8c8bff8aecc0..4b45fd5f12d4 100644
--- a/dev-ros/ament_lint/ament_lint-0.10.4-r1.ebuild
+++ b/dev-ros/ament_lint/ament_lint-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-ros/ament_lint_auto/Manifest b/dev-ros/ament_lint_auto/Manifest
index 33cc42e974a6..ab43758b05df 100644
--- a/dev-ros/ament_lint_auto/Manifest
+++ b/dev-ros/ament_lint_auto/Manifest
@@ -1,12 +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.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
+DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
 EBUILD ament_lint_auto-0.11.2.ebuild 1096 BLAKE2B c6c9fbb481208a3fe10a6e7cdd271bff04486534aa458f0f4d84692a6c2b1c3515454f28aaa4faca298de8b5d4e99a4d58246f0bc6ab4a70bc21449111c70e15 SHA512 ee87fec01224b82da9fbe20e201fdadd615b878beba8f9d9c71389eb95c67ac98c3ed786028a2d7c9e804c41a312b21135080286a1915f49b5d7a12906a3f994
-EBUILD ament_lint_auto-0.9.5.ebuild 1174 BLAKE2B 56c7160c249225a87f4614fc1a391ca6b0a4f70a8997a32e52259c60ca39f50aa86d63a51235aaa9f01fbbdbd3f92ba8c015566ec92231267ea1df7c54739eff SHA512 dc3fd294fa9d90a5e64b9d30ef5f042d510d5f9361c5c9ff584122999b654f0ddba2208ac758e1680b93a736b91c77de98e4a61774aefa5885779f5a9cf61b48
+EBUILD ament_lint_auto-0.12.1.ebuild 1096 BLAKE2B 58b7c807236f025fdf1bf9c1f9b9dc2d93da10e789b35ea3b05c54bf7aff495022285b54d7cb67bd4a504d081ae1de5bb40277b41ed39a6bfd268054ea5f25df SHA512 456447b03e0314874dc779b44a3e05f6c8e6f8044f9e3e55c6c2ecc62e68b2771da23db7263414c9d0ed1af667f55d09bcd5533e0d68c9d94b2941f87a4ddfd0
 EBUILD ament_lint_auto-9999.ebuild 1096 BLAKE2B c6c9fbb481208a3fe10a6e7cdd271bff04486534aa458f0f4d84692a6c2b1c3515454f28aaa4faca298de8b5d4e99a4d58246f0bc6ab4a70bc21449111c70e15 SHA512 ee87fec01224b82da9fbe20e201fdadd615b878beba8f9d9c71389eb95c67ac98c3ed786028a2d7c9e804c41a312b21135080286a1915f49b5d7a12906a3f994
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_lint_auto/ament_lint_auto-0.10.1.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-0.10.1.ebuild
deleted file mode 100644
index 99bd8c66a9d9..000000000000
--- a/dev-ros/ament_lint_auto/ament_lint_auto-0.10.1.ebuild
+++ /dev/null
@@ -1,47 +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 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_auto/ament_lint_auto-0.10.4.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-0.10.4.ebuild
deleted file mode 100644
index 99bd8c66a9d9..000000000000
--- a/dev-ros/ament_lint_auto/ament_lint_auto-0.10.4.ebuild
+++ /dev/null
@@ -1,47 +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 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_auto/ament_lint_auto-0.10.0.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-0.12.1.ebuild
index 99bd8c66a9d9..16d03e212bf3 100644
--- a/dev-ros/ament_lint_auto/ament_lint_auto-0.10.0.ebuild
+++ b/dev-ros/ament_lint_auto/ament_lint_auto-0.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
@@ -11,11 +11,11 @@ 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}
+	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}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="The auto-magic functions for ease to use of the ament linters"
@@ -23,12 +23,6 @@ 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
@@ -37,7 +31,9 @@ RDEPEND="
 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_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 	${PYTHON_DEPS}
 "
 
diff --git a/dev-ros/ament_lint_auto/ament_lint_auto-0.9.5.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-0.9.5.ebuild
deleted file mode 100644
index 99bd8c66a9d9..000000000000
--- a/dev-ros/ament_lint_auto/ament_lint_auto-0.9.5.ebuild
+++ /dev/null
@@ -1,47 +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 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 aad203f75555..62dce1b25975 100644
--- a/dev-ros/ament_lint_cmake/Manifest
+++ b/dev-ros/ament_lint_cmake/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.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
+DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
 EBUILD ament_lint_cmake-0.11.2.ebuild 860 BLAKE2B bb78abd111dec0a0d8f03d2dd8baba102efc41ff2444bbf17d83dcfbc4b5487caff4d6925c579ebb2be5f58dc2b1e56901c1f323d83848fe1e4f7530c3a38781 SHA512 533e94036afb344edac090e3e88b63ee7c1afbeba4432ba6cfe7334eda919717c015e8be265c5f51691ccf3a5effe0d19d14d77ac922a6d0ba0ec3883ef3eff0
+EBUILD ament_lint_cmake-0.12.1.ebuild 854 BLAKE2B ce52e72a9d4755e5e30384f7afe889e02849fc6bdcf2ddd8d3a45d4cc8175ff94c7975c9f558e938369fe87528d7a2e7e8edb0fa65cff0a75ec02625a9ae0cea SHA512 d90c3ae8bae6bcffc7164f1e9b81a1ae9340fcea5e7513714f6938bbd6087f68f5d9f835bebbb777d444dcba3f240b03aecc2333069d8abdc6f95b5d10060dd9
 EBUILD ament_lint_cmake-9999.ebuild 854 BLAKE2B ce52e72a9d4755e5e30384f7afe889e02849fc6bdcf2ddd8d3a45d4cc8175ff94c7975c9f558e938369fe87528d7a2e7e8edb0fa65cff0a75ec02625a9ae0cea SHA512 d90c3ae8bae6bcffc7164f1e9b81a1ae9340fcea5e7513714f6938bbd6087f68f5d9f835bebbb777d444dcba3f240b03aecc2333069d8abdc6f95b5d10060dd9
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_lint_cmake/ament_lint_cmake-0.10.0.ebuild b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.10.0.ebuild
deleted file mode 100644
index b926d90a9384..000000000000
--- a/dev-ros/ament_lint_cmake/ament_lint_cmake-0.10.0.ebuild
+++ /dev/null
@@ -1,46 +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="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_lint_cmake/ament_lint_cmake-0.10.4.ebuild b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.10.4.ebuild
deleted file mode 100644
index b926d90a9384..000000000000
--- a/dev-ros/ament_lint_cmake/ament_lint_cmake-0.10.4.ebuild
+++ /dev/null
@@ -1,46 +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="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_lint_cmake/ament_lint_cmake-0.10.1.ebuild b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.12.1.ebuild
index b926d90a9384..c756912e7c5c 100644
--- a/dev-ros/ament_lint_cmake/ament_lint_cmake-0.10.1.ebuild
+++ b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.12.1.ebuild
@@ -1,22 +1,21 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
-
 inherit distutils-r1
 
 ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
+if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
+	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}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Lint CMake code using cmakelint and generate xUnit test result files"
@@ -24,23 +23,13 @@ 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}
+BDEPEND="
 	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 5cc0176b2cc5..174fdd6e93eb 100644
--- a/dev-ros/ament_pep257/Manifest
+++ b/dev-ros/ament_pep257/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.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
+DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
 EBUILD ament_pep257-0.11.2.ebuild 895 BLAKE2B 8460ae9274603bc36ba7b933b145d3c7c92ebc6e5916c51d6258b25da244269b00806f0cbf8f8f18430dd3f2cca19579cedef4464483daf59dc514827623ca4e SHA512 0f846351d1b84563f86287a6722e1810d855162c4a92e6fe4c241c77d45131f7abc330fd75c7aa7678b9221276cbc717ec76c161047f850eac38a5a5a7c619e0
+EBUILD ament_pep257-0.12.1.ebuild 895 BLAKE2B 54bfe0187e573a4ce572f21c01167a2474111ef9782325a6b917e37a940e06c7b0bd65483dd655389fc0e8110ce1a38719e3747b2554455cd42963e4bcbc2b9f SHA512 f26e0e5010b89754b40dfe1ca522cf2cd1a15216eda7801477e05091cfad758b92ec328ae38c1a637bc77342f9f673b309b4e4bbf8845be06e15fb31f314970a
 EBUILD ament_pep257-9999.ebuild 895 BLAKE2B 8460ae9274603bc36ba7b933b145d3c7c92ebc6e5916c51d6258b25da244269b00806f0cbf8f8f18430dd3f2cca19579cedef4464483daf59dc514827623ca4e SHA512 0f846351d1b84563f86287a6722e1810d855162c4a92e6fe4c241c77d45131f7abc330fd75c7aa7678b9221276cbc717ec76c161047f850eac38a5a5a7c619e0
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_pep257/ament_pep257-0.10.1.ebuild b/dev-ros/ament_pep257/ament_pep257-0.10.1.ebuild
deleted file mode 100644
index d68cc9cf4ecc..000000000000
--- a/dev-ros/ament_pep257/ament_pep257-0.10.1.ebuild
+++ /dev/null
@@ -1,46 +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="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_pep257/ament_pep257-0.10.4.ebuild b/dev-ros/ament_pep257/ament_pep257-0.10.4.ebuild
deleted file mode 100644
index d68cc9cf4ecc..000000000000
--- a/dev-ros/ament_pep257/ament_pep257-0.10.4.ebuild
+++ /dev/null
@@ -1,46 +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="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_pep257/ament_pep257-0.10.0.ebuild b/dev-ros/ament_pep257/ament_pep257-0.12.1.ebuild
index d68cc9cf4ecc..b1c410e3822a 100644
--- a/dev-ros/ament_pep257/ament_pep257-0.10.0.ebuild
+++ b/dev-ros/ament_pep257/ament_pep257-0.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -12,11 +12,11 @@ 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}
+	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}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Checks code against style conventions in PEP 8 and generate test result files"
@@ -24,23 +24,16 @@ 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}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	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 9d304fda81bb..28a7749fbdca 100644
--- a/dev-ros/ament_uncrustify/Manifest
+++ b/dev-ros/ament_uncrustify/Manifest
@@ -1,6 +1,6 @@
-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_uncrustify-0.10.4.ebuild 931 BLAKE2B 55a9368980aeef9619a836facb642fd13ce5740329376478dd7e53683cc960233666068b4519f677153a578adb0363b907efe6a45b7fc2deabb7dc15c7a2afe1 SHA512 8ca56ff77559f58901428996e93ac6b635f519baa9b6ace0e0d2c17a658513409a448ae6ae7d4cd6f25d04f9a25e2fc9b63d10bacf33e311c09fc857ebfbf8ac
+DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
 EBUILD ament_uncrustify-0.11.2.ebuild 931 BLAKE2B 55a9368980aeef9619a836facb642fd13ce5740329376478dd7e53683cc960233666068b4519f677153a578adb0363b907efe6a45b7fc2deabb7dc15c7a2afe1 SHA512 8ca56ff77559f58901428996e93ac6b635f519baa9b6ace0e0d2c17a658513409a448ae6ae7d4cd6f25d04f9a25e2fc9b63d10bacf33e311c09fc857ebfbf8ac
+EBUILD ament_uncrustify-0.12.1.ebuild 931 BLAKE2B ba7c0efe953a7bb0ef00fae7d02f08e765de375e57b9de7af0ed1202e2dc378383ab8451fe80d6098785c869e37356445bd0c46d2f18d0e07a29d2445b520bce SHA512 15c5c874eb602135da2c8fdf6dba204c2370f9c4d172042d245126258456811f1cada766a37fcd81681c29e04d56c4f7aae745e340dea47d75a67b771db26c5f
 EBUILD ament_uncrustify-9999.ebuild 931 BLAKE2B 55a9368980aeef9619a836facb642fd13ce5740329376478dd7e53683cc960233666068b4519f677153a578adb0363b907efe6a45b7fc2deabb7dc15c7a2afe1 SHA512 8ca56ff77559f58901428996e93ac6b635f519baa9b6ace0e0d2c17a658513409a448ae6ae7d4cd6f25d04f9a25e2fc9b63d10bacf33e311c09fc857ebfbf8ac
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-0.10.4.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-0.12.1.ebuild
index 4a530cd280f9..169a365c7d7c 100644
--- a/dev-ros/ament_uncrustify/ament_uncrustify-0.10.4.ebuild
+++ b/dev-ros/ament_uncrustify/ament_uncrustify-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-ros/ament_xmllint/Manifest b/dev-ros/ament_xmllint/Manifest
index ffe505282298..7dc3b16cc77d 100644
--- a/dev-ros/ament_xmllint/Manifest
+++ b/dev-ros/ament_xmllint/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.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
+DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
 EBUILD ament_xmllint-0.11.2.ebuild 961 BLAKE2B f4d6ab40dbf83a55e09daebc96dc2044bb6daa14412bc121b110b8d56b169d79e72081a467b92ef33f4c2dc2589ccfb8c42d4f3d0a5b83ce05aa591a64af5602 SHA512 85a1c8c6d57bacabba8d83d8ffd6890770e7acb29b55e1833bbc8f3ed439bba834c9d76c782edb9f56be31e254e7240693f7e6cf66297176cf817ffb87bd9f9c
+EBUILD ament_xmllint-0.12.1.ebuild 961 BLAKE2B fc2289ae857ac13fb68962b52b2188024ab9db5dcf75e150dde90f6b64889a3c86c96adf8d6046da284f843e55a3b162be5e2b4948f04c3227e6e1d579007975 SHA512 d7357811bf78774f488144df21497e4b465ad00008920cdfdb2eaa838d44d8c2239e8b4840971bd1a5ac68202194df5dbf4c35e697878e8217cbb85ad4df321c
 EBUILD ament_xmllint-9999.ebuild 961 BLAKE2B f4d6ab40dbf83a55e09daebc96dc2044bb6daa14412bc121b110b8d56b169d79e72081a467b92ef33f4c2dc2589ccfb8c42d4f3d0a5b83ce05aa591a64af5602 SHA512 85a1c8c6d57bacabba8d83d8ffd6890770e7acb29b55e1833bbc8f3ed439bba834c9d76c782edb9f56be31e254e7240693f7e6cf66297176cf817ffb87bd9f9c
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_xmllint/ament_xmllint-0.10.0.ebuild b/dev-ros/ament_xmllint/ament_xmllint-0.10.0.ebuild
deleted file mode 100644
index dc712bff4c31..000000000000
--- a/dev-ros/ament_xmllint/ament_xmllint-0.10.0.ebuild
+++ /dev/null
@@ -1,48 +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="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/ament_xmllint/ament_xmllint-0.10.4.ebuild b/dev-ros/ament_xmllint/ament_xmllint-0.10.4.ebuild
deleted file mode 100644
index dc712bff4c31..000000000000
--- a/dev-ros/ament_xmllint/ament_xmllint-0.10.4.ebuild
+++ /dev/null
@@ -1,48 +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="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/ament_xmllint/ament_xmllint-0.10.1.ebuild b/dev-ros/ament_xmllint/ament_xmllint-0.12.1.ebuild
index dc712bff4c31..f9a852493ef1 100644
--- a/dev-ros/ament_xmllint/ament_xmllint-0.10.1.ebuild
+++ b/dev-ros/ament_xmllint/ament_xmllint-0.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -12,11 +12,11 @@ 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}
+	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}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Checks XML files like the package manifest using xmllint"
@@ -24,25 +24,18 @@ 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}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	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/camera_calibration/Manifest b/dev-ros/camera_calibration/Manifest
index e5aeba12373a..f82ddb69d30a 100644
--- a/dev-ros/camera_calibration/Manifest
+++ b/dev-ros/camera_calibration/Manifest
@@ -2,11 +2,15 @@ DIST camera_calibration-1.15.2-camera_calibration.tar.gz 16954576 BLAKE2B 8071b9
 DIST camera_calibration-1.15.2-multi_board_calibration.tar.gz 24644313 BLAKE2B 9969bb35028a826306a021a7b519a18c4457691c8d207aaaaea8d994a26cae792ec5c1878e04c69154c85589a7bef725f1b8cd52515ec6bbaed123705da033e4 SHA512 87ec6b24d0436a6d33d0f41130c96b663315ce2bc67e86b5c6e1bde027f4e026792ced7bdc3ab57e6b4586844e66f153353c038ac5eb36014789f29f3ad40547
 DIST camera_calibration-1.15.3-camera_calibration.tar.gz 16954576 BLAKE2B 8071b9cbae6c1b7c4c7784a5413f3328f216c17e7ef29b04688b81d45321d5a69284481770fc18e35dd7061e560023a3753743e532d52848aec9af9d09560381 SHA512 e856d58ae1cea22fe36a332794f49ef345e3e6b9455785369b33c8844bd52e311ae944becc556726d24967798588893eae4ac5eb510cd6d5fa8fb15a2b907ee6
 DIST camera_calibration-1.15.3-multi_board_calibration.tar.gz 24644313 BLAKE2B 9969bb35028a826306a021a7b519a18c4457691c8d207aaaaea8d994a26cae792ec5c1878e04c69154c85589a7bef725f1b8cd52515ec6bbaed123705da033e4 SHA512 87ec6b24d0436a6d33d0f41130c96b663315ce2bc67e86b5c6e1bde027f4e026792ced7bdc3ab57e6b4586844e66f153353c038ac5eb36014789f29f3ad40547
+DIST camera_calibration-1.16.0-camera_calibration.tar.gz 16954576 BLAKE2B 8071b9cbae6c1b7c4c7784a5413f3328f216c17e7ef29b04688b81d45321d5a69284481770fc18e35dd7061e560023a3753743e532d52848aec9af9d09560381 SHA512 e856d58ae1cea22fe36a332794f49ef345e3e6b9455785369b33c8844bd52e311ae944becc556726d24967798588893eae4ac5eb510cd6d5fa8fb15a2b907ee6
+DIST camera_calibration-1.16.0-multi_board_calibration.tar.gz 24644313 BLAKE2B 9969bb35028a826306a021a7b519a18c4457691c8d207aaaaea8d994a26cae792ec5c1878e04c69154c85589a7bef725f1b8cd52515ec6bbaed123705da033e4 SHA512 87ec6b24d0436a6d33d0f41130c96b663315ce2bc67e86b5c6e1bde027f4e026792ced7bdc3ab57e6b4586844e66f153353c038ac5eb36014789f29f3ad40547
 DIST camera_calibration-9999-camera_calibration.tar.gz 16954576 BLAKE2B 8071b9cbae6c1b7c4c7784a5413f3328f216c17e7ef29b04688b81d45321d5a69284481770fc18e35dd7061e560023a3753743e532d52848aec9af9d09560381 SHA512 e856d58ae1cea22fe36a332794f49ef345e3e6b9455785369b33c8844bd52e311ae944becc556726d24967798588893eae4ac5eb510cd6d5fa8fb15a2b907ee6
 DIST camera_calibration-9999-multi_board_calibration.tar.gz 24644313 BLAKE2B 9969bb35028a826306a021a7b519a18c4457691c8d207aaaaea8d994a26cae792ec5c1878e04c69154c85589a7bef725f1b8cd52515ec6bbaed123705da033e4 SHA512 87ec6b24d0436a6d33d0f41130c96b663315ce2bc67e86b5c6e1bde027f4e026792ced7bdc3ab57e6b4586844e66f153353c038ac5eb36014789f29f3ad40547
 DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
 DIST image_pipeline-1.15.3.tar.gz 150900 BLAKE2B 75bce8146c5273d5896ccb226bb9223f696f341089948aa44bbc932af15a1c80e6a5dbc036b4a37dcaecfca6a3e896df0935dcfb8305e23cc1a73fa77cef7a2e SHA512 9e1d21d1a43e932078938aeca4e5e6902e36e6d034a467cbd69734e318e5c4a689cb133acc7f8098f4ca928312661eb5b2aa7fae38e3d2a904b0e34889da0d32
+DIST image_pipeline-1.16.0.tar.gz 152681 BLAKE2B 6b11a07f07e8a29e601796570f404403d9acf1b31382d6d0353b2ac891c0f3345f3039bbb5bb7b3c41b10bf0478cad7a1d5590b7bbeee003aeff58437781d2e9 SHA512 909e115b150fb98a7cfa6d351b46072d92fccbded3ee15ba79135dae12d4cedf004b4c791a4c87540c74a6ad87e3947c9031e6539d09dee77527518d2b08cd18
 EBUILD camera_calibration-1.15.2.ebuild 1535 BLAKE2B b91a64293e934d4ab15e34bafffab04cb1739778b6cc9451c261760f2c695cfc80d447c83595d7637273ae8aa50d6bec3622176690daff112b79aaf39c5a6b84 SHA512 fec6c9d5589a6f174a2d2f9ee77de64e62f6c7c50f7a486f6258542495aae63578f155484e9d3df651689d625e326b973a00909c38fb0d669cc8e6539b495b58
 EBUILD camera_calibration-1.15.3.ebuild 1535 BLAKE2B a569ea156f4005f832fd41b436a3f10820c00c5f2d702d0d5fd2c648465c5e01746adf4f0d97199ebfea93795b41937f295611fe822bbc602510911d75175f6a SHA512 d480efcda271251c5a91bed1ab918d3f47f7391c0a856d8795eba2be5261359e7d64aabf4a016d901874a2aee3af82d04638c7cb616f1d9681fb33868cf82fb3
+EBUILD camera_calibration-1.16.0.ebuild 1535 BLAKE2B 215b78bea62d1c46a973687babe7bc7a22e3ff1c5e56b6216b2f6cd971d74f421526d2a27a100dbe0c2c993d7d8b322dcba5e363f599813e414fdfebd9d40160 SHA512 1e11586d993fda35942039e146e7bfa574814856914eec5c0bc63873d6b0820cc2301303384a96ecf6b1eae8f543da7f290aa4d11f3c31e04d02e1bfa5a9bfa3
 EBUILD camera_calibration-9999.ebuild 1535 BLAKE2B b91a64293e934d4ab15e34bafffab04cb1739778b6cc9451c261760f2c695cfc80d447c83595d7637273ae8aa50d6bec3622176690daff112b79aaf39c5a6b84 SHA512 fec6c9d5589a6f174a2d2f9ee77de64e62f6c7c50f7a486f6258542495aae63578f155484e9d3df651689d625e326b973a00909c38fb0d669cc8e6539b495b58
 MISC metadata.xml 344 BLAKE2B 5a86107444fb6ace449ca5724e9b37146d70b2d7cdfb964222834683c41f85f9538b290202a083db028f286ebb17742440b05b5181382b625c1fab2158e81d70 SHA512 273f5cce3fd99379d1fdeb678313491b0cfd5583076a8e093eaf4e777e4cdc615650b84840f911d5545a0555772c4f2868c17d4c07c3a90aa2ef5e881f675571
diff --git a/dev-ros/camera_calibration/camera_calibration-1.16.0.ebuild b/dev-ros/camera_calibration/camera_calibration-1.16.0.ebuild
new file mode 100644
index 000000000000..171a2e648322
--- /dev/null
+++ b/dev-ros/camera_calibration/camera_calibration-1.16.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Calibration of monocular or stereo cameras"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+SRC_URI="${SRC_URI}
+	http://download.ros.org/data/camera_calibration/camera_calibration.tar.gz -> ${P}-camera_calibration.tar.gz
+	http://download.ros.org/data/camera_calibration/multi_board_calibration.tar.gz -> ${P}-multi_board_calibration.tar.gz
+"
+
+RDEPEND="
+	dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/image_geometry[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "media-libs/opencv[python,\${PYTHON_USEDEP}]")
+	dev-ros/message_filters[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_srvs[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	)"
+
+src_prepare() {
+	ros-catkin_src_prepare
+	# Avoid external downloads during tests
+	cp "${DISTDIR}/${P}-camera_calibration.tar.gz" "${S}/camera_calibration.tar.gz" || die
+	cp "${DISTDIR}/${P}-multi_board_calibration.tar.gz" "${S}/multi_board_calibration.tar.gz" || die
+	sed -e "s#http://download.ros.org/data/camera_calibration/#file://${S}/#" -i CMakeLists.txt || die
+}
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/cv_bridge/Manifest b/dev-ros/cv_bridge/Manifest
index eb673739ed84..c5db5b46ac5a 100644
--- a/dev-ros/cv_bridge/Manifest
+++ b/dev-ros/cv_bridge/Manifest
@@ -1,6 +1,6 @@
 AUX boostpython.patch 599 BLAKE2B 5076c2efdfd06afa9dbc9e3ad344774c1fca54ef172a4808e4ba7b40f4770250d49b1e478abcee1ac973c3a1012579694499a1dd48fd84c19f996441920c329c SHA512 21c5a6589a1ee19d5f586b535807c35f5eef77da6dae614deb7542d8cb1cf850902b5d7de197d6060016f43dcbef8d6d69d104abc5f5fa0af6131a415a43ba64
-AUX ocv_leak.patch 536 BLAKE2B 4b1def824e397178ae6769ce1efce40f48c2f43b0cc759f5a001d007854684b823284828b1df483219acd587654c2e5919fdaa6ef15a92d33c0379a159f10462 SHA512 a84aa1acecd55b45760ecb8a93a88721a79ec0b882a62ae32fdeb839c2a406de0b870765a562a12cf9fd9c608bc900722fbcb5eb0f6a9653809167b2f2631967
-DIST vision_opencv-1.15.0.tar.gz 82281 BLAKE2B 6e86cf67bb9fbf07ca36dbe0bb3fb32611a4e216cea209048bfe34b71622a56954063f2e7ff466275810f36c62d016a1d04e987383dde35f0bb85abf0e74350f SHA512 b6331b00aac18f96eb40ef57b2b4fe55da956007390549762818eab7ad36fcf192549448f2edcc6b4e550273f80320bf15eb6a60900d155be680ec8682fd17ba
-EBUILD cv_bridge-1.15.0-r2.ebuild 833 BLAKE2B 2556c115644592e2568577a7537b3da139e1d21e411733f38708c18e220ea8d6201d24b005a5a32f62dba42e9fa1ac7e3ce18477efac7b7714e5721de31e20b9 SHA512 72cc4d7c768b967fa647d59e56802d172f4bf4d72962cc15bebd84b3e2e04853279dafb5af360a9e900fa1bf97abc3653fd28358e74a4b4be327f5ba55b86c07
+AUX ocv_leak.patch 535 BLAKE2B b1088e87735e44087aa7fba347459c6117cac2026fcab6c9a222baba9b6514bb58c8a38d3e3e9543002fc79d6590cecbfc032fec30d5fbd2649e9f2dce1c70c5 SHA512 0204b0a1fa6242e0c77e5f375ced38550780fb7f22d65a35a3edd10e4711fdbb0235d10d765cb29550d0324e1ca00cfcc90621bc1686159f10eb51ed2da3e875
+DIST vision_opencv-1.16.0.tar.gz 85452 BLAKE2B 5f167898cef4bbc753e32af87174b7f668b3eff00357a22e8c454d181116a925059d4837210086d445ceaf74819fdb9a527eb5667321df8a7c1fe84549dbe5b6 SHA512 affd61f0d933cc57d5d23e840f0708e8ffdc0033eee22a21fe5c0099a2ab75d4c3fdcc41705167ab3615f5388ce47641faf5b21e6c6365a4e540abe69dfad3fe
+EBUILD cv_bridge-1.16.0.ebuild 833 BLAKE2B 2f899431ecda023ca2440d70c005c355fce44ff707183828531274d4f0379b26bf3689aa465f1f9bcc419ba1e1378566131cee3a2c5e303dbc0a0649faf8a1a2 SHA512 96ec5c02976cf7e94a204e1e527f9cb8c7a6cf72a996dadcb88febc7778e1d6b60bc00f65acd35bdd86f1ceb7e94db35a26939676844de18a6a238cba1ec559f
 EBUILD cv_bridge-9999.ebuild 833 BLAKE2B 2556c115644592e2568577a7537b3da139e1d21e411733f38708c18e220ea8d6201d24b005a5a32f62dba42e9fa1ac7e3ce18477efac7b7714e5721de31e20b9 SHA512 72cc4d7c768b967fa647d59e56802d172f4bf4d72962cc15bebd84b3e2e04853279dafb5af360a9e900fa1bf97abc3653fd28358e74a4b4be327f5ba55b86c07
 MISC metadata.xml 343 BLAKE2B 4c8ada208d6cb4fb1e99ee7839cc4c20275e86a8b351169790c54c8df90a8cb381d9d71b2ebfdf2306aa7f2d66581144d61dff8adb5aa0e7ddc13696d8f17aa5 SHA512 932ed7ee027c275e3be014ee0a048c16dbec1b7108777fb2150cab84678cc31d560f1b88d6ac3fd890357512239c85951c48819a31f2e0174dac68beef44d1b2
diff --git a/dev-ros/cv_bridge/cv_bridge-1.15.0-r2.ebuild b/dev-ros/cv_bridge/cv_bridge-1.16.0.ebuild
index 666e0e743418..b661b9f5961f 100644
--- a/dev-ros/cv_bridge/cv_bridge-1.15.0-r2.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-1.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-ros/cv_bridge/files/ocv_leak.patch b/dev-ros/cv_bridge/files/ocv_leak.patch
index 32b3fafbe074..dab21616fc89 100644
--- a/dev-ros/cv_bridge/files/ocv_leak.patch
+++ b/dev-ros/cv_bridge/files/ocv_leak.patch
@@ -13,7 +13,7 @@ Index: cv_bridge/CMakeLists.txt
 -  set(_opencv_version 3)
 -endif()
 -
--find_package(OpenCV ${_opencv_version4} REQUIRED
+-find_package(OpenCV ${_opencv_version} REQUIRED
 +find_package(OpenCV 4 REQUIRED
    COMPONENTS
      opencv_core
diff --git a/dev-ros/depth_image_proc/Manifest b/dev-ros/depth_image_proc/Manifest
index 2c10cc63f2ac..32858d0d100d 100644
--- a/dev-ros/depth_image_proc/Manifest
+++ b/dev-ros/depth_image_proc/Manifest
@@ -1,6 +1,8 @@
 DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
 DIST image_pipeline-1.15.3.tar.gz 150900 BLAKE2B 75bce8146c5273d5896ccb226bb9223f696f341089948aa44bbc932af15a1c80e6a5dbc036b4a37dcaecfca6a3e896df0935dcfb8305e23cc1a73fa77cef7a2e SHA512 9e1d21d1a43e932078938aeca4e5e6902e36e6d034a467cbd69734e318e5c4a689cb133acc7f8098f4ca928312661eb5b2aa7fae38e3d2a904b0e34889da0d32
+DIST image_pipeline-1.16.0.tar.gz 152681 BLAKE2B 6b11a07f07e8a29e601796570f404403d9acf1b31382d6d0353b2ac891c0f3345f3039bbb5bb7b3c41b10bf0478cad7a1d5590b7bbeee003aeff58437781d2e9 SHA512 909e115b150fb98a7cfa6d351b46072d92fccbded3ee15ba79135dae12d4cedf004b4c791a4c87540c74a6ad87e3947c9031e6539d09dee77527518d2b08cd18
 EBUILD depth_image_proc-1.15.2.ebuild 730 BLAKE2B 3482014f0562d3a1ffe9ea79d603afd968c3b111a976413718fea27465e35226e3abc23922fb3224938fd047dd2d6564798171329195de8082b7e95750f6303c SHA512 48717a00873856350bc0002e9b76d4f1a077bde06653331e54c99de80772532899e0c656a149d4762ef699c519b4e59bac5539d8921a29d946cd39f6598c454c
 EBUILD depth_image_proc-1.15.3.ebuild 730 BLAKE2B 3884743f3eb82d4cdcbd81803321a23b1dfaf768f32f1743a8a556710ee75cce30faf875f8e08aa18cc42977f04f63b5d7aa4ba57ad1cf75a6404fd7bf93c6bb SHA512 41eaa4dcbc21bdec77a1a7b3a6449da0710d24b97ac2b03fcfbfce69ce90c89d1afb656fa87067a8fb6de899541ec545e7cbe2a5502bba4d7fbd63e6a607b174
+EBUILD depth_image_proc-1.16.0.ebuild 730 BLAKE2B 95bfdf070f0cc57be5f32584d514ca3fd4dc91950fb5b8ee8a5aa5e4253304d2c63438211c3eb931fd4ea3658fa7124cf78777ed5c1266930740a418dcf6a3d0 SHA512 9fb1ab1a5987cf5c2b28a195c04d68c3356489204ca700f15aa4202bc7aecd025a0794b05012ce2268430e5fc1880bd194a031166db96f5d1605cca2d18fb3a6
 EBUILD depth_image_proc-9999.ebuild 730 BLAKE2B 3482014f0562d3a1ffe9ea79d603afd968c3b111a976413718fea27465e35226e3abc23922fb3224938fd047dd2d6564798171329195de8082b7e95750f6303c SHA512 48717a00873856350bc0002e9b76d4f1a077bde06653331e54c99de80772532899e0c656a149d4762ef699c519b4e59bac5539d8921a29d946cd39f6598c454c
 MISC metadata.xml 344 BLAKE2B 5a86107444fb6ace449ca5724e9b37146d70b2d7cdfb964222834683c41f85f9538b290202a083db028f286ebb17742440b05b5181382b625c1fab2158e81d70 SHA512 273f5cce3fd99379d1fdeb678313491b0cfd5583076a8e093eaf4e777e4cdc615650b84840f911d5545a0555772c4f2868c17d4c07c3a90aa2ef5e881f675571
diff --git a/dev-ros/depth_image_proc/depth_image_proc-1.16.0.ebuild b/dev-ros/depth_image_proc/depth_image_proc-1.16.0.ebuild
new file mode 100644
index 000000000000..583df987bc50
--- /dev/null
+++ b/dev-ros/depth_image_proc/depth_image_proc-1.16.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Nodelets for processing depth images such as those produced by OpenNI camera"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	media-libs/opencv:=
+	dev-ros/eigen_conversions
+	dev-ros/image_geometry
+	dev-ros/image_transport
+	dev-ros/message_filters
+	dev-ros/nodelet
+	dev-ros/tf2
+	dev-ros/tf2_ros
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/diagnostic_aggregator/Manifest b/dev-ros/diagnostic_aggregator/Manifest
index 40352dcb1ad1..3d4ef31ea343 100644
--- a/dev-ros/diagnostic_aggregator/Manifest
+++ b/dev-ros/diagnostic_aggregator/Manifest
@@ -2,9 +2,11 @@ DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7
 DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
 DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
+DIST diagnostics-1.11.0.tar.gz 538022 BLAKE2B 6d6a4c17af1080d77786f5894ca3bd5c2e39e912529aee813f1e7fede4e8265e2dc0e4b3cd09051dd9456227e4db35d24fa3eebc83f77e15ba5af3bdf169df5e SHA512 c1cb328498e45211620c4d8cd025e6d1ec4c71d853b83d7f2eb0673619c70e4a96911e60c5caa6f80298cbba93769243d07c41713972546425fbe94f8ddc8f60
 EBUILD diagnostic_aggregator-1.10.1.ebuild 808 BLAKE2B 549d495f4cb67958720e274ec39f9ea59145422c12135d6f2b27cb575d40f4a373ee8b5bf8c9e8f95de874795fed4cb33bf3e8b1cd5e05948240bb9940dba198 SHA512 9338038171485e43c1fb6a74dc1dbbd085b753811ae9097ab0ccd12c6a49f602a439fa8ed70ab38df43e5c0f1f966041afefdbb4400a544aaf9a212aa4fc748a
 EBUILD diagnostic_aggregator-1.10.2.ebuild 808 BLAKE2B 549d495f4cb67958720e274ec39f9ea59145422c12135d6f2b27cb575d40f4a373ee8b5bf8c9e8f95de874795fed4cb33bf3e8b1cd5e05948240bb9940dba198 SHA512 9338038171485e43c1fb6a74dc1dbbd085b753811ae9097ab0ccd12c6a49f602a439fa8ed70ab38df43e5c0f1f966041afefdbb4400a544aaf9a212aa4fc748a
 EBUILD diagnostic_aggregator-1.10.3.ebuild 808 BLAKE2B 9892664dec34c98ee9854d5301804e592aa68e6c72d2cc74e6313f9d76af04cf1b626e34c622a6c7c1b756b6090706d69abf0b5eaa2d3b08e0f05286dd3b0d0b SHA512 85ab8ee8c9ade277b7a8db461e8f8e8830f6f2c4dfcf597ce063858d40f44f06be6dfb01d4883ed4b3a12403f68fc5923ffb4c4ec3f51e82bcf4eb2832144b60
 EBUILD diagnostic_aggregator-1.10.4.ebuild 808 BLAKE2B 9892664dec34c98ee9854d5301804e592aa68e6c72d2cc74e6313f9d76af04cf1b626e34c622a6c7c1b756b6090706d69abf0b5eaa2d3b08e0f05286dd3b0d0b SHA512 85ab8ee8c9ade277b7a8db461e8f8e8830f6f2c4dfcf597ce063858d40f44f06be6dfb01d4883ed4b3a12403f68fc5923ffb4c4ec3f51e82bcf4eb2832144b60
+EBUILD diagnostic_aggregator-1.11.0.ebuild 808 BLAKE2B 6878649a70d7b68513a82a63f6276c06496e0503ac5f6ff1074bcd630f16fc27f62a48e0505db41dfd6a78f1ecdc27f97d7c532ceb66b9c1c8e359fe6e631980 SHA512 b5e6f66e8446eb4aabda9e588a7bf426bf89c93e9a7c56d45514aa6701bcf38a1744f528167a2b30edca227cb74da93b8428cf9d6ef39d353c20c1f9bdf9e9dd
 EBUILD diagnostic_aggregator-9999.ebuild 808 BLAKE2B 549d495f4cb67958720e274ec39f9ea59145422c12135d6f2b27cb575d40f4a373ee8b5bf8c9e8f95de874795fed4cb33bf3e8b1cd5e05948240bb9940dba198 SHA512 9338038171485e43c1fb6a74dc1dbbd085b753811ae9097ab0ccd12c6a49f602a439fa8ed70ab38df43e5c0f1f966041afefdbb4400a544aaf9a212aa4fc748a
 MISC metadata.xml 330 BLAKE2B a856cefc508ebf638d764bbfad848bae8140bb8f4f8e0fcde5ade3d168cff85647d3f803f92fd05824d459cd1e723d86ff48b21c07211b27527d251bb7eb90fd SHA512 d6abd3b4af2ba8eb1de110f8b59296f327e83ced62d9618e1dd2be6d39e04e4bad27a32aa78f9e7358b2f22f872aa96bbdac1da860c6af37ebff054d6e5c7f67
diff --git a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.11.0.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.11.0.ebuild
new file mode 100644
index 000000000000..6d2eff254e5e
--- /dev/null
+++ b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.11.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Aggregates ROS diagnostics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/pluginlib:=
+		dev-libs/tinyxml2:=
+	dev-ros/roscpp
+	dev-ros/rospy
+	dev-ros/rostest
+	dev-ros/xmlrpcpp
+	dev-ros/bondcpp
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+	dev-ros/bondpy[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/diagnostic_analysis/Manifest b/dev-ros/diagnostic_analysis/Manifest
index 381a71e1a1e2..8b86056c25cc 100644
--- a/dev-ros/diagnostic_analysis/Manifest
+++ b/dev-ros/diagnostic_analysis/Manifest
@@ -2,12 +2,14 @@ DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7
 DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
 DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
+DIST diagnostics-1.11.0.tar.gz 538022 BLAKE2B 6d6a4c17af1080d77786f5894ca3bd5c2e39e912529aee813f1e7fede4e8265e2dc0e4b3cd09051dd9456227e4db35d24fa3eebc83f77e15ba5af3bdf169df5e SHA512 c1cb328498e45211620c4d8cd025e6d1ec4c71d853b83d7f2eb0673619c70e4a96911e60c5caa6f80298cbba93769243d07c41713972546425fbe94f8ddc8f60
 DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
 DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
 EBUILD diagnostic_analysis-1.10.1.ebuild 697 BLAKE2B 12c2797a9981fb9ff82e1e9a9192818a3b4e57237ec274b9908bb19072397b406a2b134074e575e6efd67f40b2159e0ae920a321d84077bf201f403eb8c22ae1 SHA512 6e00030de3792523a6062d4f8f2d9e88681e2e64c026ee15df8646c74d80e746b67b3ca3c0d81ad9946c8e3aafc0ffadbfc6a43a1cadd6d88c8abd36255da778
 EBUILD diagnostic_analysis-1.10.2.ebuild 697 BLAKE2B 12c2797a9981fb9ff82e1e9a9192818a3b4e57237ec274b9908bb19072397b406a2b134074e575e6efd67f40b2159e0ae920a321d84077bf201f403eb8c22ae1 SHA512 6e00030de3792523a6062d4f8f2d9e88681e2e64c026ee15df8646c74d80e746b67b3ca3c0d81ad9946c8e3aafc0ffadbfc6a43a1cadd6d88c8abd36255da778
 EBUILD diagnostic_analysis-1.10.3.ebuild 697 BLAKE2B e8b0db107fec8a77be9bcf76c39fdb2b0a5ea89879c5493bb43cc5a99d93f6bf2c6ad5ab67109f437612ad8fd441c2dd479c44a8b7fc3704b7e613871b43485a SHA512 5b1020bf88de8122ba476e004a3ea13593f12f8aac51022defda9eb7055537696017c820e78b4273e5a271c8466f2a40ac497df207c3dc49bbd9f017e3278f40
 EBUILD diagnostic_analysis-1.10.4.ebuild 697 BLAKE2B e8b0db107fec8a77be9bcf76c39fdb2b0a5ea89879c5493bb43cc5a99d93f6bf2c6ad5ab67109f437612ad8fd441c2dd479c44a8b7fc3704b7e613871b43485a SHA512 5b1020bf88de8122ba476e004a3ea13593f12f8aac51022defda9eb7055537696017c820e78b4273e5a271c8466f2a40ac497df207c3dc49bbd9f017e3278f40
+EBUILD diagnostic_analysis-1.11.0.ebuild 697 BLAKE2B 846e1533c6d33ee1864899f31116acf8174db85c5fc8b10c458121b1842772565e2ff68b23c36ab2c552d915737fd42c3657f17e10e9420bb4dc2cc589d5923d SHA512 8c6e8b7bf1c54b776f9fd0310293afc9f8ac7df3ccd37c209b22b6d8c364dc5dc0ac20aceb9376e0885945ba8d39fb242ebc3e97203c9acedf5f532fe400e974
 EBUILD diagnostic_analysis-1.9.4.ebuild 697 BLAKE2B 12c2797a9981fb9ff82e1e9a9192818a3b4e57237ec274b9908bb19072397b406a2b134074e575e6efd67f40b2159e0ae920a321d84077bf201f403eb8c22ae1 SHA512 6e00030de3792523a6062d4f8f2d9e88681e2e64c026ee15df8646c74d80e746b67b3ca3c0d81ad9946c8e3aafc0ffadbfc6a43a1cadd6d88c8abd36255da778
 EBUILD diagnostic_analysis-1.9.6.ebuild 697 BLAKE2B 12c2797a9981fb9ff82e1e9a9192818a3b4e57237ec274b9908bb19072397b406a2b134074e575e6efd67f40b2159e0ae920a321d84077bf201f403eb8c22ae1 SHA512 6e00030de3792523a6062d4f8f2d9e88681e2e64c026ee15df8646c74d80e746b67b3ca3c0d81ad9946c8e3aafc0ffadbfc6a43a1cadd6d88c8abd36255da778
 EBUILD diagnostic_analysis-9999.ebuild 697 BLAKE2B 12c2797a9981fb9ff82e1e9a9192818a3b4e57237ec274b9908bb19072397b406a2b134074e575e6efd67f40b2159e0ae920a321d84077bf201f403eb8c22ae1 SHA512 6e00030de3792523a6062d4f8f2d9e88681e2e64c026ee15df8646c74d80e746b67b3ca3c0d81ad9946c8e3aafc0ffadbfc6a43a1cadd6d88c8abd36255da778
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.11.0.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.11.0.ebuild
new file mode 100644
index 000000000000..1a13d767813b
--- /dev/null
+++ b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.11.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Converts diagnostics data into a series of CSV files"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/diagnostic_common_diagnostics/Manifest b/dev-ros/diagnostic_common_diagnostics/Manifest
index 5ac4e1ef5dc8..5c8fdeb470a4 100644
--- a/dev-ros/diagnostic_common_diagnostics/Manifest
+++ b/dev-ros/diagnostic_common_diagnostics/Manifest
@@ -2,12 +2,14 @@ DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7
 DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
 DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
+DIST diagnostics-1.11.0.tar.gz 538022 BLAKE2B 6d6a4c17af1080d77786f5894ca3bd5c2e39e912529aee813f1e7fede4e8265e2dc0e4b3cd09051dd9456227e4db35d24fa3eebc83f77e15ba5af3bdf169df5e SHA512 c1cb328498e45211620c4d8cd025e6d1ec4c71d853b83d7f2eb0673619c70e4a96911e60c5caa6f80298cbba93769243d07c41713972546425fbe94f8ddc8f60
 DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
 DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
 EBUILD diagnostic_common_diagnostics-1.10.1.ebuild 734 BLAKE2B f118826a52ccc510ee9643d6e9ced491271b0b102ed8de211de00e52c1c18af1d1b9e5ab112a98393981cfca26b64f497b25c69c03bad024d2db7bcd351f11b5 SHA512 7f6ad0a636ca21123fac04a084786f5dcc0e9286dcd3a1b62b957adebebb66dfbac78f39c143ca981473ae96d94a591c1bb427bd977e0de5446ff2b0b8c6afc4
 EBUILD diagnostic_common_diagnostics-1.10.2.ebuild 734 BLAKE2B f118826a52ccc510ee9643d6e9ced491271b0b102ed8de211de00e52c1c18af1d1b9e5ab112a98393981cfca26b64f497b25c69c03bad024d2db7bcd351f11b5 SHA512 7f6ad0a636ca21123fac04a084786f5dcc0e9286dcd3a1b62b957adebebb66dfbac78f39c143ca981473ae96d94a591c1bb427bd977e0de5446ff2b0b8c6afc4
 EBUILD diagnostic_common_diagnostics-1.10.3.ebuild 734 BLAKE2B 6f17888cc4985fd26a841725f08fbb6b3e8be96aef218a1278b19f963f6010e1b6bb8ca689a244999b41794fffc3592a0c53c29b032b1cb95aa2ee0fef5b58b0 SHA512 75e937609d08c2390b3943d9fa32029ab1afec87d01881134adab7617f7a92fa30cd0c609e9ae02568e3e2b1c4249ddc85baf3afb4c14a497cff652b56cabcdb
 EBUILD diagnostic_common_diagnostics-1.10.4.ebuild 734 BLAKE2B 6f17888cc4985fd26a841725f08fbb6b3e8be96aef218a1278b19f963f6010e1b6bb8ca689a244999b41794fffc3592a0c53c29b032b1cb95aa2ee0fef5b58b0 SHA512 75e937609d08c2390b3943d9fa32029ab1afec87d01881134adab7617f7a92fa30cd0c609e9ae02568e3e2b1c4249ddc85baf3afb4c14a497cff652b56cabcdb
+EBUILD diagnostic_common_diagnostics-1.11.0.ebuild 734 BLAKE2B af73da5e8aa6508a65460beec7724fc2df9d3d7b0ec0e600d7229dd0913acfa73eba2df2bffa856d731a783b07d44539fed1caa242d735408dc795c132b18dd1 SHA512 99d7eec9256239619739a74805817400734cb37ce4d280ae27da53ce9c966bb2c8da37ea8472fba0ff9fbcfc0c76a2e5552be0448d020b8ba3ac30d81d203abf
 EBUILD diagnostic_common_diagnostics-1.9.4.ebuild 734 BLAKE2B f118826a52ccc510ee9643d6e9ced491271b0b102ed8de211de00e52c1c18af1d1b9e5ab112a98393981cfca26b64f497b25c69c03bad024d2db7bcd351f11b5 SHA512 7f6ad0a636ca21123fac04a084786f5dcc0e9286dcd3a1b62b957adebebb66dfbac78f39c143ca981473ae96d94a591c1bb427bd977e0de5446ff2b0b8c6afc4
 EBUILD diagnostic_common_diagnostics-1.9.6.ebuild 734 BLAKE2B f118826a52ccc510ee9643d6e9ced491271b0b102ed8de211de00e52c1c18af1d1b9e5ab112a98393981cfca26b64f497b25c69c03bad024d2db7bcd351f11b5 SHA512 7f6ad0a636ca21123fac04a084786f5dcc0e9286dcd3a1b62b957adebebb66dfbac78f39c143ca981473ae96d94a591c1bb427bd977e0de5446ff2b0b8c6afc4
 EBUILD diagnostic_common_diagnostics-9999.ebuild 734 BLAKE2B f118826a52ccc510ee9643d6e9ced491271b0b102ed8de211de00e52c1c18af1d1b9e5ab112a98393981cfca26b64f497b25c69c03bad024d2db7bcd351f11b5 SHA512 7f6ad0a636ca21123fac04a084786f5dcc0e9286dcd3a1b62b957adebebb66dfbac78f39c143ca981473ae96d94a591c1bb427bd977e0de5446ff2b0b8c6afc4
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.11.0.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.11.0.ebuild
new file mode 100644
index 000000000000..9cba778ce8ac
--- /dev/null
+++ b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.11.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Generic nodes for monitoring a linux host"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-ros/diagnostic_updater[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
+	app-admin/hddtemp"
+DEPEND="${DEPEND}
+	test? (
+		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	)
+"
diff --git a/dev-ros/diagnostic_updater/Manifest b/dev-ros/diagnostic_updater/Manifest
index cb4c2a2affd4..0330acbf5492 100644
--- a/dev-ros/diagnostic_updater/Manifest
+++ b/dev-ros/diagnostic_updater/Manifest
@@ -2,12 +2,14 @@ DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7
 DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
 DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
+DIST diagnostics-1.11.0.tar.gz 538022 BLAKE2B 6d6a4c17af1080d77786f5894ca3bd5c2e39e912529aee813f1e7fede4e8265e2dc0e4b3cd09051dd9456227e4db35d24fa3eebc83f77e15ba5af3bdf169df5e SHA512 c1cb328498e45211620c4d8cd025e6d1ec4c71d853b83d7f2eb0673619c70e4a96911e60c5caa6f80298cbba93769243d07c41713972546425fbe94f8ddc8f60
 DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
 DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
 EBUILD diagnostic_updater-1.10.1.ebuild 804 BLAKE2B 15686a629b196137fe14c640dc28861258f65ab85cd0108b84ff02f3894128e122ab56e4d3669fa51664ce5e6b915ea717f4856be80ba695606ded59d3d255d3 SHA512 3eaf916f91a57ddc5ba05b599a5605ab3e3b45b815cad4fff386476af1ad0a0b82fad71ff60162a341fa8a64e5239ad9e41805f7f81831b5cbf79ec8067d93cc
 EBUILD diagnostic_updater-1.10.2.ebuild 804 BLAKE2B 15686a629b196137fe14c640dc28861258f65ab85cd0108b84ff02f3894128e122ab56e4d3669fa51664ce5e6b915ea717f4856be80ba695606ded59d3d255d3 SHA512 3eaf916f91a57ddc5ba05b599a5605ab3e3b45b815cad4fff386476af1ad0a0b82fad71ff60162a341fa8a64e5239ad9e41805f7f81831b5cbf79ec8067d93cc
 EBUILD diagnostic_updater-1.10.3.ebuild 804 BLAKE2B 614b2f84980c339de46fbe7cabb641b1f52c6a7bb5316045e45db5a7cddd218d3855a1b24f3f11e3ead8d52b8afb220a6b10ec467b5df200e9c9054debc9b103 SHA512 1f38b6d963c0955eed66b62407e53e377ec7a3a4d577fcd438e8868485f7696dc8055f4103c6e647a9c811343211f44c7d05ff6b552e858023ec64d368f123ad
 EBUILD diagnostic_updater-1.10.4.ebuild 804 BLAKE2B 614b2f84980c339de46fbe7cabb641b1f52c6a7bb5316045e45db5a7cddd218d3855a1b24f3f11e3ead8d52b8afb220a6b10ec467b5df200e9c9054debc9b103 SHA512 1f38b6d963c0955eed66b62407e53e377ec7a3a4d577fcd438e8868485f7696dc8055f4103c6e647a9c811343211f44c7d05ff6b552e858023ec64d368f123ad
+EBUILD diagnostic_updater-1.11.0.ebuild 804 BLAKE2B 9fd23ae0d497a3b2f396915d580949f7e0d1ec205c89d237c62ebd8e3ed251914b5a7c69694d0894d3fd96d0c5978aabe80399e88a812bf6eda43059a479622c SHA512 5fe503f3b9b141b64dea53a38ed0a0c37d5121636cfdc8ece9a9b9ece9da249d48f9ce8ed1e56cd987c1353d95039c846fdfdd1c69e718d7e6f2c15e9231b485
 EBUILD diagnostic_updater-1.9.4.ebuild 804 BLAKE2B 15686a629b196137fe14c640dc28861258f65ab85cd0108b84ff02f3894128e122ab56e4d3669fa51664ce5e6b915ea717f4856be80ba695606ded59d3d255d3 SHA512 3eaf916f91a57ddc5ba05b599a5605ab3e3b45b815cad4fff386476af1ad0a0b82fad71ff60162a341fa8a64e5239ad9e41805f7f81831b5cbf79ec8067d93cc
 EBUILD diagnostic_updater-1.9.6.ebuild 804 BLAKE2B 15686a629b196137fe14c640dc28861258f65ab85cd0108b84ff02f3894128e122ab56e4d3669fa51664ce5e6b915ea717f4856be80ba695606ded59d3d255d3 SHA512 3eaf916f91a57ddc5ba05b599a5605ab3e3b45b815cad4fff386476af1ad0a0b82fad71ff60162a341fa8a64e5239ad9e41805f7f81831b5cbf79ec8067d93cc
 EBUILD diagnostic_updater-9999.ebuild 804 BLAKE2B 15686a629b196137fe14c640dc28861258f65ab85cd0108b84ff02f3894128e122ab56e4d3669fa51664ce5e6b915ea717f4856be80ba695606ded59d3d255d3 SHA512 3eaf916f91a57ddc5ba05b599a5605ab3e3b45b815cad4fff386476af1ad0a0b82fad71ff60162a341fa8a64e5239ad9e41805f7f81831b5cbf79ec8067d93cc
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.11.0.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.11.0.ebuild
new file mode 100644
index 000000000000..09a5b5c30f80
--- /dev/null
+++ b/dev-ros/diagnostic_updater/diagnostic_updater-1.11.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for updating diagnostics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/dynamic_reconfigure/Manifest b/dev-ros/dynamic_reconfigure/Manifest
index 431b0780cd83..8ee8af6ce8ea 100644
--- a/dev-ros/dynamic_reconfigure/Manifest
+++ b/dev-ros/dynamic_reconfigure/Manifest
@@ -1,4 +1,4 @@
-DIST dynamic_reconfigure-1.7.1.tar.gz 40423 BLAKE2B 1b83910138fe324ea5ed6a2e73a8a763c4070cfb343edccfe33169f2a72ee3be0337054e7179b4fc6d1ca73557223be169f9f17e5d4aa80766841fd376e51b5c SHA512 47449ab3fb2a4e66e9da3826892de2778253c209c4a17a1bf759fba8b87e4e244967dc0521776915cf2104690b9f770337e091d89eb3ae46306dbf73a4286fa0
-EBUILD dynamic_reconfigure-1.7.1-r1.ebuild 688 BLAKE2B bb351c248a128408b535a40cdef11f997f111b58eea5c04a23acd166e179e119fef21d28bc3b5c076cde87c40aced53bc9a29f567e4e8ec80cf67c8e603a0d92 SHA512 32c17fcc058a95cfea73f96b3107fa22a519cdbdc1b3b2f6bcc23d1c0149153200096fd27572c1f83ed850a12a7344d2e316cdd1eaa760fa23cf97df1eadb77b
+DIST dynamic_reconfigure-1.7.2.tar.gz 40695 BLAKE2B 873628fc93d3ae4db0191998d1993d84611bcba463208cab280a2a6eea17fdfb5633839bec123bf511eacb877252acf354acc94fd87686621464ae63b4820d31 SHA512 df55db790fb24a1feec26a454b4e8359783ff2be4050e0650ac14fee540e6ca1c18ede00fdee1fff0a4adad891a1c63ef2ad0e8da64994ee34478549ecb4880d
+EBUILD dynamic_reconfigure-1.7.2.ebuild 688 BLAKE2B 0baa3c6e9ea09f9a96d236455a8ecaaac9333cfa1f40a11972b19b68395fa0945f9f3ddda9d3bd2af17c817b4178cd3412a1ae241158ca5dbc61014f415b6941 SHA512 f36aceb01380cd1bba3c0e535ff09f6014298c35797ecd83bad7aa4c526be24b1ea21e309131860a98a39e7279ae0d72721f423d5cfa0233308b93bdcc2b1495
 EBUILD dynamic_reconfigure-9999.ebuild 688 BLAKE2B bb351c248a128408b535a40cdef11f997f111b58eea5c04a23acd166e179e119fef21d28bc3b5c076cde87c40aced53bc9a29f567e4e8ec80cf67c8e603a0d92 SHA512 32c17fcc058a95cfea73f96b3107fa22a519cdbdc1b3b2f6bcc23d1c0149153200096fd27572c1f83ed850a12a7344d2e316cdd1eaa760fa23cf97df1eadb77b
 MISC metadata.xml 338 BLAKE2B 47fff4375a5a4769e700c1f4e90b9bcbbd7879bae54c9dd77bf8a53d666e5f6ff90292d6010e2255dedc2c65409261502066fa68b5def0511199675bd761a795 SHA512 618b15c675cfda27c4f890d8997788d0fc163c544b3c5d2127c3db93ac9ddd62b5095d3e0624ec0114917237369892c2714374ebb7a751cb1575194dddeb9281
diff --git a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.7.1-r1.ebuild b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.7.2.ebuild
index c328670cf8b6..8b133aada32e 100644
--- a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.7.1-r1.ebuild
+++ b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-ros/image_geometry/Manifest b/dev-ros/image_geometry/Manifest
index 6b6d81357195..0de8a40fd897 100644
--- a/dev-ros/image_geometry/Manifest
+++ b/dev-ros/image_geometry/Manifest
@@ -1,5 +1,7 @@
 AUX ocv_leak.patch 493 BLAKE2B 1a71b4529c6d1bce8d08137cce851edce5905076f042a1d27476be156be8104cb861bb64ecd0269cbd067c4801e5b69f7c84bc2ffbe0ddd87831eb54572f1b7a SHA512 a20172e15b9b273be57830f9181075218bd5f97abfcc84d3d23ed83872c2f89e5d06da670dfd1071cae4b20d79d9670602b1746e544462c46e3dfe7c3cffddf4
 DIST vision_opencv-1.15.0.tar.gz 82281 BLAKE2B 6e86cf67bb9fbf07ca36dbe0bb3fb32611a4e216cea209048bfe34b71622a56954063f2e7ff466275810f36c62d016a1d04e987383dde35f0bb85abf0e74350f SHA512 b6331b00aac18f96eb40ef57b2b4fe55da956007390549762818eab7ad36fcf192549448f2edcc6b4e550273f80320bf15eb6a60900d155be680ec8682fd17ba
+DIST vision_opencv-1.16.0.tar.gz 85452 BLAKE2B 5f167898cef4bbc753e32af87174b7f668b3eff00357a22e8c454d181116a925059d4837210086d445ceaf74819fdb9a527eb5667321df8a7c1fe84549dbe5b6 SHA512 affd61f0d933cc57d5d23e840f0708e8ffdc0033eee22a21fe5c0099a2ab75d4c3fdcc41705167ab3615f5388ce47641faf5b21e6c6365a4e540abe69dfad3fe
 EBUILD image_geometry-1.15.0-r1.ebuild 679 BLAKE2B 760548b02316276a250ad07957bca99c7e90bea8024bc7afda6ac55dd5512989fa479919dfdee4024ee38a98b9845a9e8386b6874ed493fb9c605fadbf7f1566 SHA512 ef5b3e61274120abff3c67adbd947fbe91af19b47aac372e803994ebf2c745dd948ec90b6a5725dda69c86685a786d298ea7fffcd071368e7aed4ee604ec8a50
+EBUILD image_geometry-1.16.0.ebuild 679 BLAKE2B 42ba94c872993d79f5d05b4638c9ce5a5866be2d9ed039995ccf79c40d26e82e50d5e1c4603cf14e506374fefcaf9b8a7a7b0eca3d58e9e44d1fd83cbdcf9839 SHA512 108d12eef2a89a2d0493830e7cfed40132eb5c8b0023cb850cc8647880db13492c0d25f2f3165e7229c2a4b4c085b8e761cc382777e7fd6d3e478af6ae842ea3
 EBUILD image_geometry-9999.ebuild 679 BLAKE2B 760548b02316276a250ad07957bca99c7e90bea8024bc7afda6ac55dd5512989fa479919dfdee4024ee38a98b9845a9e8386b6874ed493fb9c605fadbf7f1566 SHA512 ef5b3e61274120abff3c67adbd947fbe91af19b47aac372e803994ebf2c745dd948ec90b6a5725dda69c86685a786d298ea7fffcd071368e7aed4ee604ec8a50
 MISC metadata.xml 343 BLAKE2B 4c8ada208d6cb4fb1e99ee7839cc4c20275e86a8b351169790c54c8df90a8cb381d9d71b2ebfdf2306aa7f2d66581144d61dff8adb5aa0e7ddc13696d8f17aa5 SHA512 932ed7ee027c275e3be014ee0a048c16dbec1b7108777fb2150cab84678cc31d560f1b88d6ac3fd890357512239c85951c48819a31f2e0174dac68beef44d1b2
diff --git a/dev-ros/image_geometry/image_geometry-1.16.0.ebuild b/dev-ros/image_geometry/image_geometry-1.16.0.ebuild
new file mode 100644
index 000000000000..ea1bbfe903b4
--- /dev/null
+++ b/dev-ros/image_geometry/image_geometry-1.16.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ and Python libraries for interpreting images geometrically"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	media-libs/opencv:=
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-cpp/gtest
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	)"
+PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/image_proc/Manifest b/dev-ros/image_proc/Manifest
index 9af7f805b851..c5d7979e69dc 100644
--- a/dev-ros/image_proc/Manifest
+++ b/dev-ros/image_proc/Manifest
@@ -1,7 +1,9 @@
 AUX ocv_leak.patch 587 BLAKE2B 1233e318496eab850c8da43383a4dabf9997db88bf103c4652efb7a1b481d22832b90cae48294c2f0b52ba082b63ca4369445f1c4ff2092847fad0c6e14ab98b SHA512 37e1f7af29f73f972991a5e204e9d69169a4131ccdd7b19f7fa34232d0706c88303bf5f7bd476be0a21654dfb558a5e6af86d27aca8da35122b46c4846d6dee0
 DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
 DIST image_pipeline-1.15.3.tar.gz 150900 BLAKE2B 75bce8146c5273d5896ccb226bb9223f696f341089948aa44bbc932af15a1c80e6a5dbc036b4a37dcaecfca6a3e896df0935dcfb8305e23cc1a73fa77cef7a2e SHA512 9e1d21d1a43e932078938aeca4e5e6902e36e6d034a467cbd69734e318e5c4a689cb133acc7f8098f4ca928312661eb5b2aa7fae38e3d2a904b0e34889da0d32
+DIST image_pipeline-1.16.0.tar.gz 152681 BLAKE2B 6b11a07f07e8a29e601796570f404403d9acf1b31382d6d0353b2ac891c0f3345f3039bbb5bb7b3c41b10bf0478cad7a1d5590b7bbeee003aeff58437781d2e9 SHA512 909e115b150fb98a7cfa6d351b46072d92fccbded3ee15ba79135dae12d4cedf004b4c791a4c87540c74a6ad87e3947c9031e6539d09dee77527518d2b08cd18
 EBUILD image_proc-1.15.2-r2.ebuild 802 BLAKE2B 7e908a35f2fa847c7b24d49d7c2b5890fec4b8a22188bf2968475b4de0be3023ea08cdb99c7a99f9cbb4758402a76ef9fc073d70e9ac60a31368141a0fe3eb5a SHA512 64ad333b31952d50233a251033851756a174b73c4b38a7084f746d6fc61a0c07746ab725a00434339c3657bbc078e9a6e90554e8165c0a116b39692ecae5127e
 EBUILD image_proc-1.15.3-r1.ebuild 802 BLAKE2B 7e908a35f2fa847c7b24d49d7c2b5890fec4b8a22188bf2968475b4de0be3023ea08cdb99c7a99f9cbb4758402a76ef9fc073d70e9ac60a31368141a0fe3eb5a SHA512 64ad333b31952d50233a251033851756a174b73c4b38a7084f746d6fc61a0c07746ab725a00434339c3657bbc078e9a6e90554e8165c0a116b39692ecae5127e
+EBUILD image_proc-1.16.0.ebuild 802 BLAKE2B 81cb84b8866685b9b9984cc2214317c7de5b01eca9293c440a7bcd7336997e08f3ce0353d9f2458543a4d60cb686f713aac2000ccfac5b1ab6741fd5941ea6be SHA512 eae4e9c5e8805e62011ca45055a750a75d9e3cacef247f9c1046c4ba732d013e261b8cf01d18a691271707afa59bec056906747b630b200a958a11f8cc8bfbf7
 EBUILD image_proc-9999.ebuild 802 BLAKE2B 7e908a35f2fa847c7b24d49d7c2b5890fec4b8a22188bf2968475b4de0be3023ea08cdb99c7a99f9cbb4758402a76ef9fc073d70e9ac60a31368141a0fe3eb5a SHA512 64ad333b31952d50233a251033851756a174b73c4b38a7084f746d6fc61a0c07746ab725a00434339c3657bbc078e9a6e90554e8165c0a116b39692ecae5127e
 MISC metadata.xml 344 BLAKE2B 5a86107444fb6ace449ca5724e9b37146d70b2d7cdfb964222834683c41f85f9538b290202a083db028f286ebb17742440b05b5181382b625c1fab2158e81d70 SHA512 273f5cce3fd99379d1fdeb678313491b0cfd5583076a8e093eaf4e777e4cdc615650b84840f911d5545a0555772c4f2868c17d4c07c3a90aa2ef5e881f675571
diff --git a/dev-ros/image_proc/image_proc-1.16.0.ebuild b/dev-ros/image_proc/image_proc-1.16.0.ebuild
new file mode 100644
index 000000000000..4d0d9288c7a2
--- /dev/null
+++ b/dev-ros/image_proc/image_proc-1.16.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Single image rectification and color processing"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/image_geometry
+	dev-ros/image_transport
+	dev-ros/nodelet
+	dev-ros/nodelet_topic_tools
+	dev-ros/roscpp
+	dev-libs/console_bridge:=
+	media-libs/opencv:=
+	dev-libs/boost:=[threads(+)]
+"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest
+		dev-cpp/gtest
+		dev-ros/camera_calibration_parsers
+	)
+"
+PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/image_publisher/Manifest b/dev-ros/image_publisher/Manifest
index be4b5e25d34c..488ece5a0ea6 100644
--- a/dev-ros/image_publisher/Manifest
+++ b/dev-ros/image_publisher/Manifest
@@ -1,6 +1,8 @@
 DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
 DIST image_pipeline-1.15.3.tar.gz 150900 BLAKE2B 75bce8146c5273d5896ccb226bb9223f696f341089948aa44bbc932af15a1c80e6a5dbc036b4a37dcaecfca6a3e896df0935dcfb8305e23cc1a73fa77cef7a2e SHA512 9e1d21d1a43e932078938aeca4e5e6902e36e6d034a467cbd69734e318e5c4a689cb133acc7f8098f4ca928312661eb5b2aa7fae38e3d2a904b0e34889da0d32
+DIST image_pipeline-1.16.0.tar.gz 152681 BLAKE2B 6b11a07f07e8a29e601796570f404403d9acf1b31382d6d0353b2ac891c0f3345f3039bbb5bb7b3c41b10bf0478cad7a1d5590b7bbeee003aeff58437781d2e9 SHA512 909e115b150fb98a7cfa6d351b46072d92fccbded3ee15ba79135dae12d4cedf004b4c791a4c87540c74a6ad87e3947c9031e6539d09dee77527518d2b08cd18
 EBUILD image_publisher-1.15.2.ebuild 628 BLAKE2B c7625a1bc3578250b68d5bc48bda5c1f753cacd538c421e038d22110f7eb5feaf554c1f35bee533452b3b88565cc8ef64a1bef87497b56bcf2f01348591756cb SHA512 c78bf36968d4261b61a726461d5ec09b898cf70d61ba302d155c100037618f11dd2a4ff285b01d61e786c55513e5320a685235956e6c9895852a742ac431323e
 EBUILD image_publisher-1.15.3.ebuild 628 BLAKE2B c7625a1bc3578250b68d5bc48bda5c1f753cacd538c421e038d22110f7eb5feaf554c1f35bee533452b3b88565cc8ef64a1bef87497b56bcf2f01348591756cb SHA512 c78bf36968d4261b61a726461d5ec09b898cf70d61ba302d155c100037618f11dd2a4ff285b01d61e786c55513e5320a685235956e6c9895852a742ac431323e
+EBUILD image_publisher-1.16.0.ebuild 628 BLAKE2B 6a2847b0aee30649ea734ba440095225011fcb81f546d40c9a9c76eb1c6cc6878bff4aaa499e1127c04cfc5e2bd918ceceec4d17aa3e6e91f1d13d8049940fca SHA512 e42fbe4b4b8051219082d47cef5eb3d292ebcec4520efdf6b3aad122f0633a2a0ce35dafa7f9d9deeb5a6dd4bac2807c86a469bb404a9bd74347b15cb1fca589
 EBUILD image_publisher-9999.ebuild 628 BLAKE2B c7625a1bc3578250b68d5bc48bda5c1f753cacd538c421e038d22110f7eb5feaf554c1f35bee533452b3b88565cc8ef64a1bef87497b56bcf2f01348591756cb SHA512 c78bf36968d4261b61a726461d5ec09b898cf70d61ba302d155c100037618f11dd2a4ff285b01d61e786c55513e5320a685235956e6c9895852a742ac431323e
 MISC metadata.xml 344 BLAKE2B 5a86107444fb6ace449ca5724e9b37146d70b2d7cdfb964222834683c41f85f9538b290202a083db028f286ebb17742440b05b5181382b625c1fab2158e81d70 SHA512 273f5cce3fd99379d1fdeb678313491b0cfd5583076a8e093eaf4e777e4cdc615650b84840f911d5545a0555772c4f2868c17d4c07c3a90aa2ef5e881f675571
diff --git a/dev-ros/image_publisher/image_publisher-1.16.0.ebuild b/dev-ros/image_publisher/image_publisher-1.16.0.ebuild
new file mode 100644
index 000000000000..b34fb3ec1130
--- /dev/null
+++ b/dev-ros/image_publisher/image_publisher-1.16.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Publish an image stream from single image file or avi file"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	media-libs/opencv:=
+	dev-ros/dynamic_reconfigure
+	dev-ros/camera_info_manager
+	dev-ros/image_transport
+	dev-ros/nodelet
+	dev-libs/console_bridge:=
+	dev-ros/roscpp
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/image_rotate/Manifest b/dev-ros/image_rotate/Manifest
index 0b6ebd17fe0e..403222e03f82 100644
--- a/dev-ros/image_rotate/Manifest
+++ b/dev-ros/image_rotate/Manifest
@@ -1,6 +1,8 @@
 DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
 DIST image_pipeline-1.15.3.tar.gz 150900 BLAKE2B 75bce8146c5273d5896ccb226bb9223f696f341089948aa44bbc932af15a1c80e6a5dbc036b4a37dcaecfca6a3e896df0935dcfb8305e23cc1a73fa77cef7a2e SHA512 9e1d21d1a43e932078938aeca4e5e6902e36e6d034a467cbd69734e318e5c4a689cb133acc7f8098f4ca928312661eb5b2aa7fae38e3d2a904b0e34889da0d32
+DIST image_pipeline-1.16.0.tar.gz 152681 BLAKE2B 6b11a07f07e8a29e601796570f404403d9acf1b31382d6d0353b2ac891c0f3345f3039bbb5bb7b3c41b10bf0478cad7a1d5590b7bbeee003aeff58437781d2e9 SHA512 909e115b150fb98a7cfa6d351b46072d92fccbded3ee15ba79135dae12d4cedf004b4c791a4c87540c74a6ad87e3947c9031e6539d09dee77527518d2b08cd18
 EBUILD image_rotate-1.15.2.ebuild 630 BLAKE2B 18376c9b73e3fb2b5b7e178dad1369c4e82f8aa644c4fb562d8baf454213f4c05699a432b5972eddd9d486219697c3d4b23a3fcffc0fde791e1ded0c64ddc8f2 SHA512 c7580420cf209e54a04ed643266e532761ce84016d030490df785502ff063d8de70786f2ab2dff808cfbb1c086d8147533eedaeb5cad65858211aff1a540beb8
 EBUILD image_rotate-1.15.3.ebuild 630 BLAKE2B d2e6bc2d754f16372f10400174b560ccf66eee2511308cf030661ffb4a9b301863f0bf591168c9fa645a2eaefebddcf72c4b61222dc057595fd3671b1f0c4f83 SHA512 84d850e648653ca749c4dea0db4d494e10c6045ea82ebd8a0199744ba6f1c9c5c17ba686419d9ce34eca00739b47717fe6ec3d4d4a0482c0f9b2dedbad799a3d
+EBUILD image_rotate-1.16.0.ebuild 630 BLAKE2B bcc90d6ae3ff1a7e67bf17f7a541cdde694db809d2b64cf980ad3d69744bf55f919311cc5f6c63387ea5eb017759cedb32e4e19bf55e321f3f534d6c24476ff1 SHA512 95eb989e350ff6228c77c87c4def7c326457987ce481d7a89f8e1c7030256d390f0d14bd1cfb1359937b7ec1332dce03630dc924ed58d9d61d8c29043bb7f6e8
 EBUILD image_rotate-9999.ebuild 630 BLAKE2B 18376c9b73e3fb2b5b7e178dad1369c4e82f8aa644c4fb562d8baf454213f4c05699a432b5972eddd9d486219697c3d4b23a3fcffc0fde791e1ded0c64ddc8f2 SHA512 c7580420cf209e54a04ed643266e532761ce84016d030490df785502ff063d8de70786f2ab2dff808cfbb1c086d8147533eedaeb5cad65858211aff1a540beb8
 MISC metadata.xml 344 BLAKE2B 5a86107444fb6ace449ca5724e9b37146d70b2d7cdfb964222834683c41f85f9538b290202a083db028f286ebb17742440b05b5181382b625c1fab2158e81d70 SHA512 273f5cce3fd99379d1fdeb678313491b0cfd5583076a8e093eaf4e777e4cdc615650b84840f911d5545a0555772c4f2868c17d4c07c3a90aa2ef5e881f675571
diff --git a/dev-ros/image_rotate/image_rotate-1.16.0.ebuild b/dev-ros/image_rotate/image_rotate-1.16.0.ebuild
new file mode 100644
index 000000000000..46bd231c5933
--- /dev/null
+++ b/dev-ros/image_rotate/image_rotate-1.16.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Rotates an image minimizing the angle between a vector and the camera frame"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	media-libs/opencv:=
+	dev-ros/dynamic_reconfigure
+	dev-ros/eigen_conversions
+	dev-ros/image_transport
+	dev-ros/nodelet
+	dev-libs/console_bridge:=
+	dev-ros/roscpp
+	dev-ros/tf2
+	dev-ros/tf2_geometry_msgs
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_view/Manifest b/dev-ros/image_view/Manifest
index 9ae3ec3bfb7e..6a872d53d3a4 100644
--- a/dev-ros/image_view/Manifest
+++ b/dev-ros/image_view/Manifest
@@ -1,6 +1,8 @@
 DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
 DIST image_pipeline-1.15.3.tar.gz 150900 BLAKE2B 75bce8146c5273d5896ccb226bb9223f696f341089948aa44bbc932af15a1c80e6a5dbc036b4a37dcaecfca6a3e896df0935dcfb8305e23cc1a73fa77cef7a2e SHA512 9e1d21d1a43e932078938aeca4e5e6902e36e6d034a467cbd69734e318e5c4a689cb133acc7f8098f4ca928312661eb5b2aa7fae38e3d2a904b0e34889da0d32
+DIST image_pipeline-1.16.0.tar.gz 152681 BLAKE2B 6b11a07f07e8a29e601796570f404403d9acf1b31382d6d0353b2ac891c0f3345f3039bbb5bb7b3c41b10bf0478cad7a1d5590b7bbeee003aeff58437781d2e9 SHA512 909e115b150fb98a7cfa6d351b46072d92fccbded3ee15ba79135dae12d4cedf004b4c791a4c87540c74a6ad87e3947c9031e6539d09dee77527518d2b08cd18
 EBUILD image_view-1.15.2-r2.ebuild 876 BLAKE2B ea2ba3f70725b2bbaf7b9aaf1c654f40d973e38c5f3192ac9cf63e78ea2c06a78d5b49802ceeccc138a6a40c8f4890a648b852956e377abea5ffebef2a0ef482 SHA512 0fd3e4e3ed596cb796517181310559f696a9d0e0679a3a24d0e40a762b0c4b7e22eaee4460452af6a738bc00e9f6dddf461e23bf8a636d71122248c61c5b50f7
 EBUILD image_view-1.15.3-r1.ebuild 876 BLAKE2B ea2ba3f70725b2bbaf7b9aaf1c654f40d973e38c5f3192ac9cf63e78ea2c06a78d5b49802ceeccc138a6a40c8f4890a648b852956e377abea5ffebef2a0ef482 SHA512 0fd3e4e3ed596cb796517181310559f696a9d0e0679a3a24d0e40a762b0c4b7e22eaee4460452af6a738bc00e9f6dddf461e23bf8a636d71122248c61c5b50f7
+EBUILD image_view-1.16.0.ebuild 876 BLAKE2B 8c30c2a4193db62b7586022a2c0adb32bdfdb25c100464fadd6d94110a10eab0c374c09132ae3b788cebb2cf1361e71092fee13472cd0cb8a718375a04cbba6c SHA512 a0a10b4961d365253672491e60f550795867fb06197937f7f4d9226f4d7a5b5571bee6dd67dac53d75de4d2ff29f75691debf4d119d349fa42134e71492bd375
 EBUILD image_view-9999.ebuild 876 BLAKE2B ea2ba3f70725b2bbaf7b9aaf1c654f40d973e38c5f3192ac9cf63e78ea2c06a78d5b49802ceeccc138a6a40c8f4890a648b852956e377abea5ffebef2a0ef482 SHA512 0fd3e4e3ed596cb796517181310559f696a9d0e0679a3a24d0e40a762b0c4b7e22eaee4460452af6a738bc00e9f6dddf461e23bf8a636d71122248c61c5b50f7
 MISC metadata.xml 344 BLAKE2B 5a86107444fb6ace449ca5724e9b37146d70b2d7cdfb964222834683c41f85f9538b290202a083db028f286ebb17742440b05b5181382b625c1fab2158e81d70 SHA512 273f5cce3fd99379d1fdeb678313491b0cfd5583076a8e093eaf4e777e4cdc615650b84840f911d5545a0555772c4f2868c17d4c07c3a90aa2ef5e881f675571
diff --git a/dev-ros/image_view/image_view-1.16.0.ebuild b/dev-ros/image_view/image_view-1.16.0.ebuild
new file mode 100644
index 000000000000..1f0d2f62a3c7
--- /dev/null
+++ b/dev-ros/image_view/image_view-1.16.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Simple viewer for ROS image topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/camera_calibration_parsers
+	>=dev-ros/cv_bridge-1.11.10
+	dev-ros/image_transport
+	dev-ros/message_filters
+	dev-ros/nodelet
+	dev-ros/rosconsole
+	dev-libs/console_bridge:=
+	dev-ros/roscpp
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
+
+	dev-libs/boost:=[threads(+)]
+	media-libs/opencv:=
+	x11-libs/gtk+:3
+	media-libs/harfbuzz:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+BDEPEND="
+	virtual/pkgconfig
+"
diff --git a/dev-ros/joint_state_publisher/Manifest b/dev-ros/joint_state_publisher/Manifest
index 03e1ab3fdb90..ed749f62f5e0 100644
--- a/dev-ros/joint_state_publisher/Manifest
+++ b/dev-ros/joint_state_publisher/Manifest
@@ -1,4 +1,4 @@
-DIST joint_state_publisher-1.15.0.tar.gz 27974 BLAKE2B e0293f3c9496dfa47bd07e9825ed399e05b53f80947aecba228c3b153384fe5ceef808fa7a1ff5678448ef263c439bbcdae4e475bee206554f2cdff785175b1a SHA512 58387785f93195ab4b1f6a2d54f8d7765c5cd34df6a2bf5ab00caf032b5b1093fc9ec02e7217cd554cdcc37545295dff5652c295fb3ea91a549d23b83db02dbc
-EBUILD joint_state_publisher-1.15.0.ebuild 633 BLAKE2B c918cfec7c165c216083b0b33a98845448a9fd62e03623bc93df7a2eb5576687b2a8aa953fec368312d7cc984bf90515bfe9a94f7cde3d7b01572f69d68ba91b SHA512 acb9cac232f6297d5bafe5a7ba27e65b62af9f54f4d3ff1f7dbec58cb0e6b70d0715107aa453fe81b2da9f4a8d82a7bc2b1392a9a0c6e298fa156a899c199412
+DIST joint_state_publisher-1.15.1.tar.gz 28821 BLAKE2B 2bc83fd5f9aead52be31d9bedf8d20debb9b6f65ecbf8fd1ab01b365f52ad8af172c7f3724c37a519d3cf08f6085a29431238f7ea6c08468b5f5f30cded08244 SHA512 625b07ed4bff30cd885f369f1a0d354e4dbe8d77eef60fc8ef6a0e85bb4905cf771c7e0de3b7e5faf1bf6ba00e352c029739edca5a82c65201055fd4fe80d8f8
+EBUILD joint_state_publisher-1.15.1.ebuild 633 BLAKE2B 7315fa5ed6f32da9ff1491db0e4e5b276580d188755b2f594fbe5fbf3f2fe8245a57c596d2153e5dd07f9e8e70841691377b4926789b315970aa99e64dd225e4 SHA512 f66662c3adc7998d0c09e61a35830ec9adc01a9e523b8792b59d399f41d5fbcf5803870a491fe5b021f0f2b3a0deb800493c2daeb1f9b63b5f1538e74b90453d
 EBUILD joint_state_publisher-9999.ebuild 633 BLAKE2B c918cfec7c165c216083b0b33a98845448a9fd62e03623bc93df7a2eb5576687b2a8aa953fec368312d7cc984bf90515bfe9a94f7cde3d7b01572f69d68ba91b SHA512 acb9cac232f6297d5bafe5a7ba27e65b62af9f54f4d3ff1f7dbec58cb0e6b70d0715107aa453fe81b2da9f4a8d82a7bc2b1392a9a0c6e298fa156a899c199412
 MISC metadata.xml 340 BLAKE2B 52c82a93a35dbb2af8d4018d820683036c0e5bc22cc859b0141c0bcda6c2723e86b7d8bae9d17eb54e715048770ed0884d9f1499867ecfb18888b0efc2cef795 SHA512 89e0c4464b59a23bbcf308b50a31b71569e7412c8726d3ff77db7c14e4a74172afc7fd644ccab95d0bb302d3b01130a39fb1afba95e02bea07fa70f52acb19a9
diff --git a/dev-ros/joint_state_publisher/joint_state_publisher-1.15.0.ebuild b/dev-ros/joint_state_publisher/joint_state_publisher-1.15.1.ebuild
index 4124df047534..578a75edc963 100644
--- a/dev-ros/joint_state_publisher/joint_state_publisher-1.15.0.ebuild
+++ b/dev-ros/joint_state_publisher/joint_state_publisher-1.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-ros/joint_state_publisher_gui/Manifest b/dev-ros/joint_state_publisher_gui/Manifest
index 568c5377ed84..6d5f3c16e098 100644
--- a/dev-ros/joint_state_publisher_gui/Manifest
+++ b/dev-ros/joint_state_publisher_gui/Manifest
@@ -1,4 +1,4 @@
-DIST joint_state_publisher-1.15.0.tar.gz 27974 BLAKE2B e0293f3c9496dfa47bd07e9825ed399e05b53f80947aecba228c3b153384fe5ceef808fa7a1ff5678448ef263c439bbcdae4e475bee206554f2cdff785175b1a SHA512 58387785f93195ab4b1f6a2d54f8d7765c5cd34df6a2bf5ab00caf032b5b1093fc9ec02e7217cd554cdcc37545295dff5652c295fb3ea91a549d23b83db02dbc
-EBUILD joint_state_publisher_gui-1.15.0.ebuild 597 BLAKE2B f70d3a73e74ce21a96fc8919d0e87054be04f6d540cf11b43f096619fa833377679780f5af916279a35c37fd80494d9061a30d884470a7db01cc5bbcd922a181 SHA512 77fb12dc9f70ecd8a1dfdff9caf75e762e2ec80e1732784315d0bf83f01083ea2a8be82ee167d6b6a25e0b7a023f4767fb2f76fccb05e48d9c246ed2755d621d
+DIST joint_state_publisher-1.15.1.tar.gz 28821 BLAKE2B 2bc83fd5f9aead52be31d9bedf8d20debb9b6f65ecbf8fd1ab01b365f52ad8af172c7f3724c37a519d3cf08f6085a29431238f7ea6c08468b5f5f30cded08244 SHA512 625b07ed4bff30cd885f369f1a0d354e4dbe8d77eef60fc8ef6a0e85bb4905cf771c7e0de3b7e5faf1bf6ba00e352c029739edca5a82c65201055fd4fe80d8f8
+EBUILD joint_state_publisher_gui-1.15.1.ebuild 597 BLAKE2B 14e6b6ac509957ef71c8841c721012b744103d1951011cacaab165f7dbaaebfe5badd066c6fb19c3ff6992f90986c6a9751aa3de0fa67a627f26da0686ffe8ae SHA512 d5c799195fe55a1a8ce2b9764e8b6e6968248b07bb51b45a53bc9efb111825225737aa017de58c1e305efcd201fe828c5d7f1792d0167b2da525dec78bdb4bcb
 EBUILD joint_state_publisher_gui-9999.ebuild 597 BLAKE2B f70d3a73e74ce21a96fc8919d0e87054be04f6d540cf11b43f096619fa833377679780f5af916279a35c37fd80494d9061a30d884470a7db01cc5bbcd922a181 SHA512 77fb12dc9f70ecd8a1dfdff9caf75e762e2ec80e1732784315d0bf83f01083ea2a8be82ee167d6b6a25e0b7a023f4767fb2f76fccb05e48d9c246ed2755d621d
 MISC metadata.xml 340 BLAKE2B 52c82a93a35dbb2af8d4018d820683036c0e5bc22cc859b0141c0bcda6c2723e86b7d8bae9d17eb54e715048770ed0884d9f1499867ecfb18888b0efc2cef795 SHA512 89e0c4464b59a23bbcf308b50a31b71569e7412c8726d3ff77db7c14e4a74172afc7fd644ccab95d0bb302d3b01130a39fb1afba95e02bea07fa70f52acb19a9
diff --git a/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-1.15.0.ebuild b/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-1.15.1.ebuild
index 4a20aa38a90b..00da14aeea40 100644
--- a/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-1.15.0.ebuild
+++ b/dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-1.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-ros/message_filters/Manifest b/dev-ros/message_filters/Manifest
index a1ad26f70bf1..92ebf5841414 100644
--- a/dev-ros/message_filters/Manifest
+++ b/dev-ros/message_filters/Manifest
@@ -2,11 +2,13 @@ AUX tests.patch 4837 BLAKE2B 2793652865f2d1f8ce1499b37922e480d40ca3931f098156a6c
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 902 BLAKE2B 2c3b89f5aa8aecf32580628af9f138050086b6d2b0f4e4b0d1170cc5cf24eb04969b468bb69c095f1dec0f836a47c957750b2393d3763ba6392ee0ea1ed2b36f SHA512 4f0b34f78581432a34f6b1c86eabc6379ad4b8f9a675d82f4170e7ae30c291df573657c783f29c3f483bcf8d499334500d5c4a84d0493268bc540806802a1063
+EBUILD message_filters-1.15.14.ebuild 902 BLAKE2B 5a45394b00981b3e2f8968399d9733ca2167f5110097bde06253d9295b8686306ba97748711296a741a3c62bcca1bbc8927310601825756acf63deb2aefcb89c SHA512 1e35f2845159f5945d11958582ea66bc9c01d28420338c2d980afb45702a659c6e71e2bd9aa680e7ecc126a8c66ac28096386148b45be0fdeaee28f034a88f06
 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.14.ebuild b/dev-ros/message_filters/message_filters-1.15.14.ebuild
new file mode 100644
index 000000000000..89f2f8537192
--- /dev/null
+++ b/dev-ros/message_filters/message_filters-1.15.14.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 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/nodelet/Manifest b/dev-ros/nodelet/Manifest
index a0cd50065605..78e067876d6b 100644
--- a/dev-ros/nodelet/Manifest
+++ b/dev-ros/nodelet/Manifest
@@ -1,6 +1,8 @@
 DIST nodelet_core-1.10.0.tar.gz 45386 BLAKE2B 1da08ec8bc134e0eba72d7c0cde7cfd351c91c5bf4bc8d66ad3d30a8dbe39452c511b6a753ea91a139ce06b617d71f06cfb2f67c7ee2482eb5d2aba79680799c SHA512 4a298cc214660050b7a4d4f3a1e8980cbde2d05bb19369856031a128d3ca7518cbbd4615fe8c0c5944b09dca96aeaa8f41a630b2f34f9e2af423349e816c54e9
 DIST nodelet_core-1.10.1.tar.gz 45409 BLAKE2B e27fa3075bcdfe9f309758a7c2930d73d760236eb5f68c83206314f8001e2aecd5e164ffaf5a27be7dbc6353042119415772db138478b3e2112f00cbf3f380d1 SHA512 2ab86a350692afeb6ec4861eb1dbc33a58a6ea662238223d8f0be74dba4c96323dabc176b77171e2b3affb6447dfd0ec11ca49346f03d33e8aa13d8b9599e260
+DIST nodelet_core-1.10.2.tar.gz 46049 BLAKE2B 19da87672c965fa84e6b8ae48eb3d40514dad79611a27c5d632c2300e2cb7b269abb1b3862390795b55e3bec3a48c686f5af19c4aa627faf975dcaa7e2b32c19 SHA512 5f9827a8b5e491640c57bfb242ffc266291825dbc6ba452ad5be6d7bd2168872205378cc1eac398afff1a8fb0ce3763ce36a1eff627644037f799b87ee86fc99
 EBUILD nodelet-1.10.0-r1.ebuild 761 BLAKE2B 8b1355c7f26e48fb093fd2b7309e0a947fbc697f819e3ce77628590d52c4198c37c8aab73c7c4e67d5230e90e8f81cc5d16f02fb4abeb8edb83d66b7b88f29f9 SHA512 b3d54bc11a4e8527fdb8cc4ef02a1efa7a98e6c13d0e6cd4c9e9ec0b090a9fb4ef16cc8809b6fa0d95f5f284634152a212888764e016ae0240018eaf73282236
 EBUILD nodelet-1.10.1.ebuild 761 BLAKE2B c7559ed5eeb5acf28647151d44473c850898b8ee57f43fc3b1fe29ec672cd9073f1949c5ae01d12ea33a8979ff805060653806f94f1b2c80535cc2ffaf975ecd SHA512 e3f05c997153483961a5b48ff51dcbc7a0e9a851f432479c7daace1564ccc60ee1dd866efeff7d60a661684d14b5b60a532e1af205a20a7b8531a839ac85bb96
+EBUILD nodelet-1.10.2.ebuild 761 BLAKE2B 5a803315f7e79d30d6c01aef1ce807ee51163410651e64905110f9c8c85c402c45cbf4f667bf2c10db239ce024e03cabb80586befb7fb8821569a37f0f3ad16c SHA512 10a46115a2c767b864f5ec2d73b2fbd14b04c6d9a483732ebc65df5dbb3c88b35dec9d578f62938cba60adb511a90777149651827212fb5f3d67d87e8083fc40
 EBUILD nodelet-9999.ebuild 761 BLAKE2B 8b1355c7f26e48fb093fd2b7309e0a947fbc697f819e3ce77628590d52c4198c37c8aab73c7c4e67d5230e90e8f81cc5d16f02fb4abeb8edb83d66b7b88f29f9 SHA512 b3d54bc11a4e8527fdb8cc4ef02a1efa7a98e6c13d0e6cd4c9e9ec0b090a9fb4ef16cc8809b6fa0d95f5f284634152a212888764e016ae0240018eaf73282236
 MISC metadata.xml 331 BLAKE2B 9cdba9b3243ff84970d32b4e3eefc05cb7623a2ca0182a8a2ce02c30e31ebfbbd256e7e8067e69f2276675067a8d1b6330ea421f4b112e9b487047f12ce13553 SHA512 7c8b10d8f28ca71b613b548d444c4c0f20cc50800976f9f4f5af5514f9cc1a3d2250678d5bedb8df52aa21e619069898caef2bdc51530bf1bcdacfa69fbe922b
diff --git a/dev-ros/nodelet/nodelet-1.10.2.ebuild b/dev-ros/nodelet/nodelet-1.10.2.ebuild
new file mode 100644
index 000000000000..a47941a68cad
--- /dev/null
+++ b/dev-ros/nodelet/nodelet-1.10.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 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/nodelet_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Runs multiple algorithms in the same process with zero copy transport"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/bondcpp
+	dev-ros/cmake_modules
+	dev-ros/pluginlib:=
+		dev-libs/tinyxml2:=
+	dev-ros/rosconsole
+		dev-libs/console_bridge:=
+	dev-ros/roscpp
+	dev-libs/boost:=
+	sys-apps/util-linux
+	dev-ros/class_loader:=
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet_topic_tools/Manifest b/dev-ros/nodelet_topic_tools/Manifest
index a1dcee403a0a..1f7ede3092b7 100644
--- a/dev-ros/nodelet_topic_tools/Manifest
+++ b/dev-ros/nodelet_topic_tools/Manifest
@@ -1,6 +1,8 @@
 DIST nodelet_core-1.10.0.tar.gz 45386 BLAKE2B 1da08ec8bc134e0eba72d7c0cde7cfd351c91c5bf4bc8d66ad3d30a8dbe39452c511b6a753ea91a139ce06b617d71f06cfb2f67c7ee2482eb5d2aba79680799c SHA512 4a298cc214660050b7a4d4f3a1e8980cbde2d05bb19369856031a128d3ca7518cbbd4615fe8c0c5944b09dca96aeaa8f41a630b2f34f9e2af423349e816c54e9
 DIST nodelet_core-1.10.1.tar.gz 45409 BLAKE2B e27fa3075bcdfe9f309758a7c2930d73d760236eb5f68c83206314f8001e2aecd5e164ffaf5a27be7dbc6353042119415772db138478b3e2112f00cbf3f380d1 SHA512 2ab86a350692afeb6ec4861eb1dbc33a58a6ea662238223d8f0be74dba4c96323dabc176b77171e2b3affb6447dfd0ec11ca49346f03d33e8aa13d8b9599e260
+DIST nodelet_core-1.10.2.tar.gz 46049 BLAKE2B 19da87672c965fa84e6b8ae48eb3d40514dad79611a27c5d632c2300e2cb7b269abb1b3862390795b55e3bec3a48c686f5af19c4aa627faf975dcaa7e2b32c19 SHA512 5f9827a8b5e491640c57bfb242ffc266291825dbc6ba452ad5be6d7bd2168872205378cc1eac398afff1a8fb0ce3763ce36a1eff627644037f799b87ee86fc99
 EBUILD nodelet_topic_tools-1.10.0-r1.ebuild 518 BLAKE2B e441ad790a0150455b70f23427653a0f4e3c55788ca21d44478b7aa03348e59e6552500724788dbca892d37cbc11b45eba1ef3efa94a47b908976a7c0b2898a6 SHA512 638762a86d099db3b431ae683b7890867633e2c87df9d054d1f10ac2bf579d02919dcd1c10de22bd74331fe896cc3509c78dd1395e4d59037c13f97a732b5aaf
 EBUILD nodelet_topic_tools-1.10.1-r1.ebuild 518 BLAKE2B e441ad790a0150455b70f23427653a0f4e3c55788ca21d44478b7aa03348e59e6552500724788dbca892d37cbc11b45eba1ef3efa94a47b908976a7c0b2898a6 SHA512 638762a86d099db3b431ae683b7890867633e2c87df9d054d1f10ac2bf579d02919dcd1c10de22bd74331fe896cc3509c78dd1395e4d59037c13f97a732b5aaf
+EBUILD nodelet_topic_tools-1.10.2.ebuild 518 BLAKE2B db72ff85ca160b923301acebd44b3652e1db25f891fb38967761c7d3d19de3c4d497295dd5721ec35add78489ca7132f0b5883f621c01910b5d29ade587d4ce6 SHA512 410fd66967b58f627a0253606caa4f9da9cb098c7d33cdbcc009a9a01a4ba4128b4781e998909c76b78427b5fd28a8d01068a635bb5aa40656fcd9f4112668dc
 EBUILD nodelet_topic_tools-9999.ebuild 518 BLAKE2B e441ad790a0150455b70f23427653a0f4e3c55788ca21d44478b7aa03348e59e6552500724788dbca892d37cbc11b45eba1ef3efa94a47b908976a7c0b2898a6 SHA512 638762a86d099db3b431ae683b7890867633e2c87df9d054d1f10ac2bf579d02919dcd1c10de22bd74331fe896cc3509c78dd1395e4d59037c13f97a732b5aaf
 MISC metadata.xml 331 BLAKE2B 9cdba9b3243ff84970d32b4e3eefc05cb7623a2ca0182a8a2ce02c30e31ebfbbd256e7e8067e69f2276675067a8d1b6330ea421f4b112e9b487047f12ce13553 SHA512 7c8b10d8f28ca71b613b548d444c4c0f20cc50800976f9f4f5af5514f9cc1a3d2250678d5bedb8df52aa21e619069898caef2bdc51530bf1bcdacfa69fbe922b
diff --git a/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.10.2.ebuild b/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.10.2.ebuild
new file mode 100644
index 000000000000..e5f5b6e7ed6d
--- /dev/null
+++ b/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.10.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/nodelet_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common nodelet tools such as a mux, demux and throttle"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads(+)]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/message_filters
+	dev-ros/nodelet
+	dev-ros/pluginlib
+	dev-ros/roscpp
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/opencv_tests/Manifest b/dev-ros/opencv_tests/Manifest
index f870308e34c2..3f4b4700e79b 100644
--- a/dev-ros/opencv_tests/Manifest
+++ b/dev-ros/opencv_tests/Manifest
@@ -1,4 +1,6 @@
 DIST vision_opencv-1.15.0.tar.gz 82281 BLAKE2B 6e86cf67bb9fbf07ca36dbe0bb3fb32611a4e216cea209048bfe34b71622a56954063f2e7ff466275810f36c62d016a1d04e987383dde35f0bb85abf0e74350f SHA512 b6331b00aac18f96eb40ef57b2b4fe55da956007390549762818eab7ad36fcf192549448f2edcc6b4e550273f80320bf15eb6a60900d155be680ec8682fd17ba
+DIST vision_opencv-1.16.0.tar.gz 85452 BLAKE2B 5f167898cef4bbc753e32af87174b7f668b3eff00357a22e8c454d181116a925059d4837210086d445ceaf74819fdb9a527eb5667321df8a7c1fe84549dbe5b6 SHA512 affd61f0d933cc57d5d23e840f0708e8ffdc0033eee22a21fe5c0099a2ab75d4c3fdcc41705167ab3615f5388ce47641faf5b21e6c6365a4e540abe69dfad3fe
 EBUILD opencv_tests-1.15.0.ebuild 705 BLAKE2B 02c1f88b34b75de6d24cc2b6a1b0ab7b271c6485fb4288ca4df27f0d7cf34acaa7e01c6565fa8592d995b797131f75635fed360c9c627fa1600ddedc7397e4cf SHA512 fdeb7b53f1884286480b2f5898c3bbba5deba6d9867f0f14b0db5f01368cc841b0982fc69222ffe6f36f5d6d0f7ee9c425c318a0064100d8a846b524a11ee048
+EBUILD opencv_tests-1.16.0.ebuild 705 BLAKE2B a611d93c82f59ba78916c5eeb10bdec1bb412d872a3f4292c81229d535ca6aabdbc95b9c42eba9db3c7f80e4e19a674ea3b1ec7fa209882f0a89446b0dc07eaf SHA512 fdb2c72c47d19d0885d6f0b62abb1d3f7fc5d62cd5e9d3d797c49ccefad1d80d7e8494a3f6da29dbce889ee8ecef67094cd0099e8146116e63542512da7840a4
 EBUILD opencv_tests-9999.ebuild 705 BLAKE2B 02c1f88b34b75de6d24cc2b6a1b0ab7b271c6485fb4288ca4df27f0d7cf34acaa7e01c6565fa8592d995b797131f75635fed360c9c627fa1600ddedc7397e4cf SHA512 fdeb7b53f1884286480b2f5898c3bbba5deba6d9867f0f14b0db5f01368cc841b0982fc69222ffe6f36f5d6d0f7ee9c425c318a0064100d8a846b524a11ee048
 MISC metadata.xml 343 BLAKE2B 4c8ada208d6cb4fb1e99ee7839cc4c20275e86a8b351169790c54c8df90a8cb381d9d71b2ebfdf2306aa7f2d66581144d61dff8adb5aa0e7ddc13696d8f17aa5 SHA512 932ed7ee027c275e3be014ee0a048c16dbec1b7108777fb2150cab84678cc31d560f1b88d6ac3fd890357512239c85951c48819a31f2e0174dac68beef44d1b2
diff --git a/dev-ros/opencv_tests/opencv_tests-1.16.0.ebuild b/dev-ros/opencv_tests/opencv_tests-1.16.0.ebuild
new file mode 100644
index 000000000000..c1cfbbde482c
--- /dev/null
+++ b/dev-ros/opencv_tests/opencv_tests-1.16.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tests for ROS OpenCV integration"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "media-libs/opencv[python,\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	ros-catkin_src_install
+	insinto /usr/share/${PN}/launch
+	doins launch/*.launch
+	exeinto /usr/libexec/${PN}
+	doexe nodes/*
+}
diff --git a/dev-ros/pcl_conversions/Manifest b/dev-ros/pcl_conversions/Manifest
index e56c257f7d0b..e549157b7890 100644
--- a/dev-ros/pcl_conversions/Manifest
+++ b/dev-ros/pcl_conversions/Manifest
@@ -1,5 +1,7 @@
 AUX pcl.patch 2427 BLAKE2B ec9099ea6b6c39054df19aba957c6503db864190b4704445440b5e0cc93065b269d070d21b3cdd18a392dbd4acc2380b924efae34f4e3d70f96da7733ef80979 SHA512 33fdf3284c4c34fe0e7f4f36e2c6328eba471b2f2d7a30bf9bf44c82b81ff4c68a522404eafea81546d7be0d07988fa6b94e2e6d5ec96278bb11ae68177bb741
 DIST perception_pcl-1.7.2.tar.gz 81897 BLAKE2B 692f000337090c7a2354bf9626d391aa0fe390041042718e7dde7335c750137e7e1b6f939728ad1e2af3411e535ba63b42bc17f74b3535e38628f2b6c1c87036 SHA512 228b1d7d589bfd1460e8c58448b0d9257e86c1796b009853aeceeb1da20d8f46462d8c273a95804003ce3c43326c6575553d19b319aa9effcef4854347d5c3f9
+DIST perception_pcl-1.7.4.tar.gz 82160 BLAKE2B 11f4936da3d2fc86eafcc1219e4bd4acf0defece3f2dfcefea54ad3e239fc3a87c3a581291f5cd3adae74c0b6093213cff50ee1cfc7b87b1006299457773d2a8 SHA512 ee5b03dd348de2c589ec01bcab165959dc1e177abd3a2beca62bf701854231296a18052142273c6b4965101fe1b72ee685884049b45d93aa452397bb2df640f4
 EBUILD pcl_conversions-1.7.2-r1.ebuild 636 BLAKE2B 41739024596fccb8ea978f74c4f7b57552766f23c05a556e6726b3aa78fc26d9dae54f7d469dc6ceb664325fd3f30a0f5b23910478847d8b80dd15de3ded8030 SHA512 b558b33311491e1fcc409c39c37640bae397de978a333654817a0ac6255a2a6d0545193cb908e3414b5681ccd5d93e62630eaf031d9fd30c2ca38a8581bb21ac
+EBUILD pcl_conversions-1.7.4.ebuild 602 BLAKE2B df380e4fb501d46a5fe51c7a4833bac5b22199a09572ffe3ab0d4c8a4d2b6ef6371d9544cf40adf688770812fd2a48cbc0e6c7568e2157c160b510d33866bd54 SHA512 9623ef35d5b5f6cf8ca6cf96b6a9db9777878609a450ab8600b13a062ccc24b1de4a491148c5bc171081bb5dbe54310cfff059714cac4a859b8f573cc14fde45
 EBUILD pcl_conversions-9999.ebuild 602 BLAKE2B 488cfb2ca76f22ae02c751d2b4936cedc2cb0e5f48189e2cb08df5039459e52b3e77cd642db191271cabf7cd6b38033ee8bb332be35b98c6b697c7e2d1504ce9 SHA512 e04e58d53feb53a00ec9628ce4bad4911ff3095c20394807bc7af4357b40903b0be52e68e759067431eb2a08706f49cf4b2779246c1030b705d587150d47bee6
 MISC metadata.xml 344 BLAKE2B d9539150674440607eb7fd36b90cf5843da6a17a9f3e1e82632553e8cdedddc7ae3973ce9278234b9daefeef7784274edbe49d7d017c4040f69f668a38a18f3f SHA512 40ca3538a08b2b1c63be52c15c2a41bf13bd0a59af38fb9105ebeea977c43563f1ec51a1a569bd5f925b8ec9917e3014a01b28bd02dee6352cf55a84aa72efbb
diff --git a/dev-ros/pcl_conversions/pcl_conversions-1.7.4.ebuild b/dev-ros/pcl_conversions/pcl_conversions-1.7.4.ebuild
new file mode 100644
index 000000000000..0cf5c845fbc9
--- /dev/null
+++ b/dev-ros/pcl_conversions/pcl_conversions-1.7.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 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_ros/Manifest b/dev-ros/pcl_ros/Manifest
index 4a3be9037664..339a0b199d53 100644
--- a/dev-ros/pcl_ros/Manifest
+++ b/dev-ros/pcl_ros/Manifest
@@ -1,6 +1,8 @@
 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
+DIST perception_pcl-1.7.4.tar.gz 82160 BLAKE2B 11f4936da3d2fc86eafcc1219e4bd4acf0defece3f2dfcefea54ad3e239fc3a87c3a581291f5cd3adae74c0b6093213cff50ee1cfc7b87b1006299457773d2a8 SHA512 ee5b03dd348de2c589ec01bcab165959dc1e177abd3a2beca62bf701854231296a18052142273c6b4965101fe1b72ee685884049b45d93aa452397bb2df640f4
 EBUILD pcl_ros-1.7.2-r1.ebuild 1219 BLAKE2B 202836a530955dd41a4e6cc62b7a85a9f086d7a11d741ef7c0877939fa3e32da648315aa715b2762e2932489cf7348ed97115ae3b4d76533a73860a84ca29550 SHA512 b42b4c26000a31c78ce98b57c2ec9770ed2627447b99a121d58f3f08bc940cecdd923e4c784d29543f9b1c361e7b6c5bcc3cc4e4a772e1015dca62eb6b443ddf
+EBUILD pcl_ros-1.7.4.ebuild 1195 BLAKE2B 412fa0c9955ad3eea0d18ccaed024a6edc63f5eb005e73ff2477a8741b3849a833cccf091ad645084bbb655bfb59ff675d7eddeeca928828d2b4f395202a39cc SHA512 c2955983ec297abde6888348577562dcade50075850fafeea4fcb628a5217d0d91c97598d05920f7aa6f7244fc7e8db41cb136188c041e0a04470765598a5aeb
 EBUILD pcl_ros-9999.ebuild 1195 BLAKE2B 6e8600e3aa5583c00092d01a2be8011aae8ac50c47666a0115aa2cabc315af0bb8454229bdd1a8487ed6d9cf7a3284c28165ed94dcd5da487076d07f7090f983 SHA512 95a1295ff0d50a4ea60dae18174d4b620254308359f4d9a84ef78f11f22d90b9449f694cecd3a7c0a7dd1d6e82d2d337fa6f5fd98b63a1312907aa01049100f8
 MISC metadata.xml 344 BLAKE2B d9539150674440607eb7fd36b90cf5843da6a17a9f3e1e82632553e8cdedddc7ae3973ce9278234b9daefeef7784274edbe49d7d017c4040f69f668a38a18f3f SHA512 40ca3538a08b2b1c63be52c15c2a41bf13bd0a59af38fb9105ebeea977c43563f1ec51a1a569bd5f925b8ec9917e3014a01b28bd02dee6352cf55a84aa72efbb
diff --git a/dev-ros/pcl_ros/pcl_ros-1.7.4.ebuild b/dev-ros/pcl_ros/pcl_ros-1.7.4.ebuild
new file mode 100644
index 000000000000..f93127607dfb
--- /dev/null
+++ b/dev-ros/pcl_ros/pcl_ros-1.7.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 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"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="PCL (Point Cloud Library) ROS interface stack"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/rosbag
+	dev-ros/rosconsole
+	dev-ros/roslib
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/message_filters
+	>=dev-cpp/eigen-3.2.5:3
+	dev-ros/pluginlib
+	dev-libs/console_bridge:=
+	dev-ros/tf
+	dev-ros/tf2
+	dev-ros/tf2_ros
+	dev-ros/tf2_eigen
+	dev-ros/nodelet
+	dev-ros/nodelet_topic_tools
+	sci-libs/pcl:=[qhull]
+	>=dev-ros/pcl_conversions-0.2.1-r1
+	dev-libs/boost:=[threads(+)]
+"
+DEPEND="${RDEPEND}
+	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)
+"
+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/resource_retriever/Manifest b/dev-ros/resource_retriever/Manifest
index f196463becf3..9c170e2a873a 100644
--- a/dev-ros/resource_retriever/Manifest
+++ b/dev-ros/resource_retriever/Manifest
@@ -1,4 +1,4 @@
-DIST resource_retriever-1.12.6.tar.gz 6916 BLAKE2B 11c3cfd06f750e90863ccff2540cc3828cc02929418a1e4c274811fce606e512a3afb45548100f80f56fb58dae00d1ac81f7b152bda1ecc12623584cca1923c3 SHA512 a946cef7e55e2acf01ba605beb36c3ec24f22037bca38d93afcfb36cad579e58ff57efb69311e3cb69ddd9d53d7eab5f9072f3903da539d1fbd001a3a342f7dc
-EBUILD resource_retriever-1.12.6.ebuild 766 BLAKE2B b34eb0342e2a90551c81450443328c3b3701db92579ef9d9734773d105542b670f159ec33155299e1058c34eda9f86f7809eed39a7ddf7d22cdff642ce29cb5c SHA512 65c8702de80b1d9dbfaf6057cb213f61bfe2de4a48722be29e9b391f4155fb529ea47e48123cc5e9c6352144865957e27fb6fb2a0a1071107468881b90e97899
+DIST resource_retriever-1.12.7.tar.gz 6982 BLAKE2B c58f41b55f1e47e6531787f05bc58d99c650905994d02e3a793acff1d0b568729cea835010e7c83c68669f5bff4835ec6a69212e05d9dd69e0f95b4790583466 SHA512 09f718d944b62bb19aa0ba29760d4acb3791b82bbd690809295315aa2fb61e862e975240b4eccc6d77fb7b741502cb9dc10be2266a6b54b93446396efad598ef
+EBUILD resource_retriever-1.12.7.ebuild 766 BLAKE2B de4a2eb01bb73040b9642920074542d7c3ef117637d226715ec228d39ee55ac62d0d05660118e5711855e83747f96ff91ec89d4f1495d5b3c6a704fd90b3757f SHA512 766ccc3c4d27bd914c0ba832b4a13dcc085d874f8a0e72fc8eb2c4dd77ed415c174e897669298ce03db429070dd2ed83db8ae6bfe09e923350f65d6a35fd61d8
 EBUILD resource_retriever-9999.ebuild 766 BLAKE2B b34eb0342e2a90551c81450443328c3b3701db92579ef9d9734773d105542b670f159ec33155299e1058c34eda9f86f7809eed39a7ddf7d22cdff642ce29cb5c SHA512 65c8702de80b1d9dbfaf6057cb213f61bfe2de4a48722be29e9b391f4155fb529ea47e48123cc5e9c6352144865957e27fb6fb2a0a1071107468881b90e97899
 MISC metadata.xml 337 BLAKE2B 289c87e2689131a4f413daf89ec22d38252d897e1bdc3a866284627fc99ef823d200bdc58fd3f4179db780119f56ecc7009f1263c2fd7a5efbc025c2f8815260 SHA512 cbb9c81598f3b7b98929c9e3d34a863c4b62c3cc41142ac9936c65907bdb4a98a3f7faa257f9a276d6da80d1609134eef75fb6c62c1d10beadd5181442ed04a8
diff --git a/dev-ros/resource_retriever/resource_retriever-1.12.6.ebuild b/dev-ros/resource_retriever/resource_retriever-1.12.7.ebuild
index 4a7691efbe1e..1ce7de9a14ac 100644
--- a/dev-ros/resource_retriever/resource_retriever-1.12.6.ebuild
+++ b/dev-ros/resource_retriever/resource_retriever-1.12.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-ros/robot_state_publisher/Manifest b/dev-ros/robot_state_publisher/Manifest
index 91fd5460203d..5673675d8f9d 100644
--- a/dev-ros/robot_state_publisher/Manifest
+++ b/dev-ros/robot_state_publisher/Manifest
@@ -1,6 +1,6 @@
-DIST robot_state_publisher-1.15.1-joint_states_indexed.bag 778888 BLAKE2B 3d117e06712ed20f838be247057645799a8b8501ddc3582a0037d34a2da40b8390367de88bd278f05632f150e88139b34325be3d5a1ce44f7ad3ebfaffd5e0ac SHA512 171e4eb810e12da4af5f9ce4f91bb6967e3895dfa284aa542010b7a7691571051e237ab96b055105f559e8d242099eb41f1429c5afcba13361ee58bdd565a689
-DIST robot_state_publisher-1.15.1.tar.gz 25717 BLAKE2B 87f1e70f80cff01255840e99be9088bc1d91bc25f5b00d1e46b3ebed9b55bf24e5fa698b41cb4c3603ae7147191a3d39ca85b65469edffacfb91d7f913156268 SHA512 f36d07961c27c85b2787cc294ca10a7e1334e699db61926067aa0a9b1dcab0969a799feed6d2fa78d14ff76cf661d29479585d6f9ec660f94832e79d6c88ddf1
+DIST robot_state_publisher-1.15.2-joint_states_indexed.bag 778888 BLAKE2B 3d117e06712ed20f838be247057645799a8b8501ddc3582a0037d34a2da40b8390367de88bd278f05632f150e88139b34325be3d5a1ce44f7ad3ebfaffd5e0ac SHA512 171e4eb810e12da4af5f9ce4f91bb6967e3895dfa284aa542010b7a7691571051e237ab96b055105f559e8d242099eb41f1429c5afcba13361ee58bdd565a689
+DIST robot_state_publisher-1.15.2.tar.gz 792878 BLAKE2B b68d7985545cece374ebe454345be7f66bd5b66d763d224932708187fbcdf11964b2c88db95048f6e114a78c727203790b19e30724bd00aae5cb234d5cd0936b SHA512 715c578992ecdd979226e1a5b30823c7e97399e53252884d974c149727e5b1467acdf79d3870a240b0619686921f809e1037945d1b6e7863b22ce111aacfee84
 DIST robot_state_publisher-9999-joint_states_indexed.bag 778888 BLAKE2B 3d117e06712ed20f838be247057645799a8b8501ddc3582a0037d34a2da40b8390367de88bd278f05632f150e88139b34325be3d5a1ce44f7ad3ebfaffd5e0ac SHA512 171e4eb810e12da4af5f9ce4f91bb6967e3895dfa284aa542010b7a7691571051e237ab96b055105f559e8d242099eb41f1429c5afcba13361ee58bdd565a689
-EBUILD robot_state_publisher-1.15.1.ebuild 1211 BLAKE2B 3df70e764d45800e04e9d63eacbeffb2cb8b5356f93cc508e43f25b6a9d0d0e59fd7923321b4ad2e3e837d9608fcaf76d3d1da5d2c5dfcb76d65b7218c60d541 SHA512 e8d8ddcc9e033729f78dfbccde1080a9deb2bb2ab579aa7d2764b4ccf038275aab9016201e821babcd2a600fe583016e7b90438e2fd4efa9adbdb7562dbab5d5
+EBUILD robot_state_publisher-1.15.2.ebuild 1211 BLAKE2B 113e46b3d033b8b7fe5135d4ea1dc6fa4910d828064f3fa90ad22fd9fb2ac5f7c13d1b652909fc58dfe5ca83b62b22048c1e473e80fe77ff05143cde52bc4744 SHA512 24e1352de69312fa4d16f316ac78193b411ec97d83c4465208353d43d40c7a71c1c62820014720247021c517fb7572616b57908342fde80aab64cd50ae799035
 EBUILD robot_state_publisher-9999.ebuild 1211 BLAKE2B 3df70e764d45800e04e9d63eacbeffb2cb8b5356f93cc508e43f25b6a9d0d0e59fd7923321b4ad2e3e837d9608fcaf76d3d1da5d2c5dfcb76d65b7218c60d541 SHA512 e8d8ddcc9e033729f78dfbccde1080a9deb2bb2ab579aa7d2764b4ccf038275aab9016201e821babcd2a600fe583016e7b90438e2fd4efa9adbdb7562dbab5d5
 MISC metadata.xml 340 BLAKE2B dbf525f2d6e9ef39165e4e5fe00f3855793612c594bb3abce6f1d0e99212b40bda4ba409d83b66cb32cd41c066ecac03c772f4b579df78eb0daf9c2a2a454d6f SHA512 04656e683460e3e6cac76fa1e742e5fe02e951166dd69e5004745f4eb1b2e85f4cf7508777ec558cd52b12354f6c125e95c8656415e92e9ec8326ed9f27f95f9
diff --git a/dev-ros/robot_state_publisher/robot_state_publisher-1.15.1.ebuild b/dev-ros/robot_state_publisher/robot_state_publisher-1.15.2.ebuild
index 8849ecad4f2e..f77574829462 100644
--- a/dev-ros/robot_state_publisher/robot_state_publisher-1.15.1.ebuild
+++ b/dev-ros/robot_state_publisher/robot_state_publisher-1.15.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-ros/rosbag/Manifest b/dev-ros/rosbag/Manifest
index 3520d2ebd725..9626800a983d 100644
--- a/dev-ros/rosbag/Manifest
+++ b/dev-ros/rosbag/Manifest
@@ -2,12 +2,14 @@ AUX pycrypto.patch 402 BLAKE2B 2f784f93115b205285bb9eb9c910185f84871da7ecc586530
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 961 BLAKE2B 41c1b43271318a507cdd6153811ab76908819f0e75dc7c8dcfb1c7c4dcf6ed0e59b673647107caade89e21f6b6700b164053c4ce5b7de7db5fbef5ed8c8a473b SHA512 de5b04faed760e3ae5b12fbd58acdae9168de808f99e023b0f3564eca8dc1118ca30d09a14978c4fedae8c8e6e7a018b1ed0dd12b38df28002088ca8a43674cc
+EBUILD rosbag-1.15.14.ebuild 961 BLAKE2B f6c381b9ea86cb79f6b0112d51139040394018e4b93b97d284b5562e38bec70ac139ef008e7b77c3102b207db2e9117bca1720c2097723c41266a2dd875fd8e3 SHA512 c1cfc094521f4e3f7d7fd7857f69a67da2bce3635b2dd2b896fda69226fdc013f14c5a0fb0e6ba1534c7d5a60bf2fd609519d3b839ddde9f362d3cd0c4151fec
 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.14.ebuild b/dev-ros/rosbag/rosbag-1.15.14.ebuild
new file mode 100644
index 000000000000..35de79fe3bdc
--- /dev/null
+++ b/dev-ros/rosbag/rosbag-1.15.14.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 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 7739db8bbe3a..7958232a4e41 100644
--- a/dev-ros/rosbag_storage/Manifest
+++ b/dev-ros/rosbag_storage/Manifest
@@ -1,12 +1,14 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.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
+EBUILD rosbag_storage-1.15.10-r1.ebuild 911 BLAKE2B 4de91e566f55c738ee69534e781b64c1f78abff44fd44dc60bd3a88b5bd46493b17f119d59ceb8d22fcd9422ff365aa4041848c470685831c2bdf1e5418439ca SHA512 5a062e091473f0c8f643cf1156334e8a28199ecd0d5d37354d4737d902e5addc7e9d0376f3b10a8fa9076c9329a4a92495e062cc8e4ccd274bdc9f95af77e00b
+EBUILD rosbag_storage-1.15.11-r1.ebuild 911 BLAKE2B 4de91e566f55c738ee69534e781b64c1f78abff44fd44dc60bd3a88b5bd46493b17f119d59ceb8d22fcd9422ff365aa4041848c470685831c2bdf1e5418439ca SHA512 5a062e091473f0c8f643cf1156334e8a28199ecd0d5d37354d4737d902e5addc7e9d0376f3b10a8fa9076c9329a4a92495e062cc8e4ccd274bdc9f95af77e00b
+EBUILD rosbag_storage-1.15.13-r1.ebuild 911 BLAKE2B 4de91e566f55c738ee69534e781b64c1f78abff44fd44dc60bd3a88b5bd46493b17f119d59ceb8d22fcd9422ff365aa4041848c470685831c2bdf1e5418439ca SHA512 5a062e091473f0c8f643cf1156334e8a28199ecd0d5d37354d4737d902e5addc7e9d0376f3b10a8fa9076c9329a4a92495e062cc8e4ccd274bdc9f95af77e00b
+EBUILD rosbag_storage-1.15.14.ebuild 911 BLAKE2B 4de91e566f55c738ee69534e781b64c1f78abff44fd44dc60bd3a88b5bd46493b17f119d59ceb8d22fcd9422ff365aa4041848c470685831c2bdf1e5418439ca SHA512 5a062e091473f0c8f643cf1156334e8a28199ecd0d5d37354d4737d902e5addc7e9d0376f3b10a8fa9076c9329a4a92495e062cc8e4ccd274bdc9f95af77e00b
+EBUILD rosbag_storage-1.15.8-r2.ebuild 911 BLAKE2B 4de91e566f55c738ee69534e781b64c1f78abff44fd44dc60bd3a88b5bd46493b17f119d59ceb8d22fcd9422ff365aa4041848c470685831c2bdf1e5418439ca SHA512 5a062e091473f0c8f643cf1156334e8a28199ecd0d5d37354d4737d902e5addc7e9d0376f3b10a8fa9076c9329a4a92495e062cc8e4ccd274bdc9f95af77e00b
+EBUILD rosbag_storage-1.15.9-r1.ebuild 911 BLAKE2B 4de91e566f55c738ee69534e781b64c1f78abff44fd44dc60bd3a88b5bd46493b17f119d59ceb8d22fcd9422ff365aa4041848c470685831c2bdf1e5418439ca SHA512 5a062e091473f0c8f643cf1156334e8a28199ecd0d5d37354d4737d902e5addc7e9d0376f3b10a8fa9076c9329a4a92495e062cc8e4ccd274bdc9f95af77e00b
+EBUILD rosbag_storage-9999.ebuild 911 BLAKE2B 4de91e566f55c738ee69534e781b64c1f78abff44fd44dc60bd3a88b5bd46493b17f119d59ceb8d22fcd9422ff365aa4041848c470685831c2bdf1e5418439ca SHA512 5a062e091473f0c8f643cf1156334e8a28199ecd0d5d37354d4737d902e5addc7e9d0376f3b10a8fa9076c9329a4a92495e062cc8e4ccd274bdc9f95af77e00b
 MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.8-r1.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.10-r1.ebuild
index b4ede837ca4e..183c62dbd6f3 100644
--- a/dev-ros/rosbag_storage/rosbag_storage-1.15.8-r1.ebuild
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.15.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-libs/tinyxml2:=
 
 	dev-libs/openssl:0=
-	app-crypt/gpgme
+	app-crypt/gpgme:=
 "
 DEPEND="${RDEPEND}
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.10.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.11-r1.ebuild
index 98d1abfadea8..183c62dbd6f3 100644
--- a/dev-ros/rosbag_storage/rosbag_storage-1.15.10.ebuild
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.15.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-libs/tinyxml2:=
 
 	dev-libs/openssl:0=
-	app-crypt/gpgme
+	app-crypt/gpgme:=
 "
 DEPEND="${RDEPEND}
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.13.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.13-r1.ebuild
index 98d1abfadea8..183c62dbd6f3 100644
--- a/dev-ros/rosbag_storage/rosbag_storage-1.15.13.ebuild
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.15.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-libs/tinyxml2:=
 
 	dev-libs/openssl:0=
-	app-crypt/gpgme
+	app-crypt/gpgme:=
 "
 DEPEND="${RDEPEND}
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.11.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.14.ebuild
index 98d1abfadea8..183c62dbd6f3 100644
--- a/dev-ros/rosbag_storage/rosbag_storage-1.15.11.ebuild
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.15.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-libs/tinyxml2:=
 
 	dev-libs/openssl:0=
-	app-crypt/gpgme
+	app-crypt/gpgme:=
 "
 DEPEND="${RDEPEND}
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.8-r2.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.8-r2.ebuild
new file mode 100644
index 000000000000..183c62dbd6f3
--- /dev/null
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.15.8-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 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/rosbag_storage/rosbag_storage-1.15.9-r1.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.9-r1.ebuild
new file mode 100644
index 000000000000..183c62dbd6f3
--- /dev/null
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.15.9-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 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/rosbag_storage/rosbag_storage-1.15.9.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.9.ebuild
deleted file mode 100644
index b4ede837ca4e..000000000000
--- a/dev-ros/rosbag_storage/rosbag_storage-1.15.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-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/rosbag_storage/rosbag_storage-9999.ebuild b/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild
index b4ede837ca4e..183c62dbd6f3 100644
--- a/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild
+++ b/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-libs/tinyxml2:=
 
 	dev-libs/openssl:0=
-	app-crypt/gpgme
+	app-crypt/gpgme:=
 "
 DEPEND="${RDEPEND}
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
diff --git a/dev-ros/roscpp/Manifest b/dev-ros/roscpp/Manifest
index 66b44a2fb305..b9e6f165c346 100644
--- a/dev-ros/roscpp/Manifest
+++ b/dev-ros/roscpp/Manifest
@@ -1,10 +1,12 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 606 BLAKE2B b8e78e2ed68bd093f06a3649296603d192b8e2c2632d13146585e5ab506c197ff704a911bf915ee752e67f4dbe24cf5585158d00d06f7014652ab85237003576 SHA512 6066703301141ca2d920c33dcc76e59c8fd4bc8ee428de58490a56989bc91188ed5a52b3df441dca451283a95bdc0f0a9298d5d1ff74649ad753ff1f3964ec7b
+EBUILD roscpp-1.15.14.ebuild 606 BLAKE2B 14da7ff69ee4b1bbc29297eb5902fae269dd76d3d0ccfd525d18ebe0160cd5c96aa453ba43720de8eedf131ac17461cd3cfb3186125d3194986de5ac5c05af60 SHA512 43bc039c40ba035f8be199ef1967d2474b4430b306b9247a16f8ddcbf582f66076e10da6946d295c66d88927a05478d935243fe8c48cc6df7ca32b904dc90e47
 EBUILD roscpp-1.15.9.ebuild 606 BLAKE2B 7c38cba14922e02ec2bbc0c6f0365a66f5c691644f7509ff718cf932b49404c90013156c76a13313c60386a215010b2044fce30f3b3b675575e92717178e8b31 SHA512 3d3c82c30a6dc1195675fa4268a8ce463dfebcdc3e411df45a8222f99554c049a748d18ef2d47fb3d956314414b2e98ae8e913667f5610751b0c023d71fa3236
 EBUILD roscpp-9999.ebuild 606 BLAKE2B 7c38cba14922e02ec2bbc0c6f0365a66f5c691644f7509ff718cf932b49404c90013156c76a13313c60386a215010b2044fce30f3b3b675575e92717178e8b31 SHA512 3d3c82c30a6dc1195675fa4268a8ce463dfebcdc3e411df45a8222f99554c049a748d18ef2d47fb3d956314414b2e98ae8e913667f5610751b0c023d71fa3236
 MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/roscpp/roscpp-1.15.14.ebuild b/dev-ros/roscpp/roscpp-1.15.14.ebuild
new file mode 100644
index 000000000000..59de1ac4d413
--- /dev/null
+++ b/dev-ros/roscpp/roscpp-1.15.14.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=clients/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rosconsole
+	dev-ros/roscpp_serialization
+	dev-ros/roscpp_traits
+	dev-ros/rostime
+	dev-ros/xmlrpcpp
+	dev-libs/boost:=
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosdiagnostic/Manifest b/dev-ros/rosdiagnostic/Manifest
index 3a64998bfcd9..b24838726462 100644
--- a/dev-ros/rosdiagnostic/Manifest
+++ b/dev-ros/rosdiagnostic/Manifest
@@ -2,12 +2,14 @@ DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7
 DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
 DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
+DIST diagnostics-1.11.0.tar.gz 538022 BLAKE2B 6d6a4c17af1080d77786f5894ca3bd5c2e39e912529aee813f1e7fede4e8265e2dc0e4b3cd09051dd9456227e4db35d24fa3eebc83f77e15ba5af3bdf169df5e SHA512 c1cb328498e45211620c4d8cd025e6d1ec4c71d853b83d7f2eb0673619c70e4a96911e60c5caa6f80298cbba93769243d07c41713972546425fbe94f8ddc8f60
 DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
 DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
 EBUILD rosdiagnostic-1.10.1.ebuild 467 BLAKE2B 897a7789c638e7e0d54565defbc6f79ca1dc8b669600edb2ba7fbf75a5fc7dda1e2887129d2d87a4348ffb1e337598cdbdc464bae8caf35aa1980021bc40c472 SHA512 8291ea545fc6cd639177c3633cbae271af70ccecd2f7a2fa0c6a375e1852e1c4c94f213caa024fa64560faa88f56ab42328f97f3141bc84e77852bfe80cfff8f
 EBUILD rosdiagnostic-1.10.2.ebuild 467 BLAKE2B 897a7789c638e7e0d54565defbc6f79ca1dc8b669600edb2ba7fbf75a5fc7dda1e2887129d2d87a4348ffb1e337598cdbdc464bae8caf35aa1980021bc40c472 SHA512 8291ea545fc6cd639177c3633cbae271af70ccecd2f7a2fa0c6a375e1852e1c4c94f213caa024fa64560faa88f56ab42328f97f3141bc84e77852bfe80cfff8f
 EBUILD rosdiagnostic-1.10.3.ebuild 467 BLAKE2B 74db2d4dbd883a3d15235d3e26f0bbb545d8cecdfc7a7a9c6f2fade5d1c1ea8db750855662d1d53d535750b408ffc2e492c27f69ca502d9cce359bcc29bed3f3 SHA512 e519a24e329c1676e6fcf97621ba58279017ff4a44294af21c4b97f9585417aca1dbcf87cce97b1cea510dc3aca1dc76e8f21ba57553ec0d0758bf4b23d76f1a
 EBUILD rosdiagnostic-1.10.4.ebuild 467 BLAKE2B 74db2d4dbd883a3d15235d3e26f0bbb545d8cecdfc7a7a9c6f2fade5d1c1ea8db750855662d1d53d535750b408ffc2e492c27f69ca502d9cce359bcc29bed3f3 SHA512 e519a24e329c1676e6fcf97621ba58279017ff4a44294af21c4b97f9585417aca1dbcf87cce97b1cea510dc3aca1dc76e8f21ba57553ec0d0758bf4b23d76f1a
+EBUILD rosdiagnostic-1.11.0.ebuild 467 BLAKE2B 8353792c03843b7047e1b4549776fde5be7724a9c7d043103831aeadba91d449ca8350dd4b2e5f346acaa744c944db48a0bfea7be77b72123837317614d22280 SHA512 2951a6552702317a7e576123a6848b98c259b31623d197cc7dca1b54b6c8f9aff24c0e1792d34b0c87697cc5561afd16bceffa39c4a635442e74bcb7bf783821
 EBUILD rosdiagnostic-1.9.4.ebuild 467 BLAKE2B 897a7789c638e7e0d54565defbc6f79ca1dc8b669600edb2ba7fbf75a5fc7dda1e2887129d2d87a4348ffb1e337598cdbdc464bae8caf35aa1980021bc40c472 SHA512 8291ea545fc6cd639177c3633cbae271af70ccecd2f7a2fa0c6a375e1852e1c4c94f213caa024fa64560faa88f56ab42328f97f3141bc84e77852bfe80cfff8f
 EBUILD rosdiagnostic-1.9.6.ebuild 467 BLAKE2B 897a7789c638e7e0d54565defbc6f79ca1dc8b669600edb2ba7fbf75a5fc7dda1e2887129d2d87a4348ffb1e337598cdbdc464bae8caf35aa1980021bc40c472 SHA512 8291ea545fc6cd639177c3633cbae271af70ccecd2f7a2fa0c6a375e1852e1c4c94f213caa024fa64560faa88f56ab42328f97f3141bc84e77852bfe80cfff8f
 EBUILD rosdiagnostic-9999.ebuild 467 BLAKE2B 897a7789c638e7e0d54565defbc6f79ca1dc8b669600edb2ba7fbf75a5fc7dda1e2887129d2d87a4348ffb1e337598cdbdc464bae8caf35aa1980021bc40c472 SHA512 8291ea545fc6cd639177c3633cbae271af70ccecd2f7a2fa0c6a375e1852e1c4c94f213caa024fa64560faa88f56ab42328f97f3141bc84e77852bfe80cfff8f
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-1.11.0.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-1.11.0.ebuild
new file mode 100644
index 000000000000..7797dd481b5e
--- /dev/null
+++ b/dev-ros/rosdiagnostic/rosdiagnostic-1.11.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command to print aggregated diagnostic contents to the command line"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ros/rosgraph/Manifest b/dev-ros/rosgraph/Manifest
index 865b027ffa6f..70d6e9265e13 100644
--- a/dev-ros/rosgraph/Manifest
+++ b/dev-ros/rosgraph/Manifest
@@ -1,11 +1,13 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 710 BLAKE2B bc1be14a2d80c6acf980993059cb6ca0903dc884dddcfbced3d709057f827ba00f5743e99874ea5f0900c837b7f95c05d3ce89c99ce3cf502f226982d901a152 SHA512 3f1a196462ad7125e2384543384e0dfa7909bb974efdb311a9ab6584c8b31eb7fe16099594fb7fd5fa2c7c50e8c0746bf50b4ec3bdcd47f7e1960b203b3c8a9b
+EBUILD rosgraph-1.15.14.ebuild 710 BLAKE2B 19a788063e217e6d18f34bd41acc0b4bc8c1a33c8e0b0caef3939b2b01f415f3ebdee8c6aefd08536e3c3bc61b01a1b5e72d011f0b1c0e19a36a3f4a5bf0fc11 SHA512 e897aa8f9b2913f43bb51826ad8202d44bbdf6189605efde8b1dba5d95bc17f8de04d65a9143b5df4999109c734c6bf30c181785494ee443cdda33258ae4d1de
 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.14.ebuild b/dev-ros/rosgraph/rosgraph-1.15.14.ebuild
new file mode 100644
index 000000000000..c62c038b5cfa
--- /dev/null
+++ b/dev-ros/rosgraph/rosgraph-1.15.14.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Prints information about the ROS Computation Graph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/netifaces[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/roslaunch/Manifest b/dev-ros/roslaunch/Manifest
index 4ed9e65b3387..4476c30a4cc7 100644
--- a/dev-ros/roslaunch/Manifest
+++ b/dev-ros/roslaunch/Manifest
@@ -7,8 +7,10 @@ AUX roslaunch.initd 915 BLAKE2B 11f2c6f2db2ad1084332a1b704a90ed3a3fc9fe671f96f6c
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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-1.15.13.ebuild 1615 BLAKE2B 520bb52d2fd22675c70bc5b78160016f00c5c3ecaed2fee42f111067c5c01699ec120b88fe7e150331b6b08d25705e79149734fbe07245d5879f41d37a6baf48 SHA512 61313cb9c6d97ed313577208471f4fe589213f8eb7bd04d9333de017175a17f7cf47ec77574204b4c91db7774c9ce5b470d8d67395225c502aa8baec6a7e985a
+EBUILD roslaunch-1.15.14.ebuild 1615 BLAKE2B 619d759347f21db69c707028ecdb7b471adc68a5d07573e6f2a114943296dd93c0088d7fe83fdc13ab230c5e64252160a254f5ae90dfbdbfe98643add4d6d803 SHA512 53e5e06dee8a2a0d1823ca0c4c781d6578f53d48ca2adeab715e69c1661c43ebc885e4cb3678ea557d7eb4874d65a1f8ce3a5564045161f23012671db294cbb7
 EBUILD roslaunch-9999.ebuild 1615 BLAKE2B 520bb52d2fd22675c70bc5b78160016f00c5c3ecaed2fee42f111067c5c01699ec120b88fe7e150331b6b08d25705e79149734fbe07245d5879f41d37a6baf48 SHA512 61313cb9c6d97ed313577208471f4fe589213f8eb7bd04d9333de017175a17f7cf47ec77574204b4c91db7774c9ce5b470d8d67395225c502aa8baec6a7e985a
 MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/roslaunch/roslaunch-1.15.14.ebuild b/dev-ros/roslaunch/roslaunch-1.15.14.ebuild
new file mode 100644
index 000000000000..9f0aa7c4ab8c
--- /dev/null
+++ b/dev-ros/roslaunch/roslaunch-1.15.14.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for easily launching multiple ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+
+CDEPEND="
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosout
+"
+
+RDEPEND="
+	${CDEPEND}
+	acct-group/ros
+	acct-user/ros
+"
+DEPEND="
+	${CDEPEND}
+	test? (
+		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/test_rosmaster
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${S}/../rosmaster/:${EPREFIX}/usr/share/ros_packages/rosparam:${EPREFIX}/usr/share/ros_packages/roslib:${EPREFIX}/usr/share/ros_packages/rosout"
+	ros-catkin_src_test
+}
+
+src_install() {
+	ros-catkin_src_install
+
+	dodir /etc/ros
+	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
+
+	newinitd "${FILESDIR}/roscore.initd" roscore
+	newconfd "${FILESDIR}/roscore.confd" roscore
+
+	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
+	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
+
+	doenvd "${FILESDIR}/40roslaunch"
+
+	# Needed by test_roslaunch
+	insinto /usr/share/${PN}
+	doins test/xml/noop.launch
+}
diff --git a/dev-ros/roslz4/Manifest b/dev-ros/roslz4/Manifest
index 6cfda9d9ba2a..bf4d3f705ad1 100644
--- a/dev-ros/roslz4/Manifest
+++ b/dev-ros/roslz4/Manifest
@@ -1,11 +1,13 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 423 BLAKE2B ee04baf38a91a0d5a0cda63d01dd680343998aab1b0d97ad7f5858df17df4189f2565c1c592d2f1c00b317d38f3df4db221970b8ce52fb6ba4cfd58b42029a69 SHA512 5154747f57c5529cd781f3542abe7cbdc4c7a6b94ddfbb2c9521ad00d98ffeaa3ccd9546580e77a6e9aa34e6f3ec15479d0a6c9f23f3a9036a0c1996adff49e2
+EBUILD roslz4-1.15.14.ebuild 423 BLAKE2B 7dc710c1c0d4d125494d85b24f20b5ce6931fffe069e8359785cb33198a28fd9b0fbe61db5af9ea743675396f1ee6ecb739d74593711f15dd4a4120e973e2fe3 SHA512 ab769f27fc830563f178152b6d7ebe5f0d624a22c9e3ee9e64dcc3f10677fb96b5145f0d4b19a7a336ebaa4c55310444befd5ea3495f3d837fbf3bce04210383
 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.14.ebuild b/dev-ros/roslz4/roslz4-1.15.14.ebuild
new file mode 100644
index 000000000000..38046fb7703f
--- /dev/null
+++ b/dev-ros/roslz4/roslz4-1.15.14.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-arch/lz4
+	dev-ros/cpp_common"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/rosmaster/Manifest b/dev-ros/rosmaster/Manifest
index d0a567283958..66b9b252cb4c 100644
--- a/dev-ros/rosmaster/Manifest
+++ b/dev-ros/rosmaster/Manifest
@@ -1,12 +1,14 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 512 BLAKE2B a25499b4aaeb75dab3fa4c4dc78b06dfd06e4f80dd177110d09fb9a2d0f3f4ed79e043173ddcfd2cfd97495fe5e417afb5dd868b7729c521b584f501e30a7ead SHA512 2b85897d594e2b727b977ba1058b1e2e6f359a2491799a04527b1ba3a867636a625c81498a1f892cfab68e987398544362397da19466c9dfc949819e5d12067f
+EBUILD rosmaster-1.15.14.ebuild 512 BLAKE2B c4f1f0980b17e22ff367a964531332b7aef3fb3410571d51bff3eb0c679fbdfe9d0626d69febc331663e0218174cf66471288ae50322d0c15beae027186e583c SHA512 ec0866ef0a94fad936f9930c80827c21ea80c8d2e20203507f925ce10a4cedd3c4a0928f162ec67c9612971df9d7ab663bcdd4b9a8a655fe1d4ad743f0ad6198
 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.14.ebuild b/dev-ros/rosmaster/rosmaster-1.15.14.ebuild
new file mode 100644
index 000000000000..e6a73fab5f78
--- /dev/null
+++ b/dev-ros/rosmaster/rosmaster-1.15.14.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 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 8dc45a91a99d..49589c56dc2c 100644
--- a/dev-ros/rosmsg/Manifest
+++ b/dev-ros/rosmsg/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.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 EBUILD rosmsg-1.15.10.ebuild 1004 BLAKE2B 44fc7c48bd1c7180d2ad189969dc4ae3e7e77009f84361f0f75f328727fc0dfe4f97cf7d5ffbdb686359ecb69e371b45c41a57019d684e72ec3e64fc119141e4 SHA512 c04019456247c996ea0eb2600d28f7d5e298cb37ee784f433b67bff7185d36ec267e9d7d87419f956cfa4c31d42070446d2162049031bbfa071872a0f8e26f5f
 EBUILD rosmsg-1.15.11.ebuild 1004 BLAKE2B 44fc7c48bd1c7180d2ad189969dc4ae3e7e77009f84361f0f75f328727fc0dfe4f97cf7d5ffbdb686359ecb69e371b45c41a57019d684e72ec3e64fc119141e4 SHA512 c04019456247c996ea0eb2600d28f7d5e298cb37ee784f433b67bff7185d36ec267e9d7d87419f956cfa4c31d42070446d2162049031bbfa071872a0f8e26f5f
 EBUILD rosmsg-1.15.13.ebuild 1004 BLAKE2B 44fc7c48bd1c7180d2ad189969dc4ae3e7e77009f84361f0f75f328727fc0dfe4f97cf7d5ffbdb686359ecb69e371b45c41a57019d684e72ec3e64fc119141e4 SHA512 c04019456247c996ea0eb2600d28f7d5e298cb37ee784f433b67bff7185d36ec267e9d7d87419f956cfa4c31d42070446d2162049031bbfa071872a0f8e26f5f
+EBUILD rosmsg-1.15.14.ebuild 1004 BLAKE2B b1259cfadbad6ba269758d66542ab492370e34b82affc2b05a8f4eb4e5fcc205770f6400645b2be15da30fcc4a6cbd04b5cbec01f57a61d675c914c1583f1f24 SHA512 13b9643465455b0a30a947a88df7588fb63333459da3a62b0077095381cc1a40245807b3ae8e633bf2f75b12dd861ff848e451f54380d560a0196d5ea317ed44
 EBUILD rosmsg-9999.ebuild 1004 BLAKE2B 44fc7c48bd1c7180d2ad189969dc4ae3e7e77009f84361f0f75f328727fc0dfe4f97cf7d5ffbdb686359ecb69e371b45c41a57019d684e72ec3e64fc119141e4 SHA512 c04019456247c996ea0eb2600d28f7d5e298cb37ee784f433b67bff7185d36ec267e9d7d87419f956cfa4c31d42070446d2162049031bbfa071872a0f8e26f5f
 MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/rosmsg/rosmsg-1.15.14.ebuild b/dev-ros/rosmsg/rosmsg-1.15.14.ebuild
new file mode 100644
index 000000000000..1fcd5e293d54
--- /dev/null
+++ b/dev-ros/rosmsg/rosmsg-1.15.14.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 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 49f7f432077e..97c5efb52176 100644
--- a/dev-ros/rosnode/Manifest
+++ b/dev-ros/rosnode/Manifest
@@ -1,11 +1,13 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 658 BLAKE2B 5e7abe60f4ee02dbf749d1c39a25bbaceeb379553faa6f4607dcb0459d7fab7f3c81e1a8e702c36002cf764e14012bdf67d1d47d8bed3acb81b57cb18271c82f SHA512 bbc3f5f60cf01ee7e5d5dd69b639ce9464bfecf979c191c648aa531e4e4574fc4a606662d3cc4b13599b69de38b98d4c0d97ee0d4267c5472c2d3b3963e53e04
+EBUILD rosnode-1.15.14.ebuild 658 BLAKE2B bd2c4b736eb39fc19d3fd8881d90b83947aea0f9d934c3c43ec82571dacd6b3678745fcef5ac3f568843bda7b7464ff8aaea5c9f6d62309918cde6666ca83a32 SHA512 c890376ea42ba5ac19e2f1244fbd3c1a7ed93c8c88a9cef7fec215fd282e761582d909e84fd0469959fc9b96777c544e2f96d1dcebe26297dccba5699b199c50
 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.14.ebuild b/dev-ros/rosnode/rosnode-1.15.14.ebuild
new file mode 100644
index 000000000000..c5791a712db3
--- /dev/null
+++ b/dev-ros/rosnode/rosnode-1.15.14.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 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 b2baf6ec8d4e..0dfba3714a6b 100644
--- a/dev-ros/rosout/Manifest
+++ b/dev-ros/rosout/Manifest
@@ -1,12 +1,14 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 445 BLAKE2B 93d2a83966d5d04e40a269e47c22afa993f6f4d2380c3d7f90ff32c9c327ec0b22339772e493530bdeb68867038008aadafc9139ac46e33e65cb033a7e8a0aea SHA512 a1b6d7242d722f62132aa155570a41aa2b8c3048ee56676e45357e11361c89b023b67be31b0fef848cd8e448b59f5852849d32e215895cfb9816570c6e126913
+EBUILD rosout-1.15.14.ebuild 445 BLAKE2B 70dd283faa47f6e48189ebc7f6859097900a6855d001f616f50109f13e5ab3c7919bd58459a2ccc5f939cc9a7a6ca8233db5e29b9c75d5c9e55a9e95e85f7400 SHA512 5938841797232e663da8d7049bcfb1857208d7a57ba2d4105b6abe47e7ffccfc9c1da70552836f4edcbcc42110303fb3dd672d204a1871eb227ba3f7e6a93b68
 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.14.ebuild b/dev-ros/rosout/rosout-1.15.14.ebuild
new file mode 100644
index 000000000000..f046a1ba1d9f
--- /dev/null
+++ b/dev-ros/rosout/rosout-1.15.14.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 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 34db757939c0..8cc760ace528 100644
--- a/dev-ros/rosparam/Manifest
+++ b/dev-ros/rosparam/Manifest
@@ -1,12 +1,14 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 492 BLAKE2B 3d8ca72560a2be15028255af1ad9f0e926f43b76bfcf4c0ee1fd43549ea7466fb1b070a421f2bb8e9299c0ba9d54b9ec126b5099b975fa88389976dfc78e80b3 SHA512 f57762ce39deaa4f2698aa3c9f8ae5471b05e4c6eee714f3639bf7a8dfc247a5cbcbc40f7ba99d6faf91d0ea59cc9d052b79c9b687d47f051ee24fae44894469
+EBUILD rosparam-1.15.14.ebuild 492 BLAKE2B 9622f6a20b7f86bcfdb5ecac72e769638fe06236d661f570f50464199df62186a1fe4ae0d86473223583d9e66c4d04f9b48af94b4b507cfd9c5f395f7461db01 SHA512 57831de255deaa41779b96995d2b0a71b6d4144e27ff9d74178b6546eee5fcea51a0283424884f6ea392b48a56029184cbdba15c3df8e50e34ac8d3431c45204
 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.14.ebuild b/dev-ros/rosparam/rosparam-1.15.14.ebuild
new file mode 100644
index 000000000000..6b09b4ba1cbb
--- /dev/null
+++ b/dev-ros/rosparam/rosparam-1.15.14.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 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 71f13b4f980b..9a9f8882d104 100644
--- a/dev-ros/rospy/Manifest
+++ b/dev-ros/rospy/Manifest
@@ -1,12 +1,14 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 727 BLAKE2B ed3f1431e8f954adc67a1284d387bd6e5afbbb8380d3f98d5a0308f3192fc743fccda2670a09316f2f03749fd40634190a85671299984cd9fcf62ba9335f0726 SHA512 f4663f6221e330c7d902fc948032daff726f0b78b301eecee22c6a746ba2ae55f9cebc093cf7f875ccb21a0abf178c1cf2da6afda512325d3428908e8fbc6060
+EBUILD rospy-1.15.14.ebuild 727 BLAKE2B 41259733f431894b22e694efa70b5b5e3214a674c977ef3cafaa556fef6d31346f65ac70f00ab6ebf1b353ed53224e9ab824f4b2fcb40882b8b2ec03199f1dbb SHA512 98edaab427325db178d6f2e4426096cfc1bafda1c6c22d164e5df251a36916c149ed5115787c6c60d9ec19542e7e139bbe85e949e0a49835ef48045fe6d4ab12
 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.14.ebuild b/dev-ros/rospy/rospy-1.15.14.ebuild
new file mode 100644
index 000000000000..eb25d2a7442e
--- /dev/null
+++ b/dev-ros/rospy/rospy-1.15.14.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=clients/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python client library for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roscpp[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	ros-catkin_src_install
+	# Other tests need these nodes
+	exeinto /usr/share/${PN}
+	doexe test_nodes/*
+}
diff --git a/dev-ros/rosservice/Manifest b/dev-ros/rosservice/Manifest
index 2cd231d68906..c5a7496397c0 100644
--- a/dev-ros/rosservice/Manifest
+++ b/dev-ros/rosservice/Manifest
@@ -1,12 +1,14 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 526 BLAKE2B 3b9ea5d200f431087ce8fbc675b42adb19818bb100260e5a8128a6ac56c48442bf3629ec434a48bc4531c164194a693111f62fb21c76c0f0adc58c00bd6bf12b SHA512 4ddb1476e18efd87b1fc017222ee64961f9e9417008bc32a6dbc3b1db926c018b7772fbdd78da9cbe229968ecd4fe33f5486fa6d20e51d98a50f61e05d055196
+EBUILD rosservice-1.15.14.ebuild 526 BLAKE2B 47fa13ca082931ea78f83542deacaefa2d3ccd0af31ac92308a1c359d963db4c9621c9b940b790cca5b25b2ed46e7021ec3db35acd112c8258992f52e9b84b1b SHA512 c9a84a4e32057eb334275b10abc025cc58896d8c19dee9912600d78c710964765c9a9ee5e2ee24dffedd18ef588f0e83e11c3a835a8ef3cd5313c44ffc5987ef
 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.14.ebuild b/dev-ros/rosservice/rosservice-1.15.14.ebuild
new file mode 100644
index 000000000000..a0668fead1f7
--- /dev/null
+++ b/dev-ros/rosservice/rosservice-1.15.14.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 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 b5087d201abd..d8f160339734 100644
--- a/dev-ros/rostest/Manifest
+++ b/dev-ros/rostest/Manifest
@@ -1,11 +1,13 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 742 BLAKE2B 34a90031dea413cd529733e0a9bd2146d30a7409e69005299922dad54e3abd9276a3fcb7e3a2146ab9759e5295d502e4b3b108feedde0303ddab25c41c39741c SHA512 f6cf32c8a596f1c0035b42ce9851570b5262b04f19e53af13b0685e384d83d1e019a2f36018917db14b0f2b933761801a9742db44cc2fcd178c29926ea2348f6
+EBUILD rostest-1.15.14.ebuild 742 BLAKE2B bcdb28807d59c97c6b0a697812ba7f3ea2d649ca9d3d196575afdee25dfb1f87292ce00ef3fb2a6a1ce5e204ff529c7fa85fd2747c66d9b23792f20869116152 SHA512 11bc275a019b19dd5f04d3f7f789dbfec58153aaed49f5983100938e36a9482b85a7b2cc9f7c7505c4dc6361af2a748fd1b74866f7a5eb812d7d64aea2df3f00
 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.14.ebuild b/dev-ros/rostest/rostest-1.15.14.ebuild
new file mode 100644
index 000000000000..101a12f21293
--- /dev/null
+++ b/dev-ros/rostest/rostest-1.15.14.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 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 79948f00cc28..77afc8fb1cf3 100644
--- a/dev-ros/rostopic/Manifest
+++ b/dev-ros/rostopic/Manifest
@@ -1,11 +1,13 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 661 BLAKE2B 3fb5d2acef06664f880d1af9147943b5384ce44a109e857d0f7f9d70870978e08760b9fb67dc7e65da59ef7c8221652bfa695475a1e6ae1899f7c50f5528e61c SHA512 85a8481a49ae471fcd1c95e4fca5675ef5ba0435c1d0e898cf621a8ccd12cd421922bb12b9b567620c3d3322928698b17683d8966226a4579ad5606b5ba3e213
+EBUILD rostopic-1.15.14.ebuild 661 BLAKE2B 29e6a7cadbf3ab05aefda697ee37ae1304c5d143f5c438a7388d35c4d83e38029d85c6ca3d386fdb35a2b1cfb42bc4c57c3e78c86e1e80246d6e6d568cda4a59 SHA512 3003e683cf24b5e850201beb829b0431b0b327a4f9595d9e1dce7f1ae7fe6320a14f87ba314ef94d4f070b7b530c3b866a317524577af83eb7f2e6f567ea0eb0
 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.14.ebuild b/dev-ros/rostopic/rostopic-1.15.14.ebuild
new file mode 100644
index 000000000000..5b2b2a10295f
--- /dev/null
+++ b/dev-ros/rostopic/rostopic-1.15.14.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/roswtf/Manifest b/dev-ros/roswtf/Manifest
index 028d802b6b08..f8b7d90949aa 100644
--- a/dev-ros/roswtf/Manifest
+++ b/dev-ros/roswtf/Manifest
@@ -1,11 +1,13 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 1251 BLAKE2B 7e1a6dedbaf7d355990c29b1be423dc41528ccc2cd9901d4d517691056e44ec2ba776c1f0c57f21c9ee6f44250507d4872894f62a1480ca357ba63f7a80a3ff5 SHA512 d6b205648ef5482263076bf5344d0628c3f7fca525e4e7b20ba257974fa8f43f1252acb33d7392bd343d32a026c1551676f9f62758a18b01644d2984cbed7b99
+EBUILD roswtf-1.15.14.ebuild 1251 BLAKE2B aee226562efbe15069025deabf03c4129e1dddba4dca5842062fcb5e0e86b862ac28889f71b4061ce0b84f7ff21f928a3cc9faa761751a59f3150b3b83e7a700 SHA512 d5281e74f919b5a85d6382919dd71d36e3388e1f337cae4402528787c9f55e33ff649b4d83b90bc18cbcc4f4224629ad5dfef9b346d441dd0d7975b6ae81a7ba
 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.14.ebuild b/dev-ros/roswtf/roswtf-1.15.14.ebuild
new file mode 100644
index 000000000000..4aafd938bdfa
--- /dev/null
+++ b/dev-ros/roswtf/roswtf-1.15.14.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 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/rviz/Manifest b/dev-ros/rviz/Manifest
index b6f62cac447b..5efb6e791355 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1,5 +1,6 @@
+AUX assimp.patch 408 BLAKE2B 7bad0cf1d305c2db8e246a23399b941edffe813284ad9479149c4eaed88ae61b46d50db212d9e3c2f9504a150e314bd825438dfec6f0a36f61ad9542d628f8c4 SHA512 f7f3ca0ae3556735fa85497eb23c3406c3ae21c6db16df2bd323bcc23673bb2a6ea353103e0c9653337269d89b71bbbc62368261709c2485ac7891f8d23c21ab
 AUX yamlcpp.patch 435 BLAKE2B de34251a6eac3d860ce42defab5a157294b7f541fd508e6ce400f3c4c6d8ffacbb3f131dff7b453e09c6e6d03b10d7f0ecd8c665759d1f6c1195fae59919fa21 SHA512 f9da2a7cf56aa5b19648bdbe7b40ca5947f6dd140ef7bd65b860b8fea0dd16e42ad92b0b04a28276a6c053fde46ba6865846402e89d64dedc2ac6083b4036c2a
-DIST rviz-1.14.8.tar.gz 5127738 BLAKE2B 317d38e73f078e043984aac465bc3284f92febe2693f80871e9bf3ec55c800b42fbc87f0adedd888c3c62f526157846fe61ad6a33d97314b36fb89d8e305fe0b SHA512 a6e5d08be925f7df1f11eed72905447f30f829ddc4e9f39b957c1af284f0533814f29affa5105bafd2a31aa894c3700687401cef8bc36d31b28923f95da53904
-EBUILD rviz-1.14.8-r1.ebuild 1845 BLAKE2B 377ea5a9d1717f2c50bb0b3a2d322b0f5607212f45bd498e2e8d56c8f2b3275c09596ecee09465fc88412d95f08e0de126df751f5368ca59c99180af9373069a SHA512 bb161f9069d4a8b6a5de0325362c2523154bbcf599ef29e4448adcdaafe309242ace14ea80f03ffbfea5682e502ac48f7d94d9f7628e42d242655cb1e6b51dce
-EBUILD rviz-9999.ebuild 1845 BLAKE2B 377ea5a9d1717f2c50bb0b3a2d322b0f5607212f45bd498e2e8d56c8f2b3275c09596ecee09465fc88412d95f08e0de126df751f5368ca59c99180af9373069a SHA512 bb161f9069d4a8b6a5de0325362c2523154bbcf599ef29e4448adcdaafe309242ace14ea80f03ffbfea5682e502ac48f7d94d9f7628e42d242655cb1e6b51dce
+DIST rviz-1.14.14.tar.gz 5128499 BLAKE2B 64caed22b512b19c73a579f6d89c8a509b6b3fdf836d43a8a59255d25c1b5eb17fd9675db20739bb9c8025122ac4bd1ce558ac6fc58543fbf26f42306450fd67 SHA512 b02967af7339d50f02c8bdb90d11e872c9b293da72bf7524fba2e395ca1e55c28d274620ffdbb688ab2acc17ce0d37254fffcd52e9d3deff4efc25b4c0509b15
+EBUILD rviz-1.14.14.ebuild 1827 BLAKE2B d90772464cdbf41b665273a03ac80cf67df748331bf56970ffe807f6df267ae665a3e8d57d838f82a3b4ad9f43cbf1cf540c23299f5ffb9721b2e432253918c2 SHA512 d62e6bdddcb2a175e97058dac7e9709d05eb8fc487cd530dbe7586591b195fadf08b46b787a77791b4a406eb377180f21fd5c0904a8e134e7aeb70aabf5b5a8c
+EBUILD rviz-9999.ebuild 1827 BLAKE2B d90772464cdbf41b665273a03ac80cf67df748331bf56970ffe807f6df267ae665a3e8d57d838f82a3b4ad9f43cbf1cf540c23299f5ffb9721b2e432253918c2 SHA512 d62e6bdddcb2a175e97058dac7e9709d05eb8fc487cd530dbe7586591b195fadf08b46b787a77791b4a406eb377180f21fd5c0904a8e134e7aeb70aabf5b5a8c
 MISC metadata.xml 337 BLAKE2B 7a8932b503a69c523ed91eac0b3f286c0aeb9883709af787a8dbf16862056484e97928a94fbc238fc9cec781402cc639f1d963302418e5a09dbe80209ecb5ab6 SHA512 de7dc3480eef9fa198e8d6e9f8f722fb42c8984ca877cf05a890ead1450b0f39aa90b69a82876b1a1958d930b09bef8b20ef7e5a24d8777b9ccd1b6c49d01932
diff --git a/dev-ros/rviz/files/assimp.patch b/dev-ros/rviz/files/assimp.patch
new file mode 100644
index 000000000000..0e0eb3ed3384
--- /dev/null
+++ b/dev-ros/rviz/files/assimp.patch
@@ -0,0 +1,13 @@
+Index: rviz-1.14.14/src/rviz/CMakeLists.txt
+===================================================================
+--- rviz-1.14.14.orig/src/rviz/CMakeLists.txt
++++ rviz-1.14.14/src/rviz/CMakeLists.txt
+@@ -145,7 +145,7 @@ target_link_libraries(${PROJECT_NAME}
+   ${rviz_ADDITIONAL_LIBRARIES}
+   ${TinyXML2_LIBRARIES}
+   ${X11_X11_LIB}
+-  ${ASSIMP_LIBRARIES}
++  ${assimp_LIBRARIES}
+   ${YAML_CPP_LIBRARIES}
+ )
+ 
diff --git a/dev-ros/rviz/rviz-1.14.8-r1.ebuild b/dev-ros/rviz/rviz-1.14.14.ebuild
index 1f16a85d3c4b..3772a4e7299a 100644
--- a/dev-ros/rviz/rviz-1.14.8-r1.ebuild
+++ b/dev-ros/rviz/rviz-1.14.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ IUSE=""
 RDEPEND="
 	dev-libs/boost:=[threads(+)]
 	media-libs/assimp
-	<dev-games/ogre-1.10:=[-double-precision]
+	dev-games/ogre:=[-double-precision]
 	virtual/opengl
 	dev-qt/qtwidgets:5
 	dev-qt/qtcore:5
@@ -38,7 +38,6 @@ RDEPEND="
 	dev-ros/pluginlib
 	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/resource_retriever
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosconsole
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
@@ -69,7 +68,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+PATCHES=(
+	"${FILESDIR}/yamlcpp.patch"
+	"${FILESDIR}/assimp.patch"
+)
 
 src_test() {
 	virtx ros-catkin_src_test
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild
index 1f16a85d3c4b..3772a4e7299a 100644
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ IUSE=""
 RDEPEND="
 	dev-libs/boost:=[threads(+)]
 	media-libs/assimp
-	<dev-games/ogre-1.10:=[-double-precision]
+	dev-games/ogre:=[-double-precision]
 	virtual/opengl
 	dev-qt/qtwidgets:5
 	dev-qt/qtcore:5
@@ -38,7 +38,6 @@ RDEPEND="
 	dev-ros/pluginlib
 	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/resource_retriever
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosconsole
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
@@ -69,7 +68,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+PATCHES=(
+	"${FILESDIR}/yamlcpp.patch"
+	"${FILESDIR}/assimp.patch"
+)
 
 src_test() {
 	virtx ros-catkin_src_test
diff --git a/dev-ros/self_test/Manifest b/dev-ros/self_test/Manifest
index 74ee783ddb78..e664e793c254 100644
--- a/dev-ros/self_test/Manifest
+++ b/dev-ros/self_test/Manifest
@@ -2,12 +2,14 @@ DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7
 DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
 DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
+DIST diagnostics-1.11.0.tar.gz 538022 BLAKE2B 6d6a4c17af1080d77786f5894ca3bd5c2e39e912529aee813f1e7fede4e8265e2dc0e4b3cd09051dd9456227e4db35d24fa3eebc83f77e15ba5af3bdf169df5e SHA512 c1cb328498e45211620c4d8cd025e6d1ec4c71d853b83d7f2eb0673619c70e4a96911e60c5caa6f80298cbba93769243d07c41713972546425fbe94f8ddc8f60
 DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
 DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
 EBUILD self_test-1.10.1-r1.ebuild 585 BLAKE2B b72440306aca8f0d2320091182b5f90d5743311caabf699e64122db911a030d8f16089441828e632676ace38b960fae18275025dbbcc6d3727ff2819fa64be54 SHA512 26b866a5e4e52d05d62f4aadd172a8c57134ac3f97a277e298edcf2382f3e03599a9b95f3620688364ae3ecc96273958b29f8a10aea124b5d20883c3857cf405
 EBUILD self_test-1.10.2-r1.ebuild 585 BLAKE2B b72440306aca8f0d2320091182b5f90d5743311caabf699e64122db911a030d8f16089441828e632676ace38b960fae18275025dbbcc6d3727ff2819fa64be54 SHA512 26b866a5e4e52d05d62f4aadd172a8c57134ac3f97a277e298edcf2382f3e03599a9b95f3620688364ae3ecc96273958b29f8a10aea124b5d20883c3857cf405
 EBUILD self_test-1.10.3-r1.ebuild 585 BLAKE2B b72440306aca8f0d2320091182b5f90d5743311caabf699e64122db911a030d8f16089441828e632676ace38b960fae18275025dbbcc6d3727ff2819fa64be54 SHA512 26b866a5e4e52d05d62f4aadd172a8c57134ac3f97a277e298edcf2382f3e03599a9b95f3620688364ae3ecc96273958b29f8a10aea124b5d20883c3857cf405
 EBUILD self_test-1.10.4-r1.ebuild 585 BLAKE2B b72440306aca8f0d2320091182b5f90d5743311caabf699e64122db911a030d8f16089441828e632676ace38b960fae18275025dbbcc6d3727ff2819fa64be54 SHA512 26b866a5e4e52d05d62f4aadd172a8c57134ac3f97a277e298edcf2382f3e03599a9b95f3620688364ae3ecc96273958b29f8a10aea124b5d20883c3857cf405
+EBUILD self_test-1.11.0.ebuild 585 BLAKE2B 9d5bfba732f28c29f6cfe0e177a19db2515c9abed477f84b06b94f774fc0ec065c35404acf1d4f18826bee8d5c4c5afe8bac97fc13260ab512279126a8a97c00 SHA512 0314875f201d2dec25322098aa234567281b13b165faef878e6dce6357d8edd8c259ffb86fe33332aac3433d411ef32c2cc2fc65791e2c59dc2c9680dd6525b2
 EBUILD self_test-1.9.4-r1.ebuild 585 BLAKE2B b72440306aca8f0d2320091182b5f90d5743311caabf699e64122db911a030d8f16089441828e632676ace38b960fae18275025dbbcc6d3727ff2819fa64be54 SHA512 26b866a5e4e52d05d62f4aadd172a8c57134ac3f97a277e298edcf2382f3e03599a9b95f3620688364ae3ecc96273958b29f8a10aea124b5d20883c3857cf405
 EBUILD self_test-1.9.6-r1.ebuild 585 BLAKE2B b72440306aca8f0d2320091182b5f90d5743311caabf699e64122db911a030d8f16089441828e632676ace38b960fae18275025dbbcc6d3727ff2819fa64be54 SHA512 26b866a5e4e52d05d62f4aadd172a8c57134ac3f97a277e298edcf2382f3e03599a9b95f3620688364ae3ecc96273958b29f8a10aea124b5d20883c3857cf405
 EBUILD self_test-9999.ebuild 585 BLAKE2B b72440306aca8f0d2320091182b5f90d5743311caabf699e64122db911a030d8f16089441828e632676ace38b960fae18275025dbbcc6d3727ff2819fa64be54 SHA512 26b866a5e4e52d05d62f4aadd172a8c57134ac3f97a277e298edcf2382f3e03599a9b95f3620688364ae3ecc96273958b29f8a10aea124b5d20883c3857cf405
diff --git a/dev-ros/self_test/self_test-1.11.0.ebuild b/dev-ros/self_test/self_test-1.11.0.ebuild
new file mode 100644
index 000000000000..79556b56f35b
--- /dev/null
+++ b/dev-ros/self_test/self_test-1.11.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Robot self-test node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_updater
+	dev-ros/roscpp
+	dev-ros/rostest
+	dev-libs/boost:=[threads(+)]
+"
+DEPEND="${RDEPEND}
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-ros/rostest )"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/stereo_image_proc/Manifest b/dev-ros/stereo_image_proc/Manifest
index f2589bec274e..dc8cc4f2a30d 100644
--- a/dev-ros/stereo_image_proc/Manifest
+++ b/dev-ros/stereo_image_proc/Manifest
@@ -1,6 +1,8 @@
 DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
 DIST image_pipeline-1.15.3.tar.gz 150900 BLAKE2B 75bce8146c5273d5896ccb226bb9223f696f341089948aa44bbc932af15a1c80e6a5dbc036b4a37dcaecfca6a3e896df0935dcfb8305e23cc1a73fa77cef7a2e SHA512 9e1d21d1a43e932078938aeca4e5e6902e36e6d034a467cbd69734e318e5c4a689cb133acc7f8098f4ca928312661eb5b2aa7fae38e3d2a904b0e34889da0d32
+DIST image_pipeline-1.16.0.tar.gz 152681 BLAKE2B 6b11a07f07e8a29e601796570f404403d9acf1b31382d6d0353b2ac891c0f3345f3039bbb5bb7b3c41b10bf0478cad7a1d5590b7bbeee003aeff58437781d2e9 SHA512 909e115b150fb98a7cfa6d351b46072d92fccbded3ee15ba79135dae12d4cedf004b4c791a4c87540c74a6ad87e3947c9031e6539d09dee77527518d2b08cd18
 EBUILD stereo_image_proc-1.15.2-r1.ebuild 720 BLAKE2B a033f53547ce41e8a834f5d2a91d7d0b72b0923d8ad4ac89645cf9d87d8f8cc9f9795ea734af1601495f43bfe3f930bdddee850079ff644ebd77d99d8ea9ce2e SHA512 99e077c6a40172e3106ef6ff399e31f6e15ac9bee0cf2e89073eae82e3160824ff9d94a193d9bbd78aece1763c5eb8de15ca3033892f7c065ef445bf1fc766fc
 EBUILD stereo_image_proc-1.15.3-r1.ebuild 720 BLAKE2B a033f53547ce41e8a834f5d2a91d7d0b72b0923d8ad4ac89645cf9d87d8f8cc9f9795ea734af1601495f43bfe3f930bdddee850079ff644ebd77d99d8ea9ce2e SHA512 99e077c6a40172e3106ef6ff399e31f6e15ac9bee0cf2e89073eae82e3160824ff9d94a193d9bbd78aece1763c5eb8de15ca3033892f7c065ef445bf1fc766fc
+EBUILD stereo_image_proc-1.16.0.ebuild 720 BLAKE2B 643dfd2e40b21ff50be31fd83bb97ae80f30fa00be6aea21b27fbb1130216c3ff93226c5e99e39a18509dad1c4777d7a76c22f6609a4f4e884fcebaec9d5dbf1 SHA512 fb8be6babf98154e219fde1f0bd9b0d72de1ea4097a78d10217a87068d89aaf8821c3e190070ee5ae3cf07664f1dc65f59a342b001edfe815c09d67649e4e9f3
 EBUILD stereo_image_proc-9999.ebuild 720 BLAKE2B a033f53547ce41e8a834f5d2a91d7d0b72b0923d8ad4ac89645cf9d87d8f8cc9f9795ea734af1601495f43bfe3f930bdddee850079ff644ebd77d99d8ea9ce2e SHA512 99e077c6a40172e3106ef6ff399e31f6e15ac9bee0cf2e89073eae82e3160824ff9d94a193d9bbd78aece1763c5eb8de15ca3033892f7c065ef445bf1fc766fc
 MISC metadata.xml 344 BLAKE2B 5a86107444fb6ace449ca5724e9b37146d70b2d7cdfb964222834683c41f85f9538b290202a083db028f286ebb17742440b05b5181382b625c1fab2158e81d70 SHA512 273f5cce3fd99379d1fdeb678313491b0cfd5583076a8e093eaf4e777e4cdc615650b84840f911d5545a0555772c4f2868c17d4c07c3a90aa2ef5e881f675571
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.16.0.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.16.0.ebuild
new file mode 100644
index 000000000000..d67a1d21f7a2
--- /dev/null
+++ b/dev-ros/stereo_image_proc/stereo_image_proc-1.16.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Stereo and single image rectification and disparity processing"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	dev-ros/dynamic_reconfigure
+	dev-ros/image_geometry
+	dev-ros/image_proc
+	dev-ros/image_transport
+	dev-ros/message_filters
+	dev-ros/nodelet
+	media-libs/opencv:=
+	dev-libs/boost:=[threads(+)]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/test_diagnostic_aggregator/Manifest b/dev-ros/test_diagnostic_aggregator/Manifest
index 7e12fde35dc4..91839d568f0f 100644
--- a/dev-ros/test_diagnostic_aggregator/Manifest
+++ b/dev-ros/test_diagnostic_aggregator/Manifest
@@ -3,12 +3,14 @@ DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7
 DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 DIST diagnostics-1.10.3.tar.gz 537295 BLAKE2B be2937c7bc537eff5c4ffd04ffcd92734626d6563c0392f645af2a6a8b2937d08157168ce12248b63316b14b5ca11e78219cb0812cf02b63c79a6cc516e080c0 SHA512 7f074f8ad789e7a07323984fa79766ae4a8ce75faf99ce31549ef97ddb2eb3b37f473878cc23557b61a0f8650582db232fe69f901c48bd2b479d42166055bcd7
 DIST diagnostics-1.10.4.tar.gz 537046 BLAKE2B 944a2ba3614abc48677a000efcdbe47db95bc05adb018aa24fa4c2ce0f3e8ff21f537d94541f29947a3eb10d71012abed5f5f9049290d0a6242812ade73c780a SHA512 14aa086f5341dfb3cea8697350a79b863fba870255cb057dcd7019a32e69ed42d7c66d6ee209f65fb94875cf63001f785093da913b1a47b4a183c21c9c775d40
+DIST diagnostics-1.11.0.tar.gz 538022 BLAKE2B 6d6a4c17af1080d77786f5894ca3bd5c2e39e912529aee813f1e7fede4e8265e2dc0e4b3cd09051dd9456227e4db35d24fa3eebc83f77e15ba5af3bdf169df5e SHA512 c1cb328498e45211620c4d8cd025e6d1ec4c71d853b83d7f2eb0673619c70e4a96911e60c5caa6f80298cbba93769243d07c41713972546425fbe94f8ddc8f60
 DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
 DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
 EBUILD test_diagnostic_aggregator-1.10.1.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
 EBUILD test_diagnostic_aggregator-1.10.2.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
 EBUILD test_diagnostic_aggregator-1.10.3.ebuild 649 BLAKE2B c3cbbbf061d69d5a11d888c81701069dc59c927d372d8b5a096df539325962354a3f7b50f2b00e4cdc4dded3d2ab30bf9c39cf8dfd6bbb8aff06dbfffa884c7f SHA512 b32db928704d60159f5802abd8d8a2bada6196803ece3d9ad624b98a1419d0724cf8dc876cdfa8fa7456a773e30c610d3055db7c9446edcc4d03422660166e58
 EBUILD test_diagnostic_aggregator-1.10.4.ebuild 649 BLAKE2B c3cbbbf061d69d5a11d888c81701069dc59c927d372d8b5a096df539325962354a3f7b50f2b00e4cdc4dded3d2ab30bf9c39cf8dfd6bbb8aff06dbfffa884c7f SHA512 b32db928704d60159f5802abd8d8a2bada6196803ece3d9ad624b98a1419d0724cf8dc876cdfa8fa7456a773e30c610d3055db7c9446edcc4d03422660166e58
+EBUILD test_diagnostic_aggregator-1.11.0.ebuild 649 BLAKE2B b4a32c52cf87fe7fc3e1f47898725ed385b02fe06d4aaf1e30539ce67f2bc25dfd37c948076a28c667280382af046ea4e789faec6019b4badfd32cb57e3c88bd SHA512 139ce40bf5c4364c90b8462ccd57887f15c19703b8758f020d748daaba5a27a94b8eb4728293ab48457140786cc655d1bb57c2746b192a7bead72113ca066336
 EBUILD test_diagnostic_aggregator-1.9.4.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
 EBUILD test_diagnostic_aggregator-1.9.6.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
 EBUILD test_diagnostic_aggregator-9999.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.11.0.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.11.0.ebuild
new file mode 100644
index 000000000000..58f42fd7efc3
--- /dev/null
+++ b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.11.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="diagnostic_aggregator tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_aggregator
+	dev-ros/diagnostic_msgs
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/rospy
+	dev-ros/rostest
+"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gcc6.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_nodelet/Manifest b/dev-ros/test_nodelet/Manifest
index a7c5bf3fafb4..c733ba8860a3 100644
--- a/dev-ros/test_nodelet/Manifest
+++ b/dev-ros/test_nodelet/Manifest
@@ -1,7 +1,9 @@
 AUX gcc6.patch 487 BLAKE2B 30f0092f37d10831053ac74ecabf13d591e4da145772e4b42b352bc9d7299f013737b64ab8f88145100d6490f5a7b3041780d11dc45fea62ae4264be05ceec43 SHA512 1258e607c9fdd0a645e3396186408be7628ba53b6b1994a00552be48b65b413038818cb414ccf521c404a80373094059d0478f859540dff23141f14b50cfaeb3
 DIST nodelet_core-1.10.0.tar.gz 45386 BLAKE2B 1da08ec8bc134e0eba72d7c0cde7cfd351c91c5bf4bc8d66ad3d30a8dbe39452c511b6a753ea91a139ce06b617d71f06cfb2f67c7ee2482eb5d2aba79680799c SHA512 4a298cc214660050b7a4d4f3a1e8980cbde2d05bb19369856031a128d3ca7518cbbd4615fe8c0c5944b09dca96aeaa8f41a630b2f34f9e2af423349e816c54e9
 DIST nodelet_core-1.10.1.tar.gz 45409 BLAKE2B e27fa3075bcdfe9f309758a7c2930d73d760236eb5f68c83206314f8001e2aecd5e164ffaf5a27be7dbc6353042119415772db138478b3e2112f00cbf3f380d1 SHA512 2ab86a350692afeb6ec4861eb1dbc33a58a6ea662238223d8f0be74dba4c96323dabc176b77171e2b3affb6447dfd0ec11ca49346f03d33e8aa13d8b9599e260
+DIST nodelet_core-1.10.2.tar.gz 46049 BLAKE2B 19da87672c965fa84e6b8ae48eb3d40514dad79611a27c5d632c2300e2cb7b269abb1b3862390795b55e3bec3a48c686f5af19c4aa627faf975dcaa7e2b32c19 SHA512 5f9827a8b5e491640c57bfb242ffc266291825dbc6ba452ad5be6d7bd2168872205378cc1eac398afff1a8fb0ce3763ce36a1eff627644037f799b87ee86fc99
 EBUILD test_nodelet-1.10.0.ebuild 661 BLAKE2B 595be0457dd39d3dd9c8bb2f7f2ebc132afd5fa01c5261ac2c92c88ff38f212f6cd23c4ebb5e87cc4f620174ccdf914b907cdbdcc865252f8a10cc476edd5b91 SHA512 5eb9ebd871b693186ca890150faec461880cd3194fe0efc05142c38e9d8d4995dce7ba91af43806b7f295560cdabaef0faa02ebca2a4bebfc9564f1cd0b00ee3
 EBUILD test_nodelet-1.10.1.ebuild 661 BLAKE2B d84a52b248634cf969b6a0a150901b9c1a337e72541f58f304b04acc07057e977ccfa76bffd9ebcbd0a747a4b20827154f1e638dc0083cc15a6da09c59015780 SHA512 4421b77c9e9f40885e5040f1e3e8c0f8f581fad0a807b7fc891ffa544b113359b55a5ba98648299c50a87885d7374ee51ec507e5dd6ef991254a1c7a1366cf91
+EBUILD test_nodelet-1.10.2.ebuild 661 BLAKE2B 1e44fe23e92c7750b7a68dc5948d0ecedf4c8a5bfdf6623846a58d38800c4139eab05c660cace3ade3ed81c3d1f669e7650b582b26cb06a2e30849fdd8db4799 SHA512 5b0cd2c078793129fc13e07f80bce43d2c6d17fdf1307d1c559d5447a042f7d559ab324c39d16c62449e6778de856805cef637ed7016aaa67edaf4fa3dfccf07
 EBUILD test_nodelet-9999.ebuild 661 BLAKE2B 595be0457dd39d3dd9c8bb2f7f2ebc132afd5fa01c5261ac2c92c88ff38f212f6cd23c4ebb5e87cc4f620174ccdf914b907cdbdcc865252f8a10cc476edd5b91 SHA512 5eb9ebd871b693186ca890150faec461880cd3194fe0efc05142c38e9d8d4995dce7ba91af43806b7f295560cdabaef0faa02ebca2a4bebfc9564f1cd0b00ee3
 MISC metadata.xml 331 BLAKE2B 9cdba9b3243ff84970d32b4e3eefc05cb7623a2ca0182a8a2ce02c30e31ebfbbd256e7e8067e69f2276675067a8d1b6330ea421f4b112e9b487047f12ce13553 SHA512 7c8b10d8f28ca71b613b548d444c4c0f20cc50800976f9f4f5af5514f9cc1a3d2250678d5bedb8df52aa21e619069898caef2bdc51530bf1bcdacfa69fbe922b
diff --git a/dev-ros/test_nodelet/test_nodelet-1.10.2.ebuild b/dev-ros/test_nodelet/test_nodelet-1.10.2.ebuild
new file mode 100644
index 000000000000..6906c506edc5
--- /dev/null
+++ b/dev-ros/test_nodelet/test_nodelet-1.10.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 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/nodelet_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Nodelet unit tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/nodelet
+		dev-ros/pluginlib
+		dev-ros/rostest
+		dev-libs/boost
+		dev-cpp/gtest
+		dev-ros/rosbash
+	)
+"
+PATCHES=( "${FILESDIR}/gcc6.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_nodelet_topic_tools/Manifest b/dev-ros/test_nodelet_topic_tools/Manifest
index c45623d5e637..bca3140294ec 100644
--- a/dev-ros/test_nodelet_topic_tools/Manifest
+++ b/dev-ros/test_nodelet_topic_tools/Manifest
@@ -1,6 +1,8 @@
 DIST nodelet_core-1.10.0.tar.gz 45386 BLAKE2B 1da08ec8bc134e0eba72d7c0cde7cfd351c91c5bf4bc8d66ad3d30a8dbe39452c511b6a753ea91a139ce06b617d71f06cfb2f67c7ee2482eb5d2aba79680799c SHA512 4a298cc214660050b7a4d4f3a1e8980cbde2d05bb19369856031a128d3ca7518cbbd4615fe8c0c5944b09dca96aeaa8f41a630b2f34f9e2af423349e816c54e9
 DIST nodelet_core-1.10.1.tar.gz 45409 BLAKE2B e27fa3075bcdfe9f309758a7c2930d73d760236eb5f68c83206314f8001e2aecd5e164ffaf5a27be7dbc6353042119415772db138478b3e2112f00cbf3f380d1 SHA512 2ab86a350692afeb6ec4861eb1dbc33a58a6ea662238223d8f0be74dba4c96323dabc176b77171e2b3affb6447dfd0ec11ca49346f03d33e8aa13d8b9599e260
+DIST nodelet_core-1.10.2.tar.gz 46049 BLAKE2B 19da87672c965fa84e6b8ae48eb3d40514dad79611a27c5d632c2300e2cb7b269abb1b3862390795b55e3bec3a48c686f5af19c4aa627faf975dcaa7e2b32c19 SHA512 5f9827a8b5e491640c57bfb242ffc266291825dbc6ba452ad5be6d7bd2168872205378cc1eac398afff1a8fb0ce3763ce36a1eff627644037f799b87ee86fc99
 EBUILD test_nodelet_topic_tools-1.10.0.ebuild 681 BLAKE2B 6886013421f857e8e7ed5a337674f9cc2cee65fee504bd6cd24a7d11a135bcaf9b2a53a3fbdb9e31954e1a4632548585194c3ce2e15f865b9a9a9172ec8c64c3 SHA512 3b7cc612fa9bfc74c2fda44296b5790b9ee6b74a76f56f8e3714f6b50f4110052e8aaddeda6759e91dfaedb3291329830041980fd103557687cccf3acd0d7cd7
 EBUILD test_nodelet_topic_tools-1.10.1.ebuild 681 BLAKE2B c7b96ba97ecac07da0e77724237e584e65aa500b1a1820aac007842456db412472f6502180aaa86c345c928106cc9a18fdbff45ba6f564997456139cd3526c27 SHA512 d4eac84421e4dd03a3d369776ff58fafa8242bf8fe91b4e23d3ec9a6446fbf5f5c9f63459e73967b08368aa2b1a62908be2f7372c56ec1b1626069431dc81b62
+EBUILD test_nodelet_topic_tools-1.10.2.ebuild 681 BLAKE2B b11a0454ba6382975074a94591019d5cee156c5a9e9b434bc4eebf10843642a5b8b654d2c3888abf58a9839878be51aa9c81ca86fff1b7a7a748507048d3af31 SHA512 56f2b130ed56bcca39328d7d669ca987d67ecc3d7137949786b25f262ce6dd3eb9e4df58ca59ed7115de039ab6b3bdcf0483ad19cf0d3e7e1c89ae86d1d52815
 EBUILD test_nodelet_topic_tools-9999.ebuild 681 BLAKE2B 6886013421f857e8e7ed5a337674f9cc2cee65fee504bd6cd24a7d11a135bcaf9b2a53a3fbdb9e31954e1a4632548585194c3ce2e15f865b9a9a9172ec8c64c3 SHA512 3b7cc612fa9bfc74c2fda44296b5790b9ee6b74a76f56f8e3714f6b50f4110052e8aaddeda6759e91dfaedb3291329830041980fd103557687cccf3acd0d7cd7
 MISC metadata.xml 331 BLAKE2B 9cdba9b3243ff84970d32b4e3eefc05cb7623a2ca0182a8a2ce02c30e31ebfbbd256e7e8067e69f2276675067a8d1b6330ea421f4b112e9b487047f12ce13553 SHA512 7c8b10d8f28ca71b613b548d444c4c0f20cc50800976f9f4f5af5514f9cc1a3d2250678d5bedb8df52aa21e619069898caef2bdc51530bf1bcdacfa69fbe922b
diff --git a/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.10.2.ebuild b/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.10.2.ebuild
new file mode 100644
index 000000000000..2ce4b28f37d7
--- /dev/null
+++ b/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.10.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 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/nodelet_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Nodelet topic tools unit tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/message_filters
+	dev-ros/nodelet
+	dev-ros/nodelet_topic_tools
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/rostest
+	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_rosbag/Manifest b/dev-ros/test_rosbag/Manifest
index 43ea5fb388ae..f2d136c38a68 100644
--- a/dev-ros/test_rosbag/Manifest
+++ b/dev-ros/test_rosbag/Manifest
@@ -1,5 +1,6 @@
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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
@@ -70,6 +71,41 @@ DIST test_rosbag-1.15.13-test_future_version_2.1.bag 6051 BLAKE2B 5368be834eaaf7
 DIST test_rosbag-1.15.13-test_indexed_1.2.bag 142311 BLAKE2B 51e4f41334a4191a02e6cd2723ff7a38ea6b99e272304ff8be83641d31d3c4bc3bbddf835923da447d274d27253d0cf162ff065e6f952799c204a6d3b8a429bc SHA512 8c2b6973e549d1b5c2e1fe5f6873c40b7877fa87e7864d39e86646083baf481ecb3d9c1fc4ca5d44332b3b4b0f41856dd5dd2c71ce9f2281fdc61c9846bcd5b8
 DIST test_rosbag-1.15.13-test_rosbag_latched_pub.bag 4816 BLAKE2B 2a0a90eb46665486ac7a31249d7bc9c3c4f125c934a09e3fb0130bf43b10035552f9de0f0fd8280cec4cb1eb71fc7dc624ba1152724e602a2483a2df63869c3f SHA512 e1655185e8ea6a02aaccce4e819eb6d6aec48032f4f55e17d7c8649aa0d0b56eded659a97e2f83c7d04e221beb8a330bce093300d422c63f3b330f5b2b8bb8ca
 DIST test_rosbag-1.15.13-unmigrated_gen1.bag 4828 BLAKE2B 0fc0e446f8c31fef4b21a669b15a86340d0dcff2406a85f88ccdc84e6f3ff4a71252151d191c30c9879d2ce3031faf9101aaa22834cdd733491a2f92d53a7a04 SHA512 333dbf41976ae732e33f394883965d9d07bfe35d8f3c5be1bd129ff4ded31f8c8201b9fdd8bee7ecaf7f04f49d0ee7c7d2be1ec4c8322d0b0b9cc0a236fe8342
+DIST test_rosbag-1.15.14-chatter_50hz.bag 28923 BLAKE2B 2a2304b98d33b902fa3b8fc4d2a0fa3da9af600ab9f66ebf74ecb2214160346d10a0ba58d2b8dfb7039dcd7ca05e58bf7b253899238dabab1c29264970b124b7 SHA512 7493e773d678aed10ca274f8a253a412846c90fa238ac7407b04f39355b94285b40b177ae45a0a5b5ae1c2fe2d74284fba1c082550f21dd30cf5e5891ef402e1
+DIST test_rosbag-1.15.14-constants_gen1.bag 4783 BLAKE2B fec06b1016d0a6e616893f050c22072ef01cc4bc944f3778cb45613d699e404b8721b35f9563f22fa87e473f9f439965ba804cc6478c59dbeab95309375046c7 SHA512 724a420e99946a5fba1b092363cb11af11a50e85c4531b57fe64b207ed1e4022e35a870014873919a7bfe3680ae0b5b4275777f3305b8c5d1fdd7316e7d67e7b
+DIST test_rosbag-1.15.14-constants_gen2.bag 4783 BLAKE2B 6db44a7ddc61307f49bb28e276b8a834044b43d79d37ceba0aef21c8dea8a6d3ee32cc156f8bc429f074752dfc5a249b789936a6d8bf5e11397c2ee4f0e7d925 SHA512 a0df68425bf268da7d622ea43fb755dd7161bf3443c5c2499862c8932ce5e86e4edc6746a9f4a6bc4b4bb9c070a2b3af26d26755e18e796600184f280579aedc
+DIST test_rosbag-1.15.14-converged_gen1.bag 5197 BLAKE2B 99b3a9807b2e569f6773b791b008b1430408843037203a257892c82a6f59dd3e688a4f516e91d26fa567b56bececc3f69d69f4999e7a1e1430a9a606686a8de9 SHA512 490677292a7ea95109e7542e1219f51d7de9cf3bfbf90f48836fd80387655752ecb1173cbb65fc40908eb552fe1bae45e821c1b8510a401c7b643d2c0c433881
+DIST test_rosbag-1.15.14-converged_gen2.bag 5197 BLAKE2B e5b620a47c7f44911e5ee44c5787cd9ff753763816535ddaaf64f5e83a27504a5f6d241d900c0c3eacc5b9273113ad05f72cd828a4ebfb6d997df46fbc8b0cc7 SHA512 2779711e7d1223b14223312e1cbb6222ef6fdc32bd28dab6cb830784d5207f5ec7cc826e1336328520a45b15ddc937bf0be7eb8329932b77b9f1f42d162b7795
+DIST test_rosbag-1.15.14-converged_gen3.bag 5209 BLAKE2B f6d3615c771b086220350982c5ff726f263a460a714aaa3abcd683216dbdeaa72ddfd2fa2b42e761f82223af29ffa1bad554a67fc6afab52f08ffd1718fcadf0 SHA512 d896b361c73ba904c1766c9899d03f09d7ce62126378c195c620b659ff06dbdb61783ef7cddd999088a973382e60387a8eadd1d7dbd67af2d7af6c1c1fa87b6f
+DIST test_rosbag-1.15.14-converged_gen4.bag 5207 BLAKE2B d25369cfa2e0f34ab7b344ac56557292ec1b5609802327ade48d60e632900e4d746e15c9a46b700a44c198d1aef1975b042efbb1ca885f4124b5cef4936925ff SHA512 329694efa2dd1ad82a87f1419958bc2cb1edf4d8ae4ffde1c2d3d3b792d1dcba842b82c9f028cf3bb2f85fadbb068e5ed25eaebc8cd6e305c422d40dbeb75775
+DIST test_rosbag-1.15.14-convergent_gen1.bag 5485 BLAKE2B bd906d5ced9d123e04fa8b948834b907530ba2c56f4197f7ff209ec5d6afb18ff42e29d03f883d2d44e89e49c12e3769013f8209e5a674a7fd138d0264083295 SHA512 85a4129f954d4d3a2374c1c2c7fbdd82ee685853763ab62a836ab128b1dd118746984d1c1b8290ac1b522fac18493e1ab825b1a66924151dff608af0a5e07541
+DIST test_rosbag-1.15.14-convergent_gen2.bag 5485 BLAKE2B f5f6c3ed07b8cabca79fe826dcb7dbf0a9e3d7aed1d3bb0767e47a1f269e5c198de90f6e0052911f4148238b99bc3f48ea417d9a1642efb5bee74d5b5f9e7b5f SHA512 09fba991e4efe5758082f9af2501b0bc9ea452b247e3672b8eae5cef3d8d43ebbc0c7307bcb5730f1ec9a94e86506258d04e1cb25fb8d5f680f38b4b73e96c68
+DIST test_rosbag-1.15.14-migrated_addsub_gen1.bag 5031 BLAKE2B eeaff544bc0de8f9d058ebec594318b9ea8ee383f8b5083258de9dcb0068d1d6c0169cf97cc221675509932c8aa630e13958a2e82f413d6e834b3114c4702824 SHA512 b41a4a5651a97f70774c1395c8f9d5b0f4815f7e39052904fe1e89483270f9eb5216a6bd3652c2372c6c64666b4cc5e60d04f390f5ea83f88653035fa1a432fb
+DIST test_rosbag-1.15.14-migrated_explicit_gen1.bag 6172 BLAKE2B 9d5692ed7683a8a426467969488836102c56d51878c1c2d28d60f5a66a3429395cadfff75a177003238e1184ef1ff927479fb205a28e359c9e4efcbd41a1e767 SHA512 e11282b83feef48c039d34400216406537704ea5bcc10e62434bd2917a9ee0942a67315a8667d0ae7e76da178537b01f88a638f5e360663e51a438a4c6049661
+DIST test_rosbag-1.15.14-migrated_explicit_gen2.bag 6212 BLAKE2B 97b231a06d372d813dbfb6c80a6c293dda743ba4ad436ac0e265c37650461bb83315304f25d5a299eb4d82e59e6a776b4c7a66ace154aa6fb9d75bff10e45e06 SHA512 690fdad115ac672617bad2510e139f5cf67599b4e21a56dafd45bfda9f1991f4fc9251dc41c36834931402722261b008ff0ea283afd99daa3eda20bb357810ed
+DIST test_rosbag-1.15.14-migrated_explicit_gen3.bag 6220 BLAKE2B 7f9ba4eade5e2e7c03b2e180f1507cce58331493a2dddc1213a6ed5d8a46d198569ef5d5effe398c97c372adcbfed756649c35c0ae38362f017cf768faebc30e SHA512 35911f4d68eda67a49cfa03ad65c6b6a84e74f161b38839fed7a1ceeadd10715f4d82b124d640f7cfc356f107e376ea6bc9016c1be32592fe2f6865d5bb8f868
+DIST test_rosbag-1.15.14-migrated_explicit_gen4.bag 6359 BLAKE2B 156e06ff065827bea0797c6f55dfaf37cb973ac07085cb56d4f3c85eadf1c994cf859e0e7b85bf65234a52b56cf4632d2ce2c8c05c172f5c838c403fdb83fc42 SHA512 5dccc7f8bd03ce08b584a69d6a9e54969bd014d22d7af3e1a9b09d9c42ab4029cf13205f56ea81913ce47c6a5f383d1c9082feb8857fa0d4f1459f97d2f4460c
+DIST test_rosbag-1.15.14-migrated_implicit_gen1.bag 6690 BLAKE2B b6d9d8dda4bae2d41aa81928daaada62da89a7be38e8f73ed9c2c2bb7c652d194eb7afd201ca0c0283ee88a77e103d8ccb86c60bffa4adcacde7a0f7f3b7f56d SHA512 a09816ef8c00b0005c1ee42b4d33739b776e6b8792f34f3c5e70ffb91ebc4c4e3c92396d733c3fe4314bd646533d71ede9cae57faeb8a311a25e13421731aeb6
+DIST test_rosbag-1.15.14-migrated_implicit_gen2.bag 6740 BLAKE2B 2f3d4a397188454f6ee4f2cfd2438361a3ce83b4e7d124feaa15788f6e49a074db433d8e87b43961984b0c243cd02651abb26ebeca0a51eeda9b61cc7d786f8e SHA512 da0fad58643a06c8c15ae6b13530b3e879269602b6dde750ec2706087206db82bb8f4a386830b36426c98fdc71eb6d2fcf6d2ee8d0be230beb3855447acc3bb3
+DIST test_rosbag-1.15.14-migrated_implicit_gen3.bag 6752 BLAKE2B f5f7c56815dd1e9bd277cde0a91dd53a68c342527578123ad25ec981c30486ddeca774c7d4f8dcf0606d189b14e235f349490f47ceb3a191250cada8f82c32e0 SHA512 2068238ca893201d24ed26b17d8b94e13a82d9f556352572da8c44e2455f75c984454bb09074b688f11ec0a7a5e38791b669f7cdea98863d0c301917ffe5d342
+DIST test_rosbag-1.15.14-migrated_implicit_gen4.bag 6889 BLAKE2B 6f8dbc6f2920d10535c8574470e23d3007033942949ef599437dde5fd64b860139f79a9835e255065fe3c74445ef702c3793f0adfc972f88fa7046c081ec5976 SHA512 4fb2b1f78b4cfd5b155415724ab224b6d619a44af94ade80f8bd6ef30b46e498633a5457d8f939c96902a641e0fd45cac2aa8e4e7f7a26efb6c78109b2dcd4d7
+DIST test_rosbag-1.15.14-migrated_mixed_gen1.bag 7120 BLAKE2B 1788a394a5cef74864071994a97fa0a7df28167531261636b74cbb688e0e62902e2e9577f09d1546b3f3dbb0533332b8c5aee47f01a30606744cdaaa5c573a0e SHA512 a8354f9386fe2b8da148919cc036041570eb999b94be162ee06b2abfd5f0b150fe96af45530c18b86eafda2e0299b8dfa8faf1cf3ab1571a0f62f17e6ba1147c
+DIST test_rosbag-1.15.14-migrated_mixed_gen2.bag 7178 BLAKE2B aa251ca30288b42d91f5bc37e672551a90575b10ecb058042deb88b45d41a9dc38c5e17081780ca75436cee886f71e1405f7970ac1025693fbc94f8444aaed60 SHA512 fd1ffb05ea65a798c07568778da71b6f3d5c7cebd4a541ace4d800b2eff3c9ee3ce1b1b21017e4aab73438ab3005d6cf966993a7b17afce16c5b788354c5d868
+DIST test_rosbag-1.15.14-migrated_mixed_gen3.bag 7252 BLAKE2B 29896d975cd406b525e8e59e24d26817a9a13b84833d9c08733bfc05be392d6e0be6de5bbced5068bed33ae60ce4053922c8092f259a48e23ae796ac43e8e601 SHA512 d0a5fd042c614e6451b9b6518ecd3317a727939db81fa8988c700a657be77f9cc14127cd0595c97a505094df9e96b63f79381be2da3717e34f3481d521905518
+DIST test_rosbag-1.15.14-migrated_mixed_gen4.bag 7387 BLAKE2B 55de46bbc4e115113df7ccac4c08e61308e7c06ddde1f6e69a436b4b32fb296b9f60d029473f46cf37b0894e501040f4e748302a9d7c8c8684911983860519c1 SHA512 5f106b3a64968ced5baeb0f91dac7209af508c6cdc2c3148bd9c86421024051f2bd7d12027af2857dd1e49964babb330333e02bb94a120426763695c06bd31ef
+DIST test_rosbag-1.15.14-partially_migrated_gen1.bag 6568 BLAKE2B c3d16f271e035140ab802123d7d848d4d7c0e00841edd0282c632c92bbe030847bd879e7e7ff24f6384f9f2f34a9dd38bb7b5e281de9df7203d2c43c28600fa3 SHA512 ecec0e8c3ccd4613048d300417218488a3578a131ed0bd346cf07dc6c702abb2354288558e56ffd6c192abb1e2afd7084a856eecd51a935e207936b5e3d52e32
+DIST test_rosbag-1.15.14-partially_migrated_gen2.bag 6616 BLAKE2B 846b84e3d221b490d3f7b90083d5354ea21906b51569fa9c57642c6e52d06e3caa4a68b3f0fffbb5c808bb440fd17507c80a60a87bd0cb8207a14eb01418de24 SHA512 aac71997873669661eaab2d0f463e3e5afb677c9852a572fd9f139a9037d3e26e2d2ae8b9e16c204eae8f494a1a867638e5f7750293ccec27402dbea0804e712
+DIST test_rosbag-1.15.14-partially_migrated_gen3.bag 6707 BLAKE2B 6d5df33b8def73503cc35de95b680607cb7d687a16082558dd95b8b869866837cb584173088ee2a2c2d9f7ca21193eea287bef111103f8bacec2aa635cbe3e68 SHA512 e730b1b0604253286b4e53d917f01bad10cbe81b8b1547984657bd8e90112c20e1b24ba315aedccc1495374070fbbe6f7b8e51cd68e82986f68efd0785b7386d
+DIST test_rosbag-1.15.14-partially_migrated_gen4.bag 6910 BLAKE2B bde0ec1f776c109cd0c21cf4ce87b3f363c50b0eeebe004ff0060713204391f88fdae3a2a801dd6c4530f3eaf0ee74bd51ecb31ef78c34ced7a26f2a6c80de4f SHA512 42e894acacc8e974f495d8c2ca088b89a71506996f10dbfac431e6bd48af2338b2e8b7eee4c5a40098b04086c47e63f2f80f228ed39a0db4c197a47081c69f4a
+DIST test_rosbag-1.15.14-renamed_gen1.bag 4825 BLAKE2B 37b156027af0b490e00611eb31cd407cf576dd2be1abe77f3a2ca01e04e19f0a498163673928bd82fc660e38c7f9b9f7745f0b5bc2c3b5254e3d41f575561510 SHA512 99c6b187a45ac4d56544b163a876107be744d12515ff4baa6195857796d81c3b7fa0f75369c945a2bdf2954429129f5802a8a8ac6ac3a69ac1bd6b7feeb05173
+DIST test_rosbag-1.15.14-renamed_gen2.bag 4825 BLAKE2B 8a1ee3a3e421f0c2b298fcc9a4260dd76cc211c05e5d944f76f3f7d1feb461b439a5a6dc7dc545295237756510383042ab86e590e879ad35b6cdb8131d054ceb SHA512 c64b77c215c08c443d674bb12e9ac50a5fb234442c14cdea77e2936eabfe8c369947902ff6c9a211d8c3b9aa93f5677dadf8bb3b8145fc3a4b80f6c4f235e6f8
+DIST test_rosbag-1.15.14-renamed_gen3.bag 4835 BLAKE2B 8884b8fa15c3698a1d1fb19147fb2023cbd2946441ad9d4df2ef5ded3c455b2bce5a5cf6618f6e47729dc495b20b8f55a1750c4763ab4fb65c25d2a1f01de011 SHA512 67142debaecf05b76a42cf198572a9ff4bddf4c4da0b798e467f02ed5aa8ff2b6fabc248fa5caa33f346560edac1b3f38eb72ebae75b0224f6b281e5c21211a3
+DIST test_rosbag-1.15.14-renamed_gen4.bag 4833 BLAKE2B 72010f49332c337f998c4dd54a3399773e893f4f41ce01f7b130861993684641ff575c65e8bfcf1127a8dd590c0152ffcce08dfcd124e7a43c9ae8443983438e SHA512 2adfd75e05469793eb95ab68ca8403cd78f3a836157b0b1abcf21f11f16633b0e9c840f800ee5d51376fe91a31710d5674deb2c1c6e1a262517ab173550253cc
+DIST test_rosbag-1.15.14-subunmigrated_gen1.bag 5200 BLAKE2B 6786d316f28f7038b961fce5d4094b6948eb1f292dc63c04efdc9459c012acefcc7f962452a11ae53e8de4096c758833d7374ccbfc1a16b626e6c21af92b7979 SHA512 318d921f505ee97ab9ceba536ee48c4d5d5d8aa7d2619864b325d8083582daff43cf9bb61ff5ec3814e815cc334190b11687734e21141fbade9611a98244783b
+DIST test_rosbag-1.15.14-test_future_version_2.1.bag 6051 BLAKE2B 5368be834eaaf7d48519560295406a92ecc6573f7cbcbd5a29c9f05c12322198b1da8209b0316b5d694cdfbde8a9ba26be3a6f529154594e148743f7b618de45 SHA512 9a9870b28d5e0f12ed98fd1df6be21fa37e5db9f9423eb39cbbc7e8f042078210f7ccc8f534a02a5edc51fb61817ddeec705a8687917742648c1fdb70adf88db
+DIST test_rosbag-1.15.14-test_indexed_1.2.bag 142311 BLAKE2B 51e4f41334a4191a02e6cd2723ff7a38ea6b99e272304ff8be83641d31d3c4bc3bbddf835923da447d274d27253d0cf162ff065e6f952799c204a6d3b8a429bc SHA512 8c2b6973e549d1b5c2e1fe5f6873c40b7877fa87e7864d39e86646083baf481ecb3d9c1fc4ca5d44332b3b4b0f41856dd5dd2c71ce9f2281fdc61c9846bcd5b8
+DIST test_rosbag-1.15.14-test_rosbag_latched_pub.bag 4816 BLAKE2B 2a0a90eb46665486ac7a31249d7bc9c3c4f125c934a09e3fb0130bf43b10035552f9de0f0fd8280cec4cb1eb71fc7dc624ba1152724e602a2483a2df63869c3f SHA512 e1655185e8ea6a02aaccce4e819eb6d6aec48032f4f55e17d7c8649aa0d0b56eded659a97e2f83c7d04e221beb8a330bce093300d422c63f3b330f5b2b8bb8ca
+DIST test_rosbag-1.15.14-unmigrated_gen1.bag 4828 BLAKE2B 0fc0e446f8c31fef4b21a669b15a86340d0dcff2406a85f88ccdc84e6f3ff4a71252151d191c30c9879d2ce3031faf9101aaa22834cdd733491a2f92d53a7a04 SHA512 333dbf41976ae732e33f394883965d9d07bfe35d8f3c5be1bd129ff4ded31f8c8201b9fdd8bee7ecaf7f04f49d0ee7c7d2be1ec4c8322d0b0b9cc0a236fe8342
 DIST test_rosbag-9999-chatter_50hz.bag 28923 BLAKE2B 2a2304b98d33b902fa3b8fc4d2a0fa3da9af600ab9f66ebf74ecb2214160346d10a0ba58d2b8dfb7039dcd7ca05e58bf7b253899238dabab1c29264970b124b7 SHA512 7493e773d678aed10ca274f8a253a412846c90fa238ac7407b04f39355b94285b40b177ae45a0a5b5ae1c2fe2d74284fba1c082550f21dd30cf5e5891ef402e1
 DIST test_rosbag-9999-constants_gen1.bag 4783 BLAKE2B fec06b1016d0a6e616893f050c22072ef01cc4bc944f3778cb45613d699e404b8721b35f9563f22fa87e473f9f439965ba804cc6478c59dbeab95309375046c7 SHA512 724a420e99946a5fba1b092363cb11af11a50e85c4531b57fe64b207ed1e4022e35a870014873919a7bfe3680ae0b5b4275777f3305b8c5d1fdd7316e7d67e7b
 DIST test_rosbag-9999-constants_gen2.bag 4783 BLAKE2B 6db44a7ddc61307f49bb28e276b8a834044b43d79d37ceba0aef21c8dea8a6d3ee32cc156f8bc429f074752dfc5a249b789936a6d8bf5e11397c2ee4f0e7d925 SHA512 a0df68425bf268da7d622ea43fb755dd7161bf3443c5c2499862c8932ce5e86e4edc6746a9f4a6bc4b4bb9c070a2b3af26d26755e18e796600184f280579aedc
@@ -107,5 +143,6 @@ DIST test_rosbag-9999-test_rosbag_latched_pub.bag 4816 BLAKE2B 2a0a90eb46665486a
 DIST test_rosbag-9999-unmigrated_gen1.bag 4828 BLAKE2B 0fc0e446f8c31fef4b21a669b15a86340d0dcff2406a85f88ccdc84e6f3ff4a71252151d191c30c9879d2ce3031faf9101aaa22834cdd733491a2f92d53a7a04 SHA512 333dbf41976ae732e33f394883965d9d07bfe35d8f3c5be1bd129ff4ded31f8c8201b9fdd8bee7ecaf7f04f49d0ee7c7d2be1ec4c8322d0b0b9cc0a236fe8342
 EBUILD test_rosbag-1.15.11.ebuild 2482 BLAKE2B 210250ef57b758b1d1bf7100126218f20862350b8d9cd7c8832f72e953a2d413cf8f99c0ef264ced41a3813a56b9811a5ade648e8cf85119d51df831ecccb481 SHA512 fc01e4b53a3fd410fd6936f22ae89940e2c207f31b5d05f04a1b2b6cd6da0b936dcfd4277c318046b24bce408540cf5e3261af08151fe964936d3628c65f1416
 EBUILD test_rosbag-1.15.13.ebuild 2482 BLAKE2B 210250ef57b758b1d1bf7100126218f20862350b8d9cd7c8832f72e953a2d413cf8f99c0ef264ced41a3813a56b9811a5ade648e8cf85119d51df831ecccb481 SHA512 fc01e4b53a3fd410fd6936f22ae89940e2c207f31b5d05f04a1b2b6cd6da0b936dcfd4277c318046b24bce408540cf5e3261af08151fe964936d3628c65f1416
+EBUILD test_rosbag-1.15.14.ebuild 2482 BLAKE2B cbbc24c4cc2fa7ac1a9278439d24b05eb7c9bf03e068652cd26434ecd405a264e41c7753e1f707ce8958347e5abd8406566b5542e7486d128f7f2afc1f5d4698 SHA512 3f2e28ce42c5c108f0d9551d46e006c6fd9b6cfe1cd0c44ffd39134fe60fadc2b417f7691125d6b06bffe2d29486768157090d3f7fddd85a538abf61c9b4e78a
 EBUILD test_rosbag-9999.ebuild 2482 BLAKE2B 210250ef57b758b1d1bf7100126218f20862350b8d9cd7c8832f72e953a2d413cf8f99c0ef264ced41a3813a56b9811a5ade648e8cf85119d51df831ecccb481 SHA512 fc01e4b53a3fd410fd6936f22ae89940e2c207f31b5d05f04a1b2b6cd6da0b936dcfd4277c318046b24bce408540cf5e3261af08151fe964936d3628c65f1416
 MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/test_rosbag/test_rosbag-1.15.14.ebuild b/dev-ros/test_rosbag/test_rosbag-1.15.14.ebuild
new file mode 100644
index 000000000000..eb9dec36f967
--- /dev/null
+++ b/dev-ros/test_rosbag/test_rosbag-1.15.14.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+TEST_DATA="constants_gen1.bag
+constants_gen2.bag
+converged_gen1.bag
+converged_gen2.bag
+converged_gen3.bag
+converged_gen4.bag
+convergent_gen1.bag
+convergent_gen2.bag
+migrated_addsub_gen1.bag
+migrated_explicit_gen1.bag
+migrated_explicit_gen2.bag
+migrated_explicit_gen3.bag
+migrated_explicit_gen4.bag
+migrated_implicit_gen1.bag
+migrated_implicit_gen2.bag
+migrated_implicit_gen3.bag
+migrated_implicit_gen4.bag
+migrated_mixed_gen1.bag
+migrated_mixed_gen2.bag
+migrated_mixed_gen3.bag
+migrated_mixed_gen4.bag
+partially_migrated_gen1.bag
+partially_migrated_gen2.bag
+partially_migrated_gen3.bag
+partially_migrated_gen4.bag
+renamed_gen1.bag
+renamed_gen2.bag
+renamed_gen3.bag
+renamed_gen4.bag
+subunmigrated_gen1.bag
+unmigrated_gen1.bag
+"
+ROSBAG_DATA="
+test_indexed_1.2.bag
+chatter_50hz.bag
+test_future_version_2.1.bag
+test_rosbag_latched_pub.bag
+"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosbag"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+for i in ${TEST_DATA}; do
+	SRC_URI="${SRC_URI}
+		http://download.ros.org/data/test_rosbag/${i} -> ${P}-${i}"
+done
+for i in ${ROSBAG_DATA}; do
+	SRC_URI="${SRC_URI}
+		http://download.ros.org/data/rosbag/${i} -> ${P}-${i}"
+done
+
+RDEPEND="
+	dev-ros/message_generation
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/topic_tools[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/xmlrpcpp
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/boost[threads(+)]
+		app-arch/bzip2
+		dev-ros/rosout
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)
+"
+
+src_prepare() {
+	ros-catkin_src_prepare
+	for i in ${TEST_DATA} ${ROSBAG_DATA}; do
+		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
+	done
+	sed -e "s#http://download.ros.org/data/test_rosbag/#file://${S}/#g" \
+		-i bag_migration_tests/CMakeLists.txt \
+		-i CMakeLists.txt || die
+	sed -e "s#http://download.ros.org/data/rosbag/#file://${S}/#g" \
+		-i bag_migration_tests/CMakeLists.txt \
+		-i CMakeLists.txt || die
+}
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_rosbag_storage/Manifest b/dev-ros/test_rosbag_storage/Manifest
index 0653fc752607..0b24980de460 100644
--- a/dev-ros/test_rosbag_storage/Manifest
+++ b/dev-ros/test_rosbag_storage/Manifest
@@ -1,11 +1,13 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 465 BLAKE2B 34c4c6a5b4dd5994296e0de0caca6e00b04fa44292d6e6c3b4052fa96536f1b02b4a30d5385b0cc7745b64cf3cc38a0da6544ba486b704dde9e18fbe6f2d8d23 SHA512 fec456fe44002bb25f5c0b6377d54e2512a71eed69d7cc1805af28f7e930e067281b718a9fba6769a65fb5f4058953b9b2c8e55cd57d79d1d8528b4d1ba26b63
+EBUILD test_rosbag_storage-1.15.14.ebuild 465 BLAKE2B 1d4282645a9c406f369e504ec4738c1687a1b91ffc4a1a06a303ecc7a423691f9f30701160ffe99bf5d45b4291920736afcf761c52285d0c71374c097e609ae9 SHA512 2f6056f0f458200c691f1c700b02d8b0a5e7becc9b189a99317ee8b01d901fc6d1b8c41effc4e62d5411e18b19e542d682ddc758b5af855f9d3d5e20f81cf940
 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.14.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.14.ebuild
new file mode 100644
index 000000000000..3397c0ef7ed1
--- /dev/null
+++ b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.14.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 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 1d0a3d7ecd2f..777e32b99601 100644
--- a/dev-ros/test_roscpp/Manifest
+++ b/dev-ros/test_roscpp/Manifest
@@ -2,12 +2,14 @@ AUX tests.patch 512 BLAKE2B 1744807e87cdf18c3c2d74e971828a3f34986f2aff6c17e663e4
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 907 BLAKE2B 635d95284f78606deb6325567446894e49fe976b2f5df6cbfa35302bd1dfef3da7ccf314f4f56f56709b6d5c88dfd88a84ed48fe459cc00debfe16ce0edcfb67 SHA512 2c8684327c4a5c5406f2d46ae3fb25de89fc0ba8a8d29393327533965f738c4bef49feaa8573f1f98e1a825fa6ec90d43ed02a04a376ce623ee8c5f086a7332f
+EBUILD test_roscpp-1.15.14.ebuild 907 BLAKE2B 03698981fee7bb4c16f4236625e91edca0e7da5785b1c232d83c23db03cf82485795ce9c93adf32e64468c7efeb1490edaa076af01ac732ada9819d59d2dde07 SHA512 fdd3cdcf80a6750d25ee83d19e0716abc1c186a032b7c570b09cbfb0fc667ecc8be02a96092d823b30bfcfc8e2ec493e57f4d916ce6832255fd64a06c3582e32
 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.14.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.14.ebuild
new file mode 100644
index 000000000000..c4c9a58334bc
--- /dev/null
+++ b/dev-ros/test_roscpp/test_roscpp-1.15.14.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 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 abaced4ad473..b997074fb6ea 100644
--- a/dev-ros/test_rosgraph/Manifest
+++ b/dev-ros/test_rosgraph/Manifest
@@ -1,12 +1,14 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 510 BLAKE2B 382d62773752ff15bc623162e895539469b6efd98db83e6dd5ea255bc2417cf850c72cc47cb45e2c9078de708f9b1c22ac9a881fdd6a8ab243e7502c707e3199 SHA512 770669c3faf6acead18da9b7e445a62242b814322d6b69a161839c42e7018467162b6f8ce00bc89122a26935c1bdb1ad9eb0224f2e9b1b8008740bec62f3b8a7
+EBUILD test_rosgraph-1.15.14.ebuild 510 BLAKE2B 4f27e462033b5a49a4de912b7b880a8b2ccfca46b70f7e7eb9a06a2e1c4f4c1620fd6c1bb95588e5faf30f2401d2ff579ad10e9ca6966c34e80f1254e50894d9 SHA512 0cfe4f53f572a59e65dd9f3907c5f1b85d2de46b0dc30f827194ffcaba9e07d591c44e1f559e2b6c6ce2ef8544a89ecd9a2648b41850ae591d833beac66a12fd
 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.14.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.15.14.ebuild
new file mode 100644
index 000000000000..67da37d85e90
--- /dev/null
+++ b/dev-ros/test_rosgraph/test_rosgraph-1.15.14.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 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 37137cb2ad93..3956763b5a2c 100644
--- a/dev-ros/test_roslaunch/Manifest
+++ b/dev-ros/test_roslaunch/Manifest
@@ -1,11 +1,13 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 581 BLAKE2B 52ab99c09f873d9e147832a2a64467cba685509112af203c220189ae63f3a049c42e32f9d148c3b67d33edb8955ea81e1995c8ec5a534056a8ebfe1db63e0ea9 SHA512 7b5aadcb55285e7377899cb70f41941d1541d26d9ab221c54553deb017831147823bda1afa71ea90dfff956937d903c7de2d524a40a8474e3e024cdc1430c3e5
+EBUILD test_roslaunch-1.15.14.ebuild 581 BLAKE2B cfddaca063d3d847cc26c03b406fd95f18a7f8227b4f1998a216ba357d421bc7e8b5b2ac0995fab74da55e8c36b6bdd65e79ed74f6f8723cf9dc0ec7ac741096 SHA512 1de7e40a811168f15dafb47867ba1f07e685a38eafa5b27c036b672566418d8a3f0229a3c0a05e71763e836f1465d4fd38f030b62b70249044d7bd27161b9466
 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.14.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.14.ebuild
new file mode 100644
index 000000000000..b523e729a28f
--- /dev/null
+++ b/dev-ros/test_roslaunch/test_roslaunch-1.15.14.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 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 be27bf8f3bc7..65874e7ba764 100644
--- a/dev-ros/test_roslib_comm/Manifest
+++ b/dev-ros/test_roslib_comm/Manifest
@@ -1,11 +1,13 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 706 BLAKE2B d829ac240a72ceb0b2f471cafcef8df98caafb964f353ea0d4bf5faab1eee38b892e3cb738026ce8051ec6057914f4b5a55d93608dca96607f8ebd2c829dd36c SHA512 7135a1d03ad39137581c79d0b473014aa8d27c8f0ac7a9271103fd753ca836d5123fa8b4314fbcc958f975699f82f6e36733de0cd8f7a02692c8d7e340afdacd
+EBUILD test_roslib_comm-1.15.14.ebuild 706 BLAKE2B b4dce8d38f3258a23c5c3ad8bfea4ab15a364aca64baeddcb2299cb74739dc375343b65b2596e185e5fc1ed8235ee4c54495eab76fe05037a824b7c14bc42141 SHA512 f5ec27ced6b637f6fa447a9146a6560d1036e81c730d134fe7f6161771571f404a22885df5b71c003a27bd19c1b357d910738ae810286b07749c9143c980f0c6
 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.14.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.14.ebuild
new file mode 100644
index 000000000000..577fa63bdb1e
--- /dev/null
+++ b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.14.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 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 df605a3a227a..774806c5ade6 100644
--- a/dev-ros/test_rosmaster/Manifest
+++ b/dev-ros/test_rosmaster/Manifest
@@ -1,11 +1,13 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 783 BLAKE2B 004586236178305c6652839892f87a786efff23a57b6891f42dd5b8fa136a732085dda3860c72e20e300ee09cd9458606f13651eb0c16fcc48b39d4fb5d228ff SHA512 c456107a41e4ee63a7c6d77e71efca13ceeb2c8f793e72c10acaad8d1953405c41363983a6969ca0d48cc7287c4e606402fd85da77635bb5bac816e36fcbcfd1
+EBUILD test_rosmaster-1.15.14.ebuild 783 BLAKE2B 2e625723e996fe7c1a5a3a1cee3aaa9f41edc0336f5784a581709c58dfecc9465a0ba47f9590cf5ef4fe5a00e52d1351e45313dfda84569d3dc3cb5a7afc203a SHA512 37f01ad5af87a6e003859c0515f426fd2ee59fc46da43ca86c506d5b6ed87cdde57ac9e0e9c6a3a970ace25f8f9e8e38b9a8de7238f91e186926e3e299409b56
 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.14.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.15.14.ebuild
new file mode 100644
index 000000000000..cae4f9c033c3
--- /dev/null
+++ b/dev-ros/test_rosmaster/test_rosmaster-1.15.14.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 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 1f335ecbb7ad..872cd0c7402f 100644
--- a/dev-ros/test_rosparam/Manifest
+++ b/dev-ros/test_rosparam/Manifest
@@ -1,12 +1,14 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 600 BLAKE2B b51b6d1981df545993b81a00d805e66a65e5d04b2454270192d95e2a7546141fb614b7983ec653baf96ba4f989c2e51f0761e66a80fa2c195393e9c1bcdbdf97 SHA512 4b560c3bd4e5dca6c77c6197e9533bdeaf780832104ec64fb5171754abd09491ec4b102fd7578fc704b4918317ac533e77d081d00f040514c5cf6ebc796a60ae
+EBUILD test_rosparam-1.15.14.ebuild 600 BLAKE2B f06ce5a6c68235aad41f1cab28f79c3a7de4301afc12561063fbe9246a3a9657131e028fe31dda5eccdb3cba245ae3af4b78fbffcef460bb5ffc78fcffa86e9e SHA512 7b80a7439643fc33e816a86f49141f7107ba092f40b3f9969ee972ab7bb566e60a4f342d7fd8628ce4b9f6bc6ebdc790b6a01d325774dcf3c80c09db3b661306
 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.14.ebuild b/dev-ros/test_rosparam/test_rosparam-1.15.14.ebuild
new file mode 100644
index 000000000000..261604eec47c
--- /dev/null
+++ b/dev-ros/test_rosparam/test_rosparam-1.15.14.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 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 83c4b97fc585..2745a131600a 100644
--- a/dev-ros/test_rospy/Manifest
+++ b/dev-ros/test_rospy/Manifest
@@ -1,11 +1,13 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 1013 BLAKE2B e524efc6aee0a4d784dacd1f80857f0c46f2a44976c52df8a3f949a9dd79b2ee6cea38fdaca917552985c37fbce7fa7a956614c04f7b3f41a4d8737bd4dcc404 SHA512 2d6f0e11e8f25209c4e25c3adf43e5e145b4ed81e4ce61140c72733ac40f05646daed99f8c5b4b4e69c942798408bc832ba94c5d4c18049a3263d86e00a8b559
+EBUILD test_rospy-1.15.14.ebuild 1013 BLAKE2B 20d7dbcd2efb7d0ce02c6a72d72f5b92648b4c5f49746ec7c3f68d882eec80770cb7d55d5fb1f0243b0f44133087679efb9610eae106c03b815910e75de6c94e SHA512 e7a7f94a23397b9647d5f9803df8ba13992e75837b2d0c658e0ac5175e26b1887cdd57fc8e86c508ab127d82d1d08493b3075046854f154e9e4979d4bf329328
 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.14.ebuild b/dev-ros/test_rospy/test_rospy-1.15.14.ebuild
new file mode 100644
index 000000000000..77c19fe38c01
--- /dev/null
+++ b/dev-ros/test_rospy/test_rospy-1.15.14.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 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 8a53f52cf7a2..58be11609c24 100644
--- a/dev-ros/test_rosservice/Manifest
+++ b/dev-ros/test_rosservice/Manifest
@@ -1,11 +1,13 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 747 BLAKE2B ee2ed54c8d72484922df3e9d7296d7985eb33ad8c56c5c55ef5a45ffd1267313c762f820d8dc69250727f9a6664c003b2ca0674bca74ff77380d1eb1fcbd3d01 SHA512 e67ba7aae73f2d0794d15fb3a75ffba10f0e8099bda9d457fc08b7365ab3c1931afadb2636d6f8998fa1e81ae18265cfe0a8c18b6663a59b85e902e856ca3ad7
+EBUILD test_rosservice-1.15.14.ebuild 747 BLAKE2B fd2f9104a49e43ff7f985977b6a70a90f641cb5b0045c1e49ed869a90e3f26d6c1fa1f961e15323c3a4adb60853b2c02d5aff3f24ec10d0f1499a4af424951fb SHA512 4ba630323e72fd692bb8a2f56a8c115263e130a2a0b47a98809590a6dcfeaa11292b5345d7ab4c4d9e93b8a137de6230aaa13e7297b26ca634dc193d2937213a
 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.14.ebuild b/dev-ros/test_rosservice/test_rosservice-1.15.14.ebuild
new file mode 100644
index 000000000000..fbb51ec0c1c0
--- /dev/null
+++ b/dev-ros/test_rosservice/test_rosservice-1.15.14.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rospy"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	test? (
+		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
diff --git a/dev-ros/topic_tools/Manifest b/dev-ros/topic_tools/Manifest
index ead09b34fb27..a3759c265632 100644
--- a/dev-ros/topic_tools/Manifest
+++ b/dev-ros/topic_tools/Manifest
@@ -1,6 +1,8 @@
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 EBUILD topic_tools-1.15.11.ebuild 896 BLAKE2B ada9b57381ae080c76f775cb7d24cb659ac741ae073a3b92b76e8a828bf7c1bc3dc007ff44103b72aaad2c615a0234d9dd0a6386f1695e90c4ab7b1fdfdae42f SHA512 08d06c91cc8136049f47c17df3217ae3dfbf56aec73008ba20a98c991617ef5ac19ce533ecab2de0b05a2834d989dcca9ca78ff7dd97dd52bd88c681a9d20444
 EBUILD topic_tools-1.15.13.ebuild 896 BLAKE2B ada9b57381ae080c76f775cb7d24cb659ac741ae073a3b92b76e8a828bf7c1bc3dc007ff44103b72aaad2c615a0234d9dd0a6386f1695e90c4ab7b1fdfdae42f SHA512 08d06c91cc8136049f47c17df3217ae3dfbf56aec73008ba20a98c991617ef5ac19ce533ecab2de0b05a2834d989dcca9ca78ff7dd97dd52bd88c681a9d20444
+EBUILD topic_tools-1.15.14.ebuild 896 BLAKE2B dccf32299ef64da19cb1f30231143eefe2f5bf0432d08f30ba6e9e1fd1ba225854207595fb57db9d5c77840ce2beabc5c0849612770aa41fbf86ee209eee8a9c SHA512 4a1f86e2de204d05def83d92f6a66df6ea64b0c7e3eb8bd2b0d6fd9da28f2115f08070425e30587a3693d8d259ac3d01d3e1b3e42ea99b7d9a934ed23aaeb313
 EBUILD topic_tools-9999.ebuild 896 BLAKE2B ada9b57381ae080c76f775cb7d24cb659ac741ae073a3b92b76e8a828bf7c1bc3dc007ff44103b72aaad2c615a0234d9dd0a6386f1695e90c4ab7b1fdfdae42f SHA512 08d06c91cc8136049f47c17df3217ae3dfbf56aec73008ba20a98c991617ef5ac19ce533ecab2de0b05a2834d989dcca9ca78ff7dd97dd52bd88c681a9d20444
 MISC metadata.xml 327 BLAKE2B 6c8b12f6f04644a3943f8f5959973aff4b94a17295286fa2dd04562c91ec2261385e69321c980255b953e2e3ad81d1770d14ff8cf6b027cf3b837038cedd1a0b SHA512 1b670374644776a5e5537ac4c3b4aeb2207d7649504a8001b71a2fe48d6029947c1d43bd408efa8d5e73a3f0a546aab3d058d2a4e783859df84b076231d594d2
diff --git a/dev-ros/topic_tools/topic_tools-1.15.14.ebuild b/dev-ros/topic_tools/topic_tools-1.15.14.ebuild
new file mode 100644
index 000000000000..e11896922fa9
--- /dev/null
+++ b/dev-ros/topic_tools/topic_tools-1.15.14.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=tools/${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for directing, throttling and selecting ROS topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostime
+	dev-ros/xmlrpcpp
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosbash[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
+	)"
diff --git a/dev-ros/urdf/Manifest b/dev-ros/urdf/Manifest
index d6d65c392803..e9f18a641b0e 100644
--- a/dev-ros/urdf/Manifest
+++ b/dev-ros/urdf/Manifest
@@ -1,4 +1,4 @@
 DIST urdf-1.13.2.tar.gz 43588 BLAKE2B f3e97170e1930361803be2c86322ab95b62bca519127bdc3ad73065d764eaca87c2790fc1d4823e53167c853c164fc1020e1f208b6e5af025b1bb96cc0420dc2 SHA512 d22e8a647a701ff18a446d9d92511a01266b8a34c11f9f238bbc79373fa3849ebc3a11a56fea7beb4a41f893ffa30ddd5e3a6361751a6d720de6be6c6184fe41
-EBUILD urdf-1.13.2-r2.ebuild 765 BLAKE2B 2d6d394fec64f63b8e73ab141b69144e3c55c0e497191659c12f09453a803579d4f47d2947d9cdf8ad63db35e8561268be5e5a66c80fefc4fa232d5051b9bd53 SHA512 6b8455020c4c28c5855fb47a3bdf6407a5ead589084a83d9227d29931df88049526ce7ebe89754ab7029d91b9b81dfc8745c1be110259f178ee705327529e5f6
-EBUILD urdf-9999.ebuild 765 BLAKE2B 2d6d394fec64f63b8e73ab141b69144e3c55c0e497191659c12f09453a803579d4f47d2947d9cdf8ad63db35e8561268be5e5a66c80fefc4fa232d5051b9bd53 SHA512 6b8455020c4c28c5855fb47a3bdf6407a5ead589084a83d9227d29931df88049526ce7ebe89754ab7029d91b9b81dfc8745c1be110259f178ee705327529e5f6
+EBUILD urdf-1.13.2-r3.ebuild 773 BLAKE2B 20b02a43e67c18eeefe85fece6dddb1ae86523065d6c26628710e827c9fb4791859b8acb927d07cc9a5beb749a89330c385ffaf7eb5e1ec358980f0ea0490d1a SHA512 8260beeeaf19eb0733c7bafce0469928bb6a7a80a5c476f122d3dbe3a79d1d90f4665a56fceea80e056f80f95654bb9d4f55a5268aac096fb384267a7d04e805
+EBUILD urdf-9999.ebuild 773 BLAKE2B 20b02a43e67c18eeefe85fece6dddb1ae86523065d6c26628710e827c9fb4791859b8acb927d07cc9a5beb749a89330c385ffaf7eb5e1ec358980f0ea0490d1a SHA512 8260beeeaf19eb0733c7bafce0469928bb6a7a80a5c476f122d3dbe3a79d1d90f4665a56fceea80e056f80f95654bb9d4f55a5268aac096fb384267a7d04e805
 MISC metadata.xml 323 BLAKE2B e3da7b5be3eda31c2a1b6fbf7c2fbd73459d0a91d03083c1fae4ae48db17e24c5ea1526ff0ab0be47c7d2b785b392a5738c3a6792ae1776039e4fd2c527c4677 SHA512 76d44f0ff923e65928e9dd96b5e6364a3a83d3de884635d23bb63cebbdb858a19e77770740fe09b4f3b366f96bb9be5934137759b2a5af0b08bd068279af3609
diff --git a/dev-ros/urdf/urdf-1.13.2-r2.ebuild b/dev-ros/urdf/urdf-1.13.2-r3.ebuild
index 6d44db72d056..5061656d4b0c 100644
--- a/dev-ros/urdf/urdf-1.13.2-r2.ebuild
+++ b/dev-ros/urdf/urdf-1.13.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ IUSE=""
 
 RDEPEND="
 	dev-libs/boost:=[threads(+)]
-	dev-libs/urdfdom:=
+	>=dev-libs/urdfdom-3.0.1:=
 	dev-libs/urdfdom_headers
 	dev-ros/urdf_parser_plugin
 	dev-ros/pluginlib
diff --git a/dev-ros/urdf/urdf-9999.ebuild b/dev-ros/urdf/urdf-9999.ebuild
index 6d44db72d056..5061656d4b0c 100644
--- a/dev-ros/urdf/urdf-9999.ebuild
+++ b/dev-ros/urdf/urdf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ IUSE=""
 
 RDEPEND="
 	dev-libs/boost:=[threads(+)]
-	dev-libs/urdfdom:=
+	>=dev-libs/urdfdom-3.0.1:=
 	dev-libs/urdfdom_headers
 	dev-ros/urdf_parser_plugin
 	dev-ros/pluginlib
diff --git a/dev-ros/xmlrpcpp/Manifest b/dev-ros/xmlrpcpp/Manifest
index c387acba5f0b..9e4cdd5d6501 100644
--- a/dev-ros/xmlrpcpp/Manifest
+++ b/dev-ros/xmlrpcpp/Manifest
@@ -1,11 +1,13 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
 DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.13.tar.gz 1093884 BLAKE2B f92b3bc0b441f4440e0ddd69527b79943130e5eb37c0071ea3b8fe26408490a5c9ac7c2ace1e83ad4d6dbaff78600ef399166b72d29eb1c6c0082a7db3295054 SHA512 f5ca51da01c557c4f7a00216b9a39d2d891666c50bd17e0c9add65047e2693a178280488121e72a1a756a2e17f67172e817b792e359ab42dd8d6bd44dec16166
+DIST ros_comm-1.15.14.tar.gz 1094270 BLAKE2B 3b40e23f361e7f7939a9015f22956c1631e25b21d5f76eaff82cb08b378aa3733ed296bef7cdc148ae7d12e6a8dae8216bc7f230e15233bff1dec9172a25cafe SHA512 e16294eb5341669550513a6f13fa3f9f276b7f41a7a7b0cf30e6d64783464ce445d3cf0466dc41ef249f90452910741212de3c37fdff221426698a299fc32501
 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.13.ebuild 447 BLAKE2B 335e1857bcf0a4d9b19809e53371d9d10ca0eb1addbcadb99d4342189dc15de4a222bbe9d70721e4e4d1de2eceee8e2397051aef2153d5b05e54d352138895a0 SHA512 467551d8ba0d0b471df55f7903cf18d85fbf489ea10b5128d798d78bd376f139c6b69fa17a2314a2e9c082c629e2870cf42022c95123dad922c1f5384754ed90
+EBUILD xmlrpcpp-1.15.14.ebuild 447 BLAKE2B 9dbe16e6dfecf7702a647f3762afd045949ec27c87a38ff64faddc3f6e5db30830de4c41186a2ad35dcedb374658ac7e226fc7ebcdf8e359a33badd828cf6939 SHA512 3dc9b3cc9d23c336244ee24684c736659ee77f32cca7445d8a5edc42e736fa27525a0fd74db47cb880d89ef646162e2db5b08f5c4e5e18d1c78bbc31109c899e
 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.14.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.14.ebuild
new file mode 100644
index 000000000000..747dd5b5d806
--- /dev/null
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.14.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 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@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /dev-ros
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)