From 24fd814c326e282c4321965c31f341dad77e270d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Jan 2021 11:28:34 +0000 Subject: gentoo resync : 08.01.2021 --- dev-util/rosdep/Manifest | 6 +-- dev-util/rosdep/files/tests.patch | 13 ------- dev-util/rosdep/rosdep-0.19.0-r1.ebuild | 68 --------------------------------- dev-util/rosdep/rosdep-0.20.0.ebuild | 68 +++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 84 deletions(-) delete mode 100644 dev-util/rosdep/rosdep-0.19.0-r1.ebuild create mode 100644 dev-util/rosdep/rosdep-0.20.0.ebuild (limited to 'dev-util/rosdep') diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest index 0c1d72ad3571..f62c008b083a 100644 --- a/dev-util/rosdep/Manifest +++ b/dev-util/rosdep/Manifest @@ -1,5 +1,5 @@ -AUX tests.patch 1578 BLAKE2B c83b381010e29052a51f9dfb9a9ac24e9076caa23194deb1c7062b56f83bd03dce6281038541cca6c9353c2eaf90b5bbd6eaa9447ae5868b3e56e4f870be3908 SHA512 da349f614bd497dbe1437eb841657183c1b623fb3d4a933c9fe0202dd1dab741cb962370efb56cb8f11f51b70da106033fa9aafbc9d8f36e3ec1729fe6b5ec74 -DIST rosdep-0.19.0.tar.gz 309029 BLAKE2B d4d9f607757c418f848a89987db6ff17a98719d0cacab49250abf45145a9f5b538d9442622ec3a8c3536061e82e624f25c9a7b777662b686167e2fdce88433ec SHA512 3e1d5829689646d583da2eaaf3b8bbddec3cb4ca3dc3941ee2697f6367510a4dcff11984fa1792a400f49132778d7869f0a8274e42bc8c04f2e326e6a663c494 -EBUILD rosdep-0.19.0-r1.ebuild 1624 BLAKE2B b02379abc8277ca2d293141b3376fe6f18110b43336d5bf6fa624b40b9efdceb6e709197bd7c60f01f0f510cf1338b0893472d93eda16d483126df7092494dfd SHA512 84a81ca80cfc28c72b5cd37208e3569d377e09ee9908416a32230b77cb730ee70fa8a30b2f8d9173062015d8b906385360d47dcc500937f0a3188b04e17ee87a +AUX tests.patch 886 BLAKE2B e631053ce6ecd6419cf88ca952d28a225229d248f52f6f600bb9865cf9760dea01e4039401b5039330aa6776ae18e1fe0159c725ee5f1bebcc1fd73248d37209 SHA512 87f7ca16f7b7f781ac5a2173ee4a9a6ed1baa2d9583d740d0cd46590d41a5781395fc5fbba185a20cac5cae0a1f967abfc205a67bce3487c0f82b04b0c08600b +DIST rosdep-0.20.0.tar.gz 310881 BLAKE2B f81275e6b88de10b1bd080feaa97a5f870aea6f4bfa7d8ccaa788df01b5b43890f99fee3d2bdbf7dda811745a89d54aac948201a218dd32d56f2ed49eefbdaf8 SHA512 f464b4a1bd3ef437f4ef0ca55eed873125c537aed793b22e99dcdfdeb078bdd3dc03cbe75b67d6ba7b29c7390b893f85c436fb90fc339a26dca338e8652db917 +EBUILD rosdep-0.20.0.ebuild 1624 BLAKE2B dcb52662e24717f2bf79329c7ac2669e202b17a4b786ecfeefb8bedf80e20766b9b48876189b41143198e5591162d8b58c9e142128436fa8bfccee85d222cdaa SHA512 4c4e33273304deaaa2837dc07ef5a820820bb5726844174e22d0e6d95832d19f0b5335489db5429ca81904b78cffd5b265890a629366be519cec00201b97897e EBUILD rosdep-9999.ebuild 1624 BLAKE2B b02379abc8277ca2d293141b3376fe6f18110b43336d5bf6fa624b40b9efdceb6e709197bd7c60f01f0f510cf1338b0893472d93eda16d483126df7092494dfd SHA512 84a81ca80cfc28c72b5cd37208e3569d377e09ee9908416a32230b77cb730ee70fa8a30b2f8d9173062015d8b906385360d47dcc500937f0a3188b04e17ee87a MISC metadata.xml 339 BLAKE2B 98c570641ca07f96e5fcfaece9d49977136f720d77c9cf6dcecbb06bc4016410e082201d69d3c36af5de03cc70ea5a1b726289124324e2f11266e5db69a6ea97 SHA512 62ab4dc2638e4af95290eba19e1755d3bade56e5d1e7251d3cc9da410fcf7ead48562193b2cb6b6f8800daf7df31786e70ce153780b9e278891c31d2b9c257bf diff --git a/dev-util/rosdep/files/tests.patch b/dev-util/rosdep/files/tests.patch index cd6e199b3cd0..fa4fcfdb36a8 100644 --- a/dev-util/rosdep/files/tests.patch +++ b/dev-util/rosdep/files/tests.patch @@ -1,16 +1,3 @@ -Index: rosdep-0.19.0/src/rosdep2/platforms/osx.py -=================================================================== ---- rosdep-0.19.0.orig/src/rosdep2/platforms/osx.py -+++ rosdep-0.19.0/src/rosdep2/platforms/osx.py -@@ -303,7 +303,7 @@ class HomebrewInstaller(PackageManagerIn - - # make sure options is a list of list of strings - try: -- valid = all([isinstance(x, _basestring) for l in options for x in l]) -+ valid = all([isinstance(x, _basestring) for option in options for x in option]) - except Exception as e: - raise InvalidData("Invalid list of options '%s', error: %s" % (options, e)) - else: Index: rosdep-0.19.0/test/test_rosdep_gentoo.py =================================================================== --- rosdep-0.19.0.orig/test/test_rosdep_gentoo.py diff --git a/dev-util/rosdep/rosdep-0.19.0-r1.ebuild b/dev-util/rosdep/rosdep-0.19.0-r1.ebuild deleted file mode 100644 index 861de0006ff1..000000000000 --- a/dev-util/rosdep/rosdep-0.19.0-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep" -fi - -inherit ${SCM} distutils-r1 - -DESCRIPTION="Command-line tool for installing ROS system dependencies" -HOMEPAGE="https://wiki.ros.org/rosdep" -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" - KEYWORDS="" -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 - " - KEYWORDS="~amd64 ~arm" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/catkin_pkg[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}] - dev-python/rosdistro[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-python/nose[${PYTHON_USEDEP}] - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/flake8[${PYTHON_USEDEP}] - ) -" -PATCHES=( "${FILESDIR}/tests.patch" ) - -python_test() { - if has network-sandbox ${FEATURES}; then - einfo "Skipping tests due to network sandbox" - else - env -u ROS_DISTRO nosetests --with-xunit test || die - fi -} - -pkg_postrm() { - if [ "${ROOT:-/}" = "/" ] ; then - einfo "Removing rosdep default sources list." - rm -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" - fi -} - -pkg_postinst() { - if [ "${ROOT:-/}" = "/" -a ! -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" ] ; then - einfo "Initializing rosdep" - rosdep init - fi -} diff --git a/dev-util/rosdep/rosdep-0.20.0.ebuild b/dev-util/rosdep/rosdep-0.20.0.ebuild new file mode 100644 index 000000000000..6e254e1702e6 --- /dev/null +++ b/dev-util/rosdep/rosdep-0.20.0.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +SCM="" +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep" +fi + +inherit ${SCM} distutils-r1 + +DESCRIPTION="Command-line tool for installing ROS system dependencies" +HOMEPAGE="https://wiki.ros.org/rosdep" +if [ "${PV#9999}" != "${PV}" ] ; then + SRC_URI="" + KEYWORDS="" +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 + " + KEYWORDS="~amd64 ~arm" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-python/catkin_pkg[${PYTHON_USEDEP}] + dev-python/rospkg[${PYTHON_USEDEP}] + dev-python/rosdistro[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-python/nose[${PYTHON_USEDEP}] + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/flake8[${PYTHON_USEDEP}] + ) +" +PATCHES=( "${FILESDIR}/tests.patch" ) + +python_test() { + if has network-sandbox ${FEATURES}; then + einfo "Skipping tests due to network sandbox" + else + env -u ROS_DISTRO nosetests --with-xunit test || die + fi +} + +pkg_postrm() { + if [ "${ROOT:-/}" = "/" ] ; then + einfo "Removing rosdep default sources list." + rm -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" + fi +} + +pkg_postinst() { + if [ "${ROOT:-/}" = "/" -a ! -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" ] ; then + einfo "Initializing rosdep" + rosdep init + fi +} -- cgit v1.2.3