commit:     ec438673a6768995c39908600be447cdec3167b1
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 11 13:55:36 2019 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Dec 11 15:26:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec438673

dev-util/catkin: bump to 0.7.20

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 dev-util/catkin/Manifest             |   1 +
 dev-util/catkin/catkin-0.7.20.ebuild | 120 +++++++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+)

diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index 078333b1a2e..d5d5c25f558 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -1,2 +1,3 @@
 DIST catkin-0.7.14.tar.gz 203422 BLAKE2B 
22f27066054db9d35aaee216603c778a70a1941ab067ba6bfb42d25c6c90dc3fe3efb19167328dcbb008d21b9f7987cce4d3af44fe8368a1fda369432b383401
 SHA512 
4d17d2fd9c69d04d90a2aff4d48ac6cbdec052856af18cd4b3fb72cb7b3159651b606cd36ef653b9097ee7c23e036709afc019a95bb0ab34c29f51aad4d17d21
 DIST catkin-0.7.17.tar.gz 212023 BLAKE2B 
901bc5a3e226eaab59917b4d548fe3aacfad602a75e46cbd720f252ffd490c4ff2b170cd158a0c09c047b837d6f097555ba55291dfeedb51951d98f2f0273c34
 SHA512 
0c6adfda27924a5c9c5360e5e84e082e5cc9a7638a1129fe86f604515d3731f4257f725f80e8e8781200a8a367472224aea537871e56e1859e9f66950a746d45
+DIST catkin-0.7.20.tar.gz 215244 BLAKE2B 
06755e87f43d1e97138a6696af05dfd9b9434adcca9d4269c7b93b363b25ac9e8b198a980d7607b6b317f546b7637103dc251213087201ff56c1f12c86892edb
 SHA512 
7258f0d548a92d846c9ad195d5e28a567d3c1b4cd1caabffd58c3fabee66cec8ce3612d3095e6437ac201b4d37fddf8f850775e809ebb7eaaeb99328afaedfc6

diff --git a/dev-util/catkin/catkin-0.7.20.ebuild 
b/dev-util/catkin/catkin-0.7.20.ebuild
new file mode 100644
index 00000000000..92350f4085a
--- /dev/null
+++ b/dev-util/catkin/catkin-0.7.20.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+       SCM="git-r3"
+       EGIT_REPO_URI="https://github.com/ros/catkin";
+fi
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+
+inherit ${SCM} cmake-utils python-r1 python-utils-r1
+
+DESCRIPTION="Cmake macros and associated python code used to build some parts 
of ROS"
+HOMEPAGE="http://wiki.ros.org/catkin";
+if [ "${PV#9999}" != "${PV}" ] ; then
+       SRC_URI=""
+       KEYWORDS=""
+else
+       SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+       KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+       ${PYTHON_DEPS}
+       dev-python/catkin_pkg[${PYTHON_USEDEP}]
+       dev-python/empy[${PYTHON_USEDEP}]
+       dev-util/cmake
+"
+DEPEND="${RDEPEND}
+       test? ( dev-python/nose[${PYTHON_USEDEP}] 
dev-python/mock[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+       "${FILESDIR}/tests.patch"
+       "${FILESDIR}/distutils.patch"
+       "${FILESDIR}/catkin_prefix_path.patch"
+       "${FILESDIR}/gnuinstalldirs.patch"
+       "${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
+       "${FILESDIR}/package_xml.patch"
+       "${FILESDIR}/etc.patch"
+       "${FILESDIR}/sitedir.patch"
+)
+
+src_prepare() {
+       # fix libdir
+       sed -i \
+               -e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
+               -e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
+               -e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
+               -e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
+               -e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR 
${CMAKE_INSTALL_LIBDIR}:' \
+               cmake/*.cmake || die
+       cmake-utils_src_prepare
+}
+
+catkin_src_configure_internal() {
+       local sitedir="$(python_get_sitedir)"
+       mycmakeargs+=(
+               -DPYTHON_EXECUTABLE="${PYTHON}"
+               -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
+       )
+       python_export PYTHON_SCRIPTDIR
+       cmake-utils_src_configure
+}
+
+src_configure() {
+       export PYTHONPATH="${S}/python"
+       local mycmakeargs=(
+               "$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
+               "-DCATKIN_BUILD_BINARY_PACKAGE=ON"
+               )
+       python_foreach_impl catkin_src_configure_internal
+}
+
+src_compile() {
+       python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+       unset PYTHON_SCRIPTDIR
+       python_foreach_impl cmake-utils_src_test
+}
+
+catkin_src_install_internal() {
+       python_export PYTHON_SCRIPTDIR
+       cmake-utils_src_install
+       if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
+               dodir /usr/bin
+               for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
+                       dosym ../lib/python-exec/python-exec2 
"/usr/bin/${i##*/}" || die
+               done
+               touch "${T}/.catkin_python_symlinks_generated"
+       fi
+}
+
+src_install() {
+       python_foreach_impl catkin_src_install_internal
+
+       doenvd "${FILESDIR}/40catkin"
+
+       # needed to be considered as a workspace
+       touch "${ED}/usr/.catkin"
+}
+
+pkg_postinst() {
+       ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
+       ewarn "installation path for package.xml files on Gentoo."
+       ewarn "In order for ROS to work properly, you will need to reinstall 
ROS"
+       ewarn "packages that have it installed in the old location:"
+       ewarn "         emerge -1O /usr/share/*/package.xml"
+       ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more 
details."
+}

Reply via email to