gentoo resync : 14.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-14 01:05:40 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-14 01:05:40 +0100
commit: 76cba73c47c8694e74377004634daca18f2d9c08 (patch)
tree: 468603ebdc189bcfae77696162761b3be936baea /dev-ros
parent: 6957f5c65b02bba533954eabc0b62f5de36be206 (diff)
67 files changed, 202 insertions, 1213 deletions
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 18c5669a6e31..3025a1388773 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/bondcpp/Manifest b/dev-ros/bondcpp/Manifest
index fb90379c2f5f..4aa9476ead34 100644
--- a/dev-ros/bondcpp/Manifest
+++ b/dev-ros/bondcpp/Manifest
@@ -1,14 +1,4 @@
-DIST bond_core-1.7.16.tar.gz 25327 BLAKE2B 1be27c56d656b85da87a59451df82355d80178efbb5a201d9891d59491f6cdf13147ba88a2a1ee8071b167f3f0b60e2e7f93d767bbc53bfa36af712a75d0b751 SHA512 1c35776782edfb7397845fde0ef3fcaac6179f1c55637fd5209303feb1755f13bff85e6cf36a2dd2671c18d5b433cb8e9ede04df923f742e22934b19d044e06e
-DIST bond_core-1.7.17.tar.gz 31334 BLAKE2B 1b807b321231647d6d88de17bd76e00121a18749b52ccd091902761c792453be85aa342231fb7e25a8a5ff9ea23530449bc58a20c6d2522d7afe231a94b5e994 SHA512 248146e6704c36f014e0f4c5178e566b6c4e344f46b39d4ac9a6cf6b152d1c163b5881921168b8898ec44da9d9b5bc69dc3a66ae26be61007c109aed1990ee73
-DIST bond_core-1.7.18.tar.gz 31402 BLAKE2B 7c87354c1e92f5be29e751029d229859658d1841830b0d66d3a635f7073e7da86e26554e99d3d2dc00ea5586313350d0c094114ca2fab492aae7e4844e2bbbfd SHA512 d943ea3ad4de6cbf8f703161a511d235229369ec593ff6532180cf7a0114ba51d20b736491d4c4415b642c1994901ba51983580cd02aa69d64c4e0a318e00a75
-DIST bond_core-1.7.19.tar.gz 31455 BLAKE2B 86b21d44624c0be8c9445b53d46541785d47fe36366e1d25305a689faa99577905730cd313b7789302ebc6677f85c361d8c51a523233ade11bd6b493ee986dd2 SHA512 63584fa465dba48def1c049e713b0438ea6dd15bd968ee5a1ef969e21540d2693eb61bffb40134dd28486c83c6e54d8db9c71af8f2949bd38a3f7c63be5b65fb
-DIST bond_core-1.8.0.tar.gz 32199 BLAKE2B 8b5f308c3ff4ee3cf4d969ffa7cc05433ab0b992865a782b9c63d8b27615a158fe1885302703aa357f486ea4409e9e07aa3b43bbef6d41fbd127a8bc2c7252cc SHA512 5519d5366d94403862f34ff16e06ead099a164e43987a113c5ec3d62a8d32430b81fc3bee557513dac05ce6bdb39e6bc3c1a3477573de74610217ea92d373526
 DIST bond_core-1.8.1.tar.gz 32283 BLAKE2B d9d99891507106bff4f4ef7beb80ef878c9ddbbbcb073ea5bbeba11c0d21a7f94dc12a9fc3daea26c4f7585c991bb6283244af8852cee47162185136e0a2d694 SHA512 767d47d7d69bf2a1e6ce5d403f1e0f248c9414998a077f9a0815976975c6ed071eb0338543b9947285b30f5135e410fc273ad4243e5478819286a96e94f4584c
-EBUILD bondcpp-1.7.16.ebuild 499 BLAKE2B 70db2bbe5f4ea61522b71a280055fd02c889a35667e0efb7b7f1bfa0efb1ab95d0eb1631f30c015633e51705a8a89ece8383de61e89e02525f77cc550af5c0f2 SHA512 dd1e2a492d51050f1254a47328865904db06a21c23d0ad30f0a1b6f64885fcd7137c898c184ececda9f9af84e0a4aaaa51b4b28425ee2679fd4c6e387eeeccbc
-EBUILD bondcpp-1.7.17.ebuild 499 BLAKE2B 70db2bbe5f4ea61522b71a280055fd02c889a35667e0efb7b7f1bfa0efb1ab95d0eb1631f30c015633e51705a8a89ece8383de61e89e02525f77cc550af5c0f2 SHA512 dd1e2a492d51050f1254a47328865904db06a21c23d0ad30f0a1b6f64885fcd7137c898c184ececda9f9af84e0a4aaaa51b4b28425ee2679fd4c6e387eeeccbc
-EBUILD bondcpp-1.7.18.ebuild 499 BLAKE2B 0c5790868d4f7d6512660c24c40ae9acb5c85c31b25020dd0002f532578ece8e315e5ae45517354c00b197f4ebc098b418a63ef30bd3980e93ed2b6c13f43554 SHA512 5b53409455048ec162773025699da5ab5d94d5bc16a4a2d59da71b59be0e8d63e147a9cadcf83850e85f7e3d11eb60db86632ff2cd047bb16844be30ed96516c
-EBUILD bondcpp-1.7.19.ebuild 499 BLAKE2B 6e0849546e2c81a65d3d6ef41fd6734e63cee961a75e9222ebc1b861ad5df278b9a175efe3e87fdacffdd8d1a1a0650744629a691e1d93d70ddc54cc87c5aa16 SHA512 80e534a432daade57400ec5cf6165436c1a28c6e75b28141e2c208a2cdc415e8b8db8377328ba0d813bfa0fa2ccc0e5482024769b98012188b7e9362ee1f9557
-EBUILD bondcpp-1.8.0.ebuild 499 BLAKE2B 6e0849546e2c81a65d3d6ef41fd6734e63cee961a75e9222ebc1b861ad5df278b9a175efe3e87fdacffdd8d1a1a0650744629a691e1d93d70ddc54cc87c5aa16 SHA512 80e534a432daade57400ec5cf6165436c1a28c6e75b28141e2c208a2cdc415e8b8db8377328ba0d813bfa0fa2ccc0e5482024769b98012188b7e9362ee1f9557
-EBUILD bondcpp-1.8.1.ebuild 499 BLAKE2B 6e0849546e2c81a65d3d6ef41fd6734e63cee961a75e9222ebc1b861ad5df278b9a175efe3e87fdacffdd8d1a1a0650744629a691e1d93d70ddc54cc87c5aa16 SHA512 80e534a432daade57400ec5cf6165436c1a28c6e75b28141e2c208a2cdc415e8b8db8377328ba0d813bfa0fa2ccc0e5482024769b98012188b7e9362ee1f9557
-EBUILD bondcpp-9999.ebuild 499 BLAKE2B 70db2bbe5f4ea61522b71a280055fd02c889a35667e0efb7b7f1bfa0efb1ab95d0eb1631f30c015633e51705a8a89ece8383de61e89e02525f77cc550af5c0f2 SHA512 dd1e2a492d51050f1254a47328865904db06a21c23d0ad30f0a1b6f64885fcd7137c898c184ececda9f9af84e0a4aaaa51b4b28425ee2679fd4c6e387eeeccbc
+EBUILD bondcpp-1.8.1.ebuild 508 BLAKE2B 80a4608118ea91ecd6905a5df869641fb1fdce1a1188274dc152fe6174c05f663646c06ec27c69989de964aefeaf7f7fdd4a1de26424d9305186da5e4557aeec SHA512 83938bf6269b87f32651e3c095e906d45ac3d42de4d117a4c037af30fc8644ae1439fbb417a4743fedc02e83e04a6b45a1b4a453f247dc7f3a1f08baab2ebe60
+EBUILD bondcpp-9999.ebuild 508 BLAKE2B 80a4608118ea91ecd6905a5df869641fb1fdce1a1188274dc152fe6174c05f663646c06ec27c69989de964aefeaf7f7fdd4a1de26424d9305186da5e4557aeec SHA512 83938bf6269b87f32651e3c095e906d45ac3d42de4d117a4c037af30fc8644ae1439fbb417a4743fedc02e83e04a6b45a1b4a453f247dc7f3a1f08baab2ebe60
 MISC metadata.xml 327 BLAKE2B e092eb0166dfaa1b0621bf8b428daa6d4d3ad9c5508865753ac6b8a7154c060d4328b695addd27d82aa2fe6dbfd2c3b9b1bfff3ae8f15d4f4a72e06952b1de15 SHA512 08675ab2448c90d64ccdc426a04ba319caa4be4291b8f5ede6b077ccecbf14aee898975525d12c9d0c97597b4d91be36e9ddfad18c5a5e4b072a58c0833828d3
diff --git a/dev-ros/bondcpp/bondcpp-1.7.16.ebuild b/dev-ros/bondcpp/bondcpp-1.7.16.ebuild
deleted file mode 100644
index 92bf5569a27e..000000000000
--- a/dev-ros/bondcpp/bondcpp-1.7.16.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bond
-	dev-ros/cmake_modules
-	dev-ros/roscpp
-	dev-ros/smclib
-	dev-libs/boost:=
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondcpp/bondcpp-1.7.17.ebuild b/dev-ros/bondcpp/bondcpp-1.7.17.ebuild
deleted file mode 100644
index 92bf5569a27e..000000000000
--- a/dev-ros/bondcpp/bondcpp-1.7.17.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bond
-	dev-ros/cmake_modules
-	dev-ros/roscpp
-	dev-ros/smclib
-	dev-libs/boost:=
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondcpp/bondcpp-1.7.18.ebuild b/dev-ros/bondcpp/bondcpp-1.7.18.ebuild
deleted file mode 100644
index 3374ec4177ee..000000000000
--- a/dev-ros/bondcpp/bondcpp-1.7.18.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bond
-	dev-ros/cmake_modules
-	dev-ros/roscpp
-	dev-ros/smclib
-	dev-libs/boost:=
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondcpp/bondcpp-1.7.19.ebuild b/dev-ros/bondcpp/bondcpp-1.7.19.ebuild
deleted file mode 100644
index 123e756ecdab..000000000000
--- a/dev-ros/bondcpp/bondcpp-1.7.19.ebuild
+++ /dev/null
@@ -1,24 +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/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bond
-	dev-ros/cmake_modules
-	dev-ros/roscpp
-	dev-ros/smclib
-	dev-libs/boost:=
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondcpp/bondcpp-1.8.0.ebuild b/dev-ros/bondcpp/bondcpp-1.8.0.ebuild
deleted file mode 100644
index 123e756ecdab..000000000000
--- a/dev-ros/bondcpp/bondcpp-1.8.0.ebuild
+++ /dev/null
@@ -1,24 +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/bond_core"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of bond, a mechanism for checking when another process has terminated"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/bond
-	dev-ros/cmake_modules
-	dev-ros/roscpp
-	dev-ros/smclib
-	dev-libs/boost:=
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/bondcpp/bondcpp-1.8.1.ebuild b/dev-ros/bondcpp/bondcpp-1.8.1.ebuild
index 123e756ecdab..5516dd68b9ff 100644
--- a/dev-ros/bondcpp/bondcpp-1.8.1.ebuild
+++ b/dev-ros/bondcpp/bondcpp-1.8.1.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
@@ -16,7 +16,7 @@ IUSE=""
 RDEPEND="
 	dev-ros/bond
 	dev-ros/cmake_modules
-	dev-ros/roscpp
+	>=dev-ros/roscpp-1.13.6
 	dev-ros/smclib
 	dev-libs/boost:=
 	sys-apps/util-linux
diff --git a/dev-ros/bondcpp/bondcpp-9999.ebuild b/dev-ros/bondcpp/bondcpp-9999.ebuild
index 92bf5569a27e..5516dd68b9ff 100644
--- a/dev-ros/bondcpp/bondcpp-9999.ebuild
+++ b/dev-ros/bondcpp/bondcpp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ IUSE=""
 RDEPEND="
 	dev-ros/bond
 	dev-ros/cmake_modules
-	dev-ros/roscpp
+	>=dev-ros/roscpp-1.13.6
 	dev-ros/smclib
 	dev-libs/boost:=
 	sys-apps/util-linux
diff --git a/dev-ros/camera_calibration_parsers/Manifest b/dev-ros/camera_calibration_parsers/Manifest
index 058ed9976d0b..42a74cb7af64 100644
--- a/dev-ros/camera_calibration_parsers/Manifest
+++ b/dev-ros/camera_calibration_parsers/Manifest
@@ -1,5 +1,5 @@
 AUX boostpython.patch 848 BLAKE2B f9ca2e26e51f882735544245b0964d08c272643d7c786308d2ad5d1598d383e728c03bf7b609ca22cc7f24d365c00b5f802db138459e1af8d4b597d963e92358 SHA512 8fbb168908d3c0cc5f0b8fbe8e9f82970254a136284062c4daf27d9553fa04385e1bcae9b1da2943b37bf1d047faa262eca08409d5d364260fd529b59e44325d
 DIST image_common-1.11.13.tar.gz 54731 BLAKE2B 24c05d7da79ec4edc1713eb86efe9d570b8a9d55def1b0cdf7959275c4a0692af28d48d37d73361f3972c0f4ded5332ee02b535f1841473007eb8e61287b7826 SHA512 154a1acfc3ee1be83828f7b86de8a5e02d7613d724f734409c5b93b1505bcf911b95f20fe43435932f49e03e286ed7055e2b7abeb1c5292f540a2299dd424bfa
-EBUILD camera_calibration_parsers-1.11.13-r1.ebuild 686 BLAKE2B 8676d4dda9e77b3954573e1ecaf49549b40aa8976f1c9781ceefd1dd187d72537db928e960b445c8556eefbc106249c676b3716e1176dbd5ed908e057c73ef35 SHA512 ba2c7ee4b8857b92c5f5045d8c2bbac8efa6936efbba77f874d65453156753c68c71fe22c7be79126006c73d184a50a6dea7937106d38a1b508a0dc8650e7ac2
-EBUILD camera_calibration_parsers-9999.ebuild 686 BLAKE2B 8676d4dda9e77b3954573e1ecaf49549b40aa8976f1c9781ceefd1dd187d72537db928e960b445c8556eefbc106249c676b3716e1176dbd5ed908e057c73ef35 SHA512 ba2c7ee4b8857b92c5f5045d8c2bbac8efa6936efbba77f874d65453156753c68c71fe22c7be79126006c73d184a50a6dea7937106d38a1b508a0dc8650e7ac2
+EBUILD camera_calibration_parsers-1.11.13-r1.ebuild 732 BLAKE2B 7ccc34330179cb86d2add73ef0005009fae2692658fe8de0787c65558d2fc8df661425213f44cb09be8b70f41b7bcab5e94dc92671bdab9bf786d6e5d5b2d92e SHA512 556376f977f618a29a4aa5662d60cf3a75e1bb38ff08b8f76f370bb13022b211aedf89a7bb653359bbf5c2460d49d6c22167d83862c241f1f509e975ccd75c81
+EBUILD camera_calibration_parsers-9999.ebuild 732 BLAKE2B 7ccc34330179cb86d2add73ef0005009fae2692658fe8de0787c65558d2fc8df661425213f44cb09be8b70f41b7bcab5e94dc92671bdab9bf786d6e5d5b2d92e SHA512 556376f977f618a29a4aa5662d60cf3a75e1bb38ff08b8f76f370bb13022b211aedf89a7bb653359bbf5c2460d49d6c22167d83862c241f1f509e975ccd75c81
 MISC metadata.xml 341 BLAKE2B 73f546b8575b2b9855e3ed642d08ea3a9eb37be2e5b1b33b797ec4df9ad248d82681d857794fec592081101c0e285b8a9d2bfa1343ceed1ae336c2960c471eb5 SHA512 a7d57b99968b03ed5fbad1030f9dfde65d31c3b33fd3203c9bfd004f331e35b6f576f9dde7e3694360204d27c02fe95879743191cb8d96d491827708a61b1e69
diff --git a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.13-r1.ebuild b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.13-r1.ebuild
index 5b75e5e3a185..eff2ef2f3644 100644
--- a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.13-r1.ebuild
+++ b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.13-r1.ebuild
@@ -19,6 +19,8 @@ RDEPEND="
 	dev-libs/boost:=[python,${PYTHON_USEDEP}]
 	dev-ros/rosconsole
 	>=dev-cpp/yaml-cpp-0.5:=
+	dev-ros/roscpp
+	dev-ros/roscpp_serialization
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild
index 5b75e5e3a185..eff2ef2f3644 100644
--- a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild
+++ b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild
@@ -19,6 +19,8 @@ RDEPEND="
 	dev-libs/boost:=[python,${PYTHON_USEDEP}]
 	dev-ros/rosconsole
 	>=dev-cpp/yaml-cpp-0.5:=
+	dev-ros/roscpp
+	dev-ros/roscpp_serialization
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/dev-ros/geometric_shapes/Manifest b/dev-ros/geometric_shapes/Manifest
index afbd06f395b8..edd90106b06f 100644
--- a/dev-ros/geometric_shapes/Manifest
+++ b/dev-ros/geometric_shapes/Manifest
@@ -1,5 +1,7 @@
 AUX logging.patch 8504 BLAKE2B 5d1efc6613a64084c3d927b7e9e026e063de21b3e211c7f12fa26f6bc882390de47bfe7a4491f6096dd73ed73c84c2e1d4f08da9b9083351c45d910b709f02e2 SHA512 747925609a4e029344c1ba0e50fb50caf637720824aa0d086d853f9c0f5ab2ca03c98d9f1b9d79240d5b3536637ac8d604607d63613c028d1e91df6247796b4e
 DIST geometric_shapes-0.5.3.tar.gz 60799 BLAKE2B 77bfde8f7b1f3e11bd4bb12c82374e34ca0efc0f75125a1c5a58d4ce797feb70b70803526f4b8cbdf651d762082a4bbcb03df5e6ace2bdc69ed84be20a963731 SHA512 13c1b85cab4d0d5d35bd010927a5fd789312b4c11667ee73295722067968504054a8f24628db2f78782078ff3cbcd6878bd403979c29526b2183c3ae2414b2b1
+DIST geometric_shapes-0.5.4.tar.gz 62028 BLAKE2B 6873019c54872077ec88ad6107bdf1a69092d73bd1f73b38dbbdcd88a3e5da9cfffd0782ec2e01f87fd90082ed856e3a2f5161dec606ba08c0510752a813359c SHA512 bd0909fb0feeddebf65793aa77a6803217e39e782767cd2d58b26266ff79018ebb352c77385e20043a069caaa7e00ba63366a703d52605562e8535f1d3af2dac
 EBUILD geometric_shapes-0.5.3-r1.ebuild 743 BLAKE2B c1309d2ab2ae4dad4902ccfba8ed097c644918f5be10cd45a4ab1f5a218a73790ff6688176798f447a284a218120b4368fa1228f36f0d54872a8df921a9d2f81 SHA512 4bb3d115087ec084608da1a5c00e4023e9c91058d547406ed04b5c5a232cb52ef803edf73b07687209e033589a25bd37e0bc9193753064fcea36d0d44a0d5571
-EBUILD geometric_shapes-9999.ebuild 743 BLAKE2B c1309d2ab2ae4dad4902ccfba8ed097c644918f5be10cd45a4ab1f5a218a73790ff6688176798f447a284a218120b4368fa1228f36f0d54872a8df921a9d2f81 SHA512 4bb3d115087ec084608da1a5c00e4023e9c91058d547406ed04b5c5a232cb52ef803edf73b07687209e033589a25bd37e0bc9193753064fcea36d0d44a0d5571
+EBUILD geometric_shapes-0.5.4.ebuild 703 BLAKE2B 773af22ffa1bfe37adcb79a490281fe481f4eb172233f9c4c2fef4ae99774c0c378fe52bfcb3b35dfe6bb2806924aa04982fe0eefbfcc475186c7fab15ada91d SHA512 ebe158b437daa4a89ae21d663c6052d561cf76c04b4fc20a342a6a0ffdcbcab861781edd358dcfa98a0a4e0aa5d47dd9bebdbd45234f056bd939503ac730f77a
+EBUILD geometric_shapes-9999.ebuild 703 BLAKE2B 773af22ffa1bfe37adcb79a490281fe481f4eb172233f9c4c2fef4ae99774c0c378fe52bfcb3b35dfe6bb2806924aa04982fe0eefbfcc475186c7fab15ada91d SHA512 ebe158b437daa4a89ae21d663c6052d561cf76c04b4fc20a342a6a0ffdcbcab861781edd358dcfa98a0a4e0aa5d47dd9bebdbd45234f056bd939503ac730f77a
 MISC metadata.xml 343 BLAKE2B 583ed67450346fcbca09f5714c29d20e728f827c1448ce275683f600b6f87d3f00337dfbf39b694906787b5db9dfc878a316121eb7922494ce631b9a8b9b3e2c SHA512 10c40ddc16c176ed5503b7d098bc133e85973301631878b36f793df95fe2c55576cacaaf2cbfcc9152cb0659394d7ab7c5fca72cbdba32c5310b4a2ce7b365c8
diff --git a/dev-ros/geometric_shapes/geometric_shapes-0.5.4.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.5.4.ebuild
new file mode 100644
index 000000000000..80708cfa63ea
--- /dev/null
+++ b/dev-ros/geometric_shapes/geometric_shapes-0.5.4.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-planning/geometric_shapes"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Generic definitions of geometric shapes and bodies"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	media-libs/qhull
+	media-libs/assimp
+	sci-libs/octomap
+	dev-ros/random_numbers
+	dev-ros/resource_retriever
+	dev-ros/eigen_stl_containers
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest dev-ros/rosunit )
+"
diff --git a/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild b/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild
index 54b4e296f9f0..80708cfa63ea 100644
--- a/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild
+++ b/dev-ros/geometric_shapes/geometric_shapes-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
@@ -28,4 +28,3 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest dev-ros/rosunit )
 "
-PATCHES=( "${FILESDIR}/logging.patch" )
diff --git a/dev-ros/imu_filter_madgwick/Manifest b/dev-ros/imu_filter_madgwick/Manifest
index 9580e547818d..015c900f0e06 100644
--- a/dev-ros/imu_filter_madgwick/Manifest
+++ b/dev-ros/imu_filter_madgwick/Manifest
@@ -1,4 +1,5 @@
+AUX pluginlib.patch 498 BLAKE2B 923d0288c75d969156cc5825c624e041821492c0d767873685ca8d479759cc1ded1d30cb22091b45066a8ea57fb2abcccc5acd852bc0f778a203b99760e466f1 SHA512 59e3d0c7e9c7b1dde87e430cee2084afa2c3e443277322c2c21abfe9619392d88d321b90198f03b5e90f8e3d4eb184611c0839ffdb93ca275d6e20db08e4acf5
 DIST imu_tools-1.1.5.tar.gz 1653083 BLAKE2B 8c0e84333455a5b4cae215a2e54b74ff828d00a426b9ab13f4048a72556b6a526dc4256a53dc3e21e098cc31ea6d21e0d508066a4627d01c27681ce0b3b18035 SHA512 5009884852c71d6bb1b6c2be2f30ed333eca2ac6a7f29d02cb8f0821c0b95a33dd3b09049c4c4eeb1416fb0eb5dc454b3c6d36c2c24303f37c0d1d2c0c2d906a
-EBUILD imu_filter_madgwick-1.1.5-r1.ebuild 755 BLAKE2B dea2ac8e4c97538fddf1d11eb038196677a469352bca4b9a994ff6d4aa05e5471e036ae93e7c303340c1a5f412b49246d193c4804667f9a6e6a5427909a28991 SHA512 fca79c2a9a0308ed99c5c2acde0a66285dfd08ba60cdc974df9a0dfac864ee6999902b321fb6b21de1989358527e578e778b181fb41868c38c4b6f83244bc2e5
+EBUILD imu_filter_madgwick-1.1.5-r1.ebuild 797 BLAKE2B c561d840818d5aee7e61a14c076b402c83ab97ec0d6b9f671129723cc4e86f57e953e9ccbbeba362291cbf1b1561990515dcb7f1768813d0f29739117352ee14 SHA512 ab75f6871c652b1852abb67a6f633faf6048782e0924d00ae48ea2bcc6c116c13b1a6dc6cd2aed51ff554b83a9332c933d94b1a0b46e06638dc9bef46d4dfda8
 EBUILD imu_filter_madgwick-9999.ebuild 755 BLAKE2B dea2ac8e4c97538fddf1d11eb038196677a469352bca4b9a994ff6d4aa05e5471e036ae93e7c303340c1a5f412b49246d193c4804667f9a6e6a5427909a28991 SHA512 fca79c2a9a0308ed99c5c2acde0a66285dfd08ba60cdc974df9a0dfac864ee6999902b321fb6b21de1989358527e578e778b181fb41868c38c4b6f83244bc2e5
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/imu_filter_madgwick/files/pluginlib.patch b/dev-ros/imu_filter_madgwick/files/pluginlib.patch
new file mode 100644
index 000000000000..26e77bb3ffcf
--- /dev/null
+++ b/dev-ros/imu_filter_madgwick/files/pluginlib.patch
@@ -0,0 +1,10 @@
+Index: imu_filter_madgwick/src/imu_filter_nodelet.cpp
+===================================================================
+--- imu_filter_madgwick.orig/src/imu_filter_nodelet.cpp
++++ imu_filter_madgwick/src/imu_filter_nodelet.cpp
+@@ -36,4 +36,4 @@ void ImuFilterNodelet::onInit()
+   filter_.reset(new ImuFilterRos(nh, nh_private));
+ }
+ 
+-PLUGINLIB_DECLARE_CLASS(imu_filter_madgwick, ImuFilterNodelet, ImuFilterNodelet, nodelet::Nodelet);
++PLUGINLIB_EXPORT_CLASS(ImuFilterNodelet, nodelet::Nodelet);
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.1.5-r1.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.1.5-r1.ebuild
index d66fb87d71cd..8d3eedf16d3f 100644
--- a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.1.5-r1.ebuild
+++ b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.1.5-r1.ebuild
@@ -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
@@ -31,3 +31,4 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rosunit )
 "
+PATCHES=( "${FILESDIR}/pluginlib.patch" )
diff --git a/dev-ros/joint_state_publisher/Manifest b/dev-ros/joint_state_publisher/Manifest
index 116b464df29b..1a3e27cb6568 100644
--- a/dev-ros/joint_state_publisher/Manifest
+++ b/dev-ros/joint_state_publisher/Manifest
@@ -1,12 +1,6 @@
-DIST robot_model-1.12.10.tar.gz 277362 BLAKE2B 48c81b3ed4e8b1d9d94f487fd750f9b1ecb6b555c162d0ee8a90f464589bf30a4c37d80d169f13ec3029715ddd910b3f1bd2bcb5f879d3ee39e44ece35ca3f63 SHA512 cf81bbb63472804f6302d009785b36230e19e17472666332a2b6de40f4365b736c77d766540a471c42f9f98d8ba8b68753c3aadb7e052838fcdb5b4ac6595984
+DIST joint_state_publisher-1.12.13.tar.gz 20658 BLAKE2B 8f0d4b1bbe5e381cb20476461a132510e0eed0cde6564557bbcf4d3c07f9036b55fb1b8ea26ef55e0085dfd2f32705d6d4d25b35c915e349c62da17e755b65c1 SHA512 012e2c4b522c9314169323066e3975d72597783a587192a176cc7f7c4b0d59a1dfd3724a57c80d6d6a628640130d235fb9fc8620f0abcd8ef81776689d05e8f1
 DIST robot_model-1.12.11.tar.gz 277822 BLAKE2B 3bdd2b931ddfd062594ccb2be4ce6d4863a5fa66f538c3ee48c3600b3be249d267f9d03aa9a701bc6ab22c4297d659a24da668fedcd25c75fe128c43cc781be0 SHA512 8dea6fc72e9beaddbf9a82cb177561cb89c69ef8f58f0c4882598f6cc33a0e10564d9696f07b6f4e3e3404d3f1f5236e54eea4b8d249be0a216cd3ce12a03cde
-DIST robot_model-1.12.7.tar.gz 1296028 BLAKE2B a1952910b9d97f96171a3965ad3fb2785662ec787e467338c7495b0eeecf6f58e9019781ad34dda087dd83c05d61ded4b92eb3ef6fa331c8c04974f26a4ff4fd SHA512 bc1901473f890b7200ef67db891ca9269c867ee1cf67a316948587d27549c6d58ce8c0b4a0d9255a5419a235ead3b19065b135486188efc21cbb6594d1863291
-DIST robot_model-1.12.8.tar.gz 1297591 BLAKE2B ae2bfdc428a273befe6bf68d7d970ef37a2b4f816150ec74767187f65bf8cb3eff9b27c90ae279c891e6e16272afb2e0d46aa4c7ef8abadac93858d73737389a SHA512 77770e3ce1fe7c143c15581fa262dc01ccc04dd9313d022b9f0f254451db80415b558f339063debc5712590f846690d957848ba977f2175d2a4cda72b2102914
-DIST robot_model-1.12.9.tar.gz 1298115 BLAKE2B 4f17a06dd6afa574cac3a34cc286d66c0ae63328d509c6c3a89baad07c0eeaf83d7e66679f7a8910772c6bc86cc3b92e1c5fa855d6903c0f41eab58801d13f22 SHA512 fe1da6fd290af012d53cd2875cdfa5e746bfb964a6cf4ca91786218b33603858d478f49a8e18c9581ba52d9e1d68409f919ec19997de7549b3fb2bc4a3686121
-EBUILD joint_state_publisher-1.12.10.ebuild 532 BLAKE2B a37038eb7f2a6d9a3ac4ea08518b6290d08c0248f470c6884dcf87e4fa3b0c5d1f15d0ca614a3b9436dd15bc397a3f56f7eb3c9ecd5f99e2d8ab0abca9ae64ad SHA512 b0126544edc2e736160a1e1967fb587c48aab8341fbb0fde41aa2adccafb123b19816b6d7d42bc60058835326f6a77677df481daf5328f655516971549357df1
 EBUILD joint_state_publisher-1.12.11.ebuild 532 BLAKE2B a37038eb7f2a6d9a3ac4ea08518b6290d08c0248f470c6884dcf87e4fa3b0c5d1f15d0ca614a3b9436dd15bc397a3f56f7eb3c9ecd5f99e2d8ab0abca9ae64ad SHA512 b0126544edc2e736160a1e1967fb587c48aab8341fbb0fde41aa2adccafb123b19816b6d7d42bc60058835326f6a77677df481daf5328f655516971549357df1
-EBUILD joint_state_publisher-1.12.7.ebuild 532 BLAKE2B a37038eb7f2a6d9a3ac4ea08518b6290d08c0248f470c6884dcf87e4fa3b0c5d1f15d0ca614a3b9436dd15bc397a3f56f7eb3c9ecd5f99e2d8ab0abca9ae64ad SHA512 b0126544edc2e736160a1e1967fb587c48aab8341fbb0fde41aa2adccafb123b19816b6d7d42bc60058835326f6a77677df481daf5328f655516971549357df1
-EBUILD joint_state_publisher-1.12.8.ebuild 532 BLAKE2B a37038eb7f2a6d9a3ac4ea08518b6290d08c0248f470c6884dcf87e4fa3b0c5d1f15d0ca614a3b9436dd15bc397a3f56f7eb3c9ecd5f99e2d8ab0abca9ae64ad SHA512 b0126544edc2e736160a1e1967fb587c48aab8341fbb0fde41aa2adccafb123b19816b6d7d42bc60058835326f6a77677df481daf5328f655516971549357df1
-EBUILD joint_state_publisher-1.12.9.ebuild 532 BLAKE2B a37038eb7f2a6d9a3ac4ea08518b6290d08c0248f470c6884dcf87e4fa3b0c5d1f15d0ca614a3b9436dd15bc397a3f56f7eb3c9ecd5f99e2d8ab0abca9ae64ad SHA512 b0126544edc2e736160a1e1967fb587c48aab8341fbb0fde41aa2adccafb123b19816b6d7d42bc60058835326f6a77677df481daf5328f655516971549357df1
-EBUILD joint_state_publisher-9999.ebuild 532 BLAKE2B a37038eb7f2a6d9a3ac4ea08518b6290d08c0248f470c6884dcf87e4fa3b0c5d1f15d0ca614a3b9436dd15bc397a3f56f7eb3c9ecd5f99e2d8ab0abca9ae64ad SHA512 b0126544edc2e736160a1e1967fb587c48aab8341fbb0fde41aa2adccafb123b19816b6d7d42bc60058835326f6a77677df481daf5328f655516971549357df1
-MISC metadata.xml 329 BLAKE2B 19512b3b7a48d304223106030d772e2616dcf31024149fa8139bf66cedd5ed39c56e16f09f36e15280b774ce71c3c9965ac48ba0d543df365e559a4643f2fb59 SHA512 901cb37bff7bfd07cd7b6ec49833301caea33cf9696e3a644a1b128d4371b31eee2f3afdab937d39b6da925bab51604a8bb6ea370407d0170133655e9222d988
+EBUILD joint_state_publisher-1.12.13.ebuild 606 BLAKE2B c1cf841a267a048cf82380760372b47e8644bc3465df1fe41f1ab501da55de5ce333a1c50a18cd0690aae5e7555df2601ed79ab7e0ed033171e04a40c778bf97 SHA512 842ae750a98a69b4c4bea0912ea37c182f20226cf6d681b32f6cd784440d85d61f4800a97867fbd6b85f4a6cf76605acb74c604d9cf4d07e690308f82c982f1e
+EBUILD joint_state_publisher-9999.ebuild 606 BLAKE2B c1cf841a267a048cf82380760372b47e8644bc3465df1fe41f1ab501da55de5ce333a1c50a18cd0690aae5e7555df2601ed79ab7e0ed033171e04a40c778bf97 SHA512 842ae750a98a69b4c4bea0912ea37c182f20226cf6d681b32f6cd784440d85d61f4800a97867fbd6b85f4a6cf76605acb74c604d9cf4d07e690308f82c982f1e
+MISC metadata.xml 339 BLAKE2B b435f6689ab4c75a5dc4850793e70300e465c96c90b6162eaf488a069eb259e282f2534300ae1388036ba77058df57d8d43a4c60bdc1c336e1f3901a4d8bbb4e SHA512 44432f918f72fd087c1747bf5b42743651c6cf5a457c3d9cfc25206dbf24396b09b3565118895c6e1794befd027db1842dc7fd33f3e74031e0ba74be72475df1
diff --git a/dev-ros/joint_state_publisher/joint_state_publisher-1.12.10.ebuild b/dev-ros/joint_state_publisher/joint_state_publisher-1.12.13.ebuild
index 7a7a68e62676..5f4325158a53 100644
--- a/dev-ros/joint_state_publisher/joint_state_publisher-1.12.10.ebuild
+++ b/dev-ros/joint_state_publisher/joint_state_publisher-1.12.13.ebuild
@@ -1,8 +1,8 @@
-# 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/robot_model"
+ROS_REPO_URI="https://github.com/ros/joint_state_publisher"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 PYTHON_COMPAT=( python2_7 )
@@ -20,3 +20,5 @@ RDEPEND="${DEPEND}
 	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
+DEPEND="${DEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/joint_state_publisher/joint_state_publisher-1.12.7.ebuild b/dev-ros/joint_state_publisher/joint_state_publisher-1.12.7.ebuild
deleted file mode 100644
index 7a7a68e62676..000000000000
--- a/dev-ros/joint_state_publisher/joint_state_publisher-1.12.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/robot_model"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for setting and publishing joint state values for a given URDF"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
diff --git a/dev-ros/joint_state_publisher/joint_state_publisher-1.12.8.ebuild b/dev-ros/joint_state_publisher/joint_state_publisher-1.12.8.ebuild
deleted file mode 100644
index 7a7a68e62676..000000000000
--- a/dev-ros/joint_state_publisher/joint_state_publisher-1.12.8.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/robot_model"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for setting and publishing joint state values for a given URDF"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
diff --git a/dev-ros/joint_state_publisher/joint_state_publisher-1.12.9.ebuild b/dev-ros/joint_state_publisher/joint_state_publisher-1.12.9.ebuild
deleted file mode 100644
index 7a7a68e62676..000000000000
--- a/dev-ros/joint_state_publisher/joint_state_publisher-1.12.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/robot_model"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for setting and publishing joint state values for a given URDF"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
diff --git a/dev-ros/joint_state_publisher/joint_state_publisher-9999.ebuild b/dev-ros/joint_state_publisher/joint_state_publisher-9999.ebuild
index 7a7a68e62676..5f4325158a53 100644
--- a/dev-ros/joint_state_publisher/joint_state_publisher-9999.ebuild
+++ b/dev-ros/joint_state_publisher/joint_state_publisher-9999.ebuild
@@ -1,8 +1,8 @@
-# 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/robot_model"
+ROS_REPO_URI="https://github.com/ros/joint_state_publisher"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 PYTHON_COMPAT=( python2_7 )
@@ -20,3 +20,5 @@ RDEPEND="${DEPEND}
 	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
+DEPEND="${DEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/joint_state_publisher/metadata.xml b/dev-ros/joint_state_publisher/metadata.xml
index ceef7c794c18..b74086ddd5fa 100644
--- a/dev-ros/joint_state_publisher/metadata.xml
+++ b/dev-ros/joint_state_publisher/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/robot_model</remote-id>
+		<remote-id type="github">ros/joint_state_publisher</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/laser_proc/Manifest b/dev-ros/laser_proc/Manifest
index 59ec721c8ad2..e2857316951f 100644
--- a/dev-ros/laser_proc/Manifest
+++ b/dev-ros/laser_proc/Manifest
@@ -1,4 +1,5 @@
+AUX pluginlib.patch 755 BLAKE2B 08c2fa02501668ca9ce503ab9167879d7925293cdd1c77388c09cbf8d6fbc3fc7517713483a62002fed346e84dd1e1c335bde05b36cc557da175a5b6f5fe93f9 SHA512 0327f914470299ac69ca99bcccdf8672d62ad573aa551d8a161392f8ceb21ff08f320db28e51650a32f759296159543a900d1d161d3e91f24159a9005b742e22
 DIST laser_proc-0.1.4.tar.gz 6865 BLAKE2B 4709c976a3438a54f1e28f0e615bea503deeb5a3f54bae02804242dd54bd63e4418943309abe19cc34928ba3920bc7b84bc7ba8511a273357b3120c8221f0bdf SHA512 0a9ae28d9ad213f7227027c24b951d0a68799edc662e98e593090a7d01ab0a33671a2a26eeb3fdaf2f77a3d639a2274641c11e478c2f0689327a1fa66601b95a
-EBUILD laser_proc-0.1.4-r1.ebuild 551 BLAKE2B b11840887b254f7212d6ddb80267c1ef51fc66c4f7f0817c09b2e00ac207592608285f23a442d5af57a948e0972cd5bc1baf182b47fb8e2191cb45f41027d0b7 SHA512 abfaf7d5f5544b829a93b00dffad30bbd6dd4e8e859ee8d29885f2a921b5c5b97f88c5b9ba12f52ccda0a70bcdb61e4cff82b15b31dfba5515c7455280f951e2
+EBUILD laser_proc-0.1.4-r1.ebuild 593 BLAKE2B d0434e59fd670903ab4f1e48b472e659839b93fb2c9e1bd167575056f3c66e60635b7cf9ff8f475e8faac4e07fc64a244914af55e0babad1dee98f0739fc0e20 SHA512 0a42afd435557f6a64b8e6b23f0c45f5045662df8782bab104687bd4633f3d830e4ec67d78f6616a75ab9e21de8b8b66b74f0753ddb324ab5152f5b218948431
 EBUILD laser_proc-9999.ebuild 551 BLAKE2B b11840887b254f7212d6ddb80267c1ef51fc66c4f7f0817c09b2e00ac207592608285f23a442d5af57a948e0972cd5bc1baf182b47fb8e2191cb45f41027d0b7 SHA512 abfaf7d5f5544b829a93b00dffad30bbd6dd4e8e859ee8d29885f2a921b5c5b97f88c5b9ba12f52ccda0a70bcdb61e4cff82b15b31dfba5515c7455280f951e2
 MISC metadata.xml 339 BLAKE2B 3cd1bb1057e014c06068a8bbe24e0186d454d11123a6658e1576b04d62283e30a6f9aae45f3d09beb81499f32c5f1af598d1a526e4da1b6ab5ec89f6eb55a1b6 SHA512 78c716d120dc9a894dee02b01757f746407c982097ba048522eae320ba8e5f83632bb81f693549d4440b3ff47f47739b67ad19df0e8f67c24ff414e79dac99eb
diff --git a/dev-ros/laser_proc/files/pluginlib.patch b/dev-ros/laser_proc/files/pluginlib.patch
new file mode 100644
index 000000000000..cf34946597fa
--- /dev/null
+++ b/dev-ros/laser_proc/files/pluginlib.patch
@@ -0,0 +1,20 @@
+From 2d81f874dc4f2a78d66284f3f32d6efe0bace4e3 Mon Sep 17 00:00:00 2001
+From: Mikael Arguedas <mikael@osrfoundation.org>
+Date: Thu, 26 Oct 2017 18:11:55 -0700
+Subject: [PATCH] update to use non deprecated pluginlib macro
+
+---
+ src/LaserProcNodelet.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/LaserProcNodelet.cpp b/src/LaserProcNodelet.cpp
+index 177d088..5e07e39 100644
+--- a/src/LaserProcNodelet.cpp
++++ b/src/LaserProcNodelet.cpp
+@@ -57,5 +57,5 @@ class LaserProcNodelet : public nodelet::Nodelet
+ }
+ 
+ #include <pluginlib/class_list_macros.h>
+-PLUGINLIB_DECLARE_CLASS(laser_proc, LaserProcNodelet, laser_proc::LaserProcNodelet, nodelet::Nodelet);
++PLUGINLIB_EXPORT_CLASS(laser_proc::LaserProcNodelet, nodelet::Nodelet)
+ 
diff --git a/dev-ros/laser_proc/laser_proc-0.1.4-r1.ebuild b/dev-ros/laser_proc/laser_proc-0.1.4-r1.ebuild
index daae664dcaa5..56bf959350e3 100644
--- a/dev-ros/laser_proc/laser_proc-0.1.4-r1.ebuild
+++ b/dev-ros/laser_proc/laser_proc-0.1.4-r1.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
@@ -22,3 +22,4 @@ RDEPEND="
 	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/pluginlib.patch" )
diff --git a/dev-ros/rosapi/Manifest b/dev-ros/rosapi/Manifest
index c044c5c9ea7f..677603d6dda1 100644
--- a/dev-ros/rosapi/Manifest
+++ b/dev-ros/rosapi/Manifest
@@ -1,22 +1,6 @@
-DIST rosbridge_suite-0.7.13.tar.gz 367051 BLAKE2B 320173331f3cb1334becad502d11075740e9742209cac82c8d068c7a282441b07f4e6e846b74fdc95e10fac38c155943bef1aa6a09bc9058005eb873e9347b0f SHA512 f5a6abddfa768c43685ad16f20d1351e63b268c69f239aa3ff2e30f656c6a81686461185e21be88a5a0badcbc473bc7faa308540c1a14ca15fce11e9b23b9d7e
-DIST rosbridge_suite-0.7.14.tar.gz 368983 BLAKE2B 145f1fe8ff2d6d5207c301d27ede99f12ee38f47a57e9b5ae7529ae5a999af37385d4fa435c87e98d84a17f6f11f4c9801e4a2e0928aa2d66407df820c792b5f SHA512 5e7de568d32dff41870c11012b4f272c99d28d20bacd748121407f9574a4e4b94ee022aa81a859ac4cd3a1915b0a00cb6fece7f71b829cc2cc07cc6469457655
-DIST rosbridge_suite-0.7.15.tar.gz 369162 BLAKE2B 6825615a6e9016d78eda0477f720e97821a5cda8f0b75b7d98e83c8a8503c16aa903a01991e2c8c21403fc6770798480520050800df7581819266e6e011113c2 SHA512 c0cbc92e09c0a6b5f4af301107b5217f5fb4207afa9a4e5fd517f6bde9c71563a649ddd14d7b7c1c6a532e153e71e36172ea25e307f43a997a20bfb8bc63728a
-DIST rosbridge_suite-0.7.16.tar.gz 369529 BLAKE2B 5bcb0789cf573cc6ff45d1f576858505c27b7b09508c1a5e84d19e2f18d32ee76158c0cfdb332602845dce51614eaf25c0202a826ef1f54eba0dba031f46ced5 SHA512 212169fb1b812f4e6ee96bfb9a656aa4afa78f765c43d036013a80e8eec54d3ff7586fc3bd894a5c3efc4bb6df9c7d8b88f65ee74b35f8129c635d0b47d3eeb6
-DIST rosbridge_suite-0.7.17.tar.gz 373578 BLAKE2B fab4436c1ded62556ca8eea8589b91ebc18257cc50d58488dfbe9725fe8646d9aa758c870f65aa7ba3fc0c5d4ca0e65dcc4779987aab81e44219caa04db0d969 SHA512 4cd10fa54378ba5f3ed7845e61fdfb98f40113adb8ca9461ccb4e793258d44254d41cf6bcad165163837e72ef5573d994a0796a44e6d83f75c386fc9f9892a2e
-DIST rosbridge_suite-0.8.1.tar.gz 376461 BLAKE2B 413b879717d52e39134b7429e2408b8fb43dc71fdf6c719edc2e1b71517a816399fb3f3e3071fc73e2482716db4602f5b27bc273eabd05747a5f03913c4f4128 SHA512 322d720b5380970a97de07568a0e8b521a1a7646ac4695c168ae0b8fcb2ec445b7b5e9c500a12f05ede797f8ae9d2add70104e8a53667d36ae513ef56ffc6e29
-DIST rosbridge_suite-0.8.3.tar.gz 376654 BLAKE2B bcff882f60ae87d0aa4400c07176a476be3a098e9225a8389a5da094b26fc1b159decfc547f09ba2db34c52dfed5bfb10ae4b7076fb1b14b2cc2c785de81e77a SHA512 661964587d45d290b88461f535f69b496c9596546c7c9b773633fee16e645dede8597b62ab8cba490b01a9e6a8b81524df89c94c390930f0132a55cb332a198c
-DIST rosbridge_suite-0.8.4.tar.gz 376986 BLAKE2B 72632801775f49da7f43182bff88324c8dbb0a5d956d54f7b08422d7b81d717d33707de69b7a7f4a7120add49292d7b88c5f29893461f9a24e041d86f82be35e SHA512 ba47c7012ca23c92589aca8718e027980364c56696bf41a3da42a5d4904e3124019d3e23a2b7fca6093f5f6431464c2c95fde4b3da14ca876e030bcb644d0aad
-DIST rosbridge_suite-0.8.5.tar.gz 378113 BLAKE2B e5599ce1d3dd270bb54575ce01bc661fccdb12c4932b26c5701b850c3b12fc0d78db64de9ea8b72a7aca2d0e1f889630e981f1b745424109a75913fdffb1f37e SHA512 5c9061cd5dde4663b22d733484082a86c8dab3a1802834a1ed7bdfb4d914700f10b08b7864beb71dff3060b15234bcdcce4950ec55103464a501d919774a1e41
 DIST rosbridge_suite-0.8.6.tar.gz 378267 BLAKE2B b5e72b7897feef66aa05603bcff00ba213844f700f56be97a7110f33a77e3aa848ca0c583d5509ee205dc01bf001181b1887e20ee89d8348bc5eb43fd5a829b0 SHA512 e935c20466a13cbcf00051a4f32bc981806244aecf314e09e9e0ca9e0e873ab098b14b5ca5839bf14f2d3dfb823ecc62bb4e26027d4d0ff3f52bf0385011fbf3
-EBUILD rosapi-0.7.13.ebuild 666 BLAKE2B b72ae518fb0e55ae5140173b5798d487958bec6d00c702fda74f9566528eb1cb6a90b280f8ad213020409f85a0d29adc7312edce80b478546774b56a17ede0bd SHA512 08c596717d0acdd3255ddf0908aea6bd3f9ac722a29345e52bc973b26c3c155b6e6118ab03dc6dd8ea55cab2caa13f40a7352da8377d196ffbada60987c015db
-EBUILD rosapi-0.7.14.ebuild 666 BLAKE2B b72ae518fb0e55ae5140173b5798d487958bec6d00c702fda74f9566528eb1cb6a90b280f8ad213020409f85a0d29adc7312edce80b478546774b56a17ede0bd SHA512 08c596717d0acdd3255ddf0908aea6bd3f9ac722a29345e52bc973b26c3c155b6e6118ab03dc6dd8ea55cab2caa13f40a7352da8377d196ffbada60987c015db
-EBUILD rosapi-0.7.15.ebuild 666 BLAKE2B 3eab424948979ca8f5498e0274e205cab43edfbf2690ed7172c272290a8fcb0541864115c39399e0dc09035c7676e1bb9e8d50771d72b0cdedcb19aacf892401 SHA512 d94c99175e42d9ecb184d4d7641390ed9ce5c9460a6b35236b8e663865d82193ebd26e0a770da3e3351b2a01fddcc479e91c2a66bd21071b9b12dc40ee263a4c
-EBUILD rosapi-0.7.16.ebuild 666 BLAKE2B 3eab424948979ca8f5498e0274e205cab43edfbf2690ed7172c272290a8fcb0541864115c39399e0dc09035c7676e1bb9e8d50771d72b0cdedcb19aacf892401 SHA512 d94c99175e42d9ecb184d4d7641390ed9ce5c9460a6b35236b8e663865d82193ebd26e0a770da3e3351b2a01fddcc479e91c2a66bd21071b9b12dc40ee263a4c
-EBUILD rosapi-0.7.17.ebuild 666 BLAKE2B 4a5f2c91cbbac4dfd373c467b4c8161c159a20666350d6c498d54fb1cee3b3c9f47ba535b9d9d9d342ffdf473c095c392a806b727da9f51e87a5590196889ddb SHA512 f9d3f52c6681107c6c51af0f18a09c849187d7ba29361fa56bec76792e6eecc1d5d9f5e900405c5dcc2947046bb7bf3c090a90883d9c346d7973a158d16dbbfa
-EBUILD rosapi-0.8.1.ebuild 666 BLAKE2B 4a5f2c91cbbac4dfd373c467b4c8161c159a20666350d6c498d54fb1cee3b3c9f47ba535b9d9d9d342ffdf473c095c392a806b727da9f51e87a5590196889ddb SHA512 f9d3f52c6681107c6c51af0f18a09c849187d7ba29361fa56bec76792e6eecc1d5d9f5e900405c5dcc2947046bb7bf3c090a90883d9c346d7973a158d16dbbfa
-EBUILD rosapi-0.8.3.ebuild 666 BLAKE2B 4a5f2c91cbbac4dfd373c467b4c8161c159a20666350d6c498d54fb1cee3b3c9f47ba535b9d9d9d342ffdf473c095c392a806b727da9f51e87a5590196889ddb SHA512 f9d3f52c6681107c6c51af0f18a09c849187d7ba29361fa56bec76792e6eecc1d5d9f5e900405c5dcc2947046bb7bf3c090a90883d9c346d7973a158d16dbbfa
-EBUILD rosapi-0.8.4.ebuild 666 BLAKE2B 4a5f2c91cbbac4dfd373c467b4c8161c159a20666350d6c498d54fb1cee3b3c9f47ba535b9d9d9d342ffdf473c095c392a806b727da9f51e87a5590196889ddb SHA512 f9d3f52c6681107c6c51af0f18a09c849187d7ba29361fa56bec76792e6eecc1d5d9f5e900405c5dcc2947046bb7bf3c090a90883d9c346d7973a158d16dbbfa
-EBUILD rosapi-0.8.5.ebuild 666 BLAKE2B 4a5f2c91cbbac4dfd373c467b4c8161c159a20666350d6c498d54fb1cee3b3c9f47ba535b9d9d9d342ffdf473c095c392a806b727da9f51e87a5590196889ddb SHA512 f9d3f52c6681107c6c51af0f18a09c849187d7ba29361fa56bec76792e6eecc1d5d9f5e900405c5dcc2947046bb7bf3c090a90883d9c346d7973a158d16dbbfa
+DIST rosbridge_suite-0.9.0.tar.gz 89409 BLAKE2B e48f36b71d8c5bcbd1ede0a87015b231d45194f3410b4cfcc38d39089477418b1f40afb28d8df7beba2e5e99b4aafde53bbc3f9bf371f0434099d7730c6393ee SHA512 4d7a6c0c33da9bf42ff24a0add81cad5fec707ef7149bf929bd2aac92ea2fe6f42da21bd5349dadee05cacb69d7efdb7adb0c01fc01c8251e0503cb488a73364
 EBUILD rosapi-0.8.6.ebuild 666 BLAKE2B 4a5f2c91cbbac4dfd373c467b4c8161c159a20666350d6c498d54fb1cee3b3c9f47ba535b9d9d9d342ffdf473c095c392a806b727da9f51e87a5590196889ddb SHA512 f9d3f52c6681107c6c51af0f18a09c849187d7ba29361fa56bec76792e6eecc1d5d9f5e900405c5dcc2947046bb7bf3c090a90883d9c346d7973a158d16dbbfa
+EBUILD rosapi-0.9.0.ebuild 666 BLAKE2B 510dbf0f6129e666050621d4430f1e7107e51553aed8f4e70f18b611957fbe4c0e0e9ac4ddf301ff160efce8ec2dfef2d9c29e91898eb0a4adc2a526234b2d91 SHA512 b85e31287a3d3a3ef628ec346d125beafcc30023c12127a16aed0192790bc71db425c709e1b6e91d24c50e5492a768b08f5519a7e92f866ba5d3c48ebc275819
 EBUILD rosapi-9999.ebuild 666 BLAKE2B b72ae518fb0e55ae5140173b5798d487958bec6d00c702fda74f9566528eb1cb6a90b280f8ad213020409f85a0d29adc7312edce80b478546774b56a17ede0bd SHA512 08c596717d0acdd3255ddf0908aea6bd3f9ac722a29345e52bc973b26c3c155b6e6118ab03dc6dd8ea55cab2caa13f40a7352da8377d196ffbada60987c015db
 MISC metadata.xml 343 BLAKE2B 54e565b139250d84a9adfb768099d530c91876a8d20dabdb1c5fdb61c7c4e799b3e4121ad704c09b8019693ccbf15be426100cdc8e9388f8ef68312d4ca75d31 SHA512 45889c0aa111bcf8050244d51f15ceef5501a722f3feac93c3795a4b9217a41098f44f6b06f906ff333e2c98d03b0f44e4a41d1acdc70942fa9c54b05dde1365
diff --git a/dev-ros/rosapi/rosapi-0.7.14.ebuild b/dev-ros/rosapi/rosapi-0.7.14.ebuild
deleted file mode 100644
index c22242d34dcc..000000000000
--- a/dev-ros/rosapi/rosapi-0.7.14.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/rosapi-0.7.15.ebuild b/dev-ros/rosapi/rosapi-0.7.15.ebuild
deleted file mode 100644
index 40049b4ce821..000000000000
--- a/dev-ros/rosapi/rosapi-0.7.15.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/rosapi-0.7.16.ebuild b/dev-ros/rosapi/rosapi-0.7.16.ebuild
deleted file mode 100644
index 40049b4ce821..000000000000
--- a/dev-ros/rosapi/rosapi-0.7.16.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/rosapi-0.7.17.ebuild b/dev-ros/rosapi/rosapi-0.7.17.ebuild
deleted file mode 100644
index 348d9a4fa5f0..000000000000
--- a/dev-ros/rosapi/rosapi-0.7.17.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/rosapi-0.8.1.ebuild b/dev-ros/rosapi/rosapi-0.8.1.ebuild
deleted file mode 100644
index 348d9a4fa5f0..000000000000
--- a/dev-ros/rosapi/rosapi-0.8.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/rosapi-0.8.3.ebuild b/dev-ros/rosapi/rosapi-0.8.3.ebuild
deleted file mode 100644
index 348d9a4fa5f0..000000000000
--- a/dev-ros/rosapi/rosapi-0.8.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/rosapi-0.8.4.ebuild b/dev-ros/rosapi/rosapi-0.8.4.ebuild
deleted file mode 100644
index 348d9a4fa5f0..000000000000
--- a/dev-ros/rosapi/rosapi-0.8.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/rosapi-0.8.5.ebuild b/dev-ros/rosapi/rosapi-0.8.5.ebuild
deleted file mode 100644
index 348d9a4fa5f0..000000000000
--- a/dev-ros/rosapi/rosapi-0.8.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/rosapi-0.7.13.ebuild b/dev-ros/rosapi/rosapi-0.9.0.ebuild
index c22242d34dcc..b157089b594a 100644
--- a/dev-ros/rosapi/rosapi-0.7.13.ebuild
+++ b/dev-ros/rosapi/rosapi-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-ros/rosbridge_library/Manifest b/dev-ros/rosbridge_library/Manifest
index a5487afdd0f3..63bd93a83982 100644
--- a/dev-ros/rosbridge_library/Manifest
+++ b/dev-ros/rosbridge_library/Manifest
@@ -1,18 +1,6 @@
-DIST rosbridge_suite-0.7.15.tar.gz 369162 BLAKE2B 6825615a6e9016d78eda0477f720e97821a5cda8f0b75b7d98e83c8a8503c16aa903a01991e2c8c21403fc6770798480520050800df7581819266e6e011113c2 SHA512 c0cbc92e09c0a6b5f4af301107b5217f5fb4207afa9a4e5fd517f6bde9c71563a649ddd14d7b7c1c6a532e153e71e36172ea25e307f43a997a20bfb8bc63728a
-DIST rosbridge_suite-0.7.16.tar.gz 369529 BLAKE2B 5bcb0789cf573cc6ff45d1f576858505c27b7b09508c1a5e84d19e2f18d32ee76158c0cfdb332602845dce51614eaf25c0202a826ef1f54eba0dba031f46ced5 SHA512 212169fb1b812f4e6ee96bfb9a656aa4afa78f765c43d036013a80e8eec54d3ff7586fc3bd894a5c3efc4bb6df9c7d8b88f65ee74b35f8129c635d0b47d3eeb6
-DIST rosbridge_suite-0.7.17.tar.gz 373578 BLAKE2B fab4436c1ded62556ca8eea8589b91ebc18257cc50d58488dfbe9725fe8646d9aa758c870f65aa7ba3fc0c5d4ca0e65dcc4779987aab81e44219caa04db0d969 SHA512 4cd10fa54378ba5f3ed7845e61fdfb98f40113adb8ca9461ccb4e793258d44254d41cf6bcad165163837e72ef5573d994a0796a44e6d83f75c386fc9f9892a2e
-DIST rosbridge_suite-0.8.1.tar.gz 376461 BLAKE2B 413b879717d52e39134b7429e2408b8fb43dc71fdf6c719edc2e1b71517a816399fb3f3e3071fc73e2482716db4602f5b27bc273eabd05747a5f03913c4f4128 SHA512 322d720b5380970a97de07568a0e8b521a1a7646ac4695c168ae0b8fcb2ec445b7b5e9c500a12f05ede797f8ae9d2add70104e8a53667d36ae513ef56ffc6e29
-DIST rosbridge_suite-0.8.3.tar.gz 376654 BLAKE2B bcff882f60ae87d0aa4400c07176a476be3a098e9225a8389a5da094b26fc1b159decfc547f09ba2db34c52dfed5bfb10ae4b7076fb1b14b2cc2c785de81e77a SHA512 661964587d45d290b88461f535f69b496c9596546c7c9b773633fee16e645dede8597b62ab8cba490b01a9e6a8b81524df89c94c390930f0132a55cb332a198c
-DIST rosbridge_suite-0.8.4.tar.gz 376986 BLAKE2B 72632801775f49da7f43182bff88324c8dbb0a5d956d54f7b08422d7b81d717d33707de69b7a7f4a7120add49292d7b88c5f29893461f9a24e041d86f82be35e SHA512 ba47c7012ca23c92589aca8718e027980364c56696bf41a3da42a5d4904e3124019d3e23a2b7fca6093f5f6431464c2c95fde4b3da14ca876e030bcb644d0aad
-DIST rosbridge_suite-0.8.5.tar.gz 378113 BLAKE2B e5599ce1d3dd270bb54575ce01bc661fccdb12c4932b26c5701b850c3b12fc0d78db64de9ea8b72a7aca2d0e1f889630e981f1b745424109a75913fdffb1f37e SHA512 5c9061cd5dde4663b22d733484082a86c8dab3a1802834a1ed7bdfb4d914700f10b08b7864beb71dff3060b15234bcdcce4950ec55103464a501d919774a1e41
 DIST rosbridge_suite-0.8.6.tar.gz 378267 BLAKE2B b5e72b7897feef66aa05603bcff00ba213844f700f56be97a7110f33a77e3aa848ca0c583d5509ee205dc01bf001181b1887e20ee89d8348bc5eb43fd5a829b0 SHA512 e935c20466a13cbcf00051a4f32bc981806244aecf314e09e9e0ca9e0e873ab098b14b5ca5839bf14f2d3dfb823ecc62bb4e26027d4d0ff3f52bf0385011fbf3
-EBUILD rosbridge_library-0.7.15.ebuild 1451 BLAKE2B 256b8cd8ff27d00f9e8d4b332a1a4f49c0e1746709a9e6673ab9a64df136f0d796cb936e996b995d02dd87046ad1f72ed070777897d1cbd8abd005e169944f97 SHA512 f2e57246491e7edd1cd54653d1c097497174fd232045327fbbbea779371ed53488c18f000f565bd818714fb7c42b1528a90b10f659470df72a4fe433b0f6d6df
-EBUILD rosbridge_library-0.7.16.ebuild 1451 BLAKE2B 256b8cd8ff27d00f9e8d4b332a1a4f49c0e1746709a9e6673ab9a64df136f0d796cb936e996b995d02dd87046ad1f72ed070777897d1cbd8abd005e169944f97 SHA512 f2e57246491e7edd1cd54653d1c097497174fd232045327fbbbea779371ed53488c18f000f565bd818714fb7c42b1528a90b10f659470df72a4fe433b0f6d6df
-EBUILD rosbridge_library-0.7.17.ebuild 1451 BLAKE2B 4af51fa5627a70ab81bdaf3948f72ddae45fdbb43353456b9ed5f77a0b8809aad4d4649114c190aa25b412233e67fb4f7af28c1ac877ebd0cc494fdcbdfdce8e SHA512 3d9e933033b2e1f65eb80e3e97e6bce1f9044b6beadcc7f49830202da9d75b9c1b05636569c29835e0553409e04e921c00df232dc201172a227d66bb8dc9adab
-EBUILD rosbridge_library-0.8.1.ebuild 1451 BLAKE2B 4af51fa5627a70ab81bdaf3948f72ddae45fdbb43353456b9ed5f77a0b8809aad4d4649114c190aa25b412233e67fb4f7af28c1ac877ebd0cc494fdcbdfdce8e SHA512 3d9e933033b2e1f65eb80e3e97e6bce1f9044b6beadcc7f49830202da9d75b9c1b05636569c29835e0553409e04e921c00df232dc201172a227d66bb8dc9adab
-EBUILD rosbridge_library-0.8.3.ebuild 1451 BLAKE2B 4af51fa5627a70ab81bdaf3948f72ddae45fdbb43353456b9ed5f77a0b8809aad4d4649114c190aa25b412233e67fb4f7af28c1ac877ebd0cc494fdcbdfdce8e SHA512 3d9e933033b2e1f65eb80e3e97e6bce1f9044b6beadcc7f49830202da9d75b9c1b05636569c29835e0553409e04e921c00df232dc201172a227d66bb8dc9adab
-EBUILD rosbridge_library-0.8.4.ebuild 1451 BLAKE2B 4af51fa5627a70ab81bdaf3948f72ddae45fdbb43353456b9ed5f77a0b8809aad4d4649114c190aa25b412233e67fb4f7af28c1ac877ebd0cc494fdcbdfdce8e SHA512 3d9e933033b2e1f65eb80e3e97e6bce1f9044b6beadcc7f49830202da9d75b9c1b05636569c29835e0553409e04e921c00df232dc201172a227d66bb8dc9adab
-EBUILD rosbridge_library-0.8.5.ebuild 1451 BLAKE2B 4af51fa5627a70ab81bdaf3948f72ddae45fdbb43353456b9ed5f77a0b8809aad4d4649114c190aa25b412233e67fb4f7af28c1ac877ebd0cc494fdcbdfdce8e SHA512 3d9e933033b2e1f65eb80e3e97e6bce1f9044b6beadcc7f49830202da9d75b9c1b05636569c29835e0553409e04e921c00df232dc201172a227d66bb8dc9adab
+DIST rosbridge_suite-0.9.0.tar.gz 89409 BLAKE2B e48f36b71d8c5bcbd1ede0a87015b231d45194f3410b4cfcc38d39089477418b1f40afb28d8df7beba2e5e99b4aafde53bbc3f9bf371f0434099d7730c6393ee SHA512 4d7a6c0c33da9bf42ff24a0add81cad5fec707ef7149bf929bd2aac92ea2fe6f42da21bd5349dadee05cacb69d7efdb7adb0c01fc01c8251e0503cb488a73364
 EBUILD rosbridge_library-0.8.6.ebuild 1451 BLAKE2B 4af51fa5627a70ab81bdaf3948f72ddae45fdbb43353456b9ed5f77a0b8809aad4d4649114c190aa25b412233e67fb4f7af28c1ac877ebd0cc494fdcbdfdce8e SHA512 3d9e933033b2e1f65eb80e3e97e6bce1f9044b6beadcc7f49830202da9d75b9c1b05636569c29835e0553409e04e921c00df232dc201172a227d66bb8dc9adab
+EBUILD rosbridge_library-0.9.0.ebuild 1451 BLAKE2B 429d111b4ce4a0c3b8403a89dbafae8c882907ee468a463f249cdd92341749c81579b008ab101eabcc99d734ab28c43dc743a50d9b8e060b1025b0a41285898f SHA512 c8dc224f9ff3ae1a048a2d9f505c5b4d985418532e167030960782da352f25e29522f09294730bb7dd299ee8a6f60f44672f6c9f6c791cb401efa29ae02d1c9f
 EBUILD rosbridge_library-9999.ebuild 1451 BLAKE2B 256b8cd8ff27d00f9e8d4b332a1a4f49c0e1746709a9e6673ab9a64df136f0d796cb936e996b995d02dd87046ad1f72ed070777897d1cbd8abd005e169944f97 SHA512 f2e57246491e7edd1cd54653d1c097497174fd232045327fbbbea779371ed53488c18f000f565bd818714fb7c42b1528a90b10f659470df72a4fe433b0f6d6df
 MISC metadata.xml 343 BLAKE2B 54e565b139250d84a9adfb768099d530c91876a8d20dabdb1c5fdb61c7c4e799b3e4121ad704c09b8019693ccbf15be426100cdc8e9388f8ef68312d4ca75d31 SHA512 45889c0aa111bcf8050244d51f15ceef5501a722f3feac93c3795a4b9217a41098f44f6b06f906ff333e2c98d03b0f44e4a41d1acdc70942fa9c54b05dde1365
diff --git a/dev-ros/rosbridge_library/rosbridge_library-0.7.16.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.7.16.ebuild
deleted file mode 100644
index 6d15906a8674..000000000000
--- a/dev-ros/rosbridge_library/rosbridge_library-0.7.16.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Core rosbridge package responsible for interpreting JSON and performing the appropriate ROS action"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/pymongo[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/rospy_tutorials[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/stereo_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/trajectory_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/rosbridge_library/rosbridge_library-0.7.17.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.7.17.ebuild
deleted file mode 100644
index 975b2fdc45f6..000000000000
--- a/dev-ros/rosbridge_library/rosbridge_library-0.7.17.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Core rosbridge package responsible for interpreting JSON and performing the appropriate ROS action"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/pymongo[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/rospy_tutorials[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/stereo_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/trajectory_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/rosbridge_library/rosbridge_library-0.8.1.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.8.1.ebuild
deleted file mode 100644
index 975b2fdc45f6..000000000000
--- a/dev-ros/rosbridge_library/rosbridge_library-0.8.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Core rosbridge package responsible for interpreting JSON and performing the appropriate ROS action"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/pymongo[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/rospy_tutorials[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/stereo_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/trajectory_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/rosbridge_library/rosbridge_library-0.8.3.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.8.3.ebuild
deleted file mode 100644
index 975b2fdc45f6..000000000000
--- a/dev-ros/rosbridge_library/rosbridge_library-0.8.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Core rosbridge package responsible for interpreting JSON and performing the appropriate ROS action"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/pymongo[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/rospy_tutorials[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/stereo_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/trajectory_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/rosbridge_library/rosbridge_library-0.8.4.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.8.4.ebuild
deleted file mode 100644
index 975b2fdc45f6..000000000000
--- a/dev-ros/rosbridge_library/rosbridge_library-0.8.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Core rosbridge package responsible for interpreting JSON and performing the appropriate ROS action"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/pymongo[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/rospy_tutorials[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/stereo_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/trajectory_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/rosbridge_library/rosbridge_library-0.8.5.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.8.5.ebuild
deleted file mode 100644
index 975b2fdc45f6..000000000000
--- a/dev-ros/rosbridge_library/rosbridge_library-0.8.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Core rosbridge package responsible for interpreting JSON and performing the appropriate ROS action"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/pymongo[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/rospy_tutorials[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/stereo_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/trajectory_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-		dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/rosbridge_library/rosbridge_library-0.7.15.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.9.0.ebuild
index 6d15906a8674..827c969a3754 100644
--- a/dev-ros/rosbridge_library/rosbridge_library-0.7.15.ebuild
+++ b/dev-ros/rosbridge_library/rosbridge_library-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-ros/rosbridge_server/Manifest b/dev-ros/rosbridge_server/Manifest
index 4614c97fc54d..9c8d4aafecdf 100644
--- a/dev-ros/rosbridge_server/Manifest
+++ b/dev-ros/rosbridge_server/Manifest
@@ -1,24 +1,8 @@
 AUX backports-ssl.patch 420 BLAKE2B 0d97fd93631f33867234ca1e7207ab5176c45f6747cc37b97f54b57fe0d10987c02466988c612293072ffe10962c8777ed0723aca8b6f24ded873f7ad7f5b99f SHA512 ed873ddfffb3702d2de62491d76cb829d02f215b09a3c8ce3564d1ccf1aced76939dca26eb22ccb21853ab8ab1a85d654a34bfd48533041c0dbc709c105b296d
 AUX tornado.patch 3361 BLAKE2B 94032b87881cba8bf383729ff260ad34a10fc42d4cfbbf53e5051eb488bfc4a534381445260709566b0fe7d03129cdf7737a9bd952cd2eb3f79181650ee758ef SHA512 6f8768716801dbfd00ef5698b91ea3d949c00895d18b3476d80a4fb09456b23412564d03b7a10eac6ee603dc4747aea8a96e6571164718eb0790f6475de9ee93
-DIST rosbridge_suite-0.7.13.tar.gz 367051 BLAKE2B 320173331f3cb1334becad502d11075740e9742209cac82c8d068c7a282441b07f4e6e846b74fdc95e10fac38c155943bef1aa6a09bc9058005eb873e9347b0f SHA512 f5a6abddfa768c43685ad16f20d1351e63b268c69f239aa3ff2e30f656c6a81686461185e21be88a5a0badcbc473bc7faa308540c1a14ca15fce11e9b23b9d7e
-DIST rosbridge_suite-0.7.14.tar.gz 368983 BLAKE2B 145f1fe8ff2d6d5207c301d27ede99f12ee38f47a57e9b5ae7529ae5a999af37385d4fa435c87e98d84a17f6f11f4c9801e4a2e0928aa2d66407df820c792b5f SHA512 5e7de568d32dff41870c11012b4f272c99d28d20bacd748121407f9574a4e4b94ee022aa81a859ac4cd3a1915b0a00cb6fece7f71b829cc2cc07cc6469457655
-DIST rosbridge_suite-0.7.15.tar.gz 369162 BLAKE2B 6825615a6e9016d78eda0477f720e97821a5cda8f0b75b7d98e83c8a8503c16aa903a01991e2c8c21403fc6770798480520050800df7581819266e6e011113c2 SHA512 c0cbc92e09c0a6b5f4af301107b5217f5fb4207afa9a4e5fd517f6bde9c71563a649ddd14d7b7c1c6a532e153e71e36172ea25e307f43a997a20bfb8bc63728a
-DIST rosbridge_suite-0.7.16.tar.gz 369529 BLAKE2B 5bcb0789cf573cc6ff45d1f576858505c27b7b09508c1a5e84d19e2f18d32ee76158c0cfdb332602845dce51614eaf25c0202a826ef1f54eba0dba031f46ced5 SHA512 212169fb1b812f4e6ee96bfb9a656aa4afa78f765c43d036013a80e8eec54d3ff7586fc3bd894a5c3efc4bb6df9c7d8b88f65ee74b35f8129c635d0b47d3eeb6
-DIST rosbridge_suite-0.7.17.tar.gz 373578 BLAKE2B fab4436c1ded62556ca8eea8589b91ebc18257cc50d58488dfbe9725fe8646d9aa758c870f65aa7ba3fc0c5d4ca0e65dcc4779987aab81e44219caa04db0d969 SHA512 4cd10fa54378ba5f3ed7845e61fdfb98f40113adb8ca9461ccb4e793258d44254d41cf6bcad165163837e72ef5573d994a0796a44e6d83f75c386fc9f9892a2e
-DIST rosbridge_suite-0.8.1.tar.gz 376461 BLAKE2B 413b879717d52e39134b7429e2408b8fb43dc71fdf6c719edc2e1b71517a816399fb3f3e3071fc73e2482716db4602f5b27bc273eabd05747a5f03913c4f4128 SHA512 322d720b5380970a97de07568a0e8b521a1a7646ac4695c168ae0b8fcb2ec445b7b5e9c500a12f05ede797f8ae9d2add70104e8a53667d36ae513ef56ffc6e29
-DIST rosbridge_suite-0.8.3.tar.gz 376654 BLAKE2B bcff882f60ae87d0aa4400c07176a476be3a098e9225a8389a5da094b26fc1b159decfc547f09ba2db34c52dfed5bfb10ae4b7076fb1b14b2cc2c785de81e77a SHA512 661964587d45d290b88461f535f69b496c9596546c7c9b773633fee16e645dede8597b62ab8cba490b01a9e6a8b81524df89c94c390930f0132a55cb332a198c
-DIST rosbridge_suite-0.8.4.tar.gz 376986 BLAKE2B 72632801775f49da7f43182bff88324c8dbb0a5d956d54f7b08422d7b81d717d33707de69b7a7f4a7120add49292d7b88c5f29893461f9a24e041d86f82be35e SHA512 ba47c7012ca23c92589aca8718e027980364c56696bf41a3da42a5d4904e3124019d3e23a2b7fca6093f5f6431464c2c95fde4b3da14ca876e030bcb644d0aad
-DIST rosbridge_suite-0.8.5.tar.gz 378113 BLAKE2B e5599ce1d3dd270bb54575ce01bc661fccdb12c4932b26c5701b850c3b12fc0d78db64de9ea8b72a7aca2d0e1f889630e981f1b745424109a75913fdffb1f37e SHA512 5c9061cd5dde4663b22d733484082a86c8dab3a1802834a1ed7bdfb4d914700f10b08b7864beb71dff3060b15234bcdcce4950ec55103464a501d919774a1e41
 DIST rosbridge_suite-0.8.6.tar.gz 378267 BLAKE2B b5e72b7897feef66aa05603bcff00ba213844f700f56be97a7110f33a77e3aa848ca0c583d5509ee205dc01bf001181b1887e20ee89d8348bc5eb43fd5a829b0 SHA512 e935c20466a13cbcf00051a4f32bc981806244aecf314e09e9e0ca9e0e873ab098b14b5ca5839bf14f2d3dfb823ecc62bb4e26027d4d0ff3f52bf0385011fbf3
-EBUILD rosbridge_server-0.7.13-r2.ebuild 764 BLAKE2B e956a71ce0b1b15830fd7347f1cff3dcd05ee5d2cff55dfc39196953e6226ebe46ed87cb92a46704986ebfade1cd70262eeb3569c511e0d1ec2e1392624f0e00 SHA512 eeaae81a29263eb89d89f6a85401fe40d0d34d19c6febc2ab0b1bdf21205baf19cb726d50d21673df12beaedd2ec250eb68fe68a7adc54f1f14ad7f408651b4d
-EBUILD rosbridge_server-0.7.14.ebuild 764 BLAKE2B e956a71ce0b1b15830fd7347f1cff3dcd05ee5d2cff55dfc39196953e6226ebe46ed87cb92a46704986ebfade1cd70262eeb3569c511e0d1ec2e1392624f0e00 SHA512 eeaae81a29263eb89d89f6a85401fe40d0d34d19c6febc2ab0b1bdf21205baf19cb726d50d21673df12beaedd2ec250eb68fe68a7adc54f1f14ad7f408651b4d
-EBUILD rosbridge_server-0.7.15.ebuild 764 BLAKE2B 0a0ce86067ac28afdbcd4e20f132959044e3daf7168cb3f63246d8cf2d460e41204a3440d3cea0050568efb922e07fbe0d613ca8d7ea94eba690c73506dd5c5c SHA512 22d4f1cea9622c9acfbc8817ffac1c5e4f4cc4bdd517d7b930aa2f3647e9b63ef5b33e103c04a8e991533d668fc89fcdc934310a672ea5ae346191433f21d923
-EBUILD rosbridge_server-0.7.16.ebuild 764 BLAKE2B 0a0ce86067ac28afdbcd4e20f132959044e3daf7168cb3f63246d8cf2d460e41204a3440d3cea0050568efb922e07fbe0d613ca8d7ea94eba690c73506dd5c5c SHA512 22d4f1cea9622c9acfbc8817ffac1c5e4f4cc4bdd517d7b930aa2f3647e9b63ef5b33e103c04a8e991533d668fc89fcdc934310a672ea5ae346191433f21d923
-EBUILD rosbridge_server-0.7.17.ebuild 764 BLAKE2B ab514861c12a7d838a821acd2635f9b8b8f6af5f461aa235b60787900dc1a28d86a84e4511eb3968b4fccae216da72262ccc4a4efe2df680748b539fae9019c1 SHA512 e224d013573111dac8f7de49f0a617a42f1b96d474c740823f3506a1e7353ed4d1e15b0d31d122331bbdbe5bb7896d894a9c0be667c5f7caab92bf1d1ddcd331
-EBUILD rosbridge_server-0.8.1.ebuild 764 BLAKE2B ab514861c12a7d838a821acd2635f9b8b8f6af5f461aa235b60787900dc1a28d86a84e4511eb3968b4fccae216da72262ccc4a4efe2df680748b539fae9019c1 SHA512 e224d013573111dac8f7de49f0a617a42f1b96d474c740823f3506a1e7353ed4d1e15b0d31d122331bbdbe5bb7896d894a9c0be667c5f7caab92bf1d1ddcd331
-EBUILD rosbridge_server-0.8.3.ebuild 764 BLAKE2B ab514861c12a7d838a821acd2635f9b8b8f6af5f461aa235b60787900dc1a28d86a84e4511eb3968b4fccae216da72262ccc4a4efe2df680748b539fae9019c1 SHA512 e224d013573111dac8f7de49f0a617a42f1b96d474c740823f3506a1e7353ed4d1e15b0d31d122331bbdbe5bb7896d894a9c0be667c5f7caab92bf1d1ddcd331
-EBUILD rosbridge_server-0.8.4.ebuild 764 BLAKE2B ab514861c12a7d838a821acd2635f9b8b8f6af5f461aa235b60787900dc1a28d86a84e4511eb3968b4fccae216da72262ccc4a4efe2df680748b539fae9019c1 SHA512 e224d013573111dac8f7de49f0a617a42f1b96d474c740823f3506a1e7353ed4d1e15b0d31d122331bbdbe5bb7896d894a9c0be667c5f7caab92bf1d1ddcd331
-EBUILD rosbridge_server-0.8.5.ebuild 764 BLAKE2B ab514861c12a7d838a821acd2635f9b8b8f6af5f461aa235b60787900dc1a28d86a84e4511eb3968b4fccae216da72262ccc4a4efe2df680748b539fae9019c1 SHA512 e224d013573111dac8f7de49f0a617a42f1b96d474c740823f3506a1e7353ed4d1e15b0d31d122331bbdbe5bb7896d894a9c0be667c5f7caab92bf1d1ddcd331
+DIST rosbridge_suite-0.9.0.tar.gz 89409 BLAKE2B e48f36b71d8c5bcbd1ede0a87015b231d45194f3410b4cfcc38d39089477418b1f40afb28d8df7beba2e5e99b4aafde53bbc3f9bf371f0434099d7730c6393ee SHA512 4d7a6c0c33da9bf42ff24a0add81cad5fec707ef7149bf929bd2aac92ea2fe6f42da21bd5349dadee05cacb69d7efdb7adb0c01fc01c8251e0503cb488a73364
 EBUILD rosbridge_server-0.8.6.ebuild 764 BLAKE2B ab514861c12a7d838a821acd2635f9b8b8f6af5f461aa235b60787900dc1a28d86a84e4511eb3968b4fccae216da72262ccc4a4efe2df680748b539fae9019c1 SHA512 e224d013573111dac8f7de49f0a617a42f1b96d474c740823f3506a1e7353ed4d1e15b0d31d122331bbdbe5bb7896d894a9c0be667c5f7caab92bf1d1ddcd331
-EBUILD rosbridge_server-9999.ebuild 764 BLAKE2B e956a71ce0b1b15830fd7347f1cff3dcd05ee5d2cff55dfc39196953e6226ebe46ed87cb92a46704986ebfade1cd70262eeb3569c511e0d1ec2e1392624f0e00 SHA512 eeaae81a29263eb89d89f6a85401fe40d0d34d19c6febc2ab0b1bdf21205baf19cb726d50d21673df12beaedd2ec250eb68fe68a7adc54f1f14ad7f408651b4d
+EBUILD rosbridge_server-0.9.0.ebuild 688 BLAKE2B 08a4a13cb920cdf49b059c7578d36834d5a26df42ea8dd0edcaf15dc7cab2ec6db571138fdac289f38a3194c7f083149a523806131d10ca54e704fda3115d33c SHA512 a6677d1a786506d9909abb297b58b823588294df9d066cd20ada2db7543a036ce7b32cfaf7f0e87334c6f97e9543c62e010997ce1ed198b46e4738b4a99beb4d
+EBUILD rosbridge_server-9999.ebuild 688 BLAKE2B 08a4a13cb920cdf49b059c7578d36834d5a26df42ea8dd0edcaf15dc7cab2ec6db571138fdac289f38a3194c7f083149a523806131d10ca54e704fda3115d33c SHA512 a6677d1a786506d9909abb297b58b823588294df9d066cd20ada2db7543a036ce7b32cfaf7f0e87334c6f97e9543c62e010997ce1ed198b46e4738b4a99beb4d
 MISC metadata.xml 343 BLAKE2B 54e565b139250d84a9adfb768099d530c91876a8d20dabdb1c5fdb61c7c4e799b3e4121ad704c09b8019693ccbf15be426100cdc8e9388f8ef68312d4ca75d31 SHA512 45889c0aa111bcf8050244d51f15ceef5501a722f3feac93c3795a4b9217a41098f44f6b06f906ff333e2c98d03b0f44e4a41d1acdc70942fa9c54b05dde1365
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.7.14.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.7.14.ebuild
deleted file mode 100644
index a175c87a3b38..000000000000
--- a/dev-ros/rosbridge_server/rosbridge_server-0.7.14.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A WebSocket interface to rosbridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosauth[${PYTHON_USEDEP}]
-	dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}/backports-ssl.patch"
-	"${FILESDIR}/tornado.patch"
-)
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.7.15.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.7.15.ebuild
deleted file mode 100644
index 1266ea731908..000000000000
--- a/dev-ros/rosbridge_server/rosbridge_server-0.7.15.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A WebSocket interface to rosbridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosauth[${PYTHON_USEDEP}]
-	dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}/backports-ssl.patch"
-	"${FILESDIR}/tornado.patch"
-)
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.7.16.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.7.16.ebuild
deleted file mode 100644
index 1266ea731908..000000000000
--- a/dev-ros/rosbridge_server/rosbridge_server-0.7.16.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A WebSocket interface to rosbridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosauth[${PYTHON_USEDEP}]
-	dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}/backports-ssl.patch"
-	"${FILESDIR}/tornado.patch"
-)
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.7.17.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.7.17.ebuild
deleted file mode 100644
index 775590dc7d3b..000000000000
--- a/dev-ros/rosbridge_server/rosbridge_server-0.7.17.ebuild
+++ /dev/null
@@ -1,29 +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/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A WebSocket interface to rosbridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosauth[${PYTHON_USEDEP}]
-	dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}/backports-ssl.patch"
-	"${FILESDIR}/tornado.patch"
-)
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.8.1.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.8.1.ebuild
deleted file mode 100644
index 775590dc7d3b..000000000000
--- a/dev-ros/rosbridge_server/rosbridge_server-0.8.1.ebuild
+++ /dev/null
@@ -1,29 +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/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A WebSocket interface to rosbridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosauth[${PYTHON_USEDEP}]
-	dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}/backports-ssl.patch"
-	"${FILESDIR}/tornado.patch"
-)
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.8.3.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.8.3.ebuild
deleted file mode 100644
index 775590dc7d3b..000000000000
--- a/dev-ros/rosbridge_server/rosbridge_server-0.8.3.ebuild
+++ /dev/null
@@ -1,29 +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/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A WebSocket interface to rosbridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosauth[${PYTHON_USEDEP}]
-	dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}/backports-ssl.patch"
-	"${FILESDIR}/tornado.patch"
-)
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.8.4.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.8.4.ebuild
deleted file mode 100644
index 775590dc7d3b..000000000000
--- a/dev-ros/rosbridge_server/rosbridge_server-0.8.4.ebuild
+++ /dev/null
@@ -1,29 +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/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A WebSocket interface to rosbridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosauth[${PYTHON_USEDEP}]
-	dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}/backports-ssl.patch"
-	"${FILESDIR}/tornado.patch"
-)
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.8.5.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.8.5.ebuild
deleted file mode 100644
index 775590dc7d3b..000000000000
--- a/dev-ros/rosbridge_server/rosbridge_server-0.8.5.ebuild
+++ /dev/null
@@ -1,29 +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/RobotWebTools/rosbridge_suite"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="A WebSocket interface to rosbridge"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosauth[${PYTHON_USEDEP}]
-	dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}/backports-ssl.patch"
-	"${FILESDIR}/tornado.patch"
-)
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.7.13-r2.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.9.0.ebuild
index a175c87a3b38..1ea9a841c8fd 100644
--- a/dev-ros/rosbridge_server/rosbridge_server-0.7.13-r2.ebuild
+++ b/dev-ros/rosbridge_server/rosbridge_server-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,3 @@ RDEPEND="
 	www-servers/tornado[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}/backports-ssl.patch"
-	"${FILESDIR}/tornado.patch"
-)
diff --git a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
index a175c87a3b38..1ea9a841c8fd 100644
--- a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
+++ b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,3 @@ RDEPEND="
 	www-servers/tornado[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}/backports-ssl.patch"
-	"${FILESDIR}/tornado.patch"
-)
diff --git a/dev-ros/roscpp_tutorials/Manifest b/dev-ros/roscpp_tutorials/Manifest
index 44a6a4810b91..0cefee574a31 100644
--- a/dev-ros/roscpp_tutorials/Manifest
+++ b/dev-ros/roscpp_tutorials/Manifest
@@ -3,10 +3,12 @@ DIST ros_tutorials-0.7.0.tar.gz 140125 BLAKE2B 9f1006c933b4cb642f77c8e68ddda9221
 DIST ros_tutorials-0.7.1.tar.gz 140483 BLAKE2B 8f2d4aee6494476bf7efb2ea35962ea6154485143f108b8e7603a9a1e67cb76f6c87e7b2612cd07ba19c50b44cd7fbbcd89f13f902eafd17c2a0eb8738357050 SHA512 0970e6428af992addfa1af327b2e0a3f85a926c90cfceba89d415acc5404a364164e0dd497c9296f03ac06c575380ad21e83b0cdbf6709c49dc650087145ddaa
 DIST ros_tutorials-0.8.0.tar.gz 153739 BLAKE2B 0dc7918a2b95a26518d07d753040e381b26c357eb3995a22a429d58c244751d7c58c8736efbab23a6a5ca6903f08e43acf9519f2a534b22fe89ea853b2e3fbff SHA512 269f71ef360f7441e1bfed2c2b3da791ce8018d6ec833a1fb7198d289067359b1e7704e37580c61188cc45034c788f3ca463882f8247a155752ff5c61939d795
 DIST ros_tutorials-0.8.1.tar.gz 153831 BLAKE2B c34aec17ffd247554e37abb252848183392864c801dce7e2cae8c66d9fd30fdb12d50163487eff8615593df1532dece6c86303aab0b91d4075c14a9fba652b5a SHA512 f537312a78c27375791e11820f4d3a70433ce200d724d80bc8b417edd3c6dcbbf72abac0e9a98a199da2e3a8dbdec34e81d9106be4f6a5243a6f84d02d9ca668
+DIST ros_tutorials-0.9.0.tar.gz 154992 BLAKE2B d7a45d0adaa1507ae9494ea9590b9c69d3bbececa01f209a93825432b4b362499cde8c966e6734dbd854478e98970c340403ac56cb99a00b07cf9cff8b28fa36 SHA512 7beba72d3f72943ea5402416dc03809576d47d4e76e81d9ed85eba69c1f9a4e5737a91bdac76747f47e9d6459e5dd8e062cc8ec5f2fb9450cdb013b416534e56
 EBUILD roscpp_tutorials-0.6.1.ebuild 616 BLAKE2B 523f0e07b31bbebb8bb71dd0c7810439ec54431a6fc64bd293938651b17e1c751bc90b0007905e35b740db4a7c3c05628c73336ddd8f5e79efaa07a8722b3d83 SHA512 c2389098568c49cb24d43280017872b29155fc5441534aae03aca3be506058e9cdb0385a763a22c99b1d0e73a7c0505fee7b0db0dc5e433c380c68f6ba3d92e8
 EBUILD roscpp_tutorials-0.7.0.ebuild 616 BLAKE2B 523f0e07b31bbebb8bb71dd0c7810439ec54431a6fc64bd293938651b17e1c751bc90b0007905e35b740db4a7c3c05628c73336ddd8f5e79efaa07a8722b3d83 SHA512 c2389098568c49cb24d43280017872b29155fc5441534aae03aca3be506058e9cdb0385a763a22c99b1d0e73a7c0505fee7b0db0dc5e433c380c68f6ba3d92e8
 EBUILD roscpp_tutorials-0.7.1.ebuild 616 BLAKE2B b4ed00d497e609ef6d5888556fdfabb84912cb4f2f55f42990f18f9864edd3bca19743bbfdfb37f42dc1db183e4c11e8d0af2fc974122fe7dff136b9efcc281f SHA512 8eeebc4781f2d72898298228e28808f0fcfbce52f1a81b4fe532d037570e1a42de256f569fa8e21453e34941bfff6365592b5dfc4e6a0f3795b7c1b7ef7e8935
 EBUILD roscpp_tutorials-0.8.0.ebuild 616 BLAKE2B 277dfb5f79c390b88e1d938da3e4b9929edaa970280ff7b36c82bda6501d10fef0f99992f0523906ce62fee7942e5f69e2d33565c346f44a68c2ac3dd91d09c2 SHA512 229897133f8ca39d82fe27ceafff9ad80157996a13797d3bbc526a58f479812081e2ea1d8ee316ee0f66ab1bb8af713e51ef2a8a882ff2f2b357364109ddabea
 EBUILD roscpp_tutorials-0.8.1.ebuild 616 BLAKE2B 277dfb5f79c390b88e1d938da3e4b9929edaa970280ff7b36c82bda6501d10fef0f99992f0523906ce62fee7942e5f69e2d33565c346f44a68c2ac3dd91d09c2 SHA512 229897133f8ca39d82fe27ceafff9ad80157996a13797d3bbc526a58f479812081e2ea1d8ee316ee0f66ab1bb8af713e51ef2a8a882ff2f2b357364109ddabea
+EBUILD roscpp_tutorials-0.9.0.ebuild 616 BLAKE2B e3b6ddeff592902eefe58708f682822a152139dc186981d6f605e255b585cb5b4c401de2db24bfcc5f1eba8cb3ef2dda39164643d43e2c3b9d2fcee2ea92c1bf SHA512 c13ed8ca592c4c3cc90618fc4b85754de386a39ec491f544b4c580ae30b4f493fd27cf13f080e0f5e201ac9ff7ce057ddb99cfe3a287eba971124769d498c46d
 EBUILD roscpp_tutorials-9999.ebuild 616 BLAKE2B 523f0e07b31bbebb8bb71dd0c7810439ec54431a6fc64bd293938651b17e1c751bc90b0007905e35b740db4a7c3c05628c73336ddd8f5e79efaa07a8722b3d83 SHA512 c2389098568c49cb24d43280017872b29155fc5441534aae03aca3be506058e9cdb0385a763a22c99b1d0e73a7c0505fee7b0db0dc5e433c380c68f6ba3d92e8
 MISC metadata.xml 331 BLAKE2B 63203c43a194bcfe4efe5c478b8cbb8700ebc307b2312972f546ed86043374133ec6826aa6465c8c4f6c7fc94fdcc4f29c2c535d1c0bdcb1806c57ea67ebbc1e SHA512 110df3a9a1b63d8200d2c67c2671a9ca8dfdc307d54545c09f6c790e019c149e09db82a1bbbf40677ae528e0f6e12235987a21efff1d6c38e50871bbf98b477a
diff --git a/dev-ros/roscpp_tutorials/roscpp_tutorials-0.9.0.ebuild b/dev-ros/roscpp_tutorials/roscpp_tutorials-0.9.0.ebuild
new file mode 100644
index 000000000000..ed62b87963c3
--- /dev/null
+++ b/dev-ros/roscpp_tutorials/roscpp_tutorials-0.9.0.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_tutorials"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	dev-ros/rostime
+	dev-ros/roscpp
+	dev-ros/rosconsole
+	dev-ros/roscpp_serialization
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rospack/Manifest b/dev-ros/rospack/Manifest
index ef72fcbee233..2a846367cc63 100644
--- a/dev-ros/rospack/Manifest
+++ b/dev-ros/rospack/Manifest
@@ -1,8 +1,7 @@
-AUX boost165.patch 10361 BLAKE2B 19907890bcd877e73c93e19c5c0c33931aa6f0bde37b2569edf9309402ede4c8ed1f50825838cf676159d69087daac3b7293bacf95c6ff003a875be38853fc9d SHA512 c486badc23c76a96ed84a7dba0b2f90d4d1ef98a699229efb7c94821a20fc3f32345632f4f5a097dee60b4aace85affbb0e5fe11e3df7a00531138c73340ab10
 AUX gentoo.patch 576 BLAKE2B e53b90591c46bc876d0cebdbeb660257c8a5ff3fe7aebc3d895a04011f1bb0fb004fecb375157f3d70811203445db11f2b6bd51e6994ecca71ce9cc132ee33b7 SHA512 85bc49da821ff4a31d6cff838f2ff006625f0f5041c2bfa8f742c92173c48fc6d2a4601e370058478afe66e1b0aa5e237964b950554c40710f9f411e1e04bbad
-DIST rospack-2.4.2.tar.gz 71938 BLAKE2B 63657ee9484f0a63bfc35b42fd16c907e8e402d815e93ca5be26aa14e9ffb7f5f544feea4c6d7e8f8e8052ba035a655dbfffde04e2f2cec189c2eac39b6e8b31 SHA512 f5569ba19abcb41b888d98c272bacca19d7be68528550154003e8394bd431aa381858f0a4440f708b5d9ac1814fa0e093a7ba34c3c192bcedb2de8040f364605
 DIST rospack-2.4.3.tar.gz 72327 BLAKE2B b154ce307ed95403382030c0fe14bd6296174289333fea83356a4f77add0fe2a1e48c8e2b6ee037def2e823f61a7b6df4ea62fd9a6f84433f12247003823f86f SHA512 4396ef24d0bd826235d7ac0da8a0b502557ecc0086eadcda96d44779ed5d8134e9a53cd861ee135a4b1da53074bdcf906dc4cb6ea0c36798326c17788ee1e2be
-EBUILD rospack-2.4.2.ebuild 594 BLAKE2B dbb534f84fd95ac5abeeb207a6783ad089cdc1515cafcbca61539380bba74166a8e0ff6ec587713932bb7fb5b9a4355d98464fac117db566f379c9dc71f435c3 SHA512 be26b5072a612ca6e40bb8d63969aed639c2923279a4970aba2270a92f5940e5bbb01a533ae0aa7a13fff91d0b426bbb5be5510c4358416284ce0a77af499fe8
+DIST rospack-2.5.0.tar.gz 72447 BLAKE2B 820e893544b38464bfc63b516697fac9e5875bfffb0922aa0da4b572af5e47a0f4a63134786131fd0ae97751916748b0a1e6af6ca29897ef72759b601bffb551 SHA512 8c9ed4566aa1456b2dd3c4249f7023121d21ee99427d0ef78a7237fbe418f333859091b66870572d5a80995ebda9d5208643ae92213827af40c63b49be4a2560
 EBUILD rospack-2.4.3.ebuild 564 BLAKE2B b20791ff8bab8e5d800a0de2ddcbcb94900ac52797dafa4e3c3a8ec4e93389015f1424e4f44f92b79193872c80a1569b3abb15e877150629365a4184427eedfc SHA512 9814190d49aa220554bf3a440e781642eeefbb5f1b5126c1b74e0fbe98ddd946327f38973fe7215b27b0de6d5a799af221940659c51294fd28906423e3be19be
-EBUILD rospack-9999.ebuild 564 BLAKE2B b20791ff8bab8e5d800a0de2ddcbcb94900ac52797dafa4e3c3a8ec4e93389015f1424e4f44f92b79193872c80a1569b3abb15e877150629365a4184427eedfc SHA512 9814190d49aa220554bf3a440e781642eeefbb5f1b5126c1b74e0fbe98ddd946327f38973fe7215b27b0de6d5a799af221940659c51294fd28906423e3be19be
+EBUILD rospack-2.5.0.ebuild 568 BLAKE2B a840a0e1f4ef10e1366d6b8c71df812f92930604464da318aa7593c4e00b1fe9f7b83c603086f9cb4c7977f917c2501b1796e4602cceab55dde64637f64eda8d SHA512 ab3a5283d2a7c6e55ae7e9f526338296baea9aa151b22facb07c0ca604348b7c520527e4586ccda1078005ede35be56bbd1321f98552a5b354132a4a8dd8bb04
+EBUILD rospack-9999.ebuild 568 BLAKE2B a840a0e1f4ef10e1366d6b8c71df812f92930604464da318aa7593c4e00b1fe9f7b83c603086f9cb4c7977f917c2501b1796e4602cceab55dde64637f64eda8d SHA512 ab3a5283d2a7c6e55ae7e9f526338296baea9aa151b22facb07c0ca604348b7c520527e4586ccda1078005ede35be56bbd1321f98552a5b354132a4a8dd8bb04
 MISC metadata.xml 325 BLAKE2B 5a5a1c31afa5d12425b09321ce006e4e921cf4bb4b90748045afd58cedbb4e67534dc16c27d338ed759586efb03ddda6ce053cf744025fe7e489320d9b271ca4 SHA512 2718fee8c06627957b95d0e99b517d2dcb2428279925a22e6cbbab1e56ea6d25da57c7143d316e7406419b7d2ff75187950957a705348adfb4008413923dda5c
diff --git a/dev-ros/rospack/files/boost165.patch b/dev-ros/rospack/files/boost165.patch
deleted file mode 100644
index fda1c6668107..000000000000
--- a/dev-ros/rospack/files/boost165.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-commit 6fcee1b0d2b1c225c39a5820981166b99f0d8750
-Author: Tim Rakowski <tim.rakowski@googlemail.com>
-Date:   Mon Sep 4 21:41:11 2017 +0200
-
-    Replaced references to deprecated Boost.TR1
-    
-    boost/tr1 includes where removed with boost 1.65
-
-diff --git a/include/rospack/rospack.h b/include/rospack/rospack.h
-index 4389187..bb7bc2e 100644
---- a/include/rospack/rospack.h
-+++ b/include/rospack/rospack.h
-@@ -105,8 +105,8 @@ and Rosstack.
- #ifndef ROSPACK_ROSPACK_H
- #define ROSPACK_ROSPACK_H
- 
--#include <boost/tr1/unordered_set.hpp>
--#include <boost/tr1/unordered_map.hpp>
-+#include <boost/unordered_set.hpp>
-+#include <boost/unordered_map.hpp>
- #include <list>
- #include <map>
- #include <set>
-@@ -148,8 +148,8 @@ class ROSPACK_DECL Rosstackage
-     std::string tag_;
-     bool quiet_;
-     std::vector<std::string> search_paths_;
--    std::tr1::unordered_map<std::string, std::vector<std::string> > dups_;
--    std::tr1::unordered_map<std::string, Stackage*> stackages_;
-+    boost::unordered_map<std::string, std::vector<std::string> > dups_;
-+    boost::unordered_map<std::string, Stackage*> stackages_;
-     Stackage* findWithRecrawl(const std::string& name);
-     void log(const std::string& level, const std::string& msg, bool append_errno);
-     void clearStackages();
-@@ -159,7 +159,7 @@ class ROSPACK_DECL Rosstackage
-                      int depth,
-                      bool collect_profile_data,
-                      std::vector<DirectoryCrawlRecord*>& profile_data,
--                     std::tr1::unordered_set<std::string>& profile_hash);
-+                     boost::unordered_set<std::string>& profile_hash);
-     bool isStackage(const std::string& path);
-     void loadManifest(Stackage* stackage);
-     void computeDeps(Stackage* stackage, bool ignore_errors=false, bool ignore_missing=false);
-@@ -171,7 +171,7 @@ class ROSPACK_DECL Rosstackage
-                     bool no_recursion_on_wet=false);
-     void gatherDepsFull(Stackage* stackage, bool direct,
-                         traversal_order_t order, int depth,
--                        std::tr1::unordered_set<Stackage*>& deps_hash,
-+                        boost::unordered_set<Stackage*>& deps_hash,
-                         std::vector<Stackage*>& deps,
-                         bool get_indented_deps,
-                         std::vector<std::string>& indented_deps,
-diff --git a/src/rospack.cpp b/src/rospack.cpp
-index 6b88a36..a3e08a3 100644
---- a/src/rospack.cpp
-+++ b/src/rospack.cpp
-@@ -259,7 +259,7 @@ Rosstackage::~Rosstackage()
- 
- void Rosstackage::clearStackages()
- {
--  for(std::tr1::unordered_map<std::string, Stackage*>::const_iterator it = stackages_.begin();
-+  for(boost::unordered_map<std::string, Stackage*>::const_iterator it = stackages_.begin();
-       it != stackages_.end();
-       ++it)
-   {
-@@ -382,7 +382,7 @@ Rosstackage::crawl(std::vector<std::string> search_path,
-   search_paths_ = search_path;
- 
-   std::vector<DirectoryCrawlRecord*> dummy;
--  std::tr1::unordered_set<std::string> dummy2;
-+  boost::unordered_set<std::string> dummy2;
-   for(std::vector<std::string>::const_iterator p = search_paths_.begin();
-       p != search_paths_.end();
-       ++p)
-@@ -447,7 +447,7 @@ Rosstackage::contents(const std::string& name,
-                       std::set<std::string>& packages)
- {
-   Rospack rp2;
--  std::tr1::unordered_map<std::string, Stackage*>::const_iterator it = stackages_.find(name);
-+  boost::unordered_map<std::string, Stackage*>::const_iterator it = stackages_.find(name);
-   if(it != stackages_.end())
-   {
-     std::vector<std::string> search_paths;
-@@ -474,7 +474,7 @@ Rosstackage::contains(const std::string& name,
-                       std::string& path)
- {
-   Rospack rp2;
--  for(std::tr1::unordered_map<std::string, Stackage*>::const_iterator it = stackages_.begin();
-+  for(boost::unordered_map<std::string, Stackage*>::const_iterator it = stackages_.begin();
-       it != stackages_.end();
-       ++it)
-   {
-@@ -503,7 +503,7 @@ Rosstackage::contains(const std::string& name,
- void
- Rosstackage::list(std::set<std::pair<std::string, std::string> >& list)
- {
--  for(std::tr1::unordered_map<std::string, Stackage*>::const_iterator it = stackages_.begin();
-+  for(boost::unordered_map<std::string, Stackage*>::const_iterator it = stackages_.begin();
-       it != stackages_.end();
-       ++it)
-   {
-@@ -519,7 +519,7 @@ Rosstackage::listDuplicates(std::vector<std::string>& dups)
- {
-   dups.resize(dups_.size());
-   int i = 0;
--  for(std::tr1::unordered_map<std::string, std::vector<std::string> >::const_iterator it = dups_.begin();
-+  for(boost::unordered_map<std::string, std::vector<std::string> >::const_iterator it = dups_.begin();
-       it != dups_.end();
-       ++it)
-   {
-@@ -532,7 +532,7 @@ void
- Rosstackage::listDuplicatesWithPaths(std::map<std::string, std::vector<std::string> >& dups)
- {
-   dups.clear();
--  for(std::tr1::unordered_map<std::string, std::vector<std::string> >::const_iterator it = dups_.begin();
-+  for(boost::unordered_map<std::string, std::vector<std::string> >::const_iterator it = dups_.begin();
-       it != dups_.end();
-       ++it)
-   {
-@@ -598,7 +598,7 @@ Rosstackage::depsIndent(const std::string& name, bool direct,
-   {
-     computeDeps(stackage);
-     std::vector<Stackage*> deps_vec;
--    std::tr1::unordered_set<Stackage*> deps_hash;
-+    boost::unordered_set<Stackage*> deps_hash;
-     std::vector<std::string> indented_deps;
-     gatherDepsFull(stackage, direct, POSTORDER, 0, deps_hash, deps_vec, true, indented_deps);
-     for(std::vector<std::string>::const_iterator it = indented_deps.begin();
-@@ -1089,7 +1089,7 @@ Rosstackage::plugins(const std::string& name, const std::string& attrib,
-   if(!depsOnDetail(name, true, stackages, true))
-     return false;
-   // Also look in the package itself
--  std::tr1::unordered_map<std::string, Stackage*>::const_iterator it = stackages_.find(name);
-+  boost::unordered_map<std::string, Stackage*>::const_iterator it = stackages_.find(name);
-   if(it != stackages_.end())
-   {
-     // don't warn here; it was done in depsOnDetail()
-@@ -1102,7 +1102,7 @@ Rosstackage::plugins(const std::string& name, const std::string& attrib,
-     std::vector<Stackage*> top_deps;
-     if(!depsDetail(top, false, top_deps))
-       return false;
--    std::tr1::unordered_set<Stackage*> top_deps_set;
-+    boost::unordered_set<Stackage*> top_deps_set;
-     for(std::vector<Stackage*>::iterator it = top_deps.begin();
-         it != top_deps.end();
-         ++it)
-@@ -1292,7 +1292,7 @@ Rosstackage::depsOnDetail(const std::string& name, bool direct,
-   }
-   try
-   {
--    for(std::tr1::unordered_map<std::string, Stackage*>::const_iterator it = stackages_.begin();
-+    for(boost::unordered_map<std::string, Stackage*>::const_iterator it = stackages_.begin();
-         it != stackages_.end();
-         ++it)
-     {
-@@ -1327,7 +1327,7 @@ Rosstackage::profile(const std::vector<std::string>& search_path,
- {
-   double start = time_since_epoch();
-   std::vector<DirectoryCrawlRecord*> dcrs;
--  std::tr1::unordered_set<std::string> dcrs_hash;
-+  boost::unordered_set<std::string> dcrs_hash;
-   for(std::vector<std::string>::const_iterator p = search_path.begin();
-       p != search_path.end();
-       ++p)
-@@ -1437,7 +1437,7 @@ Rosstackage::crawlDetail(const std::string& path,
-                          int depth,
-                          bool collect_profile_data,
-                          std::vector<DirectoryCrawlRecord*>& profile_data,
--                         std::tr1::unordered_set<std::string>& profile_hash)
-+                         boost::unordered_set<std::string>& profile_hash)
- {
-   if(depth > MAX_CRAWL_DEPTH)
-     throw Exception("maximum depth exceeded during crawl");
-@@ -1786,7 +1786,7 @@ Rosstackage::gatherDeps(Stackage* stackage, bool direct,
-                         std::vector<Stackage*>& deps,
-                         bool no_recursion_on_wet)
- {
--  std::tr1::unordered_set<Stackage*> deps_hash;
-+  boost::unordered_set<Stackage*> deps_hash;
-   std::vector<std::string> indented_deps;
-   gatherDepsFull(stackage, direct, order, 0,
-                  deps_hash, deps, false, indented_deps, no_recursion_on_wet);
-@@ -1795,7 +1795,7 @@ Rosstackage::gatherDeps(Stackage* stackage, bool direct,
- void
- _gatherDepsFull(Stackage* stackage, bool direct,
-                             traversal_order_t order, int depth,
--                            std::tr1::unordered_set<Stackage*>& deps_hash,
-+                            boost::unordered_set<Stackage*>& deps_hash,
-                             std::vector<Stackage*>& deps,
-                             bool get_indented_deps,
-                             std::vector<std::string>& indented_deps,
-@@ -1881,7 +1881,7 @@ _gatherDepsFull(Stackage* stackage, bool direct,
- void
- Rosstackage::gatherDepsFull(Stackage* stackage, bool direct,
-                             traversal_order_t order, int depth,
--                            std::tr1::unordered_set<Stackage*>& deps_hash,
-+                            boost::unordered_set<Stackage*>& deps_hash,
-                             std::vector<Stackage*>& deps,
-                             bool get_indented_deps,
-                             std::vector<std::string>& indented_deps,
-@@ -2068,7 +2068,7 @@ Rosstackage::writeCache()
-       {
-         char *rpp = getenv("ROS_PACKAGE_PATH");
-         fprintf(cache, "#ROS_PACKAGE_PATH=%s\n", (rpp ? rpp : ""));
--        for(std::tr1::unordered_map<std::string, Stackage*>::const_iterator it = stackages_.begin();
-+        for(boost::unordered_map<std::string, Stackage*>::const_iterator it = stackages_.begin();
-             it != stackages_.end();
-             ++it)
-           fprintf(cache, "%s\n", it->second->path_.c_str());
-diff --git a/src/utils.cpp b/src/utils.cpp
-index 97a557a..f41a00e 100644
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -28,7 +28,7 @@
- #include <string>
- #include <vector>
- #include <boost/algorithm/string.hpp>
--#include <boost/tr1/unordered_set.hpp>
-+#include <boost/unordered_set.hpp>
- 
- #include "utils.h"
- 
-@@ -41,7 +41,7 @@ deduplicate_tokens(const std::string& instring,
-                    std::string& outstring)
- {
-   std::vector<std::string> vec;
--  std::tr1::unordered_set<std::string> set;
-+  boost::unordered_set<std::string> set;
-   boost::split(vec, instring,
-                boost::is_any_of("\t "),
-                boost::token_compress_on);
diff --git a/dev-ros/rospack/rospack-2.4.2.ebuild b/dev-ros/rospack/rospack-2.5.0.ebuild
index 0e082cdfb01d..cf86c350e8c7 100644
--- a/dev-ros/rospack/rospack-2.4.2.ebuild
+++ b/dev-ros/rospack/rospack-2.5.0.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
@@ -17,7 +17,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	dev-libs/boost:=
-	dev-libs/tinyxml2:=
+	>=dev-libs/tinyxml2-5:=
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	>=dev-ros/cmake_modules-0.4.1
@@ -28,5 +28,4 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/gentoo.patch"
-	"${FILESDIR}/boost165.patch"
 )
diff --git a/dev-ros/rospack/rospack-9999.ebuild b/dev-ros/rospack/rospack-9999.ebuild
index 18b9f633ad3f..cf86c350e8c7 100644
--- a/dev-ros/rospack/rospack-9999.ebuild
+++ b/dev-ros/rospack/rospack-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
@@ -17,7 +17,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	dev-libs/boost:=
-	dev-libs/tinyxml2:=
+	>=dev-libs/tinyxml2-5:=
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	>=dev-ros/cmake_modules-0.4.1
diff --git a/dev-ros/rospy_tutorials/Manifest b/dev-ros/rospy_tutorials/Manifest
index f88cf519cf6c..eb0e9f1dd6e4 100644
--- a/dev-ros/rospy_tutorials/Manifest
+++ b/dev-ros/rospy_tutorials/Manifest
@@ -3,10 +3,12 @@ DIST ros_tutorials-0.7.0.tar.gz 140125 BLAKE2B 9f1006c933b4cb642f77c8e68ddda9221
 DIST ros_tutorials-0.7.1.tar.gz 140483 BLAKE2B 8f2d4aee6494476bf7efb2ea35962ea6154485143f108b8e7603a9a1e67cb76f6c87e7b2612cd07ba19c50b44cd7fbbcd89f13f902eafd17c2a0eb8738357050 SHA512 0970e6428af992addfa1af327b2e0a3f85a926c90cfceba89d415acc5404a364164e0dd497c9296f03ac06c575380ad21e83b0cdbf6709c49dc650087145ddaa
 DIST ros_tutorials-0.8.0.tar.gz 153739 BLAKE2B 0dc7918a2b95a26518d07d753040e381b26c357eb3995a22a429d58c244751d7c58c8736efbab23a6a5ca6903f08e43acf9519f2a534b22fe89ea853b2e3fbff SHA512 269f71ef360f7441e1bfed2c2b3da791ce8018d6ec833a1fb7198d289067359b1e7704e37580c61188cc45034c788f3ca463882f8247a155752ff5c61939d795
 DIST ros_tutorials-0.8.1.tar.gz 153831 BLAKE2B c34aec17ffd247554e37abb252848183392864c801dce7e2cae8c66d9fd30fdb12d50163487eff8615593df1532dece6c86303aab0b91d4075c14a9fba652b5a SHA512 f537312a78c27375791e11820f4d3a70433ce200d724d80bc8b417edd3c6dcbbf72abac0e9a98a199da2e3a8dbdec34e81d9106be4f6a5243a6f84d02d9ca668
+DIST ros_tutorials-0.9.0.tar.gz 154992 BLAKE2B d7a45d0adaa1507ae9494ea9590b9c69d3bbececa01f209a93825432b4b362499cde8c966e6734dbd854478e98970c340403ac56cb99a00b07cf9cff8b28fa36 SHA512 7beba72d3f72943ea5402416dc03809576d47d4e76e81d9ed85eba69c1f9a4e5737a91bdac76747f47e9d6459e5dd8e062cc8ec5f2fb9450cdb013b416534e56
 EBUILD rospy_tutorials-0.6.1.ebuild 584 BLAKE2B 04767b0c93b0b6b0654e7ceea0baf700e8158157cab692ca68ee64d0a8de0623b822af0b628364b6290a6b3fc24b3da92299080308313bfd53c377a5158c8453 SHA512 923911a96d30ac4af0902b15329669798939c2325a38f44bdec8b046a4891a5d3d0e977d7f70e93a48b44cf7989cc39911004f4c0a692b00be58189a357a1f77
 EBUILD rospy_tutorials-0.7.0.ebuild 584 BLAKE2B 04767b0c93b0b6b0654e7ceea0baf700e8158157cab692ca68ee64d0a8de0623b822af0b628364b6290a6b3fc24b3da92299080308313bfd53c377a5158c8453 SHA512 923911a96d30ac4af0902b15329669798939c2325a38f44bdec8b046a4891a5d3d0e977d7f70e93a48b44cf7989cc39911004f4c0a692b00be58189a357a1f77
 EBUILD rospy_tutorials-0.7.1.ebuild 584 BLAKE2B ed4d39bd594234392e65e19dcaa019c7620196cc3807203984c77e779c9ad1b28f5940882bf2e131a21bce294c222a2c2131660c7a7bbf87a2ad0c8cdc990240 SHA512 3ac348fb1a4436859b9f74e9fe78db3d239f78fd12757f2d5481c5b2562c56fb36aeae28e23419cd278e7d34f7ff8404af81dce5e0322f9131ed69ac2d71f748
 EBUILD rospy_tutorials-0.8.0.ebuild 584 BLAKE2B 40388c2c6d10ade2e2b313523f6d21d5fadc0c6d9c71769245833e5e5b56a3b16ab8d97c72bf4c4672e0431c33ad3092e675e04d5070bdf26f1df8ad3c63aa61 SHA512 01fb16bb755f6f9f9afa5045fd4b76b370800b3e59dce440317a4c5b26cfeb6e2d1d66195fee0374185cd08e91dd25bcba9cb5130581727293de7e1eb27a5712
 EBUILD rospy_tutorials-0.8.1.ebuild 584 BLAKE2B 40388c2c6d10ade2e2b313523f6d21d5fadc0c6d9c71769245833e5e5b56a3b16ab8d97c72bf4c4672e0431c33ad3092e675e04d5070bdf26f1df8ad3c63aa61 SHA512 01fb16bb755f6f9f9afa5045fd4b76b370800b3e59dce440317a4c5b26cfeb6e2d1d66195fee0374185cd08e91dd25bcba9cb5130581727293de7e1eb27a5712
+EBUILD rospy_tutorials-0.9.0.ebuild 584 BLAKE2B efcf40c9f6d8e01f5195c13812c8155ad424281f6320d3cdf3aa1848f009db86b8d04b6ea0c120dffc3135f1d218807e260fd4711955aace0dda5880f5af7866 SHA512 91fdde82439c6052e3beaa60c3fcf05584db3b37b15feab37f84ec9c5eb3c8c74a36b630232756bd5c71d31d8ee328f811c0e7742899eae1c765b930e839f0ac
 EBUILD rospy_tutorials-9999.ebuild 584 BLAKE2B 04767b0c93b0b6b0654e7ceea0baf700e8158157cab692ca68ee64d0a8de0623b822af0b628364b6290a6b3fc24b3da92299080308313bfd53c377a5158c8453 SHA512 923911a96d30ac4af0902b15329669798939c2325a38f44bdec8b046a4891a5d3d0e977d7f70e93a48b44cf7989cc39911004f4c0a692b00be58189a357a1f77
 MISC metadata.xml 331 BLAKE2B 63203c43a194bcfe4efe5c478b8cbb8700ebc307b2312972f546ed86043374133ec6826aa6465c8c4f6c7fc94fdcc4f29c2c535d1c0bdcb1806c57ea67ebbc1e SHA512 110df3a9a1b63d8200d2c67c2671a9ca8dfdc307d54545c09f6c790e019c149e09db82a1bbbf40677ae528e0f6e12235987a21efff1d6c38e50871bbf98b477a
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.9.0.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.9.0.ebuild
new file mode 100644
index 000000000000..4ad7609bac39
--- /dev/null
+++ b/dev-ros/rospy_tutorials/rospy_tutorials-0.9.0.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_tutorials"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/turtlesim/Manifest b/dev-ros/turtlesim/Manifest
index ac79d0764d40..0a87f5a06186 100644
--- a/dev-ros/turtlesim/Manifest
+++ b/dev-ros/turtlesim/Manifest
@@ -1,4 +1,6 @@
 DIST ros_tutorials-0.8.1.tar.gz 153831 BLAKE2B c34aec17ffd247554e37abb252848183392864c801dce7e2cae8c66d9fd30fdb12d50163487eff8615593df1532dece6c86303aab0b91d4075c14a9fba652b5a SHA512 f537312a78c27375791e11820f4d3a70433ce200d724d80bc8b417edd3c6dcbbf72abac0e9a98a199da2e3a8dbdec34e81d9106be4f6a5243a6f84d02d9ca668
+DIST ros_tutorials-0.9.0.tar.gz 154992 BLAKE2B d7a45d0adaa1507ae9494ea9590b9c69d3bbececa01f209a93825432b4b362499cde8c966e6734dbd854478e98970c340403ac56cb99a00b07cf9cff8b28fa36 SHA512 7beba72d3f72943ea5402416dc03809576d47d4e76e81d9ed85eba69c1f9a4e5737a91bdac76747f47e9d6459e5dd8e062cc8ec5f2fb9450cdb013b416534e56
 EBUILD turtlesim-0.8.1.ebuild 774 BLAKE2B 7186c188c1a1e1ca0eae4e71d52968879f4dc5307de29eba04c303f8ee823762dfe2f7e9392e7dbf0b747ed2c6039fe62fbf065f046b6050bd9ef91ed5928ae4 SHA512 8dc724d0a64be8fdf139dcd875965935201b2b6de5eae6265a18d05f76d0a3070ebf63b0f36c6f1225eec3553f60fb6162b0159da298465d78e4b9b54ce4bcbb
+EBUILD turtlesim-0.9.0.ebuild 774 BLAKE2B 6e7dc750b9d704cd11fa9729796b1529513aafa28c8385c969a99cf10bb443b339292cd33316f90d060994cb50593d86da57d373c2a079f37c07937b0c2c3789 SHA512 98ae52b0813983852061ab691d7c038afef66650b2345cb1fd16386ea4932576b92ba26e9e3f81e9f94158f4df2aa9328462d20dfc2ce7d366e9d3e13aed6652
 EBUILD turtlesim-9999.ebuild 774 BLAKE2B 2bbfdd355907a2a63bf44b0781482d75a01a1c0f92bb0301538a5e791e2aa72ec0bfa8b63462d3395aabce3cc032f2cdc0fc073de54fa67d76097d7797c32337 SHA512 1d2e018a5ee100fb1e68844cf92c6567b5c53954d5d3221bc0f8f749e6c6cc7b80087b41e130b62ca174d575f1488329aca360fb80d179fc5a4505ed8c345d43
 MISC metadata.xml 331 BLAKE2B 63203c43a194bcfe4efe5c478b8cbb8700ebc307b2312972f546ed86043374133ec6826aa6465c8c4f6c7fc94fdcc4f29c2c535d1c0bdcb1806c57ea67ebbc1e SHA512 110df3a9a1b63d8200d2c67c2671a9ca8dfdc307d54545c09f6c790e019c149e09db82a1bbbf40677ae528e0f6e12235987a21efff1d6c38e50871bbf98b477a
diff --git a/dev-ros/turtlesim/turtlesim-0.9.0.ebuild b/dev-ros/turtlesim/turtlesim-0.9.0.ebuild
new file mode 100644
index 000000000000..fb6ecc08ff3f
--- /dev/null
+++ b/dev-ros/turtlesim/turtlesim-0.9.0.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_tutorials"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/std_srvs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Tool made for teaching ROS and ROS packages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-libs/boost:=[threads]
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/roscpp_serialization
+	dev-ros/roslib
+	dev-ros/rostime
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-14 01:05:40 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-14 01:05:40 +0100
commit	76cba73c47c8694e74377004634daca18f2d9c08 (patch)
tree	468603ebdc189bcfae77696162761b3be936baea /dev-ros
parent	6957f5c65b02bba533954eabc0b62f5de36be206 (diff)