gentoo auto-resync : 05:10:2022 - 01:18:42

author: V3n3RiX <venerix@koprulu.sector> 2022-10-05 01:18:42 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-10-05 01:18:42 +0100
commit: 5b84ef1b7530528af1eda8310641c6396df8143c (patch)
tree: 1dd8187ec16709816078d4b474e15257409a25db /dev-ros
parent: 07b0c0005f55e652101816d9f4cfe73403bf0906 (diff)
68 files changed, 306 insertions, 339 deletions
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 5941dcef5510..f27a9a118737 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/ament_cmake_export_link_flags/Manifest b/dev-ros/ament_cmake_export_link_flags/Manifest
index 82e87fb6e552..5081a259d7dc 100644
--- a/dev-ros/ament_cmake_export_link_flags/Manifest
+++ b/dev-ros/ament_cmake_export_link_flags/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_link_flags-1.1.4.ebuild 1156 BLAKE2B 24e9bfecb942336afcf433357c4f2ee5a65a0ed19c6a67cacf0521f63cfaf7807122d4b75718435c0c7c7289156b0428ca0385be58f0473fc1e9005630bc2342 SHA512 6d61cca22131dee38ccf39363172ddb21ba52c7b7ed04cba64e4eafaffed5edc2a9bcc9a675a1da1069c9ae00f8427b63b2a1ceb78eebfdfb2f088548434e33b
-EBUILD ament_cmake_export_link_flags-1.3.0.ebuild 1156 BLAKE2B 91f922ce535e0b65d4358038919cf65121bc81605f62243cbb4a3de5e5b765f1608cf8573a928baf534b3f91dfb14ad77533b372745399226268b211ff27abd7 SHA512 a5e43d7a551c695e6df228c26d14e8d2f559e948e81318cf5c1c3563d42ab0e7b8774661ea4017f76b4b63783dafaefa8206d9c3d40ecd9f3f8a01bad196688f
-EBUILD ament_cmake_export_link_flags-9999.ebuild 1156 BLAKE2B 24e9bfecb942336afcf433357c4f2ee5a65a0ed19c6a67cacf0521f63cfaf7807122d4b75718435c0c7c7289156b0428ca0385be58f0473fc1e9005630bc2342 SHA512 6d61cca22131dee38ccf39363172ddb21ba52c7b7ed04cba64e4eafaffed5edc2a9bcc9a675a1da1069c9ae00f8427b63b2a1ceb78eebfdfb2f088548434e33b
+EBUILD ament_cmake_export_link_flags-1.1.4.ebuild 1131 BLAKE2B f73d2c9e81d0be86952d8336c0017ae39d24928a2c112fe9901b1dcceee17380eb7bb6d5840b218bcd846a7d866d2d5534ff9679e02bbba16904c7ff665fea10 SHA512 e1c270536354f543529bffaf267ecfd944928232b05b61ba77b1b36ba764f10da2680a5fd32bf85ca62f13d5e0ac2a946d489a5ca899bae431e5fc71cf0a6536
+EBUILD ament_cmake_export_link_flags-1.3.0.ebuild 1131 BLAKE2B f73d2c9e81d0be86952d8336c0017ae39d24928a2c112fe9901b1dcceee17380eb7bb6d5840b218bcd846a7d866d2d5534ff9679e02bbba16904c7ff665fea10 SHA512 e1c270536354f543529bffaf267ecfd944928232b05b61ba77b1b36ba764f10da2680a5fd32bf85ca62f13d5e0ac2a946d489a5ca899bae431e5fc71cf0a6536
+EBUILD ament_cmake_export_link_flags-9999.ebuild 1131 BLAKE2B f73d2c9e81d0be86952d8336c0017ae39d24928a2c112fe9901b1dcceee17380eb7bb6d5840b218bcd846a7d866d2d5534ff9679e02bbba16904c7ff665fea10 SHA512 e1c270536354f543529bffaf267ecfd944928232b05b61ba77b1b36ba764f10da2680a5fd32bf85ca62f13d5e0ac2a946d489a5ca899bae431e5fc71cf0a6536
 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 fb30c82f371a..315c3e4c412a 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
@@ -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_link_flags/ament_cmake_export_link_flags-1.3.0.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.3.0.ebuild
index 5e5b6c223c05..315c3e4c412a 100644
--- a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-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_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 fb30c82f371a..315c3e4c412a 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
@@ -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_targets/Manifest b/dev-ros/ament_cmake_export_targets/Manifest
index 18468e761c5a..b3b55bd902a0 100644
--- a/dev-ros/ament_cmake_export_targets/Manifest
+++ b/dev-ros/ament_cmake_export_targets/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_targets-1.1.4.ebuild 1191 BLAKE2B 3824e2885661361cfa637c50120171a45eac6218d67e53ca728ede0819998b49c1602517240a39248d1d380e0bdb0454b7c59b6e1385ce92e74603a80ff20137 SHA512 d78c8c1abab179257b6af86bb5c008902a34f27c40aeb6155b27e866e5a45dfeb0f16f4c3a94227a36c1f2974bf839c55a173a3323435f7960c34cd84577c635
-EBUILD ament_cmake_export_targets-1.3.0.ebuild 1191 BLAKE2B 92d1202aa597bd86ba6009a99de4f5e0aa4d98ac0b555fa690b9608adebea9726a5a16507996b2d2dc38b2391a8ee297e770ea53d7816f3c7803e10e6bd2ef87 SHA512 d0915b62a92b99e7cc4ae574460a69973e0b6434ee02d070b3aa54861e9fd7a8cac2d326fb78d44addaed001032705b393e6426ae2262fb9fe6459360f722f04
-EBUILD ament_cmake_export_targets-9999.ebuild 1191 BLAKE2B 3824e2885661361cfa637c50120171a45eac6218d67e53ca728ede0819998b49c1602517240a39248d1d380e0bdb0454b7c59b6e1385ce92e74603a80ff20137 SHA512 d78c8c1abab179257b6af86bb5c008902a34f27c40aeb6155b27e866e5a45dfeb0f16f4c3a94227a36c1f2974bf839c55a173a3323435f7960c34cd84577c635
+EBUILD ament_cmake_export_targets-1.1.4.ebuild 1166 BLAKE2B fcb6e40370a7c698eb4c36c90b55be64ebf57be2124fa46138be225027f4bd95144a7d2ce2a6502728a06c5c214cb02b9d46ab6384981da4eed5af4631c0938d SHA512 92e3771f7bba2b437deec523a6f2e0b8bc35a6813bfd856e19e246085ac1f488c3485367953dca14a72cb384ed26898d3f2b88322317cd4c8a3e308740a4325d
+EBUILD ament_cmake_export_targets-1.3.0.ebuild 1166 BLAKE2B fcb6e40370a7c698eb4c36c90b55be64ebf57be2124fa46138be225027f4bd95144a7d2ce2a6502728a06c5c214cb02b9d46ab6384981da4eed5af4631c0938d SHA512 92e3771f7bba2b437deec523a6f2e0b8bc35a6813bfd856e19e246085ac1f488c3485367953dca14a72cb384ed26898d3f2b88322317cd4c8a3e308740a4325d
+EBUILD ament_cmake_export_targets-9999.ebuild 1166 BLAKE2B fcb6e40370a7c698eb4c36c90b55be64ebf57be2124fa46138be225027f4bd95144a7d2ce2a6502728a06c5c214cb02b9d46ab6384981da4eed5af4631c0938d SHA512 92e3771f7bba2b437deec523a6f2e0b8bc35a6813bfd856e19e246085ac1f488c3485367953dca14a72cb384ed26898d3f2b88322317cd4c8a3e308740a4325d
 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 efc907fe2f8b..54c4f083a05b 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
@@ -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_targets/ament_cmake_export_targets-1.3.0.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.3.0.ebuild
index a509591e9cdc..54c4f083a05b 100644
--- a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-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_targets/ament_cmake_export_targets-9999.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-9999.ebuild
index efc907fe2f8b..54c4f083a05b 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
@@ -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_gen_version_h/Manifest b/dev-ros/ament_cmake_gen_version_h/Manifest
index adcdad4659a6..e7b94fb7aec3 100644
--- a/dev-ros/ament_cmake_gen_version_h/Manifest
+++ b/dev-ros/ament_cmake_gen_version_h/Manifest
@@ -1,4 +1,4 @@
 DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
-EBUILD ament_cmake_gen_version_h-1.3.0.ebuild 1327 BLAKE2B ee87c26c06332dc94177b18d09d265e33284afefe80b51d8da508a06952832daa03fc4827fcd858bb0f72abad129b8fbb23a5a264c55d06ee39e1877f2dc4c7c SHA512 c5fbfcde5d30d2f5204cfc759535d5ca53de6f428e04d9fda5d9c1b0ec0d98b732a60a6dc0902e5ee03e82e81313d6cfb682047c4d2fb48a26f6ca7ce937cf1f
-EBUILD ament_cmake_gen_version_h-9999.ebuild 1327 BLAKE2B ee87c26c06332dc94177b18d09d265e33284afefe80b51d8da508a06952832daa03fc4827fcd858bb0f72abad129b8fbb23a5a264c55d06ee39e1877f2dc4c7c SHA512 c5fbfcde5d30d2f5204cfc759535d5ca53de6f428e04d9fda5d9c1b0ec0d98b732a60a6dc0902e5ee03e82e81313d6cfb682047c4d2fb48a26f6ca7ce937cf1f
+EBUILD ament_cmake_gen_version_h-1.3.0.ebuild 1310 BLAKE2B 9d6d23de6e2c5857297d608cd92105aa57a0b961feaa2f54a4cb564bfe28d00f480fcade7ec7394cadad2e9023218bdb505b1afb5a3d73b9f08c1a1e0b713315 SHA512 f8f97da99eefa99717d2a1bf039948438aa02607abf2941495f255b78552eb9c634a7b2e004ca09ec5d3bfe82c8cc8b72c9842ea91ce752cd0ca2e23f1f24b9f
+EBUILD ament_cmake_gen_version_h-9999.ebuild 1310 BLAKE2B 9d6d23de6e2c5857297d608cd92105aa57a0b961feaa2f54a4cb564bfe28d00f480fcade7ec7394cadad2e9023218bdb505b1afb5a3d73b9f08c1a1e0b713315 SHA512 f8f97da99eefa99717d2a1bf039948438aa02607abf2941495f255b78552eb9c634a7b2e004ca09ec5d3bfe82c8cc8b72c9842ea91ce752cd0ca2e23f1f24b9f
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-1.3.0.ebuild b/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-1.3.0.ebuild
index 1feb04c069f8..932f46d31bde 100644
--- a/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-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"
@@ -38,15 +37,16 @@ DEPEND="${RDEPEND}
 		dev-ros/ament_cmake_gtest
 	)"
 # 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}]')
 "
 RESTRICT="test" # fixme
 
 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}]"
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-9999.ebuild b/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-9999.ebuild
index 1feb04c069f8..932f46d31bde 100644
--- a/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-9999.ebuild
+++ b/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-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"
@@ -38,15 +37,16 @@ DEPEND="${RDEPEND}
 		dev-ros/ament_cmake_gtest
 	)"
 # 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}]')
 "
 RESTRICT="test" # fixme
 
 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}]"
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_gmock/Manifest b/dev-ros/ament_cmake_gmock/Manifest
index 55f761c9b323..5ddce54319c7 100644
--- a/dev-ros/ament_cmake_gmock/Manifest
+++ b/dev-ros/ament_cmake_gmock/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_gmock-1.1.4.ebuild 1158 BLAKE2B 07c83c2da9b8c4e06edfa3febae11ae24f30c7f5e6bf7a25d1dd70e4d6a9325635446f1a52d624a256216771481b915f66cd8323cf4908f9bfe1752ef5396e12 SHA512 f4cef787bdf811dca6c9ac95657c0425bd105e8b40575e24b3fbe452a6ce7890543e0df2641926bd961d4f3dcd88facb47380b63c124d2e211fc11e3c4d47c71
-EBUILD ament_cmake_gmock-1.3.0.ebuild 1158 BLAKE2B 1806c40832468a0515b5688ee84331357cbdd84eccc6b02b59143efe3243fa8c92ac7f6dc3b2fce5cbe22342177762d71aff0affdd562b7a1ad29c3e25dc65e0 SHA512 9d12071a4183bdfbc9ccf168d4cbb2d04537b573496a7304d5459d7fa522212524a1724ae0b22b17554cc21afd1909954574d6015629bb7349b449cfebf04fa7
-EBUILD ament_cmake_gmock-9999.ebuild 1158 BLAKE2B 07c83c2da9b8c4e06edfa3febae11ae24f30c7f5e6bf7a25d1dd70e4d6a9325635446f1a52d624a256216771481b915f66cd8323cf4908f9bfe1752ef5396e12 SHA512 f4cef787bdf811dca6c9ac95657c0425bd105e8b40575e24b3fbe452a6ce7890543e0df2641926bd961d4f3dcd88facb47380b63c124d2e211fc11e3c4d47c71
+EBUILD ament_cmake_gmock-1.1.4.ebuild 1133 BLAKE2B 3caafb2387ecb1ca7a964f72d6e017fe61c2853dd25ef0655c1a641638ee0a10ed74b5d79b44cbadde63fab5a52d17b04dd4b641c67341a65dc258ca8bca9e4d SHA512 322b1b9361f5bb06789cd7ea56abfe260feeec92135638a9a35dc705895ebd17847fb97823e1cbd7ed3e1c0c9bc9d56fdd9a4c442b2c9ef5cf03396cd5887068
+EBUILD ament_cmake_gmock-1.3.0.ebuild 1133 BLAKE2B 3caafb2387ecb1ca7a964f72d6e017fe61c2853dd25ef0655c1a641638ee0a10ed74b5d79b44cbadde63fab5a52d17b04dd4b641c67341a65dc258ca8bca9e4d SHA512 322b1b9361f5bb06789cd7ea56abfe260feeec92135638a9a35dc705895ebd17847fb97823e1cbd7ed3e1c0c9bc9d56fdd9a4c442b2c9ef5cf03396cd5887068
+EBUILD ament_cmake_gmock-9999.ebuild 1133 BLAKE2B 3caafb2387ecb1ca7a964f72d6e017fe61c2853dd25ef0655c1a641638ee0a10ed74b5d79b44cbadde63fab5a52d17b04dd4b641c67341a65dc258ca8bca9e4d SHA512 322b1b9361f5bb06789cd7ea56abfe260feeec92135638a9a35dc705895ebd17847fb97823e1cbd7ed3e1c0c9bc9d56fdd9a4c442b2c9ef5cf03396cd5887068
 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 25c574a131a2..ef53ef5b2fec 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
@@ -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_gmock/ament_cmake_gmock-1.3.0.ebuild b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.3.0.ebuild
index 5e1f522f8d71..ef53ef5b2fec 100644
--- a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-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_gmock/ament_cmake_gmock-9999.ebuild b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-9999.ebuild
index 25c574a131a2..ef53ef5b2fec 100644
--- a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-9999.ebuild
+++ b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-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_gtest/Manifest b/dev-ros/ament_cmake_gtest/Manifest
index ee9cd8b4a0e1..790aa482c9d3 100644
--- a/dev-ros/ament_cmake_gtest/Manifest
+++ b/dev-ros/ament_cmake_gtest/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_gtest-1.1.4.ebuild 1152 BLAKE2B 1ea1f103891adc023dcc4f516a5b73f89518d20de4d194bd2ae7352830fff29394de9597e636a742f394db9165a30ff023b3ccf585d089ebc255f1759768d581 SHA512 24738bccb2230f15e80c062a8daddef7a16fae867794d4d621d96594779dc9be51e08dbfd5e972535ab925e954c0e242e6f0a7c8048e47fc11e241873d2ae125
-EBUILD ament_cmake_gtest-1.3.0.ebuild 1152 BLAKE2B 16117619434ecc963e0cccb4e12bea83bf8b1a1bd8bbfecc0e300ee4e6a08c7ff6212c53a09e226c83b5f2526842fa6031f1925baa2313f2c6e11e6d8240bc0a SHA512 4f478be4f24152bd6974ef35ba490ba5a8c2016fc8126103592bcdde1613b58799d12c09aeae8183206e2291d48698c200b7f56bf43ba20844acce2cba844acd
-EBUILD ament_cmake_gtest-9999.ebuild 1152 BLAKE2B 1ea1f103891adc023dcc4f516a5b73f89518d20de4d194bd2ae7352830fff29394de9597e636a742f394db9165a30ff023b3ccf585d089ebc255f1759768d581 SHA512 24738bccb2230f15e80c062a8daddef7a16fae867794d4d621d96594779dc9be51e08dbfd5e972535ab925e954c0e242e6f0a7c8048e47fc11e241873d2ae125
+EBUILD ament_cmake_gtest-1.1.4.ebuild 1127 BLAKE2B 8586a944519a94fc621b21c3da5dfb152d7ae6e170b9bed3044a5542c8cb6caa7a922ed0255ba4c42def5e3fbd9fadb7c7d57369c2aae65c57aa625d17d55d60 SHA512 9180957bc6f5f784a157058207c347093d41529bfb2879e660ee86e13da63c9e93f015a2116f0bc76740b90835f5f4e340fb361d0e7f6e9289ae61fe536b0a77
+EBUILD ament_cmake_gtest-1.3.0.ebuild 1127 BLAKE2B 8586a944519a94fc621b21c3da5dfb152d7ae6e170b9bed3044a5542c8cb6caa7a922ed0255ba4c42def5e3fbd9fadb7c7d57369c2aae65c57aa625d17d55d60 SHA512 9180957bc6f5f784a157058207c347093d41529bfb2879e660ee86e13da63c9e93f015a2116f0bc76740b90835f5f4e340fb361d0e7f6e9289ae61fe536b0a77
+EBUILD ament_cmake_gtest-9999.ebuild 1127 BLAKE2B 8586a944519a94fc621b21c3da5dfb152d7ae6e170b9bed3044a5542c8cb6caa7a922ed0255ba4c42def5e3fbd9fadb7c7d57369c2aae65c57aa625d17d55d60 SHA512 9180957bc6f5f784a157058207c347093d41529bfb2879e660ee86e13da63c9e93f015a2116f0bc76740b90835f5f4e340fb361d0e7f6e9289ae61fe536b0a77
 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 69610780da9d..8230271bfaf6 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
@@ -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_gtest/ament_cmake_gtest-1.3.0.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.3.0.ebuild
index 141f05b4c322..8230271bfaf6 100644
--- a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-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_gtest/ament_cmake_gtest-9999.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-9999.ebuild
index 69610780da9d..8230271bfaf6 100644
--- a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-9999.ebuild
+++ b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-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_include_directories/Manifest b/dev-ros/ament_cmake_include_directories/Manifest
index ab7289fceedf..46dae3b42e29 100644
--- a/dev-ros/ament_cmake_include_directories/Manifest
+++ b/dev-ros/ament_cmake_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_include_directories-1.1.4.ebuild 1165 BLAKE2B be53d0a66e037552ddbdcbbc272e9663f99339f3498cf240a87342331cebce37eb1de7e2264f606e9554e0f5b1f579981bceed1c073ae0ea86a3a464838dc619 SHA512 258fbee4d5189c517e1e03d35129d1e294697b8ef863fbd2d1b9b56f04f3c2a4fefdafc3698a6ce487e69c0f33a2f807a842fa518c00ba3d6da3270b02dd6c2a
-EBUILD ament_cmake_include_directories-1.3.0.ebuild 1165 BLAKE2B 98de7dd1c74f24c2997d06be9d370afd68a5c8de33bb59c9a3b9df6bdb87cab31e70173e9c18df7f1a0bd0863386cf96ea9e141904e36892c7d15091cb29f693 SHA512 370fad510608f711b4db3b3edaf207d8f1e68847d18698f3ce3b36af3ecf30761886e9fc8545e8c8a4eb2d6c0b66b8bddd0dbbc62b29526a2ae0915a40914bbe
-EBUILD ament_cmake_include_directories-9999.ebuild 1165 BLAKE2B be53d0a66e037552ddbdcbbc272e9663f99339f3498cf240a87342331cebce37eb1de7e2264f606e9554e0f5b1f579981bceed1c073ae0ea86a3a464838dc619 SHA512 258fbee4d5189c517e1e03d35129d1e294697b8ef863fbd2d1b9b56f04f3c2a4fefdafc3698a6ce487e69c0f33a2f807a842fa518c00ba3d6da3270b02dd6c2a
+EBUILD ament_cmake_include_directories-1.1.4.ebuild 1140 BLAKE2B 2b2656c2cbaf843577d7f3554934adc93473dd37e1f970b2bf92f35f4b17d4d5fdad9cae75787e2b35c83fd90a46b2619302cb2c7692aa234eff02ed719e8215 SHA512 c1a3a6e86dd5b2eeed59c3c697d6989c837b4cf71ade555c6faeb8921b63e005b669f57188d8d4354f2a22bffc56cc61357678512f9738268c523bc544fe39aa
+EBUILD ament_cmake_include_directories-1.3.0.ebuild 1140 BLAKE2B 2b2656c2cbaf843577d7f3554934adc93473dd37e1f970b2bf92f35f4b17d4d5fdad9cae75787e2b35c83fd90a46b2619302cb2c7692aa234eff02ed719e8215 SHA512 c1a3a6e86dd5b2eeed59c3c697d6989c837b4cf71ade555c6faeb8921b63e005b669f57188d8d4354f2a22bffc56cc61357678512f9738268c523bc544fe39aa
+EBUILD ament_cmake_include_directories-9999.ebuild 1140 BLAKE2B 2b2656c2cbaf843577d7f3554934adc93473dd37e1f970b2bf92f35f4b17d4d5fdad9cae75787e2b35c83fd90a46b2619302cb2c7692aa234eff02ed719e8215 SHA512 c1a3a6e86dd5b2eeed59c3c697d6989c837b4cf71ade555c6faeb8921b63e005b669f57188d8d4354f2a22bffc56cc61357678512f9738268c523bc544fe39aa
 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 5a4b76c2c1ab..f6499feed3e5 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
@@ -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_include_directories/ament_cmake_include_directories-1.3.0.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.3.0.ebuild
index 4f7e319646d6..f6499feed3e5 100644
--- a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_include_directories/ament_cmake_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_include_directories/ament_cmake_include_directories-9999.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-9999.ebuild
index 5a4b76c2c1ab..f6499feed3e5 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
@@ -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_libraries/Manifest b/dev-ros/ament_cmake_libraries/Manifest
index 2f4d6709a8c5..c8e88366ea6c 100644
--- a/dev-ros/ament_cmake_libraries/Manifest
+++ b/dev-ros/ament_cmake_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_libraries-1.1.4.ebuild 1158 BLAKE2B e824c3cf4d7e666b09565e39d52b264a017d3b387b1124596e2bcadb8e09be6609c36ab11e2fd5fd5b53d80ee7a17c88eeab94a37da2b6b3d004b9b7d2a3c931 SHA512 202b404faec56a83893879705152ec7f22eafd9ef47e94aaf88d6143e2095729204135fa4138e3d9cfb4e6add074d61025333f1e81558786101cac401f5e6ebb
-EBUILD ament_cmake_libraries-1.3.0.ebuild 1158 BLAKE2B fefc9e85ea6e65b21260a145f06f9ea81677bcf6a4b17e4dcb5fd775969ff09b5891b3d5b6287608ff4198cc72320e895aceaac7169c28a6f8fdc066a8b993a6 SHA512 4b8d20363072fef4c90cf293db5f4b68159028c49c44d1c780f2e2dd1c938eeeb33e44cbd07102040f245bf753c363141d8ee1c6062a7e748ce32caa095b0337
-EBUILD ament_cmake_libraries-9999.ebuild 1158 BLAKE2B e824c3cf4d7e666b09565e39d52b264a017d3b387b1124596e2bcadb8e09be6609c36ab11e2fd5fd5b53d80ee7a17c88eeab94a37da2b6b3d004b9b7d2a3c931 SHA512 202b404faec56a83893879705152ec7f22eafd9ef47e94aaf88d6143e2095729204135fa4138e3d9cfb4e6add074d61025333f1e81558786101cac401f5e6ebb
+EBUILD ament_cmake_libraries-1.1.4.ebuild 1133 BLAKE2B dd5f0bee0c0b35c48ebc955d157568a7325ef76afb1371c2d774ad3bf29d365c1ff8d6edbbdff9c821ab8966929792fbad42b0d56bc7ac4a41a5f48aed4394f2 SHA512 3f9c339029d9d3304afce8aed64ddb943c102d9d2739e23f62d190dbe60af2c7916e07247e833cc50559eb19178a8af93be740142ca38e0fe4d302a7d2cc443e
+EBUILD ament_cmake_libraries-1.3.0.ebuild 1133 BLAKE2B dd5f0bee0c0b35c48ebc955d157568a7325ef76afb1371c2d774ad3bf29d365c1ff8d6edbbdff9c821ab8966929792fbad42b0d56bc7ac4a41a5f48aed4394f2 SHA512 3f9c339029d9d3304afce8aed64ddb943c102d9d2739e23f62d190dbe60af2c7916e07247e833cc50559eb19178a8af93be740142ca38e0fe4d302a7d2cc443e
+EBUILD ament_cmake_libraries-9999.ebuild 1133 BLAKE2B dd5f0bee0c0b35c48ebc955d157568a7325ef76afb1371c2d774ad3bf29d365c1ff8d6edbbdff9c821ab8966929792fbad42b0d56bc7ac4a41a5f48aed4394f2 SHA512 3f9c339029d9d3304afce8aed64ddb943c102d9d2739e23f62d190dbe60af2c7916e07247e833cc50559eb19178a8af93be740142ca38e0fe4d302a7d2cc443e
 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 d307d099dbb9..b163f6ef19db 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
@@ -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_libraries/ament_cmake_libraries-1.3.0.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.3.0.ebuild
index 70e39d4a9658..b163f6ef19db 100644
--- a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_libraries/ament_cmake_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_libraries/ament_cmake_libraries-9999.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-9999.ebuild
index d307d099dbb9..b163f6ef19db 100644
--- a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-9999.ebuild
+++ b/dev-ros/ament_cmake_libraries/ament_cmake_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}]"
 }
diff --git a/dev-ros/ament_cmake_pytest/Manifest b/dev-ros/ament_cmake_pytest/Manifest
index 19bf11b245f1..5e7c0dfdbf0c 100644
--- a/dev-ros/ament_cmake_pytest/Manifest
+++ b/dev-ros/ament_cmake_pytest/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_pytest-1.1.4.ebuild 1160 BLAKE2B f5ffa5668f5aed0f52555d643e277468aa81201497a3a419a64e6910a2ed78972733717407288755e211f57a11514e189b6e971351cb3cc38a4968ba27f9652e SHA512 9ce4f2b32d4d5ffd9916bae4347265e343af1b8115930091caa67b5a7afa319177100d9e1bd5ec849a192840724bbf53ebc23a25015e42c7ac77a27099dd1655
-EBUILD ament_cmake_pytest-1.3.0.ebuild 1160 BLAKE2B 4894668140b5b4ecb5234c965233954efc0da6952f317fa407cc50f981306cfb5813032e56b5c8e478f857fb2a1bcadc53e228781faaf0c3697d3547e962b103 SHA512 d394a4ef005b47275e566ccd4013598aa0fe1fa4d905543d2d9afa92c19ae0d021eba7f271e37dd4f763138f899ba51bc2d5396b325c05049d5bd421a62224e2
-EBUILD ament_cmake_pytest-9999.ebuild 1160 BLAKE2B f5ffa5668f5aed0f52555d643e277468aa81201497a3a419a64e6910a2ed78972733717407288755e211f57a11514e189b6e971351cb3cc38a4968ba27f9652e SHA512 9ce4f2b32d4d5ffd9916bae4347265e343af1b8115930091caa67b5a7afa319177100d9e1bd5ec849a192840724bbf53ebc23a25015e42c7ac77a27099dd1655
+EBUILD ament_cmake_pytest-1.1.4.ebuild 1135 BLAKE2B 6da9b96a858f21cdc81b111a34041fb724a3d1577fbb6a9557ee4fcaaffa52ede83e8d99a48dfefafad0cb426cdd99e1c1b53cc6d82afd5d7dd12a79996e34ea SHA512 c9abff25a2584196307ccf021cc6fbf5b507d03c46f99e67fda024284fbe115ad43ba7811bcd334d6321be9ba2b9173b877d45ed651922792d38f089701dfc46
+EBUILD ament_cmake_pytest-1.3.0.ebuild 1135 BLAKE2B 6da9b96a858f21cdc81b111a34041fb724a3d1577fbb6a9557ee4fcaaffa52ede83e8d99a48dfefafad0cb426cdd99e1c1b53cc6d82afd5d7dd12a79996e34ea SHA512 c9abff25a2584196307ccf021cc6fbf5b507d03c46f99e67fda024284fbe115ad43ba7811bcd334d6321be9ba2b9173b877d45ed651922792d38f089701dfc46
+EBUILD ament_cmake_pytest-9999.ebuild 1135 BLAKE2B 6da9b96a858f21cdc81b111a34041fb724a3d1577fbb6a9557ee4fcaaffa52ede83e8d99a48dfefafad0cb426cdd99e1c1b53cc6d82afd5d7dd12a79996e34ea SHA512 c9abff25a2584196307ccf021cc6fbf5b507d03c46f99e67fda024284fbe115ad43ba7811bcd334d6321be9ba2b9173b877d45ed651922792d38f089701dfc46
 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 e23834be6639..113de907501d 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
@@ -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_pytest/ament_cmake_pytest-1.3.0.ebuild b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.3.0.ebuild
index cd735bfb3be2..113de907501d 100644
--- a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-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_pytest/ament_cmake_pytest-9999.ebuild b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-9999.ebuild
index e23834be6639..113de907501d 100644
--- a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-9999.ebuild
+++ b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-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_python/Manifest b/dev-ros/ament_cmake_python/Manifest
index 16b838bce653..88f1954833d5 100644
--- a/dev-ros/ament_cmake_python/Manifest
+++ b/dev-ros/ament_cmake_python/Manifest
@@ -2,7 +2,7 @@ AUX destdir.patch 1203 BLAKE2B fe4e783ea9d4802752d79d489e5b05d0ca9688a76d678521a
 AUX destdir2.patch 1174 BLAKE2B dcf78cd8e36565677fbc688876a19a24a0df23b8dffbfa6dd230b935740c1ca4a6c57e3d9ad264b9b1b20be9794fafe1e3f59211f249f710016a9ce57058810e SHA512 75847abed87ee4e629682139f9cae789cfa0b02e6a08d941a6e1490ec966062f20326501d704afbfbd71dc24ab1e99479a02345a8118f14ba1264d171e85aeb0
 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_python-1.1.4.ebuild 1181 BLAKE2B 651152b5ead7ad7112dd08c6b533b7451f908ff97abc2dad7f04b38cc3c6ddc9f76e2f0c2e1348f6bacb634b847e4030618120f678823d972963dd4368ca702c SHA512 30dcac9098507e41151db00824a188f266a8abab566fe5a9e9c7b865dfd3c67da8c3569bc70a433e7a329f2eacf512d6766665b6141fd3d6e9554e42fac605b2
-EBUILD ament_cmake_python-1.3.0.ebuild 1182 BLAKE2B fddba91ce1baeeac2c00e0e7d9ca3ff4a4821886d81e0cc5af5604a43698f81aa4cd223e6130b31f5127d27866dbd1c253dabede25b04292836c06e2d82c2d58 SHA512 332ce76b974cb7ebf8de2034d0b568ac6dde41c83d32141171816e38a2508967900c22fe179766d6194f36a599d0b67e6634507d026020d77c4d5680fbf0d044
-EBUILD ament_cmake_python-9999.ebuild 1182 BLAKE2B fddba91ce1baeeac2c00e0e7d9ca3ff4a4821886d81e0cc5af5604a43698f81aa4cd223e6130b31f5127d27866dbd1c253dabede25b04292836c06e2d82c2d58 SHA512 332ce76b974cb7ebf8de2034d0b568ac6dde41c83d32141171816e38a2508967900c22fe179766d6194f36a599d0b67e6634507d026020d77c4d5680fbf0d044
+EBUILD ament_cmake_python-1.1.4.ebuild 1156 BLAKE2B 819e96e987a3fe6b0872bb6e2e849e14302e185af3413f4e4f7c69f0f7cdd872276d483fba4584c837e9e6ad58882f302ff0e089681061de32222d8386f11399 SHA512 eafa3e5e661b1745c7d581711011be8db7aa54c94504d8467e2fe68116179648bb2c689c3efa179585378204847bf5c1a547026ed698c1691c58d1e5f2f52c24
+EBUILD ament_cmake_python-1.3.0.ebuild 1157 BLAKE2B d0cc411763d6e20051634e273c0ba6aa685c09b1141918004776d99dce956dd2eb5884780051735e9d2d628b2b15a15697f0ee127114c6863d92853a2c85e513 SHA512 ab8537230f7ece2fcd1777a0796ded029988ff3c51294dccc21601d73baca7714efb48726a2ebfcd40ba8f24a1c2d8c944cb16c383f575a3ab9884c2b89c7a22
+EBUILD ament_cmake_python-9999.ebuild 1157 BLAKE2B d0cc411763d6e20051634e273c0ba6aa685c09b1141918004776d99dce956dd2eb5884780051735e9d2d628b2b15a15697f0ee127114c6863d92853a2c85e513 SHA512 ab8537230f7ece2fcd1777a0796ded029988ff3c51294dccc21601d73baca7714efb48726a2ebfcd40ba8f24a1c2d8c944cb16c383f575a3ab9884c2b89c7a22
 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 d6ff5f678382..9e97d1bcb641 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
@@ -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,20 +27,20 @@ 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}]')
 "
 PATCHES=( "${FILESDIR}/destdir.patch" )
 
 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_python/ament_cmake_python-1.3.0.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.3.0.ebuild
index d4b1a4488aca..efe87c1c7938 100644
--- a/dev-ros/ament_cmake_python/ament_cmake_python-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-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,20 +27,20 @@ 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}]')
 "
 PATCHES=( "${FILESDIR}/destdir2.patch" )
 
 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_python/ament_cmake_python-9999.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild
index d4b1a4488aca..efe87c1c7938 100644
--- a/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-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,20 +27,20 @@ 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}]')
 "
 PATCHES=( "${FILESDIR}/destdir2.patch" )
 
 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_ros/Manifest b/dev-ros/ament_cmake_ros/Manifest
index a0e38cea8eb3..293fb84bad11 100644
--- a/dev-ros/ament_cmake_ros/Manifest
+++ b/dev-ros/ament_cmake_ros/Manifest
@@ -1,4 +1,4 @@
 DIST ament_cmake_ros-0.10.0.tar.gz 10411 BLAKE2B 8113da7c8dc04339b0c1a5aff89cc9e1eb0dcf453101fb9e65c0c95fc6275a3049f83c93ff83106d22dee20d6aa6b190a49b02a51336a3858db88cf3a39bce95 SHA512 1feaab1c1100587eec42bfd62a53baaa802d7de1c8d14e991615ab60b97a9350d268f9387998d2c05ee2742886a0b5805c3053eef6b517323e24fddfe5b7d4e8
-EBUILD ament_cmake_ros-0.10.0.ebuild 1002 BLAKE2B bab6d45d83220d0cfe99971f8dfac80efefa7c0f9f29c3c32a43ed530ae81e765c48f3cc73f2053b517c41ecd2bfac0fbf595315c57f6dc3fb9e11d8cb26a097 SHA512 911a31200872cea612605c6df96f75203868d8b58c9eae886b035ecd007fb39f0a51d2284d33a42cebbc99722b2ed87d07d95d83a6d90a7f41a980cf1d698e65
-EBUILD ament_cmake_ros-9999.ebuild 1002 BLAKE2B e6e63bb862efd7af8d3cfac6d7bfb051bf6799a1237cc52456cd4d0e83a071a0db6a247ace92792ee45e4a463082924c1bcb439b8a37a810b081e42a50769d87 SHA512 2a9feca4c7564f38573162ef46c903c6f907e17037f03e61a91dccd032ac3307ecf84f108315e83cc28d2c855afff00a1683ce50e9165c7689909015f3514f4a
+EBUILD ament_cmake_ros-0.10.0.ebuild 1009 BLAKE2B 79a643c28ea231a7d8ff7bce280f5f3f189cc78cd8b10f7e3049cb1e4bec3b379b09e02de144c786aa94f10525f3d3ea7b2f12d560ed6bd0d5820dba8b52a3d1 SHA512 abfb2d44553ec1c6785d91ca11b9c338d8b765c66ea12b4bd057db5318e52d76f1627dfe1b37e21b1aec384c7c525fae47b7f3638d730a780fd355d0564916da
+EBUILD ament_cmake_ros-9999.ebuild 1009 BLAKE2B 79a643c28ea231a7d8ff7bce280f5f3f189cc78cd8b10f7e3049cb1e4bec3b379b09e02de144c786aa94f10525f3d3ea7b2f12d560ed6bd0d5820dba8b52a3d1 SHA512 abfb2d44553ec1c6785d91ca11b9c338d8b765c66ea12b4bd057db5318e52d76f1627dfe1b37e21b1aec384c7c525fae47b7f3638d730a780fd355d0564916da
 MISC metadata.xml 335 BLAKE2B 34967a233f8a8a1a3d01283b7cf0021b2aa9830157998fdbed0365a4601c9c84159805fc1e70817a257c3786f9698ddbcf8b515fe4f2cdee3da1fde91dc014ad SHA512 00c7b588cde604a184c8d1a9a9c93eca62f83bb0c61928813998b8fc57c2f2936c29740ff2b15b34e25c13b8a107e722196d635c50d6e034d6dbe81e58e5395d
diff --git a/dev-ros/ament_cmake_ros/ament_cmake_ros-0.10.0.ebuild b/dev-ros/ament_cmake_ros/ament_cmake_ros-0.10.0.ebuild
index 5a06cfb3c18e..35af72b0cbd8 100644
--- a/dev-ros/ament_cmake_ros/ament_cmake_ros-0.10.0.ebuild
+++ b/dev-ros/ament_cmake_ros/ament_cmake_ros-0.10.0.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
+	python_has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
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 9db04e1784f0..35af72b0cbd8 100644
--- a/dev-ros/ament_cmake_ros/ament_cmake_ros-9999.ebuild
+++ b/dev-ros/ament_cmake_ros/ament_cmake_ros-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
@@ -35,7 +35,7 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
+	python_has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_target_dependencies/Manifest b/dev-ros/ament_cmake_target_dependencies/Manifest
index 5f0a000853a7..9bbcc2920fcb 100644
--- a/dev-ros/ament_cmake_target_dependencies/Manifest
+++ b/dev-ros/ament_cmake_target_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_target_dependencies-1.1.4.ebuild 1231 BLAKE2B 8766429812e518e70112916979a0eb6cf536bdb27c4e04ff42b5d30309daf582ef30658579e6810df9210641bcbeaa37c85a8cb0d9dadc7ffcb30a462b1f5c76 SHA512 8952dba6e8ba12f5313bd622bc24e215c51a9204fa84b025138b90c10a786cc5341a6eadfacd36849bc5174b05b8902714fe816466146ca3f87ccb6a184a4c15
-EBUILD ament_cmake_target_dependencies-1.3.0.ebuild 1231 BLAKE2B 828a85783d01b1846d69912a8d9496dc0e36d0115e86ee2661ae14091105ed7a42a51bc25b4bc6abe98faf2c5140b5ff45b0bcb327d8ede6503de80b787a0807 SHA512 d52753cae176d11a725eb231605a7fc9cceffd2b2939d87cf27995287304e7e89a6b8147c96abf737eab3d6019881af12fbccd6062619957c9f8ce7f490cd38e
-EBUILD ament_cmake_target_dependencies-9999.ebuild 1231 BLAKE2B 8766429812e518e70112916979a0eb6cf536bdb27c4e04ff42b5d30309daf582ef30658579e6810df9210641bcbeaa37c85a8cb0d9dadc7ffcb30a462b1f5c76 SHA512 8952dba6e8ba12f5313bd622bc24e215c51a9204fa84b025138b90c10a786cc5341a6eadfacd36849bc5174b05b8902714fe816466146ca3f87ccb6a184a4c15
+EBUILD ament_cmake_target_dependencies-1.1.4.ebuild 1206 BLAKE2B 5505bc47f17917919295189625ec92975aa66ea91f70c46708dcb450acf1644674dc7e17867737babbd263fa931290fc90e697c332ab0280385b022fcbe07d69 SHA512 6cc46bde74afbf48207b6f9333e059ce635df83be3028584af32e855dfc8e2a9762d838ade945606ba402f4c287771f28ede47d22a113198d954e6a80d3fc647
+EBUILD ament_cmake_target_dependencies-1.3.0.ebuild 1206 BLAKE2B 5505bc47f17917919295189625ec92975aa66ea91f70c46708dcb450acf1644674dc7e17867737babbd263fa931290fc90e697c332ab0280385b022fcbe07d69 SHA512 6cc46bde74afbf48207b6f9333e059ce635df83be3028584af32e855dfc8e2a9762d838ade945606ba402f4c287771f28ede47d22a113198d954e6a80d3fc647
+EBUILD ament_cmake_target_dependencies-9999.ebuild 1206 BLAKE2B 5505bc47f17917919295189625ec92975aa66ea91f70c46708dcb450acf1644674dc7e17867737babbd263fa931290fc90e697c332ab0280385b022fcbe07d69 SHA512 6cc46bde74afbf48207b6f9333e059ce635df83be3028584af32e855dfc8e2a9762d838ade945606ba402f4c287771f28ede47d22a113198d954e6a80d3fc647
 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 70b3c063b089..af9969154ce6 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
@@ -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
@@ -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_target_dependencies/ament_cmake_target_dependencies-1.3.0.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.3.0.ebuild
index 57d0a18f4f66..af9969154ce6 100644
--- a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-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
@@ -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_target_dependencies/ament_cmake_target_dependencies-9999.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-9999.ebuild
index 70b3c063b089..af9969154ce6 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
@@ -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
@@ -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_uncrustify/Manifest b/dev-ros/ament_cmake_uncrustify/Manifest
index fbdebdc6f588..e3d4867959eb 100644
--- a/dev-ros/ament_cmake_uncrustify/Manifest
+++ b/dev-ros/ament_cmake_uncrustify/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_uncrustify-0.11.2.ebuild 1437 BLAKE2B 833be5fc6329f99dc99f8994b0fc7f15cd3e7ace0defaddf2e339c78909911359fc07c867429911aee846e6a4658bc8a9645b7f3908343f95a0a1c2ab50256fd SHA512 96c36c4d0d4e159301528bdc8d21c816c9baffc186449f6d262c64dc4c4d90f0cda80ac1e33e8ab68344f44c64a7b0d5cc2c84b2f82ebef9d1d2ec9d55668f9d
-EBUILD ament_cmake_uncrustify-0.12.1.ebuild 1437 BLAKE2B b9c66e573d21196c119c5bd063c0655a89ee23353531a8bff5871f0aa9a76842934ec98d1810b9631f67e7759528e4abf93f9b62a4d06e05d0973081131b0f0f SHA512 86a0991f643755d907d8da3d2136a50904f279cf04c342cea2fac2e41df7609c30d906a401d1eb28ae6dd9548c88f8ff32426ab02cb9267ad29a0657ddb4b0a3
-EBUILD ament_cmake_uncrustify-9999.ebuild 1437 BLAKE2B 833be5fc6329f99dc99f8994b0fc7f15cd3e7ace0defaddf2e339c78909911359fc07c867429911aee846e6a4658bc8a9645b7f3908343f95a0a1c2ab50256fd SHA512 96c36c4d0d4e159301528bdc8d21c816c9baffc186449f6d262c64dc4c4d90f0cda80ac1e33e8ab68344f44c64a7b0d5cc2c84b2f82ebef9d1d2ec9d55668f9d
+EBUILD ament_cmake_uncrustify-0.11.2.ebuild 1428 BLAKE2B 540f97e5a106df9e92815c190c4f6ab9f3caeea937ecf026364ca276c5cd860777bb9507c73553e64861c8d19bff304f74a3e2457679a7199b655c5438de71a5 SHA512 357f6ae7980eb84b06710efec920fdb4d07cc8e77682848892a24ced53a2000b67f05d99eb3c204b9b0a7785b74fc8ff3a4be5aab5be02a5e96a0c2fffa1bcfc
+EBUILD ament_cmake_uncrustify-0.12.1.ebuild 1428 BLAKE2B 540f97e5a106df9e92815c190c4f6ab9f3caeea937ecf026364ca276c5cd860777bb9507c73553e64861c8d19bff304f74a3e2457679a7199b655c5438de71a5 SHA512 357f6ae7980eb84b06710efec920fdb4d07cc8e77682848892a24ced53a2000b67f05d99eb3c204b9b0a7785b74fc8ff3a4be5aab5be02a5e96a0c2fffa1bcfc
+EBUILD ament_cmake_uncrustify-9999.ebuild 1428 BLAKE2B 540f97e5a106df9e92815c190c4f6ab9f3caeea937ecf026364ca276c5cd860777bb9507c73553e64861c8d19bff304f74a3e2457679a7199b655c5438de71a5 SHA512 357f6ae7980eb84b06710efec920fdb4d07cc8e77682848892a24ced53a2000b67f05d99eb3c204b9b0a7785b74fc8ff3a4be5aab5be02a5e96a0c2fffa1bcfc
 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 826f45045e89..ca275536e31d 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
@@ -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_uncrustify/ament_cmake_uncrustify-0.12.1.ebuild b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.12.1.ebuild
index c2d582d94104..ca275536e31d 100644
--- a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.12.1.ebuild
+++ b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-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_uncrustify/ament_cmake_uncrustify-9999.ebuild b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-9999.ebuild
index 826f45045e89..ca275536e31d 100644
--- a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-9999.ebuild
+++ b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-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_version/Manifest b/dev-ros/ament_cmake_version/Manifest
index e7ab8e8e66a3..a245533cac57 100644
--- a/dev-ros/ament_cmake_version/Manifest
+++ b/dev-ros/ament_cmake_version/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_version-1.1.4.ebuild 1153 BLAKE2B bda2e52ba32026d66475180792b557e32daf7c4bfe519fb2b4eb373ae936fbf96523860561f1c6ae97c85e677153e501b06c7b6ff30a952d15cd6226f1b25947 SHA512 ead48b4ca1e50612ce46f9f753c729d6b32a7174faff6a4292f31b980d4cff5843236446fe4215e38612cd9c113e68b00da36ea4bcb00c09d7d5fe636d2b1a2e
-EBUILD ament_cmake_version-1.3.0.ebuild 1153 BLAKE2B 1c0130525a99f8f7f0172099fd04881207a703492ab83811191fa9fe0f46e62386cc49c924be2c98e1f8bfd43445c377a94fe28ebffd5b45fcbb7d41fa615896 SHA512 a6fb939305b9084ab0c2f92b03dfcb78fe6b78f74e5517da342d8c8146e313f3ddac4db9a36aa727acc34d94cfa31970827ec113513228ab2830d2e2eeedefa3
-EBUILD ament_cmake_version-9999.ebuild 1153 BLAKE2B bda2e52ba32026d66475180792b557e32daf7c4bfe519fb2b4eb373ae936fbf96523860561f1c6ae97c85e677153e501b06c7b6ff30a952d15cd6226f1b25947 SHA512 ead48b4ca1e50612ce46f9f753c729d6b32a7174faff6a4292f31b980d4cff5843236446fe4215e38612cd9c113e68b00da36ea4bcb00c09d7d5fe636d2b1a2e
+EBUILD ament_cmake_version-1.1.4.ebuild 1128 BLAKE2B 8f9b5284e37d135c069f03f35682f85a7eecee66f5da817624a215b6666905ce2e3bba2998799dd4b5c4afa4c9408f9ec513ddba1bc92acffb395eebc505f544 SHA512 1c24dd4c4a8c1a30f3869a4bd19cf5de978a86f400c5bedb0c785f2cdd375d3634f292453951344961dbfca2052a30bd74ac76d9bf97a7a7c481e18e91e36131
+EBUILD ament_cmake_version-1.3.0.ebuild 1128 BLAKE2B 8f9b5284e37d135c069f03f35682f85a7eecee66f5da817624a215b6666905ce2e3bba2998799dd4b5c4afa4c9408f9ec513ddba1bc92acffb395eebc505f544 SHA512 1c24dd4c4a8c1a30f3869a4bd19cf5de978a86f400c5bedb0c785f2cdd375d3634f292453951344961dbfca2052a30bd74ac76d9bf97a7a7c481e18e91e36131
+EBUILD ament_cmake_version-9999.ebuild 1128 BLAKE2B 8f9b5284e37d135c069f03f35682f85a7eecee66f5da817624a215b6666905ce2e3bba2998799dd4b5c4afa4c9408f9ec513ddba1bc92acffb395eebc505f544 SHA512 1c24dd4c4a8c1a30f3869a4bd19cf5de978a86f400c5bedb0c785f2cdd375d3634f292453951344961dbfca2052a30bd74ac76d9bf97a7a7c481e18e91e36131
 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 2124a92f04a5..56662480fc81 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
@@ -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_version/ament_cmake_version-1.3.0.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-1.3.0.ebuild
index b70cd7b77686..56662480fc81 100644
--- a/dev-ros/ament_cmake_version/ament_cmake_version-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_version/ament_cmake_version-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_version/ament_cmake_version-9999.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-9999.ebuild
index 2124a92f04a5..56662480fc81 100644
--- a/dev-ros/ament_cmake_version/ament_cmake_version-9999.ebuild
+++ b/dev-ros/ament_cmake_version/ament_cmake_version-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_xmllint/Manifest b/dev-ros/ament_cmake_xmllint/Manifest
index b1727b4dd951..99a2db4f7f6c 100644
--- a/dev-ros/ament_cmake_xmllint/Manifest
+++ b/dev-ros/ament_cmake_xmllint/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_xmllint-0.11.2.ebuild 1373 BLAKE2B a87f242d504ec01baab3883ac83b3b1d78c750217837dddb33de0bde601b440ea5b2e68c7c711d2b90c6daa98b1f57dbf7a343f1a5e381dca6c5e3cc7950eb1d SHA512 ee3a7f5d718b509b199174edb86f444b9124667655edd870eddb8eeb3027efc32d16dab65a70c8dba114084475683c18b4fc659ad224e613cb4270e13b367c8f
-EBUILD ament_cmake_xmllint-0.12.1.ebuild 1373 BLAKE2B a87f242d504ec01baab3883ac83b3b1d78c750217837dddb33de0bde601b440ea5b2e68c7c711d2b90c6daa98b1f57dbf7a343f1a5e381dca6c5e3cc7950eb1d SHA512 ee3a7f5d718b509b199174edb86f444b9124667655edd870eddb8eeb3027efc32d16dab65a70c8dba114084475683c18b4fc659ad224e613cb4270e13b367c8f
-EBUILD ament_cmake_xmllint-9999.ebuild 1373 BLAKE2B a87f242d504ec01baab3883ac83b3b1d78c750217837dddb33de0bde601b440ea5b2e68c7c711d2b90c6daa98b1f57dbf7a343f1a5e381dca6c5e3cc7950eb1d SHA512 ee3a7f5d718b509b199174edb86f444b9124667655edd870eddb8eeb3027efc32d16dab65a70c8dba114084475683c18b4fc659ad224e613cb4270e13b367c8f
+EBUILD ament_cmake_xmllint-0.11.2.ebuild 1350 BLAKE2B 5f8b521f89e7fe58241d97e48ed68767b4090c297f988079a3b59b3c9dccd1e5a9ea6e4b395b2caffd772c83b65c61eb343d91b534c391469aa86a2caaa0f39a SHA512 01ae67f982b313181d263419433bcc592066b8f7d9844cb1ce0a5c93c9503a13495c2d61d3a6bee995616e638bd1082fcebd7228e2ca98e938f63d452fd86a23
+EBUILD ament_cmake_xmllint-0.12.1.ebuild 1350 BLAKE2B 5f8b521f89e7fe58241d97e48ed68767b4090c297f988079a3b59b3c9dccd1e5a9ea6e4b395b2caffd772c83b65c61eb343d91b534c391469aa86a2caaa0f39a SHA512 01ae67f982b313181d263419433bcc592066b8f7d9844cb1ce0a5c93c9503a13495c2d61d3a6bee995616e638bd1082fcebd7228e2ca98e938f63d452fd86a23
+EBUILD ament_cmake_xmllint-9999.ebuild 1350 BLAKE2B 5f8b521f89e7fe58241d97e48ed68767b4090c297f988079a3b59b3c9dccd1e5a9ea6e4b395b2caffd772c83b65c61eb343d91b534c391469aa86a2caaa0f39a SHA512 01ae67f982b313181d263419433bcc592066b8f7d9844cb1ce0a5c93c9503a13495c2d61d3a6bee995616e638bd1082fcebd7228e2ca98e938f63d452fd86a23
 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 7657d4a383e2..bf7643e22605 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
@@ -45,9 +45,9 @@ 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_xmllint[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+		"dev-ros/ament_xmllint[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.12.1.ebuild b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.12.1.ebuild
index 7657d4a383e2..bf7643e22605 100644
--- a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.12.1.ebuild
+++ b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.12.1.ebuild
@@ -45,9 +45,9 @@ 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_xmllint[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+		"dev-ros/ament_xmllint[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
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 7657d4a383e2..bf7643e22605 100644
--- a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-9999.ebuild
+++ b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-9999.ebuild
@@ -45,9 +45,9 @@ 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_xmllint[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+		"dev-ros/ament_xmllint[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
diff --git a/dev-ros/ament_lint_auto/Manifest b/dev-ros/ament_lint_auto/Manifest
index ab43758b05df..54dff3e2610a 100644
--- a/dev-ros/ament_lint_auto/Manifest
+++ b/dev-ros/ament_lint_auto/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_lint_auto-0.11.2.ebuild 1096 BLAKE2B c6c9fbb481208a3fe10a6e7cdd271bff04486534aa458f0f4d84692a6c2b1c3515454f28aaa4faca298de8b5d4e99a4d58246f0bc6ab4a70bc21449111c70e15 SHA512 ee87fec01224b82da9fbe20e201fdadd615b878beba8f9d9c71389eb95c67ac98c3ed786028a2d7c9e804c41a312b21135080286a1915f49b5d7a12906a3f994
-EBUILD ament_lint_auto-0.12.1.ebuild 1096 BLAKE2B 58b7c807236f025fdf1bf9c1f9b9dc2d93da10e789b35ea3b05c54bf7aff495022285b54d7cb67bd4a504d081ae1de5bb40277b41ed39a6bfd268054ea5f25df SHA512 456447b03e0314874dc779b44a3e05f6c8e6f8044f9e3e55c6c2ecc62e68b2771da23db7263414c9d0ed1af667f55d09bcd5533e0d68c9d94b2941f87a4ddfd0
-EBUILD ament_lint_auto-9999.ebuild 1096 BLAKE2B c6c9fbb481208a3fe10a6e7cdd271bff04486534aa458f0f4d84692a6c2b1c3515454f28aaa4faca298de8b5d4e99a4d58246f0bc6ab4a70bc21449111c70e15 SHA512 ee87fec01224b82da9fbe20e201fdadd615b878beba8f9d9c71389eb95c67ac98c3ed786028a2d7c9e804c41a312b21135080286a1915f49b5d7a12906a3f994
+EBUILD ament_lint_auto-0.11.2.ebuild 1086 BLAKE2B e05a3a6c1f633c0649827511d54c15d8208453313a8fe4a6b9d1a5f47846882eb65e339be9c341653347996e77173caa4fb670a371fb96e64345502806f4a409 SHA512 63101608ca383010d3b0d298178ddf10875ce6d906c80387b4f649a7d181a5997d4018a2a323422e90a0cd9a9d13a2671c8547b0fbec2fc48357335fb48056a6
+EBUILD ament_lint_auto-0.12.1.ebuild 1086 BLAKE2B e05a3a6c1f633c0649827511d54c15d8208453313a8fe4a6b9d1a5f47846882eb65e339be9c341653347996e77173caa4fb670a371fb96e64345502806f4a409 SHA512 63101608ca383010d3b0d298178ddf10875ce6d906c80387b4f649a7d181a5997d4018a2a323422e90a0cd9a9d13a2671c8547b0fbec2fc48357335fb48056a6
+EBUILD ament_lint_auto-9999.ebuild 1086 BLAKE2B e05a3a6c1f633c0649827511d54c15d8208453313a8fe4a6b9d1a5f47846882eb65e339be9c341653347996e77173caa4fb670a371fb96e64345502806f4a409 SHA512 63101608ca383010d3b0d298178ddf10875ce6d906c80387b4f649a7d181a5997d4018a2a323422e90a0cd9a9d13a2671c8547b0fbec2fc48357335fb48056a6
 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 7c0ae86f0a35..f4bba4298b4b 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
@@ -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
@@ -30,14 +30,13 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
+BDEPEND="${PYTHON_DEPS}
 	$(python_gen_any_dep '
 		dev-python/ament_package[${PYTHON_USEDEP}]
 		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_lint_auto/ament_lint_auto-0.12.1.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-0.12.1.ebuild
index 16d03e212bf3..f4bba4298b4b 100644
--- a/dev-ros/ament_lint_auto/ament_lint_auto-0.12.1.ebuild
+++ b/dev-ros/ament_lint_auto/ament_lint_auto-0.12.1.ebuild
@@ -30,14 +30,13 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
+BDEPEND="${PYTHON_DEPS}
 	$(python_gen_any_dep '
 		dev-python/ament_package[${PYTHON_USEDEP}]
 		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
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 7c0ae86f0a35..f4bba4298b4b 100644
--- a/dev-ros/ament_lint_auto/ament_lint_auto-9999.ebuild
+++ b/dev-ros/ament_lint_auto/ament_lint_auto-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
@@ -30,14 +30,13 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
+BDEPEND="${PYTHON_DEPS}
 	$(python_gen_any_dep '
 		dev-python/ament_package[${PYTHON_USEDEP}]
 		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/console_bridge_vendor/Manifest b/dev-ros/console_bridge_vendor/Manifest
index 7132d7830185..b2168959c2c7 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 965 BLAKE2B e45ffac445d619769c3bf0382c8895e055f909e217e2ef8b5c0a71bf7a2b6ab6e6245694f2b27a4a25b4b1ad8f3b27704b5525482df589328014fe28084cf122 SHA512 571c7cf889c7e5ae25fe47c9240b12d41a75c92f613cea8aa16cf5d04eea4d3d833b9e839e9588384a64dcd0d431d051026c86d7f9859e98aedc7017282778bb
-EBUILD console_bridge_vendor-9999.ebuild 965 BLAKE2B e45ffac445d619769c3bf0382c8895e055f909e217e2ef8b5c0a71bf7a2b6ab6e6245694f2b27a4a25b4b1ad8f3b27704b5525482df589328014fe28084cf122 SHA512 571c7cf889c7e5ae25fe47c9240b12d41a75c92f613cea8aa16cf5d04eea4d3d833b9e839e9588384a64dcd0d431d051026c86d7f9859e98aedc7017282778bb
+EBUILD console_bridge_vendor-1.2.2.ebuild 972 BLAKE2B f3a1f30de60ef6213b143161849daca0c2bd41d60df342cab9f2084f6b9ef5e81bf141cfa406a6619ac0275c2a28a5ff785e0b7005f8c4e62295f46ed9ae3aa4 SHA512 02e9dfd6e88d29a97d91677357a1c82604960fb92270929a046425072e04dbc2e7e123887c414d341a944ae67f4f27891e07bca37429cdc10eca7db68e6ec60e
+EBUILD console_bridge_vendor-9999.ebuild 972 BLAKE2B f3a1f30de60ef6213b143161849daca0c2bd41d60df342cab9f2084f6b9ef5e81bf141cfa406a6619ac0275c2a28a5ff785e0b7005f8c4e62295f46ed9ae3aa4 SHA512 02e9dfd6e88d29a97d91677357a1c82604960fb92270929a046425072e04dbc2e7e123887c414d341a944ae67f4f27891e07bca37429cdc10eca7db68e6ec60e
 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 4646288f53e8..e46a0a73093c 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
@@ -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
@@ -34,7 +34,7 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
+	python_has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
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 4646288f53e8..e46a0a73093c 100644
--- a/dev-ros/console_bridge_vendor/console_bridge_vendor-9999.ebuild
+++ b/dev-ros/console_bridge_vendor/console_bridge_vendor-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
@@ -34,7 +34,7 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
+	python_has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
diff --git a/dev-ros/poco_vendor/Manifest b/dev-ros/poco_vendor/Manifest
index bb2e62fc89e7..86545f10bab4 100644
--- a/dev-ros/poco_vendor/Manifest
+++ b/dev-ros/poco_vendor/Manifest
@@ -1,4 +1,4 @@
 DIST poco_vendor-1.2.1.tar.gz 3156 BLAKE2B 3f9714c81046892463d043642eee5295a6d6436730a22f7b2e114e4d9163d11e50afab895b32b31b1985373d51ea10290b5b22176643890b2f9a2f82ac9ed4f3 SHA512 21dfa72bb413e710f1ac51bbeca18b6ae111078ca06d3aba456628071f6763a386794334d0565b5111e907bb9012dbb124b73fc141002cd77717931009fa1161
-EBUILD poco_vendor-1.2.1.ebuild 789 BLAKE2B cb3a750d21f5004341dbc5f0d477ce4b813c2f78dc980741c8e28b10b84cff95e7bd70d757bad5afd38280509500f954de12d887791cbdd1833dd77cc5276fba SHA512 62e429c6e5e91132c4ae3c7e294a91a9e17d06dc215f026a9c127b21729a41fc597a03de6a727822722cef9721b08cb75db4e6c3e16912a2fee86069c06f9089
-EBUILD poco_vendor-9999.ebuild 1066 BLAKE2B c0fc132d128f0ef8f14ca3cf63e02eb33621742cbcb0455d10e0763c70b5ac1dcfdb2c81393ebdaddd4428430bdf182d0572d3bcfbe094515be2bd1aa36c9c4f SHA512 f7640ba4516c2d44ac0ab115f895084b40823161e2e6330a9fb175dded116bd1a8b12c42b7c99e77fec1c63398c0e42a65dd64291a65cdccdcead7eb3cbd3169
+EBUILD poco_vendor-1.2.1.ebuild 796 BLAKE2B d85d59b3d6387729f076cc3c591f23c2a5035ae074311eb89dc0815bc49942d66485ce61dd5f6b06868325fbe2b399f7d3a26333ec3dcf9b3cce1d341d680a20 SHA512 6e3a4d5d3596de89ba570cad3416e2a3461dd4f14be7c681054bffa8c4ef58490bdb058096d38c5de50b3bd2d9caec16b154f2f82354ea82eb59396c444530de
+EBUILD poco_vendor-9999.ebuild 1073 BLAKE2B 904f04d6cf7155927779450e4b0dea8c9f692b992bd905edff87565ac0f104e1250f681c1b519568b76d93750a2fab1804e50f63be433daa6eb2a69c07cdf9b5 SHA512 d9762135be66c56101a996577a491fda98f9976582d2bf832758a590f4c668d3d65511ee36a5a974482e9a81ba72be410cbd8d235adaf3e2fe82f8aa339a0768
 MISC metadata.xml 331 BLAKE2B bb0bfaa70ddf2d70283fa683421b1641b3439ed560f135cc5ec1b4b238fbecc31268a66dc338b60cc1cc8183bf12e4fcb5406ccc42b8bcd98e3f433008edf00e SHA512 f615d33808e4b759c621f93494d007fbc438a81c754e96f60badcb7796f5ba0d570be8d925f40a1d5da625b7a33eb148ab3233a16403681bed562aeb5c4e9445
diff --git a/dev-ros/poco_vendor/poco_vendor-1.2.1.ebuild b/dev-ros/poco_vendor/poco_vendor-1.2.1.ebuild
index 09425e587d23..03365083ddf5 100644
--- a/dev-ros/poco_vendor/poco_vendor-1.2.1.ebuild
+++ b/dev-ros/poco_vendor/poco_vendor-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,5 +33,5 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
+	python_has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/poco_vendor/poco_vendor-9999.ebuild b/dev-ros/poco_vendor/poco_vendor-9999.ebuild
index 24ec7a182e2a..6efe66ba9201 100644
--- a/dev-ros/poco_vendor/poco_vendor-9999.ebuild
+++ b/dev-ros/poco_vendor/poco_vendor-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
@@ -41,7 +41,7 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
+	python_has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
diff --git a/dev-ros/python_cmake_module/Manifest b/dev-ros/python_cmake_module/Manifest
index 5e3ed7a79e0a..34bc618aa0ab 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 985 BLAKE2B 27cecad104beb11ffed14b394b8a8ee2f25fc27fa628904cd0db6bc80b0854be1178c465db095c6e4d1e57f5067e35eccaf75cf5177ae8e43026a403753e39ec SHA512 216e5845f2896bd4dccc0f1c20d0272ee755e5ab6fbc2810dd5ee8e985e202d812d2bc12e3a20f7057d9106e6f0cf8f8d3b5c9a01bfdebbaa32acb631f738b05
-EBUILD python_cmake_module-9999.ebuild 985 BLAKE2B 27cecad104beb11ffed14b394b8a8ee2f25fc27fa628904cd0db6bc80b0854be1178c465db095c6e4d1e57f5067e35eccaf75cf5177ae8e43026a403753e39ec SHA512 216e5845f2896bd4dccc0f1c20d0272ee755e5ab6fbc2810dd5ee8e985e202d812d2bc12e3a20f7057d9106e6f0cf8f8d3b5c9a01bfdebbaa32acb631f738b05
+EBUILD python_cmake_module-0.8.1.ebuild 992 BLAKE2B 8a430a0202c4e69d91bdc53e0d9aaeea0ae6472739cb52096be4c61cfc0b420891f16aaa6dc7c49e1500f5b1c467b1c8220e9ac82f1ec20a49e0e1394af0dd4b SHA512 8b3fb974cf43d5ca558720e8ffd34d1378829d8611a2c0981adcc2d2c0cfa0cab42138acf3480f864d1e9b7b575863e2ab385e6defd2ebf4f56fe8aa5bca1a10
+EBUILD python_cmake_module-9999.ebuild 992 BLAKE2B 8a430a0202c4e69d91bdc53e0d9aaeea0ae6472739cb52096be4c61cfc0b420891f16aaa6dc7c49e1500f5b1c467b1c8220e9ac82f1ec20a49e0e1394af0dd4b SHA512 8b3fb974cf43d5ca558720e8ffd34d1378829d8611a2c0981adcc2d2c0cfa0cab42138acf3480f864d1e9b7b575863e2ab385e6defd2ebf4f56fe8aa5bca1a10
 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 a94a808de7ac..d0f3ca27bb43 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
@@ -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
@@ -34,7 +34,7 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
+	python_has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
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 a94a808de7ac..d0f3ca27bb43 100644
--- a/dev-ros/python_cmake_module/python_cmake_module-9999.ebuild
+++ b/dev-ros/python_cmake_module/python_cmake_module-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
@@ -34,7 +34,7 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
+	python_has_version "ros-meta/ament_cmake[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
author	V3n3RiX <venerix@koprulu.sector>	2022-10-05 01:18:42 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-10-05 01:18:42 +0100
commit	5b84ef1b7530528af1eda8310641c6396df8143c (patch)
tree	1dd8187ec16709816078d4b474e15257409a25db /dev-ros
parent	07b0c0005f55e652101816d9f4cfe73403bf0906 (diff)