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

tested by checking reverse dependencies are building the same and passing Signed-off-by: Arthur Zamarin <[email protected]>
hanetzer · Sep 24, 2021 · d6cfdba · d6cfdba
1 parent 71c05fe
commit d6cfdba
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 20 deletions.
diff --git a/dev-ros/ament_lint_auto/ament_lint_auto-0.11.2.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-0.11.2.ebuild
@@ -3,32 +3,26 @@
 
 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 auto-magic functions for ease to use of the ament linters"
 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_core
@@ -37,7 +31,9 @@ RDEPEND="
 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_gen_any_dep '
+ dev-python/ament_package[${PYTHON_USEDEP}]
+ dev-python/catkin_pkg[${PYTHON_USEDEP}]')
  ${PYTHON_DEPS}
 "
 

diff --git a/dev-ros/ament_lint_auto/ament_lint_auto-9999.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-9999.ebuild
@@ -3,32 +3,26 @@
 
 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 auto-magic functions for ease to use of the ament linters"
 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_core
@@ -37,7 +31,9 @@ RDEPEND="
 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_gen_any_dep '
+ dev-python/ament_package[${PYTHON_USEDEP}]
+ dev-python/catkin_pkg[${PYTHON_USEDEP}]')
  ${PYTHON_DEPS}
 "