gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /dev-ros
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
258 files changed, 3148 insertions, 1267 deletions
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 08807df5f3ab..8566e0c837f5 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/amcl/Manifest b/dev-ros/amcl/Manifest
index b2ad13a3d541..f2ea1cab7ad8 100644
--- a/dev-ros/amcl/Manifest
+++ b/dev-ros/amcl/Manifest
@@ -8,6 +8,15 @@ DIST amcl-1.17.0-texas_greenroom_loop_indexed.bag 1793411 BLAKE2B 05f5d9e7882f02
 DIST amcl-1.17.0-texas_willow_hallway_loop_indexed.bag 4737937 BLAKE2B e22fe392aa5f8b393ad2a19ee95a5612f462935981278f3e6b2f0ee3ecb0ce31b02e19d342f1166abf0bcdb72c42df7482527e86e1e3dfcd65a7efdca6bb9d3a SHA512 69cdbf6542274f25988b44fda6a5b40a905d1b9e08ad6603ccb2e3fbdf2ea6d5a8b88519856e4d04adc39c2776862d6b666c776073e562f9ae0614bc897dab3c
 DIST amcl-1.17.0-willow-full-0.05.pgm 1100980 BLAKE2B 77a0295277a86679873d8788ef37161b3847ed05e385ddad2849c06c387326a1660aa98f384420a20e40f85c2ad7a221481c07944e6d47c7d6c70918140a5cb9 SHA512 88385ca1bfe4d1b1f66a1d81beb2fc31dd48e16547156a8ee5390aed37c6407b163441b0616b5a9bbab51d42dca67ecfbd5fafbd2ba1e0150d3d2e88c6f76f02
 DIST amcl-1.17.0-willow-full.pgm 307244 BLAKE2B 6e9c02275664bf6dca4cdd5990094452131672835a5cef8a7fdc382c6426791e57ecdf2dd73dee29a1ddc0caf751990c659e7a0d2f4aa7263e6fa37c12c43d04 SHA512 471c0aecf1dd32340f7df09121bf39564fab8a330f56b72e37d322e64a160dfa9099405688ec37b08340c148fda6c46ca302355f0d118cfcdb74a36de78c127d
+DIST amcl-1.17.1-basic_localization_stage_indexed.bag 1168671 BLAKE2B 487e378ca985a011aca7aec07dda82859724625ae5f5b522902db91fdc2d63e69d2a031c41287c92867acbcf58d6c0016fd78397c4c78a974d0d86bc5729deef SHA512 2352cbe391a3fd36f325e3a0dc3b343dda8b7cbe21bd55a2c02fc5aed4dd1c187b4cb91ab289a53e52d19f790b3bbc2544781ee5cc1bf1fa8ef4ecd18d4a068f
+DIST amcl-1.17.1-global_localization_stage_indexed.bag 293838 BLAKE2B 29245f1603cd25b06345f3d9144170e2e661dac63ecb3649f70a9849e71f4568bc409ab9fc519895c653146a13c116b6eabf01689b329826673230e0faadf297 SHA512 7e9ebcb34917d3960dfbe3da1d363d53d527c9006ff3c62e05faadcbec4ba9599cb5704c7f55f04ddd5613d78f2e1be72ed78473786c98c8842f93844fc1d99f
+DIST amcl-1.17.1-rosie_localization_stage.bag 3544355 BLAKE2B 8c48d0222c51d11ad759ad217bc6896aed73e4c11ddf071dfb7287247fedfaf99a6f55ac8b2e0531c4444b11bbe1b98e9de0900008e02e652ce1328920aefeab SHA512 11dd7a3e410e4903cd50b73b3954f002f366eeed0376bd3930a59677f3a7c1523bcaeccbd596961dcacfd43747668df7e11b124db4fe7cb0f02dae89a5b873a4
+DIST amcl-1.17.1-small_loop_crazy_driving_prg_indexed.bag 11950050 BLAKE2B 4e9e5f822629ed8cd0b6e3f8f8335550edc458f10ac9d230b4dd691df6d76abeb39d5742d783ae1d2d404487eb9db17f90fe2be539b54b444a67927593679214 SHA512 c961cea0cfd5cc087ab91844f53f5d98509dd56fec5a257079c9f7b52236db5c6dafbe68035a42b91c0a99ec94fce23caf8e3c660ed609a89d7cba6c03a66fea
+DIST amcl-1.17.1-small_loop_prf_indexed.bag 8738741 BLAKE2B f28afe9c9fadd9998b61b9dc1e0bac4fe8c322a6e37d0f4195ef0f13e16fb13a78ebe9ad70d38fd979d1779c1d6117a05c376dcfc093fb2bf1252aa3437ea518 SHA512 039a4deb5533190d5502e02bd272188374d77d5e983116db80d87092a8a3c7bd1a81b9967e574c3362ab580eefceea8cdd5d8729d92a9f7c31a2b3b5eaf11a08
+DIST amcl-1.17.1-texas_greenroom_loop_indexed.bag 1793411 BLAKE2B 05f5d9e7882f020ef22b8f0aa75be158af57493c2ba0ed0cf4463a4de0f3b1cf705613779c82b8743260ce3b3800750240eed982d75a72058398e7370441d424 SHA512 ab83fcdfb673d605e0bddba659aa9e72fd1c1f360bf0b0bd916a13a015b893f78967cca2f33cf856574fdd7dddb86ff60f41b0a36addb77ac0e8ac5c60ce1d1a
+DIST amcl-1.17.1-texas_willow_hallway_loop_indexed.bag 4737937 BLAKE2B e22fe392aa5f8b393ad2a19ee95a5612f462935981278f3e6b2f0ee3ecb0ce31b02e19d342f1166abf0bcdb72c42df7482527e86e1e3dfcd65a7efdca6bb9d3a SHA512 69cdbf6542274f25988b44fda6a5b40a905d1b9e08ad6603ccb2e3fbdf2ea6d5a8b88519856e4d04adc39c2776862d6b666c776073e562f9ae0614bc897dab3c
+DIST amcl-1.17.1-willow-full-0.05.pgm 1100980 BLAKE2B 77a0295277a86679873d8788ef37161b3847ed05e385ddad2849c06c387326a1660aa98f384420a20e40f85c2ad7a221481c07944e6d47c7d6c70918140a5cb9 SHA512 88385ca1bfe4d1b1f66a1d81beb2fc31dd48e16547156a8ee5390aed37c6407b163441b0616b5a9bbab51d42dca67ecfbd5fafbd2ba1e0150d3d2e88c6f76f02
+DIST amcl-1.17.1-willow-full.pgm 307244 BLAKE2B 6e9c02275664bf6dca4cdd5990094452131672835a5cef8a7fdc382c6426791e57ecdf2dd73dee29a1ddc0caf751990c659e7a0d2f4aa7263e6fa37c12c43d04 SHA512 471c0aecf1dd32340f7df09121bf39564fab8a330f56b72e37d322e64a160dfa9099405688ec37b08340c148fda6c46ca302355f0d118cfcdb74a36de78c127d
 DIST amcl-9999-basic_localization_stage_indexed.bag 1168671 BLAKE2B 487e378ca985a011aca7aec07dda82859724625ae5f5b522902db91fdc2d63e69d2a031c41287c92867acbcf58d6c0016fd78397c4c78a974d0d86bc5729deef SHA512 2352cbe391a3fd36f325e3a0dc3b343dda8b7cbe21bd55a2c02fc5aed4dd1c187b4cb91ab289a53e52d19f790b3bbc2544781ee5cc1bf1fa8ef4ecd18d4a068f
 DIST amcl-9999-global_localization_stage_indexed.bag 293838 BLAKE2B 29245f1603cd25b06345f3d9144170e2e661dac63ecb3649f70a9849e71f4568bc409ab9fc519895c653146a13c116b6eabf01689b329826673230e0faadf297 SHA512 7e9ebcb34917d3960dfbe3da1d363d53d527c9006ff3c62e05faadcbec4ba9599cb5704c7f55f04ddd5613d78f2e1be72ed78473786c98c8842f93844fc1d99f
 DIST amcl-9999-rosie_localization_stage.bag 3544355 BLAKE2B 8c48d0222c51d11ad759ad217bc6896aed73e4c11ddf071dfb7287247fedfaf99a6f55ac8b2e0531c4444b11bbe1b98e9de0900008e02e652ce1328920aefeab SHA512 11dd7a3e410e4903cd50b73b3954f002f366eeed0376bd3930a59677f3a7c1523bcaeccbd596961dcacfd43747668df7e11b124db4fe7cb0f02dae89a5b873a4
@@ -18,6 +27,8 @@ DIST amcl-9999-texas_willow_hallway_loop_indexed.bag 4737937 BLAKE2B e22fe392aa5
 DIST amcl-9999-willow-full-0.05.pgm 1100980 BLAKE2B 77a0295277a86679873d8788ef37161b3847ed05e385ddad2849c06c387326a1660aa98f384420a20e40f85c2ad7a221481c07944e6d47c7d6c70918140a5cb9 SHA512 88385ca1bfe4d1b1f66a1d81beb2fc31dd48e16547156a8ee5390aed37c6407b163441b0616b5a9bbab51d42dca67ecfbd5fafbd2ba1e0150d3d2e88c6f76f02
 DIST amcl-9999-willow-full.pgm 307244 BLAKE2B 6e9c02275664bf6dca4cdd5990094452131672835a5cef8a7fdc382c6426791e57ecdf2dd73dee29a1ddc0caf751990c659e7a0d2f4aa7263e6fa37c12c43d04 SHA512 471c0aecf1dd32340f7df09121bf39564fab8a330f56b72e37d322e64a160dfa9099405688ec37b08340c148fda6c46ca302355f0d118cfcdb74a36de78c127d
 DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
 EBUILD amcl-1.17.0.ebuild 1811 BLAKE2B 90e0627d3836a5a6049744084dfc59ea5176fd1ccbb5888d1c35665f9b8b7ab7054034dfbd2b2ea3209524973be65483cefca3cca77082f52838c2413cd8e714 SHA512 36db15257621e9700a745ac15d816d8b798e6d751d506e1f093cd3047a56d77f2cafc0acf2999da22d3534a790c4a642ca06be0935b81b00c8d493f9be775249
+EBUILD amcl-1.17.1.ebuild 1811 BLAKE2B 90e0627d3836a5a6049744084dfc59ea5176fd1ccbb5888d1c35665f9b8b7ab7054034dfbd2b2ea3209524973be65483cefca3cca77082f52838c2413cd8e714 SHA512 36db15257621e9700a745ac15d816d8b798e6d751d506e1f093cd3047a56d77f2cafc0acf2999da22d3534a790c4a642ca06be0935b81b00c8d493f9be775249
 EBUILD amcl-9999.ebuild 1811 BLAKE2B 90e0627d3836a5a6049744084dfc59ea5176fd1ccbb5888d1c35665f9b8b7ab7054034dfbd2b2ea3209524973be65483cefca3cca77082f52838c2413cd8e714 SHA512 36db15257621e9700a745ac15d816d8b798e6d751d506e1f093cd3047a56d77f2cafc0acf2999da22d3534a790c4a642ca06be0935b81b00c8d493f9be775249
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/amcl/amcl-1.17.1.ebuild b/dev-ros/amcl/amcl-1.17.1.ebuild
new file mode 100644
index 000000000000..a871a83d6448
--- /dev/null
+++ b/dev-ros/amcl/amcl-1.17.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Probabilistic localization system for a robot moving in 2D"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+TEST_DATA="
+basic_localization_stage_indexed.bag
+global_localization_stage_indexed.bag
+small_loop_prf_indexed.bag
+small_loop_crazy_driving_prg_indexed.bag
+texas_greenroom_loop_indexed.bag
+texas_willow_hallway_loop_indexed.bag
+rosie_localization_stage.bag
+willow-full.pgm
+willow-full-0.05.pgm
+"
+
+for i in ${TEST_DATA}; do
+	SRC_URI="${SRC_URI}
+		http://download.ros.org/data/amcl/${i} -> ${P}-${i}"
+done
+
+RDEPEND="
+	dev-ros/diagnostic_updater[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/message_filters
+	dev-ros/rosbag
+		dev-libs/boost:=
+	dev-ros/roscpp
+	dev-ros/tf2
+	dev-ros/tf2_ros
+"
+DEPEND="${RDEPEND}
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
+		dev-ros/map_server[${PYTHON_SINGLE_USEDEP}]
+	)
+"
+PATCHES=( "${FILESDIR}/cmake.patch" )
+
+src_prepare() {
+	ros-catkin_src_prepare
+	for i in ${TEST_DATA}; do
+		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
+	done
+	sed -e "s#http://download.ros.org/data/amcl#file://${S}#" -i CMakeLists.txt || die
+}
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/audio_capture/Manifest b/dev-ros/audio_capture/Manifest
index 5816797de49e..1d5adea00ecd 100644
--- a/dev-ros/audio_capture/Manifest
+++ b/dev-ros/audio_capture/Manifest
@@ -1,6 +1,8 @@
 DIST audio_common-0.3.6.tar.gz 189612 BLAKE2B 536192cdbab9c205c17eb4b1f7ccb1864c2fcaa6b47747664a1fa7c077e747d6b7e01be1119a02333e1581bd865baffbd02b4e43569727645bd28f2f3ac36a22 SHA512 e36f7c52c4c9dcf382e65fe6de0b72729e76bca85230074e5cf3f0a74d7ec7e95c1aee14cfd7ee0d6075439efab04d66db946115919be664e8e94df91652e96c
 DIST audio_common-0.3.7.tar.gz 190644 BLAKE2B b4c66cedfdff01ea1e8c3b257ef65961b535041685b2ca0220545f2c8092cb43ad3de158c4c879071bedccc72859a046b7425d839dff7fcad393fda86dbec2ac SHA512 6e7f2aae57b15792709e204f556846d7fc443cb99a3013c828b5c564474ba5c3a5782144e20aa721a851e2e3f029d9200fdc98a86babf70dac330c22889a9402
+DIST audio_common-0.3.8.tar.gz 190972 BLAKE2B 729781085336ec2818817a7233c9e732a2eb62fc22f82869c629aef4a13a4a0460cf4836e118a5bb7c52af365f2fcdc8bdbaad278ac2d316846da3269ccfed57 SHA512 f69341629e8b7883e5e6f232a119cf66cf5c657feafcde7edbdc3abf73b08c24b505569b39ce370802a27a146f5a51ca4ee42db8ef201811f42474b6e54ca853
 EBUILD audio_capture-0.3.6.ebuild 640 BLAKE2B 2be2d58a1ae636ff7f9b3b3289188cb495e2be5a7e23c8a58df4c223dcdfc8433c09db9ca88f186808f72a91e366bee6d5d464416775ac05dbde773311d23884 SHA512 d82edbb3a5a93bcd2f479c6cf64972edb0daf0ffaac40ee767a029d4e99443a44d19d73495cb71caab66b5b82707fb443855c9eb3ae3f47b8e0a40c2f076243e
 EBUILD audio_capture-0.3.7.ebuild 640 BLAKE2B 2be2d58a1ae636ff7f9b3b3289188cb495e2be5a7e23c8a58df4c223dcdfc8433c09db9ca88f186808f72a91e366bee6d5d464416775ac05dbde773311d23884 SHA512 d82edbb3a5a93bcd2f479c6cf64972edb0daf0ffaac40ee767a029d4e99443a44d19d73495cb71caab66b5b82707fb443855c9eb3ae3f47b8e0a40c2f076243e
+EBUILD audio_capture-0.3.8.ebuild 640 BLAKE2B 2be2d58a1ae636ff7f9b3b3289188cb495e2be5a7e23c8a58df4c223dcdfc8433c09db9ca88f186808f72a91e366bee6d5d464416775ac05dbde773311d23884 SHA512 d82edbb3a5a93bcd2f479c6cf64972edb0daf0ffaac40ee767a029d4e99443a44d19d73495cb71caab66b5b82707fb443855c9eb3ae3f47b8e0a40c2f076243e
 EBUILD audio_capture-9999.ebuild 640 BLAKE2B 2be2d58a1ae636ff7f9b3b3289188cb495e2be5a7e23c8a58df4c223dcdfc8433c09db9ca88f186808f72a91e366bee6d5d464416775ac05dbde773311d23884 SHA512 d82edbb3a5a93bcd2f479c6cf64972edb0daf0ffaac40ee767a029d4e99443a44d19d73495cb71caab66b5b82707fb443855c9eb3ae3f47b8e0a40c2f076243e
 MISC metadata.xml 338 BLAKE2B 8dc3e58c3c56a7cc0d39ca8ac7c62cf4a315a6f3fc9ad8c1d36596fd7bde5f09f7baf8b6ff36de20b460d7049d792451dae7cc7ce22e5dc3da64b442918d9a35 SHA512 40fedee9626fb1f621315a3e0c25f469eb98b67a391cfbabcafd5971079b33f4c8d1bc61523b8c2e914d7d7b7a6ddb50d1071beff80f30d263fec27586c9c1a5
diff --git a/dev-ros/audio_capture/audio_capture-0.3.8.ebuild b/dev-ros/audio_capture/audio_capture-0.3.8.ebuild
new file mode 100644
index 000000000000..ef0806b5c857
--- /dev/null
+++ b/dev-ros/audio_capture/audio_capture-0.3.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Transports audio from a source to a destination"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-libs/boost:=[threads]
+	media-libs/gstreamer:1.0
+"
+DEPEND="${RDEPEND}
+	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+RDEPEND="${RDEPEND}
+	media-plugins/gst-plugins-lame:1.0
+	media-libs/gst-plugins-good:1.0
+	media-libs/gst-plugins-base:1.0
+"
+BDEPEND="
+	virtual/pkgconfig"
diff --git a/dev-ros/audio_common_msgs/Manifest b/dev-ros/audio_common_msgs/Manifest
index fcf7c1a65d13..e80d63912e89 100644
--- a/dev-ros/audio_common_msgs/Manifest
+++ b/dev-ros/audio_common_msgs/Manifest
@@ -1,6 +1,8 @@
 DIST audio_common-0.3.6.tar.gz 189612 BLAKE2B 536192cdbab9c205c17eb4b1f7ccb1864c2fcaa6b47747664a1fa7c077e747d6b7e01be1119a02333e1581bd865baffbd02b4e43569727645bd28f2f3ac36a22 SHA512 e36f7c52c4c9dcf382e65fe6de0b72729e76bca85230074e5cf3f0a74d7ec7e95c1aee14cfd7ee0d6075439efab04d66db946115919be664e8e94df91652e96c
 DIST audio_common-0.3.7.tar.gz 190644 BLAKE2B b4c66cedfdff01ea1e8c3b257ef65961b535041685b2ca0220545f2c8092cb43ad3de158c4c879071bedccc72859a046b7425d839dff7fcad393fda86dbec2ac SHA512 6e7f2aae57b15792709e204f556846d7fc443cb99a3013c828b5c564474ba5c3a5782144e20aa721a851e2e3f029d9200fdc98a86babf70dac330c22889a9402
+DIST audio_common-0.3.8.tar.gz 190972 BLAKE2B 729781085336ec2818817a7233c9e732a2eb62fc22f82869c629aef4a13a4a0460cf4836e118a5bb7c52af365f2fcdc8bdbaad278ac2d316846da3269ccfed57 SHA512 f69341629e8b7883e5e6f232a119cf66cf5c657feafcde7edbdc3abf73b08c24b505569b39ce370802a27a146f5a51ca4ee42db8ef201811f42474b6e54ca853
 EBUILD audio_common_msgs-0.3.6.ebuild 373 BLAKE2B 472795fa19e798d97efb732589ac4d77114cb1e113eb217fadce309c89005aba1f4a3de5f632e50f169e43275b465c454cfc7f92489318bb1c16c711ad891699 SHA512 c96dc95bd3611bf372c7c90184c75382bb82e0567530a77704b2f6461c0e79fb4eb057e18abac65a3cd746a717974f3fbc1ad6a2f0e3240d4b7d608037e30940
 EBUILD audio_common_msgs-0.3.7.ebuild 373 BLAKE2B 472795fa19e798d97efb732589ac4d77114cb1e113eb217fadce309c89005aba1f4a3de5f632e50f169e43275b465c454cfc7f92489318bb1c16c711ad891699 SHA512 c96dc95bd3611bf372c7c90184c75382bb82e0567530a77704b2f6461c0e79fb4eb057e18abac65a3cd746a717974f3fbc1ad6a2f0e3240d4b7d608037e30940
+EBUILD audio_common_msgs-0.3.8.ebuild 373 BLAKE2B 472795fa19e798d97efb732589ac4d77114cb1e113eb217fadce309c89005aba1f4a3de5f632e50f169e43275b465c454cfc7f92489318bb1c16c711ad891699 SHA512 c96dc95bd3611bf372c7c90184c75382bb82e0567530a77704b2f6461c0e79fb4eb057e18abac65a3cd746a717974f3fbc1ad6a2f0e3240d4b7d608037e30940
 EBUILD audio_common_msgs-9999.ebuild 373 BLAKE2B 472795fa19e798d97efb732589ac4d77114cb1e113eb217fadce309c89005aba1f4a3de5f632e50f169e43275b465c454cfc7f92489318bb1c16c711ad891699 SHA512 c96dc95bd3611bf372c7c90184c75382bb82e0567530a77704b2f6461c0e79fb4eb057e18abac65a3cd746a717974f3fbc1ad6a2f0e3240d4b7d608037e30940
 MISC metadata.xml 338 BLAKE2B 8dc3e58c3c56a7cc0d39ca8ac7c62cf4a315a6f3fc9ad8c1d36596fd7bde5f09f7baf8b6ff36de20b460d7049d792451dae7cc7ce22e5dc3da64b442918d9a35 SHA512 40fedee9626fb1f621315a3e0c25f469eb98b67a391cfbabcafd5971079b33f4c8d1bc61523b8c2e914d7d7b7a6ddb50d1071beff80f30d263fec27586c9c1a5
diff --git a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.8.ebuild b/dev-ros/audio_common_msgs/audio_common_msgs-0.3.8.ebuild
new file mode 100644
index 000000000000..468a27192cda
--- /dev/null
+++ b/dev-ros/audio_common_msgs/audio_common_msgs-0.3.8.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for transmitting audio via ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/audio_play/Manifest b/dev-ros/audio_play/Manifest
index 20bda4332d30..d3c7cd18a6fb 100644
--- a/dev-ros/audio_play/Manifest
+++ b/dev-ros/audio_play/Manifest
@@ -1,6 +1,8 @@
 DIST audio_common-0.3.6.tar.gz 189612 BLAKE2B 536192cdbab9c205c17eb4b1f7ccb1864c2fcaa6b47747664a1fa7c077e747d6b7e01be1119a02333e1581bd865baffbd02b4e43569727645bd28f2f3ac36a22 SHA512 e36f7c52c4c9dcf382e65fe6de0b72729e76bca85230074e5cf3f0a74d7ec7e95c1aee14cfd7ee0d6075439efab04d66db946115919be664e8e94df91652e96c
 DIST audio_common-0.3.7.tar.gz 190644 BLAKE2B b4c66cedfdff01ea1e8c3b257ef65961b535041685b2ca0220545f2c8092cb43ad3de158c4c879071bedccc72859a046b7425d839dff7fcad393fda86dbec2ac SHA512 6e7f2aae57b15792709e204f556846d7fc443cb99a3013c828b5c564474ba5c3a5782144e20aa721a851e2e3f029d9200fdc98a86babf70dac330c22889a9402
+DIST audio_common-0.3.8.tar.gz 190972 BLAKE2B 729781085336ec2818817a7233c9e732a2eb62fc22f82869c629aef4a13a4a0460cf4836e118a5bb7c52af365f2fcdc8bdbaad278ac2d316846da3269ccfed57 SHA512 f69341629e8b7883e5e6f232a119cf66cf5c657feafcde7edbdc3abf73b08c24b505569b39ce370802a27a146f5a51ca4ee42db8ef201811f42474b6e54ca853
 EBUILD audio_play-0.3.6.ebuild 603 BLAKE2B 5bcca4f0ae76e89682834850c413e4bac7d6084d5cdc8783563ee7b86e4098c3562899b99edd55704875d55a26bbd88e5696f65c231f0695f4d98a4f3053042a SHA512 62bcc91c797418be40838909f2d4f5b6e1c8888ee9700ec773349af787df37092d3eb34d37805850e8b6624a8b8286bd7576cb3a329c64ee5ef1ec5e034d67eb
 EBUILD audio_play-0.3.7.ebuild 603 BLAKE2B 5bcca4f0ae76e89682834850c413e4bac7d6084d5cdc8783563ee7b86e4098c3562899b99edd55704875d55a26bbd88e5696f65c231f0695f4d98a4f3053042a SHA512 62bcc91c797418be40838909f2d4f5b6e1c8888ee9700ec773349af787df37092d3eb34d37805850e8b6624a8b8286bd7576cb3a329c64ee5ef1ec5e034d67eb
+EBUILD audio_play-0.3.8.ebuild 603 BLAKE2B 5bcca4f0ae76e89682834850c413e4bac7d6084d5cdc8783563ee7b86e4098c3562899b99edd55704875d55a26bbd88e5696f65c231f0695f4d98a4f3053042a SHA512 62bcc91c797418be40838909f2d4f5b6e1c8888ee9700ec773349af787df37092d3eb34d37805850e8b6624a8b8286bd7576cb3a329c64ee5ef1ec5e034d67eb
 EBUILD audio_play-9999.ebuild 603 BLAKE2B 5bcca4f0ae76e89682834850c413e4bac7d6084d5cdc8783563ee7b86e4098c3562899b99edd55704875d55a26bbd88e5696f65c231f0695f4d98a4f3053042a SHA512 62bcc91c797418be40838909f2d4f5b6e1c8888ee9700ec773349af787df37092d3eb34d37805850e8b6624a8b8286bd7576cb3a329c64ee5ef1ec5e034d67eb
 MISC metadata.xml 338 BLAKE2B 8dc3e58c3c56a7cc0d39ca8ac7c62cf4a315a6f3fc9ad8c1d36596fd7bde5f09f7baf8b6ff36de20b460d7049d792451dae7cc7ce22e5dc3da64b442918d9a35 SHA512 40fedee9626fb1f621315a3e0c25f469eb98b67a391cfbabcafd5971079b33f4c8d1bc61523b8c2e914d7d7b7a6ddb50d1071beff80f30d263fec27586c9c1a5
diff --git a/dev-ros/audio_play/audio_play-0.3.8.ebuild b/dev-ros/audio_play/audio_play-0.3.8.ebuild
new file mode 100644
index 000000000000..b54dfb9a1e95
--- /dev/null
+++ b/dev-ros/audio_play/audio_play-0.3.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Outputs audio to a speaker from a source node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-libs/boost:=[threads]
+	media-libs/gstreamer:1.0
+"
+DEPEND="${RDEPEND}
+	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+RDEPEND="${RDEPEND}
+	media-libs/gst-plugins-good:1.0
+	media-libs/gst-plugins-base:1.0
+"
+BDEPEND="
+	virtual/pkgconfig
+"
diff --git a/dev-ros/base_local_planner/Manifest b/dev-ros/base_local_planner/Manifest
index 89d6070a28ad..adb98e6cc831 100644
--- a/dev-ros/base_local_planner/Manifest
+++ b/dev-ros/base_local_planner/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
 EBUILD base_local_planner-1.17.0.ebuild 1149 BLAKE2B 3e5d2a6fd2f465cd627f6094bc781fecdccea6fa9a24ff3b345074fde990ea003d0220e618d71a143b147fca2cadbb44a9854639ae407b7c459608711c5a2616 SHA512 6cbeb63500ab128e544c3635ba48cdf57709c222ff91d226e317bd9985d7f5ca1cb7c5441985625511ea170415b994bb6cd0f129afc44fcc3c18b55793b47224
+EBUILD base_local_planner-1.17.1.ebuild 1149 BLAKE2B 3e5d2a6fd2f465cd627f6094bc781fecdccea6fa9a24ff3b345074fde990ea003d0220e618d71a143b147fca2cadbb44a9854639ae407b7c459608711c5a2616 SHA512 6cbeb63500ab128e544c3635ba48cdf57709c222ff91d226e317bd9985d7f5ca1cb7c5441985625511ea170415b994bb6cd0f129afc44fcc3c18b55793b47224
 EBUILD base_local_planner-9999.ebuild 1149 BLAKE2B 3e5d2a6fd2f465cd627f6094bc781fecdccea6fa9a24ff3b345074fde990ea003d0220e618d71a143b147fca2cadbb44a9854639ae407b7c459608711c5a2616 SHA512 6cbeb63500ab128e544c3635ba48cdf57709c222ff91d226e317bd9985d7f5ca1cb7c5441985625511ea170415b994bb6cd0f129afc44fcc3c18b55793b47224
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/base_local_planner/base_local_planner-1.17.1.ebuild b/dev-ros/base_local_planner/base_local_planner-1.17.1.ebuild
new file mode 100644
index 000000000000..b332fc26a742
--- /dev/null
+++ b/dev-ros/base_local_planner/base_local_planner-1.17.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Trajectory Rollout and Dynamic Window approaches to robot navigation on a plane"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/angles
+	>=dev-ros/costmap_2d-1.16
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
+	dev-cpp/eigen:3
+	>=dev-ros/nav_core-1.16
+	dev-ros/pluginlib
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/tf2
+	dev-ros/tf2_ros
+	dev-ros/voxel_grid
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}] )
+"
+BDEPEND="
+	dev-ros/cmake_modules
+"
diff --git a/dev-ros/carrot_planner/Manifest b/dev-ros/carrot_planner/Manifest
index deeaa7de6a18..22ae94379f9d 100644
--- a/dev-ros/carrot_planner/Manifest
+++ b/dev-ros/carrot_planner/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
 EBUILD carrot_planner-1.17.0-r1.ebuild 633 BLAKE2B d69298e2372b61114bd6315dda1f5f03380aaa4ff3732f67b26d42c904576ac32cea8f4b10ffbcc220f2714bd82913e5887fdc5c5cb09be8f922f491ac00ba54 SHA512 56bb321ff22818b6b1b85c942985d879cd7e66300c2f350d69094e9d08ba92471df2a2529635b4148182430a9b92ec2c26f25eccb3e27fcebdf255266cc3ccb7
+EBUILD carrot_planner-1.17.1.ebuild 633 BLAKE2B d69298e2372b61114bd6315dda1f5f03380aaa4ff3732f67b26d42c904576ac32cea8f4b10ffbcc220f2714bd82913e5887fdc5c5cb09be8f922f491ac00ba54 SHA512 56bb321ff22818b6b1b85c942985d879cd7e66300c2f350d69094e9d08ba92471df2a2529635b4148182430a9b92ec2c26f25eccb3e27fcebdf255266cc3ccb7
 EBUILD carrot_planner-9999.ebuild 633 BLAKE2B d69298e2372b61114bd6315dda1f5f03380aaa4ff3732f67b26d42c904576ac32cea8f4b10ffbcc220f2714bd82913e5887fdc5c5cb09be8f922f491ac00ba54 SHA512 56bb321ff22818b6b1b85c942985d879cd7e66300c2f350d69094e9d08ba92471df2a2529635b4148182430a9b92ec2c26f25eccb3e27fcebdf255266cc3ccb7
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/carrot_planner/carrot_planner-1.17.1.ebuild b/dev-ros/carrot_planner/carrot_planner-1.17.1.ebuild
new file mode 100644
index 000000000000..988e46d33c04
--- /dev/null
+++ b/dev-ros/carrot_planner/carrot_planner-1.17.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Attempts to find a legal place to put a carrot for the robot to follow"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/base_local_planner
+	dev-ros/costmap_2d
+	dev-cpp/eigen:3
+	dev-ros/nav_core
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf2
+	dev-ros/tf2_ros
+
+	dev-libs/console_bridge:=
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/clear_costmap_recovery/Manifest b/dev-ros/clear_costmap_recovery/Manifest
index a9cff1182aeb..91cd25d3e6e4 100644
--- a/dev-ros/clear_costmap_recovery/Manifest
+++ b/dev-ros/clear_costmap_recovery/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
 EBUILD clear_costmap_recovery-1.17.0.ebuild 618 BLAKE2B e94706667ceb0a304db3c41d67ff2eb8b6754c06cb53833d280af3b679274504ba1db6606d06b847401c91ec976aecf5c9f4f9a69f6e9f4b96bb877e552e09a1 SHA512 2cbe381fbaeed8e010630a4a41475d219c0a9adb7ffdd7d812250dfb337e087e161777454832b1bf5cc011f7e4e47d16489083f44294d1edce962bef2e643271
+EBUILD clear_costmap_recovery-1.17.1.ebuild 618 BLAKE2B e94706667ceb0a304db3c41d67ff2eb8b6754c06cb53833d280af3b679274504ba1db6606d06b847401c91ec976aecf5c9f4f9a69f6e9f4b96bb877e552e09a1 SHA512 2cbe381fbaeed8e010630a4a41475d219c0a9adb7ffdd7d812250dfb337e087e161777454832b1bf5cc011f7e4e47d16489083f44294d1edce962bef2e643271
 EBUILD clear_costmap_recovery-9999.ebuild 618 BLAKE2B e94706667ceb0a304db3c41d67ff2eb8b6754c06cb53833d280af3b679274504ba1db6606d06b847401c91ec976aecf5c9f4f9a69f6e9f4b96bb877e552e09a1 SHA512 2cbe381fbaeed8e010630a4a41475d219c0a9adb7ffdd7d812250dfb337e087e161777454832b1bf5cc011f7e4e47d16489083f44294d1edce962bef2e643271
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.1.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.1.ebuild
new file mode 100644
index 000000000000..5f505a6c1a2e
--- /dev/null
+++ b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Recovery behavior that attempts reverting the costmaps to the static map"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/costmap_2d-1.16.3
+	dev-cpp/eigen:3
+	dev-ros/nav_core
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf2_ros
+
+	dev-libs/boost:=[threads]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	test? ( dev-ros/rostest dev-cpp/gtest )
+"
diff --git a/dev-ros/combined_robot_hw/Manifest b/dev-ros/combined_robot_hw/Manifest
index b24cbb0b5ba0..eae9275faff3 100644
--- a/dev-ros/combined_robot_hw/Manifest
+++ b/dev-ros/combined_robot_hw/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
 DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
+DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
 EBUILD combined_robot_hw-0.19.1.ebuild 466 BLAKE2B 5bb38127d200a88d822d24fcc6d3f09963c88d48a432873a704489c2cdf30caba2b531cb54731b444c0e551517e8f65de6e3ad45ac2e770be79d551ef7cfac34 SHA512 902bc604b2ea4a2ca32e1244ea33c989c63a9ae3420f85586badcf581f7b88c598766cbd97848e1f691ffa9b8ed30f575cf9d25df3376d889b273cb66786d85f
 EBUILD combined_robot_hw-0.19.2.ebuild 466 BLAKE2B 5bb38127d200a88d822d24fcc6d3f09963c88d48a432873a704489c2cdf30caba2b531cb54731b444c0e551517e8f65de6e3ad45ac2e770be79d551ef7cfac34 SHA512 902bc604b2ea4a2ca32e1244ea33c989c63a9ae3420f85586badcf581f7b88c598766cbd97848e1f691ffa9b8ed30f575cf9d25df3376d889b273cb66786d85f
+EBUILD combined_robot_hw-0.19.3.ebuild 466 BLAKE2B 5bb38127d200a88d822d24fcc6d3f09963c88d48a432873a704489c2cdf30caba2b531cb54731b444c0e551517e8f65de6e3ad45ac2e770be79d551ef7cfac34 SHA512 902bc604b2ea4a2ca32e1244ea33c989c63a9ae3420f85586badcf581f7b88c598766cbd97848e1f691ffa9b8ed30f575cf9d25df3376d889b273cb66786d85f
 EBUILD combined_robot_hw-9999.ebuild 466 BLAKE2B 5bb38127d200a88d822d24fcc6d3f09963c88d48a432873a704489c2cdf30caba2b531cb54731b444c0e551517e8f65de6e3ad45ac2e770be79d551ef7cfac34 SHA512 902bc604b2ea4a2ca32e1244ea33c989c63a9ae3420f85586badcf581f7b88c598766cbd97848e1f691ffa9b8ed30f575cf9d25df3376d889b273cb66786d85f
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/combined_robot_hw/combined_robot_hw-0.19.3.ebuild b/dev-ros/combined_robot_hw/combined_robot_hw-0.19.3.ebuild
new file mode 100644
index 000000000000..321a5d7c964b
--- /dev/null
+++ b/dev-ros/combined_robot_hw/combined_robot_hw-0.19.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Combined Robot HW class"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/hardware_interface-0.15
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-ros/roscpp
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/combined_robot_hw_tests/Manifest b/dev-ros/combined_robot_hw_tests/Manifest
index e1a4dfb06962..986948b98f88 100644
--- a/dev-ros/combined_robot_hw_tests/Manifest
+++ b/dev-ros/combined_robot_hw_tests/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
 DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
+DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
 EBUILD combined_robot_hw_tests-0.19.1.ebuild 827 BLAKE2B 2053ebb7a7974d6cfd54b34a041442e3b8e4a7e9c354bf7c0234fcdf18125cd10f373e14b147a7b35f4cbdea4a22590834895c47177ec894be57c51a6ccf47b0 SHA512 078b0482d716cae3cc2d3e8c2bc2357921d77e6430dadb79cd8db16b9876945a060cfd2f37c80316c5427b19fc380cb5d7f85f7ebde221763c86d371e70fb774
 EBUILD combined_robot_hw_tests-0.19.2.ebuild 827 BLAKE2B 2053ebb7a7974d6cfd54b34a041442e3b8e4a7e9c354bf7c0234fcdf18125cd10f373e14b147a7b35f4cbdea4a22590834895c47177ec894be57c51a6ccf47b0 SHA512 078b0482d716cae3cc2d3e8c2bc2357921d77e6430dadb79cd8db16b9876945a060cfd2f37c80316c5427b19fc380cb5d7f85f7ebde221763c86d371e70fb774
+EBUILD combined_robot_hw_tests-0.19.3.ebuild 827 BLAKE2B 2053ebb7a7974d6cfd54b34a041442e3b8e4a7e9c354bf7c0234fcdf18125cd10f373e14b147a7b35f4cbdea4a22590834895c47177ec894be57c51a6ccf47b0 SHA512 078b0482d716cae3cc2d3e8c2bc2357921d77e6430dadb79cd8db16b9876945a060cfd2f37c80316c5427b19fc380cb5d7f85f7ebde221763c86d371e70fb774
 EBUILD combined_robot_hw_tests-9999.ebuild 827 BLAKE2B 2053ebb7a7974d6cfd54b34a041442e3b8e4a7e9c354bf7c0234fcdf18125cd10f373e14b147a7b35f4cbdea4a22590834895c47177ec894be57c51a6ccf47b0 SHA512 078b0482d716cae3cc2d3e8c2bc2357921d77e6430dadb79cd8db16b9876945a060cfd2f37c80316c5427b19fc380cb5d7f85f7ebde221763c86d371e70fb774
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.3.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.3.ebuild
new file mode 100644
index 000000000000..c38e64568c99
--- /dev/null
+++ b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Combined Robot HW class tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/combined_robot_hw
+	dev-ros/controller_manager
+	dev-ros/controller_manager_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/controller_manager_tests
+	dev-ros/hardware_interface
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/compressed_depth_image_transport/Manifest b/dev-ros/compressed_depth_image_transport/Manifest
index d8e657e8a1ef..a12dd0091d27 100644
--- a/dev-ros/compressed_depth_image_transport/Manifest
+++ b/dev-ros/compressed_depth_image_transport/Manifest
@@ -1,4 +1,5 @@
+AUX ocv_leak.patch 604 BLAKE2B c7d937c796415a1f4f3f131b0006b6674ca4033428c66fc12530e5c588530e59c99c80d25e26881c39fe92c3c8c273c44f9ec57cb33319cb895d007bc77e2982 SHA512 e78c666b44de6e42bce51e20531d0883c38caabbd39149998654e58b35b2f1a05acc386c8bafa0ceb9a657730e0e44f1b016b2aba5b29b2c675ee51ad79d58fc
 DIST image_transport_plugins-1.14.0.tar.gz 28803 BLAKE2B fc3fc34c0dc01c5dc0ed7f2a88fd691f9b955009bbf91a2280e39455e0325a46edc67c25cf79d8e4882789c20235c13fb87bfc64669ffda40a1fe37224a346e9 SHA512 1333f18a3208ecda4f788dc2d974b5787a89d33a1ad1ea2c6b4cc07593c677686aa5e9df3346d2e5f307699b88b42f341a989eebecc3cd7885768e3dcdbbcdcb
-EBUILD compressed_depth_image_transport-1.14.0.ebuild 585 BLAKE2B 0b8b19deef36e366964662b6b0d7748cfb66f6e4bb4d4e5cca1b28f5c04dddf77fc296dc267d6d7ac2226f69850be63735f0dbe3a64dea0236181bdf504908dd SHA512 332f93b0ece052ab11ef4ef6cf532861e359675da30a74dd4d95427f4678c1dfadc30f48f78ecb2c833ce1bc0f8756eb6966bc0144a8f8a5b513eeea91df8e01
-EBUILD compressed_depth_image_transport-9999.ebuild 585 BLAKE2B 0b8b19deef36e366964662b6b0d7748cfb66f6e4bb4d4e5cca1b28f5c04dddf77fc296dc267d6d7ac2226f69850be63735f0dbe3a64dea0236181bdf504908dd SHA512 332f93b0ece052ab11ef4ef6cf532861e359675da30a74dd4d95427f4678c1dfadc30f48f78ecb2c833ce1bc0f8756eb6966bc0144a8f8a5b513eeea91df8e01
+EBUILD compressed_depth_image_transport-1.14.0-r1.ebuild 626 BLAKE2B 919acd6e6a1bdf0c2cb4ac66befc67212b3abd17298cadb7fa614385f5e922f923b1e3b571eb350a86b64d262d67576298bf03b1932d7c37f84b89647dcedf40 SHA512 4a048d043172009958a688d1683515c325f41b6e5d1ab8269287bf92f871d9473c20ade73783d974d5f0e0f9c86b16810f2045f7e28623c55788dc83c281029c
+EBUILD compressed_depth_image_transport-9999.ebuild 626 BLAKE2B 919acd6e6a1bdf0c2cb4ac66befc67212b3abd17298cadb7fa614385f5e922f923b1e3b571eb350a86b64d262d67576298bf03b1932d7c37f84b89647dcedf40 SHA512 4a048d043172009958a688d1683515c325f41b6e5d1ab8269287bf92f871d9473c20ade73783d974d5f0e0f9c86b16810f2045f7e28623c55788dc83c281029c
 MISC metadata.xml 352 BLAKE2B d741d3235de6a630917b5785819ea9a3b13d8602bc5fd27b9fb8d4cea1df216fb64eaa0fd2fee5c5f11012a823311155331e2ae65af23874322679dc57bc32a9 SHA512 855c756eea98c52acb020fb394646008db35b41b864a0983f67bbf07ffce658d394c0de13d6622286770e4aa4152b74f2f6028c575b11b66233431d1fffa0347
diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0-r1.ebuild
index 97f465fd4872..ee76a3e1f2b2 100644
--- a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0.ebuild
+++ b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0-r1.ebuild
@@ -26,3 +26,4 @@ DEPEND="${RDEPEND}
 		dev-cpp/gtest
 	)
 "
+PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild
index 97f465fd4872..ee76a3e1f2b2 100644
--- a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild
+++ b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild
@@ -26,3 +26,4 @@ DEPEND="${RDEPEND}
 		dev-cpp/gtest
 	)
 "
+PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/compressed_depth_image_transport/files/ocv_leak.patch b/dev-ros/compressed_depth_image_transport/files/ocv_leak.patch
new file mode 100644
index 000000000000..8e1f81ae32fa
--- /dev/null
+++ b/dev-ros/compressed_depth_image_transport/files/ocv_leak.patch
@@ -0,0 +1,13 @@
+Index: compressed_depth_image_transport/CMakeLists.txt
+===================================================================
+--- compressed_depth_image_transport.orig/CMakeLists.txt
++++ compressed_depth_image_transport/CMakeLists.txt
+@@ -5,7 +5,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM
+ #  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")
+ endif()
+ 
+-find_package(OpenCV REQUIRED)
++find_package(OpenCV REQUIRED COMPONENTS opencv_core opencv_imgcodecs opencv_highgui)
+ find_package(catkin REQUIRED cv_bridge dynamic_reconfigure image_transport)
+ 
+ # generate the dynamic_reconfigure config file
diff --git a/dev-ros/compressed_image_transport/Manifest b/dev-ros/compressed_image_transport/Manifest
index 5423f8cc5c3e..acc4d35b79d4 100644
--- a/dev-ros/compressed_image_transport/Manifest
+++ b/dev-ros/compressed_image_transport/Manifest
@@ -1,4 +1,5 @@
+AUX ocv_leak.patch 578 BLAKE2B 1d14251eee0ceb84e323e512677b877720d30c624ebe031869239386076054346d0ea8e8c9a80652880cf3cb80807ceaecca636468606e58b1181ba53ecd02e9 SHA512 008e4aa02a6f796c8149c0620bd4eb2a4988a4ac8c50ee3b208df22da7af555974240ff79a262605ccced72eee0eae6e8ce21514fcbdcaaf05bcf36befdf6f4f
 DIST image_transport_plugins-1.14.0.tar.gz 28803 BLAKE2B fc3fc34c0dc01c5dc0ed7f2a88fd691f9b955009bbf91a2280e39455e0325a46edc67c25cf79d8e4882789c20235c13fb87bfc64669ffda40a1fe37224a346e9 SHA512 1333f18a3208ecda4f788dc2d974b5787a89d33a1ad1ea2c6b4cc07593c677686aa5e9df3346d2e5f307699b88b42f341a989eebecc3cd7885768e3dcdbbcdcb
-EBUILD compressed_image_transport-1.14.0.ebuild 551 BLAKE2B 90730fdbf3d9d330a708ce8e5ec45a07bb34dbf698199b092707ac6d8d1868d3def90eba2b415280e730665dbbb0af1a860c1c93ab2cc4ce6b252fed5a29da87 SHA512 2e36d72c20c4f6edc0938ef8523dbb85875cb787440cba474872e5e9bde81c155bcdcb09c66ce739c6da29a2f284505da47ed8d52a0e38eb5010e54e5d585bec
-EBUILD compressed_image_transport-9999.ebuild 551 BLAKE2B 90730fdbf3d9d330a708ce8e5ec45a07bb34dbf698199b092707ac6d8d1868d3def90eba2b415280e730665dbbb0af1a860c1c93ab2cc4ce6b252fed5a29da87 SHA512 2e36d72c20c4f6edc0938ef8523dbb85875cb787440cba474872e5e9bde81c155bcdcb09c66ce739c6da29a2f284505da47ed8d52a0e38eb5010e54e5d585bec
+EBUILD compressed_image_transport-1.14.0-r1.ebuild 592 BLAKE2B c794f97401f7b18669ed5e7f059b9f18c3f7f4aba98618b47b20ff3ba6c96b920e036e2905896a53ec6a73431c021892aef188e3be6f643ced531cdc53db01d7 SHA512 b4e0548662d8e3d46fa421646b76414c6144840f9fc70ba1aaab44177f55dedf6e9f49567803cc26bc5885ee61d6185ed0d8c92775a94900e86408ae2c88c5fe
+EBUILD compressed_image_transport-9999.ebuild 592 BLAKE2B c794f97401f7b18669ed5e7f059b9f18c3f7f4aba98618b47b20ff3ba6c96b920e036e2905896a53ec6a73431c021892aef188e3be6f643ced531cdc53db01d7 SHA512 b4e0548662d8e3d46fa421646b76414c6144840f9fc70ba1aaab44177f55dedf6e9f49567803cc26bc5885ee61d6185ed0d8c92775a94900e86408ae2c88c5fe
 MISC metadata.xml 352 BLAKE2B d741d3235de6a630917b5785819ea9a3b13d8602bc5fd27b9fb8d4cea1df216fb64eaa0fd2fee5c5f11012a823311155331e2ae65af23874322679dc57bc32a9 SHA512 855c756eea98c52acb020fb394646008db35b41b864a0983f67bbf07ffce658d394c0de13d6622286770e4aa4152b74f2f6028c575b11b66233431d1fffa0347
diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0-r1.ebuild
index f2997bda2e2c..310a1c7220be 100644
--- a/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0.ebuild
+++ b/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0-r1.ebuild
@@ -22,3 +22,4 @@ RDEPEND="
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
index f2997bda2e2c..310a1c7220be 100644
--- a/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
+++ b/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
@@ -22,3 +22,4 @@ RDEPEND="
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/compressed_image_transport/files/ocv_leak.patch b/dev-ros/compressed_image_transport/files/ocv_leak.patch
new file mode 100644
index 000000000000..cdc103bb0a2d
--- /dev/null
+++ b/dev-ros/compressed_image_transport/files/ocv_leak.patch
@@ -0,0 +1,13 @@
+Index: compressed_image_transport/CMakeLists.txt
+===================================================================
+--- compressed_image_transport.orig/CMakeLists.txt
++++ compressed_image_transport/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ cmake_minimum_required(VERSION 3.0.2)
+ project(compressed_image_transport)
+ 
+-find_package(OpenCV REQUIRED)
++find_package(OpenCV REQUIRED COMPONENTS opencv_core opencv_imgproc opencv_imgcodecs opencv_highgui)
+ find_package(catkin REQUIRED COMPONENTS cv_bridge dynamic_reconfigure image_transport)
+ 
+ # generate the dynamic_reconfigure config file
diff --git a/dev-ros/console_bridge_vendor/Manifest b/dev-ros/console_bridge_vendor/Manifest
index 489dede53cf2..6c4721e2ab65 100644
--- a/dev-ros/console_bridge_vendor/Manifest
+++ b/dev-ros/console_bridge_vendor/Manifest
@@ -1,4 +1,4 @@
-DIST console_bridge_vendor-1.2.1.tar.gz 7403 BLAKE2B d18f2ccb352c04b1c84a2c8ed5bb4fb790cddd3adf9667a6e9e99cdfb7da3f24931c653ffd0c8175131799d08086d110ad9ad33660ffc307a3a21a7dbf54ebef SHA512 12b611ff578b4a9e20fc894789985056b1b396f7085d4d6f0848fbe1a926ddc47ee6cc2c65bf3289041573b48bad75e2ce5a6d1b3f94aa8049429faece44d6a2
-EBUILD console_bridge_vendor-1.2.1.ebuild 1040 BLAKE2B 8d68e6dc6cce79a6b6623fed86228361e6588498904b44c7679c050002ebde2a73897daf00ae8dd71a061d44d00dd60f2c851b5b7a2f43bf3d519d75a02a2412 SHA512 54a39f008c5c351508967e47a8cf5d02e5c86554dbdfe0c2896006f250b8cf385be63cc715c5ee961bb0f5bca972d6db9e4b7be0d8857c9143f79b63edce1aab
+DIST console_bridge_vendor-1.2.2.tar.gz 7570 BLAKE2B 2b690d20851cf38554fcfa8645eb0c8bd7b226dcdf1e43ac379f5164d1aa8133bd4e75654b3354153985015d46a7cb2b71195cf123a982eadd1a91bbf6172624 SHA512 e44090cec050af7681892bfc4cb71d7f127b467845a1ec0d103678322c9482ce6ede0b5e914fd472380381906e350b3f64ead4d67e4c514a3c7c7e4d6fc24c22
+EBUILD console_bridge_vendor-1.2.2.ebuild 1040 BLAKE2B 8d68e6dc6cce79a6b6623fed86228361e6588498904b44c7679c050002ebde2a73897daf00ae8dd71a061d44d00dd60f2c851b5b7a2f43bf3d519d75a02a2412 SHA512 54a39f008c5c351508967e47a8cf5d02e5c86554dbdfe0c2896006f250b8cf385be63cc715c5ee961bb0f5bca972d6db9e4b7be0d8857c9143f79b63edce1aab
 EBUILD console_bridge_vendor-9999.ebuild 1040 BLAKE2B 8d68e6dc6cce79a6b6623fed86228361e6588498904b44c7679c050002ebde2a73897daf00ae8dd71a061d44d00dd60f2c851b5b7a2f43bf3d519d75a02a2412 SHA512 54a39f008c5c351508967e47a8cf5d02e5c86554dbdfe0c2896006f250b8cf385be63cc715c5ee961bb0f5bca972d6db9e4b7be0d8857c9143f79b63edce1aab
 MISC metadata.xml 340 BLAKE2B 870056bcba705aba636b787bab5b7418c318794f542a5e9ee3f165dc569e6e69b0e41ea54899150184f4ec5810398f3d2ae9fe33ffac64ddacfcba9b3c9e583f SHA512 7e652e5616c60cf5b77bd6f7a4b120ce26c35885426c87f9d22cc2963c9975f9423f1e2e88c795c55457d386b608ce783cb606a5b02dad1fd92a467373c34169
diff --git a/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.1.ebuild b/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.2.ebuild
index 1e45c2388a63..1e45c2388a63 100644
--- a/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.1.ebuild
+++ b/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.2.ebuild
diff --git a/dev-ros/controller_interface/Manifest b/dev-ros/controller_interface/Manifest
index 10793ecddab3..45a93a802b62 100644
--- a/dev-ros/controller_interface/Manifest
+++ b/dev-ros/controller_interface/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
 DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
+DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
 EBUILD controller_interface-0.19.1-r1.ebuild 433 BLAKE2B 463bd58e5be22fe5defd3c905b67f07c52a695419a6c1cd46f8949dd7b1a84ca51beceb1115f0f6331e5f0019ab69c1442afd5d394df156eaa04bb65bdf324e1 SHA512 fe59bcc4f329a6118219a9764491d2ffd8729a25bbf723f210233807221e527c6146288e987ed545df5da425291136d350d4eb561053c5769fd1cf075e7ac5fc
 EBUILD controller_interface-0.19.2.ebuild 433 BLAKE2B 463bd58e5be22fe5defd3c905b67f07c52a695419a6c1cd46f8949dd7b1a84ca51beceb1115f0f6331e5f0019ab69c1442afd5d394df156eaa04bb65bdf324e1 SHA512 fe59bcc4f329a6118219a9764491d2ffd8729a25bbf723f210233807221e527c6146288e987ed545df5da425291136d350d4eb561053c5769fd1cf075e7ac5fc
+EBUILD controller_interface-0.19.3.ebuild 433 BLAKE2B 463bd58e5be22fe5defd3c905b67f07c52a695419a6c1cd46f8949dd7b1a84ca51beceb1115f0f6331e5f0019ab69c1442afd5d394df156eaa04bb65bdf324e1 SHA512 fe59bcc4f329a6118219a9764491d2ffd8729a25bbf723f210233807221e527c6146288e987ed545df5da425291136d350d4eb561053c5769fd1cf075e7ac5fc
 EBUILD controller_interface-9999.ebuild 433 BLAKE2B 463bd58e5be22fe5defd3c905b67f07c52a695419a6c1cd46f8949dd7b1a84ca51beceb1115f0f6331e5f0019ab69c1442afd5d394df156eaa04bb65bdf324e1 SHA512 fe59bcc4f329a6118219a9764491d2ffd8729a25bbf723f210233807221e527c6146288e987ed545df5da425291136d350d4eb561053c5769fd1cf075e7ac5fc
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_interface/controller_interface-0.19.3.ebuild b/dev-ros/controller_interface/controller_interface-0.19.3.ebuild
new file mode 100644
index 000000000000..f86635bda8b3
--- /dev/null
+++ b/dev-ros/controller_interface/controller_interface-0.19.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Interface base class for controllers"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/hardware_interface
+	dev-ros/pluginlib:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
diff --git a/dev-ros/controller_manager/Manifest b/dev-ros/controller_manager/Manifest
index c8544f2aa927..caa47d51e60f 100644
--- a/dev-ros/controller_manager/Manifest
+++ b/dev-ros/controller_manager/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
 DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
+DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
 EBUILD controller_manager-0.19.1.ebuild 911 BLAKE2B e7289f33666ce614e3f20dffb0a2b73a425deea39a818168e290c97c64b06243430c4a55c65096188cbf81f42cbd1a2dad14492cb673a5c93fab1e7df3a4e2de SHA512 a452d8ed7ffcf8d5bce4176841cde2d336317817a61c8d7eda815e74c25752631bf050f9b243e973cc4bf3171219efad6bc5dd2a85593ebfbeecdba0fac41162
 EBUILD controller_manager-0.19.2.ebuild 911 BLAKE2B e7289f33666ce614e3f20dffb0a2b73a425deea39a818168e290c97c64b06243430c4a55c65096188cbf81f42cbd1a2dad14492cb673a5c93fab1e7df3a4e2de SHA512 a452d8ed7ffcf8d5bce4176841cde2d336317817a61c8d7eda815e74c25752631bf050f9b243e973cc4bf3171219efad6bc5dd2a85593ebfbeecdba0fac41162
+EBUILD controller_manager-0.19.3.ebuild 911 BLAKE2B e7289f33666ce614e3f20dffb0a2b73a425deea39a818168e290c97c64b06243430c4a55c65096188cbf81f42cbd1a2dad14492cb673a5c93fab1e7df3a4e2de SHA512 a452d8ed7ffcf8d5bce4176841cde2d336317817a61c8d7eda815e74c25752631bf050f9b243e973cc4bf3171219efad6bc5dd2a85593ebfbeecdba0fac41162
 EBUILD controller_manager-9999.ebuild 911 BLAKE2B e7289f33666ce614e3f20dffb0a2b73a425deea39a818168e290c97c64b06243430c4a55c65096188cbf81f42cbd1a2dad14492cb673a5c93fab1e7df3a4e2de SHA512 a452d8ed7ffcf8d5bce4176841cde2d336317817a61c8d7eda815e74c25752631bf050f9b243e973cc4bf3171219efad6bc5dd2a85593ebfbeecdba0fac41162
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager/controller_manager-0.19.3.ebuild b/dev-ros/controller_manager/controller_manager-0.19.3.ebuild
new file mode 100644
index 000000000000..56fe44573d05
--- /dev/null
+++ b/dev-ros/controller_manager/controller_manager-0.19.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="The controller manager"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/controller_interface-0.15
+	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	>=dev-ros/hardware_interface-0.10.0
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)"
diff --git a/dev-ros/controller_manager_msgs/Manifest b/dev-ros/controller_manager_msgs/Manifest
index 8e2e6e406a0f..e71b67214a74 100644
--- a/dev-ros/controller_manager_msgs/Manifest
+++ b/dev-ros/controller_manager_msgs/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
 DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
+DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
 EBUILD controller_manager_msgs-0.19.1.ebuild 440 BLAKE2B e49c9671a6c3ff79321dc8c9d800c2ae79ef11d6fc240bfa593651230206b9432a0f1bb6a654996c6821aaa2a16048a8e76151e52ca24c87341b8697c9981981 SHA512 2d1850460349c82074fd0d8f503ac7602d4f59100598ee0ee844b07116ea2c40e38a83e27ff743d3845f4073328b449b1a6d7a353a950ac875238360febc57d5
 EBUILD controller_manager_msgs-0.19.2.ebuild 440 BLAKE2B e49c9671a6c3ff79321dc8c9d800c2ae79ef11d6fc240bfa593651230206b9432a0f1bb6a654996c6821aaa2a16048a8e76151e52ca24c87341b8697c9981981 SHA512 2d1850460349c82074fd0d8f503ac7602d4f59100598ee0ee844b07116ea2c40e38a83e27ff743d3845f4073328b449b1a6d7a353a950ac875238360febc57d5
+EBUILD controller_manager_msgs-0.19.3.ebuild 440 BLAKE2B e49c9671a6c3ff79321dc8c9d800c2ae79ef11d6fc240bfa593651230206b9432a0f1bb6a654996c6821aaa2a16048a8e76151e52ca24c87341b8697c9981981 SHA512 2d1850460349c82074fd0d8f503ac7602d4f59100598ee0ee844b07116ea2c40e38a83e27ff743d3845f4073328b449b1a6d7a353a950ac875238360febc57d5
 EBUILD controller_manager_msgs-9999.ebuild 440 BLAKE2B e49c9671a6c3ff79321dc8c9d800c2ae79ef11d6fc240bfa593651230206b9432a0f1bb6a654996c6821aaa2a16048a8e76151e52ca24c87341b8697c9981981 SHA512 2d1850460349c82074fd0d8f503ac7602d4f59100598ee0ee844b07116ea2c40e38a83e27ff743d3845f4073328b449b1a6d7a353a950ac875238360febc57d5
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.3.ebuild b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.3.ebuild
new file mode 100644
index 000000000000..96b14aee266a
--- /dev/null
+++ b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="The controller manager"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_manager_tests/Manifest b/dev-ros/controller_manager_tests/Manifest
index 168e91e2ce8f..0a08956588fe 100644
--- a/dev-ros/controller_manager_tests/Manifest
+++ b/dev-ros/controller_manager_tests/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
 DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
+DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
 EBUILD controller_manager_tests-0.19.1.ebuild 916 BLAKE2B 2863c87ca0bc54a305777f574d127c53b61580761dabbb5a7b694ec87c2558dedfe38ca4ade4600684991c330a0d38fcb7d35ebc6afc54d06fb9d2f49e953915 SHA512 13364da33088948d81937f9c613920b651f1f19fda2cf256a6ed22a4cce95bc7c40ffc0447936e93e7604064a8be75b58efced3ec6aae50e9f9a77ec7b09183c
 EBUILD controller_manager_tests-0.19.2.ebuild 902 BLAKE2B 60b0543b7f2b092d15eee1adbb089f47f37adaa3682a141bd58b7976dd4b6582856aa90c3e38010b29563f26af44a36fabae61e84d7dd153e4e9525c3c9fd29e SHA512 1f154dfc3a04d0bdfe1534e88ee66c381c4dac76cad042ed69eb9c6a00d91fd73dcaca14cc7836783c70514e83d787276b2e15f614cd0969cde1b09f1a24fc2a
+EBUILD controller_manager_tests-0.19.3.ebuild 902 BLAKE2B 60b0543b7f2b092d15eee1adbb089f47f37adaa3682a141bd58b7976dd4b6582856aa90c3e38010b29563f26af44a36fabae61e84d7dd153e4e9525c3c9fd29e SHA512 1f154dfc3a04d0bdfe1534e88ee66c381c4dac76cad042ed69eb9c6a00d91fd73dcaca14cc7836783c70514e83d787276b2e15f614cd0969cde1b09f1a24fc2a
 EBUILD controller_manager_tests-9999.ebuild 902 BLAKE2B 60b0543b7f2b092d15eee1adbb089f47f37adaa3682a141bd58b7976dd4b6582856aa90c3e38010b29563f26af44a36fabae61e84d7dd153e4e9525c3c9fd29e SHA512 1f154dfc3a04d0bdfe1534e88ee66c381c4dac76cad042ed69eb9c6a00d91fd73dcaca14cc7836783c70514e83d787276b2e15f614cd0969cde1b09f1a24fc2a
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.3.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.3.ebuild
new file mode 100644
index 000000000000..3c574d1b681b
--- /dev/null
+++ b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tests for the controller manager"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/controller_interface
+	dev-ros/control_toolbox
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+	dev-cpp/gtest
+"
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+"
+# needed by combined_robot_hw_tests
+mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/costmap_2d/Manifest b/dev-ros/costmap_2d/Manifest
index 04c98e5eb076..f085ac0a1d46 100644
--- a/dev-ros/costmap_2d/Manifest
+++ b/dev-ros/costmap_2d/Manifest
@@ -1,8 +1,12 @@
 DIST costmap_2d-1.17.0-simple_driving_test_indexed.bag 945511 BLAKE2B 49cef9884a1a174548239576d720c4e49797098aed9406bbbc954abfaf28844ed432092f79d346ebe471b26f48b612d3265a2d7e2303c2f129a5109b241f6fa4 SHA512 101beca7279c1ac6eecb5af243b6ec73c280958107004d84c438a8d79ff45b1bfadeb9b1956939b339c2ed32ed3d0e9e88af11340410b34ff73943dbe5fac463
 DIST costmap_2d-1.17.0-willow-full-0.025.pgm 4255956 BLAKE2B 884ee8d9cc6d346b86d0b15ee4d0184598502094bda23e2ee3df21138ab3c8dd1fe1156dc869f452d4db1262b102653764a1a005af7fd61a142efad4adb82d90 SHA512 539fffebad08e0580e42369d98a1375cde5df7c7479e4d58cae00266cbefebb2e221f5e6b936b413498860b871221df6d5bec20b93cf7e2b8121b062138303ee
+DIST costmap_2d-1.17.1-simple_driving_test_indexed.bag 945511 BLAKE2B 49cef9884a1a174548239576d720c4e49797098aed9406bbbc954abfaf28844ed432092f79d346ebe471b26f48b612d3265a2d7e2303c2f129a5109b241f6fa4 SHA512 101beca7279c1ac6eecb5af243b6ec73c280958107004d84c438a8d79ff45b1bfadeb9b1956939b339c2ed32ed3d0e9e88af11340410b34ff73943dbe5fac463
+DIST costmap_2d-1.17.1-willow-full-0.025.pgm 4255956 BLAKE2B 884ee8d9cc6d346b86d0b15ee4d0184598502094bda23e2ee3df21138ab3c8dd1fe1156dc869f452d4db1262b102653764a1a005af7fd61a142efad4adb82d90 SHA512 539fffebad08e0580e42369d98a1375cde5df7c7479e4d58cae00266cbefebb2e221f5e6b936b413498860b871221df6d5bec20b93cf7e2b8121b062138303ee
 DIST costmap_2d-9999-simple_driving_test_indexed.bag 945511 BLAKE2B 49cef9884a1a174548239576d720c4e49797098aed9406bbbc954abfaf28844ed432092f79d346ebe471b26f48b612d3265a2d7e2303c2f129a5109b241f6fa4 SHA512 101beca7279c1ac6eecb5af243b6ec73c280958107004d84c438a8d79ff45b1bfadeb9b1956939b339c2ed32ed3d0e9e88af11340410b34ff73943dbe5fac463
 DIST costmap_2d-9999-willow-full-0.025.pgm 4255956 BLAKE2B 884ee8d9cc6d346b86d0b15ee4d0184598502094bda23e2ee3df21138ab3c8dd1fe1156dc869f452d4db1262b102653764a1a005af7fd61a142efad4adb82d90 SHA512 539fffebad08e0580e42369d98a1375cde5df7c7479e4d58cae00266cbefebb2e221f5e6b936b413498860b871221df6d5bec20b93cf7e2b8121b062138303ee
 DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
 EBUILD costmap_2d-1.17.0-r1.ebuild 1730 BLAKE2B d2186af9fd7d07e7618790fe2db06c8742ac814d19a18030f39ad883df355c164ed891dcf1fad56f90de591f753678bec692a79f58309587c9db1454091633d9 SHA512 1bb529f438e783810a9ce9ba99d2fab75230b9ea86c4b69979f97ec6a470d065d50e95d3ec473846284965b4d6bc29220d6d8790533c93d0327b4649e8e86f37
+EBUILD costmap_2d-1.17.1.ebuild 1730 BLAKE2B d2186af9fd7d07e7618790fe2db06c8742ac814d19a18030f39ad883df355c164ed891dcf1fad56f90de591f753678bec692a79f58309587c9db1454091633d9 SHA512 1bb529f438e783810a9ce9ba99d2fab75230b9ea86c4b69979f97ec6a470d065d50e95d3ec473846284965b4d6bc29220d6d8790533c93d0327b4649e8e86f37
 EBUILD costmap_2d-9999.ebuild 1730 BLAKE2B d2186af9fd7d07e7618790fe2db06c8742ac814d19a18030f39ad883df355c164ed891dcf1fad56f90de591f753678bec692a79f58309587c9db1454091633d9 SHA512 1bb529f438e783810a9ce9ba99d2fab75230b9ea86c4b69979f97ec6a470d065d50e95d3ec473846284965b4d6bc29220d6d8790533c93d0327b4649e8e86f37
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/costmap_2d/costmap_2d-1.17.1.ebuild b/dev-ros/costmap_2d/costmap_2d-1.17.1.ebuild
new file mode 100644
index 000000000000..f07bee5f0d3b
--- /dev/null
+++ b/dev-ros/costmap_2d/costmap_2d-1.17.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/map_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Creates a 2D costmap from sensor data"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="ros_messages_cxx"
+DATA="simple_driving_test_indexed.bag willow-full-0.025.pgm"
+for i in ${DATA}; do
+	SRC_URI="${SRC_URI}
+		http://download.ros.org/data/costmap_2d/${i} -> ${P}-${i}"
+done
+
+RDEPEND="
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/laser_geometry
+	dev-ros/message_filters
+	>=dev-ros/pluginlib-1.13.0-r1
+	dev-ros/roscpp
+	dev-ros/tf2
+	dev-ros/tf2_ros
+	dev-ros/voxel_grid
+
+	dev-libs/boost:=[threads]
+	dev-libs/tinyxml2:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_sensor_msgs
+	test? (
+		dev-ros/map_server
+		dev-ros/rosbag
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+		dev-ros/rosunit
+	)"
+BDEPEND="
+	dev-ros/cmake_modules
+"
+
+src_prepare() {
+	ros-catkin_src_prepare
+	for i in ${DATA}; do
+		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
+	done
+	sed -e "s#http://download.ros.org/data/costmap_2d/#file://${S}/#" -i CMakeLists.txt || die
+}
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/cv_bridge/Manifest b/dev-ros/cv_bridge/Manifest
index 0dc4f121dfa8..6f8a744224c8 100644
--- a/dev-ros/cv_bridge/Manifest
+++ b/dev-ros/cv_bridge/Manifest
@@ -1,5 +1,6 @@
 AUX boostpython.patch 599 BLAKE2B 5076c2efdfd06afa9dbc9e3ad344774c1fca54ef172a4808e4ba7b40f4770250d49b1e478abcee1ac973c3a1012579694499a1dd48fd84c19f996441920c329c SHA512 21c5a6589a1ee19d5f586b535807c35f5eef77da6dae614deb7542d8cb1cf850902b5d7de197d6060016f43dcbef8d6d69d104abc5f5fa0af6131a415a43ba64
+AUX ocv_leak.patch 536 BLAKE2B 4b1def824e397178ae6769ce1efce40f48c2f43b0cc759f5a001d007854684b823284828b1df483219acd587654c2e5919fdaa6ef15a92d33c0379a159f10462 SHA512 a84aa1acecd55b45760ecb8a93a88721a79ec0b882a62ae32fdeb839c2a406de0b870765a562a12cf9fd9c608bc900722fbcb5eb0f6a9653809167b2f2631967
 DIST vision_opencv-1.15.0.tar.gz 82281 BLAKE2B 6e86cf67bb9fbf07ca36dbe0bb3fb32611a4e216cea209048bfe34b71622a56954063f2e7ff466275810f36c62d016a1d04e987383dde35f0bb85abf0e74350f SHA512 b6331b00aac18f96eb40ef57b2b4fe55da956007390549762818eab7ad36fcf192549448f2edcc6b4e550273f80320bf15eb6a60900d155be680ec8682fd17ba
-EBUILD cv_bridge-1.15.0.ebuild 801 BLAKE2B 92b9e314c3c22a21a6496ecb8c1e8c047dbf14993c30a453cd6f934a99602ea6c9bb8c5c1d9c1b86c28f51bfd6d8a137a24349343ec8ace88debadd6364bfbf8 SHA512 0871710d79cbd4fcce528d783fb6c52c2cf4d9a678ac69fa05ff1790788140c007355b5b38341c806999b6c3656f56e81d74822c4a4183bc36692dcdf00b6993
-EBUILD cv_bridge-9999.ebuild 801 BLAKE2B 92b9e314c3c22a21a6496ecb8c1e8c047dbf14993c30a453cd6f934a99602ea6c9bb8c5c1d9c1b86c28f51bfd6d8a137a24349343ec8ace88debadd6364bfbf8 SHA512 0871710d79cbd4fcce528d783fb6c52c2cf4d9a678ac69fa05ff1790788140c007355b5b38341c806999b6c3656f56e81d74822c4a4183bc36692dcdf00b6993
+EBUILD cv_bridge-1.15.0-r1.ebuild 830 BLAKE2B 37b1fd1b333425d291cca60707ea75d0ddd0033ca114b7a145d1a99ff827d537830a322fd925d4b756f70cf3ff81edabe4a9c1297c8da87671d9b54dfc5333eb SHA512 9a391aaa204f4753fc645a62da1dfc3463feacdd7eaf9c45ce5bf43b4382b4a1acf6597a6ff277b36167272784df28af404d99d3a1f6cd1803ea3582c40ff8cb
+EBUILD cv_bridge-9999.ebuild 830 BLAKE2B 37b1fd1b333425d291cca60707ea75d0ddd0033ca114b7a145d1a99ff827d537830a322fd925d4b756f70cf3ff81edabe4a9c1297c8da87671d9b54dfc5333eb SHA512 9a391aaa204f4753fc645a62da1dfc3463feacdd7eaf9c45ce5bf43b4382b4a1acf6597a6ff277b36167272784df28af404d99d3a1f6cd1803ea3582c40ff8cb
 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/cv_bridge/cv_bridge-1.15.0.ebuild b/dev-ros/cv_bridge/cv_bridge-1.15.0-r1.ebuild
index 582de3e58f72..6e6271b0b528 100644
--- a/dev-ros/cv_bridge/cv_bridge-1.15.0.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-1.15.0-r1.ebuild
@@ -27,4 +27,4 @@ DEPEND="${RDEPEND}
 		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 	)
 "
-PATCHES=( "${FILESDIR}/boostpython.patch" )
+PATCHES=( "${FILESDIR}/boostpython.patch" "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/cv_bridge/cv_bridge-9999.ebuild b/dev-ros/cv_bridge/cv_bridge-9999.ebuild
index 582de3e58f72..6e6271b0b528 100644
--- a/dev-ros/cv_bridge/cv_bridge-9999.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-9999.ebuild
@@ -27,4 +27,4 @@ DEPEND="${RDEPEND}
 		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 	)
 "
-PATCHES=( "${FILESDIR}/boostpython.patch" )
+PATCHES=( "${FILESDIR}/boostpython.patch" "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/cv_bridge/files/ocv_leak.patch b/dev-ros/cv_bridge/files/ocv_leak.patch
new file mode 100644
index 000000000000..32b3fafbe074
--- /dev/null
+++ b/dev-ros/cv_bridge/files/ocv_leak.patch
@@ -0,0 +1,20 @@
+Index: cv_bridge/CMakeLists.txt
+===================================================================
+--- cv_bridge.orig/CMakeLists.txt
++++ cv_bridge/CMakeLists.txt
+@@ -17,14 +17,7 @@ else()
+ find_package(Boost REQUIRED)
+ endif()
+ 
+-set(_opencv_version 4)
+-find_package(OpenCV 4 QUIET)
+-if(NOT OpenCV_FOUND)
+-  message(STATUS "Did not find OpenCV 4, trying OpenCV 3")
+-  set(_opencv_version 3)
+-endif()
+-
+-find_package(OpenCV ${_opencv_version4} REQUIRED
++find_package(OpenCV 4 REQUIRED
+   COMPONENTS
+     opencv_core
+     opencv_imgproc
diff --git a/dev-ros/diagnostic_aggregator/Manifest b/dev-ros/diagnostic_aggregator/Manifest
index e4e38dfe3865..64d6d1f3fd1a 100644
--- a/dev-ros/diagnostic_aggregator/Manifest
+++ b/dev-ros/diagnostic_aggregator/Manifest
@@ -1,4 +1,6 @@
 DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
+DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 EBUILD diagnostic_aggregator-1.10.1.ebuild 808 BLAKE2B 549d495f4cb67958720e274ec39f9ea59145422c12135d6f2b27cb575d40f4a373ee8b5bf8c9e8f95de874795fed4cb33bf3e8b1cd5e05948240bb9940dba198 SHA512 9338038171485e43c1fb6a74dc1dbbd085b753811ae9097ab0ccd12c6a49f602a439fa8ed70ab38df43e5c0f1f966041afefdbb4400a544aaf9a212aa4fc748a
+EBUILD diagnostic_aggregator-1.10.2.ebuild 808 BLAKE2B 549d495f4cb67958720e274ec39f9ea59145422c12135d6f2b27cb575d40f4a373ee8b5bf8c9e8f95de874795fed4cb33bf3e8b1cd5e05948240bb9940dba198 SHA512 9338038171485e43c1fb6a74dc1dbbd085b753811ae9097ab0ccd12c6a49f602a439fa8ed70ab38df43e5c0f1f966041afefdbb4400a544aaf9a212aa4fc748a
 EBUILD diagnostic_aggregator-9999.ebuild 808 BLAKE2B 549d495f4cb67958720e274ec39f9ea59145422c12135d6f2b27cb575d40f4a373ee8b5bf8c9e8f95de874795fed4cb33bf3e8b1cd5e05948240bb9940dba198 SHA512 9338038171485e43c1fb6a74dc1dbbd085b753811ae9097ab0ccd12c6a49f602a439fa8ed70ab38df43e5c0f1f966041afefdbb4400a544aaf9a212aa4fc748a
 MISC metadata.xml 329 BLAKE2B 5e824b17ef204172c52c3091d08267568c131a28f752a12867316400e12ff989c417f921329fd48f759d2d14325fe1ff48eb0bce36ba693b3dcf8a2f897c7aa9 SHA512 38a2d063b6ed23109d1c79cff72f2bddea0a0f3cdc54a7f8e73c6c824b6855c120bbfe373fcd33473c25f6067ece4cd169a68c83c04163cd631a5e1253004e44
diff --git a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.2.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.2.ebuild
new file mode 100644
index 000000000000..76db5fae27db
--- /dev/null
+++ b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.10.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Aggregates ROS diagnostics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/pluginlib:=
+		dev-libs/tinyxml2:=
+	dev-ros/roscpp
+	dev-ros/rospy
+	dev-ros/rostest
+	dev-ros/xmlrpcpp
+	dev-ros/bondcpp
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+	dev-ros/bondpy[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/diagnostic_analysis/Manifest b/dev-ros/diagnostic_analysis/Manifest
index 8dfe0c37a122..9064506fd21b 100644
--- a/dev-ros/diagnostic_analysis/Manifest
+++ b/dev-ros/diagnostic_analysis/Manifest
@@ -1,7 +1,9 @@
 DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
+DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
 DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
 EBUILD diagnostic_analysis-1.10.1.ebuild 697 BLAKE2B 12c2797a9981fb9ff82e1e9a9192818a3b4e57237ec274b9908bb19072397b406a2b134074e575e6efd67f40b2159e0ae920a321d84077bf201f403eb8c22ae1 SHA512 6e00030de3792523a6062d4f8f2d9e88681e2e64c026ee15df8646c74d80e746b67b3ca3c0d81ad9946c8e3aafc0ffadbfc6a43a1cadd6d88c8abd36255da778
+EBUILD diagnostic_analysis-1.10.2.ebuild 697 BLAKE2B 12c2797a9981fb9ff82e1e9a9192818a3b4e57237ec274b9908bb19072397b406a2b134074e575e6efd67f40b2159e0ae920a321d84077bf201f403eb8c22ae1 SHA512 6e00030de3792523a6062d4f8f2d9e88681e2e64c026ee15df8646c74d80e746b67b3ca3c0d81ad9946c8e3aafc0ffadbfc6a43a1cadd6d88c8abd36255da778
 EBUILD diagnostic_analysis-1.9.4.ebuild 697 BLAKE2B 12c2797a9981fb9ff82e1e9a9192818a3b4e57237ec274b9908bb19072397b406a2b134074e575e6efd67f40b2159e0ae920a321d84077bf201f403eb8c22ae1 SHA512 6e00030de3792523a6062d4f8f2d9e88681e2e64c026ee15df8646c74d80e746b67b3ca3c0d81ad9946c8e3aafc0ffadbfc6a43a1cadd6d88c8abd36255da778
 EBUILD diagnostic_analysis-1.9.6.ebuild 697 BLAKE2B 12c2797a9981fb9ff82e1e9a9192818a3b4e57237ec274b9908bb19072397b406a2b134074e575e6efd67f40b2159e0ae920a321d84077bf201f403eb8c22ae1 SHA512 6e00030de3792523a6062d4f8f2d9e88681e2e64c026ee15df8646c74d80e746b67b3ca3c0d81ad9946c8e3aafc0ffadbfc6a43a1cadd6d88c8abd36255da778
 EBUILD diagnostic_analysis-9999.ebuild 697 BLAKE2B 12c2797a9981fb9ff82e1e9a9192818a3b4e57237ec274b9908bb19072397b406a2b134074e575e6efd67f40b2159e0ae920a321d84077bf201f403eb8c22ae1 SHA512 6e00030de3792523a6062d4f8f2d9e88681e2e64c026ee15df8646c74d80e746b67b3ca3c0d81ad9946c8e3aafc0ffadbfc6a43a1cadd6d88c8abd36255da778
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.2.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.2.ebuild
new file mode 100644
index 000000000000..fdc2bbe90d68
--- /dev/null
+++ b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.10.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Converts diagnostics data into a series of CSV files"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/diagnostic_common_diagnostics/Manifest b/dev-ros/diagnostic_common_diagnostics/Manifest
index 5afb072bff37..aaae13b92eaa 100644
--- a/dev-ros/diagnostic_common_diagnostics/Manifest
+++ b/dev-ros/diagnostic_common_diagnostics/Manifest
@@ -1,7 +1,9 @@
 DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
+DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
 DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
 EBUILD diagnostic_common_diagnostics-1.10.1.ebuild 734 BLAKE2B f118826a52ccc510ee9643d6e9ced491271b0b102ed8de211de00e52c1c18af1d1b9e5ab112a98393981cfca26b64f497b25c69c03bad024d2db7bcd351f11b5 SHA512 7f6ad0a636ca21123fac04a084786f5dcc0e9286dcd3a1b62b957adebebb66dfbac78f39c143ca981473ae96d94a591c1bb427bd977e0de5446ff2b0b8c6afc4
+EBUILD diagnostic_common_diagnostics-1.10.2.ebuild 734 BLAKE2B f118826a52ccc510ee9643d6e9ced491271b0b102ed8de211de00e52c1c18af1d1b9e5ab112a98393981cfca26b64f497b25c69c03bad024d2db7bcd351f11b5 SHA512 7f6ad0a636ca21123fac04a084786f5dcc0e9286dcd3a1b62b957adebebb66dfbac78f39c143ca981473ae96d94a591c1bb427bd977e0de5446ff2b0b8c6afc4
 EBUILD diagnostic_common_diagnostics-1.9.4.ebuild 734 BLAKE2B f118826a52ccc510ee9643d6e9ced491271b0b102ed8de211de00e52c1c18af1d1b9e5ab112a98393981cfca26b64f497b25c69c03bad024d2db7bcd351f11b5 SHA512 7f6ad0a636ca21123fac04a084786f5dcc0e9286dcd3a1b62b957adebebb66dfbac78f39c143ca981473ae96d94a591c1bb427bd977e0de5446ff2b0b8c6afc4
 EBUILD diagnostic_common_diagnostics-1.9.6.ebuild 734 BLAKE2B f118826a52ccc510ee9643d6e9ced491271b0b102ed8de211de00e52c1c18af1d1b9e5ab112a98393981cfca26b64f497b25c69c03bad024d2db7bcd351f11b5 SHA512 7f6ad0a636ca21123fac04a084786f5dcc0e9286dcd3a1b62b957adebebb66dfbac78f39c143ca981473ae96d94a591c1bb427bd977e0de5446ff2b0b8c6afc4
 EBUILD diagnostic_common_diagnostics-9999.ebuild 734 BLAKE2B f118826a52ccc510ee9643d6e9ced491271b0b102ed8de211de00e52c1c18af1d1b9e5ab112a98393981cfca26b64f497b25c69c03bad024d2db7bcd351f11b5 SHA512 7f6ad0a636ca21123fac04a084786f5dcc0e9286dcd3a1b62b957adebebb66dfbac78f39c143ca981473ae96d94a591c1bb427bd977e0de5446ff2b0b8c6afc4
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.10.2.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.10.2.ebuild
new file mode 100644
index 000000000000..7d94a89560d9
--- /dev/null
+++ b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.10.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Generic nodes for monitoring a linux host"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-ros/diagnostic_updater[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
+	app-admin/hddtemp"
+DEPEND="${DEPEND}
+	test? (
+		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	)
+"
diff --git a/dev-ros/diagnostic_updater/Manifest b/dev-ros/diagnostic_updater/Manifest
index c6ec3c8d90c4..74ca2322546d 100644
--- a/dev-ros/diagnostic_updater/Manifest
+++ b/dev-ros/diagnostic_updater/Manifest
@@ -1,7 +1,9 @@
 DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
+DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
 DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
 EBUILD diagnostic_updater-1.10.1.ebuild 804 BLAKE2B 15686a629b196137fe14c640dc28861258f65ab85cd0108b84ff02f3894128e122ab56e4d3669fa51664ce5e6b915ea717f4856be80ba695606ded59d3d255d3 SHA512 3eaf916f91a57ddc5ba05b599a5605ab3e3b45b815cad4fff386476af1ad0a0b82fad71ff60162a341fa8a64e5239ad9e41805f7f81831b5cbf79ec8067d93cc
+EBUILD diagnostic_updater-1.10.2.ebuild 804 BLAKE2B 15686a629b196137fe14c640dc28861258f65ab85cd0108b84ff02f3894128e122ab56e4d3669fa51664ce5e6b915ea717f4856be80ba695606ded59d3d255d3 SHA512 3eaf916f91a57ddc5ba05b599a5605ab3e3b45b815cad4fff386476af1ad0a0b82fad71ff60162a341fa8a64e5239ad9e41805f7f81831b5cbf79ec8067d93cc
 EBUILD diagnostic_updater-1.9.4.ebuild 804 BLAKE2B 15686a629b196137fe14c640dc28861258f65ab85cd0108b84ff02f3894128e122ab56e4d3669fa51664ce5e6b915ea717f4856be80ba695606ded59d3d255d3 SHA512 3eaf916f91a57ddc5ba05b599a5605ab3e3b45b815cad4fff386476af1ad0a0b82fad71ff60162a341fa8a64e5239ad9e41805f7f81831b5cbf79ec8067d93cc
 EBUILD diagnostic_updater-1.9.6.ebuild 804 BLAKE2B 15686a629b196137fe14c640dc28861258f65ab85cd0108b84ff02f3894128e122ab56e4d3669fa51664ce5e6b915ea717f4856be80ba695606ded59d3d255d3 SHA512 3eaf916f91a57ddc5ba05b599a5605ab3e3b45b815cad4fff386476af1ad0a0b82fad71ff60162a341fa8a64e5239ad9e41805f7f81831b5cbf79ec8067d93cc
 EBUILD diagnostic_updater-9999.ebuild 804 BLAKE2B 15686a629b196137fe14c640dc28861258f65ab85cd0108b84ff02f3894128e122ab56e4d3669fa51664ce5e6b915ea717f4856be80ba695606ded59d3d255d3 SHA512 3eaf916f91a57ddc5ba05b599a5605ab3e3b45b815cad4fff386476af1ad0a0b82fad71ff60162a341fa8a64e5239ad9e41805f7f81831b5cbf79ec8067d93cc
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.10.2.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.10.2.ebuild
new file mode 100644
index 000000000000..26dc8c7e62f7
--- /dev/null
+++ b/dev-ros/diagnostic_updater/diagnostic_updater-1.10.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for updating diagnostics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/dwa_local_planner/Manifest b/dev-ros/dwa_local_planner/Manifest
index b83d3753085f..b238b0ed78a5 100644
--- a/dev-ros/dwa_local_planner/Manifest
+++ b/dev-ros/dwa_local_planner/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
 EBUILD dwa_local_planner-1.17.0.ebuild 804 BLAKE2B c1988ed920a5840725c4d99b7b0838e45ad05b1a7293032762cd7e0f2e624921e6bf941256d3d1197edf9eefc66caa23900d4fe2e5d50f776e8d5a7b2888dfaf SHA512 bcaeb2bdc925fd6815c36f7031d7843f020f7cf89cbd67f16d4546f9c242c9263011e69d17c70146e896cdf66b88ce283596779944e20c2de4cbefe382e14121
+EBUILD dwa_local_planner-1.17.1.ebuild 804 BLAKE2B c1988ed920a5840725c4d99b7b0838e45ad05b1a7293032762cd7e0f2e624921e6bf941256d3d1197edf9eefc66caa23900d4fe2e5d50f776e8d5a7b2888dfaf SHA512 bcaeb2bdc925fd6815c36f7031d7843f020f7cf89cbd67f16d4546f9c242c9263011e69d17c70146e896cdf66b88ce283596779944e20c2de4cbefe382e14121
 EBUILD dwa_local_planner-9999.ebuild 804 BLAKE2B c1988ed920a5840725c4d99b7b0838e45ad05b1a7293032762cd7e0f2e624921e6bf941256d3d1197edf9eefc66caa23900d4fe2e5d50f776e8d5a7b2888dfaf SHA512 bcaeb2bdc925fd6815c36f7031d7843f020f7cf89cbd67f16d4546f9c242c9263011e69d17c70146e896cdf66b88ce283596779944e20c2de4cbefe382e14121
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/dwa_local_planner/dwa_local_planner-1.17.1.ebuild b/dev-ros/dwa_local_planner/dwa_local_planner-1.17.1.ebuild
new file mode 100644
index 000000000000..ae5574a54a45
--- /dev/null
+++ b/dev-ros/dwa_local_planner/dwa_local_planner-1.17.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Dynamic Window Approach to local robot navigation on a plane"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/angles
+	dev-ros/base_local_planner
+	dev-ros/costmap_2d
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
+	dev-cpp/eigen:3
+	dev-ros/nav_core
+	dev-ros/pluginlib
+	dev-ros/roscpp
+
+	dev-ros/tf2
+	dev-ros/tf2_ros
+
+	dev-libs/boost:=[threads]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/fake_localization/Manifest b/dev-ros/fake_localization/Manifest
index d6a3a8f8f76c..4e45a5bd3c94 100644
--- a/dev-ros/fake_localization/Manifest
+++ b/dev-ros/fake_localization/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
 EBUILD fake_localization-1.17.0.ebuild 785 BLAKE2B a6aaf99ea770055a21558dbd66456f4d70ff3a38ba254e2eef02f3d292eebfb1c34ffac7692609e93eaa58a1a0ea8507ef8df90b0982165f8ae700fedfe54380 SHA512 e991ca25d41d3be88b4db190d9ed339239af0af482de98bd8e08c7055c5e534fe60a32e7b1cc02d8744df204388834f47d0ee5629352d6c76d22e94b7b7b2a53
+EBUILD fake_localization-1.17.1.ebuild 785 BLAKE2B a6aaf99ea770055a21558dbd66456f4d70ff3a38ba254e2eef02f3d292eebfb1c34ffac7692609e93eaa58a1a0ea8507ef8df90b0982165f8ae700fedfe54380 SHA512 e991ca25d41d3be88b4db190d9ed339239af0af482de98bd8e08c7055c5e534fe60a32e7b1cc02d8744df204388834f47d0ee5629352d6c76d22e94b7b7b2a53
 EBUILD fake_localization-9999.ebuild 785 BLAKE2B a6aaf99ea770055a21558dbd66456f4d70ff3a38ba254e2eef02f3d292eebfb1c34ffac7692609e93eaa58a1a0ea8507ef8df90b0982165f8ae700fedfe54380 SHA512 e991ca25d41d3be88b4db190d9ed339239af0af482de98bd8e08c7055c5e534fe60a32e7b1cc02d8744df204388834f47d0ee5629352d6c76d22e94b7b7b2a53
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/fake_localization/fake_localization-1.17.1.ebuild b/dev-ros/fake_localization/fake_localization-1.17.1.ebuild
new file mode 100644
index 000000000000..532a449c1399
--- /dev/null
+++ b/dev-ros/fake_localization/fake_localization-1.17.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+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_SINGLE_USEDEP}]
+	dev-ros/rosconsole
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/tf2_ros
+	dev-ros/message_filters
+"
+DEPEND="${RDEPEND}
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/filters/Manifest b/dev-ros/filters/Manifest
index f50d757a7046..de40d398dd04 100644
--- a/dev-ros/filters/Manifest
+++ b/dev-ros/filters/Manifest
@@ -1,4 +1,4 @@
-DIST filters-1.9.0.tar.gz 18865 BLAKE2B 0ef5508cbd32d2af42c38655aef0075b0d16339c4264bac6b3356b96a08b1344a4002c60c9c57af61846615ed28bfbfcd8cff74677e0f70e78778b3cc643c7bc SHA512 df1823a2a2a3e49bdc6c22c7bacfe696bed4eb9fa1f1339854e47e6b2757c8d7a8256c3bbf83154d22f47ae6d79af4a2fc4b878b83ad6eb9445072481326b3d3
-EBUILD filters-1.9.0.ebuild 636 BLAKE2B 4ac7170beb71921fbdaf266f72de3c82d3fcaa84ea1b7b14d1621de6c4ab44b1262dd7379851eddc66d98973214fbc221e9040365e9b805aa5a480a7e428a8f8 SHA512 428539797b5040bcc3b6db8ead1a69bdeba07d79faf4c652312f36369a1bc84dff134cd7a3460280948007984c240d13a84f60d35ba0f83a9806f3427ed4b07a
+DIST filters-1.9.1.tar.gz 19633 BLAKE2B 1ce27734145e04546d90cd802721aa5b8003b366227161e64451d7ac656628d0178b3ea5cab5f9ca5b054bc81ff5cefd00beaeea855c5c6507ecabc40bc27985 SHA512 ed66211b6e66d7c303a72bce4b9b06abd29d9101ae46b9bd4cb5dee26867d7d7e8b9bfcc6feffc83ac15a4780e62577665e9ce9881f836931f361258a12cf127
+EBUILD filters-1.9.1.ebuild 636 BLAKE2B 4ac7170beb71921fbdaf266f72de3c82d3fcaa84ea1b7b14d1621de6c4ab44b1262dd7379851eddc66d98973214fbc221e9040365e9b805aa5a480a7e428a8f8 SHA512 428539797b5040bcc3b6db8ead1a69bdeba07d79faf4c652312f36369a1bc84dff134cd7a3460280948007984c240d13a84f60d35ba0f83a9806f3427ed4b07a
 EBUILD filters-9999.ebuild 636 BLAKE2B 4ac7170beb71921fbdaf266f72de3c82d3fcaa84ea1b7b14d1621de6c4ab44b1262dd7379851eddc66d98973214fbc221e9040365e9b805aa5a480a7e428a8f8 SHA512 428539797b5040bcc3b6db8ead1a69bdeba07d79faf4c652312f36369a1bc84dff134cd7a3460280948007984c240d13a84f60d35ba0f83a9806f3427ed4b07a
 MISC metadata.xml 325 BLAKE2B 30488d99f978ac45d5d92e7aba99a4b2feb88e39702cf4ed5db2e762c45be68fe99fd18a08604da15f72116b509e5a0be4f8d74a2574f88b726db31610b20d7a SHA512 2601fa313386b132cf09dd5c27b9894b1520e1cc6af09f438cc0294a27ebc7e3d2f53f2020d477bef3b0cbd85f244a0651048f9dc1a081f509f19e82f54cee97
diff --git a/dev-ros/filters/filters-1.9.0.ebuild b/dev-ros/filters/filters-1.9.1.ebuild
index 5fdc9dc5d689..5fdc9dc5d689 100644
--- a/dev-ros/filters/filters-1.9.0.ebuild
+++ b/dev-ros/filters/filters-1.9.1.ebuild
diff --git a/dev-ros/geometric_shapes/Manifest b/dev-ros/geometric_shapes/Manifest
index af6417dfe631..ba6ba62d4c42 100644
--- a/dev-ros/geometric_shapes/Manifest
+++ b/dev-ros/geometric_shapes/Manifest
@@ -1,4 +1,4 @@
-DIST geometric_shapes-0.7.0.tar.gz 84518 BLAKE2B 948f84959c526f6155bc9769a264cc631e04171ee22bedb435667668c621c3ca2d983d7b2b964690735b3b48b8ed71058c32aefc67d6370da3cc0528ed448f3e SHA512 9f5886841dfc23db40e68d69a386879ec0b93c03faea6f2e6e33d92b303c314fbba6cfdf548e6236424d5d0131209824e0a8bc116bd64015688c2fd477eb44f0
-EBUILD geometric_shapes-0.7.0.ebuild 949 BLAKE2B 79b3a035a2856b31082145186b1d992d78831051c576246ecaf943d26a10185f75c481e0d3bad10e4c40af931080d887ee9e67e14d2fb0ef43b4cd7375daf37f SHA512 b2ced15ec139d324c9ded0303108aca66c4e7e73a978072df87b616b0a8b2d23ed0b79b81b362ae5244f9950d479293c14fd9e1bf122cd5a1bdb2c0142d90629
-EBUILD geometric_shapes-9999.ebuild 949 BLAKE2B 79b3a035a2856b31082145186b1d992d78831051c576246ecaf943d26a10185f75c481e0d3bad10e4c40af931080d887ee9e67e14d2fb0ef43b4cd7375daf37f SHA512 b2ced15ec139d324c9ded0303108aca66c4e7e73a978072df87b616b0a8b2d23ed0b79b81b362ae5244f9950d479293c14fd9e1bf122cd5a1bdb2c0142d90629
+DIST geometric_shapes-0.7.2.tar.gz 84443 BLAKE2B bcfcfeb08cbd60c889a2a801855eddd85a3ac42752991c0721ea0aee19a5650493e390d80a8ed99610a40efb5ca1fe0c1a49329471368b335483f8ceb193ca8a SHA512 5c1a05c0166c32c0d5ac9d22dd6feb784845342d7cde8d642731a08aafa54ed0b1545864f42b7de7641031bf7f0e353a632404799051770d55c7855b57d78027
+EBUILD geometric_shapes-0.7.2.ebuild 962 BLAKE2B 0ff665f8bdd88170d8882ec6f747268db7bc7186443f4df47945e6bae598aa2c4fabbf666aadab7df5eb534d2c666dc9ff8dcc4466222bc84da8a7c77ec782fd SHA512 63443250aa14f3e756ebe334978fe6fee23f7c8de255ab76712f6d0c0b786beace93ffc8a96df5bcd0b5407c366754ad1792a564e191e81224a03804a8581cc6
+EBUILD geometric_shapes-9999.ebuild 962 BLAKE2B 0ff665f8bdd88170d8882ec6f747268db7bc7186443f4df47945e6bae598aa2c4fabbf666aadab7df5eb534d2c666dc9ff8dcc4466222bc84da8a7c77ec782fd SHA512 63443250aa14f3e756ebe334978fe6fee23f7c8de255ab76712f6d0c0b786beace93ffc8a96df5bcd0b5407c366754ad1792a564e191e81224a03804a8581cc6
 MISC metadata.xml 343 BLAKE2B 583ed67450346fcbca09f5714c29d20e728f827c1448ce275683f600b6f87d3f00337dfbf39b694906787b5db9dfc878a316121eb7922494ce631b9a8b9b3e2c SHA512 10c40ddc16c176ed5503b7d098bc133e85973301631878b36f793df95fe2c55576cacaaf2cbfcc9152cb0659394d7ab7c5fca72cbdba32c5310b4a2ce7b365c8
diff --git a/dev-ros/geometric_shapes/geometric_shapes-0.7.0.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.7.2.ebuild
index 6fed36fb4824..4e9add6e0660 100644
--- a/dev-ros/geometric_shapes/geometric_shapes-0.7.0.ebuild
+++ b/dev-ros/geometric_shapes/geometric_shapes-0.7.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/geometric_shapes"
 KEYWORDS="~amd64 ~arm"
 
-inherit ros-catkin
+inherit flag-o-matic ros-catkin
 
 DESCRIPTION="Generic definitions of geometric shapes and bodies"
 LICENSE="BSD"
diff --git a/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild b/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild
index 6fed36fb4824..4e9add6e0660 100644
--- a/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild
+++ b/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/geometric_shapes"
 KEYWORDS="~amd64 ~arm"
 
-inherit ros-catkin
+inherit flag-o-matic ros-catkin
 
 DESCRIPTION="Generic definitions of geometric shapes and bodies"
 LICENSE="BSD"
diff --git a/dev-ros/global_planner/Manifest b/dev-ros/global_planner/Manifest
index efb2751017f7..30d5d276a251 100644
--- a/dev-ros/global_planner/Manifest
+++ b/dev-ros/global_planner/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
 EBUILD global_planner-1.17.0.ebuild 730 BLAKE2B c8da9232a845258d0ba889ae3a437e9640a0d17c80a2ae31021d4ac823fdc73a9ee9408e187a418f7478263cb5c02e76f880ffbae904f776ceea11f05fb244ea SHA512 603dfb1793d6f0cf79e12d38bc46ba65e8d74eb7381ec3bc8496c3792e25627a80ec2bf3269f7d62ff45be79d50596ea0f101b1eb6fa072f47540a58fdcb8f11
+EBUILD global_planner-1.17.1.ebuild 730 BLAKE2B c8da9232a845258d0ba889ae3a437e9640a0d17c80a2ae31021d4ac823fdc73a9ee9408e187a418f7478263cb5c02e76f880ffbae904f776ceea11f05fb244ea SHA512 603dfb1793d6f0cf79e12d38bc46ba65e8d74eb7381ec3bc8496c3792e25627a80ec2bf3269f7d62ff45be79d50596ea0f101b1eb6fa072f47540a58fdcb8f11
 EBUILD global_planner-9999.ebuild 730 BLAKE2B c8da9232a845258d0ba889ae3a437e9640a0d17c80a2ae31021d4ac823fdc73a9ee9408e187a418f7478263cb5c02e76f880ffbae904f776ceea11f05fb244ea SHA512 603dfb1793d6f0cf79e12d38bc46ba65e8d74eb7381ec3bc8496c3792e25627a80ec2bf3269f7d62ff45be79d50596ea0f101b1eb6fa072f47540a58fdcb8f11
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/global_planner/global_planner-1.17.1.ebuild b/dev-ros/global_planner/global_planner-1.17.1.ebuild
new file mode 100644
index 000000000000..8d1a9dbe0d24
--- /dev/null
+++ b/dev-ros/global_planner/global_planner-1.17.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Path planner library and node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/costmap_2d-1.16
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/nav_core
+	dev-ros/navfn
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf2_ros
+
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+
+	dev-ros/angles
+"
+DEPEND="${RDEPEND}
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/gmapping/Manifest b/dev-ros/gmapping/Manifest
index 52237b02c614..5a93b29e55cb 100644
--- a/dev-ros/gmapping/Manifest
+++ b/dev-ros/gmapping/Manifest
@@ -1,4 +1,6 @@
 DIST slam_gmapping-1.4.1.tar.gz 21258 BLAKE2B 61b6ee8064be43a3f6e1cafba4efb24b9cf9faa471f749539dcf5aaba9a027885f32549f9df465b88cf02a38f7ebca8fdea469880512298ab0ebf221a3e18bfb SHA512 adc458a033ed0c573a1099ff8c8164d5157b5fd94efafa92fc3a45bcde86a0754f582e87743289637c2f6f7632557ac924ed2cf62d89b15f1a47b822773dbdba
+DIST slam_gmapping-1.4.2.tar.gz 21721 BLAKE2B 63ac4ccc1238cc4fecbf416e2fb716d1b679b4ae4d2d94508887ede8894402d77564af0f60a3b8d0b1661c91d755a5276aabd3894826af436ce11bd6119619b2 SHA512 d21810149ffe09cf57730e8657298f0d5c7aaa2cd6257b4e891ef990e2b6c727f2246d22d7272969a11604e33887e245d8d66980cb0c158f875810f4ff17072a
 EBUILD gmapping-1.4.1.ebuild 531 BLAKE2B d595c9abb5a92e4e48dbdcd8409fdb2e7f9603082c74396c65e880f39e82da0b7c91f04c790162162eea9db6ce36637d62d150a3c7c9bba20e9714000ed0df20 SHA512 5262716319562be75fd623bf4a3b6fb199cb2692ff8b92614c49c56f8f0a04591d88d153b4972f184eecc9cde1be15c36cd7d73c07ff59c809d0d27ab37a8265
+EBUILD gmapping-1.4.2.ebuild 531 BLAKE2B d595c9abb5a92e4e48dbdcd8409fdb2e7f9603082c74396c65e880f39e82da0b7c91f04c790162162eea9db6ce36637d62d150a3c7c9bba20e9714000ed0df20 SHA512 5262716319562be75fd623bf4a3b6fb199cb2692ff8b92614c49c56f8f0a04591d88d153b4972f184eecc9cde1be15c36cd7d73c07ff59c809d0d27ab37a8265
 EBUILD gmapping-9999.ebuild 531 BLAKE2B d595c9abb5a92e4e48dbdcd8409fdb2e7f9603082c74396c65e880f39e82da0b7c91f04c790162162eea9db6ce36637d62d150a3c7c9bba20e9714000ed0df20 SHA512 5262716319562be75fd623bf4a3b6fb199cb2692ff8b92614c49c56f8f0a04591d88d153b4972f184eecc9cde1be15c36cd7d73c07ff59c809d0d27ab37a8265
 MISC metadata.xml 342 BLAKE2B 72a1fe4f1e7971418dbb3f5b1e78de71a77819b9fa7200feb2ce0abec5b50a5435c5e5541d290bfd23c7acee5a6920280934067c84e4716bd9f6bb0cc634544d SHA512 2a5beef664e8c79b9e4d858d0dc093068c6e462456ae6066ea637f4b725e5c7184dd65769906c34e55eb6b03949e957edba34b84a587e1daec784e1f74ea287c
diff --git a/dev-ros/gmapping/gmapping-1.4.2.ebuild b/dev-ros/gmapping/gmapping-1.4.2.ebuild
new file mode 100644
index 000000000000..c3d87b4563b2
--- /dev/null
+++ b/dev-ros/gmapping/gmapping-1.4.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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/roscpp
+	dev-ros/tf
+	dev-ros/openslam_gmapping
+	dev-ros/rosbag_storage
+	dev-ros/gmapping
+"
+DEPEND="${RDEPEND}
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/rostest"
diff --git a/dev-ros/hardware_interface/Manifest b/dev-ros/hardware_interface/Manifest
index 6f0c14963882..f0a3bbee4948 100644
--- a/dev-ros/hardware_interface/Manifest
+++ b/dev-ros/hardware_interface/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
 DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
+DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
 EBUILD hardware_interface-0.19.1.ebuild 389 BLAKE2B d50230140b3849df3e305428fe4be4b27f38d85b143c29a75b6f5064b75ba847db2c21187e5d85b8340c4bcc3397380044e67cb79ff23eb4687d4998badc0b52 SHA512 d6e1ee1fcfef637ead28b5906246a0435a8bf97a578b580032e390c3dea379104efc46bfa0ce81848a4d73543630abd1248dd63311c2411c765761eb5ad43e52
 EBUILD hardware_interface-0.19.2.ebuild 389 BLAKE2B d50230140b3849df3e305428fe4be4b27f38d85b143c29a75b6f5064b75ba847db2c21187e5d85b8340c4bcc3397380044e67cb79ff23eb4687d4998badc0b52 SHA512 d6e1ee1fcfef637ead28b5906246a0435a8bf97a578b580032e390c3dea379104efc46bfa0ce81848a4d73543630abd1248dd63311c2411c765761eb5ad43e52
+EBUILD hardware_interface-0.19.3.ebuild 389 BLAKE2B d50230140b3849df3e305428fe4be4b27f38d85b143c29a75b6f5064b75ba847db2c21187e5d85b8340c4bcc3397380044e67cb79ff23eb4687d4998badc0b52 SHA512 d6e1ee1fcfef637ead28b5906246a0435a8bf97a578b580032e390c3dea379104efc46bfa0ce81848a4d73543630abd1248dd63311c2411c765761eb5ad43e52
 EBUILD hardware_interface-9999.ebuild 389 BLAKE2B d50230140b3849df3e305428fe4be4b27f38d85b143c29a75b6f5064b75ba847db2c21187e5d85b8340c4bcc3397380044e67cb79ff23eb4687d4998badc0b52 SHA512 d6e1ee1fcfef637ead28b5906246a0435a8bf97a578b580032e390c3dea379104efc46bfa0ce81848a4d73543630abd1248dd63311c2411c765761eb5ad43e52
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/hardware_interface/hardware_interface-0.19.3.ebuild b/dev-ros/hardware_interface/hardware_interface-0.19.3.ebuild
new file mode 100644
index 000000000000..534f5a3f8d25
--- /dev/null
+++ b/dev-ros/hardware_interface/hardware_interface-0.19.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 dev-ros/rostest )"
diff --git a/dev-ros/image_geometry/Manifest b/dev-ros/image_geometry/Manifest
index b1afb3d02183..f432db3512c8 100644
--- a/dev-ros/image_geometry/Manifest
+++ b/dev-ros/image_geometry/Manifest
@@ -1,4 +1,5 @@
+AUX ocv_leak.patch 493 BLAKE2B 1a71b4529c6d1bce8d08137cce851edce5905076f042a1d27476be156be8104cb861bb64ecd0269cbd067c4801e5b69f7c84bc2ffbe0ddd87831eb54572f1b7a SHA512 a20172e15b9b273be57830f9181075218bd5f97abfcc84d3d23ed83872c2f89e5d06da670dfd1071cae4b20d79d9670602b1746e544462c46e3dfe7c3cffddf4
 DIST vision_opencv-1.15.0.tar.gz 82281 BLAKE2B 6e86cf67bb9fbf07ca36dbe0bb3fb32611a4e216cea209048bfe34b71622a56954063f2e7ff466275810f36c62d016a1d04e987383dde35f0bb85abf0e74350f SHA512 b6331b00aac18f96eb40ef57b2b4fe55da956007390549762818eab7ad36fcf192549448f2edcc6b4e550273f80320bf15eb6a60900d155be680ec8682fd17ba
-EBUILD image_geometry-1.15.0.ebuild 638 BLAKE2B d637955fd2630b3b1f845f392638e14332e2c1155478711ff8d82ef9c3b8cbccee40a2fc5a8785d9a79e6a912db63a5314c550f0abda13698ddc778c4e79a690 SHA512 49dfacdfb64b53b3f503fd9535e0bcc5c69fae30a745e4eb05f517bdfb7df3c5d502ac18a03fe0829beb4f0c5dda359bbcd62db714d7660690cfa6851084b09b
-EBUILD image_geometry-9999.ebuild 638 BLAKE2B d637955fd2630b3b1f845f392638e14332e2c1155478711ff8d82ef9c3b8cbccee40a2fc5a8785d9a79e6a912db63a5314c550f0abda13698ddc778c4e79a690 SHA512 49dfacdfb64b53b3f503fd9535e0bcc5c69fae30a745e4eb05f517bdfb7df3c5d502ac18a03fe0829beb4f0c5dda359bbcd62db714d7660690cfa6851084b09b
+EBUILD image_geometry-1.15.0-r1.ebuild 679 BLAKE2B 760548b02316276a250ad07957bca99c7e90bea8024bc7afda6ac55dd5512989fa479919dfdee4024ee38a98b9845a9e8386b6874ed493fb9c605fadbf7f1566 SHA512 ef5b3e61274120abff3c67adbd947fbe91af19b47aac372e803994ebf2c745dd948ec90b6a5725dda69c86685a786d298ea7fffcd071368e7aed4ee604ec8a50
+EBUILD image_geometry-9999.ebuild 679 BLAKE2B 760548b02316276a250ad07957bca99c7e90bea8024bc7afda6ac55dd5512989fa479919dfdee4024ee38a98b9845a9e8386b6874ed493fb9c605fadbf7f1566 SHA512 ef5b3e61274120abff3c67adbd947fbe91af19b47aac372e803994ebf2c745dd948ec90b6a5725dda69c86685a786d298ea7fffcd071368e7aed4ee604ec8a50
 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/image_geometry/files/ocv_leak.patch b/dev-ros/image_geometry/files/ocv_leak.patch
new file mode 100644
index 000000000000..cbc0f5a50669
--- /dev/null
+++ b/dev-ros/image_geometry/files/ocv_leak.patch
@@ -0,0 +1,13 @@
+Index: image_geometry/CMakeLists.txt
+===================================================================
+--- image_geometry.orig/CMakeLists.txt
++++ image_geometry/CMakeLists.txt
+@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0.2)
+ project(image_geometry)
+ 
+ find_package(catkin REQUIRED sensor_msgs)
+-find_package(OpenCV REQUIRED)
++find_package(OpenCV REQUIRED COMPONENTS opencv_core opencv_imgproc opencv_calib3d)
+ 
+ catkin_package(CATKIN_DEPENDS sensor_msgs
+                DEPENDS OpenCV
diff --git a/dev-ros/image_geometry/image_geometry-1.15.0.ebuild b/dev-ros/image_geometry/image_geometry-1.15.0-r1.ebuild
index e1195646cedd..851354d4b1be 100644
--- a/dev-ros/image_geometry/image_geometry-1.15.0.ebuild
+++ b/dev-ros/image_geometry/image_geometry-1.15.0-r1.ebuild
@@ -24,3 +24,4 @@ DEPEND="${RDEPEND}
 		dev-cpp/gtest
 		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 	)"
+PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/image_geometry/image_geometry-9999.ebuild b/dev-ros/image_geometry/image_geometry-9999.ebuild
index e1195646cedd..851354d4b1be 100644
--- a/dev-ros/image_geometry/image_geometry-9999.ebuild
+++ b/dev-ros/image_geometry/image_geometry-9999.ebuild
@@ -24,3 +24,4 @@ DEPEND="${RDEPEND}
 		dev-cpp/gtest
 		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 	)"
+PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/image_proc/Manifest b/dev-ros/image_proc/Manifest
index b4900cfd16c7..4000e1d75d07 100644
--- a/dev-ros/image_proc/Manifest
+++ b/dev-ros/image_proc/Manifest
@@ -1,4 +1,5 @@
+AUX ocv_leak.patch 587 BLAKE2B 1233e318496eab850c8da43383a4dabf9997db88bf103c4652efb7a1b481d22832b90cae48294c2f0b52ba082b63ca4369445f1c4ff2092847fad0c6e14ab98b SHA512 37e1f7af29f73f972991a5e204e9d69169a4131ccdd7b19f7fa34232d0706c88303bf5f7bd476be0a21654dfb558a5e6af86d27aca8da35122b46c4846d6dee0
 DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
-EBUILD image_proc-1.15.2.ebuild 758 BLAKE2B a543f793a421450b7cd7012091011484195b9ac822c56344643e8866de9cccdd045904a87ead629c0d247b81dccbb1a06c961113f7067c7a4ed503490a471144 SHA512 1a77611d5d36d095927094a6fb97c7663ec0cbf1fca551f60e0df2a434d15afb3b0ddea95ff10d3c71cc41af6aab22d12616011cf6f394d2ca63511744cbaf04
-EBUILD image_proc-9999.ebuild 758 BLAKE2B a543f793a421450b7cd7012091011484195b9ac822c56344643e8866de9cccdd045904a87ead629c0d247b81dccbb1a06c961113f7067c7a4ed503490a471144 SHA512 1a77611d5d36d095927094a6fb97c7663ec0cbf1fca551f60e0df2a434d15afb3b0ddea95ff10d3c71cc41af6aab22d12616011cf6f394d2ca63511744cbaf04
+EBUILD image_proc-1.15.2-r1.ebuild 799 BLAKE2B 91a407f07453a298f051b9d3deb16a0fab4c1e9386179191ce13976ff14df5e0433bedc83777d1dc4dffb6f68a3d3dda62519337006599139db966f31796c36e SHA512 70447b0bd33cdcb1eae9422d456ae66ad8ae78e4ef089e8bc0fddb8b52872ede3be3b7a05c5155393a789cf097ec5c39ba62a7a293face19153091ecbc09fc01
+EBUILD image_proc-9999.ebuild 799 BLAKE2B 91a407f07453a298f051b9d3deb16a0fab4c1e9386179191ce13976ff14df5e0433bedc83777d1dc4dffb6f68a3d3dda62519337006599139db966f31796c36e SHA512 70447b0bd33cdcb1eae9422d456ae66ad8ae78e4ef089e8bc0fddb8b52872ede3be3b7a05c5155393a789cf097ec5c39ba62a7a293face19153091ecbc09fc01
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_proc/files/ocv_leak.patch b/dev-ros/image_proc/files/ocv_leak.patch
new file mode 100644
index 000000000000..79722625d327
--- /dev/null
+++ b/dev-ros/image_proc/files/ocv_leak.patch
@@ -0,0 +1,13 @@
+Index: image_proc/CMakeLists.txt
+===================================================================
+--- image_proc.orig/CMakeLists.txt
++++ image_proc/CMakeLists.txt
+@@ -4,7 +4,7 @@ project(image_proc)
+ find_package(catkin REQUIRED)
+ 
+ find_package(catkin REQUIRED cv_bridge dynamic_reconfigure image_geometry image_transport nodelet nodelet_topic_tools roscpp sensor_msgs)
+-find_package(OpenCV REQUIRED)
++find_package(OpenCV REQUIRED COMPONENTS opencv_core opencv_imgproc opencv_highgui)
+ find_package(Boost REQUIRED COMPONENTS thread)
+ 
+ if(cv_bridge_VERSION VERSION_GREATER "1.12.0")
diff --git a/dev-ros/image_proc/image_proc-1.15.2.ebuild b/dev-ros/image_proc/image_proc-1.15.2-r1.ebuild
index e38214ace5bb..ee3903c63127 100644
--- a/dev-ros/image_proc/image_proc-1.15.2.ebuild
+++ b/dev-ros/image_proc/image_proc-1.15.2-r1.ebuild
@@ -33,3 +33,4 @@ DEPEND="${RDEPEND}
 		dev-ros/camera_calibration_parsers
 	)
 "
+PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/image_proc/image_proc-9999.ebuild b/dev-ros/image_proc/image_proc-9999.ebuild
index e38214ace5bb..ee3903c63127 100644
--- a/dev-ros/image_proc/image_proc-9999.ebuild
+++ b/dev-ros/image_proc/image_proc-9999.ebuild
@@ -33,3 +33,4 @@ DEPEND="${RDEPEND}
 		dev-ros/camera_calibration_parsers
 	)
 "
+PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/joint_limits_interface/Manifest b/dev-ros/joint_limits_interface/Manifest
index 12e5e8e8c8c3..bfa984fd6f33 100644
--- a/dev-ros/joint_limits_interface/Manifest
+++ b/dev-ros/joint_limits_interface/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
 DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
+DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
 EBUILD joint_limits_interface-0.19.1.ebuild 548 BLAKE2B 82cb562202e8dafa222ce16731fdf3c710af5c26ef2b7ffb10dc65598da75fee4323c9b2c894dd1a3fcda796319b0607f3dc6d01cf3b087427872da98f50d91b SHA512 c6d37bfa6ac8ad51a4fc114e54558f30cb90c7390c876b6dd6c649c29e26e0d40d27f47ac6079a9f27abb7a0aa78322e35a69ac638631122886244eccaa5f944
 EBUILD joint_limits_interface-0.19.2.ebuild 548 BLAKE2B 82cb562202e8dafa222ce16731fdf3c710af5c26ef2b7ffb10dc65598da75fee4323c9b2c894dd1a3fcda796319b0607f3dc6d01cf3b087427872da98f50d91b SHA512 c6d37bfa6ac8ad51a4fc114e54558f30cb90c7390c876b6dd6c649c29e26e0d40d27f47ac6079a9f27abb7a0aa78322e35a69ac638631122886244eccaa5f944
+EBUILD joint_limits_interface-0.19.3.ebuild 548 BLAKE2B 82cb562202e8dafa222ce16731fdf3c710af5c26ef2b7ffb10dc65598da75fee4323c9b2c894dd1a3fcda796319b0607f3dc6d01cf3b087427872da98f50d91b SHA512 c6d37bfa6ac8ad51a4fc114e54558f30cb90c7390c876b6dd6c649c29e26e0d40d27f47ac6079a9f27abb7a0aa78322e35a69ac638631122886244eccaa5f944
 EBUILD joint_limits_interface-9999.ebuild 548 BLAKE2B 82cb562202e8dafa222ce16731fdf3c710af5c26ef2b7ffb10dc65598da75fee4323c9b2c894dd1a3fcda796319b0607f3dc6d01cf3b087427872da98f50d91b SHA512 c6d37bfa6ac8ad51a4fc114e54558f30cb90c7390c876b6dd6c649c29e26e0d40d27f47ac6079a9f27abb7a0aa78322e35a69ac638631122886244eccaa5f944
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.19.3.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.19.3.ebuild
new file mode 100644
index 000000000000..86815d181892
--- /dev/null
+++ b/dev-ros/joint_limits_interface/joint_limits_interface-0.19.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Interface for enforcing joint limits"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/hardware_interface
+	dev-libs/urdfdom
+	dev-ros/urdf
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest dev-cpp/gtest )"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/libmavconn/Manifest b/dev-ros/libmavconn/Manifest
index 33579d0fb898..a8166b9caa8b 100644
--- a/dev-ros/libmavconn/Manifest
+++ b/dev-ros/libmavconn/Manifest
@@ -1,4 +1,6 @@
 DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
+DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
 EBUILD libmavconn-1.2.0.ebuild 454 BLAKE2B 2714c2f1b81848d481f64267b025275e129129e03d3f174e1043b7f45b6a1b25fdd3f33e8e4a0b3d1eed837a6ed6bb46b9a5cc82adc8c89d7bacc21039a025ca SHA512 2cbe5315f4c5591cb15d566f82b5b553ff40cb618560ee1f239b0229c4611440206d7631083f463e455e3446ad2d93a1da66c8a6f8414cc28a6c2c267512a79f
+EBUILD libmavconn-1.4.0.ebuild 454 BLAKE2B 2714c2f1b81848d481f64267b025275e129129e03d3f174e1043b7f45b6a1b25fdd3f33e8e4a0b3d1eed837a6ed6bb46b9a5cc82adc8c89d7bacc21039a025ca SHA512 2cbe5315f4c5591cb15d566f82b5b553ff40cb618560ee1f239b0229c4611440206d7631083f463e455e3446ad2d93a1da66c8a6f8414cc28a6c2c267512a79f
 EBUILD libmavconn-9999.ebuild 454 BLAKE2B 2714c2f1b81848d481f64267b025275e129129e03d3f174e1043b7f45b6a1b25fdd3f33e8e4a0b3d1eed837a6ed6bb46b9a5cc82adc8c89d7bacc21039a025ca SHA512 2cbe5315f4c5591cb15d566f82b5b553ff40cb618560ee1f239b0229c4611440206d7631083f463e455e3446ad2d93a1da66c8a6f8414cc28a6c2c267512a79f
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/libmavconn/libmavconn-1.4.0.ebuild b/dev-ros/libmavconn/libmavconn-1.4.0.ebuild
new file mode 100644
index 000000000000..9a943481d549
--- /dev/null
+++ b/dev-ros/libmavconn/libmavconn-1.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink communication library"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/mavlink-gbp-release-2016.7.7
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
diff --git a/dev-ros/map_server/Manifest b/dev-ros/map_server/Manifest
index 599df222a5fa..66df40bfcf05 100644
--- a/dev-ros/map_server/Manifest
+++ b/dev-ros/map_server/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
 EBUILD map_server-1.17.0.ebuild 714 BLAKE2B ea65db38fc750fd7d5a431f386d82c052e12307b266a7969f18f8e5c56aefa28055197b3a99f49c7c6c1200d9aebe356111590e116941b924194148cc6ffe49f SHA512 c86a6ad4e1be82c74af966c81d8164b60cdd3b6f68de7c2970c824b857c060e37f6cf74ad2d0377f96193f0901982ede8fa5b296d14b070486db6c87f2e00dd1
+EBUILD map_server-1.17.1.ebuild 714 BLAKE2B ea65db38fc750fd7d5a431f386d82c052e12307b266a7969f18f8e5c56aefa28055197b3a99f49c7c6c1200d9aebe356111590e116941b924194148cc6ffe49f SHA512 c86a6ad4e1be82c74af966c81d8164b60cdd3b6f68de7c2970c824b857c060e37f6cf74ad2d0377f96193f0901982ede8fa5b296d14b070486db6c87f2e00dd1
 EBUILD map_server-9999.ebuild 714 BLAKE2B ea65db38fc750fd7d5a431f386d82c052e12307b266a7969f18f8e5c56aefa28055197b3a99f49c7c6c1200d9aebe356111590e116941b924194148cc6ffe49f SHA512 c86a6ad4e1be82c74af966c81d8164b60cdd3b6f68de7c2970c824b857c060e37f6cf74ad2d0377f96193f0901982ede8fa5b296d14b070486db6c87f2e00dd1
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/map_server/map_server-1.17.1.ebuild b/dev-ros/map_server/map_server-1.17.1.ebuild
new file mode 100644
index 000000000000..01d98e8306e2
--- /dev/null
+++ b/dev-ros/map_server/map_server-1.17.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Offers map data as a ROS service"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	sci-physics/bullet:=
+	dev-ros/roscpp
+	media-libs/sdl-image[png]
+	dev-ros/tf2
+	>=dev-cpp/yaml-cpp-0.5:=
+
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest
+		dev-ros/rospy
+		dev-ros/rosunit
+		dev-cpp/gtest
+	)
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+BDEPEND="
+	virtual/pkgconfig"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/mavlink-gbp-release/Manifest b/dev-ros/mavlink-gbp-release/Manifest
index 9917d119a24d..2fba08641012 100644
--- a/dev-ros/mavlink-gbp-release/Manifest
+++ b/dev-ros/mavlink-gbp-release/Manifest
@@ -1,4 +1,4 @@
 AUX gentoo.patch 708 BLAKE2B ad41a87474f0c542dcab2189e08f744c37ebc0a5993c9ca46633d3f02b3c13b002cd1b1644123694bd0bea756168d29d121eca9cd8071a548ae592f6e81431f1 SHA512 2ab7861c421e630a87924ae4b5f282493be043d1d0a53188ed6ec2938250ac4fb1e402072d4f10afc747271c94cad424bd84ca15d49d38e871b245b5068de698
-DIST mavlink-gbp-release-2020.7.7.tar.gz 4130271 BLAKE2B e9e6759da3734fe918e1c9441ca823a62d8629f08e3b049a1817103ddd7dca14098f69842b4d38f3fda991f7c9020e9cde84315eb1c8b47ae9785c7c26957420 SHA512 bd23f9f4cfba941ef928e79d5c26d6c310189eefbd1c29f019b688c5d2a07cccf1bcf6212d516cccff28fdcfbc3cff0f585eb5e7640fc011eab252e0222cee46
-EBUILD mavlink-gbp-release-2020.7.7-r1.ebuild 563 BLAKE2B 75b26d4d4d13d45a52cb31a6603a84679093b32b6161d3d03009ea8057a773edd0bcb18ec4d6d21681bf45d793e8d7f7bcff965f9d27829f258fa660e8cfae73 SHA512 36b7e697a6db198c8477a4997d51361c4d5fa3deb826907ab61239c373efdfe0249e0a5d3a1f4c17277e3ebfca739d7788dadf6ca93adb6a36ea9cc5397ceb9a
+DIST mavlink-gbp-release-2020.9.10.tar.gz 4134330 BLAKE2B a8b2ad07ebf67bf19b37d6fefd6e41a5d6c95e9eaac413785943bd88e63f1a8acf4a4ea7d7ecd680e5ff306d46235a8cf0239af724d01d960c96cd8623818a22 SHA512 9c3429b16b0bcd364d89db3817cab76545f799407095cd6d7af5fff552aa4a4314645b6db517389bcdb511e009b4bfce5d62ae6b4aec7b0542bdc892cdf1ebb9
+EBUILD mavlink-gbp-release-2020.9.10.ebuild 563 BLAKE2B 75b26d4d4d13d45a52cb31a6603a84679093b32b6161d3d03009ea8057a773edd0bcb18ec4d6d21681bf45d793e8d7f7bcff965f9d27829f258fa660e8cfae73 SHA512 36b7e697a6db198c8477a4997d51361c4d5fa3deb826907ab61239c373efdfe0249e0a5d3a1f4c17277e3ebfca739d7788dadf6ca93adb6a36ea9cc5397ceb9a
 MISC metadata.xml 341 BLAKE2B 1292ea0319edc3c3597165f59f246829e6954b5582e623e92227de5503f35d0f61150a0516998dd1d99942c371291ed623a38112210abac7dd0a050cc810b34c SHA512 0b545da2a0f2d6372e63db33fd5f50497c0de04a69fdb3b94e57418ff617fcebaeed515241c474995efc38bbdf1c099ec67ad6a56dd3ae94b2e24be9f1f72d36
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.7.7-r1.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.9.10.ebuild
index 86036c60a87e..86036c60a87e 100644
--- a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.7.7-r1.ebuild
+++ b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.9.10.ebuild
diff --git a/dev-ros/mavros/Manifest b/dev-ros/mavros/Manifest
index 5934b8e39813..efa30930ec9a 100644
--- a/dev-ros/mavros/Manifest
+++ b/dev-ros/mavros/Manifest
@@ -1,4 +1,6 @@
 DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
+DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
 EBUILD mavros-1.2.0.ebuild 1034 BLAKE2B 4d613cae01fcbc82955bfd139a7d35800f33cd6fe42dfb8c500b52d4bd214d8a6baa23db8c7a64afcd90165dc13e53b6259f91a235e403cf6e571baf6ae771a2 SHA512 fa742657088ad5275af8161b4fd795bd6d9e102fd745299117ae0c8b67b77932abd62445798a1870f6d4273cea660458006b98fcccd5112ecf310423fcfbd3fa
-EBUILD mavros-9999.ebuild 1034 BLAKE2B 4d613cae01fcbc82955bfd139a7d35800f33cd6fe42dfb8c500b52d4bd214d8a6baa23db8c7a64afcd90165dc13e53b6259f91a235e403cf6e571baf6ae771a2 SHA512 fa742657088ad5275af8161b4fd795bd6d9e102fd745299117ae0c8b67b77932abd62445798a1870f6d4273cea660458006b98fcccd5112ecf310423fcfbd3fa
+EBUILD mavros-1.4.0.ebuild 1033 BLAKE2B 7b90ad9b79f3aaa42bb5296c848385bb8e4362af6714cc37ce3a93d93f7adec725a781c76a251f5b2c0232af47d1625af5662a93b6094865251a24a72633860b SHA512 3bd7175c6ca7d74f2f6bbb5c04b7435a9289a957f4b6f3b0c0d20a368381ab923d052bd2a60efc9cd4e6a09e68e70ef9c526eb3aafcb74b12381950bcae38325
+EBUILD mavros-9999.ebuild 1033 BLAKE2B 7b90ad9b79f3aaa42bb5296c848385bb8e4362af6714cc37ce3a93d93f7adec725a781c76a251f5b2c0232af47d1625af5662a93b6094865251a24a72633860b SHA512 3bd7175c6ca7d74f2f6bbb5c04b7435a9289a957f4b6f3b0c0d20a368381ab923d052bd2a60efc9cd4e6a09e68e70ef9c526eb3aafcb74b12381950bcae38325
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/mavros/mavros-1.4.0.ebuild b/dev-ros/mavros/mavros-1.4.0.ebuild
new file mode 100644
index 000000000000..12562bf79410
--- /dev/null
+++ b/dev-ros/mavros/mavros-1.4.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink extendable communication node for ROS"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_updater
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/angles
+	dev-ros/libmavconn
+	dev-ros/rosconsole_bridge
+	dev-libs/boost:=
+	dev-ros/eigen_conversions
+	sci-geosciences/GeographicLib
+	>=dev-ros/mavlink-gbp-release-2020.9.10
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=dev-ros/mavros_msgs-${PV}[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/mavros/mavros-9999.ebuild b/dev-ros/mavros/mavros-9999.ebuild
index 74118adcd502..12562bf79410 100644
--- a/dev-ros/mavros/mavros-9999.ebuild
+++ b/dev-ros/mavros/mavros-9999.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-libs/boost:=
 	dev-ros/eigen_conversions
 	sci-geosciences/GeographicLib
-	>=dev-ros/mavlink-gbp-release-2016.11.11
+	>=dev-ros/mavlink-gbp-release-2020.9.10
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}
diff --git a/dev-ros/mavros_extras/Manifest b/dev-ros/mavros_extras/Manifest
index cb74006a9d42..e119bb67ace0 100644
--- a/dev-ros/mavros_extras/Manifest
+++ b/dev-ros/mavros_extras/Manifest
@@ -1,4 +1,6 @@
 DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
+DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
 EBUILD mavros_extras-1.2.0.ebuild 937 BLAKE2B d056641e3f9a5dae34c078062d1a103c393e40f1a5cbdca195a296d6d8b42b968627297822a135e2ca8045ad1452f73ea7e25a556fe7ff50f5d1dca22df18764 SHA512 0f487ad55d13c7bb6eb9582db0f5c1df4cef25b686dbd1924e05234715cfbf28277a8e5ba67faa3b62aa8dc655a439bf777fabd72e5895a3f8538427c309a83c
+EBUILD mavros_extras-1.4.0.ebuild 937 BLAKE2B d056641e3f9a5dae34c078062d1a103c393e40f1a5cbdca195a296d6d8b42b968627297822a135e2ca8045ad1452f73ea7e25a556fe7ff50f5d1dca22df18764 SHA512 0f487ad55d13c7bb6eb9582db0f5c1df4cef25b686dbd1924e05234715cfbf28277a8e5ba67faa3b62aa8dc655a439bf777fabd72e5895a3f8538427c309a83c
 EBUILD mavros_extras-9999.ebuild 937 BLAKE2B d056641e3f9a5dae34c078062d1a103c393e40f1a5cbdca195a296d6d8b42b968627297822a135e2ca8045ad1452f73ea7e25a556fe7ff50f5d1dca22df18764 SHA512 0f487ad55d13c7bb6eb9582db0f5c1df4cef25b686dbd1924e05234715cfbf28277a8e5ba67faa3b62aa8dc655a439bf777fabd72e5895a3f8538427c309a83c
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/mavros_extras/mavros_extras-1.4.0.ebuild b/dev-ros/mavros_extras/mavros_extras-1.4.0.ebuild
new file mode 100644
index 000000000000..e7290bdf87be
--- /dev/null
+++ b/dev-ros/mavros_extras/mavros_extras-1.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Extra nodes and plugins for mavros"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_transport
+	dev-ros/cv_bridge
+	dev-ros/mavros
+	dev-ros/roscpp
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/urdf
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/mavros_msgs/Manifest b/dev-ros/mavros_msgs/Manifest
index e2e7e88055ce..70374cc5709e 100644
--- a/dev-ros/mavros_msgs/Manifest
+++ b/dev-ros/mavros_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
+DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
 EBUILD mavros_msgs-1.2.0.ebuild 460 BLAKE2B ce4027da677ee2a46be25024daf5c835e8de20c2e03213235e6417b17b8ceb734c160a0df0af47c616e9e95678ba8094c326e6a3c09c28358bca7de099a1a603 SHA512 f1fdca8e381f9bb7b9be71d8fae20f8d52f24be3ec734ebd8dcf9ddc2b3f08a5a1fc70bcd3cae2aff6e66e013a8752806bb7cfb1971c3e8a0f1e0d8e4353b96d
+EBUILD mavros_msgs-1.4.0.ebuild 460 BLAKE2B ce4027da677ee2a46be25024daf5c835e8de20c2e03213235e6417b17b8ceb734c160a0df0af47c616e9e95678ba8094c326e6a3c09c28358bca7de099a1a603 SHA512 f1fdca8e381f9bb7b9be71d8fae20f8d52f24be3ec734ebd8dcf9ddc2b3f08a5a1fc70bcd3cae2aff6e66e013a8752806bb7cfb1971c3e8a0f1e0d8e4353b96d
 EBUILD mavros_msgs-9999.ebuild 460 BLAKE2B ce4027da677ee2a46be25024daf5c835e8de20c2e03213235e6417b17b8ceb734c160a0df0af47c616e9e95678ba8094c326e6a3c09c28358bca7de099a1a603 SHA512 f1fdca8e381f9bb7b9be71d8fae20f8d52f24be3ec734ebd8dcf9ddc2b3f08a5a1fc70bcd3cae2aff6e66e013a8752806bb7cfb1971c3e8a0f1e0d8e4353b96d
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/mavros_msgs/mavros_msgs-1.4.0.ebuild b/dev-ros/mavros_msgs/mavros_msgs-1.4.0.ebuild
new file mode 100644
index 000000000000..04710e1afb12
--- /dev/null
+++ b/dev-ros/mavros_msgs/mavros_msgs-1.4.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geographic_msgs dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for MAVROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/message_filters/Manifest b/dev-ros/message_filters/Manifest
index e5c9a82f15c7..7d72d1458af6 100644
--- a/dev-ros/message_filters/Manifest
+++ b/dev-ros/message_filters/Manifest
@@ -1,5 +1,7 @@
 AUX tests.patch 4837 BLAKE2B 2793652865f2d1f8ce1499b37922e480d40ca3931f098156a6cf541ad48985a3bee29364bb09e37c4f15424765dd057875f26dd5290f5747718538bcbeb3aead SHA512 2c778a7e4c7fc6d89ef162fd42d6f1dbd487d885c7ee04f6a8243142aaf949b02bfcd0c08cc8799f7a1ee95d13c8d21aef340abc4a3e6ca3c0f2231118985796
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD message_filters-1.15.8.ebuild 899 BLAKE2B 20aafad99fb0b29bd6d144ea84b9276d24ea8f2a59ddcc2ecedfe6edd61867ed9c8910e2f5372ff6eb3f936f80a5ab4fd16131b73e1aeca156ccac5a3fd81b5e SHA512 c41f37eced863cd5ce31a29e8b37d5d9aca31f8cc108e46e43bb30de83cfeb46b255db0adb3f991166ca014fdf0e1487dc47315cb8019c68768d25f412a97baf
+EBUILD message_filters-1.15.9.ebuild 899 BLAKE2B 20aafad99fb0b29bd6d144ea84b9276d24ea8f2a59ddcc2ecedfe6edd61867ed9c8910e2f5372ff6eb3f936f80a5ab4fd16131b73e1aeca156ccac5a3fd81b5e SHA512 c41f37eced863cd5ce31a29e8b37d5d9aca31f8cc108e46e43bb30de83cfeb46b255db0adb3f991166ca014fdf0e1487dc47315cb8019c68768d25f412a97baf
 EBUILD message_filters-9999.ebuild 899 BLAKE2B 20aafad99fb0b29bd6d144ea84b9276d24ea8f2a59ddcc2ecedfe6edd61867ed9c8910e2f5372ff6eb3f936f80a5ab4fd16131b73e1aeca156ccac5a3fd81b5e SHA512 c41f37eced863cd5ce31a29e8b37d5d9aca31f8cc108e46e43bb30de83cfeb46b255db0adb3f991166ca014fdf0e1487dc47315cb8019c68768d25f412a97baf
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/message_filters/message_filters-1.15.9.ebuild b/dev-ros/message_filters/message_filters-1.15.9.ebuild
new file mode 100644
index 000000000000..2bbb5486cfc4
--- /dev/null
+++ b/dev-ros/message_filters/message_filters-1.15.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Set of message filters which take in messages and outputs those at a later time"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-libs/boost:=[threads]
+	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+PATCHES=( "${FILESDIR}/tests.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/mk/Manifest b/dev-ros/mk/Manifest
index 2dc6ce2cbf39..83fe0d8318d1 100644
--- a/dev-ros/mk/Manifest
+++ b/dev-ros/mk/Manifest
@@ -1,6 +1,8 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
 EBUILD mk-1.15.5.ebuild 427 BLAKE2B f2c4fb3f622cae0cc67d230fe3d86f4825ed80af6f16f00012d8fe27fe60e31fb5fcffcf841bfb3d2fadf8ed4a774c24807c2003c367b416b7467ce9497ec770 SHA512 69241cb64aa30288a318141c9a363bb4c23499028ce7b0b83c73298df45644e1d5a8d3da151f81ad9195ba8abff80e13638db2a4bb45924737738997cc476588
 EBUILD mk-1.15.6.ebuild 427 BLAKE2B f2c4fb3f622cae0cc67d230fe3d86f4825ed80af6f16f00012d8fe27fe60e31fb5fcffcf841bfb3d2fadf8ed4a774c24807c2003c367b416b7467ce9497ec770 SHA512 69241cb64aa30288a318141c9a363bb4c23499028ce7b0b83c73298df45644e1d5a8d3da151f81ad9195ba8abff80e13638db2a4bb45924737738997cc476588
+EBUILD mk-1.15.7.ebuild 427 BLAKE2B f2c4fb3f622cae0cc67d230fe3d86f4825ed80af6f16f00012d8fe27fe60e31fb5fcffcf841bfb3d2fadf8ed4a774c24807c2003c367b416b7467ce9497ec770 SHA512 69241cb64aa30288a318141c9a363bb4c23499028ce7b0b83c73298df45644e1d5a8d3da151f81ad9195ba8abff80e13638db2a4bb45924737738997cc476588
 EBUILD mk-9999.ebuild 427 BLAKE2B f2c4fb3f622cae0cc67d230fe3d86f4825ed80af6f16f00012d8fe27fe60e31fb5fcffcf841bfb3d2fadf8ed4a774c24807c2003c367b416b7467ce9497ec770 SHA512 69241cb64aa30288a318141c9a363bb4c23499028ce7b0b83c73298df45644e1d5a8d3da151f81ad9195ba8abff80e13638db2a4bb45924737738997cc476588
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/mk/mk-1.15.7.ebuild b/dev-ros/mk/mk-1.15.7.ebuild
new file mode 100644
index 000000000000..12bbf7f7952f
--- /dev/null
+++ b/dev-ros/mk/mk-1.15.7.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A collection of .mk include files for building ROS architectural elements"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}
+	dev-ros/rospack
+	dev-ros/rosbuild"
diff --git a/dev-ros/move_base/Manifest b/dev-ros/move_base/Manifest
index 0d5f6649c3b4..9d24f59d66b7 100644
--- a/dev-ros/move_base/Manifest
+++ b/dev-ros/move_base/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
 EBUILD move_base-1.17.0.ebuild 1076 BLAKE2B 71de96487c5236d19e6178a91142a56336b56ef10be127c785fd5d6c92166e7cb311bbf678cae703921c7d8d272b5c1ee0645342a895556d7d2d38ffb194f959 SHA512 ca79a18498f16740a29d765b483639f0267945e0162c59c41a62079297ce6bcb0f73e9a0baf37a472c455e7ee8d617a3f1664df914a7ccb9ba9c14cd01b98a65
+EBUILD move_base-1.17.1.ebuild 1076 BLAKE2B 71de96487c5236d19e6178a91142a56336b56ef10be127c785fd5d6c92166e7cb311bbf678cae703921c7d8d272b5c1ee0645342a895556d7d2d38ffb194f959 SHA512 ca79a18498f16740a29d765b483639f0267945e0162c59c41a62079297ce6bcb0f73e9a0baf37a472c455e7ee8d617a3f1664df914a7ccb9ba9c14cd01b98a65
 EBUILD move_base-9999.ebuild 1076 BLAKE2B 71de96487c5236d19e6178a91142a56336b56ef10be127c785fd5d6c92166e7cb311bbf678cae703921c7d8d272b5c1ee0645342a895556d7d2d38ffb194f959 SHA512 ca79a18498f16740a29d765b483639f0267945e0162c59c41a62079297ce6bcb0f73e9a0baf37a472c455e7ee8d617a3f1664df914a7ccb9ba9c14cd01b98a65
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/move_base/move_base-1.17.1.ebuild b/dev-ros/move_base/move_base-1.17.1.ebuild
new file mode 100644
index 000000000000..eaf209fa0834
--- /dev/null
+++ b/dev-ros/move_base/move_base-1.17.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Given a goal in the world, will attempt to reach it with a mobile base"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/actionlib
+	>=dev-ros/costmap_2d-1.15.1
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/nav_core
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/tf2_ros
+
+	dev-ros/base_local_planner
+	dev-ros/clear_costmap_recovery
+	dev-ros/navfn
+	dev-ros/rotate_recovery
+
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/cmake_modules"
diff --git a/dev-ros/move_slow_and_clear/Manifest b/dev-ros/move_slow_and_clear/Manifest
index 367892b58626..2c1dab6a0cd3 100644
--- a/dev-ros/move_slow_and_clear/Manifest
+++ b/dev-ros/move_slow_and_clear/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
 EBUILD move_slow_and_clear-1.17.0.ebuild 559 BLAKE2B 7cdb316390a123892a22bad332a11b681420b5843d787c0dab6553465350b2f234acbfbe6f1300fa6db7af186449ef7a67c4c7016bba7080507f13b7f1d35160 SHA512 a8df285ad63ad25fc1dee6e902c57c73cb9f98392f5fe62599150450d9615ba4a6e59cc1dee640f2bd36c9c2a1573707efadb069f0e8f2eaf849995e6bca0ddf
+EBUILD move_slow_and_clear-1.17.1.ebuild 559 BLAKE2B 7cdb316390a123892a22bad332a11b681420b5843d787c0dab6553465350b2f234acbfbe6f1300fa6db7af186449ef7a67c4c7016bba7080507f13b7f1d35160 SHA512 a8df285ad63ad25fc1dee6e902c57c73cb9f98392f5fe62599150450d9615ba4a6e59cc1dee640f2bd36c9c2a1573707efadb069f0e8f2eaf849995e6bca0ddf
 EBUILD move_slow_and_clear-9999.ebuild 559 BLAKE2B 7cdb316390a123892a22bad332a11b681420b5843d787c0dab6553465350b2f234acbfbe6f1300fa6db7af186449ef7a67c4c7016bba7080507f13b7f1d35160 SHA512 a8df285ad63ad25fc1dee6e902c57c73cb9f98392f5fe62599150450d9615ba4a6e59cc1dee640f2bd36c9c2a1573707efadb069f0e8f2eaf849995e6bca0ddf
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/move_slow_and_clear/move_slow_and_clear-1.17.1.ebuild b/dev-ros/move_slow_and_clear/move_slow_and_clear-1.17.1.ebuild
new file mode 100644
index 000000000000..a1ed26ce92da
--- /dev/null
+++ b/dev-ros/move_slow_and_clear/move_slow_and_clear-1.17.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Move slow and clear"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/costmap_2d-1.16
+	dev-ros/nav_core
+	dev-ros/pluginlib
+	dev-ros/roscpp
+
+	dev-libs/boost:=[threads]
+	dev-cpp/eigen:3
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/moveit_msgs/Manifest b/dev-ros/moveit_msgs/Manifest
index 480f195529c0..ab3349593d8c 100644
--- a/dev-ros/moveit_msgs/Manifest
+++ b/dev-ros/moveit_msgs/Manifest
@@ -1,4 +1,4 @@
-DIST moveit_msgs-0.10.1.tar.gz 19163 BLAKE2B b24b9b0330350c42c80588f6bd9273ba467958812f294918f7a4695ef435b6105591aab01f856c008ac0d73679d5bab34249f82b723de954fd66ac461ee9bbb6 SHA512 7b574bcffc7533dba44420b5a965604bc8396cfac7d1d3f3dc8e0ecb8f65c4a7b4692c06286db80ee3e3cf995c79dc52297aa9cd5237a0d87613266f762cb2dd
-EBUILD moveit_msgs-0.10.1.ebuild 585 BLAKE2B 9869f0901d9a7147418fb131865f33bb4f221460eacb9eb635fe50e12d1c436a7b87c841880e1ec28574e739a5a8172894a54b21a13a89771a7871db02108fd6 SHA512 3ff92b8cf23fefac59574aef6a5154a331282fcb78dc355be7bd230b1fd1ecd78a1f9f9e90259272cdad2448dc226bff433c23e14f9fcec8ff4c81510338a5d2
+DIST moveit_msgs-0.11.1.tar.gz 20617 BLAKE2B 12b6f6f606d5f3ecaee8bafc5703526020ef60b421e452bb603390236caede4e7fb0d1310d0fc5c38dd63676085a083a76721f97a3548022375b3b2a8b72596c SHA512 b9f99bbae3d13040368ab8fb649682becd194ff91279c7c5a3060104789df91a4d61334a369a46e9d161f9f7386d42b97a189451c2ac0b5f124fb17df92ca680
+EBUILD moveit_msgs-0.11.1.ebuild 585 BLAKE2B 9869f0901d9a7147418fb131865f33bb4f221460eacb9eb635fe50e12d1c436a7b87c841880e1ec28574e739a5a8172894a54b21a13a89771a7871db02108fd6 SHA512 3ff92b8cf23fefac59574aef6a5154a331282fcb78dc355be7bd230b1fd1ecd78a1f9f9e90259272cdad2448dc226bff433c23e14f9fcec8ff4c81510338a5d2
 EBUILD moveit_msgs-9999.ebuild 585 BLAKE2B 9869f0901d9a7147418fb131865f33bb4f221460eacb9eb635fe50e12d1c436a7b87c841880e1ec28574e739a5a8172894a54b21a13a89771a7871db02108fd6 SHA512 3ff92b8cf23fefac59574aef6a5154a331282fcb78dc355be7bd230b1fd1ecd78a1f9f9e90259272cdad2448dc226bff433c23e14f9fcec8ff4c81510338a5d2
 MISC metadata.xml 338 BLAKE2B f91c4144e8f04fe987c5db67b6ebf539420aa3c07bd50c58394bd489a5d6b41f6122a645dd2c182dc6c14d4755d97b89fe444e2a1b48a6b048a6726c36bd31e9 SHA512 232c4c964a3798a5b5aa26692e74b2f71e1a6f4bf89e618c86824d0a6fd97b4064b68ecb380dc505c4cf492fd45671e89bb419d96377e5fced8a665b864fb1a1
diff --git a/dev-ros/moveit_msgs/moveit_msgs-0.10.1.ebuild b/dev-ros/moveit_msgs/moveit_msgs-0.11.1.ebuild
index 6490a10393ef..6490a10393ef 100644
--- a/dev-ros/moveit_msgs/moveit_msgs-0.10.1.ebuild
+++ b/dev-ros/moveit_msgs/moveit_msgs-0.11.1.ebuild
diff --git a/dev-ros/nav_core/Manifest b/dev-ros/nav_core/Manifest
index 465188bff334..41da7c6f654b 100644
--- a/dev-ros/nav_core/Manifest
+++ b/dev-ros/nav_core/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
 EBUILD nav_core-1.17.0.ebuild 505 BLAKE2B 1bc51127b173b23f54ee7a8026190a2d3af1dd57aa945ab587a7ac81bef28ebcbe3d3b6aefe6d2fca92678b64a1a4cd5549ce3493a8547585e5306231668ca31 SHA512 0af0e2eda44cffd84865dc206bd835500c659672da22fa0f1329aed53df6939b55ec97f23fe6ebf3a7052f7b75c15c098c2fdb15dbded3c1aff4ab8d2d6676c6
+EBUILD nav_core-1.17.1.ebuild 505 BLAKE2B 1bc51127b173b23f54ee7a8026190a2d3af1dd57aa945ab587a7ac81bef28ebcbe3d3b6aefe6d2fca92678b64a1a4cd5549ce3493a8547585e5306231668ca31 SHA512 0af0e2eda44cffd84865dc206bd835500c659672da22fa0f1329aed53df6939b55ec97f23fe6ebf3a7052f7b75c15c098c2fdb15dbded3c1aff4ab8d2d6676c6
 EBUILD nav_core-9999.ebuild 505 BLAKE2B 1bc51127b173b23f54ee7a8026190a2d3af1dd57aa945ab587a7ac81bef28ebcbe3d3b6aefe6d2fca92678b64a1a4cd5549ce3493a8547585e5306231668ca31 SHA512 0af0e2eda44cffd84865dc206bd835500c659672da22fa0f1329aed53df6939b55ec97f23fe6ebf3a7052f7b75c15c098c2fdb15dbded3c1aff4ab8d2d6676c6
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/nav_core/nav_core-1.17.1.ebuild b/dev-ros/nav_core/nav_core-1.17.1.ebuild
new file mode 100644
index 000000000000..389fbe3ca74a
--- /dev/null
+++ b/dev-ros/nav_core/nav_core-1.17.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Common interfaces for navigation specific robot actions"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/costmap_2d
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_ros
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/navfn/Manifest b/dev-ros/navfn/Manifest
index d7beb0fd0430..503f00c5d28a 100644
--- a/dev-ros/navfn/Manifest
+++ b/dev-ros/navfn/Manifest
@@ -1,6 +1,8 @@
 AUX pgm_h_location.patch 818 BLAKE2B 9e1c0e8210f492423d897f3952e7bdecef3c3db27258308402b1fc3c96938a4b186436e7541af7c8076811b053a37a46c9ca629411dbb3ec4588430c434fc5ae SHA512 a6a0a1474480914d20d6978c52b0a7abbca16b4885be0d8aecb9e47e4ee3900964dee37546f2460a50193daf04431fd1419711a8b2c958b63423d70407117688
 AUX tests.patch 460 BLAKE2B 06814e0e141d4b7b75ef36bcea6dff20aadc324c700e0aa219110efac9b27316829f7faa0b83a99795998428e825568325e87e6ca52fa3696772e6e95b655aa2 SHA512 c02fa62a1446b403a535d028a1b36c1deac8a4cf09f0596ada560e696288412566c5b8e2719fd368e098f9ccfe23dec02c9d6e066cb837ea2cdf5b15523c21a2
 DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
 EBUILD navfn-1.17.0.ebuild 1088 BLAKE2B eb6fb1965490d7a7662440235522b299cd3ad963d37aa00b15142564909361753c975b1f854f7312ecfed16053dbfa48ca02a8c4399b1689d03a05a5e4eb8345 SHA512 e50176c125e3a802ae49cc31fc9d7c192e856355583d5243577d178c38560152bb0acffbd34640798e14e69984243e2d82f46b55d8ec5fb30a45ec16323a2ca7
+EBUILD navfn-1.17.1.ebuild 1088 BLAKE2B eb6fb1965490d7a7662440235522b299cd3ad963d37aa00b15142564909361753c975b1f854f7312ecfed16053dbfa48ca02a8c4399b1689d03a05a5e4eb8345 SHA512 e50176c125e3a802ae49cc31fc9d7c192e856355583d5243577d178c38560152bb0acffbd34640798e14e69984243e2d82f46b55d8ec5fb30a45ec16323a2ca7
 EBUILD navfn-9999.ebuild 1088 BLAKE2B eb6fb1965490d7a7662440235522b299cd3ad963d37aa00b15142564909361753c975b1f854f7312ecfed16053dbfa48ca02a8c4399b1689d03a05a5e4eb8345 SHA512 e50176c125e3a802ae49cc31fc9d7c192e856355583d5243577d178c38560152bb0acffbd34640798e14e69984243e2d82f46b55d8ec5fb30a45ec16323a2ca7
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/navfn/navfn-1.17.1.ebuild b/dev-ros/navfn/navfn-1.17.1.ebuild
new file mode 100644
index 000000000000..a504b8149f82
--- /dev/null
+++ b/dev-ros/navfn/navfn-1.17.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs"
+CATKIN_HAS_MESSAGES=yes
+
+inherit ros-catkin
+
+DESCRIPTION="Fast interpolated navigation function for creating plans for a mobile base"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/costmap_2d-1.16
+	dev-ros/nav_core
+	dev-ros/pluginlib
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_ros
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+
+	dev-cpp/eigen:3
+	x11-libs/fltk
+	media-libs/netpbm
+	dev-libs/boost:=[threads]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+	dev-ros/cmake_modules"
+
+PATCHES=( "${FILESDIR}/pgm_h_location.patch" "${FILESDIR}/tests.patch" )
+
+src_prepare() {
+	ros-catkin_src_prepare
+	sed -e "s#@PGM_PATH@#\"${S}/test/willow_costmap.pgm\"#" -i test/path_calc_test.cpp || die
+}
diff --git a/dev-ros/object_recognition_msgs/Manifest b/dev-ros/object_recognition_msgs/Manifest
index 9b3419badf22..c7dd6a29adc1 100644
--- a/dev-ros/object_recognition_msgs/Manifest
+++ b/dev-ros/object_recognition_msgs/Manifest
@@ -1,4 +1,4 @@
-DIST object_recognition_msgs-0.4.1.tar.gz 4756 BLAKE2B 9d6c919b82d4e9300eebc9ba36498414f62a9a6392649adb7db011e315eb64d2810b1c8eab6f647a58d8ab60dfa1dfae77d98164b9f97d9f4a9c47716a0d3cc4 SHA512 4e2d48795b0376640dbb6eb82ca3d0cdf5e2d4a2e7ec8d723ce7613c678fc2dc037fceafe8b37a905d9bb2f0a283e84e4adbf986dd6e5322ae96d43de120a3cf
-EBUILD object_recognition_msgs-0.4.1.ebuild 545 BLAKE2B d8164cbc0fd7851157e6dcd30e4bdcfb3620673e4409e9acde9ce8ddd1c4cc8f571e9b830f59c7941e2a950445a15993f5859e84799b0e6bf13a6333ff3bc691 SHA512 57a72839acc0955f79395bfb96c66d8a2e7508de27a3b1eaa38811eeb7db7a38eaa3fe53a51574d8bd213dd441f217e34ed39d7f60cd58527257d11251e5d02a
+DIST object_recognition_msgs-0.4.2.tar.gz 4810 BLAKE2B 004087f2f7982b2cffca52023061a5f05830fb2e10e4d62683ca171f3c36926c912d9c6e07ab5ae2a694a07fe2a3d8dac040d8f0c3abb9640e8c07462084c416 SHA512 20a2e1d05f5610c0102340a6f6fe725d47134bf6a69e018a607dde68a2d980455fc0b7d848202259801cfd7d9671a80a3f4f1bd3f571df73240e4885f5eb9d34
+EBUILD object_recognition_msgs-0.4.2.ebuild 545 BLAKE2B d8164cbc0fd7851157e6dcd30e4bdcfb3620673e4409e9acde9ce8ddd1c4cc8f571e9b830f59c7941e2a950445a15993f5859e84799b0e6bf13a6333ff3bc691 SHA512 57a72839acc0955f79395bfb96c66d8a2e7508de27a3b1eaa38811eeb7db7a38eaa3fe53a51574d8bd213dd441f217e34ed39d7f60cd58527257d11251e5d02a
 EBUILD object_recognition_msgs-9999.ebuild 545 BLAKE2B d8164cbc0fd7851157e6dcd30e4bdcfb3620673e4409e9acde9ce8ddd1c4cc8f571e9b830f59c7941e2a950445a15993f5859e84799b0e6bf13a6333ff3bc691 SHA512 57a72839acc0955f79395bfb96c66d8a2e7508de27a3b1eaa38811eeb7db7a38eaa3fe53a51574d8bd213dd441f217e34ed39d7f60cd58527257d11251e5d02a
 MISC metadata.xml 351 BLAKE2B 08c11c3e85e64d6bfad30f493bf14be8f672c8482edd9ff90c8e4d7686e9cb031f955b01bb4c8e35030e8dadc37ae299811d84da692ecaf8badcd9cc4041e8bf SHA512 84326325a832b3a3029f36b758aad22fc18b13bbfdcfd64cd25ed7f4e4e88a578788d34fe6ae9fe3e765ddf20c754448ca138753ab5ca4e881eaae36094fda2c
diff --git a/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.1.ebuild b/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.2.ebuild
index 9af6f1bdaa76..9af6f1bdaa76 100644
--- a/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.1.ebuild
+++ b/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.2.ebuild
diff --git a/dev-ros/pcl_conversions/Manifest b/dev-ros/pcl_conversions/Manifest
index 53cd7f16ca8a..b4df79390c1a 100644
--- a/dev-ros/pcl_conversions/Manifest
+++ b/dev-ros/pcl_conversions/Manifest
@@ -1,4 +1,6 @@
 DIST perception_pcl-1.7.1.tar.gz 80899 BLAKE2B 2898d88efa1b27a27eea06fb949254127cf92eb2c788ae914a40f0000fa8204202c4823c69ab5fa9bd83c2426289a4897a56fab9ec3df61e3ab0a184fc068c41 SHA512 97e9240c660adde84976860ed9c94cf8c127615526641dbcdb729ffbda4cda4dfb9f351cc2d471988732ad61e6508bfa5906c8b4503c31172e7f4e4dfc31260e
+DIST perception_pcl-1.7.2.tar.gz 81897 BLAKE2B 692f000337090c7a2354bf9626d391aa0fe390041042718e7dde7335c750137e7e1b6f939728ad1e2af3411e535ba63b42bc17f74b3535e38628f2b6c1c87036 SHA512 228b1d7d589bfd1460e8c58448b0d9257e86c1796b009853aeceeb1da20d8f46462d8c273a95804003ce3c43326c6575553d19b319aa9effcef4854347d5c3f9
 EBUILD pcl_conversions-1.7.1.ebuild 602 BLAKE2B 488cfb2ca76f22ae02c751d2b4936cedc2cb0e5f48189e2cb08df5039459e52b3e77cd642db191271cabf7cd6b38033ee8bb332be35b98c6b697c7e2d1504ce9 SHA512 e04e58d53feb53a00ec9628ce4bad4911ff3095c20394807bc7af4357b40903b0be52e68e759067431eb2a08706f49cf4b2779246c1030b705d587150d47bee6
+EBUILD pcl_conversions-1.7.2.ebuild 602 BLAKE2B 488cfb2ca76f22ae02c751d2b4936cedc2cb0e5f48189e2cb08df5039459e52b3e77cd642db191271cabf7cd6b38033ee8bb332be35b98c6b697c7e2d1504ce9 SHA512 e04e58d53feb53a00ec9628ce4bad4911ff3095c20394807bc7af4357b40903b0be52e68e759067431eb2a08706f49cf4b2779246c1030b705d587150d47bee6
 EBUILD pcl_conversions-9999.ebuild 602 BLAKE2B 488cfb2ca76f22ae02c751d2b4936cedc2cb0e5f48189e2cb08df5039459e52b3e77cd642db191271cabf7cd6b38033ee8bb332be35b98c6b697c7e2d1504ce9 SHA512 e04e58d53feb53a00ec9628ce4bad4911ff3095c20394807bc7af4357b40903b0be52e68e759067431eb2a08706f49cf4b2779246c1030b705d587150d47bee6
 MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/dev-ros/pcl_conversions/pcl_conversions-1.7.2.ebuild b/dev-ros/pcl_conversions/pcl_conversions-1.7.2.ebuild
new file mode 100644
index 000000000000..2aa2de1919aa
--- /dev/null
+++ b/dev-ros/pcl_conversions/pcl_conversions-1.7.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Provides conversions from PCL data types and ROS message types"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	sci-libs/pcl:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/pcl_ros/Manifest b/dev-ros/pcl_ros/Manifest
index d2a51cf3e105..9e7a90f94c5d 100644
--- a/dev-ros/pcl_ros/Manifest
+++ b/dev-ros/pcl_ros/Manifest
@@ -1,5 +1,5 @@
-AUX pcl111.patch 38649 BLAKE2B 8895cde34c315ba81f522d55fd6b692725ded70f7dbfd38d7e502b2303dd48041cd1e0bef1a685f204d82c9d42f76f3bf4b957c2859a97b761ee4b2790224ff0 SHA512 b745640d86c9b01a0c7d2777ac8c6a8ce81c9544ae7f74ea0aff7d31823c66eca47ac82ad150980b009d702113412501deed7c700d55a44d2307f4dce444be03
-DIST perception_pcl-1.7.1.tar.gz 80899 BLAKE2B 2898d88efa1b27a27eea06fb949254127cf92eb2c788ae914a40f0000fa8204202c4823c69ab5fa9bd83c2426289a4897a56fab9ec3df61e3ab0a184fc068c41 SHA512 97e9240c660adde84976860ed9c94cf8c127615526641dbcdb729ffbda4cda4dfb9f351cc2d471988732ad61e6508bfa5906c8b4503c31172e7f4e4dfc31260e
-EBUILD pcl_ros-1.7.1.ebuild 1033 BLAKE2B ef5a8708cf349a21b0956f8bcb8cab54955efb6ff57298979eb9c903534dbced365b2349e6694df0149871126583c78815c942d6d8459f76f8bb7c67d2977be4 SHA512 5e160e32e0d85079a670ed4d34a982a728cc0ad58245e6cfe1df5a827327551d7396f9f0e02f020ccbf414dd7b35da697c5d23b95c50de7f96640d0d2c2b7d78
-EBUILD pcl_ros-9999.ebuild 994 BLAKE2B 1c511a19b65338b27ecbe38ed5dc2301b0571271b56dc5d9b873ae6b43cdd6d385dae70fa7b4f33ddfb96aa40c3d42e30bb6fc8d74d047a0138b85f5cf8ce6f6 SHA512 8e642915515fd6b7016f8e23306f1cb95b6f753c80d7aebdd6531f398f9b1b2168ef932f00b717fbce5192f3c55039a53f7a8ee5f17d1115cc1346471050ebd4
+AUX tests.patch 526 BLAKE2B 6a4c015707096bea03a5921387286a70289e8933ff75300aee8f070fec7a2870932e35f5b4a4ddbe2131611716c2493b99ed63f93fa34880c36fd918a04eb158 SHA512 fdcba450c84e92aaa5f7263b02f118d4d3832725cd3aa30b218f3ff1af4439406ae930ccba8c601b757173572d99a26c12a670b33ad7600e71695a165461459d
+DIST perception_pcl-1.7.2.tar.gz 81897 BLAKE2B 692f000337090c7a2354bf9626d391aa0fe390041042718e7dde7335c750137e7e1b6f939728ad1e2af3411e535ba63b42bc17f74b3535e38628f2b6c1c87036 SHA512 228b1d7d589bfd1460e8c58448b0d9257e86c1796b009853aeceeb1da20d8f46462d8c273a95804003ce3c43326c6575553d19b319aa9effcef4854347d5c3f9
+EBUILD pcl_ros-1.7.2.ebuild 1032 BLAKE2B dea9184749e616fc687fdc56aad240b876aa70304f868f3e583489e6f809d5c0139b78a7ca73755f51d4ecbe0ce23b7fa0bd57e4e5b203d752a8f6069626c99f SHA512 010092ba78377fe765172ad56c8d73f04ec5a1612c4c1f0b3795b50bcbd0cd5295f1f47955a455a3cfd834bf3b78bb1621ff5787a5c640fdb9e5b05aaac096fd
+EBUILD pcl_ros-9999.ebuild 1032 BLAKE2B dea9184749e616fc687fdc56aad240b876aa70304f868f3e583489e6f809d5c0139b78a7ca73755f51d4ecbe0ce23b7fa0bd57e4e5b203d752a8f6069626c99f SHA512 010092ba78377fe765172ad56c8d73f04ec5a1612c4c1f0b3795b50bcbd0cd5295f1f47955a455a3cfd834bf3b78bb1621ff5787a5c640fdb9e5b05aaac096fd
 MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/dev-ros/pcl_ros/files/pcl111.patch b/dev-ros/pcl_ros/files/pcl111.patch
deleted file mode 100644
index 839e87dcf0a1..000000000000
--- a/dev-ros/pcl_ros/files/pcl111.patch
+++ /dev/null
@@ -1,963 +0,0 @@
-From e812d3cf1b67cc73841b41e690d53c74e5077a05 Mon Sep 17 00:00:00 2001
-From: Kunal Tyagi <tyagi.kunal@live.com>
-Date: Wed, 6 May 2020 08:41:07 +0900
-Subject: [PATCH] Changes in preparation for PCL 1.11 (#273)
-
-* Deriving typedef from pcl type
-
-* Explicit boost shared_ptr for function parameters
-
-* Use boost::shared_ptr instead of PCL::Ptr
-
-* Implementing boost-std compatibility
-
-* Using the compatibility layer
----
- pcl_ros/include/pcl_ros/features/feature.h    |  14 +-
- pcl_ros/include/pcl_ros/filters/filter.h      |   4 +-
- pcl_ros/include/pcl_ros/pcl_nodelet.h         |   9 +-
- pcl_ros/include/pcl_ros/point_cloud.h         | 121 ++++++++++++++++++
- .../extract_polygonal_prism_data.h            |   4 +-
- .../pcl_ros/segmentation/sac_segmentation.h   |  12 +-
- .../segmentation/segment_differences.h        |   4 +-
- pcl_ros/include/pcl_ros/surface/convex_hull.h |   4 +-
- .../pcl_ros/surface/moving_least_squares.h    |   4 +-
- pcl_ros/src/pcl_ros/features/boundary.cpp     |  10 +-
- pcl_ros/src/pcl_ros/features/fpfh.cpp         |  10 +-
- pcl_ros/src/pcl_ros/features/fpfh_omp.cpp     |  10 +-
- .../pcl_ros/features/moment_invariants.cpp    |   8 +-
- pcl_ros/src/pcl_ros/features/normal_3d.cpp    |   8 +-
- .../src/pcl_ros/features/normal_3d_omp.cpp    |   8 +-
- .../src/pcl_ros/features/normal_3d_tbb.cpp    |   4 +-
- pcl_ros/src/pcl_ros/features/pfh.cpp          |  10 +-
- .../pcl_ros/features/principal_curvatures.cpp |  10 +-
- pcl_ros/src/pcl_ros/features/shot.cpp         |  10 +-
- pcl_ros/src/pcl_ros/features/shot_omp.cpp     |  10 +-
- pcl_ros/src/pcl_ros/features/vfh.cpp          |  10 +-
- .../pcl_ros/segmentation/extract_clusters.cpp |   4 +-
- .../extract_polygonal_prism_data.cpp          |   6 +-
- .../pcl_ros/segmentation/sac_segmentation.cpp |   6 +-
- .../segmentation/segment_differences.cpp      |   8 +-
- pcl_ros/src/pcl_ros/surface/convex_hull.cpp   |   8 +-
- .../pcl_ros/surface/moving_least_squares.cpp  |  10 +-
- pcl_ros/tools/pointcloud_to_pcd.cpp           |   2 +-
- 28 files changed, 225 insertions(+), 103 deletions(-)
-
-diff --git a/pcl_ros/include/pcl_ros/features/feature.h b/pcl_ros/include/pcl_ros/features/feature.h
-index 26bcfe6b..098c20bc 100644
---- a/include/pcl_ros/features/feature.h
-+++ b/include/pcl_ros/features/feature.h
-@@ -69,11 +69,11 @@ namespace pcl_ros
-       typedef pcl::KdTree<pcl::PointXYZ>::Ptr KdTreePtr;
- 
-       typedef pcl::PointCloud<pcl::PointXYZ> PointCloudIn;
--      typedef PointCloudIn::Ptr PointCloudInPtr;
--      typedef PointCloudIn::ConstPtr PointCloudInConstPtr;
-+      typedef boost::shared_ptr<PointCloudIn> PointCloudInPtr;
-+      typedef boost::shared_ptr<const PointCloudIn> PointCloudInConstPtr;
- 
--      typedef boost::shared_ptr <std::vector<int> > IndicesPtr;
--      typedef boost::shared_ptr <const std::vector<int> > IndicesConstPtr;
-+      typedef pcl::IndicesPtr IndicesPtr;
-+      typedef pcl::IndicesConstPtr IndicesConstPtr;
- 
-       /** \brief Empty constructor. */
-       Feature () : /*input_(), indices_(), surface_(), */tree_(), k_(0), search_radius_(0),
-@@ -152,7 +152,7 @@ namespace pcl_ros
-         indices.header.stamp = pcl_conversions::fromPCL(input->header).stamp;
-         PointCloudIn cloud;
-         cloud.header.stamp = input->header.stamp;
--        nf_pc_.add (cloud.makeShared ());
-+        nf_pc_.add (ros_ptr(cloud.makeShared ()));
-         nf_pi_.add (boost::make_shared<PointIndices> (indices));
-       }
- 
-@@ -190,8 +190,8 @@ namespace pcl_ros
-       typedef sensor_msgs::PointCloud2 PointCloud2;
- 
-       typedef pcl::PointCloud<pcl::Normal> PointCloudN;
--      typedef PointCloudN::Ptr PointCloudNPtr;
--      typedef PointCloudN::ConstPtr PointCloudNConstPtr;
-+      typedef boost::shared_ptr<PointCloudN> PointCloudNPtr;
-+      typedef boost::shared_ptr<const PointCloudN> PointCloudNConstPtr;
- 
-       FeatureFromNormals () : normals_() {};
- 
-diff --git a/pcl_ros/include/pcl_ros/filters/filter.h b/pcl_ros/include/pcl_ros/filters/filter.h
-index 94c1e883..b4e79538 100644
---- a/include/pcl_ros/filters/filter.h
-+++ b/include/pcl_ros/filters/filter.h
-@@ -58,8 +58,8 @@ namespace pcl_ros
-     public:
-       typedef sensor_msgs::PointCloud2 PointCloud2;
- 
--      typedef boost::shared_ptr <std::vector<int> > IndicesPtr;
--      typedef boost::shared_ptr <const std::vector<int> > IndicesConstPtr;
-+      typedef pcl::IndicesPtr IndicesPtr;
-+      typedef pcl::IndicesConstPtr IndicesConstPtr;
- 
-       Filter () {}
- 
-diff --git a/pcl_ros/include/pcl_ros/pcl_nodelet.h b/pcl_ros/include/pcl_ros/pcl_nodelet.h
-index f12e62d7..279d6730 100644
---- a/include/pcl_ros/pcl_nodelet.h
-+++ b/include/pcl_ros/pcl_nodelet.h
-@@ -48,6 +48,7 @@
- // PCL includes
- #include <pcl_msgs/PointIndices.h>
- #include <pcl_msgs/ModelCoefficients.h>
-+#include <pcl/pcl_base.h>
- #include <pcl/point_types.h>
- #include <pcl_conversions/pcl_conversions.h>
- #include "pcl_ros/point_cloud.h"
-@@ -75,8 +76,8 @@ namespace pcl_ros
-       typedef sensor_msgs::PointCloud2 PointCloud2;
- 
-       typedef pcl::PointCloud<pcl::PointXYZ> PointCloud;
--      typedef PointCloud::Ptr PointCloudPtr;
--      typedef PointCloud::ConstPtr PointCloudConstPtr;
-+      typedef boost::shared_ptr<PointCloud> PointCloudPtr;
-+      typedef boost::shared_ptr<const PointCloud> PointCloudConstPtr;
- 
-       typedef pcl_msgs::PointIndices PointIndices;
-       typedef PointIndices::Ptr PointIndicesPtr;
-@@ -86,8 +87,8 @@ namespace pcl_ros
-       typedef ModelCoefficients::Ptr ModelCoefficientsPtr;
-       typedef ModelCoefficients::ConstPtr ModelCoefficientsConstPtr;
- 
--      typedef boost::shared_ptr <std::vector<int> > IndicesPtr;
--      typedef boost::shared_ptr <const std::vector<int> > IndicesConstPtr;
-+      typedef pcl::IndicesPtr IndicesPtr;
-+      typedef pcl::IndicesConstPtr IndicesConstPtr;
- 
-       /** \brief Empty constructor. */
-       PCLNodelet () : use_indices_ (false), latched_indices_ (false),
-diff --git a/pcl_ros/include/pcl_ros/point_cloud.h b/pcl_ros/include/pcl_ros/point_cloud.h
-index bbf30ad1..93df7365 100644
---- a/include/pcl_ros/point_cloud.h
-+++ b/include/pcl_ros/point_cloud.h
-@@ -270,4 +270,125 @@ namespace ros
- 
- } // namespace ros
- 
-+// test if testing machinery can be implemented
-+#if defined(__cpp_rvalue_references) && defined(__cpp_constexpr)
-+#define ROS_POINTER_COMPATIBILITY_IMPLEMENTED 1
-+#else
-+#define ROS_POINTER_COMPATIBILITY_IMPLEMENTED 0
-+#endif
-+
-+#if ROS_POINTER_COMPATIBILITY_IMPLEMENTED
-+#include <type_traits>  // for std::is_same
-+#include <memory>       // for std::shared_ptr
-+
-+#include <pcl/pcl_config.h>
-+#if PCL_VERSION_COMPARE(>=, 1, 11, 0)
-+#include <pcl/memory.h>
-+#elif PCL_VERSION_COMPARE(>=, 1, 10, 0)
-+#include <pcl/make_shared.h>
-+#endif
-+#endif
-+
-+namespace pcl
-+{
-+  namespace detail
-+  {
-+#if ROS_POINTER_COMPATIBILITY_IMPLEMENTED
-+#if PCL_VERSION_COMPARE(>=, 1, 10, 0)
-+    template <class T>
-+    constexpr static bool pcl_uses_boost = std::is_same<boost::shared_ptr<T>,
-+                                                        pcl::shared_ptr<T>>::value;
-+#else
-+    template <class T>
-+    constexpr static bool pcl_uses_boost = true;
-+#endif
-+
-+    template<class SharedPointer> struct Holder
-+    {
-+      SharedPointer p;
-+
-+      Holder(const SharedPointer &p) : p(p) {}
-+      Holder(const Holder &other) : p(other.p) {}
-+      Holder(Holder &&other) : p(std::move(other.p)) {}
-+
-+      void operator () (...) { p.reset(); }
-+    };
-+
-+    template<class T>
-+    inline std::shared_ptr<T> to_std_ptr(const boost::shared_ptr<T> &p)
-+    {
-+        typedef Holder<std::shared_ptr<T>> H;
-+        if(H *h = boost::get_deleter<H>(p))
-+        {
-+            return h->p;
-+        }
-+        else
-+        {
-+            return std::shared_ptr<T>(p.get(), Holder<boost::shared_ptr<T>>(p));
-+        }
-+    }
-+
-+    template<class T>
-+    inline boost::shared_ptr<T> to_boost_ptr(const std::shared_ptr<T> &p)
-+    {
-+        typedef Holder<boost::shared_ptr<T>> H;
-+        if(H * h = std::get_deleter<H>(p))
-+        {
-+            return h->p;
-+        }
-+        else
-+        {
-+            return boost::shared_ptr<T>(p.get(), Holder<std::shared_ptr<T>>(p));
-+        }
-+    }
-+#endif
-+  } // namespace pcl::detail
-+
-+// add functions to convert to smart pointer used by ROS
-+  template <class T>
-+  inline boost::shared_ptr<T> ros_ptr(const boost::shared_ptr<T> &p)
-+  {
-+      return p;
-+  }
-+
-+#if ROS_POINTER_COMPATIBILITY_IMPLEMENTED
-+  template <class T>
-+  inline boost::shared_ptr<T> ros_ptr(const std::shared_ptr<T> &p)
-+  {
-+      return detail::to_boost_ptr(p);
-+  }
-+
-+// add functions to convert to smart pointer used by PCL, based on PCL's own pointer
-+  template <class T, class = typename std::enable_if<!detail::pcl_uses_boost<T>>::type>
-+  inline std::shared_ptr<T> pcl_ptr(const std::shared_ptr<T> &p)
-+  {
-+      return p;
-+  }
-+
-+  template <class T, class = typename std::enable_if<!detail::pcl_uses_boost<T>>::type>
-+  inline std::shared_ptr<T> pcl_ptr(const boost::shared_ptr<T> &p)
-+  {
-+      return detail::to_std_ptr(p);
-+  }
-+
-+  template <class T, class = typename std::enable_if<detail::pcl_uses_boost<T>>::type>
-+  inline boost::shared_ptr<T> pcl_ptr(const std::shared_ptr<T> &p)
-+  {
-+      return detail::to_boost_ptr(p);
-+  }
-+
-+  template <class T, class = typename std::enable_if<detail::pcl_uses_boost<T>>::type>
-+  inline boost::shared_ptr<T> pcl_ptr(const boost::shared_ptr<T> &p)
-+  {
-+      return p;
-+  }
-+#else
-+  template <class T>
-+  inline boost::shared_ptr<T> pcl_ptr(const boost::shared_ptr<T> &p)
-+  {
-+      return p;
-+  }
-+#endif
-+} // namespace pcl
-+
- #endif
-diff --git a/pcl_ros/include/pcl_ros/segmentation/extract_polygonal_prism_data.h b/pcl_ros/include/pcl_ros/segmentation/extract_polygonal_prism_data.h
-index 7134f905..13b85316 100644
---- a/include/pcl_ros/segmentation/extract_polygonal_prism_data.h
-+++ b/include/pcl_ros/segmentation/extract_polygonal_prism_data.h
-@@ -64,8 +64,8 @@ namespace pcl_ros
-   class ExtractPolygonalPrismData : public PCLNodelet
-   {
-     typedef pcl::PointCloud<pcl::PointXYZ> PointCloud;
--    typedef PointCloud::Ptr PointCloudPtr;
--    typedef PointCloud::ConstPtr PointCloudConstPtr;
-+    typedef boost::shared_ptr<PointCloud> PointCloudPtr;
-+    typedef boost::shared_ptr<const PointCloud> PointCloudConstPtr;
- 
-     protected:
-        /** \brief The output PointIndices publisher. */
-diff --git a/pcl_ros/include/pcl_ros/segmentation/sac_segmentation.h b/pcl_ros/include/pcl_ros/segmentation/sac_segmentation.h
-index af2c9126..9243e363 100644
---- a/include/pcl_ros/segmentation/sac_segmentation.h
-+++ b/include/pcl_ros/segmentation/sac_segmentation.h
-@@ -61,8 +61,8 @@ namespace pcl_ros
-   class SACSegmentation : public PCLNodelet
-   {
-     typedef pcl::PointCloud<pcl::PointXYZ> PointCloud;
--    typedef PointCloud::Ptr PointCloudPtr;
--    typedef PointCloud::ConstPtr PointCloudConstPtr;
-+    typedef boost::shared_ptr<PointCloud> PointCloudPtr;
-+    typedef boost::shared_ptr<const PointCloud> PointCloudConstPtr;
- 
-     public:
-       /** \brief Constructor. */
-@@ -181,12 +181,12 @@ namespace pcl_ros
-   class SACSegmentationFromNormals: public SACSegmentation
-   {
-     typedef pcl::PointCloud<pcl::PointXYZ> PointCloud;
--    typedef PointCloud::Ptr PointCloudPtr;
--    typedef PointCloud::ConstPtr PointCloudConstPtr;
-+    typedef boost::shared_ptr<PointCloud> PointCloudPtr;
-+    typedef boost::shared_ptr<const PointCloud> PointCloudConstPtr;
- 
-     typedef pcl::PointCloud<pcl::Normal> PointCloudN;
--    typedef PointCloudN::Ptr PointCloudNPtr;
--    typedef PointCloudN::ConstPtr PointCloudNConstPtr;
-+    typedef boost::shared_ptr<PointCloudN> PointCloudNPtr;
-+    typedef boost::shared_ptr<const PointCloudN> PointCloudNConstPtr;
- 
-     public:
-       /** \brief Set the input TF frame the data should be transformed into before processing, if input.header.frame_id is different.
-diff --git a/pcl_ros/include/pcl_ros/segmentation/segment_differences.h b/pcl_ros/include/pcl_ros/segmentation/segment_differences.h
-index 4914bc86..da767ab3 100644
---- a/include/pcl_ros/segmentation/segment_differences.h
-+++ b/include/pcl_ros/segmentation/segment_differences.h
-@@ -60,8 +60,8 @@ namespace pcl_ros
-   class SegmentDifferences : public PCLNodelet
-   {
-     typedef pcl::PointCloud<pcl::PointXYZ> PointCloud;
--    typedef PointCloud::Ptr PointCloudPtr;
--    typedef PointCloud::ConstPtr PointCloudConstPtr;
-+    typedef boost::shared_ptr<PointCloud> PointCloudPtr;
-+    typedef boost::shared_ptr<const PointCloud> PointCloudConstPtr;
- 
-     public:
-       /** \brief Empty constructor. */
-diff --git a/pcl_ros/include/pcl_ros/surface/convex_hull.h b/pcl_ros/include/pcl_ros/surface/convex_hull.h
-index e419c0f8..54a1f367 100644
---- a/include/pcl_ros/surface/convex_hull.h
-+++ b/include/pcl_ros/surface/convex_hull.h
-@@ -53,8 +53,8 @@ namespace pcl_ros
-   class ConvexHull2D : public PCLNodelet
-   {
-     typedef pcl::PointCloud<pcl::PointXYZ> PointCloud;
--    typedef PointCloud::Ptr PointCloudPtr;
--    typedef PointCloud::ConstPtr PointCloudConstPtr;
-+    typedef boost::shared_ptr<PointCloud> PointCloudPtr;
-+    typedef boost::shared_ptr<const PointCloud> PointCloudConstPtr;
- 
-     private:
-       /** \brief Nodelet initialization routine. */
-diff --git a/pcl_ros/include/pcl_ros/surface/moving_least_squares.h b/pcl_ros/include/pcl_ros/surface/moving_least_squares.h
-index b909edf8..e90f562a 100644
---- a/include/pcl_ros/surface/moving_least_squares.h
-+++ b/include/pcl_ros/surface/moving_least_squares.h
-@@ -62,8 +62,8 @@ namespace pcl_ros
-     typedef pcl::PointNormal NormalOut;
- 
-     typedef pcl::PointCloud<PointIn> PointCloudIn;
--    typedef PointCloudIn::Ptr PointCloudInPtr;
--    typedef PointCloudIn::ConstPtr PointCloudInConstPtr;
-+    typedef boost::shared_ptr<PointCloudIn> PointCloudInPtr;
-+    typedef boost::shared_ptr<const PointCloudIn> PointCloudInConstPtr;
-     typedef pcl::PointCloud<NormalOut> NormalCloudOut;
- 
-     typedef pcl::KdTree<PointIn> KdTree;
-diff --git a/pcl_ros/src/pcl_ros/features/boundary.cpp b/pcl_ros/src/pcl_ros/features/boundary.cpp
-index 9334641a..26ee07c1 100644
---- a/src/pcl_ros/features/boundary.cpp
-+++ b/src/pcl_ros/features/boundary.cpp
-@@ -43,7 +43,7 @@ pcl_ros::BoundaryEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
- {
-   PointCloudOut output;
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- void
-@@ -57,17 +57,17 @@ pcl_ros::BoundaryEstimation::computePublish (const PointCloudInConstPtr &cloud,
-   impl_.setRadiusSearch (search_radius_);
- 
-   // Set the inputs
--  impl_.setInputCloud (cloud);
-+  impl_.setInputCloud (pcl_ptr(cloud));
-   impl_.setIndices (indices);
--  impl_.setSearchSurface (surface);
--  impl_.setInputNormals (normals);
-+  impl_.setSearchSurface (pcl_ptr(surface));
-+  impl_.setInputNormals (pcl_ptr(normals));
-   // Estimate the feature
-   PointCloudOut output;
-   impl_.compute (output);
- 
-   // Enforce that the TF frame and the timestamp are copied
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- typedef pcl_ros::BoundaryEstimation BoundaryEstimation;
-diff --git a/pcl_ros/src/pcl_ros/features/fpfh.cpp b/pcl_ros/src/pcl_ros/features/fpfh.cpp
-index 3f698aad..53be549c 100644
---- a/src/pcl_ros/features/fpfh.cpp
-+++ b/src/pcl_ros/features/fpfh.cpp
-@@ -43,7 +43,7 @@ pcl_ros::FPFHEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
- {
-   PointCloudOut output;
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- void 
-@@ -57,10 +57,10 @@ pcl_ros::FPFHEstimation::computePublish (const PointCloudInConstPtr &cloud,
-   impl_.setRadiusSearch (search_radius_);
- 
-   // Set the inputs
--  impl_.setInputCloud (cloud);
-+  impl_.setInputCloud (pcl_ptr(cloud));
-   impl_.setIndices (indices);
--  impl_.setSearchSurface (surface);
--  impl_.setInputNormals (normals);
-+  impl_.setSearchSurface (pcl_ptr(surface));
-+  impl_.setInputNormals (pcl_ptr(normals));
-   // Estimate the feature
-   PointCloudOut output;
-   impl_.compute (output);
-@@ -68,7 +68,7 @@ pcl_ros::FPFHEstimation::computePublish (const PointCloudInConstPtr &cloud,
-   // Publish a Boost shared ptr const data
-   // Enforce that the TF frame and the timestamp are copied
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- typedef pcl_ros::FPFHEstimation FPFHEstimation;
-diff --git a/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp b/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp
-index 58dd911f..e4adcabb 100644
---- a/src/pcl_ros/features/fpfh_omp.cpp
-+++ b/src/pcl_ros/features/fpfh_omp.cpp
-@@ -43,7 +43,7 @@ pcl_ros::FPFHEstimationOMP::emptyPublish (const PointCloudInConstPtr &cloud)
- {
-   PointCloudOut output;
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- void 
-@@ -57,10 +57,10 @@ pcl_ros::FPFHEstimationOMP::computePublish (const PointCloudInConstPtr &cloud,
-   impl_.setRadiusSearch (search_radius_);
- 
-   // Set the inputs
--  impl_.setInputCloud (cloud);
-+  impl_.setInputCloud (pcl_ptr(cloud));
-   impl_.setIndices (indices);
--  impl_.setSearchSurface (surface);
--  impl_.setInputNormals (normals);
-+  impl_.setSearchSurface (pcl_ptr(surface));
-+  impl_.setInputNormals (pcl_ptr(normals));
-   // Estimate the feature
-   PointCloudOut output;
-   impl_.compute (output);
-@@ -68,7 +68,7 @@ pcl_ros::FPFHEstimationOMP::computePublish (const PointCloudInConstPtr &cloud,
-   // Publish a Boost shared ptr const data
-   // Enforce that the TF frame and the timestamp are copied
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- typedef pcl_ros::FPFHEstimationOMP FPFHEstimationOMP;
-diff --git a/pcl_ros/src/pcl_ros/features/moment_invariants.cpp b/pcl_ros/src/pcl_ros/features/moment_invariants.cpp
-index d0ec3441..a6e2249a 100644
---- a/src/pcl_ros/features/moment_invariants.cpp
-+++ b/src/pcl_ros/features/moment_invariants.cpp
-@@ -43,7 +43,7 @@ pcl_ros::MomentInvariantsEstimation::emptyPublish (const PointCloudInConstPtr &c
- {
-   PointCloudOut output;
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- void 
-@@ -56,9 +56,9 @@ pcl_ros::MomentInvariantsEstimation::computePublish (const PointCloudInConstPtr
-   impl_.setRadiusSearch (search_radius_);
- 
-   // Set the inputs
--  impl_.setInputCloud (cloud);
-+  impl_.setInputCloud (pcl_ptr(cloud));
-   impl_.setIndices (indices);
--  impl_.setSearchSurface (surface);
-+  impl_.setSearchSurface (pcl_ptr(surface));
-   // Estimate the feature
-   PointCloudOut output;
-   impl_.compute (output);
-@@ -66,7 +66,7 @@ pcl_ros::MomentInvariantsEstimation::computePublish (const PointCloudInConstPtr
-   // Publish a Boost shared ptr const data
-   // Enforce that the TF frame and the timestamp are copied
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- typedef pcl_ros::MomentInvariantsEstimation MomentInvariantsEstimation;
-diff --git a/pcl_ros/src/pcl_ros/features/normal_3d.cpp b/pcl_ros/src/pcl_ros/features/normal_3d.cpp
-index 9e700f78..042186a9 100644
---- a/src/pcl_ros/features/normal_3d.cpp
-+++ b/src/pcl_ros/features/normal_3d.cpp
-@@ -43,7 +43,7 @@ pcl_ros::NormalEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
- {
-   PointCloudOut output;
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- void 
-@@ -56,9 +56,9 @@ pcl_ros::NormalEstimation::computePublish (const PointCloudInConstPtr &cloud,
-   impl_.setRadiusSearch (search_radius_);
- 
-   // Set the inputs
--  impl_.setInputCloud (cloud);
-+  impl_.setInputCloud (pcl_ptr(cloud));
-   impl_.setIndices (indices);
--  impl_.setSearchSurface (surface);
-+  impl_.setSearchSurface (pcl_ptr(surface));
-   // Estimate the feature
-   PointCloudOut output;
-   impl_.compute (output);
-@@ -66,7 +66,7 @@ pcl_ros::NormalEstimation::computePublish (const PointCloudInConstPtr &cloud,
-   // Publish a Boost shared ptr const data
-   // Enforce that the TF frame and the timestamp are copied
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- typedef pcl_ros::NormalEstimation NormalEstimation;
-diff --git a/pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp b/pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp
-index a741c052..3e92d2f2 100644
---- a/src/pcl_ros/features/normal_3d_omp.cpp
-+++ b/src/pcl_ros/features/normal_3d_omp.cpp
-@@ -43,7 +43,7 @@ pcl_ros::NormalEstimationOMP::emptyPublish (const PointCloudInConstPtr &cloud)
- {
-   PointCloudOut output;
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- void 
-@@ -56,9 +56,9 @@ pcl_ros::NormalEstimationOMP::computePublish (const PointCloudInConstPtr &cloud,
-   impl_.setRadiusSearch (search_radius_);
- 
-   // Set the inputs
--  impl_.setInputCloud (cloud);
-+  impl_.setInputCloud (pcl_ptr(cloud));
-   impl_.setIndices (indices);
--  impl_.setSearchSurface (surface);
-+  impl_.setSearchSurface (pcl_ptr(surface));
-   // Estimate the feature
-   PointCloudOut output;
-   impl_.compute (output);
-@@ -66,7 +66,7 @@ pcl_ros::NormalEstimationOMP::computePublish (const PointCloudInConstPtr &cloud,
-   // Publish a Boost shared ptr const data
-   // Enforce that the TF frame and the timestamp are copied
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- typedef pcl_ros::NormalEstimationOMP NormalEstimationOMP;
-diff --git a/pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp b/pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp
-index a4a8581e..680a4a02 100644
---- a/src/pcl_ros/features/normal_3d_tbb.cpp
-+++ b/src/pcl_ros/features/normal_3d_tbb.cpp
-@@ -45,7 +45,7 @@ pcl_ros::NormalEstimationTBB::emptyPublish (const PointCloudInConstPtr &cloud)
- {
-   PointCloud output;
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- void 
-@@ -71,7 +71,7 @@ pcl_ros::NormalEstimationTBB::computePublish (const PointCloudInConstPtr &cloud,
-   // Publish a Boost shared ptr const data
-   // Enforce that the TF frame and the timestamp are copied
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- typedef pcl_ros::NormalEstimationTBB NormalEstimationTBB;
-diff --git a/pcl_ros/src/pcl_ros/features/pfh.cpp b/pcl_ros/src/pcl_ros/features/pfh.cpp
-index 38b4d19c..dd8409e2 100644
---- a/src/pcl_ros/features/pfh.cpp
-+++ b/src/pcl_ros/features/pfh.cpp
-@@ -43,7 +43,7 @@ pcl_ros::PFHEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
- {
-   PointCloudOut output;
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- void 
-@@ -57,10 +57,10 @@ pcl_ros::PFHEstimation::computePublish (const PointCloudInConstPtr &cloud,
-   impl_.setRadiusSearch (search_radius_);
- 
-   // Set the inputs
--  impl_.setInputCloud (cloud);
-+  impl_.setInputCloud (pcl_ptr(cloud));
-   impl_.setIndices (indices);
--  impl_.setSearchSurface (surface);
--  impl_.setInputNormals (normals);
-+  impl_.setSearchSurface (pcl_ptr(surface));
-+  impl_.setInputNormals (pcl_ptr(normals));
-   // Estimate the feature
-   PointCloudOut output;
-   impl_.compute (output);
-@@ -68,7 +68,7 @@ pcl_ros::PFHEstimation::computePublish (const PointCloudInConstPtr &cloud,
-   // Publish a Boost shared ptr const data
-   // Enforce that the TF frame and the timestamp are copied
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- typedef pcl_ros::PFHEstimation PFHEstimation;
-diff --git a/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp b/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp
-index 113124dc..501d686e 100644
---- a/src/pcl_ros/features/principal_curvatures.cpp
-+++ b/src/pcl_ros/features/principal_curvatures.cpp
-@@ -43,7 +43,7 @@ pcl_ros::PrincipalCurvaturesEstimation::emptyPublish (const PointCloudInConstPtr
- {
-   PointCloudOut output;
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- void 
-@@ -57,10 +57,10 @@ pcl_ros::PrincipalCurvaturesEstimation::computePublish (const PointCloudInConstP
-   impl_.setRadiusSearch (search_radius_);
- 
-   // Set the inputs
--  impl_.setInputCloud (cloud);
-+  impl_.setInputCloud (pcl_ptr(cloud));
-   impl_.setIndices (indices);
--  impl_.setSearchSurface (surface);
--  impl_.setInputNormals (normals);
-+  impl_.setSearchSurface (pcl_ptr(surface));
-+  impl_.setInputNormals (pcl_ptr(normals));
-   // Estimate the feature
-   PointCloudOut output;
-   impl_.compute (output);
-@@ -68,7 +68,7 @@ pcl_ros::PrincipalCurvaturesEstimation::computePublish (const PointCloudInConstP
-   // Publish a Boost shared ptr const data
-   // Enforce that the TF frame and the timestamp are copied
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- typedef pcl_ros::PrincipalCurvaturesEstimation PrincipalCurvaturesEstimation;
-diff --git a/pcl_ros/src/pcl_ros/features/shot.cpp b/pcl_ros/src/pcl_ros/features/shot.cpp
-index d051ab0f..ed6ba44b 100644
---- a/src/pcl_ros/features/shot.cpp
-+++ b/src/pcl_ros/features/shot.cpp
-@@ -42,7 +42,7 @@ pcl_ros::SHOTEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
- {
-   PointCloudOut output;
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- void 
-@@ -56,10 +56,10 @@ pcl_ros::SHOTEstimation::computePublish (const PointCloudInConstPtr &cloud,
-   impl_.setRadiusSearch (search_radius_);
- 
-   // Set the inputs
--  impl_.setInputCloud (cloud);
-+  impl_.setInputCloud (pcl_ptr(cloud));
-   impl_.setIndices (indices);
--  impl_.setSearchSurface (surface);
--  impl_.setInputNormals (normals);
-+  impl_.setSearchSurface (pcl_ptr(surface));
-+  impl_.setInputNormals (pcl_ptr(normals));
-   // Estimate the feature
-   PointCloudOut output;
-   impl_.compute (output);
-@@ -67,7 +67,7 @@ pcl_ros::SHOTEstimation::computePublish (const PointCloudInConstPtr &cloud,
-   // Publish a Boost shared ptr const data
-   // Enforce that the TF frame and the timestamp are copied
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- typedef pcl_ros::SHOTEstimation SHOTEstimation;
-diff --git a/pcl_ros/src/pcl_ros/features/shot_omp.cpp b/pcl_ros/src/pcl_ros/features/shot_omp.cpp
-index 1ac1b065..4563f123 100644
---- a/src/pcl_ros/features/shot_omp.cpp
-+++ b/src/pcl_ros/features/shot_omp.cpp
-@@ -42,7 +42,7 @@ pcl_ros::SHOTEstimationOMP::emptyPublish (const PointCloudInConstPtr &cloud)
- {
-   PointCloudOut output;
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- void 
-@@ -56,10 +56,10 @@ pcl_ros::SHOTEstimationOMP::computePublish (const PointCloudInConstPtr &cloud,
-   impl_.setRadiusSearch (search_radius_);
- 
-   // Set the inputs
--  impl_.setInputCloud (cloud);
-+  impl_.setInputCloud (pcl_ptr(cloud));
-   impl_.setIndices (indices);
--  impl_.setSearchSurface (surface);
--  impl_.setInputNormals (normals);
-+  impl_.setSearchSurface (pcl_ptr(surface));
-+  impl_.setInputNormals (pcl_ptr(normals));
-   // Estimate the feature
-   PointCloudOut output;
-   impl_.compute (output);
-@@ -67,7 +67,7 @@ pcl_ros::SHOTEstimationOMP::computePublish (const PointCloudInConstPtr &cloud,
-   // Publish a Boost shared ptr const data
-   // Enforce that the TF frame and the timestamp are copied
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- typedef pcl_ros::SHOTEstimationOMP SHOTEstimationOMP;
-diff --git a/pcl_ros/src/pcl_ros/features/vfh.cpp b/pcl_ros/src/pcl_ros/features/vfh.cpp
-index 9d0fe361..ece448fd 100644
---- a/src/pcl_ros/features/vfh.cpp
-+++ b/src/pcl_ros/features/vfh.cpp
-@@ -43,7 +43,7 @@ pcl_ros::VFHEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
- {
-   PointCloudOut output;
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- void 
-@@ -57,10 +57,10 @@ pcl_ros::VFHEstimation::computePublish (const PointCloudInConstPtr &cloud,
-   impl_.setRadiusSearch (search_radius_);
- 
-   // Set the inputs
--  impl_.setInputCloud (cloud);
-+  impl_.setInputCloud (pcl_ptr(cloud));
-   impl_.setIndices (indices);
--  impl_.setSearchSurface (surface);
--  impl_.setInputNormals (normals);
-+  impl_.setSearchSurface (pcl_ptr(surface));
-+  impl_.setInputNormals (pcl_ptr(normals));
-   // Estimate the feature
-   PointCloudOut output;
-   impl_.compute (output);
-@@ -68,7 +68,7 @@ pcl_ros::VFHEstimation::computePublish (const PointCloudInConstPtr &cloud,
-   // Publish a Boost shared ptr const data
-   // Enforce that the TF frame and the timestamp are copied
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- typedef pcl_ros::VFHEstimation VFHEstimation;
-diff --git a/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp b/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp
-index 17adec46..5599b408 100644
---- a/src/pcl_ros/segmentation/extract_clusters.cpp
-+++ b/src/pcl_ros/segmentation/extract_clusters.cpp
-@@ -202,7 +202,7 @@ pcl_ros::EuclideanClusterExtraction::input_indices_callback (
-   if (indices)
-     indices_ptr.reset (new std::vector<int> (indices->indices));
- 
--  impl_.setInputCloud (cloud);
-+  impl_.setInputCloud (pcl_ptr(cloud));
-   impl_.setIndices (indices_ptr);
- 
-   std::vector<pcl::PointIndices> clusters;
-@@ -239,7 +239,7 @@ pcl_ros::EuclideanClusterExtraction::input_indices_callback (
-       header.stamp += ros::Duration (i * 0.001);
-       toPCL(header, output.header);
-       // Publish a Boost shared ptr const data
--      pub_output_.publish (output.makeShared ());
-+      pub_output_.publish (ros_ptr(output.makeShared ()));
-       NODELET_DEBUG ("[segmentAndPublish] Published cluster %zu (with %zu values and stamp %f) on topic %s",
-                      i, clusters[i].indices.size (), header.stamp.toSec (), pnh_->resolveName ("output").c_str ());
-     }
-diff --git a/pcl_ros/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp b/pcl_ros/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
-index 0185bfbe..ff823b19 100644
---- a/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
-+++ b/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
-@@ -189,16 +189,16 @@ pcl_ros::ExtractPolygonalPrismData::input_hull_indices_callback (
-       pub_output_.publish (inliers);
-       return;
-     }
--    impl_.setInputPlanarHull (planar_hull.makeShared ());
-+    impl_.setInputPlanarHull (pcl_ptr(planar_hull.makeShared ()));
-   }
-   else
--    impl_.setInputPlanarHull (hull);
-+    impl_.setInputPlanarHull (pcl_ptr(hull));
- 
-   IndicesPtr indices_ptr;
-   if (indices && !indices->header.frame_id.empty ())
-     indices_ptr.reset (new std::vector<int> (indices->indices));
- 
--  impl_.setInputCloud (cloud);
-+  impl_.setInputCloud (pcl_ptr(cloud));
-   impl_.setIndices (indices_ptr);
- 
-   // Final check if the data is empty (remember that indices are set to the size of the data -- if indices* = NULL)
-diff --git a/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp b/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp
-index b73dd3fd..bc7b97e7 100644
---- a/src/pcl_ros/segmentation/sac_segmentation.cpp
-+++ b/src/pcl_ros/segmentation/sac_segmentation.cpp
-@@ -324,7 +324,7 @@ pcl_ros::SACSegmentation::input_indices_callback (const PointCloudConstPtr &clou
-   if (indices && !indices->header.frame_id.empty ())
-     indices_ptr.reset (new std::vector<int> (indices->indices));
- 
--  impl_.setInputCloud (cloud_tf);
-+  impl_.setInputCloud (pcl_ptr(cloud_tf));
-   impl_.setIndices (indices_ptr);
- 
-   // Final check if the data is empty (remember that indices are set to the size of the data -- if indices* = NULL)
-@@ -651,8 +651,8 @@ pcl_ros::SACSegmentationFromNormals::input_normals_indices_callback (
-     return;
-   }
- 
--  impl_.setInputCloud (cloud);
--  impl_.setInputNormals (cloud_normals);
-+  impl_.setInputCloud (pcl_ptr(cloud));
-+  impl_.setInputNormals (pcl_ptr(cloud_normals));
- 
-   IndicesPtr indices_ptr;
-   if (indices && !indices->header.frame_id.empty ())
-diff --git a/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp b/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp
-index 4c934152..e3979549 100644
---- a/src/pcl_ros/segmentation/segment_differences.cpp
-+++ b/src/pcl_ros/segmentation/segment_differences.cpp
-@@ -115,7 +115,7 @@ pcl_ros::SegmentDifferences::input_target_callback (const PointCloudConstPtr &cl
-     NODELET_ERROR ("[%s::input_indices_callback] Invalid input!", getName ().c_str ());
-     PointCloud output;
-     output.header = cloud->header;
--    pub_output_.publish (output.makeShared ());
-+    pub_output_.publish (ros_ptr(output.makeShared ()));
-     return;
-   }
- 
-@@ -126,13 +126,13 @@ pcl_ros::SegmentDifferences::input_target_callback (const PointCloudConstPtr &cl
-                  cloud->width * cloud->height, pcl::getFieldsList (*cloud).c_str (), fromPCL(cloud->header).stamp.toSec (), cloud->header.frame_id.c_str (), pnh_->resolveName ("input").c_str (),
-                  cloud_target->width * cloud_target->height, pcl::getFieldsList (*cloud_target).c_str (), fromPCL(cloud_target->header).stamp.toSec (), cloud_target->header.frame_id.c_str (), pnh_->resolveName ("target").c_str ());
- 
--  impl_.setInputCloud (cloud);
--  impl_.setTargetCloud (cloud_target);
-+  impl_.setInputCloud (pcl_ptr(cloud));
-+  impl_.setTargetCloud (pcl_ptr(cloud_target));
- 
-   PointCloud output;
-   impl_.segment (output);
- 
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
-   NODELET_DEBUG ("[%s::segmentAndPublish] Published PointCloud2 with %zu points and stamp %f on topic %s", getName ().c_str (),
-                      output.points.size (), fromPCL(output.header).stamp.toSec (), pnh_->resolveName ("output").c_str ());
- }
-diff --git a/pcl_ros/src/pcl_ros/surface/convex_hull.cpp b/pcl_ros/src/pcl_ros/surface/convex_hull.cpp
-index 4b7eeaf5..75903889 100644
---- a/src/pcl_ros/surface/convex_hull.cpp
-+++ b/src/pcl_ros/surface/convex_hull.cpp
-@@ -121,7 +121,7 @@ void
-     NODELET_ERROR ("[%s::input_indices_callback] Invalid input!", getName ().c_str ());
-     // Publish an empty message
-     output.header = cloud->header;
--    pub_output_.publish (output.makeShared ());
-+    pub_output_.publish (ros_ptr(output.makeShared ()));
-     return;
-   }
-   // If indices are given, check if they are valid
-@@ -130,7 +130,7 @@ void
-     NODELET_ERROR ("[%s::input_indices_callback] Invalid indices!", getName ().c_str ());
-     // Publish an empty message
-     output.header = cloud->header;
--    pub_output_.publish (output.makeShared ());
-+    pub_output_.publish (ros_ptr(output.makeShared ()));
-     return;
-   }
- 
-@@ -150,7 +150,7 @@ void
-   if (indices)
-     indices_ptr.reset (new std::vector<int> (indices->indices));
- 
--  impl_.setInputCloud (cloud);
-+  impl_.setInputCloud (pcl_ptr(cloud));
-   impl_.setIndices (indices_ptr);
- 
-   // Estimate the feature
-@@ -194,7 +194,7 @@ void
-   }
-   // Publish a Boost shared ptr const data
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
- }
- 
- typedef pcl_ros::ConvexHull2D ConvexHull2D;
-diff --git a/pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp b/pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp
-index b9a01e64..99e5d481 100644
---- a/src/pcl_ros/surface/moving_least_squares.cpp
-+++ b/src/pcl_ros/surface/moving_least_squares.cpp
-@@ -141,7 +141,7 @@ pcl_ros::MovingLeastSquares::input_indices_callback (const PointCloudInConstPtr
-   {
-     NODELET_ERROR ("[%s::input_indices_callback] Invalid input!", getName ().c_str ());
-     output.header = cloud->header;
--    pub_output_.publish (output.makeShared ());
-+    pub_output_.publish (ros_ptr(output.makeShared ()));
-     return;
-   }
-   // If indices are given, check if they are valid
-@@ -149,7 +149,7 @@ pcl_ros::MovingLeastSquares::input_indices_callback (const PointCloudInConstPtr
-   {
-     NODELET_ERROR ("[%s::input_indices_callback] Invalid indices!", getName ().c_str ());
-     output.header = cloud->header;
--    pub_output_.publish (output.makeShared ());
-+    pub_output_.publish (ros_ptr(output.makeShared ()));
-     return;
-   }
- 
-@@ -166,7 +166,7 @@ pcl_ros::MovingLeastSquares::input_indices_callback (const PointCloudInConstPtr
-   ///
- 
-   // Reset the indices and surface pointers
--  impl_.setInputCloud (cloud);
-+  impl_.setInputCloud (pcl_ptr(cloud));
- 
-   IndicesPtr indices_ptr;
-   if (indices)
-@@ -182,9 +182,9 @@ pcl_ros::MovingLeastSquares::input_indices_callback (const PointCloudInConstPtr
-   // Publish a Boost shared ptr const data
-   // Enforce that the TF frame and the timestamp are copied
-   output.header = cloud->header;
--  pub_output_.publish (output.makeShared ());
-+  pub_output_.publish (ros_ptr(output.makeShared ()));
-   normals->header = cloud->header;
--  pub_normals_.publish (normals);
-+  pub_normals_.publish (ros_ptr(normals));
- }
- 
- //////////////////////////////////////////////////////////////////////////////////////////////
-diff --git a/pcl_ros/tools/pointcloud_to_pcd.cpp b/pcl_ros/tools/pointcloud_to_pcd.cpp
-index 484113da..fb149b46 100644
---- a/tools/pointcloud_to_pcd.cpp
-+++ b/tools/pointcloud_to_pcd.cpp
-@@ -78,7 +78,7 @@ class PointCloudToPCD
-     ////////////////////////////////////////////////////////////////////////////////
-     // Callback
-     void
--      cloud_cb (const pcl::PCLPointCloud2::ConstPtr& cloud)
-+      cloud_cb (const boost::shared_ptr<const pcl::PCLPointCloud2>& cloud)
-     {
-       if ((cloud->width * cloud->height) == 0)
-         return;
diff --git a/dev-ros/pcl_ros/files/tests.patch b/dev-ros/pcl_ros/files/tests.patch
new file mode 100644
index 000000000000..dbb2f3030186
--- /dev/null
+++ b/dev-ros/pcl_ros/files/tests.patch
@@ -0,0 +1,15 @@
+Increase tolerance, this fails under high loads
+
+Index: pcl_ros/samples/pcl_ros/segmentation/sample_extract_clusters.launch
+===================================================================
+--- pcl_ros.orig/samples/pcl_ros/segmentation/sample_extract_clusters.launch
++++ pcl_ros/samples/pcl_ros/segmentation/sample_extract_clusters.launch
+@@ -25,7 +25,7 @@
+     <rosparam>
+       topic: /extract_clusters/output
+       hz: 3000
+-      hzerror: 2400
++      hzerror: 2900
+       test_duration: 5.0
+     </rosparam>
+   </test>
diff --git a/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild b/dev-ros/pcl_ros/pcl_ros-1.7.2.ebuild
index 5d3ff3e64a29..afd8b02fd200 100644
--- a/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild
+++ b/dev-ros/pcl_ros/pcl_ros-1.7.2.ebuild
@@ -42,4 +42,4 @@ DEPEND="${RDEPEND}
 		dev-cpp/gtest
 	)
 "
-PATCHES=( "${FILESDIR}/pcl111.patch" )
+PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/pcl_ros/pcl_ros-9999.ebuild b/dev-ros/pcl_ros/pcl_ros-9999.ebuild
index 95393ac0ab86..afd8b02fd200 100644
--- a/dev-ros/pcl_ros/pcl_ros-9999.ebuild
+++ b/dev-ros/pcl_ros/pcl_ros-9999.ebuild
@@ -42,3 +42,4 @@ DEPEND="${RDEPEND}
 		dev-cpp/gtest
 	)
 "
+PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/pr2_dashboard_aggregator/Manifest b/dev-ros/pr2_dashboard_aggregator/Manifest
index 4dc222cba52b..991d49f5fb3f 100644
--- a/dev-ros/pr2_dashboard_aggregator/Manifest
+++ b/dev-ros/pr2_dashboard_aggregator/Manifest
@@ -1,4 +1,6 @@
 DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
+DIST pr2_common-1.13.0.tar.gz 21741522 BLAKE2B a8488526aa8f059a5f3aa9e43cb30600c610a2a63d6689a32e14c39e6077c6ce2411f29ff273d00864970491cf7fab76fd94de3dc5b94bc1a12199c11aa8fe44 SHA512 c62f5c9de1d7bfaa138510633ae16a6255fadd90ae019fab203eedeb1914858287c91d0ffde287ef4df4f7245c6548ccad400ffcc94b342a1f22aec014035bc5
 EBUILD pr2_dashboard_aggregator-1.12.4.ebuild 518 BLAKE2B 391535aefd882495e7b0cae7e8c1ee74b8abfafedbeff96491fd343ef24cae9028d81e8974c2407b41405b2dad410a1098c341da0e678e21fe52335e3162112b SHA512 3c551b8194ce339137985b0bc32216a1ba31bb75924a436032a62fe9b4839515c3b434308f230cf8fb7cfdb75840326e046d10d447d16983b0686289f2ffdd70
+EBUILD pr2_dashboard_aggregator-1.13.0.ebuild 518 BLAKE2B 391535aefd882495e7b0cae7e8c1ee74b8abfafedbeff96491fd343ef24cae9028d81e8974c2407b41405b2dad410a1098c341da0e678e21fe52335e3162112b SHA512 3c551b8194ce339137985b0bc32216a1ba31bb75924a436032a62fe9b4839515c3b434308f230cf8fb7cfdb75840326e046d10d447d16983b0686289f2ffdd70
 EBUILD pr2_dashboard_aggregator-9999.ebuild 518 BLAKE2B 391535aefd882495e7b0cae7e8c1ee74b8abfafedbeff96491fd343ef24cae9028d81e8974c2407b41405b2dad410a1098c341da0e678e21fe52335e3162112b SHA512 3c551b8194ce339137985b0bc32216a1ba31bb75924a436032a62fe9b4839515c3b434308f230cf8fb7cfdb75840326e046d10d447d16983b0686289f2ffdd70
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.13.0.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.13.0.ebuild
new file mode 100644
index 000000000000..bc9b14b580de
--- /dev/null
+++ b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.13.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Aggregates all of the topics that a 'pr2_dashboard' app might be interested in"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_description/Manifest b/dev-ros/pr2_description/Manifest
index 5b92752dccee..65a0c43cc400 100644
--- a/dev-ros/pr2_description/Manifest
+++ b/dev-ros/pr2_description/Manifest
@@ -1,4 +1,6 @@
 DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
+DIST pr2_common-1.13.0.tar.gz 21741522 BLAKE2B a8488526aa8f059a5f3aa9e43cb30600c610a2a63d6689a32e14c39e6077c6ce2411f29ff273d00864970491cf7fab76fd94de3dc5b94bc1a12199c11aa8fe44 SHA512 c62f5c9de1d7bfaa138510633ae16a6255fadd90ae019fab203eedeb1914858287c91d0ffde287ef4df4f7245c6548ccad400ffcc94b342a1f22aec014035bc5
 EBUILD pr2_description-1.12.4.ebuild 660 BLAKE2B b82c4c3ffa9f2798e7766aefae817bccf1dd574812aca03787678c6ab1130b35cb5d2bb9a0a84ee10e31cb5c6f0db256df1af43c7a31860745b83863ad83a53d SHA512 b84cdf3f3575970ce102c3088c95fcdda19ea230c1df03adfb10d1a360e169f4d25b1aa0214b1540e0113cc9ed89f0a31553e8ea5903cbed9177ad2b07ac2a9c
+EBUILD pr2_description-1.13.0.ebuild 660 BLAKE2B b82c4c3ffa9f2798e7766aefae817bccf1dd574812aca03787678c6ab1130b35cb5d2bb9a0a84ee10e31cb5c6f0db256df1af43c7a31860745b83863ad83a53d SHA512 b84cdf3f3575970ce102c3088c95fcdda19ea230c1df03adfb10d1a360e169f4d25b1aa0214b1540e0113cc9ed89f0a31553e8ea5903cbed9177ad2b07ac2a9c
 EBUILD pr2_description-9999.ebuild 660 BLAKE2B b82c4c3ffa9f2798e7766aefae817bccf1dd574812aca03787678c6ab1130b35cb5d2bb9a0a84ee10e31cb5c6f0db256df1af43c7a31860745b83863ad83a53d SHA512 b84cdf3f3575970ce102c3088c95fcdda19ea230c1df03adfb10d1a360e169f4d25b1aa0214b1540e0113cc9ed89f0a31553e8ea5903cbed9177ad2b07ac2a9c
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_description/pr2_description-1.13.0.ebuild b/dev-ros/pr2_description/pr2_description-1.13.0.ebuild
new file mode 100644
index 000000000000..6b8e630a5696
--- /dev/null
+++ b/dev-ros/pr2_description/pr2_description-1.13.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/xacro[${PYTHON_SINGLE_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/urdfdom
+		dev-cpp/gtest
+		dev-ros/rosbash
+	)"
+BDEPEND="
+	dev-ros/convex_decomposition
+	dev-ros/ivcon
+"
+
+src_test() {
+	# Needed for tests to find internal launch file
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/pr2_machine/Manifest b/dev-ros/pr2_machine/Manifest
index 1927c46f9cb0..89fc9e8b5e3a 100644
--- a/dev-ros/pr2_machine/Manifest
+++ b/dev-ros/pr2_machine/Manifest
@@ -1,4 +1,6 @@
 DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
+DIST pr2_common-1.13.0.tar.gz 21741522 BLAKE2B a8488526aa8f059a5f3aa9e43cb30600c610a2a63d6689a32e14c39e6077c6ce2411f29ff273d00864970491cf7fab76fd94de3dc5b94bc1a12199c11aa8fe44 SHA512 c62f5c9de1d7bfaa138510633ae16a6255fadd90ae019fab203eedeb1914858287c91d0ffde287ef4df4f7245c6548ccad400ffcc94b342a1f22aec014035bc5
 EBUILD pr2_machine-1.12.4.ebuild 371 BLAKE2B bef838adcd55896dee5b599d3ad47d727050d60747603ffec68a456a6e355a4dc78fce279df6436ca8dbdead92ea2549c4b9eeffe804cd9db5102917ad2c3c69 SHA512 da37d15dfa41249a5ebd95254c898e46762003978854990176baed596ab0fe9e5b3f46da8d02cde862c9d8a966cc86882f580cf7f6dcfe4f18e9e023053b42a6
+EBUILD pr2_machine-1.13.0.ebuild 371 BLAKE2B bef838adcd55896dee5b599d3ad47d727050d60747603ffec68a456a6e355a4dc78fce279df6436ca8dbdead92ea2549c4b9eeffe804cd9db5102917ad2c3c69 SHA512 da37d15dfa41249a5ebd95254c898e46762003978854990176baed596ab0fe9e5b3f46da8d02cde862c9d8a966cc86882f580cf7f6dcfe4f18e9e023053b42a6
 EBUILD pr2_machine-9999.ebuild 371 BLAKE2B bef838adcd55896dee5b599d3ad47d727050d60747603ffec68a456a6e355a4dc78fce279df6436ca8dbdead92ea2549c4b9eeffe804cd9db5102917ad2c3c69 SHA512 da37d15dfa41249a5ebd95254c898e46762003978854990176baed596ab0fe9e5b3f46da8d02cde862c9d8a966cc86882f580cf7f6dcfe4f18e9e023053b42a6
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_machine/pr2_machine-1.13.0.ebuild b/dev-ros/pr2_machine/pr2_machine-1.13.0.ebuild
new file mode 100644
index 000000000000..258bc46816a7
--- /dev/null
+++ b/dev-ros/pr2_machine/pr2_machine-1.13.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="xxx.machine files that describe the different hosts a node can be spawned on"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_msgs/Manifest b/dev-ros/pr2_msgs/Manifest
index a43761f2560e..663d72926b1b 100644
--- a/dev-ros/pr2_msgs/Manifest
+++ b/dev-ros/pr2_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
+DIST pr2_common-1.13.0.tar.gz 21741522 BLAKE2B a8488526aa8f059a5f3aa9e43cb30600c610a2a63d6689a32e14c39e6077c6ce2411f29ff273d00864970491cf7fab76fd94de3dc5b94bc1a12199c11aa8fe44 SHA512 c62f5c9de1d7bfaa138510633ae16a6255fadd90ae019fab203eedeb1914858287c91d0ffde287ef4df4f7245c6548ccad400ffcc94b342a1f22aec014035bc5
 EBUILD pr2_msgs-1.12.4.ebuild 427 BLAKE2B 853d578c3cb801817ad94411c583a15bbf535d11b2578f36563045888ba1b6eb9dc1b8938731523edffe1e29cbc359fce63c02b1ba1e1ed3c2e65148208b146e SHA512 02cd78974a0b281024bfc31a1c2c33589dc1a3769e41890caf73f2dc2c7f5fb5a4e795281f6bc5388dc72cfb1da1ba7bfa29d0508440155a69b5ba5960b1a84c
+EBUILD pr2_msgs-1.13.0.ebuild 427 BLAKE2B 853d578c3cb801817ad94411c583a15bbf535d11b2578f36563045888ba1b6eb9dc1b8938731523edffe1e29cbc359fce63c02b1ba1e1ed3c2e65148208b146e SHA512 02cd78974a0b281024bfc31a1c2c33589dc1a3769e41890caf73f2dc2c7f5fb5a4e795281f6bc5388dc72cfb1da1ba7bfa29d0508440155a69b5ba5960b1a84c
 EBUILD pr2_msgs-9999.ebuild 427 BLAKE2B 853d578c3cb801817ad94411c583a15bbf535d11b2578f36563045888ba1b6eb9dc1b8938731523edffe1e29cbc359fce63c02b1ba1e1ed3c2e65148208b146e SHA512 02cd78974a0b281024bfc31a1c2c33589dc1a3769e41890caf73f2dc2c7f5fb5a4e795281f6bc5388dc72cfb1da1ba7bfa29d0508440155a69b5ba5960b1a84c
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_msgs/pr2_msgs-1.13.0.ebuild b/dev-ros/pr2_msgs/pr2_msgs-1.13.0.ebuild
new file mode 100644
index 000000000000..cbbb022aa76a
--- /dev/null
+++ b/dev-ros/pr2_msgs/pr2_msgs-1.13.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for representing PR2 state"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_cpp/Manifest b/dev-ros/qt_gui_cpp/Manifest
index 06bd956ecd99..e69ab50651fa 100644
--- a/dev-ros/qt_gui_cpp/Manifest
+++ b/dev-ros/qt_gui_cpp/Manifest
@@ -1,8 +1,6 @@
 AUX libdir.patch 864 BLAKE2B c104517d108824d13455565cecbeac0886c60cc042bcab4ffd9961be7096117342157a0da0bb4912e18179bca5c40d8391be8d162ac9f07a7b4a5c8a3d65f4c5 SHA512 16960a3224f982cf3b55904d5c5370a715aed2a7dfd6f98ecc21af1f70fd527e84b1ee10f127e45251a149abb165aed06e595c73f7deda88f84548fb4c7cb717
-AUX sip.patch 703 BLAKE2B 8ab944d7ebad99070a8f3b9f3f327e5c763a48fe34303771655e498e112d05ae6855a81438e14ead305b6f8818abc996a2d52f1ad24433cfe21cc9f6cec8fd75 SHA512 045f3801407dc59ae50593e6d481afe2ed45abc86845a515d8ade4543710ccc0fa39f6564ea3ad150a06a0d0076647839a15c783da063179c6dc9072e07e2f99
-DIST qt_gui_core-0.4.1.tar.gz 96850 BLAKE2B a8a4325d5462a0788a69661adb20b3bf1bc9e391344ced31468bf9ddbe7114a13a2ecd3dda580986bd0af98c837641bda3e3d6cd3c5d9fa3352c37817ace2ed4 SHA512 0c46f86f88a818107049d08db6682a320f47b1b4983c586e4c944a387c070c7e017fca2f4be9d251f8a907f15be439998b2d559bea51ffc724fa4afc5e75f67c
+AUX rpaths.patch 1008 BLAKE2B 98d940001ca220ecb4078188c6c461e47038ce9bc3b486ee1ccf5dbd13a6d2cd632cdbc684bbce48485da52c04ef460bfd7a069f393cf8879afcd56fe3796c69 SHA512 a3bba92a6309859097be3c0ef8381dc327c43a90645c4c6d22ebf351b8d4cf98df90a6fb91d48a1d12cdaa901a6da5fc273098950d0f80f10b3366305142ec9b
 DIST qt_gui_core-0.4.2.tar.gz 97267 BLAKE2B 631996dd5b2a4e0aa557eb14a9dcb967377fce4923ada280d5894a733827f6f7d1aa240cc28261ee95a39171b03cba4f27f794ca3f9eb488d8b1953d237a9223 SHA512 a8b684d52eb1d4bfcdb6b63a989598d2098462d6fd93f26dd5a7eb0c0c9be9c324cb5d77b5e12c583253da4ce5edc544535bb9dd5a2f7966bf1642a7bd0ca421
-EBUILD qt_gui_cpp-0.4.1.ebuild 797 BLAKE2B c0e7aa99b7438690b5f1d52891705362a10daf64673a44f48fc5bc184125dd65c9fb194acc9bd85013070d80514899f05b17e2693fde7f8c0d62f39f8907752b SHA512 6f6d444d0fa41294a7fb5956deac1f2242be17c197d40f169cf17bdbd6b0902d4dfd49d56ced102e468357a5201752fd445427a69f779a9b857031988f06d877
-EBUILD qt_gui_cpp-0.4.2.ebuild 772 BLAKE2B 5af95a34039ac353072b20e9b5f7b655a4287113fa88fdb6ce8bb9fe50b6ba4e1e98333ca5ef09c9c4f8acc6896df4ac9df98577526af7e5fe834ff8c18ab58b SHA512 57a1de4d91e349cca601b2b1b88de828ecbfd66475521d124acbf02f2246cca66b15940a84b0e9a28014c732ad0e253d45e919c1a61a85306abcddcd3fd4dc60
-EBUILD qt_gui_cpp-9999.ebuild 772 BLAKE2B 5af95a34039ac353072b20e9b5f7b655a4287113fa88fdb6ce8bb9fe50b6ba4e1e98333ca5ef09c9c4f8acc6896df4ac9df98577526af7e5fe834ff8c18ab58b SHA512 57a1de4d91e349cca601b2b1b88de828ecbfd66475521d124acbf02f2246cca66b15940a84b0e9a28014c732ad0e253d45e919c1a61a85306abcddcd3fd4dc60
+EBUILD qt_gui_cpp-0.4.2-r1.ebuild 800 BLAKE2B b96725aea2b97bc1ae98669a63cbd8f21a493254ab36ce5f60e26294369e9d8987a74cc8571c55b59e49f708ac77f144d260de684bdb56eb151cffeecf983590 SHA512 5bb93b6d3565f38cfc1cd0cb81c4f3be5537a00aa980428f2bed931fb2c36edacef7c88cc62f319e1828343d7271bb0e9e467425c33d5d5757b3d12720d352a0
+EBUILD qt_gui_cpp-9999.ebuild 800 BLAKE2B b96725aea2b97bc1ae98669a63cbd8f21a493254ab36ce5f60e26294369e9d8987a74cc8571c55b59e49f708ac77f144d260de684bdb56eb151cffeecf983590 SHA512 5bb93b6d3565f38cfc1cd0cb81c4f3be5537a00aa980428f2bed931fb2c36edacef7c88cc62f319e1828343d7271bb0e9e467425c33d5d5757b3d12720d352a0
 MISC metadata.xml 343 BLAKE2B 518da938afd557552bcb4eec225723207d73325a348640eb5280137715941f95190d8be30f52d1773e97cb80c9ed25b34d60ed7cfdbb5425e6b6d30bb1a2050b SHA512 88a9c15a6f681122449cff3b89c4805a0a9ee5d579e1eb98f4814e6e57d3adafb0e370986a6e68c555880b80fb900d74ffd4cb19a670c15e3d0f5fa383e39810
diff --git a/dev-ros/qt_gui_cpp/files/rpaths.patch b/dev-ros/qt_gui_cpp/files/rpaths.patch
new file mode 100644
index 000000000000..313e3edcb72a
--- /dev/null
+++ b/dev-ros/qt_gui_cpp/files/rpaths.patch
@@ -0,0 +1,15 @@
+Index: qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt
+===================================================================
+--- qt_gui_cpp.orig/src/qt_gui_cpp_sip/CMakeLists.txt
++++ qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt
+@@ -29,8 +29,8 @@ set(qt_gui_cpp_sip_DEPENDENT_FILES
+ # maintain context for different named target
+ set(qt_gui_cpp_sip_INCLUDE_DIRS ${qt_gui_cpp_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../../include" ${catkin_INCLUDE_DIRS})
+ set(qt_gui_cpp_sip_LIBRARIES ${qt_gui_cpp_LIBRARIES} ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
+-set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+-set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER})
++set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS})
++set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER} -L${CATKIN_DEVEL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+ 
+ find_package(python_qt_binding REQUIRED)
+ include(${python_qt_binding_EXTRAS_DIR}/sip_helper.cmake)
diff --git a/dev-ros/qt_gui_cpp/files/sip.patch b/dev-ros/qt_gui_cpp/files/sip.patch
deleted file mode 100644
index 8157a9bc68d7..000000000000
--- a/dev-ros/qt_gui_cpp/files/sip.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5ecb3a219146816916c4a94e32664850548a2085 Mon Sep 17 00:00:00 2001
-From: Johannes Meyer <johannes@intermodalics.eu>
-Date: Tue, 7 Jul 2020 01:20:51 +0200
-Subject: [PATCH] qt_gui_cpp_sip: declare private assignment operator for SIP
- (#226)
-
----
- qt_gui_cpp/src/qt_gui_cpp_sip/plugin_context.sip | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/qt_gui_cpp/src/qt_gui_cpp_sip/plugin_context.sip b/qt_gui_cpp/src/qt_gui_cpp_sip/plugin_context.sip
-index 286d52e6..1d37a37d 100644
---- a/src/qt_gui_cpp_sip/plugin_context.sip
-+++ b/src/qt_gui_cpp_sip/plugin_context.sip
-@@ -25,6 +25,10 @@ public:
- 
-   void reloadPlugin();
- 
-+private:
-+
-+  PluginContext& operator=(const PluginContext&);
-+
- };
- 
- };
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.1.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.1.ebuild
deleted file mode 100644
index c4d73b4fc0d7..000000000000
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++-bindings for 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_SINGLE_USEDEP}]
-	dev-libs/tinyxml
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}/libdir.patch"
-	"${FILESDIR}/sip.patch"
-)
-
-# FIXME: fails to build with ninja
-CMAKE_MAKEFILE_GENERATOR=emake
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2-r1.ebuild
index 1f52f6afc836..dac9e5563d61 100644
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2.ebuild
+++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2-r1.ebuild
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 "
 PATCHES=(
 	"${FILESDIR}/libdir.patch"
+	"${FILESDIR}/rpaths.patch"
 )
 
 # FIXME: fails to build with ninja
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
index 1f52f6afc836..dac9e5563d61 100644
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
+++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 "
 PATCHES=(
 	"${FILESDIR}/libdir.patch"
+	"${FILESDIR}/rpaths.patch"
 )
 
 # FIXME: fails to build with ninja
diff --git a/dev-ros/ros_environment/Manifest b/dev-ros/ros_environment/Manifest
index 06b1a7cedeb0..fc245934c302 100644
--- a/dev-ros/ros_environment/Manifest
+++ b/dev-ros/ros_environment/Manifest
@@ -1,5 +1,5 @@
 AUX catkinprefixpath.patch 1035 BLAKE2B 8054e8f2ae8a7f0060d44558fe32bdf607b81054249a2f7255878801e8abc2fdaa695609fc056b5a4cfc1fdbf7eae9adbd5057bd8f0831820bbb564b4778c8f2 SHA512 ce669139250c78e521e82ea23ca288c0b12cf7da17bbf06cf4cb3c425b3bc61ad182a475af3923fdbdf7c07f574077e2ad935d6c0c133d408ffc0f0d3f2d02ae
-DIST ros_environment-1.3.1.tar.gz 6533 BLAKE2B 50b6b24af91c5d96097873c3a05f258b2737053594a888ac5677147160708e192e1662558f33537b9510d206d5f00374ba3bec3b3491e5f51cfac3bcec842c1f SHA512 f47b9a7801ea4aa841b5127714e099c83e60fb42e8eedb726a4d3b23fcfb93c25c6f9bdc042a449399333c3165db1a72b9ebb25424981fe43bcfa5445f4678c5
-EBUILD ros_environment-1.3.1.ebuild 499 BLAKE2B 7aa52f2d0c596142e177f889234871cba1656cf3b5e7379d101315b6602e7449f05ecbf541785ed03d95d2bc113a9539fe8b79de0e0c51c388a92c3e1b259cd2 SHA512 73d5591ec8876fe33613814636fbc5bf3eed80591cb00ec279155333a1ef6f6353dfce927c12b4bc06f2bddf1e36550f2cfde0b44a2d1d4385820823e00d117b
+DIST ros_environment-1.3.2.tar.gz 6418 BLAKE2B d08308c966e95e2bf9a043d52b4f3c787c89b39ce30b038daae7907aa9493ab0478c898da84673099485f08c5b5d811dfc84af3bb714766fb5ff4ab95a17b1ed SHA512 4fff1bfba0af47aaf0fa2e571f61e559952432da77b5c453153b357e22fc9148d72bad4772bf3def0f754e86794c0246662c384ec75b7d89b6ebac4ad8baf808
+EBUILD ros_environment-1.3.2.ebuild 499 BLAKE2B 7aa52f2d0c596142e177f889234871cba1656cf3b5e7379d101315b6602e7449f05ecbf541785ed03d95d2bc113a9539fe8b79de0e0c51c388a92c3e1b259cd2 SHA512 73d5591ec8876fe33613814636fbc5bf3eed80591cb00ec279155333a1ef6f6353dfce927c12b4bc06f2bddf1e36550f2cfde0b44a2d1d4385820823e00d117b
 EBUILD ros_environment-9999.ebuild 499 BLAKE2B 7aa52f2d0c596142e177f889234871cba1656cf3b5e7379d101315b6602e7449f05ecbf541785ed03d95d2bc113a9539fe8b79de0e0c51c388a92c3e1b259cd2 SHA512 73d5591ec8876fe33613814636fbc5bf3eed80591cb00ec279155333a1ef6f6353dfce927c12b4bc06f2bddf1e36550f2cfde0b44a2d1d4385820823e00d117b
 MISC metadata.xml 333 BLAKE2B 87f510ba6f10a5a9473d242879151d307c5357749325c127ccd415d525968f1f4f3ae23e9e11d328f7cdc115f98b4dfc492dced529627229c6f01f133f67a032 SHA512 85ed3e7f2098353f25e0e6fd77afb64a602f828ab76ae6ac3c5a47eb02cfbb884e6b25473b1488ad9746fdba3ed50db47b90a191c5f2ec145587e33f0761406b
diff --git a/dev-ros/ros_environment/ros_environment-1.3.1.ebuild b/dev-ros/ros_environment/ros_environment-1.3.2.ebuild
index 9b7f339511b4..9b7f339511b4 100644
--- a/dev-ros/ros_environment/ros_environment-1.3.1.ebuild
+++ b/dev-ros/ros_environment/ros_environment-1.3.2.ebuild
diff --git a/dev-ros/rosbag/Manifest b/dev-ros/rosbag/Manifest
index 91b6a01ee254..d8d08265a857 100644
--- a/dev-ros/rosbag/Manifest
+++ b/dev-ros/rosbag/Manifest
@@ -1,7 +1,9 @@
 AUX pycrypto.patch 402 BLAKE2B 2f784f93115b205285bb9eb9c910185f84871da7ecc5865304d220df7e1e9bea3799743a1f7a2a274423ec3fa4e367773814bd5fbb5cb074acb7252845ba6e94 SHA512 2343aca88929010f76389f31187b913f92f8d510a18a0d81b20c2c9accc2da68d15fd959404f11d363bdbe98f644ff2e76a70fdca4a718b490fa7f812a1b417e
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rosbag-1.15.7.ebuild 961 BLAKE2B 1fe92d6cd74a7eb7ce6c002073b82bef14a6bb85042a60cffe28627cb487005d87d5a38c0c8674929c084d81a802b74bbbc22bd73ada7cf11e8f3ee33ba1b57d SHA512 70adb3692fa3e2bfa8f0eac8e12542015a15155129a10361055102459aa16a98041d35ddc3841ade1ff564a0737285d7f100c3088b466bbfa19fbc5775302280
 EBUILD rosbag-1.15.8.ebuild 961 BLAKE2B 1fe92d6cd74a7eb7ce6c002073b82bef14a6bb85042a60cffe28627cb487005d87d5a38c0c8674929c084d81a802b74bbbc22bd73ada7cf11e8f3ee33ba1b57d SHA512 70adb3692fa3e2bfa8f0eac8e12542015a15155129a10361055102459aa16a98041d35ddc3841ade1ff564a0737285d7f100c3088b466bbfa19fbc5775302280
+EBUILD rosbag-1.15.9.ebuild 961 BLAKE2B 1fe92d6cd74a7eb7ce6c002073b82bef14a6bb85042a60cffe28627cb487005d87d5a38c0c8674929c084d81a802b74bbbc22bd73ada7cf11e8f3ee33ba1b57d SHA512 70adb3692fa3e2bfa8f0eac8e12542015a15155129a10361055102459aa16a98041d35ddc3841ade1ff564a0737285d7f100c3088b466bbfa19fbc5775302280
 EBUILD rosbag-9999.ebuild 961 BLAKE2B 1fe92d6cd74a7eb7ce6c002073b82bef14a6bb85042a60cffe28627cb487005d87d5a38c0c8674929c084d81a802b74bbbc22bd73ada7cf11e8f3ee33ba1b57d SHA512 70adb3692fa3e2bfa8f0eac8e12542015a15155129a10361055102459aa16a98041d35ddc3841ade1ff564a0737285d7f100c3088b466bbfa19fbc5775302280
 MISC metadata.xml 418 BLAKE2B 2d84b96bfb428654a9b926100a8bd083afb2addc6db8b2e6fb003fab4bb8c1615df40ee13c863a3ddfe98a1a1f9b72af8310a80a9f610a01fe14366afde2e38d SHA512 d7579d9a25bf9f83513e3d8058ec845ee9b59e5d999128532b63d992cee8ef94922aee88140f044829442077c6f9ae80d6b0b0f554cf677690fdc88a17c9f260
diff --git a/dev-ros/rosbag/rosbag-1.15.9.ebuild b/dev-ros/rosbag/rosbag-1.15.9.ebuild
new file mode 100644
index 000000000000..39331484104e
--- /dev/null
+++ b/dev-ros/rosbag/rosbag-1.15.9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Set of tools for recording from and playing back to ROS topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE="lz4"
+
+RDEPEND="
+	>=dev-ros/rosbag_storage-1.14
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/topic_tools
+	dev-ros/xmlrpcpp
+	dev-libs/boost:=
+	app-arch/bzip2
+	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-libs/console_bridge:=
+	$(python_gen_cond_dep "dev-python/pycryptodome[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/python-gnupg[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	lz4? ( dev-ros/roslz4[${PYTHON_SINGLE_USEDEP}] )"
+PATCHES=( "${FILESDIR}/pycrypto.patch" )
diff --git a/dev-ros/rosbag_storage/Manifest b/dev-ros/rosbag_storage/Manifest
index 85f4d764e08e..6f8f4ca1b94e 100644
--- a/dev-ros/rosbag_storage/Manifest
+++ b/dev-ros/rosbag_storage/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rosbag_storage-1.15.8-r1.ebuild 909 BLAKE2B ff001115ff23dae3f7716ede48c603a57ac58a4d044a42876c6a2a23def35cf6f5d235e0a1a38cecba4fc2c66378fd51e2e995a1525c91768f800b666ad29772 SHA512 11a5e8b06dd0a5febf9d0c67c7ec68ef72b8ddc24636c4d9ef1b9e458074eca3d8f5362cd55a3f2df2d09666dc9e82e5c558608da68a929cdf3a194118df556a
+EBUILD rosbag_storage-1.15.9.ebuild 909 BLAKE2B ff001115ff23dae3f7716ede48c603a57ac58a4d044a42876c6a2a23def35cf6f5d235e0a1a38cecba4fc2c66378fd51e2e995a1525c91768f800b666ad29772 SHA512 11a5e8b06dd0a5febf9d0c67c7ec68ef72b8ddc24636c4d9ef1b9e458074eca3d8f5362cd55a3f2df2d09666dc9e82e5c558608da68a929cdf3a194118df556a
 EBUILD rosbag_storage-9999.ebuild 909 BLAKE2B ff001115ff23dae3f7716ede48c603a57ac58a4d044a42876c6a2a23def35cf6f5d235e0a1a38cecba4fc2c66378fd51e2e995a1525c91768f800b666ad29772 SHA512 11a5e8b06dd0a5febf9d0c67c7ec68ef72b8ddc24636c4d9ef1b9e458074eca3d8f5362cd55a3f2df2d09666dc9e82e5c558608da68a929cdf3a194118df556a
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.9.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.9.ebuild
new file mode 100644
index 000000000000..b4ede837ca4e
--- /dev/null
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.15.9.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Set of tools for recording from and playing back ROS message"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/console_bridge
+
+	dev-ros/cpp_common
+	>=dev-ros/pluginlib-1.13.0-r2:=
+	dev-ros/roscpp_serialization
+	dev-ros/roscpp_traits
+	dev-ros/rostime
+	dev-ros/roslz4
+
+	dev-libs/boost:=
+	app-arch/bzip2
+	dev-libs/console_bridge:=
+	dev-libs/tinyxml2:=
+
+	dev-libs/openssl:0=
+	app-crypt/gpgme
+"
+DEPEND="${RDEPEND}
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest
+		dev-cpp/gtest
+	)
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/rosbash/Manifest b/dev-ros/rosbash/Manifest
index 884fde73e339..975980f04b31 100644
--- a/dev-ros/rosbash/Manifest
+++ b/dev-ros/rosbash/Manifest
@@ -1,7 +1,9 @@
 AUX catkin_prefix.patch 443 BLAKE2B 4b366a582a5ebda3cfd644fb0319cd6cd07e9e983db9ed6cdb850bc6ecd393172e7e8dc93c30100470ba8417991e0487a7f85be53556472aa37947bae48ff2b6 SHA512 8662743559045f129a1dd94c7b42491f025b9038dff960f5d5259775760c0d3a0ae7086a6faae8bc6f511e72a0c5552013c88c4a8333043a0af6291b894ec5c1
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
 EBUILD rosbash-1.15.5.ebuild 408 BLAKE2B f1cd0b3d8f4b45b02da8d8e2416514af39d5c06eb92f4d6d798747db255227f5b7f47a527cf95889e6a3570912d1afef17ea8a26d05c8c9e97fb354f4c1fb980 SHA512 8fe645a744e36f11f80cb5d4d4fd8ac5e80426decb33e552aa26ab263d274a14a16bbd7c70de243ab7fba3470597473ba4735f51e078be515e1636448300f009
 EBUILD rosbash-1.15.6.ebuild 408 BLAKE2B f1cd0b3d8f4b45b02da8d8e2416514af39d5c06eb92f4d6d798747db255227f5b7f47a527cf95889e6a3570912d1afef17ea8a26d05c8c9e97fb354f4c1fb980 SHA512 8fe645a744e36f11f80cb5d4d4fd8ac5e80426decb33e552aa26ab263d274a14a16bbd7c70de243ab7fba3470597473ba4735f51e078be515e1636448300f009
+EBUILD rosbash-1.15.7.ebuild 408 BLAKE2B f1cd0b3d8f4b45b02da8d8e2416514af39d5c06eb92f4d6d798747db255227f5b7f47a527cf95889e6a3570912d1afef17ea8a26d05c8c9e97fb354f4c1fb980 SHA512 8fe645a744e36f11f80cb5d4d4fd8ac5e80426decb33e552aa26ab263d274a14a16bbd7c70de243ab7fba3470597473ba4735f51e078be515e1636448300f009
 EBUILD rosbash-9999.ebuild 408 BLAKE2B f1cd0b3d8f4b45b02da8d8e2416514af39d5c06eb92f4d6d798747db255227f5b7f47a527cf95889e6a3570912d1afef17ea8a26d05c8c9e97fb354f4c1fb980 SHA512 8fe645a744e36f11f80cb5d4d4fd8ac5e80426decb33e552aa26ab263d274a14a16bbd7c70de243ab7fba3470597473ba4735f51e078be515e1636448300f009
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosbash/rosbash-1.15.7.ebuild b/dev-ros/rosbash/rosbash-1.15.7.ebuild
new file mode 100644
index 000000000000..31312870be31
--- /dev/null
+++ b/dev-ros/rosbash/rosbash-1.15.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Assorted shell commands for using ros with bash"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rospack"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
diff --git a/dev-ros/rosboost_cfg/Manifest b/dev-ros/rosboost_cfg/Manifest
index 83e109e04069..dce8a4532d98 100644
--- a/dev-ros/rosboost_cfg/Manifest
+++ b/dev-ros/rosboost_cfg/Manifest
@@ -1,6 +1,8 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
 EBUILD rosboost_cfg-1.15.5.ebuild 363 BLAKE2B 33ab4b86cebcd6c3ae2af1991c22159c54f49c9c83fda291683cab5df3ce2a98ed574d054df63574a20f693ac199b21d16735a5daaf544cfda4b5a4d2578cc09 SHA512 a9f65adaf5dbcdead5dbc662f7de8b729f00d52885bb4f86ae2bc5b55312abe0cc7d801c0cd7560fdfe04304914552fc4c428e18824bb25af38f6d6b8d071da6
 EBUILD rosboost_cfg-1.15.6.ebuild 363 BLAKE2B 33ab4b86cebcd6c3ae2af1991c22159c54f49c9c83fda291683cab5df3ce2a98ed574d054df63574a20f693ac199b21d16735a5daaf544cfda4b5a4d2578cc09 SHA512 a9f65adaf5dbcdead5dbc662f7de8b729f00d52885bb4f86ae2bc5b55312abe0cc7d801c0cd7560fdfe04304914552fc4c428e18824bb25af38f6d6b8d071da6
+EBUILD rosboost_cfg-1.15.7.ebuild 363 BLAKE2B 33ab4b86cebcd6c3ae2af1991c22159c54f49c9c83fda291683cab5df3ce2a98ed574d054df63574a20f693ac199b21d16735a5daaf544cfda4b5a4d2578cc09 SHA512 a9f65adaf5dbcdead5dbc662f7de8b729f00d52885bb4f86ae2bc5b55312abe0cc7d801c0cd7560fdfe04304914552fc4c428e18824bb25af38f6d6b8d071da6
 EBUILD rosboost_cfg-9999.ebuild 363 BLAKE2B 33ab4b86cebcd6c3ae2af1991c22159c54f49c9c83fda291683cab5df3ce2a98ed574d054df63574a20f693ac199b21d16735a5daaf544cfda4b5a4d2578cc09 SHA512 a9f65adaf5dbcdead5dbc662f7de8b729f00d52885bb4f86ae2bc5b55312abe0cc7d801c0cd7560fdfe04304914552fc4c428e18824bb25af38f6d6b8d071da6
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosboost_cfg/rosboost_cfg-1.15.7.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.15.7.ebuild
new file mode 100644
index 000000000000..efba0bfb28e5
--- /dev/null
+++ b/dev-ros/rosboost_cfg/rosboost_cfg-1.15.7.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for determining cflags/lflags/etc. of boost on your system"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbuild/Manifest b/dev-ros/rosbuild/Manifest
index b2ebaa2bb4b5..8c809d9c36a3 100644
--- a/dev-ros/rosbuild/Manifest
+++ b/dev-ros/rosbuild/Manifest
@@ -1,6 +1,8 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
 EBUILD rosbuild-1.15.5.ebuild 356 BLAKE2B a3f80a31d0bfb733854ac89fa0435a9e084db5f05b32e8cb3132ee94d21ecf67f7025c1ba457706e5374aa7bee060895541a328763dcf95c7677f1d76fd9cae2 SHA512 aa88a7718ccb741df3c06d422790b9c0e01d27a23bb27de9a71935157b32766bfa67406135e6c51dde4265ba5b9693111b5e34d660a67cfa1d1b0769f86b55ea
 EBUILD rosbuild-1.15.6.ebuild 356 BLAKE2B a3f80a31d0bfb733854ac89fa0435a9e084db5f05b32e8cb3132ee94d21ecf67f7025c1ba457706e5374aa7bee060895541a328763dcf95c7677f1d76fd9cae2 SHA512 aa88a7718ccb741df3c06d422790b9c0e01d27a23bb27de9a71935157b32766bfa67406135e6c51dde4265ba5b9693111b5e34d660a67cfa1d1b0769f86b55ea
+EBUILD rosbuild-1.15.7.ebuild 356 BLAKE2B a3f80a31d0bfb733854ac89fa0435a9e084db5f05b32e8cb3132ee94d21ecf67f7025c1ba457706e5374aa7bee060895541a328763dcf95c7677f1d76fd9cae2 SHA512 aa88a7718ccb741df3c06d422790b9c0e01d27a23bb27de9a71935157b32766bfa67406135e6c51dde4265ba5b9693111b5e34d660a67cfa1d1b0769f86b55ea
 EBUILD rosbuild-9999.ebuild 356 BLAKE2B a3f80a31d0bfb733854ac89fa0435a9e084db5f05b32e8cb3132ee94d21ecf67f7025c1ba457706e5374aa7bee060895541a328763dcf95c7677f1d76fd9cae2 SHA512 aa88a7718ccb741df3c06d422790b9c0e01d27a23bb27de9a71935157b32766bfa67406135e6c51dde4265ba5b9693111b5e34d660a67cfa1d1b0769f86b55ea
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosbuild/rosbuild-1.15.7.ebuild b/dev-ros/rosbuild/rosbuild-1.15.7.ebuild
new file mode 100644
index 000000000000..ee01e05ff7a2
--- /dev/null
+++ b/dev-ros/rosbuild/rosbuild-1.15.7.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Scripts for managing the CMake-based build system for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosclean/Manifest b/dev-ros/rosclean/Manifest
index add66204fcd8..161390d525c9 100644
--- a/dev-ros/rosclean/Manifest
+++ b/dev-ros/rosclean/Manifest
@@ -1,6 +1,8 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
 EBUILD rosclean-1.15.5.ebuild 478 BLAKE2B dd60994c921a1667e9f6c29bb0a151bcf886887386ccc555f58b6daf77c0cb62413f4b6eea2982dd1cf29180097584c5ba588c059911e76b6a153b89f76fa305 SHA512 9ff32db2c13c6163cb7d303c2f4dcc0650486f8d79617f7c28841db4af7e7f8489396b3e27610c41fdf0f9fc45ca13bccf7a65e2b184fce462beb55d2eeb7378
 EBUILD rosclean-1.15.6.ebuild 478 BLAKE2B dd60994c921a1667e9f6c29bb0a151bcf886887386ccc555f58b6daf77c0cb62413f4b6eea2982dd1cf29180097584c5ba588c059911e76b6a153b89f76fa305 SHA512 9ff32db2c13c6163cb7d303c2f4dcc0650486f8d79617f7c28841db4af7e7f8489396b3e27610c41fdf0f9fc45ca13bccf7a65e2b184fce462beb55d2eeb7378
+EBUILD rosclean-1.15.7.ebuild 478 BLAKE2B dd60994c921a1667e9f6c29bb0a151bcf886887386ccc555f58b6daf77c0cb62413f4b6eea2982dd1cf29180097584c5ba588c059911e76b6a153b89f76fa305 SHA512 9ff32db2c13c6163cb7d303c2f4dcc0650486f8d79617f7c28841db4af7e7f8489396b3e27610c41fdf0f9fc45ca13bccf7a65e2b184fce462beb55d2eeb7378
 EBUILD rosclean-9999.ebuild 478 BLAKE2B dd60994c921a1667e9f6c29bb0a151bcf886887386ccc555f58b6daf77c0cb62413f4b6eea2982dd1cf29180097584c5ba588c059911e76b6a153b89f76fa305 SHA512 9ff32db2c13c6163cb7d303c2f4dcc0650486f8d79617f7c28841db4af7e7f8489396b3e27610c41fdf0f9fc45ca13bccf7a65e2b184fce462beb55d2eeb7378
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosclean/rosclean-1.15.7.ebuild b/dev-ros/rosclean/rosclean-1.15.7.ebuild
new file mode 100644
index 000000000000..990890224df3
--- /dev/null
+++ b/dev-ros/rosclean/rosclean-1.15.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Cleanup filesystem resources (e.g. log files)"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
+"
diff --git a/dev-ros/rosconsole/Manifest b/dev-ros/rosconsole/Manifest
index 61669a285f43..fbc6debf1d9e 100644
--- a/dev-ros/rosconsole/Manifest
+++ b/dev-ros/rosconsole/Manifest
@@ -1,6 +1,8 @@
 DIST rosconsole-1.14.0.tar.gz 26166 BLAKE2B 79d73e5918eb5f3837e57e4207b3b42cc3222a92e8357265132d2d0848f966fa1e1aed69f8809af30497ef6b1f52c0de0073c20bf6e309010a8d98e0f745fb9c SHA512 68a5d709294b162d5b424bdbcd70fb66a43ccd8512bc60f571fe24bb0150e52f93addc3f22777c2f5810e95492265be58d3cfc6563a4e66665b3261ef161d5cd
 DIST rosconsole-1.14.2.tar.gz 26212 BLAKE2B b43f07f920a526c740d1ee8c3f5d7f5724ed617adad409df84001571e0df30df65c200bfc50c4c6a97a24642b3ad61340706ed4b6d14822935256bfb305350a3 SHA512 f1af112ada723195acda17edb64f75969a0abea58504d14507470eb36b0649e028cd675a368e040ddc955216da304dd64416fda8de7bc29dcd73c56c8286f311
+DIST rosconsole-1.14.3.tar.gz 26274 BLAKE2B 77547855d29bd837144663cff15ef0d5711ffbabacad161de0903df7acdda45bf2461718ce78ee1c9706a455ff1398876ed2014382bc4f39f08174cffc6ebae9 SHA512 a134dea50a8fb5cef600eecdf2e7402d7c95da364081f9619ae4a75be8782b28acdd4535146da2493b2e533867e7d7968398e83ea6d5438c171168ffab30ea97
 EBUILD rosconsole-1.14.0.ebuild 765 BLAKE2B 7351af58d0d748ec7f8675088f51e01f17283a47a88bd5b5bb05af37496a27294c862c46d230b8618d7fc48cc7bc876453960e0dadf7f5c0fb58d727e53a87f5 SHA512 5458fd9162a1a8af31ca61a600cfe02300090681848f0653e15fbfb47bca48bab148d6394b7c4ca6cb0b260e1c40f32e058bbfe50f1b5abd692ae9fee1714758
 EBUILD rosconsole-1.14.2.ebuild 765 BLAKE2B 7351af58d0d748ec7f8675088f51e01f17283a47a88bd5b5bb05af37496a27294c862c46d230b8618d7fc48cc7bc876453960e0dadf7f5c0fb58d727e53a87f5 SHA512 5458fd9162a1a8af31ca61a600cfe02300090681848f0653e15fbfb47bca48bab148d6394b7c4ca6cb0b260e1c40f32e058bbfe50f1b5abd692ae9fee1714758
+EBUILD rosconsole-1.14.3.ebuild 765 BLAKE2B 7351af58d0d748ec7f8675088f51e01f17283a47a88bd5b5bb05af37496a27294c862c46d230b8618d7fc48cc7bc876453960e0dadf7f5c0fb58d727e53a87f5 SHA512 5458fd9162a1a8af31ca61a600cfe02300090681848f0653e15fbfb47bca48bab148d6394b7c4ca6cb0b260e1c40f32e058bbfe50f1b5abd692ae9fee1714758
 EBUILD rosconsole-9999.ebuild 765 BLAKE2B 7351af58d0d748ec7f8675088f51e01f17283a47a88bd5b5bb05af37496a27294c862c46d230b8618d7fc48cc7bc876453960e0dadf7f5c0fb58d727e53a87f5 SHA512 5458fd9162a1a8af31ca61a600cfe02300090681848f0653e15fbfb47bca48bab148d6394b7c4ca6cb0b260e1c40f32e058bbfe50f1b5abd692ae9fee1714758
 MISC metadata.xml 508 BLAKE2B 5641aa17bb1302f29cbbe3015007bcbff004d8681223ab9140296209f1ea7995340b3a21890dcaacb3f15020b3431660bf1124fdccc5697bd9222f6b7ebf2d76 SHA512 cc34b9588999d9e10ee8537f509b7ae72b100e477b9f545fad31043eabf0a9f27913b608e4d198ca4b99d5fc1643332fe28ea065181fb3a195472a6726c272a2
diff --git a/dev-ros/rosconsole/rosconsole-1.14.3.ebuild b/dev-ros/rosconsole/rosconsole-1.14.3.ebuild
new file mode 100644
index 000000000000..76c9a71eb9d4
--- /dev/null
+++ b/dev-ros/rosconsole/rosconsole-1.14.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/rosconsole"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="ROS console output library"
+LICENSE="BSD"
+SLOT="0"
+IUSE="+log4cxx glog"
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rostime
+	dev-ros/rosunit
+	dev-libs/boost:=[threads]
+	log4cxx? ( dev-libs/log4cxx )
+	!log4cxx? ( glog? ( dev-cpp/glog ) )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local ROSCONSOLE_BACKEND=""
+	if use log4cxx; then
+		ROSCONSOLE_BACKEND="log4cxx"
+	elif use glog; then
+		ROSCONSOLE_BACKEND="glog"
+	else
+		ROSCONSOLE_BACKEND="print"
+	fi
+	local mycatkincmakeargs=( "-DROSCONSOLE_BACKEND=${ROSCONSOLE_BACKEND}" )
+	ros-catkin_src_configure
+}
diff --git a/dev-ros/roscpp/Manifest b/dev-ros/roscpp/Manifest
index de84df2ca95d..a9631c8e32f3 100644
--- a/dev-ros/roscpp/Manifest
+++ b/dev-ros/roscpp/Manifest
@@ -1,7 +1,4 @@
-AUX boost173.patch 3035 BLAKE2B 3ce759d081ebaaab9e10b838515ffe41d3e5c3925e995379fe768030e1a308f3531aea70c97aa0b761fd9531ec18fb054a7b1f4ff0ad3f522a4e28a7165f7571 SHA512 6b263429c7172189e4d341a1e0471d70de419d3c694bcd09549d057fd8568facd30b46a2adbb66f0cb5216333225ed5db5752be4ebc17980e2080312031c7409
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-EBUILD roscpp-1.15.7.ebuild 647 BLAKE2B 10abcfc901b53a6de6abce9a5ae0e8ac5f17939ace4126c13a2ecd326854c635174f1b68740ed5f177600309ee63aefac3bb7e4c338fd5c7d50699d2cd4fc9a8 SHA512 f098ea166d39d993387205ee1c7d51bfac64bf536f2399ca2cbae70dc992428bd858c2d864b20531f2c956cb3cc26cf991def027bf1ef1145993f8db1888e9f3
-EBUILD roscpp-1.15.8.ebuild 647 BLAKE2B 10abcfc901b53a6de6abce9a5ae0e8ac5f17939ace4126c13a2ecd326854c635174f1b68740ed5f177600309ee63aefac3bb7e4c338fd5c7d50699d2cd4fc9a8 SHA512 f098ea166d39d993387205ee1c7d51bfac64bf536f2399ca2cbae70dc992428bd858c2d864b20531f2c956cb3cc26cf991def027bf1ef1145993f8db1888e9f3
-EBUILD roscpp-9999.ebuild 647 BLAKE2B 10abcfc901b53a6de6abce9a5ae0e8ac5f17939ace4126c13a2ecd326854c635174f1b68740ed5f177600309ee63aefac3bb7e4c338fd5c7d50699d2cd4fc9a8 SHA512 f098ea166d39d993387205ee1c7d51bfac64bf536f2399ca2cbae70dc992428bd858c2d864b20531f2c956cb3cc26cf991def027bf1ef1145993f8db1888e9f3
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
+EBUILD roscpp-1.15.9.ebuild 606 BLAKE2B 7c38cba14922e02ec2bbc0c6f0365a66f5c691644f7509ff718cf932b49404c90013156c76a13313c60386a215010b2044fce30f3b3b675575e92717178e8b31 SHA512 3d3c82c30a6dc1195675fa4268a8ce463dfebcdc3e411df45a8222f99554c049a748d18ef2d47fb3d956314414b2e98ae8e913667f5610751b0c023d71fa3236
+EBUILD roscpp-9999.ebuild 606 BLAKE2B 7c38cba14922e02ec2bbc0c6f0365a66f5c691644f7509ff718cf932b49404c90013156c76a13313c60386a215010b2044fce30f3b3b675575e92717178e8b31 SHA512 3d3c82c30a6dc1195675fa4268a8ce463dfebcdc3e411df45a8222f99554c049a748d18ef2d47fb3d956314414b2e98ae8e913667f5610751b0c023d71fa3236
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roscpp/files/boost173.patch b/dev-ros/roscpp/files/boost173.patch
deleted file mode 100644
index d31f8c8ff246..000000000000
--- a/dev-ros/roscpp/files/boost173.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: roscpp/include/ros/timer_manager.h
-===================================================================
---- roscpp.orig/include/ros/timer_manager.h
-+++ roscpp/include/ros/timer_manager.h
-@@ -349,7 +349,7 @@ int32_t TimerManager<T, D, E>::add(const
-     {
-       boost::mutex::scoped_lock lock(waiting_mutex_);
-       waiting_.push_back(info->handle);
--      waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, _1, _2));
-+      waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, boost::placeholders::_1, boost::placeholders::_2));
-     }
- 
-     new_timer_ = true;
-@@ -416,7 +416,7 @@ void TimerManager<T, D, E>::schedule(con
- 
-     waiting_.push_back(info->handle);
-     // waitingCompare requires a lock on the timers_mutex_
--    waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, _1, _2));
-+    waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, boost::placeholders::_1, boost::placeholders::_2));
-   }
- 
-   new_timer_ = true;
-@@ -490,7 +490,7 @@ void TimerManager<T, D, E>::setPeriod(in
-     // In this case, let next_expected be updated only in updateNext
-     
-     info->period = period;
--    waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, _1, _2));
-+    waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, boost::placeholders::_1, boost::placeholders::_2));
-   }
- 
-   new_timer_ = true;
-Index: roscpp/src/libros/connection_manager.cpp
-===================================================================
---- roscpp.orig/src/libros/connection_manager.cpp
-+++ roscpp/src/libros/connection_manager.cpp
-@@ -66,7 +66,7 @@ void ConnectionManager::start()
-   tcpserver_transport_ = boost::make_shared<TransportTCP>(&poll_manager_->getPollSet());
-   if (!tcpserver_transport_->listen(network::getTCPROSPort(), 
- 				    MAX_TCPROS_CONN_QUEUE, 
--				    boost::bind(&ConnectionManager::tcprosAcceptConnection, this, _1)))
-+				    boost::bind(&ConnectionManager::tcprosAcceptConnection, this, boost::placeholders::_1)))
-   {
-     ROS_FATAL("Listen on port [%d] failed", network::getTCPROSPort());
-     ROS_BREAK();
-@@ -142,7 +142,7 @@ void ConnectionManager::addConnection(co
-   boost::mutex::scoped_lock lock(connections_mutex_);
- 
-   connections_.insert(conn);
--  conn->addDropListener(boost::bind(&ConnectionManager::onConnectionDropped, this, _1));
-+  conn->addDropListener(boost::bind(&ConnectionManager::onConnectionDropped, this, boost::placeholders::_1));
- }
- 
- void ConnectionManager::onConnectionDropped(const ConnectionPtr& conn)
-@@ -190,7 +190,7 @@ void ConnectionManager::tcprosAcceptConn
-   ConnectionPtr conn(boost::make_shared<Connection>());
-   addConnection(conn);
- 
--  conn->initialize(transport, true, boost::bind(&ConnectionManager::onConnectionHeaderReceived, this, _1, _2));
-+  conn->initialize(transport, true, boost::bind(&ConnectionManager::onConnectionHeaderReceived, this, boost::placeholders::_1, boost::placeholders::_2));
- }
- 
- bool ConnectionManager::onConnectionHeaderReceived(const ConnectionPtr& conn, const Header& header)
diff --git a/dev-ros/roscpp/roscpp-1.15.8.ebuild b/dev-ros/roscpp/roscpp-1.15.8.ebuild
deleted file mode 100644
index 8863bf3d38b4..000000000000
--- a/dev-ros/roscpp/roscpp-1.15.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=clients/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/boost173.patch" )
diff --git a/dev-ros/roscpp/roscpp-1.15.7.ebuild b/dev-ros/roscpp/roscpp-1.15.9.ebuild
index 8863bf3d38b4..033a2eb87fd0 100644
--- a/dev-ros/roscpp/roscpp-1.15.7.ebuild
+++ b/dev-ros/roscpp/roscpp-1.15.9.ebuild
@@ -27,4 +27,3 @@ RDEPEND="
 	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/boost173.patch" )
diff --git a/dev-ros/roscpp/roscpp-9999.ebuild b/dev-ros/roscpp/roscpp-9999.ebuild
index 8863bf3d38b4..033a2eb87fd0 100644
--- a/dev-ros/roscpp/roscpp-9999.ebuild
+++ b/dev-ros/roscpp/roscpp-9999.ebuild
@@ -27,4 +27,3 @@ RDEPEND="
 	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/boost173.patch" )
diff --git a/dev-ros/roscreate/Manifest b/dev-ros/roscreate/Manifest
index 5ff5685240a1..b274e5babfde 100644
--- a/dev-ros/roscreate/Manifest
+++ b/dev-ros/roscreate/Manifest
@@ -1,4 +1,6 @@
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
 EBUILD roscreate-1.15.6.ebuild 626 BLAKE2B c880b48ff7e31fb2325430bc6598fc183494f5b70c57c01daed20b5748dda199f288ef41991a1829d5a0730b8ca9788dcae36f566d55214ac4c370894d60bcb7 SHA512 b50345e9763f4e56bd789c723e29eb53403c4ee859ae39c4d9470ab2b7ab8fbf564ce83c34fd54faacbefc72f964588e879f212fd4d441038eb62a0c8001be26
+EBUILD roscreate-1.15.7.ebuild 626 BLAKE2B c880b48ff7e31fb2325430bc6598fc183494f5b70c57c01daed20b5748dda199f288ef41991a1829d5a0730b8ca9788dcae36f566d55214ac4c370894d60bcb7 SHA512 b50345e9763f4e56bd789c723e29eb53403c4ee859ae39c4d9470ab2b7ab8fbf564ce83c34fd54faacbefc72f964588e879f212fd4d441038eb62a0c8001be26
 EBUILD roscreate-9999.ebuild 626 BLAKE2B c880b48ff7e31fb2325430bc6598fc183494f5b70c57c01daed20b5748dda199f288ef41991a1829d5a0730b8ca9788dcae36f566d55214ac4c370894d60bcb7 SHA512 b50345e9763f4e56bd789c723e29eb53403c4ee859ae39c4d9470ab2b7ab8fbf564ce83c34fd54faacbefc72f964588e879f212fd4d441038eb62a0c8001be26
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roscreate/roscreate-1.15.7.ebuild b/dev-ros/roscreate/roscreate-1.15.7.ebuild
new file mode 100644
index 000000000000..5a077c7eb99f
--- /dev/null
+++ b/dev-ros/roscreate/roscreate-1.15.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/rosdiagnostic/Manifest b/dev-ros/rosdiagnostic/Manifest
index 1d50e7c4c258..e2f6c7a3a87e 100644
--- a/dev-ros/rosdiagnostic/Manifest
+++ b/dev-ros/rosdiagnostic/Manifest
@@ -1,7 +1,9 @@
 DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
+DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
 DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
 EBUILD rosdiagnostic-1.10.1.ebuild 467 BLAKE2B 897a7789c638e7e0d54565defbc6f79ca1dc8b669600edb2ba7fbf75a5fc7dda1e2887129d2d87a4348ffb1e337598cdbdc464bae8caf35aa1980021bc40c472 SHA512 8291ea545fc6cd639177c3633cbae271af70ccecd2f7a2fa0c6a375e1852e1c4c94f213caa024fa64560faa88f56ab42328f97f3141bc84e77852bfe80cfff8f
+EBUILD rosdiagnostic-1.10.2.ebuild 467 BLAKE2B 897a7789c638e7e0d54565defbc6f79ca1dc8b669600edb2ba7fbf75a5fc7dda1e2887129d2d87a4348ffb1e337598cdbdc464bae8caf35aa1980021bc40c472 SHA512 8291ea545fc6cd639177c3633cbae271af70ccecd2f7a2fa0c6a375e1852e1c4c94f213caa024fa64560faa88f56ab42328f97f3141bc84e77852bfe80cfff8f
 EBUILD rosdiagnostic-1.9.4.ebuild 467 BLAKE2B 897a7789c638e7e0d54565defbc6f79ca1dc8b669600edb2ba7fbf75a5fc7dda1e2887129d2d87a4348ffb1e337598cdbdc464bae8caf35aa1980021bc40c472 SHA512 8291ea545fc6cd639177c3633cbae271af70ccecd2f7a2fa0c6a375e1852e1c4c94f213caa024fa64560faa88f56ab42328f97f3141bc84e77852bfe80cfff8f
 EBUILD rosdiagnostic-1.9.6.ebuild 467 BLAKE2B 897a7789c638e7e0d54565defbc6f79ca1dc8b669600edb2ba7fbf75a5fc7dda1e2887129d2d87a4348ffb1e337598cdbdc464bae8caf35aa1980021bc40c472 SHA512 8291ea545fc6cd639177c3633cbae271af70ccecd2f7a2fa0c6a375e1852e1c4c94f213caa024fa64560faa88f56ab42328f97f3141bc84e77852bfe80cfff8f
 EBUILD rosdiagnostic-9999.ebuild 467 BLAKE2B 897a7789c638e7e0d54565defbc6f79ca1dc8b669600edb2ba7fbf75a5fc7dda1e2887129d2d87a4348ffb1e337598cdbdc464bae8caf35aa1980021bc40c472 SHA512 8291ea545fc6cd639177c3633cbae271af70ccecd2f7a2fa0c6a375e1852e1c4c94f213caa024fa64560faa88f56ab42328f97f3141bc84e77852bfe80cfff8f
diff --git a/dev-ros/rosdiagnostic/rosdiagnostic-1.10.2.ebuild b/dev-ros/rosdiagnostic/rosdiagnostic-1.10.2.ebuild
new file mode 100644
index 000000000000..89a06deb6a4d
--- /dev/null
+++ b/dev-ros/rosdiagnostic/rosdiagnostic-1.10.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command to print aggregated diagnostic contents to the command line"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ros/rosgraph/Manifest b/dev-ros/rosgraph/Manifest
index e832b8198ce8..a3206929c394 100644
--- a/dev-ros/rosgraph/Manifest
+++ b/dev-ros/rosgraph/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rosgraph-1.15.8.ebuild 710 BLAKE2B 950e34d102bc2aa25a4abf3edfe5cc45385467704018fd872354da1b44c1eff914701a0d7c2d3cf8190660fcf0bbff0901217f0009a48472865278defc3a33d0 SHA512 17f5432be62c756cea092e8bafbbcdd5df2d5cbc52b288216b77ec418afca3359812019e5b283edee5a997c4e60bf8413b2edc3f97d9c3841e42b4af4cfd9c92
+EBUILD rosgraph-1.15.9.ebuild 710 BLAKE2B 950e34d102bc2aa25a4abf3edfe5cc45385467704018fd872354da1b44c1eff914701a0d7c2d3cf8190660fcf0bbff0901217f0009a48472865278defc3a33d0 SHA512 17f5432be62c756cea092e8bafbbcdd5df2d5cbc52b288216b77ec418afca3359812019e5b283edee5a997c4e60bf8413b2edc3f97d9c3841e42b4af4cfd9c92
 EBUILD rosgraph-9999.ebuild 710 BLAKE2B 950e34d102bc2aa25a4abf3edfe5cc45385467704018fd872354da1b44c1eff914701a0d7c2d3cf8190660fcf0bbff0901217f0009a48472865278defc3a33d0 SHA512 17f5432be62c756cea092e8bafbbcdd5df2d5cbc52b288216b77ec418afca3359812019e5b283edee5a997c4e60bf8413b2edc3f97d9c3841e42b4af4cfd9c92
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosgraph/rosgraph-1.15.9.ebuild b/dev-ros/rosgraph/rosgraph-1.15.9.ebuild
new file mode 100644
index 000000000000..171218629338
--- /dev/null
+++ b/dev-ros/rosgraph/rosgraph-1.15.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Prints information about the ROS Computation Graph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/netifaces[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/roslang/Manifest b/dev-ros/roslang/Manifest
index 299a953c6777..4785dc06f276 100644
--- a/dev-ros/roslang/Manifest
+++ b/dev-ros/roslang/Manifest
@@ -1,6 +1,8 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
 EBUILD roslang-1.15.5.ebuild 342 BLAKE2B ce1b9ba89906a027900c3c42de9cae98313517b93debbdaeb55855880791556c5747fafbfb08b55890644e46f784cb94e3f44f8cbd2ada1f47705993368d33f9 SHA512 694b372d7f0ac31cf86fc4cd55e8539a6d66cd245d8c301b20724dd22127cf098fa6f75595a3ed444d6058cb9de9a30b891fd13f4c911a4f903bdd1cd741fc50
 EBUILD roslang-1.15.6.ebuild 342 BLAKE2B ce1b9ba89906a027900c3c42de9cae98313517b93debbdaeb55855880791556c5747fafbfb08b55890644e46f784cb94e3f44f8cbd2ada1f47705993368d33f9 SHA512 694b372d7f0ac31cf86fc4cd55e8539a6d66cd245d8c301b20724dd22127cf098fa6f75595a3ed444d6058cb9de9a30b891fd13f4c911a4f903bdd1cd741fc50
+EBUILD roslang-1.15.7.ebuild 342 BLAKE2B ce1b9ba89906a027900c3c42de9cae98313517b93debbdaeb55855880791556c5747fafbfb08b55890644e46f784cb94e3f44f8cbd2ada1f47705993368d33f9 SHA512 694b372d7f0ac31cf86fc4cd55e8539a6d66cd245d8c301b20724dd22127cf098fa6f75595a3ed444d6058cb9de9a30b891fd13f4c911a4f903bdd1cd741fc50
 EBUILD roslang-9999.ebuild 342 BLAKE2B ce1b9ba89906a027900c3c42de9cae98313517b93debbdaeb55855880791556c5747fafbfb08b55890644e46f784cb94e3f44f8cbd2ada1f47705993368d33f9 SHA512 694b372d7f0ac31cf86fc4cd55e8539a6d66cd245d8c301b20724dd22127cf098fa6f75595a3ed444d6058cb9de9a30b891fd13f4c911a4f903bdd1cd741fc50
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roslang/roslang-1.15.7.ebuild b/dev-ros/roslang/roslang-1.15.7.ebuild
new file mode 100644
index 000000000000..5c52cec83fd8
--- /dev/null
+++ b/dev-ros/roslang/roslang-1.15.7.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common package for all ROS client libraries"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/roslaunch/Manifest b/dev-ros/roslaunch/Manifest
index b841b0ea100c..b06973998de2 100644
--- a/dev-ros/roslaunch/Manifest
+++ b/dev-ros/roslaunch/Manifest
@@ -5,6 +5,8 @@ AUX roscore.xml.in 347 BLAKE2B 05c90bd6a2cffeaab16d1fb576e2cbe5768a848c5b6231af9
 AUX roslaunch.confd 46 BLAKE2B 24fcab885cf07185c751da12863e3af0ac8f1097a636c3641be1b6357e26b5178d13ee42d04bbacea27763df075f5436813afc2025dd9013461059b0c5feacd9 SHA512 0a86b0beb7b4bad2c01f3814070d27a3c85a99629ab26fa3aa6cce19d178d500c912665b152403cf7301f210e3cf9e6bd03103c3654b1ef61dae165ba5ac704d
 AUX roslaunch.initd 915 BLAKE2B 11f2c6f2db2ad1084332a1b704a90ed3a3fc9fe671f96f6ca74bbabdab3b7f22bed96c077dd994e3c3fc54eb299e93001167fe16e688eb062033f3da86ac168d SHA512 4f8bb2dfe085d09245ec2343e423e1dacbd02108868c5d9523d63929c939b753f45ce963d5d44b5ad0f547f7d85b82ea6d3a80f8984dfe72ade7f8a5372c850c
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD roslaunch-1.15.8-r1.ebuild 1638 BLAKE2B 3b0bbdda497ad507283016a803a75d67ffaa47c766295f887fcae53ac0cf03622c4497263888b42dc1f705e5699ef443692b1fcad48e950352e2998bea287141 SHA512 2929c876f90e4feb4411f39dc3dabf24bb30858411ca9d5f39f4b956ccbcbaba5cb278d593f9db0b10e69314fdca43c952f4d9b1840d946f6bb01088093f3a8e
+EBUILD roslaunch-1.15.9.ebuild 1638 BLAKE2B 3b0bbdda497ad507283016a803a75d67ffaa47c766295f887fcae53ac0cf03622c4497263888b42dc1f705e5699ef443692b1fcad48e950352e2998bea287141 SHA512 2929c876f90e4feb4411f39dc3dabf24bb30858411ca9d5f39f4b956ccbcbaba5cb278d593f9db0b10e69314fdca43c952f4d9b1840d946f6bb01088093f3a8e
 EBUILD roslaunch-9999.ebuild 1638 BLAKE2B 3b0bbdda497ad507283016a803a75d67ffaa47c766295f887fcae53ac0cf03622c4497263888b42dc1f705e5699ef443692b1fcad48e950352e2998bea287141 SHA512 2929c876f90e4feb4411f39dc3dabf24bb30858411ca9d5f39f4b956ccbcbaba5cb278d593f9db0b10e69314fdca43c952f4d9b1840d946f6bb01088093f3a8e
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roslaunch/roslaunch-1.15.9.ebuild b/dev-ros/roslaunch/roslaunch-1.15.9.ebuild
new file mode 100644
index 000000000000..b0c3d9412aae
--- /dev/null
+++ b/dev-ros/roslaunch/roslaunch-1.15.9.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin user
+
+DESCRIPTION="Tool for easily launching multiple ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosout
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/test_rosmaster
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${S}/../rosmaster/:${EPREFIX}/usr/share/ros_packages/rosparam:${EPREFIX}/usr/share/ros_packages/roslib:${EPREFIX}/usr/share/ros_packages/rosout"
+	ros-catkin_src_test
+}
+
+src_install() {
+	ros-catkin_src_install
+
+	dodir /etc/ros
+	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
+
+	newinitd "${FILESDIR}/roscore.initd" roscore
+	newconfd "${FILESDIR}/roscore.confd" roscore
+
+	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
+	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
+
+	doenvd "${FILESDIR}/40roslaunch"
+
+	# Needed by test_roslaunch
+	insinto /usr/share/${PN}
+	doins test/xml/noop.launch
+}
+
+pkg_preinst() {
+	enewgroup ros
+	enewuser ros -1 -1 /home/ros ros
+}
diff --git a/dev-ros/roslib/Manifest b/dev-ros/roslib/Manifest
index 87190f1a4a90..fe2136df7102 100644
--- a/dev-ros/roslib/Manifest
+++ b/dev-ros/roslib/Manifest
@@ -1,4 +1,6 @@
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
 EBUILD roslib-1.15.6.ebuild 654 BLAKE2B 805e9c77fd269f613d293ea6050de03e66071f62d7d171b99f6d35976cc04a8a42e59a56cbbd4cbb9e96491363092d277e601a10e5a248106cace80f3f9e015c SHA512 d91fdb48693a37e9b68e7e0f03744cd5845aacb66f46edeb07428e182cba0587511a45095206886374dd59bbb023aa99b5d6e1e379a2f42438ed1e2be69dceeb
+EBUILD roslib-1.15.7.ebuild 654 BLAKE2B 805e9c77fd269f613d293ea6050de03e66071f62d7d171b99f6d35976cc04a8a42e59a56cbbd4cbb9e96491363092d277e601a10e5a248106cace80f3f9e015c SHA512 d91fdb48693a37e9b68e7e0f03744cd5845aacb66f46edeb07428e182cba0587511a45095206886374dd59bbb023aa99b5d6e1e379a2f42438ed1e2be69dceeb
 EBUILD roslib-9999.ebuild 654 BLAKE2B 805e9c77fd269f613d293ea6050de03e66071f62d7d171b99f6d35976cc04a8a42e59a56cbbd4cbb9e96491363092d277e601a10e5a248106cace80f3f9e015c SHA512 d91fdb48693a37e9b68e7e0f03744cd5845aacb66f46edeb07428e182cba0587511a45095206886374dd59bbb023aa99b5d6e1e379a2f42438ed1e2be69dceeb
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roslib/roslib-1.15.7.ebuild b/dev-ros/roslib/roslib-1.15.7.ebuild
new file mode 100644
index 000000000000..26e633c4c21c
--- /dev/null
+++ b/dev-ros/roslib/roslib-1.15.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Base dependencies and support libraries for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep ">=dev-python/rospkg-1.0.37[\${PYTHON_USEDEP}]")
+	dev-libs/boost:=[threads]
+	dev-ros/rospack
+	dev-ros/ros_environment
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}/../../"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/roslz4/Manifest b/dev-ros/roslz4/Manifest
index 79ab4414ccc7..1ee836473d2e 100644
--- a/dev-ros/roslz4/Manifest
+++ b/dev-ros/roslz4/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD roslz4-1.15.8.ebuild 423 BLAKE2B 07733e7ff6a8499ee8b776196447a3cf96447c56546e347301460aef88599ef435b0df425485b5cd6a690d087b5f76e4fb63b4f09d638f9d882af859ef6a52e2 SHA512 f3ba822f1e1e7c1bec61e1e3b607fb0db2724c48e84c898e9510731bc96daa5d6bb63abf84fb93d6ced24e74d88370f7ddbfa18a788b08b7a3680df5cc5e1b2e
+EBUILD roslz4-1.15.9.ebuild 423 BLAKE2B 07733e7ff6a8499ee8b776196447a3cf96447c56546e347301460aef88599ef435b0df425485b5cd6a690d087b5f76e4fb63b4f09d638f9d882af859ef6a52e2 SHA512 f3ba822f1e1e7c1bec61e1e3b607fb0db2724c48e84c898e9510731bc96daa5d6bb63abf84fb93d6ced24e74d88370f7ddbfa18a788b08b7a3680df5cc5e1b2e
 EBUILD roslz4-9999.ebuild 423 BLAKE2B 07733e7ff6a8499ee8b776196447a3cf96447c56546e347301460aef88599ef435b0df425485b5cd6a690d087b5f76e4fb63b4f09d638f9d882af859ef6a52e2 SHA512 f3ba822f1e1e7c1bec61e1e3b607fb0db2724c48e84c898e9510731bc96daa5d6bb63abf84fb93d6ced24e74d88370f7ddbfa18a788b08b7a3680df5cc5e1b2e
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roslz4/roslz4-1.15.9.ebuild b/dev-ros/roslz4/roslz4-1.15.9.ebuild
new file mode 100644
index 000000000000..6f69f8c2dc65
--- /dev/null
+++ b/dev-ros/roslz4/roslz4-1.15.9.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-arch/lz4
+	dev-ros/cpp_common"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/rosmake/Manifest b/dev-ros/rosmake/Manifest
index c3a8bf2481ee..cfb343bb9235 100644
--- a/dev-ros/rosmake/Manifest
+++ b/dev-ros/rosmake/Manifest
@@ -1,6 +1,8 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
 EBUILD rosmake-1.15.5.ebuild 464 BLAKE2B 79d72e2052108d28c39977c1cbebe80821dc836d3a9e709ac78fdf519b9e9cb9b90402890e5c2921418508c6e8f251004e861b992b71e897384d7c6bf346a49a SHA512 0e7c3bbf085636584863eddd17761d537647ec7beaa9f80a801ece101e6626afe8600d5c84b6770ed8028831fee2809f5ff7ddea279ef5c63d76aa4740ba7c79
 EBUILD rosmake-1.15.6.ebuild 464 BLAKE2B 79d72e2052108d28c39977c1cbebe80821dc836d3a9e709ac78fdf519b9e9cb9b90402890e5c2921418508c6e8f251004e861b992b71e897384d7c6bf346a49a SHA512 0e7c3bbf085636584863eddd17761d537647ec7beaa9f80a801ece101e6626afe8600d5c84b6770ed8028831fee2809f5ff7ddea279ef5c63d76aa4740ba7c79
+EBUILD rosmake-1.15.7.ebuild 464 BLAKE2B 79d72e2052108d28c39977c1cbebe80821dc836d3a9e709ac78fdf519b9e9cb9b90402890e5c2921418508c6e8f251004e861b992b71e897384d7c6bf346a49a SHA512 0e7c3bbf085636584863eddd17761d537647ec7beaa9f80a801ece101e6626afe8600d5c84b6770ed8028831fee2809f5ff7ddea279ef5c63d76aa4740ba7c79
 EBUILD rosmake-9999.ebuild 464 BLAKE2B 79d72e2052108d28c39977c1cbebe80821dc836d3a9e709ac78fdf519b9e9cb9b90402890e5c2921418508c6e8f251004e861b992b71e897384d7c6bf346a49a SHA512 0e7c3bbf085636584863eddd17761d537647ec7beaa9f80a801ece101e6626afe8600d5c84b6770ed8028831fee2809f5ff7ddea279ef5c63d76aa4740ba7c79
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosmake/rosmake-1.15.7.ebuild b/dev-ros/rosmake/rosmake-1.15.7.ebuild
new file mode 100644
index 000000000000..d848bd5393ac
--- /dev/null
+++ b/dev-ros/rosmake/rosmake-1.15.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS dependency aware build tool"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
+"
diff --git a/dev-ros/rosmaster/Manifest b/dev-ros/rosmaster/Manifest
index bd0271937e80..77a799d9d2cc 100644
--- a/dev-ros/rosmaster/Manifest
+++ b/dev-ros/rosmaster/Manifest
@@ -1,6 +1,8 @@
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rosmaster-1.15.7.ebuild 512 BLAKE2B 2bc45ed2f61251e6c25fe3caaf50536f5379356d9aacd1840d1011ce17cd8954a5ffd1dfa2e9164afd6c0b03ed77c4e9a6f73ad0f1f071c1e9c086f666d73e01 SHA512 f07ee64c88f466b5bcd95cf59a43340aca286e9367b9a9c4975cbd6cfee013389062b6d08e87828bbd55a6e732bb16dd12b297703aae324d4b158de39d47ce99
 EBUILD rosmaster-1.15.8.ebuild 512 BLAKE2B 2bc45ed2f61251e6c25fe3caaf50536f5379356d9aacd1840d1011ce17cd8954a5ffd1dfa2e9164afd6c0b03ed77c4e9a6f73ad0f1f071c1e9c086f666d73e01 SHA512 f07ee64c88f466b5bcd95cf59a43340aca286e9367b9a9c4975cbd6cfee013389062b6d08e87828bbd55a6e732bb16dd12b297703aae324d4b158de39d47ce99
+EBUILD rosmaster-1.15.9.ebuild 512 BLAKE2B 2bc45ed2f61251e6c25fe3caaf50536f5379356d9aacd1840d1011ce17cd8954a5ffd1dfa2e9164afd6c0b03ed77c4e9a6f73ad0f1f071c1e9c086f666d73e01 SHA512 f07ee64c88f466b5bcd95cf59a43340aca286e9367b9a9c4975cbd6cfee013389062b6d08e87828bbd55a6e732bb16dd12b297703aae324d4b158de39d47ce99
 EBUILD rosmaster-9999.ebuild 512 BLAKE2B 2bc45ed2f61251e6c25fe3caaf50536f5379356d9aacd1840d1011ce17cd8954a5ffd1dfa2e9164afd6c0b03ed77c4e9a6f73ad0f1f071c1e9c086f666d73e01 SHA512 f07ee64c88f466b5bcd95cf59a43340aca286e9367b9a9c4975cbd6cfee013389062b6d08e87828bbd55a6e732bb16dd12b297703aae324d4b158de39d47ce99
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosmaster/rosmaster-1.15.9.ebuild b/dev-ros/rosmaster/rosmaster-1.15.9.ebuild
new file mode 100644
index 000000000000..82438464c6ff
--- /dev/null
+++ b/dev-ros/rosmaster/rosmaster-1.15.9.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS Master implementation"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/defusedxml[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
diff --git a/dev-ros/rosmsg/Manifest b/dev-ros/rosmsg/Manifest
index f86d36d5d6a9..f45945b4eb1c 100644
--- a/dev-ros/rosmsg/Manifest
+++ b/dev-ros/rosmsg/Manifest
@@ -1,6 +1,5 @@
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
-DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-EBUILD rosmsg-1.15.7.ebuild 624 BLAKE2B 44c0cc3aef9ef0727ab783de6e4cb92457775ed5fb93f9a22bf395ee48dd0fbdaeac2a2db2c7c62717bdac30c255ca4ba9b45da419671e9fa898726260fbb072 SHA512 0e64f192a34a18baa5d4d9a0e3d1172657d6c2c9bca04238cfaabfbff3344733c2e044796aaf2bb39a25504d1fba2c85b33c414656f27b1cfb6e8668eac80394
-EBUILD rosmsg-1.15.8.ebuild 624 BLAKE2B 44c0cc3aef9ef0727ab783de6e4cb92457775ed5fb93f9a22bf395ee48dd0fbdaeac2a2db2c7c62717bdac30c255ca4ba9b45da419671e9fa898726260fbb072 SHA512 0e64f192a34a18baa5d4d9a0e3d1172657d6c2c9bca04238cfaabfbff3344733c2e044796aaf2bb39a25504d1fba2c85b33c414656f27b1cfb6e8668eac80394
+AUX duplicates.patch 634 BLAKE2B a856eca55e0e293bd61054dfad52f95bee785eb70dcc32018104800241f960702c15547b52836e0080a7b3f46b5961af4ff0aea591cadf46500d64803b24c192 SHA512 e1bc63c9d765b41b6a42d033877ca4b5041729a7e6d19b747c6681b5c84d6e2a6197d8f2812f6243dbff86fc7ffbf6264a09e2f8935e8da1bfd9f92284e42a3e
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
+EBUILD rosmsg-1.15.9.ebuild 763 BLAKE2B ab90d989f27cd1a5fa81b9740f48b946466d7527cfe5b94f08cb61dcf36f49952633f8e274def64933d9dd8729ccc947b9f72669d7da9e5ec5cb9392eb3f3801 SHA512 8725f91c7f1a84507c46246af3efb01866f685ac10000b90ee8b32a648dac4c8c6bb0bdd3c162f9aae15baf597c07ceb07a437f7da0eb0614181f819f9de47f7
 EBUILD rosmsg-9999.ebuild 624 BLAKE2B 44c0cc3aef9ef0727ab783de6e4cb92457775ed5fb93f9a22bf395ee48dd0fbdaeac2a2db2c7c62717bdac30c255ca4ba9b45da419671e9fa898726260fbb072 SHA512 0e64f192a34a18baa5d4d9a0e3d1172657d6c2c9bca04238cfaabfbff3344733c2e044796aaf2bb39a25504d1fba2c85b33c414656f27b1cfb6e8668eac80394
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosmsg/files/duplicates.patch b/dev-ros/rosmsg/files/duplicates.patch
new file mode 100644
index 000000000000..4705f00d2e85
--- /dev/null
+++ b/dev-ros/rosmsg/files/duplicates.patch
@@ -0,0 +1,13 @@
+Index: rosmsg/src/rosmsg/__init__.py
+===================================================================
+--- rosmsg.orig/src/rosmsg/__init__.py
++++ rosmsg/src/rosmsg/__init__.py
+@@ -618,7 +618,7 @@ def rosmsg_cmd_show(mode, full, alias='s
+         if '/' in arg: #package specified
+             rosmsg_debug(rospack, mode, arg, options.raw)
+         else:
+-            found_msgs = list(rosmsg_search(rospack, mode, arg))
++            found_msgs = list(dict.fromkeys(rosmsg_search(rospack, mode, arg)))
+             if not found_msgs:
+                 print("Could not find msg '%s'" % arg, file=sys.stderr)
+                 return 1
diff --git a/dev-ros/rosmsg/rosmsg-1.15.8.ebuild b/dev-ros/rosmsg/rosmsg-1.15.9.ebuild
index ba0d62bb080b..c750959458b6 100644
--- a/dev-ros/rosmsg/rosmsg-1.15.8.ebuild
+++ b/dev-ros/rosmsg/rosmsg-1.15.9.ebuild
@@ -23,3 +23,9 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}] )
 "
+PATCHES=( "${FILESDIR}/duplicates.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}/../../:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/rosnode/Manifest b/dev-ros/rosnode/Manifest
index 8aa1f13ed71e..761d6fc13e66 100644
--- a/dev-ros/rosnode/Manifest
+++ b/dev-ros/rosnode/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rosnode-1.15.8.ebuild 658 BLAKE2B e710cb82de78e27e96fd40f3b64b5f519d7330a9b717a34cc5f5f6c8af0939bdbd19a4a0d4171d775c3aa198e6dd7230f14eec2a9136ed999d190480c36a938d SHA512 f0f1f6570efb644397de72efc476af299fe6ff6c7401473890cfac3dac994c80c8c6660268da17067c868cf6ec8f8d39811067e61b0c5ff0e4e13f459fe9e06c
+EBUILD rosnode-1.15.9.ebuild 658 BLAKE2B e710cb82de78e27e96fd40f3b64b5f519d7330a9b717a34cc5f5f6c8af0939bdbd19a4a0d4171d775c3aa198e6dd7230f14eec2a9136ed999d190480c36a938d SHA512 f0f1f6570efb644397de72efc476af299fe6ff6c7401473890cfac3dac994c80c8c6660268da17067c868cf6ec8f8d39811067e61b0c5ff0e4e13f459fe9e06c
 EBUILD rosnode-9999.ebuild 658 BLAKE2B e710cb82de78e27e96fd40f3b64b5f519d7330a9b717a34cc5f5f6c8af0939bdbd19a4a0d4171d775c3aa198e6dd7230f14eec2a9136ed999d190480c36a938d SHA512 f0f1f6570efb644397de72efc476af299fe6ff6c7401473890cfac3dac994c80c8c6660268da17067c868cf6ec8f8d39811067e61b0c5ff0e4e13f459fe9e06c
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosmsg/rosmsg-1.15.7.ebuild b/dev-ros/rosnode/rosnode-1.15.9.ebuild
index ba0d62bb080b..6ac973a5e5a1 100644
--- a/dev-ros/rosmsg/rosmsg-1.15.7.ebuild
+++ b/dev-ros/rosnode/rosnode-1.15.9.ebuild
@@ -9,7 +9,7 @@ ROS_SUBDIR=tools/${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Command-line tools for displaying information about message and services"
+DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -18,8 +18,10 @@ RDEPEND="
 	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
 	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}] )
-"
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	)"
diff --git a/dev-ros/rosout/Manifest b/dev-ros/rosout/Manifest
index 471da6477f52..d176da41d162 100644
--- a/dev-ros/rosout/Manifest
+++ b/dev-ros/rosout/Manifest
@@ -1,6 +1,8 @@
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rosout-1.15.7.ebuild 445 BLAKE2B 962dda734a0d479db9be66e9413414d687dde713c768b944c66c752bfd313ca6d9c4eab5a888d57e3abec45c638b37b3a5b8730378a54398949c0a00d6dad1dc SHA512 8808989a59d0f18d340a05513d107ce0b11063737e869b20e2f97eb49acd5f967a3229de4fceccb2b0c60beaf76fcfa5aeb8415758ff6ce3fcfb22e9002e715a
 EBUILD rosout-1.15.8.ebuild 445 BLAKE2B 962dda734a0d479db9be66e9413414d687dde713c768b944c66c752bfd313ca6d9c4eab5a888d57e3abec45c638b37b3a5b8730378a54398949c0a00d6dad1dc SHA512 8808989a59d0f18d340a05513d107ce0b11063737e869b20e2f97eb49acd5f967a3229de4fceccb2b0c60beaf76fcfa5aeb8415758ff6ce3fcfb22e9002e715a
+EBUILD rosout-1.15.9.ebuild 445 BLAKE2B 962dda734a0d479db9be66e9413414d687dde713c768b944c66c752bfd313ca6d9c4eab5a888d57e3abec45c638b37b3a5b8730378a54398949c0a00d6dad1dc SHA512 8808989a59d0f18d340a05513d107ce0b11063737e869b20e2f97eb49acd5f967a3229de4fceccb2b0c60beaf76fcfa5aeb8415758ff6ce3fcfb22e9002e715a
 EBUILD rosout-9999.ebuild 445 BLAKE2B 962dda734a0d479db9be66e9413414d687dde713c768b944c66c752bfd313ca6d9c4eab5a888d57e3abec45c638b37b3a5b8730378a54398949c0a00d6dad1dc SHA512 8808989a59d0f18d340a05513d107ce0b11063737e869b20e2f97eb49acd5f967a3229de4fceccb2b0c60beaf76fcfa5aeb8415758ff6ce3fcfb22e9002e715a
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosout/rosout-1.15.9.ebuild b/dev-ros/rosout/rosout-1.15.9.ebuild
new file mode 100644
index 000000000000..4a60a4d6a5fe
--- /dev/null
+++ b/dev-ros/rosout/rosout-1.15.9.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+"
+DEPEND="${RDEPEND}
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/rosparam/Manifest b/dev-ros/rosparam/Manifest
index aad597d3d0d1..d543f94b35b3 100644
--- a/dev-ros/rosparam/Manifest
+++ b/dev-ros/rosparam/Manifest
@@ -1,6 +1,8 @@
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rosparam-1.15.7.ebuild 492 BLAKE2B acccae97699f0557ba8467d767f476a6ad54bfb5770437f1bab2a302aed2c30b3ec974c428c9077a34c5a997f6843fb9a7151651b74ff9fcc4acf4de1a5b03f1 SHA512 8856c8d723b12d48b6edc4bd4ecc69c9b3f277b38e949e843672a52766ede0c4e6a57c8fdec23cde3f9afa769caffe29acf7a2526496bbd37aabf8794cb3e75e
 EBUILD rosparam-1.15.8.ebuild 492 BLAKE2B acccae97699f0557ba8467d767f476a6ad54bfb5770437f1bab2a302aed2c30b3ec974c428c9077a34c5a997f6843fb9a7151651b74ff9fcc4acf4de1a5b03f1 SHA512 8856c8d723b12d48b6edc4bd4ecc69c9b3f277b38e949e843672a52766ede0c4e6a57c8fdec23cde3f9afa769caffe29acf7a2526496bbd37aabf8794cb3e75e
+EBUILD rosparam-1.15.9.ebuild 492 BLAKE2B acccae97699f0557ba8467d767f476a6ad54bfb5770437f1bab2a302aed2c30b3ec974c428c9077a34c5a997f6843fb9a7151651b74ff9fcc4acf4de1a5b03f1 SHA512 8856c8d723b12d48b6edc4bd4ecc69c9b3f277b38e949e843672a52766ede0c4e6a57c8fdec23cde3f9afa769caffe29acf7a2526496bbd37aabf8794cb3e75e
 EBUILD rosparam-9999.ebuild 492 BLAKE2B acccae97699f0557ba8467d767f476a6ad54bfb5770437f1bab2a302aed2c30b3ec974c428c9077a34c5a997f6843fb9a7151651b74ff9fcc4acf4de1a5b03f1 SHA512 8856c8d723b12d48b6edc4bd4ecc69c9b3f277b38e949e843672a52766ede0c4e6a57c8fdec23cde3f9afa769caffe29acf7a2526496bbd37aabf8794cb3e75e
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosparam/rosparam-1.15.9.ebuild b/dev-ros/rosparam/rosparam-1.15.9.ebuild
new file mode 100644
index 000000000000..0e2d39275623
--- /dev/null
+++ b/dev-ros/rosparam/rosparam-1.15.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rospy/Manifest b/dev-ros/rospy/Manifest
index 2bb2fc72179f..8ad6535b60be 100644
--- a/dev-ros/rospy/Manifest
+++ b/dev-ros/rospy/Manifest
@@ -1,6 +1,8 @@
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rospy-1.15.7.ebuild 727 BLAKE2B 896a986416606452c618e6a5b22900895844158a39f12de9adea1360895efadaf436dbf932373d82dfdf84da62c38b6a0fb53453b7dd47810f49cf1768cac0d5 SHA512 fd0517eebfcf2c58d894ad66e7a99371a942d955f7bf0b8db8e8fc81ce9a2be7abff9e82f66f843739358c8f431d74fa73e9185dcfd037cfc9c55a9804d9eb21
 EBUILD rospy-1.15.8.ebuild 727 BLAKE2B 896a986416606452c618e6a5b22900895844158a39f12de9adea1360895efadaf436dbf932373d82dfdf84da62c38b6a0fb53453b7dd47810f49cf1768cac0d5 SHA512 fd0517eebfcf2c58d894ad66e7a99371a942d955f7bf0b8db8e8fc81ce9a2be7abff9e82f66f843739358c8f431d74fa73e9185dcfd037cfc9c55a9804d9eb21
+EBUILD rospy-1.15.9.ebuild 727 BLAKE2B 896a986416606452c618e6a5b22900895844158a39f12de9adea1360895efadaf436dbf932373d82dfdf84da62c38b6a0fb53453b7dd47810f49cf1768cac0d5 SHA512 fd0517eebfcf2c58d894ad66e7a99371a942d955f7bf0b8db8e8fc81ce9a2be7abff9e82f66f843739358c8f431d74fa73e9185dcfd037cfc9c55a9804d9eb21
 EBUILD rospy-9999.ebuild 727 BLAKE2B 896a986416606452c618e6a5b22900895844158a39f12de9adea1360895efadaf436dbf932373d82dfdf84da62c38b6a0fb53453b7dd47810f49cf1768cac0d5 SHA512 fd0517eebfcf2c58d894ad66e7a99371a942d955f7bf0b8db8e8fc81ce9a2be7abff9e82f66f843739358c8f431d74fa73e9185dcfd037cfc9c55a9804d9eb21
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rospy/rospy-1.15.9.ebuild b/dev-ros/rospy/rospy-1.15.9.ebuild
new file mode 100644
index 000000000000..c15250f755ce
--- /dev/null
+++ b/dev-ros/rospy/rospy-1.15.9.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=clients/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python client library for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roscpp[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	ros-catkin_src_install
+	# Other tests need these nodes
+	exeinto /usr/share/${PN}
+	doexe test_nodes/*
+}
diff --git a/dev-ros/rosserial_arduino/Manifest b/dev-ros/rosserial_arduino/Manifest
index 2b0c6b0a1352..d7df19e7d286 100644
--- a/dev-ros/rosserial_arduino/Manifest
+++ b/dev-ros/rosserial_arduino/Manifest
@@ -1,4 +1,6 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
+DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
 EBUILD rosserial_arduino-0.8.0.ebuild 548 BLAKE2B 27d998f1f8a5d3c23db89c917c6e87f41a98a39f6c58fac15aec0263b87ec59c04e0cfb12ebd7e0ba8f76a01d67d4b1828091fca1c095b8ca601c92366c9eed8 SHA512 e79b4cf7b54d944a8c818ef0696645833351cd6588d1db7cf476b260819bcf5c91a9578c1f6d0d34f7cd3529a62cec9d32199b36a5f9976914c28ce533150e6b
+EBUILD rosserial_arduino-0.9.1.ebuild 548 BLAKE2B 27d998f1f8a5d3c23db89c917c6e87f41a98a39f6c58fac15aec0263b87ec59c04e0cfb12ebd7e0ba8f76a01d67d4b1828091fca1c095b8ca601c92366c9eed8 SHA512 e79b4cf7b54d944a8c818ef0696645833351cd6588d1db7cf476b260819bcf5c91a9578c1f6d0d34f7cd3529a62cec9d32199b36a5f9976914c28ce533150e6b
 EBUILD rosserial_arduino-9999.ebuild 548 BLAKE2B 27d998f1f8a5d3c23db89c917c6e87f41a98a39f6c58fac15aec0263b87ec59c04e0cfb12ebd7e0ba8f76a01d67d4b1828091fca1c095b8ca601c92366c9eed8 SHA512 e79b4cf7b54d944a8c818ef0696645833351cd6588d1db7cf476b260819bcf5c91a9578c1f6d0d34f7cd3529a62cec9d32199b36a5f9976914c28ce533150e6b
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_arduino/rosserial_arduino-0.9.1.ebuild b/dev-ros/rosserial_arduino/rosserial_arduino-0.9.1.ebuild
new file mode 100644
index 000000000000..f444499009fb
--- /dev/null
+++ b/dev-ros/rosserial_arduino/rosserial_arduino-0.9.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Arduino/AVR Platforms"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_client/Manifest b/dev-ros/rosserial_client/Manifest
index 9d368eff9db2..702acbc8b63c 100644
--- a/dev-ros/rosserial_client/Manifest
+++ b/dev-ros/rosserial_client/Manifest
@@ -1,4 +1,6 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
+DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
 EBUILD rosserial_client-0.8.0.ebuild 539 BLAKE2B da74557635d36b5eca90c602c08fd019adb016983e8020ed323494364d72e04ad8a0a9ec10c656385a4b6007c19a6f317071d1867cefb54ef3287bcfc1fa838e SHA512 652104de1796d68783793fee30369672263acd9d22263aee7171399dfec0fc2dc82561b54784e4e5dfd68251fbd51e22f33980b10370741c9aabc4be2fb4baf3
+EBUILD rosserial_client-0.9.1.ebuild 539 BLAKE2B da74557635d36b5eca90c602c08fd019adb016983e8020ed323494364d72e04ad8a0a9ec10c656385a4b6007c19a6f317071d1867cefb54ef3287bcfc1fa838e SHA512 652104de1796d68783793fee30369672263acd9d22263aee7171399dfec0fc2dc82561b54784e4e5dfd68251fbd51e22f33980b10370741c9aabc4be2fb4baf3
 EBUILD rosserial_client-9999.ebuild 539 BLAKE2B da74557635d36b5eca90c602c08fd019adb016983e8020ed323494364d72e04ad8a0a9ec10c656385a4b6007c19a6f317071d1867cefb54ef3287bcfc1fa838e SHA512 652104de1796d68783793fee30369672263acd9d22263aee7171399dfec0fc2dc82561b54784e4e5dfd68251fbd51e22f33980b10370741c9aabc4be2fb4baf3
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_client/rosserial_client-0.9.1.ebuild b/dev-ros/rosserial_client/rosserial_client-0.9.1.ebuild
new file mode 100644
index 000000000000..6dab12d86ad4
--- /dev/null
+++ b/dev-ros/rosserial_client/rosserial_client-0.9.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Generalized client side source for rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_embeddedlinux/Manifest b/dev-ros/rosserial_embeddedlinux/Manifest
index 0fcdb4271c8d..9ce8403b8368 100644
--- a/dev-ros/rosserial_embeddedlinux/Manifest
+++ b/dev-ros/rosserial_embeddedlinux/Manifest
@@ -1,4 +1,6 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
+DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
 EBUILD rosserial_embeddedlinux-0.8.0.ebuild 687 BLAKE2B b3b7e24440c0d323fa83f59638b18260e491b33f1956077d35b023a329d2a9d6b70af75e08d624ead4b07be8e7cf5d5081081336c90b5a669f7ea4fcc311318f SHA512 439b2dfdba81bef226851cf69fc56481d72b107ebf5437b46bc3a716417c4af2def56d4e78b345c9c4651fb7037c6c011079d4a24ed7abaec3bfb09319b51b97
+EBUILD rosserial_embeddedlinux-0.9.1.ebuild 687 BLAKE2B b3b7e24440c0d323fa83f59638b18260e491b33f1956077d35b023a329d2a9d6b70af75e08d624ead4b07be8e7cf5d5081081336c90b5a669f7ea4fcc311318f SHA512 439b2dfdba81bef226851cf69fc56481d72b107ebf5437b46bc3a716417c4af2def56d4e78b345c9c4651fb7037c6c011079d4a24ed7abaec3bfb09319b51b97
 EBUILD rosserial_embeddedlinux-9999.ebuild 687 BLAKE2B b3b7e24440c0d323fa83f59638b18260e491b33f1956077d35b023a329d2a9d6b70af75e08d624ead4b07be8e7cf5d5081081336c90b5a669f7ea4fcc311318f SHA512 439b2dfdba81bef226851cf69fc56481d72b107ebf5437b46bc3a716417c4af2def56d4e78b345c9c4651fb7037c6c011079d4a24ed7abaec3bfb09319b51b97
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.9.1.ebuild b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.9.1.ebuild
new file mode 100644
index 000000000000..49525af06d65
--- /dev/null
+++ b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.9.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Embedded Linux Enviroments"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_msgs/Manifest b/dev-ros/rosserial_msgs/Manifest
index 729ec2310351..86803e8d22f6 100644
--- a/dev-ros/rosserial_msgs/Manifest
+++ b/dev-ros/rosserial_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
+DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
 EBUILD rosserial_msgs-0.8.0.ebuild 389 BLAKE2B 234bcf626bfc4630ee1f5b8f51f2ad1b647d2f5192f90963f857199e1e19ae71d1ecec963903b0b9b094c85630f83eb1bc51a17b54d12431c127a3bd4b31d4a1 SHA512 2ab9b776da7d158a66da5f46bd4237df51d4e3a6a469839a84b9aabcf5c9ee5e1b295eddbeff926b7e1ba1bd1e6baf7d09a9dfbf46da21fbb6c55e51ec020e1a
+EBUILD rosserial_msgs-0.9.1.ebuild 389 BLAKE2B 234bcf626bfc4630ee1f5b8f51f2ad1b647d2f5192f90963f857199e1e19ae71d1ecec963903b0b9b094c85630f83eb1bc51a17b54d12431c127a3bd4b31d4a1 SHA512 2ab9b776da7d158a66da5f46bd4237df51d4e3a6a469839a84b9aabcf5c9ee5e1b295eddbeff926b7e1ba1bd1e6baf7d09a9dfbf46da21fbb6c55e51ec020e1a
 EBUILD rosserial_msgs-9999.ebuild 389 BLAKE2B 234bcf626bfc4630ee1f5b8f51f2ad1b647d2f5192f90963f857199e1e19ae71d1ecec963903b0b9b094c85630f83eb1bc51a17b54d12431c127a3bd4b31d4a1 SHA512 2ab9b776da7d158a66da5f46bd4237df51d4e3a6a469839a84b9aabcf5c9ee5e1b295eddbeff926b7e1ba1bd1e6baf7d09a9dfbf46da21fbb6c55e51ec020e1a
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_msgs/rosserial_msgs-0.9.1.ebuild b/dev-ros/rosserial_msgs/rosserial_msgs-0.9.1.ebuild
new file mode 100644
index 000000000000..711a0ec3fdf5
--- /dev/null
+++ b/dev-ros/rosserial_msgs/rosserial_msgs-0.9.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for automatic topic configuration using rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_python/Manifest b/dev-ros/rosserial_python/Manifest
index 6aedc2179ddd..e4e6f9c14518 100644
--- a/dev-ros/rosserial_python/Manifest
+++ b/dev-ros/rosserial_python/Manifest
@@ -1,4 +1,6 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
+DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
 EBUILD rosserial_python-0.8.0.ebuild 586 BLAKE2B 0cae58d4cf90d4a0f43961f61bfd5b3446a536354ec02a36adfbccca8c87e6ad1ad53ada5b8f6133b2d90fdfc3e51ced9189fda0e1a01692767eb8972d1dee29 SHA512 a94d8dacfb76b95f725552e8ff07155b849ff82a9abb37c96239b8930c838526e8fc8655d32ea70a6368d81e643f9c57895fa5bad7fc5527e4994b05d8e838b6
+EBUILD rosserial_python-0.9.1.ebuild 586 BLAKE2B 0cae58d4cf90d4a0f43961f61bfd5b3446a536354ec02a36adfbccca8c87e6ad1ad53ada5b8f6133b2d90fdfc3e51ced9189fda0e1a01692767eb8972d1dee29 SHA512 a94d8dacfb76b95f725552e8ff07155b849ff82a9abb37c96239b8930c838526e8fc8655d32ea70a6368d81e643f9c57895fa5bad7fc5527e4994b05d8e838b6
 EBUILD rosserial_python-9999.ebuild 586 BLAKE2B 0cae58d4cf90d4a0f43961f61bfd5b3446a536354ec02a36adfbccca8c87e6ad1ad53ada5b8f6133b2d90fdfc3e51ced9189fda0e1a01692767eb8972d1dee29 SHA512 a94d8dacfb76b95f725552e8ff07155b849ff82a9abb37c96239b8930c838526e8fc8655d32ea70a6368d81e643f9c57895fa5bad7fc5527e4994b05d8e838b6
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_python/rosserial_python-0.9.1.ebuild b/dev-ros/rosserial_python/rosserial_python-0.9.1.ebuild
new file mode 100644
index 000000000000..2051b6c0c412
--- /dev/null
+++ b/dev-ros/rosserial_python/rosserial_python-0.9.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A Python-based implementation of the ROS serial protocol"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyserial[\${PYTHON_USEDEP}]")
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_server/Manifest b/dev-ros/rosserial_server/Manifest
index e96618f0021a..3037133e437b 100644
--- a/dev-ros/rosserial_server/Manifest
+++ b/dev-ros/rosserial_server/Manifest
@@ -1,5 +1,4 @@
-AUX boost170.patch 2996 BLAKE2B d34ed939d222fa4d9528e8e6a7f3aaa90ebea944e651f7f25d4f254fec3e3b2c655f242fba7e00e315f54f8eb518309ea8f52de2a29c14d2dcdd5ec5c70c1a56 SHA512 4f0742061fdee931c5a934d5816e801bff30664e3a28e3970bf9e3636c2d8a562ff283a246b83bbabf7e4dfa755964e03c6a5b07d7d667583831cd3b6ed67fcc
-DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-EBUILD rosserial_server-0.8.0.ebuild 516 BLAKE2B 6884398136dd1046a8a9f1b8af328e8749daf29e85d58d28ace77860891e48913a13b71ca4ef989b577eb0afd05548c1562ef2cf360179b579fdc634152fc67e SHA512 cbdffd7e79726db8730296d421ef81129633f20278edfe828363737d7c55bba6013da79f939bd70fe060f1e7525b6eedba3913259f2abab2623ee3112680d16e
-EBUILD rosserial_server-9999.ebuild 516 BLAKE2B 6884398136dd1046a8a9f1b8af328e8749daf29e85d58d28ace77860891e48913a13b71ca4ef989b577eb0afd05548c1562ef2cf360179b579fdc634152fc67e SHA512 cbdffd7e79726db8730296d421ef81129633f20278edfe828363737d7c55bba6013da79f939bd70fe060f1e7525b6eedba3913259f2abab2623ee3112680d16e
+DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
+EBUILD rosserial_server-0.9.1.ebuild 475 BLAKE2B e85d9a372f4f728d998257b020e61f9256632fba6cd7df6dc52922ebda8d668d0085f318c120bb567ee1df69686306d29e69589cce39308d64fdad699de7f969 SHA512 337997a50e283871e8077cd3c0c8ecf4b6afbb3a34610f9d35ec6f9ffaff28525e7a19ac2072feef7692c7438f3626d3bc0a72131c234371257fa2ea86839fdf
+EBUILD rosserial_server-9999.ebuild 475 BLAKE2B e85d9a372f4f728d998257b020e61f9256632fba6cd7df6dc52922ebda8d668d0085f318c120bb567ee1df69686306d29e69589cce39308d64fdad699de7f969 SHA512 337997a50e283871e8077cd3c0c8ecf4b6afbb3a34610f9d35ec6f9ffaff28525e7a19ac2072feef7692c7438f3626d3bc0a72131c234371257fa2ea86839fdf
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_server/files/boost170.patch b/dev-ros/rosserial_server/files/boost170.patch
deleted file mode 100644
index cbf106fc9acd..000000000000
--- a/dev-ros/rosserial_server/files/boost170.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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.8.0.ebuild b/dev-ros/rosserial_server/rosserial_server-0.9.1.ebuild
index c3d3ee32e16b..dff517382a90 100644
--- a/dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild
+++ b/dev-ros/rosserial_server/rosserial_server-0.9.1.ebuild
@@ -21,4 +21,3 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/rosserial_server/rosserial_server-9999.ebuild b/dev-ros/rosserial_server/rosserial_server-9999.ebuild
index c3d3ee32e16b..dff517382a90 100644
--- a/dev-ros/rosserial_server/rosserial_server-9999.ebuild
+++ b/dev-ros/rosserial_server/rosserial_server-9999.ebuild
@@ -21,4 +21,3 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/rosserial_tivac/Manifest b/dev-ros/rosserial_tivac/Manifest
index dd631ad961c2..eb54ca6bfffc 100644
--- a/dev-ros/rosserial_tivac/Manifest
+++ b/dev-ros/rosserial_tivac/Manifest
@@ -1,4 +1,6 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
+DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
 EBUILD rosserial_tivac-0.8.0.ebuild 496 BLAKE2B a5a535ad4c877c8fb72eb7fa298b7f02c1ce52faecf9aa6a4a8bc9d59c86c9d494b75abfafd8003f060c1cf6fd93895e0496e7a1989365953b155bc1bc5e71a8 SHA512 cfc3d38a7ad8dab2b095df719a9cd4d108b4425858b3ab7cb2834545a3066c1f3faa5be0ed2c044829d16495eca3d5d66b8f3811c1c39c0a3268d0c135840e51
+EBUILD rosserial_tivac-0.9.1.ebuild 496 BLAKE2B a5a535ad4c877c8fb72eb7fa298b7f02c1ce52faecf9aa6a4a8bc9d59c86c9d494b75abfafd8003f060c1cf6fd93895e0496e7a1989365953b155bc1bc5e71a8 SHA512 cfc3d38a7ad8dab2b095df719a9cd4d108b4425858b3ab7cb2834545a3066c1f3faa5be0ed2c044829d16495eca3d5d66b8f3811c1c39c0a3268d0c135840e51
 EBUILD rosserial_tivac-9999.ebuild 496 BLAKE2B a5a535ad4c877c8fb72eb7fa298b7f02c1ce52faecf9aa6a4a8bc9d59c86c9d494b75abfafd8003f060c1cf6fd93895e0496e7a1989365953b155bc1bc5e71a8 SHA512 cfc3d38a7ad8dab2b095df719a9cd4d108b4425858b3ab7cb2834545a3066c1f3faa5be0ed2c044829d16495eca3d5d66b8f3811c1c39c0a3268d0c135840e51
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_tivac/rosserial_tivac-0.9.1.ebuild b/dev-ros/rosserial_tivac/rosserial_tivac-0.9.1.ebuild
new file mode 100644
index 000000000000..b486bb20bc3c
--- /dev/null
+++ b/dev-ros/rosserial_tivac/rosserial_tivac-0.9.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Definitions for rosserial_client targets for TivaC Launchpad evaluation boards."
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_windows/Manifest b/dev-ros/rosserial_windows/Manifest
index 1996898ea517..c305869a592e 100644
--- a/dev-ros/rosserial_windows/Manifest
+++ b/dev-ros/rosserial_windows/Manifest
@@ -1,4 +1,6 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
+DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
 EBUILD rosserial_windows-0.8.0.ebuild 702 BLAKE2B d93f97f30b94f86ea7b5fd0342e4e9cf51fab2e1b5b0008e4ff7f4e1a12f6a5a24c50c7e2ddba0c79abb692bb9a7a71bef20ac7e8c719f7cedc960f0c814ce42 SHA512 dd6fcb093c3973180c29c29f159c09b4984d0a761df8700aca2cb0dc139c322e6376da9ff9433b17ef659cfdfe23a1bc0714159f013e3f928bdad4fac283fb09
+EBUILD rosserial_windows-0.9.1.ebuild 702 BLAKE2B d93f97f30b94f86ea7b5fd0342e4e9cf51fab2e1b5b0008e4ff7f4e1a12f6a5a24c50c7e2ddba0c79abb692bb9a7a71bef20ac7e8c719f7cedc960f0c814ce42 SHA512 dd6fcb093c3973180c29c29f159c09b4984d0a761df8700aca2cb0dc139c322e6376da9ff9433b17ef659cfdfe23a1bc0714159f013e3f928bdad4fac283fb09
 EBUILD rosserial_windows-9999.ebuild 702 BLAKE2B d93f97f30b94f86ea7b5fd0342e4e9cf51fab2e1b5b0008e4ff7f4e1a12f6a5a24c50c7e2ddba0c79abb692bb9a7a71bef20ac7e8c719f7cedc960f0c814ce42 SHA512 dd6fcb093c3973180c29c29f159c09b4984d0a761df8700aca2cb0dc139c322e6376da9ff9433b17ef659cfdfe23a1bc0714159f013e3f928bdad4fac283fb09
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_windows/rosserial_windows-0.9.1.ebuild b/dev-ros/rosserial_windows/rosserial_windows-0.9.1.ebuild
new file mode 100644
index 000000000000..8b3875a023b5
--- /dev/null
+++ b/dev-ros/rosserial_windows/rosserial_windows-0.9.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Windows Platforms"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_xbee/Manifest b/dev-ros/rosserial_xbee/Manifest
index c160b68c5437..d4790999caba 100644
--- a/dev-ros/rosserial_xbee/Manifest
+++ b/dev-ros/rosserial_xbee/Manifest
@@ -1,4 +1,6 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
+DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
 EBUILD rosserial_xbee-0.8.0.ebuild 649 BLAKE2B fbd016a5c96d7c313f2aa06aaf1efa36d71f637e5924339a001bb501673dacae88ea0522267dfd11657fde1f1e1cccd3f0df80e50aaee0dbdb31ec5698efda5d SHA512 32e5ac40d57fc52b2eb1288dddb8361360f2f698fe7e313e719fe047abc5411e5f0fbc66566ca6922c4dff73eb11147e54765988b202983d6418edb74ce145c6
+EBUILD rosserial_xbee-0.9.1.ebuild 649 BLAKE2B fbd016a5c96d7c313f2aa06aaf1efa36d71f637e5924339a001bb501673dacae88ea0522267dfd11657fde1f1e1cccd3f0df80e50aaee0dbdb31ec5698efda5d SHA512 32e5ac40d57fc52b2eb1288dddb8361360f2f698fe7e313e719fe047abc5411e5f0fbc66566ca6922c4dff73eb11147e54765988b202983d6418edb74ce145c6
 EBUILD rosserial_xbee-9999.ebuild 649 BLAKE2B fbd016a5c96d7c313f2aa06aaf1efa36d71f637e5924339a001bb501673dacae88ea0522267dfd11657fde1f1e1cccd3f0df80e50aaee0dbdb31ec5698efda5d SHA512 32e5ac40d57fc52b2eb1288dddb8361360f2f698fe7e313e719fe047abc5411e5f0fbc66566ca6922c4dff73eb11147e54765988b202983d6418edb74ce145c6
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_xbee/rosserial_xbee-0.9.1.ebuild b/dev-ros/rosserial_xbee/rosserial_xbee-0.9.1.ebuild
new file mode 100644
index 000000000000..aab6d7663008
--- /dev/null
+++ b/dev-ros/rosserial_xbee/rosserial_xbee-0.9.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools to do communicate between rosserial nodes connected to an xbee"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyserial[\${PYTHON_USEDEP}]")
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosserial_python[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/Manifest b/dev-ros/rosservice/Manifest
index 72af5c006d6f..c6ba5d749e94 100644
--- a/dev-ros/rosservice/Manifest
+++ b/dev-ros/rosservice/Manifest
@@ -1,6 +1,8 @@
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rosservice-1.15.7.ebuild 526 BLAKE2B 8cb13efa66e3c5195c6e068ea35383b2a787cab7bfc194a9e849c9cfd85be0c4f41ff69550acbb98be97ae492fcc515fbf759cffb58b569a1f10973cf30109ff SHA512 52e5e56b6ddbd78c13c94ac71cb159730dcf2ce914c84279b1cbdb2b1ae53bb85d89cb2d93e1e4749f38816faa5fa7dd3a645630c06cea6541a554d48a108105
 EBUILD rosservice-1.15.8.ebuild 526 BLAKE2B 8cb13efa66e3c5195c6e068ea35383b2a787cab7bfc194a9e849c9cfd85be0c4f41ff69550acbb98be97ae492fcc515fbf759cffb58b569a1f10973cf30109ff SHA512 52e5e56b6ddbd78c13c94ac71cb159730dcf2ce914c84279b1cbdb2b1ae53bb85d89cb2d93e1e4749f38816faa5fa7dd3a645630c06cea6541a554d48a108105
+EBUILD rosservice-1.15.9.ebuild 526 BLAKE2B 8cb13efa66e3c5195c6e068ea35383b2a787cab7bfc194a9e849c9cfd85be0c4f41ff69550acbb98be97ae492fcc515fbf759cffb58b569a1f10973cf30109ff SHA512 52e5e56b6ddbd78c13c94ac71cb159730dcf2ce914c84279b1cbdb2b1ae53bb85d89cb2d93e1e4749f38816faa5fa7dd3a645630c06cea6541a554d48a108105
 EBUILD rosservice-9999.ebuild 526 BLAKE2B 8cb13efa66e3c5195c6e068ea35383b2a787cab7bfc194a9e849c9cfd85be0c4f41ff69550acbb98be97ae492fcc515fbf759cffb58b569a1f10973cf30109ff SHA512 52e5e56b6ddbd78c13c94ac71cb159730dcf2ce914c84279b1cbdb2b1ae53bb85d89cb2d93e1e4749f38816faa5fa7dd3a645630c06cea6541a554d48a108105
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosservice/rosservice-1.15.9.ebuild b/dev-ros/rosservice/rosservice-1.15.9.ebuild
new file mode 100644
index 000000000000..f997c822e5bf
--- /dev/null
+++ b/dev-ros/rosservice/rosservice-1.15.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for listing and querying ROS Services"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rostest/Manifest b/dev-ros/rostest/Manifest
index 4180f0b1550a..606717593e37 100644
--- a/dev-ros/rostest/Manifest
+++ b/dev-ros/rostest/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rostest-1.15.8.ebuild 739 BLAKE2B 453895ae38b9f9e6a3e2e7512ad64e9c3796a88a9ca571af350e0205e135c20f5a7bfe7efc22d20511cf0ea02da646bc55f34833ca50aa6bf809637bc48bb2e0 SHA512 148e5465bc6de907327105531b669fd30fce4fdeb31de101d3992315272069611bccfa688db08dea45da495b8e2320f1a84420769a439705b0443da9be9e233d
+EBUILD rostest-1.15.9.ebuild 739 BLAKE2B 453895ae38b9f9e6a3e2e7512ad64e9c3796a88a9ca571af350e0205e135c20f5a7bfe7efc22d20511cf0ea02da646bc55f34833ca50aa6bf809637bc48bb2e0 SHA512 148e5465bc6de907327105531b669fd30fce4fdeb31de101d3992315272069611bccfa688db08dea45da495b8e2320f1a84420769a439705b0443da9be9e233d
 EBUILD rostest-9999.ebuild 739 BLAKE2B 453895ae38b9f9e6a3e2e7512ad64e9c3796a88a9ca571af350e0205e135c20f5a7bfe7efc22d20511cf0ea02da646bc55f34833ca50aa6bf809637bc48bb2e0 SHA512 148e5465bc6de907327105531b669fd30fce4fdeb31de101d3992315272069611bccfa688db08dea45da495b8e2320f1a84420769a439705b0443da9be9e233d
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rostest/rostest-1.15.9.ebuild b/dev-ros/rostest/rostest-1.15.9.ebuild
new file mode 100644
index 000000000000..37af233ee567
--- /dev/null
+++ b/dev-ros/rostest/rostest-1.15.9.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Integration test suite based on roslaunch compatible with xUnit frameworks"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]"
+DEPEND="${DEPEND}
+	test? (
+		${RDEPEND}
+		dev-ros/rosservice
+		dev-cpp/gtest
+		dev-ros/rostopic
+	)"
diff --git a/dev-ros/rostopic/Manifest b/dev-ros/rostopic/Manifest
index c1c9a86bc5c3..62119feacaa3 100644
--- a/dev-ros/rostopic/Manifest
+++ b/dev-ros/rostopic/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rostopic-1.15.8.ebuild 661 BLAKE2B d33853c2b2aefa1b73d391d516146c63842c01332ebd99feea7faea2bc842cde957ddb7cab481dfdda934e04a53d567bdb97a3886b76525ddddeb06409ca1551 SHA512 8812788df4dbd5f760cf65238d0482022bab1f2ee421e9614000e843019a5ba7b56f11f0c2f00891c19f203569d840680f8b00079b4b15ea56ef31f2e6f1f7af
+EBUILD rostopic-1.15.9.ebuild 661 BLAKE2B d33853c2b2aefa1b73d391d516146c63842c01332ebd99feea7faea2bc842cde957ddb7cab481dfdda934e04a53d567bdb97a3886b76525ddddeb06409ca1551 SHA512 8812788df4dbd5f760cf65238d0482022bab1f2ee421e9614000e843019a5ba7b56f11f0c2f00891c19f203569d840680f8b00079b4b15ea56ef31f2e6f1f7af
 EBUILD rostopic-9999.ebuild 661 BLAKE2B d33853c2b2aefa1b73d391d516146c63842c01332ebd99feea7faea2bc842cde957ddb7cab481dfdda934e04a53d567bdb97a3886b76525ddddeb06409ca1551 SHA512 8812788df4dbd5f760cf65238d0482022bab1f2ee421e9614000e843019a5ba7b56f11f0c2f00891c19f203569d840680f8b00079b4b15ea56ef31f2e6f1f7af
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rostopic/rostopic-1.15.9.ebuild b/dev-ros/rostopic/rostopic-1.15.9.ebuild
new file mode 100644
index 000000000000..c436e4f953a2
--- /dev/null
+++ b/dev-ros/rostopic/rostopic-1.15.9.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/rosunit/Manifest b/dev-ros/rosunit/Manifest
index d699305a5fc6..8c40b4064786 100644
--- a/dev-ros/rosunit/Manifest
+++ b/dev-ros/rosunit/Manifest
@@ -1,6 +1,8 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
+DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
 EBUILD rosunit-1.15.5.ebuild 505 BLAKE2B 4f9b26d7728fbcb21ce6fe3aa70982afc65c2de19d86f5a828f4b1b8d5c07d19cd1b3187dff03bb3cc3cbd84515b3267c1dfa18676d4ed9ab7c9f31a29d556cc SHA512 35952c146d24201c3d3c7244aa788465b10d2d8c1e84f7708a4d3b58e1697987d315e619f51f2d83c4820f83d75d9317d6eeb5fdb369a460ba06b1e0c37731e2
 EBUILD rosunit-1.15.6.ebuild 505 BLAKE2B 4f9b26d7728fbcb21ce6fe3aa70982afc65c2de19d86f5a828f4b1b8d5c07d19cd1b3187dff03bb3cc3cbd84515b3267c1dfa18676d4ed9ab7c9f31a29d556cc SHA512 35952c146d24201c3d3c7244aa788465b10d2d8c1e84f7708a4d3b58e1697987d315e619f51f2d83c4820f83d75d9317d6eeb5fdb369a460ba06b1e0c37731e2
+EBUILD rosunit-1.15.7.ebuild 505 BLAKE2B 4f9b26d7728fbcb21ce6fe3aa70982afc65c2de19d86f5a828f4b1b8d5c07d19cd1b3187dff03bb3cc3cbd84515b3267c1dfa18676d4ed9ab7c9f31a29d556cc SHA512 35952c146d24201c3d3c7244aa788465b10d2d8c1e84f7708a4d3b58e1697987d315e619f51f2d83c4820f83d75d9317d6eeb5fdb369a460ba06b1e0c37731e2
 EBUILD rosunit-9999.ebuild 505 BLAKE2B 4f9b26d7728fbcb21ce6fe3aa70982afc65c2de19d86f5a828f4b1b8d5c07d19cd1b3187dff03bb3cc3cbd84515b3267c1dfa18676d4ed9ab7c9f31a29d556cc SHA512 35952c146d24201c3d3c7244aa788465b10d2d8c1e84f7708a4d3b58e1697987d315e619f51f2d83c4820f83d75d9317d6eeb5fdb369a460ba06b1e0c37731e2
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosunit/rosunit-1.15.7.ebuild b/dev-ros/rosunit/rosunit-1.15.7.ebuild
new file mode 100644
index 000000000000..198f80e39504
--- /dev/null
+++ b/dev-ros/rosunit/rosunit-1.15.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit-testing package for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
+"
diff --git a/dev-ros/roswtf/Manifest b/dev-ros/roswtf/Manifest
index 1ada29e80ce4..25b2beb62c69 100644
--- a/dev-ros/roswtf/Manifest
+++ b/dev-ros/roswtf/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD roswtf-1.15.8.ebuild 1251 BLAKE2B 303c0c50720d47750aa73ad06e3140fa732339c5ba7c9f848fc883305fc557a24a01a04b272aee46a56a9ffc686990666c3f47fb1e00f643d53dba24e8b1627b SHA512 8f0703e03fba1f02852ca921347733299c7950eecb49be7bd854e4ffd5b0f3996a4cda5d393711f5ca2e6b110420e3438899c1ef75cbd8d668c9c7792b52a64e
+EBUILD roswtf-1.15.9.ebuild 1251 BLAKE2B 303c0c50720d47750aa73ad06e3140fa732339c5ba7c9f848fc883305fc557a24a01a04b272aee46a56a9ffc686990666c3f47fb1e00f643d53dba24e8b1627b SHA512 8f0703e03fba1f02852ca921347733299c7950eecb49be7bd854e4ffd5b0f3996a4cda5d393711f5ca2e6b110420e3438899c1ef75cbd8d668c9c7792b52a64e
 EBUILD roswtf-9999.ebuild 1251 BLAKE2B 303c0c50720d47750aa73ad06e3140fa732339c5ba7c9f848fc883305fc557a24a01a04b272aee46a56a9ffc686990666c3f47fb1e00f643d53dba24e8b1627b SHA512 8f0703e03fba1f02852ca921347733299c7950eecb49be7bd854e4ffd5b0f3996a4cda5d393711f5ca2e6b110420e3438899c1ef75cbd8d668c9c7792b52a64e
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roswtf/roswtf-1.15.9.ebuild b/dev-ros/roswtf/roswtf-1.15.9.ebuild
new file mode 100644
index 000000000000..e6c601a37116
--- /dev/null
+++ b/dev-ros/roswtf/roswtf-1.15.9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for diagnosing issues with a running ROS system"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/paramiko[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rosbuild[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/roslang[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+BDEPEND="
+	test? (
+		dev-ros/cmake_modules
+	)
+"
+
+src_test() {
+	# Needed for tests to find internal launch file
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/rotate_recovery/Manifest b/dev-ros/rotate_recovery/Manifest
index f2cac61abb6b..6b5c428a9d19 100644
--- a/dev-ros/rotate_recovery/Manifest
+++ b/dev-ros/rotate_recovery/Manifest
@@ -1,4 +1,6 @@
 DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
 EBUILD rotate_recovery-1.17.0.ebuild 739 BLAKE2B 08cc4d3b70f7ccb672b4edac5cd84272c59499b202b60bdb185c7e954853e9c67ca2903f51bd50c12d21eaa16a5492ab02af9f0d418f3a82db399289cf0c2de4 SHA512 ec926673895d206ee1908e24ca5f91237fa153b46389e40b7b6b40674eb29846804087dd8937322eae3fee7c8901e8b85a790b7191e7b57adbc25c1a828f8c14
+EBUILD rotate_recovery-1.17.1.ebuild 739 BLAKE2B 08cc4d3b70f7ccb672b4edac5cd84272c59499b202b60bdb185c7e954853e9c67ca2903f51bd50c12d21eaa16a5492ab02af9f0d418f3a82db399289cf0c2de4 SHA512 ec926673895d206ee1908e24ca5f91237fa153b46389e40b7b6b40674eb29846804087dd8937322eae3fee7c8901e8b85a790b7191e7b57adbc25c1a828f8c14
 EBUILD rotate_recovery-9999.ebuild 739 BLAKE2B 08cc4d3b70f7ccb672b4edac5cd84272c59499b202b60bdb185c7e954853e9c67ca2903f51bd50c12d21eaa16a5492ab02af9f0d418f3a82db399289cf0c2de4 SHA512 ec926673895d206ee1908e24ca5f91237fa153b46389e40b7b6b40674eb29846804087dd8937322eae3fee7c8901e8b85a790b7191e7b57adbc25c1a828f8c14
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/rotate_recovery/rotate_recovery-1.17.1.ebuild b/dev-ros/rotate_recovery/rotate_recovery-1.17.1.ebuild
new file mode 100644
index 000000000000..06340ad401d2
--- /dev/null
+++ b/dev-ros/rotate_recovery/rotate_recovery-1.17.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Recovery behavior that attempts performing a 360 degree rotation of the robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/angles
+	dev-ros/base_local_planner
+	dev-ros/costmap_2d
+	dev-cpp/eigen:3
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=dev-ros/nav_core-1.16
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf2
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_ros
+
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules"
diff --git a/dev-ros/rqt_bag/Manifest b/dev-ros/rqt_bag/Manifest
index d7dd37ce9ede..81e11ea9828e 100644
--- a/dev-ros/rqt_bag/Manifest
+++ b/dev-ros/rqt_bag/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_bag-0.4.13.tar.gz 51027 BLAKE2B 1a65935847c28dbb88ee897b4066620c3d1d83e2f33de7f8a93417ebd8924a572476c24756daaab7ec4c481a2b963fc552ec4a8b9030a1a847c1663b2e9229f7 SHA512 d92511e98c83f821fe967c8f8a4f19b31b03c464996ab3ee10c4d6c5dd61c8d2f65562a683e3d44dcddca862db69a5f850b361231c2a548edc71d6fa861326fd
-EBUILD rqt_bag-0.4.13.ebuild 670 BLAKE2B c7233f8c285eb728e0314dd7a99a18a0572b93b392f89441934158fb83cc5997b5160c080e1f1138a895f35b18222a3a8cd1f5b7738f5d745b4c05687a1f9681 SHA512 adc55e129b7e78eadcf77b0c2c1426740e40695ed12982dc3e3438ebd080d4332f405833c0888c0cce4a8c13d9aa88071272a24cfb23243fd9bb16f2b3b82843
+DIST rqt_bag-0.4.15.tar.gz 51549 BLAKE2B 87e1a5b997efa6e0b460edd11b14608ba35a49e3b404c2df32fa6f5bf442bca271e9329a2a7eea5b21b07488e0b06b7a23e706fa631dc4146c8911a29ddf36eb SHA512 01df2bf2626057ad05a52f0c069b013fd2f9ef00afa57e76b696fc7b66c6b6766a8ae6f880b1fa5493759b53deb87ac4d12bd5c22fe81ea9192f5ae6f91aa976
+EBUILD rqt_bag-0.4.15.ebuild 670 BLAKE2B c7233f8c285eb728e0314dd7a99a18a0572b93b392f89441934158fb83cc5997b5160c080e1f1138a895f35b18222a3a8cd1f5b7738f5d745b4c05687a1f9681 SHA512 adc55e129b7e78eadcf77b0c2c1426740e40695ed12982dc3e3438ebd080d4332f405833c0888c0cce4a8c13d9aa88071272a24cfb23243fd9bb16f2b3b82843
 EBUILD rqt_bag-9999.ebuild 670 BLAKE2B c7233f8c285eb728e0314dd7a99a18a0572b93b392f89441934158fb83cc5997b5160c080e1f1138a895f35b18222a3a8cd1f5b7738f5d745b4c05687a1f9681 SHA512 adc55e129b7e78eadcf77b0c2c1426740e40695ed12982dc3e3438ebd080d4332f405833c0888c0cce4a8c13d9aa88071272a24cfb23243fd9bb16f2b3b82843
 MISC metadata.xml 339 BLAKE2B 0ab275c9533eaf810c3fd33f5fcfbab2de7d7258604b431cc7a90a5ac63127bf048188835d89237de809b314fc5bff2a3afbea2dae6a7299ada7dbb0183ec262 SHA512 4925d508214e10ae0538559a9d17ed336e721ac3b25375cd4cf94e4437b7f509ccb60aa4865a89cc482817230de827c5adb4c83fbfd63c697c833d19b7da8e16
diff --git a/dev-ros/rqt_bag/rqt_bag-0.4.13.ebuild b/dev-ros/rqt_bag/rqt_bag-0.4.15.ebuild
index 51bedaaa5154..51bedaaa5154 100644
--- a/dev-ros/rqt_bag/rqt_bag-0.4.13.ebuild
+++ b/dev-ros/rqt_bag/rqt_bag-0.4.15.ebuild
diff --git a/dev-ros/rqt_bag_plugins/Manifest b/dev-ros/rqt_bag_plugins/Manifest
index c2e8f20ca3ca..2c8173cb79ff 100644
--- a/dev-ros/rqt_bag_plugins/Manifest
+++ b/dev-ros/rqt_bag_plugins/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_bag-0.4.13.tar.gz 51027 BLAKE2B 1a65935847c28dbb88ee897b4066620c3d1d83e2f33de7f8a93417ebd8924a572476c24756daaab7ec4c481a2b963fc552ec4a8b9030a1a847c1663b2e9229f7 SHA512 d92511e98c83f821fe967c8f8a4f19b31b03c464996ab3ee10c4d6c5dd61c8d2f65562a683e3d44dcddca862db69a5f850b361231c2a548edc71d6fa861326fd
-EBUILD rqt_bag_plugins-0.4.13.ebuild 903 BLAKE2B 3758a7b809b257d62052f25602c116973ad72dfcc4f2205e8110804fb3149fae848f1c400d15522ab3af613c622218540d9a8fc399d5116c61ec94f1e43c25ce SHA512 58db500bb8bce1318b64cc656e67b70f833647c19bad1f83dcef607e4949e73555b6ebe7373f1ce9ef7c151fec197c7b0c28b1df2bcda89fac315bdc501046a3
+DIST rqt_bag-0.4.15.tar.gz 51549 BLAKE2B 87e1a5b997efa6e0b460edd11b14608ba35a49e3b404c2df32fa6f5bf442bca271e9329a2a7eea5b21b07488e0b06b7a23e706fa631dc4146c8911a29ddf36eb SHA512 01df2bf2626057ad05a52f0c069b013fd2f9ef00afa57e76b696fc7b66c6b6766a8ae6f880b1fa5493759b53deb87ac4d12bd5c22fe81ea9192f5ae6f91aa976
+EBUILD rqt_bag_plugins-0.4.15.ebuild 903 BLAKE2B 3758a7b809b257d62052f25602c116973ad72dfcc4f2205e8110804fb3149fae848f1c400d15522ab3af613c622218540d9a8fc399d5116c61ec94f1e43c25ce SHA512 58db500bb8bce1318b64cc656e67b70f833647c19bad1f83dcef607e4949e73555b6ebe7373f1ce9ef7c151fec197c7b0c28b1df2bcda89fac315bdc501046a3
 EBUILD rqt_bag_plugins-9999.ebuild 903 BLAKE2B 3758a7b809b257d62052f25602c116973ad72dfcc4f2205e8110804fb3149fae848f1c400d15522ab3af613c622218540d9a8fc399d5116c61ec94f1e43c25ce SHA512 58db500bb8bce1318b64cc656e67b70f833647c19bad1f83dcef607e4949e73555b6ebe7373f1ce9ef7c151fec197c7b0c28b1df2bcda89fac315bdc501046a3
 MISC metadata.xml 339 BLAKE2B 0ab275c9533eaf810c3fd33f5fcfbab2de7d7258604b431cc7a90a5ac63127bf048188835d89237de809b314fc5bff2a3afbea2dae6a7299ada7dbb0183ec262 SHA512 4925d508214e10ae0538559a9d17ed336e721ac3b25375cd4cf94e4437b7f509ccb60aa4865a89cc482817230de827c5adb4c83fbfd63c697c833d19b7da8e16
diff --git a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.13.ebuild b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.15.ebuild
index f0c32428d755..f0c32428d755 100644
--- a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.13.ebuild
+++ b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.15.ebuild
diff --git a/dev-ros/rqt_controller_manager/Manifest b/dev-ros/rqt_controller_manager/Manifest
index 294c03fc56ae..e0c657bbfdcb 100644
--- a/dev-ros/rqt_controller_manager/Manifest
+++ b/dev-ros/rqt_controller_manager/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
 DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
+DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
 EBUILD rqt_controller_manager-0.19.1.ebuild 427 BLAKE2B 3ecf12e6658ea615e3eef0b7fb0e521714a4aa8460f0c3d01685f4837b9783ba2f4a8cadce0d9f51c950c640588d05a0534399a743725029d1399e004df91ec0 SHA512 38034063d79e54980873015db92326b57021cb42604045ce3d7ef621077114feeac1b9bfade11e37055423b9ab2c11f26e1ba36ff0e9ac3ff8c88dc2eeba883c
 EBUILD rqt_controller_manager-0.19.2.ebuild 427 BLAKE2B 3ecf12e6658ea615e3eef0b7fb0e521714a4aa8460f0c3d01685f4837b9783ba2f4a8cadce0d9f51c950c640588d05a0534399a743725029d1399e004df91ec0 SHA512 38034063d79e54980873015db92326b57021cb42604045ce3d7ef621077114feeac1b9bfade11e37055423b9ab2c11f26e1ba36ff0e9ac3ff8c88dc2eeba883c
+EBUILD rqt_controller_manager-0.19.3.ebuild 427 BLAKE2B 3ecf12e6658ea615e3eef0b7fb0e521714a4aa8460f0c3d01685f4837b9783ba2f4a8cadce0d9f51c950c640588d05a0534399a743725029d1399e004df91ec0 SHA512 38034063d79e54980873015db92326b57021cb42604045ce3d7ef621077114feeac1b9bfade11e37055423b9ab2c11f26e1ba36ff0e9ac3ff8c88dc2eeba883c
 EBUILD rqt_controller_manager-9999.ebuild 427 BLAKE2B 3ecf12e6658ea615e3eef0b7fb0e521714a4aa8460f0c3d01685f4837b9783ba2f4a8cadce0d9f51c950c640588d05a0534399a743725029d1399e004df91ec0 SHA512 38034063d79e54980873015db92326b57021cb42604045ce3d7ef621077114feeac1b9bfade11e37055423b9ab2c11f26e1ba36ff0e9ac3ff8c88dc2eeba883c
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.3.ebuild b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.3.ebuild
new file mode 100644
index 000000000000..235e5e6a6f49
--- /dev/null
+++ b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="RQT control manager plugin"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_image_view/Manifest b/dev-ros/rqt_image_view/Manifest
index a5dd505bfa38..8985fde56654 100644
--- a/dev-ros/rqt_image_view/Manifest
+++ b/dev-ros/rqt_image_view/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_image_view-0.4.15.tar.gz 14817 BLAKE2B 00c196bac88eb18f039e88e34d9a943a8e5b052f038682297ecf4c1a31bbb3f25b28a252a6034b774186518a33684f82d94fe89ec2cf6a9449aa961dd2b60435 SHA512 347abc44f930ca2a2d72ed9b8a3c825caf23e0643c80a394c8f74b4452d9549bab8ecc91cf5231d8d51b4be345f3c44783a266cd22c0b1197d3376698b849989
-EBUILD rqt_image_view-0.4.15.ebuild 631 BLAKE2B f8e01de0c3e023c5564b5310558dae31143c45b607702988b6c8de59f85ca67de30b602144a995e992a86ab5ef27b5fdec227fe4ede6deb57448f2d7fed433e2 SHA512 301800eb5b1a8e527505269b703593f531ef84fb9ec88ada2c05ed105598dec3345e6bf48c55a32b012f9eea3b6171b016c8e0aa85bb6fd6734c108b98bf9b3f
+DIST rqt_image_view-0.4.16.tar.gz 14850 BLAKE2B 9e5c9017166db13f3c2c28d851b932a9854718170da51c840a52c17031bd7604eeb4097d2d60d5504d8d0430efc908a0629bb6d9c986884c6bb63449225b6e44 SHA512 62ee991bd613577f0676d55305c6c95f4687aee7990feebc1178dcaa40e85c61e7a76c11b9393e83aaddba4347a16016a126edffb4511c3d38902136eac62752
+EBUILD rqt_image_view-0.4.16.ebuild 631 BLAKE2B f8e01de0c3e023c5564b5310558dae31143c45b607702988b6c8de59f85ca67de30b602144a995e992a86ab5ef27b5fdec227fe4ede6deb57448f2d7fed433e2 SHA512 301800eb5b1a8e527505269b703593f531ef84fb9ec88ada2c05ed105598dec3345e6bf48c55a32b012f9eea3b6171b016c8e0aa85bb6fd6734c108b98bf9b3f
 EBUILD rqt_image_view-9999.ebuild 631 BLAKE2B f8e01de0c3e023c5564b5310558dae31143c45b607702988b6c8de59f85ca67de30b602144a995e992a86ab5ef27b5fdec227fe4ede6deb57448f2d7fed433e2 SHA512 301800eb5b1a8e527505269b703593f531ef84fb9ec88ada2c05ed105598dec3345e6bf48c55a32b012f9eea3b6171b016c8e0aa85bb6fd6734c108b98bf9b3f
 MISC metadata.xml 346 BLAKE2B a79e94b137d03773101db1b1312e511a6b3d489b49cbf26b3b5e890dc3970ea8425985cb04ad705ed7e0f9bc8c18bf07f5f5aa328b359d37c4ceac3e36516f3a SHA512 dd45aa50e58a93d0f1fb637248f842b21d39547ac94d4e183ad110515fc2f9ac6f325d8f894c6103a5366d791cd8765291f2b9c6ac74761fdc5f83220297013e
diff --git a/dev-ros/rqt_image_view/rqt_image_view-0.4.15.ebuild b/dev-ros/rqt_image_view/rqt_image_view-0.4.16.ebuild
index 6ed30f7ba659..6ed30f7ba659 100644
--- a/dev-ros/rqt_image_view/rqt_image_view-0.4.15.ebuild
+++ b/dev-ros/rqt_image_view/rqt_image_view-0.4.16.ebuild
diff --git a/dev-ros/rqt_launch/Manifest b/dev-ros/rqt_launch/Manifest
index af7d01aae742..f45bf01c70ea 100644
--- a/dev-ros/rqt_launch/Manifest
+++ b/dev-ros/rqt_launch/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_launch-0.4.8.tar.gz 11471 BLAKE2B 8a96bd774449ffd8988bdde6c2be5cde3b69d819c94eb59ed8be4e179839da9b1eaa959174307481dfe438a5a300665ca1154f500c40a6d2546b6e83f163c2cb SHA512 83a40eca2c2282f2e5e397332b5b61b60ac27312b31ad21c21f03243e1b28961d96ba93f4e8c5043e05791c85d1fa88fee461f4b457934fcb68e47a60239cc89
-EBUILD rqt_launch-0.4.8.ebuild 633 BLAKE2B f6d805fd8533bd751bfba0fe241bc86f711098ff4705f50c674b09a64734feca3ed152c0ebc00aecf33c37416417ed9f79253379f7a8a88bc3c22457eeb6aaeb SHA512 0f9f7d1e2fa2ca4a097c2961f43b61dec14683306bb08ff41c45c332dc7d4c383a3842f356e27563d9723a92153f69358099dc1318ad026afd33668e181d7a9e
+DIST rqt_launch-0.4.9.tar.gz 11629 BLAKE2B a2bcb23e5051d43656e636ad654262d68ce69f6edc1ebb24698701564fcd2cec57796019c3cb8c723b697290680365d2b26a38917f19747573609dc04c194f2b SHA512 927ef766836b99686f8c5c8c4ded0bfab5825819f72ae15c0aee817d43f36b280a2143df0e59fe17ab20e4e57ca8002cdf18b6a485f95155e199e062b71fd9b1
+EBUILD rqt_launch-0.4.9.ebuild 633 BLAKE2B f6d805fd8533bd751bfba0fe241bc86f711098ff4705f50c674b09a64734feca3ed152c0ebc00aecf33c37416417ed9f79253379f7a8a88bc3c22457eeb6aaeb SHA512 0f9f7d1e2fa2ca4a097c2961f43b61dec14683306bb08ff41c45c332dc7d4c383a3842f356e27563d9723a92153f69358099dc1318ad026afd33668e181d7a9e
 EBUILD rqt_launch-9999.ebuild 633 BLAKE2B f6d805fd8533bd751bfba0fe241bc86f711098ff4705f50c674b09a64734feca3ed152c0ebc00aecf33c37416417ed9f79253379f7a8a88bc3c22457eeb6aaeb SHA512 0f9f7d1e2fa2ca4a097c2961f43b61dec14683306bb08ff41c45c332dc7d4c383a3842f356e27563d9723a92153f69358099dc1318ad026afd33668e181d7a9e
 MISC metadata.xml 342 BLAKE2B fae2903c0945afe03caecb1c3464346a871500c9e3d117cc4b91fa69cfcc6932e255064b90ce5996b242e56279f862e248b9fc87ccead7c0d3ec163810393bda SHA512 aad741d410634982fb90b906e217598f08f8ca899c8d23cc67c5d955e8c81d1d414c3d7c01b98d0b50b8fac94ac08e089f62b6d27001733f18d50c75e73f94ea
diff --git a/dev-ros/rqt_launch/rqt_launch-0.4.8.ebuild b/dev-ros/rqt_launch/rqt_launch-0.4.9.ebuild
index 3a4d4bd89d35..3a4d4bd89d35 100644
--- a/dev-ros/rqt_launch/rqt_launch-0.4.8.ebuild
+++ b/dev-ros/rqt_launch/rqt_launch-0.4.9.ebuild
diff --git a/dev-ros/rqt_robot_monitor/Manifest b/dev-ros/rqt_robot_monitor/Manifest
index 25c24581dea6..558ed3f587e5 100644
--- a/dev-ros/rqt_robot_monitor/Manifest
+++ b/dev-ros/rqt_robot_monitor/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_robot_monitor-0.5.12.tar.gz 14917 BLAKE2B 8864165fc491bad7a77e12a769d63e5b404d02cd96ef4dfa33c87ed9e2417ba4bd9a0dfc0cf53507c32e5216e16c8b9f89ee4bb5e762fa4049d846f98d0872c4 SHA512 f354e30a85d6bf8e3f15bbd7b97051b02a3348b37a559a53c8942f5939525e046295f5c6e03902850b137dc705bfad94b5e2fd0554ecfe32e24296c2656ee1b5
-EBUILD rqt_robot_monitor-0.5.12.ebuild 845 BLAKE2B 383aa16befa5d9bdfe89644a275d7afdfd373c1382228ec61c7ff06c0560f97ae5b20db6f25a6e5964773b15f228e6f19f480ce787c3468e3f6d7fbdf63736b8 SHA512 dfee20b821d73999a195c3a06694d579097acbe70bb79a5d73ebaae31a0db522c20a41bbcb7d2fd70c72fdca65ec354295bec5ae80a979350e78f843a51c90ab
+DIST rqt_robot_monitor-0.5.13.tar.gz 15140 BLAKE2B 6c59e7a65cc709d48148df1f757261e5fe70872106b6fe2fc5b1d809340a62321c9d56bf245b5d9fedc87113fd18b5e0ce279245794b2a678f405ea409d72531 SHA512 68b9c57130fed3c4e16a437038c5498ec069440c5064470cc442c051387988f1075dec5dd65191d332c68554d76d2be091d90f5cbc9e2218e849a42ace069045
+EBUILD rqt_robot_monitor-0.5.13.ebuild 845 BLAKE2B 383aa16befa5d9bdfe89644a275d7afdfd373c1382228ec61c7ff06c0560f97ae5b20db6f25a6e5964773b15f228e6f19f480ce787c3468e3f6d7fbdf63736b8 SHA512 dfee20b821d73999a195c3a06694d579097acbe70bb79a5d73ebaae31a0db522c20a41bbcb7d2fd70c72fdca65ec354295bec5ae80a979350e78f843a51c90ab
 EBUILD rqt_robot_monitor-9999.ebuild 845 BLAKE2B 383aa16befa5d9bdfe89644a275d7afdfd373c1382228ec61c7ff06c0560f97ae5b20db6f25a6e5964773b15f228e6f19f480ce787c3468e3f6d7fbdf63736b8 SHA512 dfee20b821d73999a195c3a06694d579097acbe70bb79a5d73ebaae31a0db522c20a41bbcb7d2fd70c72fdca65ec354295bec5ae80a979350e78f843a51c90ab
 MISC metadata.xml 349 BLAKE2B 6019f392e319c3986723ef46e8c93a47ca404f177fb455c2bae087a6b392eb0b9d5a8561d1d064721109397a67246b8e43d495a0b0c32d49204e554de3d6208e SHA512 5bfd04997cfd615160f709201b7a5585e501ff3b1f861f46cad14b0fac73c6fc44e6dc1eb92c90a2dfa3fcfb948cbbd8d8bdb7bdf1a6de2f835eda65ede1181d
diff --git a/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.12.ebuild b/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.13.ebuild
index a0787380331e..a0787380331e 100644
--- a/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.12.ebuild
+++ b/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.13.ebuild
diff --git a/dev-ros/rqt_tf_tree/Manifest b/dev-ros/rqt_tf_tree/Manifest
index 3627c0272f56..1fcfd5e4bbcb 100644
--- a/dev-ros/rqt_tf_tree/Manifest
+++ b/dev-ros/rqt_tf_tree/Manifest
@@ -1,5 +1,5 @@
 AUX yaml.patch 626 BLAKE2B b6fddb180dc4a058e2bc7691f875d8b5eca4191a78d1bf4656aa9792f63caf2a6be1b39342f406a0bf0298903df04e9498693edcfdb4f726545f1527ccde6256 SHA512 05dedc11ab9f5c249ab7eefa28f2abb7bbf9fdea66fc81fe10892afc590360bd251385b936d8a987150b75b74a088aff51c02bd2ce94d87a0cd5b43b051827aa
-DIST rqt_tf_tree-0.6.1.tar.gz 8469 BLAKE2B 0ff1291f982ba0338b75997df868f623682007cbff29b90465aef550463ab8082ca1c068fe4cbca3cfa4a5b46c132cfef089af948300a7e8f1f919933cc1ade6 SHA512 22441bd7313c250f786060d09eb170a42b85ec5414b24be2db1ecdb6d1336acef6a879513793f6a60ddd875ca7fbd1c6b0ac2bde759968440c6c638c62c6c89b
-EBUILD rqt_tf_tree-0.6.1.ebuild 895 BLAKE2B 1284f4d9e1da5ef37cbad13ef0c3bee4ef4040091895de85f995211688146d03fae8dec00f0d16703e7bd5a6c9a2fcaaf9a7f4bf82a9d6ba56d344f6b04ebcc7 SHA512 836bac913c95f3a3393bd273758b2cfe58b901788a395076f44e0fd7118549fef55bf06edf451c54e92f2e6d15985acfdca1fd943989482975e7e5c7e47d6084
+DIST rqt_tf_tree-0.6.2.tar.gz 8513 BLAKE2B 31207aaa5152c82fd0f728f12348110c7b161b2b36b74330876ccfd8044c98d177341d1ab08860275c6db2f1a043f934b9c2354efa431ea46697fa6af8f29d4e SHA512 1aa03dd674dbb0122c24dcac363850d08b04f2b1aebbfa0c1d3baa3c4b1c9e802a45dabb638d149c03386415601c4751e67b0edae00a577792a37867fb76b69b
+EBUILD rqt_tf_tree-0.6.2.ebuild 895 BLAKE2B 1284f4d9e1da5ef37cbad13ef0c3bee4ef4040091895de85f995211688146d03fae8dec00f0d16703e7bd5a6c9a2fcaaf9a7f4bf82a9d6ba56d344f6b04ebcc7 SHA512 836bac913c95f3a3393bd273758b2cfe58b901788a395076f44e0fd7118549fef55bf06edf451c54e92f2e6d15985acfdca1fd943989482975e7e5c7e47d6084
 EBUILD rqt_tf_tree-9999.ebuild 895 BLAKE2B 1284f4d9e1da5ef37cbad13ef0c3bee4ef4040091895de85f995211688146d03fae8dec00f0d16703e7bd5a6c9a2fcaaf9a7f4bf82a9d6ba56d344f6b04ebcc7 SHA512 836bac913c95f3a3393bd273758b2cfe58b901788a395076f44e0fd7118549fef55bf06edf451c54e92f2e6d15985acfdca1fd943989482975e7e5c7e47d6084
 MISC metadata.xml 343 BLAKE2B 91fa5f7b77b6bf54278e18b894d5c45bf8f10d7cf8b575f1bd46739ef2ccb479c1790f0101f3d38508e978b8f3f86216189ce58ac87d46e30ddcb0ac865016fa SHA512 2d95857675c40435840997f90568071873801c690e386ff1ba5eaeabf31ce1d157b7eeb9f15126979da1939923924718f6a1397c0e18213cab236e98daefd869
diff --git a/dev-ros/rqt_tf_tree/rqt_tf_tree-0.6.1.ebuild b/dev-ros/rqt_tf_tree/rqt_tf_tree-0.6.2.ebuild
index 29eb0bd0e67a..29eb0bd0e67a 100644
--- a/dev-ros/rqt_tf_tree/rqt_tf_tree-0.6.1.ebuild
+++ b/dev-ros/rqt_tf_tree/rqt_tf_tree-0.6.2.ebuild
diff --git a/dev-ros/self_test/Manifest b/dev-ros/self_test/Manifest
index 9c5238d071a4..64a28d7ab808 100644
--- a/dev-ros/self_test/Manifest
+++ b/dev-ros/self_test/Manifest
@@ -1,7 +1,9 @@
 DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
+DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
 DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
 EBUILD self_test-1.10.1.ebuild 582 BLAKE2B 526815fa4ca6aae1ecf495401e0f4b577ec7e98fcb80dfc5935451f4bf6787b4640f9360e0045839dc133f3bbe01b61a668b140c1cd4fbc14a64cb6d7defe5e7 SHA512 c68bdd649d682a5bbf07eddd0fafcaf89ea7d916362316d1e5db6ddaaacc50025162652779c033be5c7a31d8c5430400ace3355670f4d56a347ede191eef3162
+EBUILD self_test-1.10.2.ebuild 582 BLAKE2B 526815fa4ca6aae1ecf495401e0f4b577ec7e98fcb80dfc5935451f4bf6787b4640f9360e0045839dc133f3bbe01b61a668b140c1cd4fbc14a64cb6d7defe5e7 SHA512 c68bdd649d682a5bbf07eddd0fafcaf89ea7d916362316d1e5db6ddaaacc50025162652779c033be5c7a31d8c5430400ace3355670f4d56a347ede191eef3162
 EBUILD self_test-1.9.4.ebuild 582 BLAKE2B 526815fa4ca6aae1ecf495401e0f4b577ec7e98fcb80dfc5935451f4bf6787b4640f9360e0045839dc133f3bbe01b61a668b140c1cd4fbc14a64cb6d7defe5e7 SHA512 c68bdd649d682a5bbf07eddd0fafcaf89ea7d916362316d1e5db6ddaaacc50025162652779c033be5c7a31d8c5430400ace3355670f4d56a347ede191eef3162
 EBUILD self_test-1.9.6.ebuild 582 BLAKE2B 526815fa4ca6aae1ecf495401e0f4b577ec7e98fcb80dfc5935451f4bf6787b4640f9360e0045839dc133f3bbe01b61a668b140c1cd4fbc14a64cb6d7defe5e7 SHA512 c68bdd649d682a5bbf07eddd0fafcaf89ea7d916362316d1e5db6ddaaacc50025162652779c033be5c7a31d8c5430400ace3355670f4d56a347ede191eef3162
 EBUILD self_test-9999.ebuild 582 BLAKE2B 526815fa4ca6aae1ecf495401e0f4b577ec7e98fcb80dfc5935451f4bf6787b4640f9360e0045839dc133f3bbe01b61a668b140c1cd4fbc14a64cb6d7defe5e7 SHA512 c68bdd649d682a5bbf07eddd0fafcaf89ea7d916362316d1e5db6ddaaacc50025162652779c033be5c7a31d8c5430400ace3355670f4d56a347ede191eef3162
diff --git a/dev-ros/self_test/self_test-1.10.2.ebuild b/dev-ros/self_test/self_test-1.10.2.ebuild
new file mode 100644
index 000000000000..508f8474c698
--- /dev/null
+++ b/dev-ros/self_test/self_test-1.10.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Robot self-test node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_updater
+	dev-ros/roscpp
+	dev-ros/rostest
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-ros/rostest )"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_diagnostic_aggregator/Manifest b/dev-ros/test_diagnostic_aggregator/Manifest
index 584dd91e583a..90a5dad761a8 100644
--- a/dev-ros/test_diagnostic_aggregator/Manifest
+++ b/dev-ros/test_diagnostic_aggregator/Manifest
@@ -1,8 +1,10 @@
 AUX gcc6.patch 487 BLAKE2B 9301c9e8e22bb780ea2d91a0055fc0f2f03af1ce3fefeb3bf8c5d53d544f1b73b5420a3cf510c6adc71a615ddfea2894c9ff1fbc4655a403b5b599753a25727e SHA512 20b0cf8ed7774493fa0626fd89932368d6bcbb50e4719cbd29c58012d5bd60357392984959452f8ba12266c54cbd8d825d972de2a3f46f067bda164868d32f86
 DIST diagnostics-1.10.1.tar.gz 536607 BLAKE2B 6a69163fbf60820839f1fc7071b6ea9df7b70cc2979b42648ac56d0acce820af69595b2a9e4d11b9752d4d85bd19276ccfcb6a57a523e7d69354fbc64414fec4 SHA512 a45d41a0ba3b879ab3228bc3d3152cd59d7145b96f9a5b1798eb1d9aaba8dbd6234ec3692c1a84289d0f543eed3adb0ca4dcbd1f1b6ceaef54af7866e1ad9ee7
+DIST diagnostics-1.10.2.tar.gz 536910 BLAKE2B da4de61798d0022114573ca7360f48afe0a7b62f56ac2e9830182dfd0cdaf2f7985b549807028360d8edd97ec3630465eef0d02c51333ffedf0809f235a11f26 SHA512 5a88cfe6f2bc71ae71e3d7aad6c83c6ac17fb2e072b8ba1ba97b86cb8e6f7373ba2c4b6889d0253f062119c86459880485b1afc682747f91c2eb7acdb9e71d3c
 DIST diagnostics-1.9.4.tar.gz 533933 BLAKE2B 07effeceaa55fd86995a1202777a926c4474e7fe4bba1e013ec5bd6191ed7b39ab6a6e7220d9a48a97c79beec3965ba0bd639e3e56ad64d061730a9a40258e49 SHA512 1438e7b81e74f86a90a8528cf363b94149657f178fba58b532909249c2a9841d4225c0169ff78914ac695acc1494a89b06f0dee145a4b3b00a0c7efaebe0d467
 DIST diagnostics-1.9.6.tar.gz 534544 BLAKE2B 25cf7d15033dbb265d5e75d137b344f0a22b63bafb5ecf67d4cc24727ce03f83a0fc040c571e67ec703f155139d158ba415c9005cfc5937cd556b55fd60bc4a4 SHA512 f239504c9920b9c6582f24a322b8bd24c671d6e7dd29f144bf506a051356456e902ddeb0cb122be0dae1d2d3418da33cd5237229bf017695cee48289358bbd4b
 EBUILD test_diagnostic_aggregator-1.10.1.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
+EBUILD test_diagnostic_aggregator-1.10.2.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
 EBUILD test_diagnostic_aggregator-1.9.4.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
 EBUILD test_diagnostic_aggregator-1.9.6.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
 EBUILD test_diagnostic_aggregator-9999.ebuild 649 BLAKE2B 1c3b7c46e8ba5b1df790052e54fcf2ca934799839453fec449515767cdd8b84d1914086015d55a1af815d186bde05b602d2116e818e6eaebacb1bdbf4fac1edc SHA512 baaa1eb697a3deb8ca6ff764d5c734f3b115918b8a247d88521a4f6d88d0955d6d81f6d0fb52e69f579891cd19b41ad81aee1de7e559c48c8795cd204839c03c
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.2.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.2.ebuild
new file mode 100644
index 000000000000..fcaf935a3f4e
--- /dev/null
+++ b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.10.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="diagnostic_aggregator tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_aggregator
+	dev-ros/diagnostic_msgs
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/rospy
+	dev-ros/rostest
+"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gcc6.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_rosbag/Manifest b/dev-ros/test_rosbag/Manifest
index 687dace6499a..32ae9bd5e7d0 100644
--- a/dev-ros/test_rosbag/Manifest
+++ b/dev-ros/test_rosbag/Manifest
@@ -1,4 +1,5 @@
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 DIST test_rosbag-1.15.8-chatter_50hz.bag 28923 BLAKE2B 2a2304b98d33b902fa3b8fc4d2a0fa3da9af600ab9f66ebf74ecb2214160346d10a0ba58d2b8dfb7039dcd7ca05e58bf7b253899238dabab1c29264970b124b7 SHA512 7493e773d678aed10ca274f8a253a412846c90fa238ac7407b04f39355b94285b40b177ae45a0a5b5ae1c2fe2d74284fba1c082550f21dd30cf5e5891ef402e1
 DIST test_rosbag-1.15.8-constants_gen1.bag 4783 BLAKE2B fec06b1016d0a6e616893f050c22072ef01cc4bc944f3778cb45613d699e404b8721b35f9563f22fa87e473f9f439965ba804cc6478c59dbeab95309375046c7 SHA512 724a420e99946a5fba1b092363cb11af11a50e85c4531b57fe64b207ed1e4022e35a870014873919a7bfe3680ae0b5b4275777f3305b8c5d1fdd7316e7d67e7b
 DIST test_rosbag-1.15.8-constants_gen2.bag 4783 BLAKE2B 6db44a7ddc61307f49bb28e276b8a834044b43d79d37ceba0aef21c8dea8a6d3ee32cc156f8bc429f074752dfc5a249b789936a6d8bf5e11397c2ee4f0e7d925 SHA512 a0df68425bf268da7d622ea43fb755dd7161bf3443c5c2499862c8932ce5e86e4edc6746a9f4a6bc4b4bb9c070a2b3af26d26755e18e796600184f280579aedc
@@ -34,6 +35,41 @@ DIST test_rosbag-1.15.8-test_future_version_2.1.bag 6051 BLAKE2B 5368be834eaaf7d
 DIST test_rosbag-1.15.8-test_indexed_1.2.bag 142311 BLAKE2B 51e4f41334a4191a02e6cd2723ff7a38ea6b99e272304ff8be83641d31d3c4bc3bbddf835923da447d274d27253d0cf162ff065e6f952799c204a6d3b8a429bc SHA512 8c2b6973e549d1b5c2e1fe5f6873c40b7877fa87e7864d39e86646083baf481ecb3d9c1fc4ca5d44332b3b4b0f41856dd5dd2c71ce9f2281fdc61c9846bcd5b8
 DIST test_rosbag-1.15.8-test_rosbag_latched_pub.bag 4816 BLAKE2B 2a0a90eb46665486ac7a31249d7bc9c3c4f125c934a09e3fb0130bf43b10035552f9de0f0fd8280cec4cb1eb71fc7dc624ba1152724e602a2483a2df63869c3f SHA512 e1655185e8ea6a02aaccce4e819eb6d6aec48032f4f55e17d7c8649aa0d0b56eded659a97e2f83c7d04e221beb8a330bce093300d422c63f3b330f5b2b8bb8ca
 DIST test_rosbag-1.15.8-unmigrated_gen1.bag 4828 BLAKE2B 0fc0e446f8c31fef4b21a669b15a86340d0dcff2406a85f88ccdc84e6f3ff4a71252151d191c30c9879d2ce3031faf9101aaa22834cdd733491a2f92d53a7a04 SHA512 333dbf41976ae732e33f394883965d9d07bfe35d8f3c5be1bd129ff4ded31f8c8201b9fdd8bee7ecaf7f04f49d0ee7c7d2be1ec4c8322d0b0b9cc0a236fe8342
+DIST test_rosbag-1.15.9-chatter_50hz.bag 28923 BLAKE2B 2a2304b98d33b902fa3b8fc4d2a0fa3da9af600ab9f66ebf74ecb2214160346d10a0ba58d2b8dfb7039dcd7ca05e58bf7b253899238dabab1c29264970b124b7 SHA512 7493e773d678aed10ca274f8a253a412846c90fa238ac7407b04f39355b94285b40b177ae45a0a5b5ae1c2fe2d74284fba1c082550f21dd30cf5e5891ef402e1
+DIST test_rosbag-1.15.9-constants_gen1.bag 4783 BLAKE2B fec06b1016d0a6e616893f050c22072ef01cc4bc944f3778cb45613d699e404b8721b35f9563f22fa87e473f9f439965ba804cc6478c59dbeab95309375046c7 SHA512 724a420e99946a5fba1b092363cb11af11a50e85c4531b57fe64b207ed1e4022e35a870014873919a7bfe3680ae0b5b4275777f3305b8c5d1fdd7316e7d67e7b
+DIST test_rosbag-1.15.9-constants_gen2.bag 4783 BLAKE2B 6db44a7ddc61307f49bb28e276b8a834044b43d79d37ceba0aef21c8dea8a6d3ee32cc156f8bc429f074752dfc5a249b789936a6d8bf5e11397c2ee4f0e7d925 SHA512 a0df68425bf268da7d622ea43fb755dd7161bf3443c5c2499862c8932ce5e86e4edc6746a9f4a6bc4b4bb9c070a2b3af26d26755e18e796600184f280579aedc
+DIST test_rosbag-1.15.9-converged_gen1.bag 5197 BLAKE2B 99b3a9807b2e569f6773b791b008b1430408843037203a257892c82a6f59dd3e688a4f516e91d26fa567b56bececc3f69d69f4999e7a1e1430a9a606686a8de9 SHA512 490677292a7ea95109e7542e1219f51d7de9cf3bfbf90f48836fd80387655752ecb1173cbb65fc40908eb552fe1bae45e821c1b8510a401c7b643d2c0c433881
+DIST test_rosbag-1.15.9-converged_gen2.bag 5197 BLAKE2B e5b620a47c7f44911e5ee44c5787cd9ff753763816535ddaaf64f5e83a27504a5f6d241d900c0c3eacc5b9273113ad05f72cd828a4ebfb6d997df46fbc8b0cc7 SHA512 2779711e7d1223b14223312e1cbb6222ef6fdc32bd28dab6cb830784d5207f5ec7cc826e1336328520a45b15ddc937bf0be7eb8329932b77b9f1f42d162b7795
+DIST test_rosbag-1.15.9-converged_gen3.bag 5209 BLAKE2B f6d3615c771b086220350982c5ff726f263a460a714aaa3abcd683216dbdeaa72ddfd2fa2b42e761f82223af29ffa1bad554a67fc6afab52f08ffd1718fcadf0 SHA512 d896b361c73ba904c1766c9899d03f09d7ce62126378c195c620b659ff06dbdb61783ef7cddd999088a973382e60387a8eadd1d7dbd67af2d7af6c1c1fa87b6f
+DIST test_rosbag-1.15.9-converged_gen4.bag 5207 BLAKE2B d25369cfa2e0f34ab7b344ac56557292ec1b5609802327ade48d60e632900e4d746e15c9a46b700a44c198d1aef1975b042efbb1ca885f4124b5cef4936925ff SHA512 329694efa2dd1ad82a87f1419958bc2cb1edf4d8ae4ffde1c2d3d3b792d1dcba842b82c9f028cf3bb2f85fadbb068e5ed25eaebc8cd6e305c422d40dbeb75775
+DIST test_rosbag-1.15.9-convergent_gen1.bag 5485 BLAKE2B bd906d5ced9d123e04fa8b948834b907530ba2c56f4197f7ff209ec5d6afb18ff42e29d03f883d2d44e89e49c12e3769013f8209e5a674a7fd138d0264083295 SHA512 85a4129f954d4d3a2374c1c2c7fbdd82ee685853763ab62a836ab128b1dd118746984d1c1b8290ac1b522fac18493e1ab825b1a66924151dff608af0a5e07541
+DIST test_rosbag-1.15.9-convergent_gen2.bag 5485 BLAKE2B f5f6c3ed07b8cabca79fe826dcb7dbf0a9e3d7aed1d3bb0767e47a1f269e5c198de90f6e0052911f4148238b99bc3f48ea417d9a1642efb5bee74d5b5f9e7b5f SHA512 09fba991e4efe5758082f9af2501b0bc9ea452b247e3672b8eae5cef3d8d43ebbc0c7307bcb5730f1ec9a94e86506258d04e1cb25fb8d5f680f38b4b73e96c68
+DIST test_rosbag-1.15.9-migrated_addsub_gen1.bag 5031 BLAKE2B eeaff544bc0de8f9d058ebec594318b9ea8ee383f8b5083258de9dcb0068d1d6c0169cf97cc221675509932c8aa630e13958a2e82f413d6e834b3114c4702824 SHA512 b41a4a5651a97f70774c1395c8f9d5b0f4815f7e39052904fe1e89483270f9eb5216a6bd3652c2372c6c64666b4cc5e60d04f390f5ea83f88653035fa1a432fb
+DIST test_rosbag-1.15.9-migrated_explicit_gen1.bag 6172 BLAKE2B 9d5692ed7683a8a426467969488836102c56d51878c1c2d28d60f5a66a3429395cadfff75a177003238e1184ef1ff927479fb205a28e359c9e4efcbd41a1e767 SHA512 e11282b83feef48c039d34400216406537704ea5bcc10e62434bd2917a9ee0942a67315a8667d0ae7e76da178537b01f88a638f5e360663e51a438a4c6049661
+DIST test_rosbag-1.15.9-migrated_explicit_gen2.bag 6212 BLAKE2B 97b231a06d372d813dbfb6c80a6c293dda743ba4ad436ac0e265c37650461bb83315304f25d5a299eb4d82e59e6a776b4c7a66ace154aa6fb9d75bff10e45e06 SHA512 690fdad115ac672617bad2510e139f5cf67599b4e21a56dafd45bfda9f1991f4fc9251dc41c36834931402722261b008ff0ea283afd99daa3eda20bb357810ed
+DIST test_rosbag-1.15.9-migrated_explicit_gen3.bag 6220 BLAKE2B 7f9ba4eade5e2e7c03b2e180f1507cce58331493a2dddc1213a6ed5d8a46d198569ef5d5effe398c97c372adcbfed756649c35c0ae38362f017cf768faebc30e SHA512 35911f4d68eda67a49cfa03ad65c6b6a84e74f161b38839fed7a1ceeadd10715f4d82b124d640f7cfc356f107e376ea6bc9016c1be32592fe2f6865d5bb8f868
+DIST test_rosbag-1.15.9-migrated_explicit_gen4.bag 6359 BLAKE2B 156e06ff065827bea0797c6f55dfaf37cb973ac07085cb56d4f3c85eadf1c994cf859e0e7b85bf65234a52b56cf4632d2ce2c8c05c172f5c838c403fdb83fc42 SHA512 5dccc7f8bd03ce08b584a69d6a9e54969bd014d22d7af3e1a9b09d9c42ab4029cf13205f56ea81913ce47c6a5f383d1c9082feb8857fa0d4f1459f97d2f4460c
+DIST test_rosbag-1.15.9-migrated_implicit_gen1.bag 6690 BLAKE2B b6d9d8dda4bae2d41aa81928daaada62da89a7be38e8f73ed9c2c2bb7c652d194eb7afd201ca0c0283ee88a77e103d8ccb86c60bffa4adcacde7a0f7f3b7f56d SHA512 a09816ef8c00b0005c1ee42b4d33739b776e6b8792f34f3c5e70ffb91ebc4c4e3c92396d733c3fe4314bd646533d71ede9cae57faeb8a311a25e13421731aeb6
+DIST test_rosbag-1.15.9-migrated_implicit_gen2.bag 6740 BLAKE2B 2f3d4a397188454f6ee4f2cfd2438361a3ce83b4e7d124feaa15788f6e49a074db433d8e87b43961984b0c243cd02651abb26ebeca0a51eeda9b61cc7d786f8e SHA512 da0fad58643a06c8c15ae6b13530b3e879269602b6dde750ec2706087206db82bb8f4a386830b36426c98fdc71eb6d2fcf6d2ee8d0be230beb3855447acc3bb3
+DIST test_rosbag-1.15.9-migrated_implicit_gen3.bag 6752 BLAKE2B f5f7c56815dd1e9bd277cde0a91dd53a68c342527578123ad25ec981c30486ddeca774c7d4f8dcf0606d189b14e235f349490f47ceb3a191250cada8f82c32e0 SHA512 2068238ca893201d24ed26b17d8b94e13a82d9f556352572da8c44e2455f75c984454bb09074b688f11ec0a7a5e38791b669f7cdea98863d0c301917ffe5d342
+DIST test_rosbag-1.15.9-migrated_implicit_gen4.bag 6889 BLAKE2B 6f8dbc6f2920d10535c8574470e23d3007033942949ef599437dde5fd64b860139f79a9835e255065fe3c74445ef702c3793f0adfc972f88fa7046c081ec5976 SHA512 4fb2b1f78b4cfd5b155415724ab224b6d619a44af94ade80f8bd6ef30b46e498633a5457d8f939c96902a641e0fd45cac2aa8e4e7f7a26efb6c78109b2dcd4d7
+DIST test_rosbag-1.15.9-migrated_mixed_gen1.bag 7120 BLAKE2B 1788a394a5cef74864071994a97fa0a7df28167531261636b74cbb688e0e62902e2e9577f09d1546b3f3dbb0533332b8c5aee47f01a30606744cdaaa5c573a0e SHA512 a8354f9386fe2b8da148919cc036041570eb999b94be162ee06b2abfd5f0b150fe96af45530c18b86eafda2e0299b8dfa8faf1cf3ab1571a0f62f17e6ba1147c
+DIST test_rosbag-1.15.9-migrated_mixed_gen2.bag 7178 BLAKE2B aa251ca30288b42d91f5bc37e672551a90575b10ecb058042deb88b45d41a9dc38c5e17081780ca75436cee886f71e1405f7970ac1025693fbc94f8444aaed60 SHA512 fd1ffb05ea65a798c07568778da71b6f3d5c7cebd4a541ace4d800b2eff3c9ee3ce1b1b21017e4aab73438ab3005d6cf966993a7b17afce16c5b788354c5d868
+DIST test_rosbag-1.15.9-migrated_mixed_gen3.bag 7252 BLAKE2B 29896d975cd406b525e8e59e24d26817a9a13b84833d9c08733bfc05be392d6e0be6de5bbced5068bed33ae60ce4053922c8092f259a48e23ae796ac43e8e601 SHA512 d0a5fd042c614e6451b9b6518ecd3317a727939db81fa8988c700a657be77f9cc14127cd0595c97a505094df9e96b63f79381be2da3717e34f3481d521905518
+DIST test_rosbag-1.15.9-migrated_mixed_gen4.bag 7387 BLAKE2B 55de46bbc4e115113df7ccac4c08e61308e7c06ddde1f6e69a436b4b32fb296b9f60d029473f46cf37b0894e501040f4e748302a9d7c8c8684911983860519c1 SHA512 5f106b3a64968ced5baeb0f91dac7209af508c6cdc2c3148bd9c86421024051f2bd7d12027af2857dd1e49964babb330333e02bb94a120426763695c06bd31ef
+DIST test_rosbag-1.15.9-partially_migrated_gen1.bag 6568 BLAKE2B c3d16f271e035140ab802123d7d848d4d7c0e00841edd0282c632c92bbe030847bd879e7e7ff24f6384f9f2f34a9dd38bb7b5e281de9df7203d2c43c28600fa3 SHA512 ecec0e8c3ccd4613048d300417218488a3578a131ed0bd346cf07dc6c702abb2354288558e56ffd6c192abb1e2afd7084a856eecd51a935e207936b5e3d52e32
+DIST test_rosbag-1.15.9-partially_migrated_gen2.bag 6616 BLAKE2B 846b84e3d221b490d3f7b90083d5354ea21906b51569fa9c57642c6e52d06e3caa4a68b3f0fffbb5c808bb440fd17507c80a60a87bd0cb8207a14eb01418de24 SHA512 aac71997873669661eaab2d0f463e3e5afb677c9852a572fd9f139a9037d3e26e2d2ae8b9e16c204eae8f494a1a867638e5f7750293ccec27402dbea0804e712
+DIST test_rosbag-1.15.9-partially_migrated_gen3.bag 6707 BLAKE2B 6d5df33b8def73503cc35de95b680607cb7d687a16082558dd95b8b869866837cb584173088ee2a2c2d9f7ca21193eea287bef111103f8bacec2aa635cbe3e68 SHA512 e730b1b0604253286b4e53d917f01bad10cbe81b8b1547984657bd8e90112c20e1b24ba315aedccc1495374070fbbe6f7b8e51cd68e82986f68efd0785b7386d
+DIST test_rosbag-1.15.9-partially_migrated_gen4.bag 6910 BLAKE2B bde0ec1f776c109cd0c21cf4ce87b3f363c50b0eeebe004ff0060713204391f88fdae3a2a801dd6c4530f3eaf0ee74bd51ecb31ef78c34ced7a26f2a6c80de4f SHA512 42e894acacc8e974f495d8c2ca088b89a71506996f10dbfac431e6bd48af2338b2e8b7eee4c5a40098b04086c47e63f2f80f228ed39a0db4c197a47081c69f4a
+DIST test_rosbag-1.15.9-renamed_gen1.bag 4825 BLAKE2B 37b156027af0b490e00611eb31cd407cf576dd2be1abe77f3a2ca01e04e19f0a498163673928bd82fc660e38c7f9b9f7745f0b5bc2c3b5254e3d41f575561510 SHA512 99c6b187a45ac4d56544b163a876107be744d12515ff4baa6195857796d81c3b7fa0f75369c945a2bdf2954429129f5802a8a8ac6ac3a69ac1bd6b7feeb05173
+DIST test_rosbag-1.15.9-renamed_gen2.bag 4825 BLAKE2B 8a1ee3a3e421f0c2b298fcc9a4260dd76cc211c05e5d944f76f3f7d1feb461b439a5a6dc7dc545295237756510383042ab86e590e879ad35b6cdb8131d054ceb SHA512 c64b77c215c08c443d674bb12e9ac50a5fb234442c14cdea77e2936eabfe8c369947902ff6c9a211d8c3b9aa93f5677dadf8bb3b8145fc3a4b80f6c4f235e6f8
+DIST test_rosbag-1.15.9-renamed_gen3.bag 4835 BLAKE2B 8884b8fa15c3698a1d1fb19147fb2023cbd2946441ad9d4df2ef5ded3c455b2bce5a5cf6618f6e47729dc495b20b8f55a1750c4763ab4fb65c25d2a1f01de011 SHA512 67142debaecf05b76a42cf198572a9ff4bddf4c4da0b798e467f02ed5aa8ff2b6fabc248fa5caa33f346560edac1b3f38eb72ebae75b0224f6b281e5c21211a3
+DIST test_rosbag-1.15.9-renamed_gen4.bag 4833 BLAKE2B 72010f49332c337f998c4dd54a3399773e893f4f41ce01f7b130861993684641ff575c65e8bfcf1127a8dd590c0152ffcce08dfcd124e7a43c9ae8443983438e SHA512 2adfd75e05469793eb95ab68ca8403cd78f3a836157b0b1abcf21f11f16633b0e9c840f800ee5d51376fe91a31710d5674deb2c1c6e1a262517ab173550253cc
+DIST test_rosbag-1.15.9-subunmigrated_gen1.bag 5200 BLAKE2B 6786d316f28f7038b961fce5d4094b6948eb1f292dc63c04efdc9459c012acefcc7f962452a11ae53e8de4096c758833d7374ccbfc1a16b626e6c21af92b7979 SHA512 318d921f505ee97ab9ceba536ee48c4d5d5d8aa7d2619864b325d8083582daff43cf9bb61ff5ec3814e815cc334190b11687734e21141fbade9611a98244783b
+DIST test_rosbag-1.15.9-test_future_version_2.1.bag 6051 BLAKE2B 5368be834eaaf7d48519560295406a92ecc6573f7cbcbd5a29c9f05c12322198b1da8209b0316b5d694cdfbde8a9ba26be3a6f529154594e148743f7b618de45 SHA512 9a9870b28d5e0f12ed98fd1df6be21fa37e5db9f9423eb39cbbc7e8f042078210f7ccc8f534a02a5edc51fb61817ddeec705a8687917742648c1fdb70adf88db
+DIST test_rosbag-1.15.9-test_indexed_1.2.bag 142311 BLAKE2B 51e4f41334a4191a02e6cd2723ff7a38ea6b99e272304ff8be83641d31d3c4bc3bbddf835923da447d274d27253d0cf162ff065e6f952799c204a6d3b8a429bc SHA512 8c2b6973e549d1b5c2e1fe5f6873c40b7877fa87e7864d39e86646083baf481ecb3d9c1fc4ca5d44332b3b4b0f41856dd5dd2c71ce9f2281fdc61c9846bcd5b8
+DIST test_rosbag-1.15.9-test_rosbag_latched_pub.bag 4816 BLAKE2B 2a0a90eb46665486ac7a31249d7bc9c3c4f125c934a09e3fb0130bf43b10035552f9de0f0fd8280cec4cb1eb71fc7dc624ba1152724e602a2483a2df63869c3f SHA512 e1655185e8ea6a02aaccce4e819eb6d6aec48032f4f55e17d7c8649aa0d0b56eded659a97e2f83c7d04e221beb8a330bce093300d422c63f3b330f5b2b8bb8ca
+DIST test_rosbag-1.15.9-unmigrated_gen1.bag 4828 BLAKE2B 0fc0e446f8c31fef4b21a669b15a86340d0dcff2406a85f88ccdc84e6f3ff4a71252151d191c30c9879d2ce3031faf9101aaa22834cdd733491a2f92d53a7a04 SHA512 333dbf41976ae732e33f394883965d9d07bfe35d8f3c5be1bd129ff4ded31f8c8201b9fdd8bee7ecaf7f04f49d0ee7c7d2be1ec4c8322d0b0b9cc0a236fe8342
 DIST test_rosbag-9999-chatter_50hz.bag 28923 BLAKE2B 2a2304b98d33b902fa3b8fc4d2a0fa3da9af600ab9f66ebf74ecb2214160346d10a0ba58d2b8dfb7039dcd7ca05e58bf7b253899238dabab1c29264970b124b7 SHA512 7493e773d678aed10ca274f8a253a412846c90fa238ac7407b04f39355b94285b40b177ae45a0a5b5ae1c2fe2d74284fba1c082550f21dd30cf5e5891ef402e1
 DIST test_rosbag-9999-constants_gen1.bag 4783 BLAKE2B fec06b1016d0a6e616893f050c22072ef01cc4bc944f3778cb45613d699e404b8721b35f9563f22fa87e473f9f439965ba804cc6478c59dbeab95309375046c7 SHA512 724a420e99946a5fba1b092363cb11af11a50e85c4531b57fe64b207ed1e4022e35a870014873919a7bfe3680ae0b5b4275777f3305b8c5d1fdd7316e7d67e7b
 DIST test_rosbag-9999-constants_gen2.bag 4783 BLAKE2B 6db44a7ddc61307f49bb28e276b8a834044b43d79d37ceba0aef21c8dea8a6d3ee32cc156f8bc429f074752dfc5a249b789936a6d8bf5e11397c2ee4f0e7d925 SHA512 a0df68425bf268da7d622ea43fb755dd7161bf3443c5c2499862c8932ce5e86e4edc6746a9f4a6bc4b4bb9c070a2b3af26d26755e18e796600184f280579aedc
@@ -70,5 +106,6 @@ DIST test_rosbag-9999-test_indexed_1.2.bag 142311 BLAKE2B 51e4f41334a4191a02e6cd
 DIST test_rosbag-9999-test_rosbag_latched_pub.bag 4816 BLAKE2B 2a0a90eb46665486ac7a31249d7bc9c3c4f125c934a09e3fb0130bf43b10035552f9de0f0fd8280cec4cb1eb71fc7dc624ba1152724e602a2483a2df63869c3f SHA512 e1655185e8ea6a02aaccce4e819eb6d6aec48032f4f55e17d7c8649aa0d0b56eded659a97e2f83c7d04e221beb8a330bce093300d422c63f3b330f5b2b8bb8ca
 DIST test_rosbag-9999-unmigrated_gen1.bag 4828 BLAKE2B 0fc0e446f8c31fef4b21a669b15a86340d0dcff2406a85f88ccdc84e6f3ff4a71252151d191c30c9879d2ce3031faf9101aaa22834cdd733491a2f92d53a7a04 SHA512 333dbf41976ae732e33f394883965d9d07bfe35d8f3c5be1bd129ff4ded31f8c8201b9fdd8bee7ecaf7f04f49d0ee7c7d2be1ec4c8322d0b0b9cc0a236fe8342
 EBUILD test_rosbag-1.15.8.ebuild 2436 BLAKE2B 20fe1864e638a94568a06e323082356e18297f6ecf0cf041092ccbc027f40ab2c209260194a6d69a7aa0f57fd621da5827d1b975d187596e19c84d1169b38657 SHA512 773d00d67cba50371a20cf0120414bc0fd5ce3a7ab2c7100b519ebe63506610653551c516c75b0925f1a012eb599070255ca164b2fc02834f799ec11a78f4cd5
+EBUILD test_rosbag-1.15.9.ebuild 2436 BLAKE2B 20fe1864e638a94568a06e323082356e18297f6ecf0cf041092ccbc027f40ab2c209260194a6d69a7aa0f57fd621da5827d1b975d187596e19c84d1169b38657 SHA512 773d00d67cba50371a20cf0120414bc0fd5ce3a7ab2c7100b519ebe63506610653551c516c75b0925f1a012eb599070255ca164b2fc02834f799ec11a78f4cd5
 EBUILD test_rosbag-9999.ebuild 2436 BLAKE2B 20fe1864e638a94568a06e323082356e18297f6ecf0cf041092ccbc027f40ab2c209260194a6d69a7aa0f57fd621da5827d1b975d187596e19c84d1169b38657 SHA512 773d00d67cba50371a20cf0120414bc0fd5ce3a7ab2c7100b519ebe63506610653551c516c75b0925f1a012eb599070255ca164b2fc02834f799ec11a78f4cd5
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosbag/test_rosbag-1.15.9.ebuild b/dev-ros/test_rosbag/test_rosbag-1.15.9.ebuild
new file mode 100644
index 000000000000..6b6c0a839d19
--- /dev/null
+++ b/dev-ros/test_rosbag/test_rosbag-1.15.9.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+TEST_DATA="constants_gen1.bag
+constants_gen2.bag
+converged_gen1.bag
+converged_gen2.bag
+converged_gen3.bag
+converged_gen4.bag
+convergent_gen1.bag
+convergent_gen2.bag
+migrated_addsub_gen1.bag
+migrated_explicit_gen1.bag
+migrated_explicit_gen2.bag
+migrated_explicit_gen3.bag
+migrated_explicit_gen4.bag
+migrated_implicit_gen1.bag
+migrated_implicit_gen2.bag
+migrated_implicit_gen3.bag
+migrated_implicit_gen4.bag
+migrated_mixed_gen1.bag
+migrated_mixed_gen2.bag
+migrated_mixed_gen3.bag
+migrated_mixed_gen4.bag
+partially_migrated_gen1.bag
+partially_migrated_gen2.bag
+partially_migrated_gen3.bag
+partially_migrated_gen4.bag
+renamed_gen1.bag
+renamed_gen2.bag
+renamed_gen3.bag
+renamed_gen4.bag
+subunmigrated_gen1.bag
+unmigrated_gen1.bag
+"
+ROSBAG_DATA="
+test_indexed_1.2.bag
+chatter_50hz.bag
+test_future_version_2.1.bag
+test_rosbag_latched_pub.bag
+"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosbag"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+for i in ${TEST_DATA}; do
+	SRC_URI="${SRC_URI}
+		http://download.ros.org/data/test_rosbag/${i} -> ${P}-${i}"
+done
+for i in ${ROSBAG_DATA}; do
+	SRC_URI="${SRC_URI}
+		http://download.ros.org/data/rosbag/${i} -> ${P}-${i}"
+done
+
+RDEPEND="
+	dev-ros/message_generation
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/topic_tools[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/xmlrpcpp
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/boost[threads]
+		app-arch/bzip2
+		dev-ros/rosout
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)
+"
+
+src_prepare() {
+	ros-catkin_src_prepare
+	for i in ${TEST_DATA} ${ROSBAG_DATA}; do
+		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
+	done
+	sed -e "s#http://download.ros.org/data/test_rosbag/#file://${S}/#g" \
+		-i bag_migration_tests/CMakeLists.txt \
+		-i CMakeLists.txt || die
+	sed -e "s#http://download.ros.org/data/rosbag/#file://${S}/#g" \
+		-i bag_migration_tests/CMakeLists.txt \
+		-i CMakeLists.txt || die
+}
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_rosbag_storage/Manifest b/dev-ros/test_rosbag_storage/Manifest
index 8d3a9708f86f..b8270f3f2f0e 100644
--- a/dev-ros/test_rosbag_storage/Manifest
+++ b/dev-ros/test_rosbag_storage/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD test_rosbag_storage-1.15.8.ebuild 449 BLAKE2B 211dd15ae3eb1f7aac8829f7e43c60a87f2c0a9fb16deca301ebee0450171d551606cc69264eb0cf7e6ad8453a3d13815b5b29873efb600c3bea51b6eb7f8fd6 SHA512 6e599f7da72c39133a6017fd21c76833a9dde42876839133eefc641362e8c03a18f47c2e3c3c0a7b48cc49f313891fdd6f04fe69c8a11e4642efd8be3fc6805b
+EBUILD test_rosbag_storage-1.15.9.ebuild 465 BLAKE2B 9f68320ee0d3b7e76bc344ca2ee54007efbbc9b7083aac353ce3cf94e74ac10575c79f7f2d41ae8ccdf93e03597e387151c6bdd7487c483652ed2029241ca26c SHA512 be77680f6db9f03bf414540eab944ac5598860b56eb4779e871ad917d9f7c135a2912daf6b2f27318830f1c508c4a08c53da5bf0c42d3562d7afedd2d0354e6b
 EBUILD test_rosbag_storage-9999.ebuild 465 BLAKE2B 9f68320ee0d3b7e76bc344ca2ee54007efbbc9b7083aac353ce3cf94e74ac10575c79f7f2d41ae8ccdf93e03597e387151c6bdd7487c483652ed2029241ca26c SHA512 be77680f6db9f03bf414540eab944ac5598860b56eb4779e871ad917d9f7c135a2912daf6b2f27318830f1c508c4a08c53da5bf0c42d3562d7afedd2d0354e6b
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.9.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.9.ebuild
new file mode 100644
index 000000000000..258d31bf3e94
--- /dev/null
+++ b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosbag_storage"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rosbag_storage
+	dev-ros/rosbag
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_roscpp/Manifest b/dev-ros/test_roscpp/Manifest
index fcb728eea452..1403c6316d90 100644
--- a/dev-ros/test_roscpp/Manifest
+++ b/dev-ros/test_roscpp/Manifest
@@ -1,7 +1,9 @@
 AUX tests.patch 512 BLAKE2B 1744807e87cdf18c3c2d74e971828a3f34986f2aff6c17e663e464a7ad522abdbaf96f20771c0f699ef24a5afd572a4a6431a7f21b851e95408e1c7c57032694 SHA512 2f923f01f7b5c869ff1279e6cb1d82f0699388c16caa615b84dd6b3f914355a79ffddb55491bea227980404ff85b3663f51c84e242d5540e3c88f10d912cdca7
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD test_roscpp-1.15.7.ebuild 669 BLAKE2B 70791b7e565532c36eb3e6120c1a32824bfcfd46b14e141231f3909ebef51544cec10871114ed60707f42097a78091f48d48f90d65e4c406ae3273bca07161c6 SHA512 36cd0566c4887c7e7545610c83c11501a83a8d120006bf03b7b14f91cf221df1297efe10cc49abd0d8d2fa811542491091a87c1dddee77ab8032f5e2edd15612
 EBUILD test_roscpp-1.15.8.ebuild 904 BLAKE2B e35cf2878ba0a9788757aa1cf212abf2ce28f7f977fde80c35702f45a77ef5c0e279751cf5d7718f15671e574c43d8d1fae3a0704970c5e8a35ba39db4428cfe SHA512 3e0e54eabf80d143a80aa5d07c632f2e3602dfbe2797b50e8c5058ea4e504117782dbf93e4f54b32a24594e8f9958d09ddd8063e2c4c4e3ce0b517ee4a4ff49c
+EBUILD test_roscpp-1.15.9.ebuild 904 BLAKE2B e35cf2878ba0a9788757aa1cf212abf2ce28f7f977fde80c35702f45a77ef5c0e279751cf5d7718f15671e574c43d8d1fae3a0704970c5e8a35ba39db4428cfe SHA512 3e0e54eabf80d143a80aa5d07c632f2e3602dfbe2797b50e8c5058ea4e504117782dbf93e4f54b32a24594e8f9958d09ddd8063e2c4c4e3ce0b517ee4a4ff49c
 EBUILD test_roscpp-9999.ebuild 904 BLAKE2B e35cf2878ba0a9788757aa1cf212abf2ce28f7f977fde80c35702f45a77ef5c0e279751cf5d7718f15671e574c43d8d1fae3a0704970c5e8a35ba39db4428cfe SHA512 3e0e54eabf80d143a80aa5d07c632f2e3602dfbe2797b50e8c5058ea4e504117782dbf93e4f54b32a24594e8f9958d09ddd8063e2c4c4e3ce0b517ee4a4ff49c
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.9.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.9.ebuild
new file mode 100644
index 000000000000..6162bbe7696c
--- /dev/null
+++ b/dev-ros/test_roscpp/test_roscpp-1.15.9.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roscpp"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=[threads]
+	test? (
+		dev-cpp/gtest
+	)
+"
+REQUIRED_USE="test? ( ros_messages_cxx )"
+PATCHES=( "${FILESDIR}/tests.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	# Sometimes high number of tests running in parallel make them fail
+	# https://bugs.gentoo.org/738620
+	ros-catkin_src_test -j 1
+}
diff --git a/dev-ros/test_rosgraph/Manifest b/dev-ros/test_rosgraph/Manifest
index a2b1a935487a..5e493f2b883a 100644
--- a/dev-ros/test_rosgraph/Manifest
+++ b/dev-ros/test_rosgraph/Manifest
@@ -1,6 +1,8 @@
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD test_rosgraph-1.15.7.ebuild 421 BLAKE2B 511420303458e310ce9aa7247d12fec089f2caf0e73abea4145c7a530c819fe62042cbaf8bcc2f2c13d51fd8b7099234e725e79efd630db2adc01675ac636951 SHA512 b43c9865b12656ec3dbcbc14b29cf258fa7f4093c8a528f6dc68ddbbeeb8fc72579f9d37ef3703e24d27c51dff6a5dde1855837eac1173734ca2cc457b2c1b08
 EBUILD test_rosgraph-1.15.8.ebuild 510 BLAKE2B 50a7d2d46a51ff814ed2723360ee1a20b9b5c62e0a8bff0fd5e4cfb05f6b32669ce835c570401624e3c2b56339e264250d9b52a87b3e4bc605cba5efeb3d48f5 SHA512 01bc68bbe8446b2caa942850e2f7c323e259c04304e87267addac7da987f152382451037167f6fe6c2878437d6b7d0f7658b3915eea5c9cbdf5b4c13e67f580b
+EBUILD test_rosgraph-1.15.9.ebuild 510 BLAKE2B 50a7d2d46a51ff814ed2723360ee1a20b9b5c62e0a8bff0fd5e4cfb05f6b32669ce835c570401624e3c2b56339e264250d9b52a87b3e4bc605cba5efeb3d48f5 SHA512 01bc68bbe8446b2caa942850e2f7c323e259c04304e87267addac7da987f152382451037167f6fe6c2878437d6b7d0f7658b3915eea5c9cbdf5b4c13e67f580b
 EBUILD test_rosgraph-9999.ebuild 510 BLAKE2B 50a7d2d46a51ff814ed2723360ee1a20b9b5c62e0a8bff0fd5e4cfb05f6b32669ce835c570401624e3c2b56339e264250d9b52a87b3e4bc605cba5efeb3d48f5 SHA512 01bc68bbe8446b2caa942850e2f7c323e259c04304e87267addac7da987f152382451037167f6fe6c2878437d6b7d0f7658b3915eea5c9cbdf5b4c13e67f580b
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.15.9.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.15.9.ebuild
new file mode 100644
index 000000000000..71104c076e50
--- /dev/null
+++ b/dev-ros/test_rosgraph/test_rosgraph-1.15.9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosgraph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}] )
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_roslaunch/Manifest b/dev-ros/test_roslaunch/Manifest
index 473a28319086..e1a387a42c20 100644
--- a/dev-ros/test_roslaunch/Manifest
+++ b/dev-ros/test_roslaunch/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD test_roslaunch-1.15.8.ebuild 581 BLAKE2B f8a48b9d29f48846193dfa403c0f5578fa90dc5e223f150a51bdcd6d3897585ab4b71ed212d40a4efbdb952ae1b120c9d7c2a7d5c21633fbdc383caf8bde03eb SHA512 7380b34283cfe2d4b920085a021de1de01bac3e298978b805b604e97c6260d416097230d8f77f5fbb56e53001f8df3f91e968e6b9c86aada1791b8cadcddaa32
+EBUILD test_roslaunch-1.15.9.ebuild 581 BLAKE2B f8a48b9d29f48846193dfa403c0f5578fa90dc5e223f150a51bdcd6d3897585ab4b71ed212d40a4efbdb952ae1b120c9d7c2a7d5c21633fbdc383caf8bde03eb SHA512 7380b34283cfe2d4b920085a021de1de01bac3e298978b805b604e97c6260d416097230d8f77f5fbb56e53001f8df3f91e968e6b9c86aada1791b8cadcddaa32
 EBUILD test_roslaunch-9999.ebuild 581 BLAKE2B f8a48b9d29f48846193dfa403c0f5578fa90dc5e223f150a51bdcd6d3897585ab4b71ed212d40a4efbdb952ae1b120c9d7c2a7d5c21633fbdc383caf8bde03eb SHA512 7380b34283cfe2d4b920085a021de1de01bac3e298978b805b604e97c6260d416097230d8f77f5fbb56e53001f8df3f91e968e6b9c86aada1791b8cadcddaa32
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.15.9.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.9.ebuild
new file mode 100644
index 000000000000..3ebd0d435c48
--- /dev/null
+++ b/dev-ros/test_roslaunch/test_roslaunch-1.15.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roslaunch"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	test? (
+		dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	)
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_roslib_comm/Manifest b/dev-ros/test_roslib_comm/Manifest
index 4e87932c80a1..8330d677a3b2 100644
--- a/dev-ros/test_roslib_comm/Manifest
+++ b/dev-ros/test_roslib_comm/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD test_roslib_comm-1.15.8.ebuild 706 BLAKE2B a432620b8fbed9bad43dbfab3d0b6b438d2a2f1021099f54e9e63643629d0efca42dd4d187d8b675decf58ff89ae2d724cf5669ab0e6544856ac155fe14c9863 SHA512 05b7a3b259f91173395a5eb964b7dcc881d6f1ae2eb0fd44a7e4de1320bd29641454ed8824c94e5327b75abed7757e2b3fa0826d6c08051c5da394e88295d62a
+EBUILD test_roslib_comm-1.15.9.ebuild 706 BLAKE2B a432620b8fbed9bad43dbfab3d0b6b438d2a2f1021099f54e9e63643629d0efca42dd4d187d8b675decf58ff89ae2d724cf5669ab0e6544856ac155fe14c9863 SHA512 05b7a3b259f91173395a5eb964b7dcc881d6f1ae2eb0fd44a7e4de1320bd29641454ed8824c94e5327b75abed7757e2b3fa0826d6c08051c5da394e88295d62a
 EBUILD test_roslib_comm-9999.ebuild 706 BLAKE2B a432620b8fbed9bad43dbfab3d0b6b438d2a2f1021099f54e9e63643629d0efca42dd4d187d8b675decf58ff89ae2d724cf5669ab0e6544856ac155fe14c9863 SHA512 05b7a3b259f91173395a5eb964b7dcc881d6f1ae2eb0fd44a7e4de1320bd29641454ed8824c94e5327b75abed7757e2b3fa0826d6c08051c5da394e88295d62a
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.9.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.9.ebuild
new file mode 100644
index 000000000000..d53ce85e7df6
--- /dev/null
+++ b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.9.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roslib"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/test_rosmaster
+		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	)
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_rosmaster/Manifest b/dev-ros/test_rosmaster/Manifest
index 2417c1bb3d6f..247f4d87baa1 100644
--- a/dev-ros/test_rosmaster/Manifest
+++ b/dev-ros/test_rosmaster/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD test_rosmaster-1.15.8.ebuild 783 BLAKE2B 13c70c437a3f2d082ce7f8fde7476b2e02f53d42c2733f2334cc6f9e7d1e08ea07359792992ec772c007bacc9750dbd3de7521480270d3764d3d267e2b550a39 SHA512 8945deb795c584b316d0a9f612f472a5ab60e546293e4c4f633e77a05b4159c145b23f88f488fcb5a19dd9a749bea7cac7fe3a3240a5172320c5b7147c51ea2e
+EBUILD test_rosmaster-1.15.9.ebuild 783 BLAKE2B 13c70c437a3f2d082ce7f8fde7476b2e02f53d42c2733f2334cc6f9e7d1e08ea07359792992ec772c007bacc9750dbd3de7521480270d3764d3d267e2b550a39 SHA512 8945deb795c584b316d0a9f612f472a5ab60e546293e4c4f633e77a05b4159c145b23f88f488fcb5a19dd9a749bea7cac7fe3a3240a5172320c5b7147c51ea2e
 EBUILD test_rosmaster-9999.ebuild 783 BLAKE2B 13c70c437a3f2d082ce7f8fde7476b2e02f53d42c2733f2334cc6f9e7d1e08ea07359792992ec772c007bacc9750dbd3de7521480270d3764d3d267e2b550a39 SHA512 8945deb795c584b316d0a9f612f472a5ab60e546293e4c4f633e77a05b4159c145b23f88f488fcb5a19dd9a749bea7cac7fe3a3240a5172320c5b7147c51ea2e
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.15.9.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.15.9.ebuild
new file mode 100644
index 000000000000..6a163fb0f0ad
--- /dev/null
+++ b/dev-ros/test_rosmaster/test_rosmaster-1.15.9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosmaster"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}] )
+"
+
+mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
+
+src_install() {
+	ros-catkin_src_install
+	dodir /usr/share/${PN}
+	cp -a test "${ED}//usr/share/${PN}/" || die
+}
diff --git a/dev-ros/test_rosparam/Manifest b/dev-ros/test_rosparam/Manifest
index e510a02cecbc..957c650ddda3 100644
--- a/dev-ros/test_rosparam/Manifest
+++ b/dev-ros/test_rosparam/Manifest
@@ -1,6 +1,8 @@
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD test_rosparam-1.15.7.ebuild 511 BLAKE2B a324a281705bc80360f1c447f7191aae44dbef988217d13d3addcee32bd91b705aa947a53c778f9cf6e3e442cba7c6e64f8cf46100727be29f99f76bb8c0a8cf SHA512 f1d00655518e6aea60aef0100c357b6526d38354ce03b98c7baaf2d76c1d4cbb6a6c1f11877c1847bf6ecd61393f577c9330814b3876832736ee12f5db1325d5
 EBUILD test_rosparam-1.15.8.ebuild 600 BLAKE2B 4d0797df48efa718a5111e2d1725155b7c177688c7f3384b07594786422c56ba6b1ffecf31bf1841cdb5db38d272ae420f35094a82cf36b7d04e0257b0d220fa SHA512 910aad8bc034550401cf40a46562b197be5294c6e9374dc726fa7f49a298f7ee948671a6523afeec64f443490e48f8c58aec43602fb18ccbda558e67af2a7380
+EBUILD test_rosparam-1.15.9.ebuild 600 BLAKE2B 4d0797df48efa718a5111e2d1725155b7c177688c7f3384b07594786422c56ba6b1ffecf31bf1841cdb5db38d272ae420f35094a82cf36b7d04e0257b0d220fa SHA512 910aad8bc034550401cf40a46562b197be5294c6e9374dc726fa7f49a298f7ee948671a6523afeec64f443490e48f8c58aec43602fb18ccbda558e67af2a7380
 EBUILD test_rosparam-9999.ebuild 600 BLAKE2B 4d0797df48efa718a5111e2d1725155b7c177688c7f3384b07594786422c56ba6b1ffecf31bf1841cdb5db38d272ae420f35094a82cf36b7d04e0257b0d220fa SHA512 910aad8bc034550401cf40a46562b197be5294c6e9374dc726fa7f49a298f7ee948671a6523afeec64f443490e48f8c58aec43602fb18ccbda558e67af2a7380
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosparam/test_rosparam-1.15.9.ebuild b/dev-ros/test_rosparam/test_rosparam-1.15.9.ebuild
new file mode 100644
index 000000000000..712bc9fd620e
--- /dev/null
+++ b/dev-ros/test_rosparam/test_rosparam-1.15.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosparam"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	test? (
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_rospy/Manifest b/dev-ros/test_rospy/Manifest
index 906344117124..4479ca163784 100644
--- a/dev-ros/test_rospy/Manifest
+++ b/dev-ros/test_rospy/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD test_rospy-1.15.8.ebuild 1013 BLAKE2B 37058ad100f52ac127d95444a415b1ffe56408048842e9628a9f0ab31fb82e8911399d169234ee4659d786d6575d80a7ad934a687cacb31f8832ee4c376d43e3 SHA512 a7c6fda6661c18be0d595b5c50c39b6f1428987ece563cb07e8a2c6e1f37ea62472108d0bcdcffd4d0f2c7b6fce763ebcc756df684c1041c37ae5e18452148b2
+EBUILD test_rospy-1.15.9.ebuild 1013 BLAKE2B 37058ad100f52ac127d95444a415b1ffe56408048842e9628a9f0ab31fb82e8911399d169234ee4659d786d6575d80a7ad934a687cacb31f8832ee4c376d43e3 SHA512 a7c6fda6661c18be0d595b5c50c39b6f1428987ece563cb07e8a2c6e1f37ea62472108d0bcdcffd4d0f2c7b6fce763ebcc756df684c1041c37ae5e18452148b2
 EBUILD test_rospy-9999.ebuild 1013 BLAKE2B 37058ad100f52ac127d95444a415b1ffe56408048842e9628a9f0ab31fb82e8911399d169234ee4659d786d6575d80a7ad934a687cacb31f8832ee4c376d43e3 SHA512 a7c6fda6661c18be0d595b5c50c39b6f1428987ece563cb07e8a2c6e1f37ea62472108d0bcdcffd4d0f2c7b6fce763ebcc756df684c1041c37ae5e18452148b2
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rospy/test_rospy-1.15.9.ebuild b/dev-ros/test_rospy/test_rospy-1.15.9.ebuild
new file mode 100644
index 000000000000..5b429c7f5335
--- /dev/null
+++ b/dev-ros/test_rospy/test_rospy-1.15.9.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rospy"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+	test? (
+		$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
+		dev-ros/rosbuild
+		dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
+	)"
diff --git a/dev-ros/test_rosservice/Manifest b/dev-ros/test_rosservice/Manifest
index 645ac9cfded6..6f944769c332 100644
--- a/dev-ros/test_rosservice/Manifest
+++ b/dev-ros/test_rosservice/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD test_rosservice-1.15.8.ebuild 747 BLAKE2B 40c198294cef61fd7b95b91984dc3ee881e7567d97e26862a1263acd65439e132106052dc72cc6b26b77e99f3c08816094daf981496154adb6afe83e7f19def6 SHA512 09fe74b32c6a922eb8822e47645f6c19268dff1338a24b471d0902fc8ba1ea002a6c3a6ff13afdf38d8b4dbb83a32ec8a414ff0485615c9362afc5ce8bb95bfd
+EBUILD test_rosservice-1.15.9.ebuild 747 BLAKE2B 40c198294cef61fd7b95b91984dc3ee881e7567d97e26862a1263acd65439e132106052dc72cc6b26b77e99f3c08816094daf981496154adb6afe83e7f19def6 SHA512 09fe74b32c6a922eb8822e47645f6c19268dff1338a24b471d0902fc8ba1ea002a6c3a6ff13afdf38d8b4dbb83a32ec8a414ff0485615c9362afc5ce8bb95bfd
 EBUILD test_rosservice-9999.ebuild 747 BLAKE2B 40c198294cef61fd7b95b91984dc3ee881e7567d97e26862a1263acd65439e132106052dc72cc6b26b77e99f3c08816094daf981496154adb6afe83e7f19def6 SHA512 09fe74b32c6a922eb8822e47645f6c19268dff1338a24b471d0902fc8ba1ea002a6c3a6ff13afdf38d8b4dbb83a32ec8a414ff0485615c9362afc5ce8bb95bfd
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosservice/test_rosservice-1.15.9.ebuild b/dev-ros/test_rosservice/test_rosservice-1.15.9.ebuild
new file mode 100644
index 000000000000..7f51764ff341
--- /dev/null
+++ b/dev-ros/test_rosservice/test_rosservice-1.15.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rospy"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	test? (
+		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
diff --git a/dev-ros/topic_tools/Manifest b/dev-ros/topic_tools/Manifest
index 9541d91f7bcc..36b517bde683 100644
--- a/dev-ros/topic_tools/Manifest
+++ b/dev-ros/topic_tools/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD topic_tools-1.15.8.ebuild 832 BLAKE2B e025e1142b4a923027c5d15452c5ce6e310df1f805bdbb14e03f71b5beabd909bc8609f0eea161614e697b6c42ffe101b97f2f6556bc81c1bc05770dbd50d3c7 SHA512 c03f68fce690a2d76b547786532e1bba9a5db6480c780f9a0c4eabd5b607c681e7bb45f86014c61e6ded236cd3a53cb459e06b91da1b0a10bdb55c4ca5b60d8e
+EBUILD topic_tools-1.15.9.ebuild 832 BLAKE2B e025e1142b4a923027c5d15452c5ce6e310df1f805bdbb14e03f71b5beabd909bc8609f0eea161614e697b6c42ffe101b97f2f6556bc81c1bc05770dbd50d3c7 SHA512 c03f68fce690a2d76b547786532e1bba9a5db6480c780f9a0c4eabd5b607c681e7bb45f86014c61e6ded236cd3a53cb459e06b91da1b0a10bdb55c4ca5b60d8e
 EBUILD topic_tools-9999.ebuild 832 BLAKE2B e025e1142b4a923027c5d15452c5ce6e310df1f805bdbb14e03f71b5beabd909bc8609f0eea161614e697b6c42ffe101b97f2f6556bc81c1bc05770dbd50d3c7 SHA512 c03f68fce690a2d76b547786532e1bba9a5db6480c780f9a0c4eabd5b607c681e7bb45f86014c61e6ded236cd3a53cb459e06b91da1b0a10bdb55c4ca5b60d8e
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/topic_tools/topic_tools-1.15.9.ebuild b/dev-ros/topic_tools/topic_tools-1.15.9.ebuild
new file mode 100644
index 000000000000..8c28b2e72861
--- /dev/null
+++ b/dev-ros/topic_tools/topic_tools-1.15.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=tools/${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for directing, throttling and selecting ROS topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostime
+	dev-ros/xmlrpcpp
+	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosbash[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
diff --git a/dev-ros/transmission_interface/Manifest b/dev-ros/transmission_interface/Manifest
index 5dd28a20d7d1..383f9026d5a7 100644
--- a/dev-ros/transmission_interface/Manifest
+++ b/dev-ros/transmission_interface/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
 DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
+DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
 EBUILD transmission_interface-0.19.1.ebuild 693 BLAKE2B 4ad32954a9822e3a44c676e602745356d7ce4c03b19cce04bcdf6cdac58d0bbc33d591ed4e8e1411d846b41802cb615819698bbf91cca51b4165548f490d085e SHA512 2ca6e1bfa6fd74625e91e52e647216565ec1999b42ea820179ff0ab0ca3b57b83486b56943d90cfeb495effd00a02f78cbc5c7c7690cf80e369c0e92096dfddd
 EBUILD transmission_interface-0.19.2.ebuild 693 BLAKE2B 4ad32954a9822e3a44c676e602745356d7ce4c03b19cce04bcdf6cdac58d0bbc33d591ed4e8e1411d846b41802cb615819698bbf91cca51b4165548f490d085e SHA512 2ca6e1bfa6fd74625e91e52e647216565ec1999b42ea820179ff0ab0ca3b57b83486b56943d90cfeb495effd00a02f78cbc5c7c7690cf80e369c0e92096dfddd
+EBUILD transmission_interface-0.19.3.ebuild 693 BLAKE2B 4ad32954a9822e3a44c676e602745356d7ce4c03b19cce04bcdf6cdac58d0bbc33d591ed4e8e1411d846b41802cb615819698bbf91cca51b4165548f490d085e SHA512 2ca6e1bfa6fd74625e91e52e647216565ec1999b42ea820179ff0ab0ca3b57b83486b56943d90cfeb495effd00a02f78cbc5c7c7690cf80e369c0e92096dfddd
 EBUILD transmission_interface-9999.ebuild 693 BLAKE2B 4ad32954a9822e3a44c676e602745356d7ce4c03b19cce04bcdf6cdac58d0bbc33d591ed4e8e1411d846b41802cb615819698bbf91cca51b4165548f490d085e SHA512 2ca6e1bfa6fd74625e91e52e647216565ec1999b42ea820179ff0ab0ca3b57b83486b56943d90cfeb495effd00a02f78cbc5c7c7690cf80e369c0e92096dfddd
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/transmission_interface/transmission_interface-0.19.3.ebuild b/dev-ros/transmission_interface/transmission_interface-0.19.3.ebuild
new file mode 100644
index 000000000000..eeacb3a95b5b
--- /dev/null
+++ b/dev-ros/transmission_interface/transmission_interface-0.19.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Transmission Interface"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/hardware_interface
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-libs/console_bridge:=
+	dev-ros/resource_retriever
+	dev-ros/roscpp
+	dev-libs/tinyxml
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+	)
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/urg_node/Manifest b/dev-ros/urg_node/Manifest
index ac22c9ecd1c8..21876b532662 100644
--- a/dev-ros/urg_node/Manifest
+++ b/dev-ros/urg_node/Manifest
@@ -1,4 +1,4 @@
-DIST urg_node-0.1.13.tar.gz 20949 BLAKE2B e85653ec46dd85aa62e4e5f06c4d4c775a2d616f0b4daa80584bf81010ad06acbec7f73e0b4a238618c36ec83d07e4dd513fafa9b29e197ad21b56ec02fe4452 SHA512 be503538a293fa0cdf6e7902c0faa5c866a2298193f4ad6cce705dab90220955d4cb21087d84d10ff7d2daf29f362391f17a038496f3036934c57e12f3270a30
-EBUILD urg_node-0.1.13.ebuild 771 BLAKE2B a78e7957b80f181fca7464b1499a5c686252271eb27494585e9c567648e5e3b140380267226c8dee82bcc9ac536fac178dcbc57f4179f3b2183125183390ec06 SHA512 d33a2914eaf7d953e9305df5862d4d133e23971578bb7c910fcc7b2692b57334d9970e7cf472569fe1fc7be23ef61cfabcb2ae7e51009254702fdbf8afcd5084
+DIST urg_node-0.1.14.tar.gz 20987 BLAKE2B ee358a238f0886c3eeee213467c44d3e721f4e6fb6c9d887393bdd3eab16d36eb07a62f705256d2a81314afaf29119608a874e26b19afa190a3033e84d3a987d SHA512 2614d614ee88cc5c9087f0ddff5cb991f6707452b42bc00f1c7b0bcbbc6a8fd1915b94fd041526e93ac8b0a481d1b45eeddea32d71a1034362b37e1f458217fb
+EBUILD urg_node-0.1.14.ebuild 771 BLAKE2B a78e7957b80f181fca7464b1499a5c686252271eb27494585e9c567648e5e3b140380267226c8dee82bcc9ac536fac178dcbc57f4179f3b2183125183390ec06 SHA512 d33a2914eaf7d953e9305df5862d4d133e23971578bb7c910fcc7b2692b57334d9970e7cf472569fe1fc7be23ef61cfabcb2ae7e51009254702fdbf8afcd5084
 EBUILD urg_node-9999.ebuild 771 BLAKE2B a78e7957b80f181fca7464b1499a5c686252271eb27494585e9c567648e5e3b140380267226c8dee82bcc9ac536fac178dcbc57f4179f3b2183125183390ec06 SHA512 d33a2914eaf7d953e9305df5862d4d133e23971578bb7c910fcc7b2692b57334d9970e7cf472569fe1fc7be23ef61cfabcb2ae7e51009254702fdbf8afcd5084
 MISC metadata.xml 334 BLAKE2B 11f0825fc04fb1be3a7d357977ce3abc4c5d34e8e9924512a2a47cdc00be4153912e5e60f7d3b24e58a1e3942554bf4c2ce015818b32de50d0b25bb3e6db0dbf SHA512 eb832353afafdd96bb0d620bb87a19720451fdffa2150cbf0bf547c6f782c62f395d00e2f675d9da0345a377fd4f22d8e951bb9da7ade108f4e0a51b5af235b5
diff --git a/dev-ros/urg_node/urg_node-0.1.13.ebuild b/dev-ros/urg_node/urg_node-0.1.14.ebuild
index cd680c30f62e..cd680c30f62e 100644
--- a/dev-ros/urg_node/urg_node-0.1.13.ebuild
+++ b/dev-ros/urg_node/urg_node-0.1.14.ebuild
diff --git a/dev-ros/voxel_grid/Manifest b/dev-ros/voxel_grid/Manifest
index c3524ac57c19..88bf3fe7b8bc 100644
--- a/dev-ros/voxel_grid/Manifest
+++ b/dev-ros/voxel_grid/Manifest
@@ -1,6 +1,8 @@
 DIST navigation-1.16.6.tar.gz 346529 BLAKE2B ed2d7ddd0ca9525f0ae22711d65fc2ede5f3046fd320e5016b93505616c4d476d65128695ff8830c4fa0b8dbdc276a1ec5951fdb4d0516f4d5f70897e4759f31 SHA512 c6bc3db39457c6bccba7ee2646504c4e1c91840a3297bdb9b92b28d93c608c0de113eb92527d4f499232de628d5b49816ec42522043500b20fb04056e2a7c97f
 DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
+DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
 EBUILD voxel_grid-1.16.6.ebuild 392 BLAKE2B 80cb2e7bc178de47c612318b29fcbbab0b842a57232f2dd36da2e9236fd6cbd6ed8018ded40f3e328dd98560e1ba7577b23512765ab6395d96f0816e02e841e9 SHA512 e5427c6a3fd9ec77a41efc8a18384353744ff04b67ebb1fce4981573ddbed2b4cca4387b4ed4734dc4e658d0ad616e6f30a756a93c4912199b0f4c7f3a86693d
 EBUILD voxel_grid-1.17.0.ebuild 392 BLAKE2B 80cb2e7bc178de47c612318b29fcbbab0b842a57232f2dd36da2e9236fd6cbd6ed8018ded40f3e328dd98560e1ba7577b23512765ab6395d96f0816e02e841e9 SHA512 e5427c6a3fd9ec77a41efc8a18384353744ff04b67ebb1fce4981573ddbed2b4cca4387b4ed4734dc4e658d0ad616e6f30a756a93c4912199b0f4c7f3a86693d
+EBUILD voxel_grid-1.17.1.ebuild 392 BLAKE2B 80cb2e7bc178de47c612318b29fcbbab0b842a57232f2dd36da2e9236fd6cbd6ed8018ded40f3e328dd98560e1ba7577b23512765ab6395d96f0816e02e841e9 SHA512 e5427c6a3fd9ec77a41efc8a18384353744ff04b67ebb1fce4981573ddbed2b4cca4387b4ed4734dc4e658d0ad616e6f30a756a93c4912199b0f4c7f3a86693d
 EBUILD voxel_grid-9999.ebuild 392 BLAKE2B 80cb2e7bc178de47c612318b29fcbbab0b842a57232f2dd36da2e9236fd6cbd6ed8018ded40f3e328dd98560e1ba7577b23512765ab6395d96f0816e02e841e9 SHA512 e5427c6a3fd9ec77a41efc8a18384353744ff04b67ebb1fce4981573ddbed2b4cca4387b4ed4734dc4e658d0ad616e6f30a756a93c4912199b0f4c7f3a86693d
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/voxel_grid/voxel_grid-1.17.1.ebuild b/dev-ros/voxel_grid/voxel_grid-1.17.1.ebuild
new file mode 100644
index 000000000000..2a7672352f28
--- /dev/null
+++ b/dev-ros/voxel_grid/voxel_grid-1.17.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Implementation of an efficient 3D voxel grid"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/roscpp"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/xacro/Manifest b/dev-ros/xacro/Manifest
index 587006448cd3..cb5b3c126080 100644
--- a/dev-ros/xacro/Manifest
+++ b/dev-ros/xacro/Manifest
@@ -1,5 +1,5 @@
 AUX tests.patch 625 BLAKE2B 5ec4d6bca2278f40a4886371abd75beb0ff933d3b7e6e9e4554e7f9d63b521d2ff9d2c91c530177c818de2006bbc7db77e86ce3f4323017f870cb6b2a186ba9c SHA512 10da25011dc5c63d282d45862c35d9f900a90bc61059d6e703e50e2a94bdd4ca9c0f20d3fe6e5b03b3f98059e1bcb74272adcbb7f72d5e5f1d3ad4ce5a5f6bca
-DIST xacro-1.14.1.tar.gz 80879 BLAKE2B 6ce62c42e194d41bc2c0af322497f2ade2d4ac9e788cd15f3b7b6c976abae575b3bbb1224085d4e2d68cd10d3fbb665b9b333f91a38bdefe4a22f71d9270f005 SHA512 fb2272a4c4da47dcee26860ec94a5b4921401c6a4f0544181c7a9ae188c0cf6bb8ee2c0c0eb6e7fabd3f323c10d391dbafcc2b118384a32ecd18da6c8075ae10
-EBUILD xacro-1.14.1.ebuild 773 BLAKE2B cffe52b6159091b8fa0e657680e1c6bde3fe55c60645ba55bb09d14514a066f70b81a690507ccfa29586c809225fc42e173bd643af08e94a56ce5148512efd4b SHA512 66e63f19b3d547f7b0cbfafd7ca6417baafb1dcd25dedffe6e0662f8ca35693d433ce3152b7fdfdca0b3184ffb213ab7a280991717d2790ae5f3a5723def6aa2
+DIST xacro-1.14.5.tar.gz 81184 BLAKE2B 27234030e313c715cdd2fb9cc2e77f8e3591017ac99ca7af35e7ae6a01bab56175f4f512595ee12ca47a7405ad38cec4d77b6cf71172c24444c31da350be6d3c SHA512 5f3bc7507fcd4774c0a00c5715cf96cb4b2b3ca279df70d0158c7d8eae773df962c10319887f867316ea135937249cb6805bd79b78f70f61d7a767b63dfdf3db
+EBUILD xacro-1.14.5.ebuild 773 BLAKE2B cffe52b6159091b8fa0e657680e1c6bde3fe55c60645ba55bb09d14514a066f70b81a690507ccfa29586c809225fc42e173bd643af08e94a56ce5148512efd4b SHA512 66e63f19b3d547f7b0cbfafd7ca6417baafb1dcd25dedffe6e0662f8ca35693d433ce3152b7fdfdca0b3184ffb213ab7a280991717d2790ae5f3a5723def6aa2
 EBUILD xacro-9999.ebuild 773 BLAKE2B cffe52b6159091b8fa0e657680e1c6bde3fe55c60645ba55bb09d14514a066f70b81a690507ccfa29586c809225fc42e173bd643af08e94a56ce5148512efd4b SHA512 66e63f19b3d547f7b0cbfafd7ca6417baafb1dcd25dedffe6e0662f8ca35693d433ce3152b7fdfdca0b3184ffb213ab7a280991717d2790ae5f3a5723def6aa2
 MISC metadata.xml 323 BLAKE2B d43754a1147a95e3536569c858b3dafecbc9dd4ec06ef00d23d7948de3aaf40d15aabf502f6c1b5579c03139c06579517c86fddc6eaa61f970baf101d9fef68e SHA512 9c6fccac3f7ab699969eb90199aa9690d064f1d66cc003c157bf85bc3147ae42f1433ac1589f57ce5b05ebd78a44c7f1a92f99e3af29bdee58727c1a676afd37
diff --git a/dev-ros/xacro/xacro-1.14.1.ebuild b/dev-ros/xacro/xacro-1.14.5.ebuild
index 8383de0334c5..8383de0334c5 100644
--- a/dev-ros/xacro/xacro-1.14.1.ebuild
+++ b/dev-ros/xacro/xacro-1.14.5.ebuild
diff --git a/dev-ros/xmlrpcpp/Manifest b/dev-ros/xmlrpcpp/Manifest
index 535545b0bdab..4a3acaaa0b35 100644
--- a/dev-ros/xmlrpcpp/Manifest
+++ b/dev-ros/xmlrpcpp/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD xmlrpcpp-1.15.8.ebuild 444 BLAKE2B 11b1eda8abe7c6201faa025c584dbc21bd8dd1457932a244b23108aa3fad65fe6f5560c84ed22f8f0822b7bd1635af34faada3870d278eeeef783eca58380fc5 SHA512 8d3039c3406f21a738c324a8cd304fad351e208e9d8570a49c41e92ad2fbf1d7488caa749e53f26aebafdbdec69101c813f430866406f65425d21c42ee655035
+EBUILD xmlrpcpp-1.15.9.ebuild 444 BLAKE2B 11b1eda8abe7c6201faa025c584dbc21bd8dd1457932a244b23108aa3fad65fe6f5560c84ed22f8f0822b7bd1635af34faada3870d278eeeef783eca58380fc5 SHA512 8d3039c3406f21a738c324a8cd304fad351e208e9d8570a49c41e92ad2fbf1d7488caa749e53f26aebafdbdec69101c813f430866406f65425d21c42ee655035
 EBUILD xmlrpcpp-9999.ebuild 444 BLAKE2B 11b1eda8abe7c6201faa025c584dbc21bd8dd1457932a244b23108aa3fad65fe6f5560c84ed22f8f0822b7bd1635af34faada3870d278eeeef783eca58380fc5 SHA512 8d3039c3406f21a738c324a8cd304fad351e208e9d8570a49c41e92ad2fbf1d7488caa749e53f26aebafdbdec69101c813f430866406f65425d21c42ee655035
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.9.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.9.ebuild
new file mode 100644
index 000000000000..2987c4392d5e
--- /dev/null
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of the XML-RPC protocol"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rostime
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+		dev-libs/boost[threads]
+	)
+"
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /dev-ros
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)