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, 30 Jul 2017 16:44:12
Message-Id: 1501433033.a3411b1aa5b89bab62c3ae242214429f1973cd40.aballier@gentoo
1 commit: a3411b1aa5b89bab62c3ae242214429f1973cd40
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 30 16:29:41 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 30 16:43:53 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3411b1a
7
8 dev-util/catkin: bump to 0.7.7
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.3
11
12 dev-util/catkin/Manifest | 1 +
13 dev-util/catkin/catkin-0.7.7.ebuild | 119 ++++++++++++++++++++++++++++++++++++
14 2 files changed, 120 insertions(+)
15
16 diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
17 index 27e59d038c0..75e182c5a53 100644
18 --- a/dev-util/catkin/Manifest
19 +++ b/dev-util/catkin/Manifest
20 @@ -1 +1,2 @@
21 DIST catkin-0.7.6.tar.gz 202970 SHA256 468725aadfd6b615cd7d7a75fca37777db987b6ad63f73062c3273bd96d380d6 SHA512 9f4ddef3cdef0f81aeb2abe27db797318f813e184d457f6f81439d3b539efe2e2726da7eda8359a803848c5e5f8a2f8fd291b6f2a00a16a06112d084c1ec14ce WHIRLPOOL 863f477d54dd2ed297ea94776102fd31ad68cba3550e2a17a3218acda889c0b1071c9df73f16224fc75445742294df46ba6a7eae20019bb01974bde17db9fab8
22 +DIST catkin-0.7.7.tar.gz 203773 SHA256 0ab4efd1d42fc586ace5a37aba3c4266cff31593b39b7abe3ab6ced6b160e92f SHA512 616ff6a34ab52d50e383acdcebe66aa8f4ac1515ed3c654d75f32cdfe86ee3b87b17872ea2068ea5ddc5f35b73b5cf53c84c6e386d89ad2c8270228f1c446d01 WHIRLPOOL 40c901f74e39e6239d0967ce997d6ebc011063ed0208123d20e057a3bbd53e4dd7b70c6e8c4bfb31d7f0ae9e57292e17343565b68b9c441a5c10f7ff1dee6117
23
24 diff --git a/dev-util/catkin/catkin-0.7.7.ebuild b/dev-util/catkin/catkin-0.7.7.ebuild
25 new file mode 100644
26 index 00000000000..eb49a4b8c81
27 --- /dev/null
28 +++ b/dev-util/catkin/catkin-0.7.7.ebuild
29 @@ -0,0 +1,119 @@
30 +# Copyright 1999-2017 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 +}