1 |
commit: 5f733bc1078a6c7e59bf6c3c4c5f8d5b572a4ec5 |
2 |
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 24 08:27:44 2021 +0000 |
4 |
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 24 10:29:41 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f733bc1 |
7 |
|
8 |
dev-ros/ament_cmake_lint_cmake: enable py3.9, enable py3.10 |
9 |
|
10 |
checked by testing the same resulting files using various python |
11 |
targets |
12 |
|
13 |
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> |
14 |
|
15 |
.../ament_cmake_lint_cmake-0.11.2.ebuild | 18 +++++++----------- |
16 |
.../ament_cmake_lint_cmake-9999.ebuild | 18 +++++++----------- |
17 |
2 files changed, 14 insertions(+), 22 deletions(-) |
18 |
|
19 |
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 |
20 |
index d16461b67cd..57023a6b7a9 100644 |
21 |
--- a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.ebuild |
22 |
+++ b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.ebuild |
23 |
@@ -3,19 +3,18 @@ |
24 |
|
25 |
EAPI=7 |
26 |
|
27 |
-PYTHON_COMPAT=( python{3_7,3_8} ) |
28 |
- |
29 |
+PYTHON_COMPAT=( python3_{8..10} ) |
30 |
inherit cmake python-any-r1 |
31 |
|
32 |
ROS_PN="ament_lint" |
33 |
if [ "${PV#9999}" != "${PV}" ] ; then |
34 |
inherit git-r3 |
35 |
EGIT_REPO_URI="https://github.com/ament/ament_lint" |
36 |
- SRC_URI="" |
37 |
- S=${WORKDIR}/${P}/${PN} |
38 |
+ S="${WORKDIR}/${P}/${PN}" |
39 |
else |
40 |
SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz" |
41 |
S="${WORKDIR}/${ROS_PN}-${PV}/${PN}" |
42 |
+ KEYWORDS="~amd64" |
43 |
fi |
44 |
|
45 |
DESCRIPTION="The CMake API for ament_lint_cmake to lint CMake code using cmakelint" |
46 |
@@ -23,12 +22,6 @@ HOMEPAGE="https://github.com/ament/ament_lint" |
47 |
|
48 |
LICENSE="Apache-2.0" |
49 |
SLOT="0" |
50 |
-if [ "${PV#9999}" != "${PV}" ] ; then |
51 |
- PROPERTIES="live" |
52 |
-else |
53 |
- KEYWORDS="~amd64" |
54 |
-fi |
55 |
-IUSE="" |
56 |
|
57 |
RDEPEND=" |
58 |
dev-ros/ament_cmake_test |
59 |
@@ -36,7 +29,10 @@ RDEPEND=" |
60 |
" |
61 |
DEPEND="${RDEPEND}" |
62 |
BDEPEND=" |
63 |
- $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]') |
64 |
+ $(python_gen_any_dep ' |
65 |
+ dev-python/ament_package[${PYTHON_USEDEP}] |
66 |
+ dev-python/catkin_pkg[${PYTHON_USEDEP}] |
67 |
+ dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]') |
68 |
dev-ros/ament_cmake_test |
69 |
dev-ros/ament_cmake_core |
70 |
${PYTHON_DEPS} |
71 |
|
72 |
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 |
73 |
index d16461b67cd..57023a6b7a9 100644 |
74 |
--- a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-9999.ebuild |
75 |
+++ b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-9999.ebuild |
76 |
@@ -3,19 +3,18 @@ |
77 |
|
78 |
EAPI=7 |
79 |
|
80 |
-PYTHON_COMPAT=( python{3_7,3_8} ) |
81 |
- |
82 |
+PYTHON_COMPAT=( python3_{8..10} ) |
83 |
inherit cmake python-any-r1 |
84 |
|
85 |
ROS_PN="ament_lint" |
86 |
if [ "${PV#9999}" != "${PV}" ] ; then |
87 |
inherit git-r3 |
88 |
EGIT_REPO_URI="https://github.com/ament/ament_lint" |
89 |
- SRC_URI="" |
90 |
- S=${WORKDIR}/${P}/${PN} |
91 |
+ S="${WORKDIR}/${P}/${PN}" |
92 |
else |
93 |
SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz" |
94 |
S="${WORKDIR}/${ROS_PN}-${PV}/${PN}" |
95 |
+ KEYWORDS="~amd64" |
96 |
fi |
97 |
|
98 |
DESCRIPTION="The CMake API for ament_lint_cmake to lint CMake code using cmakelint" |
99 |
@@ -23,12 +22,6 @@ HOMEPAGE="https://github.com/ament/ament_lint" |
100 |
|
101 |
LICENSE="Apache-2.0" |
102 |
SLOT="0" |
103 |
-if [ "${PV#9999}" != "${PV}" ] ; then |
104 |
- PROPERTIES="live" |
105 |
-else |
106 |
- KEYWORDS="~amd64" |
107 |
-fi |
108 |
-IUSE="" |
109 |
|
110 |
RDEPEND=" |
111 |
dev-ros/ament_cmake_test |
112 |
@@ -36,7 +29,10 @@ RDEPEND=" |
113 |
" |
114 |
DEPEND="${RDEPEND}" |
115 |
BDEPEND=" |
116 |
- $(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]') |
117 |
+ $(python_gen_any_dep ' |
118 |
+ dev-python/ament_package[${PYTHON_USEDEP}] |
119 |
+ dev-python/catkin_pkg[${PYTHON_USEDEP}] |
120 |
+ dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]') |
121 |
dev-ros/ament_cmake_test |
122 |
dev-ros/ament_cmake_core |
123 |
${PYTHON_DEPS} |