commit: 4274c4df40af7e72ad02e8bc597f2207adaf791e Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Tue Apr 14 12:53:06 2020 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Tue Apr 14 12:54:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4274c4df
Revert "dev-python/rospkg: Remove redundant versions" This reverts commit dc9da7ffe2c399ae57974a164dee6bedebdeef04. Closes: https://bugs.gentoo.org/715382 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> dev-python/rospkg/Manifest | 2 ++ dev-python/rospkg/files/gentoo.patch | 15 +++++++++++ dev-python/rospkg/rospkg-1.1.10.ebuild | 49 ++++++++++++++++++++++++++++++++++ dev-python/rospkg/rospkg-1.1.9.ebuild | 49 ++++++++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+) diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest index 3d7146dfd9e..a12f2364d91 100644 --- a/dev-python/rospkg/Manifest +++ b/dev-python/rospkg/Manifest @@ -1 +1,3 @@ +DIST rospkg-1.1.10.tar.gz 90434 BLAKE2B 1eb128d7e3f6d07e8309ecf5ea6c4340afcbb6f0618fd4628543c046003782750c5013c13ff2ed17018abc6efc6ce2042ccf2c6dccea8933be7045ddfe3f4522 SHA512 54b1b0ca4683b9388989501781239cf35873f2bf2028d176718f624999835b21e44f0cc5988624b37f7172d21f0c01aa336d35a884753c842098e558c37ac6c8 +DIST rospkg-1.1.9.tar.gz 90412 BLAKE2B 4cca7d1ebfcba495aafd766f0d720a6bc6e5aade0bff098d4a1cbab3b55c7a720de7d1f97edf806a93cc21eeda4cac86e844b5e3b23f85cbcb7b328fd07da222 SHA512 d33005e29313ba06959189f8f563361fd9523c2368855f260347b4c509d8b4053f74db3e2cf5986031653d647ded097f272f65d617da93e13cf77a906cb56ca6 DIST rospkg-1.2.0.tar.gz 90516 BLAKE2B 0c1d993c70f0ad383ab457c846416a22b9adf9611704a918c3765659231846749228073ea04950ddfdbe13f7e51f87ce5d17c1488f995e846a6590a0f9549efd SHA512 f059259a38b8b2281496a69f8a55fdd31a11e91583babb82e574363c40c90221a4abb7c1d7a5ed6be3b2389ee6aaf08b4e016260c73dd779f8c7993e6eba78db diff --git a/dev-python/rospkg/files/gentoo.patch b/dev-python/rospkg/files/gentoo.patch new file mode 100644 index 00000000000..5a9e7738b39 --- /dev/null +++ b/dev-python/rospkg/files/gentoo.patch @@ -0,0 +1,15 @@ +Strip ros_packages/ from paths. ros_packages is only for avoiding to crawl the +whole /usr but the real one in the path without it. + +Index: rospkg-1.1.0/src/rospkg/rospack.py +=================================================================== +--- rospkg-1.1.0.orig/src/rospkg/rospack.py ++++ rospkg-1.1.0/src/rospkg/rospack.py +@@ -59,6 +59,7 @@ def list_by_path(manifest_name, path, ca + path = os.path.abspath(path) + basename = os.path.basename + for d, dirs, files in os.walk(path, topdown=True, followlinks=True): ++ d = d.replace('ros_packages/', '') + if 'CATKIN_IGNORE' in files: + del dirs[:] + continue # leaf diff --git a/dev-python/rospkg/rospkg-1.1.10.ebuild b/dev-python/rospkg/rospkg-1.1.10.ebuild new file mode 100644 index 00000000000..f8ef1bca937 --- /dev/null +++ b/dev-python/rospkg/rospkg-1.1.10.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_6 pypy3 ) + +SCM="" +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"; +fi + +inherit ${SCM} distutils-r1 + +DESCRIPTION="Standalone Python library for the ROS package system" +HOMEPAGE="http://wiki.ros.org/rospkg"; +if [ "${PV#9999}" != "${PV}" ] ; then + SRC_URI="" + KEYWORDS="" + # Needed for tests + S="${WORKDIR}/${PN}" + EGIT_CHECKOUT_DIR="${S}" +else + SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]" +BDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/nose[${PYTHON_USEDEP}] + )" +DEPEND="${RDEPEND} ${BDEPEND} + test? ( + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + ) +" +PATCHES=( "${FILESDIR}/gentoo.patch" ) + +python_test() { + nosetests --with-coverage --cover-package=rospkg --with-xunit test || die +} diff --git a/dev-python/rospkg/rospkg-1.1.9.ebuild b/dev-python/rospkg/rospkg-1.1.9.ebuild new file mode 100644 index 00000000000..f8ef1bca937 --- /dev/null +++ b/dev-python/rospkg/rospkg-1.1.9.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_6 pypy3 ) + +SCM="" +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"; +fi + +inherit ${SCM} distutils-r1 + +DESCRIPTION="Standalone Python library for the ROS package system" +HOMEPAGE="http://wiki.ros.org/rospkg"; +if [ "${PV#9999}" != "${PV}" ] ; then + SRC_URI="" + KEYWORDS="" + # Needed for tests + S="${WORKDIR}/${PN}" + EGIT_CHECKOUT_DIR="${S}" +else + SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]" +BDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/nose[${PYTHON_USEDEP}] + )" +DEPEND="${RDEPEND} ${BDEPEND} + test? ( + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + ) +" +PATCHES=( "${FILESDIR}/gentoo.patch" ) + +python_test() { + nosetests --with-coverage --cover-package=rospkg --with-xunit test || die +}
