[gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/, dev-util/catkin/files/
commit: c9fb3d4e4b878dc857fb467c837fd7d3922631bb Author: Alexis Ballier gentoo org> AuthorDate: Tue Oct 13 11:36:53 2020 + Commit: Alexis Ballier gentoo org> CommitDate: Tue Oct 13 12:24:14 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9fb3d4e dev-util/catkin: Remove old Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Alexis Ballier gentoo.org> dev-util/catkin/Manifest | 1 - dev-util/catkin/catkin-0.8.3-r1.ebuild | 125 - dev-util/catkin/files/egginfo.patch| 13 3 files changed, 139 deletions(-) diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest index e2012a736da..daf0db1703c 100644 --- a/dev-util/catkin/Manifest +++ b/dev-util/catkin/Manifest @@ -1,2 +1 @@ -DIST catkin-0.8.3.tar.gz 215988 BLAKE2B 92d7bced93e2d33dafcfd902724f993aa15756139265b5594c15041c333568591193b86e1a4bee8c278f2739dd063f73b6ce675b8ab4fefd312b5daeea414c7a SHA512 14fd03627f3fb339a850ca73e7a49dfeb7312a85416473dff60995ea1d0f1050982929c297751502589a7320dd7eec5d922c86061166f9d475fc1108540db4ae DIST catkin-0.8.8.tar.gz 217566 BLAKE2B c17ed55e4f72f6645a778b5669e9b54090ea0425526d7540a6c8cf3af88ba10dfd91b927f53a83d9d2fac56e000c4c52e93216a36694475a91fabe00dd2d0168 SHA512 a90c552bebb46ade23171c85ca1cb23b295d156e731c29cd7602e544aef6231edb179d0fce52d06008d762bafd309456e0ef8976a3f67ed9ea861b905b1bb979 diff --git a/dev-util/catkin/catkin-0.8.3-r1.ebuild b/dev-util/catkin/catkin-0.8.3-r1.ebuild deleted file mode 100644 index c11d6524150..000 --- a/dev-util/catkin/catkin-0.8.3-r1.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -SCM="" -if [ "${PV#}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/ros/catkin"; -fi - -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) - -inherit ${SCM} cmake-utils python-r1 python-utils-r1 - -DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS" -HOMEPAGE="https://wiki.ros.org/catkin"; -if [ "${PV#}" != "${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}] )" -BDEPEND=" - dev-util/cmake -" - -PATCHES=( - "${FILESDIR}/tests.patch" - "${FILESDIR}/distutils-v2.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}/egginfo.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=( - "-DCATKIN_ENABLE_TESTING=$(usex test)" - "-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##*/}" - 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" -
[gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/, dev-util/catkin/files/
commit: 9131bb78d82b71dec2d2bf255edb5f58bd2dc3f9 Author: Alexis Ballier gentoo org> AuthorDate: Mon Aug 10 12:22:10 2020 + Commit: Alexis Ballier gentoo org> CommitDate: Mon Aug 10 12:23:07 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9131bb78 dev-util/catkin: improve gtest/gmock search logic Closes: https://bugs.gentoo.org/736599 Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Alexis Ballier gentoo.org> ...{catkin-0.8.8.ebuild => catkin-0.8.8-r1.ebuild} | 1 + dev-util/catkin/catkin-.ebuild | 1 + dev-util/catkin/files/gtest.patch | 45 ++ 3 files changed, 47 insertions(+) diff --git a/dev-util/catkin/catkin-0.8.8.ebuild b/dev-util/catkin/catkin-0.8.8-r1.ebuild similarity index 99% rename from dev-util/catkin/catkin-0.8.8.ebuild rename to dev-util/catkin/catkin-0.8.8-r1.ebuild index 124af520da9..41845cda313 100644 --- a/dev-util/catkin/catkin-0.8.8.ebuild +++ b/dev-util/catkin/catkin-0.8.8-r1.ebuild @@ -47,6 +47,7 @@ PATCHES=( "${FILESDIR}/catkin_prefix_path_util_py_v2.patch" "${FILESDIR}/package_xml.patch" "${FILESDIR}/etc.patch" + "${FILESDIR}/gtest.patch" ) src_prepare() { diff --git a/dev-util/catkin/catkin-.ebuild b/dev-util/catkin/catkin-.ebuild index 124af520da9..41845cda313 100644 --- a/dev-util/catkin/catkin-.ebuild +++ b/dev-util/catkin/catkin-.ebuild @@ -47,6 +47,7 @@ PATCHES=( "${FILESDIR}/catkin_prefix_path_util_py_v2.patch" "${FILESDIR}/package_xml.patch" "${FILESDIR}/etc.patch" + "${FILESDIR}/gtest.patch" ) src_prepare() { diff --git a/dev-util/catkin/files/gtest.patch b/dev-util/catkin/files/gtest.patch new file mode 100644 index 000..106b7e2886e --- /dev/null +++ b/dev-util/catkin/files/gtest.patch @@ -0,0 +1,45 @@ +From d9302318dece61acd0caa27d56f3817838f8f333 Mon Sep 17 00:00:00 2001 +From: seanyen +Date: Thu, 6 Aug 2020 18:59:07 -0700 +Subject: [PATCH] Adding the new GTest search logic for Vcpkg. + +--- + cmake/test/gtest.cmake | 25 + + 1 file changed, 25 insertions(+) + +Index: catkin-0.8.8/cmake/test/gtest.cmake +=== +--- catkin-0.8.8.orig/cmake/test/gtest.cmake catkin-0.8.8/cmake/test/gtest.cmake +@@ -337,6 +337,31 @@ if(TARGET gtest AND TARGET gtest_main AN + set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}) + endif() + else() ++ # attempt to find the modern GTest config. ++ find_package(GTest 1.8.1 QUIET CONFIG) ++ if(GTest_FOUND AND TARGET GTest::gtest AND TARGET GTest::gtest_main) ++set(GTEST_FOUND TRUE) ++add_library(gtest ALIAS GTest::gtest) ++add_library(gtest_main ALIAS GTest::gtest_main) ++set(GTEST_INCLUDE_DIRS) ++set(GTEST_LIBRARY_DIRS) ++set(GTEST_LIBRARIES gtest) ++set(GTEST_MAIN_LIBRARIES gtest_main) ++set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}) ++ endif() ++ if(GTest_FOUND AND TARGET GTest::gmock AND TARGET GTest::gmock_main) ++set(GMOCK_FOUND TRUE) ++add_library(gmock ALIAS GTest::gmock) ++add_library(gmock_main ALIAS GTest::gmock_main) ++set(GMOCK_INCLUDE_DIRS) ++set(GMOCK_LIBRARY_DIRS) ++set(GMOCK_LIBRARIES gmock) ++set(GMOCK_MAIN_LIBRARIES gmock_main) ++set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARIES} ${GMOCK_MAIN_LIBRARIES}) ++ endif() ++endif() ++ ++if(NOT GTEST_FOUND) + find_package(GTest QUIET) + endif() + if(NOT GMOCK_FOUND OR NOT GTEST_FOUND)
[gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/, dev-util/catkin/files/
commit: 022f150b8d86abac12c77f73ac86e88b3d813f36 Author: Alexis Ballier gentoo org> AuthorDate: Thu Jun 4 13:07:10 2020 + Commit: Alexis Ballier gentoo org> CommitDate: Thu Jun 4 13:08:02 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=022f150b dev-util/catkin: fix python script install. Closes: https://bugs.gentoo.org/726414 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Alexis Ballier gentoo.org> .../catkin/{catkin-0.8.3.ebuild => catkin-0.8.3-r1.ebuild} | 1 + dev-util/catkin/catkin-.ebuild | 1 + dev-util/catkin/files/distutils-v2.patch| 13 + 3 files changed, 15 insertions(+) diff --git a/dev-util/catkin/catkin-0.8.3.ebuild b/dev-util/catkin/catkin-0.8.3-r1.ebuild similarity index 98% rename from dev-util/catkin/catkin-0.8.3.ebuild rename to dev-util/catkin/catkin-0.8.3-r1.ebuild index c37940ea8df..adf1b136a8c 100644 --- a/dev-util/catkin/catkin-0.8.3.ebuild +++ b/dev-util/catkin/catkin-0.8.3-r1.ebuild @@ -43,6 +43,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/tests.patch" + "${FILESDIR}/distutils-v2.patch" "${FILESDIR}/catkin_prefix_path.patch" "${FILESDIR}/gnuinstalldirs.patch" "${FILESDIR}/catkin_prefix_path_util_py_v2.patch" diff --git a/dev-util/catkin/catkin-.ebuild b/dev-util/catkin/catkin-.ebuild index c37940ea8df..adf1b136a8c 100644 --- a/dev-util/catkin/catkin-.ebuild +++ b/dev-util/catkin/catkin-.ebuild @@ -43,6 +43,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/tests.patch" + "${FILESDIR}/distutils-v2.patch" "${FILESDIR}/catkin_prefix_path.patch" "${FILESDIR}/gnuinstalldirs.patch" "${FILESDIR}/catkin_prefix_path_util_py_v2.patch" diff --git a/dev-util/catkin/files/distutils-v2.patch b/dev-util/catkin/files/distutils-v2.patch new file mode 100644 index 000..cb3aab220b0 --- /dev/null +++ b/dev-util/catkin/files/distutils-v2.patch @@ -0,0 +1,13 @@ +Allow to install scripts in PYTHON_SCRIPTDIR. +Needed for Gentoo multi-python support. + +Index: catkin-0.8.3/cmake/templates/python_distutils_install.sh.in +=== +--- catkin-0.8.3.orig/cmake/templates/python_distutils_install.sh.in catkin-0.8.3/cmake/templates/python_distutils_install.sh.in +@@ -30,4 +30,4 @@ echo_and_run /usr/bin/env \ + build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \ + install \ + --root="${DESTDIR-/}" \ +-@SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@" ++@SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/, dev-util/catkin/files/
commit: b33ece56c59ae0b1c186af967c552efaa9dcd361 Author: Alexis Ballier gentoo org> AuthorDate: Mon Nov 28 13:55:54 2016 + Commit: Alexis Ballier gentoo org> CommitDate: Mon Nov 28 15:04:28 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b33ece56 dev-util/catkin: set global etc destination to /etc, part of bug #598537 Package-Manager: portage-2.3.2 .../catkin/{catkin-0.7.4.ebuild => catkin-0.7.4-r1.ebuild} | 1 + dev-util/catkin/catkin-.ebuild | 1 + dev-util/catkin/files/etc.patch | 13 + 3 files changed, 15 insertions(+) diff --git a/dev-util/catkin/catkin-0.7.4.ebuild b/dev-util/catkin/catkin-0.7.4-r1.ebuild similarity index 99% rename from dev-util/catkin/catkin-0.7.4.ebuild rename to dev-util/catkin/catkin-0.7.4-r1.ebuild index ada4a5e..c984078 100644 --- a/dev-util/catkin/catkin-0.7.4.ebuild +++ b/dev-util/catkin/catkin-0.7.4-r1.ebuild @@ -42,6 +42,7 @@ PATCHES=( "${FILESDIR}/gnuinstalldirs.patch" "${FILESDIR}/catkin_prefix_path_util_py.patch" "${FILESDIR}/package_xml.patch" + "${FILESDIR}/etc.patch" ) src_prepare() { diff --git a/dev-util/catkin/catkin-.ebuild b/dev-util/catkin/catkin-.ebuild index ada4a5e..c984078 100644 --- a/dev-util/catkin/catkin-.ebuild +++ b/dev-util/catkin/catkin-.ebuild @@ -42,6 +42,7 @@ PATCHES=( "${FILESDIR}/gnuinstalldirs.patch" "${FILESDIR}/catkin_prefix_path_util_py.patch" "${FILESDIR}/package_xml.patch" + "${FILESDIR}/etc.patch" ) src_prepare() { diff --git a/dev-util/catkin/files/etc.patch b/dev-util/catkin/files/etc.patch new file mode 100644 index ..205aca9 --- /dev/null +++ b/dev-util/catkin/files/etc.patch @@ -0,0 +1,13 @@ +Index: catkin-0.7.4/cmake/all.cmake +=== +--- catkin-0.7.4.orig/cmake/all.cmake catkin-0.7.4/cmake/all.cmake +@@ -163,7 +163,7 @@ unset(_CATKIN_CURRENT_PACKAGE) + + # set global install destinations + set(CATKIN_GLOBAL_BIN_DESTINATION bin) +-set(CATKIN_GLOBAL_ETC_DESTINATION etc) ++set(CATKIN_GLOBAL_ETC_DESTINATION ../etc) + set(CATKIN_GLOBAL_INCLUDE_DESTINATION include) + set(CATKIN_GLOBAL_LIB_DESTINATION ${CMAKE_INSTALL_LIBDIR}) + set(CATKIN_GLOBAL_LIBEXEC_DESTINATION libexec)
[gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/, dev-util/catkin/files/
commit: 7a248874093015abaf34f4845a583797f80f8002 Author: Alexis Ballier gentoo org> AuthorDate: Fri Oct 7 11:50:48 2016 + Commit: Alexis Ballier gentoo org> CommitDate: Fri Oct 7 11:50:48 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a248874 dev-util/catkin: Add CATKIN_PREFIX_PATH support to _setup_util.py.in. Patch by Eric Timmons. Bug #586104. Package-Manager: portage-2.3.1 .../{catkin-0.7.1.ebuild => catkin-0.7.1-r1.ebuild} | 3 ++- dev-util/catkin/catkin-.ebuild | 3 ++- dev-util/catkin/files/catkin_prefix_path_util_py.patch | 16 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dev-util/catkin/catkin-0.7.1.ebuild b/dev-util/catkin/catkin-0.7.1-r1.ebuild similarity index 96% rename from dev-util/catkin/catkin-0.7.1.ebuild rename to dev-util/catkin/catkin-0.7.1-r1.ebuild index ddfc8ba..cf494b1 100644 --- a/dev-util/catkin/catkin-0.7.1.ebuild +++ b/dev-util/catkin/catkin-0.7.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -40,6 +40,7 @@ PATCHES=( "${FILESDIR}/distutils.patch" "${FILESDIR}/catkin_prefix_path.patch" "${FILESDIR}/gnuinstalldirs.patch" + "${FILESDIR}/catkin_prefix_path_util_py.patch" ) src_prepare() { diff --git a/dev-util/catkin/catkin-.ebuild b/dev-util/catkin/catkin-.ebuild index ddfc8ba..cf494b1 100644 --- a/dev-util/catkin/catkin-.ebuild +++ b/dev-util/catkin/catkin-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -40,6 +40,7 @@ PATCHES=( "${FILESDIR}/distutils.patch" "${FILESDIR}/catkin_prefix_path.patch" "${FILESDIR}/gnuinstalldirs.patch" + "${FILESDIR}/catkin_prefix_path_util_py.patch" ) src_prepare() { diff --git a/dev-util/catkin/files/catkin_prefix_path_util_py.patch b/dev-util/catkin/files/catkin_prefix_path_util_py.patch new file mode 100644 index ..d978176 --- /dev/null +++ b/dev-util/catkin/files/catkin_prefix_path_util_py.patch @@ -0,0 +1,16 @@ +Author: Eric Timmons +https://bugs.gentoo.org/show_bug.cgi?id=586104 + +Index: catkin-0.6.16/cmake/templates/_setup_util.py.in +=== +--- catkin-0.6.16.orig/cmake/templates/_setup_util.py.in catkin-0.6.16/cmake/templates/_setup_util.py.in +@@ -262,7 +262,7 @@ + sys.exit(1) + + # environment at generation time +-CMAKE_PREFIX_PATH = '@CMAKE_PREFIX_PATH_AS_IS@'.split(';') ++CMAKE_PREFIX_PATH = '@CATKIN_PREFIX_PATH@;@CMAKE_PREFIX_PATH_AS_IS@'.split(';') + # prepend current workspace if not already part of CPP + base_path = os.path.dirname(__file__) + if base_path not in CMAKE_PREFIX_PATH:
[gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/, dev-util/catkin/files/
commit: 46e2e14c175c3f370a24beadcb558595de8091e0 Author: Alexis Ballier gentoo org> AuthorDate: Thu Sep 17 10:28:47 2015 + Commit: Alexis Ballier gentoo org> CommitDate: Thu Sep 17 10:29:09 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46e2e14c dev-util/catkin: initial import. ebuild by me. Package-Manager: portage-2.2.20.1 dev-util/catkin/Manifest | 1 + dev-util/catkin/catkin-0.6.14.ebuild | 95 ++ dev-util/catkin/catkin-.ebuild | 95 ++ dev-util/catkin/files/catkin_prefix_path.patch | 55 +++ dev-util/catkin/files/distutils.patch | 13 dev-util/catkin/files/tests.patch | 40 +++ dev-util/catkin/metadata.xml | 5 ++ 7 files changed, 304 insertions(+) diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest new file mode 100644 index 000..1d66923 --- /dev/null +++ b/dev-util/catkin/Manifest @@ -0,0 +1 @@ +DIST catkin-0.6.14.tar.gz 197628 SHA256 0ca265803be8a2c1b6036d67ed63505551f4bbc02fa6cb8180dc3167b9f3afc9 SHA512 e2aec7bfbef0f103d96c71408917823cd80e205c021bcd78c018eb2bff04bc268f661ada52963929726e0a986115cbe2c4d791cfa4542a20f7841cd74372 WHIRLPOOL 18a4173b5536da3ec6f7395c39f382b03d173e878b81ffef7d224d2828d6930099a74e08a6299b09a68bd56de87e4be225a735cc8a423b8a0b810cd92b1a5e1d diff --git a/dev-util/catkin/catkin-0.6.14.ebuild b/dev-util/catkin/catkin-0.6.14.ebuild new file mode 100644 index 000..53f670a --- /dev/null +++ b/dev-util/catkin/catkin-0.6.14.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +SCM="" +if [ "${PV#}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_REPO_URI="http://github.com/ros/catkin"; +fi + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +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#}" != "${PV}" ] ; then + SRC_URI="" + KEYWORDS="" +else + SRC_URI="http://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="test" + +RDEPEND=" + dev-python/catkin_pkg[${PYTHON_USEDEP}] + dev-python/empy[${PYTHON_USEDEP}] +" +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" +) + +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() { + mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" ) + python_export PYTHON_SCRIPTDIR + cmake-utils_src_configure +} + +src_configure() { + 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 + # needed to be considered as a workspace + touch "${ED}/usr/.catkin" +} diff --git a/dev-util/catkin/catkin-.ebuild b/dev-util/catkin/catkin-.ebuild new file mode 100644 index 000..53f670a --- /dev/null +++ b/dev-util/catkin/catkin-.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +SCM="" +if [ "${PV#}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_REPO_URI="http://github.com/ros/catkin"; +fi + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit ${SCM} cmake-utils python-r1 python-utils-r1 + +DESCRIPTIO