gentoo resync : 30.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-30 17:27:54 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-30 17:27:54 +0100
commit: f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
tree: e907cb121b30e3c1df1710719c0ddf4029597a47 /dev-ros
parent: db063b515939ab15261136b24e4bc44386335c0c (diff)
75 files changed, 1333 insertions, 24 deletions
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 54ef9ccf5e2d..08807df5f3ab 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 a222024422f5..9550d354f5f4 100644
--- a/dev-ros/ament_cmake_copyright/Manifest
+++ b/dev-ros/ament_cmake_copyright/Manifest
@@ -1,4 +1,6 @@
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 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.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.0.ebuild b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.0.ebuild
new file mode 100644
index 000000000000..29ed35a1afd5
--- /dev/null
+++ b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2019-2020 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 ff3ec42f545b..967704b76c01 100644
--- a/dev-ros/ament_cmake_core/Manifest
+++ b/dev-ros/ament_cmake_core/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 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-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.1.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.0.1.ebuild
new file mode 100644
index 000000000000..91e4b417df78
--- /dev/null
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 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 6c220bf6bc38..cf152696bfbd 100644
--- a/dev-ros/ament_cmake_cppcheck/Manifest
+++ b/dev-ros/ament_cmake_cppcheck/Manifest
@@ -1,4 +1,6 @@
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 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.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.0.ebuild b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.10.0.ebuild
new file mode 100644
index 000000000000..9318e3a9e9c2
--- /dev/null
+++ b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.10.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2019-2020 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 606112f459c5..56cc9011a790 100644
--- a/dev-ros/ament_cmake_cpplint/Manifest
+++ b/dev-ros/ament_cmake_cpplint/Manifest
@@ -1,4 +1,6 @@
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 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.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.0.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.10.0.ebuild
new file mode 100644
index 000000000000..f60a48951cc2
--- /dev/null
+++ b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.10.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2019-2020 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 89a0178fe883..a3e3f0b7abf4 100644
--- a/dev-ros/ament_cmake_export_definitions/Manifest
+++ b/dev-ros/ament_cmake_export_definitions/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 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-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.1.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.1.ebuild
new file mode 100644
index 000000000000..63b8542747c6
--- /dev/null
+++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 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 a1f91bd63d22..1c2bf3460371 100644
--- a/dev-ros/ament_cmake_export_dependencies/Manifest
+++ b/dev-ros/ament_cmake_export_dependencies/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 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-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.1.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.1.ebuild
new file mode 100644
index 000000000000..6dcea483b58f
--- /dev/null
+++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 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 0b983549deb0..c64fe24eaf6f 100644
--- a/dev-ros/ament_cmake_export_include_directories/Manifest
+++ b/dev-ros/ament_cmake_export_include_directories/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 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-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.1.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.1.ebuild
new file mode 100644
index 000000000000..64cff4ebe537
--- /dev/null
+++ b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 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 2b04e9b2044f..0ae0839979d3 100644
--- a/dev-ros/ament_cmake_export_interfaces/Manifest
+++ b/dev-ros/ament_cmake_export_interfaces/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 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-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.1.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.1.ebuild
new file mode 100644
index 000000000000..d8a437ccd5be
--- /dev/null
+++ b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 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 323a892b40f6..a8087e1cf349 100644
--- a/dev-ros/ament_cmake_export_libraries/Manifest
+++ b/dev-ros/ament_cmake_export_libraries/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 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-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.1.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.1.ebuild
new file mode 100644
index 000000000000..448a058815a4
--- /dev/null
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 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 06b57bd54740..24f07bcaee82 100644
--- a/dev-ros/ament_cmake_export_link_flags/Manifest
+++ b/dev-ros/ament_cmake_export_link_flags/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 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-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.1.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.1.ebuild
new file mode 100644
index 000000000000..a009e37c439b
--- /dev/null
+++ b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 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 bdf3854cf4a3..af6fcd2466da 100644
--- a/dev-ros/ament_cmake_export_targets/Manifest
+++ b/dev-ros/ament_cmake_export_targets/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 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-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.1.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.1.ebuild
new file mode 100644
index 000000000000..16d96ae3af52
--- /dev/null
+++ b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 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 6ae0dd448383..03c54ffad5e0 100644
--- a/dev-ros/ament_cmake_gmock/Manifest
+++ b/dev-ros/ament_cmake_gmock/Manifest
@@ -1,4 +1,6 @@
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 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-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.1.ebuild b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.1.ebuild
new file mode 100644
index 000000000000..f63ad218898c
--- /dev/null
+++ b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 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 f8f1aab49821..874d763c2541 100644
--- a/dev-ros/ament_cmake_gtest/Manifest
+++ b/dev-ros/ament_cmake_gtest/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 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-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.1.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.1.ebuild
new file mode 100644
index 000000000000..2f25c5bddffb
--- /dev/null
+++ b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 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 dfadfa2571cd..7a69dc93337d 100644
--- a/dev-ros/ament_cmake_include_directories/Manifest
+++ b/dev-ros/ament_cmake_include_directories/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 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-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.1.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.1.ebuild
new file mode 100644
index 000000000000..64cff4ebe537
--- /dev/null
+++ b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 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 380eb0cded4f..92fea5664c8b 100644
--- a/dev-ros/ament_cmake_libraries/Manifest
+++ b/dev-ros/ament_cmake_libraries/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 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-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.1.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.1.ebuild
new file mode 100644
index 000000000000..b578744e5fc1
--- /dev/null
+++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 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 a8f4f8a4911c..3526d807a72c 100644
--- a/dev-ros/ament_cmake_lint_cmake/Manifest
+++ b/dev-ros/ament_cmake_lint_cmake/Manifest
@@ -1,4 +1,6 @@
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 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.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.0.ebuild b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.10.0.ebuild
new file mode 100644
index 000000000000..9b291e4d7356
--- /dev/null
+++ b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.10.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2019-2020 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 899dd9246716..96377b3c0b07 100644
--- a/dev-ros/ament_cmake_pytest/Manifest
+++ b/dev-ros/ament_cmake_pytest/Manifest
@@ -1,4 +1,6 @@
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 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-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.1.ebuild b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.1.ebuild
new file mode 100644
index 000000000000..f0104eb06e84
--- /dev/null
+++ b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 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 e3b7c53500d6..b9523712f9a8 100644
--- a/dev-ros/ament_cmake_python/Manifest
+++ b/dev-ros/ament_cmake_python/Manifest
@@ -1,7 +1,9 @@
 AUX destdir.patch 1203 BLAKE2B fe4e783ea9d4802752d79d489e5b05d0ca9688a76d678521af41f232005da611c0286f594d15045dcae5610362ccc1bb878d29bddbeb86a9452b0289af347d67 SHA512 85e196c9777a6cc8b8b693e3825d5027c7a5db0a74008ad34d9be3714a088a9e651bb99ce53ee2bd95c47b2c1f8c2c657fa18cce0f13b11e4ea437cdd03ef0b3
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 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-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.1.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.0.1.ebuild
new file mode 100644
index 000000000000..866ed8213865
--- /dev/null
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-1.0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 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 a0312c22c8da..c3f8393559a9 100644
--- a/dev-ros/ament_cmake_target_dependencies/Manifest
+++ b/dev-ros/ament_cmake_target_dependencies/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 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-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.1.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.1.ebuild
new file mode 100644
index 000000000000..16ca90c0c124
--- /dev/null
+++ b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2020 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 bb268be1bc91..a8acc54bb7ac 100644
--- a/dev-ros/ament_cmake_test/Manifest
+++ b/dev-ros/ament_cmake_test/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 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-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.1.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-1.0.1.ebuild
new file mode 100644
index 000000000000..00d8aa0613ba
--- /dev/null
+++ b/dev-ros/ament_cmake_test/ament_cmake_test-1.0.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019-2020 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 52bed5a3bf96..6bf21541d21e 100644
--- a/dev-ros/ament_cmake_uncrustify/Manifest
+++ b/dev-ros/ament_cmake_uncrustify/Manifest
@@ -1,4 +1,6 @@
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 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.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.0.ebuild b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.10.0.ebuild
new file mode 100644
index 000000000000..347b57dc9dc5
--- /dev/null
+++ b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.10.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2019-2020 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 31f0b01a7017..1c35439b1f06 100644
--- a/dev-ros/ament_cmake_version/Manifest
+++ b/dev-ros/ament_cmake_version/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 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-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.1.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-1.0.1.ebuild
new file mode 100644
index 000000000000..59400b11d05b
--- /dev/null
+++ b/dev-ros/ament_cmake_version/ament_cmake_version-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 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 8eb07f87fedb..303fe3436058 100644
--- a/dev-ros/ament_cmake_xmllint/Manifest
+++ b/dev-ros/ament_cmake_xmllint/Manifest
@@ -1,4 +1,6 @@
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 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.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.0.ebuild b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.10.0.ebuild
new file mode 100644
index 000000000000..065d1257e262
--- /dev/null
+++ b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.10.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2019-2020 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 d25f0be68034..745b87c6ab7c 100644
--- a/dev-ros/ament_copyright/Manifest
+++ b/dev-ros/ament_copyright/Manifest
@@ -1,4 +1,4 @@
-DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
-EBUILD ament_copyright-0.9.5.ebuild 1107 BLAKE2B f6a4bb7c676a6c29b1f55c91c248205325891950c9a5723afb95ef1dd63ba8aba67e2610c88933830ae928b6cce4f4568e47c2008a528745223314992fe93f77 SHA512 9f68a8c170acd053148971c754670f68c75bc0b4c85ea5032f01a73d4a01ebf376aceb65663592048072b7ba677f36ae7c2ff788bd0a49667db9438eda95b60b
-EBUILD ament_copyright-9999.ebuild 1107 BLAKE2B f6a4bb7c676a6c29b1f55c91c248205325891950c9a5723afb95ef1dd63ba8aba67e2610c88933830ae928b6cce4f4568e47c2008a528745223314992fe93f77 SHA512 9f68a8c170acd053148971c754670f68c75bc0b4c85ea5032f01a73d4a01ebf376aceb65663592048072b7ba677f36ae7c2ff788bd0a49667db9438eda95b60b
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+EBUILD ament_copyright-0.10.0.ebuild 1140 BLAKE2B 9ec8b335378a72ee8bd87e27a274d53e70b941fd8fa301ebeb0687aa076e4f26e25af1a45ba3d7e9ea6e21998b97bc8e5e12d180c9735d0d340f6e78fea4c6f4 SHA512 048ed0e03cec9761e90c59773626a12347b487c296fd95024113c82ed245f66302016a2ccd85854d4386226b333171a00736d43b92431a2db90ec1e3119c4e26
+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.9.5.ebuild b/dev-ros/ament_copyright/ament_copyright-0.10.0.ebuild
index 900785c148df..fb789cb409b3 100644
--- a/dev-ros/ament_copyright/ament_copyright-0.9.5.ebuild
+++ b/dev-ros/ament_copyright/ament_copyright-0.10.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_copyright/ament_copyright-9999.ebuild b/dev-ros/ament_copyright/ament_copyright-9999.ebuild
index 900785c148df..fb789cb409b3 100644
--- a/dev-ros/ament_copyright/ament_copyright-9999.ebuild
+++ b/dev-ros/ament_copyright/ament_copyright-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_cppcheck/Manifest b/dev-ros/ament_cppcheck/Manifest
index 3bd21e14e20e..bf103a22ca84 100644
--- a/dev-ros/ament_cppcheck/Manifest
+++ b/dev-ros/ament_cppcheck/Manifest
@@ -1,4 +1,4 @@
-DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
-EBUILD ament_cppcheck-0.9.5.ebuild 779 BLAKE2B 73abfee136357c8313b74ab0551e101f8b0760bdf7a5c159aa033e157b018e490d9ba6938c476f91bc341d1b6230c4d881a8160d4008008c6e80593434d50a0f SHA512 52522b7326d8a241755a18f79214ca6930801ecc60911a60f80fb30c2ff6d58f8863bb0588dc2af69b2fde4ce76d6d0894506ee84399c50e4c8759ee4975887b
-EBUILD ament_cppcheck-9999.ebuild 779 BLAKE2B 73abfee136357c8313b74ab0551e101f8b0760bdf7a5c159aa033e157b018e490d9ba6938c476f91bc341d1b6230c4d881a8160d4008008c6e80593434d50a0f SHA512 52522b7326d8a241755a18f79214ca6930801ecc60911a60f80fb30c2ff6d58f8863bb0588dc2af69b2fde4ce76d6d0894506ee84399c50e4c8759ee4975887b
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+EBUILD ament_cppcheck-0.10.0.ebuild 812 BLAKE2B 485643f05a8e499f3c0ace2a346ec29d804670174d6c98da7932d9c0c73b182c7dea7d4a70d0769c31ee59d94601fd09770dd89ff610c4176818a1d3197af305 SHA512 206edcec6b794621c069fd396d485c4e36fcc03cd6421c08e2388aceb65b3c0ee0e1b03a72e8c57089ed6f0cb4a9f09f7e6e6f2b51ea58f48ca7346d58a6433c
+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.9.5.ebuild b/dev-ros/ament_cppcheck/ament_cppcheck-0.10.0.ebuild
index 6a0744a992d3..42fa61df3e0b 100644
--- a/dev-ros/ament_cppcheck/ament_cppcheck-0.9.5.ebuild
+++ b/dev-ros/ament_cppcheck/ament_cppcheck-0.10.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild b/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild
index 6a0744a992d3..42fa61df3e0b 100644
--- a/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild
+++ b/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_cpplint/Manifest b/dev-ros/ament_cpplint/Manifest
index 04779351cabc..4693bc3cd603 100644
--- a/dev-ros/ament_cpplint/Manifest
+++ b/dev-ros/ament_cpplint/Manifest
@@ -1,4 +1,4 @@
-DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
-EBUILD ament_cpplint-0.9.5.ebuild 986 BLAKE2B 9905865e8c4138fd906c704461de13087fb8f211d0e8969e63014344f750003d3225339affa9767d25c8b3ce933728323d964997a9f8992eef24d3cd9f61456a SHA512 d2c675161d3b76deee6286b32fd5ecc6e2b521f21a893c0f611b55472548a30c26f64912fa63094bf875fde8406d484ff143e4991a7627f2abc5345abc9138de
-EBUILD ament_cpplint-9999.ebuild 986 BLAKE2B 9905865e8c4138fd906c704461de13087fb8f211d0e8969e63014344f750003d3225339affa9767d25c8b3ce933728323d964997a9f8992eef24d3cd9f61456a SHA512 d2c675161d3b76deee6286b32fd5ecc6e2b521f21a893c0f611b55472548a30c26f64912fa63094bf875fde8406d484ff143e4991a7627f2abc5345abc9138de
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+EBUILD ament_cpplint-0.10.0.ebuild 1019 BLAKE2B 45dfe10090b96ac0d7ed70acc6588c4b2afe9e165669e2a7976c6539d3659ce5d50d1ee1b5d77dc6d83aa39d9b78b530a48a83f64fc92117c97d89c1eb48b1ec SHA512 4ed1572ff1163d907fa8be47cb077746c67aa95b187ab67a0bf8b81e5e08201c0f4d2d423cdd8be735dae51ab8d15fc8363af08178cd2e2212eb5d78ea11c3c4
+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.9.5.ebuild b/dev-ros/ament_cpplint/ament_cpplint-0.10.0.ebuild
index 429c4f07a46d..a1b7cd1269bd 100644
--- a/dev-ros/ament_cpplint/ament_cpplint-0.9.5.ebuild
+++ b/dev-ros/ament_cpplint/ament_cpplint-0.10.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_cpplint/ament_cpplint-9999.ebuild b/dev-ros/ament_cpplint/ament_cpplint-9999.ebuild
index 429c4f07a46d..a1b7cd1269bd 100644
--- a/dev-ros/ament_cpplint/ament_cpplint-9999.ebuild
+++ b/dev-ros/ament_cpplint/ament_cpplint-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_flake8/Manifest b/dev-ros/ament_flake8/Manifest
index 5cda0b532524..6ab9236f5bbf 100644
--- a/dev-ros/ament_flake8/Manifest
+++ b/dev-ros/ament_flake8/Manifest
@@ -1,4 +1,4 @@
-DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
-EBUILD ament_flake8-0.9.5.ebuild 933 BLAKE2B 9d3adc524e34363cf1ec0ad87dbd63703081f6553058b5f1f7f7462a106ff6612701a3fcef44b72aa9ac53ff7fca0ccd239548ff2a8500dc7309aec4203ea836 SHA512 f7635c4e1feff8c29b5279b6034a8f0c5acb7dfb286780567b43306127e15b2e70449cff37490f1cee6edf86f5d07734473d8b084a514b0a0d367ba3d8a7cf07
-EBUILD ament_flake8-9999.ebuild 933 BLAKE2B 9d3adc524e34363cf1ec0ad87dbd63703081f6553058b5f1f7f7462a106ff6612701a3fcef44b72aa9ac53ff7fca0ccd239548ff2a8500dc7309aec4203ea836 SHA512 f7635c4e1feff8c29b5279b6034a8f0c5acb7dfb286780567b43306127e15b2e70449cff37490f1cee6edf86f5d07734473d8b084a514b0a0d367ba3d8a7cf07
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+EBUILD ament_flake8-0.10.0.ebuild 966 BLAKE2B 12ecb70da0074205908513558015c4f0647dac907f865128be25735e5657fd9e65c034c2984609464c2dbf456046b787d995f1b7e9966bbc21f92ca16610a839 SHA512 2adc3d70b9dde93e3118e384f46410b22630d0f092b2d0d7fe8aebd828276d86df7e126741a9ad38cafa2c557ddc739953cb74c880f7d12d326566c77a8e8ad4
+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.9.5.ebuild b/dev-ros/ament_flake8/ament_flake8-0.10.0.ebuild
index 91b3d21e5ffc..4d6314b20b89 100644
--- a/dev-ros/ament_flake8/ament_flake8-0.9.5.ebuild
+++ b/dev-ros/ament_flake8/ament_flake8-0.10.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_flake8/ament_flake8-9999.ebuild b/dev-ros/ament_flake8/ament_flake8-9999.ebuild
index 91b3d21e5ffc..4d6314b20b89 100644
--- a/dev-ros/ament_flake8/ament_flake8-9999.ebuild
+++ b/dev-ros/ament_flake8/ament_flake8-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_lint/Manifest b/dev-ros/ament_lint/Manifest
index 9728f57976d6..0c02806e4fa1 100644
--- a/dev-ros/ament_lint/Manifest
+++ b/dev-ros/ament_lint/Manifest
@@ -1,4 +1,6 @@
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 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.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.0.ebuild b/dev-ros/ament_lint/ament_lint-0.10.0.ebuild
new file mode 100644
index 000000000000..20530ba2bd7e
--- /dev/null
+++ b/dev-ros/ament_lint/ament_lint-0.10.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2019-2020 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 dcb0095131ec..430439d1bb38 100644
--- a/dev-ros/ament_lint_auto/Manifest
+++ b/dev-ros/ament_lint_auto/Manifest
@@ -1,4 +1,6 @@
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 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.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.0.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-0.10.0.ebuild
new file mode 100644
index 000000000000..120c90db0dd4
--- /dev/null
+++ b/dev-ros/ament_lint_auto/ament_lint_auto-0.10.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 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 f42a6470b9e7..6785c9a8b223 100644
--- a/dev-ros/ament_lint_cmake/Manifest
+++ b/dev-ros/ament_lint_cmake/Manifest
@@ -1,4 +1,4 @@
-DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
-EBUILD ament_lint_cmake-0.9.5.ebuild 978 BLAKE2B 5ad587b24be0ed037c2b8548afd9c547355e680b8a970eebf877b3226d12901ff6164b283c4db1ab70494a866c54d094a8f98d30a8e054fbfc02275b35a0a9c5 SHA512 e1cadb43205d6932d795327dd8435da5cdf06a3ed64229c354802ce7ec43be94a812b9a411274c7158e9a1c8eb61e45cd6e315b08c4efecb6b19c1080d19a209
-EBUILD ament_lint_cmake-9999.ebuild 978 BLAKE2B 5ad587b24be0ed037c2b8548afd9c547355e680b8a970eebf877b3226d12901ff6164b283c4db1ab70494a866c54d094a8f98d30a8e054fbfc02275b35a0a9c5 SHA512 e1cadb43205d6932d795327dd8435da5cdf06a3ed64229c354802ce7ec43be94a812b9a411274c7158e9a1c8eb61e45cd6e315b08c4efecb6b19c1080d19a209
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+EBUILD ament_lint_cmake-0.10.0.ebuild 1011 BLAKE2B b1ad74b8e17ea1b5f886ef742e46d174693fa4714ba221f56e0f60cfeeb08117b17d7c8477de5386d745f3acb212e76cbf0e23f7af25631a1931a7216fe0e1ef SHA512 a6a14cdfd85cbd963431911796408d321c9c854dd7feb199045813ef53f917386f8dcb5dfdcf59d0cf5f83743a4442c7fdb7a9a9d2e24f0b11adc167efb4137e
+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.9.5.ebuild b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.10.0.ebuild
index e45310e62d25..33508ffd955c 100644
--- a/dev-ros/ament_lint_cmake/ament_lint_cmake-0.9.5.ebuild
+++ b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.10.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_lint_cmake/ament_lint_cmake-9999.ebuild b/dev-ros/ament_lint_cmake/ament_lint_cmake-9999.ebuild
index e45310e62d25..33508ffd955c 100644
--- a/dev-ros/ament_lint_cmake/ament_lint_cmake-9999.ebuild
+++ b/dev-ros/ament_lint_cmake/ament_lint_cmake-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_pep257/Manifest b/dev-ros/ament_pep257/Manifest
index 656e4646e94b..28b681bb9237 100644
--- a/dev-ros/ament_pep257/Manifest
+++ b/dev-ros/ament_pep257/Manifest
@@ -1,4 +1,4 @@
-DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
-EBUILD ament_pep257-0.9.5.ebuild 981 BLAKE2B a451962b7f69f4579458efcdecfdf818cb97665fde6e6b942fa66dbc6c77737afabc29bae35d1bcdb9d500583ead032b987418d74a3dda906bfc8ad7fab3c996 SHA512 5628c2bd6b5e935f99ace1d4e7c4cea19fced6840e0f2616e1bf4ad7421b60be5c7dabcaad23a161fe3780ede977a2d79db5218ca65128b05de4c1199131a331
-EBUILD ament_pep257-9999.ebuild 981 BLAKE2B a451962b7f69f4579458efcdecfdf818cb97665fde6e6b942fa66dbc6c77737afabc29bae35d1bcdb9d500583ead032b987418d74a3dda906bfc8ad7fab3c996 SHA512 5628c2bd6b5e935f99ace1d4e7c4cea19fced6840e0f2616e1bf4ad7421b60be5c7dabcaad23a161fe3780ede977a2d79db5218ca65128b05de4c1199131a331
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+EBUILD ament_pep257-0.10.0.ebuild 1014 BLAKE2B 5a81703962a92ac21544e12395287773fe970456841c1042ef2d655dc4597d86240a990ae322e3406026dd5f921776ef2e310699f7daf92ae402af9b24f01822 SHA512 ff765b32ff0a7e4ec81a55b9590cd66841daafbee029d62343281ef1ecc9887e5ad963fe2f7a51fad838a881fa42463b574e6923385b3dfc8b9d6859e213834d
+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.9.5.ebuild b/dev-ros/ament_pep257/ament_pep257-0.10.0.ebuild
index 30e3a98b66d7..e29026c993c2 100644
--- a/dev-ros/ament_pep257/ament_pep257-0.9.5.ebuild
+++ b/dev-ros/ament_pep257/ament_pep257-0.10.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_pep257/ament_pep257-9999.ebuild b/dev-ros/ament_pep257/ament_pep257-9999.ebuild
index 30e3a98b66d7..e29026c993c2 100644
--- a/dev-ros/ament_pep257/ament_pep257-9999.ebuild
+++ b/dev-ros/ament_pep257/ament_pep257-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_uncrustify/Manifest b/dev-ros/ament_uncrustify/Manifest
index 27786584e2cc..76cdb377f2dc 100644
--- a/dev-ros/ament_uncrustify/Manifest
+++ b/dev-ros/ament_uncrustify/Manifest
@@ -1,4 +1,4 @@
-DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
-EBUILD ament_uncrustify-0.9.5.ebuild 777 BLAKE2B aa07cfce12f28ae5f06d91195986cc2aeea829b035ccf427e1c566eeca297387d70146884fddcd6187fe0e689509b8715ea0a6cedb7a4e3fe5ec694690c14165 SHA512 7bdf67b0dfe60c106e6598ddd366bd8990813a42c3f992c9f74b7291c0b35b8345e8164a17783befb3fc0e3e2c8732dde5bffc44eb11e577a78265fc2e2454e0
-EBUILD ament_uncrustify-9999.ebuild 777 BLAKE2B aa07cfce12f28ae5f06d91195986cc2aeea829b035ccf427e1c566eeca297387d70146884fddcd6187fe0e689509b8715ea0a6cedb7a4e3fe5ec694690c14165 SHA512 7bdf67b0dfe60c106e6598ddd366bd8990813a42c3f992c9f74b7291c0b35b8345e8164a17783befb3fc0e3e2c8732dde5bffc44eb11e577a78265fc2e2454e0
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+EBUILD ament_uncrustify-0.10.0.ebuild 810 BLAKE2B 787273df2df17c7ab6669d41b03ac4af946e19ab82ac97d151a64f8ae5ebe4cacc5412e52ec230931dcc0c9447f75be645c2ec29285c5f51deb4eeddc4e90c80 SHA512 32b7290e38432c311e67f9721b7f5916179c04f955f35c958d82eb23c15d9aa4280af3755134113a18fb25a19a44baf41a5c76bea074dde37fcdd3cbddd58645
+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.9.5.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-0.10.0.ebuild
index fa3b285d2836..43acf79bb21d 100644
--- a/dev-ros/ament_uncrustify/ament_uncrustify-0.9.5.ebuild
+++ b/dev-ros/ament_uncrustify/ament_uncrustify-0.10.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild
index fa3b285d2836..43acf79bb21d 100644
--- a/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild
+++ b/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_xmllint/Manifest b/dev-ros/ament_xmllint/Manifest
index e2c1a0231cba..8401b856fd30 100644
--- a/dev-ros/ament_xmllint/Manifest
+++ b/dev-ros/ament_xmllint/Manifest
@@ -1,4 +1,4 @@
-DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
-EBUILD ament_xmllint-0.9.5.ebuild 1047 BLAKE2B 4becfad9cf69de54c705e4ab87d16167e89c6fbea628db129aeb0b8318d251046fdcad5e8db1c8d6fadf084129b24a5a15e01c5409272ec8c8206b47c2327f1b SHA512 7f0161cc73cbb48c6567bdb980401684944cb1daeb4662a717b2329f4bc1efebc84632006ce8832ffbbd70dedf02a67902e9b0843522f00a04c7308748bf3d22
-EBUILD ament_xmllint-9999.ebuild 1047 BLAKE2B 4becfad9cf69de54c705e4ab87d16167e89c6fbea628db129aeb0b8318d251046fdcad5e8db1c8d6fadf084129b24a5a15e01c5409272ec8c8206b47c2327f1b SHA512 7f0161cc73cbb48c6567bdb980401684944cb1daeb4662a717b2329f4bc1efebc84632006ce8832ffbbd70dedf02a67902e9b0843522f00a04c7308748bf3d22
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+EBUILD ament_xmllint-0.10.0.ebuild 1080 BLAKE2B c86fcc87bf6e04549e993e5503e50f7f373a26d55333cda855ebe8ad0b74f0d28fcb39db983ae39512ad21a58f877874af74d32ee95329a7fc0c07d4fc330595 SHA512 500020a2efba6390399b1d769cd9d7ed374ac0f246820478ea865984c740e1baa25f52da3795bea9d326b5b2d8f7af9fa097b5e0f3eff8ddf87423925f2418f2
+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.9.5.ebuild b/dev-ros/ament_xmllint/ament_xmllint-0.10.0.ebuild
index d9b72688ca3b..b5534f5fbb16 100644
--- a/dev-ros/ament_xmllint/ament_xmllint-0.9.5.ebuild
+++ b/dev-ros/ament_xmllint/ament_xmllint-0.10.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild b/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild
index d9b72688ca3b..b5534f5fbb16 100644
--- a/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild
+++ b/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-30 17:27:54 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-30 17:27:54 +0100
commit	f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
tree	e907cb121b30e3c1df1710719c0ddf4029597a47 /dev-ros
parent	db063b515939ab15261136b24e4bc44386335c0c (diff)