gentoo resync : 09.07.2022

5 files changed, 15 insertions, 62 deletions

diff --git a/dev-ros/visp_tracker/Manifest b/dev-ros/visp_tracker/Manifest
index c59c04b9a305..61dd95f2cfba 100644
--- a/dev-ros/visp_tracker/Manifest
+++ b/dev-ros/visp_tracker/Manifest
@@ -1,7 +1,4 @@
-AUX gcc6.patch 350 BLAKE2B 5e0f54319cc37bf0a4cf46e3b96f37bdb059af0f0e4a2b7219363504c96a2ed43121f4028c4d264959f1cf78e10d329ac67ee85d6a2868212b0cbcf924e2f93d SHA512 b1647cca84792212a1fe20685e83ee28fc225fb7272ed892fdbc4faae809059ce955cf5df1d8b3543c1248a741ad9a0bcb263a547aa21be2cebd8608dfba457e
-DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
-DIST vision_visp-0.12.1.tar.gz 1014707 BLAKE2B 0c482268761f75e4e36260bb8a98c32677e500f322b3807eda7e24c35681d5fee628e422b67ab9ae73c6a27b467d600ca5ba72220a09e93b146b97273b5d0d54 SHA512 9e050009a335bd8d7f3c024e460087139b43e5b4c44c2048409176b8503aa81193916e767ce06df48fa5d0f0ca23ac551df7201e92e7de65967b9f2df5a1bf7c
-EBUILD visp_tracker-0.11.1-r1.ebuild 1059 BLAKE2B 00e115d602728ebcd542d5673fe0ffdcf23a9711a673aff1525b9174d1a5931346ff3e81114300d2390d45a266a7bafa0fdc6bc90ca8e8ccb95ee1eb3375b157 SHA512 601529cbb921b96349c998525f186fa541a56c64251d7401451a481201e5dd47c24b491d45148ccea9c16e4b78c0f435292900173082d2d7ec087ba21f98c1b2
-EBUILD visp_tracker-0.12.1.ebuild 1057 BLAKE2B bdaa61a26af4da88ddf813996c46203ee8ee63cb056d64c0b73e809dd75a71c33b96774bed8d5af369bfd9c31d9a6ce4e9930f904c10c67afd4a31a230e1f48b SHA512 9422a71751ee39f203bce5cb2762a7038fb07e8f31e9e6583c64ecefb0bdfbc57d1c51a9c22af493a208a5f5228893004e6b2de283c17cfb330e80ea9eff9ac1
-EBUILD visp_tracker-9999.ebuild 1057 BLAKE2B bdaa61a26af4da88ddf813996c46203ee8ee63cb056d64c0b73e809dd75a71c33b96774bed8d5af369bfd9c31d9a6ce4e9930f904c10c67afd4a31a230e1f48b SHA512 9422a71751ee39f203bce5cb2762a7038fb07e8f31e9e6583c64ecefb0bdfbc57d1c51a9c22af493a208a5f5228893004e6b2de283c17cfb330e80ea9eff9ac1
+DIST vision_visp-0.13.1.tar.gz 1015139 BLAKE2B 8550c32b39cb94785221d924a97795d5b865327bbb8d570131fccf91c95eaee47f242eea5826efb04b083bf467ae8400729a40cb992fe5f1e689648718958d63 SHA512 bf40f4b81a56cec1031d1d2988f6fa41b542af07b63cdd6f3994d5000f7f3e5c721580cba206918d648db5c0cfb422d06829385da94dade4b31a5e8dcf916ddb
+EBUILD visp_tracker-0.13.1.ebuild 1115 BLAKE2B 4488fb324af71a3f5027aff2cca68edbf12f3d8e0304844f74cc94407a2193e1e090ff5bea756ba244cdad59697d6d8878a612dc5070244a83d3222acf1d0659 SHA512 7b0b0eb264ac5253ef072aa4eae789366b4aabf13d76f41ae453a4df436faf9fed51e3dd7a6f10fff1d8663402d4aa50ac5ae7515c539ed44aa510355b7d2553
+EBUILD visp_tracker-9999.ebuild 1115 BLAKE2B 4488fb324af71a3f5027aff2cca68edbf12f3d8e0304844f74cc94407a2193e1e090ff5bea756ba244cdad59697d6d8878a612dc5070244a83d3222acf1d0659 SHA512 7b0b0eb264ac5253ef072aa4eae789366b4aabf13d76f41ae453a4df436faf9fed51e3dd7a6f10fff1d8663402d4aa50ac5ae7515c539ed44aa510355b7d2553
 MISC metadata.xml 334 BLAKE2B e801c8eb4cd9e8e9a72038c502229181950691797bf3833e43e4d48c5674c2ec65effc7790de655a4d3ffe18837fda483ace821d9dd19057f8417c856267d638 SHA512 b15aadab13b3dcf6650802c5f2ae0d512fbb18add8c2c30b2dc3eba70f0ae3092d1311426607684223d35b4e46d34b1573e07eb6eeb02f19fc19a837e29bc965
diff --git a/dev-ros/visp_tracker/files/gcc6.patch b/dev-ros/visp_tracker/files/gcc6.patch
deleted file mode 100644
index 417357fedce3..000000000000
--- a/dev-ros/visp_tracker/files/gcc6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: visp_tracker/CMakeLists.txt
-===================================================================
---- visp_tracker.orig/CMakeLists.txt
-+++ visp_tracker/CMakeLists.txt
-@@ -70,7 +70,7 @@ catkin_package(
-      VISP
-    )
- 
--include_directories(SYSTEM
-+include_directories(
-   ${Boost_INCLUDE_DIRS}
-   ${VISP_INCLUDE_DIRS}
-   ${catkin_INCLUDE_DIRS}
diff --git a/dev-ros/visp_tracker/visp_tracker-0.11.1-r1.ebuild b/dev-ros/visp_tracker/visp_tracker-0.11.1-r1.ebuild
deleted file mode 100644
index ccb52c00e4db..000000000000
--- a/dev-ros/visp_tracker/visp_tracker-0.11.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="kinetic-"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Wraps the ViSP moving edge tracker provided by the ViSP library"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads(+)]
-	dev-ros/dynamic_reconfigure
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/image_proc
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-ros/resource_retriever
-	dev-ros/roscpp
-	dev-ros/sensor_msgs
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
-	sci-libs/ViSP:=[opencv,X]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
-fi
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_tracker/visp_tracker-0.12.1.ebuild b/dev-ros/visp_tracker/visp_tracker-0.13.1.ebuild
index 81537d67935a..3179650edbf0 100644
--- a/dev-ros/visp_tracker/visp_tracker-0.12.1.ebuild
+++ b/dev-ros/visp_tracker/visp_tracker-0.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,4 +36,8 @@ DEPEND="${RDEPEND}"
 if [ "${PV#9999}" = "${PV}" ] ; then
 	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
 fi
-PATCHES=( "${FILESDIR}/gcc6.patch" )
+
+src_compile() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_compile
+}
diff --git a/dev-ros/visp_tracker/visp_tracker-9999.ebuild b/dev-ros/visp_tracker/visp_tracker-9999.ebuild
index 81537d67935a..3179650edbf0 100644
--- a/dev-ros/visp_tracker/visp_tracker-9999.ebuild
+++ b/dev-ros/visp_tracker/visp_tracker-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,4 +36,8 @@ DEPEND="${RDEPEND}"
 if [ "${PV#9999}" = "${PV}" ] ; then
 	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
 fi
-PATCHES=( "${FILESDIR}/gcc6.patch" )
+
+src_compile() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_compile
+}