gentoo auto-resync : 04:10:2022 - 13:17:38

38 files changed, 188 insertions, 207 deletions

diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 13e0a21b3292..5941dcef5510 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 0be3d7f9d37a..466e2c9b5f4b 100644
--- a/dev-ros/ament_cmake_copyright/Manifest
+++ b/dev-ros/ament_cmake_copyright/Manifest
@@ -1,6 +1,6 @@
 DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_cmake_copyright-0.11.2.ebuild 1584 BLAKE2B 8e6d4ceacbf5eef73735a962b0a7122798ef6ca5c1f0a63b93c7f673b4feeea16f612001848cddcab0e6536ac02dc77606c3acab2e8442e2caf9bd4b955bd71b SHA512 e7d0a0308ee9810b70859d33a01cd2109b5bab01cac740efc020cc74dedcf168eaf820be4e3256f3dde48f1d3c8b8099ba71222b9b46e45f2f1a30ea6bad22b0
-EBUILD ament_cmake_copyright-0.12.1.ebuild 1584 BLAKE2B 86c264708c8c39a0788ac8b2de4d0c4316c510514b729bbe4bec879e4ef1572d0e9a87df06520fed4701e582bfcef84717f0c7ed48b8afde77e7ba6ec446df31 SHA512 3c9281af951a09f65e75dcf8e8c535db5a19ed779bcc0a3953c7afa67092a3289681e914d6dd6701e9c70d2990e8cbdb28e75ff8ffb0fda05df87b3cf01dd036
-EBUILD ament_cmake_copyright-9999.ebuild 1584 BLAKE2B 8e6d4ceacbf5eef73735a962b0a7122798ef6ca5c1f0a63b93c7f673b4feeea16f612001848cddcab0e6536ac02dc77606c3acab2e8442e2caf9bd4b955bd71b SHA512 e7d0a0308ee9810b70859d33a01cd2109b5bab01cac740efc020cc74dedcf168eaf820be4e3256f3dde48f1d3c8b8099ba71222b9b46e45f2f1a30ea6bad22b0
+EBUILD ament_cmake_copyright-0.11.2.ebuild 1568 BLAKE2B 3b43fc8e211a04d94ad3420cc1bd90a9d7f9210f39b5ec11372e855335903c44a87d9b0499b0be093ec26562fdffb311f4b763b04cee49f341e8be71f87ca611 SHA512 15dfbf94c9070f7eaef9692697b04b0533a472abd34c1c6e04357634480a4366cfc2f82c7bc234b7e4d7bd1275144dbf7cefce12be94052835d82f6d69668a17
+EBUILD ament_cmake_copyright-0.12.1.ebuild 1568 BLAKE2B 3b43fc8e211a04d94ad3420cc1bd90a9d7f9210f39b5ec11372e855335903c44a87d9b0499b0be093ec26562fdffb311f4b763b04cee49f341e8be71f87ca611 SHA512 15dfbf94c9070f7eaef9692697b04b0533a472abd34c1c6e04357634480a4366cfc2f82c7bc234b7e4d7bd1275144dbf7cefce12be94052835d82f6d69668a17
+EBUILD ament_cmake_copyright-9999.ebuild 1568 BLAKE2B 3b43fc8e211a04d94ad3420cc1bd90a9d7f9210f39b5ec11372e855335903c44a87d9b0499b0be093ec26562fdffb311f4b763b04cee49f341e8be71f87ca611 SHA512 15dfbf94c9070f7eaef9692697b04b0533a472abd34c1c6e04357634480a4366cfc2f82c7bc234b7e4d7bd1275144dbf7cefce12be94052835d82f6d69668a17
 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 a5d7095d6b60..5366e55b2827 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
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,10 +47,10 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
-		( use !test || has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]" )
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+		"dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
+		( use !test || python_has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]" )
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.12.1.ebuild b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.12.1.ebuild
index dd36342b121c..5366e55b2827 100644
--- a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.12.1.ebuild
+++ b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.12.1.ebuild
@@ -47,10 +47,10 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
-		( use !test || has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]" )
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+		"dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
+		( use !test || python_has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]" )
 }
 
 src_configure() {
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 a5d7095d6b60..5366e55b2827 100644
--- a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-9999.ebuild
+++ b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,10 +47,10 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
-		( use !test || has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]" )
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+		"dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
+		( use !test || python_has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]" )
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_core/Manifest b/dev-ros/ament_cmake_core/Manifest
index a6810a65720c..34efefeaa30f 100644
--- a/dev-ros/ament_cmake_core/Manifest
+++ b/dev-ros/ament_cmake_core/Manifest
@@ -1,8 +1,8 @@
 AUX findpython.patch 543 BLAKE2B b5124bbbfdd97548aaf61bc5c0693bbd230a253302054103b83ae3136c4152f1b692b92a275dcb64713e1baaa0478a65a78a3e3bab9b8668fb14bf5e2c55ffac SHA512 1bd15b358230d43e7556536550287fa3b1e1eaf73fc852986ae7cec82bb13d883f08ac08b89de327465a76a0acdb94a1b09b4a80c4285f85224a2411ab712799
 DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_core-1.1.4.ebuild 1075 BLAKE2B ff884eddba246893586a32fd06e24bd72119d430d3191b1c3e88de924f8994dea0063299946e3a1ab3bf484e696f610f636833d67fe3db1abc0fad18c55d0367 SHA512 d9f881098dfbee87dd5c4c387641353856aa37a4de85019943b4f1dce4bd2e6e04e43fadc5ef9ad5f40c91b35a5ca7e9f8054b8911962541681519f2d7a363b4
-EBUILD ament_cmake_core-1.3.0-r1.ebuild 1118 BLAKE2B a52ebad923bd46201e5d03d6ed84d929c325fbb1abeb215dbe2bdf158144c69103a0f45b0a71026efc43eccb574b82c5c4af986ef02b069cee248f073ee14f95 SHA512 868413b27d322859a673f8bb6431b4110b302a49c10a2c34bd153f7945ea202335b78cc3603bed0186f7099609527fca30f53bb6d3b964c58bab3022e49eb5d9
-EBUILD ament_cmake_core-1.3.0.ebuild 1075 BLAKE2B b316f88d4917bcd603d931c4dbf322910332d87a787e4eb004e3cac909ef0d9dbccc903a35d5b39534cf7b740c5da917d131ecaf80cac9a1702839b1d94d8eb3 SHA512 31c22b3cc6e68423f3f23aa3b0605fae6d6304c4fa194f621035fee473121a5df90eb7a29f6926a265174816dd67e88d556a54f2976c05d44e1287d84957e2ed
-EBUILD ament_cmake_core-9999.ebuild 1118 BLAKE2B a52ebad923bd46201e5d03d6ed84d929c325fbb1abeb215dbe2bdf158144c69103a0f45b0a71026efc43eccb574b82c5c4af986ef02b069cee248f073ee14f95 SHA512 868413b27d322859a673f8bb6431b4110b302a49c10a2c34bd153f7945ea202335b78cc3603bed0186f7099609527fca30f53bb6d3b964c58bab3022e49eb5d9
+EBUILD ament_cmake_core-1.1.4.ebuild 1050 BLAKE2B 6fb63764deca8b482a9d9cef499898f1e4224e34f5ceab0ab5d76bebeff8bca50d5060b996ed181395bf62e838f68ab6ccf42acb0e11e938e1c305ec40b52683 SHA512 2c9c5959306877abf4984eec2ae11f75f762969958e0300b0a67bddf7b6382481477c9ebbb8020368a7136e5991fa11fc8433b3749898375cbd1aeaddd8eb2a8
+EBUILD ament_cmake_core-1.3.0-r1.ebuild 1093 BLAKE2B 5e7193bb5e3e4099a25f3a8065e9c009e8866a011570c181b0e6cc4c765125dd0d72ac682f7b1903efef4cc455851a180d48c056ff20e0ece6ec4b3b3a608d81 SHA512 bc62add555c6a0417164494aa77b1a4a009b1936ec60b0f3e44bfbda75f93367117f6847a39ac2f3982ae08d840c697e27c667c098d48d291976cbfa55131aee
+EBUILD ament_cmake_core-1.3.0.ebuild 1050 BLAKE2B 6fb63764deca8b482a9d9cef499898f1e4224e34f5ceab0ab5d76bebeff8bca50d5060b996ed181395bf62e838f68ab6ccf42acb0e11e938e1c305ec40b52683 SHA512 2c9c5959306877abf4984eec2ae11f75f762969958e0300b0a67bddf7b6382481477c9ebbb8020368a7136e5991fa11fc8433b3749898375cbd1aeaddd8eb2a8
+EBUILD ament_cmake_core-9999.ebuild 1093 BLAKE2B 5e7193bb5e3e4099a25f3a8065e9c009e8866a011570c181b0e6cc4c765125dd0d72ac682f7b1903efef4cc455851a180d48c056ff20e0ece6ec4b3b3a608d81 SHA512 bc62add555c6a0417164494aa77b1a4a009b1936ec60b0f3e44bfbda75f93367117f6847a39ac2f3982ae08d840c697e27c667c098d48d291976cbfa55131aee
 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 0bc79bd3fd0c..b015998c0bf2 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
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-python/ament_package
 	dev-python/catkin_pkg
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild
index 3e96c689fcb9..299b18017185 100644
--- a/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,7 +27,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 PATCHES=( "${FILESDIR}/findpython.patch" )
 
 RDEPEND="
@@ -36,12 +34,13 @@ RDEPEND="
 	dev-python/catkin_pkg
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0.ebuild
index 102deab4e5c7..b015998c0bf2 100644
--- a/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0.ebuild
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-python/ament_package
 	dev-python/catkin_pkg
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
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 3e96c689fcb9..299b18017185 100644
--- a/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,7 +27,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 PATCHES=( "${FILESDIR}/findpython.patch" )
 
 RDEPEND="
@@ -36,12 +34,13 @@ RDEPEND="
 	dev-python/catkin_pkg
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_cppcheck/Manifest b/dev-ros/ament_cmake_cppcheck/Manifest
index 27ab17697b5e..540c1b69aea1 100644
--- a/dev-ros/ament_cmake_cppcheck/Manifest
+++ b/dev-ros/ament_cmake_cppcheck/Manifest
@@ -1,6 +1,6 @@
 DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_cmake_cppcheck-0.11.2.ebuild 1457 BLAKE2B 4d33712fae1347ae211d98b265300ef2a833c65868ad51b2ef2a72339b2b6f239724dea4fc0e51d7533ef74d7d0520c9577b7905b849d71a218c713891e2e59f SHA512 483e99eb874bf9c3b959b10446d3e92311acbf01ef11aca2458f027428bf128e516ac230a9c6ab2cae863f2842091301da294c610e532ce24807200ab05af225
-EBUILD ament_cmake_cppcheck-0.12.1.ebuild 1457 BLAKE2B 5d5f4a0a4e49a9a0dc4a1378fb1cc1c415b8de52b186ddf1d8385612950a55daf1f6c2493f53c7157dbee90a10e44c66f414c1477b56702af38a76be53dbb5c6 SHA512 67dea1e4e71a7e804f9fdce7853ba989f375337becc86ac12520bf4930643367b85842a664a5043bba6812be476824e6893c9c427bef0c60580c7c757913f0b1
-EBUILD ament_cmake_cppcheck-9999.ebuild 1457 BLAKE2B 4d33712fae1347ae211d98b265300ef2a833c65868ad51b2ef2a72339b2b6f239724dea4fc0e51d7533ef74d7d0520c9577b7905b849d71a218c713891e2e59f SHA512 483e99eb874bf9c3b959b10446d3e92311acbf01ef11aca2458f027428bf128e516ac230a9c6ab2cae863f2842091301da294c610e532ce24807200ab05af225
+EBUILD ament_cmake_cppcheck-0.11.2.ebuild 1448 BLAKE2B bf14c617b202dd7f5b134e73cb96b01e52379407e6a4703e51f1ccc4eee3ec8fe9e0c87264c404a24329d086ca28674592046667681f679d2b5921cddec01523 SHA512 f42264130eef5ca480337abb3bc0a399bbc4bf5d3b29c79667f4642cb9bc3430179abe9b76edf0c25a1eb9aa59302c26f478efd834126c872d3b112eac4d755d
+EBUILD ament_cmake_cppcheck-0.12.1.ebuild 1448 BLAKE2B bf14c617b202dd7f5b134e73cb96b01e52379407e6a4703e51f1ccc4eee3ec8fe9e0c87264c404a24329d086ca28674592046667681f679d2b5921cddec01523 SHA512 f42264130eef5ca480337abb3bc0a399bbc4bf5d3b29c79667f4642cb9bc3430179abe9b76edf0c25a1eb9aa59302c26f478efd834126c872d3b112eac4d755d
+EBUILD ament_cmake_cppcheck-9999.ebuild 1448 BLAKE2B bf14c617b202dd7f5b134e73cb96b01e52379407e6a4703e51f1ccc4eee3ec8fe9e0c87264c404a24329d086ca28674592046667681f679d2b5921cddec01523 SHA512 f42264130eef5ca480337abb3bc0a399bbc4bf5d3b29c79667f4642cb9bc3430179abe9b76edf0c25a1eb9aa59302c26f478efd834126c872d3b112eac4d755d
 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 7c749cbd249f..760fd56cb6c8 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
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,9 +46,9 @@ BDEPEND="
 "
 
 python_check_deps() {
-	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+			"dev-python/ament_package[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.12.1.ebuild b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.12.1.ebuild
index db187d2408e7..760fd56cb6c8 100644
--- a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.12.1.ebuild
+++ b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.12.1.ebuild
@@ -46,9 +46,9 @@ BDEPEND="
 "
 
 python_check_deps() {
-	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+			"dev-python/ament_package[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
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 7c749cbd249f..760fd56cb6c8 100644
--- a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-9999.ebuild
+++ b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,9 +46,9 @@ BDEPEND="
 "
 
 python_check_deps() {
-	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+			"dev-python/ament_package[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_cpplint/Manifest b/dev-ros/ament_cmake_cpplint/Manifest
index 7d44e0b7f3cb..1d0006e31d9a 100644
--- a/dev-ros/ament_cmake_cpplint/Manifest
+++ b/dev-ros/ament_cmake_cpplint/Manifest
@@ -1,6 +1,6 @@
 DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 DIST ament_lint-0.12.1.tar.gz 281555 BLAKE2B 1feabfc9e65b09970cb9d9706e9fbc3ca8b60d0592597a8a8666f3b272e71a09c28bf3f21926f0f3b96d93e61d3f8c99286b2b5658359116305bbaf449b40207 SHA512 34625c9ff0615c09dc5e918896af5f46480de735388e57c06c8d8f3267cd98c7e0314ddc99d8ba328dbfa949c51eb893121f6639689f3a803503c77164e56bcc
-EBUILD ament_cmake_cpplint-0.11.2.ebuild 1423 BLAKE2B 1899b520512daa0a778d66e7ecbfc838f4ced3f048808bf1d9dd588963832808dfdbacca2018b83fe625a9a02e085476f5531db5fca490aadddd10965a41d7e5 SHA512 d202937e66c0d111bfd8d80971a7eb46be25fca44fcf1c0e821948571b0fab6e0d315fff9f5b029a92d41720cb47ae8fd8878fb5c29f9f3d7f5fc3c8a70e06e6
-EBUILD ament_cmake_cpplint-0.12.1.ebuild 1423 BLAKE2B b4b2bf7d19ff82080e26daa373b16f7b2ca302cfc5115c9f2af8927d53d00c509535af99a1ed147a113bd7b54066ad946c31db632801667b56ca19ce296ed45b SHA512 58fd31f70f6489b9b3f473b1132d2bc08e9c624c97007376995b9243a3d8f68d690f45c2edd1931dfdbd69ac54826d176374152e7a7191a3b7644329d6f9bc50
-EBUILD ament_cmake_cpplint-9999.ebuild 1423 BLAKE2B 1899b520512daa0a778d66e7ecbfc838f4ced3f048808bf1d9dd588963832808dfdbacca2018b83fe625a9a02e085476f5531db5fca490aadddd10965a41d7e5 SHA512 d202937e66c0d111bfd8d80971a7eb46be25fca44fcf1c0e821948571b0fab6e0d315fff9f5b029a92d41720cb47ae8fd8878fb5c29f9f3d7f5fc3c8a70e06e6
+EBUILD ament_cmake_cpplint-0.11.2.ebuild 1414 BLAKE2B 286ef2024524b6979d9d0de4e9340e8d56983226f5913320519e86081507c965203b2012951b3e7b362401a036998a4e58b6f686aabe792c43972b938732ac56 SHA512 6c45dc04f421d755159fd6c1c186fbf7e3a306345b9a2ed8fb0aec943d7e731a7483accd76f0e5f295a407a5748bba4a959590da73027499839ae7eda57b5a1c
+EBUILD ament_cmake_cpplint-0.12.1.ebuild 1414 BLAKE2B 286ef2024524b6979d9d0de4e9340e8d56983226f5913320519e86081507c965203b2012951b3e7b362401a036998a4e58b6f686aabe792c43972b938732ac56 SHA512 6c45dc04f421d755159fd6c1c186fbf7e3a306345b9a2ed8fb0aec943d7e731a7483accd76f0e5f295a407a5748bba4a959590da73027499839ae7eda57b5a1c
+EBUILD ament_cmake_cpplint-9999.ebuild 1414 BLAKE2B 286ef2024524b6979d9d0de4e9340e8d56983226f5913320519e86081507c965203b2012951b3e7b362401a036998a4e58b6f686aabe792c43972b938732ac56 SHA512 6c45dc04f421d755159fd6c1c186fbf7e3a306345b9a2ed8fb0aec943d7e731a7483accd76f0e5f295a407a5748bba4a959590da73027499839ae7eda57b5a1c
 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 8fd9b0edd57b..8697fbb57423 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
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,9 +45,9 @@ BDEPEND="
 "
 
 python_check_deps() {
-	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+			"dev-python/ament_package[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.12.1.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.12.1.ebuild
index 7052cdbb4a60..8697fbb57423 100644
--- a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.12.1.ebuild
+++ b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.12.1.ebuild
@@ -45,9 +45,9 @@ BDEPEND="
 "
 
 python_check_deps() {
-	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+			"dev-python/ament_package[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
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 8fd9b0edd57b..8697fbb57423 100644
--- a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-9999.ebuild
+++ b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,9 +45,9 @@ BDEPEND="
 "
 
 python_check_deps() {
-	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+	{ use !test || python_has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+			"dev-python/ament_package[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_export_definitions/Manifest b/dev-ros/ament_cmake_export_definitions/Manifest
index 50b7aebcaa0d..045aa30c456c 100644
--- a/dev-ros/ament_cmake_export_definitions/Manifest
+++ b/dev-ros/ament_cmake_export_definitions/Manifest
@@ -1,6 +1,6 @@
 DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_export_definitions-1.1.4.ebuild 1157 BLAKE2B 6efd9fde227b076997fbdd8a5bc4c03059c4be887bdf95d1e571d0d8132a73d7a8a652bff4a61d1b2dc9c87aba5ec01a146a653967004f9e07837a8c757647e5 SHA512 5299442c841458865b988e54f9223d6da27df0ac81a8187c1a4f40e5802c99f2da86c0f3d035c9bc2489c718979217e45a08a3e9bb739a972336fb18a01a3655
-EBUILD ament_cmake_export_definitions-1.3.0.ebuild 1157 BLAKE2B 0d65047b840c2171c3a84e09c78f4d5fe87032fd7fc8458e647bbd893a82be3bd659795f81c0338b02958d865d47d1a868800309f2c601a0e708e966cbab5be0 SHA512 c874d2dc21e2ab429e8cdf72b36604c95ea4cc915c4ae4206c5b7cf40ea64088a7e7d5fe7ed8bf982a45b6669e6f89db62b591b46c5f6dfc75a11e3a91af64b4
-EBUILD ament_cmake_export_definitions-9999.ebuild 1157 BLAKE2B 6efd9fde227b076997fbdd8a5bc4c03059c4be887bdf95d1e571d0d8132a73d7a8a652bff4a61d1b2dc9c87aba5ec01a146a653967004f9e07837a8c757647e5 SHA512 5299442c841458865b988e54f9223d6da27df0ac81a8187c1a4f40e5802c99f2da86c0f3d035c9bc2489c718979217e45a08a3e9bb739a972336fb18a01a3655
+EBUILD ament_cmake_export_definitions-1.1.4.ebuild 1132 BLAKE2B b18ffb1ea3def688c0a7baca1d157c6855b457cc6a1082f535c4fc8eb2b1146acbbc477055c6ec175233eca0b1ccc268e097bfc1063dbb5770ed344db76c0c14 SHA512 ec6ae631574b79436b49a093084045ebc0be1d7e0376fad79e6526e32172d7d34598bac4e3ab0e0b4e35c12c1afbccf9265bbe658c2dd3e37a55c356a07c711c
+EBUILD ament_cmake_export_definitions-1.3.0.ebuild 1132 BLAKE2B b18ffb1ea3def688c0a7baca1d157c6855b457cc6a1082f535c4fc8eb2b1146acbbc477055c6ec175233eca0b1ccc268e097bfc1063dbb5770ed344db76c0c14 SHA512 ec6ae631574b79436b49a093084045ebc0be1d7e0376fad79e6526e32172d7d34598bac4e3ab0e0b4e35c12c1afbccf9265bbe658c2dd3e37a55c356a07c711c
+EBUILD ament_cmake_export_definitions-9999.ebuild 1132 BLAKE2B b18ffb1ea3def688c0a7baca1d157c6855b457cc6a1082f535c4fc8eb2b1146acbbc477055c6ec175233eca0b1ccc268e097bfc1063dbb5770ed344db76c0c14 SHA512 ec6ae631574b79436b49a093084045ebc0be1d7e0376fad79e6526e32172d7d34598bac4e3ab0e0b4e35c12c1afbccf9265bbe658c2dd3e37a55c356a07c711c
 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 a76ef5d0d6c4..74a79383b500 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
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.3.0.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.3.0.ebuild
index b9c7aa31c087..74a79383b500 100644
--- a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.3.0.ebuild
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
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 a76ef5d0d6c4..74a79383b500 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
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_dependencies/Manifest b/dev-ros/ament_cmake_export_dependencies/Manifest
index 6a05e4c2a68d..bea4a1566d04 100644
--- a/dev-ros/ament_cmake_export_dependencies/Manifest
+++ b/dev-ros/ament_cmake_export_dependencies/Manifest
@@ -1,6 +1,6 @@
 DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_export_dependencies-1.1.4.ebuild 1198 BLAKE2B 2b43718be095690973e7fbab299a1eaf0d1db9f6afc32e0d3c4bae35b28c8a1cc1eefaa78b104f21448b7ae3fcfe98a20d90fdb113cd36d7b17586d78f9cc731 SHA512 55c3736c2ec7d266b2dcbbccf04d4e9483deb979c3a8289864434165332bf4005a3e2344a9cc171261318045a36dd7ad69e1ed6576b8d73afa4a12382a5faa2e
-EBUILD ament_cmake_export_dependencies-1.3.0-r1.ebuild 1233 BLAKE2B 3bda378deea27b6063720fd331fb4733857bba72b0ba3eea5f25208a2dc6077b179887afda6334efa89d9d38b2dd186a6c4249abedd5cef465740ebd3b55b797 SHA512 d92050158f03c58390682ef6c67e49816eac33c5b465b1bc3d0ec5b68c953793c72f785615ad7eac835e2267f75e939c0ed96474803f801b16e01e24b6353522
-EBUILD ament_cmake_export_dependencies-9999.ebuild 1233 BLAKE2B 3bda378deea27b6063720fd331fb4733857bba72b0ba3eea5f25208a2dc6077b179887afda6334efa89d9d38b2dd186a6c4249abedd5cef465740ebd3b55b797 SHA512 d92050158f03c58390682ef6c67e49816eac33c5b465b1bc3d0ec5b68c953793c72f785615ad7eac835e2267f75e939c0ed96474803f801b16e01e24b6353522
+EBUILD ament_cmake_export_dependencies-1.1.4.ebuild 1173 BLAKE2B 2b553eb7a582a62439f5790016d5ecec5ef1dad4331079c54683cbb5a92aa2adacecd503be83e0dc90a87c64664216335eca6a7dc87a25c7b0341132504b8ee9 SHA512 d3d3e4e0e221017a9131660d33e8217db7912ca184093a7cb0b8ae47a53ed96c63893aaeb46b977336be3174324e6a7212ca7487e167646231399f0e9e415e93
+EBUILD ament_cmake_export_dependencies-1.3.0-r1.ebuild 1208 BLAKE2B 36936e6dd89a0c290413789332ad08e3b2c343120f2692f43ab37315dfa83b6f8e1f74b369f33ae61e152e4e6186ff8f4dda9e95990b13be88224970c560b710 SHA512 40fadb6bf548f2608ca75981d1ff320195d815a53b7dc196b525303e8dfe1da7f59fcd06460db37405b9180f3df05a18db85c26fcc328c641ab2b88b19a29322
+EBUILD ament_cmake_export_dependencies-9999.ebuild 1208 BLAKE2B 36936e6dd89a0c290413789332ad08e3b2c343120f2692f43ab37315dfa83b6f8e1f74b369f33ae61e152e4e6186ff8f4dda9e95990b13be88224970c560b710 SHA512 40fadb6bf548f2608ca75981d1ff320195d815a53b7dc196b525303e8dfe1da7f59fcd06460db37405b9180f3df05a18db85c26fcc328c641ab2b88b19a29322
 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 d9868e9db6f6..e0d2318a70a0 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
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,7 +27,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
@@ -36,12 +34,13 @@ 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_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.3.0-r1.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.3.0-r1.ebuild
index c116d2160e29..87ab8cbd0b33 100644
--- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.3.0-r1.ebuild
+++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.3.0-r1.ebuild
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,7 +27,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
@@ -37,12 +35,13 @@ 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_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
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 c116d2160e29..87ab8cbd0b33 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
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,7 +27,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
@@ -37,12 +35,13 @@ 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_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_include_directories/Manifest b/dev-ros/ament_cmake_export_include_directories/Manifest
index 283a416a4af7..1a53cd1d79e8 100644
--- a/dev-ros/ament_cmake_export_include_directories/Manifest
+++ b/dev-ros/ament_cmake_export_include_directories/Manifest
@@ -1,6 +1,6 @@
 DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_export_include_directories-1.1.4.ebuild 1165 BLAKE2B be53d0a66e037552ddbdcbbc272e9663f99339f3498cf240a87342331cebce37eb1de7e2264f606e9554e0f5b1f579981bceed1c073ae0ea86a3a464838dc619 SHA512 258fbee4d5189c517e1e03d35129d1e294697b8ef863fbd2d1b9b56f04f3c2a4fefdafc3698a6ce487e69c0f33a2f807a842fa518c00ba3d6da3270b02dd6c2a
-EBUILD ament_cmake_export_include_directories-1.3.0.ebuild 1165 BLAKE2B 98de7dd1c74f24c2997d06be9d370afd68a5c8de33bb59c9a3b9df6bdb87cab31e70173e9c18df7f1a0bd0863386cf96ea9e141904e36892c7d15091cb29f693 SHA512 370fad510608f711b4db3b3edaf207d8f1e68847d18698f3ce3b36af3ecf30761886e9fc8545e8c8a4eb2d6c0b66b8bddd0dbbc62b29526a2ae0915a40914bbe
-EBUILD ament_cmake_export_include_directories-9999.ebuild 1165 BLAKE2B be53d0a66e037552ddbdcbbc272e9663f99339f3498cf240a87342331cebce37eb1de7e2264f606e9554e0f5b1f579981bceed1c073ae0ea86a3a464838dc619 SHA512 258fbee4d5189c517e1e03d35129d1e294697b8ef863fbd2d1b9b56f04f3c2a4fefdafc3698a6ce487e69c0f33a2f807a842fa518c00ba3d6da3270b02dd6c2a
+EBUILD ament_cmake_export_include_directories-1.1.4.ebuild 1140 BLAKE2B 2b2656c2cbaf843577d7f3554934adc93473dd37e1f970b2bf92f35f4b17d4d5fdad9cae75787e2b35c83fd90a46b2619302cb2c7692aa234eff02ed719e8215 SHA512 c1a3a6e86dd5b2eeed59c3c697d6989c837b4cf71ade555c6faeb8921b63e005b669f57188d8d4354f2a22bffc56cc61357678512f9738268c523bc544fe39aa
+EBUILD ament_cmake_export_include_directories-1.3.0.ebuild 1140 BLAKE2B 2b2656c2cbaf843577d7f3554934adc93473dd37e1f970b2bf92f35f4b17d4d5fdad9cae75787e2b35c83fd90a46b2619302cb2c7692aa234eff02ed719e8215 SHA512 c1a3a6e86dd5b2eeed59c3c697d6989c837b4cf71ade555c6faeb8921b63e005b669f57188d8d4354f2a22bffc56cc61357678512f9738268c523bc544fe39aa
+EBUILD ament_cmake_export_include_directories-9999.ebuild 1140 BLAKE2B 2b2656c2cbaf843577d7f3554934adc93473dd37e1f970b2bf92f35f4b17d4d5fdad9cae75787e2b35c83fd90a46b2619302cb2c7692aa234eff02ed719e8215 SHA512 c1a3a6e86dd5b2eeed59c3c697d6989c837b4cf71ade555c6faeb8921b63e005b669f57188d8d4354f2a22bffc56cc61357678512f9738268c523bc544fe39aa
 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 5a4b76c2c1ab..f6499feed3e5 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
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.3.0.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.3.0.ebuild
index 4f7e319646d6..f6499feed3e5 100644
--- a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.3.0.ebuild
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
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 5a4b76c2c1ab..f6499feed3e5 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
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_interfaces/Manifest b/dev-ros/ament_cmake_export_interfaces/Manifest
index c7da829d25f4..ceaf400a1845 100644
--- a/dev-ros/ament_cmake_export_interfaces/Manifest
+++ b/dev-ros/ament_cmake_export_interfaces/Manifest
@@ -1,6 +1,6 @@
 DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_export_interfaces-1.1.4.ebuild 1194 BLAKE2B be8f4b0fb704923f485013230245678df7fed19dcef44e777de663686ecf6e6199ca09fef39d7179b66493bd51203b824ecf6fd274b5a4adfc6f23f227d258e4 SHA512 b48be94ef1c80a7699f77a4aa5fd1e4e130d317494a3e40e276568ada7ea45316d3dff6166b869e63f5d80d49d42c198721fafdb0c10ee1654ec321e08ebfa69
-EBUILD ament_cmake_export_interfaces-1.3.0.ebuild 1194 BLAKE2B c23d297e4572e024fc9f35fa0a42694d8dd78b811c2ff94bca7a5eb748e9b7d9befd34e929e4fb3fe13438b439bd1b427d5d8ce3da2f942f3fd5720a2114dffb SHA512 1259e13f359c029de5c60be039869387298d9e2aaf472aa9453031a76c719573da8a3e2afbc1809472eddb14275998636daa847f66b3915d71b7a1dc44f915b8
-EBUILD ament_cmake_export_interfaces-9999.ebuild 1194 BLAKE2B be8f4b0fb704923f485013230245678df7fed19dcef44e777de663686ecf6e6199ca09fef39d7179b66493bd51203b824ecf6fd274b5a4adfc6f23f227d258e4 SHA512 b48be94ef1c80a7699f77a4aa5fd1e4e130d317494a3e40e276568ada7ea45316d3dff6166b869e63f5d80d49d42c198721fafdb0c10ee1654ec321e08ebfa69
+EBUILD ament_cmake_export_interfaces-1.1.4.ebuild 1169 BLAKE2B d71f9f7623a3f05247244d443257f5727fae0e01679ff12be894b0efa6d49bf532ca602286ae7b441f26e360cad1d1c8f2a3fd115770fa89918dc164e5d1130c SHA512 adc6572834e7e5f789b9ddd05465ce0c0b29ecfd9ee7f4ae2d9041096c66398c3f20a74f1d87c1e651cb1c6042bd0c67e1283641d4044811bbcd7aeb928f818a
+EBUILD ament_cmake_export_interfaces-1.3.0.ebuild 1169 BLAKE2B d71f9f7623a3f05247244d443257f5727fae0e01679ff12be894b0efa6d49bf532ca602286ae7b441f26e360cad1d1c8f2a3fd115770fa89918dc164e5d1130c SHA512 adc6572834e7e5f789b9ddd05465ce0c0b29ecfd9ee7f4ae2d9041096c66398c3f20a74f1d87c1e651cb1c6042bd0c67e1283641d4044811bbcd7aeb928f818a
+EBUILD ament_cmake_export_interfaces-9999.ebuild 1169 BLAKE2B d71f9f7623a3f05247244d443257f5727fae0e01679ff12be894b0efa6d49bf532ca602286ae7b441f26e360cad1d1c8f2a3fd115770fa89918dc164e5d1130c SHA512 adc6572834e7e5f789b9ddd05465ce0c0b29ecfd9ee7f4ae2d9041096c66398c3f20a74f1d87c1e651cb1c6042bd0c67e1283641d4044811bbcd7aeb928f818a
 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 4d93075295d4..a240edee1e72 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
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,7 +27,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
@@ -36,12 +34,13 @@ 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_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.3.0.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.3.0.ebuild
index 622ff31823d0..a240edee1e72 100644
--- a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.3.0.ebuild
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,7 +27,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
@@ -36,12 +34,13 @@ 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_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
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 4d93075295d4..a240edee1e72 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
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,7 +27,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
@@ -36,12 +34,13 @@ 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_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_libraries/Manifest b/dev-ros/ament_cmake_export_libraries/Manifest
index 8adafea6eb0b..2475d891ab07 100644
--- a/dev-ros/ament_cmake_export_libraries/Manifest
+++ b/dev-ros/ament_cmake_export_libraries/Manifest
@@ -1,6 +1,6 @@
 DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_export_libraries-1.1.4.ebuild 1155 BLAKE2B c47ab427ad295d5533feae449695d683d8cd3249631e3eacce2efadc83576c13d0eb7cf5fa94e4c3f87f03bb985bd58be931203cf565886cb32dec9c3c4295fe SHA512 23ccf249fbf1e80d711924acbfa5573f51c232f90248ac50628f36943562efa830dbfb70b48c97bd0687343152984eb6ae4616e2746d5fd493af5062301322f0
-EBUILD ament_cmake_export_libraries-1.3.0.ebuild 1155 BLAKE2B 4504538b49872446ed5da72b4f593345b1e4226dff5db70f1a5db69b438f7cf48b37d29ca50fa4921c9fde627614390f02a8bfc78931eabd6ea54180b08a7c5a SHA512 62dee1632bdc90df2abc16ccb8e341cd871ca4eefc10e8e1e00ab7f83360b9f81c847823a55e8ab9bdd344a0c09d8da66af95d935f1b494be4b872cb7a1860e9
-EBUILD ament_cmake_export_libraries-9999.ebuild 1155 BLAKE2B c47ab427ad295d5533feae449695d683d8cd3249631e3eacce2efadc83576c13d0eb7cf5fa94e4c3f87f03bb985bd58be931203cf565886cb32dec9c3c4295fe SHA512 23ccf249fbf1e80d711924acbfa5573f51c232f90248ac50628f36943562efa830dbfb70b48c97bd0687343152984eb6ae4616e2746d5fd493af5062301322f0
+EBUILD ament_cmake_export_libraries-1.1.4.ebuild 1130 BLAKE2B f415101f7ea62b6564ade96a4701c31626b9fd3c1a006d8b8c96631cf17402ba3cc567a0430ac4cfb3b8c9400a333fffa132b7f806866846ff737dfc09e1ee0f SHA512 ad75d3265e4432c08d91f72e3660d86ceab964239ed9dc9d1b14c92f51e638b86b873cbc9ddde6be4ace4e2a990b266931f5ca87fa9cc061a6d09465a9761e03
+EBUILD ament_cmake_export_libraries-1.3.0.ebuild 1130 BLAKE2B f415101f7ea62b6564ade96a4701c31626b9fd3c1a006d8b8c96631cf17402ba3cc567a0430ac4cfb3b8c9400a333fffa132b7f806866846ff737dfc09e1ee0f SHA512 ad75d3265e4432c08d91f72e3660d86ceab964239ed9dc9d1b14c92f51e638b86b873cbc9ddde6be4ace4e2a990b266931f5ca87fa9cc061a6d09465a9761e03
+EBUILD ament_cmake_export_libraries-9999.ebuild 1130 BLAKE2B f415101f7ea62b6564ade96a4701c31626b9fd3c1a006d8b8c96631cf17402ba3cc567a0430ac4cfb3b8c9400a333fffa132b7f806866846ff737dfc09e1ee0f SHA512 ad75d3265e4432c08d91f72e3660d86ceab964239ed9dc9d1b14c92f51e638b86b873cbc9ddde6be4ace4e2a990b266931f5ca87fa9cc061a6d09465a9761e03
 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 027da570e32d..b517a6e02372 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
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.3.0.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.3.0.ebuild
index c22c1ee30534..b517a6e02372 100644
--- a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.3.0.ebuild
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
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 027da570e32d..b517a6e02372 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
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }