gentoo resync : 25.08.2020

4 files changed, 57 insertions, 9 deletions

diff --git a/dev-ros/ament_cmake_libraries/Manifest b/dev-ros/ament_cmake_libraries/Manifest
index 87567b9cb1bd..380eb0cded4f 100644
--- a/dev-ros/ament_cmake_libraries/Manifest
+++ b/dev-ros/ament_cmake_libraries/Manifest
@@ -1,4 +1,6 @@
-DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
-EBUILD ament_cmake_libraries-0.8.1.ebuild 1153 BLAKE2B 742d43baa3796a5dd5067256bad9ae0cf7ce11e7f7d59e043530038d129a7ac866dfcd4ca48085ecb8f2e225e4df03553a2272511c5c062b3e38e2a6a472170f SHA512 a210c241e8b2f0eeae4e787abf1facff78118ae6b05c11c89c6ba7e6b55c50665a6629f815c0817fc7ccb0ed68a47776305c858c3529a8549c6b9a1d706fb27d
-EBUILD ament_cmake_libraries-9999.ebuild 1153 BLAKE2B 742d43baa3796a5dd5067256bad9ae0cf7ce11e7f7d59e043530038d129a7ac866dfcd4ca48085ecb8f2e225e4df03553a2272511c5c062b3e38e2a6a472170f SHA512 a210c241e8b2f0eeae4e787abf1facff78118ae6b05c11c89c6ba7e6b55c50665a6629f815c0817fc7ccb0ed68a47776305c858c3529a8549c6b9a1d706fb27d
+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_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-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-0.8.1.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-0.9.6.ebuild
index 9e26d92976cd..b578744e5fc1 100644
--- a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-0.8.1.ebuild
+++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-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-any-r1
+inherit cmake python-any-r1
 
 ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.0.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.0.ebuild
new file mode 100644
index 000000000000..b578744e5fc1
--- /dev/null
+++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.0.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_libraries/ament_cmake_libraries-9999.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-9999.ebuild
index 9e26d92976cd..b578744e5fc1 100644
--- a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-9999.ebuild
+++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-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-any-r1
+inherit cmake python-any-r1
 
 ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then