From 01d5d3de1190a8355e8d42e739bed44dd427a633 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Fri, 7 Oct 2016 17:54:09 +0200 Subject: dev-python/rospkg: drop norecurse patch now that ROS_PACKAGE_PATH is installed in /usr/share/ros_packages. Package-Manager: portage-2.3.1 --- dev-python/rospkg/files/norecurse.patch | 64 ------------------------------- dev-python/rospkg/rospkg-1.0.41-r1.ebuild | 45 ++++++++++++++++++++++ dev-python/rospkg/rospkg-1.0.41.ebuild | 56 --------------------------- dev-python/rospkg/rospkg-9999.ebuild | 13 +------ 4 files changed, 46 insertions(+), 132 deletions(-) delete mode 100644 dev-python/rospkg/files/norecurse.patch create mode 100644 dev-python/rospkg/rospkg-1.0.41-r1.ebuild delete mode 100644 dev-python/rospkg/rospkg-1.0.41.ebuild (limited to 'dev-python/rospkg') diff --git a/dev-python/rospkg/files/norecurse.patch b/dev-python/rospkg/files/norecurse.patch deleted file mode 100644 index 4b7aae9a86e3..000000000000 --- a/dev-python/rospkg/files/norecurse.patch +++ /dev/null @@ -1,64 +0,0 @@ -commit c2e06e0ea0b4a1cbb67049ab77a80f53646fb0b2 -Author: Alexis Ballier -Date: Tue Dec 23 12:27:19 2014 +0100 - - Add support for rospack_norecurse to avoid recursing into all subdirectories when looking for a package. - - I am installing ros into /usr, hence this searches in /usr/share. I have a lot of directories, not ROS related, into /usr/share (e.g. a full TeX Live install), and I get these timings: - - Without rospack_norecurse in /usr/share: - $ time rosversion rospack - 2.2.5 - - real 0m2.861s - user 0m1.588s - sys 0m1.267s - - With rospack_norecurse in /usr/share: - $ time rosversion rospack - 2.2.5 - - real 0m0.135s - user 0m0.100s - sys 0m0.034s - - This is on a desktop with a SSD drive. On an arm board, with much less packages in /usr/share but way much slower I/O I remember hitting the 10 seconds timeout for roscore to start. - -diff --git a/src/rospkg/rospack.py b/src/rospkg/rospack.py -index e55acec..7ed98de 100644 ---- a/src/rospkg/rospack.py -+++ b/src/rospkg/rospack.py -@@ -42,7 +42,7 @@ from .stack import parse_stack_file, InvalidStack - _cache_lock = Lock() - - --def list_by_path(manifest_name, path, cache): -+def list_by_path(manifest_name, path, cache, recurse=True): - """ - List ROS stacks or packages within the specified path. - -@@ -53,6 +53,7 @@ def list_by_path(manifest_name, path, cache): - :param manifest_name: MANIFEST_FILE or STACK_FILE, ``str`` - :param path: path to list resources in, ``str`` - :param cache: path cache to update. Maps resource name to directory path, ``{str: str}`` -+ :param recurse: search recursively in subdirectories ``bool`` - :returns: complete list of resources in ROS environment, ``[str]`` - """ - resources = [] -@@ -89,9 +90,15 @@ def list_by_path(manifest_name, path, cache): - # optimization for stacks. - del dirs[:] - continue #leaf -- elif 'rospack_nosubdirs' in files: -+ elif 'rospack_nosubdirs' in files or not recurse: - del dirs[:] - continue #leaf -+ elif 'rospack_norecurse' in files: -+ for sd in dirs: -+ spath = os.path.join(d, sd) -+ resources += list_by_path(manifest_name, spath, cache, False) -+ del dirs[:] -+ continue - # remove hidden dirs (esp. .svn/.git) - [dirs.remove(di) for di in dirs if di[0] == '.'] - return resources diff --git a/dev-python/rospkg/rospkg-1.0.41-r1.ebuild b/dev-python/rospkg/rospkg-1.0.41-r1.ebuild new file mode 100644 index 000000000000..666d51a85c08 --- /dev/null +++ b/dev-python/rospkg/rospkg-1.0.41-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) + +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="http://download.ros.org/downloads/${PN}/${P}.tar.gz + https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz + " + KEYWORDS="~amd64 ~arm" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="test" + +RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + test? ( + dev-python/nose[${PYTHON_USEDEP}] + dev-python/coverage[${PYTHON_USEDEP}] + ) +" + +python_test() { + nosetests --with-coverage --cover-package=rospkg --with-xunit test || die +} diff --git a/dev-python/rospkg/rospkg-1.0.41.ebuild b/dev-python/rospkg/rospkg-1.0.41.ebuild deleted file mode 100644 index 9939d92441ae..000000000000 --- a/dev-python/rospkg/rospkg-1.0.41.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) - -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="http://download.ros.org/downloads/${PN}/${P}.tar.gz - https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz - " - KEYWORDS="~amd64 ~arm" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="test" - -RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( - dev-python/nose[${PYTHON_USEDEP}] - dev-python/coverage[${PYTHON_USEDEP}] - ) -" -PATCHES=( - "${FILESDIR}/norecurse.patch" -) - -python_test() { - nosetests --with-coverage --cover-package=rospkg --with-xunit test || die -} - -src_install() { - distutils-r1_src_install - - # Avoid recursing into /usr/share when looking for packages. - dodir /usr/share - touch "${ED}/usr/share/rospack_norecurse" -} diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild index 518544135142..666d51a85c08 100644 --- a/dev-python/rospkg/rospkg-9999.ebuild +++ b/dev-python/rospkg/rospkg-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -39,18 +39,7 @@ DEPEND="${RDEPEND} dev-python/coverage[${PYTHON_USEDEP}] ) " -PATCHES=( - "${FILESDIR}/norecurse.patch" -) python_test() { nosetests --with-coverage --cover-package=rospkg --with-xunit test || die } - -src_install() { - distutils-r1_src_install - - # Avoid recursing into /usr/share when looking for packages. - dodir /usr/share - touch "${ED}/usr/share/rospack_norecurse" -} -- cgit v1.2.3-65-gdbad