gentoo resync : 25.08.2020

4 files changed, 68 insertions, 9 deletions

diff --git a/dev-ros/ament_cmake_python/Manifest b/dev-ros/ament_cmake_python/Manifest
index 060074eec0b6..e3b7c53500d6 100644
--- a/dev-ros/ament_cmake_python/Manifest
+++ b/dev-ros/ament_cmake_python/Manifest
@@ -1,5 +1,7 @@
 AUX destdir.patch 1203 BLAKE2B fe4e783ea9d4802752d79d489e5b05d0ca9688a76d678521af41f232005da611c0286f594d15045dcae5610362ccc1bb878d29bddbeb86a9452b0289af347d67 SHA512 85e196c9777a6cc8b8b693e3825d5027c7a5db0a74008ad34d9be3714a088a9e651bb99ce53ee2bd95c47b2c1f8c2c657fa18cce0f13b11e4ea437cdd03ef0b3
-DIST ament_cmake-0.8.1.tar.gz 57078 BLAKE2B 4c6d5c821ffef6288cdd400aa9b084fcbfb33d6c9accddd1349bd656d3b3de9e779603bdad256e3f74a292e3805f06e00ba85719f09fe441f6eecdbd236cc878 SHA512 ae6bfe95585a331055ae159f8b4363f237602ece929877766a8c8bd5bfc0b423379dee38e9fe2707f92ed9753564281be13af1202ec4e9b545d293485884f35e
-EBUILD ament_cmake_python-0.8.1-r1.ebuild 1032 BLAKE2B 8113b0daaed54dba1b76fcf18ee95f335591037d6ad83a5b0f9e7c6665c270a6fcbc8b27bbe28e63957c93d53b49d9fcbcebabc7db7ede8ce2358c85e12308dc SHA512 ebb58bf8f4b1e7f7afbad4f5d9bd5ae56dab68307e6c58361ecce66dbc98b70bb959e9d3db97aa83bcd11184be3cf0551c4477233417be7a646b4e22dfe163c1
-EBUILD ament_cmake_python-9999.ebuild 1032 BLAKE2B 8113b0daaed54dba1b76fcf18ee95f335591037d6ad83a5b0f9e7c6665c270a6fcbc8b27bbe28e63957c93d53b49d9fcbcebabc7db7ede8ce2358c85e12308dc SHA512 ebb58bf8f4b1e7f7afbad4f5d9bd5ae56dab68307e6c58361ecce66dbc98b70bb959e9d3db97aa83bcd11184be3cf0551c4477233417be7a646b4e22dfe163c1
+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_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-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-0.8.1-r1.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-0.9.6.ebuild
index fba573262bf6..866ed8213865 100644
--- a/dev-ros/ament_cmake_python/ament_cmake_python-0.8.1-r1.ebuild
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-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
@@ -40,3 +40,8 @@ BDEPEND="
 	${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_python/ament_cmake_python-1.0.0.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.0.0.ebuild
new file mode 100644
index 000000000000..866ed8213865
--- /dev/null
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-1.0.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_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_python/ament_cmake_python-9999.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild
index fba573262bf6..866ed8213865 100644
--- a/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-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
@@ -40,3 +40,8 @@ BDEPEND="
 	${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}]"
+}