From c5566b0759e89abc79fc8e73143f450ec3978929 Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Tue, 3 Aug 2021 16:01:03 +0200
Subject: dev-ros/ament_lint: python improvements

add py39 & 310
setup distutils dep properly
enable but restrict tests

Closes: https://bugs.gentoo.org/798624
Closes: https://bugs.gentoo.org/803005
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
---
 dev-ros/ament_lint/ament_lint-0.10.4-r1.ebuild | 40 ++++++++++++++++++++++++++
 dev-ros/ament_lint/ament_lint-0.10.4.ebuild    | 35 ----------------------
 dev-ros/ament_lint/ament_lint-9999.ebuild      |  7 ++++-
 3 files changed, 46 insertions(+), 36 deletions(-)
 create mode 100644 dev-ros/ament_lint/ament_lint-0.10.4-r1.ebuild
 delete mode 100644 dev-ros/ament_lint/ament_lint-0.10.4.ebuild

(limited to 'dev-ros/ament_lint')

diff --git a/dev-ros/ament_lint/ament_lint-0.10.4-r1.ebuild b/dev-ros/ament_lint/ament_lint-0.10.4-r1.ebuild
new file mode 100644
index 000000000000..8c8bff8aecc0
--- /dev/null
+++ b/dev-ros/ament_lint/ament_lint-0.10.4-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-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}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Common API for ament linter packages"
+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=""
+DEPEND="${RDEPEND}"
+BDEPEND=""
+# pytest.ini is there but no tests are ran causing it to fail
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint/ament_lint-0.10.4.ebuild b/dev-ros/ament_lint/ament_lint-0.10.4.ebuild
deleted file mode 100644
index ea29b12dcd48..000000000000
--- a/dev-ros/ament_lint/ament_lint-0.10.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit distutils-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}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Common API for ament linter packages"
-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=""
-DEPEND="${RDEPEND}"
-BDEPEND=""
diff --git a/dev-ros/ament_lint/ament_lint-9999.ebuild b/dev-ros/ament_lint/ament_lint-9999.ebuild
index ea29b12dcd48..8c8bff8aecc0 100644
--- a/dev-ros/ament_lint/ament_lint-9999.ebuild
+++ b/dev-ros/ament_lint/ament_lint-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -33,3 +34,7 @@ IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}"
 BDEPEND=""
+# pytest.ini is there but no tests are ran causing it to fail
+RESTRICT="test"
+
+distutils_enable_tests pytest
-- 
cgit v1.2.3-65-gdbad