gentoo resync : 25.08.2020

4 files changed, 78 insertions, 17 deletions

diff --git a/dev-ros/ament_cmake_test/Manifest b/dev-ros/ament_cmake_test/Manifest
index 525a99246446..bb268be1bc91 100644
--- a/dev-ros/ament_cmake_test/Manifest
+++ b/dev-ros/ament_cmake_test/Manifest
@@ -1,4 +1,6 @@
-DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
-EBUILD ament_cmake_test-0.8.1.ebuild 1249 BLAKE2B 9de5cd84858828b42234a80abdb7c6fb709a853fb590d36b61aea4a2125356375d99a9dde55e7f5a7c6478c7cff34536a3528a9e39b8c668edad01091546365a SHA512 1c105fe065b6265f165be147a2e8b936b7a1a5de5ae55e2c4a2c826bd35657faf382a975db4b03621f8cf646d3e84e92a12e9b69c555a8f099cbce995715098c
-EBUILD ament_cmake_test-9999.ebuild 1249 BLAKE2B 9de5cd84858828b42234a80abdb7c6fb709a853fb590d36b61aea4a2125356375d99a9dde55e7f5a7c6478c7cff34536a3528a9e39b8c668edad01091546365a SHA512 1c105fe065b6265f165be147a2e8b936b7a1a5de5ae55e2c4a2c826bd35657faf382a975db4b03621f8cf646d3e84e92a12e9b69c555a8f099cbce995715098c
+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
+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-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-0.8.1.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-0.9.6.ebuild
index 938e0193c306..00d8aa0613ba 100644
--- a/dev-ros/ament_cmake_test/ament_cmake_test-0.8.1.ebuild
+++ b/dev-ros/ament_cmake_test/ament_cmake_test-0.9.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# 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} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit cmake-utils python-r1
+inherit cmake python-r1
 
 ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -42,18 +42,18 @@ BDEPEND="${DEPEND}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_configure() {
-	python_foreach_impl cmake-utils_src_configure
+	python_foreach_impl cmake_src_configure
 }
 
 src_compile() {
-	python_foreach_impl cmake-utils_src_compile
+	python_foreach_impl cmake_src_compile
 }
 
 src_test() {
-	python_foreach_impl cmake-utils_src_test
+	python_foreach_impl cmake_src_test
 }
 
 src_install() {
-	python_foreach_impl cmake-utils_src_install
+	python_foreach_impl cmake_src_install
 	python_foreach_impl python_optimize
 }
diff --git a/dev-ros/ament_cmake_test/ament_cmake_test-1.0.0.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-1.0.0.ebuild
new file mode 100644
index 000000000000..00d8aa0613ba
--- /dev/null
+++ b/dev-ros/ament_cmake_test/ament_cmake_test-1.0.0.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_test/ament_cmake_test-9999.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-9999.ebuild
index 938e0193c306..00d8aa0613ba 100644
--- a/dev-ros/ament_cmake_test/ament_cmake_test-9999.ebuild
+++ b/dev-ros/ament_cmake_test/ament_cmake_test-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# 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} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit cmake-utils python-r1
+inherit cmake python-r1
 
 ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -42,18 +42,18 @@ BDEPEND="${DEPEND}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_configure() {
-	python_foreach_impl cmake-utils_src_configure
+	python_foreach_impl cmake_src_configure
 }
 
 src_compile() {
-	python_foreach_impl cmake-utils_src_compile
+	python_foreach_impl cmake_src_compile
 }
 
 src_test() {
-	python_foreach_impl cmake-utils_src_test
+	python_foreach_impl cmake_src_test
 }
 
 src_install() {
-	python_foreach_impl cmake-utils_src_install
+	python_foreach_impl cmake_src_install
 	python_foreach_impl python_optimize
 }