Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/rospkg/files/, dev-python/rospkg/
Date: Tue, 23 Feb 2016 18:38:30
Message-Id: 1456252338.b8ea6a01778544fd37dacafbfeb35fe5616d081e.aballier@gentoo
1 commit: b8ea6a01778544fd37dacafbfeb35fe5616d081e
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 23 18:32:18 2016 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 23 18:32:18 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8ea6a01
7
8 dev-python/rospkg: remove old
9
10 Package-Manager: portage-2.2.27
11 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
12
13 dev-python/rospkg/Manifest | 2 --
14 dev-python/rospkg/files/py3.patch | 21 ------------
15 dev-python/rospkg/rospkg-1.0.35.ebuild | 56 ------------------------------
16 dev-python/rospkg/rospkg-1.0.37-r1.ebuild | 57 -------------------------------
17 4 files changed, 136 deletions(-)
18
19 diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
20 index 24e6a92..1024384 100644
21 --- a/dev-python/rospkg/Manifest
22 +++ b/dev-python/rospkg/Manifest
23 @@ -1,3 +1 @@
24 -DIST rospkg-1.0.35.tar.gz 88589 SHA256 9ce13cb1d0f470f24cdb7f665d53948fcd0db19be7c8946ad998cbcf3998da30 SHA512 01e59dc3eb8290af661dc54902da950649a81b3caa0b65ad7dba18c0c6d0ba1ed08bec802edbced49f65515f20f1b8db719bfb576eb38c87982386aac22a2e31 WHIRLPOOL 20ebafd588c6cf8598d155cdd6ec76a9f1b7ce1bb9f1a545159a75d4fe5c3621005ea5abb5b15080716439bdec91a943855a564014eee295999126caed5c34e3
25 -DIST rospkg-1.0.37.tar.gz 89332 SHA256 733e9e30d30a1f293f2d2b07060d231746ce88f7cfecb076d466d9aece5a0a8a SHA512 5e8e938831aac0c14b18d0f5063c8c8d50a2f13a4a15ce15955d854a840a8b46bab42d854b6d61d1e4e6bdef95f90e10008838d16b31e7d5b0d963b1c3c246d6 WHIRLPOOL 3d50c070197019b607e23a430affec8950539e0b32dd88f14e85027acea87435abebd8f58c4aeadd11cafee00d2faa26a3d9d88a0afb6efdc42dc0797642ef39
26 DIST rospkg-1.0.38.tar.gz 89321 SHA256 1a1567d3e33c3910518dbfbb09760c499153b1c0ad6b8ddc5045488c11db43e4 SHA512 21cc9057a445b06db66b454e46c3ecdf8d83e54bbf4c204c63b13278dc93cdad60a80f4cab29eba7bc1811d43b406f91435499f7e58fa97814302dfb786f483e WHIRLPOOL 109e8d5ddc3f432c28959b7e6f15703aa2d67cd3ee524e4964e5388a7982b6aea144e5afcf0d22add230e33beb485ade0656025b77f2b56be75d313aa1e52870
27
28 diff --git a/dev-python/rospkg/files/py3.patch b/dev-python/rospkg/files/py3.patch
29 deleted file mode 100644
30 index 268ff89..0000000
31 --- a/dev-python/rospkg/files/py3.patch
32 +++ /dev/null
33 @@ -1,21 +0,0 @@
34 -https://github.com/ros-infrastructure/rospkg/pull/90
35 -
36 -commit 7be8d9e5ec3c6bffd970e93053078b707879c7b9
37 -Author: Alexis Ballier <aballier@g.o>
38 -Date: Tue Oct 13 10:08:42 2015 +0200
39 -
40 - src/rospkg/os_detect.py: Use "string in dict" instead of "dict.has_key(string)" for python3 compatibility.
41 -
42 -diff --git a/src/rospkg/os_detect.py b/src/rospkg/os_detect.py
43 -index 14b57c2..554b607 100644
44 ---- a/src/rospkg/os_detect.py
45 -+++ b/src/rospkg/os_detect.py
46 -@@ -150,7 +150,7 @@ class FdoDetect(OsDetector):
47 - """
48 - def __init__(self, fdo_id):
49 - release_info = read_os_release()
50 -- if release_info is not None and release_info.has_key("ID") and release_info["ID"] == fdo_id:
51 -+ if release_info is not None and "ID" in release_info and release_info["ID"] == fdo_id:
52 - self.release_info = release_info
53 - else:
54 - self.release_info = None
55
56 diff --git a/dev-python/rospkg/rospkg-1.0.35.ebuild b/dev-python/rospkg/rospkg-1.0.35.ebuild
57 deleted file mode 100644
58 index 06dd93b..0000000
59 --- a/dev-python/rospkg/rospkg-1.0.35.ebuild
60 +++ /dev/null
61 @@ -1,56 +0,0 @@
62 -# Copyright 1999-2014 Gentoo Foundation
63 -# Distributed under the terms of the GNU General Public License v2
64 -# $Id$
65 -
66 -EAPI=5
67 -PYTHON_COMPAT=( python{2_7,3_3,3_4} )
68 -
69 -SCM=""
70 -if [ "${PV#9999}" != "${PV}" ] ; then
71 - SCM="git-r3"
72 - EGIT_REPO_URI="http://github.com/ros-infrastructure/rospkg"
73 -fi
74 -
75 -inherit ${SCM} distutils-r1
76 -
77 -DESCRIPTION="Standalone Python library for the ROS package system"
78 -HOMEPAGE="http://wiki.ros.org/rospkg"
79 -if [ "${PV#9999}" != "${PV}" ] ; then
80 - SRC_URI=""
81 - KEYWORDS=""
82 - # Needed for tests
83 - S="${WORKDIR}/${PN}"
84 - EGIT_CHECKOUT_DIR="${S}"
85 -else
86 - SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
87 - http://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz
88 - "
89 - KEYWORDS="~amd64 ~arm"
90 -fi
91 -
92 -LICENSE="BSD"
93 -SLOT="0"
94 -IUSE="test"
95 -
96 -RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
97 -DEPEND="${RDEPEND}
98 - test? (
99 - dev-python/nose[${PYTHON_USEDEP}]
100 - dev-python/coverage[${PYTHON_USEDEP}]
101 - )
102 -"
103 -PATCHES=(
104 - "${FILESDIR}/norecurse.patch"
105 -)
106 -
107 -python_test() {
108 - nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
109 -}
110 -
111 -src_install() {
112 - distutils-r1_src_install
113 -
114 - # Avoid recursing into /usr/share when looking for packages.
115 - dodir /usr/share
116 - touch "${ED}/usr/share/rospack_norecurse"
117 -}
118
119 diff --git a/dev-python/rospkg/rospkg-1.0.37-r1.ebuild b/dev-python/rospkg/rospkg-1.0.37-r1.ebuild
120 deleted file mode 100644
121 index 526c071..0000000
122 --- a/dev-python/rospkg/rospkg-1.0.37-r1.ebuild
123 +++ /dev/null
124 @@ -1,57 +0,0 @@
125 -# Copyright 1999-2014 Gentoo Foundation
126 -# Distributed under the terms of the GNU General Public License v2
127 -# $Id$
128 -
129 -EAPI=5
130 -PYTHON_COMPAT=( python{2_7,3_3,3_4} )
131 -
132 -SCM=""
133 -if [ "${PV#9999}" != "${PV}" ] ; then
134 - SCM="git-r3"
135 - EGIT_REPO_URI="http://github.com/ros-infrastructure/rospkg"
136 -fi
137 -
138 -inherit ${SCM} distutils-r1
139 -
140 -DESCRIPTION="Standalone Python library for the ROS package system"
141 -HOMEPAGE="http://wiki.ros.org/rospkg"
142 -if [ "${PV#9999}" != "${PV}" ] ; then
143 - SRC_URI=""
144 - KEYWORDS=""
145 - # Needed for tests
146 - S="${WORKDIR}/${PN}"
147 - EGIT_CHECKOUT_DIR="${S}"
148 -else
149 - SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
150 - http://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz
151 - "
152 - KEYWORDS="~amd64 ~arm"
153 -fi
154 -
155 -LICENSE="BSD"
156 -SLOT="0"
157 -IUSE="test"
158 -
159 -RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
160 -DEPEND="${RDEPEND}
161 - test? (
162 - dev-python/nose[${PYTHON_USEDEP}]
163 - dev-python/coverage[${PYTHON_USEDEP}]
164 - )
165 -"
166 -PATCHES=(
167 - "${FILESDIR}/norecurse.patch"
168 - "${FILESDIR}/py3.patch"
169 -)
170 -
171 -python_test() {
172 - nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
173 -}
174 -
175 -src_install() {
176 - distutils-r1_src_install
177 -
178 - # Avoid recursing into /usr/share when looking for packages.
179 - dodir /usr/share
180 - touch "${ED}/usr/share/rospack_norecurse"
181 -}