From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EDBE9138351 for ; Sun, 29 Mar 2020 07:31:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 155E8E0A6E; Sun, 29 Mar 2020 07:31:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E43C6E0A7D for ; Sun, 29 Mar 2020 07:31:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BD8BC34FAD2 for ; Sun, 29 Mar 2020 07:31:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 547ED1BC for ; Sun, 29 Mar 2020 07:31:35 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1585467064.dc9da7ffe2c399ae57974a164dee6bedebdeef04.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/rospkg/files/, dev-python/rospkg/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/rospkg/Manifest dev-python/rospkg/files/gentoo.patch dev-python/rospkg/rospkg-1.1.10.ebuild dev-python/rospkg/rospkg-1.1.9.ebuild X-VCS-Directories: dev-python/rospkg/ dev-python/rospkg/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: dc9da7ffe2c399ae57974a164dee6bedebdeef04 X-VCS-Branch: master Date: Sun, 29 Mar 2020 07:31:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 769b13a9-d511-4308-b834-56acef0fe8f3 X-Archives-Hash: 21d248e017b097ca55052f847f47f109 commit: dc9da7ffe2c399ae57974a164dee6bedebdeef04 Author: Michał Górny gentoo org> AuthorDate: Sun Mar 29 07:17:40 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Mar 29 07:31:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc9da7ff dev-python/rospkg: Remove redundant versions Signed-off-by: Michał Górny 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 deletions(-) diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest index a12f2364d91..3d7146dfd9e 100644 --- a/dev-python/rospkg/Manifest +++ b/dev-python/rospkg/Manifest @@ -1,3 +1 @@ -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 deleted file mode 100644 index 5a9e7738b39..00000000000 --- a/dev-python/rospkg/files/gentoo.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index f8ef1bca937..00000000000 --- a/dev-python/rospkg/rospkg-1.1.10.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# 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 deleted file mode 100644 index f8ef1bca937..00000000000 --- a/dev-python/rospkg/rospkg-1.1.9.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# 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 -}