gentoo resync : 29.12.2022

4 files changed, 67 insertions, 2 deletions

diff --git a/dev-ros/ament_cmake_core/Manifest b/dev-ros/ament_cmake_core/Manifest
index 59c672a2a9c1..a6810a65720c 100644
--- a/dev-ros/ament_cmake_core/Manifest
+++ b/dev-ros/ament_cmake_core/Manifest
@@ -1,6 +1,8 @@
+AUX findpython.patch 543 BLAKE2B b5124bbbfdd97548aaf61bc5c0693bbd230a253302054103b83ae3136c4152f1b692b92a275dcb64713e1baaa0478a65a78a3e3bab9b8668fb14bf5e2c55ffac SHA512 1bd15b358230d43e7556536550287fa3b1e1eaf73fc852986ae7cec82bb13d883f08ac08b89de327465a76a0acdb94a1b09b4a80c4285f85224a2411ab712799
 DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
 EBUILD ament_cmake_core-1.1.4.ebuild 1075 BLAKE2B ff884eddba246893586a32fd06e24bd72119d430d3191b1c3e88de924f8994dea0063299946e3a1ab3bf484e696f610f636833d67fe3db1abc0fad18c55d0367 SHA512 d9f881098dfbee87dd5c4c387641353856aa37a4de85019943b4f1dce4bd2e6e04e43fadc5ef9ad5f40c91b35a5ca7e9f8054b8911962541681519f2d7a363b4
+EBUILD ament_cmake_core-1.3.0-r1.ebuild 1118 BLAKE2B a52ebad923bd46201e5d03d6ed84d929c325fbb1abeb215dbe2bdf158144c69103a0f45b0a71026efc43eccb574b82c5c4af986ef02b069cee248f073ee14f95 SHA512 868413b27d322859a673f8bb6431b4110b302a49c10a2c34bd153f7945ea202335b78cc3603bed0186f7099609527fca30f53bb6d3b964c58bab3022e49eb5d9
 EBUILD ament_cmake_core-1.3.0.ebuild 1075 BLAKE2B b316f88d4917bcd603d931c4dbf322910332d87a787e4eb004e3cac909ef0d9dbccc903a35d5b39534cf7b740c5da917d131ecaf80cac9a1702839b1d94d8eb3 SHA512 31c22b3cc6e68423f3f23aa3b0605fae6d6304c4fa194f621035fee473121a5df90eb7a29f6926a265174816dd67e88d556a54f2976c05d44e1287d84957e2ed
-EBUILD ament_cmake_core-9999.ebuild 1075 BLAKE2B ff884eddba246893586a32fd06e24bd72119d430d3191b1c3e88de924f8994dea0063299946e3a1ab3bf484e696f610f636833d67fe3db1abc0fad18c55d0367 SHA512 d9f881098dfbee87dd5c4c387641353856aa37a4de85019943b4f1dce4bd2e6e04e43fadc5ef9ad5f40c91b35a5ca7e9f8054b8911962541681519f2d7a363b4
+EBUILD ament_cmake_core-9999.ebuild 1118 BLAKE2B a52ebad923bd46201e5d03d6ed84d929c325fbb1abeb215dbe2bdf158144c69103a0f45b0a71026efc43eccb574b82c5c4af986ef02b069cee248f073ee14f95 SHA512 868413b27d322859a673f8bb6431b4110b302a49c10a2c34bd153f7945ea202335b78cc3603bed0186f7099609527fca30f53bb6d3b964c58bab3022e49eb5d9
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..3e96c689fcb9
--- /dev/null
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+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
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+PATCHES=( "${FILESDIR}/findpython.patch" )
+
+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_core/ament_cmake_core-9999.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
index 0bc79bd3fd0c..3e96c689fcb9 100644
--- a/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,6 +29,7 @@ else
 	KEYWORDS="~amd64"
 fi
 IUSE=""
+PATCHES=( "${FILESDIR}/findpython.patch" )
 
 RDEPEND="
 	dev-python/ament_package
diff --git a/dev-ros/ament_cmake_core/files/findpython.patch b/dev-ros/ament_cmake_core/files/findpython.patch
new file mode 100644
index 000000000000..790b0631b82c
--- /dev/null
+++ b/dev-ros/ament_cmake_core/files/findpython.patch
@@ -0,0 +1,15 @@
+Index: ament_cmake_core/cmake/core/python.cmake
+===================================================================
+--- ament_cmake_core.orig/cmake/core/python.cmake
++++ ament_cmake_core/cmake/core/python.cmake
+@@ -17,6 +17,10 @@
+ # Example:
+ #   find_package(Python3 3.8 REQUIRED)
+ #   find_package(ament_cmake REQUIRED)
++ 
++if (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo)
++  set(Python3_FIND_UNVERSIONED_NAMES FIRST)
++endif()
+ if(NOT TARGET Python3::Interpreter)
+   find_package(Python3 REQUIRED COMPONENTS Interpreter)
+ endif()