1 |
commit: 851539d05ba74c25e5f79826eb2f0a65a3a6a45f |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 9 16:38:49 2017 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 9 17:46:01 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=851539d0 |
7 |
|
8 |
dev-util/catkin: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
dev-util/catkin/Manifest | 2 - |
13 |
dev-util/catkin/catkin-0.7.1-r2.ebuild | 110 --------------------------------- |
14 |
dev-util/catkin/catkin-0.7.2.ebuild | 110 --------------------------------- |
15 |
3 files changed, 222 deletions(-) |
16 |
|
17 |
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest |
18 |
index dff4f787ea..0491695b6d 100644 |
19 |
--- a/dev-util/catkin/Manifest |
20 |
+++ b/dev-util/catkin/Manifest |
21 |
@@ -1,3 +1 @@ |
22 |
-DIST catkin-0.7.1.tar.gz 200307 SHA256 232cc85807daee31329ba4509fb1e5697ddb0a17f9442ac886a5883da687d9ab SHA512 e1ab220dc04e9522059c073c328c7da9d957266d2030e07a4ae03829c5666abf8ff5008e8208b5ca4b9a0153cb201337879e3c8f987d84fe5a4b66000d60ae03 WHIRLPOOL f47fb5a51869f49fc238eeb05ae76284081d8ac522283232b182197d7fc8e0255f34e99fd7f08abc79427f63e554e0cefdf5bee81a96a64d9ef489c45151af52 |
23 |
-DIST catkin-0.7.2.tar.gz 201049 SHA256 e8c23823b8cc6ea19b5e15af93c2790395cae72b82797c8f1ce2569e0c036e2f SHA512 23587533d531f6ef2fdc4c109a7954a771af60b95261057061aca50bf6d041e31307f4429d6dc9021ecc9e21d723806278b186a037b7ac26b751d83cb842ea37 WHIRLPOOL f91c4164ace4a354fcb9541ddd54f310b3bd5e3f481b0bf9c02cf594531485b079ec026ce6ce388cabf54a7bbc91230ddc71aa07a567a23d1b3384b7e0a313f0 |
24 |
DIST catkin-0.7.4.tar.gz 201140 SHA256 e113577697cd58432111c187b3faaa0df365f7694fe81ff71f9d29b65d467e48 SHA512 89bd38e8fbe4eba481404295f83a77974a2af14a038d326b294029d84789356290480588d7824e4e9849a9974a8ca08be13115c459aa6e00a8e36ce861f46a83 WHIRLPOOL 66b738d02609d9cfe891f7e159ec8ff980acb18208b635d25e9c66895e85ebd6024082ff117d3c1e0a26ebe529d7079aea2f8ecdfa541dc449b0ea768e033dd0 |
25 |
|
26 |
diff --git a/dev-util/catkin/catkin-0.7.1-r2.ebuild b/dev-util/catkin/catkin-0.7.1-r2.ebuild |
27 |
deleted file mode 100644 |
28 |
index ada4a5e925..0000000000 |
29 |
--- a/dev-util/catkin/catkin-0.7.1-r2.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,110 +0,0 @@ |
32 |
-# Copyright 1999-2016 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
-# $Id$ |
35 |
- |
36 |
-EAPI=5 |
37 |
- |
38 |
-SCM="" |
39 |
-if [ "${PV#9999}" != "${PV}" ] ; then |
40 |
- SCM="git-r3" |
41 |
- EGIT_REPO_URI="https://github.com/ros/catkin" |
42 |
-fi |
43 |
- |
44 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
45 |
- |
46 |
-inherit ${SCM} cmake-utils python-r1 python-utils-r1 |
47 |
- |
48 |
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS" |
49 |
-HOMEPAGE="http://wiki.ros.org/catkin" |
50 |
-if [ "${PV#9999}" != "${PV}" ] ; then |
51 |
- SRC_URI="" |
52 |
- KEYWORDS="" |
53 |
-else |
54 |
- SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz" |
55 |
- KEYWORDS="~amd64 ~arm" |
56 |
-fi |
57 |
- |
58 |
-LICENSE="BSD" |
59 |
-SLOT="0" |
60 |
-IUSE="test" |
61 |
- |
62 |
-RDEPEND=" |
63 |
- dev-python/catkin_pkg[${PYTHON_USEDEP}] |
64 |
- dev-python/empy[${PYTHON_USEDEP}] |
65 |
-" |
66 |
-DEPEND="${RDEPEND} |
67 |
- test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )" |
68 |
- |
69 |
-PATCHES=( |
70 |
- "${FILESDIR}/tests.patch" |
71 |
- "${FILESDIR}/distutils.patch" |
72 |
- "${FILESDIR}/catkin_prefix_path.patch" |
73 |
- "${FILESDIR}/gnuinstalldirs.patch" |
74 |
- "${FILESDIR}/catkin_prefix_path_util_py.patch" |
75 |
- "${FILESDIR}/package_xml.patch" |
76 |
-) |
77 |
- |
78 |
-src_prepare() { |
79 |
- # fix libdir |
80 |
- sed -i \ |
81 |
- -e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \ |
82 |
- -e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \ |
83 |
- -e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \ |
84 |
- -e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \ |
85 |
- -e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \ |
86 |
- cmake/*.cmake || die |
87 |
- cmake-utils_src_prepare |
88 |
-} |
89 |
- |
90 |
-catkin_src_configure_internal() { |
91 |
- mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" ) |
92 |
- python_export PYTHON_SCRIPTDIR |
93 |
- cmake-utils_src_configure |
94 |
-} |
95 |
- |
96 |
-src_configure() { |
97 |
- local mycmakeargs=( |
98 |
- "$(cmake-utils_use test CATKIN_ENABLE_TESTING)" |
99 |
- "-DCATKIN_BUILD_BINARY_PACKAGE=ON" |
100 |
- ) |
101 |
- python_foreach_impl catkin_src_configure_internal |
102 |
-} |
103 |
- |
104 |
-src_compile() { |
105 |
- python_foreach_impl cmake-utils_src_compile |
106 |
-} |
107 |
- |
108 |
-src_test() { |
109 |
- unset PYTHON_SCRIPTDIR |
110 |
- python_foreach_impl cmake-utils_src_test |
111 |
-} |
112 |
- |
113 |
-catkin_src_install_internal() { |
114 |
- python_export PYTHON_SCRIPTDIR |
115 |
- cmake-utils_src_install |
116 |
- if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then |
117 |
- dodir /usr/bin |
118 |
- for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do |
119 |
- dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die |
120 |
- done |
121 |
- touch "${T}/.catkin_python_symlinks_generated" |
122 |
- fi |
123 |
-} |
124 |
- |
125 |
-src_install() { |
126 |
- python_foreach_impl catkin_src_install_internal |
127 |
- |
128 |
- doenvd "${FILESDIR}/40catkin" |
129 |
- |
130 |
- # needed to be considered as a workspace |
131 |
- touch "${ED}/usr/.catkin" |
132 |
-} |
133 |
- |
134 |
-pkg_postinst() { |
135 |
- ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the" |
136 |
- ewarn "installation path for package.xml files on Gentoo." |
137 |
- ewarn "In order for ROS to work properly, you will need to reinstall ROS" |
138 |
- ewarn "packages that have it installed in the old location:" |
139 |
- ewarn " emerge -1O /usr/share/*/package.xml" |
140 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details." |
141 |
-} |
142 |
|
143 |
diff --git a/dev-util/catkin/catkin-0.7.2.ebuild b/dev-util/catkin/catkin-0.7.2.ebuild |
144 |
deleted file mode 100644 |
145 |
index ada4a5e925..0000000000 |
146 |
--- a/dev-util/catkin/catkin-0.7.2.ebuild |
147 |
+++ /dev/null |
148 |
@@ -1,110 +0,0 @@ |
149 |
-# Copyright 1999-2016 Gentoo Foundation |
150 |
-# Distributed under the terms of the GNU General Public License v2 |
151 |
-# $Id$ |
152 |
- |
153 |
-EAPI=5 |
154 |
- |
155 |
-SCM="" |
156 |
-if [ "${PV#9999}" != "${PV}" ] ; then |
157 |
- SCM="git-r3" |
158 |
- EGIT_REPO_URI="https://github.com/ros/catkin" |
159 |
-fi |
160 |
- |
161 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
162 |
- |
163 |
-inherit ${SCM} cmake-utils python-r1 python-utils-r1 |
164 |
- |
165 |
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS" |
166 |
-HOMEPAGE="http://wiki.ros.org/catkin" |
167 |
-if [ "${PV#9999}" != "${PV}" ] ; then |
168 |
- SRC_URI="" |
169 |
- KEYWORDS="" |
170 |
-else |
171 |
- SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz" |
172 |
- KEYWORDS="~amd64 ~arm" |
173 |
-fi |
174 |
- |
175 |
-LICENSE="BSD" |
176 |
-SLOT="0" |
177 |
-IUSE="test" |
178 |
- |
179 |
-RDEPEND=" |
180 |
- dev-python/catkin_pkg[${PYTHON_USEDEP}] |
181 |
- dev-python/empy[${PYTHON_USEDEP}] |
182 |
-" |
183 |
-DEPEND="${RDEPEND} |
184 |
- test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )" |
185 |
- |
186 |
-PATCHES=( |
187 |
- "${FILESDIR}/tests.patch" |
188 |
- "${FILESDIR}/distutils.patch" |
189 |
- "${FILESDIR}/catkin_prefix_path.patch" |
190 |
- "${FILESDIR}/gnuinstalldirs.patch" |
191 |
- "${FILESDIR}/catkin_prefix_path_util_py.patch" |
192 |
- "${FILESDIR}/package_xml.patch" |
193 |
-) |
194 |
- |
195 |
-src_prepare() { |
196 |
- # fix libdir |
197 |
- sed -i \ |
198 |
- -e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \ |
199 |
- -e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \ |
200 |
- -e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \ |
201 |
- -e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \ |
202 |
- -e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \ |
203 |
- cmake/*.cmake || die |
204 |
- cmake-utils_src_prepare |
205 |
-} |
206 |
- |
207 |
-catkin_src_configure_internal() { |
208 |
- mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" ) |
209 |
- python_export PYTHON_SCRIPTDIR |
210 |
- cmake-utils_src_configure |
211 |
-} |
212 |
- |
213 |
-src_configure() { |
214 |
- local mycmakeargs=( |
215 |
- "$(cmake-utils_use test CATKIN_ENABLE_TESTING)" |
216 |
- "-DCATKIN_BUILD_BINARY_PACKAGE=ON" |
217 |
- ) |
218 |
- python_foreach_impl catkin_src_configure_internal |
219 |
-} |
220 |
- |
221 |
-src_compile() { |
222 |
- python_foreach_impl cmake-utils_src_compile |
223 |
-} |
224 |
- |
225 |
-src_test() { |
226 |
- unset PYTHON_SCRIPTDIR |
227 |
- python_foreach_impl cmake-utils_src_test |
228 |
-} |
229 |
- |
230 |
-catkin_src_install_internal() { |
231 |
- python_export PYTHON_SCRIPTDIR |
232 |
- cmake-utils_src_install |
233 |
- if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then |
234 |
- dodir /usr/bin |
235 |
- for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do |
236 |
- dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die |
237 |
- done |
238 |
- touch "${T}/.catkin_python_symlinks_generated" |
239 |
- fi |
240 |
-} |
241 |
- |
242 |
-src_install() { |
243 |
- python_foreach_impl catkin_src_install_internal |
244 |
- |
245 |
- doenvd "${FILESDIR}/40catkin" |
246 |
- |
247 |
- # needed to be considered as a workspace |
248 |
- touch "${ED}/usr/.catkin" |
249 |
-} |
250 |
- |
251 |
-pkg_postinst() { |
252 |
- ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the" |
253 |
- ewarn "installation path for package.xml files on Gentoo." |
254 |
- ewarn "In order for ROS to work properly, you will need to reinstall ROS" |
255 |
- ewarn "packages that have it installed in the old location:" |
256 |
- ewarn " emerge -1O /usr/share/*/package.xml" |
257 |
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details." |
258 |
-} |