summaryrefslogtreecommitdiff
path: root/dev-util/rosdep
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/rosdep')
-rw-r--r--dev-util/rosdep/Manifest4
-rw-r--r--dev-util/rosdep/rosdep-0.21.0.ebuild4
-rw-r--r--dev-util/rosdep/rosdep-9999.ebuild24
3 files changed, 14 insertions, 18 deletions
diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest
index 2462cc2388eb..31ef8c06d772 100644
--- a/dev-util/rosdep/Manifest
+++ b/dev-util/rosdep/Manifest
@@ -1,5 +1,5 @@
AUX tests.patch 886 BLAKE2B e631053ce6ecd6419cf88ca952d28a225229d248f52f6f600bb9865cf9760dea01e4039401b5039330aa6776ae18e1fe0159c725ee5f1bebcc1fd73248d37209 SHA512 87f7ca16f7b7f781ac5a2173ee4a9a6ed1baa2d9583d740d0cd46590d41a5781395fc5fbba185a20cac5cae0a1f967abfc205a67bce3487c0f82b04b0c08600b
DIST rosdep-0.21.0.tar.gz 312028 BLAKE2B 7ad3bfe027c574fdc82952085a5ea447e811b6858fca13121ad25cf1bda04e33091782b69c4a8f9a71383f1716678bd19c8752600987f7c41016ee93eed1ddcb SHA512 fb784c1603087b62444d767f1ce9e45303d2161e69ac82fec0edeeefd99f0c70e14b25b64a516df01e72aaa3a1b4a25b9507855edaa169c3af945e6581d9751d
-EBUILD rosdep-0.21.0.ebuild 1461 BLAKE2B e0094a7f2ffed1cfdef35e810893311de5a6324026b1d4c1eef7d3ebd2490b73527592b33f5fe739b9b86bc1cc97e5aba33d7e573d7cc06eb24edca35939143f SHA512 1b43e9769afe3c9852c0458af434c5d5cd2c6a8c1f9ead659759f024639c830250a0e8f9f30fa81b83f9840ddecb81ab5c88493fd2e689508f31b0e0ca7b6364
-EBUILD rosdep-9999.ebuild 1461 BLAKE2B e0094a7f2ffed1cfdef35e810893311de5a6324026b1d4c1eef7d3ebd2490b73527592b33f5fe739b9b86bc1cc97e5aba33d7e573d7cc06eb24edca35939143f SHA512 1b43e9769afe3c9852c0458af434c5d5cd2c6a8c1f9ead659759f024639c830250a0e8f9f30fa81b83f9840ddecb81ab5c88493fd2e689508f31b0e0ca7b6364
+EBUILD rosdep-0.21.0.ebuild 1463 BLAKE2B 8d15346e3a68b98db33f3e486aa08949e2e35d75775a948fe5fda08cd33e7a6a1a2a1fa944f0e4d99e0e88dbaa23ad465319be51da3282c2ac42a84e207d29b6 SHA512 ff289c1ce0c723e646665c75e98add48f5f9e08548846edbb2134a468f152dd22e4aadff49882c7afa1f553d3903040f393c14fce0fb783ba06f1c176224325a
+EBUILD rosdep-9999.ebuild 1418 BLAKE2B 72fb64046c1a0c6ee41ce327eb01c97c040bc2a85f2c91b9b4bdc3ce85b549a23e9ec30fc35c314ecc8d968bb1e1640afc928d83715a57fc919f70dad51a25a4 SHA512 81783872ee2c48f8d661b0cf1d2e7cae2e136f63d213ea83b08063688c5b6e217d9ad47077a23b147f6b49f33d4c4245c2bbd222a99582e1222b9d6b3f58f3df
MISC metadata.xml 340 BLAKE2B 3b83bd82370daae07a101ac040bb7726d8d79354d7f249a9e09081e1f2042bac1fd8cfbc51f7c2c186e2499962749ad579a2fbef65f2d80dc9f4de620904d976 SHA512 38588868dee16a28125f625e85606a6e0995a6e25cf7c17de373eb45a6ad72e56bc2e98cdd946457aaba53f394ed045cb69891a77796aa0f1c3f2e24e6ab9b56
diff --git a/dev-util/rosdep/rosdep-0.21.0.ebuild b/dev-util/rosdep/rosdep-0.21.0.ebuild
index 4db6d1249c3b..fb9e71e7a7b8 100644
--- a/dev-util/rosdep/rosdep-0.21.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.21.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -44,7 +44,7 @@ BDEPEND="
"
PATCHES=( "${FILESDIR}/tests.patch" )
-distutils_enable_tests nose
+distutils_enable_tests pytest
src_test() {
unset ROS_DISTRO
diff --git a/dev-util/rosdep/rosdep-9999.ebuild b/dev-util/rosdep/rosdep-9999.ebuild
index 4db6d1249c3b..b27a854ad522 100644
--- a/dev-util/rosdep/rosdep-9999.ebuild
+++ b/dev-util/rosdep/rosdep-9999.ebuild
@@ -1,22 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{8..10} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep"
-fi
-
-inherit ${SCM} distutils-r1
+inherit distutils-r1
DESCRIPTION="Command-line tool for installing ROS system dependencies"
HOMEPAGE="https://wiki.ros.org/rosdep"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
+
+if [[ ${PV} = *9999 ]]; then
+ EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep"
+ inherit git-r3
else
SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
https://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz
@@ -29,7 +25,7 @@ SLOT="0"
# Tests need network
RESTRICT="test"
-PROPERTIES+=" test_network"
+PROPERTIES="test_network"
RDEPEND="
dev-python/catkin_pkg[${PYTHON_USEDEP}]
@@ -44,7 +40,7 @@ BDEPEND="
"
PATCHES=( "${FILESDIR}/tests.patch" )
-distutils_enable_tests nose
+distutils_enable_tests pytest
src_test() {
unset ROS_DISTRO