[gentoo-commits] repo/gentoo:master commit in: dev-ros/ament_cmake_ros/

[Arthur Zamarin]

commit:     0ec737fd060240c293cb9716cdf15f02a7761608
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 24 10:23:52 2021 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 24 10:29:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ec737fd

dev-ros/ament_cmake_ros: enable py3.9, enable py3.10

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-ros/ament_cmake_ros/ament_cmake_ros-0.9.2.ebuild | 14 +++-----------
 dev-ros/ament_cmake_ros/ament_cmake_ros-9999.ebuild  | 14 +++-----------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/dev-ros/ament_cmake_ros/ament_cmake_ros-0.9.2.ebuild 
b/dev-ros/ament_cmake_ros/ament_cmake_ros-0.9.2.ebuild
index 7c84882802b..9db04e1784f 100644
--- a/dev-ros/ament_cmake_ros/ament_cmake_ros-0.9.2.ebuild
+++ b/dev-ros/ament_cmake_ros/ament_cmake_ros-0.9.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
@@ -11,11 +11,11 @@ ROS_PN="ament_cmake_ros"
 if [ "${PV#9999}" != "${PV}" ] ; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/ros2/ament_cmake_ros";
-       SRC_URI=""
-       S=${WORKDIR}/${P}/${PN}
+       S="${WORKDIR}/${P}/${PN}"
 else
        SRC_URI="https://github.com/ros2/ament_cmake_ros/archive/${PV}.tar.gz 
-> ${ROS_PN}-${PV}.tar.gz"
        S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+       KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="ROS specific CMake bits in the ament buildsystem"
@@ -23,17 +23,9 @@ HOMEPAGE="https://github.com/ros2/ament_cmake_ros";
 
 LICENSE="Apache-2.0"
 SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-       PROPERTIES="live"
-else
-       KEYWORDS="~amd64"
-fi
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-"
-DEPEND="${RDEPEND}"
 BDEPEND="
        $(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
        test? (

diff --git a/dev-ros/ament_cmake_ros/ament_cmake_ros-9999.ebuild 
b/dev-ros/ament_cmake_ros/ament_cmake_ros-9999.ebuild
index 7c84882802b..9db04e1784f 100644
--- a/dev-ros/ament_cmake_ros/ament_cmake_ros-9999.ebuild
+++ b/dev-ros/ament_cmake_ros/ament_cmake_ros-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1
 
@@ -11,11 +11,11 @@ ROS_PN="ament_cmake_ros"
 if [ "${PV#9999}" != "${PV}" ] ; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/ros2/ament_cmake_ros";
-       SRC_URI=""
-       S=${WORKDIR}/${P}/${PN}
+       S="${WORKDIR}/${P}/${PN}"
 else
        SRC_URI="https://github.com/ros2/ament_cmake_ros/archive/${PV}.tar.gz 
-> ${ROS_PN}-${PV}.tar.gz"
        S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+       KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="ROS specific CMake bits in the ament buildsystem"
@@ -23,17 +23,9 @@ HOMEPAGE="https://github.com/ros2/ament_cmake_ros";
 
 LICENSE="Apache-2.0"
 SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-       PROPERTIES="live"
-else
-       KEYWORDS="~amd64"
-fi
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-"
-DEPEND="${RDEPEND}"
 BDEPEND="
        $(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]')
        test? (