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: Sun, 28 Jan 2018 12:54:45
Message-Id: 1517144071.3099952b46f3a81af5ae064eb52135a3103e36d3.aballier@gentoo
1 commit: 3099952b46f3a81af5ae064eb52135a3103e36d3
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 28 09:39:39 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=3099952b
7
8 dev-util/catkin: bump to 0.7.10
9
10 Package-Manager: Portage-2.3.20, Repoman-2.3.6
11
12 dev-util/catkin/Manifest | 1 +
13 dev-util/catkin/catkin-0.7.10.ebuild | 119 +++++++++++++++++++++++++++++++++++
14 2 files changed, 120 insertions(+)
15
16 diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
17 index 220a254b789..b51f9132370 100644
18 --- a/dev-util/catkin/Manifest
19 +++ b/dev-util/catkin/Manifest
20 @@ -1 +1,2 @@
21 +DIST catkin-0.7.10.tar.gz 206434 BLAKE2B 66887a207cefea11f2a35706f296b1a761f30829ec2ffe4e162c31d3c672b670cb24f4dcf07992d0d5cfe936f87b5e7565200752cff4f1d30e649be6f3f123a4 SHA512 81705f76d20fb71e26aaabedda5b5db508d20c07f82f8e12537dc6931be884c28b62f0a734b4f2a1c46be2b5c6c431ecd8ce819bdddc71c62b8cc1f72d1f00c8
22 DIST catkin-0.7.8.tar.gz 203828 BLAKE2B 169a8381297f5ea213c6e4179f63020330b19fb52821bb851f0716857607fda2af3e867ff3f23113bd66d9b96a9b47d60c6bf3643b9552c8f7686a8126b4dd18 SHA512 c3628c551c8a5a1e544f7816a5bdedf413217c6e1fc7bb612801d29fbb247660b35d634c26f8847ace8984482978a8b8bf72c3373fd1e2e0972917f206ee0605
23
24 diff --git a/dev-util/catkin/catkin-0.7.10.ebuild b/dev-util/catkin/catkin-0.7.10.ebuild
25 new file mode 100644
26 index 00000000000..6f125a7d7fb
27 --- /dev/null
28 +++ b/dev-util/catkin/catkin-0.7.10.ebuild
29 @@ -0,0 +1,119 @@
30 +# Copyright 1999-2018 Gentoo Foundation
31 +# Distributed under the terms of the GNU General Public License v2
32 +
33 +EAPI=5
34 +
35 +SCM=""
36 +if [ "${PV#9999}" != "${PV}" ] ; then
37 + SCM="git-r3"
38 + EGIT_REPO_URI="https://github.com/ros/catkin"
39 +fi
40 +
41 +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
42 +
43 +inherit ${SCM} cmake-utils python-r1 python-utils-r1
44 +
45 +DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
46 +HOMEPAGE="http://wiki.ros.org/catkin"
47 +if [ "${PV#9999}" != "${PV}" ] ; then
48 + SRC_URI=""
49 + KEYWORDS=""
50 +else
51 + SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
52 + KEYWORDS="~amd64 ~arm"
53 +fi
54 +
55 +LICENSE="BSD"
56 +SLOT="0"
57 +IUSE="test"
58 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
59 +
60 +RDEPEND="
61 + ${PYTHON_DEPS}
62 + dev-python/catkin_pkg[${PYTHON_USEDEP}]
63 + dev-python/empy[${PYTHON_USEDEP}]
64 + dev-util/cmake
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 + "${FILESDIR}/etc.patch"
77 + "${FILESDIR}/sitedir.patch"
78 +)
79 +
80 +src_prepare() {
81 + # fix libdir
82 + sed -i \
83 + -e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
84 + -e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
85 + -e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
86 + -e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
87 + -e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
88 + cmake/*.cmake || die
89 + cmake-utils_src_prepare
90 +}
91 +
92 +catkin_src_configure_internal() {
93 + local sitedir="$(python_get_sitedir)"
94 + mycmakeargs+=(
95 + -DPYTHON_EXECUTABLE="${PYTHON}"
96 + -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
97 + )
98 + python_export PYTHON_SCRIPTDIR
99 + cmake-utils_src_configure
100 +}
101 +
102 +src_configure() {
103 + export PYTHONPATH="${S}/python"
104 + local mycmakeargs=(
105 + "$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
106 + "-DCATKIN_BUILD_BINARY_PACKAGE=ON"
107 + )
108 + python_foreach_impl catkin_src_configure_internal
109 +}
110 +
111 +src_compile() {
112 + python_foreach_impl cmake-utils_src_compile
113 +}
114 +
115 +src_test() {
116 + unset PYTHON_SCRIPTDIR
117 + python_foreach_impl cmake-utils_src_test
118 +}
119 +
120 +catkin_src_install_internal() {
121 + python_export PYTHON_SCRIPTDIR
122 + cmake-utils_src_install
123 + if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
124 + dodir /usr/bin
125 + for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
126 + dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
127 + done
128 + touch "${T}/.catkin_python_symlinks_generated"
129 + fi
130 +}
131 +
132 +src_install() {
133 + python_foreach_impl catkin_src_install_internal
134 +
135 + doenvd "${FILESDIR}/40catkin"
136 +
137 + # needed to be considered as a workspace
138 + touch "${ED}/usr/.catkin"
139 +}
140 +
141 +pkg_postinst() {
142 + ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
143 + ewarn "installation path for package.xml files on Gentoo."
144 + ewarn "In order for ROS to work properly, you will need to reinstall ROS"
145 + ewarn "packages that have it installed in the old location:"
146 + ewarn " emerge -1O /usr/share/*/package.xml"
147 + ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
148 +}