Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/ament_uncrustify/
Date: Wed, 30 Sep 2020 13:56:06
Message-Id: 1601474147.df6b1017150d08d2b038e66d3b3632f3eaf86a20.aballier@gentoo
1 commit: df6b1017150d08d2b038e66d3b3632f3eaf86a20
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 30 13:52:37 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=df6b1017
7
8 dev-ros/ament_uncrustify: fix setuptools dep
9
10 Closes: https://bugs.gentoo.org/745726
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_uncrustify/Manifest | 1 -
15 .../ament_uncrustify-0.10.0.ebuild | 1 +
16 .../ament_uncrustify/ament_uncrustify-0.9.5.ebuild | 37 ----------------------
17 .../ament_uncrustify/ament_uncrustify-9999.ebuild | 1 +
18 4 files changed, 2 insertions(+), 38 deletions(-)
19
20 diff --git a/dev-ros/ament_uncrustify/Manifest b/dev-ros/ament_uncrustify/Manifest
21 index 8dd9c04fcb2..2bd08ffb898 100644
22 --- a/dev-ros/ament_uncrustify/Manifest
23 +++ b/dev-ros/ament_uncrustify/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_uncrustify/ament_uncrustify-0.10.0.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-0.10.0.ebuild
29 index fa3b285d283..43acf79bb21 100644
30 --- a/dev-ros/ament_uncrustify/ament_uncrustify-0.10.0.ebuild
31 +++ b/dev-ros/ament_uncrustify/ament_uncrustify-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_uncrustify/ament_uncrustify-0.9.5.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-0.9.5.ebuild
42 deleted file mode 100644
43 index fa3b285d283..00000000000
44 --- a/dev-ros/ament_uncrustify/ament_uncrustify-0.9.5.ebuild
45 +++ /dev/null
46 @@ -1,37 +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="The ability to check code against style conventions using uncrustify"
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=""
78 -
79 -RDEPEND="
80 - dev-util/uncrustify
81 -"
82 -DEPEND=""
83 -BDEPEND=""
84
85 diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild
86 index fa3b285d283..43acf79bb21 100644
87 --- a/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild
88 +++ b/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild
89 @@ -4,6 +4,7 @@
90 EAPI=7
91
92 PYTHON_COMPAT=( python{3_7,3_8} )
93 +DISTUTILS_USE_SETUPTOOLS=rdepend
94
95 inherit distutils-r1