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

[Arthur Zamarin]

commit:     aac20b90cebc18cda23e4f48845777f44e8e077f
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 24 09:34:56 2021 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 24 10:29:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aac20b90

dev-ros/ament_cmake_cppcheck: enable py3.9

passes tests

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

 .../ament_cmake_cppcheck-0.11.2.ebuild                   | 16 ++++++----------
 .../ament_cmake_cppcheck-9999.ebuild                     | 16 ++++++----------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.11.2.ebuild 
b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.11.2.ebuild
index db8cbeb5173..7c749cbd249 100644
--- a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.11.2.ebuild
+++ b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.11.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_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="CMake API for ament_cppcheck to perform static code analysis on 
C/C++"
@@ -23,11 +23,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="test"
 RESTRICT="!test? ( test )"
 
@@ -36,9 +31,10 @@ RDEPEND="
        dev-ros/ament_cmake_core
        dev-ros/ament_cppcheck
 "
-DEPEND=""
 BDEPEND="
-       $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] 
dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+       $(python_gen_any_dep '
+               dev-python/ament_package[${PYTHON_USEDEP}]
+               dev-python/catkin_pkg[${PYTHON_USEDEP}]')
        dev-ros/ament_cmake_test
        dev-ros/ament_cmake_core
        test? (

diff --git a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-9999.ebuild 
b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-9999.ebuild
index db8cbeb5173..7c749cbd249 100644
--- a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-9999.ebuild
+++ b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-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_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="CMake API for ament_cppcheck to perform static code analysis on 
C/C++"
@@ -23,11 +23,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="test"
 RESTRICT="!test? ( test )"
 
@@ -36,9 +31,10 @@ RDEPEND="
        dev-ros/ament_cmake_core
        dev-ros/ament_cppcheck
 "
-DEPEND=""
 BDEPEND="
-       $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] 
dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+       $(python_gen_any_dep '
+               dev-python/ament_package[${PYTHON_USEDEP}]
+               dev-python/catkin_pkg[${PYTHON_USEDEP}]')
        dev-ros/ament_cmake_test
        dev-ros/ament_cmake_core
        test? (