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