commit: 30dea65ada6aba709ba4fb6e4c0bbc44794d8d1a Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Wed Sep 30 13:51:16 2020 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Wed Sep 30 13:55:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30dea65a
dev-ros/ament_xmllint: fix setuptools dep Closes: https://bugs.gentoo.org/745723 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> dev-ros/ament_xmllint/Manifest | 1 - dev-ros/ament_xmllint/ament_xmllint-0.10.0.ebuild | 1 + dev-ros/ament_xmllint/ament_xmllint-0.9.5.ebuild | 47 ----------------------- dev-ros/ament_xmllint/ament_xmllint-9999.ebuild | 1 + 4 files changed, 2 insertions(+), 48 deletions(-) diff --git a/dev-ros/ament_xmllint/Manifest b/dev-ros/ament_xmllint/Manifest index 8dd9c04fcb2..2bd08ffb898 100644 --- a/dev-ros/ament_xmllint/Manifest +++ b/dev-ros/ament_xmllint/Manifest @@ -1,2 +1 @@ DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8 -DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384 diff --git a/dev-ros/ament_xmllint/ament_xmllint-0.10.0.ebuild b/dev-ros/ament_xmllint/ament_xmllint-0.10.0.ebuild index d9b72688ca3..b5534f5fbb1 100644 --- a/dev-ros/ament_xmllint/ament_xmllint-0.10.0.ebuild +++ b/dev-ros/ament_xmllint/ament_xmllint-0.10.0.ebuild @@ -4,6 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python{3_7,3_8} ) +DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 diff --git a/dev-ros/ament_xmllint/ament_xmllint-0.9.5.ebuild b/dev-ros/ament_xmllint/ament_xmllint-0.9.5.ebuild deleted file mode 100644 index d9b72688ca3..00000000000 --- a/dev-ros/ament_xmllint/ament_xmllint-0.9.5.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2019-2020 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="Checks XML files like the package manifest using xmllint" -HOMEPAGE="https://github.com/ament/ament_lint"; - -LICENSE="Apache-2.0" -SLOT="0" -if [ "${PV#9999}" != "${PV}" ] ; then - KEYWORDS="" -else - KEYWORDS="~amd64" -fi -IUSE="test" - -RDEPEND=" - dev-ros/ament_lint[${PYTHON_USEDEP}] - dev-libs/libxml2[python,${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( - dev-ros/ament_copyright[${PYTHON_USEDEP}] - dev-ros/ament_flake8[${PYTHON_USEDEP}] - dev-ros/ament_pep257[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - ) -" -BDEPEND="" - -distutils_enable_tests pytest diff --git a/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild b/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild index d9b72688ca3..b5534f5fbb1 100644 --- a/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild +++ b/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild @@ -4,6 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python{3_7,3_8} ) +DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1
