gentoo resync : 25.09.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-09-25 20:21:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-09-25 20:21:45 +0100
commit: c719fdcee603a5a706a45d10cb598762d56a727d (patch)
tree: 620cbf137661399a3fb1eff92914204f9a970713 /dev-ros
parent: cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff)
99 files changed, 255 insertions, 453 deletions
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 86aead076fa1..790703cb1135 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 2cc539d1e637..fe3b2a27496d 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
-EBUILD ament_cmake_copyright-0.11.2.ebuild 1660 BLAKE2B 3980914f8813bc3b30914f0dc0bac722be513a78474ad27db8770217c9e1a9996ecd8736f54de04f54b3ea0c1ade7033f083090a8cc1b5817b2d51285121400a SHA512 05d65a67a27999b048cdc3965fe198027443b9d6d79ed5a029c46816922b4517663cce51812c059f8bfb52f4db993db1a930b2fbc20ab293e8bc33f7b5d97ed4
-EBUILD ament_cmake_copyright-9999.ebuild 1660 BLAKE2B 3980914f8813bc3b30914f0dc0bac722be513a78474ad27db8770217c9e1a9996ecd8736f54de04f54b3ea0c1ade7033f083090a8cc1b5817b2d51285121400a SHA512 05d65a67a27999b048cdc3965fe198027443b9d6d79ed5a029c46816922b4517663cce51812c059f8bfb52f4db993db1a930b2fbc20ab293e8bc33f7b5d97ed4
+EBUILD ament_cmake_copyright-0.11.2.ebuild 1584 BLAKE2B 8e6d4ceacbf5eef73735a962b0a7122798ef6ca5c1f0a63b93c7f673b4feeea16f612001848cddcab0e6536ac02dc77606c3acab2e8442e2caf9bd4b955bd71b SHA512 e7d0a0308ee9810b70859d33a01cd2109b5bab01cac740efc020cc74dedcf168eaf820be4e3256f3dde48f1d3c8b8099ba71222b9b46e45f2f1a30ea6bad22b0
+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.11.2.ebuild b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.11.2.ebuild
index aedb04bff69e..a5d7095d6b60 100644
--- a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.11.2.ebuild
+++ b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.11.2.ebuild
@@ -3,7 +3,7 @@
 
 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_copyright/ament_cmake_copyright-9999.ebuild b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-9999.ebuild
index aedb04bff69e..a5d7095d6b60 100644
--- a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-9999.ebuild
+++ b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-9999.ebuild
@@ -3,7 +3,7 @@
 
 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 19b3c9dd4ee2..fd9ac81ee83d 100644
--- a/dev-ros/ament_cmake_core/Manifest
+++ b/dev-ros/ament_cmake_core/Manifest
@@ -11,6 +11,6 @@ EBUILD ament_cmake_core-1.0.1.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e4
 EBUILD ament_cmake_core-1.0.3.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
 EBUILD ament_cmake_core-1.0.4.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
 EBUILD ament_cmake_core-1.1.3.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
-EBUILD ament_cmake_core-1.1.4.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
-EBUILD ament_cmake_core-9999.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
+EBUILD ament_cmake_core-1.1.4.ebuild 1075 BLAKE2B ff884eddba246893586a32fd06e24bd72119d430d3191b1c3e88de924f8994dea0063299946e3a1ab3bf484e696f610f636833d67fe3db1abc0fad18c55d0367 SHA512 d9f881098dfbee87dd5c4c387641353856aa37a4de85019943b4f1dce4bd2e6e04e43fadc5ef9ad5f40c91b35a5ca7e9f8054b8911962541681519f2d7a363b4
+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-1.1.4.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.1.4.ebuild
index a1dc3e627817..0bc79bd3fd0c 100644
--- a/dev-ros/ament_cmake_core/ament_cmake_core-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-1.1.4.ebuild
@@ -3,7 +3,7 @@
 
 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_core/ament_cmake_core-9999.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
index a1dc3e627817..0bc79bd3fd0c 100644
--- a/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
@@ -3,7 +3,7 @@
 
 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 01e955dff6b9..0cd0ea508978 100644
--- a/dev-ros/ament_cmake_cppcheck/Manifest
+++ b/dev-ros/ament_cmake_cppcheck/Manifest
@@ -6,7 +6,7 @@ DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53
 EBUILD ament_cmake_cppcheck-0.10.0.ebuild 1537 BLAKE2B a53eefde7cae95039d554c2514a5eb0d94c2aadce0cea6e7923b7186909cd84a04fcdd0b59291bec620b20c9e6b6ee06c306ed673ac5ea6f92ebb1b552ab6083 SHA512 45cff84303c29a7d05cb66b25d01c26cf6e84f228aba58ef0119113aff269bdca6822e156f984e766c8835e85b9268c3fbf31f26ef969f9f0dac5290e54af67d
 EBUILD ament_cmake_cppcheck-0.10.1.ebuild 1537 BLAKE2B a53eefde7cae95039d554c2514a5eb0d94c2aadce0cea6e7923b7186909cd84a04fcdd0b59291bec620b20c9e6b6ee06c306ed673ac5ea6f92ebb1b552ab6083 SHA512 45cff84303c29a7d05cb66b25d01c26cf6e84f228aba58ef0119113aff269bdca6822e156f984e766c8835e85b9268c3fbf31f26ef969f9f0dac5290e54af67d
 EBUILD ament_cmake_cppcheck-0.10.4.ebuild 1537 BLAKE2B a53eefde7cae95039d554c2514a5eb0d94c2aadce0cea6e7923b7186909cd84a04fcdd0b59291bec620b20c9e6b6ee06c306ed673ac5ea6f92ebb1b552ab6083 SHA512 45cff84303c29a7d05cb66b25d01c26cf6e84f228aba58ef0119113aff269bdca6822e156f984e766c8835e85b9268c3fbf31f26ef969f9f0dac5290e54af67d
-EBUILD ament_cmake_cppcheck-0.11.2.ebuild 1537 BLAKE2B a53eefde7cae95039d554c2514a5eb0d94c2aadce0cea6e7923b7186909cd84a04fcdd0b59291bec620b20c9e6b6ee06c306ed673ac5ea6f92ebb1b552ab6083 SHA512 45cff84303c29a7d05cb66b25d01c26cf6e84f228aba58ef0119113aff269bdca6822e156f984e766c8835e85b9268c3fbf31f26ef969f9f0dac5290e54af67d
+EBUILD ament_cmake_cppcheck-0.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-9999.ebuild 1537 BLAKE2B a53eefde7cae95039d554c2514a5eb0d94c2aadce0cea6e7923b7186909cd84a04fcdd0b59291bec620b20c9e6b6ee06c306ed673ac5ea6f92ebb1b552ab6083 SHA512 45cff84303c29a7d05cb66b25d01c26cf6e84f228aba58ef0119113aff269bdca6822e156f984e766c8835e85b9268c3fbf31f26ef969f9f0dac5290e54af67d
+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.11.2.ebuild b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.11.2.ebuild
index db8cbeb51733..7c749cbd249f 100644
--- a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.11.2.ebuild
+++ b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.11.2.ebuild
@@ -3,7 +3,7 @@
 
 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_cppcheck/ament_cmake_cppcheck-9999.ebuild b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-9999.ebuild
index db8cbeb51733..7c749cbd249f 100644
--- a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-9999.ebuild
+++ b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-9999.ebuild
@@ -3,7 +3,7 @@
 
 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 1f3c2bf14bca..d7de5d09a7d0 100644
--- a/dev-ros/ament_cmake_cpplint/Manifest
+++ b/dev-ros/ament_cmake_cpplint/Manifest
@@ -6,7 +6,7 @@ DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53
 EBUILD ament_cmake_cpplint-0.10.0.ebuild 1503 BLAKE2B e3393824134e0ad87e9df8c937cd0b00c4263a4a351740ce7f36949be5392b5fbe32296d521503b2efbb3059b0857c51496de10da95498c400d11af601ab9221 SHA512 fe6811b1405e6bb04082648970b11f9292e6c3cdb97125378de9dd8fa52c6424b49e7d9f1e0040e3343a8c72d9a336809c9aea7718d3d6c916a58b1e763cfef7
 EBUILD ament_cmake_cpplint-0.10.1.ebuild 1503 BLAKE2B e3393824134e0ad87e9df8c937cd0b00c4263a4a351740ce7f36949be5392b5fbe32296d521503b2efbb3059b0857c51496de10da95498c400d11af601ab9221 SHA512 fe6811b1405e6bb04082648970b11f9292e6c3cdb97125378de9dd8fa52c6424b49e7d9f1e0040e3343a8c72d9a336809c9aea7718d3d6c916a58b1e763cfef7
 EBUILD ament_cmake_cpplint-0.10.4.ebuild 1503 BLAKE2B e3393824134e0ad87e9df8c937cd0b00c4263a4a351740ce7f36949be5392b5fbe32296d521503b2efbb3059b0857c51496de10da95498c400d11af601ab9221 SHA512 fe6811b1405e6bb04082648970b11f9292e6c3cdb97125378de9dd8fa52c6424b49e7d9f1e0040e3343a8c72d9a336809c9aea7718d3d6c916a58b1e763cfef7
-EBUILD ament_cmake_cpplint-0.11.2.ebuild 1503 BLAKE2B e3393824134e0ad87e9df8c937cd0b00c4263a4a351740ce7f36949be5392b5fbe32296d521503b2efbb3059b0857c51496de10da95498c400d11af601ab9221 SHA512 fe6811b1405e6bb04082648970b11f9292e6c3cdb97125378de9dd8fa52c6424b49e7d9f1e0040e3343a8c72d9a336809c9aea7718d3d6c916a58b1e763cfef7
+EBUILD ament_cmake_cpplint-0.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-9999.ebuild 1503 BLAKE2B e3393824134e0ad87e9df8c937cd0b00c4263a4a351740ce7f36949be5392b5fbe32296d521503b2efbb3059b0857c51496de10da95498c400d11af601ab9221 SHA512 fe6811b1405e6bb04082648970b11f9292e6c3cdb97125378de9dd8fa52c6424b49e7d9f1e0040e3343a8c72d9a336809c9aea7718d3d6c916a58b1e763cfef7
+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.11.2.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.11.2.ebuild
index c9b636058541..8fd9b0edd57b 100644
--- a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.11.2.ebuild
+++ b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.11.2.ebuild
@@ -3,7 +3,7 @@
 
 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-9999.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-9999.ebuild
index c9b636058541..8fd9b0edd57b 100644
--- a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-9999.ebuild
+++ b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-9999.ebuild
@@ -3,7 +3,7 @@
 
 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_export_definitions/Manifest b/dev-ros/ament_cmake_export_definitions/Manifest
index 44534b696017..fc21d82695fa 100644
--- a/dev-ros/ament_cmake_export_definitions/Manifest
+++ b/dev-ros/ament_cmake_export_definitions/Manifest
@@ -11,6 +11,6 @@ EBUILD ament_cmake_export_definitions-1.0.1.ebuild 1157 BLAKE2B b990becd71cf4199
 EBUILD ament_cmake_export_definitions-1.0.3.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
 EBUILD ament_cmake_export_definitions-1.0.4.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
 EBUILD ament_cmake_export_definitions-1.1.3.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
-EBUILD ament_cmake_export_definitions-1.1.4.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
-EBUILD ament_cmake_export_definitions-9999.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
+EBUILD ament_cmake_export_definitions-1.1.4.ebuild 1157 BLAKE2B 6efd9fde227b076997fbdd8a5bc4c03059c4be887bdf95d1e571d0d8132a73d7a8a652bff4a61d1b2dc9c87aba5ec01a146a653967004f9e07837a8c757647e5 SHA512 5299442c841458865b988e54f9223d6da27df0ac81a8187c1a4f40e5802c99f2da86c0f3d035c9bc2489c718979217e45a08a3e9bb739a972336fb18a01a3655
+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.1.4.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.4.ebuild
index 40a130e4953e..a76ef5d0d6c4 100644
--- a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.4.ebuild
@@ -3,7 +3,7 @@
 
 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_definitions/ament_cmake_export_definitions-9999.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild
index 40a130e4953e..a76ef5d0d6c4 100644
--- a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild
+++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild
@@ -3,7 +3,7 @@
 
 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 c7fa906899b2..e6a39d3aac5e 100644
--- a/dev-ros/ament_cmake_export_dependencies/Manifest
+++ b/dev-ros/ament_cmake_export_dependencies/Manifest
@@ -11,6 +11,6 @@ EBUILD ament_cmake_export_dependencies-1.0.1.ebuild 1198 BLAKE2B aa10e6775337c94
 EBUILD ament_cmake_export_dependencies-1.0.3.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
 EBUILD ament_cmake_export_dependencies-1.0.4.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
 EBUILD ament_cmake_export_dependencies-1.1.3.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
-EBUILD ament_cmake_export_dependencies-1.1.4.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
-EBUILD ament_cmake_export_dependencies-9999.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
+EBUILD ament_cmake_export_dependencies-1.1.4.ebuild 1198 BLAKE2B 2b43718be095690973e7fbab299a1eaf0d1db9f6afc32e0d3c4bae35b28c8a1cc1eefaa78b104f21448b7ae3fcfe98a20d90fdb113cd36d7b17586d78f9cc731 SHA512 55c3736c2ec7d266b2dcbbccf04d4e9483deb979c3a8289864434165332bf4005a3e2344a9cc171261318045a36dd7ad69e1ed6576b8d73afa4a12382a5faa2e
+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.1.4.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.4.ebuild
index 6be2a34aa01e..d9868e9db6f6 100644
--- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.4.ebuild
@@ -3,7 +3,7 @@
 
 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/ament_cmake_export_dependencies-9999.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild
index 6be2a34aa01e..d9868e9db6f6 100644
--- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild
+++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild
@@ -3,7 +3,7 @@
 
 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 c4d37f5ae200..07df2cb25323 100644
--- a/dev-ros/ament_cmake_export_include_directories/Manifest
+++ b/dev-ros/ament_cmake_export_include_directories/Manifest
@@ -11,6 +11,6 @@ EBUILD ament_cmake_export_include_directories-1.0.1.ebuild 1165 BLAKE2B 73c706b1
 EBUILD ament_cmake_export_include_directories-1.0.3.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_export_include_directories-1.0.4.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_export_include_directories-1.1.3.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
-EBUILD ament_cmake_export_include_directories-1.1.4.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
-EBUILD ament_cmake_export_include_directories-9999.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
+EBUILD ament_cmake_export_include_directories-1.1.4.ebuild 1165 BLAKE2B be53d0a66e037552ddbdcbbc272e9663f99339f3498cf240a87342331cebce37eb1de7e2264f606e9554e0f5b1f579981bceed1c073ae0ea86a3a464838dc619 SHA512 258fbee4d5189c517e1e03d35129d1e294697b8ef863fbd2d1b9b56f04f3c2a4fefdafc3698a6ce487e69c0f33a2f807a842fa518c00ba3d6da3270b02dd6c2a
+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.1.4.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.1.4.ebuild
index 4a30d0ac2418..5a4b76c2c1ab 100644
--- a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.1.4.ebuild
@@ -3,7 +3,7 @@
 
 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/ament_cmake_export_include_directories-9999.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-9999.ebuild
index 4a30d0ac2418..5a4b76c2c1ab 100644
--- a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-9999.ebuild
+++ b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-9999.ebuild
@@ -3,7 +3,7 @@
 
 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 da1536629af2..786666cdb274 100644
--- a/dev-ros/ament_cmake_export_interfaces/Manifest
+++ b/dev-ros/ament_cmake_export_interfaces/Manifest
@@ -11,6 +11,6 @@ EBUILD ament_cmake_export_interfaces-1.0.1.ebuild 1194 BLAKE2B bcef251f9271cae69
 EBUILD ament_cmake_export_interfaces-1.0.3.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
 EBUILD ament_cmake_export_interfaces-1.0.4.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
 EBUILD ament_cmake_export_interfaces-1.1.3.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
-EBUILD ament_cmake_export_interfaces-1.1.4.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
-EBUILD ament_cmake_export_interfaces-9999.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
+EBUILD ament_cmake_export_interfaces-1.1.4.ebuild 1194 BLAKE2B be8f4b0fb704923f485013230245678df7fed19dcef44e777de663686ecf6e6199ca09fef39d7179b66493bd51203b824ecf6fd274b5a4adfc6f23f227d258e4 SHA512 b48be94ef1c80a7699f77a4aa5fd1e4e130d317494a3e40e276568ada7ea45316d3dff6166b869e63f5d80d49d42c198721fafdb0c10ee1654ec321e08ebfa69
+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.1.4.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.4.ebuild
index e618a9ad7d4d..4d93075295d4 100644
--- a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.4.ebuild
@@ -3,7 +3,7 @@
 
 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/ament_cmake_export_interfaces-9999.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-9999.ebuild
index e618a9ad7d4d..4d93075295d4 100644
--- a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-9999.ebuild
+++ b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-9999.ebuild
@@ -3,7 +3,7 @@
 
 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 0c37289637e3..fff7f8169e31 100644
--- a/dev-ros/ament_cmake_export_libraries/Manifest
+++ b/dev-ros/ament_cmake_export_libraries/Manifest
@@ -11,6 +11,6 @@ EBUILD ament_cmake_export_libraries-1.0.1.ebuild 1155 BLAKE2B 7ddac875570204413f
 EBUILD ament_cmake_export_libraries-1.0.3.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
 EBUILD ament_cmake_export_libraries-1.0.4.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
 EBUILD ament_cmake_export_libraries-1.1.3.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
-EBUILD ament_cmake_export_libraries-1.1.4.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
-EBUILD ament_cmake_export_libraries-9999.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
+EBUILD ament_cmake_export_libraries-1.1.4.ebuild 1155 BLAKE2B c47ab427ad295d5533feae449695d683d8cd3249631e3eacce2efadc83576c13d0eb7cf5fa94e4c3f87f03bb985bd58be931203cf565886cb32dec9c3c4295fe SHA512 23ccf249fbf1e80d711924acbfa5573f51c232f90248ac50628f36943562efa830dbfb70b48c97bd0687343152984eb6ae4616e2746d5fd493af5062301322f0
+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.1.4.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.4.ebuild
index 5a63a39ded54..027da570e32d 100644
--- a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.4.ebuild
@@ -3,7 +3,7 @@
 
 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/ament_cmake_export_libraries-9999.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-9999.ebuild
index 5a63a39ded54..027da570e32d 100644
--- a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-9999.ebuild
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-9999.ebuild
@@ -3,7 +3,7 @@
 
 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 bfb08e350901..be8a63383a7a 100644
--- a/dev-ros/ament_cmake_export_link_flags/Manifest
+++ b/dev-ros/ament_cmake_export_link_flags/Manifest
@@ -11,6 +11,6 @@ EBUILD ament_cmake_export_link_flags-1.0.1.ebuild 1156 BLAKE2B 640b451d2800a60cc
 EBUILD ament_cmake_export_link_flags-1.0.3.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
 EBUILD ament_cmake_export_link_flags-1.0.4.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
 EBUILD ament_cmake_export_link_flags-1.1.3.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
-EBUILD ament_cmake_export_link_flags-1.1.4.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
-EBUILD ament_cmake_export_link_flags-9999.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
+EBUILD ament_cmake_export_link_flags-1.1.4.ebuild 1156 BLAKE2B 24e9bfecb942336afcf433357c4f2ee5a65a0ed19c6a67cacf0521f63cfaf7807122d4b75718435c0c7c7289156b0428ca0385be58f0473fc1e9005630bc2342 SHA512 6d61cca22131dee38ccf39363172ddb21ba52c7b7ed04cba64e4eafaffed5edc2a9bcc9a675a1da1069c9ae00f8427b63b2a1ceb78eebfdfb2f088548434e33b
+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.1.4.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.1.4.ebuild
index e31c09637e5a..fb30c82f371a 100644
--- a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.1.4.ebuild
@@ -3,7 +3,7 @@
 
 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/ament_cmake_export_link_flags-9999.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-9999.ebuild
index e31c09637e5a..fb30c82f371a 100644
--- a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-9999.ebuild
+++ b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-9999.ebuild
@@ -3,7 +3,7 @@
 
 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 2df4d6da5bca..30eed86f1c47 100644
--- a/dev-ros/ament_cmake_export_targets/Manifest
+++ b/dev-ros/ament_cmake_export_targets/Manifest
@@ -11,6 +11,6 @@ EBUILD ament_cmake_export_targets-1.0.1.ebuild 1191 BLAKE2B ffdacf3804630a8049cd
 EBUILD ament_cmake_export_targets-1.0.3.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
 EBUILD ament_cmake_export_targets-1.0.4.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
 EBUILD ament_cmake_export_targets-1.1.3.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
-EBUILD ament_cmake_export_targets-1.1.4.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
-EBUILD ament_cmake_export_targets-9999.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
+EBUILD ament_cmake_export_targets-1.1.4.ebuild 1191 BLAKE2B 3824e2885661361cfa637c50120171a45eac6218d67e53ca728ede0819998b49c1602517240a39248d1d380e0bdb0454b7c59b6e1385ce92e74603a80ff20137 SHA512 d78c8c1abab179257b6af86bb5c008902a34f27c40aeb6155b27e866e5a45dfeb0f16f4c3a94227a36c1f2974bf839c55a173a3323435f7960c34cd84577c635
+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.1.4.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.4.ebuild
index 50b62c2a317b..efc907fe2f8b 100644
--- a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.4.ebuild
@@ -3,7 +3,7 @@
 
 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/ament_cmake_export_targets-9999.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-9999.ebuild
index 50b62c2a317b..efc907fe2f8b 100644
--- a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-9999.ebuild
+++ b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-9999.ebuild
@@ -3,7 +3,7 @@
 
 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 0d32c7096516..0353cedd0747 100644
--- a/dev-ros/ament_cmake_gmock/Manifest
+++ b/dev-ros/ament_cmake_gmock/Manifest
@@ -9,6 +9,6 @@ EBUILD ament_cmake_gmock-1.0.1.ebuild 1158 BLAKE2B d97a5089a055c9bbfa733f42d848f
 EBUILD ament_cmake_gmock-1.0.3.ebuild 1158 BLAKE2B d97a5089a055c9bbfa733f42d848f01c849cf5a4c5f106305346e9b7bbcd7a3bd93898b334133280a7be9b71911f3ea9c2f4ea62d4db6240b21d27f072a12bec SHA512 3a05e2fc64eccf5c6fa31b015eb86746a2089837cf44ab901b84c1fa80e09cde06459e4f0e4002ca31cbaed367804c8d445edb5bda4ba20940d85afa29b3134e
 EBUILD ament_cmake_gmock-1.0.4.ebuild 1158 BLAKE2B d97a5089a055c9bbfa733f42d848f01c849cf5a4c5f106305346e9b7bbcd7a3bd93898b334133280a7be9b71911f3ea9c2f4ea62d4db6240b21d27f072a12bec SHA512 3a05e2fc64eccf5c6fa31b015eb86746a2089837cf44ab901b84c1fa80e09cde06459e4f0e4002ca31cbaed367804c8d445edb5bda4ba20940d85afa29b3134e
 EBUILD ament_cmake_gmock-1.1.3.ebuild 1158 BLAKE2B d97a5089a055c9bbfa733f42d848f01c849cf5a4c5f106305346e9b7bbcd7a3bd93898b334133280a7be9b71911f3ea9c2f4ea62d4db6240b21d27f072a12bec SHA512 3a05e2fc64eccf5c6fa31b015eb86746a2089837cf44ab901b84c1fa80e09cde06459e4f0e4002ca31cbaed367804c8d445edb5bda4ba20940d85afa29b3134e
-EBUILD ament_cmake_gmock-1.1.4.ebuild 1158 BLAKE2B d97a5089a055c9bbfa733f42d848f01c849cf5a4c5f106305346e9b7bbcd7a3bd93898b334133280a7be9b71911f3ea9c2f4ea62d4db6240b21d27f072a12bec SHA512 3a05e2fc64eccf5c6fa31b015eb86746a2089837cf44ab901b84c1fa80e09cde06459e4f0e4002ca31cbaed367804c8d445edb5bda4ba20940d85afa29b3134e
-EBUILD ament_cmake_gmock-9999.ebuild 1158 BLAKE2B d97a5089a055c9bbfa733f42d848f01c849cf5a4c5f106305346e9b7bbcd7a3bd93898b334133280a7be9b71911f3ea9c2f4ea62d4db6240b21d27f072a12bec SHA512 3a05e2fc64eccf5c6fa31b015eb86746a2089837cf44ab901b84c1fa80e09cde06459e4f0e4002ca31cbaed367804c8d445edb5bda4ba20940d85afa29b3134e
+EBUILD ament_cmake_gmock-1.1.4.ebuild 1158 BLAKE2B 07c83c2da9b8c4e06edfa3febae11ae24f30c7f5e6bf7a25d1dd70e4d6a9325635446f1a52d624a256216771481b915f66cd8323cf4908f9bfe1752ef5396e12 SHA512 f4cef787bdf811dca6c9ac95657c0425bd105e8b40575e24b3fbe452a6ce7890543e0df2641926bd961d4f3dcd88facb47380b63c124d2e211fc11e3c4d47c71
+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.1.4.ebuild b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.1.4.ebuild
index 17c189d5d54e..25c574a131a2 100644
--- a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.1.4.ebuild
@@ -3,7 +3,7 @@
 
 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/ament_cmake_gmock-9999.ebuild b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-9999.ebuild
index 17c189d5d54e..25c574a131a2 100644
--- a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-9999.ebuild
+++ b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-9999.ebuild
@@ -3,7 +3,7 @@
 
 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 54676fc73855..4863c605f3ca 100644
--- a/dev-ros/ament_cmake_gtest/Manifest
+++ b/dev-ros/ament_cmake_gtest/Manifest
@@ -11,6 +11,6 @@ EBUILD ament_cmake_gtest-1.0.1.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f
 EBUILD ament_cmake_gtest-1.0.3.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
 EBUILD ament_cmake_gtest-1.0.4.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
 EBUILD ament_cmake_gtest-1.1.3.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
-EBUILD ament_cmake_gtest-1.1.4.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
-EBUILD ament_cmake_gtest-9999.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
+EBUILD ament_cmake_gtest-1.1.4.ebuild 1152 BLAKE2B 1ea1f103891adc023dcc4f516a5b73f89518d20de4d194bd2ae7352830fff29394de9597e636a742f394db9165a30ff023b3ccf585d089ebc255f1759768d581 SHA512 24738bccb2230f15e80c062a8daddef7a16fae867794d4d621d96594779dc9be51e08dbfd5e972535ab925e954c0e242e6f0a7c8048e47fc11e241873d2ae125
+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.1.4.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.1.4.ebuild
index b93c7a39772a..69610780da9d 100644
--- a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.1.4.ebuild
@@ -3,7 +3,7 @@
 
 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/ament_cmake_gtest-9999.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-9999.ebuild
index b93c7a39772a..69610780da9d 100644
--- a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-9999.ebuild
+++ b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-9999.ebuild
@@ -3,7 +3,7 @@
 
 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 42a8709a2184..36bec7f21587 100644
--- a/dev-ros/ament_cmake_include_directories/Manifest
+++ b/dev-ros/ament_cmake_include_directories/Manifest
@@ -11,6 +11,6 @@ EBUILD ament_cmake_include_directories-1.0.1.ebuild 1165 BLAKE2B 73c706b13714c04
 EBUILD ament_cmake_include_directories-1.0.3.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_include_directories-1.0.4.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_include_directories-1.1.3.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
-EBUILD ament_cmake_include_directories-1.1.4.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
-EBUILD ament_cmake_include_directories-9999.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
+EBUILD ament_cmake_include_directories-1.1.4.ebuild 1165 BLAKE2B be53d0a66e037552ddbdcbbc272e9663f99339f3498cf240a87342331cebce37eb1de7e2264f606e9554e0f5b1f579981bceed1c073ae0ea86a3a464838dc619 SHA512 258fbee4d5189c517e1e03d35129d1e294697b8ef863fbd2d1b9b56f04f3c2a4fefdafc3698a6ce487e69c0f33a2f807a842fa518c00ba3d6da3270b02dd6c2a
+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-1.1.4.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.4.ebuild
index 4a30d0ac2418..5a4b76c2c1ab 100644
--- a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.4.ebuild
@@ -3,7 +3,7 @@
 
 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/ament_cmake_include_directories-9999.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-9999.ebuild
index 4a30d0ac2418..5a4b76c2c1ab 100644
--- a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-9999.ebuild
+++ b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-9999.ebuild
@@ -3,7 +3,7 @@
 
 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 0e7f8df2ba78..5051b60543d8 100644
--- a/dev-ros/ament_cmake_libraries/Manifest
+++ b/dev-ros/ament_cmake_libraries/Manifest
@@ -11,6 +11,6 @@ EBUILD ament_cmake_libraries-1.0.1.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b
 EBUILD ament_cmake_libraries-1.0.3.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
 EBUILD ament_cmake_libraries-1.0.4.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
 EBUILD ament_cmake_libraries-1.1.3.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
-EBUILD ament_cmake_libraries-1.1.4.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
-EBUILD ament_cmake_libraries-9999.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
+EBUILD ament_cmake_libraries-1.1.4.ebuild 1158 BLAKE2B e824c3cf4d7e666b09565e39d52b264a017d3b387b1124596e2bcadb8e09be6609c36ab11e2fd5fd5b53d80ee7a17c88eeab94a37da2b6b3d004b9b7d2a3c931 SHA512 202b404faec56a83893879705152ec7f22eafd9ef47e94aaf88d6143e2095729204135fa4138e3d9cfb4e6add074d61025333f1e81558786101cac401f5e6ebb
+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.1.4.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.1.4.ebuild
index f4eece8f0db0..d307d099dbb9 100644
--- a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.1.4.ebuild
@@ -3,7 +3,7 @@
 
 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/ament_cmake_libraries-9999.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-9999.ebuild
index f4eece8f0db0..d307d099dbb9 100644
--- a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-9999.ebuild
+++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-9999.ebuild
@@ -3,7 +3,7 @@
 
 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 f112830ee771..e3a9644879fe 100644
--- a/dev-ros/ament_cmake_lint_cmake/Manifest
+++ b/dev-ros/ament_cmake_lint_cmake/Manifest
@@ -6,7 +6,7 @@ DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53
 EBUILD ament_cmake_lint_cmake-0.10.0.ebuild 1260 BLAKE2B d8a066607f3882b1fcfb7309c125ea4918d87e66e77fa1bcbdee4c3f924d9dbe39a332c8c2435ca607d3ce1a7ac69fc1576b1ba894947c36b8fed674fae399f2 SHA512 2e2181f42119a1d2e20167d13dbb42343f6c4b425c729c32d7b9ca8022f9691f591f335edccdaa2e3f01b04b7b84c4116f7e21f71c582ebd4964150da9e0ad56
 EBUILD ament_cmake_lint_cmake-0.10.1.ebuild 1260 BLAKE2B d8a066607f3882b1fcfb7309c125ea4918d87e66e77fa1bcbdee4c3f924d9dbe39a332c8c2435ca607d3ce1a7ac69fc1576b1ba894947c36b8fed674fae399f2 SHA512 2e2181f42119a1d2e20167d13dbb42343f6c4b425c729c32d7b9ca8022f9691f591f335edccdaa2e3f01b04b7b84c4116f7e21f71c582ebd4964150da9e0ad56
 EBUILD ament_cmake_lint_cmake-0.10.4.ebuild 1260 BLAKE2B d8a066607f3882b1fcfb7309c125ea4918d87e66e77fa1bcbdee4c3f924d9dbe39a332c8c2435ca607d3ce1a7ac69fc1576b1ba894947c36b8fed674fae399f2 SHA512 2e2181f42119a1d2e20167d13dbb42343f6c4b425c729c32d7b9ca8022f9691f591f335edccdaa2e3f01b04b7b84c4116f7e21f71c582ebd4964150da9e0ad56
-EBUILD ament_cmake_lint_cmake-0.11.2.ebuild 1260 BLAKE2B d8a066607f3882b1fcfb7309c125ea4918d87e66e77fa1bcbdee4c3f924d9dbe39a332c8c2435ca607d3ce1a7ac69fc1576b1ba894947c36b8fed674fae399f2 SHA512 2e2181f42119a1d2e20167d13dbb42343f6c4b425c729c32d7b9ca8022f9691f591f335edccdaa2e3f01b04b7b84c4116f7e21f71c582ebd4964150da9e0ad56
+EBUILD ament_cmake_lint_cmake-0.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-9999.ebuild 1260 BLAKE2B d8a066607f3882b1fcfb7309c125ea4918d87e66e77fa1bcbdee4c3f924d9dbe39a332c8c2435ca607d3ce1a7ac69fc1576b1ba894947c36b8fed674fae399f2 SHA512 2e2181f42119a1d2e20167d13dbb42343f6c4b425c729c32d7b9ca8022f9691f591f335edccdaa2e3f01b04b7b84c4116f7e21f71c582ebd4964150da9e0ad56
+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.11.2.ebuild b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.ebuild
index d16461b67cd9..57023a6b7a97 100644
--- a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.ebuild
+++ b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.ebuild
@@ -3,19 +3,18 @@
 
 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_lint_cmake/ament_cmake_lint_cmake-9999.ebuild b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-9999.ebuild
index d16461b67cd9..57023a6b7a97 100644
--- a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-9999.ebuild
+++ b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-9999.ebuild
@@ -3,19 +3,18 @@
 
 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 54bee812f3f3..9700a791c940 100644
--- a/dev-ros/ament_cmake_pytest/Manifest
+++ b/dev-ros/ament_cmake_pytest/Manifest
@@ -9,6 +9,6 @@ EBUILD ament_cmake_pytest-1.0.1.ebuild 1160 BLAKE2B 1e876dd0840295037a3ba7066f67
 EBUILD ament_cmake_pytest-1.0.3.ebuild 1160 BLAKE2B 1e876dd0840295037a3ba7066f6775673196c6946b661647d731e4f6cee928bc70b2abbb680a2a16fc9e42b0209a00a59c0489ed9cf1be34033447897c79b4e1 SHA512 53067e8a88265f8d96ec184411739922d32b000f6d7214ee18c05e080a55d3ba4a46ac1ebec0c008198453992f1f1c004516712d6207e713000e21a801edddde
 EBUILD ament_cmake_pytest-1.0.4.ebuild 1160 BLAKE2B 1e876dd0840295037a3ba7066f6775673196c6946b661647d731e4f6cee928bc70b2abbb680a2a16fc9e42b0209a00a59c0489ed9cf1be34033447897c79b4e1 SHA512 53067e8a88265f8d96ec184411739922d32b000f6d7214ee18c05e080a55d3ba4a46ac1ebec0c008198453992f1f1c004516712d6207e713000e21a801edddde
 EBUILD ament_cmake_pytest-1.1.3.ebuild 1160 BLAKE2B 1e876dd0840295037a3ba7066f6775673196c6946b661647d731e4f6cee928bc70b2abbb680a2a16fc9e42b0209a00a59c0489ed9cf1be34033447897c79b4e1 SHA512 53067e8a88265f8d96ec184411739922d32b000f6d7214ee18c05e080a55d3ba4a46ac1ebec0c008198453992f1f1c004516712d6207e713000e21a801edddde
-EBUILD ament_cmake_pytest-1.1.4.ebuild 1160 BLAKE2B 1e876dd0840295037a3ba7066f6775673196c6946b661647d731e4f6cee928bc70b2abbb680a2a16fc9e42b0209a00a59c0489ed9cf1be34033447897c79b4e1 SHA512 53067e8a88265f8d96ec184411739922d32b000f6d7214ee18c05e080a55d3ba4a46ac1ebec0c008198453992f1f1c004516712d6207e713000e21a801edddde
-EBUILD ament_cmake_pytest-9999.ebuild 1160 BLAKE2B 1e876dd0840295037a3ba7066f6775673196c6946b661647d731e4f6cee928bc70b2abbb680a2a16fc9e42b0209a00a59c0489ed9cf1be34033447897c79b4e1 SHA512 53067e8a88265f8d96ec184411739922d32b000f6d7214ee18c05e080a55d3ba4a46ac1ebec0c008198453992f1f1c004516712d6207e713000e21a801edddde
+EBUILD ament_cmake_pytest-1.1.4.ebuild 1160 BLAKE2B f5ffa5668f5aed0f52555d643e277468aa81201497a3a419a64e6910a2ed78972733717407288755e211f57a11514e189b6e971351cb3cc38a4968ba27f9652e SHA512 9ce4f2b32d4d5ffd9916bae4347265e343af1b8115930091caa67b5a7afa319177100d9e1bd5ec849a192840724bbf53ebc23a25015e42c7ac77a27099dd1655
+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.1.4.ebuild b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.1.4.ebuild
index cf7e6c682106..e23834be6639 100644
--- a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.1.4.ebuild
@@ -3,7 +3,7 @@
 
 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_pytest/ament_cmake_pytest-9999.ebuild b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-9999.ebuild
index cf7e6c682106..e23834be6639 100644
--- a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-9999.ebuild
+++ b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-9999.ebuild
@@ -3,7 +3,7 @@
 
 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 6bd904992bf2..892be9eae254 100644
--- a/dev-ros/ament_cmake_python/Manifest
+++ b/dev-ros/ament_cmake_python/Manifest
@@ -12,6 +12,6 @@ EBUILD ament_cmake_python-1.0.1.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3
 EBUILD ament_cmake_python-1.0.3.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
 EBUILD ament_cmake_python-1.0.4.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
 EBUILD ament_cmake_python-1.1.3.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
-EBUILD ament_cmake_python-1.1.4.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
-EBUILD ament_cmake_python-9999.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
+EBUILD ament_cmake_python-1.1.4.ebuild 1181 BLAKE2B 651152b5ead7ad7112dd08c6b533b7451f908ff97abc2dad7f04b38cc3c6ddc9f76e2f0c2e1348f6bacb634b847e4030618120f678823d972963dd4368ca702c SHA512 30dcac9098507e41151db00824a188f266a8abab566fe5a9e9c7b865dfd3c67da8c3569bc70a433e7a329f2eacf512d6766665b6141fd3d6e9554e42fac605b2
+EBUILD ament_cmake_python-9999.ebuild 1181 BLAKE2B 651152b5ead7ad7112dd08c6b533b7451f908ff97abc2dad7f04b38cc3c6ddc9f76e2f0c2e1348f6bacb634b847e4030618120f678823d972963dd4368ca702c SHA512 30dcac9098507e41151db00824a188f266a8abab566fe5a9e9c7b865dfd3c67da8c3569bc70a433e7a329f2eacf512d6766665b6141fd3d6e9554e42fac605b2
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_python/ament_cmake_python-1.1.4.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.1.4.ebuild
index 0e793810f45b..d6ff5f678382 100644
--- a/dev-ros/ament_cmake_python/ament_cmake_python-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-1.1.4.ebuild
@@ -3,7 +3,7 @@
 
 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/ament_cmake_python-9999.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild
index 0e793810f45b..d6ff5f678382 100644
--- a/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild
@@ -3,7 +3,7 @@
 
 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_ros/Manifest b/dev-ros/ament_cmake_ros/Manifest
index 9d086daba4c2..0413c586690a 100644
--- a/dev-ros/ament_cmake_ros/Manifest
+++ b/dev-ros/ament_cmake_ros/Manifest
@@ -1,4 +1,4 @@
 DIST ament_cmake_ros-0.9.2.tar.gz 10831 BLAKE2B 1e8293a51a1137a84955027b9e89b2dfead58f5a56a3884d10121fcf40ad8702afe91ecff551e7910eb4ba5cce4990a95cd40399b3016fd5ce82181173fe6362 SHA512 85e5ba6982271ba8507f97712f20553de82a6a80a4fb7676f819310acc029c7e9b3933af845ed3ccb9925aa5aace1d1f6b412e975502550867223a440e07ae25
-EBUILD ament_cmake_ros-0.9.2.ebuild 1109 BLAKE2B 53efbff8bce6a16b48f5ed28d92a1d9bed4fca1473d68850b4da63c7a7e3f1db214e095584ebff20edb8b935aa402bc7d13bcbe79f18ec55deecf818121cc4bd SHA512 0a14bd217150a93ac77b9030dea4c6a2cd6e56bf8918995411f83611ceb973e9891a02f612c7b8028ce3c178faad2ae8d54b48ba907bb7e33ae44e4d10bbc2cd
-EBUILD ament_cmake_ros-9999.ebuild 1109 BLAKE2B 53efbff8bce6a16b48f5ed28d92a1d9bed4fca1473d68850b4da63c7a7e3f1db214e095584ebff20edb8b935aa402bc7d13bcbe79f18ec55deecf818121cc4bd SHA512 0a14bd217150a93ac77b9030dea4c6a2cd6e56bf8918995411f83611ceb973e9891a02f612c7b8028ce3c178faad2ae8d54b48ba907bb7e33ae44e4d10bbc2cd
+EBUILD ament_cmake_ros-0.9.2.ebuild 1002 BLAKE2B e6e63bb862efd7af8d3cfac6d7bfb051bf6799a1237cc52456cd4d0e83a071a0db6a247ace92792ee45e4a463082924c1bcb439b8a37a810b081e42a50769d87 SHA512 2a9feca4c7564f38573162ef46c903c6f907e17037f03e61a91dccd032ac3307ecf84f108315e83cc28d2c855afff00a1683ce50e9165c7689909015f3514f4a
+EBUILD ament_cmake_ros-9999.ebuild 1002 BLAKE2B e6e63bb862efd7af8d3cfac6d7bfb051bf6799a1237cc52456cd4d0e83a071a0db6a247ace92792ee45e4a463082924c1bcb439b8a37a810b081e42a50769d87 SHA512 2a9feca4c7564f38573162ef46c903c6f907e17037f03e61a91dccd032ac3307ecf84f108315e83cc28d2c855afff00a1683ce50e9165c7689909015f3514f4a
 MISC metadata.xml 335 BLAKE2B 34967a233f8a8a1a3d01283b7cf0021b2aa9830157998fdbed0365a4601c9c84159805fc1e70817a257c3786f9698ddbcf8b515fe4f2cdee3da1fde91dc014ad SHA512 00c7b588cde604a184c8d1a9a9c93eca62f83bb0c61928813998b8fc57c2f2936c29740ff2b15b34e25c13b8a107e722196d635c50d6e034d6dbe81e58e5395d
diff --git a/dev-ros/ament_cmake_ros/ament_cmake_ros-0.9.2.ebuild b/dev-ros/ament_cmake_ros/ament_cmake_ros-0.9.2.ebuild
index 7c84882802b0..9db04e1784f0 100644
--- a/dev-ros/ament_cmake_ros/ament_cmake_ros-0.9.2.ebuild
+++ b/dev-ros/ament_cmake_ros/ament_cmake_ros-0.9.2.ebuild
@@ -3,7 +3,7 @@
 
 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_cmake_ros"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ros2/ament_cmake_ros"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
+	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/ros2/ament_cmake_ros/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
 	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="ROS specific CMake bits in the ament buildsystem"
@@ -23,17 +23,9 @@ HOMEPAGE="https://github.com/ros2/ament_cmake_ros"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-"
-DEPEND="${RDEPEND}"
 BDEPEND="
 	$(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
 	test? (
diff --git a/dev-ros/ament_cmake_ros/ament_cmake_ros-9999.ebuild b/dev-ros/ament_cmake_ros/ament_cmake_ros-9999.ebuild
index 7c84882802b0..9db04e1784f0 100644
--- a/dev-ros/ament_cmake_ros/ament_cmake_ros-9999.ebuild
+++ b/dev-ros/ament_cmake_ros/ament_cmake_ros-9999.ebuild
@@ -3,7 +3,7 @@
 
 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_cmake_ros"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ros2/ament_cmake_ros"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
+	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/ros2/ament_cmake_ros/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
 	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="ROS specific CMake bits in the ament buildsystem"
@@ -23,17 +23,9 @@ HOMEPAGE="https://github.com/ros2/ament_cmake_ros"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-"
-DEPEND="${RDEPEND}"
 BDEPEND="
 	$(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
 	test? (
diff --git a/dev-ros/ament_cmake_target_dependencies/Manifest b/dev-ros/ament_cmake_target_dependencies/Manifest
index 9763a1d8b088..8a7e2e110354 100644
--- a/dev-ros/ament_cmake_target_dependencies/Manifest
+++ b/dev-ros/ament_cmake_target_dependencies/Manifest
@@ -11,6 +11,6 @@ EBUILD ament_cmake_target_dependencies-1.0.1.ebuild 1231 BLAKE2B 3b2f9b63aac301d
 EBUILD ament_cmake_target_dependencies-1.0.3.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
 EBUILD ament_cmake_target_dependencies-1.0.4.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
 EBUILD ament_cmake_target_dependencies-1.1.3.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
-EBUILD ament_cmake_target_dependencies-1.1.4.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
-EBUILD ament_cmake_target_dependencies-9999.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
+EBUILD ament_cmake_target_dependencies-1.1.4.ebuild 1231 BLAKE2B 8766429812e518e70112916979a0eb6cf536bdb27c4e04ff42b5d30309daf582ef30658579e6810df9210641bcbeaa37c85a8cb0d9dadc7ffcb30a462b1f5c76 SHA512 8952dba6e8ba12f5313bd622bc24e215c51a9204fa84b025138b90c10a786cc5341a6eadfacd36849bc5174b05b8902714fe816466146ca3f87ccb6a184a4c15
+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.1.4.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.1.4.ebuild
index cc319e25dd31..70b3c063b089 100644
--- a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.1.4.ebuild
@@ -3,7 +3,7 @@
 
 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_target_dependencies/ament_cmake_target_dependencies-9999.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-9999.ebuild
index cc319e25dd31..70b3c063b089 100644
--- a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-9999.ebuild
+++ b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-9999.ebuild
@@ -3,7 +3,7 @@
 
 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 380e4a537fad..f0547cdb8abb 100644
--- a/dev-ros/ament_cmake_test/Manifest
+++ b/dev-ros/ament_cmake_test/Manifest
@@ -11,6 +11,6 @@ EBUILD ament_cmake_test-1.0.1.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce
 EBUILD ament_cmake_test-1.0.3.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
 EBUILD ament_cmake_test-1.0.4.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
 EBUILD ament_cmake_test-1.1.3.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
-EBUILD ament_cmake_test-1.1.4.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
-EBUILD ament_cmake_test-9999.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
+EBUILD ament_cmake_test-1.1.4.ebuild 1230 BLAKE2B d99da03c7ca02f1f3590469878855ee5f337f0e34820cac05e71c91395143e60059f194aa6e676bf76caf4041d22ed93c586089f1e48b66e23ae1f9ec5c35610 SHA512 f8c786793bfa4dea5e4b42bbaa30a12eb35ddf0c951a62907ef9b350f0ea784bd10d16c9efd468f30a77f7678b944886247992d6d20260967d95cf7169a306da
+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.1.4.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-1.1.4.ebuild
index bb59c0de949c..098bae647945 100644
--- a/dev-ros/ament_cmake_test/ament_cmake_test-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_test/ament_cmake_test-1.1.4.ebuild
@@ -3,7 +3,7 @@
 
 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_test/ament_cmake_test-9999.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-9999.ebuild
index bb59c0de949c..098bae647945 100644
--- a/dev-ros/ament_cmake_test/ament_cmake_test-9999.ebuild
+++ b/dev-ros/ament_cmake_test/ament_cmake_test-9999.ebuild
@@ -3,7 +3,7 @@
 
 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 8ef5580fac51..1cbaceca0588 100644
--- a/dev-ros/ament_cmake_uncrustify/Manifest
+++ b/dev-ros/ament_cmake_uncrustify/Manifest
@@ -6,7 +6,7 @@ DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53
 EBUILD ament_cmake_uncrustify-0.10.0.ebuild 1517 BLAKE2B 7611ecb510ac8094b3b4878b4dfc83339e198e24910806025d1393477bd3c7d8c7de5afb5a351e021408279d1f16348e1d2cffb3b42c24139ce471b64d5ffd69 SHA512 9df72e736c4e772e75c3131b1774550a03b785e3ee9f4504d6ceea19d18960ac96fd1d8e415a349e8a65d4be33e51022d2618a779cc04e40822720b87125ebc4
 EBUILD ament_cmake_uncrustify-0.10.1.ebuild 1517 BLAKE2B 7611ecb510ac8094b3b4878b4dfc83339e198e24910806025d1393477bd3c7d8c7de5afb5a351e021408279d1f16348e1d2cffb3b42c24139ce471b64d5ffd69 SHA512 9df72e736c4e772e75c3131b1774550a03b785e3ee9f4504d6ceea19d18960ac96fd1d8e415a349e8a65d4be33e51022d2618a779cc04e40822720b87125ebc4
 EBUILD ament_cmake_uncrustify-0.10.4.ebuild 1517 BLAKE2B 7611ecb510ac8094b3b4878b4dfc83339e198e24910806025d1393477bd3c7d8c7de5afb5a351e021408279d1f16348e1d2cffb3b42c24139ce471b64d5ffd69 SHA512 9df72e736c4e772e75c3131b1774550a03b785e3ee9f4504d6ceea19d18960ac96fd1d8e415a349e8a65d4be33e51022d2618a779cc04e40822720b87125ebc4
-EBUILD ament_cmake_uncrustify-0.11.2.ebuild 1517 BLAKE2B 7611ecb510ac8094b3b4878b4dfc83339e198e24910806025d1393477bd3c7d8c7de5afb5a351e021408279d1f16348e1d2cffb3b42c24139ce471b64d5ffd69 SHA512 9df72e736c4e772e75c3131b1774550a03b785e3ee9f4504d6ceea19d18960ac96fd1d8e415a349e8a65d4be33e51022d2618a779cc04e40822720b87125ebc4
+EBUILD ament_cmake_uncrustify-0.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-9999.ebuild 1517 BLAKE2B 7611ecb510ac8094b3b4878b4dfc83339e198e24910806025d1393477bd3c7d8c7de5afb5a351e021408279d1f16348e1d2cffb3b42c24139ce471b64d5ffd69 SHA512 9df72e736c4e772e75c3131b1774550a03b785e3ee9f4504d6ceea19d18960ac96fd1d8e415a349e8a65d4be33e51022d2618a779cc04e40822720b87125ebc4
+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.11.2.ebuild b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.11.2.ebuild
index ba3ee494af1c..826f45045e89 100644
--- a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.11.2.ebuild
+++ b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.11.2.ebuild
@@ -3,7 +3,7 @@
 
 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-9999.ebuild b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-9999.ebuild
index ba3ee494af1c..826f45045e89 100644
--- a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-9999.ebuild
+++ b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-9999.ebuild
@@ -3,7 +3,7 @@
 
 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_version/Manifest b/dev-ros/ament_cmake_version/Manifest
index 90d3107939cf..6a398c045d25 100644
--- a/dev-ros/ament_cmake_version/Manifest
+++ b/dev-ros/ament_cmake_version/Manifest
@@ -11,6 +11,6 @@ EBUILD ament_cmake_version-1.0.1.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944a
 EBUILD ament_cmake_version-1.0.3.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
 EBUILD ament_cmake_version-1.0.4.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
 EBUILD ament_cmake_version-1.1.3.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
-EBUILD ament_cmake_version-1.1.4.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
-EBUILD ament_cmake_version-9999.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
+EBUILD ament_cmake_version-1.1.4.ebuild 1153 BLAKE2B bda2e52ba32026d66475180792b557e32daf7c4bfe519fb2b4eb373ae936fbf96523860561f1c6ae97c85e677153e501b06c7b6ff30a952d15cd6226f1b25947 SHA512 ead48b4ca1e50612ce46f9f753c729d6b32a7174faff6a4292f31b980d4cff5843236446fe4215e38612cd9c113e68b00da36ea4bcb00c09d7d5fe636d2b1a2e
+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.1.4.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-1.1.4.ebuild
index a03f6bbe74af..2124a92f04a5 100644
--- a/dev-ros/ament_cmake_version/ament_cmake_version-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_version/ament_cmake_version-1.1.4.ebuild
@@ -3,7 +3,7 @@
 
 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_version/ament_cmake_version-9999.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-9999.ebuild
index a03f6bbe74af..2124a92f04a5 100644
--- a/dev-ros/ament_cmake_version/ament_cmake_version-9999.ebuild
+++ b/dev-ros/ament_cmake_version/ament_cmake_version-9999.ebuild
@@ -3,7 +3,7 @@
 
 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 ae2dcc095b36..a96802c735af 100644
--- a/dev-ros/ament_cmake_xmllint/Manifest
+++ b/dev-ros/ament_cmake_xmllint/Manifest
@@ -6,7 +6,7 @@ DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53
 EBUILD ament_cmake_xmllint-0.10.0.ebuild 1453 BLAKE2B adb8a13381da60fda8c430297974c6e53992342984a2f4c7115b3d9370b9397ebabfd3d7944b8e8571a2e0de8e5613f55834e0c3e95922a3a32a096e257a1686 SHA512 f4ce7240407a8dd1eecb4332f25d1fb2ab5d45980b3a101a09521e9507c62d27f3aab18d87c20036060a3012f084d40de5145fe8daa61adb07185e928b302eb3
 EBUILD ament_cmake_xmllint-0.10.1.ebuild 1453 BLAKE2B adb8a13381da60fda8c430297974c6e53992342984a2f4c7115b3d9370b9397ebabfd3d7944b8e8571a2e0de8e5613f55834e0c3e95922a3a32a096e257a1686 SHA512 f4ce7240407a8dd1eecb4332f25d1fb2ab5d45980b3a101a09521e9507c62d27f3aab18d87c20036060a3012f084d40de5145fe8daa61adb07185e928b302eb3
 EBUILD ament_cmake_xmllint-0.10.4.ebuild 1453 BLAKE2B adb8a13381da60fda8c430297974c6e53992342984a2f4c7115b3d9370b9397ebabfd3d7944b8e8571a2e0de8e5613f55834e0c3e95922a3a32a096e257a1686 SHA512 f4ce7240407a8dd1eecb4332f25d1fb2ab5d45980b3a101a09521e9507c62d27f3aab18d87c20036060a3012f084d40de5145fe8daa61adb07185e928b302eb3
-EBUILD ament_cmake_xmllint-0.11.2.ebuild 1453 BLAKE2B adb8a13381da60fda8c430297974c6e53992342984a2f4c7115b3d9370b9397ebabfd3d7944b8e8571a2e0de8e5613f55834e0c3e95922a3a32a096e257a1686 SHA512 f4ce7240407a8dd1eecb4332f25d1fb2ab5d45980b3a101a09521e9507c62d27f3aab18d87c20036060a3012f084d40de5145fe8daa61adb07185e928b302eb3
+EBUILD ament_cmake_xmllint-0.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 1453 BLAKE2B adb8a13381da60fda8c430297974c6e53992342984a2f4c7115b3d9370b9397ebabfd3d7944b8e8571a2e0de8e5613f55834e0c3e95922a3a32a096e257a1686 SHA512 f4ce7240407a8dd1eecb4332f25d1fb2ab5d45980b3a101a09521e9507c62d27f3aab18d87c20036060a3012f084d40de5145fe8daa61adb07185e928b302eb3
+EBUILD ament_cmake_xmllint-9999.ebuild 1372 BLAKE2B a67d9919583c2aaecc588a64fd6029b56441961cc2125f47447d3de961fe61470a35c4886c0c22fa6b6b713e42ddb0ce9750565895b6e0ce11f847824d314850 SHA512 512e1499562d581c7a3c3908a60c426220e81eb70739f8de041d7e2561c1a92abc7fb24cff2369516d1fc5d7e8a0c8909fad89ed7c22fbe113edb8fc09e8c896
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
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 91e92ca5ad7d..72cc39d41939 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
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 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 91e92ca5ad7d..72cc39d41939 100644
--- a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-9999.ebuild
+++ b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 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_copyright/Manifest b/dev-ros/ament_copyright/Manifest
index 2e8d5910ae33..1c4cb94dedda 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 1146 BLAKE2B 2dc60a4dbe7576339ef943632712daa4947ca09fc86d6354c817c9c437f7c27f58f9ea357e8d235437647c6387e373a1439d31c20cb35a8dceab634d41f3e2b0 SHA512 6e9a1dee263be9edf0f7408a31640f43452d3107344c528eb19c9614aa57b66e53783f47ce65d194d0fe8eb4a4154bdc45df7d1baf01b64b2d96cf311ddf2902
-EBUILD ament_copyright-0.11.2.ebuild 1146 BLAKE2B 2dc60a4dbe7576339ef943632712daa4947ca09fc86d6354c817c9c437f7c27f58f9ea357e8d235437647c6387e373a1439d31c20cb35a8dceab634d41f3e2b0 SHA512 6e9a1dee263be9edf0f7408a31640f43452d3107344c528eb19c9614aa57b66e53783f47ce65d194d0fe8eb4a4154bdc45df7d1baf01b64b2d96cf311ddf2902
-EBUILD ament_copyright-9999.ebuild 1146 BLAKE2B 2dc60a4dbe7576339ef943632712daa4947ca09fc86d6354c817c9c437f7c27f58f9ea357e8d235437647c6387e373a1439d31c20cb35a8dceab634d41f3e2b0 SHA512 6e9a1dee263be9edf0f7408a31640f43452d3107344c528eb19c9614aa57b66e53783f47ce65d194d0fe8eb4a4154bdc45df7d1baf01b64b2d96cf311ddf2902
+EBUILD ament_copyright-0.11.2.ebuild 931 BLAKE2B e6da3ad933a9e0f235ea784ea78802fb35053b63be63a9fa24d5924710e7835402a43fdb379593067a18bdb6345b63c0f564abc03e3f03ab13c5dcc205874b1b SHA512 6a30e33a94bcac5c4660c163a4e8f232175bb3336bc7b072d9c46eac980a4b4126d7d38bdc51a88a1e73549203ff2a843bdb23de2306bdde535ebbe626adbb3e
+EBUILD ament_copyright-9999.ebuild 931 BLAKE2B e6da3ad933a9e0f235ea784ea78802fb35053b63be63a9fa24d5924710e7835402a43fdb379593067a18bdb6345b63c0f564abc03e3f03ab13c5dcc205874b1b SHA512 6a30e33a94bcac5c4660c163a4e8f232175bb3336bc7b072d9c46eac980a4b4126d7d38bdc51a88a1e73549203ff2a843bdb23de2306bdde535ebbe626adbb3e
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_copyright/ament_copyright-0.11.2.ebuild b/dev-ros/ament_copyright/ament_copyright-0.11.2.ebuild
index dfdc3192ac68..74abd98c7e6a 100644
--- a/dev-ros/ament_copyright/ament_copyright-0.11.2.ebuild
+++ b/dev-ros/ament_copyright/ament_copyright-0.11.2.ebuild
@@ -3,7 +3,7 @@
 
 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_copyright/ament_copyright-9999.ebuild b/dev-ros/ament_copyright/ament_copyright-9999.ebuild
index dfdc3192ac68..74abd98c7e6a 100644
--- a/dev-ros/ament_copyright/ament_copyright-9999.ebuild
+++ b/dev-ros/ament_copyright/ament_copyright-9999.ebuild
@@ -3,7 +3,7 @@
 
 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_cpplint/Manifest b/dev-ros/ament_cpplint/Manifest
index 98bea8e7227b..beba5a2c137e 100644
--- a/dev-ros/ament_cpplint/Manifest
+++ b/dev-ros/ament_cpplint/Manifest
@@ -5,6 +5,6 @@ DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c
 EBUILD ament_cpplint-0.10.0.ebuild 1025 BLAKE2B 1a90d417f2c6a3c05a9e8171520b84520c3936d0e7a38abd6a29846b3da00b6972583fed66acd98324766ece259484fd859a1c0746b2afaa71742b54fafa2db8 SHA512 2e43e46d5029a4e213379f2b7a44ee53a6778eb831a12abad119674deccf5f0adec1320ba43a9b1624dfc37f71f2bda0c2f0123123d89cfe8495b7b8e029076e
 EBUILD ament_cpplint-0.10.1.ebuild 1025 BLAKE2B 1a90d417f2c6a3c05a9e8171520b84520c3936d0e7a38abd6a29846b3da00b6972583fed66acd98324766ece259484fd859a1c0746b2afaa71742b54fafa2db8 SHA512 2e43e46d5029a4e213379f2b7a44ee53a6778eb831a12abad119674deccf5f0adec1320ba43a9b1624dfc37f71f2bda0c2f0123123d89cfe8495b7b8e029076e
 EBUILD ament_cpplint-0.10.4.ebuild 1025 BLAKE2B 1a90d417f2c6a3c05a9e8171520b84520c3936d0e7a38abd6a29846b3da00b6972583fed66acd98324766ece259484fd859a1c0746b2afaa71742b54fafa2db8 SHA512 2e43e46d5029a4e213379f2b7a44ee53a6778eb831a12abad119674deccf5f0adec1320ba43a9b1624dfc37f71f2bda0c2f0123123d89cfe8495b7b8e029076e
-EBUILD ament_cpplint-0.11.2.ebuild 1025 BLAKE2B 1a90d417f2c6a3c05a9e8171520b84520c3936d0e7a38abd6a29846b3da00b6972583fed66acd98324766ece259484fd859a1c0746b2afaa71742b54fafa2db8 SHA512 2e43e46d5029a4e213379f2b7a44ee53a6778eb831a12abad119674deccf5f0adec1320ba43a9b1624dfc37f71f2bda0c2f0123123d89cfe8495b7b8e029076e
-EBUILD ament_cpplint-9999.ebuild 1025 BLAKE2B 1a90d417f2c6a3c05a9e8171520b84520c3936d0e7a38abd6a29846b3da00b6972583fed66acd98324766ece259484fd859a1c0746b2afaa71742b54fafa2db8 SHA512 2e43e46d5029a4e213379f2b7a44ee53a6778eb831a12abad119674deccf5f0adec1320ba43a9b1624dfc37f71f2bda0c2f0123123d89cfe8495b7b8e029076e
+EBUILD ament_cpplint-0.11.2.ebuild 868 BLAKE2B 6827a856e030d854e417cdd2c27f98b7a522ab310ee4c117eaae9c188bee3ebe35f0dfe85c216331989b75b0107b0b088a6ee08e9807aeb5ca2b18dc87509363 SHA512 f26b89bdfd541736c625e22b331960d9fe9f3da3282680548a904637deedf4f4356f993221705f7a1593262f9c3eab45370f4d8e2060dc3038cf46d5875844b0
+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.11.2.ebuild b/dev-ros/ament_cpplint/ament_cpplint-0.11.2.ebuild
index c8856b376bb5..fd0a411550bc 100644
--- a/dev-ros/ament_cpplint/ament_cpplint-0.11.2.ebuild
+++ b/dev-ros/ament_cpplint/ament_cpplint-0.11.2.ebuild
@@ -3,7 +3,7 @@
 
 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_cpplint/ament_cpplint-9999.ebuild b/dev-ros/ament_cpplint/ament_cpplint-9999.ebuild
index c8856b376bb5..fd0a411550bc 100644
--- a/dev-ros/ament_cpplint/ament_cpplint-9999.ebuild
+++ b/dev-ros/ament_cpplint/ament_cpplint-9999.ebuild
@@ -3,7 +3,7 @@
 
 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 36e8e3272383..74b0383f4030 100644
--- a/dev-ros/ament_flake8/Manifest
+++ b/dev-ros/ament_flake8/Manifest
@@ -5,6 +5,6 @@ DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c
 EBUILD ament_flake8-0.10.0.ebuild 968 BLAKE2B 72fdf816476eda52b369baede1ad220599eef94170efb53e2aafbe21f03e81d332e7552383c643308909f8d05e982954ffd600a1683bc6e442f3191320f5c19b SHA512 fdd06b0c0946e6aa1fbc538c541cacdf40448d606fe3b04d4b968195175200731672d120bb92ea2aa9b8e5805c274cf5551f82b4d174dde7ab62bf2a211c7ff9
 EBUILD ament_flake8-0.10.1.ebuild 968 BLAKE2B 72fdf816476eda52b369baede1ad220599eef94170efb53e2aafbe21f03e81d332e7552383c643308909f8d05e982954ffd600a1683bc6e442f3191320f5c19b SHA512 fdd06b0c0946e6aa1fbc538c541cacdf40448d606fe3b04d4b968195175200731672d120bb92ea2aa9b8e5805c274cf5551f82b4d174dde7ab62bf2a211c7ff9
 EBUILD ament_flake8-0.10.4.ebuild 968 BLAKE2B 72fdf816476eda52b369baede1ad220599eef94170efb53e2aafbe21f03e81d332e7552383c643308909f8d05e982954ffd600a1683bc6e442f3191320f5c19b SHA512 fdd06b0c0946e6aa1fbc538c541cacdf40448d606fe3b04d4b968195175200731672d120bb92ea2aa9b8e5805c274cf5551f82b4d174dde7ab62bf2a211c7ff9
-EBUILD ament_flake8-0.11.2.ebuild 968 BLAKE2B 72fdf816476eda52b369baede1ad220599eef94170efb53e2aafbe21f03e81d332e7552383c643308909f8d05e982954ffd600a1683bc6e442f3191320f5c19b SHA512 fdd06b0c0946e6aa1fbc538c541cacdf40448d606fe3b04d4b968195175200731672d120bb92ea2aa9b8e5805c274cf5551f82b4d174dde7ab62bf2a211c7ff9
-EBUILD ament_flake8-9999.ebuild 968 BLAKE2B 72fdf816476eda52b369baede1ad220599eef94170efb53e2aafbe21f03e81d332e7552383c643308909f8d05e982954ffd600a1683bc6e442f3191320f5c19b SHA512 fdd06b0c0946e6aa1fbc538c541cacdf40448d606fe3b04d4b968195175200731672d120bb92ea2aa9b8e5805c274cf5551f82b4d174dde7ab62bf2a211c7ff9
+EBUILD ament_flake8-0.11.2.ebuild 819 BLAKE2B 1c28ed70fc17fd1f204c658544ceffbfa867a51473c94a9d04064ead508d0683718392e4ab9e532a52d43d514b799cae09f6ce164e512479662515c417df9f73 SHA512 ee7d194283ec63a69b0eb82b24b09c090367f0b6e4857b12dc829152ccd81b0bbe3fa715716303a0ee98bd65725f63687f7e035e7ecfc0a92e45c89948096c8f
+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.11.2.ebuild b/dev-ros/ament_flake8/ament_flake8-0.11.2.ebuild
index c2beb0d53809..86b4eb10d03b 100644
--- a/dev-ros/ament_flake8/ament_flake8-0.11.2.ebuild
+++ b/dev-ros/ament_flake8/ament_flake8-0.11.2.ebuild
@@ -3,7 +3,7 @@
 
 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_flake8/ament_flake8-9999.ebuild b/dev-ros/ament_flake8/ament_flake8-9999.ebuild
index c2beb0d53809..86b4eb10d03b 100644
--- a/dev-ros/ament_flake8/ament_flake8-9999.ebuild
+++ b/dev-ros/ament_flake8/ament_flake8-9999.ebuild
@@ -3,7 +3,7 @@
 
 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_auto/Manifest b/dev-ros/ament_lint_auto/Manifest
index f62188a10526..33cc42e974a6 100644
--- a/dev-ros/ament_lint_auto/Manifest
+++ b/dev-ros/ament_lint_auto/Manifest
@@ -6,7 +6,7 @@ DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53
 EBUILD ament_lint_auto-0.10.0.ebuild 1174 BLAKE2B 56c7160c249225a87f4614fc1a391ca6b0a4f70a8997a32e52259c60ca39f50aa86d63a51235aaa9f01fbbdbd3f92ba8c015566ec92231267ea1df7c54739eff SHA512 dc3fd294fa9d90a5e64b9d30ef5f042d510d5f9361c5c9ff584122999b654f0ddba2208ac758e1680b93a736b91c77de98e4a61774aefa5885779f5a9cf61b48
 EBUILD ament_lint_auto-0.10.1.ebuild 1174 BLAKE2B 56c7160c249225a87f4614fc1a391ca6b0a4f70a8997a32e52259c60ca39f50aa86d63a51235aaa9f01fbbdbd3f92ba8c015566ec92231267ea1df7c54739eff SHA512 dc3fd294fa9d90a5e64b9d30ef5f042d510d5f9361c5c9ff584122999b654f0ddba2208ac758e1680b93a736b91c77de98e4a61774aefa5885779f5a9cf61b48
 EBUILD ament_lint_auto-0.10.4.ebuild 1174 BLAKE2B 56c7160c249225a87f4614fc1a391ca6b0a4f70a8997a32e52259c60ca39f50aa86d63a51235aaa9f01fbbdbd3f92ba8c015566ec92231267ea1df7c54739eff SHA512 dc3fd294fa9d90a5e64b9d30ef5f042d510d5f9361c5c9ff584122999b654f0ddba2208ac758e1680b93a736b91c77de98e4a61774aefa5885779f5a9cf61b48
-EBUILD ament_lint_auto-0.11.2.ebuild 1174 BLAKE2B 56c7160c249225a87f4614fc1a391ca6b0a4f70a8997a32e52259c60ca39f50aa86d63a51235aaa9f01fbbdbd3f92ba8c015566ec92231267ea1df7c54739eff SHA512 dc3fd294fa9d90a5e64b9d30ef5f042d510d5f9361c5c9ff584122999b654f0ddba2208ac758e1680b93a736b91c77de98e4a61774aefa5885779f5a9cf61b48
+EBUILD ament_lint_auto-0.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-9999.ebuild 1174 BLAKE2B 56c7160c249225a87f4614fc1a391ca6b0a4f70a8997a32e52259c60ca39f50aa86d63a51235aaa9f01fbbdbd3f92ba8c015566ec92231267ea1df7c54739eff SHA512 dc3fd294fa9d90a5e64b9d30ef5f042d510d5f9361c5c9ff584122999b654f0ddba2208ac758e1680b93a736b91c77de98e4a61774aefa5885779f5a9cf61b48
+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.11.2.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-0.11.2.ebuild
index 99bd8c66a9d9..7c0ae86f0a35 100644
--- a/dev-ros/ament_lint_auto/ament_lint_auto-0.11.2.ebuild
+++ b/dev-ros/ament_lint_auto/ament_lint_auto-0.11.2.ebuild
@@ -3,7 +3,7 @@
 
 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-9999.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-9999.ebuild
index 99bd8c66a9d9..7c0ae86f0a35 100644
--- a/dev-ros/ament_lint_auto/ament_lint_auto-9999.ebuild
+++ b/dev-ros/ament_lint_auto/ament_lint_auto-9999.ebuild
@@ -3,7 +3,7 @@
 
 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_cmake/Manifest b/dev-ros/ament_lint_cmake/Manifest
index fdf01b7b666c..553e09994ec4 100644
--- a/dev-ros/ament_lint_cmake/Manifest
+++ b/dev-ros/ament_lint_cmake/Manifest
@@ -5,6 +5,6 @@ DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c
 EBUILD ament_lint_cmake-0.10.0.ebuild 1017 BLAKE2B 7fca1803c7fa666a9dc860bb9cd4c474f20d9904f29b0f59f88875b0648f76d1c3737a24d901ed50617032068ccfda4d3841e1f6de62dfd25488ec7d63cd5517 SHA512 679e7f313ecc007a698a3c978ab11718c6fddad57655869a3b81a14cefc7d1d2d60e11311a600b6186ed6c0c13ac84834f1ecfe54dbbc81f8efcf77b4d2b547f
 EBUILD ament_lint_cmake-0.10.1.ebuild 1017 BLAKE2B 7fca1803c7fa666a9dc860bb9cd4c474f20d9904f29b0f59f88875b0648f76d1c3737a24d901ed50617032068ccfda4d3841e1f6de62dfd25488ec7d63cd5517 SHA512 679e7f313ecc007a698a3c978ab11718c6fddad57655869a3b81a14cefc7d1d2d60e11311a600b6186ed6c0c13ac84834f1ecfe54dbbc81f8efcf77b4d2b547f
 EBUILD ament_lint_cmake-0.10.4.ebuild 1017 BLAKE2B 7fca1803c7fa666a9dc860bb9cd4c474f20d9904f29b0f59f88875b0648f76d1c3737a24d901ed50617032068ccfda4d3841e1f6de62dfd25488ec7d63cd5517 SHA512 679e7f313ecc007a698a3c978ab11718c6fddad57655869a3b81a14cefc7d1d2d60e11311a600b6186ed6c0c13ac84834f1ecfe54dbbc81f8efcf77b4d2b547f
-EBUILD ament_lint_cmake-0.11.2.ebuild 1017 BLAKE2B 7fca1803c7fa666a9dc860bb9cd4c474f20d9904f29b0f59f88875b0648f76d1c3737a24d901ed50617032068ccfda4d3841e1f6de62dfd25488ec7d63cd5517 SHA512 679e7f313ecc007a698a3c978ab11718c6fddad57655869a3b81a14cefc7d1d2d60e11311a600b6186ed6c0c13ac84834f1ecfe54dbbc81f8efcf77b4d2b547f
+EBUILD ament_lint_cmake-0.11.2.ebuild 860 BLAKE2B bb78abd111dec0a0d8f03d2dd8baba102efc41ff2444bbf17d83dcfbc4b5487caff4d6925c579ebb2be5f58dc2b1e56901c1f323d83848fe1e4f7530c3a38781 SHA512 533e94036afb344edac090e3e88b63ee7c1afbeba4432ba6cfe7334eda919717c015e8be265c5f51691ccf3a5effe0d19d14d77ac922a6d0ba0ec3883ef3eff0
 EBUILD ament_lint_cmake-9999.ebuild 1017 BLAKE2B 7fca1803c7fa666a9dc860bb9cd4c474f20d9904f29b0f59f88875b0648f76d1c3737a24d901ed50617032068ccfda4d3841e1f6de62dfd25488ec7d63cd5517 SHA512 679e7f313ecc007a698a3c978ab11718c6fddad57655869a3b81a14cefc7d1d2d60e11311a600b6186ed6c0c13ac84834f1ecfe54dbbc81f8efcf77b4d2b547f
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_lint_cmake/ament_lint_cmake-0.11.2.ebuild b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.11.2.ebuild
index b926d90a9384..26c91bcf5f4c 100644
--- a/dev-ros/ament_lint_cmake/ament_lint_cmake-0.11.2.ebuild
+++ b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.11.2.ebuild
@@ -3,7 +3,7 @@
 
 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="Lint CMake code using cmakelint and generate xUnit test result files"
@@ -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_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 32746e3e12a6..5cc0176b2cc5 100644
--- a/dev-ros/ament_pep257/Manifest
+++ b/dev-ros/ament_pep257/Manifest
@@ -5,6 +5,6 @@ DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c
 EBUILD ament_pep257-0.10.0.ebuild 1020 BLAKE2B 7f8c5a1e7873b10041b8d416bf3b78c358e53911d74390daaf63377d0d4b27709376a80e09e9e68a10e3cdb25cf27853111aaf88f31a20da7fcc0e709150027b SHA512 405e63b87196f1dbd91358b8c14c39a0a478791bff751c3b78000152c553acf1a712e7425e104e05489e16ad3b8151ec3399b937eaa8db74aad7db9c1c471c81
 EBUILD ament_pep257-0.10.1.ebuild 1020 BLAKE2B 7f8c5a1e7873b10041b8d416bf3b78c358e53911d74390daaf63377d0d4b27709376a80e09e9e68a10e3cdb25cf27853111aaf88f31a20da7fcc0e709150027b SHA512 405e63b87196f1dbd91358b8c14c39a0a478791bff751c3b78000152c553acf1a712e7425e104e05489e16ad3b8151ec3399b937eaa8db74aad7db9c1c471c81
 EBUILD ament_pep257-0.10.4.ebuild 1020 BLAKE2B 7f8c5a1e7873b10041b8d416bf3b78c358e53911d74390daaf63377d0d4b27709376a80e09e9e68a10e3cdb25cf27853111aaf88f31a20da7fcc0e709150027b SHA512 405e63b87196f1dbd91358b8c14c39a0a478791bff751c3b78000152c553acf1a712e7425e104e05489e16ad3b8151ec3399b937eaa8db74aad7db9c1c471c81
-EBUILD ament_pep257-0.11.2.ebuild 1020 BLAKE2B 7f8c5a1e7873b10041b8d416bf3b78c358e53911d74390daaf63377d0d4b27709376a80e09e9e68a10e3cdb25cf27853111aaf88f31a20da7fcc0e709150027b SHA512 405e63b87196f1dbd91358b8c14c39a0a478791bff751c3b78000152c553acf1a712e7425e104e05489e16ad3b8151ec3399b937eaa8db74aad7db9c1c471c81
-EBUILD ament_pep257-9999.ebuild 1020 BLAKE2B 7f8c5a1e7873b10041b8d416bf3b78c358e53911d74390daaf63377d0d4b27709376a80e09e9e68a10e3cdb25cf27853111aaf88f31a20da7fcc0e709150027b SHA512 405e63b87196f1dbd91358b8c14c39a0a478791bff751c3b78000152c553acf1a712e7425e104e05489e16ad3b8151ec3399b937eaa8db74aad7db9c1c471c81
+EBUILD ament_pep257-0.11.2.ebuild 895 BLAKE2B 8460ae9274603bc36ba7b933b145d3c7c92ebc6e5916c51d6258b25da244269b00806f0cbf8f8f18430dd3f2cca19579cedef4464483daf59dc514827623ca4e SHA512 0f846351d1b84563f86287a6722e1810d855162c4a92e6fe4c241c77d45131f7abc330fd75c7aa7678b9221276cbc717ec76c161047f850eac38a5a5a7c619e0
+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.11.2.ebuild b/dev-ros/ament_pep257/ament_pep257-0.11.2.ebuild
index d68cc9cf4ecc..92564bbd5e52 100644
--- a/dev-ros/ament_pep257/ament_pep257-0.11.2.ebuild
+++ b/dev-ros/ament_pep257/ament_pep257-0.11.2.ebuild
@@ -3,7 +3,7 @@
 
 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_pep257/ament_pep257-9999.ebuild b/dev-ros/ament_pep257/ament_pep257-9999.ebuild
index d68cc9cf4ecc..92564bbd5e52 100644
--- a/dev-ros/ament_pep257/ament_pep257-9999.ebuild
+++ b/dev-ros/ament_pep257/ament_pep257-9999.ebuild
@@ -3,7 +3,7 @@
 
 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_xmllint/Manifest b/dev-ros/ament_xmllint/Manifest
index 1552f4ab3436..496945f52e01 100644
--- a/dev-ros/ament_xmllint/Manifest
+++ b/dev-ros/ament_xmllint/Manifest
@@ -5,6 +5,6 @@ DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c
 EBUILD ament_xmllint-0.10.0.ebuild 1086 BLAKE2B 1aa1586f23b93239b69be21b1cca02453b921f28bb635bcffe173b7d5a3c868ddc366841421f906680799692d48e5d3a5763aee6b31120e19b145f115f169301 SHA512 bde5d7c87301bfe9110faa376623048ec98474fcb35ff5a6eb970196149895725d231e47457e4dbd7d1da40fb912b340f44944be83703b3e80b2ecb62b0b258e
 EBUILD ament_xmllint-0.10.1.ebuild 1086 BLAKE2B 1aa1586f23b93239b69be21b1cca02453b921f28bb635bcffe173b7d5a3c868ddc366841421f906680799692d48e5d3a5763aee6b31120e19b145f115f169301 SHA512 bde5d7c87301bfe9110faa376623048ec98474fcb35ff5a6eb970196149895725d231e47457e4dbd7d1da40fb912b340f44944be83703b3e80b2ecb62b0b258e
 EBUILD ament_xmllint-0.10.4.ebuild 1086 BLAKE2B 1aa1586f23b93239b69be21b1cca02453b921f28bb635bcffe173b7d5a3c868ddc366841421f906680799692d48e5d3a5763aee6b31120e19b145f115f169301 SHA512 bde5d7c87301bfe9110faa376623048ec98474fcb35ff5a6eb970196149895725d231e47457e4dbd7d1da40fb912b340f44944be83703b3e80b2ecb62b0b258e
-EBUILD ament_xmllint-0.11.2.ebuild 1086 BLAKE2B 1aa1586f23b93239b69be21b1cca02453b921f28bb635bcffe173b7d5a3c868ddc366841421f906680799692d48e5d3a5763aee6b31120e19b145f115f169301 SHA512 bde5d7c87301bfe9110faa376623048ec98474fcb35ff5a6eb970196149895725d231e47457e4dbd7d1da40fb912b340f44944be83703b3e80b2ecb62b0b258e
-EBUILD ament_xmllint-9999.ebuild 1086 BLAKE2B 1aa1586f23b93239b69be21b1cca02453b921f28bb635bcffe173b7d5a3c868ddc366841421f906680799692d48e5d3a5763aee6b31120e19b145f115f169301 SHA512 bde5d7c87301bfe9110faa376623048ec98474fcb35ff5a6eb970196149895725d231e47457e4dbd7d1da40fb912b340f44944be83703b3e80b2ecb62b0b258e
+EBUILD ament_xmllint-0.11.2.ebuild 960 BLAKE2B 52e1b8d5670a4e66a148d3388ff51af51b52182a326e658370b0921a3579ee1a838e215e79ab6cc4957510a3477a105116ebf6ca20215e83f19d2a31f795ac3b SHA512 b2b36a86b3e792eed2c0c56302b4ab8cea618b8f4ea5d1571e6e7b7901fc117a3f105f6e00d6eb84127c4aa589247dba87dbe33c6a917adae5ff3d4e3466e0f0
+EBUILD ament_xmllint-9999.ebuild 960 BLAKE2B 52e1b8d5670a4e66a148d3388ff51af51b52182a326e658370b0921a3579ee1a838e215e79ab6cc4957510a3477a105116ebf6ca20215e83f19d2a31f795ac3b SHA512 b2b36a86b3e792eed2c0c56302b4ab8cea618b8f4ea5d1571e6e7b7901fc117a3f105f6e00d6eb84127c4aa589247dba87dbe33c6a917adae5ff3d4e3466e0f0
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_xmllint/ament_xmllint-0.11.2.ebuild b/dev-ros/ament_xmllint/ament_xmllint-0.11.2.ebuild
index dc712bff4c31..1cd644ad005b 100644
--- a/dev-ros/ament_xmllint/ament_xmllint-0.11.2.ebuild
+++ b/dev-ros/ament_xmllint/ament_xmllint-0.11.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..9} )
 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/ament_xmllint/ament_xmllint-9999.ebuild b/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild
index dc712bff4c31..1cd644ad005b 100644
--- a/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild
+++ b/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..9} )
 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/console_bridge_vendor/Manifest b/dev-ros/console_bridge_vendor/Manifest
index 4f8b4c44a525..7132d7830185 100644
--- a/dev-ros/console_bridge_vendor/Manifest
+++ b/dev-ros/console_bridge_vendor/Manifest
@@ -1,4 +1,4 @@
 DIST console_bridge_vendor-1.2.2.tar.gz 7570 BLAKE2B 2b690d20851cf38554fcfa8645eb0c8bd7b226dcdf1e43ac379f5164d1aa8133bd4e75654b3354153985015d46a7cb2b71195cf123a982eadd1a91bbf6172624 SHA512 e44090cec050af7681892bfc4cb71d7f127b467845a1ec0d103678322c9482ce6ede0b5e914fd472380381906e350b3f64ead4d67e4c514a3c7c7e4d6fc24c22
-EBUILD console_bridge_vendor-1.2.2.ebuild 1042 BLAKE2B cdf8cd999343a79ef781f9e86287e77d11cb395c1ca08c636ce8eecaa9da9213cca54dcc7f84d22a77c9cf4adb21893322fcc002d624498119a3710301cc35a1 SHA512 a375f76cd2085990d18bea63f1fd5be94cc4ab1741286dbdf57ee9daa588316b38c976a3050e74153fc2e727d941f313f4008d0533f496695a2a62cf7e133898
-EBUILD console_bridge_vendor-9999.ebuild 1042 BLAKE2B cdf8cd999343a79ef781f9e86287e77d11cb395c1ca08c636ce8eecaa9da9213cca54dcc7f84d22a77c9cf4adb21893322fcc002d624498119a3710301cc35a1 SHA512 a375f76cd2085990d18bea63f1fd5be94cc4ab1741286dbdf57ee9daa588316b38c976a3050e74153fc2e727d941f313f4008d0533f496695a2a62cf7e133898
+EBUILD console_bridge_vendor-1.2.2.ebuild 965 BLAKE2B e45ffac445d619769c3bf0382c8895e055f909e217e2ef8b5c0a71bf7a2b6ab6e6245694f2b27a4a25b4b1ad8f3b27704b5525482df589328014fe28084cf122 SHA512 571c7cf889c7e5ae25fe47c9240b12d41a75c92f613cea8aa16cf5d04eea4d3d833b9e839e9588384a64dcd0d431d051026c86d7f9859e98aedc7017282778bb
+EBUILD console_bridge_vendor-9999.ebuild 965 BLAKE2B e45ffac445d619769c3bf0382c8895e055f909e217e2ef8b5c0a71bf7a2b6ab6e6245694f2b27a4a25b4b1ad8f3b27704b5525482df589328014fe28084cf122 SHA512 571c7cf889c7e5ae25fe47c9240b12d41a75c92f613cea8aa16cf5d04eea4d3d833b9e839e9588384a64dcd0d431d051026c86d7f9859e98aedc7017282778bb
 MISC metadata.xml 341 BLAKE2B b799ae238b59b7d78f3f044af907f3598d6f85e89167150551af57853376c77f28f1221811d4e1e8864256d1189dfd92fdc6d47ddd181cf9b1606945759ddcd4 SHA512 8d716639e08062e601f547912ee7dcdfdb3f6eb0fb8f5a53311b1a759eda4bd06d91f6823c78440dd99a2c81e67f4aaef87f6d5882dc59b7d9de9924020fac8f
diff --git a/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.2.ebuild b/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.2.ebuild
index 657bd30e0142..4646288f53e8 100644
--- a/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.2.ebuild
+++ b/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.2.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ros2/console_bridge_vendor"
-	SRC_URI=""
 else
 	SRC_URI="https://github.com/ros2/console_bridge_vendor/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Wrapper around console_bridge"
@@ -20,11 +20,6 @@ HOMEPAGE="https://github.com/ros2/console_bridge_vendor"
 
 LICENSE="Apache-2.0 BSD"
 SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ros/console_bridge_vendor/console_bridge_vendor-9999.ebuild b/dev-ros/console_bridge_vendor/console_bridge_vendor-9999.ebuild
index 657bd30e0142..4646288f53e8 100644
--- a/dev-ros/console_bridge_vendor/console_bridge_vendor-9999.ebuild
+++ b/dev-ros/console_bridge_vendor/console_bridge_vendor-9999.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ros2/console_bridge_vendor"
-	SRC_URI=""
 else
 	SRC_URI="https://github.com/ros2/console_bridge_vendor/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Wrapper around console_bridge"
@@ -20,11 +20,6 @@ HOMEPAGE="https://github.com/ros2/console_bridge_vendor"
 
 LICENSE="Apache-2.0 BSD"
 SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ros/python_cmake_module/Manifest b/dev-ros/python_cmake_module/Manifest
index c097bf120dbb..5e3ed7a79e0a 100644
--- a/dev-ros/python_cmake_module/Manifest
+++ b/dev-ros/python_cmake_module/Manifest
@@ -1,4 +1,4 @@
 DIST python_cmake_module-0.8.1.tar.gz 7047 BLAKE2B 79f6259913d42381443f3d93d48f67fb325abf423baf054465d83f641ca40f5bfad0acab0f19560968a280eaacecf56df253c90688d75144e25e27e28f3646b0 SHA512 f513031c9d0bbd5d05a1711074287a5ffd0c30be79d2f4849599ff539584f950c2e7c2322763358c8a1ac266da325f40fe9cd4d3a127cd6a9e4dfd83a3e4149c
-EBUILD python_cmake_module-0.8.1.ebuild 1113 BLAKE2B e7d8580459b468295c8a801b74b8079c7987ec0cde60d10761765a49bba31d6fef0945760048dbb6762fee722b94d9f1553a5fb5e92e2a7261f8a3e42a61d782 SHA512 09d97095ff454ea8f046b4dc6afddb65eae195508b1bfce94f83aa74554afac255d7e44906559b73df7aee23a3612661d88706d23bc948e8af8800c3c806db00
-EBUILD python_cmake_module-9999.ebuild 1113 BLAKE2B e7d8580459b468295c8a801b74b8079c7987ec0cde60d10761765a49bba31d6fef0945760048dbb6762fee722b94d9f1553a5fb5e92e2a7261f8a3e42a61d782 SHA512 09d97095ff454ea8f046b4dc6afddb65eae195508b1bfce94f83aa74554afac255d7e44906559b73df7aee23a3612661d88706d23bc948e8af8800c3c806db00
+EBUILD python_cmake_module-0.8.1.ebuild 985 BLAKE2B 27cecad104beb11ffed14b394b8a8ee2f25fc27fa628904cd0db6bc80b0854be1178c465db095c6e4d1e57f5067e35eccaf75cf5177ae8e43026a403753e39ec SHA512 216e5845f2896bd4dccc0f1c20d0272ee755e5ab6fbc2810dd5ee8e985e202d812d2bc12e3a20f7057d9106e6f0cf8f8d3b5c9a01bfdebbaa32acb631f738b05
+EBUILD python_cmake_module-9999.ebuild 985 BLAKE2B 27cecad104beb11ffed14b394b8a8ee2f25fc27fa628904cd0db6bc80b0854be1178c465db095c6e4d1e57f5067e35eccaf75cf5177ae8e43026a403753e39ec SHA512 216e5845f2896bd4dccc0f1c20d0272ee755e5ab6fbc2810dd5ee8e985e202d812d2bc12e3a20f7057d9106e6f0cf8f8d3b5c9a01bfdebbaa32acb631f738b05
 MISC metadata.xml 339 BLAKE2B 377b2b39e6e34169034061e193a85f733223ab4016b86ebe047622d579eb7981ea80f50e1210a048c53df099f1d529312287c69eeedd0726d0f88ad217f1208a SHA512 be0c139a5d989a28bba3fe868d5c5700abcc802e1d976d732eb90479393937b09f6cdce8d542bdb587d1699a2e55b741ccef508087c1c9476f66d1ca6a83f54b
diff --git a/dev-ros/python_cmake_module/python_cmake_module-0.8.1.ebuild b/dev-ros/python_cmake_module/python_cmake_module-0.8.1.ebuild
index 150095c180f0..a94a808de7ac 100644
--- a/dev-ros/python_cmake_module/python_cmake_module-0.8.1.ebuild
+++ b/dev-ros/python_cmake_module/python_cmake_module-0.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
@@ -11,11 +11,10 @@ ROS_PN="python_cmake_module"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ros2/python_cmake_module"
-	SRC_URI=""
-	S=${WORKDIR}/${P}
 else
 	SRC_URI="https://github.com/ros2/python_cmake_module/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
 	S="${WORKDIR}/${ROS_PN}-${PV}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="CMake module with extra functionality for Python"
@@ -23,17 +22,9 @@ HOMEPAGE="https://github.com/ros2/python_cmake_module"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-"
-DEPEND="${RDEPEND}"
 BDEPEND="
 	$(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
 	test? (
diff --git a/dev-ros/python_cmake_module/python_cmake_module-9999.ebuild b/dev-ros/python_cmake_module/python_cmake_module-9999.ebuild
index 150095c180f0..a94a808de7ac 100644
--- a/dev-ros/python_cmake_module/python_cmake_module-9999.ebuild
+++ b/dev-ros/python_cmake_module/python_cmake_module-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
@@ -11,11 +11,10 @@ ROS_PN="python_cmake_module"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ros2/python_cmake_module"
-	SRC_URI=""
-	S=${WORKDIR}/${P}
 else
 	SRC_URI="https://github.com/ros2/python_cmake_module/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
 	S="${WORKDIR}/${ROS_PN}-${PV}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="CMake module with extra functionality for Python"
@@ -23,17 +22,9 @@ HOMEPAGE="https://github.com/ros2/python_cmake_module"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-"
-DEPEND="${RDEPEND}"
 BDEPEND="
 	$(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
 	test? (
author	V3n3RiX <venerix@redcorelinux.org>	2021-09-25 20:21:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-09-25 20:21:45 +0100
commit	c719fdcee603a5a706a45d10cb598762d56a727d (patch)
tree	620cbf137661399a3fb1eff92914204f9a970713 /dev-ros
parent	cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff)