1 |
commit: 30dea65ada6aba709ba4fb6e4c0bbc44794d8d1a |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 30 13:51:16 2020 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 30 13:55:47 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30dea65a |
7 |
|
8 |
dev-ros/ament_xmllint: fix setuptools dep |
9 |
|
10 |
Closes: https://bugs.gentoo.org/745723 |
11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
12 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
13 |
|
14 |
dev-ros/ament_xmllint/Manifest | 1 - |
15 |
dev-ros/ament_xmllint/ament_xmllint-0.10.0.ebuild | 1 + |
16 |
dev-ros/ament_xmllint/ament_xmllint-0.9.5.ebuild | 47 ----------------------- |
17 |
dev-ros/ament_xmllint/ament_xmllint-9999.ebuild | 1 + |
18 |
4 files changed, 2 insertions(+), 48 deletions(-) |
19 |
|
20 |
diff --git a/dev-ros/ament_xmllint/Manifest b/dev-ros/ament_xmllint/Manifest |
21 |
index 8dd9c04fcb2..2bd08ffb898 100644 |
22 |
--- a/dev-ros/ament_xmllint/Manifest |
23 |
+++ b/dev-ros/ament_xmllint/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8 |
26 |
-DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384 |
27 |
|
28 |
diff --git a/dev-ros/ament_xmllint/ament_xmllint-0.10.0.ebuild b/dev-ros/ament_xmllint/ament_xmllint-0.10.0.ebuild |
29 |
index d9b72688ca3..b5534f5fbb1 100644 |
30 |
--- a/dev-ros/ament_xmllint/ament_xmllint-0.10.0.ebuild |
31 |
+++ b/dev-ros/ament_xmllint/ament_xmllint-0.10.0.ebuild |
32 |
@@ -4,6 +4,7 @@ |
33 |
EAPI=7 |
34 |
|
35 |
PYTHON_COMPAT=( python{3_7,3_8} ) |
36 |
+DISTUTILS_USE_SETUPTOOLS=rdepend |
37 |
|
38 |
inherit distutils-r1 |
39 |
|
40 |
|
41 |
diff --git a/dev-ros/ament_xmllint/ament_xmllint-0.9.5.ebuild b/dev-ros/ament_xmllint/ament_xmllint-0.9.5.ebuild |
42 |
deleted file mode 100644 |
43 |
index d9b72688ca3..00000000000 |
44 |
--- a/dev-ros/ament_xmllint/ament_xmllint-0.9.5.ebuild |
45 |
+++ /dev/null |
46 |
@@ -1,47 +0,0 @@ |
47 |
-# Copyright 2019-2020 Gentoo Authors |
48 |
-# Distributed under the terms of the GNU General Public License v2 |
49 |
- |
50 |
-EAPI=7 |
51 |
- |
52 |
-PYTHON_COMPAT=( python{3_7,3_8} ) |
53 |
- |
54 |
-inherit distutils-r1 |
55 |
- |
56 |
-ROS_PN="ament_lint" |
57 |
-if [ "${PV#9999}" != "${PV}" ] ; then |
58 |
- inherit git-r3 |
59 |
- EGIT_REPO_URI="https://github.com/ament/ament_lint" |
60 |
- SRC_URI="" |
61 |
- S=${WORKDIR}/${P}/${PN} |
62 |
-else |
63 |
- SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz" |
64 |
- S="${WORKDIR}/${ROS_PN}-${PV}/${PN}" |
65 |
-fi |
66 |
- |
67 |
-DESCRIPTION="Checks XML files like the package manifest using xmllint" |
68 |
-HOMEPAGE="https://github.com/ament/ament_lint" |
69 |
- |
70 |
-LICENSE="Apache-2.0" |
71 |
-SLOT="0" |
72 |
-if [ "${PV#9999}" != "${PV}" ] ; then |
73 |
- KEYWORDS="" |
74 |
-else |
75 |
- KEYWORDS="~amd64" |
76 |
-fi |
77 |
-IUSE="test" |
78 |
- |
79 |
-RDEPEND=" |
80 |
- dev-ros/ament_lint[${PYTHON_USEDEP}] |
81 |
- dev-libs/libxml2[python,${PYTHON_USEDEP}] |
82 |
-" |
83 |
-DEPEND="${RDEPEND} |
84 |
- test? ( |
85 |
- dev-ros/ament_copyright[${PYTHON_USEDEP}] |
86 |
- dev-ros/ament_flake8[${PYTHON_USEDEP}] |
87 |
- dev-ros/ament_pep257[${PYTHON_USEDEP}] |
88 |
- dev-python/pytest[${PYTHON_USEDEP}] |
89 |
- ) |
90 |
-" |
91 |
-BDEPEND="" |
92 |
- |
93 |
-distutils_enable_tests pytest |
94 |
|
95 |
diff --git a/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild b/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild |
96 |
index d9b72688ca3..b5534f5fbb1 100644 |
97 |
--- a/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild |
98 |
+++ b/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild |
99 |
@@ -4,6 +4,7 @@ |
100 |
EAPI=7 |
101 |
|
102 |
PYTHON_COMPAT=( python{3_7,3_8} ) |
103 |
+DISTUTILS_USE_SETUPTOOLS=rdepend |
104 |
|
105 |
inherit distutils-r1 |