From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- dev-util/catkin/Manifest | 18 +-- dev-util/catkin/catkin-0.7.14.ebuild | 120 -------------------- dev-util/catkin/catkin-0.7.17.ebuild | 120 -------------------- dev-util/catkin/catkin-0.7.20.ebuild | 120 -------------------- dev-util/catkin/catkin-0.8.3-r1.ebuild | 2 +- dev-util/catkin/catkin-0.8.8-r1.ebuild | 123 +++++++++++++++++++++ dev-util/catkin/catkin-9999.ebuild | 20 ++-- .../catkin/files/catkin_prefix_path_util_py.patch | 40 ------- .../files/catkin_prefix_path_util_py_v2.patch | 2 +- dev-util/catkin/files/distutils.patch | 13 --- dev-util/catkin/files/gtest.patch | 45 ++++++++ dev-util/catkin/files/sitedir.patch | 15 --- 12 files changed, 185 insertions(+), 453 deletions(-) delete mode 100644 dev-util/catkin/catkin-0.7.14.ebuild delete mode 100644 dev-util/catkin/catkin-0.7.17.ebuild delete mode 100644 dev-util/catkin/catkin-0.7.20.ebuild create mode 100644 dev-util/catkin/catkin-0.8.8-r1.ebuild delete mode 100644 dev-util/catkin/files/catkin_prefix_path_util_py.patch delete mode 100644 dev-util/catkin/files/distutils.patch create mode 100644 dev-util/catkin/files/gtest.patch delete mode 100644 dev-util/catkin/files/sitedir.patch (limited to 'dev-util/catkin') diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest index 3c90b01aba85..a04b449af3d2 100644 --- a/dev-util/catkin/Manifest +++ b/dev-util/catkin/Manifest @@ -1,22 +1,16 @@ AUX 40catkin 89 BLAKE2B d8a24606f095c6afdbc9141a47fa250bd931b53f9e32ce885a7e1dee33013968e8e401404c187d8afb6660bbb3528888c43b46e473f5dd96b53cf9af04d24d42 SHA512 bc0fc727177f071c48b2177adceaa0f5578a55bb05a65035871d83c7b217d86ef7f6c8585264971d0c8957652a8a60dbdb674600087800433823190e577744db AUX catkin_prefix_path.patch 3297 BLAKE2B 60027c9564b6013f885bdd1f695e7279459cbf499536f381806116ef3d9d66a8507faa39008ee95d1d5662ec667dbe8ca3c1b284f0dd0fe561217a4876bfe960 SHA512 22c6e2440e1d7e48c46c0ad7f2006d621942b9c75d1d126ef1e110b36da321b79152aae8bf4d82c18250ce6da3337c697733ba130c1b2f116282ccb954d8d13f -AUX catkin_prefix_path_util_py.patch 2134 BLAKE2B 2c358c1e7e9b2cdb2b889b70ca5644f3823b7d1ef0af597d7f7f0a6de9ef7697d41ce74964f5e0d95deb9d2bc9e1afaf4665fb48cb76258c552483cbdc68374a SHA512 68b375ed46f7d25ece3e723fb6d41ba3f89bd27ef44f11d74427f63d615e043ab02de4ac806d77059db8a0d12671f0602df16a2b318b9d6e36671cd1491ce2b0 -AUX catkin_prefix_path_util_py_v2.patch 2146 BLAKE2B 3d5fa2ec75d71938f3290617f60eb45e46ee6e24da722d05977dd5c58eb078ca1d5fd7b943bd46bbe765e63a7114d5df9fe36ac286f161c99731736a51635279 SHA512 b55d1a67433afec78238795c5d807607c59b97514beffa5e2cf30c9340ec0d62045bdff9af875fc4c2ae7b4d90859010b08b737120e9434d9c7589569f8696d9 +AUX catkin_prefix_path_util_py_v2.patch 2153 BLAKE2B 0ae7e9bf9c43652a148102d43eccf7026bb4ad2b00f61530d946d3831da783ab39cb67b844ce093cad97b8dbfdc2c74aaddb8df6771742726a8ef860099933b0 SHA512 4a801c57da530fde06dfed3482931a52c1dfeccf90951b40cde827dfb63e32d811f0963352cdcefe89eb84e6b15729cb2baa03a59ca7c11a44541e8c9c8880c8 AUX distutils-v2.patch 795 BLAKE2B 830270d966c3006967424b94cd99d6a43803a85e8e68de4d609d60c68cbb610451b42a11d6906d944fb1f47ff669216f9f02e31f227b1379a6efb7b2e5e2f38d SHA512 c315382e77cbf3461e2a57ed6e3f270fe333396ebaff018a4177eb83ea9fd1565368ed51228686ba0ff6c2df6bed4eadece653664ff6bb7e32882eba6d3c3f7f -AUX distutils.patch 798 BLAKE2B aeb6d364c8fa565e662686f723fe782bb6d3b2a17c0a1b243090515290258586e0df79699a32ec0eeb5834628dc885566c296055c4062826c03014a809b8cb01 SHA512 de281d0039515c4621d161c778520c4306897426c5692f46b4440326b6246502e64f90f121eaff8741775bafcb4213b2817468354db8c5b3c1250a2fce42d36d AUX egginfo.patch 633 BLAKE2B 9308280ddb79b5a303dc6e022d81d4f6b599a669fca18a586a45bb5282f54603a1b201047532c38fdc734e917002709702caccfe3418772b8e4dc5ac928e234b SHA512 768505296427bbafb108aa2ce87cb127b0db8b889d3bc355267123d04cc956beb1eca9cd317d17633eaa50126e96d0aa3dce8d3aa0abc9aad4ee070b607a4224 AUX etc.patch 654 BLAKE2B 0ec3289f09983127f60ce4e1a93ad82b9c928fffe3dc820dc3ffc33c4cbedf794d3e49dbe646c83f884072ad949ebdbbe334cced9fdaa3448b5b219669019913 SHA512 8e6026dac6d79fc30056a7c598a99ca4cafcad442eec2eb2f48219b184d610e4d5da5faea5284dd078101b4ef761533d034aba49fd1af95f7f365887bbf22739 AUX gnuinstalldirs.patch 714 BLAKE2B 32364640271a4868d5a92fcc9ca803df8067ecda2c89c69eb88c168bab4acc099ef2a7efd3c56a77e34acef2ad308780b69c66eb49c272e4d3b1b776d1b4c594 SHA512 38e6e0a220f20a7909a760b558997086bac9dc4919158d58dc41e5dd7d3bf22b8eb9a48cb05503c594dfa0a9e4bdb70e8eec121f45f777fc7821ec6e3678b600 +AUX gtest.patch 1676 BLAKE2B 2f53c95833d47d6637d4aecd07212e33be66e576ed2d869c221b77f0215f6d3879b85b4d70ed554febea86ab9c5246486dc21ed40b5796d081b271057e9cf0a7 SHA512 844e37fc82055eb5e22404b6786910043365a8425a3852e760e3122cc99716083a21155ab9a685d800b034fe34538849cd94740dc851f15e3bafa0773820912b AUX package_xml.patch 1588 BLAKE2B 15a11031b704f307778e8cb85438851bfa38a2784abee9c544a10fa4e61036ffb45a391f40eacd7f97ec92abf060a1afc790d87cc1cfa40ddc07561db14c027f SHA512 7d6e1cb0076681c6cbb1332b05e6cd33bae4f780939e00412fd4b022f71b0418a4ff4f8e13d06f42fd21225e78d058818d680fef691dad4412d75ea0f0ef9f5e -AUX sitedir.patch 884 BLAKE2B ba051cbd046971d3b6327755b0de83c03b3a441a3e47e7d791e653bcd0b7ed3373752367a4ecfb8570a6b5d7c6fb3ae006f0c516909646d7ba7142f20b352217 SHA512 c619b6bcfa007f90464146767ea5b1aed4dad79d16bcc7daa573df14dcaa6eeb2ff96eb9d838d3bbfd0480b87d5538ffaf31dc059e25224d425f3786523b475d AUX tests.patch 1640 BLAKE2B cc0d89a779ad056806b1c721709c1318278cb836e539042071e83acaa0aaffed9c316ed482a821219c9c074c71ea15bad343a7f63b887b9b266982fe4afe7f71 SHA512 a53ff72bf5302107241d43a0daa8ff18c50b6e69c0e1ecf2a841ace8d37fe7f3e8cb4202b666ad3bdda1bcb7d79f39244308542e1992b9af94d97bcec7086913 -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 DIST catkin-0.8.3.tar.gz 215988 BLAKE2B 92d7bced93e2d33dafcfd902724f993aa15756139265b5594c15041c333568591193b86e1a4bee8c278f2739dd063f73b6ce675b8ab4fefd312b5daeea414c7a SHA512 14fd03627f3fb339a850ca73e7a49dfeb7312a85416473dff60995ea1d0f1050982929c297751502589a7320dd7eec5d922c86061166f9d475fc1108540db4ae -EBUILD catkin-0.7.14.ebuild 3123 BLAKE2B 55670c978713ca720322e1fc8b2f83b4177f9ec4b92ff3d8ce160211c1dd8bccdb393ac720aa0d18ddb51bb31bc2a7bacdd51b2b447bbfe15c5f593e11147235 SHA512 bd0d8dc4b32f5e563efdae702305b4bced7c6581d2bce59861e90e6326247b95a60e2a1840f68a5126ba79e6e7e26b3cc2848b88ed587c0d843597716b5000e0 -EBUILD catkin-0.7.17.ebuild 3126 BLAKE2B 572239dad696efab0d44e214c85d6a223e095f2f9fbd61a7fbf467cdda3a8f3b64ee9d971a5f36165f604efd1a1f6801649a7399ff2009aa2d04fa59e8b9b467 SHA512 47cb440805dfb949f2ea55edb77a12e8986ddd4c7898d9abfd2fe306d0f522f59d2a3a5be658eb58c1e406feea1e83bae427e60ceee73e9c445fa7be1237fe5f -EBUILD catkin-0.7.20.ebuild 3133 BLAKE2B 6f37db38a28e5b9256e52b0f5ea7b7a5ac60286a800c5cddf624519c1ee4a0524a47ff8f245604d1f51aea2d3b9384240fde336af8c06e2baf5577e7d8362143 SHA512 0a6099a1ca8517167c3e4a05a4140e14f85788de885fcf8c7cccaf501e5b5cd9fd0042341dc8831384c1f2abdfd0b9f64c197b26aabb41ab1fbd598bd3273974 -EBUILD catkin-0.8.3-r1.ebuild 3206 BLAKE2B ff3891f92e7eeb384ad4535c7b4626e2e2bf516aa5f745f93afef93dd3afbf14f87cd9d6fc56f01e3dffb8ad617fc337424456723e317890c67266cc196dcc38 SHA512 6a8fea7c9b318e10933a827af1db94f8fbd3e0df55acb693747441a14fca2c0b0f5cd0ad9a8c131da6a100f077eb3e9825aa7e04bd0c9e7b4ca10efb0650fea3 -EBUILD catkin-9999.ebuild 3206 BLAKE2B ff3891f92e7eeb384ad4535c7b4626e2e2bf516aa5f745f93afef93dd3afbf14f87cd9d6fc56f01e3dffb8ad617fc337424456723e317890c67266cc196dcc38 SHA512 6a8fea7c9b318e10933a827af1db94f8fbd3e0df55acb693747441a14fca2c0b0f5cd0ad9a8c131da6a100f077eb3e9825aa7e04bd0c9e7b4ca10efb0650fea3 +DIST catkin-0.8.8.tar.gz 217566 BLAKE2B c17ed55e4f72f6645a778b5669e9b54090ea0425526d7540a6c8cf3af88ba10dfd91b927f53a83d9d2fac56e000c4c52e93216a36694475a91fabe00dd2d0168 SHA512 a90c552bebb46ade23171c85ca1cb23b295d156e731c29cd7602e544aef6231edb179d0fce52d06008d762bafd309456e0ef8976a3f67ed9ea861b905b1bb979 +EBUILD catkin-0.8.3-r1.ebuild 3207 BLAKE2B 98a247feda56bd8c6faf9534fdb5eedf31695a7a15be03194722ea6506e3330e11eb78ddb6e083d9dadb180f8796c91c7299c6ed3d2674d9d0dcb6d4e796bc5a SHA512 90e51c55e9221af64e256a3db88af93e83dcee4e184198d47be333bcf2400b1a49860b38fd87f470a61dc53f6729468750fe62351d1a929b531ed7ae672346d9 +EBUILD catkin-0.8.8-r1.ebuild 3152 BLAKE2B 006b96c6f47e160955e70516ef68f6d185db8d8a08a4898d9fde3e533db221c294b2c4bd9a483cbafa9dec60e8ce70a3d24759968a0b11c79fd2912348e3f6d1 SHA512 ff5b3b612883df9c9b58c704d6a57a408de662ec37805cb824b73f64754cee2b103c6da68afefdfc19b1e2a7d7fbeedb0faa347dcc95480fa197c32bf049f12e +EBUILD catkin-9999.ebuild 3152 BLAKE2B 006b96c6f47e160955e70516ef68f6d185db8d8a08a4898d9fde3e533db221c294b2c4bd9a483cbafa9dec60e8ce70a3d24759968a0b11c79fd2912348e3f6d1 SHA512 ff5b3b612883df9c9b58c704d6a57a408de662ec37805cb824b73f64754cee2b103c6da68afefdfc19b1e2a7d7fbeedb0faa347dcc95480fa197c32bf049f12e MISC metadata.xml 324 BLAKE2B 393e10af3d1bef82391a91bbf6382d9d1cafcdfe8a681b3a24844427cee1e3aa36f27ffd0a37a65b8a476ce0b3f2a860f546adc32c480164c69f66673bb0b5f4 SHA512 598dc8dd4427079a7eeca415c192ec39e99e53bc41c06796d2355b8858363b71ee8f038646c61ddd82d27451eb48c6f93b47489cdb04ae7c8663a6b46c4f9b94 diff --git a/dev-util/catkin/catkin-0.7.14.ebuild b/dev-util/catkin/catkin-0.7.14.ebuild deleted file mode 100644 index 4a444f773cf6..000000000000 --- a/dev-util/catkin/catkin-0.7.14.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2020 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=( python3_6 pypy3 ) - -inherit ${SCM} cmake-utils python-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.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##*/}" - 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." -} diff --git a/dev-util/catkin/catkin-0.7.17.ebuild b/dev-util/catkin/catkin-0.7.17.ebuild deleted file mode 100644 index bd0fec4e9fa1..000000000000 --- a/dev-util/catkin/catkin-0.7.17.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2020 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=( python3_6 pypy3 ) - -inherit ${SCM} cmake-utils python-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##*/}" - 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." -} diff --git a/dev-util/catkin/catkin-0.7.20.ebuild b/dev-util/catkin/catkin-0.7.20.ebuild deleted file mode 100644 index c4909886d81d..000000000000 --- a/dev-util/catkin/catkin-0.7.20.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2020 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=( python3_6 pypy3 ) - -inherit ${SCM} cmake-utils python-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." -} diff --git a/dev-util/catkin/catkin-0.8.3-r1.ebuild b/dev-util/catkin/catkin-0.8.3-r1.ebuild index adf1b136a8c7..c11d65241502 100644 --- a/dev-util/catkin/catkin-0.8.3-r1.ebuild +++ b/dev-util/catkin/catkin-0.8.3-r1.ebuild @@ -14,7 +14,7 @@ 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="http://wiki.ros.org/catkin" +HOMEPAGE="https://wiki.ros.org/catkin" if [ "${PV#9999}" != "${PV}" ] ; then SRC_URI="" KEYWORDS="" diff --git a/dev-util/catkin/catkin-0.8.8-r1.ebuild b/dev-util/catkin/catkin-0.8.8-r1.ebuild new file mode 100644 index 000000000000..46bed14e7929 --- /dev/null +++ b/dev-util/catkin/catkin-0.8.8-r1.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2020 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_6,3_7,3_8} ) + +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="" + 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="" + +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 adf1b136a8c7..46bed14e7929 100644 --- a/dev-util/catkin/catkin-9999.ebuild +++ b/dev-util/catkin/catkin-9999.ebuild @@ -11,10 +11,10 @@ fi PYTHON_COMPAT=( python{3_6,3_7,3_8} ) -inherit ${SCM} cmake-utils python-r1 python-utils-r1 +inherit ${SCM} cmake 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" +HOMEPAGE="https://wiki.ros.org/catkin" if [ "${PV#9999}" != "${PV}" ] ; then SRC_URI="" KEYWORDS="" @@ -37,9 +37,7 @@ RDEPEND=" " DEPEND="${RDEPEND} test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )" -BDEPEND=" - dev-util/cmake -" +BDEPEND="" PATCHES=( "${FILESDIR}/tests.patch" @@ -49,7 +47,7 @@ PATCHES=( "${FILESDIR}/catkin_prefix_path_util_py_v2.patch" "${FILESDIR}/package_xml.patch" "${FILESDIR}/etc.patch" - "${FILESDIR}/egginfo.patch" + "${FILESDIR}/gtest.patch" ) src_prepare() { @@ -61,7 +59,7 @@ src_prepare() { -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 + cmake_src_prepare } catkin_src_configure_internal() { @@ -71,7 +69,7 @@ catkin_src_configure_internal() { -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}" ) python_export PYTHON_SCRIPTDIR - cmake-utils_src_configure + cmake_src_configure } src_configure() { @@ -84,17 +82,17 @@ src_configure() { } src_compile() { - python_foreach_impl cmake-utils_src_compile + python_foreach_impl cmake_src_compile } src_test() { unset PYTHON_SCRIPTDIR - python_foreach_impl cmake-utils_src_test + python_foreach_impl cmake_src_test } catkin_src_install_internal() { python_export PYTHON_SCRIPTDIR - cmake-utils_src_install + cmake_src_install if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then dodir /usr/bin for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do diff --git a/dev-util/catkin/files/catkin_prefix_path_util_py.patch b/dev-util/catkin/files/catkin_prefix_path_util_py.patch deleted file mode 100644 index e667ea9cf59e..000000000000 --- a/dev-util/catkin/files/catkin_prefix_path_util_py.patch +++ /dev/null @@ -1,40 +0,0 @@ -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: -Index: catkin-0.7.1/python/catkin/builder.py -=================================================================== ---- catkin-0.7.1.orig/python/catkin/builder.py -+++ catkin-0.7.1/python/catkin/builder.py -@@ -1026,6 +1026,7 @@ def build_workspace_isolated( - 'CATKIN_LIB_ENVIRONMENT_PATHS': "'lib'", - 'CATKIN_PKGCONFIG_ENVIRONMENT_PATHS': "os.path.join('lib', 'pkgconfig')", - 'CMAKE_PREFIX_PATH_AS_IS': ';'.join(os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep)), -+ 'CATKIN_PREFIX_PATH': ';'.join(os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep)), - 'PYTHON_EXECUTABLE': sys.executable, - 'PYTHON_INSTALL_DIR': get_python_install_dir(), - } -Index: catkin-0.7.1/test/unit_tests/test_setup_util.py -=================================================================== ---- catkin-0.7.1.orig/test/unit_tests/test_setup_util.py -+++ catkin-0.7.1/test/unit_tests/test_setup_util.py -@@ -14,6 +14,7 @@ data = configure_file(os.path.join(os.pa - 'PYTHON_EXECUTABLE': sys.executable, - 'PYTHON_INSTALL_DIR': 'pythonX.Y/packages', - 'CMAKE_PREFIX_PATH_AS_IS': '', -+ 'CATKIN_PREFIX_PATH':'', - }) - with tempfile.NamedTemporaryFile('w+') as setup_util_file: - setup_util_file.write(data) diff --git a/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch index ae468b21c01c..6ad761f8421a 100644 --- a/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch +++ b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch @@ -22,7 +22,7 @@ Index: catkin-0.7.17/python/catkin/builder.py 'CATKIN_LIB_ENVIRONMENT_PATHS': "'lib'", 'CATKIN_PKGCONFIG_ENVIRONMENT_PATHS': "os.path.join('lib', 'pkgconfig')", 'CMAKE_PREFIX_PATH_AS_IS': ';'.join(os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep)), -+ 'CATKIN_PREFIX_PATH': ';'.join(os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep)), ++ 'CATKIN_PREFIX_PATH': ';'.join(os.environ.get('CATKIN_PREFIX_PATH','').split(os.pathsep)), 'PYTHON_EXECUTABLE': sys.executable, 'PYTHON_INSTALL_DIR': get_python_install_dir(), } diff --git a/dev-util/catkin/files/distutils.patch b/dev-util/catkin/files/distutils.patch deleted file mode 100644 index 292551181b6d..000000000000 --- a/dev-util/catkin/files/distutils.patch +++ /dev/null @@ -1,13 +0,0 @@ -Allow to install scripts in PYTHON_SCRIPTDIR. -Needed for Gentoo multi-python support. - -Index: catkin-0.6.11/cmake/templates/python_distutils_install.sh.in -=================================================================== ---- catkin-0.6.11.orig/cmake/templates/python_distutils_install.sh.in -+++ catkin-0.6.11/cmake/templates/python_distutils_install.sh.in -@@ -25,4 +25,4 @@ cd "@INSTALL_CMD_WORKING_DIRECTORY@" - build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \ - install \ - $DESTDIR_ARG \ -- @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@}" diff --git a/dev-util/catkin/files/gtest.patch b/dev-util/catkin/files/gtest.patch new file mode 100644 index 000000000000..106b7e2886e8 --- /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) diff --git a/dev-util/catkin/files/sitedir.patch b/dev-util/catkin/files/sitedir.patch deleted file mode 100644 index 61fcad29d04a..000000000000 --- a/dev-util/catkin/files/sitedir.patch +++ /dev/null @@ -1,15 +0,0 @@ -Pass --install-lib to setup.py install. -pypy installs in /usr/site-packages otherwise... - -Index: catkin-0.7.6/cmake/templates/python_distutils_install.sh.in -=================================================================== ---- catkin-0.7.6.orig/cmake/templates/python_distutils_install.sh.in -+++ catkin-0.7.6/cmake/templates/python_distutils_install.sh.in -@@ -30,4 +30,6 @@ echo_and_run /usr/bin/env \ - build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \ - install \ - $DESTDIR_ARG \ -- @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="${PYTHON_SCRIPTDIR:-@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@}" \ -+ --install-lib="@CMAKE_INSTALL_PREFIX@/@PYTHON_INSTALL_DIR@" -- cgit v1.2.3