gentoo resync : 02.08.2019

27 files changed, 88 insertions, 563 deletions

diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 9ff78ef51ecb..5065fb9df386 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/message_filters/Manifest b/dev-ros/message_filters/Manifest
index 39594a624d62..1f60ea256613 100644
--- a/dev-ros/message_filters/Manifest
+++ b/dev-ros/message_filters/Manifest
@@ -1,11 +1,6 @@
+AUX boost.patch 1066 BLAKE2B 955d62df23d3165df5cf2645967755bf8dbd993779ddba0c6db4cbd77c6456d536421d428475ef521f3b961e4e9dd9f93a78066f10ed961fddb6a8528ea29648 SHA512 a78c61c54c7389647fa7001ce0d453b0d2b74324877da1275edc487c18cd6208a640678575887f84bcab0a742618efe69bd209855a4f57f58ede98f0a3cd7600
 AUX tests.patch 4837 BLAKE2B 2793652865f2d1f8ce1499b37922e480d40ca3931f098156a6cf541ad48985a3bee29364bb09e37c4f15424765dd057875f26dd5290f5747718538bcbeb3aead SHA512 2c778a7e4c7fc6d89ef162fd42d6f1dbd487d885c7ee04f6a8243142aaf949b02bfcd0c08cc8799f7a1ee95d13c8d21aef340abc4a3e6ca3c0f2231118985796
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD message_filters-1.13.5.ebuild 793 BLAKE2B f1c658e7498ab3cadd2ba8cbae62aa6b4f0409b11ce2a9faf1b84b251237f09b9ee3cee8905fca94d5fd041c60fd1ffddf6998451bf5593e9ce49117c6a0a2f3 SHA512 13acb3053fa753b76ab44c43df05a6168da17a8c5b9c0c6ea3b4154934423233e87e758a6a072d34649cccd6c60b4e4eb0abac3ef1475e2864f2a70f874a8bd9
-EBUILD message_filters-1.13.6.ebuild 775 BLAKE2B 59353b2f13fa5e412bbc668cb6c4b53edda3b25ae2d99262baad0b640b878827274f2811ed6bb59d077481415cec85ed0246c3ce3f014bf5bb95b11ca43c7dc0 SHA512 93e76073de1cda034e82462936971fb07506b6b27603f952b06c35a829f213d51a7484c192fe86a13d8ffd84e5bc5fa904630042e2b32be6adaf2fa4495e582c
-EBUILD message_filters-1.14.2.ebuild 775 BLAKE2B 59353b2f13fa5e412bbc668cb6c4b53edda3b25ae2d99262baad0b640b878827274f2811ed6bb59d077481415cec85ed0246c3ce3f014bf5bb95b11ca43c7dc0 SHA512 93e76073de1cda034e82462936971fb07506b6b27603f952b06c35a829f213d51a7484c192fe86a13d8ffd84e5bc5fa904630042e2b32be6adaf2fa4495e582c
-EBUILD message_filters-1.14.3.ebuild 775 BLAKE2B 59353b2f13fa5e412bbc668cb6c4b53edda3b25ae2d99262baad0b640b878827274f2811ed6bb59d077481415cec85ed0246c3ce3f014bf5bb95b11ca43c7dc0 SHA512 93e76073de1cda034e82462936971fb07506b6b27603f952b06c35a829f213d51a7484c192fe86a13d8ffd84e5bc5fa904630042e2b32be6adaf2fa4495e582c
+EBUILD message_filters-1.14.3-r1.ebuild 801 BLAKE2B d5fcbf87153ea43e9dfa32217e1227bd99a69dc3a6cd139d7682761ba4156a2cc26b310628f45b46bd039cdaedd927fa01ca5c4a19dbd30b6daf687a701d0463 SHA512 6d89bd8d709fc393c10674cb8b5f1cc86d2fb1eec960a31f1867f75550aef651e32804a58a8c9dc460ee0f7846af89035e407afbceb3b7bf5c1dc4944715e42c
 EBUILD message_filters-9999.ebuild 775 BLAKE2B 59353b2f13fa5e412bbc668cb6c4b53edda3b25ae2d99262baad0b640b878827274f2811ed6bb59d077481415cec85ed0246c3ce3f014bf5bb95b11ca43c7dc0 SHA512 93e76073de1cda034e82462936971fb07506b6b27603f952b06c35a829f213d51a7484c192fe86a13d8ffd84e5bc5fa904630042e2b32be6adaf2fa4495e582c
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/message_filters/files/boost.patch b/dev-ros/message_filters/files/boost.patch
new file mode 100644
index 000000000000..1acc778756a8
--- /dev/null
+++ b/dev-ros/message_filters/files/boost.patch
@@ -0,0 +1,26 @@
+commit 41f18edc9f2f0b1ef304ea25f148bd56a6bf3d70
+Author: Maarten de Vries <maarten@de-vri.es>
+Date:   Thu Jan 31 00:58:29 2019 +0100
+
+    Remove signals from find_package(Boost COMPONENTS ...) (#1580)
+    
+    The packages use signals2, not signals. Only boost libraries with
+    compiled code should be passed to find_package(Boost COMPONENTS ...),
+    and the signals2 library has always been header only.
+    
+    Boost 1.69 has removed the deprecated signals library, so the otherwise
+    useless but harmless `signals` component now breaks the build.
+
+diff --git a/utilities/message_filters/CMakeLists.txt b/utilities/message_filters/CMakeLists.txt
+index 5694ac57e..d2b1477ad 100644
+--- a/utilities/message_filters/CMakeLists.txt
++++ b/utilities/message_filters/CMakeLists.txt
+@@ -13,7 +13,7 @@ catkin_package(
+ )
+ catkin_python_setup()
+ 
+-find_package(Boost REQUIRED COMPONENTS signals thread)
++find_package(Boost REQUIRED COMPONENTS thread)
+ 
+ include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
+ link_directories(${catkin_LIBRARY_DIRS})
diff --git a/dev-ros/message_filters/message_filters-1.13.6.ebuild b/dev-ros/message_filters/message_filters-1.13.6.ebuild
deleted file mode 100644
index ec237f43cd55..000000000000
--- a/dev-ros/message_filters/message_filters-1.13.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Set of message filters which take in messages and may output those messages at a later time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-libs/boost:=[threads]
-	dev-ros/genpy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/message_filters/message_filters-1.14.2.ebuild b/dev-ros/message_filters/message_filters-1.14.2.ebuild
deleted file mode 100644
index ec237f43cd55..000000000000
--- a/dev-ros/message_filters/message_filters-1.14.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Set of message filters which take in messages and may output those messages at a later time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-libs/boost:=[threads]
-	dev-ros/genpy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/message_filters/message_filters-1.13.5.ebuild b/dev-ros/message_filters/message_filters-1.14.3-r1.ebuild
index fcee1e3cf904..48aa4d167295 100644
--- a/dev-ros/message_filters/message_filters-1.13.5.ebuild
+++ b/dev-ros/message_filters/message_filters-1.14.3-r1.ebuild
@@ -18,7 +18,6 @@ IUSE=""
 RDEPEND="
 	dev-ros/rosconsole
 	dev-ros/roscpp
-	dev-ros/xmlrpcpp
 	dev-libs/boost:=[threads]
 	dev-ros/genpy[${PYTHON_USEDEP}]
 	dev-ros/roslib[${PYTHON_USEDEP}]
@@ -30,4 +29,4 @@ DEPEND="${RDEPEND}
 		dev-cpp/gtest
 		dev-python/nose[${PYTHON_USEDEP}]
 	)"
-PATCHES=( "${FILESDIR}/tests.patch" )
+PATCHES=( "${FILESDIR}/tests.patch" "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/message_filters/message_filters-1.14.3.ebuild b/dev-ros/message_filters/message_filters-1.14.3.ebuild
deleted file mode 100644
index ec237f43cd55..000000000000
--- a/dev-ros/message_filters/message_filters-1.14.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Set of message filters which take in messages and may output those messages at a later time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-libs/boost:=[threads]
-	dev-ros/genpy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/roscpp/Manifest b/dev-ros/roscpp/Manifest
index b27f47775a95..2c1d604b1da9 100644
--- a/dev-ros/roscpp/Manifest
+++ b/dev-ros/roscpp/Manifest
@@ -1,18 +1,5 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+AUX boost.patch 1237 BLAKE2B bdea2bd55d1df3db2bdf3df15fd648bd488403068fc4667a2f1217cedaa066d5bb24cde84f1b9bc2ae43c33baec0dd601e0de1c036d0a522d9bf215f00cdf8eb SHA512 383a3c7ec2f4d92f578a18f530e2cf856c269bf761adb4c2a015fdffa5ee8adfbb2d62086c0c2a126653ea63a97763a8631eb93a82d1e9da5898c54f7187eadd
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD roscpp-1.13.0.ebuild 653 BLAKE2B 073d9236c452a0cd7a5e1da9a9a38f9bb775c7dc100507d8c5ac52c6d51ca7c367b53a5de0c8f63c9a4ac9faf18a21d9a5730bf263610d12c781c12ed286bdfe SHA512 5cc89df1054707302bf70e0b88329e33094c244c3c478c676f7727b8b0fc89909a07185a266e2588aaa2a2aa69a01502a099cec0e1a901de5cb9ee579618bdeb
-EBUILD roscpp-1.13.1.ebuild 653 BLAKE2B 073d9236c452a0cd7a5e1da9a9a38f9bb775c7dc100507d8c5ac52c6d51ca7c367b53a5de0c8f63c9a4ac9faf18a21d9a5730bf263610d12c781c12ed286bdfe SHA512 5cc89df1054707302bf70e0b88329e33094c244c3c478c676f7727b8b0fc89909a07185a266e2588aaa2a2aa69a01502a099cec0e1a901de5cb9ee579618bdeb
-EBUILD roscpp-1.13.2.ebuild 653 BLAKE2B 073d9236c452a0cd7a5e1da9a9a38f9bb775c7dc100507d8c5ac52c6d51ca7c367b53a5de0c8f63c9a4ac9faf18a21d9a5730bf263610d12c781c12ed286bdfe SHA512 5cc89df1054707302bf70e0b88329e33094c244c3c478c676f7727b8b0fc89909a07185a266e2588aaa2a2aa69a01502a099cec0e1a901de5cb9ee579618bdeb
-EBUILD roscpp-1.13.4.ebuild 653 BLAKE2B 073d9236c452a0cd7a5e1da9a9a38f9bb775c7dc100507d8c5ac52c6d51ca7c367b53a5de0c8f63c9a4ac9faf18a21d9a5730bf263610d12c781c12ed286bdfe SHA512 5cc89df1054707302bf70e0b88329e33094c244c3c478c676f7727b8b0fc89909a07185a266e2588aaa2a2aa69a01502a099cec0e1a901de5cb9ee579618bdeb
-EBUILD roscpp-1.13.5.ebuild 653 BLAKE2B 073d9236c452a0cd7a5e1da9a9a38f9bb775c7dc100507d8c5ac52c6d51ca7c367b53a5de0c8f63c9a4ac9faf18a21d9a5730bf263610d12c781c12ed286bdfe SHA512 5cc89df1054707302bf70e0b88329e33094c244c3c478c676f7727b8b0fc89909a07185a266e2588aaa2a2aa69a01502a099cec0e1a901de5cb9ee579618bdeb
-EBUILD roscpp-1.13.6.ebuild 653 BLAKE2B 073d9236c452a0cd7a5e1da9a9a38f9bb775c7dc100507d8c5ac52c6d51ca7c367b53a5de0c8f63c9a4ac9faf18a21d9a5730bf263610d12c781c12ed286bdfe SHA512 5cc89df1054707302bf70e0b88329e33094c244c3c478c676f7727b8b0fc89909a07185a266e2588aaa2a2aa69a01502a099cec0e1a901de5cb9ee579618bdeb
-EBUILD roscpp-1.14.2.ebuild 653 BLAKE2B 073d9236c452a0cd7a5e1da9a9a38f9bb775c7dc100507d8c5ac52c6d51ca7c367b53a5de0c8f63c9a4ac9faf18a21d9a5730bf263610d12c781c12ed286bdfe SHA512 5cc89df1054707302bf70e0b88329e33094c244c3c478c676f7727b8b0fc89909a07185a266e2588aaa2a2aa69a01502a099cec0e1a901de5cb9ee579618bdeb
-EBUILD roscpp-1.14.3.ebuild 653 BLAKE2B 073d9236c452a0cd7a5e1da9a9a38f9bb775c7dc100507d8c5ac52c6d51ca7c367b53a5de0c8f63c9a4ac9faf18a21d9a5730bf263610d12c781c12ed286bdfe SHA512 5cc89df1054707302bf70e0b88329e33094c244c3c478c676f7727b8b0fc89909a07185a266e2588aaa2a2aa69a01502a099cec0e1a901de5cb9ee579618bdeb
+EBUILD roscpp-1.14.3-r1.ebuild 691 BLAKE2B 4ee23561129e0d495247847daebaeb24b51c69f7e407717be6649913a21baeb5381ad7c129cdcbc2ed3de1fefad64731cfc67c58c88d745484e0b8d7a2a67022 SHA512 d908b3c8b4e7584fa916fee734fb66aa227ca8f5f95ca2cadf44172ea6638cd521f9d322e360454ea18c8fd819f8c544949270bd5a0efa89f647ee306f1a59b2
 EBUILD roscpp-9999.ebuild 653 BLAKE2B 073d9236c452a0cd7a5e1da9a9a38f9bb775c7dc100507d8c5ac52c6d51ca7c367b53a5de0c8f63c9a4ac9faf18a21d9a5730bf263610d12c781c12ed286bdfe SHA512 5cc89df1054707302bf70e0b88329e33094c244c3c478c676f7727b8b0fc89909a07185a266e2588aaa2a2aa69a01502a099cec0e1a901de5cb9ee579618bdeb
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roscpp/files/boost.patch b/dev-ros/roscpp/files/boost.patch
new file mode 100644
index 000000000000..1d509a8ab6c7
--- /dev/null
+++ b/dev-ros/roscpp/files/boost.patch
@@ -0,0 +1,26 @@
+commit 41f18edc9f2f0b1ef304ea25f148bd56a6bf3d70
+Author: Maarten de Vries <maarten@de-vri.es>
+Date:   Thu Jan 31 00:58:29 2019 +0100
+
+    Remove signals from find_package(Boost COMPONENTS ...) (#1580)
+    
+    The packages use signals2, not signals. Only boost libraries with
+    compiled code should be passed to find_package(Boost COMPONENTS ...),
+    and the signals2 library has always been header only.
+    
+    Boost 1.69 has removed the deprecated signals library, so the otherwise
+    useless but harmless `signals` component now breaks the build.
+
+diff --git a/clients/roscpp/CMakeLists.txt b/clients/roscpp/CMakeLists.txt
+index a5d354ea6..8f462df2c 100644
+--- a/clients/roscpp/CMakeLists.txt
++++ b/clients/roscpp/CMakeLists.txt
+@@ -22,7 +22,7 @@ list(GET roscpp_VERSION_LIST 2 roscpp_VERSION_PATCH)
+ 
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/ros/common.h.in ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros/common.h)
+ 
+-find_package(Boost REQUIRED COMPONENTS chrono filesystem signals system)
++find_package(Boost REQUIRED COMPONENTS chrono filesystem system)
+ 
+ include_directories(include ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
+ 
diff --git a/dev-ros/roscpp/roscpp-1.13.0.ebuild b/dev-ros/roscpp/roscpp-1.13.0.ebuild
deleted file mode 100644
index 4d1d63e2e341..000000000000
--- a/dev-ros/roscpp/roscpp-1.13.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp/roscpp-1.13.1.ebuild b/dev-ros/roscpp/roscpp-1.13.1.ebuild
deleted file mode 100644
index 4d1d63e2e341..000000000000
--- a/dev-ros/roscpp/roscpp-1.13.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp/roscpp-1.13.2.ebuild b/dev-ros/roscpp/roscpp-1.13.2.ebuild
deleted file mode 100644
index 4d1d63e2e341..000000000000
--- a/dev-ros/roscpp/roscpp-1.13.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp/roscpp-1.13.5.ebuild b/dev-ros/roscpp/roscpp-1.13.5.ebuild
deleted file mode 100644
index 4d1d63e2e341..000000000000
--- a/dev-ros/roscpp/roscpp-1.13.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp/roscpp-1.13.6.ebuild b/dev-ros/roscpp/roscpp-1.13.6.ebuild
deleted file mode 100644
index 4d1d63e2e341..000000000000
--- a/dev-ros/roscpp/roscpp-1.13.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp/roscpp-1.14.2.ebuild b/dev-ros/roscpp/roscpp-1.14.2.ebuild
deleted file mode 100644
index 4d1d63e2e341..000000000000
--- a/dev-ros/roscpp/roscpp-1.14.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp/roscpp-1.13.4.ebuild b/dev-ros/roscpp/roscpp-1.14.3-r1.ebuild
index 4d1d63e2e341..15e970883b2a 100644
--- a/dev-ros/roscpp/roscpp-1.13.4.ebuild
+++ b/dev-ros/roscpp/roscpp-1.14.3-r1.ebuild
@@ -28,3 +28,4 @@ RDEPEND="
 	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/roscpp/roscpp-1.14.3.ebuild b/dev-ros/roscpp/roscpp-1.14.3.ebuild
deleted file mode 100644
index 4d1d63e2e341..000000000000
--- a/dev-ros/roscpp/roscpp-1.14.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/test_roscpp/Manifest b/dev-ros/test_roscpp/Manifest
index d1a6de3b68e8..4ed5d0988cd2 100644
--- a/dev-ros/test_roscpp/Manifest
+++ b/dev-ros/test_roscpp/Manifest
@@ -1,18 +1,5 @@
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+AUX boost.patch 1046 BLAKE2B f74c7018f277fa2cb525f68602599127eba9fa43cd29b706960de70c3757f9e4e22a3491f3f2d549a0c20abcdf70051449765bc0bad24bfb018a96b5f30022be SHA512 9391547e16815bd065bb467f13468c020006aaac0e49b6b86505ea3aefc110a2a342b47cf3c235fd5522d9881a8c9c85e142c15f00e4b1a627c6be9516738d37
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD test_roscpp-1.13.0.ebuild 686 BLAKE2B 296e8e053461f066595a98c326f46f3bc66efe748748a996df81c64ce40b3dcc69f4ae94f33e4b2d4c68d3eb7ee9e56d6f685f150e9d1d16fe8f680b9d71f6b0 SHA512 5326ed5fe18e0c6b65d667a5ee932ad44ecdeca05a32a480f8cc9eda62accd0fd9a03d17790a75d383f8b59a2824914b7b8a8a1166686335cbede424de0067d8
-EBUILD test_roscpp-1.13.1.ebuild 686 BLAKE2B 296e8e053461f066595a98c326f46f3bc66efe748748a996df81c64ce40b3dcc69f4ae94f33e4b2d4c68d3eb7ee9e56d6f685f150e9d1d16fe8f680b9d71f6b0 SHA512 5326ed5fe18e0c6b65d667a5ee932ad44ecdeca05a32a480f8cc9eda62accd0fd9a03d17790a75d383f8b59a2824914b7b8a8a1166686335cbede424de0067d8
-EBUILD test_roscpp-1.13.2.ebuild 686 BLAKE2B 296e8e053461f066595a98c326f46f3bc66efe748748a996df81c64ce40b3dcc69f4ae94f33e4b2d4c68d3eb7ee9e56d6f685f150e9d1d16fe8f680b9d71f6b0 SHA512 5326ed5fe18e0c6b65d667a5ee932ad44ecdeca05a32a480f8cc9eda62accd0fd9a03d17790a75d383f8b59a2824914b7b8a8a1166686335cbede424de0067d8
-EBUILD test_roscpp-1.13.4.ebuild 686 BLAKE2B 296e8e053461f066595a98c326f46f3bc66efe748748a996df81c64ce40b3dcc69f4ae94f33e4b2d4c68d3eb7ee9e56d6f685f150e9d1d16fe8f680b9d71f6b0 SHA512 5326ed5fe18e0c6b65d667a5ee932ad44ecdeca05a32a480f8cc9eda62accd0fd9a03d17790a75d383f8b59a2824914b7b8a8a1166686335cbede424de0067d8
-EBUILD test_roscpp-1.13.5.ebuild 686 BLAKE2B 296e8e053461f066595a98c326f46f3bc66efe748748a996df81c64ce40b3dcc69f4ae94f33e4b2d4c68d3eb7ee9e56d6f685f150e9d1d16fe8f680b9d71f6b0 SHA512 5326ed5fe18e0c6b65d667a5ee932ad44ecdeca05a32a480f8cc9eda62accd0fd9a03d17790a75d383f8b59a2824914b7b8a8a1166686335cbede424de0067d8
-EBUILD test_roscpp-1.13.6.ebuild 686 BLAKE2B 51f728f587419c338a10bc87ec34ae493f31936785c460c5f339c4842df4d170090cca5ffb859424a8a3061c6ebd7eb271bb1e0584e2bd3f504f778b9804efc0 SHA512 248c4b2c8b6afe224576f4581c13d85b79abafd63bdd7832bfad6074d6abf2fdee67ff66a1cfad78dcde23a93696633b4b7a96f9e87b0d352ad507753613f964
-EBUILD test_roscpp-1.14.2.ebuild 686 BLAKE2B 51f728f587419c338a10bc87ec34ae493f31936785c460c5f339c4842df4d170090cca5ffb859424a8a3061c6ebd7eb271bb1e0584e2bd3f504f778b9804efc0 SHA512 248c4b2c8b6afe224576f4581c13d85b79abafd63bdd7832bfad6074d6abf2fdee67ff66a1cfad78dcde23a93696633b4b7a96f9e87b0d352ad507753613f964
-EBUILD test_roscpp-1.14.3.ebuild 686 BLAKE2B 51f728f587419c338a10bc87ec34ae493f31936785c460c5f339c4842df4d170090cca5ffb859424a8a3061c6ebd7eb271bb1e0584e2bd3f504f778b9804efc0 SHA512 248c4b2c8b6afe224576f4581c13d85b79abafd63bdd7832bfad6074d6abf2fdee67ff66a1cfad78dcde23a93696633b4b7a96f9e87b0d352ad507753613f964
+EBUILD test_roscpp-1.14.3-r1.ebuild 721 BLAKE2B 2cfdd691aedc99cda218504cacc6eeffcc96c75eed937fca3d5c2c04235363cc7a876ac87f6af5f1c318616aecb6c4838ea9d970bb2ce5991eb488175cd334bc SHA512 cf2c48391e89b87a39e3d368907a711a7ed7b470ce6ddcb676bd83dfe21df9c66d060c238307b333a38f3221ddc1a1e0d0cbb3614f7609120a60b4b0e8706622
 EBUILD test_roscpp-9999.ebuild 686 BLAKE2B 913ebd162894a4839ac240006a07f9007384d8066f71fcbef889b020b1283e5d528edc297e9f81497a984e152b6d0f1d91149bbaf0cdb437b2a6074ea51b9326 SHA512 88523b4bd636f6c066a7132bb0509c92cdfbfdbf24db72adef2c4461358c31c40f5c4f7db655aecbc41766429b50f73f1c7e247b7a956fefe2184e9079cd8df8
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_roscpp/files/boost.patch b/dev-ros/test_roscpp/files/boost.patch
new file mode 100644
index 000000000000..41bac154d6ce
--- /dev/null
+++ b/dev-ros/test_roscpp/files/boost.patch
@@ -0,0 +1,26 @@
+commit 41f18edc9f2f0b1ef304ea25f148bd56a6bf3d70
+Author: Maarten de Vries <maarten@de-vri.es>
+Date:   Thu Jan 31 00:58:29 2019 +0100
+
+    Remove signals from find_package(Boost COMPONENTS ...) (#1580)
+    
+    The packages use signals2, not signals. Only boost libraries with
+    compiled code should be passed to find_package(Boost COMPONENTS ...),
+    and the signals2 library has always been header only.
+    
+    Boost 1.69 has removed the deprecated signals library, so the otherwise
+    useless but harmless `signals` component now breaks the build.
+
+diff --git a/test/test_roscpp/CMakeLists.txt b/test/test_roscpp/CMakeLists.txt
+index 519767362..01c3d6672 100644
+--- a/test/test_roscpp/CMakeLists.txt
++++ b/test/test_roscpp/CMakeLists.txt
+@@ -11,7 +11,7 @@ find_package(catkin REQUIRED COMPONENTS
+ )
+ 
+ if(CATKIN_ENABLE_TESTING)
+-  find_package(Boost REQUIRED COMPONENTS signals filesystem system)
++  find_package(Boost REQUIRED COMPONENTS filesystem system)
+ 
+   include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
+ 
diff --git a/dev-ros/test_roscpp/test_roscpp-1.13.1.ebuild b/dev-ros/test_roscpp/test_roscpp-1.13.1.ebuild
deleted file mode 100644
index 2aff5d7a157e..000000000000
--- a/dev-ros/test_roscpp/test_roscpp-1.13.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roscpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=[threads]
-	test? (
-		dev-cpp/gtest
-	)
-"
-REQUIRED_USE="test? ( ros_messages_cxx )"
diff --git a/dev-ros/test_roscpp/test_roscpp-1.13.2.ebuild b/dev-ros/test_roscpp/test_roscpp-1.13.2.ebuild
deleted file mode 100644
index 2aff5d7a157e..000000000000
--- a/dev-ros/test_roscpp/test_roscpp-1.13.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roscpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=[threads]
-	test? (
-		dev-cpp/gtest
-	)
-"
-REQUIRED_USE="test? ( ros_messages_cxx )"
diff --git a/dev-ros/test_roscpp/test_roscpp-1.13.4.ebuild b/dev-ros/test_roscpp/test_roscpp-1.13.4.ebuild
deleted file mode 100644
index 2aff5d7a157e..000000000000
--- a/dev-ros/test_roscpp/test_roscpp-1.13.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roscpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=[threads]
-	test? (
-		dev-cpp/gtest
-	)
-"
-REQUIRED_USE="test? ( ros_messages_cxx )"
diff --git a/dev-ros/test_roscpp/test_roscpp-1.13.5.ebuild b/dev-ros/test_roscpp/test_roscpp-1.13.5.ebuild
deleted file mode 100644
index 2aff5d7a157e..000000000000
--- a/dev-ros/test_roscpp/test_roscpp-1.13.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roscpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=[threads]
-	test? (
-		dev-cpp/gtest
-	)
-"
-REQUIRED_USE="test? ( ros_messages_cxx )"
diff --git a/dev-ros/test_roscpp/test_roscpp-1.13.6.ebuild b/dev-ros/test_roscpp/test_roscpp-1.13.6.ebuild
deleted file mode 100644
index 74f15fb4247b..000000000000
--- a/dev-ros/test_roscpp/test_roscpp-1.13.6.ebuild
+++ /dev/null
@@ -1,31 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roscpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=[threads]
-	test? (
-		dev-cpp/gtest
-	)
-"
-REQUIRED_USE="test? ( ros_messages_cxx )"
diff --git a/dev-ros/test_roscpp/test_roscpp-1.14.2.ebuild b/dev-ros/test_roscpp/test_roscpp-1.14.2.ebuild
deleted file mode 100644
index 74f15fb4247b..000000000000
--- a/dev-ros/test_roscpp/test_roscpp-1.14.2.ebuild
+++ /dev/null
@@ -1,31 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roscpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=[threads]
-	test? (
-		dev-cpp/gtest
-	)
-"
-REQUIRED_USE="test? ( ros_messages_cxx )"
diff --git a/dev-ros/test_roscpp/test_roscpp-1.13.0.ebuild b/dev-ros/test_roscpp/test_roscpp-1.14.3-r1.ebuild
index 2aff5d7a157e..8e988cf0c461 100644
--- a/dev-ros/test_roscpp/test_roscpp-1.13.0.ebuild
+++ b/dev-ros/test_roscpp/test_roscpp-1.14.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -29,3 +29,4 @@ DEPEND="${RDEPEND}
 	)
 "
 REQUIRED_USE="test? ( ros_messages_cxx )"
+PATCHES=( "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/test_roscpp/test_roscpp-1.14.3.ebuild b/dev-ros/test_roscpp/test_roscpp-1.14.3.ebuild
deleted file mode 100644
index 74f15fb4247b..000000000000
--- a/dev-ros/test_roscpp/test_roscpp-1.14.3.ebuild
+++ /dev/null
@@ -1,31 +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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roscpp"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=[threads]
-	test? (
-		dev-cpp/gtest
-	)
-"
-REQUIRED_USE="test? ( ros_messages_cxx )"