gentoo resync : 11.02.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-02-11 16:09:52 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-02-11 16:09:52 +0000
commit: f78108598211053d41752a83e0345441bb9014ae (patch)
tree: dd2fc7ae0a1aea7bda4942ab0c453d1e55284b37 /dev-ros
parent: dc45b83b28fb83e9659492066e347b8dc60bc9e3 (diff)
97 files changed, 1254 insertions, 69 deletions
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 39fa2b87d224..bf37e56287af 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/cpp_common/Manifest b/dev-ros/cpp_common/Manifest
index 46ee85a47ff2..e911c9549de4 100644
--- a/dev-ros/cpp_common/Manifest
+++ b/dev-ros/cpp_common/Manifest
@@ -1,6 +1,8 @@
 DIST roscpp_core-0.6.7.tar.gz 34845 BLAKE2B cdb2385069a74d670061bc2245421e31216e1c9ace5c96f83d1875ddcf460f2ad425b10db3330253e2a49f3bc415cf3c72ab885cb121c9477ae54a385893a7b8 SHA512 d93afb6e0e88bb01b13af0334a7977411fac8f89dd06fc69a32b95bab4ead05d6cb564b089ee846fe542be180f6418664f8328a6a9e753a55b34e5a0a1d61bf4
 DIST roscpp_core-0.6.8.tar.gz 35003 BLAKE2B 7b4c02652693f76326df83d17164d3268f8b0eda0ddfe8f73d286ae09d7fbb3f8f433ab92527167fb918b55c53aeaa4e26d6876dac51d9d35e0b18b185d89867 SHA512 5fa9f8714059fbc864583662cd411d64470565cc2c372a09a63708a8cc06140d2ce8b84a7025837a49f2c09c7fee5092ec42d5625de4bfd2d9410baf7821b5df
+DIST roscpp_core-0.6.9.tar.gz 35069 BLAKE2B 5718611730419de3fd5dbd7c26792857c75306f4155916fe9570e494a0b1f0b9ca167a06654e1d5b1e1d20aa8cbd17c306bc91e7d0e803c8691d78c6c456fcec SHA512 87360695e71a020e869633c19187851242b84686b87842b388273f9874ff72e4e587eaf55dc10d099e55bc8db17c2ae7efdd5a9ff553a006b7f7c4ea5e1c84d9
 EBUILD cpp_common-0.6.7-r1.ebuild 420 BLAKE2B b21ab6c6e875b3295217c3c735601d424d86bfca9479e7fc569c5b1c6e3d8b1c1646cb3ca8d41246a6298dc57436ede4efc03f47490367d203d041795e3bf67a SHA512 4f3e377d1cd041b0d7802a182a4182f461d23fcd989c1c89e111702c0679e64a47c48b398b4bf4605052048dae569627091bdf08c4754d95556810bc3ec9158a
 EBUILD cpp_common-0.6.8.ebuild 420 BLAKE2B 4115e4c4d1d239123ecb499c7a95c2dc07ab44ff2e7b3beeaedfc2b8c94ff998dd22fed3bf3e3a18ac669350ce3c3c91c1b55ba69b63c305b94f7177eb463807 SHA512 22e7e4b61e7b846e7cf5ef1c096e58fa2d93ed72dfe178c47d3f3411b63c65e2af7873c5d42197b5ba984b0f610016858e3382cd440cab051a155a5e99f8390e
+EBUILD cpp_common-0.6.9.ebuild 420 BLAKE2B 4115e4c4d1d239123ecb499c7a95c2dc07ab44ff2e7b3beeaedfc2b8c94ff998dd22fed3bf3e3a18ac669350ce3c3c91c1b55ba69b63c305b94f7177eb463807 SHA512 22e7e4b61e7b846e7cf5ef1c096e58fa2d93ed72dfe178c47d3f3411b63c65e2af7873c5d42197b5ba984b0f610016858e3382cd440cab051a155a5e99f8390e
 EBUILD cpp_common-9999.ebuild 420 BLAKE2B b21ab6c6e875b3295217c3c735601d424d86bfca9479e7fc569c5b1c6e3d8b1c1646cb3ca8d41246a6298dc57436ede4efc03f47490367d203d041795e3bf67a SHA512 4f3e377d1cd041b0d7802a182a4182f461d23fcd989c1c89e111702c0679e64a47c48b398b4bf4605052048dae569627091bdf08c4754d95556810bc3ec9158a
 MISC metadata.xml 329 BLAKE2B 58bfccd5cddfdb91aa5b414646dc07911ab19e1544dc8ac9eabb8d4d8eba138b76b990e017f86854c83efb8f5f6f31f391ad8c03dc8bcf6eef741a70a226ceb6 SHA512 8adfef45e8768b11f9f155e95e1c4b50606aa53abd64b84bc5b24c17134b8daf3536f51ae20a17e871e25db2140181502b62a9ace282872620845412571de89a
diff --git a/dev-ros/cpp_common/cpp_common-0.6.9.ebuild b/dev-ros/cpp_common/cpp_common-0.6.9.ebuild
new file mode 100644
index 000000000000..4b61973c2c53
--- /dev/null
+++ b/dev-ros/cpp_common/cpp_common-0.6.9.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/roscpp_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ code for doing things that are not necessarily ROS related"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/console_bridge:=
+	dev-libs/boost:=[threads]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/message_filters/Manifest b/dev-ros/message_filters/Manifest
index 7302a391bec2..3f59e8240ccf 100644
--- a/dev-ros/message_filters/Manifest
+++ b/dev-ros/message_filters/Manifest
@@ -1,13 +1,7 @@
 AUX tests.patch 4837 BLAKE2B 2793652865f2d1f8ce1499b37922e480d40ca3931f098156a6cf541ad48985a3bee29364bb09e37c4f15424765dd057875f26dd5290f5747718538bcbeb3aead SHA512 2c778a7e4c7fc6d89ef162fd42d6f1dbd487d885c7ee04f6a8243142aaf949b02bfcd0c08cc8799f7a1ee95d13c8d21aef340abc4a3e6ca3c0f2231118985796
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-EBUILD message_filters-1.13.0.ebuild 800 BLAKE2B e5bd733e2e07c031e60f3c7a306b043b8fd240e0ba0cbb895da7980d92faa82decbc1d08d056fc4bfa06fd542292dc2667248135a1b6f41330261d508cdafc41 SHA512 fad3d08a7de4c26b00488eb2e57d21faf2dc444faeae87d645bf02cc99eae49b09a4f8c10754c90cde26fb60f52102f8be3d10653196b2c2449c0fa727f18cc0
-EBUILD message_filters-1.13.1.ebuild 800 BLAKE2B e5bd733e2e07c031e60f3c7a306b043b8fd240e0ba0cbb895da7980d92faa82decbc1d08d056fc4bfa06fd542292dc2667248135a1b6f41330261d508cdafc41 SHA512 fad3d08a7de4c26b00488eb2e57d21faf2dc444faeae87d645bf02cc99eae49b09a4f8c10754c90cde26fb60f52102f8be3d10653196b2c2449c0fa727f18cc0
-EBUILD message_filters-1.13.2.ebuild 800 BLAKE2B e5bd733e2e07c031e60f3c7a306b043b8fd240e0ba0cbb895da7980d92faa82decbc1d08d056fc4bfa06fd542292dc2667248135a1b6f41330261d508cdafc41 SHA512 fad3d08a7de4c26b00488eb2e57d21faf2dc444faeae87d645bf02cc99eae49b09a4f8c10754c90cde26fb60f52102f8be3d10653196b2c2449c0fa727f18cc0
-EBUILD message_filters-1.13.4.ebuild 800 BLAKE2B e5bd733e2e07c031e60f3c7a306b043b8fd240e0ba0cbb895da7980d92faa82decbc1d08d056fc4bfa06fd542292dc2667248135a1b6f41330261d508cdafc41 SHA512 fad3d08a7de4c26b00488eb2e57d21faf2dc444faeae87d645bf02cc99eae49b09a4f8c10754c90cde26fb60f52102f8be3d10653196b2c2449c0fa727f18cc0
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD message_filters-1.13.5.ebuild 800 BLAKE2B e5bd733e2e07c031e60f3c7a306b043b8fd240e0ba0cbb895da7980d92faa82decbc1d08d056fc4bfa06fd542292dc2667248135a1b6f41330261d508cdafc41 SHA512 fad3d08a7de4c26b00488eb2e57d21faf2dc444faeae87d645bf02cc99eae49b09a4f8c10754c90cde26fb60f52102f8be3d10653196b2c2449c0fa727f18cc0
-EBUILD message_filters-9999.ebuild 800 BLAKE2B e5bd733e2e07c031e60f3c7a306b043b8fd240e0ba0cbb895da7980d92faa82decbc1d08d056fc4bfa06fd542292dc2667248135a1b6f41330261d508cdafc41 SHA512 fad3d08a7de4c26b00488eb2e57d21faf2dc444faeae87d645bf02cc99eae49b09a4f8c10754c90cde26fb60f52102f8be3d10653196b2c2449c0fa727f18cc0
+EBUILD message_filters-1.13.6.ebuild 782 BLAKE2B 5fe1a17f76e448fb0e9e79d34e4562cd8646bb9460bf7924ed6675b79c4baf4291427f3828a27fdd4a59f706eeb3cb207e38d0f951b4500bee204b8b3cb44406 SHA512 62a1ffd1cdd967ccf4bbc9b78390499f050b72c17b9d0bcd906846f006c0e89a6c988e63b3cf4ccbfeef45e515d461aae3ab9046e26dc0bb9b3a0fddd16faa19
+EBUILD message_filters-9999.ebuild 782 BLAKE2B 5fe1a17f76e448fb0e9e79d34e4562cd8646bb9460bf7924ed6675b79c4baf4291427f3828a27fdd4a59f706eeb3cb207e38d0f951b4500bee204b8b3cb44406 SHA512 62a1ffd1cdd967ccf4bbc9b78390499f050b72c17b9d0bcd906846f006c0e89a6c988e63b3cf4ccbfeef45e515d461aae3ab9046e26dc0bb9b3a0fddd16faa19
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/message_filters/message_filters-1.13.4.ebuild b/dev-ros/message_filters/message_filters-1.13.4.ebuild
deleted file mode 100644
index fcb4bda239a5..000000000000
--- a/dev-ros/message_filters/message_filters-1.13.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Set of message filters which take in messages and may output those messages at a later time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=[threads]
-	dev-ros/genpy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/message_filters/message_filters-1.13.0.ebuild b/dev-ros/message_filters/message_filters-1.13.6.ebuild
index fcb4bda239a5..ae26242e4665 100644
--- a/dev-ros/message_filters/message_filters-1.13.0.ebuild
+++ b/dev-ros/message_filters/message_filters-1.13.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,6 @@ IUSE=""
 RDEPEND="
 	dev-ros/rosconsole
 	dev-ros/roscpp
-	dev-ros/xmlrpcpp
 	dev-libs/boost:=[threads]
 	dev-ros/genpy[${PYTHON_USEDEP}]
 	dev-ros/roslib[${PYTHON_USEDEP}]
diff --git a/dev-ros/message_filters/message_filters-9999.ebuild b/dev-ros/message_filters/message_filters-9999.ebuild
index fcb4bda239a5..ae26242e4665 100644
--- a/dev-ros/message_filters/message_filters-9999.ebuild
+++ b/dev-ros/message_filters/message_filters-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,6 @@ IUSE=""
 RDEPEND="
 	dev-ros/rosconsole
 	dev-ros/roscpp
-	dev-ros/xmlrpcpp
 	dev-libs/boost:=[threads]
 	dev-ros/genpy[${PYTHON_USEDEP}]
 	dev-ros/roslib[${PYTHON_USEDEP}]
diff --git a/dev-ros/mk/Manifest b/dev-ros/mk/Manifest
index f8b373feb605..b362201e25dc 100644
--- a/dev-ros/mk/Manifest
+++ b/dev-ros/mk/Manifest
@@ -8,6 +8,7 @@ DIST ros-1.13.5.tar.gz 167351 BLAKE2B a9a2b9aa4ca2fd9391eebe0f757cbd229d480f8be8
 DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee5547254500ade917484674aefd8b91d651c8f48c187704b4174659c3a983cd6a864f316180f2de4d45ef4f6e0c7cd86 SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31
 DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
+DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
 EBUILD mk-1.12.3.ebuild 375 BLAKE2B 90af150f66eaf495a195d9496b85c5d7032e63dea49a8e3a4a50093ec28dc0b9ee34d325b1271767c00ec2ab0f009c3d55435dc455b804381552d5720b77695c SHA512 646ad27a20843606d390e1050bb2e374ffdd9ff74c3881564580cc09774743e8041ef4864b0b80366315ff7c84ea30f100e47b14bca35ed328590ff4fe498812
 EBUILD mk-1.12.5.ebuild 375 BLAKE2B 90af150f66eaf495a195d9496b85c5d7032e63dea49a8e3a4a50093ec28dc0b9ee34d325b1271767c00ec2ab0f009c3d55435dc455b804381552d5720b77695c SHA512 646ad27a20843606d390e1050bb2e374ffdd9ff74c3881564580cc09774743e8041ef4864b0b80366315ff7c84ea30f100e47b14bca35ed328590ff4fe498812
 EBUILD mk-1.13.1.ebuild 375 BLAKE2B 90af150f66eaf495a195d9496b85c5d7032e63dea49a8e3a4a50093ec28dc0b9ee34d325b1271767c00ec2ab0f009c3d55435dc455b804381552d5720b77695c SHA512 646ad27a20843606d390e1050bb2e374ffdd9ff74c3881564580cc09774743e8041ef4864b0b80366315ff7c84ea30f100e47b14bca35ed328590ff4fe498812
@@ -18,5 +19,6 @@ EBUILD mk-1.13.5.ebuild 375 BLAKE2B d8b4bb6bc10990275b7f4b55d61942666605be22da31
 EBUILD mk-1.14.0.ebuild 375 BLAKE2B d8b4bb6bc10990275b7f4b55d61942666605be22da31662bc4180af8ac3754686edfff45c5cc1a4c9da766a40589d5da1044dc900af3e59afe2c6cd698b7e72a SHA512 60fb53a958d5fb9816b68ac15255469f0a5c57ad7d0e13a0c8e49effa66718ec399e125b74b147b9122cc645399e512b5bd09020b74469b8e0cb2da35203fe5e
 EBUILD mk-1.14.1.ebuild 375 BLAKE2B d8b4bb6bc10990275b7f4b55d61942666605be22da31662bc4180af8ac3754686edfff45c5cc1a4c9da766a40589d5da1044dc900af3e59afe2c6cd698b7e72a SHA512 60fb53a958d5fb9816b68ac15255469f0a5c57ad7d0e13a0c8e49effa66718ec399e125b74b147b9122cc645399e512b5bd09020b74469b8e0cb2da35203fe5e
 EBUILD mk-1.14.2.ebuild 375 BLAKE2B d8b4bb6bc10990275b7f4b55d61942666605be22da31662bc4180af8ac3754686edfff45c5cc1a4c9da766a40589d5da1044dc900af3e59afe2c6cd698b7e72a SHA512 60fb53a958d5fb9816b68ac15255469f0a5c57ad7d0e13a0c8e49effa66718ec399e125b74b147b9122cc645399e512b5bd09020b74469b8e0cb2da35203fe5e
+EBUILD mk-1.14.3.ebuild 375 BLAKE2B dc9107f8b68fd4c40998b1e25d4d2efb3645a8263dea46f047b2cfb970d811cd5289212a61dbb3d00112f750644b6d6bea7179666807b7a9d2477fc8af9dfc6c SHA512 699f235d01cdc1168d163bf885feba22845f1db03d34a194ea58ff4cb3f3dd414ce3b4111fd672a00d8dc3f0e4fd74ff8e2c572085dbcccddee2e24a344dc539
 EBUILD mk-9999.ebuild 375 BLAKE2B 90af150f66eaf495a195d9496b85c5d7032e63dea49a8e3a4a50093ec28dc0b9ee34d325b1271767c00ec2ab0f009c3d55435dc455b804381552d5720b77695c SHA512 646ad27a20843606d390e1050bb2e374ffdd9ff74c3881564580cc09774743e8041ef4864b0b80366315ff7c84ea30f100e47b14bca35ed328590ff4fe498812
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/mk/mk-1.14.3.ebuild b/dev-ros/mk/mk-1.14.3.ebuild
new file mode 100644
index 000000000000..158d271ee738
--- /dev/null
+++ b/dev-ros/mk/mk-1.14.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+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}"
diff --git a/dev-ros/ros_environment/Manifest b/dev-ros/ros_environment/Manifest
new file mode 100644
index 000000000000..fa5db4025f7b
--- /dev/null
+++ b/dev-ros/ros_environment/Manifest
@@ -0,0 +1,5 @@
+AUX catkinprefixpath.patch 1035 BLAKE2B 8054e8f2ae8a7f0060d44558fe32bdf607b81054249a2f7255878801e8abc2fdaa695609fc056b5a4cfc1fdbf7eae9adbd5057bd8f0831820bbb564b4778c8f2 SHA512 ce669139250c78e521e82ea23ca288c0b12cf7da17bbf06cf4cb3c425b3bc61ad182a475af3923fdbdf7c07f574077e2ad935d6c0c133d408ffc0f0d3f2d02ae
+DIST ros_environment-1.2.0.tar.gz 6366 BLAKE2B ff540b9e861d039739253b9effbfe06ec703f47b48d9bb7009b5caed5010ed8219a207bfd363c03b115d018965c2e584abbf58f649ea868e66e79d4dda11d1ae SHA512 1b89e3d6ea88fc0972bbe980bae0b663e9335adece8eb0d517cac76b0a412cbe6b9783a967d4a9b5ca1c3bf2a432bb826d28f6f1d9a33fcc33a75edeef0be20b
+EBUILD ros_environment-1.2.0-r1.ebuild 553 BLAKE2B 54d329b8384ea3b8e000b5f9275995bd19ae2dbb4a5579e0bfb853416fab4e22999039506e60cabb7fd939755400b77218f030efc42fe32ebac8de0130b9c52e SHA512 b6706f03c5ae5ad81be45651bd4f6562617213b0e66ddcf7d3ca7e7015f845993c21eebfe06f86405e2e0e827bfdaaf603fbd99bba3a2cdda8c90f5466b8c2fa
+EBUILD ros_environment-9999.ebuild 553 BLAKE2B 54d329b8384ea3b8e000b5f9275995bd19ae2dbb4a5579e0bfb853416fab4e22999039506e60cabb7fd939755400b77218f030efc42fe32ebac8de0130b9c52e SHA512 b6706f03c5ae5ad81be45651bd4f6562617213b0e66ddcf7d3ca7e7015f845993c21eebfe06f86405e2e0e827bfdaaf603fbd99bba3a2cdda8c90f5466b8c2fa
+MISC metadata.xml 333 BLAKE2B 87f510ba6f10a5a9473d242879151d307c5357749325c127ccd415d525968f1f4f3ae23e9e11d328f7cdc115f98b4dfc492dced529627229c6f01f133f67a032 SHA512 85ed3e7f2098353f25e0e6fd77afb64a602f828ab76ae6ac3c5a47eb02cfbb884e6b25473b1488ad9746fdba3ed50db47b90a191c5f2ec145587e33f0761406b
diff --git a/dev-ros/ros_environment/files/catkinprefixpath.patch b/dev-ros/ros_environment/files/catkinprefixpath.patch
new file mode 100644
index 000000000000..67f16ec9348a
--- /dev/null
+++ b/dev-ros/ros_environment/files/catkinprefixpath.patch
@@ -0,0 +1,20 @@
+Support CATKIN_PREFIX_PATH; let CMAKE_PREFIX_PATH come first, so that standard ROS methods still work even if we do not
+use them.
+
+Index: ros_environment-1.2.0/env-hooks/1.ros_package_path.sh.em
+===================================================================
+--- ros_environment-1.2.0.orig/env-hooks/1.ros_package_path.sh.em
++++ ros_environment-1.2.0/env-hooks/1.ros_package_path.sh.em
+@@ -4,8 +4,10 @@
+ PYTHON_CODE_BUILD_ROS_PACKAGE_PATH=$(cat <<EOF
+ from __future__ import print_function
+ import os
+-env_name = 'CMAKE_PREFIX_PATH'
+-paths = [path for path in os.environ[env_name].split(os.pathsep)] if env_name in os.environ and os.environ[env_name] != '' else []
++env_names = [ 'CMAKE_PREFIX_PATH', 'CATKIN_PREFIX_PATH' ]
++paths = []
++for env_name in env_names:
++    paths += [path for path in os.environ[env_name].split(os.pathsep)] if env_name in os.environ and os.environ[env_name] != '' else []
+ workspaces = [path for path in paths if os.path.exists(os.path.join(path, '.catkin'))]
+ paths = []
+ for workspace in workspaces:
diff --git a/dev-ros/ros_environment/metadata.xml b/dev-ros/ros_environment/metadata.xml
new file mode 100644
index 000000000000..7476e60efa62
--- /dev/null
+++ b/dev-ros/ros_environment/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ros/ros_environment</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/ros_environment/ros_environment-1.2.0-r1.ebuild b/dev-ros/ros_environment/ros_environment-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..14906c3050db
--- /dev/null
+++ b/dev-ros/ros_environment/ros_environment-1.2.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_environment"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit ros-catkin
+
+DESCRIPTION="ROS environment variables"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="!!<dev-ros/roslib-1.14.3"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/catkinprefixpath.patch" )
+
+src_configure() {
+	export ROS_DISTRO="Gentoo"
+	export ROS_DISTRO_OVERRIDE="Gentoo"
+	ros-catkin_src_configure
+}
diff --git a/dev-ros/ros_environment/ros_environment-9999.ebuild b/dev-ros/ros_environment/ros_environment-9999.ebuild
new file mode 100644
index 000000000000..14906c3050db
--- /dev/null
+++ b/dev-ros/ros_environment/ros_environment-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_environment"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit ros-catkin
+
+DESCRIPTION="ROS environment variables"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="!!<dev-ros/roslib-1.14.3"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/catkinprefixpath.patch" )
+
+src_configure() {
+	export ROS_DISTRO="Gentoo"
+	export ROS_DISTRO_OVERRIDE="Gentoo"
+	ros-catkin_src_configure
+}
diff --git a/dev-ros/rosbag/Manifest b/dev-ros/rosbag/Manifest
index 2db7d1d9618c..a51f51f50128 100644
--- a/dev-ros/rosbag/Manifest
+++ b/dev-ros/rosbag/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD rosbag-1.13.5-r1.ebuild 788 BLAKE2B aaff3aaa1cd2185386f03d77b1077af54dfe8db1679a0e188c30cdca8c405c471c13fffda3cc33427b9bf1a05b1dbfa774b49adcb2a03bbdcdea9bdc8c5f2f61 SHA512 eb722337ca6e9626ea86a2f0de133b3d649d71f2331463a81357f4f0cb6eae4c6f7e75648bacfa6a3184b1d9deccc1083948426f06d51ccfb3565b9b4686b636
+EBUILD rosbag-1.13.6.ebuild 788 BLAKE2B e79eae884ca24580a8a18e819a55720c74e7d6f5239600336f1664bee61b77467cf86e905a7f65c254b156b6a6e6d9211461a32ca2ca215cec5aac4da43c7d44 SHA512 4378dc8403f94b286cb4ca54a53f8006ef317b1ca343e6fa5e424ee4da972a7cc862d0f19a397afff98c004c012246133d32b60b8ebc727713dda6603ebe9fbc
 EBUILD rosbag-9999.ebuild 788 BLAKE2B aaff3aaa1cd2185386f03d77b1077af54dfe8db1679a0e188c30cdca8c405c471c13fffda3cc33427b9bf1a05b1dbfa774b49adcb2a03bbdcdea9bdc8c5f2f61 SHA512 eb722337ca6e9626ea86a2f0de133b3d649d71f2331463a81357f4f0cb6eae4c6f7e75648bacfa6a3184b1d9deccc1083948426f06d51ccfb3565b9b4686b636
 MISC metadata.xml 418 BLAKE2B 2d84b96bfb428654a9b926100a8bd083afb2addc6db8b2e6fb003fab4bb8c1615df40ee13c863a3ddfe98a1a1f9b72af8310a80a9f610a01fe14366afde2e38d SHA512 d7579d9a25bf9f83513e3d8058ec845ee9b59e5d999128532b63d992cee8ef94922aee88140f044829442077c6f9ae80d6b0b0f554cf677690fdc88a17c9f260
diff --git a/dev-ros/rosbag/rosbag-1.13.6.ebuild b/dev-ros/rosbag/rosbag-1.13.6.ebuild
new file mode 100644
index 000000000000..0517a514bb8d
--- /dev/null
+++ b/dev-ros/rosbag/rosbag-1.13.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+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
+	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_USEDEP}]
+	dev-ros/genpy[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	lz4? ( dev-ros/roslz4[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosbag_storage/Manifest b/dev-ros/rosbag_storage/Manifest
index b2c594f5dd91..b323555252bc 100644
--- a/dev-ros/rosbag_storage/Manifest
+++ b/dev-ros/rosbag_storage/Manifest
@@ -1,5 +1,7 @@
 AUX logging.patch 1413 BLAKE2B a483c85345e4ce5f0a05b144fd1b7372336b9c1b662adc97f8523ff35a511c4dac79ea3e2007b25d08f14e8a72215c9210c8d10a3d995bd553efd119c557b857 SHA512 9416943424d475d1a1598ead2f0886e71da3b66d0e49a0b88b00443808579d441a21c892ad4f0eb8acc6e334973976e543942504a9d7cd96f465ed278e1c2a0a
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD rosbag_storage-1.13.5-r1.ebuild 601 BLAKE2B daacb65932d99179656da5421499edfb4220da7af7a36db1df5c2c92e482bec2797c26c4099b59590c5e067ecf272b8196cb38e02f2e903006b1ccd98ff6b00c SHA512 90346da2e41f9a8872fade4baf35337a898cdd0016180d428674545d7c203950fa242646bc043707908ec0dbd18843dca7ce4008a6cb0597ae2116e087dea99c
+EBUILD rosbag_storage-1.13.6.ebuild 561 BLAKE2B a854c2211195a8f6d7315aaac5ace505422963fe8c61efadc9bbeeff0d0772f04f97564c08dcbc97217d83a3e2d1148f46a9c58661ac7f50306c7dad3e176356 SHA512 041d8bdd541ad46b520f09d8fb1d3006fb1ed8a16631763491dd2f416791f59a0cbb4a314d80e2c55b8336a30eda0032428a2c22a248c4b0b17b5c318b056c09
 EBUILD rosbag_storage-9999.ebuild 561 BLAKE2B 15e7ad41222dfdb28ae020427b69bf33bdcd1ceddf691af8276bb3a71900fd17b111caad7f8e3e90b800f3461d291c90f1a411a4a5aa07767e51a82330af9c1b SHA512 6d62fd37d0e4ae687ff233328693ab233aa81decd4ebe0ae956f92da52ccf827a2c73ef3771dade3ed21b08328a5fb6ea9210bc6ef02859e9c20c57fc86a3e43
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.13.6.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.13.6.ebuild
new file mode 100644
index 000000000000..60604612caf1
--- /dev/null
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.13.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=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/roscpp_serialization
+	dev-ros/roscpp_traits
+	dev-ros/rostime
+	dev-ros/roslz4
+	dev-libs/boost:=
+	app-arch/bzip2
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbash/Manifest b/dev-ros/rosbash/Manifest
index b09b83dd7700..47c4ce0750d6 100644
--- a/dev-ros/rosbash/Manifest
+++ b/dev-ros/rosbash/Manifest
@@ -2,8 +2,10 @@ AUX catkin_prefix2.patch 484 BLAKE2B 54fbc5a2dee390b46a9beccd804102f390e734ee827
 DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee5547254500ade917484674aefd8b91d651c8f48c187704b4174659c3a983cd6a864f316180f2de4d45ef4f6e0c7cd86 SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31
 DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
+DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
 EBUILD rosbash-1.14.0.ebuild 397 BLAKE2B 697a26c052654752492451f3dcf43ab749ce7465a780abec59a9ca6b3a292ac3ac5b63a823872438051d1e735df30457b978420138f6343927f081cee4e14328 SHA512 88620b4194b8f9f28abd459d601c7af6538b532143a04b8f5ba4d455800f79426138316c3b110527e71c369d24dfa6c5781290e3359f2a581ff9022376bf8c0d
 EBUILD rosbash-1.14.1.ebuild 397 BLAKE2B 697a26c052654752492451f3dcf43ab749ce7465a780abec59a9ca6b3a292ac3ac5b63a823872438051d1e735df30457b978420138f6343927f081cee4e14328 SHA512 88620b4194b8f9f28abd459d601c7af6538b532143a04b8f5ba4d455800f79426138316c3b110527e71c369d24dfa6c5781290e3359f2a581ff9022376bf8c0d
 EBUILD rosbash-1.14.2.ebuild 397 BLAKE2B 697a26c052654752492451f3dcf43ab749ce7465a780abec59a9ca6b3a292ac3ac5b63a823872438051d1e735df30457b978420138f6343927f081cee4e14328 SHA512 88620b4194b8f9f28abd459d601c7af6538b532143a04b8f5ba4d455800f79426138316c3b110527e71c369d24dfa6c5781290e3359f2a581ff9022376bf8c0d
+EBUILD rosbash-1.14.3.ebuild 397 BLAKE2B af829f04684903bcd7f53ad019615f0a8357c63e6fca7949322cf945f4bd27352f631488539239a9c7625e6d9fda2df49e17d51c02ef31ea2309851b75d22b4b SHA512 b075932a3f05df7fb8bd3995eb826d4be5ffed44070b321fcd8749ff4433cd3813b563c7bce9e92611cf2c2a2b76caa1bde98d90f26fc0b6450fe072cd20c51d
 EBUILD rosbash-9999.ebuild 397 BLAKE2B efc58a8a7f774d0c4c149f7d742532a12d1c20d919657c18c15e5113b9c78cfff54ff1ef248ac18136fe17c4ac867ab017a57c112e984cbded05e79131f580f4 SHA512 2cd1be7424bd28eea9ab74a9af96036be9c401e45d2ed33c9fad290694ceafc5ecb4245de700eacf0c5799324d92df08f7da2978c38e1409b0e7e01fccb01879
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosbash/rosbash-1.14.3.ebuild b/dev-ros/rosbash/rosbash-1.14.3.ebuild
new file mode 100644
index 000000000000..bef22c0c8f54
--- /dev/null
+++ b/dev-ros/rosbash/rosbash-1.14.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+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=""
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
diff --git a/dev-ros/rosboost_cfg/Manifest b/dev-ros/rosboost_cfg/Manifest
index a42d216cb8b1..613e1c7ee168 100644
--- a/dev-ros/rosboost_cfg/Manifest
+++ b/dev-ros/rosboost_cfg/Manifest
@@ -1,8 +1,10 @@
 DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee5547254500ade917484674aefd8b91d651c8f48c187704b4174659c3a983cd6a864f316180f2de4d45ef4f6e0c7cd86 SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31
 DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
+DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
 EBUILD rosboost_cfg-1.14.0.ebuild 404 BLAKE2B 48203ef89441ae30f36386de138e4dd270570723c7859db065728b93323adb44270488e6471f29f99f7a62bcb3ce93c152149c10a75c0d2fad45d455f36f5eff SHA512 ada58b94da4ab79e27617f452697b2bf237c993eea09ac79ab6f16b59abfe1e0fb2656d8c3a65638f1d01e494900e1e4a5b9f178745655ed4ee75739f0c6fcee
 EBUILD rosboost_cfg-1.14.1.ebuild 404 BLAKE2B 48203ef89441ae30f36386de138e4dd270570723c7859db065728b93323adb44270488e6471f29f99f7a62bcb3ce93c152149c10a75c0d2fad45d455f36f5eff SHA512 ada58b94da4ab79e27617f452697b2bf237c993eea09ac79ab6f16b59abfe1e0fb2656d8c3a65638f1d01e494900e1e4a5b9f178745655ed4ee75739f0c6fcee
 EBUILD rosboost_cfg-1.14.2.ebuild 404 BLAKE2B 48203ef89441ae30f36386de138e4dd270570723c7859db065728b93323adb44270488e6471f29f99f7a62bcb3ce93c152149c10a75c0d2fad45d455f36f5eff SHA512 ada58b94da4ab79e27617f452697b2bf237c993eea09ac79ab6f16b59abfe1e0fb2656d8c3a65638f1d01e494900e1e4a5b9f178745655ed4ee75739f0c6fcee
+EBUILD rosboost_cfg-1.14.3.ebuild 404 BLAKE2B 54c18c5b9e3cdfebc7c5a97a4f792098c45b41ca466987214918527a211a9b054fc1dfb41a09eb1b74dad3451c89b4233fff5f50567d22229b8c55d2b6d6d23c SHA512 d9cb5768cce8e96a5117dae239c4c983eb954737be4123d01edb874b052686c0027c1306727e3f646ded4179b04be88b81933e78c11bb68b6758826628dd5257
 EBUILD rosboost_cfg-9999.ebuild 404 BLAKE2B 48203ef89441ae30f36386de138e4dd270570723c7859db065728b93323adb44270488e6471f29f99f7a62bcb3ce93c152149c10a75c0d2fad45d455f36f5eff SHA512 ada58b94da4ab79e27617f452697b2bf237c993eea09ac79ab6f16b59abfe1e0fb2656d8c3a65638f1d01e494900e1e4a5b9f178745655ed4ee75739f0c6fcee
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosboost_cfg/rosboost_cfg-1.14.3.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.14.3.ebuild
new file mode 100644
index 000000000000..642c0a9d2fd8
--- /dev/null
+++ b/dev-ros/rosboost_cfg/rosboost_cfg-1.14.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+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 685aef54ab04..657c67c354bc 100644
--- a/dev-ros/rosbuild/Manifest
+++ b/dev-ros/rosbuild/Manifest
@@ -1,4 +1,6 @@
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
+DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
 EBUILD rosbuild-1.14.2.ebuild 359 BLAKE2B 5480063e327e04bf680869425ce3f41aca4d046a85b6da58e95af25ce09f6a4d20728bfb8306168036e9f6029e0d5bfbbbb631726fece9356ccb11ef5315d7a4 SHA512 c32f230cb997b196c479113619ef447f2dca26eeccc3f3aad5819641f29adddb3c2a7e6b694fd3f1d91987d401bbfe4b736612dfa767251c7cbd3d117c32c1d7
+EBUILD rosbuild-1.14.3.ebuild 359 BLAKE2B 4f06a27d7541789e90b44bdb141bdce321cfa175907435f495b468a131b6bf9fbb12760023c06f2f205a740a26c2f7508e1010c340db44849c342f6575bb5963 SHA512 a81fcf9c6ff5c4255eff7bc0d0a666e479282663477cfc43d6c74bdd8e61108ca05e5fec77511bb70e83c75841ec74b1aa16c850023f81637bcd7528ddcff5c9
 EBUILD rosbuild-9999.ebuild 359 BLAKE2B ad9f9b2884bab7f030013e68e212acf2c4f01a3e7029a9b3970888c7217a286b3801e51b0e07da0a941c67b1faebc754d0740d398f44364b4edced5baa36dcd8 SHA512 9141477396ef5d7dc006c1b6eba58c127a936623c52d4e2ef0da9b47751c56cb2b8eee7f72c255662b98fcec73f32f0c55a0eb8621cee8ef8b22a0d779835611
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosbuild/rosbuild-1.14.3.ebuild b/dev-ros/rosbuild/rosbuild-1.14.3.ebuild
new file mode 100644
index 000000000000..a445e3892ca0
--- /dev/null
+++ b/dev-ros/rosbuild/rosbuild-1.14.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+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 53a7eb17d802..a53822d4b319 100644
--- a/dev-ros/rosclean/Manifest
+++ b/dev-ros/rosclean/Manifest
@@ -2,8 +2,10 @@ AUX bb.patch 1448 BLAKE2B 5b5c19eb43f461404f0a3fc064a9597424b064292785fd1dec6e62
 DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee5547254500ade917484674aefd8b91d651c8f48c187704b4174659c3a983cd6a864f316180f2de4d45ef4f6e0c7cd86 SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31
 DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
+DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
 EBUILD rosclean-1.14.0.ebuild 515 BLAKE2B ab604ad9028bbce5661c52a5dba7c94344a260f874f64ed0829817a8a1e7d64155192741830d454fce4881576f0ded267c26135b8f08b02d9dc8ad546ca2a854 SHA512 ad634d8296e5bd2c7e561d8d348b88bdc6f0feff15a194165b543f32bc27aaebfe31a861f45dc7455c5ca2f83d324548fe728b8bbc3590988384835911e3e6d2
 EBUILD rosclean-1.14.1.ebuild 515 BLAKE2B ab604ad9028bbce5661c52a5dba7c94344a260f874f64ed0829817a8a1e7d64155192741830d454fce4881576f0ded267c26135b8f08b02d9dc8ad546ca2a854 SHA512 ad634d8296e5bd2c7e561d8d348b88bdc6f0feff15a194165b543f32bc27aaebfe31a861f45dc7455c5ca2f83d324548fe728b8bbc3590988384835911e3e6d2
 EBUILD rosclean-1.14.2.ebuild 515 BLAKE2B ab604ad9028bbce5661c52a5dba7c94344a260f874f64ed0829817a8a1e7d64155192741830d454fce4881576f0ded267c26135b8f08b02d9dc8ad546ca2a854 SHA512 ad634d8296e5bd2c7e561d8d348b88bdc6f0feff15a194165b543f32bc27aaebfe31a861f45dc7455c5ca2f83d324548fe728b8bbc3590988384835911e3e6d2
+EBUILD rosclean-1.14.3.ebuild 515 BLAKE2B fa83467fd09d0332cc684e7bee60e331dbb2ff4baafbe7e10d4f629485dbde5a5ebea9c23151568a339920e45253c44eb3f33b25bfeb724615074b70b4d5a675 SHA512 6b82d82b58bac9d1f7f575410f6ab3026297c13f55f36f0037d96ab07a39ccdfdd19f9b1803a356f2422c06bda5e6575028ed06d8e2ba295c7ded8c261148223
 EBUILD rosclean-9999.ebuild 515 BLAKE2B ab604ad9028bbce5661c52a5dba7c94344a260f874f64ed0829817a8a1e7d64155192741830d454fce4881576f0ded267c26135b8f08b02d9dc8ad546ca2a854 SHA512 ad634d8296e5bd2c7e561d8d348b88bdc6f0feff15a194165b543f32bc27aaebfe31a861f45dc7455c5ca2f83d324548fe728b8bbc3590988384835911e3e6d2
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosclean/rosclean-1.14.3.ebuild b/dev-ros/rosclean/rosclean-1.14.3.ebuild
new file mode 100644
index 000000000000..21f38f6fae9a
--- /dev/null
+++ b/dev-ros/rosclean/rosclean-1.14.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Cleanup filesystem resources (e.g. log files)"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+PATCHES=( "${FILESDIR}/bb.patch" )
diff --git a/dev-ros/rosconsole/Manifest b/dev-ros/rosconsole/Manifest
index 5c8090abefef..b152e327f363 100644
--- a/dev-ros/rosconsole/Manifest
+++ b/dev-ros/rosconsole/Manifest
@@ -7,6 +7,7 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD rosconsole-1.12.5.ebuild 828 BLAKE2B e29a3a389028d513a848fa8775e5af5f917998c4aa0f6f0d102bed4f082d5a83a55722de1f6e98a350d04adb290f8fd71b12a8e8bc90a6b946d804a95eefbc9a SHA512 fb28469ec9ea38e830b9390be614f30c90d2bbf0cde0339d7f326e008179a73b5f814dccc5a086fa91f9541844e4b330eb330667064fae846af71ca60949e50a
 EBUILD rosconsole-1.12.6.ebuild 789 BLAKE2B 93b8b8384a5f5f89fd5e5ad0d19b1708e344853f52e1a19b0777628971bd3fd07f6b746ad45c135519c6493baecaddd5ab2f47f997a0219e6da3320c9ad6a13d SHA512 21261df402cda22d8f94a7a377348def3995625be6ef1935bbc9af3d858660b453ed798525a8bc0c7b5b33bbc8842b8ba722a2e84cff148f1ba9378585372ede
 EBUILD rosconsole-1.12.7.ebuild 789 BLAKE2B 9fcccb20b80b62ff402e3792e04cbcb53ea15b41fb4415ae6cc4b4c4f9f0e0efc421c2d43f72d0d1ff99a45404e61ec9b2325a6a451e33b69985b1366188b8ab SHA512 9dcaa45739e2aa5c65e1a4929019577c7fe16f34da326df87f68f243df4a67654f6b6db4c5320e271f4ca08c09d01ac5799a462398325397a3c89ada9e7e060b
@@ -15,5 +16,6 @@ EBUILD rosconsole-1.13.1.ebuild 789 BLAKE2B 9fcccb20b80b62ff402e3792e04cbcb53ea1
 EBUILD rosconsole-1.13.2.ebuild 789 BLAKE2B 9fcccb20b80b62ff402e3792e04cbcb53ea15b41fb4415ae6cc4b4c4f9f0e0efc421c2d43f72d0d1ff99a45404e61ec9b2325a6a451e33b69985b1366188b8ab SHA512 9dcaa45739e2aa5c65e1a4929019577c7fe16f34da326df87f68f243df4a67654f6b6db4c5320e271f4ca08c09d01ac5799a462398325397a3c89ada9e7e060b
 EBUILD rosconsole-1.13.4.ebuild 789 BLAKE2B 9fcccb20b80b62ff402e3792e04cbcb53ea15b41fb4415ae6cc4b4c4f9f0e0efc421c2d43f72d0d1ff99a45404e61ec9b2325a6a451e33b69985b1366188b8ab SHA512 9dcaa45739e2aa5c65e1a4929019577c7fe16f34da326df87f68f243df4a67654f6b6db4c5320e271f4ca08c09d01ac5799a462398325397a3c89ada9e7e060b
 EBUILD rosconsole-1.13.5.ebuild 789 BLAKE2B 9fcccb20b80b62ff402e3792e04cbcb53ea15b41fb4415ae6cc4b4c4f9f0e0efc421c2d43f72d0d1ff99a45404e61ec9b2325a6a451e33b69985b1366188b8ab SHA512 9dcaa45739e2aa5c65e1a4929019577c7fe16f34da326df87f68f243df4a67654f6b6db4c5320e271f4ca08c09d01ac5799a462398325397a3c89ada9e7e060b
+EBUILD rosconsole-1.13.6.ebuild 789 BLAKE2B f7e1468717fd6c8cf1829fcdc53838807478f0a3c3d3dcbd465e6d73aadb31aa5c48d7137cb29cdf2b6b91d8194a6ffab1c3fef094547290ad4270e4a7c12425 SHA512 0979b156f8a4a0458064a0cf9c92d01603a455d4f56d863603bcb863ec7c81aea317dbc71c6cfb64b02e16d6369e3ca635ab20deeaaa924bc835a5915a129fa0
 EBUILD rosconsole-9999.ebuild 789 BLAKE2B c748512aa3000741ebf9a4e65b96b773fa11837f786618eff4aeb78f0b68277950ba2659b67fe5907550f46fbf513647129062d0387ef6586589543b100a0754 SHA512 cc63348b5f297e2ac0a808ca9345dd008f19bfabb66187b34014e8f7f9bf328d4c4e12f61cc3bb18c23b8295aaf7236819992944a1d9d130c184d4e677931b12
 MISC metadata.xml 506 BLAKE2B 8f06ce63dfe5a9efb05feb0fb939e33131413252a5d441719383a83219f0637bd9c2d2c1ee2c94b3a3bcb1ea34cc573f6e010935c69c547d9a3269ee23b0fb74 SHA512 84b404de2f1df9eba8d51450637b11e19d7ffb6d55133ce44a643b39b939437ef7228ac7369923ffd84317fc3690e8179a9fda438e94683eda63b13f8dd9d165
diff --git a/dev-ros/rosconsole/rosconsole-1.13.6.ebuild b/dev-ros/rosconsole/rosconsole-1.13.6.ebuild
new file mode 100644
index 000000000000..146fbb09651d
--- /dev/null
+++ b/dev-ros/rosconsole/rosconsole-1.13.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+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 b02bdb0f4909..98b8359267e6 100644
--- a/dev-ros/roscpp/Manifest
+++ b/dev-ros/roscpp/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD roscpp-1.13.0.ebuild 660 BLAKE2B c672c938a5a26749a183413dd65ede6fe5d5ad878e02ae36447679995969ce9d60cc925bb0d4f9d43f36828ff245d34f68aceeb01d8f0b6a7b88d4c89987cd35 SHA512 8bddfb5b394c902c228d70808ef468c747dafba23701b50bfe6513725e6df36b426a1cd5a94655abdcdf52a3dff7f2d58478e47202b19af26c6044e7d3c72f1a
 EBUILD roscpp-1.13.1.ebuild 660 BLAKE2B c672c938a5a26749a183413dd65ede6fe5d5ad878e02ae36447679995969ce9d60cc925bb0d4f9d43f36828ff245d34f68aceeb01d8f0b6a7b88d4c89987cd35 SHA512 8bddfb5b394c902c228d70808ef468c747dafba23701b50bfe6513725e6df36b426a1cd5a94655abdcdf52a3dff7f2d58478e47202b19af26c6044e7d3c72f1a
 EBUILD roscpp-1.13.2.ebuild 660 BLAKE2B c672c938a5a26749a183413dd65ede6fe5d5ad878e02ae36447679995969ce9d60cc925bb0d4f9d43f36828ff245d34f68aceeb01d8f0b6a7b88d4c89987cd35 SHA512 8bddfb5b394c902c228d70808ef468c747dafba23701b50bfe6513725e6df36b426a1cd5a94655abdcdf52a3dff7f2d58478e47202b19af26c6044e7d3c72f1a
 EBUILD roscpp-1.13.4.ebuild 660 BLAKE2B c672c938a5a26749a183413dd65ede6fe5d5ad878e02ae36447679995969ce9d60cc925bb0d4f9d43f36828ff245d34f68aceeb01d8f0b6a7b88d4c89987cd35 SHA512 8bddfb5b394c902c228d70808ef468c747dafba23701b50bfe6513725e6df36b426a1cd5a94655abdcdf52a3dff7f2d58478e47202b19af26c6044e7d3c72f1a
 EBUILD roscpp-1.13.5.ebuild 660 BLAKE2B c672c938a5a26749a183413dd65ede6fe5d5ad878e02ae36447679995969ce9d60cc925bb0d4f9d43f36828ff245d34f68aceeb01d8f0b6a7b88d4c89987cd35 SHA512 8bddfb5b394c902c228d70808ef468c747dafba23701b50bfe6513725e6df36b426a1cd5a94655abdcdf52a3dff7f2d58478e47202b19af26c6044e7d3c72f1a
+EBUILD roscpp-1.13.6.ebuild 660 BLAKE2B e690e4fed779ce1564559bad4e32a8703d7497eda3d057d92181a199b90910203689bdb6fbaa6e4e415b8c8f81ebe65ea2f75f2d946a58b5e481d2b8647d5d31 SHA512 06fd3999eabbaeffc1e6f5563e1b28ba2838eaa4993780ea8b172376dda882ed953a729a638bfc7e920566320a722d0e6ec4bebec76e6b7b870618e3902ce92a
 EBUILD roscpp-9999.ebuild 660 BLAKE2B c672c938a5a26749a183413dd65ede6fe5d5ad878e02ae36447679995969ce9d60cc925bb0d4f9d43f36828ff245d34f68aceeb01d8f0b6a7b88d4c89987cd35 SHA512 8bddfb5b394c902c228d70808ef468c747dafba23701b50bfe6513725e6df36b426a1cd5a94655abdcdf52a3dff7f2d58478e47202b19af26c6044e7d3c72f1a
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roscpp/roscpp-1.13.6.ebuild b/dev-ros/roscpp/roscpp-1.13.6.ebuild
new file mode 100644
index 000000000000..6be640b77dc2
--- /dev/null
+++ b/dev-ros/roscpp/roscpp-1.13.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=clients/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rosconsole
+	dev-ros/roscpp_serialization
+	dev-ros/roscpp_traits
+	dev-ros/rostime
+	dev-ros/xmlrpcpp
+	dev-libs/boost:=
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp_serialization/Manifest b/dev-ros/roscpp_serialization/Manifest
index 3a622ee05b49..85cfc620876e 100644
--- a/dev-ros/roscpp_serialization/Manifest
+++ b/dev-ros/roscpp_serialization/Manifest
@@ -8,6 +8,7 @@ DIST roscpp_core-0.6.4.tar.gz 33661 BLAKE2B 5f38662f221f8a02c90cf8c739b5f9ecf5d8
 DIST roscpp_core-0.6.5.tar.gz 34493 BLAKE2B 9804fe6f23192e0e19bfb26e0671ad36189b936701e45755adb0c54e25c1c92dabd6f645bd014451bcd21f45af39be2f1c24727d1231cc52b62caba4d01ca4ff SHA512 32314cac55716b074416fac6665a8dec3a6a64abfac55be709f50b7ca1cbd993797d176bc2aefe2ae8b233b21e8464f330ad31de98bf60edc63149215dcb0cda
 DIST roscpp_core-0.6.7.tar.gz 34845 BLAKE2B cdb2385069a74d670061bc2245421e31216e1c9ace5c96f83d1875ddcf460f2ad425b10db3330253e2a49f3bc415cf3c72ab885cb121c9477ae54a385893a7b8 SHA512 d93afb6e0e88bb01b13af0334a7977411fac8f89dd06fc69a32b95bab4ead05d6cb564b089ee846fe542be180f6418664f8328a6a9e753a55b34e5a0a1d61bf4
 DIST roscpp_core-0.6.8.tar.gz 35003 BLAKE2B 7b4c02652693f76326df83d17164d3268f8b0eda0ddfe8f73d286ae09d7fbb3f8f433ab92527167fb918b55c53aeaa4e26d6876dac51d9d35e0b18b185d89867 SHA512 5fa9f8714059fbc864583662cd411d64470565cc2c372a09a63708a8cc06140d2ce8b84a7025837a49f2c09c7fee5092ec42d5625de4bfd2d9410baf7821b5df
+DIST roscpp_core-0.6.9.tar.gz 35069 BLAKE2B 5718611730419de3fd5dbd7c26792857c75306f4155916fe9570e494a0b1f0b9ca167a06654e1d5b1e1d20aa8cbd17c306bc91e7d0e803c8691d78c6c456fcec SHA512 87360695e71a020e869633c19187851242b84686b87842b388273f9874ff72e4e587eaf55dc10d099e55bc8db17c2ae7efdd5a9ff553a006b7f7c4ea5e1c84d9
 EBUILD roscpp_serialization-0.5.6.ebuild 387 BLAKE2B f317b3ea7afe3d1fae0ce968ee9dd5096827a7cffb2ad977b6f27a07c14d9fb8f87bdf8f763cd726df89b9260398598ff26b0dc0ed680cc319337111465374f3 SHA512 df6d50183e072652d2c3c513bbc3d031289cbcc6391d30ea2ff348c419b507d7b4691cee60ffe5198ece313bc8eaae6351d164288740149c9260c8d51be1f5f9
 EBUILD roscpp_serialization-0.5.7.ebuild 387 BLAKE2B f317b3ea7afe3d1fae0ce968ee9dd5096827a7cffb2ad977b6f27a07c14d9fb8f87bdf8f763cd726df89b9260398598ff26b0dc0ed680cc319337111465374f3 SHA512 df6d50183e072652d2c3c513bbc3d031289cbcc6391d30ea2ff348c419b507d7b4691cee60ffe5198ece313bc8eaae6351d164288740149c9260c8d51be1f5f9
 EBUILD roscpp_serialization-0.6.0.ebuild 387 BLAKE2B f317b3ea7afe3d1fae0ce968ee9dd5096827a7cffb2ad977b6f27a07c14d9fb8f87bdf8f763cd726df89b9260398598ff26b0dc0ed680cc319337111465374f3 SHA512 df6d50183e072652d2c3c513bbc3d031289cbcc6391d30ea2ff348c419b507d7b4691cee60ffe5198ece313bc8eaae6351d164288740149c9260c8d51be1f5f9
@@ -18,5 +19,6 @@ EBUILD roscpp_serialization-0.6.4.ebuild 387 BLAKE2B fb36a18f1f6481c5a1793e7bd0d
 EBUILD roscpp_serialization-0.6.5.ebuild 387 BLAKE2B fb36a18f1f6481c5a1793e7bd0d3f149794a497169f12a02ccb2fe7816c5fd9b03c780a719214b56822e90c34fe3ae46f9cb875d37cc124eadb536f9c4374e04 SHA512 09647fe204192af1a48512bf57b5cc2d2b02c03d15badf41a7595bcbd8fed32e3d22b227dcd2b4a748cc54e664f3139666fed0c8130d1a4aaf09f53c9cc0502f
 EBUILD roscpp_serialization-0.6.7.ebuild 387 BLAKE2B fb36a18f1f6481c5a1793e7bd0d3f149794a497169f12a02ccb2fe7816c5fd9b03c780a719214b56822e90c34fe3ae46f9cb875d37cc124eadb536f9c4374e04 SHA512 09647fe204192af1a48512bf57b5cc2d2b02c03d15badf41a7595bcbd8fed32e3d22b227dcd2b4a748cc54e664f3139666fed0c8130d1a4aaf09f53c9cc0502f
 EBUILD roscpp_serialization-0.6.8.ebuild 387 BLAKE2B 8c6cce04919a8a1ff197d4518b83da92e5a4e8b72fec4288bae1a0e5a79a26200d5baef7d2f7b33585f453e1082b338c37881601d497134a881139ca4bc3ed5b SHA512 6c11b64d7abcde3b95ae30401a44f183775cedddf083bc50a78dbc2f41e14738315a9b7190fa1f7873f2208eb8227a3a7603235f9c093576cfdd1cc3c2a84b5e
+EBUILD roscpp_serialization-0.6.9.ebuild 387 BLAKE2B 8c6cce04919a8a1ff197d4518b83da92e5a4e8b72fec4288bae1a0e5a79a26200d5baef7d2f7b33585f453e1082b338c37881601d497134a881139ca4bc3ed5b SHA512 6c11b64d7abcde3b95ae30401a44f183775cedddf083bc50a78dbc2f41e14738315a9b7190fa1f7873f2208eb8227a3a7603235f9c093576cfdd1cc3c2a84b5e
 EBUILD roscpp_serialization-9999.ebuild 387 BLAKE2B f317b3ea7afe3d1fae0ce968ee9dd5096827a7cffb2ad977b6f27a07c14d9fb8f87bdf8f763cd726df89b9260398598ff26b0dc0ed680cc319337111465374f3 SHA512 df6d50183e072652d2c3c513bbc3d031289cbcc6391d30ea2ff348c419b507d7b4691cee60ffe5198ece313bc8eaae6351d164288740149c9260c8d51be1f5f9
 MISC metadata.xml 329 BLAKE2B 58bfccd5cddfdb91aa5b414646dc07911ab19e1544dc8ac9eabb8d4d8eba138b76b990e017f86854c83efb8f5f6f31f391ad8c03dc8bcf6eef741a70a226ceb6 SHA512 8adfef45e8768b11f9f155e95e1c4b50606aa53abd64b84bc5b24c17134b8daf3536f51ae20a17e871e25db2140181502b62a9ace282872620845412571de89a
diff --git a/dev-ros/roscpp_serialization/roscpp_serialization-0.6.9.ebuild b/dev-ros/roscpp_serialization/roscpp_serialization-0.6.9.ebuild
new file mode 100644
index 000000000000..85ab25009f61
--- /dev/null
+++ b/dev-ros/roscpp_serialization/roscpp_serialization-0.6.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/roscpp_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Code for serialization"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rostime
+	dev-ros/roscpp_traits
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp_traits/Manifest b/dev-ros/roscpp_traits/Manifest
index 9af6cf430cb3..fc39b9c7645a 100644
--- a/dev-ros/roscpp_traits/Manifest
+++ b/dev-ros/roscpp_traits/Manifest
@@ -8,6 +8,7 @@ DIST roscpp_core-0.6.4.tar.gz 33661 BLAKE2B 5f38662f221f8a02c90cf8c739b5f9ecf5d8
 DIST roscpp_core-0.6.5.tar.gz 34493 BLAKE2B 9804fe6f23192e0e19bfb26e0671ad36189b936701e45755adb0c54e25c1c92dabd6f645bd014451bcd21f45af39be2f1c24727d1231cc52b62caba4d01ca4ff SHA512 32314cac55716b074416fac6665a8dec3a6a64abfac55be709f50b7ca1cbd993797d176bc2aefe2ae8b233b21e8464f330ad31de98bf60edc63149215dcb0cda
 DIST roscpp_core-0.6.7.tar.gz 34845 BLAKE2B cdb2385069a74d670061bc2245421e31216e1c9ace5c96f83d1875ddcf460f2ad425b10db3330253e2a49f3bc415cf3c72ab885cb121c9477ae54a385893a7b8 SHA512 d93afb6e0e88bb01b13af0334a7977411fac8f89dd06fc69a32b95bab4ead05d6cb564b089ee846fe542be180f6418664f8328a6a9e753a55b34e5a0a1d61bf4
 DIST roscpp_core-0.6.8.tar.gz 35003 BLAKE2B 7b4c02652693f76326df83d17164d3268f8b0eda0ddfe8f73d286ae09d7fbb3f8f433ab92527167fb918b55c53aeaa4e26d6876dac51d9d35e0b18b185d89867 SHA512 5fa9f8714059fbc864583662cd411d64470565cc2c372a09a63708a8cc06140d2ce8b84a7025837a49f2c09c7fee5092ec42d5625de4bfd2d9410baf7821b5df
+DIST roscpp_core-0.6.9.tar.gz 35069 BLAKE2B 5718611730419de3fd5dbd7c26792857c75306f4155916fe9570e494a0b1f0b9ca167a06654e1d5b1e1d20aa8cbd17c306bc91e7d0e803c8691d78c6c456fcec SHA512 87360695e71a020e869633c19187851242b84686b87842b388273f9874ff72e4e587eaf55dc10d099e55bc8db17c2ae7efdd5a9ff553a006b7f7c4ea5e1c84d9
 EBUILD roscpp_traits-0.5.6.ebuild 361 BLAKE2B c79a9a0a824011375ee8d54208efed3e7a9dbce0f1b174d54b0ec54a315c86b471f50f66e05ce57da989b097941a2fa75b20df1559f7843e33e7eb9f46cf076c SHA512 632de556bd758612be30a4bc95f359ce047a9efc04b3f6d582920f3823292ecdc7c419416e354331c605e160ee39378753475169f588544088f3724508b52e85
 EBUILD roscpp_traits-0.5.7.ebuild 361 BLAKE2B c79a9a0a824011375ee8d54208efed3e7a9dbce0f1b174d54b0ec54a315c86b471f50f66e05ce57da989b097941a2fa75b20df1559f7843e33e7eb9f46cf076c SHA512 632de556bd758612be30a4bc95f359ce047a9efc04b3f6d582920f3823292ecdc7c419416e354331c605e160ee39378753475169f588544088f3724508b52e85
 EBUILD roscpp_traits-0.6.0.ebuild 361 BLAKE2B c79a9a0a824011375ee8d54208efed3e7a9dbce0f1b174d54b0ec54a315c86b471f50f66e05ce57da989b097941a2fa75b20df1559f7843e33e7eb9f46cf076c SHA512 632de556bd758612be30a4bc95f359ce047a9efc04b3f6d582920f3823292ecdc7c419416e354331c605e160ee39378753475169f588544088f3724508b52e85
@@ -18,5 +19,6 @@ EBUILD roscpp_traits-0.6.4.ebuild 361 BLAKE2B 0ddcf5e6ec308690c906565b3a3c8e4ce2
 EBUILD roscpp_traits-0.6.5.ebuild 361 BLAKE2B 0ddcf5e6ec308690c906565b3a3c8e4ce28be6f127d8cc6dc771b7f3f05b470c86ec93f08b78ae1579fcf0b3dc76ee8a122052a8e9bae9c85dc3ecece2e5f16e SHA512 b79e33893cb0fdcc9949ab291f0cf196b2a23368f2d6d1750beb981077026477402971c5de4bb157ba631bbc7c85fbe4b3594c60e3da25e058cdcb9b5dcc2231
 EBUILD roscpp_traits-0.6.7.ebuild 361 BLAKE2B 0ddcf5e6ec308690c906565b3a3c8e4ce28be6f127d8cc6dc771b7f3f05b470c86ec93f08b78ae1579fcf0b3dc76ee8a122052a8e9bae9c85dc3ecece2e5f16e SHA512 b79e33893cb0fdcc9949ab291f0cf196b2a23368f2d6d1750beb981077026477402971c5de4bb157ba631bbc7c85fbe4b3594c60e3da25e058cdcb9b5dcc2231
 EBUILD roscpp_traits-0.6.8.ebuild 361 BLAKE2B ce58e77baba6cee4e273a6c75ab9fadfeea8db41f7e34bcc9fa70592a37717b7e47bc22d35e0eebc75b454ae09e1af5444cb576538870c50ec6936187f21b725 SHA512 178cbe085ec3b665826ff0493518d8854a067b8d46663751db0746076ee3244ef74856d68da78736c2048df709281c952a130654aa5782a8652c77aad2f5b2f8
+EBUILD roscpp_traits-0.6.9.ebuild 361 BLAKE2B ce58e77baba6cee4e273a6c75ab9fadfeea8db41f7e34bcc9fa70592a37717b7e47bc22d35e0eebc75b454ae09e1af5444cb576538870c50ec6936187f21b725 SHA512 178cbe085ec3b665826ff0493518d8854a067b8d46663751db0746076ee3244ef74856d68da78736c2048df709281c952a130654aa5782a8652c77aad2f5b2f8
 EBUILD roscpp_traits-9999.ebuild 361 BLAKE2B c79a9a0a824011375ee8d54208efed3e7a9dbce0f1b174d54b0ec54a315c86b471f50f66e05ce57da989b097941a2fa75b20df1559f7843e33e7eb9f46cf076c SHA512 632de556bd758612be30a4bc95f359ce047a9efc04b3f6d582920f3823292ecdc7c419416e354331c605e160ee39378753475169f588544088f3724508b52e85
 MISC metadata.xml 329 BLAKE2B 58bfccd5cddfdb91aa5b414646dc07911ab19e1544dc8ac9eabb8d4d8eba138b76b990e017f86854c83efb8f5f6f31f391ad8c03dc8bcf6eef741a70a226ceb6 SHA512 8adfef45e8768b11f9f155e95e1c4b50606aa53abd64b84bc5b24c17134b8daf3536f51ae20a17e871e25db2140181502b62a9ace282872620845412571de89a
diff --git a/dev-ros/roscpp_traits/roscpp_traits-0.6.9.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.6.9.ebuild
new file mode 100644
index 000000000000..48ba1af0d0b9
--- /dev/null
+++ b/dev-ros/roscpp_traits/roscpp_traits-0.6.9.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/roscpp_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Message traits code"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rostime
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscreate/Manifest b/dev-ros/roscreate/Manifest
index 8325ab504947..2a9cfc108e5f 100644
--- a/dev-ros/roscreate/Manifest
+++ b/dev-ros/roscreate/Manifest
@@ -1,8 +1,10 @@
 DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee5547254500ade917484674aefd8b91d651c8f48c187704b4174659c3a983cd6a864f316180f2de4d45ef4f6e0c7cd86 SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31
 DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
+DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
 EBUILD roscreate-1.14.0.ebuild 519 BLAKE2B 3169feb3272913a9ae785fc5cabd1a851ca09b41aaf0b41342fe058d447ee0c0c51a52afded1bf13985e00724f70bb5b795ae1aaeca95c2d3419b6b1f9e291dd SHA512 69cf9bcdae88e96a1b81a3ebfd7e9946b9b850d408d473fb92d076d4c3c9e56495c003d43e1bb535aba1c0b54e4c016719ad06a0862e5435e971e9013c5dc80f
 EBUILD roscreate-1.14.1.ebuild 519 BLAKE2B 3169feb3272913a9ae785fc5cabd1a851ca09b41aaf0b41342fe058d447ee0c0c51a52afded1bf13985e00724f70bb5b795ae1aaeca95c2d3419b6b1f9e291dd SHA512 69cf9bcdae88e96a1b81a3ebfd7e9946b9b850d408d473fb92d076d4c3c9e56495c003d43e1bb535aba1c0b54e4c016719ad06a0862e5435e971e9013c5dc80f
 EBUILD roscreate-1.14.2.ebuild 519 BLAKE2B 3169feb3272913a9ae785fc5cabd1a851ca09b41aaf0b41342fe058d447ee0c0c51a52afded1bf13985e00724f70bb5b795ae1aaeca95c2d3419b6b1f9e291dd SHA512 69cf9bcdae88e96a1b81a3ebfd7e9946b9b850d408d473fb92d076d4c3c9e56495c003d43e1bb535aba1c0b54e4c016719ad06a0862e5435e971e9013c5dc80f
+EBUILD roscreate-1.14.3.ebuild 519 BLAKE2B f2b348ca21158c199e059a8aefd9dee671d137f5625d5c1245bd2e99ccb88b21634710aafff9e8b876200684203d4022e62dc25375a8fed2ca16059fdc9eacec SHA512 e85f6b7b10e2ec396f7291e7ef4b6b7dc3dde0b1dcc62b6374f36ed65895d57887116c74dfcf52288cee9115fc1cc1196deaa0925df102d8c4254f8b8b383435
 EBUILD roscreate-9999.ebuild 519 BLAKE2B 3169feb3272913a9ae785fc5cabd1a851ca09b41aaf0b41342fe058d447ee0c0c51a52afded1bf13985e00724f70bb5b795ae1aaeca95c2d3419b6b1f9e291dd SHA512 69cf9bcdae88e96a1b81a3ebfd7e9946b9b850d408d473fb92d076d4c3c9e56495c003d43e1bb535aba1c0b54e4c016719ad06a0862e5435e971e9013c5dc80f
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roscreate/roscreate-1.14.3.ebuild b/dev-ros/roscreate/roscreate-1.14.3.ebuild
new file mode 100644
index 000000000000..d7d38bfca154
--- /dev/null
+++ b/dev-ros/roscreate/roscreate-1.14.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/rosgraph/Manifest b/dev-ros/rosgraph/Manifest
index df92f824c7b6..76bc8daa3e94 100644
--- a/dev-ros/rosgraph/Manifest
+++ b/dev-ros/rosgraph/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD rosgraph-1.13.0.ebuild 565 BLAKE2B c369316a472a383f8253f1cf220c53b1945f60514f7b06ca382bd4a5629995142dcefb3b10bc8f3eac41d94f0dc3c7631064de4091cf79a9dba266fad22f811a SHA512 70a937f19ab51f2c106458bc93a5771f32bebdf5c5bc7a56f7bf9a59bb11cfd8056a882300860429f751d8e9b8fdc9f131cc9477c5c629b35819d9ba983ba81e
 EBUILD rosgraph-1.13.1.ebuild 565 BLAKE2B c369316a472a383f8253f1cf220c53b1945f60514f7b06ca382bd4a5629995142dcefb3b10bc8f3eac41d94f0dc3c7631064de4091cf79a9dba266fad22f811a SHA512 70a937f19ab51f2c106458bc93a5771f32bebdf5c5bc7a56f7bf9a59bb11cfd8056a882300860429f751d8e9b8fdc9f131cc9477c5c629b35819d9ba983ba81e
 EBUILD rosgraph-1.13.2.ebuild 565 BLAKE2B c369316a472a383f8253f1cf220c53b1945f60514f7b06ca382bd4a5629995142dcefb3b10bc8f3eac41d94f0dc3c7631064de4091cf79a9dba266fad22f811a SHA512 70a937f19ab51f2c106458bc93a5771f32bebdf5c5bc7a56f7bf9a59bb11cfd8056a882300860429f751d8e9b8fdc9f131cc9477c5c629b35819d9ba983ba81e
 EBUILD rosgraph-1.13.4.ebuild 565 BLAKE2B c369316a472a383f8253f1cf220c53b1945f60514f7b06ca382bd4a5629995142dcefb3b10bc8f3eac41d94f0dc3c7631064de4091cf79a9dba266fad22f811a SHA512 70a937f19ab51f2c106458bc93a5771f32bebdf5c5bc7a56f7bf9a59bb11cfd8056a882300860429f751d8e9b8fdc9f131cc9477c5c629b35819d9ba983ba81e
 EBUILD rosgraph-1.13.5.ebuild 565 BLAKE2B c369316a472a383f8253f1cf220c53b1945f60514f7b06ca382bd4a5629995142dcefb3b10bc8f3eac41d94f0dc3c7631064de4091cf79a9dba266fad22f811a SHA512 70a937f19ab51f2c106458bc93a5771f32bebdf5c5bc7a56f7bf9a59bb11cfd8056a882300860429f751d8e9b8fdc9f131cc9477c5c629b35819d9ba983ba81e
+EBUILD rosgraph-1.13.6.ebuild 565 BLAKE2B f114b400b404be9513274f72198db5c78d44db0a9b492ceeba750fbdb9508dfe875846c7589e0405760494a3d1bb7e1fd2f18edbec07bf6c9bd91f0999972575 SHA512 671d90a8cdda97907381e55e2403ea109758b49aba964b13de5e4f3b7ec0e512e2fb3c59987a236cb7709c0708ac07df99cd2090cfc9608dd91243cb5aa9a88f
 EBUILD rosgraph-9999.ebuild 565 BLAKE2B c369316a472a383f8253f1cf220c53b1945f60514f7b06ca382bd4a5629995142dcefb3b10bc8f3eac41d94f0dc3c7631064de4091cf79a9dba266fad22f811a SHA512 70a937f19ab51f2c106458bc93a5771f32bebdf5c5bc7a56f7bf9a59bb11cfd8056a882300860429f751d8e9b8fdc9f131cc9477c5c629b35819d9ba983ba81e
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosgraph/rosgraph-1.13.6.ebuild b/dev-ros/rosgraph/rosgraph-1.13.6.ebuild
new file mode 100644
index 000000000000..85373fac5957
--- /dev/null
+++ b/dev-ros/rosgraph/rosgraph-1.13.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Prints information about the ROS Computation Graph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/roslang/Manifest b/dev-ros/roslang/Manifest
index 5003a6840e16..6c78e38d6e7e 100644
--- a/dev-ros/roslang/Manifest
+++ b/dev-ros/roslang/Manifest
@@ -8,6 +8,7 @@ DIST ros-1.13.5.tar.gz 167351 BLAKE2B a9a2b9aa4ca2fd9391eebe0f757cbd229d480f8be8
 DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee5547254500ade917484674aefd8b91d651c8f48c187704b4174659c3a983cd6a864f316180f2de4d45ef4f6e0c7cd86 SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31
 DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
+DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
 EBUILD roslang-1.12.3.ebuild 345 BLAKE2B ac4fc5706ffea46afbc1dbcc13d7fde649a7683048d84c290e52b097d7a0a656cf55de7c4da86d7047c3c6f536e32667919b285c8a6f5bbd6199f7c0636b1335 SHA512 2bab3c76aa2b9a25fea43269da722479ee1cc590b8be6e396a461a585883e0f1c7ee9a2a5679c2ebe2705570c22a6b695c56085f49e562e9fdad494d17f4f05d
 EBUILD roslang-1.12.5.ebuild 345 BLAKE2B ac4fc5706ffea46afbc1dbcc13d7fde649a7683048d84c290e52b097d7a0a656cf55de7c4da86d7047c3c6f536e32667919b285c8a6f5bbd6199f7c0636b1335 SHA512 2bab3c76aa2b9a25fea43269da722479ee1cc590b8be6e396a461a585883e0f1c7ee9a2a5679c2ebe2705570c22a6b695c56085f49e562e9fdad494d17f4f05d
 EBUILD roslang-1.13.1.ebuild 345 BLAKE2B ac4fc5706ffea46afbc1dbcc13d7fde649a7683048d84c290e52b097d7a0a656cf55de7c4da86d7047c3c6f536e32667919b285c8a6f5bbd6199f7c0636b1335 SHA512 2bab3c76aa2b9a25fea43269da722479ee1cc590b8be6e396a461a585883e0f1c7ee9a2a5679c2ebe2705570c22a6b695c56085f49e562e9fdad494d17f4f05d
@@ -18,5 +19,6 @@ EBUILD roslang-1.13.5.ebuild 345 BLAKE2B 63a12ae1cc4a7323b3518c105abbfca250c1eb0
 EBUILD roslang-1.14.0.ebuild 345 BLAKE2B 63a12ae1cc4a7323b3518c105abbfca250c1eb0d7b8b94d5424bbf7fa02c7b65941f936fa543f78860bb2a8ff657e66beb9e243edbd6ac32b937f34eb0fe6e12 SHA512 210db54ca3268a2a860dab6590bdbfb847289d1174683b96b3f94e3fb8957623fe19719c7106326f987173fbcb51a501740ee57e0f86db10e6112e4969aa5cc0
 EBUILD roslang-1.14.1.ebuild 345 BLAKE2B 63a12ae1cc4a7323b3518c105abbfca250c1eb0d7b8b94d5424bbf7fa02c7b65941f936fa543f78860bb2a8ff657e66beb9e243edbd6ac32b937f34eb0fe6e12 SHA512 210db54ca3268a2a860dab6590bdbfb847289d1174683b96b3f94e3fb8957623fe19719c7106326f987173fbcb51a501740ee57e0f86db10e6112e4969aa5cc0
 EBUILD roslang-1.14.2.ebuild 345 BLAKE2B 63a12ae1cc4a7323b3518c105abbfca250c1eb0d7b8b94d5424bbf7fa02c7b65941f936fa543f78860bb2a8ff657e66beb9e243edbd6ac32b937f34eb0fe6e12 SHA512 210db54ca3268a2a860dab6590bdbfb847289d1174683b96b3f94e3fb8957623fe19719c7106326f987173fbcb51a501740ee57e0f86db10e6112e4969aa5cc0
+EBUILD roslang-1.14.3.ebuild 345 BLAKE2B abac9fc1ac751a5421d26bc2497de9c7156b80a77c03de6a08d07a7cabf66b6b93fcc76a1da6b9727868682d3f356742ad508dbf10abcb99b8fa73faa5157b44 SHA512 f38c714eb4eff24db349063fb01c53b141a59ada5911569404fc31923252929d5de33111d2e875853b994202537974d36d8d347d07ba93c6a7495daed44ed0c9
 EBUILD roslang-9999.ebuild 345 BLAKE2B ac4fc5706ffea46afbc1dbcc13d7fde649a7683048d84c290e52b097d7a0a656cf55de7c4da86d7047c3c6f536e32667919b285c8a6f5bbd6199f7c0636b1335 SHA512 2bab3c76aa2b9a25fea43269da722479ee1cc590b8be6e396a461a585883e0f1c7ee9a2a5679c2ebe2705570c22a6b695c56085f49e562e9fdad494d17f4f05d
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roslang/roslang-1.14.3.ebuild b/dev-ros/roslang/roslang-1.14.3.ebuild
new file mode 100644
index 000000000000..770e484fec52
--- /dev/null
+++ b/dev-ros/roslang/roslang-1.14.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+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 3d5ad048e914..e9980b8c07f5 100644
--- a/dev-ros/roslaunch/Manifest
+++ b/dev-ros/roslaunch/Manifest
@@ -10,10 +10,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD roslaunch-1.13.0.ebuild 1439 BLAKE2B f6f002d1e89e4d476de600a9e1977c057715a6a26c79a37cf9d40d2b6b0ace1dce72e2a5977f4e690219ceca3f965100f0a1b57abaa02dceff6f3c6b565ee2ef SHA512 4e41004097cae99b8b2876daf760eb4a4238ad5558203e623c45cdc91f966597a0ad3599e52cd8c715bd02c9f17b7b347e7bc85f7de6ecf92697ea56508446fa
 EBUILD roslaunch-1.13.1.ebuild 1439 BLAKE2B f6f002d1e89e4d476de600a9e1977c057715a6a26c79a37cf9d40d2b6b0ace1dce72e2a5977f4e690219ceca3f965100f0a1b57abaa02dceff6f3c6b565ee2ef SHA512 4e41004097cae99b8b2876daf760eb4a4238ad5558203e623c45cdc91f966597a0ad3599e52cd8c715bd02c9f17b7b347e7bc85f7de6ecf92697ea56508446fa
 EBUILD roslaunch-1.13.2.ebuild 1439 BLAKE2B f6f002d1e89e4d476de600a9e1977c057715a6a26c79a37cf9d40d2b6b0ace1dce72e2a5977f4e690219ceca3f965100f0a1b57abaa02dceff6f3c6b565ee2ef SHA512 4e41004097cae99b8b2876daf760eb4a4238ad5558203e623c45cdc91f966597a0ad3599e52cd8c715bd02c9f17b7b347e7bc85f7de6ecf92697ea56508446fa
 EBUILD roslaunch-1.13.4.ebuild 1439 BLAKE2B f6f002d1e89e4d476de600a9e1977c057715a6a26c79a37cf9d40d2b6b0ace1dce72e2a5977f4e690219ceca3f965100f0a1b57abaa02dceff6f3c6b565ee2ef SHA512 4e41004097cae99b8b2876daf760eb4a4238ad5558203e623c45cdc91f966597a0ad3599e52cd8c715bd02c9f17b7b347e7bc85f7de6ecf92697ea56508446fa
 EBUILD roslaunch-1.13.5.ebuild 1439 BLAKE2B f6f002d1e89e4d476de600a9e1977c057715a6a26c79a37cf9d40d2b6b0ace1dce72e2a5977f4e690219ceca3f965100f0a1b57abaa02dceff6f3c6b565ee2ef SHA512 4e41004097cae99b8b2876daf760eb4a4238ad5558203e623c45cdc91f966597a0ad3599e52cd8c715bd02c9f17b7b347e7bc85f7de6ecf92697ea56508446fa
+EBUILD roslaunch-1.13.6.ebuild 1439 BLAKE2B b51daa806a06a27e7bd964664fcd5f645ea363c0d30c722646d3be4fc8e5d2714235f9aef77520b16a59fc7728bad21d09530d7bcd5de853fdd84e7a9548574a SHA512 9d1d5cb89bbf3a74f06da46bbcd37da29f16b9ec1d591d0f5a9a1abedb2b15438ed323ef3ca2176ea97a0b611fcaf8da9b99a06738f0d362d4225e74c0aff962
 EBUILD roslaunch-9999.ebuild 1439 BLAKE2B f6f002d1e89e4d476de600a9e1977c057715a6a26c79a37cf9d40d2b6b0ace1dce72e2a5977f4e690219ceca3f965100f0a1b57abaa02dceff6f3c6b565ee2ef SHA512 4e41004097cae99b8b2876daf760eb4a4238ad5558203e623c45cdc91f966597a0ad3599e52cd8c715bd02c9f17b7b347e7bc85f7de6ecf92697ea56508446fa
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roslaunch/roslaunch-1.13.6.ebuild b/dev-ros/roslaunch/roslaunch-1.13.6.ebuild
new file mode 100644
index 000000000000..4a273f61dd48
--- /dev/null
+++ b/dev-ros/roslaunch/roslaunch-1.13.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit ros-catkin user
+
+DESCRIPTION="Tool for easily launching multiple ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/rosclean[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosparam[${PYTHON_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_USEDEP}]
+	dev-ros/rosout
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-util/rosdep[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-ros/test_rosmaster
+	)"
+PATCHES=( "${FILESDIR}/timeout.patch" )
+
+src_test() {
+	rosdep update
+	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 7a26069909b3..c5e64ac26ebe 100644
--- a/dev-ros/roslib/Manifest
+++ b/dev-ros/roslib/Manifest
@@ -2,8 +2,10 @@ AUX envhook.patch 1627 BLAKE2B 5cdc90c1828c9bad7777b6ae113f6f44a1e26a3fb5ace8f10
 DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee5547254500ade917484674aefd8b91d651c8f48c187704b4174659c3a983cd6a864f316180f2de4d45ef4f6e0c7cd86 SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31
 DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
+DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
 EBUILD roslib-1.14.0-r1.ebuild 595 BLAKE2B b954effacf7a6d3dfbfffdc37a9b9f3a919a495bc40b976cba8b25f600ef03f46c2fdbdbc8af85faa6295f4d99c4e17852313fed77ed5b5df71366ee380de0bf SHA512 8b6e937898de79be077c51e95a0776cace5b7593afa0ef85f04a0312d85b2eb22763315abc643cdce637d01e9c227c0cc1aea2385e46263d099c0a2677a7eba3
 EBUILD roslib-1.14.1.ebuild 595 BLAKE2B b954effacf7a6d3dfbfffdc37a9b9f3a919a495bc40b976cba8b25f600ef03f46c2fdbdbc8af85faa6295f4d99c4e17852313fed77ed5b5df71366ee380de0bf SHA512 8b6e937898de79be077c51e95a0776cace5b7593afa0ef85f04a0312d85b2eb22763315abc643cdce637d01e9c227c0cc1aea2385e46263d099c0a2677a7eba3
 EBUILD roslib-1.14.2.ebuild 595 BLAKE2B b954effacf7a6d3dfbfffdc37a9b9f3a919a495bc40b976cba8b25f600ef03f46c2fdbdbc8af85faa6295f4d99c4e17852313fed77ed5b5df71366ee380de0bf SHA512 8b6e937898de79be077c51e95a0776cace5b7593afa0ef85f04a0312d85b2eb22763315abc643cdce637d01e9c227c0cc1aea2385e46263d099c0a2677a7eba3
-EBUILD roslib-9999.ebuild 595 BLAKE2B b954effacf7a6d3dfbfffdc37a9b9f3a919a495bc40b976cba8b25f600ef03f46c2fdbdbc8af85faa6295f4d99c4e17852313fed77ed5b5df71366ee380de0bf SHA512 8b6e937898de79be077c51e95a0776cace5b7593afa0ef85f04a0312d85b2eb22763315abc643cdce637d01e9c227c0cc1aea2385e46263d099c0a2677a7eba3
+EBUILD roslib-1.14.3.ebuild 580 BLAKE2B b0ce75c1aa2465d9f25b98cc2b110a95155d1a2047d15b0359780f0f59a8e52c3a460af7eeeb171a09d2f0ee50f001ccc7fa4d0287ad2de876435545e906dba6 SHA512 5269bcbdcc950bf9a41f5374cb0796b1d085130cdf4129e53be68eceebf8a67611e6206a6585a52051b6de75a895eb09b0372034255cb2ff2c2d3268c0ad44f6
+EBUILD roslib-9999.ebuild 580 BLAKE2B b0ce75c1aa2465d9f25b98cc2b110a95155d1a2047d15b0359780f0f59a8e52c3a460af7eeeb171a09d2f0ee50f001ccc7fa4d0287ad2de876435545e906dba6 SHA512 5269bcbdcc950bf9a41f5374cb0796b1d085130cdf4129e53be68eceebf8a67611e6206a6585a52051b6de75a895eb09b0372034255cb2ff2c2d3268c0ad44f6
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roslib/roslib-1.14.3.ebuild b/dev-ros/roslib/roslib-1.14.3.ebuild
new file mode 100644
index 000000000000..f7f039b0555d
--- /dev/null
+++ b/dev-ros/roslib/roslib-1.14.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Base dependencies and support libraries for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=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
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/roslib/roslib-9999.ebuild b/dev-ros/roslib/roslib-9999.ebuild
index 1866c312cfe9..f7f039b0555d 100644
--- a/dev-ros/roslib/roslib-9999.ebuild
+++ b/dev-ros/roslib/roslib-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,10 +19,10 @@ RDEPEND="
 	>=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
 		dev-python/nose[${PYTHON_USEDEP}]
 	)"
-PATCHES=( "${FILESDIR}/envhook.patch" )
diff --git a/dev-ros/roslz4/Manifest b/dev-ros/roslz4/Manifest
index 633dfb67b6c6..c31a75d06218 100644
--- a/dev-ros/roslz4/Manifest
+++ b/dev-ros/roslz4/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD roslz4-1.13.0.ebuild 444 BLAKE2B ade6f8178790b8df54671967173694695b26d14071d816d556e496c444e1a9a1736bf7dc938a07ae9116e7038efdfbed29f6f615e85958e0d9ac49b0ae708286 SHA512 f14d7826160e308fcbc2e166888958a5c718e09993978f991ce8e804cf819506e1ddfa845ca8452f758d412e8854d8f74b98326f91dd6bf530d1caaff62d6ab2
 EBUILD roslz4-1.13.1.ebuild 444 BLAKE2B ade6f8178790b8df54671967173694695b26d14071d816d556e496c444e1a9a1736bf7dc938a07ae9116e7038efdfbed29f6f615e85958e0d9ac49b0ae708286 SHA512 f14d7826160e308fcbc2e166888958a5c718e09993978f991ce8e804cf819506e1ddfa845ca8452f758d412e8854d8f74b98326f91dd6bf530d1caaff62d6ab2
 EBUILD roslz4-1.13.2.ebuild 444 BLAKE2B ade6f8178790b8df54671967173694695b26d14071d816d556e496c444e1a9a1736bf7dc938a07ae9116e7038efdfbed29f6f615e85958e0d9ac49b0ae708286 SHA512 f14d7826160e308fcbc2e166888958a5c718e09993978f991ce8e804cf819506e1ddfa845ca8452f758d412e8854d8f74b98326f91dd6bf530d1caaff62d6ab2
 EBUILD roslz4-1.13.4.ebuild 444 BLAKE2B ade6f8178790b8df54671967173694695b26d14071d816d556e496c444e1a9a1736bf7dc938a07ae9116e7038efdfbed29f6f615e85958e0d9ac49b0ae708286 SHA512 f14d7826160e308fcbc2e166888958a5c718e09993978f991ce8e804cf819506e1ddfa845ca8452f758d412e8854d8f74b98326f91dd6bf530d1caaff62d6ab2
 EBUILD roslz4-1.13.5.ebuild 444 BLAKE2B ade6f8178790b8df54671967173694695b26d14071d816d556e496c444e1a9a1736bf7dc938a07ae9116e7038efdfbed29f6f615e85958e0d9ac49b0ae708286 SHA512 f14d7826160e308fcbc2e166888958a5c718e09993978f991ce8e804cf819506e1ddfa845ca8452f758d412e8854d8f74b98326f91dd6bf530d1caaff62d6ab2
+EBUILD roslz4-1.13.6.ebuild 444 BLAKE2B c3dc40fa9a3a839d22b0d8ce5be0db59540cda25f894ad3b76ad3e0ed17f3def497493371580ffcd12f567176e6983a980fe84a94ee365f40d5147e8c74bb1e7 SHA512 3905600fe691ee7132021d3e5797ba69458accb841cd4b6d2596bac85216c01db57cf1330ab9ba8dc2241366ea7915c5f4d745c56b120c6b1f1c5ee7f4f5d099
 EBUILD roslz4-9999.ebuild 444 BLAKE2B ade6f8178790b8df54671967173694695b26d14071d816d556e496c444e1a9a1736bf7dc938a07ae9116e7038efdfbed29f6f615e85958e0d9ac49b0ae708286 SHA512 f14d7826160e308fcbc2e166888958a5c718e09993978f991ce8e804cf819506e1ddfa845ca8452f758d412e8854d8f74b98326f91dd6bf530d1caaff62d6ab2
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roslz4/roslz4-1.13.6.ebuild b/dev-ros/roslz4/roslz4-1.13.6.ebuild
new file mode 100644
index 000000000000..0e76c772bc3a
--- /dev/null
+++ b/dev-ros/roslz4/roslz4-1.13.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+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"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/rosmake/Manifest b/dev-ros/rosmake/Manifest
index bd33309344b7..e866c68835c3 100644
--- a/dev-ros/rosmake/Manifest
+++ b/dev-ros/rosmake/Manifest
@@ -1,8 +1,10 @@
 DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee5547254500ade917484674aefd8b91d651c8f48c187704b4174659c3a983cd6a864f316180f2de4d45ef4f6e0c7cd86 SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31
 DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
+DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
 EBUILD rosmake-1.14.0.ebuild 453 BLAKE2B 32e9013181907249a70550ecb1c6a009f830ed77c899222cd9091363c797792584111920d9edab243dadae8518baf427fb258d38722c12394e96b43ff1a2c746 SHA512 63133eabaada1be18e1b039eb50b0628045a6c3b1af1d17cade4354f2d7c3329a2da3897eb9b8a638e9b342991d4f0f1096163c9c2369d0ac7b56a95d564b0e0
 EBUILD rosmake-1.14.1.ebuild 453 BLAKE2B 32e9013181907249a70550ecb1c6a009f830ed77c899222cd9091363c797792584111920d9edab243dadae8518baf427fb258d38722c12394e96b43ff1a2c746 SHA512 63133eabaada1be18e1b039eb50b0628045a6c3b1af1d17cade4354f2d7c3329a2da3897eb9b8a638e9b342991d4f0f1096163c9c2369d0ac7b56a95d564b0e0
 EBUILD rosmake-1.14.2.ebuild 453 BLAKE2B 32e9013181907249a70550ecb1c6a009f830ed77c899222cd9091363c797792584111920d9edab243dadae8518baf427fb258d38722c12394e96b43ff1a2c746 SHA512 63133eabaada1be18e1b039eb50b0628045a6c3b1af1d17cade4354f2d7c3329a2da3897eb9b8a638e9b342991d4f0f1096163c9c2369d0ac7b56a95d564b0e0
+EBUILD rosmake-1.14.3.ebuild 453 BLAKE2B 3d7c3a0dff3c530c6ba95ef011d6b7bf6ecf23d69d877954dc866b71ff69185949c5fa8711bfdbec8082f12295a226b268bf6fb5c8a13af26027bd877821a78f SHA512 8ba6df61b2f97b6a81797f4b543622194cfe4db1fa71831c164b94d70a7e0f59eb5c42b437fe9f9308600a3c0d0096932eb8e604bafb83e616189028df7896ad
 EBUILD rosmake-9999.ebuild 453 BLAKE2B 32e9013181907249a70550ecb1c6a009f830ed77c899222cd9091363c797792584111920d9edab243dadae8518baf427fb258d38722c12394e96b43ff1a2c746 SHA512 63133eabaada1be18e1b039eb50b0628045a6c3b1af1d17cade4354f2d7c3329a2da3897eb9b8a638e9b342991d4f0f1096163c9c2369d0ac7b56a95d564b0e0
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosmake/rosmake-1.14.3.ebuild b/dev-ros/rosmake/rosmake-1.14.3.ebuild
new file mode 100644
index 000000000000..bfa505412da9
--- /dev/null
+++ b/dev-ros/rosmake/rosmake-1.14.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS dependency aware build tool"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/rosmaster/Manifest b/dev-ros/rosmaster/Manifest
index f03950455936..79ddeb1b2912 100644
--- a/dev-ros/rosmaster/Manifest
+++ b/dev-ros/rosmaster/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD rosmaster-1.13.0.ebuild 507 BLAKE2B d677748e4a749632124488bcb406472485451aec9069f8552b156fef595871a646de61f4caad5f5329843241d7dc5dadf725278835daeeea588a63c04db60f51 SHA512 8ce63e763e343457d51155784a816468172b969fb2ddb0d7547c37a5605ae4b555cbb5d17f75e435d390e4828e612cd30d7480ce70268bf3cfbfbea535fa9987
 EBUILD rosmaster-1.13.1.ebuild 507 BLAKE2B d677748e4a749632124488bcb406472485451aec9069f8552b156fef595871a646de61f4caad5f5329843241d7dc5dadf725278835daeeea588a63c04db60f51 SHA512 8ce63e763e343457d51155784a816468172b969fb2ddb0d7547c37a5605ae4b555cbb5d17f75e435d390e4828e612cd30d7480ce70268bf3cfbfbea535fa9987
 EBUILD rosmaster-1.13.2.ebuild 507 BLAKE2B d677748e4a749632124488bcb406472485451aec9069f8552b156fef595871a646de61f4caad5f5329843241d7dc5dadf725278835daeeea588a63c04db60f51 SHA512 8ce63e763e343457d51155784a816468172b969fb2ddb0d7547c37a5605ae4b555cbb5d17f75e435d390e4828e612cd30d7480ce70268bf3cfbfbea535fa9987
 EBUILD rosmaster-1.13.4.ebuild 507 BLAKE2B d677748e4a749632124488bcb406472485451aec9069f8552b156fef595871a646de61f4caad5f5329843241d7dc5dadf725278835daeeea588a63c04db60f51 SHA512 8ce63e763e343457d51155784a816468172b969fb2ddb0d7547c37a5605ae4b555cbb5d17f75e435d390e4828e612cd30d7480ce70268bf3cfbfbea535fa9987
 EBUILD rosmaster-1.13.5.ebuild 507 BLAKE2B d677748e4a749632124488bcb406472485451aec9069f8552b156fef595871a646de61f4caad5f5329843241d7dc5dadf725278835daeeea588a63c04db60f51 SHA512 8ce63e763e343457d51155784a816468172b969fb2ddb0d7547c37a5605ae4b555cbb5d17f75e435d390e4828e612cd30d7480ce70268bf3cfbfbea535fa9987
+EBUILD rosmaster-1.13.6.ebuild 507 BLAKE2B de748e4826e73ed170a738b4f8f0111c73c50425f71a446f9985f37ebe664487680db0700ad669f87e749495ad85119c7caa63622fd586af1e42eab319a59b98 SHA512 34977957fd2c2ae15eb7527899ea0eeab7421ee8ff58666ca2ea8aa16bcebf6027f827f71158acadf79b56bfbe5e312488de21bdbe115a163afb837fc3e2c23c
 EBUILD rosmaster-9999.ebuild 507 BLAKE2B d677748e4a749632124488bcb406472485451aec9069f8552b156fef595871a646de61f4caad5f5329843241d7dc5dadf725278835daeeea588a63c04db60f51 SHA512 8ce63e763e343457d51155784a816468172b969fb2ddb0d7547c37a5605ae4b555cbb5d17f75e435d390e4828e612cd30d7480ce70268bf3cfbfbea535fa9987
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosmaster/rosmaster-1.13.6.ebuild b/dev-ros/rosmaster/rosmaster-1.13.6.ebuild
new file mode 100644
index 000000000000..fed9f60badee
--- /dev/null
+++ b/dev-ros/rosmaster/rosmaster-1.13.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS Master implementation"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmsg/Manifest b/dev-ros/rosmsg/Manifest
index 67d1c1b1ce5f..81450adad6d9 100644
--- a/dev-ros/rosmsg/Manifest
+++ b/dev-ros/rosmsg/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD rosmsg-1.13.0.ebuild 558 BLAKE2B 96a695d6c98833129338733b929369b52201115adf653e7e9a71685dd53c19c6f67b3fb73f255b9c156edf21bb5e523f53667a71c98b42710f9cad9a64b69ac8 SHA512 7a0f064fcbb1c218455bc573bd58e3b0f37f902047fbdb6023aa3bc49cc725fae1888d869945c450e203c634c47fc7c897d6759d25044ad43080ddd3cf865838
 EBUILD rosmsg-1.13.1.ebuild 558 BLAKE2B 96a695d6c98833129338733b929369b52201115adf653e7e9a71685dd53c19c6f67b3fb73f255b9c156edf21bb5e523f53667a71c98b42710f9cad9a64b69ac8 SHA512 7a0f064fcbb1c218455bc573bd58e3b0f37f902047fbdb6023aa3bc49cc725fae1888d869945c450e203c634c47fc7c897d6759d25044ad43080ddd3cf865838
 EBUILD rosmsg-1.13.2.ebuild 558 BLAKE2B 96a695d6c98833129338733b929369b52201115adf653e7e9a71685dd53c19c6f67b3fb73f255b9c156edf21bb5e523f53667a71c98b42710f9cad9a64b69ac8 SHA512 7a0f064fcbb1c218455bc573bd58e3b0f37f902047fbdb6023aa3bc49cc725fae1888d869945c450e203c634c47fc7c897d6759d25044ad43080ddd3cf865838
 EBUILD rosmsg-1.13.4.ebuild 558 BLAKE2B 96a695d6c98833129338733b929369b52201115adf653e7e9a71685dd53c19c6f67b3fb73f255b9c156edf21bb5e523f53667a71c98b42710f9cad9a64b69ac8 SHA512 7a0f064fcbb1c218455bc573bd58e3b0f37f902047fbdb6023aa3bc49cc725fae1888d869945c450e203c634c47fc7c897d6759d25044ad43080ddd3cf865838
 EBUILD rosmsg-1.13.5.ebuild 558 BLAKE2B 96a695d6c98833129338733b929369b52201115adf653e7e9a71685dd53c19c6f67b3fb73f255b9c156edf21bb5e523f53667a71c98b42710f9cad9a64b69ac8 SHA512 7a0f064fcbb1c218455bc573bd58e3b0f37f902047fbdb6023aa3bc49cc725fae1888d869945c450e203c634c47fc7c897d6759d25044ad43080ddd3cf865838
+EBUILD rosmsg-1.13.6.ebuild 558 BLAKE2B 524d21bea49f0d39c3fc1048cecbcb41ac26fd95707477a95a935b9953bd22eed2374a572cf5383e2875cb9239d3d9dcab3bf893b90725516b7db1a20b54356d SHA512 4f0520cd384af41918728fb15a5c1e707a5cafa5ea43f420bc3daae8640ff42b1745def598cfd8615f5423f23898f08cd333bc27ecdd63a7a17cb2b5373a48ce
 EBUILD rosmsg-9999.ebuild 558 BLAKE2B 96a695d6c98833129338733b929369b52201115adf653e7e9a71685dd53c19c6f67b3fb73f255b9c156edf21bb5e523f53667a71c98b42710f9cad9a64b69ac8 SHA512 7a0f064fcbb1c218455bc573bd58e3b0f37f902047fbdb6023aa3bc49cc725fae1888d869945c450e203c634c47fc7c897d6759d25044ad43080ddd3cf865838
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosmsg/rosmsg-1.13.6.ebuild b/dev-ros/rosmsg/rosmsg-1.13.6.ebuild
new file mode 100644
index 000000000000..7189f2bbf44a
--- /dev/null
+++ b/dev-ros/rosmsg/rosmsg-1.13.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tools for displaying information about message and services"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/genmsg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosnode/Manifest b/dev-ros/rosnode/Manifest
index 0e59286ab5e6..1d0fe6d83af6 100644
--- a/dev-ros/rosnode/Manifest
+++ b/dev-ros/rosnode/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD rosnode-1.13.0.ebuild 563 BLAKE2B 366ea6732404b9746d50ac5a07976d563dfcd0385534c7f75bf1a427f262113b8188a0310ed0f6a0562d809574362319d6d611d6286736c3612a27626664a22b SHA512 b464b60f4f1bd7de42b78b37aafc9dd1f9853512400343adb842facef7e01d0274e2c3916d93ddc8e8e96a370f745762722aafc876191ed2e1078f94216cb5e3
 EBUILD rosnode-1.13.1.ebuild 563 BLAKE2B 366ea6732404b9746d50ac5a07976d563dfcd0385534c7f75bf1a427f262113b8188a0310ed0f6a0562d809574362319d6d611d6286736c3612a27626664a22b SHA512 b464b60f4f1bd7de42b78b37aafc9dd1f9853512400343adb842facef7e01d0274e2c3916d93ddc8e8e96a370f745762722aafc876191ed2e1078f94216cb5e3
 EBUILD rosnode-1.13.2.ebuild 563 BLAKE2B 366ea6732404b9746d50ac5a07976d563dfcd0385534c7f75bf1a427f262113b8188a0310ed0f6a0562d809574362319d6d611d6286736c3612a27626664a22b SHA512 b464b60f4f1bd7de42b78b37aafc9dd1f9853512400343adb842facef7e01d0274e2c3916d93ddc8e8e96a370f745762722aafc876191ed2e1078f94216cb5e3
 EBUILD rosnode-1.13.4.ebuild 563 BLAKE2B 366ea6732404b9746d50ac5a07976d563dfcd0385534c7f75bf1a427f262113b8188a0310ed0f6a0562d809574362319d6d611d6286736c3612a27626664a22b SHA512 b464b60f4f1bd7de42b78b37aafc9dd1f9853512400343adb842facef7e01d0274e2c3916d93ddc8e8e96a370f745762722aafc876191ed2e1078f94216cb5e3
 EBUILD rosnode-1.13.5.ebuild 563 BLAKE2B 366ea6732404b9746d50ac5a07976d563dfcd0385534c7f75bf1a427f262113b8188a0310ed0f6a0562d809574362319d6d611d6286736c3612a27626664a22b SHA512 b464b60f4f1bd7de42b78b37aafc9dd1f9853512400343adb842facef7e01d0274e2c3916d93ddc8e8e96a370f745762722aafc876191ed2e1078f94216cb5e3
+EBUILD rosnode-1.13.6.ebuild 563 BLAKE2B 522df7bcc03e916bf5cbb27ac830d9ad17ec2d3c56a73280c001521184921d8c9773c38eb013c198ff13532ff6617845e00df952544f1dd0d4c18dd5ac5b5a33 SHA512 523644d5838b3db6f1bb5a909248bc70ef7e8fd12ea165d758cc142935b0b60c37c003b70cd20ee325b2ed9d644248439d4866c4aee1b4604109e69ac560f90a
 EBUILD rosnode-9999.ebuild 563 BLAKE2B 366ea6732404b9746d50ac5a07976d563dfcd0385534c7f75bf1a427f262113b8188a0310ed0f6a0562d809574362319d6d611d6286736c3612a27626664a22b SHA512 b464b60f4f1bd7de42b78b37aafc9dd1f9853512400343adb842facef7e01d0274e2c3916d93ddc8e8e96a370f745762722aafc876191ed2e1078f94216cb5e3
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosnode/rosnode-1.13.6.ebuild b/dev-ros/rosnode/rosnode-1.13.6.ebuild
new file mode 100644
index 000000000000..e55999df9cae
--- /dev/null
+++ b/dev-ros/rosnode/rosnode-1.13.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/genmsg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosout/Manifest b/dev-ros/rosout/Manifest
index f67ae0a33ba8..7ecbf4f58870 100644
--- a/dev-ros/rosout/Manifest
+++ b/dev-ros/rosout/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD rosout-1.13.0.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
 EBUILD rosout-1.13.1.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
 EBUILD rosout-1.13.2.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
 EBUILD rosout-1.13.4.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
 EBUILD rosout-1.13.5.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
+EBUILD rosout-1.13.6.ebuild 447 BLAKE2B 81c9dd524245527cee90454c213d934a2a45b9da4ad4f99951b2ffa1e378ba29c1fd95cabb9e1b6ee06fe40bc92cc6a9b80b29a657364c6ad46ceb00d69b8117 SHA512 93c1d6a9774efc847bd8263218db6e932b9afcfb0f34f5836cb54fb0374777606917462fa198ba025a47268238ed95408a4e08233b602d3f21d4169b7a7cd56f
 EBUILD rosout-9999.ebuild 447 BLAKE2B adabe1d2c1ee22ac5c5a0a779b6aaf8727ef695af867b2c8b0c91d9d68f4fcefe12641d6952981925090335b78df5c35fc8f91d022e6e6abaaacea5539a59f6a SHA512 803a69ff8f9f0ee9dfd2c1d071307f185fead002952113c31c216583f3d77688bf86205e76d79326c72d2472e533d685304247178debda9607fa2d3547433a6b
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosout/rosout-1.13.6.ebuild b/dev-ros/rosout/rosout-1.13.6.ebuild
new file mode 100644
index 000000000000..73aa43ce3f38
--- /dev/null
+++ b/dev-ros/rosout/rosout-1.13.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=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
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/Manifest b/dev-ros/rosparam/Manifest
index ce7d559ad433..a0726207deed 100644
--- a/dev-ros/rosparam/Manifest
+++ b/dev-ros/rosparam/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD rosparam-1.13.0.ebuild 513 BLAKE2B cb78bd19efd8a4ca007cc6cbf10d8d4b3669240d794a4ddf9ea6c93bf8fd820eb34cae3ce548ccdc05aa9142af2d1b0329b1cfc58a360a32e35f4f1ad4d10d9d SHA512 4aad95d1cf8eebdd10fc942b2df5b177e67c7e77bb9b18b9c38e5c14d8eee956c0bec18d1275169603bd6f5fe67b17277e5ba24f2280fa92c0c8126144060c81
 EBUILD rosparam-1.13.1.ebuild 513 BLAKE2B cb78bd19efd8a4ca007cc6cbf10d8d4b3669240d794a4ddf9ea6c93bf8fd820eb34cae3ce548ccdc05aa9142af2d1b0329b1cfc58a360a32e35f4f1ad4d10d9d SHA512 4aad95d1cf8eebdd10fc942b2df5b177e67c7e77bb9b18b9c38e5c14d8eee956c0bec18d1275169603bd6f5fe67b17277e5ba24f2280fa92c0c8126144060c81
 EBUILD rosparam-1.13.2.ebuild 513 BLAKE2B cb78bd19efd8a4ca007cc6cbf10d8d4b3669240d794a4ddf9ea6c93bf8fd820eb34cae3ce548ccdc05aa9142af2d1b0329b1cfc58a360a32e35f4f1ad4d10d9d SHA512 4aad95d1cf8eebdd10fc942b2df5b177e67c7e77bb9b18b9c38e5c14d8eee956c0bec18d1275169603bd6f5fe67b17277e5ba24f2280fa92c0c8126144060c81
 EBUILD rosparam-1.13.4.ebuild 513 BLAKE2B cb78bd19efd8a4ca007cc6cbf10d8d4b3669240d794a4ddf9ea6c93bf8fd820eb34cae3ce548ccdc05aa9142af2d1b0329b1cfc58a360a32e35f4f1ad4d10d9d SHA512 4aad95d1cf8eebdd10fc942b2df5b177e67c7e77bb9b18b9c38e5c14d8eee956c0bec18d1275169603bd6f5fe67b17277e5ba24f2280fa92c0c8126144060c81
 EBUILD rosparam-1.13.5.ebuild 513 BLAKE2B cb78bd19efd8a4ca007cc6cbf10d8d4b3669240d794a4ddf9ea6c93bf8fd820eb34cae3ce548ccdc05aa9142af2d1b0329b1cfc58a360a32e35f4f1ad4d10d9d SHA512 4aad95d1cf8eebdd10fc942b2df5b177e67c7e77bb9b18b9c38e5c14d8eee956c0bec18d1275169603bd6f5fe67b17277e5ba24f2280fa92c0c8126144060c81
+EBUILD rosparam-1.13.6.ebuild 513 BLAKE2B 12c41654b69e870df6ad95d453463f68e6c809a0ee99f2428285bea055a30f8bbc1d5116966ffc06360f7fb52bc8154cb97279b14c82681dff84325a1a766436 SHA512 7fa0a85a0acb91465850dea55c864b9e7f61a7db0af2a510ce3e881f0ddf4deee162d5e9cf1ecfae4eae93b57b96d7e9e30341aa6d7c6e759a82d62bf94e01ce
 EBUILD rosparam-9999.ebuild 513 BLAKE2B cb78bd19efd8a4ca007cc6cbf10d8d4b3669240d794a4ddf9ea6c93bf8fd820eb34cae3ce548ccdc05aa9142af2d1b0329b1cfc58a360a32e35f4f1ad4d10d9d SHA512 4aad95d1cf8eebdd10fc942b2df5b177e67c7e77bb9b18b9c38e5c14d8eee956c0bec18d1275169603bd6f5fe67b17277e5ba24f2280fa92c0c8126144060c81
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosparam/rosparam-1.13.6.ebuild b/dev-ros/rosparam/rosparam-1.13.6.ebuild
new file mode 100644
index 000000000000..8f4a32442ac6
--- /dev/null
+++ b/dev-ros/rosparam/rosparam-1.13.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+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_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rospy/Manifest b/dev-ros/rospy/Manifest
index 86e77ea73f31..c436e3dfd298 100644
--- a/dev-ros/rospy/Manifest
+++ b/dev-ros/rospy/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD rospy-1.13.0.ebuild 734 BLAKE2B 96c03724a98663e3e06a90eb455899ca3f5061d8a006cd473ecce61e75404a0d09141065b14e1499de90fcc43a6681bed256a5dfccd200400dfad93cb0eb7810 SHA512 0daec5b0544638b2cf7437e18d719ddacf03e08c52e53fb70ac0384f389b5b2a4060209ff6d317c56d86c693bfa770cb6ddcf9c9881d1e43f9f9680df4ea106f
 EBUILD rospy-1.13.1.ebuild 734 BLAKE2B 96c03724a98663e3e06a90eb455899ca3f5061d8a006cd473ecce61e75404a0d09141065b14e1499de90fcc43a6681bed256a5dfccd200400dfad93cb0eb7810 SHA512 0daec5b0544638b2cf7437e18d719ddacf03e08c52e53fb70ac0384f389b5b2a4060209ff6d317c56d86c693bfa770cb6ddcf9c9881d1e43f9f9680df4ea106f
 EBUILD rospy-1.13.2.ebuild 734 BLAKE2B 96c03724a98663e3e06a90eb455899ca3f5061d8a006cd473ecce61e75404a0d09141065b14e1499de90fcc43a6681bed256a5dfccd200400dfad93cb0eb7810 SHA512 0daec5b0544638b2cf7437e18d719ddacf03e08c52e53fb70ac0384f389b5b2a4060209ff6d317c56d86c693bfa770cb6ddcf9c9881d1e43f9f9680df4ea106f
 EBUILD rospy-1.13.4.ebuild 734 BLAKE2B 96c03724a98663e3e06a90eb455899ca3f5061d8a006cd473ecce61e75404a0d09141065b14e1499de90fcc43a6681bed256a5dfccd200400dfad93cb0eb7810 SHA512 0daec5b0544638b2cf7437e18d719ddacf03e08c52e53fb70ac0384f389b5b2a4060209ff6d317c56d86c693bfa770cb6ddcf9c9881d1e43f9f9680df4ea106f
 EBUILD rospy-1.13.5.ebuild 734 BLAKE2B 96c03724a98663e3e06a90eb455899ca3f5061d8a006cd473ecce61e75404a0d09141065b14e1499de90fcc43a6681bed256a5dfccd200400dfad93cb0eb7810 SHA512 0daec5b0544638b2cf7437e18d719ddacf03e08c52e53fb70ac0384f389b5b2a4060209ff6d317c56d86c693bfa770cb6ddcf9c9881d1e43f9f9680df4ea106f
+EBUILD rospy-1.13.6.ebuild 734 BLAKE2B 5d9b2c75d339a5d6d4b087039e8eee6fee7379106551fbb3bef655c014ecae22daab67cbf907468fd6942b32827f0ee7150603c2b8cfcc9795a22ac638e7eb3c SHA512 0e9f566e30c8401d751d94150f5830461ff46156a853b2c30cc9a7c5bdd7d7f67fae2c6a34480a5bc3711d48aee3093984b898520b3b4fc06316b455eae3e826
 EBUILD rospy-9999.ebuild 734 BLAKE2B 96c03724a98663e3e06a90eb455899ca3f5061d8a006cd473ecce61e75404a0d09141065b14e1499de90fcc43a6681bed256a5dfccd200400dfad93cb0eb7810 SHA512 0daec5b0544638b2cf7437e18d719ddacf03e08c52e53fb70ac0384f389b5b2a4060209ff6d317c56d86c693bfa770cb6ddcf9c9881d1e43f9f9680df4ea106f
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rospy/rospy-1.13.6.ebuild b/dev-ros/rospy/rospy-1.13.6.ebuild
new file mode 100644
index 000000000000..6491d58ff8b1
--- /dev/null
+++ b/dev-ros/rospy/rospy-1.13.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=clients/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python client library for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roscpp[${PYTHON_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/rosservice/Manifest b/dev-ros/rosservice/Manifest
index 103de6895a21..4f282e3488d9 100644
--- a/dev-ros/rosservice/Manifest
+++ b/dev-ros/rosservice/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD rosservice-1.13.0.ebuild 539 BLAKE2B a31e81ef5f0f8073361ba4a7a05c4c6be67e727821a6fc2bea924e333f17451dee00ea5e53af8c24c1587fca0f5f59175546f5d68d4fa5ef89200cd45fdfb7c0 SHA512 7c1c2f7bf117425c550211b8a2574700234ccda37b229904d4c4596e2a82b747ba7f9316a9d214fa42b6ea789dc6f4e3b281784a4059a6d13a55db92447b1f0c
 EBUILD rosservice-1.13.1.ebuild 539 BLAKE2B a31e81ef5f0f8073361ba4a7a05c4c6be67e727821a6fc2bea924e333f17451dee00ea5e53af8c24c1587fca0f5f59175546f5d68d4fa5ef89200cd45fdfb7c0 SHA512 7c1c2f7bf117425c550211b8a2574700234ccda37b229904d4c4596e2a82b747ba7f9316a9d214fa42b6ea789dc6f4e3b281784a4059a6d13a55db92447b1f0c
 EBUILD rosservice-1.13.2.ebuild 539 BLAKE2B a31e81ef5f0f8073361ba4a7a05c4c6be67e727821a6fc2bea924e333f17451dee00ea5e53af8c24c1587fca0f5f59175546f5d68d4fa5ef89200cd45fdfb7c0 SHA512 7c1c2f7bf117425c550211b8a2574700234ccda37b229904d4c4596e2a82b747ba7f9316a9d214fa42b6ea789dc6f4e3b281784a4059a6d13a55db92447b1f0c
 EBUILD rosservice-1.13.4.ebuild 539 BLAKE2B a31e81ef5f0f8073361ba4a7a05c4c6be67e727821a6fc2bea924e333f17451dee00ea5e53af8c24c1587fca0f5f59175546f5d68d4fa5ef89200cd45fdfb7c0 SHA512 7c1c2f7bf117425c550211b8a2574700234ccda37b229904d4c4596e2a82b747ba7f9316a9d214fa42b6ea789dc6f4e3b281784a4059a6d13a55db92447b1f0c
 EBUILD rosservice-1.13.5.ebuild 539 BLAKE2B a31e81ef5f0f8073361ba4a7a05c4c6be67e727821a6fc2bea924e333f17451dee00ea5e53af8c24c1587fca0f5f59175546f5d68d4fa5ef89200cd45fdfb7c0 SHA512 7c1c2f7bf117425c550211b8a2574700234ccda37b229904d4c4596e2a82b747ba7f9316a9d214fa42b6ea789dc6f4e3b281784a4059a6d13a55db92447b1f0c
+EBUILD rosservice-1.13.6.ebuild 539 BLAKE2B 7c02a04878a4508cc7bb8ce6251c8920af1c78db8894a65b9857881172ecece13b63acaa4c520829459dd9900f61485bede0c81d5912f3a58f9c40a8fef92053 SHA512 d83674d4eedd0611c56be1ae34b813a4c160d722aa8b8a2d45e0b8c427964ccd278ca9d138680ec9832265acc5a4ec59d367e65d1e86ab14c00720d42d3c7865
 EBUILD rosservice-9999.ebuild 539 BLAKE2B a31e81ef5f0f8073361ba4a7a05c4c6be67e727821a6fc2bea924e333f17451dee00ea5e53af8c24c1587fca0f5f59175546f5d68d4fa5ef89200cd45fdfb7c0 SHA512 7c1c2f7bf117425c550211b8a2574700234ccda37b229904d4c4596e2a82b747ba7f9316a9d214fa42b6ea789dc6f4e3b281784a4059a6d13a55db92447b1f0c
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosservice/rosservice-1.13.6.ebuild b/dev-ros/rosservice/rosservice-1.13.6.ebuild
new file mode 100644
index 000000000000..5fd9906789c0
--- /dev/null
+++ b/dev-ros/rosservice/rosservice-1.13.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for listing and querying ROS Services"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rosmsg[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rostest/Manifest b/dev-ros/rostest/Manifest
index 4db1070993f0..cbaa7b01b837 100644
--- a/dev-ros/rostest/Manifest
+++ b/dev-ros/rostest/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD rostest-1.13.0.ebuild 726 BLAKE2B 1f45be27b42b2bfbcc782edb426e08c0d347967048bd65488d1ceee5954441397fdbc7d38671bc4f84d608dcb62d4c72f7ae1101cbc36dd61be211c81614ec6d SHA512 e2adcdb3f5837f146e02fabbefd2a3a56562810a8e8ef6d01c0fc2bc382b0a205fc59d3fea23a153d8673419d2225655a797dde3b8b4422d73742e523398644f
 EBUILD rostest-1.13.1.ebuild 726 BLAKE2B 1f45be27b42b2bfbcc782edb426e08c0d347967048bd65488d1ceee5954441397fdbc7d38671bc4f84d608dcb62d4c72f7ae1101cbc36dd61be211c81614ec6d SHA512 e2adcdb3f5837f146e02fabbefd2a3a56562810a8e8ef6d01c0fc2bc382b0a205fc59d3fea23a153d8673419d2225655a797dde3b8b4422d73742e523398644f
 EBUILD rostest-1.13.2.ebuild 726 BLAKE2B 1f45be27b42b2bfbcc782edb426e08c0d347967048bd65488d1ceee5954441397fdbc7d38671bc4f84d608dcb62d4c72f7ae1101cbc36dd61be211c81614ec6d SHA512 e2adcdb3f5837f146e02fabbefd2a3a56562810a8e8ef6d01c0fc2bc382b0a205fc59d3fea23a153d8673419d2225655a797dde3b8b4422d73742e523398644f
 EBUILD rostest-1.13.4.ebuild 726 BLAKE2B 1f45be27b42b2bfbcc782edb426e08c0d347967048bd65488d1ceee5954441397fdbc7d38671bc4f84d608dcb62d4c72f7ae1101cbc36dd61be211c81614ec6d SHA512 e2adcdb3f5837f146e02fabbefd2a3a56562810a8e8ef6d01c0fc2bc382b0a205fc59d3fea23a153d8673419d2225655a797dde3b8b4422d73742e523398644f
 EBUILD rostest-1.13.5.ebuild 726 BLAKE2B 1f45be27b42b2bfbcc782edb426e08c0d347967048bd65488d1ceee5954441397fdbc7d38671bc4f84d608dcb62d4c72f7ae1101cbc36dd61be211c81614ec6d SHA512 e2adcdb3f5837f146e02fabbefd2a3a56562810a8e8ef6d01c0fc2bc382b0a205fc59d3fea23a153d8673419d2225655a797dde3b8b4422d73742e523398644f
+EBUILD rostest-1.13.6.ebuild 726 BLAKE2B b7f810c064557daf24e458cd345cf525a72dadd94850e64fa47f1e3eefdbe0b806496c3a992e136ef3050a54c7470502928add640a14012e7f226bf0b9ac586b SHA512 1fbaa60365546572c1c955df97ee218981ca0a6a666d146ffcb6f0a0e56618108eda8524204968a73b98ced8ec947f35960472bbc14b000ac868fa183871cbad
 EBUILD rostest-9999.ebuild 726 BLAKE2B 1f45be27b42b2bfbcc782edb426e08c0d347967048bd65488d1ceee5954441397fdbc7d38671bc4f84d608dcb62d4c72f7ae1101cbc36dd61be211c81614ec6d SHA512 e2adcdb3f5837f146e02fabbefd2a3a56562810a8e8ef6d01c0fc2bc382b0a205fc59d3fea23a153d8673419d2225655a797dde3b8b4422d73742e523398644f
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rostest/rostest-1.13.6.ebuild b/dev-ros/rostest/rostest-1.13.6.ebuild
new file mode 100644
index 000000000000..10f35c044f10
--- /dev/null
+++ b/dev-ros/rostest/rostest-1.13.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit ros-catkin
+
+DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/roslaunch[${PYTHON_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	test? (
+		${RDEPEND}
+		dev-cpp/gtest
+	)"
diff --git a/dev-ros/rostime/Manifest b/dev-ros/rostime/Manifest
index da9bf6b7540b..77ce36cc2948 100644
--- a/dev-ros/rostime/Manifest
+++ b/dev-ros/rostime/Manifest
@@ -8,6 +8,7 @@ DIST roscpp_core-0.6.4.tar.gz 33661 BLAKE2B 5f38662f221f8a02c90cf8c739b5f9ecf5d8
 DIST roscpp_core-0.6.5.tar.gz 34493 BLAKE2B 9804fe6f23192e0e19bfb26e0671ad36189b936701e45755adb0c54e25c1c92dabd6f645bd014451bcd21f45af39be2f1c24727d1231cc52b62caba4d01ca4ff SHA512 32314cac55716b074416fac6665a8dec3a6a64abfac55be709f50b7ca1cbd993797d176bc2aefe2ae8b233b21e8464f330ad31de98bf60edc63149215dcb0cda
 DIST roscpp_core-0.6.7.tar.gz 34845 BLAKE2B cdb2385069a74d670061bc2245421e31216e1c9ace5c96f83d1875ddcf460f2ad425b10db3330253e2a49f3bc415cf3c72ab885cb121c9477ae54a385893a7b8 SHA512 d93afb6e0e88bb01b13af0334a7977411fac8f89dd06fc69a32b95bab4ead05d6cb564b089ee846fe542be180f6418664f8328a6a9e753a55b34e5a0a1d61bf4
 DIST roscpp_core-0.6.8.tar.gz 35003 BLAKE2B 7b4c02652693f76326df83d17164d3268f8b0eda0ddfe8f73d286ae09d7fbb3f8f433ab92527167fb918b55c53aeaa4e26d6876dac51d9d35e0b18b185d89867 SHA512 5fa9f8714059fbc864583662cd411d64470565cc2c372a09a63708a8cc06140d2ce8b84a7025837a49f2c09c7fee5092ec42d5625de4bfd2d9410baf7821b5df
+DIST roscpp_core-0.6.9.tar.gz 35069 BLAKE2B 5718611730419de3fd5dbd7c26792857c75306f4155916fe9570e494a0b1f0b9ca167a06654e1d5b1e1d20aa8cbd17c306bc91e7d0e803c8691d78c6c456fcec SHA512 87360695e71a020e869633c19187851242b84686b87842b388273f9874ff72e4e587eaf55dc10d099e55bc8db17c2ae7efdd5a9ff553a006b7f7c4ea5e1c84d9
 EBUILD rostime-0.5.6.ebuild 429 BLAKE2B 36d6c8525c3585e6f82b3bb4a819a3308457224ad7b412b2749d354c84557f2f8c4f9858270d51c694a6e2caae2aac205d0f717c6462b22122f83807cb69b354 SHA512 ef98d05ed0e98e664b9ca9d1dd736be40ffd22003bdeedb3c6ba9477707e1868d57c1070916dc765edeb143d1ffba2a3231c940cc236b8790bd3f5b2f7a44dd3
 EBUILD rostime-0.5.7.ebuild 429 BLAKE2B 36d6c8525c3585e6f82b3bb4a819a3308457224ad7b412b2749d354c84557f2f8c4f9858270d51c694a6e2caae2aac205d0f717c6462b22122f83807cb69b354 SHA512 ef98d05ed0e98e664b9ca9d1dd736be40ffd22003bdeedb3c6ba9477707e1868d57c1070916dc765edeb143d1ffba2a3231c940cc236b8790bd3f5b2f7a44dd3
 EBUILD rostime-0.6.0.ebuild 429 BLAKE2B 36d6c8525c3585e6f82b3bb4a819a3308457224ad7b412b2749d354c84557f2f8c4f9858270d51c694a6e2caae2aac205d0f717c6462b22122f83807cb69b354 SHA512 ef98d05ed0e98e664b9ca9d1dd736be40ffd22003bdeedb3c6ba9477707e1868d57c1070916dc765edeb143d1ffba2a3231c940cc236b8790bd3f5b2f7a44dd3
@@ -18,5 +19,6 @@ EBUILD rostime-0.6.4.ebuild 429 BLAKE2B df90753494617c12f173fee147ec3d1f2b7b8ebf
 EBUILD rostime-0.6.5.ebuild 429 BLAKE2B df90753494617c12f173fee147ec3d1f2b7b8ebf5fa3e42d963254203533ebabd456c4b2f2d9d8b3af80ff5fbcb138c5ab114595c8d123a0eecd36c04346c35b SHA512 8f2cea38e9d0c0fbbd2dacb1433e2320e812b0310f7d04ed816c71510ef64962f5e34fd34dc14e2a695ab5f0688068fc4e7ee75f41a2a6696753a68553109bbc
 EBUILD rostime-0.6.7.ebuild 429 BLAKE2B df90753494617c12f173fee147ec3d1f2b7b8ebf5fa3e42d963254203533ebabd456c4b2f2d9d8b3af80ff5fbcb138c5ab114595c8d123a0eecd36c04346c35b SHA512 8f2cea38e9d0c0fbbd2dacb1433e2320e812b0310f7d04ed816c71510ef64962f5e34fd34dc14e2a695ab5f0688068fc4e7ee75f41a2a6696753a68553109bbc
 EBUILD rostime-0.6.8.ebuild 429 BLAKE2B 4e52ba258dcd50a574daa94e34b98510e728da99182b87f7c0ce9bf876e0f57c3c95b7b06475218bda84d71b8527f9e81bf236612b2229d028f3c95a2cacd044 SHA512 010d928ad23a12e5af670ebb1e183c3e393db80cfcbe1cb707ff0157ab908f8ac59fc4f89de9cab5dc50a5613ad8a88db5b42fc3ff5e67fdef8b17e909c0d00d
+EBUILD rostime-0.6.9.ebuild 429 BLAKE2B 4e52ba258dcd50a574daa94e34b98510e728da99182b87f7c0ce9bf876e0f57c3c95b7b06475218bda84d71b8527f9e81bf236612b2229d028f3c95a2cacd044 SHA512 010d928ad23a12e5af670ebb1e183c3e393db80cfcbe1cb707ff0157ab908f8ac59fc4f89de9cab5dc50a5613ad8a88db5b42fc3ff5e67fdef8b17e909c0d00d
 EBUILD rostime-9999.ebuild 429 BLAKE2B 36d6c8525c3585e6f82b3bb4a819a3308457224ad7b412b2749d354c84557f2f8c4f9858270d51c694a6e2caae2aac205d0f717c6462b22122f83807cb69b354 SHA512 ef98d05ed0e98e664b9ca9d1dd736be40ffd22003bdeedb3c6ba9477707e1868d57c1070916dc765edeb143d1ffba2a3231c940cc236b8790bd3f5b2f7a44dd3
 MISC metadata.xml 329 BLAKE2B 58bfccd5cddfdb91aa5b414646dc07911ab19e1544dc8ac9eabb8d4d8eba138b76b990e017f86854c83efb8f5f6f31f391ad8c03dc8bcf6eef741a70a226ceb6 SHA512 8adfef45e8768b11f9f155e95e1c4b50606aa53abd64b84bc5b24c17134b8daf3536f51ae20a17e871e25db2140181502b62a9ace282872620845412571de89a
diff --git a/dev-ros/rostime/rostime-0.6.9.ebuild b/dev-ros/rostime/rostime-0.6.9.ebuild
new file mode 100644
index 000000000000..6d97b2f7c4f5
--- /dev/null
+++ b/dev-ros/rostime/rostime-0.6.9.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/roscpp_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Time and Duration implementations for C++ libraries"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	dev-ros/cpp_common
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
diff --git a/dev-ros/rostopic/Manifest b/dev-ros/rostopic/Manifest
index c7f3c6d61e2a..6e02ecb75287 100644
--- a/dev-ros/rostopic/Manifest
+++ b/dev-ros/rostopic/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD rostopic-1.13.0.ebuild 566 BLAKE2B a784e9bbea130808d8070a55ed07d8a6879a74d03e1b8046e5de7abb302bf25d27e4ea99d48de4adb3d922ef6163fd6352470ff8573db5b48a6373cf561a78a3 SHA512 3110b8d806f845a9f1a0899a84949087c90ed18a70c9aab33e81fc711542ab7b5e57e495421f8aeb9b1e538bdedee70c338e3b2e13f97667812fe9b5d6111c0b
 EBUILD rostopic-1.13.1.ebuild 566 BLAKE2B a784e9bbea130808d8070a55ed07d8a6879a74d03e1b8046e5de7abb302bf25d27e4ea99d48de4adb3d922ef6163fd6352470ff8573db5b48a6373cf561a78a3 SHA512 3110b8d806f845a9f1a0899a84949087c90ed18a70c9aab33e81fc711542ab7b5e57e495421f8aeb9b1e538bdedee70c338e3b2e13f97667812fe9b5d6111c0b
 EBUILD rostopic-1.13.2.ebuild 566 BLAKE2B a784e9bbea130808d8070a55ed07d8a6879a74d03e1b8046e5de7abb302bf25d27e4ea99d48de4adb3d922ef6163fd6352470ff8573db5b48a6373cf561a78a3 SHA512 3110b8d806f845a9f1a0899a84949087c90ed18a70c9aab33e81fc711542ab7b5e57e495421f8aeb9b1e538bdedee70c338e3b2e13f97667812fe9b5d6111c0b
 EBUILD rostopic-1.13.4.ebuild 566 BLAKE2B a784e9bbea130808d8070a55ed07d8a6879a74d03e1b8046e5de7abb302bf25d27e4ea99d48de4adb3d922ef6163fd6352470ff8573db5b48a6373cf561a78a3 SHA512 3110b8d806f845a9f1a0899a84949087c90ed18a70c9aab33e81fc711542ab7b5e57e495421f8aeb9b1e538bdedee70c338e3b2e13f97667812fe9b5d6111c0b
 EBUILD rostopic-1.13.5.ebuild 566 BLAKE2B a784e9bbea130808d8070a55ed07d8a6879a74d03e1b8046e5de7abb302bf25d27e4ea99d48de4adb3d922ef6163fd6352470ff8573db5b48a6373cf561a78a3 SHA512 3110b8d806f845a9f1a0899a84949087c90ed18a70c9aab33e81fc711542ab7b5e57e495421f8aeb9b1e538bdedee70c338e3b2e13f97667812fe9b5d6111c0b
+EBUILD rostopic-1.13.6.ebuild 566 BLAKE2B 758a5d3391f24f2d7f61b1581ca9ad0002e95f210692dfa05f680fc156abeac38f82f727364eb16b49e4d0f6282ef197cd28e54524ce411cce4483f65bdd6994 SHA512 d109003bc46cc131343fb8d85b735dcaa762db6fbfeaa3854b275103ec5280987443efcd68524fed0b3bf422506d1b5db83a93beafe46b52259ae6a785dc12c4
 EBUILD rostopic-9999.ebuild 566 BLAKE2B a784e9bbea130808d8070a55ed07d8a6879a74d03e1b8046e5de7abb302bf25d27e4ea99d48de4adb3d922ef6163fd6352470ff8573db5b48a6373cf561a78a3 SHA512 3110b8d806f845a9f1a0899a84949087c90ed18a70c9aab33e81fc711542ab7b5e57e495421f8aeb9b1e538bdedee70c338e3b2e13f97667812fe9b5d6111c0b
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rostopic/rostopic-1.13.6.ebuild b/dev-ros/rostopic/rostopic-1.13.6.ebuild
new file mode 100644
index 000000000000..222f83a30d20
--- /dev/null
+++ b/dev-ros/rostopic/rostopic-1.13.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
diff --git a/dev-ros/rosunit/Manifest b/dev-ros/rosunit/Manifest
index 5c1f7384a9bc..d704f7460eba 100644
--- a/dev-ros/rosunit/Manifest
+++ b/dev-ros/rosunit/Manifest
@@ -1,8 +1,10 @@
 DIST ros-1.14.0.tar.gz 167371 BLAKE2B 07a046b44a327febe2f5aa6793a27f8ee5547254500ade917484674aefd8b91d651c8f48c187704b4174659c3a983cd6a864f316180f2de4d45ef4f6e0c7cd86 SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31
 DIST ros-1.14.1.tar.gz 167768 BLAKE2B 1d4ec3b2af505be4995ade962c8d7c8f165af40b6911986e82d34c79baf8a3b36d553caa35395e006348bbae3e15b551831065b6185373e7451bafd444ac5d66 SHA512 b8d3ea058cd53d5ecd3aa3302ecdd89ef183cb0b58a0f39949e8215ffd7361111e0d926c3c8eb93bab7867d166870e9acc411c931df543f9ba9e5031739a399a
 DIST ros-1.14.2.tar.gz 167882 BLAKE2B 7aadc3d06b02b58067a805613dd87cab3a97a0d0f2ddd79c496a63d75abba3444e2b624ff17308db910d9e1beca43b67d897f1358fbe4d9484a560da2de987f8 SHA512 9d848140bc694f0f2b86f8c9ef67e0279c5f05a73abe43f54aedb7439c7810346d136445c7195310e5f00e0a0cdfbbf6cbb004e7ab0b1427811ec8b0a73933d5
+DIST ros-1.14.3.tar.gz 166640 BLAKE2B 191f3455853ff070d7a53352b801adad58b2c32d683994c96ce6dcab297a4032dc1ac313f9be7547596440a4179ecd38f743c4b02cac8326872f450a59847bc1 SHA512 60b8a38765539a7598c9725de56ef859022875c3b2c50636bf0a79c7aca653d0efd487ad60639362c90a6d983d9e76a8fbf565a91d53da21cfb4fa95bf7ac786
 EBUILD rosunit-1.14.0.ebuild 500 BLAKE2B 32eb9022bc2035f87168c5d79d09fac1ad49ae70a64c232fce1aea0bbad9e9770845c91311afa13bc410cb80069bc610ab1d8e572d63764d95c94aaa48ba2c93 SHA512 fbb7785549c4c31ae9f499566e853a481305fd8f27ca781b8e0a1493faf250df57e75e7b873a1786296d6e6a7eb467fb69008b651434f9b1cb0d1960f980ef41
 EBUILD rosunit-1.14.1.ebuild 500 BLAKE2B 32eb9022bc2035f87168c5d79d09fac1ad49ae70a64c232fce1aea0bbad9e9770845c91311afa13bc410cb80069bc610ab1d8e572d63764d95c94aaa48ba2c93 SHA512 fbb7785549c4c31ae9f499566e853a481305fd8f27ca781b8e0a1493faf250df57e75e7b873a1786296d6e6a7eb467fb69008b651434f9b1cb0d1960f980ef41
 EBUILD rosunit-1.14.2.ebuild 500 BLAKE2B 32eb9022bc2035f87168c5d79d09fac1ad49ae70a64c232fce1aea0bbad9e9770845c91311afa13bc410cb80069bc610ab1d8e572d63764d95c94aaa48ba2c93 SHA512 fbb7785549c4c31ae9f499566e853a481305fd8f27ca781b8e0a1493faf250df57e75e7b873a1786296d6e6a7eb467fb69008b651434f9b1cb0d1960f980ef41
+EBUILD rosunit-1.14.3.ebuild 500 BLAKE2B 581f2614a0edc064f445c4b6e3d8bc8a77eb96a4e88c11574d39bcf69585c1a963d1b29a3e220c8080013d51b13ac48548144ee9fc799ae81524050a1dd7d5cb SHA512 3b8b4bf8b571e1dd1e14f0098b1e1bc79daa16d02d5635976e56e7a1ed55bfd984a427ee0e9fd9375df57812afda02eb45158ceca3eac9f49c07fef5a275b0e5
 EBUILD rosunit-9999.ebuild 500 BLAKE2B 32eb9022bc2035f87168c5d79d09fac1ad49ae70a64c232fce1aea0bbad9e9770845c91311afa13bc410cb80069bc610ab1d8e572d63764d95c94aaa48ba2c93 SHA512 fbb7785549c4c31ae9f499566e853a481305fd8f27ca781b8e0a1493faf250df57e75e7b873a1786296d6e6a7eb467fb69008b651434f9b1cb0d1960f980ef41
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosunit/rosunit-1.14.3.ebuild b/dev-ros/rosunit/rosunit-1.14.3.ebuild
new file mode 100644
index 000000000000..eb257dfeac25
--- /dev/null
+++ b/dev-ros/rosunit/rosunit-1.14.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit-testing package for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/roswtf/Manifest b/dev-ros/roswtf/Manifest
index ccf18cda26c4..0d6f738ba7a2 100644
--- a/dev-ros/roswtf/Manifest
+++ b/dev-ros/roswtf/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD roswtf-1.13.0.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
 EBUILD roswtf-1.13.1.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
 EBUILD roswtf-1.13.2.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
 EBUILD roswtf-1.13.4.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
 EBUILD roswtf-1.13.5.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
+EBUILD roswtf-1.13.6.ebuild 662 BLAKE2B 7ca8fccb945abfa0b4c4c2048e1582063be1dd67276224522a9e568bb3947903a190a75b6f09306f1c273af70cec7a1d4b7979663244f746a14191d644034ae5 SHA512 086d738888864950509088d82d2d669397805523501addd75fb067220ee2b6cab9e515e469159fe5e0ed8a479780d6737c954d90d218401aacebbff868c8d43a
 EBUILD roswtf-9999.ebuild 662 BLAKE2B f6ccaffa46e840f520e1bd63befdbab04d52c240055e63e28be2793904cff438ad64082558ca361855afcd5b2ecca94a4ef610a2406bb8ba42b5c8ddfdc72f09 SHA512 b3afa27d6bc9e241f10f67a9ae876123db28a5960a4d069b95f790901565285814b16604c98777339ec805d1f7f0fdde98eabf47f394aabad3a6d69eaacd29b5
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/message_filters/message_filters-1.13.2.ebuild b/dev-ros/roswtf/roswtf-1.13.6.ebuild
index fcb4bda239a5..396feee7b7a8 100644
--- a/dev-ros/message_filters/message_filters-1.13.2.ebuild
+++ b/dev-ros/roswtf/roswtf-1.13.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,28 +6,23 @@ EAPI=5
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
-DESCRIPTION="Set of message filters which take in messages and may output those messages at a later time"
+DESCRIPTION="Tool for diagnosing issues with a running ROS system"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=[threads]
-	dev-ros/genpy[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
 	dev-ros/roslib[${PYTHON_USEDEP}]
 	dev-python/rospkg[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? (
 		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit[${PYTHON_USEDEP}]
-		dev-cpp/gtest
+		dev-util/rosdep[${PYTHON_USEDEP}]
+		dev-util/rosinstall[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 	)"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/test_rosbag/Manifest b/dev-ros/test_rosbag/Manifest
index 8b18abfc10e9..39d98a94dc0a 100644
--- a/dev-ros/test_rosbag/Manifest
+++ b/dev-ros/test_rosbag/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD test_rosbag-1.13.0.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
 EBUILD test_rosbag-1.13.1.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
 EBUILD test_rosbag-1.13.2.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
 EBUILD test_rosbag-1.13.4.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
 EBUILD test_rosbag-1.13.5.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
+EBUILD test_rosbag-1.13.6.ebuild 840 BLAKE2B 9f1886a266e904b42f948de75eb4befb12b589248050ae75bcda3ff682d8248ded8e601e6113af84f30e42ab5b024b1a90b96af0f18d46f4dcf822a03561766c SHA512 c3a56c11dc788d45ed76b1e151312c3db2832c391581a18a6ed7e67a72702fdb8454255b7c4be2c85a0a67bb8ad37fd0155ffcec56d61e746b5347e7f05e809f
 EBUILD test_rosbag-9999.ebuild 840 BLAKE2B 4ea77fe53b2287de2f68558340968b0833871953aea2008574e1f85395ce8c35d7169c612fff9f66579119aa1f80f42d5a10806b3321fd0edd9fff7795b4f5f8 SHA512 f094d1f6268deb2b18ca04e0d1098eccb889e9e40337f947392a36c603b2ffd111cb0968187e2ceb8aa77f7dec772c00f0d5d1660ff3e1b85476c5939a33e6ba
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosbag/test_rosbag-1.13.6.ebuild b/dev-ros/test_rosbag/test_rosbag-1.13.6.ebuild
new file mode 100644
index 000000000000..e1c884997333
--- /dev/null
+++ b/dev-ros/test_rosbag/test_rosbag-1.13.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+PYTHON_COMPAT=( python2_7 )
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosbag"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/message_generation
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	dev-ros/topic_tools[${PYTHON_USEDEP}]
+	dev-ros/xmlrpcpp
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/boost[threads]
+		app-arch/bzip2
+		dev-ros/rosout
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+	)
+"
diff --git a/dev-ros/test_rosbag_storage/Manifest b/dev-ros/test_rosbag_storage/Manifest
index 3d81fc692ec7..a7b217d9b22e 100644
--- a/dev-ros/test_rosbag_storage/Manifest
+++ b/dev-ros/test_rosbag_storage/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD test_rosbag_storage-1.13.0.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
 EBUILD test_rosbag_storage-1.13.1.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
 EBUILD test_rosbag_storage-1.13.2.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
 EBUILD test_rosbag_storage-1.13.4.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
 EBUILD test_rosbag_storage-1.13.5.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
+EBUILD test_rosbag_storage-1.13.6.ebuild 452 BLAKE2B 2769e5d28c34b7102298c3d0f98d660baa870c59a7299be038029e6ce3636489b3d02a16d954dd9779fb635917ad134408ef5205cc62c8ea6dd43b9e98f408a3 SHA512 deff131d08cdead605916e1af61fd5aabdbe2f70479075272a9ec78202686638377d72c27fbbe2561d18452b950682ae7a2e0042bb4d6766c58715ce047e9830
 EBUILD test_rosbag_storage-9999.ebuild 452 BLAKE2B 77d6739d14ac2a65205f3fb708f2876a5ac77cb1d5dd398d77418ad90295a431c0184711d6bba55780c8249690fd870170b2bf492134c88879ab8b71ce6ef643 SHA512 5da1d0e29a39475966df57aa6f820e053b3cd4873d9ce88803956c52fd3a3a14773b618c57a5621831cc5b505380658c4881a23fe16a656f0f3ba1215b9a07e8
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.6.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.6.ebuild
new file mode 100644
index 000000000000..31f2c38f62c9
--- /dev/null
+++ b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.13.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosbag_storage"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rosbag_storage
+	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 34ce720b34a7..60751dfd4670 100644
--- a/dev-ros/test_roscpp/Manifest
+++ b/dev-ros/test_roscpp/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD test_roscpp-1.13.0.ebuild 686 BLAKE2B 296e8e053461f066595a98c326f46f3bc66efe748748a996df81c64ce40b3dcc69f4ae94f33e4b2d4c68d3eb7ee9e56d6f685f150e9d1d16fe8f680b9d71f6b0 SHA512 5326ed5fe18e0c6b65d667a5ee932ad44ecdeca05a32a480f8cc9eda62accd0fd9a03d17790a75d383f8b59a2824914b7b8a8a1166686335cbede424de0067d8
 EBUILD test_roscpp-1.13.1.ebuild 686 BLAKE2B 296e8e053461f066595a98c326f46f3bc66efe748748a996df81c64ce40b3dcc69f4ae94f33e4b2d4c68d3eb7ee9e56d6f685f150e9d1d16fe8f680b9d71f6b0 SHA512 5326ed5fe18e0c6b65d667a5ee932ad44ecdeca05a32a480f8cc9eda62accd0fd9a03d17790a75d383f8b59a2824914b7b8a8a1166686335cbede424de0067d8
 EBUILD test_roscpp-1.13.2.ebuild 686 BLAKE2B 296e8e053461f066595a98c326f46f3bc66efe748748a996df81c64ce40b3dcc69f4ae94f33e4b2d4c68d3eb7ee9e56d6f685f150e9d1d16fe8f680b9d71f6b0 SHA512 5326ed5fe18e0c6b65d667a5ee932ad44ecdeca05a32a480f8cc9eda62accd0fd9a03d17790a75d383f8b59a2824914b7b8a8a1166686335cbede424de0067d8
 EBUILD test_roscpp-1.13.4.ebuild 686 BLAKE2B 296e8e053461f066595a98c326f46f3bc66efe748748a996df81c64ce40b3dcc69f4ae94f33e4b2d4c68d3eb7ee9e56d6f685f150e9d1d16fe8f680b9d71f6b0 SHA512 5326ed5fe18e0c6b65d667a5ee932ad44ecdeca05a32a480f8cc9eda62accd0fd9a03d17790a75d383f8b59a2824914b7b8a8a1166686335cbede424de0067d8
 EBUILD test_roscpp-1.13.5.ebuild 686 BLAKE2B 296e8e053461f066595a98c326f46f3bc66efe748748a996df81c64ce40b3dcc69f4ae94f33e4b2d4c68d3eb7ee9e56d6f685f150e9d1d16fe8f680b9d71f6b0 SHA512 5326ed5fe18e0c6b65d667a5ee932ad44ecdeca05a32a480f8cc9eda62accd0fd9a03d17790a75d383f8b59a2824914b7b8a8a1166686335cbede424de0067d8
+EBUILD test_roscpp-1.13.6.ebuild 686 BLAKE2B 51f728f587419c338a10bc87ec34ae493f31936785c460c5f339c4842df4d170090cca5ffb859424a8a3061c6ebd7eb271bb1e0584e2bd3f504f778b9804efc0 SHA512 248c4b2c8b6afe224576f4581c13d85b79abafd63bdd7832bfad6074d6abf2fdee67ff66a1cfad78dcde23a93696633b4b7a96f9e87b0d352ad507753613f964
 EBUILD test_roscpp-9999.ebuild 686 BLAKE2B 913ebd162894a4839ac240006a07f9007384d8066f71fcbef889b020b1283e5d528edc297e9f81497a984e152b6d0f1d91149bbaf0cdb437b2a6074ea51b9326 SHA512 88523b4bd636f6c066a7132bb0509c92cdfbfdbf24db72adef2c4461358c31c40f5c4f7db655aecbc41766429b50f73f1c7e247b7a956fefe2184e9079cd8df8
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_roscpp/test_roscpp-1.13.6.ebuild b/dev-ros/test_roscpp/test_roscpp-1.13.6.ebuild
new file mode 100644
index 000000000000..74f15fb4247b
--- /dev/null
+++ b/dev-ros/test_roscpp/test_roscpp-1.13.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roscpp"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=[threads]
+	test? (
+		dev-cpp/gtest
+	)
+"
+REQUIRED_USE="test? ( ros_messages_cxx )"
diff --git a/dev-ros/test_rosgraph/Manifest b/dev-ros/test_rosgraph/Manifest
index d6b826b19a5e..e8f6d80f03bc 100644
--- a/dev-ros/test_rosgraph/Manifest
+++ b/dev-ros/test_rosgraph/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD test_rosgraph-1.13.0.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
 EBUILD test_rosgraph-1.13.1.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
 EBUILD test_rosgraph-1.13.2.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
 EBUILD test_rosgraph-1.13.4.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
 EBUILD test_rosgraph-1.13.5.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
+EBUILD test_rosgraph-1.13.6.ebuild 438 BLAKE2B f404da5764238b04f9eb7f055bc3726924311a8f7f77482e8c2ca65f6dab05d669f7abed15204263bc044e7841d6adbff29e5854d23d4ffab1102fac32a39788 SHA512 b4183c921be3b4856544b67a535721c0badd209b8e7c3f570ac5fb4684e1dcfd5dcfaa4ea08ab23b13b64a86d17fd01bf8e45b1e866d16fc5dd71109e723d274
 EBUILD test_rosgraph-9999.ebuild 438 BLAKE2B 7f9b25d24b5cab1d71ca26dc80adc38743677d4794e97dc06d8f9c8f40e0cbe42824928f279078bd7c8ea0fac89d17a331f22ced085397a58232be41de424422 SHA512 6a7779f57141d8c72a97e36d73411f5241b3839ff8d1a3d102314fee9192ff6ff637ae86918723a4fa1b8e5dc2523c6a8907ec655f3ec6f5e3abb25533f3a780
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.13.6.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.13.6.ebuild
new file mode 100644
index 000000000000..e901f1348a64
--- /dev/null
+++ b/dev-ros/test_rosgraph/test_rosgraph-1.13.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosgraph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/test_roslaunch/Manifest b/dev-ros/test_roslaunch/Manifest
index c0bf024a1709..8b7a891a2f89 100644
--- a/dev-ros/test_roslaunch/Manifest
+++ b/dev-ros/test_roslaunch/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD test_roslaunch-1.13.0.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
 EBUILD test_roslaunch-1.13.1.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
 EBUILD test_roslaunch-1.13.2.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
 EBUILD test_roslaunch-1.13.4.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
 EBUILD test_roslaunch-1.13.5.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
+EBUILD test_roslaunch-1.13.6.ebuild 483 BLAKE2B 5823a43960ad28a1efb407a8e13bc4482329d2f9d893d2110a286d0dbfa76ea9c42ee3aa483780c2c586df817b19c8b08084ff603384e52d542c6a9d3f409117 SHA512 ff69459d80e8cebe100b59e89c29e09242762d67c3cfe5c115bb0a764f1a65f7c7a2cef29c5d0e7fedf0157b89a40e6173955878f1d2e2cd2bdd3bd97dfbf1ba
 EBUILD test_roslaunch-9999.ebuild 483 BLAKE2B 30e75a9862ea977d4aaf8f4429e35ec20ecc5999219c3d783b27f96de7ccaa18af6bbcf664611eda1b56933e3247b0e37dff999bb8532d8cc4f9586ba60afb72 SHA512 4d6f106652d163dcade1a720e50fe7ef7d3f219f9196128fc044b19fc98c8a4d183c5933d9aa8a152959f331f0b17fd1f8ff67c34f8c875b532d25af5a39e180
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.13.6.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.13.6.ebuild
new file mode 100644
index 000000000000..04a9794a2d44
--- /dev/null
+++ b/dev-ros/test_roslaunch/test_roslaunch-1.13.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roslaunch"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	test? (
+		dev-ros/roslaunch[${PYTHON_USEDEP}]
+		dev-python/rospkg[${PYTHON_USEDEP}]
+	)
+"
diff --git a/dev-ros/test_roslib_comm/Manifest b/dev-ros/test_roslib_comm/Manifest
index 89386f299a34..b13a5e5b1fd1 100644
--- a/dev-ros/test_roslib_comm/Manifest
+++ b/dev-ros/test_roslib_comm/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD test_roslib_comm-1.13.0.ebuild 556 BLAKE2B e0007a98d958cdee5405bc5209ced4b7288dc6a72a819a7ab1ee4c0e483408d1b9cbd457ac8d5ae09561a90c66a3bba45f75b8be050b46dd68b64be85c986e66 SHA512 5389f774e680c06cb109b50cc415538a7fe72d77197e96d924890776203cd70c92e4f30b0cc7c84cc77016477866f5e6f577b06643810dc5ffc8f060c6b99ee0
 EBUILD test_roslib_comm-1.13.1.ebuild 556 BLAKE2B e0007a98d958cdee5405bc5209ced4b7288dc6a72a819a7ab1ee4c0e483408d1b9cbd457ac8d5ae09561a90c66a3bba45f75b8be050b46dd68b64be85c986e66 SHA512 5389f774e680c06cb109b50cc415538a7fe72d77197e96d924890776203cd70c92e4f30b0cc7c84cc77016477866f5e6f577b06643810dc5ffc8f060c6b99ee0
 EBUILD test_roslib_comm-1.13.2.ebuild 556 BLAKE2B e0007a98d958cdee5405bc5209ced4b7288dc6a72a819a7ab1ee4c0e483408d1b9cbd457ac8d5ae09561a90c66a3bba45f75b8be050b46dd68b64be85c986e66 SHA512 5389f774e680c06cb109b50cc415538a7fe72d77197e96d924890776203cd70c92e4f30b0cc7c84cc77016477866f5e6f577b06643810dc5ffc8f060c6b99ee0
 EBUILD test_roslib_comm-1.13.4.ebuild 556 BLAKE2B e0007a98d958cdee5405bc5209ced4b7288dc6a72a819a7ab1ee4c0e483408d1b9cbd457ac8d5ae09561a90c66a3bba45f75b8be050b46dd68b64be85c986e66 SHA512 5389f774e680c06cb109b50cc415538a7fe72d77197e96d924890776203cd70c92e4f30b0cc7c84cc77016477866f5e6f577b06643810dc5ffc8f060c6b99ee0
 EBUILD test_roslib_comm-1.13.5.ebuild 556 BLAKE2B e0007a98d958cdee5405bc5209ced4b7288dc6a72a819a7ab1ee4c0e483408d1b9cbd457ac8d5ae09561a90c66a3bba45f75b8be050b46dd68b64be85c986e66 SHA512 5389f774e680c06cb109b50cc415538a7fe72d77197e96d924890776203cd70c92e4f30b0cc7c84cc77016477866f5e6f577b06643810dc5ffc8f060c6b99ee0
+EBUILD test_roslib_comm-1.13.6.ebuild 556 BLAKE2B ba0100b4680795f137e8d40d567c1b8de599bf1fefeaec049426ac6156c9548f9d194b7c06c24872361fe11342574028b0aa48037c1d98cebf3822593c640148 SHA512 20767eb40a897f75beff6cab033ee24a70a1971c41d83fab04a9160e6e2f1fe536b319017736ac40fc8930320bcf8efdc77913bea0cc8bf367ea590399730c2a
 EBUILD test_roslib_comm-9999.ebuild 556 BLAKE2B 500e11a34be014312a1e6432df777843bafb425e09d976cf3c7e4aa86eb8a8c1f085f76d48841aad243b97f1fdf87b79fbdd84b2294089bb6520701923c92939 SHA512 34db49c0d2de9f563da46e1ec3b87a0b4adfe9b99e6b6bbfce2b2b176320ce6f27d9f05c8c47346d07088b23d9f7771a56b7f346bbefc340c8ff5d116523def8
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.13.6.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.13.6.ebuild
new file mode 100644
index 000000000000..25cb9086d149
--- /dev/null
+++ b/dev-ros/test_roslib_comm/test_roslib_comm-1.13.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roslib"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (	dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )
+"
diff --git a/dev-ros/test_rosmaster/Manifest b/dev-ros/test_rosmaster/Manifest
index d9ed52a8996a..3420cb591a0d 100644
--- a/dev-ros/test_rosmaster/Manifest
+++ b/dev-ros/test_rosmaster/Manifest
@@ -4,11 +4,13 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD test_rosmaster-1.12.7.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
 EBUILD test_rosmaster-1.13.0.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
 EBUILD test_rosmaster-1.13.1.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
 EBUILD test_rosmaster-1.13.2.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
 EBUILD test_rosmaster-1.13.4.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
 EBUILD test_rosmaster-1.13.5.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
+EBUILD test_rosmaster-1.13.6.ebuild 698 BLAKE2B 58ce81be4098e9839761dd1979ce2f5c44f0fc6d7bced98d12ecb6cacaee7d36d7a507ff32e3e4aabdc35ac822eeec17d9b24f694f834b3856ca4e3405f37826 SHA512 f8169b68855c6dcdef425686423d9d4d78bc354cd4f85fbcfebf2e3394c16095c74f0ef21a06f56d45a649adf8f451f7b18e2fcaf37210f94db7750948af47d0
 EBUILD test_rosmaster-9999.ebuild 698 BLAKE2B d5b4d4a9029b5fb5d967a146d22f056f48bab5c55d71db031322feadd8dbd11cccd46dfb8bba77bf70328e24b329e3bdb7df824c9706f30c5dd7e40f1d5c9eb0 SHA512 99dc926c24a752cedb957d9322d1f9a76ca3eb1855ef485ba81fe12fcca2641ecebc960279dbc04739a14cdb77e807cc012233419d6d7c7466b4778c2f5d9498
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.13.6.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.13.6.ebuild
new file mode 100644
index 000000000000..f9547e8381b1
--- /dev/null
+++ b/dev-ros/test_rosmaster/test_rosmaster-1.13.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosmaster"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (	dev-ros/roslib[${PYTHON_USEDEP}] )
+"
+
+mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
+
+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 9c4f48fe0c7f..0684fce9bc84 100644
--- a/dev-ros/test_rosparam/Manifest
+++ b/dev-ros/test_rosparam/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD test_rosparam-1.13.0.ebuild 503 BLAKE2B a18419f3e90f5af5413901969cefd6c1b53907748dc5da1156ec36de248c638b7e2ba3b8dd71ef8c46289d119dbb3bee7617acc0025cd0f9e8b84d1f6eba99d6 SHA512 c7858182460cfc4a85c2603f1e95252a63040349ac31c021307c42a951d1f3ab4b59d5c24f1fea1d0c10598060a253ac9423dd4100e1f85cbbb5211605b8b81d
 EBUILD test_rosparam-1.13.1.ebuild 503 BLAKE2B a18419f3e90f5af5413901969cefd6c1b53907748dc5da1156ec36de248c638b7e2ba3b8dd71ef8c46289d119dbb3bee7617acc0025cd0f9e8b84d1f6eba99d6 SHA512 c7858182460cfc4a85c2603f1e95252a63040349ac31c021307c42a951d1f3ab4b59d5c24f1fea1d0c10598060a253ac9423dd4100e1f85cbbb5211605b8b81d
 EBUILD test_rosparam-1.13.2.ebuild 503 BLAKE2B a18419f3e90f5af5413901969cefd6c1b53907748dc5da1156ec36de248c638b7e2ba3b8dd71ef8c46289d119dbb3bee7617acc0025cd0f9e8b84d1f6eba99d6 SHA512 c7858182460cfc4a85c2603f1e95252a63040349ac31c021307c42a951d1f3ab4b59d5c24f1fea1d0c10598060a253ac9423dd4100e1f85cbbb5211605b8b81d
 EBUILD test_rosparam-1.13.4.ebuild 503 BLAKE2B a18419f3e90f5af5413901969cefd6c1b53907748dc5da1156ec36de248c638b7e2ba3b8dd71ef8c46289d119dbb3bee7617acc0025cd0f9e8b84d1f6eba99d6 SHA512 c7858182460cfc4a85c2603f1e95252a63040349ac31c021307c42a951d1f3ab4b59d5c24f1fea1d0c10598060a253ac9423dd4100e1f85cbbb5211605b8b81d
 EBUILD test_rosparam-1.13.5.ebuild 503 BLAKE2B a18419f3e90f5af5413901969cefd6c1b53907748dc5da1156ec36de248c638b7e2ba3b8dd71ef8c46289d119dbb3bee7617acc0025cd0f9e8b84d1f6eba99d6 SHA512 c7858182460cfc4a85c2603f1e95252a63040349ac31c021307c42a951d1f3ab4b59d5c24f1fea1d0c10598060a253ac9423dd4100e1f85cbbb5211605b8b81d
+EBUILD test_rosparam-1.13.6.ebuild 503 BLAKE2B d782d1f52885c86ac50106fb19b07f9a2517a29dfa321f82e15b9ef0d0517586ce1fa0b7248aaadfa0d7e56d6c4a31ca852ad7c637e7bc2586b1f3537c879adf SHA512 b42629a3510b66d53f9e326d95aef7eb8545aecfd3e4277fb8e082982d9568334d082bb38a5e6901e2d68e9fb45b7b8a58a89df438ff345611113c316ee9c0ae
 EBUILD test_rosparam-9999.ebuild 503 BLAKE2B e065bfcfa421c3de64ad8840a544eb4f427c3b2753b38b64960b51e4a9f432d7d3a6e8f2f4ef5303e47c0005e533deea5f34cd63369febb1f05ea3ac0bfb460f SHA512 a36d13dae004b782d566d5c7edf5ebe551c6e6a4d5213904824b1ccacfb61b24c437d01765fe96d584ffcc497fee7a3a630c3bbd45d0849fd0b460289ba8a654
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosparam/test_rosparam-1.13.6.ebuild b/dev-ros/test_rosparam/test_rosparam-1.13.6.ebuild
new file mode 100644
index 000000000000..1c24d77d5702
--- /dev/null
+++ b/dev-ros/test_rosparam/test_rosparam-1.13.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosparam"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-ros/rosparam[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/test_rospy/Manifest b/dev-ros/test_rospy/Manifest
index 6a9d62db7a6a..b045b091d0b0 100644
--- a/dev-ros/test_rospy/Manifest
+++ b/dev-ros/test_rospy/Manifest
@@ -4,11 +4,13 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD test_rospy-1.12.7.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
 EBUILD test_rospy-1.13.0.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
 EBUILD test_rospy-1.13.1.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
 EBUILD test_rospy-1.13.2.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
 EBUILD test_rospy-1.13.4.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
 EBUILD test_rospy-1.13.5.ebuild 843 BLAKE2B 742ed12d2afb829588c9dd21f8f45704f8d9c96b21a3b8df99b441976a1447c951c7155cd12e56911fa27b6b4872d24e8118a7c096d4c9fe758f89903d0aab7d SHA512 f1d27544929d7eeaf83551314ee33f1c06c14d506e5dab48dda9b565b8e55954bf76267081d5dfd4e0d641fd0114d527b9014ce9830bebfe21c9ef95156d9a14
+EBUILD test_rospy-1.13.6.ebuild 843 BLAKE2B 13c5ffa92a54986807fc5eff84d10624f2cc4ec05809a20049c8996ea4cc327836009bd680fbe0776aacb0a46f399beb15fcd9efa51bcb6d525b85207484999e SHA512 56e91015952815944f4357e9589296af3985c721150616c73e718ec9e5068a01c1e46df91ef5cacc080111954a6242884e6d373c2beaa63a277947d666c2c1bf
 EBUILD test_rospy-9999.ebuild 843 BLAKE2B 95bee07029a08cc289842cab2529c1854f1af6ea706853c51725ae88e6e50cad233090f48dfb4c203747a3e4d1fb7849caaf7daa3865730bc6bcb02e295cb77f SHA512 0351a18324e0c5c13cb36af850383a9c904ac8d5bd8f005dfafa6fa1e84a7a9377aaa8fd760036cc7057ee2d4f210f924fed6e65147da9a6c7676f31c75d54a0
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rospy/test_rospy-1.13.6.ebuild b/dev-ros/test_rospy/test_rospy-1.13.6.ebuild
new file mode 100644
index 000000000000..c681d244b919
--- /dev/null
+++ b/dev-ros/test_rospy/test_rospy-1.13.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rospy"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-ros/rosbuild
+		dev-ros/rosgraph[${PYTHON_USEDEP}]
+		dev-ros/rospy[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/test_rosservice/Manifest b/dev-ros/test_rosservice/Manifest
index 36f618f9ee61..f77b193bc160 100644
--- a/dev-ros/test_rosservice/Manifest
+++ b/dev-ros/test_rosservice/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD test_rosservice-1.13.0.ebuild 679 BLAKE2B 3b7b23facab4bf83bd3194e9cc2b4e46489fb2e80893d3bf8658c339e0395cc86c66c325be2d5e13409ac6e8fee40cddc1787a73f062cc7d2cdca365d6c502fb SHA512 cb072fe9c3cf62c3cf67466e417c04b8658335f2b3ff4f42aeef1d2649df39f6687fdb8b6b25b482bc66795a083e0289143a3db2353c8df291ff29304e44689d
 EBUILD test_rosservice-1.13.1.ebuild 679 BLAKE2B 3b7b23facab4bf83bd3194e9cc2b4e46489fb2e80893d3bf8658c339e0395cc86c66c325be2d5e13409ac6e8fee40cddc1787a73f062cc7d2cdca365d6c502fb SHA512 cb072fe9c3cf62c3cf67466e417c04b8658335f2b3ff4f42aeef1d2649df39f6687fdb8b6b25b482bc66795a083e0289143a3db2353c8df291ff29304e44689d
 EBUILD test_rosservice-1.13.2.ebuild 679 BLAKE2B 3b7b23facab4bf83bd3194e9cc2b4e46489fb2e80893d3bf8658c339e0395cc86c66c325be2d5e13409ac6e8fee40cddc1787a73f062cc7d2cdca365d6c502fb SHA512 cb072fe9c3cf62c3cf67466e417c04b8658335f2b3ff4f42aeef1d2649df39f6687fdb8b6b25b482bc66795a083e0289143a3db2353c8df291ff29304e44689d
 EBUILD test_rosservice-1.13.4.ebuild 679 BLAKE2B 3b7b23facab4bf83bd3194e9cc2b4e46489fb2e80893d3bf8658c339e0395cc86c66c325be2d5e13409ac6e8fee40cddc1787a73f062cc7d2cdca365d6c502fb SHA512 cb072fe9c3cf62c3cf67466e417c04b8658335f2b3ff4f42aeef1d2649df39f6687fdb8b6b25b482bc66795a083e0289143a3db2353c8df291ff29304e44689d
 EBUILD test_rosservice-1.13.5.ebuild 679 BLAKE2B 3b7b23facab4bf83bd3194e9cc2b4e46489fb2e80893d3bf8658c339e0395cc86c66c325be2d5e13409ac6e8fee40cddc1787a73f062cc7d2cdca365d6c502fb SHA512 cb072fe9c3cf62c3cf67466e417c04b8658335f2b3ff4f42aeef1d2649df39f6687fdb8b6b25b482bc66795a083e0289143a3db2353c8df291ff29304e44689d
+EBUILD test_rosservice-1.13.6.ebuild 679 BLAKE2B 79475728406b39495d95ea0f5c7b7ee57ee8392f3194bbf98eae6bd491e3d4830c25f1df75ac050724c9c5dd8f3aacad90621775f743390c10ed4366a68b4423 SHA512 d5557ba461241fbf6b04c3238be7df0042a46ced72a014df1a53fcb9dfd4a8cc916f59bfe4717f24449512650b194db976c27e5f618c904fca85238e6d51ca33
 EBUILD test_rosservice-9999.ebuild 679 BLAKE2B d8c7decce6abc14a7e9c0d9b36a40a001c282333d0e50e8caf7c8598b646adb458bce1aadd01a2a97639dac10d2ec7a232f8145c6fb6a904eb83311bbb47afae SHA512 36c5673453deb431ee1e5816af18510e7bfd9d324089e6bf05af963ef4d769ddc2d8d1d04796f849b75a8d0aeb0dc9663fa9747c07ad20c68934e258e0d273cc
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosservice/test_rosservice-1.13.6.ebuild b/dev-ros/test_rosservice/test_rosservice-1.13.6.ebuild
new file mode 100644
index 000000000000..e129fbdc99eb
--- /dev/null
+++ b/dev-ros/test_rosservice/test_rosservice-1.13.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rospy"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	test? (
+		dev-ros/test_rosmaster[${PYTHON_USEDEP}]
+		dev-ros/rospy[${PYTHON_USEDEP}]
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/topic_tools/Manifest b/dev-ros/topic_tools/Manifest
index 707c57f53f6a..20caaf410a9a 100644
--- a/dev-ros/topic_tools/Manifest
+++ b/dev-ros/topic_tools/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD topic_tools-1.13.0.ebuild 695 BLAKE2B e7db753be80e10a45afaea27eda9e8d8ef671612792a2ab92f5ae6910c2907f6f7f9ab4a4e66d4d73af09ac522a394e78ed97bb825879bfb6878612250060db6 SHA512 9d720cd48cf826527f5cb8ee0d7ec0c46b52612c6880ab0d61474412185a34461fdbad8ec3879fa48168ca9d411df151aa08779627606f1bf17e3ddb7e38f17e
 EBUILD topic_tools-1.13.1.ebuild 695 BLAKE2B e7db753be80e10a45afaea27eda9e8d8ef671612792a2ab92f5ae6910c2907f6f7f9ab4a4e66d4d73af09ac522a394e78ed97bb825879bfb6878612250060db6 SHA512 9d720cd48cf826527f5cb8ee0d7ec0c46b52612c6880ab0d61474412185a34461fdbad8ec3879fa48168ca9d411df151aa08779627606f1bf17e3ddb7e38f17e
 EBUILD topic_tools-1.13.2.ebuild 695 BLAKE2B e7db753be80e10a45afaea27eda9e8d8ef671612792a2ab92f5ae6910c2907f6f7f9ab4a4e66d4d73af09ac522a394e78ed97bb825879bfb6878612250060db6 SHA512 9d720cd48cf826527f5cb8ee0d7ec0c46b52612c6880ab0d61474412185a34461fdbad8ec3879fa48168ca9d411df151aa08779627606f1bf17e3ddb7e38f17e
 EBUILD topic_tools-1.13.4.ebuild 695 BLAKE2B e7db753be80e10a45afaea27eda9e8d8ef671612792a2ab92f5ae6910c2907f6f7f9ab4a4e66d4d73af09ac522a394e78ed97bb825879bfb6878612250060db6 SHA512 9d720cd48cf826527f5cb8ee0d7ec0c46b52612c6880ab0d61474412185a34461fdbad8ec3879fa48168ca9d411df151aa08779627606f1bf17e3ddb7e38f17e
 EBUILD topic_tools-1.13.5.ebuild 695 BLAKE2B e7db753be80e10a45afaea27eda9e8d8ef671612792a2ab92f5ae6910c2907f6f7f9ab4a4e66d4d73af09ac522a394e78ed97bb825879bfb6878612250060db6 SHA512 9d720cd48cf826527f5cb8ee0d7ec0c46b52612c6880ab0d61474412185a34461fdbad8ec3879fa48168ca9d411df151aa08779627606f1bf17e3ddb7e38f17e
+EBUILD topic_tools-1.13.6.ebuild 695 BLAKE2B efb0405deee55dc5f573debd35e7f6e03f6bd0e1e89c022d64e108d6f790f1c7ce6271b027557ed0dc2d36b48d4958320d1d4f9cbeb5d51b6c038e9aec2c4271 SHA512 5efbd84f924cded65cce7323e67a1246b0564c7e903913a437cbdcd3632683338083f1e01d8689f0e2b0af6444eb0cca8f6274487917b6c0fd2a7b238e046fba
 EBUILD topic_tools-9999.ebuild 695 BLAKE2B 63c6c776011923217856c1392fb0d292d0bb44bebd000c7fa6530371a237aefda1a18c07bd78d9352d0f4dc7608a1c9dd335710cc6860485678dd2da4fa621df SHA512 918f548657eeab6f571e371dde921b0cdc374890b3f4a80b9eb51ece52e3404ce750a9447d1139e15a60409054f8f3e6d829f75ad538e6c80ffa8617eaca646a
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/message_filters/message_filters-1.13.1.ebuild b/dev-ros/topic_tools/topic_tools-1.13.6.ebuild
index fcb4bda239a5..227b9521dac4 100644
--- a/dev-ros/message_filters/message_filters-1.13.1.ebuild
+++ b/dev-ros/topic_tools/topic_tools-1.13.6.ebuild
@@ -1,28 +1,29 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Set of message filters which take in messages and may output those messages at a later time"
+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-libs/boost:=[threads]
-	dev-ros/genpy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
+"
 DEPEND="${RDEPEND}
 	test? (
 		dev-ros/rostest[${PYTHON_USEDEP}]
@@ -30,4 +31,3 @@ DEPEND="${RDEPEND}
 		dev-cpp/gtest
 		dev-python/nose[${PYTHON_USEDEP}]
 	)"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/xmlrpcpp/Manifest b/dev-ros/xmlrpcpp/Manifest
index fbfba13dff25..87501df4c3d3 100644
--- a/dev-ros/xmlrpcpp/Manifest
+++ b/dev-ros/xmlrpcpp/Manifest
@@ -3,10 +3,12 @@ DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1ac
 DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
 DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
+DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 EBUILD xmlrpcpp-1.13.0.ebuild 372 BLAKE2B a665b463f43367c765319e4a86d0027fabecb2ec7672f3fce55a3b593f875171eeef769bfbc70d3cfb701c035895ee1819b2b922b2e29c083085e43e491b2d2c SHA512 cd4b48ddd4741f7112ecc47ee4e6907ce1d7e67ab4d580b876f95229b325ce2fbbb466d764155cda81d99c9f22f05f2d0524a5ccf7c930a5cb57f0e8bf0b0791
 EBUILD xmlrpcpp-1.13.1.ebuild 372 BLAKE2B a665b463f43367c765319e4a86d0027fabecb2ec7672f3fce55a3b593f875171eeef769bfbc70d3cfb701c035895ee1819b2b922b2e29c083085e43e491b2d2c SHA512 cd4b48ddd4741f7112ecc47ee4e6907ce1d7e67ab4d580b876f95229b325ce2fbbb466d764155cda81d99c9f22f05f2d0524a5ccf7c930a5cb57f0e8bf0b0791
 EBUILD xmlrpcpp-1.13.2.ebuild 372 BLAKE2B a665b463f43367c765319e4a86d0027fabecb2ec7672f3fce55a3b593f875171eeef769bfbc70d3cfb701c035895ee1819b2b922b2e29c083085e43e491b2d2c SHA512 cd4b48ddd4741f7112ecc47ee4e6907ce1d7e67ab4d580b876f95229b325ce2fbbb466d764155cda81d99c9f22f05f2d0524a5ccf7c930a5cb57f0e8bf0b0791
 EBUILD xmlrpcpp-1.13.4.ebuild 372 BLAKE2B a665b463f43367c765319e4a86d0027fabecb2ec7672f3fce55a3b593f875171eeef769bfbc70d3cfb701c035895ee1819b2b922b2e29c083085e43e491b2d2c SHA512 cd4b48ddd4741f7112ecc47ee4e6907ce1d7e67ab4d580b876f95229b325ce2fbbb466d764155cda81d99c9f22f05f2d0524a5ccf7c930a5cb57f0e8bf0b0791
 EBUILD xmlrpcpp-1.13.5.ebuild 372 BLAKE2B a665b463f43367c765319e4a86d0027fabecb2ec7672f3fce55a3b593f875171eeef769bfbc70d3cfb701c035895ee1819b2b922b2e29c083085e43e491b2d2c SHA512 cd4b48ddd4741f7112ecc47ee4e6907ce1d7e67ab4d580b876f95229b325ce2fbbb466d764155cda81d99c9f22f05f2d0524a5ccf7c930a5cb57f0e8bf0b0791
+EBUILD xmlrpcpp-1.13.6.ebuild 372 BLAKE2B 8caf0ab6a8639e6dacde87df3fd5e236e43c27d0f419775f6689613d772b08d1019e23b62dd6580a09d22097c418b359462a507684163b7878b2e4d058c417ef SHA512 6509ebcf6deee98bbdaf1b82a95a137801c8dffe9e8fffed70533b78ee19941544432d770089130707747d93fd955fb035440354bf30938081afe9a97c53002c
 EBUILD xmlrpcpp-9999.ebuild 372 BLAKE2B a665b463f43367c765319e4a86d0027fabecb2ec7672f3fce55a3b593f875171eeef769bfbc70d3cfb701c035895ee1819b2b922b2e29c083085e43e491b2d2c SHA512 cd4b48ddd4741f7112ecc47ee4e6907ce1d7e67ab4d580b876f95229b325ce2fbbb466d764155cda81d99c9f22f05f2d0524a5ccf7c930a5cb57f0e8bf0b0791
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.13.6.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.13.6.ebuild
new file mode 100644
index 000000000000..e20aad21511f
--- /dev/null
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.13.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of the XML-RPC protocol"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/cpp_common"
+DEPEND="${RDEPEND}"
author	V3n3RiX <venerix@redcorelinux.org>	2018-02-11 16:09:52 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-02-11 16:09:52 +0000
commit	f78108598211053d41752a83e0345441bb9014ae (patch)
tree	dd2fc7ae0a1aea7bda4942ab0c453d1e55284b37 /dev-ros
parent	dc45b83b28fb83e9659492066e347b8dc60bc9e3 (diff)