1 |
commit: c49c01a279f217f2c1ae974dc53266aa4f06d09b |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 30 15:02:24 2020 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 30 15:02:35 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c49c01a2 |
7 |
|
8 |
dev-util/catkin: Remove old |
9 |
|
10 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
12 |
|
13 |
dev-util/catkin/Manifest | 2 - |
14 |
dev-util/catkin/catkin-0.7.17.ebuild | 120 ---------------------------------- |
15 |
dev-util/catkin/catkin-0.7.20.ebuild | 120 ---------------------------------- |
16 |
dev-util/catkin/files/distutils.patch | 13 ---- |
17 |
dev-util/catkin/files/sitedir.patch | 15 ----- |
18 |
5 files changed, 270 deletions(-) |
19 |
|
20 |
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest |
21 |
index a32421bb653..e2012a736da 100644 |
22 |
--- a/dev-util/catkin/Manifest |
23 |
+++ b/dev-util/catkin/Manifest |
24 |
@@ -1,4 +1,2 @@ |
25 |
-DIST catkin-0.7.17.tar.gz 212023 BLAKE2B 901bc5a3e226eaab59917b4d548fe3aacfad602a75e46cbd720f252ffd490c4ff2b170cd158a0c09c047b837d6f097555ba55291dfeedb51951d98f2f0273c34 SHA512 0c6adfda27924a5c9c5360e5e84e082e5cc9a7638a1129fe86f604515d3731f4257f725f80e8e8781200a8a367472224aea537871e56e1859e9f66950a746d45 |
26 |
-DIST catkin-0.7.20.tar.gz 215244 BLAKE2B 06755e87f43d1e97138a6696af05dfd9b9434adcca9d4269c7b93b363b25ac9e8b198a980d7607b6b317f546b7637103dc251213087201ff56c1f12c86892edb SHA512 7258f0d548a92d846c9ad195d5e28a567d3c1b4cd1caabffd58c3fabee66cec8ce3612d3095e6437ac201b4d37fddf8f850775e809ebb7eaaeb99328afaedfc6 |
27 |
DIST catkin-0.8.3.tar.gz 215988 BLAKE2B 92d7bced93e2d33dafcfd902724f993aa15756139265b5594c15041c333568591193b86e1a4bee8c278f2739dd063f73b6ce675b8ab4fefd312b5daeea414c7a SHA512 14fd03627f3fb339a850ca73e7a49dfeb7312a85416473dff60995ea1d0f1050982929c297751502589a7320dd7eec5d922c86061166f9d475fc1108540db4ae |
28 |
DIST catkin-0.8.8.tar.gz 217566 BLAKE2B c17ed55e4f72f6645a778b5669e9b54090ea0425526d7540a6c8cf3af88ba10dfd91b927f53a83d9d2fac56e000c4c52e93216a36694475a91fabe00dd2d0168 SHA512 a90c552bebb46ade23171c85ca1cb23b295d156e731c29cd7602e544aef6231edb179d0fce52d06008d762bafd309456e0ef8976a3f67ed9ea861b905b1bb979 |
29 |
|
30 |
diff --git a/dev-util/catkin/catkin-0.7.17.ebuild b/dev-util/catkin/catkin-0.7.17.ebuild |
31 |
deleted file mode 100644 |
32 |
index bd0fec4e9fa..00000000000 |
33 |
--- a/dev-util/catkin/catkin-0.7.17.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,120 +0,0 @@ |
36 |
-# Copyright 1999-2020 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=5 |
40 |
- |
41 |
-SCM="" |
42 |
-if [ "${PV#9999}" != "${PV}" ] ; then |
43 |
- SCM="git-r3" |
44 |
- EGIT_REPO_URI="https://github.com/ros/catkin" |
45 |
-fi |
46 |
- |
47 |
-PYTHON_COMPAT=( python3_6 pypy3 ) |
48 |
- |
49 |
-inherit ${SCM} cmake-utils python-r1 |
50 |
- |
51 |
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS" |
52 |
-HOMEPAGE="http://wiki.ros.org/catkin" |
53 |
-if [ "${PV#9999}" != "${PV}" ] ; then |
54 |
- SRC_URI="" |
55 |
- KEYWORDS="" |
56 |
-else |
57 |
- SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz" |
58 |
- KEYWORDS="~amd64 ~arm" |
59 |
-fi |
60 |
- |
61 |
-LICENSE="BSD" |
62 |
-SLOT="0" |
63 |
-IUSE="test" |
64 |
-RESTRICT="!test? ( test )" |
65 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
66 |
- |
67 |
-RDEPEND=" |
68 |
- ${PYTHON_DEPS} |
69 |
- dev-python/catkin_pkg[${PYTHON_USEDEP}] |
70 |
- dev-python/empy[${PYTHON_USEDEP}] |
71 |
- dev-util/cmake |
72 |
-" |
73 |
-DEPEND="${RDEPEND} |
74 |
- test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )" |
75 |
- |
76 |
-PATCHES=( |
77 |
- "${FILESDIR}/tests.patch" |
78 |
- "${FILESDIR}/distutils.patch" |
79 |
- "${FILESDIR}/catkin_prefix_path.patch" |
80 |
- "${FILESDIR}/gnuinstalldirs.patch" |
81 |
- "${FILESDIR}/catkin_prefix_path_util_py_v2.patch" |
82 |
- "${FILESDIR}/package_xml.patch" |
83 |
- "${FILESDIR}/etc.patch" |
84 |
- "${FILESDIR}/sitedir.patch" |
85 |
-) |
86 |
- |
87 |
-src_prepare() { |
88 |
- # fix libdir |
89 |
- sed -i \ |
90 |
- -e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \ |
91 |
- -e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \ |
92 |
- -e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \ |
93 |
- -e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \ |
94 |
- -e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \ |
95 |
- cmake/*.cmake || die |
96 |
- cmake-utils_src_prepare |
97 |
-} |
98 |
- |
99 |
-catkin_src_configure_internal() { |
100 |
- local sitedir="$(python_get_sitedir)" |
101 |
- mycmakeargs+=( |
102 |
- -DPYTHON_EXECUTABLE="${PYTHON}" |
103 |
- -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}" |
104 |
- ) |
105 |
- python_export PYTHON_SCRIPTDIR |
106 |
- cmake-utils_src_configure |
107 |
-} |
108 |
- |
109 |
-src_configure() { |
110 |
- export PYTHONPATH="${S}/python" |
111 |
- local mycmakeargs=( |
112 |
- "$(cmake-utils_use test CATKIN_ENABLE_TESTING)" |
113 |
- "-DCATKIN_BUILD_BINARY_PACKAGE=ON" |
114 |
- ) |
115 |
- python_foreach_impl catkin_src_configure_internal |
116 |
-} |
117 |
- |
118 |
-src_compile() { |
119 |
- python_foreach_impl cmake-utils_src_compile |
120 |
-} |
121 |
- |
122 |
-src_test() { |
123 |
- unset PYTHON_SCRIPTDIR |
124 |
- python_foreach_impl cmake-utils_src_test |
125 |
-} |
126 |
- |
127 |
-catkin_src_install_internal() { |
128 |
- python_export PYTHON_SCRIPTDIR |
129 |
- cmake-utils_src_install |
130 |
- if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then |
131 |
- dodir /usr/bin |
132 |
- for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do |
133 |
- dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" |
134 |
- done |
135 |
- touch "${T}/.catkin_python_symlinks_generated" |
136 |
- fi |
137 |
-} |
138 |
- |
139 |
-src_install() { |
140 |
- python_foreach_impl catkin_src_install_internal |
141 |
- |
142 |
- doenvd "${FILESDIR}/40catkin" |
143 |
- |
144 |
- # needed to be considered as a workspace |
145 |
- touch "${ED}/usr/.catkin" |
146 |
-} |
147 |
- |
148 |
-pkg_postinst() { |
149 |
- ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the" |
150 |
- ewarn "installation path for package.xml files on Gentoo." |
151 |
- ewarn "In order for ROS to work properly, you will need to reinstall ROS" |
152 |
- ewarn "packages that have it installed in the old location:" |
153 |
- ewarn " emerge -1O /usr/share/*/package.xml" |
154 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details." |
155 |
-} |
156 |
|
157 |
diff --git a/dev-util/catkin/catkin-0.7.20.ebuild b/dev-util/catkin/catkin-0.7.20.ebuild |
158 |
deleted file mode 100644 |
159 |
index c4909886d81..00000000000 |
160 |
--- a/dev-util/catkin/catkin-0.7.20.ebuild |
161 |
+++ /dev/null |
162 |
@@ -1,120 +0,0 @@ |
163 |
-# Copyright 1999-2020 Gentoo Authors |
164 |
-# Distributed under the terms of the GNU General Public License v2 |
165 |
- |
166 |
-EAPI=5 |
167 |
- |
168 |
-SCM="" |
169 |
-if [ "${PV#9999}" != "${PV}" ] ; then |
170 |
- SCM="git-r3" |
171 |
- EGIT_REPO_URI="https://github.com/ros/catkin" |
172 |
-fi |
173 |
- |
174 |
-PYTHON_COMPAT=( python3_6 pypy3 ) |
175 |
- |
176 |
-inherit ${SCM} cmake-utils python-r1 |
177 |
- |
178 |
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS" |
179 |
-HOMEPAGE="http://wiki.ros.org/catkin" |
180 |
-if [ "${PV#9999}" != "${PV}" ] ; then |
181 |
- SRC_URI="" |
182 |
- KEYWORDS="" |
183 |
-else |
184 |
- SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz" |
185 |
- KEYWORDS="~amd64 ~arm" |
186 |
-fi |
187 |
- |
188 |
-LICENSE="BSD" |
189 |
-SLOT="0" |
190 |
-IUSE="test" |
191 |
-RESTRICT="!test? ( test )" |
192 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
193 |
- |
194 |
-RDEPEND=" |
195 |
- ${PYTHON_DEPS} |
196 |
- dev-python/catkin_pkg[${PYTHON_USEDEP}] |
197 |
- dev-python/empy[${PYTHON_USEDEP}] |
198 |
- dev-util/cmake |
199 |
-" |
200 |
-DEPEND="${RDEPEND} |
201 |
- test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )" |
202 |
- |
203 |
-PATCHES=( |
204 |
- "${FILESDIR}/tests.patch" |
205 |
- "${FILESDIR}/distutils.patch" |
206 |
- "${FILESDIR}/catkin_prefix_path.patch" |
207 |
- "${FILESDIR}/gnuinstalldirs.patch" |
208 |
- "${FILESDIR}/catkin_prefix_path_util_py_v2.patch" |
209 |
- "${FILESDIR}/package_xml.patch" |
210 |
- "${FILESDIR}/etc.patch" |
211 |
- "${FILESDIR}/sitedir.patch" |
212 |
-) |
213 |
- |
214 |
-src_prepare() { |
215 |
- # fix libdir |
216 |
- sed -i \ |
217 |
- -e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \ |
218 |
- -e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \ |
219 |
- -e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \ |
220 |
- -e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \ |
221 |
- -e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \ |
222 |
- cmake/*.cmake || die |
223 |
- cmake-utils_src_prepare |
224 |
-} |
225 |
- |
226 |
-catkin_src_configure_internal() { |
227 |
- local sitedir="$(python_get_sitedir)" |
228 |
- mycmakeargs+=( |
229 |
- -DPYTHON_EXECUTABLE="${PYTHON}" |
230 |
- -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}" |
231 |
- ) |
232 |
- python_export PYTHON_SCRIPTDIR |
233 |
- cmake-utils_src_configure |
234 |
-} |
235 |
- |
236 |
-src_configure() { |
237 |
- export PYTHONPATH="${S}/python" |
238 |
- local mycmakeargs=( |
239 |
- "$(cmake-utils_use test CATKIN_ENABLE_TESTING)" |
240 |
- "-DCATKIN_BUILD_BINARY_PACKAGE=ON" |
241 |
- ) |
242 |
- python_foreach_impl catkin_src_configure_internal |
243 |
-} |
244 |
- |
245 |
-src_compile() { |
246 |
- python_foreach_impl cmake-utils_src_compile |
247 |
-} |
248 |
- |
249 |
-src_test() { |
250 |
- unset PYTHON_SCRIPTDIR |
251 |
- python_foreach_impl cmake-utils_src_test |
252 |
-} |
253 |
- |
254 |
-catkin_src_install_internal() { |
255 |
- python_export PYTHON_SCRIPTDIR |
256 |
- cmake-utils_src_install |
257 |
- if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then |
258 |
- dodir /usr/bin |
259 |
- for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do |
260 |
- dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die |
261 |
- done |
262 |
- touch "${T}/.catkin_python_symlinks_generated" |
263 |
- fi |
264 |
-} |
265 |
- |
266 |
-src_install() { |
267 |
- python_foreach_impl catkin_src_install_internal |
268 |
- |
269 |
- doenvd "${FILESDIR}/40catkin" |
270 |
- |
271 |
- # needed to be considered as a workspace |
272 |
- touch "${ED}/usr/.catkin" |
273 |
-} |
274 |
- |
275 |
-pkg_postinst() { |
276 |
- ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the" |
277 |
- ewarn "installation path for package.xml files on Gentoo." |
278 |
- ewarn "In order for ROS to work properly, you will need to reinstall ROS" |
279 |
- ewarn "packages that have it installed in the old location:" |
280 |
- ewarn " emerge -1O /usr/share/*/package.xml" |
281 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details." |
282 |
-} |
283 |
|
284 |
diff --git a/dev-util/catkin/files/distutils.patch b/dev-util/catkin/files/distutils.patch |
285 |
deleted file mode 100644 |
286 |
index 292551181b6..00000000000 |
287 |
--- a/dev-util/catkin/files/distutils.patch |
288 |
+++ /dev/null |
289 |
@@ -1,13 +0,0 @@ |
290 |
-Allow to install scripts in PYTHON_SCRIPTDIR. |
291 |
-Needed for Gentoo multi-python support. |
292 |
- |
293 |
-Index: catkin-0.6.11/cmake/templates/python_distutils_install.sh.in |
294 |
-=================================================================== |
295 |
---- catkin-0.6.11.orig/cmake/templates/python_distutils_install.sh.in |
296 |
-+++ catkin-0.6.11/cmake/templates/python_distutils_install.sh.in |
297 |
-@@ -25,4 +25,4 @@ cd "@INSTALL_CMD_WORKING_DIRECTORY@" |
298 |
- build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \ |
299 |
- install \ |
300 |
- $DESTDIR_ARG \ |
301 |
-- @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@" |
302 |
-+ @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}" |
303 |
|
304 |
diff --git a/dev-util/catkin/files/sitedir.patch b/dev-util/catkin/files/sitedir.patch |
305 |
deleted file mode 100644 |
306 |
index 61fcad29d04..00000000000 |
307 |
--- a/dev-util/catkin/files/sitedir.patch |
308 |
+++ /dev/null |
309 |
@@ -1,15 +0,0 @@ |
310 |
-Pass --install-lib to setup.py install. |
311 |
-pypy installs in /usr/site-packages otherwise... |
312 |
- |
313 |
-Index: catkin-0.7.6/cmake/templates/python_distutils_install.sh.in |
314 |
-=================================================================== |
315 |
---- catkin-0.7.6.orig/cmake/templates/python_distutils_install.sh.in |
316 |
-+++ catkin-0.7.6/cmake/templates/python_distutils_install.sh.in |
317 |
-@@ -30,4 +30,6 @@ echo_and_run /usr/bin/env \ |
318 |
- build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \ |
319 |
- install \ |
320 |
- $DESTDIR_ARG \ |
321 |
-- @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}" |
322 |
-+ @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" \ |
323 |
-+ --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}" \ |
324 |
-+ --install-lib="@CMAKE_INSTALL_PREFIX@/@PYTHON_INSTALL_DIR@" |