gentoo resync : 25.08.2020

4 files changed, 13 insertions, 41 deletions

diff --git a/dev-ros/tf2/Manifest b/dev-ros/tf2/Manifest
index c133031f2197..c8d18ad1d66a 100644
--- a/dev-ros/tf2/Manifest
+++ b/dev-ros/tf2/Manifest
@@ -1,5 +1,4 @@
-AUX boost.patch 958 BLAKE2B 0d75e27281700e0408bbc3132b6fea851e76cfc06b0e9fe7da2911675875e5779cb9aa485539cdfad3e3f812e7711546f0e7c468f964f54a5a0c5ee5c58e5bd5 SHA512 d2f776bfd87fe3b22303b3e7fa5e7a7cf1bc59330ba6d16760172786c3119eb42dde925aa3f7ce04423c1c2cdf6b0fedbe05aeab8d983585e6fd3103996751dc
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2-0.6.5-r1.ebuild 585 BLAKE2B a01271211102fe8762c2c0d222d1e00b3776427cf539965ef113745fd808968763458799130890f87d9fd40f873711070885d1bf76eab1d4a3640dd0244f3001 SHA512 65bf35a70d1a20039f4c8535ca98a54bb85b58e9ff67588921f581634d549460dc1301bf31f34ed8a633f2cd81cb06ff8ac09ecf14a7b7ea7d7af53face432e9
-EBUILD tf2-9999.ebuild 550 BLAKE2B 10c50cfb412755a1c9ca026c2343da67ebdd73a2d9b9eb3697d7d87ca3a167e7f02008cd1f55c6cea8129b162d32c0277ddadfe07dc814a8359e0366f4013121 SHA512 f90dce47cd2d78d2de07c1bfc8da8e17865fe4c3e76313efc8751be397e2892a4df61a10de60eb875309ae9db9c20cd6700a72540cbeb49e303a297d830281b4
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2-0.7.2.ebuild 561 BLAKE2B 959ada1501d564b182a4f437d9f4f760b425761857da4a5e8a84a8aaa9ec1709d6ba5fa6b628a7b8ce8501127034f2e720d98cbd22d004397fcda25c54579902 SHA512 bf6b87155448407748783c0ee9cf5c513899bf23e4b441ec0b9bfb57144e2ebfa5c53254d359e805a2071b7652a05dd623ff541f9bb5fc48a35f125702d4f6a7
+EBUILD tf2-9999.ebuild 561 BLAKE2B 959ada1501d564b182a4f437d9f4f760b425761857da4a5e8a84a8aaa9ec1709d6ba5fa6b628a7b8ce8501127034f2e720d98cbd22d004397fcda25c54579902 SHA512 bf6b87155448407748783c0ee9cf5c513899bf23e4b441ec0b9bfb57144e2ebfa5c53254d359e805a2071b7652a05dd623ff541f9bb5fc48a35f125702d4f6a7
 MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2/files/boost.patch b/dev-ros/tf2/files/boost.patch
deleted file mode 100644
index 5f87149ee31e..000000000000
--- a/dev-ros/tf2/files/boost.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 6223549e4d5e1d442a9cfb8e8c7334bcc62c1662
-Author: Maarten de Vries <maarten@de-vri.es>
-Date:   Thu Jan 17 16:00:14 2019 +0100
-
-    Remove `signals` from find_package(Boost COMPONENTS ...).
-    
-    tf2 is using signals2, which is not the same library.
-    Additionally, signals2 has always been header only, and header only
-    libraries must not be listed in find_package.
-    
-    Boost 1.69 removed the old signals library entirely, so the otherwise
-    useless `COMPONENTS signals` actually breaks the build.
-
-diff --git a/tf2/CMakeLists.txt b/tf2/CMakeLists.txt
-index 9ffb17a..7a6da34 100644
---- a/tf2/CMakeLists.txt
-+++ b/tf2/CMakeLists.txt
-@@ -3,7 +3,7 @@ project(tf2)
- 
- find_package(console_bridge REQUIRED)
- find_package(catkin REQUIRED COMPONENTS geometry_msgs rostime tf2_msgs)
--find_package(Boost REQUIRED COMPONENTS signals system thread)
-+find_package(Boost REQUIRED COMPONENTS system thread)
- 
- catkin_package(
-    INCLUDE_DIRS include
diff --git a/dev-ros/tf2/tf2-0.6.5-r1.ebuild b/dev-ros/tf2/tf2-0.7.2.ebuild
index 826acc9420ad..1e993d3ee72a 100644
--- a/dev-ros/tf2/tf2-0.6.5-r1.ebuild
+++ b/dev-ros/tf2/tf2-0.7.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/geometry2"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -14,13 +14,12 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/console_bridge:=
 	dev-ros/rostime
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/roscpp )
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-ros/roscpp dev-cpp/gtest )
 "
-PATCHES=( "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/tf2/tf2-9999.ebuild b/dev-ros/tf2/tf2-9999.ebuild
index 5c97f8328efe..1e993d3ee72a 100644
--- a/dev-ros/tf2/tf2-9999.ebuild
+++ b/dev-ros/tf2/tf2-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/geometry2"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -14,12 +14,12 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/console_bridge:=
 	dev-ros/rostime
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/roscpp )
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-ros/roscpp dev-cpp/gtest )
 "