Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/wstool/, dev-util/wstool/files/
Date: Sun, 29 Dec 2019 08:53:36
Message-Id: 1577609585.87188c995cf9cfc793445e2c28e95c0c0f7821a8.soap@gentoo
1 commit: 87188c995cf9cfc793445e2c28e95c0c0f7821a8
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 29 08:53:05 2019 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 29 08:53:05 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87188c99
7
8 dev-util/wstool: Remove old
9
10 Package-Manager: Portage-2.3.83, Repoman-2.3.20
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 dev-util/wstool/Manifest | 2 --
14 dev-util/wstool/files/prefix2.patch | 26 ---------------
15 dev-util/wstool/wstool-0.1.13.ebuild | 62 ------------------------------------
16 dev-util/wstool/wstool-0.1.17.ebuild | 62 ------------------------------------
17 4 files changed, 152 deletions(-)
18
19 diff --git a/dev-util/wstool/Manifest b/dev-util/wstool/Manifest
20 index 235a4850546..e04952ad72f 100644
21 --- a/dev-util/wstool/Manifest
22 +++ b/dev-util/wstool/Manifest
23 @@ -1,3 +1 @@
24 -DIST wstool-0.1.13.tar.gz 75188 BLAKE2B 6a34aa04e4a076a75dacf24faf789d5295f6ad9afbbdddae480d8cdd11db63940faeca2c5936a2432aeccae5274e2e9e4e824f303460fe96f95c0d17abeeb9c1 SHA512 4d54f78ca044d31d927de1c3387536d0447ece77672c555845adf54e47f07adb67e6e9c866bc2719aae468aeeb26c900b3784e0ec7cf014c8118e841a92dca14
25 -DIST wstool-0.1.17.tar.gz 76168 BLAKE2B 4862df0ff16a5102e42d3ed683dbd9e8eb432aaf44f6e641fba6bb6f5d962645685b0fc9ca11f3c8adbe15dbef33086b93e3f9136073f7f181b5da37522e28fa SHA512 13533354a40723137baadc125425a2ec3d6a441da4870f04a9e17c53509ee4d3dc27df1a59edc2c3985a05fbd66a045539e9814f73509ee527fb763f8a804626
26 DIST wstool-0.1.18.tar.gz 80595 BLAKE2B ed90fc5c63ab5d775dfb49ddacc6da6e285aeb5078cf471c0d504659a9e322fde27797e4d05fd56dff4b9958558200cf05e46cf7ae71fd1231ab63048e668808 SHA512 fda9c679183c605048ed024a57b07fd2d9b644978a3e4ff89c3716b74d8e4ba0124779bcdf88a75fdbbf47c765b7ab63db7c84a55a6e1744fc6f955649590c48
27
28 diff --git a/dev-util/wstool/files/prefix2.patch b/dev-util/wstool/files/prefix2.patch
29 deleted file mode 100644
30 index 934443f9870..00000000000
31 --- a/dev-util/wstool/files/prefix2.patch
32 +++ /dev/null
33 @@ -1,26 +0,0 @@
34 -Index: wstool-0.1.13/setup.py
35 -===================================================================
36 ---- wstool-0.1.13.orig/setup.py
37 -+++ wstool-0.1.13/setup.py
38 -@@ -26,18 +26,11 @@ def _resolve_prefix(prefix, type):
39 - # issue: https://github.com/vcstools/wstool/issues/81
40 - osx_system_prefix = '/System/Library/Frameworks/Python.framework/Versions'
41 - if type == 'man':
42 -- if prefix == '/usr':
43 -- return '/usr/share'
44 -- if sys.prefix.startswith(osx_system_prefix):
45 -- return '/usr/local/share'
46 -+ return os.path.join(prefix, 'share')
47 - elif type == 'bash_comp':
48 -- if prefix == '/usr':
49 -- return '/'
50 -- if sys.prefix.startswith(osx_system_prefix):
51 -- return '/usr/local'
52 -+ return os.path.join(prefix, '../')
53 - elif type == 'zsh_comp':
54 -- if sys.prefix.startswith(osx_system_prefix):
55 -- return '/usr/local'
56 -+ return os.path.join(prefix, '../')
57 - else:
58 - raise ValueError('not supported type')
59 - return prefix
60
61 diff --git a/dev-util/wstool/wstool-0.1.13.ebuild b/dev-util/wstool/wstool-0.1.13.ebuild
62 deleted file mode 100644
63 index 30a7bd56fa0..00000000000
64 --- a/dev-util/wstool/wstool-0.1.13.ebuild
65 +++ /dev/null
66 @@ -1,62 +0,0 @@
67 -# Copyright 1999-2019 Gentoo Authors
68 -# Distributed under the terms of the GNU General Public License v2
69 -
70 -EAPI=5
71 -PYTHON_COMPAT=( python{2_7,3_5} )
72 -
73 -SCM=""
74 -if [ "${PV#9999}" != "${PV}" ] ; then
75 - SCM="git-r3"
76 - EGIT_REPO_URI="https://github.com/vcstools/wstool"
77 -fi
78 -
79 -inherit ${SCM} distutils-r1
80 -
81 -DESCRIPTION="Commands to manage several local SCM repositories for ROS"
82 -HOMEPAGE="http://wiki.ros.org/wstool"
83 -if [ "${PV#9999}" != "${PV}" ] ; then
84 - SRC_URI=""
85 - KEYWORDS=""
86 -else
87 - SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
88 - https://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz
89 - "
90 - KEYWORDS="~amd64 ~arm"
91 -fi
92 -
93 -LICENSE="BSD"
94 -SLOT="0"
95 -IUSE="test"
96 -RESTRICT="!test? ( test )"
97 -
98 -RDEPEND="
99 - dev-python/pyyaml[${PYTHON_USEDEP}]
100 - >=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}]
101 -"
102 -DEPEND="${RDEPEND}
103 - dev-python/sphinx
104 - test? (
105 - dev-python/nose[${PYTHON_USEDEP}]
106 - dev-python/coverage[${PYTHON_USEDEP}]
107 - dev-vcs/git
108 - dev-vcs/bzr
109 - dev-vcs/mercurial
110 - dev-vcs/subversion
111 - )
112 -"
113 -
114 -PATCHES=( "${FILESDIR}/prefix2.patch" )
115 -DISTUTILS_IN_SOURCE_BUILD="yes"
116 -
117 -python_test() {
118 - # From travis.yml
119 - # Set git config to silence some stuff in the tests
120 - git config --global user.email "foo@×××××××.com"
121 - git config --global user.name "Foo Bar"
122 - # Set the hg user
123 - echo -e "[ui]\nusername = Your Name <your@××××.com>" >> ~/.hgrc
124 - # Set the bzr user
125 - bzr whoami "Your Name <name@×××××××.com>"
126 - # command to run tests
127 - nosetests --with-coverage --cover-package=wstool || die
128 -}
129
130 diff --git a/dev-util/wstool/wstool-0.1.17.ebuild b/dev-util/wstool/wstool-0.1.17.ebuild
131 deleted file mode 100644
132 index 44cd350a809..00000000000
133 --- a/dev-util/wstool/wstool-0.1.17.ebuild
134 +++ /dev/null
135 @@ -1,62 +0,0 @@
136 -# Copyright 1999-2019 Gentoo Authors
137 -# Distributed under the terms of the GNU General Public License v2
138 -
139 -EAPI=5
140 -PYTHON_COMPAT=( python{2_7,3_5,3_6} )
141 -
142 -SCM=""
143 -if [ "${PV#9999}" != "${PV}" ] ; then
144 - SCM="git-r3"
145 - EGIT_REPO_URI="https://github.com/vcstools/wstool"
146 -fi
147 -
148 -inherit ${SCM} distutils-r1
149 -
150 -DESCRIPTION="Commands to manage several local SCM repositories for ROS"
151 -HOMEPAGE="http://wiki.ros.org/wstool"
152 -if [ "${PV#9999}" != "${PV}" ] ; then
153 - SRC_URI=""
154 - KEYWORDS=""
155 -else
156 - SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
157 - https://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz
158 - "
159 - KEYWORDS="~amd64 ~arm"
160 -fi
161 -
162 -LICENSE="BSD"
163 -SLOT="0"
164 -IUSE="test"
165 -RESTRICT="!test? ( test )"
166 -
167 -RDEPEND="
168 - dev-python/pyyaml[${PYTHON_USEDEP}]
169 - >=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}]
170 -"
171 -DEPEND="${RDEPEND}
172 - dev-python/sphinx
173 - test? (
174 - dev-python/nose[${PYTHON_USEDEP}]
175 - dev-python/coverage[${PYTHON_USEDEP}]
176 - dev-vcs/git
177 - dev-vcs/bzr
178 - dev-vcs/mercurial
179 - dev-vcs/subversion
180 - )
181 -"
182 -
183 -PATCHES=( "${FILESDIR}/prefix2.patch" )
184 -DISTUTILS_IN_SOURCE_BUILD="yes"
185 -
186 -python_test() {
187 - # From travis.yml
188 - # Set git config to silence some stuff in the tests
189 - git config --global user.email "foo@×××××××.com"
190 - git config --global user.name "Foo Bar"
191 - # Set the hg user
192 - echo -e "[ui]\nusername = Your Name <your@××××.com>" >> ~/.hgrc
193 - # Set the bzr user
194 - bzr whoami "Your Name <name@×××××××.com>"
195 - # command to run tests
196 - nosetests --with-coverage --cover-package=wstool || die
197 -}