From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 12B93138359 for ; Thu, 30 Jul 2020 15:03:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C4C8E0AC2; Thu, 30 Jul 2020 15:03:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1842DE0AC2 for ; Thu, 30 Jul 2020 15:03:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0E90734F2A8 for ; Thu, 30 Jul 2020 15:03:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5BCF3300 for ; Thu, 30 Jul 2020 15:03:03 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1596121354.ec697969872d1eaadcaa9cb904160de37d65b523.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/catkin/Manifest dev-util/catkin/catkin-0.8.8.ebuild dev-util/catkin/catkin-9999.ebuild X-VCS-Directories: dev-util/catkin/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: ec697969872d1eaadcaa9cb904160de37d65b523 X-VCS-Branch: master Date: Thu, 30 Jul 2020 15:03:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bf38517d-a0c0-4315-aa82-152783f27e97 X-Archives-Hash: 83f93c885385c91c602a49bffa6d0d4d commit: ec697969872d1eaadcaa9cb904160de37d65b523 Author: Alexis Ballier gentoo org> AuthorDate: Thu Jul 30 15:01:07 2020 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Thu Jul 30 15:02:34 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec697969 dev-util/catkin: bump to 0.8.8 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Alexis Ballier gentoo.org> dev-util/catkin/Manifest | 1 + .../catkin/{catkin-9999.ebuild => catkin-0.8.8.ebuild} | 17 +++++++---------- dev-util/catkin/catkin-9999.ebuild | 17 +++++++---------- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest index dba3fbac5c5..5ff51930aca 100644 --- a/dev-util/catkin/Manifest +++ b/dev-util/catkin/Manifest @@ -2,3 +2,4 @@ DIST catkin-0.7.14.tar.gz 203422 BLAKE2B 22f27066054db9d35aaee216603c778a70a1941 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 +DIST catkin-0.8.8.tar.gz 217566 BLAKE2B c17ed55e4f72f6645a778b5669e9b54090ea0425526d7540a6c8cf3af88ba10dfd91b927f53a83d9d2fac56e000c4c52e93216a36694475a91fabe00dd2d0168 SHA512 a90c552bebb46ade23171c85ca1cb23b295d156e731c29cd7602e544aef6231edb179d0fce52d06008d762bafd309456e0ef8976a3f67ed9ea861b905b1bb979 diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-0.8.8.ebuild similarity index 91% copy from dev-util/catkin/catkin-9999.ebuild copy to dev-util/catkin/catkin-0.8.8.ebuild index adf1b136a8c..124af520da9 100644 --- a/dev-util/catkin/catkin-9999.ebuild +++ b/dev-util/catkin/catkin-0.8.8.ebuild @@ -11,7 +11,7 @@ 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" @@ -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,6 @@ PATCHES=( "${FILESDIR}/catkin_prefix_path_util_py_v2.patch" "${FILESDIR}/package_xml.patch" "${FILESDIR}/etc.patch" - "${FILESDIR}/egginfo.patch" ) src_prepare() { @@ -61,7 +58,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 +68,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 +81,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/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild index adf1b136a8c..124af520da9 100644 --- a/dev-util/catkin/catkin-9999.ebuild +++ b/dev-util/catkin/catkin-9999.ebuild @@ -11,7 +11,7 @@ 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" @@ -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,6 @@ PATCHES=( "${FILESDIR}/catkin_prefix_path_util_py_v2.patch" "${FILESDIR}/package_xml.patch" "${FILESDIR}/etc.patch" - "${FILESDIR}/egginfo.patch" ) src_prepare() { @@ -61,7 +58,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 +68,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 +81,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