dev-util/catkin: bump to 0.7.10

Package-Manager: Portage-2.3.20, Repoman-2.3.6

diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index 220a254b789af4dd0c006efba958d02386640d4e..b51f913237026d9358fb1b89bb9357d7ced8bbdf 100644 (file)
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -1 +1,2 @@
+DIST catkin-0.7.10.tar.gz 206434 BLAKE2B 66887a207cefea11f2a35706f296b1a761f30829ec2ffe4e162c31d3c672b670cb24f4dcf07992d0d5cfe936f87b5e7565200752cff4f1d30e649be6f3f123a4 SHA512 81705f76d20fb71e26aaabedda5b5db508d20c07f82f8e12537dc6931be884c28b62f0a734b4f2a1c46be2b5c6c431ecd8ce819bdddc71c62b8cc1f72d1f00c8
 DIST catkin-0.7.8.tar.gz 203828 BLAKE2B 169a8381297f5ea213c6e4179f63020330b19fb52821bb851f0716857607fda2af3e867ff3f23113bd66d9b96a9b47d60c6bf3643b9552c8f7686a8126b4dd18 SHA512 c3628c551c8a5a1e544f7816a5bdedf413217c6e1fc7bb612801d29fbb247660b35d634c26f8847ace8984482978a8b8bf72c3373fd1e2e0972917f206ee0605

diff --git a/dev-util/catkin/catkin-0.7.10.ebuild b/dev-util/catkin/catkin-0.7.10.ebuild
new file mode 100644 (file)
index 0000000..6f125a7
--- /dev/null
+++ b/dev-util/catkin/catkin-0.7.10.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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_4,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"
+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.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."
+}