[gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Alexis Ballier" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/
Date: Thu, 30 Jul 2020 15:03:03 +0000 (UTC)	[thread overview]
Message-ID: <1596121354.ec697969872d1eaadcaa9cb904160de37d65b523.aballier@gentoo> (raw)

commit:     ec697969872d1eaadcaa9cb904160de37d65b523
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 30 15:01:07 2020 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> 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 <aballier <AT> 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

next             reply	other threads:[~2020-07-30 15:03 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-30 15:03 Alexis Ballier [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-12-25 22:06 [gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/ David Seifert
2021-09-23 14:07 Arthur Zamarin
2021-08-03 10:50 Alexis Ballier
2020-10-13 12:24 Alexis Ballier
2020-08-17 12:53 Sam James
2020-02-10 21:00 Michał Górny
2019-12-29  9:56 David Seifert
2019-12-11 15:26 Alexis Ballier
2019-05-24 16:23 Alexis Ballier
2018-02-06 19:24 Alexis Ballier
2018-01-28 12:54 Alexis Ballier
2018-01-28 12:54 Alexis Ballier
2017-07-30 16:44 Alexis Ballier
2017-05-26 13:08 Alexis Ballier
2017-04-20 20:48 David Seifert
2017-02-27 10:49 Alexis Ballier
2017-02-23  9:44 Alexis Ballier
2017-02-23  9:44 Alexis Ballier
2017-02-21  9:21 Alexis Ballier
2017-02-16  4:32 Alexis Ballier
2017-02-16  4:32 Alexis Ballier
2017-02-09 17:46 Alexis Ballier
2017-02-09 17:46 Alexis Ballier
2016-10-10 10:18 Alexis Ballier
2016-10-07 15:55 Alexis Ballier
2016-10-07 11:51 Alexis Ballier
2016-03-24 11:18 Alexis Ballier
2016-03-05 11:58 Alexis Ballier
2016-02-23 18:06 Alexis Ballier
2015-11-19  9:58 Alexis Ballier
2015-11-19  9:42 Alexis Ballier
2015-11-14 10:55 Alexis Ballier
2015-09-23  8:19 Alexis Ballier

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:dba3fbac5c dfblob:5ff51930ac dfblob:adf1b136a8
dfblob:124af520da dfblob:adf1b136a8 dfblob:124af520da )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1596121354.ec697969872d1eaadcaa9cb904160de37d65b523.aballier@gentoo \
    --to=aballier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox