gentoo resync : 06.08.2019

4 files changed, 32 insertions, 42 deletions

diff --git a/dev-ros/tf/Manifest b/dev-ros/tf/Manifest
index 1fa20c1a9724..b7c6a63fa00b 100644
--- a/dev-ros/tf/Manifest
+++ b/dev-ros/tf/Manifest
@@ -1,6 +1,5 @@
-DIST geometry-1.11.9.tar.gz 185525 BLAKE2B ba807c12d4389983d95a37707344f439cd256c5200bcc639b103862d6b3c4670db62a048feddac2ddeabe8374ccfebc0cef7bf6e14b672b1610194c40c9d6022 SHA512 de775da483d1bcca05bcc0f05dc358e1e11e4ba9845f446f5810ca2e835e75ed7202ff7c43a0d7433f9db4298930af32715f2ab2689e0f22c9d8ac10a73cc97c
+AUX boost.patch 974 BLAKE2B 77e8a170d7d6dcec9e41e32443abf512d735c0cbb82bc160883e14dad45136818fbe47e34813bf7abe328fca4549c92b5c1041c83a33a5ea63145abb1e8f9431 SHA512 272b7ea812a7a65d415fb8dc845f23cb969391a10e5035b759e48f1fe31466248ffece658f2323a3e3e0ce6b7bfef6ae6e4d0014e8a8a926755e98a9c96783fc
 DIST geometry-1.12.0.tar.gz 186357 BLAKE2B 6bf8c93b5707403655253a30b8994bb62b8b44077805bf43b266b781e5c8edb65c402d00fb76d9e87bd111211b932f10487f769ac4d04322255b57f44680adca SHA512 5cef17a76dfd5b9c2f118519bf3a74a1213d3036c8de19de453e8419d12d744a6a4ae4fd4a76b34c455b548a9857cd5bfa181698d903356737e1555d619a0627
-EBUILD tf-1.11.9.ebuild 1006 BLAKE2B 71c1becd35ac2ececd5b14d98a0ebc183be878d4c7765b16e9d5f5d0541b54162b1b175efd3548a6bae4b7325d3989af65a5dbe066a602c54002d69d2d326a32 SHA512 936b4e9db468d68476d5aa58b76721168aab9d597589b335cbd662370ad34a1b02b3044e954374f8f6b66e2cfe472c9f689c94917da9395970c25d6f0e307e24
-EBUILD tf-1.12.0.ebuild 1006 BLAKE2B adf845f181fb20a7acd81d38786687aadfd3ed5b147bf2afa4d8a1dd32e87e746eb06859c2d5ac14b82cae587385ca8e80af95e683fcfb80bc6682a52ac69c1c SHA512 4cd0691a6b2fe1582d7c7aee0bd83e2be2db926193b58b9be050f88cd13c80e5f177e3d9e2d6c15883c3049adb8b3d48c7b40d3343e5ecbcb7a8ffae0719e165
+EBUILD tf-1.12.0.ebuild 1041 BLAKE2B bafd8e43f109f7127ce19e48a0d31e44ab91b8027ef02c0c7b86ba0159671ffca727c701e38844e6694c2313de3bd5655a9c94fe9780260507c8c1e35a3643b2 SHA512 8ec179d1f944810777444059a15c395be28c2329c7600d8696f3c99ca56e1d1edf09de48010cab9c05265c346e3dd6afeb95a2f188e6fe1954fee0de3dfa3275
 EBUILD tf-9999.ebuild 1006 BLAKE2B 67006c1c0fc77a0449be9d829464d1efad49aa0e503d96df900e3c288350dd1d140fd2b22bdd76eaa6e3973ef83642251c2ef3218f02492e6d637e903992983e SHA512 980971c39495ef9679810efa1cce7ac029ea92b2fe09031a8dd52d346c37770caf5717641d548b200b42dbce2b4c21dd64d3363794e3fd904c441753fcbd65ac
 MISC metadata.xml 326 BLAKE2B 5dc7af91da7fdb7ea5fc3057f3d536db449ab74936a1d7d5fc8db12e7ee77f575df3607e4cb4be025a297c16ff2396fe7b8ee18d3024278059c3a9acf59485ba SHA512 2a6fb539ad45610d9ece5d96d9dfdcc90a0e11723e2a2747dd49a4b15fedda8afc369e5d9a1a4337f9216a983a4d8f3c9fe6b1054c8dafedd83ced92fd8381ae
diff --git a/dev-ros/tf/files/boost.patch b/dev-ros/tf/files/boost.patch
new file mode 100644
index 000000000000..dd926cf05848
--- /dev/null
+++ b/dev-ros/tf/files/boost.patch
@@ -0,0 +1,28 @@
+From 2eed72cb7b63fc4ee98af695c625d9a741a09897 Mon Sep 17 00:00:00 2001
+From: Maarten de Vries <maarten@de-vri.es>
+Date: Thu, 17 Jan 2019 21:40:28 +0100
+Subject: [PATCH] Remove `signals` from find_package(Boost COMPONENTS ...)
+
+tf is using signals2, which is not the same library as signals.
+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.
+---
+ tf/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tf/CMakeLists.txt b/tf/CMakeLists.txt
+index 04dcb4e8..b469f658 100644
+--- a/tf/CMakeLists.txt
++++ b/tf/CMakeLists.txt
+@@ -15,7 +15,7 @@ find_package(catkin REQUIRED COMPONENTS
+     std_msgs
+     tf2_ros
+ )
+-find_package(Boost REQUIRED COMPONENTS thread signals system)
++find_package(Boost REQUIRED COMPONENTS thread system)
+ 
+ catkin_python_setup()
+ 
diff --git a/dev-ros/tf/tf-1.11.9.ebuild b/dev-ros/tf/tf-1.11.9.ebuild
deleted file mode 100644
index 9fbd6e2ea2c0..000000000000
--- a/dev-ros/tf/tf-1.11.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Maintains the relationship between coordinate frames in a tree structure buffered in time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/angles
-	dev-ros/message_filters
-	dev-ros/rosconsole
-	dev-ros/rostime
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/tf/tf-1.12.0.ebuild b/dev-ros/tf/tf-1.12.0.ebuild
index d129d24ee28a..201cf57ee6b6 100644
--- a/dev-ros/tf/tf-1.12.0.ebuild
+++ b/dev-ros/tf/tf-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,3 +36,4 @@ DEPEND="${RDEPEND}
 		dev-cpp/gtest
 		dev-python/nose[${PYTHON_USEDEP}]
 	)"
+PATCHES=( "${FILESDIR}/boost.patch" )