gentoo resync : 06.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-09-06 10:28:05 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-09-06 10:28:05 +0100
commit: f1af93971b7490792d8541bc790e0d8c6d787059 (patch)
tree: a38046712bbc3a3844d77452d16c84e716caa3d4 /dev-ros
parent: fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff)
125 files changed, 836 insertions, 1029 deletions
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 5065fb9df386..b98cadd84bd7 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/camera_calibration_parsers/Manifest b/dev-ros/camera_calibration_parsers/Manifest
index 718d2b68c998..b88dba8ad043 100644
--- a/dev-ros/camera_calibration_parsers/Manifest
+++ b/dev-ros/camera_calibration_parsers/Manifest
@@ -1,4 +1,4 @@
-AUX boostpython.patch 848 BLAKE2B f9ca2e26e51f882735544245b0964d08c272643d7c786308d2ad5d1598d383e728c03bf7b609ca22cc7f24d365c00b5f802db138459e1af8d4b597d963e92358 SHA512 8fbb168908d3c0cc5f0b8fbe8e9f82970254a136284062c4daf27d9553fa04385e1bcae9b1da2943b37bf1d047faa262eca08409d5d364260fd529b59e44325d
+AUX boostpython.patch 894 BLAKE2B b9dadc07ac55c68b15c2960ae545a0d7f2984da11d835f41707d6a1b54487650a4507c720e3c372eeb2aec9f8fc20edfb726a4df616349802aa484210ee8bf2e SHA512 222e4ae077e40af8cd2b913d71d43e06b5b798375ae0d8fd9cf6c9387d7ffb1acd2c44208713cdeb8ae24dce74eff426b4b9180d6e07a2041b5d0a6031ad756a
 DIST image_common-1.11.13.tar.gz 54731 BLAKE2B 24c05d7da79ec4edc1713eb86efe9d570b8a9d55def1b0cdf7959275c4a0692af28d48d37d73361f3972c0f4ded5332ee02b535f1841473007eb8e61287b7826 SHA512 154a1acfc3ee1be83828f7b86de8a5e02d7613d724f734409c5b93b1505bcf911b95f20fe43435932f49e03e286ed7055e2b7abeb1c5292f540a2299dd424bfa
 EBUILD camera_calibration_parsers-1.11.13-r1.ebuild 725 BLAKE2B 95216c8cbedd069150bbceb53a63a0279025540f7faa93c99b074594658aeb389b2f8e362588cdc516c9c36d456997acad77a97b0bfe3e9f8e2dff5454872df8 SHA512 6769971a6358c655f0e4aa332ded4efa362221b53d5bd82b9654c26ade8f7f7e74be0ed3abea0825a4380b2f88abeba4e062319feebf42217d12bbb60c1982ae
 EBUILD camera_calibration_parsers-9999.ebuild 725 BLAKE2B 95216c8cbedd069150bbceb53a63a0279025540f7faa93c99b074594658aeb389b2f8e362588cdc516c9c36d456997acad77a97b0bfe3e9f8e2dff5454872df8 SHA512 6769971a6358c655f0e4aa332ded4efa362221b53d5bd82b9654c26ade8f7f7e74be0ed3abea0825a4380b2f88abeba4e062319feebf42217d12bbb60c1982ae
diff --git a/dev-ros/camera_calibration_parsers/files/boostpython.patch b/dev-ros/camera_calibration_parsers/files/boostpython.patch
index 8e2b868ec452..02019d6458f7 100644
--- a/dev-ros/camera_calibration_parsers/files/boostpython.patch
+++ b/dev-ros/camera_calibration_parsers/files/boostpython.patch
@@ -14,7 +14,7 @@ Index: camera_calibration_parsers/CMakeLists.txt
 -else()
 -  find_package(Boost REQUIRED COMPONENTS filesystem python3)
 -endif()
-+find_package(Boost REQUIRED COMPONENTS filesystem python)
++find_package(Boost REQUIRED COMPONENTS filesystem python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
  include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
  
  catkin_python_setup()
diff --git a/dev-ros/cmake_modules/Manifest b/dev-ros/cmake_modules/Manifest
index f3fa34e7d8e0..4ddcce29bbea 100644
--- a/dev-ros/cmake_modules/Manifest
+++ b/dev-ros/cmake_modules/Manifest
@@ -1,6 +1,8 @@
 DIST cmake_modules-0.4.0.tar.gz 17379 BLAKE2B 36e152ae01a3b7a4d7b4e7db62b27cc13a8df21a32605da30111d6fcfdff6a9d98eafb740139aca297a7e9bde296b1e5b1bc401bf6c6cb602e01c7c96d024d7b SHA512 60bcc800541d6280e3a20c016ac9489efb98e136ed0cc4b13685c1b43001d74ea75b334df8a7b6da414c17ecd7ad8398f4bb6a8fe0bb75155430b47d045a2462
 DIST cmake_modules-0.4.1.tar.gz 18057 BLAKE2B fa61b95fc2a401df8b146fc57a26ea1d0770daf94d4f2d7bf241b213ba58733e6bbbc11af0140d6ac7bf84ab78acd7abdd79570866683bc7a0704294fe8f3c29 SHA512 7bc0ab1c89686cfbabbf5fd5bf1685c8eef7325c62a7ecd5ef38a14b54eb80c65306b70b30bef4a001d4081e6c43e75a39fc38e5e1b6227a6725093417ba4cf2
+DIST cmake_modules-0.4.2.tar.gz 18541 BLAKE2B 448fa9f49c155e60f56094cadfd2f1d26bac426a18ce7355c92f227fb650f77affd49557c98fa4d0b26d4e21ed7b4d2a2e6deb6fdc25a3996705a2b9e3805f56 SHA512 1ab0f9d15296c024caf83f126db675894163ff6104c86e22f105e8027561b291e2a0178e39980439e66e4b691e6122830621fbb09f957eebe94ddd065c23f5e7
 EBUILD cmake_modules-0.4.0.ebuild 378 BLAKE2B dd8e5ea62e68f2c8215bac9cabe3f6a41d1480867ff31d3ce674be3a9e10df36107ba823e8fcd8402ce9125d0c46438aad41680f7c1c4d483de9253dea202ec4 SHA512 22e051b6b8a10f022fc1103d66c3959f6aabccfc05772752723100051a0ad6d366d3dbafe87b8edf30df6f9ed937ff5ca3edca344241cd95a6f134c4c55e9b46
 EBUILD cmake_modules-0.4.1.ebuild 378 BLAKE2B 6754d24dab6e7da85e91617d88521e45a971a24223679a553a6a9c2361ba293c59dad24020deb22f3c2e93718e86fce81ffd6d14e13e5de73c748f6639fa04e3 SHA512 680f503ced4fe891e84760007dd2fd9ea3854f27c971ca3540661369f22fd1d6201b1595e13e242ff746bef204d61639a4cdeac2d9a3da2b96771ffa17f1df3b
+EBUILD cmake_modules-0.4.2.ebuild 375 BLAKE2B 0e07ec88f48c4f823b5587eeb764a691265858f1d84386e55cee65f61a06d0cf4d1e5a11f2ff4ea78d04bbb7011e1138c9a21af71457c4ecca4775d710a4c386 SHA512 c3bd32b8ca16b4ed7274d0054fced3ca987854707dda2af695a77cb31d37bfcbfb17e04e52d729c708d4f2f929e1b9b02553bf36f122352b7b7d6128e26ddaa5
 EBUILD cmake_modules-9999.ebuild 378 BLAKE2B dd8e5ea62e68f2c8215bac9cabe3f6a41d1480867ff31d3ce674be3a9e10df36107ba823e8fcd8402ce9125d0c46438aad41680f7c1c4d483de9253dea202ec4 SHA512 22e051b6b8a10f022fc1103d66c3959f6aabccfc05772752723100051a0ad6d366d3dbafe87b8edf30df6f9ed937ff5ca3edca344241cd95a6f134c4c55e9b46
 MISC metadata.xml 331 BLAKE2B 542842b17662d8d11d0e8c9bf8e964a0bb220e9fd9b377a5d85ae41760a836cc66d5f4325fd79644878c7514d5d6487b4231417249bad174e294961404f64919 SHA512 cd2600dbf2b4aa2203c0d84f35ee501e48d3e14d16bd66a66c135dc57dab76b5abd9a9888e62babce118f9fb7c80752be6d4a72b0c7a040f844cf37735a537d9
diff --git a/dev-ros/cmake_modules/cmake_modules-0.4.2.ebuild b/dev-ros/cmake_modules/cmake_modules-0.4.2.ebuild
new file mode 100644
index 000000000000..a76cb730354e
--- /dev/null
+++ b/dev-ros/cmake_modules/cmake_modules-0.4.2.ebuild
@@ -0,0 +1,17 @@
+# 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/cmake_modules"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="CMake Modules which are not distributed with CMake but are commonly used by ROS packages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/cv_bridge/Manifest b/dev-ros/cv_bridge/Manifest
index bb2d0891d149..9eb6df69e8b0 100644
--- a/dev-ros/cv_bridge/Manifest
+++ b/dev-ros/cv_bridge/Manifest
@@ -1,10 +1,5 @@
-DIST vision_opencv-1.12.5.tar.gz 81739 BLAKE2B 5c135009f4e766b34c217b6de1dba836bf225b4cc7aca53b34c297f0c0986a79c3c629990464599da98fa32424a87467037caf3b51f3f6dcab2add615d613c08 SHA512 df3ad951262a692124eead5751f64c04fbf831486db8c000e23e2f0b10f645d830c38cf2d99d23b696b96cd0388c4d732ddda4e5d8e8b7cb88a3fd5909c62c71
-DIST vision_opencv-1.12.7.tar.gz 81877 BLAKE2B 216a82ec377e0bc3d85866da3ed3b9e8e90f7615bfbf0e3cacc30cd2bc2aeeb3f822d8daa1f0be42dab45dbdfc69c043a3a4c29b8357561356a2f874b3f61552 SHA512 e02f9450183e8e927d947d2382859ed01aaa5dc7a8f299e5a39815c53ee726b96781e961b1cf0f5cc3ac16699d162d4ed80678de4b6517e5139a5a8bd592e39c
-DIST vision_opencv-1.12.8.tar.gz 82043 BLAKE2B 9eb18ea9a4d3ddf6d2103ab3a2e53557349880ea665f8089d64319e8c99fb4ea922e8de1ab04fb749bed5c2503041d27d8e9b773d6142a5b5366aae937ca2514 SHA512 fadd84bb5e9586a5b04833100d9e1267ce8d153ca95a3257e1c3e6fe825dae524e25b2cc7deebb48d326cce8ef04523c5803eeecd88362cf6ff0384c52557608
+AUX boostpython.patch 551 BLAKE2B f3cecec73fbc584f324da2c1438ca42e283031fdf6df3f8ac458da9f09c3344716e9ca901de9f35edceaf6cc0223f66a1cef2e77ee3106f7b39b8ab96b204ade SHA512 9b306662ccef96aa9eee0b5c244de4919a9f8614502e1d75e63e787b4a0408ca6363c67b4b6eb897ffd8ca90df856444c357acee5f23074e33f7afd985686f7f
 DIST vision_opencv-1.13.0.tar.gz 82177 BLAKE2B 1c863f3c9e6b856d61a0e879f958f0f1fd184f088e208023a504cf5bb982c5496b71e1f2b4761e4456ca76348e51bc2bc760b2c43e1a35b02fa5c23c8e444502 SHA512 a20ec2f41a0c94dde51b19f902ae078cbf5449a2aadbeacbc49bbfc2ab52c39878e63448a3137591f7e1b2f6025baef616579463cf32274e7838157137d214bc
-EBUILD cv_bridge-1.12.5.ebuild 592 BLAKE2B e83e4897190d99593d5921ba55ba342511f8e5d3b7b4173892b3b763b01f6a68d4421d39c928519505982a6df17185973ec91685e3421a0f67ee8099b8c95999 SHA512 ae4b1d791d4ace3b583124c14a5499e0e0f45ad834e694c9c06f259ce28a4af95c43f567bd440139f043be7d80f9bcb4d19caaf56794228ec1e6e49b0b8cff62
-EBUILD cv_bridge-1.12.7.ebuild 592 BLAKE2B e83e4897190d99593d5921ba55ba342511f8e5d3b7b4173892b3b763b01f6a68d4421d39c928519505982a6df17185973ec91685e3421a0f67ee8099b8c95999 SHA512 ae4b1d791d4ace3b583124c14a5499e0e0f45ad834e694c9c06f259ce28a4af95c43f567bd440139f043be7d80f9bcb4d19caaf56794228ec1e6e49b0b8cff62
-EBUILD cv_bridge-1.12.8.ebuild 592 BLAKE2B 31b4abecd775ec2383eae038f2a27780a9b5dd1628f15223deb347426ec132ecc19b12077f44c782e7f93bd16977613bab442595c9cc7c6b3006120c863e0ffb SHA512 fcfa0f414ff530e0f0981a538b64e5a8a403aec5962f7b7d5127ff0e6aed93324e612650b46fb6632aaa9a59ce42641085221f04b5153c6a06b754310ec2618e
-EBUILD cv_bridge-1.13.0.ebuild 592 BLAKE2B 31b4abecd775ec2383eae038f2a27780a9b5dd1628f15223deb347426ec132ecc19b12077f44c782e7f93bd16977613bab442595c9cc7c6b3006120c863e0ffb SHA512 fcfa0f414ff530e0f0981a538b64e5a8a403aec5962f7b7d5127ff0e6aed93324e612650b46fb6632aaa9a59ce42641085221f04b5153c6a06b754310ec2618e
-EBUILD cv_bridge-9999.ebuild 592 BLAKE2B e83e4897190d99593d5921ba55ba342511f8e5d3b7b4173892b3b763b01f6a68d4421d39c928519505982a6df17185973ec91685e3421a0f67ee8099b8c95999 SHA512 ae4b1d791d4ace3b583124c14a5499e0e0f45ad834e694c9c06f259ce28a4af95c43f567bd440139f043be7d80f9bcb4d19caaf56794228ec1e6e49b0b8cff62
+EBUILD cv_bridge-1.13.0.ebuild 633 BLAKE2B 43e33f439c1fa4af188c7cadbfc36c16ebb4bf1594cd1b797fdb09dc1cc660b4773d1488ff189666dcd8d6a3cba4024f20b0a7b4ad82c4fa47c33c987b15196a SHA512 757803d5fa063ad1856bb9d758522b2a8908999187742f6a8fb3398204ab4c824d0da8e70b085c0e687e23ed49740ec2073e962c60f49e650ceacee2e44e1a25
+EBUILD cv_bridge-9999.ebuild 633 BLAKE2B 43e33f439c1fa4af188c7cadbfc36c16ebb4bf1594cd1b797fdb09dc1cc660b4773d1488ff189666dcd8d6a3cba4024f20b0a7b4ad82c4fa47c33c987b15196a SHA512 757803d5fa063ad1856bb9d758522b2a8908999187742f6a8fb3398204ab4c824d0da8e70b085c0e687e23ed49740ec2073e962c60f49e650ceacee2e44e1a25
 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/cv_bridge/cv_bridge-1.12.5.ebuild b/dev-ros/cv_bridge/cv_bridge-1.12.5.ebuild
deleted file mode 100644
index 091646aa633e..000000000000
--- a/dev-ros/cv_bridge/cv_bridge-1.12.5.ebuild
+++ /dev/null
@@ -1,23 +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-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS Image messages and OpenCV images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	>=media-libs/opencv-3:=[contrib(+)]
-	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cv_bridge/cv_bridge-1.12.7.ebuild b/dev-ros/cv_bridge/cv_bridge-1.12.7.ebuild
deleted file mode 100644
index 091646aa633e..000000000000
--- a/dev-ros/cv_bridge/cv_bridge-1.12.7.ebuild
+++ /dev/null
@@ -1,23 +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-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS Image messages and OpenCV images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	>=media-libs/opencv-3:=[contrib(+)]
-	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cv_bridge/cv_bridge-1.12.8.ebuild b/dev-ros/cv_bridge/cv_bridge-1.12.8.ebuild
deleted file mode 100644
index 781df6ff0219..000000000000
--- a/dev-ros/cv_bridge/cv_bridge-1.12.8.ebuild
+++ /dev/null
@@ -1,23 +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-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS Image messages and OpenCV images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	>=media-libs/opencv-3:=[contrib(+)]
-	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild b/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
index 781df6ff0219..422225d82b4f 100644
--- a/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-1.13.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
@@ -21,3 +21,4 @@ RDEPEND="
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boostpython.patch" )
diff --git a/dev-ros/cv_bridge/cv_bridge-9999.ebuild b/dev-ros/cv_bridge/cv_bridge-9999.ebuild
index 091646aa633e..422225d82b4f 100644
--- a/dev-ros/cv_bridge/cv_bridge-9999.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-9999.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
@@ -21,3 +21,4 @@ RDEPEND="
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boostpython.patch" )
diff --git a/dev-ros/cv_bridge/files/boostpython.patch b/dev-ros/cv_bridge/files/boostpython.patch
new file mode 100644
index 000000000000..72fac8087363
--- /dev/null
+++ b/dev-ros/cv_bridge/files/boostpython.patch
@@ -0,0 +1,17 @@
+Index: cv_bridge/CMakeLists.txt
+===================================================================
+--- cv_bridge.orig/CMakeLists.txt
++++ cv_bridge/CMakeLists.txt
+@@ -5,11 +5,7 @@ find_package(catkin REQUIRED COMPONENTS
+ 
+ if(NOT ANDROID)
+   find_package(PythonLibs)
+-  if(PYTHONLIBS_VERSION_STRING VERSION_LESS 3)
+-    find_package(Boost REQUIRED python)
+-  else()
+-    find_package(Boost REQUIRED python3)
+-  endif()
++  find_package(Boost REQUIRED python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+ else()
+ find_package(Boost REQUIRED)
+ endif()
diff --git a/dev-ros/fake_localization/Manifest b/dev-ros/fake_localization/Manifest
index 99e16c336ab6..754740aff10d 100644
--- a/dev-ros/fake_localization/Manifest
+++ b/dev-ros/fake_localization/Manifest
@@ -1,10 +1,5 @@
-DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
-DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
-DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
+AUX boost170.patch 378 BLAKE2B 9e9cf95eefc7232744cf165e88b0cd8f9ce6d20db95f375f54acc98c238563acb5a18edd267fe002ddf1341ea0951921e29f3954c2435058a5e4353037346813 SHA512 ca18f9ecb6e382385995dce25851636df9f1edd1b0951b650bb292202e94758a71c820f00947f4edc3c6065e09d828b7c88c325d8a239f425b5aca423157b95a
 DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
-EBUILD fake_localization-1.15.2.ebuild 720 BLAKE2B c908c0cd83c2103307dda8033ca003cc748f56a8a391f3285eac49be401d182d6eaed1f682379b861edca5b7be2c7f3d671bad838e9ac7c665f6ef7b658349cc SHA512 4bfe514a438cc5475255f4bb1a807d4a5325271b9c17536b17b3ee0f1cadd8d3090006ff6342fc049c908c97de470aeb44605f48986ea479902b071aab34a67c
-EBUILD fake_localization-1.16.0.ebuild 765 BLAKE2B 0e237ba1e5e9bdfe5e997ac17595c3d7606b937c91b2deffce7327dc8d5ac4d181e28a890ea8f6aa5dec540fe2880df4f5976ba09453df33f4ca2ec8d2b6c6a9 SHA512 aa8ec22b3120ff38e5f2d2f3a9429c1fe5d605c9fd6a9fca87f2bb3e024d66d63738d624e9ca72932521e89385a749c3bc0b6969894d950dc39e3202313027d4
-EBUILD fake_localization-1.16.1.ebuild 765 BLAKE2B 0e237ba1e5e9bdfe5e997ac17595c3d7606b937c91b2deffce7327dc8d5ac4d181e28a890ea8f6aa5dec540fe2880df4f5976ba09453df33f4ca2ec8d2b6c6a9 SHA512 aa8ec22b3120ff38e5f2d2f3a9429c1fe5d605c9fd6a9fca87f2bb3e024d66d63738d624e9ca72932521e89385a749c3bc0b6969894d950dc39e3202313027d4
-EBUILD fake_localization-1.16.2.ebuild 765 BLAKE2B 0e237ba1e5e9bdfe5e997ac17595c3d7606b937c91b2deffce7327dc8d5ac4d181e28a890ea8f6aa5dec540fe2880df4f5976ba09453df33f4ca2ec8d2b6c6a9 SHA512 aa8ec22b3120ff38e5f2d2f3a9429c1fe5d605c9fd6a9fca87f2bb3e024d66d63738d624e9ca72932521e89385a749c3bc0b6969894d950dc39e3202313027d4
+EBUILD fake_localization-1.16.2.ebuild 803 BLAKE2B e4a4f7e50b2dfedb16e3b6cf64b42f18ad0281e6316c32e301e75ca382b7fa8df4520ca8c4720ce9f5658fabfc489c7d69a3f300623f6fec3e9515a73897e096 SHA512 9c9d3f649d752f6ed4e05d1c50de2caf696d4053a006ac2737b2c2248222c210e0f259bc02c8bfd019d348d201f21d1a5662a94fa9665f040b4012544252e3c1
 EBUILD fake_localization-9999.ebuild 765 BLAKE2B 0e237ba1e5e9bdfe5e997ac17595c3d7606b937c91b2deffce7327dc8d5ac4d181e28a890ea8f6aa5dec540fe2880df4f5976ba09453df33f4ca2ec8d2b6c6a9 SHA512 aa8ec22b3120ff38e5f2d2f3a9429c1fe5d605c9fd6a9fca87f2bb3e024d66d63738d624e9ca72932521e89385a749c3bc0b6969894d950dc39e3202313027d4
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/fake_localization/fake_localization-1.15.2.ebuild b/dev-ros/fake_localization/fake_localization-1.15.2.ebuild
deleted file mode 100644
index 831e3177e5e2..000000000000
--- a/dev-ros/fake_localization/fake_localization-1.15.2.ebuild
+++ /dev/null
@@ -1,28 +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-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="A ROS node that simply forwards odometry information"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/angles
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/message_filters
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/fake_localization/fake_localization-1.16.0.ebuild b/dev-ros/fake_localization/fake_localization-1.16.0.ebuild
deleted file mode 100644
index 0c7895911491..000000000000
--- a/dev-ros/fake_localization/fake_localization-1.16.0.ebuild
+++ /dev/null
@@ -1,29 +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-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="A ROS node that simply forwards odometry information"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/angles
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/message_filters
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/fake_localization/fake_localization-1.16.1.ebuild b/dev-ros/fake_localization/fake_localization-1.16.1.ebuild
deleted file mode 100644
index 0c7895911491..000000000000
--- a/dev-ros/fake_localization/fake_localization-1.16.1.ebuild
+++ /dev/null
@@ -1,29 +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-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="A ROS node that simply forwards odometry information"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/angles
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/message_filters
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/fake_localization/fake_localization-1.16.2.ebuild b/dev-ros/fake_localization/fake_localization-1.16.2.ebuild
index 0c7895911491..946772aaddd8 100644
--- a/dev-ros/fake_localization/fake_localization-1.16.2.ebuild
+++ b/dev-ros/fake_localization/fake_localization-1.16.2.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
@@ -27,3 +27,4 @@ RDEPEND="
 	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/fake_localization/files/boost170.patch b/dev-ros/fake_localization/files/boost170.patch
new file mode 100644
index 000000000000..b7f877a82b4f
--- /dev/null
+++ b/dev-ros/fake_localization/files/boost170.patch
@@ -0,0 +1,13 @@
+Index: fake_localization/CMakeLists.txt
+===================================================================
+--- fake_localization.orig/CMakeLists.txt
++++ fake_localization/CMakeLists.txt
+@@ -14,7 +14,7 @@ find_package(catkin REQUIRED
+         )
+ 
+ 
+-find_package(Boost REQUIRED COMPONENTS signals)
++find_package(Boost REQUIRED COMPONENTS)
+ 
+ catkin_package(
+     CATKIN_DEPENDS
diff --git a/dev-ros/gazebo_dev/Manifest b/dev-ros/gazebo_dev/Manifest
index 8276b1760c22..e7dbb49be05c 100644
--- a/dev-ros/gazebo_dev/Manifest
+++ b/dev-ros/gazebo_dev/Manifest
@@ -1,8 +1,10 @@
 DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
 DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
 DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
+DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
 EBUILD gazebo_dev-2.7.3.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
 EBUILD gazebo_dev-2.7.4.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
 EBUILD gazebo_dev-2.8.4.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
+EBUILD gazebo_dev-2.8.5.ebuild 426 BLAKE2B f3a1c0411f63f023e771d8196cc2bdeade104317a27fa785a70f47909b6a0cb23df920f20452047a7c34fb2f265b2b20065ff09dfe9766d3c320f25e8b523055 SHA512 cc17d8c023011dcfe5a7af0876eea0164611220cac10c26ddd7ff8fcfc5fdbe06b068b9d178072293ca6eed7c4644a12f70c6cd749ef8f3727a2b86774e6769b
 EBUILD gazebo_dev-9999.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_dev/gazebo_dev-2.8.5.ebuild b/dev-ros/gazebo_dev/gazebo_dev-2.8.5.ebuild
new file mode 100644
index 000000000000..02ff0da21fb6
--- /dev/null
+++ b/dev-ros/gazebo_dev/gazebo_dev-2.8.5.ebuild
@@ -0,0 +1,19 @@
+# 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-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Provides a cmake config for the default version of Gazebo for the ROS distribution."
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	sci-electronics/gazebo
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_msgs/Manifest b/dev-ros/gazebo_msgs/Manifest
index 4e7487c262a1..9f7659803749 100644
--- a/dev-ros/gazebo_msgs/Manifest
+++ b/dev-ros/gazebo_msgs/Manifest
@@ -2,9 +2,11 @@ DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a312
 DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
 DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
 DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
+DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
 EBUILD gazebo_msgs-2.6.2.ebuild 575 BLAKE2B ec162aec234dc512a0e6a0c4e8f3504551858056636ab0990f0d29cf2fa7268202be4bf733f1ee2eb3a276c8427ad80958829ef2c16162c189072eaa231a2d79 SHA512 005e0f24abf8af454865f57af36dc11fabd7bfe818188f11be3dc4ecea4e64a5cfc7fe3dd6b510019e667d9ee198e01e16112c8bb0905d6004f46d66bbc1204a
 EBUILD gazebo_msgs-2.7.3.ebuild 575 BLAKE2B ec162aec234dc512a0e6a0c4e8f3504551858056636ab0990f0d29cf2fa7268202be4bf733f1ee2eb3a276c8427ad80958829ef2c16162c189072eaa231a2d79 SHA512 005e0f24abf8af454865f57af36dc11fabd7bfe818188f11be3dc4ecea4e64a5cfc7fe3dd6b510019e667d9ee198e01e16112c8bb0905d6004f46d66bbc1204a
 EBUILD gazebo_msgs-2.7.4.ebuild 575 BLAKE2B ec162aec234dc512a0e6a0c4e8f3504551858056636ab0990f0d29cf2fa7268202be4bf733f1ee2eb3a276c8427ad80958829ef2c16162c189072eaa231a2d79 SHA512 005e0f24abf8af454865f57af36dc11fabd7bfe818188f11be3dc4ecea4e64a5cfc7fe3dd6b510019e667d9ee198e01e16112c8bb0905d6004f46d66bbc1204a
 EBUILD gazebo_msgs-2.8.4.ebuild 575 BLAKE2B ec162aec234dc512a0e6a0c4e8f3504551858056636ab0990f0d29cf2fa7268202be4bf733f1ee2eb3a276c8427ad80958829ef2c16162c189072eaa231a2d79 SHA512 005e0f24abf8af454865f57af36dc11fabd7bfe818188f11be3dc4ecea4e64a5cfc7fe3dd6b510019e667d9ee198e01e16112c8bb0905d6004f46d66bbc1204a
+EBUILD gazebo_msgs-2.8.5.ebuild 575 BLAKE2B ec162aec234dc512a0e6a0c4e8f3504551858056636ab0990f0d29cf2fa7268202be4bf733f1ee2eb3a276c8427ad80958829ef2c16162c189072eaa231a2d79 SHA512 005e0f24abf8af454865f57af36dc11fabd7bfe818188f11be3dc4ecea4e64a5cfc7fe3dd6b510019e667d9ee198e01e16112c8bb0905d6004f46d66bbc1204a
 EBUILD gazebo_msgs-9999.ebuild 575 BLAKE2B ec162aec234dc512a0e6a0c4e8f3504551858056636ab0990f0d29cf2fa7268202be4bf733f1ee2eb3a276c8427ad80958829ef2c16162c189072eaa231a2d79 SHA512 005e0f24abf8af454865f57af36dc11fabd7bfe818188f11be3dc4ecea4e64a5cfc7fe3dd6b510019e667d9ee198e01e16112c8bb0905d6004f46d66bbc1204a
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_msgs/gazebo_msgs-2.8.5.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-2.8.5.ebuild
new file mode 100644
index 000000000000..41fc810e4a75
--- /dev/null
+++ b/dev-ros/gazebo_msgs/gazebo_msgs-2.8.5.ebuild
@@ -0,0 +1,20 @@
+# 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-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python{2_7,3_5} )
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/trajectory_msgs dev-ros/std_msgs dev-ros/std_srvs"
+
+inherit ros-catkin
+
+DESCRIPTION="Message and service data structures for interacting with Gazebo from ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_plugins/Manifest b/dev-ros/gazebo_plugins/Manifest
index 1a91d0a21d8e..5acbf46e7172 100644
--- a/dev-ros/gazebo_plugins/Manifest
+++ b/dev-ros/gazebo_plugins/Manifest
@@ -3,9 +3,11 @@ DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a312
 DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
 DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
 DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
+DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
 EBUILD gazebo_plugins-2.6.2.ebuild 1425 BLAKE2B 7346eacd043a18ec5f1394c05772a0a662f6461698c35955b8c0bee18bcba98ba213c1633e7c5647c6788df132c02b45bf1017d18a8b8211ffbbf036aa94ee8e SHA512 17b7572dd9e6e26f0eeffee09d301f6c25dfb9a40334f02047d2fabf3f2b6196a5a3e2e8ffdd6753c0f9d908ec9e4bc0a16455bae22de5f46aa335d15be41fd1
 EBUILD gazebo_plugins-2.7.3.ebuild 1698 BLAKE2B 97e8bb62518f3d7fca4e315971a4ebd4a44492ad7a951dc992e3a7b88227a6cecc7293db2fd760911bcd9388dd1644c5f155a5fda1a4d38626e1cf39d2115810 SHA512 e6b11eb60341523338b6c5ec182cd759f9b270c49ced0cb3c3693d254058a42462a5fb94a7eade95e2d920a2a66896921bf5ce6e040f4e3640274843e8e368a8
 EBUILD gazebo_plugins-2.7.4.ebuild 1445 BLAKE2B 1dc2fd6f9b5fb5496d396f8a39cb69a954bedba41c21285aa62baf7af5ba78203cac9949b739952e2b042bd7837172d3b11293d47ba31966d17ee5012096e5f1 SHA512 f663cc5db54307153ae6e7c7bdf9f9ebddbe3dfa852ed656abed8d51bd567394ee44698283d32377306f3a6adf0a55aefc53db249b8b452f62539a1b44135d09
 EBUILD gazebo_plugins-2.8.4.ebuild 1445 BLAKE2B 1dc2fd6f9b5fb5496d396f8a39cb69a954bedba41c21285aa62baf7af5ba78203cac9949b739952e2b042bd7837172d3b11293d47ba31966d17ee5012096e5f1 SHA512 f663cc5db54307153ae6e7c7bdf9f9ebddbe3dfa852ed656abed8d51bd567394ee44698283d32377306f3a6adf0a55aefc53db249b8b452f62539a1b44135d09
+EBUILD gazebo_plugins-2.8.5.ebuild 1445 BLAKE2B 1dc2fd6f9b5fb5496d396f8a39cb69a954bedba41c21285aa62baf7af5ba78203cac9949b739952e2b042bd7837172d3b11293d47ba31966d17ee5012096e5f1 SHA512 f663cc5db54307153ae6e7c7bdf9f9ebddbe3dfa852ed656abed8d51bd567394ee44698283d32377306f3a6adf0a55aefc53db249b8b452f62539a1b44135d09
 EBUILD gazebo_plugins-9999.ebuild 1445 BLAKE2B 1dc2fd6f9b5fb5496d396f8a39cb69a954bedba41c21285aa62baf7af5ba78203cac9949b739952e2b042bd7837172d3b11293d47ba31966d17ee5012096e5f1 SHA512 f663cc5db54307153ae6e7c7bdf9f9ebddbe3dfa852ed656abed8d51bd567394ee44698283d32377306f3a6adf0a55aefc53db249b8b452f62539a1b44135d09
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.8.5.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.8.5.ebuild
new file mode 100644
index 000000000000..af125170e28e
--- /dev/null
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-2.8.5.ebuild
@@ -0,0 +1,53 @@
+# 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-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python{2_7,3_5} )
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components"
+LICENSE="BSD Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/gazebo_dev
+	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/rospy
+	dev-ros/nodelet
+	dev-ros/angles
+	dev-ros/std_srvs
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/urdf
+	dev-ros/tf
+	dev-ros/tf2_ros
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/driver_base[${PYTHON_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/pcl_conversions
+	dev-ros/image_transport
+	dev-ros/rosconsole
+	dev-ros/cv_bridge
+	media-libs/opencv:=
+	dev-ros/polled_camera
+	dev-ros/diagnostic_updater
+	dev-ros/camera_info_manager
+	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/libxml2
+	>=sci-electronics/gazebo-7:=
+	dev-libs/protobuf:=
+	dev-games/ogre
+	sci-libs/pcl
+	dev-libs/boost:=
+	dev-ros/roslib[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/Manifest b/dev-ros/gazebo_ros/Manifest
index e4bc896893cb..830dffa46649 100644
--- a/dev-ros/gazebo_ros/Manifest
+++ b/dev-ros/gazebo_ros/Manifest
@@ -3,9 +3,11 @@ DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a312
 DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
 DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
 DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
+DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
 EBUILD gazebo_ros-2.6.2.ebuild 1009 BLAKE2B 356b118f6b7e0e2638a9b513ded0b9a9ef94a413b17ecaad22d73984ae88980be5e77390774e2ef43fd470c8af1e5e997399a8011f1bbca04b4186e0bc1105bb SHA512 61c285486cf13f06346311cd83bb04c4c9dc87963ec2927d658a8782a5a4b43fe7f54bf07127652f20ae9dde473f1234e3fd2fc84b691f665b9f6d95f978c132
 EBUILD gazebo_ros-2.7.3.ebuild 1282 BLAKE2B 2ad6a1a6e9a192a34ac8140b20ebc4787a31971d176e4ddd7f929746b1d694955e50b166f732908906ee1b5385dd51cbca746ee1ff4727e48948fca8c3ce0f37 SHA512 5d25298b56befcd572bd1939b075ed34a772410e10ebe73975a6e1f756e10bd090a2cd4776fa4bda21bd994ed1cce20155a1dae02bf8918e46259228ec3c43f8
 EBUILD gazebo_ros-2.7.4.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
 EBUILD gazebo_ros-2.8.4.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
+EBUILD gazebo_ros-2.8.5.ebuild 1026 BLAKE2B befc99333d36e2366eb794f9d2a820a310759ec9aa3e573d382f7fa7aac1e1499d8c1d7844e9343843ef66012a38e9a22781471e8c496758dce10360144f5961 SHA512 373e347c174d56497d381d3e0c6a76795caaeea32c083e878fd245b012b661c9385da8f51e19282f06ff7595fddf40ac0f573c491cc21ee1abf0611dfe1da35b
 EBUILD gazebo_ros-9999.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.8.5.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.8.5.ebuild
new file mode 100644
index 000000000000..107dee905b18
--- /dev/null
+++ b/dev-ros/gazebo_ros/gazebo_ros-2.8.5.ebuild
@@ -0,0 +1,36 @@
+# 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-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/gazebo_dev
+	dev-libs/tinyxml
+	sci-electronics/gazebo:=
+	dev-libs/protobuf:=
+	dev-ros/gazebo_plugins[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/tf[${PYTHON_USEDEP}]
+	dev-ros/dynamic_reconfigure
+	dev-libs/libxml2
+	dev-libs/boost:=[threads]
+	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros_control/Manifest b/dev-ros/gazebo_ros_control/Manifest
index 63b02abb7b5b..f416c5d73f18 100644
--- a/dev-ros/gazebo_ros_control/Manifest
+++ b/dev-ros/gazebo_ros_control/Manifest
@@ -4,9 +4,11 @@ DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a312
 DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
 DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
 DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
+DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
 EBUILD gazebo_ros_control-2.6.2-r1.ebuild 743 BLAKE2B 7398cf457863ad2296e87275ad1a5dca21c5742d48bc9713a11a0a16d3b24906913460380349161f809abf61843616b12a18eea9472169db97f258b6d490fa60 SHA512 f7cee8fa23e02e997dea2462c6d87bfdf12fe68c6e5cc812c81fa119389517b4ee0743f93201bc4f2845ac154ac802ee0118da00a96c075a9296cad87b10dda0
 EBUILD gazebo_ros_control-2.7.3.ebuild 975 BLAKE2B 6c89cd3e49119edcd893a7f764d359035a08774b429f3b458178614f60dd0db9488f2c68f35f85c24cc100cd4705403e8b99df0a8fab1ce49a9b31c8c98c23d4 SHA512 94554d46030657d71e14614c0f297ad9e7541ef08bb601a2e8578d7187e31186c997f8298626a07b28d8110c8017e0cc129b4c07ab8831cf14c1c8df774a4e60
 EBUILD gazebo_ros_control-2.7.4.ebuild 722 BLAKE2B edd1cd3d2d5bfdc2e5c3e73264f49c3447831dc44a2363a0bcd2c8afaa3daaa0878032f43186c4a911d35f5d78e43377fd9aff973d1c0b9a5b2bcceb692b609a SHA512 5528e932fad26207b866e59b6d577892ee1a95493727434450ce5e7a07f9432e5d5fc426e89f2a7598f0ac8a4f1ba39b5354355dc7cba13fff90fe2632cb9715
 EBUILD gazebo_ros_control-2.8.4.ebuild 722 BLAKE2B edd1cd3d2d5bfdc2e5c3e73264f49c3447831dc44a2363a0bcd2c8afaa3daaa0878032f43186c4a911d35f5d78e43377fd9aff973d1c0b9a5b2bcceb692b609a SHA512 5528e932fad26207b866e59b6d577892ee1a95493727434450ce5e7a07f9432e5d5fc426e89f2a7598f0ac8a4f1ba39b5354355dc7cba13fff90fe2632cb9715
+EBUILD gazebo_ros_control-2.8.5.ebuild 719 BLAKE2B 5ff337b05ffaf84f0ba0e11b1b681e7e31e86af8c3829916404b85c4516e2ac080f42ff38f6bc9e2e432bc19930059ea627a4d3fa6b2432f1553eb2b8093d10d SHA512 4598b1d44a404b4ece5d67379c85798bf8db7c9d2e0580a7afb73d35ccad375bb68b95a566fba1a2e7c721a449a62b84f2d51552c3eb76619ee8acdccf5caadc
 EBUILD gazebo_ros_control-9999.ebuild 722 BLAKE2B edd1cd3d2d5bfdc2e5c3e73264f49c3447831dc44a2363a0bcd2c8afaa3daaa0878032f43186c4a911d35f5d78e43377fd9aff973d1c0b9a5b2bcceb692b609a SHA512 5528e932fad26207b866e59b6d577892ee1a95493727434450ce5e7a07f9432e5d5fc426e89f2a7598f0ac8a4f1ba39b5354355dc7cba13fff90fe2632cb9715
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.5.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.5.ebuild
new file mode 100644
index 000000000000..c98bd84a588a
--- /dev/null
+++ b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.5.ebuild
@@ -0,0 +1,33 @@
+# 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-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS control plugins for gazebo"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/gazebo_dev
+	dev-ros/gazebo_ros
+	dev-ros/control_toolbox
+	dev-ros/controller_manager
+	dev-ros/hardware_interface
+	dev-ros/transmission_interface
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	>=dev-ros/joint_limits_interface-0.11.0
+	>=dev-ros/urdf-1.12.3-r1
+	dev-libs/urdfdom:=
+	sci-electronics/gazebo:=
+	dev-libs/boost:=[threads]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gencpp/Manifest b/dev-ros/gencpp/Manifest
index 75435af20e8b..e48dd3fddb0d 100644
--- a/dev-ros/gencpp/Manifest
+++ b/dev-ros/gencpp/Manifest
@@ -1,6 +1,6 @@
-DIST gencpp-0.5.5.tar.gz 8601 BLAKE2B c048ce73f41d8b9ef3111bcb00b9a8776f4b1498bf4828e48ec45994c4f0fecfc75318fcfbfddd18b492d7b597e62e69fd497de63b6cc1417a107e11ecf38e83 SHA512 6440747ba98b23ed515db6d7b6760a98dcb3f832f87c0a8d3797b47c48e51cb01e2c62837ff5a84a2f8aeff16764493093170d83639602e3d82de846e95f9f8a
 DIST gencpp-0.6.0.tar.gz 9164 BLAKE2B 97b7e3904cde95ca6304e498d5f338cf303a55c407c187994b3dcb2bb062bd6dc1b4a2ab6f0cc949bfc6c481199586abef115fe54b4b99e99bc99dac8ae261cf SHA512 0ef0ae3d5f93ab5693455eb5319a0b8fbaab4ee56bd890e0ef96bfbdf8959affe61551f30739bab7e945c213c9b2fb51ff5e89c5b3a40d945da23e1ba88b9c1e
-EBUILD gencpp-0.5.5.ebuild 458 BLAKE2B dc930cb726120fd10a24c028d885025a5367b16dcd6360b26868514dbf62ea8c8c9dda2f9c1e3e2db607d15d3c65add1604e55298643ab1061b3e411154185a9 SHA512 9ccbae064bb90ca6cec89c521677a1b15bcee7bf7b48570af39cdb048cbaf4d8f9f86676d8eac3bf0c2ce8c8b84735ed88e6b41681302c70334f058db3fbc768
+DIST gencpp-0.6.2.tar.gz 9407 BLAKE2B 7676b9f22961d09684faa44f39ca3ac02196d6679f636019ab4cb4624297d3ebb16f301f53532954aec74c25e267924a5facfff6c8d0bffee02d88d665927359 SHA512 3f076369069940f2261f4bfd9b5c644709bf58c951ee309bb33ed689fe83cb331b63a5986826540b8df6fa04ace3b1b8520fbfe85856afb5bafd52ebc4459a87
 EBUILD gencpp-0.6.0.ebuild 458 BLAKE2B dc930cb726120fd10a24c028d885025a5367b16dcd6360b26868514dbf62ea8c8c9dda2f9c1e3e2db607d15d3c65add1604e55298643ab1061b3e411154185a9 SHA512 9ccbae064bb90ca6cec89c521677a1b15bcee7bf7b48570af39cdb048cbaf4d8f9f86676d8eac3bf0c2ce8c8b84735ed88e6b41681302c70334f058db3fbc768
+EBUILD gencpp-0.6.2.ebuild 458 BLAKE2B dc930cb726120fd10a24c028d885025a5367b16dcd6360b26868514dbf62ea8c8c9dda2f9c1e3e2db607d15d3c65add1604e55298643ab1061b3e411154185a9 SHA512 9ccbae064bb90ca6cec89c521677a1b15bcee7bf7b48570af39cdb048cbaf4d8f9f86676d8eac3bf0c2ce8c8b84735ed88e6b41681302c70334f058db3fbc768
 EBUILD gencpp-9999.ebuild 458 BLAKE2B dc930cb726120fd10a24c028d885025a5367b16dcd6360b26868514dbf62ea8c8c9dda2f9c1e3e2db607d15d3c65add1604e55298643ab1061b3e411154185a9 SHA512 9ccbae064bb90ca6cec89c521677a1b15bcee7bf7b48570af39cdb048cbaf4d8f9f86676d8eac3bf0c2ce8c8b84735ed88e6b41681302c70334f058db3fbc768
 MISC metadata.xml 324 BLAKE2B acb13fb86def5c4a53edd5c0db5d4c65d73e99f6d18a2fa1509981878637f006f9b14c5cd40e56b886b73c4ac8ec957844da3e424bb515248c07298388eb23c4 SHA512 031c6670cbdd1abdf53174d877a08985012d75ffa1fb16415501d128ac519567f6b9ae3c786a878aba25481c4413ebbcbc34d3782bf1d85cc6976caccd1aaaac
diff --git a/dev-ros/gencpp/gencpp-0.5.5.ebuild b/dev-ros/gencpp/gencpp-0.6.2.ebuild
index 7da44afd03eb..7da44afd03eb 100644
--- a/dev-ros/gencpp/gencpp-0.5.5.ebuild
+++ b/dev-ros/gencpp/gencpp-0.6.2.ebuild
diff --git a/dev-ros/genlisp/Manifest b/dev-ros/genlisp/Manifest
index 105310f15999..9238626966d6 100644
--- a/dev-ros/genlisp/Manifest
+++ b/dev-ros/genlisp/Manifest
@@ -1,4 +1,6 @@
 DIST genlisp-0.4.16.tar.gz 10059 BLAKE2B c6833f5af7b9da0405ed8b83a22e3f1bc584c0353485cabf3317ed82b4cca64dae0014febc9ae09a6532f869f35f9ba15c6008bd8f160eaba19e35cf90738630 SHA512 1cf180a337716f704d0e152a77049349aee9935273592b83aca64f3a9f926ed8775669114744ebf265dd09e70cf24af24e5c3e12a7bb3e7ecd90dc86f3cca3a6
+DIST genlisp-0.4.17.tar.gz 10154 BLAKE2B b16ccb9a5ad0e43906736786001b26e1de4548e40dfbf3bd24c4f2e6e1fcfb180a6dc7851f5a2c47d51dd247cc804f7cf7e3c023e88a2f442958c9ff59547ec4 SHA512 a86f4f921ff6e51323e1bf0e2ea5ada5dba106f6197b52ece4bbfe876951aead19ff9142395968bcccc06d83047232ecdad42f7ed9f380cf0f0a63e8717577dd
 EBUILD genlisp-0.4.16.ebuild 412 BLAKE2B ddfb4fbe952db9ab12e4851be24396359a42f0350223b79ddac0119b5071263b6ce44499c6343cae56657601018cd8efa3acb9802721abda6e96d6a2dda6530d SHA512 f8d78d7358929aad7c555e648dc19f74b78b2dc273343b676fcb6a3844005bd219bde48ab20b34cd13e3f1b10f7d61e44d5cf40629fdab31722e96d2e54d9f54
+EBUILD genlisp-0.4.17.ebuild 412 BLAKE2B ddfb4fbe952db9ab12e4851be24396359a42f0350223b79ddac0119b5071263b6ce44499c6343cae56657601018cd8efa3acb9802721abda6e96d6a2dda6530d SHA512 f8d78d7358929aad7c555e648dc19f74b78b2dc273343b676fcb6a3844005bd219bde48ab20b34cd13e3f1b10f7d61e44d5cf40629fdab31722e96d2e54d9f54
 EBUILD genlisp-9999.ebuild 412 BLAKE2B ddfb4fbe952db9ab12e4851be24396359a42f0350223b79ddac0119b5071263b6ce44499c6343cae56657601018cd8efa3acb9802721abda6e96d6a2dda6530d SHA512 f8d78d7358929aad7c555e648dc19f74b78b2dc273343b676fcb6a3844005bd219bde48ab20b34cd13e3f1b10f7d61e44d5cf40629fdab31722e96d2e54d9f54
 MISC metadata.xml 325 BLAKE2B 0aaea5b7b4f0c686a5c27a7551d9b33da2fee26858b13837bc30810b880a0b70850b7f85d6cdaa7b60975cc66087f4a0370d417ef1879659737530617696b5dc SHA512 f1bda8492546d5a2cecaed684a06df6d41b1b1883cf1dba70dd51f88993a5466924394468d750fc5778bd1530b660e12c0d1e186f30530e5919c9a46a9382159
diff --git a/dev-ros/genlisp/genlisp-0.4.17.ebuild b/dev-ros/genlisp/genlisp-0.4.17.ebuild
new file mode 100644
index 000000000000..1c014b8cd52c
--- /dev/null
+++ b/dev-ros/genlisp/genlisp-0.4.17.ebuild
@@ -0,0 +1,18 @@
+# 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/genlisp"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+
+inherit ros-catkin
+
+DESCRIPTION="Common-Lisp ROS message and service generators"
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+
+RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/genmsg/Manifest b/dev-ros/genmsg/Manifest
index 2077526f8a1c..fccab3c1eb8c 100644
--- a/dev-ros/genmsg/Manifest
+++ b/dev-ros/genmsg/Manifest
@@ -1,8 +1,6 @@
-DIST genmsg-0.5.10.tar.gz 59468 BLAKE2B 2cb70a60dc9281c8999fd88615845bec840ba0d46b00e170fb56e152234c5762058a5a1b2f87fea67d596eadb330627bcfeb8554124894bfb1155654dadb7357 SHA512 8effbada30bc3c48526ef162ef11d0d14c8bba5688d26089cb934a0e9a069233a724608862188caa86d1a4dc8e773d4e93fce5d88239acf0af525f6821d01268
 DIST genmsg-0.5.11.tar.gz 59507 BLAKE2B 080661242a9b6e71d2a098236bce380230c54b5017b2e3b4753fe79a0269fac8ecbd4a36f83710a7d499638bf7289203bea63e0f1215d008a2813a619e70935b SHA512 81ec559e1682aef3ca58c18fa33ce4b6a8d6d835be9831bc1b0401ed440b68f7e021a5a6ebfc17a9cb3b95a3c8434542724f5222f3730793c08a87762ff0c45b
-DIST genmsg-0.5.9.tar.gz 59409 BLAKE2B e3d4ac69bbc665aa62ef9fb7b35cc9b47280690eb743f50e5fe5acaf96a0fda363d594878b1f3584f5d96952dbe9c64428e5e4aeb1f0432c591d03d9ce16cd89 SHA512 ac62c8d08da449890c6eb53264153e01237cd50b97d4d4123e334c59a9a1ef73ce70c4d3d7c95f91ea872ea06b30fa72bf8a3a177309493b33984b8d21e36939
-EBUILD genmsg-0.5.10.ebuild 463 BLAKE2B f5f2c1d769f56c46bdbc8c8f2c35d3c5336813b913d2e5ebcf22f5f1f6f59818a641afe3d3eea9f4b4f477cfe45479f402c59c8de8fc90e92d681e5262874887 SHA512 4028a15840348c1c377ab017b790a5f75c94f676a00d173dfd449221adc0fdb9a2e2166d85b2cd098474efdd049c5367371ecc657e47c989abda6e379d6d27d5
+DIST genmsg-0.5.12.tar.gz 59591 BLAKE2B ca1275994a71be82054f9c3d980fc4b56b03576fb26236a5a0bf45443a5a9eb0cc078cf082004b01f893e2b5e8ffb4c0a7a285596346ee6c79a3ae084219b5c6 SHA512 e87762904eaacf37011a57c3ba0f78e96a7f8048f2222e5831774b7726e8600e0264c6d48d1e3cbb0b0d8671fccc045555c13146931dfbb16fdf193ce9b056be
 EBUILD genmsg-0.5.11.ebuild 463 BLAKE2B f5f2c1d769f56c46bdbc8c8f2c35d3c5336813b913d2e5ebcf22f5f1f6f59818a641afe3d3eea9f4b4f477cfe45479f402c59c8de8fc90e92d681e5262874887 SHA512 4028a15840348c1c377ab017b790a5f75c94f676a00d173dfd449221adc0fdb9a2e2166d85b2cd098474efdd049c5367371ecc657e47c989abda6e379d6d27d5
-EBUILD genmsg-0.5.9.ebuild 463 BLAKE2B f5f2c1d769f56c46bdbc8c8f2c35d3c5336813b913d2e5ebcf22f5f1f6f59818a641afe3d3eea9f4b4f477cfe45479f402c59c8de8fc90e92d681e5262874887 SHA512 4028a15840348c1c377ab017b790a5f75c94f676a00d173dfd449221adc0fdb9a2e2166d85b2cd098474efdd049c5367371ecc657e47c989abda6e379d6d27d5
+EBUILD genmsg-0.5.12.ebuild 463 BLAKE2B f5f2c1d769f56c46bdbc8c8f2c35d3c5336813b913d2e5ebcf22f5f1f6f59818a641afe3d3eea9f4b4f477cfe45479f402c59c8de8fc90e92d681e5262874887 SHA512 4028a15840348c1c377ab017b790a5f75c94f676a00d173dfd449221adc0fdb9a2e2166d85b2cd098474efdd049c5367371ecc657e47c989abda6e379d6d27d5
 EBUILD genmsg-9999.ebuild 463 BLAKE2B f5f2c1d769f56c46bdbc8c8f2c35d3c5336813b913d2e5ebcf22f5f1f6f59818a641afe3d3eea9f4b4f477cfe45479f402c59c8de8fc90e92d681e5262874887 SHA512 4028a15840348c1c377ab017b790a5f75c94f676a00d173dfd449221adc0fdb9a2e2166d85b2cd098474efdd049c5367371ecc657e47c989abda6e379d6d27d5
 MISC metadata.xml 324 BLAKE2B 4e885cafaf86dab897c52a6e27092584252b7daff9d9597c0bfd45b148b91ec763c3e46abbeb3db64fb5d17fc2d1ff83cf252201c165a3b52bc5e4d4033abcc6 SHA512 be0ee3a5595270480a29bf98888215b692009bdfaf06591c3cd56196b1c437e847abac787d4304f0166e76525b5ca7d82d81f660f1309a5139081bd205d95939
diff --git a/dev-ros/genmsg/genmsg-0.5.10.ebuild b/dev-ros/genmsg/genmsg-0.5.12.ebuild
index b4480e2c242a..b4480e2c242a 100644
--- a/dev-ros/genmsg/genmsg-0.5.10.ebuild
+++ b/dev-ros/genmsg/genmsg-0.5.12.ebuild
diff --git a/dev-ros/genmsg/genmsg-0.5.9.ebuild b/dev-ros/genmsg/genmsg-0.5.9.ebuild
deleted file mode 100644
index b4480e2c242a..000000000000
--- a/dev-ros/genmsg/genmsg-0.5.9.ebuild
+++ /dev/null
@@ -1,19 +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/genmsg"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin
-
-DESCRIPTION="Python library for generating ROS message and service data structures for various languages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/genpy/Manifest b/dev-ros/genpy/Manifest
index 7001241e4524..401798602fe6 100644
--- a/dev-ros/genpy/Manifest
+++ b/dev-ros/genpy/Manifest
@@ -1,4 +1,6 @@
 DIST genpy-0.6.7.tar.gz 52001 BLAKE2B 6c2a6cbbac6b0c72b1d5bec160f2f06ac86852afa2664835a4223e5adc5df6ae13a3a506d1c684f39f1066094f437fc54e4deb927c9e58209231af599b70af77 SHA512 645db3b343d53a640c6cbae91ec178bb99249899632b88f54831a524c2c3d76a68c8e45e2820b536509eb3d84a37735f9a3cd04f46522a98748a38534cc9d6b8
+DIST genpy-0.6.8.tar.gz 52344 BLAKE2B 1b58011126d577c7c16c0b37940d491f18e9a1013296b873dfa6e53697c2b6a3e7a829b760e591b3fa502a5fd53461256547212483cd13e27f476e0a16e8121a SHA512 5de1bea04a08c4fa72ae369d56c0f4b6a0106f7317490bc9c9c65c4506028f4aa44cb149d85d270c85c72ce5847db9110e7d48a1a4331a7d588222647f3dfc5f
 EBUILD genpy-0.6.7.ebuild 529 BLAKE2B 909649e8b561b751f4cbd7c7a8bffa7a6d80f6ea582485287b7bfdb275b8f57686d3f4e0fb182b2782a43e07fca7ebbab1e40d11c1df0486543178bf553b63c5 SHA512 577bd8eba4224de58d9ced4e0e5838a1fe2e99b93c556601ea457ad61e4f3f0dd8d4c888042bd6ab373ea6d0adc28d390ae685a4966a72c5135f0c8c5b81569d
+EBUILD genpy-0.6.8.ebuild 529 BLAKE2B 909649e8b561b751f4cbd7c7a8bffa7a6d80f6ea582485287b7bfdb275b8f57686d3f4e0fb182b2782a43e07fca7ebbab1e40d11c1df0486543178bf553b63c5 SHA512 577bd8eba4224de58d9ced4e0e5838a1fe2e99b93c556601ea457ad61e4f3f0dd8d4c888042bd6ab373ea6d0adc28d390ae685a4966a72c5135f0c8c5b81569d
 EBUILD genpy-9999.ebuild 529 BLAKE2B 909649e8b561b751f4cbd7c7a8bffa7a6d80f6ea582485287b7bfdb275b8f57686d3f4e0fb182b2782a43e07fca7ebbab1e40d11c1df0486543178bf553b63c5 SHA512 577bd8eba4224de58d9ced4e0e5838a1fe2e99b93c556601ea457ad61e4f3f0dd8d4c888042bd6ab373ea6d0adc28d390ae685a4966a72c5135f0c8c5b81569d
 MISC metadata.xml 323 BLAKE2B 025145a67d18622d14ea6ac43585246aac2cdc4f65e63b04dbfd32aa6f04f4e301e22f2e326a486e2fad3c1ef82f9890179a8dc142f4aa551b5b9db155e616da SHA512 523ec83e710fb0b80d731b536c8605a4211bfa176951a1af5ee6f6e60fee1ca3634c0d659b2d3ae71f3bb9d3765cc44cfdada5c7a364cea63f323c462227f364
diff --git a/dev-ros/genpy/genpy-0.6.8.ebuild b/dev-ros/genpy/genpy-0.6.8.ebuild
new file mode 100644
index 000000000000..e4a330326fa0
--- /dev/null
+++ b/dev-ros/genpy/genpy-0.6.8.ebuild
@@ -0,0 +1,24 @@
+# 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/genpy"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+
+inherit ros-catkin
+
+DESCRIPTION="Python ROS message and service generators"
+HOMEPAGE="http://wiki.ros.org/genpy"
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+
+RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
diff --git a/dev-ros/gmapping/Manifest b/dev-ros/gmapping/Manifest
index 8f539baa8058..da87d350f1d1 100644
--- a/dev-ros/gmapping/Manifest
+++ b/dev-ros/gmapping/Manifest
@@ -1,4 +1,7 @@
+AUX boost170.patch 428 BLAKE2B 047a099ab5a36f3f603ecc10b5cf1e0edb25c880bf1ade298dfcfef7864bb9c445f2f0902299857003d8e32dcf7612ad149a70364fb6fa64fa86b84b620b346b SHA512 e9a2bb68993387b4ac6268d15151a4feedf1c6f73c84ee927590220edc1b826e18355fa3553d3605ca1afabd5b7b74b7e8c242797965b17fa9aa7449b406c493
 DIST slam_gmapping-1.3.10.tar.gz 21032 BLAKE2B cca0779e64d45622dad4ec29cb3c1d0162176038288c0aa7b117f1a76a7655f3af3024dba7ff1025948e400e0176794a553e357a235187d9196161a635ab6d01 SHA512 fa4485ddc9fcfaac63a63d209a5a994e33e78546a39edcf47eb3c3f1775f0d87a1f562319058868838990bbf85a9515ff0228779dce7531148f208b3522e7e7a
+DIST slam_gmapping-1.4.0.tar.gz 21123 BLAKE2B 088d1bfaa69bf98eb2b2176afbfadf843f5f478f9c54dc7eb32fa91116da31bab66f9a1ac09d0535629cc5a7f604d153c90c5a25f173fb867369aa9e33d4d7b2 SHA512 ae7984716113e24e1bced88523729481829303a2b88d247b8fc8bdd23c0f38b4ce6260d7086d79a6653ecfdbe8ba60ae011af20180ffcb5025cd9d347d3e76b1
 EBUILD gmapping-1.3.10.ebuild 546 BLAKE2B 9a6c5e78a43ba77c86dd2a1640ef56bcd2f481a830c3333ab4b87f84f4c761c8728e811e5e314b5eed9809e987fd2b8a0a72aaf58b62f6c4dea561d2101682ad SHA512 41823e5fad9201ca764d2a22af8de2c88b19e449f8d2fec8682a5d21381e35f29a17b729d3b5cc5faacd50057fe5e69b110f7756b414b859528656bea3a963b8
-EBUILD gmapping-9999.ebuild 546 BLAKE2B 9a6c5e78a43ba77c86dd2a1640ef56bcd2f481a830c3333ab4b87f84f4c761c8728e811e5e314b5eed9809e987fd2b8a0a72aaf58b62f6c4dea561d2101682ad SHA512 41823e5fad9201ca764d2a22af8de2c88b19e449f8d2fec8682a5d21381e35f29a17b729d3b5cc5faacd50057fe5e69b110f7756b414b859528656bea3a963b8
+EBUILD gmapping-1.4.0.ebuild 572 BLAKE2B d57a0f72d1343457fef74a3da8cd76103526209a99a2ab4ebcf815672ed387aa4d6504068f3da6d3441e6e51147565a0c200ab9ba109e54d6b77a3bd0d86f260 SHA512 b64efeb32bc2b14c13a3e898358a8ed7094e1d7bbc201333ac850794583a4c309ddaa61229fc2d99f67a4b8e55879ab0ec256e82b4223f9fcf8fc2dd389abe8a
+EBUILD gmapping-9999.ebuild 531 BLAKE2B 3674f6396da0e8f9dc6b0bbb16e5d627678b02a03807775f54fc7f26910cfe918b00445b780918b74ade87a304543b632c08580cc205aba1e5ab5bceb0b3f260 SHA512 019a01e8efeb054beaa804025619988c5b42ea220621c27b57deb0da4069aa3a964f10f897aa255bf09ffb7be07a3177d305bd7e747c0ec769769ddabc7d475c
 MISC metadata.xml 342 BLAKE2B 72a1fe4f1e7971418dbb3f5b1e78de71a77819b9fa7200feb2ce0abec5b50a5435c5e5541d290bfd23c7acee5a6920280934067c84e4716bd9f6bb0cc634544d SHA512 2a5beef664e8c79b9e4d858d0dc093068c6e462456ae6066ea637f4b725e5c7184dd65769906c34e55eb6b03949e957edba34b84a587e1daec784e1f74ea287c
diff --git a/dev-ros/gmapping/files/boost170.patch b/dev-ros/gmapping/files/boost170.patch
new file mode 100644
index 000000000000..e3a599471991
--- /dev/null
+++ b/dev-ros/gmapping/files/boost170.patch
@@ -0,0 +1,13 @@
+Index: gmapping/CMakeLists.txt
+===================================================================
+--- gmapping.orig/CMakeLists.txt
++++ gmapping/CMakeLists.txt
+@@ -3,7 +3,7 @@ project(gmapping)
+ 
+ find_package(catkin REQUIRED nav_msgs nodelet openslam_gmapping roscpp tf rosbag_storage)
+ 
+-find_package(Boost REQUIRED signals)
++find_package(Boost REQUIRED)
+ 
+ include_directories(${Boost_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
+ 
diff --git a/dev-ros/gmapping/gmapping-1.4.0.ebuild b/dev-ros/gmapping/gmapping-1.4.0.ebuild
new file mode 100644
index 000000000000..aaad570edc05
--- /dev/null
+++ b/dev-ros/gmapping/gmapping-1.4.0.ebuild
@@ -0,0 +1,27 @@
+# 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-perception/slam_gmapping"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS wrapper for OpenSlam's Gmapping"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/openslam_gmapping
+	dev-ros/rosbag_storage
+	dev-ros/gmapping
+"
+DEPEND="${RDEPEND}
+	dev-ros/rostest"
+PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/gmapping/gmapping-9999.ebuild b/dev-ros/gmapping/gmapping-9999.ebuild
index ca6f43afe50c..307f03f929b1 100644
--- a/dev-ros/gmapping/gmapping-9999.ebuild
+++ b/dev-ros/gmapping/gmapping-9999.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
@@ -9,7 +9,7 @@ ROS_SUBDIR=${PN}
 inherit ros-catkin
 
 DESCRIPTION="ROS wrapper for OpenSlam's Gmapping"
-LICENSE="CC-BY-NC-SA-2.5"
+LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ros/hardware_interface/Manifest b/dev-ros/hardware_interface/Manifest
index 3fdf719f2c37..b776cfe91324 100644
--- a/dev-ros/hardware_interface/Manifest
+++ b/dev-ros/hardware_interface/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
 DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD hardware_interface-0.14.2.ebuild 376 BLAKE2B 18e8430dde17dbc3210d2f2ab48b7eabf3a99759bf8188987eb3fe940f74c6f750469d5d44fa0f48c2322ac3cd098a970ddf055e462ffa412ea6b775961bbbcc SHA512 afdcab1d054715913d893114e875cbda28d221a223071fd07e51c203dfe7a7530ef51aa21262868e4c3f4c9cb5da19f416799a9587885ebe063280fd4626a67f
-EBUILD hardware_interface-0.15.0.ebuild 376 BLAKE2B 18e8430dde17dbc3210d2f2ab48b7eabf3a99759bf8188987eb3fe940f74c6f750469d5d44fa0f48c2322ac3cd098a970ddf055e462ffa412ea6b775961bbbcc SHA512 afdcab1d054715913d893114e875cbda28d221a223071fd07e51c203dfe7a7530ef51aa21262868e4c3f4c9cb5da19f416799a9587885ebe063280fd4626a67f
-EBUILD hardware_interface-0.15.1.ebuild 373 BLAKE2B c4797e08466c4708cfea0d9c81a1c39d50cb144f1d82f042ee32fd7358aa2d0997ea2560057c518fbfeb9e18f6308ff4b4b4f945b65055bf6fd8afa422e4162d SHA512 4d683b44c185383dd1aa364d3fb8385af95fb419a79117137f7496b0f3b53c064708041801aed5a4b90ac4196794b038586d647e0d3c0457af0005272232c6a9
-EBUILD hardware_interface-9999.ebuild 376 BLAKE2B 401acb59d859e1d03c60ba7d0772aeb714aac13bdf14b78b833c1ea09aa4e71cab66f89db6476f95749dd19482837de44fcb0f7902d7e237ee2c1a425c42b152 SHA512 c3b42b40faeaf538720e8b3075217a3e251d14e72f8f19895b3a7d47bf1f1ef06d69be1d73586126fa637fbad2b8dfe33aefe28cebaf38074983a3e9de853a6d
+EBUILD hardware_interface-0.15.1.ebuild 389 BLAKE2B ea9053d0704382f430d5f292b6e85bfbca99f4195300bfe08c2367533c79115207af69b881110c13ecd8c01f1bcef9c4d3bf77eb81b77c322ab610488c38db23 SHA512 e1435146e9df259f3d9442a6cd429a685f422a3f854e07a32e6f0092a7e368b04d3cd47286ef70fc869d0ab24d13b8b6e52f953b119e85027337629f831547bf
+EBUILD hardware_interface-9999.ebuild 389 BLAKE2B ea9053d0704382f430d5f292b6e85bfbca99f4195300bfe08c2367533c79115207af69b881110c13ecd8c01f1bcef9c4d3bf77eb81b77c322ab610488c38db23 SHA512 e1435146e9df259f3d9442a6cd429a685f422a3f854e07a32e6f0092a7e368b04d3cd47286ef70fc869d0ab24d13b8b6e52f953b119e85027337629f831547bf
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/hardware_interface/hardware_interface-0.14.2.ebuild b/dev-ros/hardware_interface/hardware_interface-0.14.2.ebuild
deleted file mode 100644
index eaae5e2ef40b..000000000000
--- a/dev-ros/hardware_interface/hardware_interface-0.14.2.ebuild
+++ /dev/null
@@ -1,18 +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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Hardware Interface base class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roscpp"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/hardware_interface/hardware_interface-0.15.0.ebuild b/dev-ros/hardware_interface/hardware_interface-0.15.0.ebuild
deleted file mode 100644
index eaae5e2ef40b..000000000000
--- a/dev-ros/hardware_interface/hardware_interface-0.15.0.ebuild
+++ /dev/null
@@ -1,18 +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-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Hardware Interface base class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roscpp"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/hardware_interface/hardware_interface-0.15.1.ebuild b/dev-ros/hardware_interface/hardware_interface-0.15.1.ebuild
index 474b9e3bcba2..a2893f32df40 100644
--- a/dev-ros/hardware_interface/hardware_interface-0.15.1.ebuild
+++ b/dev-ros/hardware_interface/hardware_interface-0.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,4 +15,4 @@ IUSE=""
 
 RDEPEND="dev-ros/roscpp"
 DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
+	test? ( dev-cpp/gtest dev-ros/rostest )"
diff --git a/dev-ros/hardware_interface/hardware_interface-9999.ebuild b/dev-ros/hardware_interface/hardware_interface-9999.ebuild
index b9af97a138ee..a2893f32df40 100644
--- a/dev-ros/hardware_interface/hardware_interface-9999.ebuild
+++ b/dev-ros/hardware_interface/hardware_interface-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,4 +15,4 @@ IUSE=""
 
 RDEPEND="dev-ros/roscpp"
 DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
+	test? ( dev-cpp/gtest dev-ros/rostest )"
diff --git a/dev-ros/hector_mapping/Manifest b/dev-ros/hector_mapping/Manifest
index 1e07aafc1c17..2992de9716ee 100644
--- a/dev-ros/hector_mapping/Manifest
+++ b/dev-ros/hector_mapping/Manifest
@@ -1,4 +1,5 @@
+AUX boost170.patch 631 BLAKE2B 9b1d25a62617b44e6a6f81b4f281ff9331051b242698cc9ae4864237b5a7d18e77298a7f00927a1215982dbec91bb9279878cd5805233d16b9f94caab1db4ab5 SHA512 f61c0def48c65577eace4e2c4bf49b5540f74beb1f54e34f4f75df82325cf0446928e664ce3256205591bac877ae65b371348948e6eea4013a3627b83e97bcdd
 DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-EBUILD hector_mapping-0.3.5.ebuild 708 BLAKE2B 208fb91376f6c91beccbe330dfa28112f5017bf83f7ac5c39231bbf85e5a26430fa72e32608bcfb3bc14e81ef77f4ffeb9498d13da55f44a2c80729009250f87 SHA512 d5ce8cb9c597f1e0848423d6f3dfff16bf1a093bdfe06757d69bea9186cfbc21de60fad3cb814e8ec52045d7b02097e745a7c81626a43aaf8eaa3e77a0be0ed2
+EBUILD hector_mapping-0.3.5.ebuild 749 BLAKE2B f65010124e6564265f95eb3a54ebacd4ef2e684f05c3c87fb30fd7ad07fa9968c4d93864065da116be990c1ba1878cf7d23cb1f6d6b63a303cbecf7c522f4bb4 SHA512 018c0e845e93f747e4928105344ba8f05e47fe713a26b40eabe6e44049acd5da2dfba18edd01816f3545137e41f47c69bbe4312632da9e536db74ea2d2fe6b6c
 EBUILD hector_mapping-9999.ebuild 708 BLAKE2B 208fb91376f6c91beccbe330dfa28112f5017bf83f7ac5c39231bbf85e5a26430fa72e32608bcfb3bc14e81ef77f4ffeb9498d13da55f44a2c80729009250f87 SHA512 d5ce8cb9c597f1e0848423d6f3dfff16bf1a093bdfe06757d69bea9186cfbc21de60fad3cb814e8ec52045d7b02097e745a7c81626a43aaf8eaa3e77a0be0ed2
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_mapping/files/boost170.patch b/dev-ros/hector_mapping/files/boost170.patch
new file mode 100644
index 000000000000..89bc05d2f7da
--- /dev/null
+++ b/dev-ros/hector_mapping/files/boost170.patch
@@ -0,0 +1,13 @@
+Index: hector_mapping/CMakeLists.txt
+===================================================================
+--- hector_mapping.orig/CMakeLists.txt
++++ hector_mapping/CMakeLists.txt
+@@ -7,7 +7,7 @@ project(hector_mapping)
+ find_package(catkin REQUIRED COMPONENTS roscpp nav_msgs visualization_msgs tf message_filters laser_geometry tf_conversions message_generation)
+ 
+ ## System dependencies are found with CMake's conventions
+-find_package(Boost REQUIRED COMPONENTS thread signals)
++find_package(Boost REQUIRED COMPONENTS thread)
+ include_directories(${Boost_INCLUDE_DIRS})
+ 
+ # Find Eigen3 (from http://wiki.ros.org/jade/Migration)
diff --git a/dev-ros/hector_mapping/hector_mapping-0.3.5.ebuild b/dev-ros/hector_mapping/hector_mapping-0.3.5.ebuild
index 4e49dd7e8a0e..fbcf32d16868 100644
--- a/dev-ros/hector_mapping/hector_mapping-0.3.5.ebuild
+++ b/dev-ros/hector_mapping/hector_mapping-0.3.5.ebuild
@@ -26,3 +26,4 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-cpp/eigen:3"
+PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/image_cb_detector/Manifest b/dev-ros/image_cb_detector/Manifest
index de4f43b1f7d0..2bbc98ad1426 100644
--- a/dev-ros/image_cb_detector/Manifest
+++ b/dev-ros/image_cb_detector/Manifest
@@ -1,6 +1,7 @@
+AUX boost170.patch 551 BLAKE2B c98a11a8faa4c22d78e991bfa911b13bcf66fe3b8b8be2efce6ba723eb1a2226de9d73186c05073bf6b12f360a160f9fe00fe24f8c9e71120abbc58252d02a6b SHA512 e75225d990f7c56522b244f95bf812df565394a3a586b4d71032fb164ae77f351f43ed27af29aa4aed0f40e4ec613600f16a10281f47223b5cf65b2860df7777
 AUX c11.patch 587 BLAKE2B 2cf07b3b5eebf9840bd45aa419283cc53e03dc45c5cf4eab6cd5894143983c7cb05146c9242c91ac105c90bba8d878ff8da4776629f04fc3f32b5290aa59fd87 SHA512 1ae09e987fb231400594019832f8a6d42ca1ebd07eafaca151d08812d8a4b62f95d4fadac0227c96d115c69da24bc3889f7d30af27000347ee000a937ae2b498
 AUX gcc6.patch 495 BLAKE2B 50ac60a74148e3e32b2a69750cad6d98ce2ecef22ed4462431821075f6e247290e28b8d57b58b4b86a7cb9600988a8e22ea2aa5508da6dd6ac85a93aac197ad1 SHA512 5b99edada624eabd4830997677ebb4916c6a9a3c631eead6ae723985e3ce5a0f3b77c484777182a34e727dba869181d11002ba38cfb49cf20eb0832aca67f6bb
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD image_cb_detector-0.10.14-r1.ebuild 933 BLAKE2B afb1d6def81a9a3ca97bb1beefbf761626ca7a671268bb41f5fe7ef56c86a02028143f34a0d95ad82fb461181a9458aa9f13e38b77ddfa5e48c25ed2d3ed5357 SHA512 a74f31fc57efb8c52cc67127f694cf1776257773b2b575cb3786ede25618453980c0688bf519bf63e34947e31ca3fbb24703dc7e5506e6962f1bd4999d2756a9
+EBUILD image_cb_detector-0.10.14-r1.ebuild 959 BLAKE2B 13f8864e7892b30be430d1c3f5b9753a049ad9cb9fb61dcef6eb9bb6578a5687c0eb5724f9727455b463e7becd0d10e49e49e72246974f6f8eedba63c36ba07c SHA512 0e4bacf6310c9bd1c7fec693b39570ef1a8ef004a11769a5f83a5520f23cd101f6d152b38890008c83f60139bfb36dd1d7b48e97ba96b84115c057a02ae96e44
 EBUILD image_cb_detector-9999.ebuild 933 BLAKE2B afb1d6def81a9a3ca97bb1beefbf761626ca7a671268bb41f5fe7ef56c86a02028143f34a0d95ad82fb461181a9458aa9f13e38b77ddfa5e48c25ed2d3ed5357 SHA512 a74f31fc57efb8c52cc67127f694cf1776257773b2b575cb3786ede25618453980c0688bf519bf63e34947e31ca3fbb24703dc7e5506e6962f1bd4999d2756a9
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/image_cb_detector/files/boost170.patch b/dev-ros/image_cb_detector/files/boost170.patch
new file mode 100644
index 000000000000..f8ae562dadc5
--- /dev/null
+++ b/dev-ros/image_cb_detector/files/boost170.patch
@@ -0,0 +1,13 @@
+Index: image_cb_detector/CMakeLists.txt
+===================================================================
+--- image_cb_detector.orig/CMakeLists.txt
++++ image_cb_detector/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ cmake_minimum_required(VERSION 2.8.3)
+ project(image_cb_detector)
+ 
+-find_package(Boost REQUIRED thread signals)
++find_package(Boost REQUIRED thread)
+ find_package(catkin REQUIRED actionlib actionlib_msgs calibration_msgs cv_bridge genmsg geometry_msgs image_transport message_filters roscpp sensor_msgs std_msgs)
+ find_package(OpenCV REQUIRED)
+ 
diff --git a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild b/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
index 8b96da0e6b06..2502c78f860a 100644
--- a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
+++ b/dev-ros/image_cb_detector/image_cb_detector-0.10.14-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,4 +29,4 @@ RDEPEND="
 	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" )
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/image_view/Manifest b/dev-ros/image_view/Manifest
index 50378f002836..138608fafb2d 100644
--- a/dev-ros/image_view/Manifest
+++ b/dev-ros/image_view/Manifest
@@ -1,6 +1,5 @@
-DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
+AUX boost170.patch 513 BLAKE2B c78a511ebf9ec506d75ba5ad639932321ff5542d5812db3e7b448765aff92c9b3e75f299c0ef15626cd5bbd6a34acee9efe202dc2f38dc20478b3f8e2f6b2577 SHA512 15c4024d4de848e06b47d845dd33758cac44c1e2c07982749a523a7d8d852921fff1306aa105f65df6d5152a09e974a0cfb8c1f70859cc415f51b1e1ec9e2b79
 DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
-EBUILD image_view-1.12.22-r1.ebuild 794 BLAKE2B 90e70f23cb4ad8c7430293bb2499acdcc35a64f5a9b605e1d96cd4e754a3d16741a190a7b1c989d8e1fc8d12507308227887eacb5e0e9663ad3e58c82ec8bfe4 SHA512 bdd6d9362267653cbd80ea6c8dd6a98b8c7eeb3b4908e270af5109d7c36ffb8a6eed7012314f52b05cafbc0c1fcb27d4f9ff3a3742faf7d408f0ce3a6c04b19f
-EBUILD image_view-1.12.23.ebuild 794 BLAKE2B b110f344132d47cdf515fadfdabb4d194c621ebe5b5aa6af9bd618e77a5b8ed57e9d3c616d4379c62a6bd21300b241e9305ba3b8e67ce20b2b2c22d5a52f7643 SHA512 9c8802246ef3e980f7111f16214ef251e62fc2b093c4e2ca8397c3fbb23ed360ff8b463fbf19947c445e0b039e2e3f91ae5c8350aa9fd0e2e190b568e5e3b7ea
-EBUILD image_view-9999.ebuild 794 BLAKE2B 90e70f23cb4ad8c7430293bb2499acdcc35a64f5a9b605e1d96cd4e754a3d16741a190a7b1c989d8e1fc8d12507308227887eacb5e0e9663ad3e58c82ec8bfe4 SHA512 bdd6d9362267653cbd80ea6c8dd6a98b8c7eeb3b4908e270af5109d7c36ffb8a6eed7012314f52b05cafbc0c1fcb27d4f9ff3a3742faf7d408f0ce3a6c04b19f
+EBUILD image_view-1.12.23.ebuild 879 BLAKE2B fa54faf98131e0639ebfb8b375c3e6d09b7765ec108cdba4a91adfbc20a74a6dc9053d4b09f306329d0f97a675c347ef2363480508bee8e84869221b3c60d002 SHA512 f5ae3c9cdd3297cdea49c0a9ad6083e547bfc4327360e362001a044e26b9fed332465ececc8a3f2ff6c1b63092a65b17b6267274db7c55cbdc10bd5ec182754e
+EBUILD image_view-9999.ebuild 838 BLAKE2B bea07f7d3bd91a3065f787a854916581e51fd718d33138828ed33a774e80b7c488deafd64899ce56ad69bd631ebdd3b6abdbb018dbc2ada14c7eaefd6b472032 SHA512 2673f92cba702ef2c199f873d64c3e38bc7f0a957e7988fdd4a32bb83cb2fc05ec34313b03ae194ee44975d782b4f93c9eeb6c2cfdeaa03e14583b982a4d0a83
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_view/files/boost170.patch b/dev-ros/image_view/files/boost170.patch
new file mode 100644
index 000000000000..ab52d89c5fad
--- /dev/null
+++ b/dev-ros/image_view/files/boost170.patch
@@ -0,0 +1,13 @@
+Index: image_view/CMakeLists.txt
+===================================================================
+--- image_view.orig/CMakeLists.txt
++++ image_view/CMakeLists.txt
+@@ -5,7 +5,7 @@ find_package(catkin REQUIRED COMPONENTS
+ generate_dynamic_reconfigure_options(cfg/ImageView.cfg)
+ 
+ catkin_package(CATKIN_DEPENDS dynamic_reconfigure)
+-find_package(Boost REQUIRED COMPONENTS signals thread)
++find_package(Boost REQUIRED COMPONENTS thread)
+ find_package(OpenCV REQUIRED)
+ 
+ include_directories(${Boost_INCLUDE_DIRS}
diff --git a/dev-ros/image_view/image_view-1.12.22-r1.ebuild b/dev-ros/image_view/image_view-1.12.22-r1.ebuild
deleted file mode 100644
index 9b9820cf2699..000000000000
--- a/dev-ros/image_view/image_view-1.12.22-r1.ebuild
+++ /dev/null
@@ -1,33 +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-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Simple viewer for ROS image topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	media-libs/opencv:=
-	x11-libs/gtk+:2
-	dev-ros/camera_calibration_parsers
-	>=dev-ros/cv_bridge-1.11.10
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_view/image_view-1.12.23.ebuild b/dev-ros/image_view/image_view-1.12.23.ebuild
index 6835689f080e..b7c4e715c9e9 100644
--- a/dev-ros/image_view/image_view-1.12.23.ebuild
+++ b/dev-ros/image_view/image_view-1.12.23.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
@@ -29,5 +29,7 @@ RDEPEND="
 	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/image_view/image_view-9999.ebuild b/dev-ros/image_view/image_view-9999.ebuild
index 9b9820cf2699..b9c0dff05bac 100644
--- a/dev-ros/image_view/image_view-9999.ebuild
+++ b/dev-ros/image_view/image_view-9999.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,5 +29,6 @@ RDEPEND="
 	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_filter_madgwick/Manifest b/dev-ros/imu_filter_madgwick/Manifest
index d8fb3cc5ccfc..04f00fa55599 100644
--- a/dev-ros/imu_filter_madgwick/Manifest
+++ b/dev-ros/imu_filter_madgwick/Manifest
@@ -1,9 +1,5 @@
-AUX pluginlib.patch 498 BLAKE2B 923d0288c75d969156cc5825c624e041821492c0d767873685ca8d479759cc1ded1d30cb22091b45066a8ea57fb2abcccc5acd852bc0f778a203b99760e466f1 SHA512 59e3d0c7e9c7b1dde87e430cee2084afa2c3e443277322c2c21abfe9619392d88d321b90198f03b5e90f8e3d4eb184611c0839ffdb93ca275d6e20db08e4acf5
-DIST imu_tools-1.1.5.tar.gz 1653083 BLAKE2B 8c0e84333455a5b4cae215a2e54b74ff828d00a426b9ab13f4048a72556b6a526dc4256a53dc3e21e098cc31ea6d21e0d508066a4627d01c27681ce0b3b18035 SHA512 5009884852c71d6bb1b6c2be2f30ed333eca2ac6a7f29d02cb8f0821c0b95a33dd3b09049c4c4eeb1416fb0eb5dc454b3c6d36c2c24303f37c0d1d2c0c2d906a
-DIST imu_tools-1.2.0.tar.gz 1653607 BLAKE2B 76cccfeae657188e3be3774bcb19c5edac94e7070a6fd8a01c8a56857297491568f978820e6f32467b031ceece4742e6c0fe926e5d59ad19a2f6fb1c037ac3ec SHA512 3f39a2ec539949a6881cc106122d663706ddd3ed03ed822b9370e56beb56f1349bfd668a71e443ab2b9d525c6a3a88fad053768764160d9d0f04c08ba1ad2f8e
+AUX boost_signals.patch 617 BLAKE2B f7ee39beda0b22eb154e9ada0ded0d015fe7a926c40d57563f4e1619f8d770a305c035edfd222e8b9da9eec7f7fd27f84340d6f3053de654663510af3691342b SHA512 7e21054ab7ca3594f190211c1d55df9fea02552a104d8f382067c18545eafce4f3b17453b64d687d38d993c7cf54e137cf82113e8ddc9dc3f9ef763b269d8c82
 DIST imu_tools-1.2.1.tar.gz 1654279 BLAKE2B 06e3b27708bec09fea448b636f77b1480310483468459496e3748ef786e20e10f67fe25aba3c2d128221e42762e70fa98eedeeb79185247c47388c71120ed166 SHA512 8bd7f817df4e564d255fd5820dcbc6dd8ffa762d1b32111ed2f8d9cc258096cba1f9602260f020860fe2988eb1412c6d0598de08e4cd79ede56a40d1371d1ff0
-EBUILD imu_filter_madgwick-1.1.5-r1.ebuild 797 BLAKE2B c561d840818d5aee7e61a14c076b402c83ab97ec0d6b9f671129723cc4e86f57e953e9ccbbeba362291cbf1b1561990515dcb7f1768813d0f29739117352ee14 SHA512 ab75f6871c652b1852abb67a6f633faf6048782e0924d00ae48ea2bcc6c116c13b1a6dc6cd2aed51ff554b83a9332c933d94b1a0b46e06638dc9bef46d4dfda8
-EBUILD imu_filter_madgwick-1.2.0.ebuild 755 BLAKE2B d9db5fb169aba977dbe2c7b6d67c050938e72bee39137503c79cea7a110aa7d3ab1e66e781e38636113adb2c6b590dd7bbe3ecdec3fb1ea83db96b6116cd38e5 SHA512 88428a38e0ebeefab1df6d2057b808e04b7d6ba88c430934d1cf6aed0f076f5045c227ef17cf4eabd068e3036d775e43b6ecbe21a0fad4cef0e6044607b0c6e2
-EBUILD imu_filter_madgwick-1.2.1.ebuild 752 BLAKE2B 6ee196807033632b04c62bd8206dda394f69087f0cf0142fba1b72fc1e0cfff0b28cb8fcf661ea9e2e96fbc076ddc7a944100bec7975efae77176b107733533a SHA512 03b527ecf188ce715b2c3f3cb851738faf5e9123e08eb6152921d9a12ba651b88ff963c22e4258a87ad2002640172fe401e74126561fa7686418dbbed1a6c406
-EBUILD imu_filter_madgwick-9999.ebuild 755 BLAKE2B dea2ac8e4c97538fddf1d11eb038196677a469352bca4b9a994ff6d4aa05e5471e036ae93e7c303340c1a5f412b49246d193c4804667f9a6e6a5427909a28991 SHA512 fca79c2a9a0308ed99c5c2acde0a66285dfd08ba60cdc974df9a0dfac864ee6999902b321fb6b21de1989358527e578e778b181fb41868c38c4b6f83244bc2e5
+EBUILD imu_filter_madgwick-1.2.1.ebuild 798 BLAKE2B 53a0f91afd1285fc0ef66e8e17382acdaf0d9d2526c127d050540b3a86a52bb8205a3eb9c3d37f8449986b9036c56bf7917702909f317e76247b11889cc92c6c SHA512 e10214a59ac79a47b5e739570188f54fb27740f50f6b9e1d3e2e7a997a6712489068f8dc0f38fdaf73b236b6884e8ed61a57e74da9d46ba4c978a581edf077e6
+EBUILD imu_filter_madgwick-9999.ebuild 798 BLAKE2B 53a0f91afd1285fc0ef66e8e17382acdaf0d9d2526c127d050540b3a86a52bb8205a3eb9c3d37f8449986b9036c56bf7917702909f317e76247b11889cc92c6c SHA512 e10214a59ac79a47b5e739570188f54fb27740f50f6b9e1d3e2e7a997a6712489068f8dc0f38fdaf73b236b6884e8ed61a57e74da9d46ba4c978a581edf077e6
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/imu_filter_madgwick/files/boost_signals.patch b/dev-ros/imu_filter_madgwick/files/boost_signals.patch
new file mode 100644
index 000000000000..75d3130d9765
--- /dev/null
+++ b/dev-ros/imu_filter_madgwick/files/boost_signals.patch
@@ -0,0 +1,13 @@
+Index: imu_filter_madgwick/CMakeLists.txt
+===================================================================
+--- imu_filter_madgwick.orig/CMakeLists.txt
++++ imu_filter_madgwick/CMakeLists.txt
+@@ -3,7 +3,7 @@ project(imu_filter_madgwick)
+ 
+ find_package(catkin REQUIRED COMPONENTS roscpp sensor_msgs geometry_msgs tf2 tf2_geometry_msgs tf2_ros nodelet pluginlib message_filters dynamic_reconfigure)
+ 
+-find_package(Boost REQUIRED COMPONENTS system thread signals)
++find_package(Boost REQUIRED COMPONENTS system thread)
+ 
+ # Generate dynamic parameters
+ generate_dynamic_reconfigure_options(cfg/ImuFilterMadgwick.cfg)
diff --git a/dev-ros/imu_filter_madgwick/files/pluginlib.patch b/dev-ros/imu_filter_madgwick/files/pluginlib.patch
deleted file mode 100644
index 26e77bb3ffcf..000000000000
--- a/dev-ros/imu_filter_madgwick/files/pluginlib.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: imu_filter_madgwick/src/imu_filter_nodelet.cpp
-===================================================================
---- imu_filter_madgwick.orig/src/imu_filter_nodelet.cpp
-+++ imu_filter_madgwick/src/imu_filter_nodelet.cpp
-@@ -36,4 +36,4 @@ void ImuFilterNodelet::onInit()
-   filter_.reset(new ImuFilterRos(nh, nh_private));
- }
- 
--PLUGINLIB_DECLARE_CLASS(imu_filter_madgwick, ImuFilterNodelet, ImuFilterNodelet, nodelet::Nodelet);
-+PLUGINLIB_EXPORT_CLASS(ImuFilterNodelet, nodelet::Nodelet);
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.1.5-r1.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.1.5-r1.ebuild
deleted file mode 100644
index 8d3eedf16d3f..000000000000
--- a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,34 +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/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-ros/tf2_ros
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/pluginlib
-	dev-ros/message_filters
-	dev-ros/dynamic_reconfigure
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosunit )
-"
-PATCHES=( "${FILESDIR}/pluginlib.patch" )
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.0.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.0.ebuild
deleted file mode 100644
index 1594d52649aa..000000000000
--- a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.0.ebuild
+++ /dev/null
@@ -1,33 +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/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-ros/tf2_ros
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/pluginlib
-	dev-ros/message_filters
-	dev-ros/dynamic_reconfigure
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosunit )
-"
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.1.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.1.ebuild
index 1292030f59aa..44fb87672c7d 100644
--- a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.1.ebuild
+++ b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.1.ebuild
@@ -31,3 +31,4 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rosunit )
 "
+PATCHES=( "${FILESDIR}/boost_signals.patch" )
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.ebuild
index d66fb87d71cd..44fb87672c7d 100644
--- a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.ebuild
+++ b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.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
@@ -31,3 +31,4 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rosunit )
 "
+PATCHES=( "${FILESDIR}/boost_signals.patch" )
diff --git a/dev-ros/interactive_marker_tutorials/Manifest b/dev-ros/interactive_marker_tutorials/Manifest
index 63978c407293..b6cd092ee51e 100644
--- a/dev-ros/interactive_marker_tutorials/Manifest
+++ b/dev-ros/interactive_marker_tutorials/Manifest
@@ -1,8 +1,4 @@
-DIST visualization_tutorials-0.10.1.tar.gz 428608 BLAKE2B abee44fa91388e792a5e2ccadf07a32236f7575f5a0e0121ddfdc0135bf63b12c8d603d4bee3ef463f0c64debf9e9c6f8c7c89c2e8dce8375d3264039b6378b0 SHA512 38ad2c29456ff994914b1ca3b2ab6d90b0c9224481d360fd7f88b38c0e9615d35eb94b90abb699738b5f4fac091489bdf2373168bc3a0acc0e6ba3a61b646bbf
-DIST visualization_tutorials-0.10.2.tar.gz 428684 BLAKE2B 751d18089c69cdb8cd0cfac97235d213cce9d098264dc49fcaf7d7a949216b8fd40041c23be5d16be1537298b876dc1854a8b7dc1214ba7aeb74b18716892636 SHA512 40d8621fd05e81dc23adbf7fd0a69209d796ade3ad291aa350030872a3bbffad2ec9ac0d31734ccf73f8215f7dd52834a35baaa3fe198a3fc4c5bda71a760b05
 DIST visualization_tutorials-0.10.3.tar.gz 428877 BLAKE2B 4bcd482ae61f29908ca23dda653d1c6d0e6a0a9df56df8343d1dfb5124f8d60c9a12ef8b1565c4655617dcd62d80a2aa51f2fd9b2c5329e33c3cc22e3e63c22d SHA512 2e484791851291d2316c7a20e92d988d71b6c41c98bad98c78bed465069dcfe5fc1ddd5c15c6981e951db2c114e965747c07e27f4851c2705af3dd036b992781
-EBUILD interactive_marker_tutorials-0.10.1.ebuild 616 BLAKE2B 72b4d727495dbe33c5fb596eee49474e4eac54f8d4c400a704a58efe364e4634203d102510ab77f2c9716a9f7c28f79127c2399ba05095cacbe9f612eb86dcab SHA512 23efafcbdb9297b028329a3486533e10ed560e5dcc053f397ceac1f16e2052702498346dad522191167bcb26a4141b71922dd5a3d4ce7f4e6a7d11747299dd10
-EBUILD interactive_marker_tutorials-0.10.2.ebuild 616 BLAKE2B 1a0233430e646cee91bd197ba068742de0a91ac963e060d23587e45b4b9e7aab5829bcc36a666367bf1cb50d36159a68d83c35e72499b5affce16c7bd45835d3 SHA512 d4c1167db05ac08c3f44a7fa8c1ecd5df277b045dc5a173a0bd61d6713cda6f5f3f23e7e81d42b537ca8b1acea0e66370f704bcaa5283d508918dec63aa6d7e6
-EBUILD interactive_marker_tutorials-0.10.3.ebuild 616 BLAKE2B 1a0233430e646cee91bd197ba068742de0a91ac963e060d23587e45b4b9e7aab5829bcc36a666367bf1cb50d36159a68d83c35e72499b5affce16c7bd45835d3 SHA512 d4c1167db05ac08c3f44a7fa8c1ecd5df277b045dc5a173a0bd61d6713cda6f5f3f23e7e81d42b537ca8b1acea0e66370f704bcaa5283d508918dec63aa6d7e6
-EBUILD interactive_marker_tutorials-9999.ebuild 616 BLAKE2B 72b4d727495dbe33c5fb596eee49474e4eac54f8d4c400a704a58efe364e4634203d102510ab77f2c9716a9f7c28f79127c2399ba05095cacbe9f612eb86dcab SHA512 23efafcbdb9297b028329a3486533e10ed560e5dcc053f397ceac1f16e2052702498346dad522191167bcb26a4141b71922dd5a3d4ce7f4e6a7d11747299dd10
+EBUILD interactive_marker_tutorials-0.10.3-r1.ebuild 631 BLAKE2B a35e25dd19e6280ba002ea71274d10105f0ed40b43d2aab2a89db0a6c496b1c04068cebc5874533e2f1c6adb7e7dd711f92d2004d0a7b7abf9fae6b869b4104c SHA512 6ca56c0b03b28cfde6aae740c77481ff3b7c9cf4e21de0753f5e6784af4db43563165e369af15ba3c718d525bcbdf86ada545b80da4597fea557f91abb5e1d94
+EBUILD interactive_marker_tutorials-9999.ebuild 631 BLAKE2B a35e25dd19e6280ba002ea71274d10105f0ed40b43d2aab2a89db0a6c496b1c04068cebc5874533e2f1c6adb7e7dd711f92d2004d0a7b7abf9fae6b869b4104c SHA512 6ca56c0b03b28cfde6aae740c77481ff3b7c9cf4e21de0753f5e6784af4db43563165e369af15ba3c718d525bcbdf86ada545b80da4597fea557f91abb5e1d94
 MISC metadata.xml 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.1.ebuild b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.1.ebuild
deleted file mode 100644
index dcb82f94d3ea..000000000000
--- a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Interactive marker tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/interactive_markers
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.2.ebuild b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.3-r1.ebuild
index 834526809e25..6844281b86eb 100644
--- a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.2.ebuild
+++ b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.3-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
@@ -21,5 +21,6 @@ RDEPEND="
 	dev-ros/tf[${PYTHON_USEDEP}]
 	dev-ros/rospy[${PYTHON_USEDEP}]
 	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.3.ebuild b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.3.ebuild
deleted file mode 100644
index 834526809e25..000000000000
--- a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.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-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Interactive marker tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/interactive_markers
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-9999.ebuild b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-9999.ebuild
index dcb82f94d3ea..6844281b86eb 100644
--- a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-9999.ebuild
+++ b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,5 +21,6 @@ RDEPEND="
 	dev-ros/tf[${PYTHON_USEDEP}]
 	dev-ros/rospy[${PYTHON_USEDEP}]
 	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/laser_assembler/Manifest b/dev-ros/laser_assembler/Manifest
index ed2fbf5726ce..b4ffa268ad19 100644
--- a/dev-ros/laser_assembler/Manifest
+++ b/dev-ros/laser_assembler/Manifest
@@ -1,8 +1,6 @@
-DIST laser_assembler-1.7.4.tar.gz 22113 BLAKE2B b0b6c7252151fa06a22b55dc62a040b229eb3d55549233931b5d8947629aca91b611c282cfe03b032a4fe718c09c4ecf5a5fa92f1536773dc2b58f8d7e72cc60 SHA512 e6b5c529f3d3c62462da7c319d71ea6ce799af05c09118fddfde7aa0928bff9fdf3237527aa66f33b248be1c35a124d794b7a0ffea920b7e62855c12be91b8ba
-DIST laser_assembler-1.7.5.tar.gz 22140 BLAKE2B 0f9667ac1b2b902e10a36e0b468c7c5ff36b1db7435d70187f53d36ce14cedf261ea03fc61ba465c4dcb170ab2b4b546acdc1055e6045df8333e18886868130f SHA512 822b83ec8eb52c13fd8931108beb22c53c27cdaabce1668a18e7b40805b232575375161f10ebe489a6752d82e81b160070ef027a52f1883e2a558ebf22eb76be
 DIST laser_assembler-1.7.6.tar.gz 22185 BLAKE2B 068c4d64e6de313a1609738880d1fa95b9d6e710e55c7c8d669d7d809955f7cd33a7b50d94abd05a18f5783d8a8b3287df21c7bc9310a6219c42a8c2db0d0561 SHA512 b3df050473a598569a9df796f3e23437604fd24b9bd1500d632c8f2a7fc0c2604063bdf28e5f5bfa5c79efa4f35abf5fb85602769d95935ef262b357e0af2dbb
-EBUILD laser_assembler-1.7.4-r1.ebuild 776 BLAKE2B 923601e1c227a5009744a7abf130d201074aafa9ff6002851a7eef5fe8d083b596ce40197adbee265b840aaa913866839cfebe637ea4fe2703aab3ace6b87b70 SHA512 e652eb8c33fbfe88c9f7417fb1d25488a0bb1faa39f6b126aaf35590caafd00839dfa10ae1d8953d7112a8250068d488a33379568c9a0e0c24ec59a932e6b20e
-EBUILD laser_assembler-1.7.5.ebuild 776 BLAKE2B d2e1adab41eacac6f3adcc8005a95d83271c9033738d0ced2def3e25526a8a756ce62ab4ad8049ef9b13d5218fb54b981af44d1c41be32cb6ec33c0b513b8963 SHA512 73e1eeaf600c1083b84c52cf57c250848298c5095e8e2774d8cd6ed67644a02c97580f269488aa6654ff5ed8d999a880e978fc0d8459fab2a36a846177fdf793
+DIST laser_assembler-1.7.7.tar.gz 22199 BLAKE2B 5ae26ef567149e6f3015cd3188bcc1adb72c09a33f6594658a20f954a500a76ca44f0f87e47dd9ae9a195df120752c4b35564264a1530b75808d8544f9b9162b SHA512 b7eb6f875209f4a692d1a16934196548a607730dd861806cda8a2f4c6a46722a56590148267b635e2bd5ee31e5490d6c533868bed7328a22a365cb1b8c63ddef
 EBUILD laser_assembler-1.7.6.ebuild 773 BLAKE2B 8c902f0232857fa1663031a67513c0c937d6686e1b0d858e74a33168d4874cc31d8b826ffefe6ab4724b914e75738a37244f81e3cc0d8be7d8db2bf02155e771 SHA512 50df22bb4bd666e928c79064ec3a7185ac38969b50da0d238e739de322b4ff632f20a687c0e895494b6cbaf1382e9e3c2e670b0227d32b38f0646340a9e44f49
+EBUILD laser_assembler-1.7.7.ebuild 773 BLAKE2B 8c902f0232857fa1663031a67513c0c937d6686e1b0d858e74a33168d4874cc31d8b826ffefe6ab4724b914e75738a37244f81e3cc0d8be7d8db2bf02155e771 SHA512 50df22bb4bd666e928c79064ec3a7185ac38969b50da0d238e739de322b4ff632f20a687c0e895494b6cbaf1382e9e3c2e670b0227d32b38f0646340a9e44f49
 EBUILD laser_assembler-9999.ebuild 776 BLAKE2B 923601e1c227a5009744a7abf130d201074aafa9ff6002851a7eef5fe8d083b596ce40197adbee265b840aaa913866839cfebe637ea4fe2703aab3ace6b87b70 SHA512 e652eb8c33fbfe88c9f7417fb1d25488a0bb1faa39f6b126aaf35590caafd00839dfa10ae1d8953d7112a8250068d488a33379568c9a0e0c24ec59a932e6b20e
 MISC metadata.xml 344 BLAKE2B 9f0a0af9b8ec8ea7a0e261981de8219df856a612762a2dc6986240610e76d0c1578b071cea0a25aa56e3462d0d871a9f8a117a0902971b6e5640e2511dfc9a8a SHA512 c9746c67ccaf314fa717cdde076e8094d48c7832e8d6e5402ffbaf7829c0205d8bfe281ffbafb4ee5933af5b49a2210d6b1645c07cf0dc2a78b9900230118d45
diff --git a/dev-ros/laser_assembler/laser_assembler-1.7.5.ebuild b/dev-ros/laser_assembler/laser_assembler-1.7.5.ebuild
deleted file mode 100644
index 9ee670fb205b..000000000000
--- a/dev-ros/laser_assembler/laser_assembler-1.7.5.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-perception/laser_assembler"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Nodes to assemble point clouds from either LaserScan or PointCloud messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-ros/tf
-	dev-ros/laser_geometry[${PYTHON_USEDEP}]
-	dev-ros/pluginlib
-	dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/message_filters[${PYTHON_USEDEP}]
-	dev-ros/filters
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )
-"
diff --git a/dev-ros/laser_assembler/laser_assembler-1.7.4-r1.ebuild b/dev-ros/laser_assembler/laser_assembler-1.7.7.ebuild
index b81ead0f3d81..903bdb286b20 100644
--- a/dev-ros/laser_assembler/laser_assembler-1.7.4-r1.ebuild
+++ b/dev-ros/laser_assembler/laser_assembler-1.7.7.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
diff --git a/dev-ros/laser_cb_detector/Manifest b/dev-ros/laser_cb_detector/Manifest
index 88a9ce4022db..4b6f47a9e756 100644
--- a/dev-ros/laser_cb_detector/Manifest
+++ b/dev-ros/laser_cb_detector/Manifest
@@ -1,5 +1,6 @@
+AUX boost170.patch 539 BLAKE2B 02288b4d5c3de5ef4290ce7ba4f8c46c95148ea2417c172f0ae90ec7604c7c08c3f8b9eebdbb4d9bf26f81011f996148db3fd0243b56ad77be7533282f9ecc0b SHA512 d2185960b22b9539f318c452e5bb95612e21156380183ed795142d87c9d1f8ca74c6bb08a2039138729767800cf6592b6bb64bf12db62166c8c3ee2176aec65d
 AUX gcc6.patch 461 BLAKE2B 2e745eb80783777fb510d763b1c3119e8fb89f2a7defd9a3a62ed902c9f9a5fcf973b032281049499aa7ea4b36569c5cba72ea89d74040580a8a06a2b99d2f5d SHA512 122b897b905cd9212f038887d23c6a4c9648bcdcf64231b400fcaff7aa7c3a4c731ede2d6d69d85949ca20905a3b166451bb4de7a9ad09b3ffc9b94eb2959702
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD laser_cb_detector-0.10.14.ebuild 728 BLAKE2B c5a0e74981b25cacf9618ec4cba8fd7a7d1088f7a9243e0b5ecd005a7737204ce3ea9a1b8bc8bf63b33d3449d099275ed8c3f029a5b93cdcba9f08aafb04a9c0 SHA512 be9fb0ab225811f6878fca22af77defde55502875dee2c9eba8ecb56b9bf34885260552f1568b432c1e51ae277b17983fdbbbc98650e0884de0e99d9de14b1f4
+EBUILD laser_cb_detector-0.10.14.ebuild 754 BLAKE2B 754aa6caa3919022243c83f10857e83ec60befd0f7d2fc6be4fce31eea3884774252bd94ad853fbc9d2ce8df2d283290273ef40c8f6992ccba8328243080d1ed SHA512 823d9e615b926cff6fa41bd911a06e04c7c3afb153d03e75cefc1024ff5fb2a4195eff1f6546f703993f521b6558013c9998254b50c99f73c424b9127dc64898
 EBUILD laser_cb_detector-9999.ebuild 728 BLAKE2B c5a0e74981b25cacf9618ec4cba8fd7a7d1088f7a9243e0b5ecd005a7737204ce3ea9a1b8bc8bf63b33d3449d099275ed8c3f029a5b93cdcba9f08aafb04a9c0 SHA512 be9fb0ab225811f6878fca22af77defde55502875dee2c9eba8ecb56b9bf34885260552f1568b432c1e51ae277b17983fdbbbc98650e0884de0e99d9de14b1f4
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/laser_cb_detector/files/boost170.patch b/dev-ros/laser_cb_detector/files/boost170.patch
new file mode 100644
index 000000000000..019a948be95c
--- /dev/null
+++ b/dev-ros/laser_cb_detector/files/boost170.patch
@@ -0,0 +1,13 @@
+Index: laser_cb_detector/CMakeLists.txt
+===================================================================
+--- laser_cb_detector.orig/CMakeLists.txt
++++ laser_cb_detector/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ cmake_minimum_required(VERSION 2.8.3)
+ project(laser_cb_detector)
+ 
+-find_package(Boost REQUIRED signals thread)
++find_package(Boost REQUIRED thread)
+ find_package(catkin REQUIRED actionlib actionlib_msgs cv_bridge image_cb_detector message_filters roscpp settlerlib std_msgs)
+ 
+ add_action_files(DIRECTORY action FILES Config.action)
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
index 605a596b776e..888eec2019d8 100644
--- a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.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
@@ -27,4 +27,4 @@ RDEPEND="
 	dev-ros/settlerlib
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/laser_filters/Manifest b/dev-ros/laser_filters/Manifest
index b1f162a54ccd..d3ceaa8035e6 100644
--- a/dev-ros/laser_filters/Manifest
+++ b/dev-ros/laser_filters/Manifest
@@ -1,6 +1,6 @@
-DIST laser_filters-1.8.5.tar.gz 29485 BLAKE2B 4564408348a1710ba30f41b92c8f602a5cefe473527409ee3b567c2843b46d623ad20092931a68bd8a456fcb58dfabbec03056cac53eac7838bef664496c3bb4 SHA512 dc43aaa3c06f64328f9e744866ded854ffc36609f0d91b0bb0a2be736038b34690b9b819257c41b18ef01d1810e67e21d6cebf1e8bd7190fd4eaa2ddbe8723d2
 DIST laser_filters-1.8.6.tar.gz 29484 BLAKE2B b436a6715421940b55e15ab2393f06f988d1ab6d8756d3bbe90b4a189c7e5e669e2ddbd0926b8d6d149159cffe70a6c64aa600b47d6bf730ccbfc14b3e8e69ce SHA512 43662fb9a006730c34a37cd50425d54de2141294b5f271761d9e63416fa6633c3a505e637248dc4192606653d7d8083da1a42826e29495726b4744fc98ff9943
-EBUILD laser_filters-1.8.5-r1.ebuild 641 BLAKE2B 72e5ce055e7dcfe13864e5d11c401d90e6c511ecc1ae9fc9001f1551278a4fcc48006edb1f9cc21035c079b150e9cfc192103da4745fae0a78cd92ad94b2cb1d SHA512 8dbfa82eaad2684ff480f4c966cb64e8ddac779f6ac5a2792bab38c2b7a43f1b15cc234e5dab991fe2f699cba72949225a33f3da8d81b8f690f26a76f301e314
+DIST laser_filters-1.8.7.tar.gz 31072 BLAKE2B 296dd26e92e3d2e4ebe6e6c08d62224f684306bd4fdf198ca84a98801ddf884d85b7888a6d1d51e96b90403ae484c3d6d48a08c9218c1d7c118cf4518c70202a SHA512 8ea1af3af17c3d7870822230760dc8201ec7403db8246cb82f912ca6eb6bcd634df64ae757128dfa82d8fd2d297e3c2dfb066ca612d11933a4074379b35113bb
 EBUILD laser_filters-1.8.6.ebuild 641 BLAKE2B 9292584fd3190275f5ca6d2d2cbe28047f7e76d5135079f7b24945c063c95196356bb45c1b7b5ad92797509a2f17ca6169e242266c833d2ee87fd2bd1321313d SHA512 a333b0a64a0210fa160b68fce4851e2d7c5a2d75f61ae01aa8c5871bb3845f22801921644cc2ee9e48ce62bc98f3dc81bbfd16380ee439d8d78dc3766d6cd799
+EBUILD laser_filters-1.8.7.ebuild 638 BLAKE2B 19cd66c471e64e87e69614903d3fdd152d304adb797d2fe68e658b0a581a4aeeadf7c0d563526a19f7fa363545600b51a2aa08914d26f35234a92be517ef67cf SHA512 638ad97d98d29ae469075f3b52b3f06acf99f4e4325c428ba8e008e83778388a1bd91a8200fb923405cc85274524ec5ae0b569740f4230bbb646d71c9bfd98e5
 EBUILD laser_filters-9999.ebuild 641 BLAKE2B 72e5ce055e7dcfe13864e5d11c401d90e6c511ecc1ae9fc9001f1551278a4fcc48006edb1f9cc21035c079b150e9cfc192103da4745fae0a78cd92ad94b2cb1d SHA512 8dbfa82eaad2684ff480f4c966cb64e8ddac779f6ac5a2792bab38c2b7a43f1b15cc234e5dab991fe2f699cba72949225a33f3da8d81b8f690f26a76f301e314
 MISC metadata.xml 342 BLAKE2B 92f4937b0999d701af2eb4810e3d0d9d713fd0238fa57500e7bfdbfc1d602afdd51252b796c3a27c2eb8ea398330b04c3d1f78ca8f5c307bf5adfb4570c3db6b SHA512 4ab282060abc14838675f8d99f245894bec67f8e824191e666671bfc6134383c23853137cff023f59b81141aae204f282d3b40e779627c375609fc4223af8ec5
diff --git a/dev-ros/laser_filters/laser_filters-1.8.5-r1.ebuild b/dev-ros/laser_filters/laser_filters-1.8.7.ebuild
index 0dd0c51fad51..3f17816b445d 100644
--- a/dev-ros/laser_filters/laser_filters-1.8.5-r1.ebuild
+++ b/dev-ros/laser_filters/laser_filters-1.8.7.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
diff --git a/dev-ros/libmavconn/Manifest b/dev-ros/libmavconn/Manifest
index 3bf8d4d18fce..c1431707e56c 100644
--- a/dev-ros/libmavconn/Manifest
+++ b/dev-ros/libmavconn/Manifest
@@ -1,5 +1,6 @@
+AUX boost170.patch 3754 BLAKE2B 7e4d5be1898f70f7075cc51b36d143f3fd4feeceab6658926d6b0ba9030b0cc3d5ccbbfe624f914698eda0bcfdc748543e35f8de2cda59133b1d0cfe813bb119 SHA512 f3d0f1bdd19f08077e5650d02997028ad044594c185994e8df08903602199bb9b063d1623a807920b8d07c91b468c1b3ac34a806aec7b40ed15e9b70a0eb60c4
 AUX logging.patch 16008 BLAKE2B ac82381998cfc3b204f745b79cba6128751dd511b0d89d50f5317c82138cd06d51e627706ce533f205a731202e32838a8c7a7b3bb7c85011d6e9c698a4d1f792 SHA512 08e64047cbc613982be4bd34c07916df2e90a96f9f6873969be7dfd265f2d6ce4956669be7c57c38f23314fd4634b5569aec17618d412d0662ae5baf8f590433
 DIST mavros-0.19.0.tar.gz 219739 BLAKE2B 4e9a47fa4cdbf11b530bdc39a8048b1834689039af3005d30ffcc2b626651612db12ecc1929ecaf994c5a887224bcf2b0469d1e15ed5b353be4132fb0f523a96 SHA512 87b1b77505d3606196d609a016bcb89b3831e982f8352a13f69f5c2580f46ac603edb2d3c2ce4df5cdd1424172145b88d2b35d149c2be507eb0f23039e7e45a7
-EBUILD libmavconn-0.19.0-r1.ebuild 471 BLAKE2B 41b2e29199232ef6b987afcb6f98d892d61577b6423443148c40120ede225fe304dd1c397391d806f58f14879f26a101cb460f69e9f613161271964d3134cafb SHA512 cb723c1dc318517da33d1554b663e2bef35df7a3a3dd0ced92dd698baf33a374a1db59ea8566a146a5e09c4689b553312bb1bb28c2ed664ae1097ea6b147fdba
+EBUILD libmavconn-0.19.0-r1.ebuild 499 BLAKE2B 3c0d8430aa3e771ad35d32d4d4970e950a82d3390129d3f17853d5f39c1479f72483d8f9311ff6229c4becc587e865304aff22374e85b54bf90c339f45be7979 SHA512 cf6f5d7ed4972f115f374993a04bdb5e2c855a592133e47ba684bd2c54ce7e6d5cf0678093a34e5a81475c55ca8d95be838c86718862107d502d9fd08af6ab92
 EBUILD libmavconn-9999.ebuild 431 BLAKE2B a98c07058726ca23ea9c93d4d072b51d94dbe9472f78caccd72b3e857250f18737981a4cfa2fc48c1c1c75db9313a4b129cd66320b9e82ccee04dc28616b905f SHA512 5d0ade0e7b70ff32b9fb2fed6041e2e9610a03deac57205a5e7136bc8ef9f27aa5a98a07e76e5d362784f37b4d5eb98a03184ededbd6dd39bd50f93531ace235
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/libmavconn/files/boost170.patch b/dev-ros/libmavconn/files/boost170.patch
new file mode 100644
index 000000000000..357025d90af5
--- /dev/null
+++ b/dev-ros/libmavconn/files/boost170.patch
@@ -0,0 +1,98 @@
+Index: libmavconn/src/tcp.cpp
+===================================================================
+--- libmavconn.orig/src/tcp.cpp
++++ libmavconn/src/tcp.cpp
+@@ -41,13 +41,19 @@ static bool resolve_address_tcp(io_servi
+ 	error_code ec;
+ 
+ 	tcp::resolver::query query(host, "");
+-	std::for_each(resolver.resolve(query, ec), tcp::resolver::iterator(),
+-			[&](const tcp::endpoint & q_ep) {
+-				ep = q_ep;
+-				ep.port(port);
+-				result = true;
+-				CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
+-			});
++
++	auto fn = [&](const tcp::endpoint & q_ep) {
++		ep = q_ep;
++		ep.port(port);
++		result = true;
++		CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
++	};
++
++#if BOOST_ASIO_VERSION >= 101200
++	for (auto q_ep : resolver.resolve(query, ec)) fn(q_ep);
++#else
++	std::for_each(resolver.resolve(query, ec), tcp::resolver::iterator(), fn);
++#endif
+ 
+ 	if (ec) {
+ 		CONSOLE_BRIDGE_logWarn(PFXd "resolve error: %s", chan, ec.message().c_str());
+@@ -112,7 +118,7 @@ void MAVConnTCPClient::client_connected(
+ 			server_channel, conn_id, to_string_ss(server_ep).c_str());
+ 
+ 	// start recv
+-	socket.get_io_service().post(std::bind(&MAVConnTCPClient::do_recv, shared_from_this()));
++	static_cast<boost::asio::io_service&>(socket.get_executor().context()).post(std::bind(&MAVConnTCPClient::do_recv, shared_from_this()));
+ }
+ 
+ MAVConnTCPClient::~MAVConnTCPClient()
+@@ -152,7 +158,7 @@ void MAVConnTCPClient::send_bytes(const
+ 
+ 		tx_q.emplace_back(bytes, length);
+ 	}
+-	socket.get_io_service().post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
++	static_cast<boost::asio::io_service&>(socket.get_executor().context()).post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
+ }
+ 
+ void MAVConnTCPClient::send_message(const mavlink_message_t *message)
+@@ -174,7 +180,7 @@ void MAVConnTCPClient::send_message(cons
+ 
+ 		tx_q.emplace_back(message);
+ 	}
+-	socket.get_io_service().post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
++	static_cast<boost::asio::io_service&>(socket.get_executor().context()).post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
+ }
+ 
+ void MAVConnTCPClient::send_message(const mavlink::Message &message)
+@@ -194,7 +200,7 @@ void MAVConnTCPClient::send_message(cons
+ 
+ 		tx_q.emplace_back(message, get_status_p(), sys_id, comp_id);
+ 	}
+-	socket.get_io_service().post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
++	static_cast<boost::asio::io_service&>(socket.get_executor().context()).post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
+ }
+ 
+ void MAVConnTCPClient::do_recv()
+Index: libmavconn/src/udp.cpp
+===================================================================
+--- libmavconn.orig/src/udp.cpp
++++ libmavconn/src/udp.cpp
+@@ -41,13 +41,19 @@ static bool resolve_address_udp(io_servi
+ 	error_code ec;
+ 
+ 	udp::resolver::query query(host, "");
+-	std::for_each(resolver.resolve(query, ec), udp::resolver::iterator(),
+-			[&](const udp::endpoint & q_ep) {
+-				ep = q_ep;
+-				ep.port(port);
+-				result = true;
+-				CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
+-			});
++
++	auto fn = [&](const udp::endpoint & q_ep) {
++		ep = q_ep;
++		ep.port(port);
++		result = true;
++		CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
++	};
++
++#if BOOST_ASIO_VERSION >= 101200
++	for (auto q_ep : resolver.resolve(query, ec)) fn(q_ep);
++#else
++	std::for_each(resolver.resolve(query, ec), udp::resolver::iterator(), fn);
++#endif
+ 
+ 	if (ec) {
+ 		CONSOLE_BRIDGE_logWarn(PFXd "resolve error: %s", chan, ec.message().c_str());
diff --git a/dev-ros/libmavconn/libmavconn-0.19.0-r1.ebuild b/dev-ros/libmavconn/libmavconn-0.19.0-r1.ebuild
index dddbbe6be4df..d42a92fd0e64 100644
--- a/dev-ros/libmavconn/libmavconn-0.19.0-r1.ebuild
+++ b/dev-ros/libmavconn/libmavconn-0.19.0-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
@@ -19,4 +19,7 @@ RDEPEND="
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/logging.patch" )
+PATCHES=(
+	"${FILESDIR}/logging.patch"
+	"${FILESDIR}/boost170.patch"
+)
diff --git a/dev-ros/python_qt_binding/Manifest b/dev-ros/python_qt_binding/Manifest
index a96986339a35..fd7f65e06416 100644
--- a/dev-ros/python_qt_binding/Manifest
+++ b/dev-ros/python_qt_binding/Manifest
@@ -1,8 +1,7 @@
-DIST python_qt_binding-0.3.2.tar.gz 12047 BLAKE2B 330ab27cface576d37cfca709a9758b6499a181b8e2734c04ef0f55b84a3d45a4ae821fbf572337e71115b4db57839f900e406b9ce8b3cfc71daa2d4ff4b143c SHA512 777d7ba00652d34994648615125f6c426170a1723570de35b9e5a060d0f077b563a57c9b0cbe7bd85a7ed2f5f011797e9102918a27df4f0096831cce0bb80304
-DIST python_qt_binding-0.3.3.tar.gz 12114 BLAKE2B 12a2e785746ec3d9fe7b387a9e727bfacb5e37da90702c728c8e874c52cd3e4cfc000936d8f17cefbeeb98673de8c21f066eded743df3b5325b88e785f3dc100 SHA512 0dfd698b390a87e0619e93a291656c329ff37713411c5a805e720aeedf9fefd43fc780bbdba351cd1a73e30d67ce8e93a98b5ba6b5584a807d829611ac232263
+AUX var.patch 961 BLAKE2B 5bbf8db95f689cc7d2c0358d0dcccc8856a4318137eeda2f56458d145654bc20b6ed3a6d6df40d89f4f2a654762415776aa0bf8410dafddce5606e3d515e554f SHA512 4b774ae419f56094bb0d059fca1944043c9d8b176195dd6df970407ba7e4e71239fd2ad155c4cfaeb50bad585fea175f08ad7d6911cace5a8a21b0a03c483f52
 DIST python_qt_binding-0.3.4.tar.gz 12255 BLAKE2B bc72aa806098d460e5b884bde7664f295399555d96e10b66791e59a26d1e61dd22aabecf9b40b5d14f61c2c906c18ff3fe2cd03de6108d7d9c2c649d553ab09d SHA512 df5fc2c6a744e66d0c03089e15ce4cfb3890d8fd67d826a3832d22cf99de235e18720c59f737c3ddacefb02dac5571d64042dd862c10ea4c44835063037eb533
-EBUILD python_qt_binding-0.3.2.ebuild 457 BLAKE2B de30c507e7415187bddfc691f988e8e79e7a4f0671ad817493ba42a8aa837449946db9be13829592abfd5504718f0b08e5b67f6abbfc7a65576cec4485721530 SHA512 1da86df5a851ea02b666825ab445a1015b07d4cec74791b9eb7620e63947bdd7b52be3146312b6dc2d5bb9e6faed454efa4622a8b1928eb35bdd71107f01d2e9
-EBUILD python_qt_binding-0.3.3.ebuild 457 BLAKE2B de30c507e7415187bddfc691f988e8e79e7a4f0671ad817493ba42a8aa837449946db9be13829592abfd5504718f0b08e5b67f6abbfc7a65576cec4485721530 SHA512 1da86df5a851ea02b666825ab445a1015b07d4cec74791b9eb7620e63947bdd7b52be3146312b6dc2d5bb9e6faed454efa4622a8b1928eb35bdd71107f01d2e9
+DIST python_qt_binding-0.3.5.tar.gz 12412 BLAKE2B ee2f2537bb1ddceb5cce0ca1963e042d10e5d011cffac25caba1a714c992d975413b7e1c4a23d5472567d4e214f482414dcfc56d499fcbcb0bd5559d7670b484 SHA512 a54ce90008d0893f236533cdda7d3520db264ba3e66b6edf18bac0d6e97975823e3900d1f265a7459813c823c9fc0bce7bb12570de1f8101b588954adeb073b4
 EBUILD python_qt_binding-0.3.4.ebuild 457 BLAKE2B de30c507e7415187bddfc691f988e8e79e7a4f0671ad817493ba42a8aa837449946db9be13829592abfd5504718f0b08e5b67f6abbfc7a65576cec4485721530 SHA512 1da86df5a851ea02b666825ab445a1015b07d4cec74791b9eb7620e63947bdd7b52be3146312b6dc2d5bb9e6faed454efa4622a8b1928eb35bdd71107f01d2e9
+EBUILD python_qt_binding-0.3.5-r1.ebuild 493 BLAKE2B 50e17b641cec09703e2a2cc8cdde1fca6adb281403ff834ad0ff6b9e2518f70af7b283bceca8d744e887179ef4fff7c019d35ad77e2424691b1a2b63b76f43e0 SHA512 429199c878e3a355db508187e8aa745866f7114e52d9f3426d23a1dca03310beaa7a74f19422a21565bbdf46bf03271e19a1dc498e2a0a25437ba9a862cf4c64
 EBUILD python_qt_binding-9999.ebuild 457 BLAKE2B de30c507e7415187bddfc691f988e8e79e7a4f0671ad817493ba42a8aa837449946db9be13829592abfd5504718f0b08e5b67f6abbfc7a65576cec4485721530 SHA512 1da86df5a851ea02b666825ab445a1015b07d4cec74791b9eb7620e63947bdd7b52be3146312b6dc2d5bb9e6faed454efa4622a8b1928eb35bdd71107f01d2e9
 MISC metadata.xml 349 BLAKE2B bc205c9c90eab1ea292d3e90f9f4a1d769c5202af60c57371152eaf80a50bdf6257cb2bb0ad6070a8443f0d19cc64e8493d5ec43e2701085f96c90ec6187a705 SHA512 f388f612a53c2de0a6cdece5a03d08e583f848592da6763b7995ff80e60756caca49da4318ded57ba09141facf717442141066142ed0691172f4e6b98a5ee266
diff --git a/dev-ros/python_qt_binding/files/var.patch b/dev-ros/python_qt_binding/files/var.patch
new file mode 100644
index 000000000000..f0cd56d10a7e
--- /dev/null
+++ b/dev-ros/python_qt_binding/files/var.patch
@@ -0,0 +1,31 @@
+From 1b3000d2eccfad651b427de20028a4ca552e9ea7 Mon Sep 17 00:00:00 2001
+From: Hans Gaiser <h.gaiser@fizyr.com>
+Date: Mon, 29 Jul 2019 15:17:39 -0700
+Subject: [PATCH] Replace Qt variable in generated Makefile. (#64)
+
+* Replace Qt variable in generated Makefile.
+
+* use single quotes
+---
+ cmake/sip_configure.py | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/cmake/sip_configure.py b/cmake/sip_configure.py
+index 49eb866..ce084dd 100644
+--- a/cmake/sip_configure.py
++++ b/cmake/sip_configure.py
+@@ -145,5 +145,14 @@ def split_paths(paths):
+ else:
+     makefile.extra_cxxflags.append('-std=c++14')
+ 
++# Finalise the Makefile, preparing it to be saved to disk
++makefile.finalise()
++
++# Replace Qt variables from libraries
++libs = makefile.LIBS.as_list()
++for i in range(len(libs)):
++    libs[i] = libs[i].replace('$$[QT_INSTALL_LIBS]', config.build_macros()['LIBDIR_QT'])
++makefile.LIBS.set(libs)
++
+ # Generate the Makefile itself
+ makefile.generate()
diff --git a/dev-ros/python_qt_binding/python_qt_binding-0.3.2.ebuild b/dev-ros/python_qt_binding/python_qt_binding-0.3.2.ebuild
deleted file mode 100644
index 5309c2893fbe..000000000000
--- a/dev-ros/python_qt_binding/python_qt_binding-0.3.2.ebuild
+++ /dev/null
@@ -1,20 +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-visualization/python_qt_binding"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/python_qt_binding/python_qt_binding-0.3.3.ebuild b/dev-ros/python_qt_binding/python_qt_binding-0.3.5-r1.ebuild
index 5309c2893fbe..f74ff22c2b2e 100644
--- a/dev-ros/python_qt_binding/python_qt_binding-0.3.3.ebuild
+++ b/dev-ros/python_qt_binding/python_qt_binding-0.3.5-r1.ebuild
@@ -18,3 +18,4 @@ RDEPEND="
 	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/var.patch" )
diff --git a/dev-ros/qt_gui_cpp/Manifest b/dev-ros/qt_gui_cpp/Manifest
index 642c118d5e43..49de18ceb811 100644
--- a/dev-ros/qt_gui_cpp/Manifest
+++ b/dev-ros/qt_gui_cpp/Manifest
@@ -1,11 +1,5 @@
 AUX libdir.patch 1151 BLAKE2B f78ed19cff2df00514da0e60b6cfbda581443a0b7b1515a7c40d1a9518391611de3c5ff9eed6091ac2dbbdff168aba14239ac21754657541aa5b6e053e19aa7d SHA512 a6393e452f9a2a2517d35e2edb069f94acc8461dfda631c3183099a9b8bf6aa79bd5747ef1e1275637ad3fbbca67bab0aa9bcb21dce1f3eb67ed2600ceffe657
-DIST qt_gui_core-0.3.10.tar.gz 91569 BLAKE2B 04c764e49c5dc1126d0f87e1c53109748dc11b38e94f242d44fca56e8334eaae3469f2299f9c2c4eef536264d1fd5c3ba5d8dbff0fc809afdb36d0b2a35ea669 SHA512 76c418315453d975ae2901e1d33205f3471ff540fac3be9834a567d4763400688aaedf3d172d45cc2f39652055446085a3ea65c7acca679e271333d8ca6ed3fa
 DIST qt_gui_core-0.3.11.tar.gz 91640 BLAKE2B 49615e039ea7a2586679c6d6ffd9a583a16c2087b1c1090885ca83894aa98d44efc10c7bb622068ac49eb8c70eac98a5f495e3b417b3750171c31b433c53bfad SHA512 f83abd1d75ea6794fc25da79912a629bd13167bbe2815c9616a0e1a8993a4730053fc737cb864ba01ac869d9aec85269d2e1a19d963a50b8469e6d073e55db9a
-DIST qt_gui_core-0.3.8.tar.gz 91248 BLAKE2B 9ed159b8d065e7b2a44dcf9ac496a699675e5ec41d5ed222413894f098e122b092c976c934dc37a99846e0fe80858fb377bf937b3eabc3f0c6df126de7944e88 SHA512 aec926adffc9f1ab84d7d5cccb207d87254496b37e9e2e4c430de191917823424751206647d61821a65dec0aad3241dab22c85f21980fbe1a4bf114bb2c29d70
-DIST qt_gui_core-0.3.9.tar.gz 91495 BLAKE2B c0f2f2b9231a42da68c0032bfb192a47060f4b0915952b77750985be00023f22678480605990a79016b8ed906cacbdb9cd7eafabbb917b06f891f6b7817a999c SHA512 3e7e45001f1749e3ca75c6b33e3e7a131a314a5ec66925b86f2617f6f749f4c2093d33420bbe0f148faa44fb1fb3071241e47180d3c56ed9d1f7a2befb006a95
-EBUILD qt_gui_cpp-0.3.10.ebuild 745 BLAKE2B b4c55f12bd7cb313436c2267d56d2e9af5ea75d4542053309708a47b4beb0e904f3caac9dfe5a79fcecd5fb990ce73d44405c1277b54789ab44afca1fe3e884c SHA512 7bf57c06abef1e07e5fa74fa5a98f3b8a45da55d5b2c689635d2493433d0d0d8c55b77ba66616c460031443f076113dd5f8809adf9b526719ea4874237ae0006
 EBUILD qt_gui_cpp-0.3.11.ebuild 745 BLAKE2B b4c55f12bd7cb313436c2267d56d2e9af5ea75d4542053309708a47b4beb0e904f3caac9dfe5a79fcecd5fb990ce73d44405c1277b54789ab44afca1fe3e884c SHA512 7bf57c06abef1e07e5fa74fa5a98f3b8a45da55d5b2c689635d2493433d0d0d8c55b77ba66616c460031443f076113dd5f8809adf9b526719ea4874237ae0006
-EBUILD qt_gui_cpp-0.3.8-r1.ebuild 745 BLAKE2B 2f7e609d3f4336951307b9ba559969a437bf68f44a4695d333791fb9ccc7057a23c85048060812b232bc9c20ffd1a0c3c96bd341c53fb0bbda12230815c6be1d SHA512 776fa23e75d92cbf557fbcee6742f0fd18dbac87af5aa3640aded8e5775c59eac1294c22403bbf86a8ada2c205ca629e88f627ac82bffcd2f01c3e19f2c87060
-EBUILD qt_gui_cpp-0.3.9.ebuild 745 BLAKE2B b4c55f12bd7cb313436c2267d56d2e9af5ea75d4542053309708a47b4beb0e904f3caac9dfe5a79fcecd5fb990ce73d44405c1277b54789ab44afca1fe3e884c SHA512 7bf57c06abef1e07e5fa74fa5a98f3b8a45da55d5b2c689635d2493433d0d0d8c55b77ba66616c460031443f076113dd5f8809adf9b526719ea4874237ae0006
 EBUILD qt_gui_cpp-9999.ebuild 745 BLAKE2B 2f7e609d3f4336951307b9ba559969a437bf68f44a4695d333791fb9ccc7057a23c85048060812b232bc9c20ffd1a0c3c96bd341c53fb0bbda12230815c6be1d SHA512 776fa23e75d92cbf557fbcee6742f0fd18dbac87af5aa3640aded8e5775c59eac1294c22403bbf86a8ada2c205ca629e88f627ac82bffcd2f01c3e19f2c87060
 MISC metadata.xml 343 BLAKE2B 518da938afd557552bcb4eec225723207d73325a348640eb5280137715941f95190d8be30f52d1773e97cb80c9ed25b34d60ed7cfdbb5425e6b6d30bb1a2050b SHA512 88a9c15a6f681122449cff3b89c4805a0a9ee5d579e1eb98f4814e6e57d3adafb0e370986a6e68c555880b80fb900d74ffd4cb19a670c15e3d0f5fa383e39810
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.10.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.10.ebuild
deleted file mode 100644
index a52422eff7b2..000000000000
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.10.ebuild
+++ /dev/null
@@ -1,34 +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-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	>=dev-ros/pluginlib-1.9.23
-		dev-libs/tinyxml2:=
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-	dev-libs/tinyxml
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}/libdir.patch"
-)
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.8-r1.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.8-r1.ebuild
deleted file mode 100644
index 0216c3788c0b..000000000000
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.8-r1.ebuild
+++ /dev/null
@@ -1,34 +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-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	>=dev-ros/pluginlib-1.9.23
-		dev-libs/tinyxml2:=
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-	dev-libs/tinyxml
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}/libdir.patch"
-)
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.9.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.9.ebuild
deleted file mode 100644
index a52422eff7b2..000000000000
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.9.ebuild
+++ /dev/null
@@ -1,34 +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-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	>=dev-ros/pluginlib-1.9.23
-		dev-libs/tinyxml2:=
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-	dev-libs/tinyxml
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}/libdir.patch"
-)
diff --git a/dev-ros/rosserial_server/Manifest b/dev-ros/rosserial_server/Manifest
index 5e8a2cf69384..42c604f67fd1 100644
--- a/dev-ros/rosserial_server/Manifest
+++ b/dev-ros/rosserial_server/Manifest
@@ -1,13 +1,5 @@
-AUX boost162.patch 2859 BLAKE2B f8555ab6ed3adf3062061b1d226a9ce79d51769021db54d345fc2d6759cda50a72da3333ce4fbd19ea1a5e085e8cde0ebe169c5bca6b509e2508cf8da658b9b6 SHA512 81ce80b1c72f39fc8edf5859564f1c470c5f1cb89b6d1f032f7ea155b099ca1736a04d6e5f3110fc3ba95dc23c37c625718fe6a588d36166ba3605a69042dc71
-DIST rosserial-0.7.4.tar.gz 150244 BLAKE2B 57cc4711f42506587cc6e004f321fe4f4f1ba4e1843a3370ecc50ccb7a26912a4896b31351afaa8e3a02fa07fe7d2b0bb705d248b5a39925873df76c195aaa1f SHA512 a3b9590aeac0a557bee7fa2aa4b561f2dd83dcaff9033425c77cdeca572f4a4ba8fc30b21a3cd035e454e4997d99f9e6541d54739aa9051b9e22d84710e10e00
-DIST rosserial-0.7.5.tar.gz 150687 BLAKE2B 08026b17b08747fd9b1e23a693349f30ff8406cc50f0bd0c949b9367a2b8845b821d69d25e3d35ce9e552e9aa423471e62399ef95c17e35849fcfd858eae6d75 SHA512 3c9ce00b3d95f6d29360aee3b45cb35339ba8646f0f43f64cf1c3f2e77a7c9edbb4f85b761a21a0a3e73cdd064a59c98f997f408a6e8526641499420a94c8a36
-DIST rosserial-0.7.6.tar.gz 151270 BLAKE2B d4082e2eac6c3b2d80bb7c62b6e830a461b7b379c8bad3ea14e44ca8c054e9c78c9605e6a30f6295cbdefc0c7c57133029ebc9042c2d687e3112a703c69400b8 SHA512 adebd29406644c134ab9216f42c1e84dd245b1b1637e055717dea16e82a559c900726c0f6dd9f61e092a3f137805cc96be6f0b100a59574e0818a0bbfb712ea2
-DIST rosserial-0.7.7.tar.gz 155237 BLAKE2B e0e905c9d58face06ceac0e21aa2c72d07961daa5a37f85df6dc39738b27ffa47a9236f2627705c94185891f7d7291dabb80e10fece2eec2c6b76bcbdba7d32a SHA512 fdf880146b7697592288d3f5341f784e2dbadc9639a0b66458709bdee1725e6ca603215296f85e386bc9ad59ca8c3132daf0c33cfb852c10c7c1715c06ff2384
+AUX boost170.patch 2996 BLAKE2B d34ed939d222fa4d9528e8e6a7f3aaa90ebea944e651f7f25d4f254fec3e3b2c655f242fba7e00e315f54f8eb518309ea8f52de2a29c14d2dcdd5ec5c70c1a56 SHA512 4f0742061fdee931c5a934d5816e801bff30664e3a28e3970bf9e3636c2d8a562ff283a246b83bbabf7e4dfa755964e03c6a5b07d7d667583831cd3b6ed67fcc
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-EBUILD rosserial_server-0.7.4.ebuild 518 BLAKE2B b455a5a1762eefcad84069783614f93c3ecfde49c3053a77d5177fbea4c267b384a1b0ced72420a694e42cc68d5140f28c65a8fc8db107597773f10fa30b021a SHA512 3f80d6d50ee1b1db6cff6894afe8a6ccccdd3b0381132d21307244a61a94265651cf9cd68ab2504f29fc51d2d2431b0249848aa967d5f1ce01cfea3fee887931
-EBUILD rosserial_server-0.7.5.ebuild 477 BLAKE2B 79518fc245f624e1b74b34c87f21518f56ad4279536552b5daa6af93f6bada35ae2d8c3fb402da1b53306eb7726138b71fe67f8d7915cd7359de780404809c62 SHA512 f7fca26dec079fc7bd52b62ffb73da97e8b3b99fb88c32f25f675128883682f3fb536e129b9a3b2caa0283d5225025289992e6a882dcbc369941f499f56e1395
-EBUILD rosserial_server-0.7.6.ebuild 477 BLAKE2B fead5c5372a7d937149e60a5199b713f0f2c65be98e0543198e4762b300a9357f02030ff76587ca723da5f3856ab65e97810884c0a6741d3774d719be8224376 SHA512 bc3775b6682869c1818f0564913f4edaf12cfb25d5b1718ee5549ec9e6ac3153418442bf5a064ac29e18e59a8390d2ba379ba789a1aa6b77476ad1816f200330
-EBUILD rosserial_server-0.7.7.ebuild 477 BLAKE2B fead5c5372a7d937149e60a5199b713f0f2c65be98e0543198e4762b300a9357f02030ff76587ca723da5f3856ab65e97810884c0a6741d3774d719be8224376 SHA512 bc3775b6682869c1818f0564913f4edaf12cfb25d5b1718ee5549ec9e6ac3153418442bf5a064ac29e18e59a8390d2ba379ba789a1aa6b77476ad1816f200330
-EBUILD rosserial_server-0.8.0.ebuild 474 BLAKE2B ead1281a9d9b0623bb781bf19314fef704fd23b68a3faaf0e86f2c3405751fc6a1f65987e3248f99774761b1bc5bff9c2ca44e03b1ad601255420c365f7fef2f SHA512 0debfa6c14ea2f1a2d4b21a605e4eebf6b50078d7b59edad0aadba2b647f9729bfbe939f29d26e3f3b7f4e44a5b87533b79711604283c40d78be69d7acc43c0f
+EBUILD rosserial_server-0.8.0.ebuild 515 BLAKE2B c3d7da30d2933a83dfc9f848cf1aa559249fa145a30be06b22afdce081e0926eeaf673e3be56f05a2056f8944461fdd3be637c0d390fb07a540b388e378686cf SHA512 a95d1df1ca5f73613d82946bce7053ca77308b91677a6cd4ebfd52a67226994faa771f4b025b0334b15f174a533a6bfb5fc75cd8cf562f796839f6e77a879b27
 EBUILD rosserial_server-9999.ebuild 477 BLAKE2B 9b3dc301b81032dd2a4d9d5046f5659d2531cd94283dde61fe0dc634fc4a60300bd90298334c7168f7c8c7ec5fb0e32856cb2f788974f127e08e6a2243faee9b SHA512 be9ca28d3ce9c5e13a57fc8c3fed5f6e8a3a6decd61d504486034638332b5ed666fb4512c833f6eb9b0e01b866cd2d39c6183d501e47d12fa877057b254568f0
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_server/files/boost162.patch b/dev-ros/rosserial_server/files/boost162.patch
deleted file mode 100644
index d644d409f9e6..000000000000
--- a/dev-ros/rosserial_server/files/boost162.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-commit f8a46f3142444c854233a85f7a5ec7b91b5378a6
-Author: Malte Splietker <splietker@users.noreply.github.com>
-Date:   Wed Oct 5 04:26:00 2016 +0200
-
-    Fixing build errors for boost >=1.60 (#226) (#250)
-    
-    Signed-off-by: Malte Splietker <maltespl@mail.upb.de>
-
-diff --git a/rosserial_server/include/rosserial_server/session.h b/rosserial_server/include/rosserial_server/session.h
-index 86b9baa..ebd109a 100644
---- a/rosserial_server/include/rosserial_server/session.h
-+++ b/rosserial_server/include/rosserial_server/session.h
-@@ -499,7 +499,7 @@ private:
-   boost::asio::deadline_timer ros_spin_timer_;
-   std::string require_param_name_;
- 
--  std::map<uint16_t, boost::function<void(ros::serialization::IStream)> > callbacks_;
-+  std::map<uint16_t, boost::function<void(ros::serialization::IStream&)> > callbacks_;
-   std::map<uint16_t, PublisherPtr> publishers_;
-   std::map<uint16_t, SubscriberPtr> subscribers_;
-   std::map<std::string, ServiceClientPtr> services_;
-diff --git a/rosserial_server/include/rosserial_server/topic_handlers.h b/rosserial_server/include/rosserial_server/topic_handlers.h
-index 666f3fc..2f367c3 100644
---- a/rosserial_server/include/rosserial_server/topic_handlers.h
-+++ b/rosserial_server/include/rosserial_server/topic_handlers.h
-@@ -93,7 +93,7 @@ typedef boost::shared_ptr<Publisher> PublisherPtr;
- class Subscriber {
- public:
-   Subscriber(ros::NodeHandle& nh, rosserial_msgs::TopicInfo& topic_info,
--      boost::function<void(std::vector<uint8_t> buffer)> write_fn)
-+      boost::function<void(std::vector<uint8_t>& buffer)> write_fn)
-     : write_fn_(write_fn) {
-     ros::SubscribeOptions opts;
-     opts.init<topic_tools::ShapeShifter>(
-@@ -119,7 +119,7 @@ private:
-   }
- 
-   ros::Subscriber subscriber_;
--  boost::function<void(std::vector<uint8_t> buffer)> write_fn_;
-+  boost::function<void(std::vector<uint8_t>& buffer)> write_fn_;
- };
- 
- typedef boost::shared_ptr<Subscriber> SubscriberPtr;
-@@ -127,7 +127,7 @@ typedef boost::shared_ptr<Subscriber> SubscriberPtr;
- class ServiceClient {
- public:
-   ServiceClient(ros::NodeHandle& nh, rosserial_msgs::TopicInfo& topic_info,
--      boost::function<void(std::vector<uint8_t> buffer, const uint16_t topic_id)> write_fn)
-+      boost::function<void(std::vector<uint8_t>& buffer, const uint16_t topic_id)> write_fn)
-     : write_fn_(write_fn) {
-     topic_id_ = -1;
-     if (!service_info_service_.isValid()) {
-@@ -185,7 +185,7 @@ private:
-   topic_tools::ShapeShifter response_message_;
-   ros::ServiceClient service_client_;
-   static ros::ServiceClient service_info_service_;
--  boost::function<void(std::vector<uint8_t> buffer, const uint16_t topic_id)> write_fn_;
-+  boost::function<void(std::vector<uint8_t>& buffer, const uint16_t topic_id)> write_fn_;
-   std::string service_md5_;
-   std::string request_message_md5_;
-   std::string response_message_md5_;
diff --git a/dev-ros/rosserial_server/files/boost170.patch b/dev-ros/rosserial_server/files/boost170.patch
new file mode 100644
index 000000000000..cbf106fc9acd
--- /dev/null
+++ b/dev-ros/rosserial_server/files/boost170.patch
@@ -0,0 +1,71 @@
+Index: rosserial_server/include/rosserial_server/async_read_buffer.h
+===================================================================
+--- rosserial_server.orig/include/rosserial_server/async_read_buffer.h
++++ rosserial_server/include/rosserial_server/async_read_buffer.h
+@@ -166,7 +166,7 @@ private:
+ 
+     // Post the callback rather than executing it here so, so that we have a chance to do the cleanup
+     // below prior to it actually getting run, in the event that the callback queues up another read.
+-    stream_.get_io_service().post(boost::bind(read_success_callback_, stream));
++    static_cast<boost::asio::io_service&>(stream_.get_executor().context()).post(boost::bind(read_success_callback_, stream));
+ 
+     // Resetting these values clears our state so that we know there isn't a callback pending.
+     read_requested_bytes_ = 0;
+Index: rosserial_server/include/rosserial_server/udp_stream.h
+===================================================================
+--- rosserial_server.orig/include/rosserial_server/udp_stream.h
++++ rosserial_server/include/rosserial_server/udp_stream.h
+@@ -48,7 +48,6 @@ namespace rosserial_server
+ {
+ 
+ using boost::asio::ip::udp;
+-using boost::asio::handler_type;
+ 
+ 
+ class UdpStream : public udp::socket
+@@ -62,9 +61,9 @@ public:
+   {
+     boost::system::error_code ec;
+     const protocol_type protocol = server_endpoint.protocol();
+-    this->get_service().open(this->get_implementation(), protocol, ec);
++    udp::socket::open(protocol, ec);
+     boost::asio::detail::throw_error(ec, "open");
+-    this->get_service().bind(this->get_implementation(), server_endpoint, ec);
++    bind(server_endpoint, ec);
+     boost::asio::detail::throw_error(ec, "bind");
+ 
+     client_endpoint_ = client_endpoint;
+@@ -76,6 +75,8 @@ public:
+   async_write_some(const ConstBufferSequence& buffers,
+       BOOST_ASIO_MOVE_ARG(WriteHandler) handler)
+   {
++    return async_send(buffers, handler);
++#if 0
+     // If you get an error on the following line it means that your handler does
+     // not meet the documented type requirements for a WriteHandler.
+     BOOST_ASIO_WRITE_HANDLER_CHECK(WriteHandler, handler) type_check;
+@@ -94,6 +95,7 @@ public:
+         this->get_implementation(), buffers, client_endpoint_, 0,
+         BOOST_ASIO_MOVE_CAST(WriteHandler)(handler));
+ #endif
++#endif
+   }
+ 
+   template <typename MutableBufferSequence, typename ReadHandler>
+@@ -102,6 +104,8 @@ public:
+   async_read_some(const MutableBufferSequence& buffers,
+       BOOST_ASIO_MOVE_ARG(ReadHandler) handler)
+   {
++    return async_receive(buffers, handler);
++#if 0
+     // If you get an error on the following line it means that your handler does
+     // not meet the documented type requirements for a ReadHandler.
+     BOOST_ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check;
+@@ -119,6 +123,7 @@ public:
+         this->get_implementation(), buffers, client_endpoint_, 0,
+         BOOST_ASIO_MOVE_CAST(ReadHandler)(handler));
+ #endif
++#endif
+   }
+ 
+ private:
diff --git a/dev-ros/rosserial_server/rosserial_server-0.7.4.ebuild b/dev-ros/rosserial_server/rosserial_server-0.7.4.ebuild
deleted file mode 100644
index da37baf0378a..000000000000
--- a/dev-ros/rosserial_server/rosserial_server-0.7.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the rosserial server side"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/topic_tools
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/boost162.patch" )
diff --git a/dev-ros/rosserial_server/rosserial_server-0.7.5.ebuild b/dev-ros/rosserial_server/rosserial_server-0.7.5.ebuild
deleted file mode 100644
index 305a25dc9b21..000000000000
--- a/dev-ros/rosserial_server/rosserial_server-0.7.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the rosserial server side"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/topic_tools
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_server/rosserial_server-0.7.6.ebuild b/dev-ros/rosserial_server/rosserial_server-0.7.6.ebuild
deleted file mode 100644
index 813f62d5eb64..000000000000
--- a/dev-ros/rosserial_server/rosserial_server-0.7.6.ebuild
+++ /dev/null
@@ -1,22 +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-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the rosserial server side"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/topic_tools
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_server/rosserial_server-0.7.7.ebuild b/dev-ros/rosserial_server/rosserial_server-0.7.7.ebuild
deleted file mode 100644
index 813f62d5eb64..000000000000
--- a/dev-ros/rosserial_server/rosserial_server-0.7.7.ebuild
+++ /dev/null
@@ -1,22 +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-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the rosserial server side"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/topic_tools
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild b/dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild
index 93bba24008f8..37c1c17be5dd 100644
--- a/dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild
+++ b/dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,3 +20,4 @@ RDEPEND="
 	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/sound_play/Manifest b/dev-ros/sound_play/Manifest
deleted file mode 100644
index 2571d94e7668..000000000000
--- a/dev-ros/sound_play/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST audio_common-0.3.1.tar.gz 184749 BLAKE2B 3404c419962dc6bf22f63a36bf43cb8d7509244f84a2a3407717ee31f1be56e22e352e714310d69b9ee280d0aa1d13df3cdbcbb0a42a47f3d3408cb42e3ddfa5 SHA512 3accd7d0ff91ce70c643747ae0b4db4c11bbd6b93dda02c1934d23a900b6bf286e72461e296fe1e0d49ebadd99c3ca1b042db8feddc9cca2ae70a0caccea7147
-DIST audio_common-0.3.2.tar.gz 187214 BLAKE2B 12708d58c9ba28477f5f42866310aedaba66f647b20064b41675befe63f095a08b077e6082ec7969db7c626eb7576ac108c4a1f492083b3554b93ac0c56a6415 SHA512 bdd28e05f45b177c22e64bba168a722ff9b7bdf72f9b11a86bcc08ba7f9edfed83793f87aa5479354dff10a5834f13363f6986a63f60c0af965006b837df1508
-DIST audio_common-0.3.3.tar.gz 187239 BLAKE2B 2a7172a68d2a0561c4aa20923f3ed5682d41f6e09c1b7b7cedfd9c7ebf0f03302749355a6c36fdd6dd8c6cad5994e2fe0530e16a6514b6ca33269da5be907a73 SHA512 8cfd17ac065ce6379085183b07ca85299d7e2dc17077d41d1b690e72b707ce076d88e84b1fdf639e0290309f3ea19a7d8a1e185113c081f32a2372e1874b7036
-EBUILD sound_play-0.3.1.ebuild 883 BLAKE2B ce92dce9d12107ea31d5ff1ad4175d43be03255a8a4c9d1cca3b032a99674d0161951c80633452b70760980bab9aa10e05687031636a0e49dd288737b3d9f84f SHA512 061d07513c20b8cf7ee0deb675526be846daa56dd71c947e0f066f68e015a79f8617018db0a6685a6e8492bff45a6a09a671c234885ebb0c3fb2d31f68b024fe
-EBUILD sound_play-0.3.2.ebuild 883 BLAKE2B 6a2e3a80d19fddcca1a18f02fbe68b6097edf83459d9731b356e7413ed4e51f21728ba8962d16250f7047e541e5a365dcb3a0867f1dafb546a01be10b821a591 SHA512 8b3458348592d723ae469aa7619e984063ea3a6ca8e8fe7916d36480c675e3cc14b95aa5fa6b5ead5d0d2f4999401ecd8569fe41cca846a569903be06ab210da
-EBUILD sound_play-0.3.3.ebuild 883 BLAKE2B 6a2e3a80d19fddcca1a18f02fbe68b6097edf83459d9731b356e7413ed4e51f21728ba8962d16250f7047e541e5a365dcb3a0867f1dafb546a01be10b821a591 SHA512 8b3458348592d723ae469aa7619e984063ea3a6ca8e8fe7916d36480c675e3cc14b95aa5fa6b5ead5d0d2f4999401ecd8569fe41cca846a569903be06ab210da
-EBUILD sound_play-9999.ebuild 883 BLAKE2B ce92dce9d12107ea31d5ff1ad4175d43be03255a8a4c9d1cca3b032a99674d0161951c80633452b70760980bab9aa10e05687031636a0e49dd288737b3d9f84f SHA512 061d07513c20b8cf7ee0deb675526be846daa56dd71c947e0f066f68e015a79f8617018db0a6685a6e8492bff45a6a09a671c234885ebb0c3fb2d31f68b024fe
-MISC metadata.xml 338 BLAKE2B 8dc3e58c3c56a7cc0d39ca8ac7c62cf4a315a6f3fc9ad8c1d36596fd7bde5f09f7baf8b6ff36de20b460d7049d792451dae7cc7ce22e5dc3da64b442918d9a35 SHA512 40fedee9626fb1f621315a3e0c25f469eb98b67a391cfbabcafd5971079b33f4c8d1bc61523b8c2e914d7d7b7a6ddb50d1071beff80f30d263fec27586c9c1a5
diff --git a/dev-ros/sound_play/metadata.xml b/dev-ros/sound_play/metadata.xml
deleted file mode 100644
index 73c3483f9803..000000000000
--- a/dev-ros/sound_play/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/audio_common</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/sound_play/sound_play-0.3.1.ebuild b/dev-ros/sound_play/sound_play-0.3.1.ebuild
deleted file mode 100644
index 218675dbdc7e..000000000000
--- a/dev-ros/sound_play/sound_play-0.3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS node that translates commands on a ROS topic (robotsound) into sounds"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib
-	media-libs/gstreamer:1.0
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	dev-python/gst-python[${PYTHON_USEDEP}]
-	app-accessibility/festival
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
diff --git a/dev-ros/sound_play/sound_play-0.3.2.ebuild b/dev-ros/sound_play/sound_play-0.3.2.ebuild
deleted file mode 100644
index c6c2efd7eed4..000000000000
--- a/dev-ros/sound_play/sound_play-0.3.2.ebuild
+++ /dev/null
@@ -1,34 +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-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS node that translates commands on a ROS topic (robotsound) into sounds"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib
-	media-libs/gstreamer:1.0
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	dev-python/gst-python[${PYTHON_USEDEP}]
-	app-accessibility/festival
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
diff --git a/dev-ros/sound_play/sound_play-0.3.3.ebuild b/dev-ros/sound_play/sound_play-0.3.3.ebuild
deleted file mode 100644
index c6c2efd7eed4..000000000000
--- a/dev-ros/sound_play/sound_play-0.3.3.ebuild
+++ /dev/null
@@ -1,34 +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-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS node that translates commands on a ROS topic (robotsound) into sounds"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib
-	media-libs/gstreamer:1.0
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	dev-python/gst-python[${PYTHON_USEDEP}]
-	app-accessibility/festival
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
diff --git a/dev-ros/sound_play/sound_play-9999.ebuild b/dev-ros/sound_play/sound_play-9999.ebuild
deleted file mode 100644
index 218675dbdc7e..000000000000
--- a/dev-ros/sound_play/sound_play-9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS node that translates commands on a ROS topic (robotsound) into sounds"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib
-	media-libs/gstreamer:1.0
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	dev-python/gst-python[${PYTHON_USEDEP}]
-	app-accessibility/festival
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
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" )
diff --git a/dev-ros/turtle_tf/Manifest b/dev-ros/turtle_tf/Manifest
index 26e7f3f340a1..e139c196d00d 100644
--- a/dev-ros/turtle_tf/Manifest
+++ b/dev-ros/turtle_tf/Manifest
@@ -1,4 +1,4 @@
 DIST geometry_tutorials-0.2.2.tar.gz 15148 BLAKE2B 459d2661ef9b21ebf465097c6fb4f01dee2b3d96b0dd6494fe91996513a60764747b2844f931f7351bcea59698e52fcf1d821ce5484ca0bb8b2e1501bdb5492f SHA512 5a6fe2e26d11d3fe8c1fc6979d1d76b13b01df23ef1f0d5e5df094aa0441e1ded33d2402b88be1143a88002ecde2a6bddc3b03efca713bd5521c68de2e054548
-EBUILD turtle_tf-0.2.2.ebuild 639 BLAKE2B 3ff434ac252c9c44b4fbbd0f3e23833938b31d54c253d355c2dfd06db347fca875d507f3985a6827df09a18c2e2ce33e01a0834ec7a4eb0164e7c6080cbcb4e6 SHA512 8b91c226e36b6cc29f2beeb7732a1ffb057a09acfee3133b7d48b3f1c23752d012da8329f5b2cc60f50f2c717530acc96ff4b27428621a90ec9d64b7e82e4746
-EBUILD turtle_tf-9999.ebuild 639 BLAKE2B 3ff434ac252c9c44b4fbbd0f3e23833938b31d54c253d355c2dfd06db347fca875d507f3985a6827df09a18c2e2ce33e01a0834ec7a4eb0164e7c6080cbcb4e6 SHA512 8b91c226e36b6cc29f2beeb7732a1ffb057a09acfee3133b7d48b3f1c23752d012da8329f5b2cc60f50f2c717530acc96ff4b27428621a90ec9d64b7e82e4746
+EBUILD turtle_tf-0.2.2-r1.ebuild 654 BLAKE2B d556aefec8b67ea6295af072a78f9376a88d49d1a02e06a7e2708e35186c3e0ab0ea1236ad6ba66d7c806039e69190229b8cd17d67a53bc7958a5d3acaade21b SHA512 a90c2e1e1a4cd9763638b516c20d4e95a7e7a3458421200f0022b2ce6ff0c4573d4cc205205802864bd4e31cf1ccaa97ea9d0e9079f1da6d95984d4589867f51
+EBUILD turtle_tf-9999.ebuild 654 BLAKE2B d556aefec8b67ea6295af072a78f9376a88d49d1a02e06a7e2708e35186c3e0ab0ea1236ad6ba66d7c806039e69190229b8cd17d67a53bc7958a5d3acaade21b SHA512 a90c2e1e1a4cd9763638b516c20d4e95a7e7a3458421200f0022b2ce6ff0c4573d4cc205205802864bd4e31cf1ccaa97ea9d0e9079f1da6d95984d4589867f51
 MISC metadata.xml 336 BLAKE2B d96d84717f479ca09194af211cae6924a342d43f2007badbe36f8986ce87000b5ee576a796dccbe741707dbeec730100c3a6f0a217bbceaae13b8397627ddf57 SHA512 79de9c6a61f56c0a03ff7eb31ba09215ff77e79a35980d3a63cbfd38cd4d5f84b0a8d6074aeb0d281884bcba981aa8467695a9249fdd644579eabc8bfe787da0
diff --git a/dev-ros/turtle_tf/turtle_tf-0.2.2.ebuild b/dev-ros/turtle_tf/turtle_tf-0.2.2-r1.ebuild
index 885c2dd1ccbc..382e9bc485cd 100644
--- a/dev-ros/turtle_tf/turtle_tf-0.2.2.ebuild
+++ b/dev-ros/turtle_tf/turtle_tf-0.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,5 +21,6 @@ RDEPEND="
 	dev-ros/turtlesim[${PYTHON_USEDEP}]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_tf/turtle_tf-9999.ebuild b/dev-ros/turtle_tf/turtle_tf-9999.ebuild
index 885c2dd1ccbc..382e9bc485cd 100644
--- a/dev-ros/turtle_tf/turtle_tf-9999.ebuild
+++ b/dev-ros/turtle_tf/turtle_tf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,5 +21,6 @@ RDEPEND="
 	dev-ros/turtlesim[${PYTHON_USEDEP}]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_tf2/Manifest b/dev-ros/turtle_tf2/Manifest
index 4d886cb4aa42..529737e45ac5 100644
--- a/dev-ros/turtle_tf2/Manifest
+++ b/dev-ros/turtle_tf2/Manifest
@@ -1,4 +1,4 @@
 DIST geometry_tutorials-0.2.2.tar.gz 15148 BLAKE2B 459d2661ef9b21ebf465097c6fb4f01dee2b3d96b0dd6494fe91996513a60764747b2844f931f7351bcea59698e52fcf1d821ce5484ca0bb8b2e1501bdb5492f SHA512 5a6fe2e26d11d3fe8c1fc6979d1d76b13b01df23ef1f0d5e5df094aa0441e1ded33d2402b88be1143a88002ecde2a6bddc3b03efca713bd5521c68de2e054548
-EBUILD turtle_tf2-0.2.2.ebuild 658 BLAKE2B 0128d45162c09334cf5ad8e1ec62fd4ae4c774fe97dba117cfdbb21b37d95445d9aa83112c547fb74d969816a5947455145bd8a274bc630990d6107811875d1e SHA512 9f401fe02153448a2e7cff0072ed6054679c9a711c0428d72801b2af43fd951cc696e9c32be37aa30fde6e3d17f6d3bdc23e118f0ffe9deacd8301548db3106e
-EBUILD turtle_tf2-9999.ebuild 658 BLAKE2B 0128d45162c09334cf5ad8e1ec62fd4ae4c774fe97dba117cfdbb21b37d95445d9aa83112c547fb74d969816a5947455145bd8a274bc630990d6107811875d1e SHA512 9f401fe02153448a2e7cff0072ed6054679c9a711c0428d72801b2af43fd951cc696e9c32be37aa30fde6e3d17f6d3bdc23e118f0ffe9deacd8301548db3106e
+EBUILD turtle_tf2-0.2.2-r1.ebuild 673 BLAKE2B d78c85601295d95e7c6e5184cd6534475ad46b461ef3cc463cd2e4f2172adc824d70a077c42f20250d072b2fd3e6d5504f85311bfd1a71d0881a23e0abc74b78 SHA512 09361b68326c63dedb0b4bc1b8fc50dbf2f9de47d8a6fc2f8b82fb8600e7d9474c3baa6c9e8cc57288a4616cba635204d4f56f4f012dd9c58ae4e8c608bfa351
+EBUILD turtle_tf2-9999.ebuild 673 BLAKE2B d78c85601295d95e7c6e5184cd6534475ad46b461ef3cc463cd2e4f2172adc824d70a077c42f20250d072b2fd3e6d5504f85311bfd1a71d0881a23e0abc74b78 SHA512 09361b68326c63dedb0b4bc1b8fc50dbf2f9de47d8a6fc2f8b82fb8600e7d9474c3baa6c9e8cc57288a4616cba635204d4f56f4f012dd9c58ae4e8c608bfa351
 MISC metadata.xml 336 BLAKE2B d96d84717f479ca09194af211cae6924a342d43f2007badbe36f8986ce87000b5ee576a796dccbe741707dbeec730100c3a6f0a217bbceaae13b8397627ddf57 SHA512 79de9c6a61f56c0a03ff7eb31ba09215ff77e79a35980d3a63cbfd38cd4d5f84b0a8d6074aeb0d281884bcba981aa8467695a9249fdd644579eabc8bfe787da0
diff --git a/dev-ros/turtle_tf2/turtle_tf2-0.2.2.ebuild b/dev-ros/turtle_tf2/turtle_tf2-0.2.2-r1.ebuild
index 750c1ccbd2e4..317903b4fac6 100644
--- a/dev-ros/turtle_tf2/turtle_tf2-0.2.2.ebuild
+++ b/dev-ros/turtle_tf2/turtle_tf2-0.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,5 +22,6 @@ RDEPEND="
 	dev-ros/turtlesim[${PYTHON_USEDEP}]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_tf2/turtle_tf2-9999.ebuild b/dev-ros/turtle_tf2/turtle_tf2-9999.ebuild
index 750c1ccbd2e4..317903b4fac6 100644
--- a/dev-ros/turtle_tf2/turtle_tf2-9999.ebuild
+++ b/dev-ros/turtle_tf2/turtle_tf2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,5 +22,6 @@ RDEPEND="
 	dev-ros/turtlesim[${PYTHON_USEDEP}]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/visp_auto_tracker/Manifest b/dev-ros/visp_auto_tracker/Manifest
index 5a169e41f614..2be54bfb5b7f 100644
--- a/dev-ros/visp_auto_tracker/Manifest
+++ b/dev-ros/visp_auto_tracker/Manifest
@@ -1,10 +1,7 @@
+AUX boost170.patch 497 BLAKE2B 3ff7f23fe562d9597bd379123721a24a6b949d38ceddce49c4dd0a12d4e6597704511c31fc133ce4d3bb8897c725c6ab207d9330482287ecb44830fb16765e65 SHA512 489454810cb6fa313ac24668c655e59e9a520c32548f9df3b7d0529f0e6a7fc83691a0f2b48d9b1f3f74fc77738e79e06fb0f32fce427c3aff3fa76886b71be7
 DIST vision_visp-0.10.0.tar.gz 1015180 BLAKE2B bf0474d0633a6b704077e232d4676e6ebb9ec666b9b03792dbb929c6c6d1c52a941f7a4517f7bc6a7150882c16ba719eb3cf17c3fbdd13df109eab3a34afa259 SHA512 8e2652d6ca9c9535f1bebb628ec908f64c9fc89358bc92ed42ef12430b0b28c8ed3ed7935d2d3fe03c9761f9ac08e200eb59839ee2243df62d5934e8162cca9c
-DIST vision_visp-0.8.0.tar.gz 1010996 BLAKE2B 4bd5947ddc5c39ae107ea0ff4127ca3f6b9f705793efa4301f10ea2f46e4957c04a64d0df3d84d613a1c1b91c04ff8c6c0e578ea7d4e6420a5bb6974081cf971 SHA512 2bf2d69b6e19de21b34869858672662162703ff8b2aea85fdb9a6dafa88d8fe1f97d18587e863f3f7c088697e931a1b6e4e2e37f31fc7caff0906e98debbad1a
-DIST vision_visp-0.9.1.tar.gz 1014625 BLAKE2B e2d4c6a05e9f155090bf450eaf53ccb9226d5a2fc8ed94d5a548985e870be0fdc57191a5056161a03105c4660acee6fc1353ff8be12b19ee0bd536685cb21795 SHA512 f9ce23286fd9c7706364e9d63e6fb3881bad759aeea72313e5d2a24347f152ba90aab1c73d1b468ed3319e99f0a2bcb81208302825c83be686b9528f3b07469e
-DIST vision_visp-0.9.3.tar.gz 1014883 BLAKE2B 45dcc7b6fc7f80986c57ab92b31ce85ec7806206903b79363e0eb54467043a63300f37fa15292174be3638898acdeb2c3b3a468c11e7ab0ef689b40b8f2c899e SHA512 e5775e410efefaaac00cdfaf07b65f9f77ade0e7d6f40b3d8345d7b594520f46741f56039c1eb0193c57287bafbddf8e755e10d6f85cc12ddefb2b997681f44a
+DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
 EBUILD visp_auto_tracker-0.10.0.ebuild 823 BLAKE2B 057ac6a5573c0d918d421bc327d516fdce3102e8b45d9f7b82ab493b1155cde822a18a181d717939c54f556910cecc0fa62c11141a338b48b9431b5de4209a39 SHA512 e022bf96aa850a4c687ce12d66d695d8e4d26fe569cd79ec8ace67e9fad25b61ca080a8db156e98a082bff56aff6a338da04f6bfc1b0df1e9f9d4bac0ad26719
-EBUILD visp_auto_tracker-0.8.0.ebuild 817 BLAKE2B 41b9a81e16d441dc2cf06bbe5ca6023349a923e50ed16327639001403db82a7e376442e7eb62a7150261dfcd8d6cf208fa6bad1072ed168b3bdccfd7db83432b SHA512 9ea3649c0e37dc9c13e9386980d2b6cfaf0e94e6d9a4b1ca090633ba9c5faf81b7291ae2fe1ad611f33905d2dcc3f83987d374b598a3d8f26b1b68fe865c17ca
-EBUILD visp_auto_tracker-0.9.1.ebuild 817 BLAKE2B 41b9a81e16d441dc2cf06bbe5ca6023349a923e50ed16327639001403db82a7e376442e7eb62a7150261dfcd8d6cf208fa6bad1072ed168b3bdccfd7db83432b SHA512 9ea3649c0e37dc9c13e9386980d2b6cfaf0e94e6d9a4b1ca090633ba9c5faf81b7291ae2fe1ad611f33905d2dcc3f83987d374b598a3d8f26b1b68fe865c17ca
-EBUILD visp_auto_tracker-0.9.3.ebuild 823 BLAKE2B 057ac6a5573c0d918d421bc327d516fdce3102e8b45d9f7b82ab493b1155cde822a18a181d717939c54f556910cecc0fa62c11141a338b48b9431b5de4209a39 SHA512 e022bf96aa850a4c687ce12d66d695d8e4d26fe569cd79ec8ace67e9fad25b61ca080a8db156e98a082bff56aff6a338da04f6bfc1b0df1e9f9d4bac0ad26719
+EBUILD visp_auto_tracker-0.11.1.ebuild 862 BLAKE2B 3676e0cffd02b7a817e56f65daf927dade01accc138e9613ffb3ce792ba8c00b9b8986fc3258b3ad4fb2f153a1b281fa9bfcc078e1d9f6124974038fd323cd4e SHA512 22294bd0393d4e07a44d93ed52c30121ed98356851e9c73a46939cb623662671c3840f13f3192ae69f5e97419aafa5bb594c1ef1fe677697b252b5b84da480ba
 EBUILD visp_auto_tracker-9999.ebuild 823 BLAKE2B 057ac6a5573c0d918d421bc327d516fdce3102e8b45d9f7b82ab493b1155cde822a18a181d717939c54f556910cecc0fa62c11141a338b48b9431b5de4209a39 SHA512 e022bf96aa850a4c687ce12d66d695d8e4d26fe569cd79ec8ace67e9fad25b61ca080a8db156e98a082bff56aff6a338da04f6bfc1b0df1e9f9d4bac0ad26719
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_auto_tracker/files/boost170.patch b/dev-ros/visp_auto_tracker/files/boost170.patch
new file mode 100644
index 000000000000..47f04d4989a3
--- /dev/null
+++ b/dev-ros/visp_auto_tracker/files/boost170.patch
@@ -0,0 +1,13 @@
+Index: visp_auto_tracker/CMakeLists.txt
+===================================================================
+--- visp_auto_tracker.orig/CMakeLists.txt
++++ visp_auto_tracker/CMakeLists.txt
+@@ -36,7 +36,7 @@ find_package(catkin REQUIRED COMPONENTS
+ find_package(VISP)
+ 
+ find_package(Boost REQUIRED
+-  COMPONENTS filesystem system signals regex date_time program_options thread)
++  COMPONENTS filesystem system regex date_time program_options thread)
+ 
+ include_directories(
+   ${Boost_INCLUDE_DIRS}
diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.9.3.ebuild b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1.ebuild
index 119d92d4d319..dcd584eb2644 100644
--- a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.9.3.ebuild
+++ b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1.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
@@ -30,3 +30,5 @@ DEPEND="${RDEPEND}"
 if [ "${PV#9999}" = "${PV}" ] ; then
 	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
 fi
+
+PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.8.0.ebuild b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.8.0.ebuild
deleted file mode 100644
index 6db3ddb1a6d2..000000000000
--- a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.8.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="jade-"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Online automated pattern-based object tracker relying on visual servoing"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/resource_retriever
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visp_bridge
-	dev-ros/visp_tracker
-	sci-libs/ViSP:=[dmtx,zbar]
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-jade-${PV}/${ROS_SUBDIR}"
-fi
diff --git a/dev-ros/visp_bridge/Manifest b/dev-ros/visp_bridge/Manifest
index 25086193f109..97dfb54b94c1 100644
--- a/dev-ros/visp_bridge/Manifest
+++ b/dev-ros/visp_bridge/Manifest
@@ -1,5 +1,7 @@
 AUX gcc6.patch 362 BLAKE2B 07aa55e77c23987add38afbb9612a4ac17d4295a51deff3986c9fa4eacf2604815d2cb654169c03c2943c7e6e0d8041ab1a3f380656643f660f176abfa347e67 SHA512 b4fc5219f35ac7ce1a81cf7b82ce0aebaef61b6e20cf42e62a1811c996dd0a68fe92dc49642ff38454c5d1f5496dbe954ba4029c93791f8ddefe71118377a03f
 DIST vision_visp-0.10.0.tar.gz 1015180 BLAKE2B bf0474d0633a6b704077e232d4676e6ebb9ec666b9b03792dbb929c6c6d1c52a941f7a4517f7bc6a7150882c16ba719eb3cf17c3fbdd13df109eab3a34afa259 SHA512 8e2652d6ca9c9535f1bebb628ec908f64c9fc89358bc92ed42ef12430b0b28c8ed3ed7935d2d3fe03c9761f9ac08e200eb59839ee2243df62d5934e8162cca9c
+DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
 EBUILD visp_bridge-0.10.0.ebuild 764 BLAKE2B 2a80f9321f45777b263c2b38d4a151ff94b448d1bcb3805e84fc1550248970867a17dd43e33fb4843b4ce59d02abdfd7ddf53daf356e3e0c3225403843306c72 SHA512 13d806ca821ae4c682af8c627d30a6803d0e3afe061e395c4115477d4826995117a4fe49dfabdcfa69aa591d2c8bc749aca7201ce7001664ac51b1ef138551ab
+EBUILD visp_bridge-0.11.1.ebuild 761 BLAKE2B c63d9082f7f2bc459f3584c93694eba59a7851a2e509cbad53568b7ad0334aa8077ec516ac60ba544d7ca7919ba6a603952d5be8398d45698da38cbd2ec61638 SHA512 c1684e01f02bcce559c910a0a9a9f45b85b8f36fcaa686500129c911a80d92d8eb8ed813f408b826e90a6731843af1eb37ee5ccf2d2fd7844f3397002eca4e59
 EBUILD visp_bridge-9999.ebuild 764 BLAKE2B 2a80f9321f45777b263c2b38d4a151ff94b448d1bcb3805e84fc1550248970867a17dd43e33fb4843b4ce59d02abdfd7ddf53daf356e3e0c3225403843306c72 SHA512 13d806ca821ae4c682af8c627d30a6803d0e3afe061e395c4115477d4826995117a4fe49dfabdcfa69aa591d2c8bc749aca7201ce7001664ac51b1ef138551ab
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.9.1.ebuild b/dev-ros/visp_bridge/visp_bridge-0.11.1.ebuild
index 6db3ddb1a6d2..f6afcabe1f31 100644
--- a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.9.1.ebuild
+++ b/dev-ros/visp_bridge/visp_bridge-0.11.1.ebuild
@@ -1,32 +1,30 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 ROS_REPO_URI="https://github.com/lagadic/vision_visp"
 KEYWORDS="~amd64 ~arm"
-VER_PREFIX="jade-"
+VER_PREFIX="kinetic-"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Online automated pattern-based object tracker relying on visual servoing"
+DESCRIPTION="Converts between ROS structures and ViSP structures"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
+	sci-libs/ViSP:=[xml]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/resource_retriever
 	dev-ros/roscpp
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visp_bridge
-	dev-ros/visp_tracker
-	sci-libs/ViSP:=[dmtx,zbar]
-	dev-libs/boost:=[threads]
+	dev-ros/camera_calibration_parsers
+	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-jade-${PV}/${ROS_SUBDIR}"
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
 fi
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_camera_calibration/Manifest b/dev-ros/visp_camera_calibration/Manifest
index 5edf466eb84b..aeffa65c9208 100644
--- a/dev-ros/visp_camera_calibration/Manifest
+++ b/dev-ros/visp_camera_calibration/Manifest
@@ -1,6 +1,8 @@
 AUX boost.patch 763 BLAKE2B 35752cfddd17e214035570181bab527d86c670be398be4f092b02dacd16ff041f30351258518f70548e5af8c34616b3b945af4bc2c6e6fb5578e2fc1963f1829 SHA512 32e9b218ea6d66658cf4d999607e798b232cc160bb8b305e20fee8f3204ea1344cfe8ef54eead8e61cd84870a5a37f7205d7ff1da82d6a19610967985122ed65
 AUX gcc6.patch 421 BLAKE2B cf5b648dbd6d5121db22cee0aaddd9a359a87e9305e3887b4ec15b148e2921baf2562c9c377abb6c848088ce9592952bf537469fbe68cc025ad6e32db8817c61 SHA512 a4ed8165e1a8099d79bfe48563558bbb6de20b90dcc7def4b9dbb46a6c1115cbacfe09ed0c3ddb2b654914fe3b49554f11453fc3d2c87c8841b6755a24f08c4e
 DIST vision_visp-0.10.0.tar.gz 1015180 BLAKE2B bf0474d0633a6b704077e232d4676e6ebb9ec666b9b03792dbb929c6c6d1c52a941f7a4517f7bc6a7150882c16ba719eb3cf17c3fbdd13df109eab3a34afa259 SHA512 8e2652d6ca9c9535f1bebb628ec908f64c9fc89358bc92ed42ef12430b0b28c8ed3ed7935d2d3fe03c9761f9ac08e200eb59839ee2243df62d5934e8162cca9c
+DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
 EBUILD visp_camera_calibration-0.10.0.ebuild 848 BLAKE2B 16cb6a6339f61c1059211ef5e342a041c0eaaf6db8fee2caa74059287568b46aec22508df3e093171e2dedd515d0be006fb860fb0f8d7660f925880cbf487471 SHA512 12ff2d1a1cf572e4a79c63cfdaab543cda1c84c5a0da6327e231da45a01cc04c1dfe0b69bf6ffdda9302ea3182976c5758018f1a7b5ee10bb615cdf90871e992
-EBUILD visp_camera_calibration-9999.ebuild 848 BLAKE2B 16cb6a6339f61c1059211ef5e342a041c0eaaf6db8fee2caa74059287568b46aec22508df3e093171e2dedd515d0be006fb860fb0f8d7660f925880cbf487471 SHA512 12ff2d1a1cf572e4a79c63cfdaab543cda1c84c5a0da6327e231da45a01cc04c1dfe0b69bf6ffdda9302ea3182976c5758018f1a7b5ee10bb615cdf90871e992
+EBUILD visp_camera_calibration-0.11.1.ebuild 822 BLAKE2B 7ac77d0d3bb577f52e68fa8757d4212a39aac172258c7818349f3c7943a1ec10cd01f0b536a2ebbe3b73ceed7060e307b2572df69eaace8fbc4816f7e18ddd44 SHA512 24a271be96708e3766681a2b5e3d512090f7daa87a1ed17adaa69de764d5e5e6c76797507eed07b8c7df6f546002adea2d20812bcc31b3f98d7bab0a7a17dcac
+EBUILD visp_camera_calibration-9999.ebuild 822 BLAKE2B 7ac77d0d3bb577f52e68fa8757d4212a39aac172258c7818349f3c7943a1ec10cd01f0b536a2ebbe3b73ceed7060e307b2572df69eaace8fbc4816f7e18ddd44 SHA512 24a271be96708e3766681a2b5e3d512090f7daa87a1ed17adaa69de764d5e5e6c76797507eed07b8c7df6f546002adea2d20812bcc31b3f98d7bab0a7a17dcac
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_camera_calibration/visp_camera_calibration-0.11.1.ebuild b/dev-ros/visp_camera_calibration/visp_camera_calibration-0.11.1.ebuild
new file mode 100644
index 000000000000..41bd62f885fa
--- /dev/null
+++ b/dev-ros/visp_camera_calibration/visp_camera_calibration-0.11.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="kinetic-"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_5} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Calibration of cameras using a customizable pattern and ViSP library"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/camera_calibration_parsers
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/visp_bridge
+	sci-libs/ViSP:=
+	dev-libs/boost:=
+"
+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_camera_calibration/visp_camera_calibration-9999.ebuild b/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild
index f92c1cac82c2..41bd62f885fa 100644
--- a/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild
+++ b/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild
@@ -29,4 +29,4 @@ DEPEND="${RDEPEND}"
 if [ "${PV#9999}" = "${PV}" ] ; then
 	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
 fi
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost.patch" )
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_hand2eye_calibration/Manifest b/dev-ros/visp_hand2eye_calibration/Manifest
index be809e888cba..ddb8555f5fb1 100644
--- a/dev-ros/visp_hand2eye_calibration/Manifest
+++ b/dev-ros/visp_hand2eye_calibration/Manifest
@@ -1,4 +1,6 @@
 DIST vision_visp-0.10.0.tar.gz 1015180 BLAKE2B bf0474d0633a6b704077e232d4676e6ebb9ec666b9b03792dbb929c6c6d1c52a941f7a4517f7bc6a7150882c16ba719eb3cf17c3fbdd13df109eab3a34afa259 SHA512 8e2652d6ca9c9535f1bebb628ec908f64c9fc89358bc92ed42ef12430b0b28c8ed3ed7935d2d3fe03c9761f9ac08e200eb59839ee2243df62d5934e8162cca9c
+DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
 EBUILD visp_hand2eye_calibration-0.10.0.ebuild 755 BLAKE2B b35b30e3ea6bfb2bacebf0ffdab567ea22f041dd3cc7bfb4b4b456c89d9823a078c7941c8e0914e9a58c341e53930bff35952c515e62dc56050af64ddfba2100 SHA512 ed589d3eeddf49c9d3a43be5935d06153d49d4a784f900ce7c5df567bfa86b38ce37a0c326bb0a1ab8c9f217b67c1c79e6a66c6603776550828c2964f378100e
+EBUILD visp_hand2eye_calibration-0.11.1.ebuild 755 BLAKE2B b35b30e3ea6bfb2bacebf0ffdab567ea22f041dd3cc7bfb4b4b456c89d9823a078c7941c8e0914e9a58c341e53930bff35952c515e62dc56050af64ddfba2100 SHA512 ed589d3eeddf49c9d3a43be5935d06153d49d4a784f900ce7c5df567bfa86b38ce37a0c326bb0a1ab8c9f217b67c1c79e6a66c6603776550828c2964f378100e
 EBUILD visp_hand2eye_calibration-9999.ebuild 755 BLAKE2B b35b30e3ea6bfb2bacebf0ffdab567ea22f041dd3cc7bfb4b4b456c89d9823a078c7941c8e0914e9a58c341e53930bff35952c515e62dc56050af64ddfba2100 SHA512 ed589d3eeddf49c9d3a43be5935d06153d49d4a784f900ce7c5df567bfa86b38ce37a0c326bb0a1ab8c9f217b67c1c79e6a66c6603776550828c2964f378100e
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.11.1.ebuild b/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.11.1.ebuild
new file mode 100644
index 000000000000..3266f4d20f9f
--- /dev/null
+++ b/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.11.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="kinetic-"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_5} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Estimates the camera position with respect to its effector using the ViSP library"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_proc
+	dev-ros/roscpp
+	dev-ros/sensor_msgs
+	dev-ros/visp_bridge
+	dev-ros/visp_tracker
+	sci-libs/ViSP:=
+"
+DEPEND="${RDEPEND}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+fi
diff --git a/dev-ros/visp_tracker/Manifest b/dev-ros/visp_tracker/Manifest
index 8bbc978aa7f5..9492da77860e 100644
--- a/dev-ros/visp_tracker/Manifest
+++ b/dev-ros/visp_tracker/Manifest
@@ -1,5 +1,7 @@
 AUX gcc6.patch 350 BLAKE2B 5e0f54319cc37bf0a4cf46e3b96f37bdb059af0f0e4a2b7219363504c96a2ed43121f4028c4d264959f1cf78e10d329ac67ee85d6a2868212b0cbcf924e2f93d SHA512 b1647cca84792212a1fe20685e83ee28fc225fb7272ed892fdbc4faae809059ce955cf5df1d8b3543c1248a741ad9a0bcb263a547aa21be2cebd8608dfba457e
 DIST vision_visp-0.10.0.tar.gz 1015180 BLAKE2B bf0474d0633a6b704077e232d4676e6ebb9ec666b9b03792dbb929c6c6d1c52a941f7a4517f7bc6a7150882c16ba719eb3cf17c3fbdd13df109eab3a34afa259 SHA512 8e2652d6ca9c9535f1bebb628ec908f64c9fc89358bc92ed42ef12430b0b28c8ed3ed7935d2d3fe03c9761f9ac08e200eb59839ee2243df62d5934e8162cca9c
+DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
 EBUILD visp_tracker-0.10.0-r2.ebuild 1082 BLAKE2B 8a3c5df1b1082f6146b1e651b9a3b56135fa8f9f7ef225d1f9a18da8065d3afabf3b2ffa373bc0046e6364d7c90718ed4d4221cc955be9f102cc322bc09af8fd SHA512 867d3842ca354574e0434538fc02bb2163cd658c95c354ca318453a94acd42b98741efb04177510e56249aa4407bd63a08cb4d5a852d46edc203a134182cb491
+EBUILD visp_tracker-0.11.1.ebuild 1079 BLAKE2B 9336683df158dfd87f52b7e491274e3e7368dace92534e5eda9f4fe922cc5459f6b7299e9929b6fde0d51f413861a667d286a70549ec6ba492f47273a7255e28 SHA512 a1a439e2cabbfac28bb20c973508839845beb286f0e8d08617a72d3b3b15b8eb073c15d83bbc426ee489222b0d3f678a2f5ec535552365f271450600a4fd09fc
 EBUILD visp_tracker-9999.ebuild 1082 BLAKE2B 8a3c5df1b1082f6146b1e651b9a3b56135fa8f9f7ef225d1f9a18da8065d3afabf3b2ffa373bc0046e6364d7c90718ed4d4221cc955be9f102cc322bc09af8fd SHA512 867d3842ca354574e0434538fc02bb2163cd658c95c354ca318453a94acd42b98741efb04177510e56249aa4407bd63a08cb4d5a852d46edc203a134182cb491
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_tracker/visp_tracker-0.11.1.ebuild b/dev-ros/visp_tracker/visp_tracker-0.11.1.ebuild
new file mode 100644
index 000000000000..7f8945759d9f
--- /dev/null
+++ b/dev-ros/visp_tracker/visp_tracker-0.11.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="kinetic-"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+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 visual servoing library into a ROS package"
+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_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	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" )
author	V3n3RiX <venerix@redcorelinux.org>	2019-09-06 10:28:05 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-09-06 10:28:05 +0100
commit	f1af93971b7490792d8541bc790e0d8c6d787059 (patch)
tree	a38046712bbc3a3844d77452d16c84e716caa3d4 /dev-ros
parent	fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff)