commit:     5f733bc1078a6c7e59bf6c3c4c5f8d5b572a4ec5
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 24 08:27:44 2021 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 24 10:29:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f733bc1

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

checked by testing the same resulting files using various python
targets

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

 .../ament_cmake_lint_cmake-0.11.2.ebuild               | 18 +++++++-----------
 .../ament_cmake_lint_cmake-9999.ebuild                 | 18 +++++++-----------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git 
a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.ebuild 
b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.ebuild
index d16461b67cd..57023a6b7a9 100644
--- a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.ebuild
+++ b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.ebuild
@@ -3,19 +3,18 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake python-any-r1
 
 ROS_PN="ament_lint"
 if [ "${PV#9999}" != "${PV}" ] ; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/ament/ament_lint";
-       SRC_URI=""
-       S=${WORKDIR}/${P}/${PN}
+       S="${WORKDIR}/${P}/${PN}"
 else
        SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> 
${ROS_PN}-${PV}.tar.gz"
        S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+       KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="The CMake API for ament_lint_cmake to lint CMake code using 
cmakelint"
@@ -23,12 +22,6 @@ HOMEPAGE="https://github.com/ament/ament_lint";
 
 LICENSE="Apache-2.0"
 SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-       PROPERTIES="live"
-else
-       KEYWORDS="~amd64"
-fi
-IUSE=""
 
 RDEPEND="
        dev-ros/ament_cmake_test
@@ -36,7 +29,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-       $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] 
dev-python/catkin_pkg[${PYTHON_USEDEP}] 
dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]')
+       $(python_gen_any_dep '
+               dev-python/ament_package[${PYTHON_USEDEP}]
+               dev-python/catkin_pkg[${PYTHON_USEDEP}]
+               dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]')
        dev-ros/ament_cmake_test
        dev-ros/ament_cmake_core
        ${PYTHON_DEPS}

diff --git a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-9999.ebuild 
b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-9999.ebuild
index d16461b67cd..57023a6b7a9 100644
--- a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-9999.ebuild
+++ b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-9999.ebuild
@@ -3,19 +3,18 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake python-any-r1
 
 ROS_PN="ament_lint"
 if [ "${PV#9999}" != "${PV}" ] ; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/ament/ament_lint";
-       SRC_URI=""
-       S=${WORKDIR}/${P}/${PN}
+       S="${WORKDIR}/${P}/${PN}"
 else
        SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> 
${ROS_PN}-${PV}.tar.gz"
        S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+       KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="The CMake API for ament_lint_cmake to lint CMake code using 
cmakelint"
@@ -23,12 +22,6 @@ HOMEPAGE="https://github.com/ament/ament_lint";
 
 LICENSE="Apache-2.0"
 SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-       PROPERTIES="live"
-else
-       KEYWORDS="~amd64"
-fi
-IUSE=""
 
 RDEPEND="
        dev-ros/ament_cmake_test
@@ -36,7 +29,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-       $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] 
dev-python/catkin_pkg[${PYTHON_USEDEP}] 
dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]')
+       $(python_gen_any_dep '
+               dev-python/ament_package[${PYTHON_USEDEP}]
+               dev-python/catkin_pkg[${PYTHON_USEDEP}]
+               dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]')
        dev-ros/ament_cmake_test
        dev-ros/ament_cmake_core
        ${PYTHON_DEPS}

Reply via email to