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