From d162ba1860a88062f4cd61f8b52fc303ba0b2991 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Aug 2021 00:16:33 +0100 Subject: gentoo resync : 07.08.2021 --- dev-util/catkin/Manifest | 6 +- dev-util/catkin/catkin-0.8.10.ebuild | 111 +++++++++++++++++++++++++++++++ dev-util/catkin/catkin-0.8.9.ebuild | 122 ----------------------------------- dev-util/catkin/catkin-9999.ebuild | 15 +---- 4 files changed, 116 insertions(+), 138 deletions(-) create mode 100644 dev-util/catkin/catkin-0.8.10.ebuild delete mode 100644 dev-util/catkin/catkin-0.8.9.ebuild (limited to 'dev-util/catkin') diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest index 1397294354f8..b218c87a2e35 100644 --- a/dev-util/catkin/Manifest +++ b/dev-util/catkin/Manifest @@ -7,7 +7,7 @@ AUX gnuinstalldirs.patch 714 BLAKE2B 32364640271a4868d5a92fcc9ca803df8067ecda2c8 AUX gtest.patch 1676 BLAKE2B 2f53c95833d47d6637d4aecd07212e33be66e576ed2d869c221b77f0215f6d3879b85b4d70ed554febea86ab9c5246486dc21ed40b5796d081b271057e9cf0a7 SHA512 844e37fc82055eb5e22404b6786910043365a8425a3852e760e3122cc99716083a21155ab9a685d800b034fe34538849cd94740dc851f15e3bafa0773820912b AUX package_xml.patch 1588 BLAKE2B 15a11031b704f307778e8cb85438851bfa38a2784abee9c544a10fa4e61036ffb45a391f40eacd7f97ec92abf060a1afc790d87cc1cfa40ddc07561db14c027f SHA512 7d6e1cb0076681c6cbb1332b05e6cd33bae4f780939e00412fd4b022f71b0418a4ff4f8e13d06f42fd21225e78d058818d680fef691dad4412d75ea0f0ef9f5e AUX tests.patch 1640 BLAKE2B cc0d89a779ad056806b1c721709c1318278cb836e539042071e83acaa0aaffed9c316ed482a821219c9c074c71ea15bad343a7f63b887b9b266982fe4afe7f71 SHA512 a53ff72bf5302107241d43a0daa8ff18c50b6e69c0e1ecf2a841ace8d37fe7f3e8cb4202b666ad3bdda1bcb7d79f39244308542e1992b9af94d97bcec7086913 -DIST catkin-0.8.9.tar.gz 217743 BLAKE2B e59df77a7df04492942917377f4f3dd9e302e20fd901bbc8878d1f51879a481e15b01482db4f1d3b8d1eee360779bedb5d999663fe58f10d33c5e4f1964a3be7 SHA512 a34784d349935f5917e7d4600c5ad3e728a86d8ed235fb3be86b4dec212693a1e4209901929d284e50c112f31ada62a04a9caf9845ee06c6db2e98e79602ecd9 -EBUILD catkin-0.8.9.ebuild 3139 BLAKE2B 814f839892968462a8d1cef298f0e7ae91f071e377f497dc11e11e342fa3552192469596e04453c01a748e434d4487642216a28a30a544f895a681eb5f3fb9d4 SHA512 4f14a2fbee4f8abd1df90d96c1a94849057adebaf7fc51f99877c76e53b75d6296812ee7dce246053de3b5b056ea52ccdbf7b4f8ccf81d29eb32a1ab60e99165 -EBUILD catkin-9999.ebuild 3139 BLAKE2B 814f839892968462a8d1cef298f0e7ae91f071e377f497dc11e11e342fa3552192469596e04453c01a748e434d4487642216a28a30a544f895a681eb5f3fb9d4 SHA512 4f14a2fbee4f8abd1df90d96c1a94849057adebaf7fc51f99877c76e53b75d6296812ee7dce246053de3b5b056ea52ccdbf7b4f8ccf81d29eb32a1ab60e99165 +DIST catkin-0.8.10.tar.gz 218095 BLAKE2B cac62d7682e14e258cb7b8a55ae93c8792dcdb38b281c68b8135adfe9225c07a0c6c16717426f9b12ccc6aba91178cf18eeb05a0474ee6524131970e0c158c92 SHA512 0bab7a7b13484b09d301af52f7e563b78d8b80ac5cfc36a36a725baea7f23bf374d4814303875a4a1aa3981e346a3e5fa3f9b1e27c3ae819102dbc239ca767b1 +EBUILD catkin-0.8.10.ebuild 2734 BLAKE2B 6017e5cac7053667df9386eebcb9e67caf1cb17e3772127be5a3c407f24243e0e7944226bf9dddcbdb5843425f280ec5c11d93fb37506d55ccc535446ab5fb6a SHA512 8cd5ceebc295769a2d92274d51d66aa803000b9fa762249ecee159895b974bfb308e192fe24e0e4d3f7f5df657911214833a4bdaf4482b7f452628a7d777c0b8 +EBUILD catkin-9999.ebuild 2734 BLAKE2B 6017e5cac7053667df9386eebcb9e67caf1cb17e3772127be5a3c407f24243e0e7944226bf9dddcbdb5843425f280ec5c11d93fb37506d55ccc535446ab5fb6a SHA512 8cd5ceebc295769a2d92274d51d66aa803000b9fa762249ecee159895b974bfb308e192fe24e0e4d3f7f5df657911214833a4bdaf4482b7f452628a7d777c0b8 MISC metadata.xml 324 BLAKE2B 393e10af3d1bef82391a91bbf6382d9d1cafcdfe8a681b3a24844427cee1e3aa36f27ffd0a37a65b8a476ce0b3f2a860f546adc32c480164c69f66673bb0b5f4 SHA512 598dc8dd4427079a7eeca415c192ec39e99e53bc41c06796d2355b8858363b71ee8f038646c61ddd82d27451eb48c6f93b47489cdb04ae7c8663a6b46c4f9b94 diff --git a/dev-util/catkin/catkin-0.8.10.ebuild b/dev-util/catkin/catkin-0.8.10.ebuild new file mode 100644 index 000000000000..1918b71d47c2 --- /dev/null +++ b/dev-util/catkin/catkin-0.8.10.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +SCM="" +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_REPO_URI="https://github.com/ros/catkin" +fi + +PYTHON_COMPAT=( python{3_7,3_8,3_9} ) + +inherit ${SCM} cmake 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#9999}" != "${PV}" ] ; then + SRC_URI="" +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="" + +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}/gtest.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_src_prepare +} + +catkin_src_configure_internal() { + local sitedir="$(python_get_sitedir)" + mycmakeargs+=( + -DPYTHON_EXECUTABLE="${PYTHON}" + -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}" + ) + PYTHON_SCRIPTDIR="$(python_get_scriptdir)" cmake_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_src_compile +} + +src_test() { + python_foreach_impl cmake_src_test +} + +catkin_src_install_internal() { + export PYTHON_SCRIPTDIR="$(python_get_scriptdir)" + cmake_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" + + python_foreach_impl python_optimize +} diff --git a/dev-util/catkin/catkin-0.8.9.ebuild b/dev-util/catkin/catkin-0.8.9.ebuild deleted file mode 100644 index 65304103f95e..000000000000 --- a/dev-util/catkin/catkin-0.8.9.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/ros/catkin" -fi - -PYTHON_COMPAT=( python{3_7,3_8,3_9} ) - -inherit ${SCM} cmake 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#9999}" != "${PV}" ] ; then - SRC_URI="" -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="" - -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}/gtest.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_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_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_src_compile -} - -src_test() { - unset PYTHON_SCRIPTDIR - python_foreach_impl cmake_src_test -} - -catkin_src_install_internal() { - python_export PYTHON_SCRIPTDIR - cmake_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" - - python_foreach_impl python_optimize -} - -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." -} diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild index 65304103f95e..1918b71d47c2 100644 --- a/dev-util/catkin/catkin-9999.ebuild +++ b/dev-util/catkin/catkin-9999.ebuild @@ -67,8 +67,7 @@ catkin_src_configure_internal() { -DPYTHON_EXECUTABLE="${PYTHON}" -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}" ) - python_export PYTHON_SCRIPTDIR - cmake_src_configure + PYTHON_SCRIPTDIR="$(python_get_scriptdir)" cmake_src_configure } src_configure() { @@ -85,12 +84,11 @@ src_compile() { } src_test() { - unset PYTHON_SCRIPTDIR python_foreach_impl cmake_src_test } catkin_src_install_internal() { - python_export PYTHON_SCRIPTDIR + export PYTHON_SCRIPTDIR="$(python_get_scriptdir)" cmake_src_install if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then dodir /usr/bin @@ -111,12 +109,3 @@ src_install() { python_foreach_impl python_optimize } - -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." -} -- cgit v1.2.3