gentoo resync : 29.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-29 18:03:51 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-29 18:03:51 +0000
commit: d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch)
tree: 1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /dev-ros
parent: abaa75b10f899ada8dd05b23cc03205064394bc6 (diff)
69 files changed, 1671 insertions, 3 deletions
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 89fde39d9ba5..728c180adc85 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/ament_cmake_copyright/Manifest b/dev-ros/ament_cmake_copyright/Manifest
index 9550d354f5f4..7d56978dde38 100644
--- a/dev-ros/ament_cmake_copyright/Manifest
+++ b/dev-ros/ament_cmake_copyright/Manifest
@@ -1,6 +1,8 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_copyright-0.10.0.ebuild 1654 BLAKE2B 26a9e8d2d6fefbf848866d0e332adc17be234c1b44c8bc46c79ed9f1f010155d4faf2b06b6bfa690b9c7996ecef6cb9c27f825ed03f35771dbfebe7be8fa73cb SHA512 e46fdff6ee8d624b9c68b3c17c8c4bce35705f19f1ed4194f55adcfc2edeaf0337489f5b8bfef2e206502146aef5435664016eabef37df264becc21af3082271
+EBUILD ament_cmake_copyright-0.10.1.ebuild 1654 BLAKE2B dfd67a10a78c30a58adc4b2a5c1669b0c634b315e926ad78ec9125767b7f23d8335da5dd3a4f10cb8400359f79065dcf079eedab713b1950bb7bce74d649e22e SHA512 b804e31c9b537195d93f26ededc1cb1a89a8c4eacf9ca1a7fcdfe60fe0e084f9006de63ce7393461207ce2f72ab6247df582aa63ceb4180694f576d1d9ffc5f2
 EBUILD ament_cmake_copyright-0.9.5.ebuild 1654 BLAKE2B 26a9e8d2d6fefbf848866d0e332adc17be234c1b44c8bc46c79ed9f1f010155d4faf2b06b6bfa690b9c7996ecef6cb9c27f825ed03f35771dbfebe7be8fa73cb SHA512 e46fdff6ee8d624b9c68b3c17c8c4bce35705f19f1ed4194f55adcfc2edeaf0337489f5b8bfef2e206502146aef5435664016eabef37df264becc21af3082271
 EBUILD ament_cmake_copyright-9999.ebuild 1654 BLAKE2B 26a9e8d2d6fefbf848866d0e332adc17be234c1b44c8bc46c79ed9f1f010155d4faf2b06b6bfa690b9c7996ecef6cb9c27f825ed03f35771dbfebe7be8fa73cb SHA512 e46fdff6ee8d624b9c68b3c17c8c4bce35705f19f1ed4194f55adcfc2edeaf0337489f5b8bfef2e206502146aef5435664016eabef37df264becc21af3082271
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.1.ebuild b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.1.ebuild
new file mode 100644
index 000000000000..5c1ecf570f76
--- /dev/null
+++ b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The auto-magic functions for ease to use of the ament linters"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_copyright
+	dev-ros/ament_cmake_test
+"
+DEPEND=""
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-ros/ament_copyright[${PYTHON_USEDEP}] test? ( dev-ros/ament_lint_cmake[${PYTHON_USEDEP}] )' )
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_test
+	dev-ros/ament_copyright
+	test? (
+		dev-ros/ament_cmake_lint_cmake
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
+		( use !test || has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]" )
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-ros/ament_cmake_core/Manifest b/dev-ros/ament_cmake_core/Manifest
index 4480e13e82d1..df0567c30ffe 100644
--- a/dev-ros/ament_cmake_core/Manifest
+++ b/dev-ros/ament_cmake_core/Manifest
@@ -2,9 +2,11 @@ DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
+DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 EBUILD ament_cmake_core-0.9.6.ebuild 1073 BLAKE2B d37f5ca1ef5e17edd4465569e91d02eacce49ba591df6aedc86f2d97cc6c03a3c65d58e95c4ff8efd6ec0e87cf914914c64cbc44ed15725432cdb6db0279c073 SHA512 a6002301b67b79499f416d819dc9bbdcbbb486e0de1e01c5afcd8c72ee2ac37cf97c4f60ac8da0ad1b34a10dcd261532f85134b9ab4f90446f5d8c8c23f6d163
 EBUILD ament_cmake_core-1.0.0.ebuild 1073 BLAKE2B d37f5ca1ef5e17edd4465569e91d02eacce49ba591df6aedc86f2d97cc6c03a3c65d58e95c4ff8efd6ec0e87cf914914c64cbc44ed15725432cdb6db0279c073 SHA512 a6002301b67b79499f416d819dc9bbdcbbb486e0de1e01c5afcd8c72ee2ac37cf97c4f60ac8da0ad1b34a10dcd261532f85134b9ab4f90446f5d8c8c23f6d163
 EBUILD ament_cmake_core-1.0.1.ebuild 1073 BLAKE2B d37f5ca1ef5e17edd4465569e91d02eacce49ba591df6aedc86f2d97cc6c03a3c65d58e95c4ff8efd6ec0e87cf914914c64cbc44ed15725432cdb6db0279c073 SHA512 a6002301b67b79499f416d819dc9bbdcbbb486e0de1e01c5afcd8c72ee2ac37cf97c4f60ac8da0ad1b34a10dcd261532f85134b9ab4f90446f5d8c8c23f6d163
 EBUILD ament_cmake_core-1.0.3.ebuild 1073 BLAKE2B 7230079cc909de0ad3065ce364661a08496d765e5eaedf515426c4db57fccc09a7b64af969f56d321cd0490ce9a57053420ec7a494dfce38ad7345fe58723b53 SHA512 eacd49435c8f65b7b8c9c1868c49dec2d84d9d0014ccc7f9fec5785d4d6c8fc69c23aeab4a2886c9fdda9dc2bbfd10602ee6ce676a0c430e40e03d1dc64215c1
+EBUILD ament_cmake_core-1.0.4.ebuild 1073 BLAKE2B 7230079cc909de0ad3065ce364661a08496d765e5eaedf515426c4db57fccc09a7b64af969f56d321cd0490ce9a57053420ec7a494dfce38ad7345fe58723b53 SHA512 eacd49435c8f65b7b8c9c1868c49dec2d84d9d0014ccc7f9fec5785d4d6c8fc69c23aeab4a2886c9fdda9dc2bbfd10602ee6ce676a0c430e40e03d1dc64215c1
 EBUILD ament_cmake_core-9999.ebuild 1073 BLAKE2B d37f5ca1ef5e17edd4465569e91d02eacce49ba591df6aedc86f2d97cc6c03a3c65d58e95c4ff8efd6ec0e87cf914914c64cbc44ed15725432cdb6db0279c073 SHA512 a6002301b67b79499f416d819dc9bbdcbbb486e0de1e01c5afcd8c72ee2ac37cf97c4f60ac8da0ad1b34a10dcd261532f85134b9ab4f90446f5d8c8c23f6d163
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-1.0.4.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.0.4.ebuild
new file mode 100644
index 000000000000..370c1f7cd0cd
--- /dev/null
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-1.0.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The core of the ament buildsystem in CMake"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-python/ament_package
+	dev-python/catkin_pkg
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_cppcheck/Manifest b/dev-ros/ament_cmake_cppcheck/Manifest
index cf152696bfbd..06afc4226143 100644
--- a/dev-ros/ament_cmake_cppcheck/Manifest
+++ b/dev-ros/ament_cmake_cppcheck/Manifest
@@ -1,6 +1,8 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_cppcheck-0.10.0.ebuild 1531 BLAKE2B 079fd406d74a4a9418b0a3c15aa24ebbaebbe097405452cf328dec3c4d82b3e0eb2eacfa3d7c116f3f50c55cb08e0f9187cc8b9cca3d4d8d4805dd8c06ba5a2c SHA512 517ca42684f14960d0ec0c01a47c30bd36c3ed7817a42a6869b49ebf0c003d93aefc430c6680389bf908f9e87313f710d51aee20033232ade8b2632e142f7661
+EBUILD ament_cmake_cppcheck-0.10.1.ebuild 1531 BLAKE2B 8c1a701ac0d96d662281c7edbcbf0f60118de64ac0e461d7e15c661ef6a9890d0807e4852328ff21e2ea47bdf1167776b65aed1c2291c7414979bfd27a23a256 SHA512 81559e08339fe000495c2ec6c103ef2ce395b746083bf4e1f30f803e3d9d5d756ae3add70efbd3910783e7d292a6cb2443bc7a4ba022cf6fecebb92d4eecfc8d
 EBUILD ament_cmake_cppcheck-0.9.5.ebuild 1531 BLAKE2B 079fd406d74a4a9418b0a3c15aa24ebbaebbe097405452cf328dec3c4d82b3e0eb2eacfa3d7c116f3f50c55cb08e0f9187cc8b9cca3d4d8d4805dd8c06ba5a2c SHA512 517ca42684f14960d0ec0c01a47c30bd36c3ed7817a42a6869b49ebf0c003d93aefc430c6680389bf908f9e87313f710d51aee20033232ade8b2632e142f7661
 EBUILD ament_cmake_cppcheck-9999.ebuild 1531 BLAKE2B 079fd406d74a4a9418b0a3c15aa24ebbaebbe097405452cf328dec3c4d82b3e0eb2eacfa3d7c116f3f50c55cb08e0f9187cc8b9cca3d4d8d4805dd8c06ba5a2c SHA512 517ca42684f14960d0ec0c01a47c30bd36c3ed7817a42a6869b49ebf0c003d93aefc430c6680389bf908f9e87313f710d51aee20033232ade8b2632e142f7661
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.10.1.ebuild b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.10.1.ebuild
new file mode 100644
index 000000000000..33c0d35ad478
--- /dev/null
+++ b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.10.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="CMake API for ament_cppcheck to perform static code analysis on C/C++"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cppcheck
+"
+DEPEND=""
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	test? (
+		dev-ros/ament_cmake_copyright
+		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
+		dev-ros/ament_cmake_lint_cmake
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-ros/ament_cmake_cpplint/Manifest b/dev-ros/ament_cmake_cpplint/Manifest
index 56cc9011a790..f55ca7a6c073 100644
--- a/dev-ros/ament_cmake_cpplint/Manifest
+++ b/dev-ros/ament_cmake_cpplint/Manifest
@@ -1,6 +1,8 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_cpplint-0.10.0.ebuild 1497 BLAKE2B afb97f6aa510db683fb58c335538ded3a01c7d2524839b34786a1e8ee9f970aaf4f535cb09a32ccec303c15f71c6ee0e4e62a6775032fa8a7391a00186d5f41b SHA512 c77eb75c3a6468e07ef03d21e31cc1314ac3f0122b2fe91e470717d4c108efa5ba9e210a2c30cd0e3b90250b4ea33d0d3a640424f8d80108bdc3702d1cc00237
+EBUILD ament_cmake_cpplint-0.10.1.ebuild 1497 BLAKE2B 26f65a47ff96981d769730c72be65bf89c789f9fc5b60674198086154c5b4199aef809161c57f63b77c53a4bd662e444d37929b83043bf78758f1118547c5b84 SHA512 1bde22b110f2365a11ffb704be940b98db6701fa1c15324dda65a183ce2ee480e5f7ecf3599b7d2b269f847b61fbc93f2b290b62063de604502221751ee92202
 EBUILD ament_cmake_cpplint-0.9.5.ebuild 1497 BLAKE2B afb97f6aa510db683fb58c335538ded3a01c7d2524839b34786a1e8ee9f970aaf4f535cb09a32ccec303c15f71c6ee0e4e62a6775032fa8a7391a00186d5f41b SHA512 c77eb75c3a6468e07ef03d21e31cc1314ac3f0122b2fe91e470717d4c108efa5ba9e210a2c30cd0e3b90250b4ea33d0d3a640424f8d80108bdc3702d1cc00237
 EBUILD ament_cmake_cpplint-9999.ebuild 1497 BLAKE2B afb97f6aa510db683fb58c335538ded3a01c7d2524839b34786a1e8ee9f970aaf4f535cb09a32ccec303c15f71c6ee0e4e62a6775032fa8a7391a00186d5f41b SHA512 c77eb75c3a6468e07ef03d21e31cc1314ac3f0122b2fe91e470717d4c108efa5ba9e210a2c30cd0e3b90250b4ea33d0d3a640424f8d80108bdc3702d1cc00237
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.10.1.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.10.1.ebuild
new file mode 100644
index 000000000000..b7bc58e1dcf7
--- /dev/null
+++ b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.10.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="CMake API for ament_cpplint to lint C / C++ code using cpplint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cpplint
+"
+DEPEND=""
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	test? (
+		dev-ros/ament_cmake_copyright
+		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
+		dev-ros/ament_cmake_lint_cmake
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-ros/ament_cmake_export_definitions/Manifest b/dev-ros/ament_cmake_export_definitions/Manifest
index 0ddf903d3679..1a35d047e4ae 100644
--- a/dev-ros/ament_cmake_export_definitions/Manifest
+++ b/dev-ros/ament_cmake_export_definitions/Manifest
@@ -2,9 +2,11 @@ DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
+DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 EBUILD ament_cmake_export_definitions-0.9.6.ebuild 1155 BLAKE2B 4997b26202eae3bef2595a4baa4129a624a56492957314a86506b817cff3091f324db22245d38234d7597e56ddc6e53b672800e3bdba13614b1ab78fecbfd4c8 SHA512 cf0569c2dea554d78c660227d59b28526f7b532b0a37542dcba679d0f4cd4a774d360ca037ea05414c4f89d48dbbbce125aecc726d8f78ba3ba5b7c3096f242f
 EBUILD ament_cmake_export_definitions-1.0.0.ebuild 1155 BLAKE2B 4997b26202eae3bef2595a4baa4129a624a56492957314a86506b817cff3091f324db22245d38234d7597e56ddc6e53b672800e3bdba13614b1ab78fecbfd4c8 SHA512 cf0569c2dea554d78c660227d59b28526f7b532b0a37542dcba679d0f4cd4a774d360ca037ea05414c4f89d48dbbbce125aecc726d8f78ba3ba5b7c3096f242f
 EBUILD ament_cmake_export_definitions-1.0.1.ebuild 1155 BLAKE2B 4997b26202eae3bef2595a4baa4129a624a56492957314a86506b817cff3091f324db22245d38234d7597e56ddc6e53b672800e3bdba13614b1ab78fecbfd4c8 SHA512 cf0569c2dea554d78c660227d59b28526f7b532b0a37542dcba679d0f4cd4a774d360ca037ea05414c4f89d48dbbbce125aecc726d8f78ba3ba5b7c3096f242f
 EBUILD ament_cmake_export_definitions-1.0.3.ebuild 1155 BLAKE2B fe4927a4e7f92b2e4db9092c2d55d2624f2a10c8b0eb72e3dcbdc7f3d579b327aef8979008c6750394cfa1ac87e50d3bad1fcce71c2ea53e10761b644b196067 SHA512 b996616ae7619b31272dd4fe31c82826d81061a308ee8049a92366f3e047f68d963ab846b7753bb170db7143f1ac7f0813c1a3cffd92b8859d126b5373e26264
+EBUILD ament_cmake_export_definitions-1.0.4.ebuild 1155 BLAKE2B fe4927a4e7f92b2e4db9092c2d55d2624f2a10c8b0eb72e3dcbdc7f3d579b327aef8979008c6750394cfa1ac87e50d3bad1fcce71c2ea53e10761b644b196067 SHA512 b996616ae7619b31272dd4fe31c82826d81061a308ee8049a92366f3e047f68d963ab846b7753bb170db7143f1ac7f0813c1a3cffd92b8859d126b5373e26264
 EBUILD ament_cmake_export_definitions-9999.ebuild 1155 BLAKE2B 4997b26202eae3bef2595a4baa4129a624a56492957314a86506b817cff3091f324db22245d38234d7597e56ddc6e53b672800e3bdba13614b1ab78fecbfd4c8 SHA512 cf0569c2dea554d78c660227d59b28526f7b532b0a37542dcba679d0f4cd4a774d360ca037ea05414c4f89d48dbbbce125aecc726d8f78ba3ba5b7c3096f242f
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.4.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.4.ebuild
new file mode 100644
index 000000000000..6ac3919b8389
--- /dev/null
+++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export definitions to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_dependencies/Manifest b/dev-ros/ament_cmake_export_dependencies/Manifest
index 071830019729..bdeb1319ecb3 100644
--- a/dev-ros/ament_cmake_export_dependencies/Manifest
+++ b/dev-ros/ament_cmake_export_dependencies/Manifest
@@ -2,9 +2,11 @@ DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
+DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 EBUILD ament_cmake_export_dependencies-0.9.6.ebuild 1196 BLAKE2B aa76cd6782478190c43f8f3e35d53a1d4c5b6e58ce2db0bca28850a595507e948130fc5de4b3e30b8ce5ec6023e686caafdc174a93498be2e9e441dca04db558 SHA512 5e55ee6b59f0894993b652d6ba7d4ac7dafa5a7d48c7ddb04fdf081e254ac76b2083dd131bf5c02000cb20e8576962c6bff6f82f08170514f1e75414da768eaa
 EBUILD ament_cmake_export_dependencies-1.0.0.ebuild 1196 BLAKE2B aa76cd6782478190c43f8f3e35d53a1d4c5b6e58ce2db0bca28850a595507e948130fc5de4b3e30b8ce5ec6023e686caafdc174a93498be2e9e441dca04db558 SHA512 5e55ee6b59f0894993b652d6ba7d4ac7dafa5a7d48c7ddb04fdf081e254ac76b2083dd131bf5c02000cb20e8576962c6bff6f82f08170514f1e75414da768eaa
 EBUILD ament_cmake_export_dependencies-1.0.1.ebuild 1196 BLAKE2B aa76cd6782478190c43f8f3e35d53a1d4c5b6e58ce2db0bca28850a595507e948130fc5de4b3e30b8ce5ec6023e686caafdc174a93498be2e9e441dca04db558 SHA512 5e55ee6b59f0894993b652d6ba7d4ac7dafa5a7d48c7ddb04fdf081e254ac76b2083dd131bf5c02000cb20e8576962c6bff6f82f08170514f1e75414da768eaa
 EBUILD ament_cmake_export_dependencies-1.0.3.ebuild 1196 BLAKE2B 18fe4de959fbfdb24491dbe9ef058ca04cd610a8ea46067f2f0fe10793bf45c81009ef60ab720066f57ad52a9386cb3744b1019cc511348690394f51e050d82d SHA512 9bac47b8d95a71ce5d1fcacd10b728e20357b384344e88aebcef0023f7ff7f4261f6f01d4325735b87e5c2c8e4bfb087e59b7ac6b3c0a4ee03decbf093b4671d
+EBUILD ament_cmake_export_dependencies-1.0.4.ebuild 1196 BLAKE2B 18fe4de959fbfdb24491dbe9ef058ca04cd610a8ea46067f2f0fe10793bf45c81009ef60ab720066f57ad52a9386cb3744b1019cc511348690394f51e050d82d SHA512 9bac47b8d95a71ce5d1fcacd10b728e20357b384344e88aebcef0023f7ff7f4261f6f01d4325735b87e5c2c8e4bfb087e59b7ac6b3c0a4ee03decbf093b4671d
 EBUILD ament_cmake_export_dependencies-9999.ebuild 1196 BLAKE2B aa76cd6782478190c43f8f3e35d53a1d4c5b6e58ce2db0bca28850a595507e948130fc5de4b3e30b8ce5ec6023e686caafdc174a93498be2e9e441dca04db558 SHA512 5e55ee6b59f0894993b652d6ba7d4ac7dafa5a7d48c7ddb04fdf081e254ac76b2083dd131bf5c02000cb20e8576962c6bff6f82f08170514f1e75414da768eaa
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.4.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.4.ebuild
new file mode 100644
index 000000000000..6713c25e3394
--- /dev/null
+++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export dependencies to downstream packages in the ament buildsystem in CMake"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_include_directories/Manifest b/dev-ros/ament_cmake_export_include_directories/Manifest
index 600d429eb906..0ca90fea78ff 100644
--- a/dev-ros/ament_cmake_export_include_directories/Manifest
+++ b/dev-ros/ament_cmake_export_include_directories/Manifest
@@ -2,9 +2,11 @@ DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
+DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 EBUILD ament_cmake_export_include_directories-0.9.6.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
 EBUILD ament_cmake_export_include_directories-1.0.0.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
 EBUILD ament_cmake_export_include_directories-1.0.1.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
 EBUILD ament_cmake_export_include_directories-1.0.3.ebuild 1163 BLAKE2B 04a326d4c94dd1d4b0cf98388f6c7acacc88ef4cade7469a76d0410bfc987efbb717f61694042f48a36e18151a2bfa7a6ca9c133c175fd505182bd3e2f6b6580 SHA512 9f50373a331e62a6b43739c28a99a7511c7d2e187e4dddd0b4ad148c616ddcb4ed422fcb0fa5f87db287b365cb8070087a131a40d6726c65e0e0d70e3a7c2753
+EBUILD ament_cmake_export_include_directories-1.0.4.ebuild 1163 BLAKE2B 04a326d4c94dd1d4b0cf98388f6c7acacc88ef4cade7469a76d0410bfc987efbb717f61694042f48a36e18151a2bfa7a6ca9c133c175fd505182bd3e2f6b6580 SHA512 9f50373a331e62a6b43739c28a99a7511c7d2e187e4dddd0b4ad148c616ddcb4ed422fcb0fa5f87db287b365cb8070087a131a40d6726c65e0e0d70e3a7c2753
 EBUILD ament_cmake_export_include_directories-9999.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.4.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.4.ebuild
new file mode 100644
index 000000000000..5c7886431d21
--- /dev/null
+++ b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_interfaces/Manifest b/dev-ros/ament_cmake_export_interfaces/Manifest
index ddb5304a235b..a85a1bb419b5 100644
--- a/dev-ros/ament_cmake_export_interfaces/Manifest
+++ b/dev-ros/ament_cmake_export_interfaces/Manifest
@@ -2,9 +2,11 @@ DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
+DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 EBUILD ament_cmake_export_interfaces-0.9.6.ebuild 1192 BLAKE2B a31e72f4ee4a4d0882481d7fc2667e8facf73736b68b5b82017bfb7913d46e2210113dd961110991c8263c5bb038fb4eea9a19d9d0bb8fb33905ce0bd55b2ab1 SHA512 6216e585570926389694b3c4c45f3a3fb88ab0f620294a209f2920fb47e676e16850348a4cab2f2f7530855d7f287f727ddf483918fb3191d26879446f0a6ed9
 EBUILD ament_cmake_export_interfaces-1.0.0.ebuild 1192 BLAKE2B a31e72f4ee4a4d0882481d7fc2667e8facf73736b68b5b82017bfb7913d46e2210113dd961110991c8263c5bb038fb4eea9a19d9d0bb8fb33905ce0bd55b2ab1 SHA512 6216e585570926389694b3c4c45f3a3fb88ab0f620294a209f2920fb47e676e16850348a4cab2f2f7530855d7f287f727ddf483918fb3191d26879446f0a6ed9
 EBUILD ament_cmake_export_interfaces-1.0.1.ebuild 1192 BLAKE2B a31e72f4ee4a4d0882481d7fc2667e8facf73736b68b5b82017bfb7913d46e2210113dd961110991c8263c5bb038fb4eea9a19d9d0bb8fb33905ce0bd55b2ab1 SHA512 6216e585570926389694b3c4c45f3a3fb88ab0f620294a209f2920fb47e676e16850348a4cab2f2f7530855d7f287f727ddf483918fb3191d26879446f0a6ed9
 EBUILD ament_cmake_export_interfaces-1.0.3.ebuild 1192 BLAKE2B f097ab854c36d7ef18cea60524ae07ab857ddea8eb9e20c0cc0ea91efec15071cf13089c865fa1e21ec7447d14e9a109f452ae999a5865ee56488e2042ad909b SHA512 073f0c38ec1a57d8fd9c0622edb789abf1d24865c841ceee89030f6c84953887ec42b2d4a5f669c7a79c63ebdd57b73e645e4ac65034e63cecd7af7e81973055
+EBUILD ament_cmake_export_interfaces-1.0.4.ebuild 1192 BLAKE2B f097ab854c36d7ef18cea60524ae07ab857ddea8eb9e20c0cc0ea91efec15071cf13089c865fa1e21ec7447d14e9a109f452ae999a5865ee56488e2042ad909b SHA512 073f0c38ec1a57d8fd9c0622edb789abf1d24865c841ceee89030f6c84953887ec42b2d4a5f669c7a79c63ebdd57b73e645e4ac65034e63cecd7af7e81973055
 EBUILD ament_cmake_export_interfaces-9999.ebuild 1192 BLAKE2B a31e72f4ee4a4d0882481d7fc2667e8facf73736b68b5b82017bfb7913d46e2210113dd961110991c8263c5bb038fb4eea9a19d9d0bb8fb33905ce0bd55b2ab1 SHA512 6216e585570926389694b3c4c45f3a3fb88ab0f620294a209f2920fb47e676e16850348a4cab2f2f7530855d7f287f727ddf483918fb3191d26879446f0a6ed9
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.4.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.4.ebuild
new file mode 100644
index 000000000000..45106f08c2c2
--- /dev/null
+++ b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export interfaces to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_export_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_libraries/Manifest b/dev-ros/ament_cmake_export_libraries/Manifest
index 7c879f0a0bc0..f6972fe5c7b5 100644
--- a/dev-ros/ament_cmake_export_libraries/Manifest
+++ b/dev-ros/ament_cmake_export_libraries/Manifest
@@ -2,9 +2,11 @@ DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
+DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 EBUILD ament_cmake_export_libraries-0.9.6.ebuild 1153 BLAKE2B 0e965df391989bd92a92dd5083616a185229fa147f289aa8de78ae30740a29b77be4d3cd618f37324baab31616f59b29b1358233ff936e49db51edaa44faa81d SHA512 2686fe869b5b1b89f4b70b449a142098a5d8b05b55576a402873db009fed2d9173e13056147b69cc80920fe30fa3488b7c06188aa0384b32c5532a7396f917d3
 EBUILD ament_cmake_export_libraries-1.0.0.ebuild 1153 BLAKE2B 0e965df391989bd92a92dd5083616a185229fa147f289aa8de78ae30740a29b77be4d3cd618f37324baab31616f59b29b1358233ff936e49db51edaa44faa81d SHA512 2686fe869b5b1b89f4b70b449a142098a5d8b05b55576a402873db009fed2d9173e13056147b69cc80920fe30fa3488b7c06188aa0384b32c5532a7396f917d3
 EBUILD ament_cmake_export_libraries-1.0.1.ebuild 1153 BLAKE2B 0e965df391989bd92a92dd5083616a185229fa147f289aa8de78ae30740a29b77be4d3cd618f37324baab31616f59b29b1358233ff936e49db51edaa44faa81d SHA512 2686fe869b5b1b89f4b70b449a142098a5d8b05b55576a402873db009fed2d9173e13056147b69cc80920fe30fa3488b7c06188aa0384b32c5532a7396f917d3
 EBUILD ament_cmake_export_libraries-1.0.3.ebuild 1153 BLAKE2B 23f5c14836ae4cf1d3e4502a7e5fcc78034149d490212fb4857bbbdf8db2309636c4a9f368d3382c919d61915b7996ff520dd42c4136bb5d703030908f608652 SHA512 9ed911a2a1656b6590285cb7d74f8a94fc65a56363155fe9e2be9954ed972a184d3f3dd112919b7bdc66b0cb77ca7bcce185ffc1a42753250f07b318fcc39601
+EBUILD ament_cmake_export_libraries-1.0.4.ebuild 1153 BLAKE2B 23f5c14836ae4cf1d3e4502a7e5fcc78034149d490212fb4857bbbdf8db2309636c4a9f368d3382c919d61915b7996ff520dd42c4136bb5d703030908f608652 SHA512 9ed911a2a1656b6590285cb7d74f8a94fc65a56363155fe9e2be9954ed972a184d3f3dd112919b7bdc66b0cb77ca7bcce185ffc1a42753250f07b318fcc39601
 EBUILD ament_cmake_export_libraries-9999.ebuild 1153 BLAKE2B 0e965df391989bd92a92dd5083616a185229fa147f289aa8de78ae30740a29b77be4d3cd618f37324baab31616f59b29b1358233ff936e49db51edaa44faa81d SHA512 2686fe869b5b1b89f4b70b449a142098a5d8b05b55576a402873db009fed2d9173e13056147b69cc80920fe30fa3488b7c06188aa0384b32c5532a7396f917d3
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.4.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.4.ebuild
new file mode 100644
index 000000000000..d4c3c7ec2f73
--- /dev/null
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export libraries to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_link_flags/Manifest b/dev-ros/ament_cmake_export_link_flags/Manifest
index 24617cd54888..0a3bb073e8f5 100644
--- a/dev-ros/ament_cmake_export_link_flags/Manifest
+++ b/dev-ros/ament_cmake_export_link_flags/Manifest
@@ -2,9 +2,11 @@ DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
+DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 EBUILD ament_cmake_export_link_flags-0.9.6.ebuild 1154 BLAKE2B 0dea0c9e936377232321181b16855767842f15e91b33f3c121fa6fbe3ec957e96d227d09287a5cbf1968bacb156676badfe4ed221eeec42a712d3ea732479683 SHA512 28cdb8b9391cb9023f707967c566dbcd1ba01c8a2b09505ffcb8bc0547c490bb2e2f6952a0ca3e3e35880275d7fd99f3303664f908b6635c76b8fa76169c7f3b
 EBUILD ament_cmake_export_link_flags-1.0.0.ebuild 1154 BLAKE2B 0dea0c9e936377232321181b16855767842f15e91b33f3c121fa6fbe3ec957e96d227d09287a5cbf1968bacb156676badfe4ed221eeec42a712d3ea732479683 SHA512 28cdb8b9391cb9023f707967c566dbcd1ba01c8a2b09505ffcb8bc0547c490bb2e2f6952a0ca3e3e35880275d7fd99f3303664f908b6635c76b8fa76169c7f3b
 EBUILD ament_cmake_export_link_flags-1.0.1.ebuild 1154 BLAKE2B 0dea0c9e936377232321181b16855767842f15e91b33f3c121fa6fbe3ec957e96d227d09287a5cbf1968bacb156676badfe4ed221eeec42a712d3ea732479683 SHA512 28cdb8b9391cb9023f707967c566dbcd1ba01c8a2b09505ffcb8bc0547c490bb2e2f6952a0ca3e3e35880275d7fd99f3303664f908b6635c76b8fa76169c7f3b
 EBUILD ament_cmake_export_link_flags-1.0.3.ebuild 1154 BLAKE2B bb0a52daf587ad0bbd12084092ade69bbdbb26079c1391004d07d7990bbc14700e43a177719b5dcfc14d14483f33f07e7cd0b96f6c6a33ff39e50728bccc76d6 SHA512 bea1f127f5b57ade409f17bbe9a8bfabc133d09dedf285b627fbbbbaffd7e4762ecf601b22eb70200d473782b51aa809619ec808842f2870980be4a872620764
+EBUILD ament_cmake_export_link_flags-1.0.4.ebuild 1154 BLAKE2B bb0a52daf587ad0bbd12084092ade69bbdbb26079c1391004d07d7990bbc14700e43a177719b5dcfc14d14483f33f07e7cd0b96f6c6a33ff39e50728bccc76d6 SHA512 bea1f127f5b57ade409f17bbe9a8bfabc133d09dedf285b627fbbbbaffd7e4762ecf601b22eb70200d473782b51aa809619ec808842f2870980be4a872620764
 EBUILD ament_cmake_export_link_flags-9999.ebuild 1154 BLAKE2B 0dea0c9e936377232321181b16855767842f15e91b33f3c121fa6fbe3ec957e96d227d09287a5cbf1968bacb156676badfe4ed221eeec42a712d3ea732479683 SHA512 28cdb8b9391cb9023f707967c566dbcd1ba01c8a2b09505ffcb8bc0547c490bb2e2f6952a0ca3e3e35880275d7fd99f3303664f908b6635c76b8fa76169c7f3b
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.4.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.4.ebuild
new file mode 100644
index 000000000000..a448d65732b8
--- /dev/null
+++ b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export link flags to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_targets/Manifest b/dev-ros/ament_cmake_export_targets/Manifest
index 35ef3dddf0e4..e0e704373edf 100644
--- a/dev-ros/ament_cmake_export_targets/Manifest
+++ b/dev-ros/ament_cmake_export_targets/Manifest
@@ -2,9 +2,11 @@ DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
+DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 EBUILD ament_cmake_export_targets-0.9.6.ebuild 1189 BLAKE2B fd9b5e87e6d47b35c3683d888ee96178cc0ab09726a556952d9980d3b191a68277f0f8ef6bacdf8309041efbdffecc9ad6228a0671f80ec0e401f7f5718dc2bd SHA512 e222d4075bb2ec2be2caa3f4725aacfd6ded24e1cb2eb389f5f7e76228ae00f863a36d954ce50ed2df3a58a3a12d981bc7ceae16bbe080acdb9d192d1777a3c0
 EBUILD ament_cmake_export_targets-1.0.0.ebuild 1189 BLAKE2B fd9b5e87e6d47b35c3683d888ee96178cc0ab09726a556952d9980d3b191a68277f0f8ef6bacdf8309041efbdffecc9ad6228a0671f80ec0e401f7f5718dc2bd SHA512 e222d4075bb2ec2be2caa3f4725aacfd6ded24e1cb2eb389f5f7e76228ae00f863a36d954ce50ed2df3a58a3a12d981bc7ceae16bbe080acdb9d192d1777a3c0
 EBUILD ament_cmake_export_targets-1.0.1.ebuild 1189 BLAKE2B fd9b5e87e6d47b35c3683d888ee96178cc0ab09726a556952d9980d3b191a68277f0f8ef6bacdf8309041efbdffecc9ad6228a0671f80ec0e401f7f5718dc2bd SHA512 e222d4075bb2ec2be2caa3f4725aacfd6ded24e1cb2eb389f5f7e76228ae00f863a36d954ce50ed2df3a58a3a12d981bc7ceae16bbe080acdb9d192d1777a3c0
 EBUILD ament_cmake_export_targets-1.0.3.ebuild 1189 BLAKE2B 91f3089c548ef6a95a07589619ab01f830d38bff2888a3b525c2b560ab7bb87c3738262f5c2dc59c55374ee14029fba940cc256afa08aca9e97ce3641001d017 SHA512 fa9d76db88977007900f8143d11fa38618c1f5d56b629f4383de46b2311983cb39d90c9d8a79e6454d4cc88306455650623cf945121fd9afa596265890d08faf
+EBUILD ament_cmake_export_targets-1.0.4.ebuild 1189 BLAKE2B 91f3089c548ef6a95a07589619ab01f830d38bff2888a3b525c2b560ab7bb87c3738262f5c2dc59c55374ee14029fba940cc256afa08aca9e97ce3641001d017 SHA512 fa9d76db88977007900f8143d11fa38618c1f5d56b629f4383de46b2311983cb39d90c9d8a79e6454d4cc88306455650623cf945121fd9afa596265890d08faf
 EBUILD ament_cmake_export_targets-9999.ebuild 1189 BLAKE2B fd9b5e87e6d47b35c3683d888ee96178cc0ab09726a556952d9980d3b191a68277f0f8ef6bacdf8309041efbdffecc9ad6228a0671f80ec0e401f7f5718dc2bd SHA512 e222d4075bb2ec2be2caa3f4725aacfd6ded24e1cb2eb389f5f7e76228ae00f863a36d954ce50ed2df3a58a3a12d981bc7ceae16bbe080acdb9d192d1777a3c0
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.4.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.4.ebuild
new file mode 100644
index 000000000000..ad4a03f26007
--- /dev/null
+++ b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export targets to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_export_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_gmock/Manifest b/dev-ros/ament_cmake_gmock/Manifest
index 0c1404e1942e..e980b78e1790 100644
--- a/dev-ros/ament_cmake_gmock/Manifest
+++ b/dev-ros/ament_cmake_gmock/Manifest
@@ -1,8 +1,10 @@
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
+DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 EBUILD ament_cmake_gmock-1.0.0.ebuild 1156 BLAKE2B c87d1774065994503291eca280dd6bb3e11ac3df3216e040990110d684824877c0bbb4a478e1c34d622f9e7ea14ae3e33ac8a5b93a9373abe389b6992aaaf7c3 SHA512 215bf70e9ceb21398d648b8d97472b83184359a2508f1f98c87f4a393beb453f62b243951b278b9540712a0468f7b97f9cb19dd4d331e1eba137e94b10d09ba7
 EBUILD ament_cmake_gmock-1.0.1.ebuild 1156 BLAKE2B c87d1774065994503291eca280dd6bb3e11ac3df3216e040990110d684824877c0bbb4a478e1c34d622f9e7ea14ae3e33ac8a5b93a9373abe389b6992aaaf7c3 SHA512 215bf70e9ceb21398d648b8d97472b83184359a2508f1f98c87f4a393beb453f62b243951b278b9540712a0468f7b97f9cb19dd4d331e1eba137e94b10d09ba7
 EBUILD ament_cmake_gmock-1.0.3.ebuild 1156 BLAKE2B 0774dd783bdaa7bf75e333765f2759216640bcb15e61f574ae439ade4385f90e7b545edc6fd51ba1ba3f21aeb1a340c314e4005d222abd992825c23d8e5342f9 SHA512 be9eae5c429701f6ab79b61800a3c973a28ff21e1d5648ef1902609a636c2e1e38abc20a74675fc0004634f5594ff1303a1b92050c578f0ec3ce1182c82e291c
+EBUILD ament_cmake_gmock-1.0.4.ebuild 1156 BLAKE2B 0774dd783bdaa7bf75e333765f2759216640bcb15e61f574ae439ade4385f90e7b545edc6fd51ba1ba3f21aeb1a340c314e4005d222abd992825c23d8e5342f9 SHA512 be9eae5c429701f6ab79b61800a3c973a28ff21e1d5648ef1902609a636c2e1e38abc20a74675fc0004634f5594ff1303a1b92050c578f0ec3ce1182c82e291c
 EBUILD ament_cmake_gmock-9999.ebuild 1156 BLAKE2B c87d1774065994503291eca280dd6bb3e11ac3df3216e040990110d684824877c0bbb4a478e1c34d622f9e7ea14ae3e33ac8a5b93a9373abe389b6992aaaf7c3 SHA512 215bf70e9ceb21398d648b8d97472b83184359a2508f1f98c87f4a393beb453f62b243951b278b9540712a0468f7b97f9cb19dd4d331e1eba137e94b10d09ba7
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.4.ebuild b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.4.ebuild
new file mode 100644
index 000000000000..aaa2ff2d8833
--- /dev/null
+++ b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add Google mock-based tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_gtest/Manifest b/dev-ros/ament_cmake_gtest/Manifest
index 3e6e327f577a..c786e0645c5b 100644
--- a/dev-ros/ament_cmake_gtest/Manifest
+++ b/dev-ros/ament_cmake_gtest/Manifest
@@ -2,9 +2,11 @@ DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
+DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 EBUILD ament_cmake_gtest-0.9.6.ebuild 1150 BLAKE2B 74e8c2f0f9e7d6f0a3b1e3f9ab99b72a602ed394a26465093c99ea199fb969626ba9ae90e5e876b789487fae9cb2d41843c60c3cf8dd8e109c0d318669cd3528 SHA512 ba1df600f56bb1d86e1e3a30ec60d0fc72607d5be023d42c72717280efe366620d98bb9887093152b30a35bba30a5cad4da6091c105f2fd609a8d451fed46268
 EBUILD ament_cmake_gtest-1.0.0.ebuild 1150 BLAKE2B 74e8c2f0f9e7d6f0a3b1e3f9ab99b72a602ed394a26465093c99ea199fb969626ba9ae90e5e876b789487fae9cb2d41843c60c3cf8dd8e109c0d318669cd3528 SHA512 ba1df600f56bb1d86e1e3a30ec60d0fc72607d5be023d42c72717280efe366620d98bb9887093152b30a35bba30a5cad4da6091c105f2fd609a8d451fed46268
 EBUILD ament_cmake_gtest-1.0.1.ebuild 1150 BLAKE2B 74e8c2f0f9e7d6f0a3b1e3f9ab99b72a602ed394a26465093c99ea199fb969626ba9ae90e5e876b789487fae9cb2d41843c60c3cf8dd8e109c0d318669cd3528 SHA512 ba1df600f56bb1d86e1e3a30ec60d0fc72607d5be023d42c72717280efe366620d98bb9887093152b30a35bba30a5cad4da6091c105f2fd609a8d451fed46268
 EBUILD ament_cmake_gtest-1.0.3.ebuild 1150 BLAKE2B 0ae36f07500fc03d411ab43694eb11820c28c847d7854f8552d5e3396e303c73bcd59f53c08175b35a974b1ea0d5b107db697e4a85a15cd61ff38b2152f826db SHA512 98523573b07616f80c725996427053fa8e661a938bc886c06c72b9b4a81bba3bcb9cfd9f855d3cdca79f6208643910716f93682f006c9715ae350cfd77645887
+EBUILD ament_cmake_gtest-1.0.4.ebuild 1150 BLAKE2B 0ae36f07500fc03d411ab43694eb11820c28c847d7854f8552d5e3396e303c73bcd59f53c08175b35a974b1ea0d5b107db697e4a85a15cd61ff38b2152f826db SHA512 98523573b07616f80c725996427053fa8e661a938bc886c06c72b9b4a81bba3bcb9cfd9f855d3cdca79f6208643910716f93682f006c9715ae350cfd77645887
 EBUILD ament_cmake_gtest-9999.ebuild 1150 BLAKE2B 74e8c2f0f9e7d6f0a3b1e3f9ab99b72a602ed394a26465093c99ea199fb969626ba9ae90e5e876b789487fae9cb2d41843c60c3cf8dd8e109c0d318669cd3528 SHA512 ba1df600f56bb1d86e1e3a30ec60d0fc72607d5be023d42c72717280efe366620d98bb9887093152b30a35bba30a5cad4da6091c105f2fd609a8d451fed46268
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.4.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.4.ebuild
new file mode 100644
index 000000000000..19e8b3f3f026
--- /dev/null
+++ b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add gtest-based tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_include_directories/Manifest b/dev-ros/ament_cmake_include_directories/Manifest
index ac08aa8b4fdc..6cbe45eaf06a 100644
--- a/dev-ros/ament_cmake_include_directories/Manifest
+++ b/dev-ros/ament_cmake_include_directories/Manifest
@@ -2,9 +2,11 @@ DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
+DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 EBUILD ament_cmake_include_directories-0.9.6.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
 EBUILD ament_cmake_include_directories-1.0.0.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
 EBUILD ament_cmake_include_directories-1.0.1.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
 EBUILD ament_cmake_include_directories-1.0.3.ebuild 1163 BLAKE2B 04a326d4c94dd1d4b0cf98388f6c7acacc88ef4cade7469a76d0410bfc987efbb717f61694042f48a36e18151a2bfa7a6ca9c133c175fd505182bd3e2f6b6580 SHA512 9f50373a331e62a6b43739c28a99a7511c7d2e187e4dddd0b4ad148c616ddcb4ed422fcb0fa5f87db287b365cb8070087a131a40d6726c65e0e0d70e3a7c2753
+EBUILD ament_cmake_include_directories-1.0.4.ebuild 1163 BLAKE2B 04a326d4c94dd1d4b0cf98388f6c7acacc88ef4cade7469a76d0410bfc987efbb717f61694042f48a36e18151a2bfa7a6ca9c133c175fd505182bd3e2f6b6580 SHA512 9f50373a331e62a6b43739c28a99a7511c7d2e187e4dddd0b4ad148c616ddcb4ed422fcb0fa5f87db287b365cb8070087a131a40d6726c65e0e0d70e3a7c2753
 EBUILD ament_cmake_include_directories-9999.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.4.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.4.ebuild
new file mode 100644
index 000000000000..5c7886431d21
--- /dev/null
+++ b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_libraries/Manifest b/dev-ros/ament_cmake_libraries/Manifest
index 47fe73e9e55f..93e1638c6cf9 100644
--- a/dev-ros/ament_cmake_libraries/Manifest
+++ b/dev-ros/ament_cmake_libraries/Manifest
@@ -2,9 +2,11 @@ DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
+DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 EBUILD ament_cmake_libraries-0.9.6.ebuild 1156 BLAKE2B 02b31003eabc18ab331de87e54ed0b051c982fed15df3ea70a849e7151022b8957bd51edc88ccffb6028c36028bcf4f1fb854ed8ab94c605177d800cb82d8ac3 SHA512 7ceb43c0e90bf0e6fa7e33517a5fb2f34b3175b59220d6d97a85374b6c1018d86b23d0100ccdaad977c41209f1feb27a2cf6217b37e395439b66da22b697a0cb
 EBUILD ament_cmake_libraries-1.0.0.ebuild 1156 BLAKE2B 02b31003eabc18ab331de87e54ed0b051c982fed15df3ea70a849e7151022b8957bd51edc88ccffb6028c36028bcf4f1fb854ed8ab94c605177d800cb82d8ac3 SHA512 7ceb43c0e90bf0e6fa7e33517a5fb2f34b3175b59220d6d97a85374b6c1018d86b23d0100ccdaad977c41209f1feb27a2cf6217b37e395439b66da22b697a0cb
 EBUILD ament_cmake_libraries-1.0.1.ebuild 1156 BLAKE2B 02b31003eabc18ab331de87e54ed0b051c982fed15df3ea70a849e7151022b8957bd51edc88ccffb6028c36028bcf4f1fb854ed8ab94c605177d800cb82d8ac3 SHA512 7ceb43c0e90bf0e6fa7e33517a5fb2f34b3175b59220d6d97a85374b6c1018d86b23d0100ccdaad977c41209f1feb27a2cf6217b37e395439b66da22b697a0cb
 EBUILD ament_cmake_libraries-1.0.3.ebuild 1156 BLAKE2B 09a82757642e296546760943547eaa057b0e87b6ef3b63f7073bebb3bf814a100642692b43e0c7a22a37dbe0f04b2423b2927dfecab25482c2b504dbba1cd82d SHA512 f0c7b2def8ce644881a53369a7d68f7ae0eb869186330b125f4826eb96662f782a6988edca96886593a5d9ee196e399ddcf7ac1567fc2dd61abb8c9f6e347273
+EBUILD ament_cmake_libraries-1.0.4.ebuild 1156 BLAKE2B 09a82757642e296546760943547eaa057b0e87b6ef3b63f7073bebb3bf814a100642692b43e0c7a22a37dbe0f04b2423b2927dfecab25482c2b504dbba1cd82d SHA512 f0c7b2def8ce644881a53369a7d68f7ae0eb869186330b125f4826eb96662f782a6988edca96886593a5d9ee196e399ddcf7ac1567fc2dd61abb8c9f6e347273
 EBUILD ament_cmake_libraries-9999.ebuild 1156 BLAKE2B 02b31003eabc18ab331de87e54ed0b051c982fed15df3ea70a849e7151022b8957bd51edc88ccffb6028c36028bcf4f1fb854ed8ab94c605177d800cb82d8ac3 SHA512 7ceb43c0e90bf0e6fa7e33517a5fb2f34b3175b59220d6d97a85374b6c1018d86b23d0100ccdaad977c41209f1feb27a2cf6217b37e395439b66da22b697a0cb
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.4.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.4.ebuild
new file mode 100644
index 000000000000..54072eb71aef
--- /dev/null
+++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The functionality to deduplicate libraries in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_lint_cmake/Manifest b/dev-ros/ament_cmake_lint_cmake/Manifest
index 3526d807a72c..6feeaaa84ac2 100644
--- a/dev-ros/ament_cmake_lint_cmake/Manifest
+++ b/dev-ros/ament_cmake_lint_cmake/Manifest
@@ -1,6 +1,8 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_lint_cmake-0.10.0.ebuild 1254 BLAKE2B 13f8562fe224b99a99bebcee8e6ec64172a9d222aaa4943ed2742d405a1e33b4916fa6d93897858e92e6c92d99a29ed52ab805c2eb372e1dd630456b9372c5bc SHA512 cb2793e0c927ea5c887885ad230af2c9c2c4f47388a0885379609a76963bf2da279eaf1b0df8a2dbb4c7fac23c33eeef8a88b8616409fcd435ec9e289bd052ba
+EBUILD ament_cmake_lint_cmake-0.10.1.ebuild 1254 BLAKE2B d34f035640125f0a67b23877a04c3f1b25fd42f77ba4703fa2ba479f08e5021a0dc42fc10064e30b2951eb247bd5f5eb997201894b15e441dc6bb0afa121ac7d SHA512 81d5de5ab1ad982d029e29d1a8c269f594a15ddbfad5909777ba48074b1d809894419bc9d4b011e912ef7280b3342e76141b1cf9a6522711ff1f244b9a434ed3
 EBUILD ament_cmake_lint_cmake-0.9.5.ebuild 1254 BLAKE2B 13f8562fe224b99a99bebcee8e6ec64172a9d222aaa4943ed2742d405a1e33b4916fa6d93897858e92e6c92d99a29ed52ab805c2eb372e1dd630456b9372c5bc SHA512 cb2793e0c927ea5c887885ad230af2c9c2c4f47388a0885379609a76963bf2da279eaf1b0df8a2dbb4c7fac23c33eeef8a88b8616409fcd435ec9e289bd052ba
 EBUILD ament_cmake_lint_cmake-9999.ebuild 1254 BLAKE2B 13f8562fe224b99a99bebcee8e6ec64172a9d222aaa4943ed2742d405a1e33b4916fa6d93897858e92e6c92d99a29ed52ab805c2eb372e1dd630456b9372c5bc SHA512 cb2793e0c927ea5c887885ad230af2c9c2c4f47388a0885379609a76963bf2da279eaf1b0df8a2dbb4c7fac23c33eeef8a88b8616409fcd435ec9e289bd052ba
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.10.1.ebuild b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.10.1.ebuild
new file mode 100644
index 000000000000..93474a6aa424
--- /dev/null
+++ b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.10.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The CMake API for ament_lint_cmake to lint CMake code using cmakelint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_lint_cmake
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]')
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_pytest/Manifest b/dev-ros/ament_cmake_pytest/Manifest
index 4ba3e442d360..7606fa944efd 100644
--- a/dev-ros/ament_cmake_pytest/Manifest
+++ b/dev-ros/ament_cmake_pytest/Manifest
@@ -1,8 +1,10 @@
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
+DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 EBUILD ament_cmake_pytest-1.0.0.ebuild 1158 BLAKE2B ee413315205e26fd9606f578f147db7f9dfd14d66b86ca29114555b9bd34c6347cb6681fecca18e60aa0e966139a06c922d0c6d848e8409e48181257b8307b52 SHA512 20920da8d699f6675887da88dff9fdb279eb2ac1da3d2436b7b970b07128aafc2f07dc747f30174f6441546152fb3c02b670abab8d7a60502c78079acff2fa8d
 EBUILD ament_cmake_pytest-1.0.1.ebuild 1158 BLAKE2B ee413315205e26fd9606f578f147db7f9dfd14d66b86ca29114555b9bd34c6347cb6681fecca18e60aa0e966139a06c922d0c6d848e8409e48181257b8307b52 SHA512 20920da8d699f6675887da88dff9fdb279eb2ac1da3d2436b7b970b07128aafc2f07dc747f30174f6441546152fb3c02b670abab8d7a60502c78079acff2fa8d
 EBUILD ament_cmake_pytest-1.0.3.ebuild 1158 BLAKE2B dd9d5e38b21a0396f21c6173f1ea12cb6d69dd057d072a65eb7a0ca8d7cb40a82db07fd4045d4d8bbb2216ff8aad52bfc3517344320501624b7e6138c3b34901 SHA512 ed015b26829a6846060534b123539d3cefaa23985cc6482f8193261644552d8c1989fc52f6242d240c27f9c17357b9c27a48389e1c6e161b17fd5c5ab256dd85
+EBUILD ament_cmake_pytest-1.0.4.ebuild 1158 BLAKE2B dd9d5e38b21a0396f21c6173f1ea12cb6d69dd057d072a65eb7a0ca8d7cb40a82db07fd4045d4d8bbb2216ff8aad52bfc3517344320501624b7e6138c3b34901 SHA512 ed015b26829a6846060534b123539d3cefaa23985cc6482f8193261644552d8c1989fc52f6242d240c27f9c17357b9c27a48389e1c6e161b17fd5c5ab256dd85
 EBUILD ament_cmake_pytest-9999.ebuild 1158 BLAKE2B ee413315205e26fd9606f578f147db7f9dfd14d66b86ca29114555b9bd34c6347cb6681fecca18e60aa0e966139a06c922d0c6d848e8409e48181257b8307b52 SHA512 20920da8d699f6675887da88dff9fdb279eb2ac1da3d2436b7b970b07128aafc2f07dc747f30174f6441546152fb3c02b670abab8d7a60502c78079acff2fa8d
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.4.ebuild b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.4.ebuild
new file mode 100644
index 000000000000..cefdc0d87e32
--- /dev/null
+++ b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to run Python tests using pytest in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_python/Manifest b/dev-ros/ament_cmake_python/Manifest
index 8d4016e89140..a32a55ca8df1 100644
--- a/dev-ros/ament_cmake_python/Manifest
+++ b/dev-ros/ament_cmake_python/Manifest
@@ -3,9 +3,11 @@ DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
+DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 EBUILD ament_cmake_python-0.9.6.ebuild 1179 BLAKE2B bd55579ab2cf0c7043498796caa5a8311ff3a040d31e1405091007d85228c369091c1cbd05403f1dab1146701105c22c04b946b7d1966fcb2bb2dbbb0fe047d4 SHA512 e706c7a8176da23881db3cc87b38b60bd5ef7da781ac129a4bfff0cdf2d867d55936a9fad42e06885884f3374dda21f6f94743faaec605de9eefbe18a3ecec93
 EBUILD ament_cmake_python-1.0.0.ebuild 1179 BLAKE2B bd55579ab2cf0c7043498796caa5a8311ff3a040d31e1405091007d85228c369091c1cbd05403f1dab1146701105c22c04b946b7d1966fcb2bb2dbbb0fe047d4 SHA512 e706c7a8176da23881db3cc87b38b60bd5ef7da781ac129a4bfff0cdf2d867d55936a9fad42e06885884f3374dda21f6f94743faaec605de9eefbe18a3ecec93
 EBUILD ament_cmake_python-1.0.1.ebuild 1179 BLAKE2B bd55579ab2cf0c7043498796caa5a8311ff3a040d31e1405091007d85228c369091c1cbd05403f1dab1146701105c22c04b946b7d1966fcb2bb2dbbb0fe047d4 SHA512 e706c7a8176da23881db3cc87b38b60bd5ef7da781ac129a4bfff0cdf2d867d55936a9fad42e06885884f3374dda21f6f94743faaec605de9eefbe18a3ecec93
 EBUILD ament_cmake_python-1.0.3.ebuild 1179 BLAKE2B 13acc47e826830c6b40846d5b8ac26277f48ba05d4161569491ce1b5a10915bb4580ff2dbc81412cddf64e0f989c334ebfec20402e40e021acc6b5bcee23e794 SHA512 70c6c04763d6a80391e22ba2b87b1d8f63c349f21ba8f168dfa3f932f0a5d9189151daee0637059c3f801b2a75bf817325eaeaff1a106b148c05c576da02fb2c
+EBUILD ament_cmake_python-1.0.4.ebuild 1179 BLAKE2B 13acc47e826830c6b40846d5b8ac26277f48ba05d4161569491ce1b5a10915bb4580ff2dbc81412cddf64e0f989c334ebfec20402e40e021acc6b5bcee23e794 SHA512 70c6c04763d6a80391e22ba2b87b1d8f63c349f21ba8f168dfa3f932f0a5d9189151daee0637059c3f801b2a75bf817325eaeaff1a106b148c05c576da02fb2c
 EBUILD ament_cmake_python-9999.ebuild 1179 BLAKE2B bd55579ab2cf0c7043498796caa5a8311ff3a040d31e1405091007d85228c369091c1cbd05403f1dab1146701105c22c04b946b7d1966fcb2bb2dbbb0fe047d4 SHA512 e706c7a8176da23881db3cc87b38b60bd5ef7da781ac129a4bfff0cdf2d867d55936a9fad42e06885884f3374dda21f6f94743faaec605de9eefbe18a3ecec93
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_python/ament_cmake_python-1.0.4.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.0.4.ebuild
new file mode 100644
index 000000000000..7f0a525558f8
--- /dev/null
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-1.0.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to use Python in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+PATCHES=( "${FILESDIR}/destdir.patch" )
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_target_dependencies/Manifest b/dev-ros/ament_cmake_target_dependencies/Manifest
index ae6ffdb57c53..297bfa4c1a3d 100644
--- a/dev-ros/ament_cmake_target_dependencies/Manifest
+++ b/dev-ros/ament_cmake_target_dependencies/Manifest
@@ -2,9 +2,11 @@ DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
+DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 EBUILD ament_cmake_target_dependencies-0.9.6.ebuild 1229 BLAKE2B 7c1768c9208e49b4e2a07cccf0323d84886882dc298e1cb2f49b79f26f2aa36cf01d3569ea083bb578fc32628df41831bf1b0acec0b12702cfabad6a90afd9a9 SHA512 268221ab833b39d7d943dd0d3022ef5d0fe5862adbfaed9f7a8878b21eb1393b2902d1c77c6b2c9f7c5ae92b2e9fc5b5e28787908bba7eca40635ef616989481
 EBUILD ament_cmake_target_dependencies-1.0.0.ebuild 1229 BLAKE2B 7c1768c9208e49b4e2a07cccf0323d84886882dc298e1cb2f49b79f26f2aa36cf01d3569ea083bb578fc32628df41831bf1b0acec0b12702cfabad6a90afd9a9 SHA512 268221ab833b39d7d943dd0d3022ef5d0fe5862adbfaed9f7a8878b21eb1393b2902d1c77c6b2c9f7c5ae92b2e9fc5b5e28787908bba7eca40635ef616989481
 EBUILD ament_cmake_target_dependencies-1.0.1.ebuild 1229 BLAKE2B 7c1768c9208e49b4e2a07cccf0323d84886882dc298e1cb2f49b79f26f2aa36cf01d3569ea083bb578fc32628df41831bf1b0acec0b12702cfabad6a90afd9a9 SHA512 268221ab833b39d7d943dd0d3022ef5d0fe5862adbfaed9f7a8878b21eb1393b2902d1c77c6b2c9f7c5ae92b2e9fc5b5e28787908bba7eca40635ef616989481
 EBUILD ament_cmake_target_dependencies-1.0.3.ebuild 1229 BLAKE2B ea03b9417f0ca29cb04318e213b4d02c5f455dacccbae3aed3248a56def5f0825fdf58d88b2b12ca0aae8f298b0b9d718db9c516efce6cebf4b089f062041bf9 SHA512 167b693e391cf2dc49a0a0a4a482eeef1bc53047331fc19b1636b5b413ba637e78ed270038d9e723abf6a9bb67d52b46c524aed4d732f16932bca5d7026a1ae5
+EBUILD ament_cmake_target_dependencies-1.0.4.ebuild 1229 BLAKE2B ea03b9417f0ca29cb04318e213b4d02c5f455dacccbae3aed3248a56def5f0825fdf58d88b2b12ca0aae8f298b0b9d718db9c516efce6cebf4b089f062041bf9 SHA512 167b693e391cf2dc49a0a0a4a482eeef1bc53047331fc19b1636b5b413ba637e78ed270038d9e723abf6a9bb67d52b46c524aed4d732f16932bca5d7026a1ae5
 EBUILD ament_cmake_target_dependencies-9999.ebuild 1229 BLAKE2B 7c1768c9208e49b4e2a07cccf0323d84886882dc298e1cb2f49b79f26f2aa36cf01d3569ea083bb578fc32628df41831bf1b0acec0b12702cfabad6a90afd9a9 SHA512 268221ab833b39d7d943dd0d3022ef5d0fe5862adbfaed9f7a8878b21eb1393b2902d1c77c6b2c9f7c5ae92b2e9fc5b5e28787908bba7eca40635ef616989481
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.4.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.4.ebuild
new file mode 100644
index 000000000000..034cb6e5b257
--- /dev/null
+++ b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Add defs, include dirs and libs to a target in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_include_directories
+	dev-ros/ament_cmake_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_test/Manifest b/dev-ros/ament_cmake_test/Manifest
index 56b5f95cb406..4da0d126a12e 100644
--- a/dev-ros/ament_cmake_test/Manifest
+++ b/dev-ros/ament_cmake_test/Manifest
@@ -2,9 +2,11 @@ DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
+DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 EBUILD ament_cmake_test-0.9.6.ebuild 1228 BLAKE2B fda231a83e47e9306552d0b3ca2e98b74a838f66e241218a01fe4d9b071b2886dc187b4f078ccdb2aea8414c1e2e5367bbee966360acbf4fdfe902fac810f3a5 SHA512 ba3574bae3f6cf78d92ac513e30f70da3fd8fca369d86b4d1f76435f92ca45e4e38d25b9eab175bc8549786e67b6d65e1ad787bf34663691fbc211e10406691c
 EBUILD ament_cmake_test-1.0.0.ebuild 1228 BLAKE2B fda231a83e47e9306552d0b3ca2e98b74a838f66e241218a01fe4d9b071b2886dc187b4f078ccdb2aea8414c1e2e5367bbee966360acbf4fdfe902fac810f3a5 SHA512 ba3574bae3f6cf78d92ac513e30f70da3fd8fca369d86b4d1f76435f92ca45e4e38d25b9eab175bc8549786e67b6d65e1ad787bf34663691fbc211e10406691c
 EBUILD ament_cmake_test-1.0.1.ebuild 1228 BLAKE2B fda231a83e47e9306552d0b3ca2e98b74a838f66e241218a01fe4d9b071b2886dc187b4f078ccdb2aea8414c1e2e5367bbee966360acbf4fdfe902fac810f3a5 SHA512 ba3574bae3f6cf78d92ac513e30f70da3fd8fca369d86b4d1f76435f92ca45e4e38d25b9eab175bc8549786e67b6d65e1ad787bf34663691fbc211e10406691c
 EBUILD ament_cmake_test-1.0.3.ebuild 1228 BLAKE2B ea35e40adec01965f2d97ad01b45f6ee97fb7456abdedab7176491f14af9e48e1ba4ea098f7fc44319978083c89553bef5e49528f1c7804f2006a94f430b1ae1 SHA512 f11ada814f8dcc381c473cc340aede0c321c66f0a5177daf496a5c8e42daefbe800a04f75ed4f4c39ea654b122b830a55c70f7748c1f66605757f4b6bff5dfc8
+EBUILD ament_cmake_test-1.0.4.ebuild 1228 BLAKE2B ea35e40adec01965f2d97ad01b45f6ee97fb7456abdedab7176491f14af9e48e1ba4ea098f7fc44319978083c89553bef5e49528f1c7804f2006a94f430b1ae1 SHA512 f11ada814f8dcc381c473cc340aede0c321c66f0a5177daf496a5c8e42daefbe800a04f75ed4f4c39ea654b122b830a55c70f7748c1f66605757f4b6bff5dfc8
 EBUILD ament_cmake_test-9999.ebuild 1228 BLAKE2B fda231a83e47e9306552d0b3ca2e98b74a838f66e241218a01fe4d9b071b2886dc187b4f078ccdb2aea8414c1e2e5367bbee966360acbf4fdfe902fac810f3a5 SHA512 ba3574bae3f6cf78d92ac513e30f70da3fd8fca369d86b4d1f76435f92ca45e4e38d25b9eab175bc8549786e67b6d65e1ad787bf34663691fbc211e10406691c
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_test/ament_cmake_test-1.0.4.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-1.0.4.ebuild
new file mode 100644
index 000000000000..0649041487a2
--- /dev/null
+++ b/dev-ros/ament_cmake_test/ament_cmake_test-1.0.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+DEPEND="
+	dev-ros/ament_cmake_core
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-ros/ament_cmake_python
+	${PYTHON_DEPS}
+"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	python_foreach_impl cmake_src_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	python_foreach_impl cmake_src_test
+}
+
+src_install() {
+	python_foreach_impl cmake_src_install
+	python_foreach_impl python_optimize
+}
diff --git a/dev-ros/ament_cmake_uncrustify/Manifest b/dev-ros/ament_cmake_uncrustify/Manifest
index 6bf21541d21e..9e03d7695df2 100644
--- a/dev-ros/ament_cmake_uncrustify/Manifest
+++ b/dev-ros/ament_cmake_uncrustify/Manifest
@@ -1,6 +1,8 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_uncrustify-0.10.0.ebuild 1511 BLAKE2B 7ac9f39d3b46d3f919ef3b19b8c751568aeeca04a02937b5bc2524df065cd1803fd2283bffaeb3692a70b6a1057b9882a99310d2975108c77cae75228b789ae5 SHA512 2f902e897196006df8fcf882c9a9876f6aba7bf919cda7c3e9797acf09a7d5003e44e415132540c56818b9325ea6d17cf9c1edff2dc09ba88ac7827406bc5408
+EBUILD ament_cmake_uncrustify-0.10.1.ebuild 1511 BLAKE2B 4ae62c7d3ab5932cd82c92db21dff087881294fe8ad9c240bb2c0c736190272e77e5081f30d5566db236a5fe3416903c2489d5c50c9e7d686b3c404bc2252e4d SHA512 445f4e300753d31be081aeba7111633836c7d2b57d28c861d0b32482f70dc576a46ed6223c565754cf907ccc1b7546bac52b2aa65649dfa52e4a9d3e79c97975
 EBUILD ament_cmake_uncrustify-0.9.5.ebuild 1511 BLAKE2B 7ac9f39d3b46d3f919ef3b19b8c751568aeeca04a02937b5bc2524df065cd1803fd2283bffaeb3692a70b6a1057b9882a99310d2975108c77cae75228b789ae5 SHA512 2f902e897196006df8fcf882c9a9876f6aba7bf919cda7c3e9797acf09a7d5003e44e415132540c56818b9325ea6d17cf9c1edff2dc09ba88ac7827406bc5408
 EBUILD ament_cmake_uncrustify-9999.ebuild 1511 BLAKE2B 7ac9f39d3b46d3f919ef3b19b8c751568aeeca04a02937b5bc2524df065cd1803fd2283bffaeb3692a70b6a1057b9882a99310d2975108c77cae75228b789ae5 SHA512 2f902e897196006df8fcf882c9a9876f6aba7bf919cda7c3e9797acf09a7d5003e44e415132540c56818b9325ea6d17cf9c1edff2dc09ba88ac7827406bc5408
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.10.1.ebuild b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.10.1.ebuild
new file mode 100644
index 000000000000..ac77dc9fa08f
--- /dev/null
+++ b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.10.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The CMake API for ament_uncrustify to check code against styleconventions"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_uncrustify
+"
+DEPEND=""
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	test? (
+		dev-ros/ament_cmake_copyright
+		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
+		dev-ros/ament_cmake_lint_cmake
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-ros/ament_cmake_version/Manifest b/dev-ros/ament_cmake_version/Manifest
index 34b9915170cb..e75c644ad8c9 100644
--- a/dev-ros/ament_cmake_version/Manifest
+++ b/dev-ros/ament_cmake_version/Manifest
@@ -2,9 +2,11 @@ DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
 DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
+DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 EBUILD ament_cmake_version-0.9.6.ebuild 1151 BLAKE2B 06c964c00f3ad5e81382614db7c8ebee1ff5c6b0d8491993e566a7c402bb89ca35663b8745d02c00fed1adf26c6f92f6cf3447fe6bdbbad4ce52e5f8b47b5ac7 SHA512 68f13961bfc2c66ded41ab9803937cdd96c76f3d05dae2a2799c3381fc4b576a7b81ac47eda6649b385d576e295451eee0799f856d798bfcf8b7f5895d22f1b2
 EBUILD ament_cmake_version-1.0.0.ebuild 1151 BLAKE2B 06c964c00f3ad5e81382614db7c8ebee1ff5c6b0d8491993e566a7c402bb89ca35663b8745d02c00fed1adf26c6f92f6cf3447fe6bdbbad4ce52e5f8b47b5ac7 SHA512 68f13961bfc2c66ded41ab9803937cdd96c76f3d05dae2a2799c3381fc4b576a7b81ac47eda6649b385d576e295451eee0799f856d798bfcf8b7f5895d22f1b2
 EBUILD ament_cmake_version-1.0.1.ebuild 1151 BLAKE2B 06c964c00f3ad5e81382614db7c8ebee1ff5c6b0d8491993e566a7c402bb89ca35663b8745d02c00fed1adf26c6f92f6cf3447fe6bdbbad4ce52e5f8b47b5ac7 SHA512 68f13961bfc2c66ded41ab9803937cdd96c76f3d05dae2a2799c3381fc4b576a7b81ac47eda6649b385d576e295451eee0799f856d798bfcf8b7f5895d22f1b2
 EBUILD ament_cmake_version-1.0.3.ebuild 1151 BLAKE2B 3bb0a21c76581e3f7f97770c98438baeac048edea02ad8e3a5b39ce0a8ed28198cb3d0f007b261a5c79cc743587793c46ccf867401a004e283bc00b9262e952d SHA512 e5b8a51d3aa08e124d31250fc8c4cdf7e29092bc1e5a817f816a9bf917ab185c5562e210e8b87ebf5d7abeb11f1502d42996b6d23875ffbf16f36d28925ed55d
+EBUILD ament_cmake_version-1.0.4.ebuild 1151 BLAKE2B 3bb0a21c76581e3f7f97770c98438baeac048edea02ad8e3a5b39ce0a8ed28198cb3d0f007b261a5c79cc743587793c46ccf867401a004e283bc00b9262e952d SHA512 e5b8a51d3aa08e124d31250fc8c4cdf7e29092bc1e5a817f816a9bf917ab185c5562e210e8b87ebf5d7abeb11f1502d42996b6d23875ffbf16f36d28925ed55d
 EBUILD ament_cmake_version-9999.ebuild 1151 BLAKE2B 06c964c00f3ad5e81382614db7c8ebee1ff5c6b0d8491993e566a7c402bb89ca35663b8745d02c00fed1adf26c6f92f6cf3447fe6bdbbad4ce52e5f8b47b5ac7 SHA512 68f13961bfc2c66ded41ab9803937cdd96c76f3d05dae2a2799c3381fc4b576a7b81ac47eda6649b385d576e295451eee0799f856d798bfcf8b7f5895d22f1b2
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_version/ament_cmake_version-1.0.4.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-1.0.4.ebuild
new file mode 100644
index 000000000000..f177169cb5a4
--- /dev/null
+++ b/dev-ros/ament_cmake_version/ament_cmake_version-1.0.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Override the exported package version in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_xmllint/Manifest b/dev-ros/ament_cmake_xmllint/Manifest
index 303fe3436058..c2b23723caff 100644
--- a/dev-ros/ament_cmake_xmllint/Manifest
+++ b/dev-ros/ament_cmake_xmllint/Manifest
@@ -1,6 +1,8 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_xmllint-0.10.0.ebuild 1447 BLAKE2B 49fdb7b43e6447652f7021c27b32d2ab56c091f4a85a60d5760caf0a5e5c3300e472c332d2521997dd8da6eb5bc7ae11eff014ed8989bbbc5c9e2094f792a6b4 SHA512 a4862a39bdb0239cf83d0ee4ed91d4f90d2846b886807dc8458007d7f8ffff3cc30b7d16ab7396d3c7f524dddc5b00efde1137353207355bb20b25576f3c07d2
+EBUILD ament_cmake_xmllint-0.10.1.ebuild 1447 BLAKE2B 66d9dde6bb0ea0e11a3e5d8d89cb961eff1b815fc73b86cd5c18082a928d576fad8b6db32615a82fa9d94406141ae44c373a80b09090fef623e3b90acfbcf4fc SHA512 2060b66c3f0adfef596d1e9c2e9ba359153934c0b9a690efea04a0652487a48ce7408a27a060b7f14356afe94b15ea6012a3922250ca325dd6601c992727fa1c
 EBUILD ament_cmake_xmllint-0.9.5.ebuild 1447 BLAKE2B 49fdb7b43e6447652f7021c27b32d2ab56c091f4a85a60d5760caf0a5e5c3300e472c332d2521997dd8da6eb5bc7ae11eff014ed8989bbbc5c9e2094f792a6b4 SHA512 a4862a39bdb0239cf83d0ee4ed91d4f90d2846b886807dc8458007d7f8ffff3cc30b7d16ab7396d3c7f524dddc5b00efde1137353207355bb20b25576f3c07d2
 EBUILD ament_cmake_xmllint-9999.ebuild 1447 BLAKE2B 49fdb7b43e6447652f7021c27b32d2ab56c091f4a85a60d5760caf0a5e5c3300e472c332d2521997dd8da6eb5bc7ae11eff014ed8989bbbc5c9e2094f792a6b4 SHA512 a4862a39bdb0239cf83d0ee4ed91d4f90d2846b886807dc8458007d7f8ffff3cc30b7d16ab7396d3c7f524dddc5b00efde1137353207355bb20b25576f3c07d2
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.10.1.ebuild b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.10.1.ebuild
new file mode 100644
index 000000000000..4e164f033962
--- /dev/null
+++ b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.10.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="he CMake API for ament_xmllint to check XML file using xmmlint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_copyright
+"
+DEPEND=""
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-ros/ament_xmllint[${PYTHON_USEDEP}]')
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_copyright
+	test? (
+		dev-ros/ament_cmake_lint_cmake
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version "dev-ros/ament_xmllint[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-ros/ament_copyright/Manifest b/dev-ros/ament_copyright/Manifest
index 745b87c6ab7c..82a8db357c62 100644
--- a/dev-ros/ament_copyright/Manifest
+++ b/dev-ros/ament_copyright/Manifest
@@ -1,4 +1,6 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 EBUILD ament_copyright-0.10.0.ebuild 1140 BLAKE2B 9ec8b335378a72ee8bd87e27a274d53e70b941fd8fa301ebeb0687aa076e4f26e25af1a45ba3d7e9ea6e21998b97bc8e5e12d180c9735d0d340f6e78fea4c6f4 SHA512 048ed0e03cec9761e90c59773626a12347b487c296fd95024113c82ed245f66302016a2ccd85854d4386226b333171a00736d43b92431a2db90ec1e3119c4e26
+EBUILD ament_copyright-0.10.1.ebuild 1140 BLAKE2B 8514e017f9e9964e643f21747b2a12c1aa3c8d3dff3eb7a8882a2015353089d9f79fc95467d5aa391d4ffeefc3817afdb062bfda7cf4eb467f6c5bf34b5e38de SHA512 609663ad2640fdeaf886c66dea0adf6262a73175a2a374d625007d246385076828327e191ab570f1ab2adb7586b7ff7b4a5e9e6be5e6bd07a02463040e48c6a7
 EBUILD ament_copyright-9999.ebuild 1140 BLAKE2B 9ec8b335378a72ee8bd87e27a274d53e70b941fd8fa301ebeb0687aa076e4f26e25af1a45ba3d7e9ea6e21998b97bc8e5e12d180c9735d0d340f6e78fea4c6f4 SHA512 048ed0e03cec9761e90c59773626a12347b487c296fd95024113c82ed245f66302016a2ccd85854d4386226b333171a00736d43b92431a2db90ec1e3119c4e26
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_copyright/ament_copyright-0.10.1.ebuild b/dev-ros/ament_copyright/ament_copyright-0.10.1.ebuild
new file mode 100644
index 000000000000..e23e04234485
--- /dev/null
+++ b/dev-ros/ament_copyright/ament_copyright-0.10.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to check source files for copyright and license information."
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-ros/ament_cppcheck/Manifest b/dev-ros/ament_cppcheck/Manifest
index bf103a22ca84..33203839d77a 100644
--- a/dev-ros/ament_cppcheck/Manifest
+++ b/dev-ros/ament_cppcheck/Manifest
@@ -1,4 +1,6 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 EBUILD ament_cppcheck-0.10.0.ebuild 812 BLAKE2B 485643f05a8e499f3c0ace2a346ec29d804670174d6c98da7932d9c0c73b182c7dea7d4a70d0769c31ee59d94601fd09770dd89ff610c4176818a1d3197af305 SHA512 206edcec6b794621c069fd396d485c4e36fcc03cd6421c08e2388aceb65b3c0ee0e1b03a72e8c57089ed6f0cb4a9f09f7e6e6f2b51ea58f48ca7346d58a6433c
+EBUILD ament_cppcheck-0.10.1.ebuild 812 BLAKE2B ab414a0a9a388b20e9a12c2a50db30e8e36b678381571c876a88fd81db8521aadd786d76c4034ae6a4f9207ccae38ded21abefc9ee5b31f3ed786ac15dec5334 SHA512 0d0d3e6282809b20fdf2fcc6bdfa98d4ede980f3d30262d443bd4c28e3457c965dd5ba59fdfe993bca39855b1cfbe40a67419152f86a83718ec39aceefa9a82a
 EBUILD ament_cppcheck-9999.ebuild 812 BLAKE2B 485643f05a8e499f3c0ace2a346ec29d804670174d6c98da7932d9c0c73b182c7dea7d4a70d0769c31ee59d94601fd09770dd89ff610c4176818a1d3197af305 SHA512 206edcec6b794621c069fd396d485c4e36fcc03cd6421c08e2388aceb65b3c0ee0e1b03a72e8c57089ed6f0cb4a9f09f7e6e6f2b51ea58f48ca7346d58a6433c
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cppcheck/ament_cppcheck-0.10.1.ebuild b/dev-ros/ament_cppcheck/ament_cppcheck-0.10.1.ebuild
new file mode 100644
index 000000000000..7749ef3ab532
--- /dev/null
+++ b/dev-ros/ament_cppcheck/ament_cppcheck-0.10.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to perform static code analysis on C/C++ code using Cppcheck"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-util/cppcheck
+"
+DEPEND=""
+BDEPEND=""
diff --git a/dev-ros/ament_cpplint/Manifest b/dev-ros/ament_cpplint/Manifest
index 4693bc3cd603..14b014d8accc 100644
--- a/dev-ros/ament_cpplint/Manifest
+++ b/dev-ros/ament_cpplint/Manifest
@@ -1,4 +1,6 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 EBUILD ament_cpplint-0.10.0.ebuild 1019 BLAKE2B 45dfe10090b96ac0d7ed70acc6588c4b2afe9e165669e2a7976c6539d3659ce5d50d1ee1b5d77dc6d83aa39d9b78b530a48a83f64fc92117c97d89c1eb48b1ec SHA512 4ed1572ff1163d907fa8be47cb077746c67aa95b187ab67a0bf8b81e5e08201c0f4d2d423cdd8be735dae51ab8d15fc8363af08178cd2e2212eb5d78ea11c3c4
+EBUILD ament_cpplint-0.10.1.ebuild 1019 BLAKE2B 0bd671d351d7be269682c8a678bc7ba6b278cf94e67a91513ae7e03c93705f957dd82bbe213fc293d41893ee8690a9c29ca56079f986fb46897e07ff8370918b SHA512 c56cbbb4fdd2684d4e9aa706b9a8a672b0661f7af9f676256cf227f94604c2e20c88bfeb2367fd815e3e0ded07f4de58d910524ea9a348e88bbb7cea9ba8c6e2
 EBUILD ament_cpplint-9999.ebuild 1019 BLAKE2B 45dfe10090b96ac0d7ed70acc6588c4b2afe9e165669e2a7976c6539d3659ce5d50d1ee1b5d77dc6d83aa39d9b78b530a48a83f64fc92117c97d89c1eb48b1ec SHA512 4ed1572ff1163d907fa8be47cb077746c67aa95b187ab67a0bf8b81e5e08201c0f4d2d423cdd8be735dae51ab8d15fc8363af08178cd2e2212eb5d78ea11c3c4
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cpplint/ament_cpplint-0.10.1.ebuild b/dev-ros/ament_cpplint/ament_cpplint-0.10.1.ebuild
new file mode 100644
index 000000000000..ad815d52a35a
--- /dev/null
+++ b/dev-ros/ament_cpplint/ament_cpplint-0.10.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to check code against the Google style conventions using cpplint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_copyright[${PYTHON_USEDEP}]
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_flake8/Manifest b/dev-ros/ament_flake8/Manifest
index 6ab9236f5bbf..a6175d9a59fc 100644
--- a/dev-ros/ament_flake8/Manifest
+++ b/dev-ros/ament_flake8/Manifest
@@ -1,4 +1,6 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 EBUILD ament_flake8-0.10.0.ebuild 966 BLAKE2B 12ecb70da0074205908513558015c4f0647dac907f865128be25735e5657fd9e65c034c2984609464c2dbf456046b787d995f1b7e9966bbc21f92ca16610a839 SHA512 2adc3d70b9dde93e3118e384f46410b22630d0f092b2d0d7fe8aebd828276d86df7e126741a9ad38cafa2c557ddc739953cb74c880f7d12d326566c77a8e8ad4
+EBUILD ament_flake8-0.10.1.ebuild 966 BLAKE2B e7e0704a7a5472744396378f7d0bd01d5400e062d559768d83af64fb548f156e364c23d581fa39f6a3ca4e7c32a3e2641e90bd00f337f4681ae8aa466690289e SHA512 d499a9e2e9c8106a15bb3b977b5c8162ba40a8fe1302e1d13b0a8ed45c0da7fbaf2a5f220756e2c25e4bc5ec66be0a790bc5db7cbd2ee7bebc8158378985b415
 EBUILD ament_flake8-9999.ebuild 966 BLAKE2B 12ecb70da0074205908513558015c4f0647dac907f865128be25735e5657fd9e65c034c2984609464c2dbf456046b787d995f1b7e9966bbc21f92ca16610a839 SHA512 2adc3d70b9dde93e3118e384f46410b22630d0f092b2d0d7fe8aebd828276d86df7e126741a9ad38cafa2c557ddc739953cb74c880f7d12d326566c77a8e8ad4
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_flake8/ament_flake8-0.10.1.ebuild b/dev-ros/ament_flake8/ament_flake8-0.10.1.ebuild
new file mode 100644
index 000000000000..5b58746c66f9
--- /dev/null
+++ b/dev-ros/ament_flake8/ament_flake8-0.10.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to check code for style and syntax conventions with flake8"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint[${PYTHON_USEDEP}]
+	dev-python/flake8[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint/Manifest b/dev-ros/ament_lint/Manifest
index 0c02806e4fa1..8fe0ce7ba9b6 100644
--- a/dev-ros/ament_lint/Manifest
+++ b/dev-ros/ament_lint/Manifest
@@ -1,6 +1,8 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_lint-0.10.0.ebuild 737 BLAKE2B b3a0d3593189f905166edd4123aeffe2dc09fb018fc03993c440112de49ffb73084c14f3a3c3fd7cd01166b30d704b81e0920c16b3b8951bfa45accfb314b6af SHA512 fce25c1e73eb20ecd99ec8ed09dd4eac16f97becfee54c4f765ab42cac960b7e3f5662e41abaa0dc014eeb9cfdfa079f41c51182c95fbe9cdb3569de6564e2d4
+EBUILD ament_lint-0.10.1.ebuild 737 BLAKE2B d26f5ebc82112b98e28bf1853a2ea398c875264b56ee9edb4158045de7897b9a54c4acfc417688a2e84661bbf9e1b66beaa6158e656832c0417bb559a3490172 SHA512 9e29bc77ad04b76b13114b6cd2744a4a53746f30c0b698a7b2760ed919339b8bf90eb793cf7ec84a519e68d7382dd195ed05ca2606ea1257d4c0c0eff33eebb6
 EBUILD ament_lint-0.9.5.ebuild 737 BLAKE2B b3a0d3593189f905166edd4123aeffe2dc09fb018fc03993c440112de49ffb73084c14f3a3c3fd7cd01166b30d704b81e0920c16b3b8951bfa45accfb314b6af SHA512 fce25c1e73eb20ecd99ec8ed09dd4eac16f97becfee54c4f765ab42cac960b7e3f5662e41abaa0dc014eeb9cfdfa079f41c51182c95fbe9cdb3569de6564e2d4
 EBUILD ament_lint-9999.ebuild 737 BLAKE2B b3a0d3593189f905166edd4123aeffe2dc09fb018fc03993c440112de49ffb73084c14f3a3c3fd7cd01166b30d704b81e0920c16b3b8951bfa45accfb314b6af SHA512 fce25c1e73eb20ecd99ec8ed09dd4eac16f97becfee54c4f765ab42cac960b7e3f5662e41abaa0dc014eeb9cfdfa079f41c51182c95fbe9cdb3569de6564e2d4
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_lint/ament_lint-0.10.1.ebuild b/dev-ros/ament_lint/ament_lint-0.10.1.ebuild
new file mode 100644
index 000000000000..7d09ac309c69
--- /dev/null
+++ b/dev-ros/ament_lint/ament_lint-0.10.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Common API for ament linter packages"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+BDEPEND=""
diff --git a/dev-ros/ament_lint_auto/Manifest b/dev-ros/ament_lint_auto/Manifest
index 430439d1bb38..d32784adf368 100644
--- a/dev-ros/ament_lint_auto/Manifest
+++ b/dev-ros/ament_lint_auto/Manifest
@@ -1,6 +1,8 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_lint_auto-0.10.0.ebuild 1172 BLAKE2B ac440b1fb55484c7d9f85dfe512af394474333ec6233ebc0cf54dc2383b5a14285693f6db4ffc1bd1f6631b6c4e7dc48b569e5e79e86dca6dab412e01e1af744 SHA512 aaa135a58122470a3ff8e86c2aecc3e5f09af378abf3bf85af575b692f79ad96ad7fad7b038289319c756bd8f0d179a0e6135aa6ccafaaeb595e22c1430162f1
+EBUILD ament_lint_auto-0.10.1.ebuild 1172 BLAKE2B 559756d7fc49d1ccd4842590c23694cb2d8ede967b19f3d10b11fa24c205c73b2b3a323d369d2e8c9dc971b9524064c1bc9e5b78f2a039b212e9861296e8bd90 SHA512 7d58905ebb6125cdb6074f15f1b72ac208ff22cc6b68dbb5f0ecd0a75bf54ba29931dd3fb441da26dd0c1a0eb7ada8765ca28a8a58bd6b750e18313bdd26c044
 EBUILD ament_lint_auto-0.9.5.ebuild 1172 BLAKE2B ac440b1fb55484c7d9f85dfe512af394474333ec6233ebc0cf54dc2383b5a14285693f6db4ffc1bd1f6631b6c4e7dc48b569e5e79e86dca6dab412e01e1af744 SHA512 aaa135a58122470a3ff8e86c2aecc3e5f09af378abf3bf85af575b692f79ad96ad7fad7b038289319c756bd8f0d179a0e6135aa6ccafaaeb595e22c1430162f1
 EBUILD ament_lint_auto-9999.ebuild 1172 BLAKE2B ac440b1fb55484c7d9f85dfe512af394474333ec6233ebc0cf54dc2383b5a14285693f6db4ffc1bd1f6631b6c4e7dc48b569e5e79e86dca6dab412e01e1af744 SHA512 aaa135a58122470a3ff8e86c2aecc3e5f09af378abf3bf85af575b692f79ad96ad7fad7b038289319c756bd8f0d179a0e6135aa6ccafaaeb595e22c1430162f1
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_lint_auto/ament_lint_auto-0.10.1.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-0.10.1.ebuild
new file mode 100644
index 000000000000..4f99b8080f80
--- /dev/null
+++ b/dev-ros/ament_lint_auto/ament_lint_auto-0.10.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The auto-magic functions for ease to use of the ament linters"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_test
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_lint_cmake/Manifest b/dev-ros/ament_lint_cmake/Manifest
index 6785c9a8b223..4426400cbfdf 100644
--- a/dev-ros/ament_lint_cmake/Manifest
+++ b/dev-ros/ament_lint_cmake/Manifest
@@ -1,4 +1,6 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 EBUILD ament_lint_cmake-0.10.0.ebuild 1011 BLAKE2B b1ad74b8e17ea1b5f886ef742e46d174693fa4714ba221f56e0f60cfeeb08117b17d7c8477de5386d745f3acb212e76cbf0e23f7af25631a1931a7216fe0e1ef SHA512 a6a14cdfd85cbd963431911796408d321c9c854dd7feb199045813ef53f917386f8dcb5dfdcf59d0cf5f83743a4442c7fdb7a9a9d2e24f0b11adc167efb4137e
+EBUILD ament_lint_cmake-0.10.1.ebuild 1011 BLAKE2B 311b2e96057f3400d1299e625c304f3796c299b348ee9a6ce85e50fcead38afe231c0038543ee892cbd5ffea5d3732bc2e5555d2ac7d880f4d39fc4f2c1e4593 SHA512 6fd943f7ad4a21c0f4c238a2dd5598f9c2ac6811b554595eff147467f5d67a99efb22a7e3aa9a68d39d75a9e006b33c95f9e47b6d2b3b359c9e490f95ae740ce
 EBUILD ament_lint_cmake-9999.ebuild 1011 BLAKE2B b1ad74b8e17ea1b5f886ef742e46d174693fa4714ba221f56e0f60cfeeb08117b17d7c8477de5386d745f3acb212e76cbf0e23f7af25631a1931a7216fe0e1ef SHA512 a6a14cdfd85cbd963431911796408d321c9c854dd7feb199045813ef53f917386f8dcb5dfdcf59d0cf5f83743a4442c7fdb7a9a9d2e24f0b11adc167efb4137e
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_lint_cmake/ament_lint_cmake-0.10.1.ebuild b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.10.1.ebuild
new file mode 100644
index 000000000000..7eb72a8a75a3
--- /dev/null
+++ b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.10.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Lint CMake code using cmakelint and generate xUnit test result files"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-ros/ament_copyright[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_pep257/Manifest b/dev-ros/ament_pep257/Manifest
index 28b681bb9237..5f21f12db00f 100644
--- a/dev-ros/ament_pep257/Manifest
+++ b/dev-ros/ament_pep257/Manifest
@@ -1,4 +1,6 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 EBUILD ament_pep257-0.10.0.ebuild 1014 BLAKE2B 5a81703962a92ac21544e12395287773fe970456841c1042ef2d655dc4597d86240a990ae322e3406026dd5f921776ef2e310699f7daf92ae402af9b24f01822 SHA512 ff765b32ff0a7e4ec81a55b9590cd66841daafbee029d62343281ef1ecc9887e5ad963fe2f7a51fad838a881fa42463b574e6923385b3dfc8b9d6859e213834d
+EBUILD ament_pep257-0.10.1.ebuild 1014 BLAKE2B 8f4b833434ab1bb56b7920298b1631678fcc906c03164b5a6768c3926f832c401d30394a245cea458a641d5c0549f3d6dcdbfd3728e4d0a3ef247fe67632018a SHA512 8782acb7ad825140abd83f6f674066cb7225dd7166ae6617b33c9edef65258a21f459e7cfe149b8bddb2696f78ccf0af19e6066c3719f0eb7c32e938b18b2830
 EBUILD ament_pep257-9999.ebuild 1014 BLAKE2B 5a81703962a92ac21544e12395287773fe970456841c1042ef2d655dc4597d86240a990ae322e3406026dd5f921776ef2e310699f7daf92ae402af9b24f01822 SHA512 ff765b32ff0a7e4ec81a55b9590cd66841daafbee029d62343281ef1ecc9887e5ad963fe2f7a51fad838a881fa42463b574e6923385b3dfc8b9d6859e213834d
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_pep257/ament_pep257-0.10.1.ebuild b/dev-ros/ament_pep257/ament_pep257-0.10.1.ebuild
new file mode 100644
index 000000000000..08b1b6af9f30
--- /dev/null
+++ b/dev-ros/ament_pep257/ament_pep257-0.10.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Checks code against style conventions in PEP 8 and generate test result files"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint[${PYTHON_USEDEP}]
+	dev-python/pydocstyle[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_uncrustify/Manifest b/dev-ros/ament_uncrustify/Manifest
index 76cdb377f2dc..a27ccc30e5a5 100644
--- a/dev-ros/ament_uncrustify/Manifest
+++ b/dev-ros/ament_uncrustify/Manifest
@@ -1,4 +1,6 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 EBUILD ament_uncrustify-0.10.0.ebuild 810 BLAKE2B 787273df2df17c7ab6669d41b03ac4af946e19ab82ac97d151a64f8ae5ebe4cacc5412e52ec230931dcc0c9447f75be645c2ec29285c5f51deb4eeddc4e90c80 SHA512 32b7290e38432c311e67f9721b7f5916179c04f955f35c958d82eb23c15d9aa4280af3755134113a18fb25a19a44baf41a5c76bea074dde37fcdd3cbddd58645
+EBUILD ament_uncrustify-0.10.1.ebuild 810 BLAKE2B feec1feafbe565d7f6da7b29b451d943617481b231b3ed7cd6261a0e362bc2ead74b586c8698d57a80dea23026c36b30db946f904f595b0af9b7d4934206ac2f SHA512 10e69b0263da0e88bc29324cacf4fe0430be35836afea9edf81b64f1ef60597a66965d0aca23e8c6e7ba38b838ba1c1c6730900fcb802f111881d99544fdbaf7
 EBUILD ament_uncrustify-9999.ebuild 810 BLAKE2B 787273df2df17c7ab6669d41b03ac4af946e19ab82ac97d151a64f8ae5ebe4cacc5412e52ec230931dcc0c9447f75be645c2ec29285c5f51deb4eeddc4e90c80 SHA512 32b7290e38432c311e67f9721b7f5916179c04f955f35c958d82eb23c15d9aa4280af3755134113a18fb25a19a44baf41a5c76bea074dde37fcdd3cbddd58645
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-0.10.1.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-0.10.1.ebuild
new file mode 100644
index 000000000000..016aff416aad
--- /dev/null
+++ b/dev-ros/ament_uncrustify/ament_uncrustify-0.10.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to check code against style conventions using uncrustify"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-util/uncrustify
+"
+DEPEND=""
+BDEPEND=""
diff --git a/dev-ros/ament_xmllint/Manifest b/dev-ros/ament_xmllint/Manifest
index 8401b856fd30..7717708fcb48 100644
--- a/dev-ros/ament_xmllint/Manifest
+++ b/dev-ros/ament_xmllint/Manifest
@@ -1,4 +1,6 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 EBUILD ament_xmllint-0.10.0.ebuild 1080 BLAKE2B c86fcc87bf6e04549e993e5503e50f7f373a26d55333cda855ebe8ad0b74f0d28fcb39db983ae39512ad21a58f877874af74d32ee95329a7fc0c07d4fc330595 SHA512 500020a2efba6390399b1d769cd9d7ed374ac0f246820478ea865984c740e1baa25f52da3795bea9d326b5b2d8f7af9fa097b5e0f3eff8ddf87423925f2418f2
+EBUILD ament_xmllint-0.10.1.ebuild 1080 BLAKE2B 43c6b1dbb4ca5b5fc4eb4998079e32adc8b422c105f4a3af99d4079d2e0f2a13cb50c7a9a14f00d41520ead3237d57c6519da97e11f9ddcedde5d5640678ccbb SHA512 a475cede669417bc62435e0bde392a070cef3cd8552c63d3cf5df19c2321396ab129f3d8f84a819a1e995e9ffe0fff693fbbd3d3b4a86dd0b567bb8d7aea8c4d
 EBUILD ament_xmllint-9999.ebuild 1080 BLAKE2B c86fcc87bf6e04549e993e5503e50f7f373a26d55333cda855ebe8ad0b74f0d28fcb39db983ae39512ad21a58f877874af74d32ee95329a7fc0c07d4fc330595 SHA512 500020a2efba6390399b1d769cd9d7ed374ac0f246820478ea865984c740e1baa25f52da3795bea9d326b5b2d8f7af9fa097b5e0f3eff8ddf87423925f2418f2
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_xmllint/ament_xmllint-0.10.1.ebuild b/dev-ros/ament_xmllint/ament_xmllint-0.10.1.ebuild
new file mode 100644
index 000000000000..36ebcfc004b0
--- /dev/null
+++ b/dev-ros/ament_xmllint/ament_xmllint-0.10.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Checks XML files like the package manifest using xmllint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint[${PYTHON_USEDEP}]
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_copyright[${PYTHON_USEDEP}]
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/realtime_tools/Manifest b/dev-ros/realtime_tools/Manifest
index a491449e9ad9..0893cb25a2d5 100644
--- a/dev-ros/realtime_tools/Manifest
+++ b/dev-ros/realtime_tools/Manifest
@@ -1,5 +1,5 @@
 AUX atomic.patch 411 BLAKE2B 2af7ae6e0f7b91cbc80188ede62098bd700e556dad07c24d681c19d1b84efe3bfa9f06b3d1b0cd9f83437c160ccbf1494f684e76421a4d19a79defadc6d10832 SHA512 f58cb21ee24f7615c37cb5a4fb86547d0c1458f075d93039dab1ab3a5c35b90a5964587326b5331b331867eeaa13a218838941f100851b3605b2ac193d85870a
-DIST realtime_tools-1.16.0.tar.gz 12046 BLAKE2B 673cd87573b7db87573e345f7cd916b246894da8ab2f720b56b81cd276c25fdc50e70bfff021b9f88d2699a36f00abe5a90aec55963ea3f4a20cb6345474bc52 SHA512 65037a3fffdfb81a6020dbedd0155cb1ebd6ca64a5bff46ae9c705327a458883412bee7885e5d91073c55b77611cd8492254ca68d185827be87598a4f0015718
-EBUILD realtime_tools-1.16.0-r1.ebuild 604 BLAKE2B 3dcfe4ab7a5988cf7f0ffda2ac976e24ae7f51340b9cd8e7e136eb95c57daff6b70c598dbf3e5a19a64af9fbd07225c1b19d5af4bfc6b2905b06ea7dbd6dbd9b SHA512 f3b6eeba05b6f2b3b700419676c8be7af0685a86a127d098ac4eda5bc0d59c1aa5113b5c5fc2d9eea011b560d67d3e91ca61c8acf1cf95db97567c4090088adf
+DIST realtime_tools-1.16.1.tar.gz 12161 BLAKE2B 940e703ea5231976c8a963ae657647e66ce0c1e4f5544e930c5dae86db63b5699a2a1356066a89e6f4f7ad898590f2e4f9024da38b76f9b16e40c890cd7584d1 SHA512 14ae5e4b8d883ffccaef0abde7b86829fe528084302fb51c86c2115c837573be3be92190380b5bc13d35eddc4e15d7968f516d4b03d374636fa386dcb7c3a31c
+EBUILD realtime_tools-1.16.1.ebuild 604 BLAKE2B 5062f3c5237dfc58921439f20c54098640561bf2617524fd2834e37c3e97ef723b3907bc75c0c9aae6686908769c028b9b70551b203b11678a6db3953498eb77 SHA512 3b9d3dc8142be19e8935d53232d39ba167c09bc075e4d49a726de8b26b170f3be4486dc67a3e253c9a1d783817cfe8c189cc62709a309193fbe3553b210e7bbd
 EBUILD realtime_tools-9999.ebuild 604 BLAKE2B 3dcfe4ab7a5988cf7f0ffda2ac976e24ae7f51340b9cd8e7e136eb95c57daff6b70c598dbf3e5a19a64af9fbd07225c1b19d5af4bfc6b2905b06ea7dbd6dbd9b SHA512 f3b6eeba05b6f2b3b700419676c8be7af0685a86a127d098ac4eda5bc0d59c1aa5113b5c5fc2d9eea011b560d67d3e91ca61c8acf1cf95db97567c4090088adf
 MISC metadata.xml 341 BLAKE2B 6a21b434a2b09c8a9475755b58b36647dba03618418887a8a38680406a6cce9019097260edb298f428566dec649bba5dd8dc2878a34227736ce1aee727fa9ad3 SHA512 25b78ddc49681242a2f228d1fa23b40df20e285ece1855c8493d09af6e65615a6f3f89506fc1d89deffb6dd6b8d2b3d8042ec39ba710c59dd4389a44acc38b87
diff --git a/dev-ros/realtime_tools/realtime_tools-1.16.0-r1.ebuild b/dev-ros/realtime_tools/realtime_tools-1.16.1.ebuild
index c76733870b90..7461e643ffec 100644
--- a/dev-ros/realtime_tools/realtime_tools-1.16.0-r1.ebuild
+++ b/dev-ros/realtime_tools/realtime_tools-1.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-29 18:03:51 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-29 18:03:51 +0000
commit	d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch)
tree	1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /dev-ros
parent	abaa75b10f899ada8dd05b23cc03205064394bc6 (diff)