gentoo resync : 19.07.2019

6 files changed, 30 insertions, 83 deletions

diff --git a/dev-ros/tf2/Manifest b/dev-ros/tf2/Manifest
index 0ad76582b1c3..c133031f2197 100644
--- a/dev-ros/tf2/Manifest
+++ b/dev-ros/tf2/Manifest
@@ -1,10 +1,5 @@
-DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
-DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
+AUX boost.patch 958 BLAKE2B 0d75e27281700e0408bbc3132b6fea851e76cfc06b0e9fe7da2911675875e5779cb9aa485539cdfad3e3f812e7711546f0e7c468f964f54a5a0c5ee5c58e5bd5 SHA512 d2f776bfd87fe3b22303b3e7fa5e7a7cf1bc59330ba6d16760172786c3119eb42dde925aa3f7ce04423c1c2cdf6b0fedbe05aeab8d983585e6fd3103996751dc
 DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2-0.6.1.ebuild 550 BLAKE2B a1824ba987c5aa4c6492ab7b03e8705bf2c89d47f1528f7656322d684ca7d3620691699882ecfe1b35925f912c68c84d30981fd673c51785fff291f5a5665a13 SHA512 c2246380dba8b2dc1066b364b31390092192526bf8ce2b2161789192428b38087773cd54965138871bf42aa9daa1e63426eecd75a9548a675c5feea6c6e4ab1b
-EBUILD tf2-0.6.2.ebuild 550 BLAKE2B a1824ba987c5aa4c6492ab7b03e8705bf2c89d47f1528f7656322d684ca7d3620691699882ecfe1b35925f912c68c84d30981fd673c51785fff291f5a5665a13 SHA512 c2246380dba8b2dc1066b364b31390092192526bf8ce2b2161789192428b38087773cd54965138871bf42aa9daa1e63426eecd75a9548a675c5feea6c6e4ab1b
-EBUILD tf2-0.6.3.ebuild 550 BLAKE2B a1824ba987c5aa4c6492ab7b03e8705bf2c89d47f1528f7656322d684ca7d3620691699882ecfe1b35925f912c68c84d30981fd673c51785fff291f5a5665a13 SHA512 c2246380dba8b2dc1066b364b31390092192526bf8ce2b2161789192428b38087773cd54965138871bf42aa9daa1e63426eecd75a9548a675c5feea6c6e4ab1b
-EBUILD tf2-0.6.5.ebuild 547 BLAKE2B 00c7d0cad97f91edb2408ae1bf7327a4664e0070dbaf2470c2c3301729fa241224b0ad2511b35282ddfed7a98b61899fb67f37140590560fc751391477bc9810 SHA512 7869555a737885921f0c5dfe8d1e5e81fe706346a04ad5065b287c0e679fd183fd65828ee008ac9a4f1f4b1dd84a0cfc2c75e029ee7b1e21cd00390e8f95a3be
+EBUILD tf2-0.6.5-r1.ebuild 585 BLAKE2B a01271211102fe8762c2c0d222d1e00b3776427cf539965ef113745fd808968763458799130890f87d9fd40f873711070885d1bf76eab1d4a3640dd0244f3001 SHA512 65bf35a70d1a20039f4c8535ca98a54bb85b58e9ff67588921f581634d549460dc1301bf31f34ed8a633f2cd81cb06ff8ac09ecf14a7b7ea7d7af53face432e9
 EBUILD tf2-9999.ebuild 550 BLAKE2B 10c50cfb412755a1c9ca026c2343da67ebdd73a2d9b9eb3697d7d87ca3a167e7f02008cd1f55c6cea8129b162d32c0277ddadfe07dc814a8359e0366f4013121 SHA512 f90dce47cd2d78d2de07c1bfc8da8e17865fe4c3e76313efc8751be397e2892a4df61a10de60eb875309ae9db9c20cd6700a72540cbeb49e303a297d830281b4
 MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2/files/boost.patch b/dev-ros/tf2/files/boost.patch
new file mode 100644
index 000000000000..5f87149ee31e
--- /dev/null
+++ b/dev-ros/tf2/files/boost.patch
@@ -0,0 +1,26 @@
+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.2.ebuild b/dev-ros/tf2/tf2-0.6.2.ebuild
deleted file mode 100644
index 5751b898da20..000000000000
--- a/dev-ros/tf2/tf2-0.6.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="The second generation Transform Library in ROS"
-LICENSE="BSD"
-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 )
-"
diff --git a/dev-ros/tf2/tf2-0.6.3.ebuild b/dev-ros/tf2/tf2-0.6.3.ebuild
deleted file mode 100644
index 5751b898da20..000000000000
--- a/dev-ros/tf2/tf2-0.6.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="The second generation Transform Library in ROS"
-LICENSE="BSD"
-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 )
-"
diff --git a/dev-ros/tf2/tf2-0.6.1.ebuild b/dev-ros/tf2/tf2-0.6.5-r1.ebuild
index 5751b898da20..826acc9420ad 100644
--- a/dev-ros/tf2/tf2-0.6.1.ebuild
+++ b/dev-ros/tf2/tf2-0.6.5-r1.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
@@ -23,3 +23,4 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( dev-ros/roscpp )
 "
+PATCHES=( "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/tf2/tf2-0.6.5.ebuild b/dev-ros/tf2/tf2-0.6.5.ebuild
deleted file mode 100644
index 102478eb1ac6..000000000000
--- a/dev-ros/tf2/tf2-0.6.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="The second generation Transform Library in ROS"
-LICENSE="BSD"
-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 )
-"