gentoo resync : 21.07.2018

37 files changed, 156 insertions, 258 deletions

diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index c1a8bc2450c6..52cb022564d1 100644
--- a/ros-meta/Manifest.gz
+++ b/ros-meta/Manifest.gz
diff --git a/ros-meta/audio_common/Manifest b/ros-meta/audio_common/Manifest
index baa94019168f..7a34aaec6fc2 100644
--- a/ros-meta/audio_common/Manifest
+++ b/ros-meta/audio_common/Manifest
@@ -1,6 +1,8 @@
 DIST audio_common-0.3.1.tar.gz 184749 BLAKE2B 3404c419962dc6bf22f63a36bf43cb8d7509244f84a2a3407717ee31f1be56e22e352e714310d69b9ee280d0aa1d13df3cdbcbb0a42a47f3d3408cb42e3ddfa5 SHA512 3accd7d0ff91ce70c643747ae0b4db4c11bbd6b93dda02c1934d23a900b6bf286e72461e296fe1e0d49ebadd99c3ca1b042db8feddc9cca2ae70a0caccea7147
 DIST audio_common-0.3.2.tar.gz 187214 BLAKE2B 12708d58c9ba28477f5f42866310aedaba66f647b20064b41675befe63f095a08b077e6082ec7969db7c626eb7576ac108c4a1f492083b3554b93ac0c56a6415 SHA512 bdd28e05f45b177c22e64bba168a722ff9b7bdf72f9b11a86bcc08ba7f9edfed83793f87aa5479354dff10a5834f13363f6986a63f60c0af965006b837df1508
+DIST audio_common-0.3.3.tar.gz 187239 BLAKE2B 2a7172a68d2a0561c4aa20923f3ed5682d41f6e09c1b7b7cedfd9c7ebf0f03302749355a6c36fdd6dd8c6cad5994e2fe0530e16a6514b6ca33269da5be907a73 SHA512 8cfd17ac065ce6379085183b07ca85299d7e2dc17077d41d1b690e72b707ce076d88e84b1fdf639e0290309f3ea19a7d8a1e185113c081f32a2372e1874b7036
 EBUILD audio_common-0.3.1.ebuild 445 BLAKE2B c5d2309725f5be1d4f3a8ff93b85ae4314294a16ba938173d7300841ae37566b73998329b2b0725a0893cde72eb65e332286b28e27c692d89a5d38183983b735 SHA512 a935365402497017e18f8d3076d95410f8548934226eb3a1356ba4676bc2fceb6dbc8a9e9b5ff22ef973ad3d62d0aa630ce828fcf4755939784b66ddd9df15e7
 EBUILD audio_common-0.3.2.ebuild 445 BLAKE2B fbd3db94de88e4a4dbd29c2de6712055c2c98f740ece29ffff014ec7dd5d35b6c3938a0a32bd93142498f6a968780a047adb7f3e048feda886a1d50f3a32b96b SHA512 9f66a6664f8f668f2075e1addb695b1497535a20629b70d318924478b773122c7e1296646f55c231ae64c9b75e4ef580091ff37fbbfa94c257e6ddbb6fb4957e
+EBUILD audio_common-0.3.3.ebuild 445 BLAKE2B fbd3db94de88e4a4dbd29c2de6712055c2c98f740ece29ffff014ec7dd5d35b6c3938a0a32bd93142498f6a968780a047adb7f3e048feda886a1d50f3a32b96b SHA512 9f66a6664f8f668f2075e1addb695b1497535a20629b70d318924478b773122c7e1296646f55c231ae64c9b75e4ef580091ff37fbbfa94c257e6ddbb6fb4957e
 EBUILD audio_common-9999.ebuild 445 BLAKE2B 29102438426520b303d050239c1e99849d1d144db61ffad6cc0cda90eadb69c7c377696248f60072ee505b02c2f1503df301f35d1968a6268047656accaa8aaf SHA512 08cf87d7e7fa9011bb2f96abaff0672c8908d15780ba9e31fe7c43c396c7ddf064060c85b896be9d5dd13da95f80d05cc4cf93b37b735d790f960f9d46c503eb
 MISC metadata.xml 338 BLAKE2B 8dc3e58c3c56a7cc0d39ca8ac7c62cf4a315a6f3fc9ad8c1d36596fd7bde5f09f7baf8b6ff36de20b460d7049d792451dae7cc7ce22e5dc3da64b442918d9a35 SHA512 40fedee9626fb1f621315a3e0c25f469eb98b67a391cfbabcafd5971079b33f4c8d1bc61523b8c2e914d7d7b7a6ddb50d1071beff80f30d263fec27586c9c1a5
diff --git a/ros-meta/audio_common/audio_common-0.3.3.ebuild b/ros-meta/audio_common/audio_common-0.3.3.ebuild
new file mode 100644
index 000000000000..7b04768cb702
--- /dev/null
+++ b/ros-meta/audio_common/audio_common-0.3.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common code for working with audio in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/audio_capture
+	dev-ros/audio_common_msgs
+	dev-ros/audio_play
+	dev-ros/sound_play
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/desktop/Manifest b/ros-meta/desktop/Manifest
index 02bc5aa8ef9c..9845006bb5d0 100644
--- a/ros-meta/desktop/Manifest
+++ b/ros-meta/desktop/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 DIST metapackages-1.4.0.tar.gz 1955 BLAKE2B ef6cfd432f8109a39db9e01dab9fc87f2c2da55f5c6890e9feee69e0a955c4f2eeb092ba61911cb700eb0feff7a2659dbd3b65019bfea960f293ee814b411380 SHA512 7694fcb88081c619e6b5aaedb7fbe2cd77f9cee8a45d79848ba354d654aff77467c3d28925b21c52b985b1cb81e36d2cdf84b5b27bfecd8f54b7acb2c92acd71
-EBUILD desktop-1.3.1.ebuild 426 BLAKE2B 62f0f275406b690b02893c52f8fdae0a240b55b5957de525b1acb5279ecb9103cbc807eaffb4793fd7199e530b5854ef6c239f6b8e5b5d31366292b850a5ee8e SHA512 e5b59aab7626053c2171bcf5b68953ede65661a055a4ab1a9da3026166febb6ca1f417108835d963adc4a1743fc417497da0b3f0430cbc87f3c36c8143fc47aa
-EBUILD desktop-1.3.2.ebuild 545 BLAKE2B 80bdf50ff305641fb13a4f79eb3772b777aa8eb93aa34b73ad691605b3f47359887695e2e494b62978653ad9c73d8a2aa68d86c5d903148c5438c4076d52626c SHA512 85f8dc98250b2c87174b49dc8c60051ea5ce1344841b432ecfb3fd13c796022c8bce4325ee74416af3f90235cf2a2956d1cf8baca9f557484f043ac64674e33c
+DIST metapackages-1.4.1.tar.gz 1961 BLAKE2B 9fb450ad10a9d8485314ddbb1acfaec0961fecfc7098a1de314e2dc5abf55f6267bb5e528a107a46b22f37e1afe96b42b0896e5f2513905d85b94aebeb56e425 SHA512 cbfb8d865d95f2759f8f57df2cb81ef7fa3ca21698e11b442a6dbce5cba8ba93f09022fcafd4efa3e2197ee726e082de62f213e009684a62589358a64495f9fd
 EBUILD desktop-1.4.0.ebuild 545 BLAKE2B 80bdf50ff305641fb13a4f79eb3772b777aa8eb93aa34b73ad691605b3f47359887695e2e494b62978653ad9c73d8a2aa68d86c5d903148c5438c4076d52626c SHA512 85f8dc98250b2c87174b49dc8c60051ea5ce1344841b432ecfb3fd13c796022c8bce4325ee74416af3f90235cf2a2956d1cf8baca9f557484f043ac64674e33c
+EBUILD desktop-1.4.1.ebuild 545 BLAKE2B 80bdf50ff305641fb13a4f79eb3772b777aa8eb93aa34b73ad691605b3f47359887695e2e494b62978653ad9c73d8a2aa68d86c5d903148c5438c4076d52626c SHA512 85f8dc98250b2c87174b49dc8c60051ea5ce1344841b432ecfb3fd13c796022c8bce4325ee74416af3f90235cf2a2956d1cf8baca9f557484f043ac64674e33c
 EBUILD desktop-9999.ebuild 545 BLAKE2B 80bdf50ff305641fb13a4f79eb3772b777aa8eb93aa34b73ad691605b3f47359887695e2e494b62978653ad9c73d8a2aa68d86c5d903148c5438c4076d52626c SHA512 85f8dc98250b2c87174b49dc8c60051ea5ce1344841b432ecfb3fd13c796022c8bce4325ee74416af3f90235cf2a2956d1cf8baca9f557484f043ac64674e33c
 MISC metadata.xml 330 BLAKE2B 36f43f490574870aeef3890638e64a34286ccf546cdfc0451b5fddeefef2e32dffa69699d6154999c54368cdf7c42974800efa44515e6d2485d36acb04f9197a SHA512 62a9e0730238ae6511441116167bd835c785291f6db65c554a68069e69b81a713f1ed7a46cbc30cafc64377b170c3f94ee979140013c11f41af9f43906214da5
diff --git a/ros-meta/desktop/desktop-1.3.1.ebuild b/ros-meta/desktop/desktop-1.3.1.ebuild
deleted file mode 100644
index 57ee10fc02b5..000000000000
--- a/ros-meta/desktop/desktop-1.3.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/metapackages"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Metapackage for a basic ROS desktop install"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	ros-meta/robot
-	ros-meta/viz
-	dev-ros/roslint
-	ros-meta/visualization_tutorials
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/desktop/desktop-1.3.2.ebuild b/ros-meta/desktop/desktop-1.4.1.ebuild
index 801a5e18074b..801a5e18074b 100644
--- a/ros-meta/desktop/desktop-1.3.2.ebuild
+++ b/ros-meta/desktop/desktop-1.4.1.ebuild
diff --git a/ros-meta/desktop_full/Manifest b/ros-meta/desktop_full/Manifest
index 5a63820fc761..494c4c2a01bb 100644
--- a/ros-meta/desktop_full/Manifest
+++ b/ros-meta/desktop_full/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 DIST metapackages-1.4.0.tar.gz 1955 BLAKE2B ef6cfd432f8109a39db9e01dab9fc87f2c2da55f5c6890e9feee69e0a955c4f2eeb092ba61911cb700eb0feff7a2659dbd3b65019bfea960f293ee814b411380 SHA512 7694fcb88081c619e6b5aaedb7fbe2cd77f9cee8a45d79848ba354d654aff77467c3d28925b21c52b985b1cb81e36d2cdf84b5b27bfecd8f54b7acb2c92acd71
-EBUILD desktop_full-1.3.1.ebuild 429 BLAKE2B f94e018c3ddb1606b32961151a7f7d22bc07b1024bcf3104a5569887faa7a0cbf23e4f6d08917e5a1715042c3f3995a5066b7579387c71f6091ce100e2ad597a SHA512 a909d6569232079079266e7167831db796b95dfafa393b89b0332e189fbfde3f16ca0cc35b54464e8a3bfb639dd64d396c384a207371eb27552e83ebf607a6b9
-EBUILD desktop_full-1.3.2.ebuild 429 BLAKE2B fa8abeef13b7e17677e6f7f645adaa5d97d1388e3fc258e4c9893ba15924048b82a219d5c99218b6bfe5be2daad4ebfd155f3a1a47aac5659ba8644a229f98d7 SHA512 99329d95c13cfdd580ecfd238fd887bb2dcc6b98261f0aaeda07f101a764a13892d0b5a1abf80ef9c3641969bc38f3ca70cc3a912a0348e1c033ab2b566110c5
+DIST metapackages-1.4.1.tar.gz 1961 BLAKE2B 9fb450ad10a9d8485314ddbb1acfaec0961fecfc7098a1de314e2dc5abf55f6267bb5e528a107a46b22f37e1afe96b42b0896e5f2513905d85b94aebeb56e425 SHA512 cbfb8d865d95f2759f8f57df2cb81ef7fa3ca21698e11b442a6dbce5cba8ba93f09022fcafd4efa3e2197ee726e082de62f213e009684a62589358a64495f9fd
 EBUILD desktop_full-1.4.0.ebuild 429 BLAKE2B fa8abeef13b7e17677e6f7f645adaa5d97d1388e3fc258e4c9893ba15924048b82a219d5c99218b6bfe5be2daad4ebfd155f3a1a47aac5659ba8644a229f98d7 SHA512 99329d95c13cfdd580ecfd238fd887bb2dcc6b98261f0aaeda07f101a764a13892d0b5a1abf80ef9c3641969bc38f3ca70cc3a912a0348e1c033ab2b566110c5
+EBUILD desktop_full-1.4.1.ebuild 429 BLAKE2B fa8abeef13b7e17677e6f7f645adaa5d97d1388e3fc258e4c9893ba15924048b82a219d5c99218b6bfe5be2daad4ebfd155f3a1a47aac5659ba8644a229f98d7 SHA512 99329d95c13cfdd580ecfd238fd887bb2dcc6b98261f0aaeda07f101a764a13892d0b5a1abf80ef9c3641969bc38f3ca70cc3a912a0348e1c033ab2b566110c5
 EBUILD desktop_full-9999.ebuild 429 BLAKE2B fa8abeef13b7e17677e6f7f645adaa5d97d1388e3fc258e4c9893ba15924048b82a219d5c99218b6bfe5be2daad4ebfd155f3a1a47aac5659ba8644a229f98d7 SHA512 99329d95c13cfdd580ecfd238fd887bb2dcc6b98261f0aaeda07f101a764a13892d0b5a1abf80ef9c3641969bc38f3ca70cc3a912a0348e1c033ab2b566110c5
 MISC metadata.xml 330 BLAKE2B 36f43f490574870aeef3890638e64a34286ccf546cdfc0451b5fddeefef2e32dffa69699d6154999c54368cdf7c42974800efa44515e6d2485d36acb04f9197a SHA512 62a9e0730238ae6511441116167bd835c785291f6db65c554a68069e69b81a713f1ed7a46cbc30cafc64377b170c3f94ee979140013c11f41af9f43906214da5
diff --git a/ros-meta/desktop_full/desktop_full-1.3.1.ebuild b/ros-meta/desktop_full/desktop_full-1.3.1.ebuild
deleted file mode 100644
index 5d7cc244f8fe..000000000000
--- a/ros-meta/desktop_full/desktop_full-1.3.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/metapackages"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Metapackage for ROS complete desktop install"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	ros-meta/desktop
-	ros-meta/perception
-	ros-meta/simulators
-	dev-ros/urdf_tutorial
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/desktop_full/desktop_full-1.3.2.ebuild b/ros-meta/desktop_full/desktop_full-1.4.1.ebuild
index 6355747b05a6..6355747b05a6 100644
--- a/ros-meta/desktop_full/desktop_full-1.3.2.ebuild
+++ b/ros-meta/desktop_full/desktop_full-1.4.1.ebuild
diff --git a/ros-meta/gazebo_ros_pkgs/Manifest b/ros-meta/gazebo_ros_pkgs/Manifest
index 4a70910bf3f0..7f3520cb75b9 100644
--- a/ros-meta/gazebo_ros_pkgs/Manifest
+++ b/ros-meta/gazebo_ros_pkgs/Manifest
@@ -2,9 +2,11 @@ DIST gazebo_ros_pkgs-2.6.1.tar.gz 1825040 BLAKE2B ebf12fe16ce2d8ee74bb171bfa1ff1
 DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a3128162c44b10552166c7070eaabde3f806cee9981c60b30b18b6cbe80b83e2871b0100b51329a1a6bd9747320245f21ec1a4 SHA512 f932eebbc88f4922c0275625d50ad5723446744cbf4a59138437d9bdd75a9b5232fdf8df2012460313eb2224d4287daebc3a28181ab3f1b81e67d70a8b8ed5d3
 DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
 DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
+DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
 EBUILD gazebo_ros_pkgs-2.6.1.ebuild 457 BLAKE2B f62b4dc6e86a8c1f6d0459da68d398663e954fc6508cdf4f876ef450bbe9da9dea5189a7f287c0a011ed6f29bb02311ffc243016c780352a710db0ee73e81e5e SHA512 b24783ce061b9089ad545dbf9b2f3b7c02be105afa65f6c252b8714020f6788847f3ab45bb57a1ba6a5ba79a3782b3f0033e5424ede03bf61f872b3c287cd711
 EBUILD gazebo_ros_pkgs-2.6.2.ebuild 457 BLAKE2B 0574045871c0d8611d2a8267b358cac6f8c16c4c6fd6b941747f052d56e089c52f6a202cb7106eb38525f8f6269389d367409fddd0f7cf1a273166c1e130352b SHA512 147db9137c88a3576f1c8177ee21aa0e2f85e882a8bd98dfaaefa82a382dd87eb817303263f1654f6dcd7bb033c83e20ddc47c4ed7d7e54ee0eeb7ca1f6a1980
 EBUILD gazebo_ros_pkgs-2.7.3.ebuild 477 BLAKE2B d9f4c6b5fed3b475447e26efe8be74e5e84cecec13c86ddc37f7dc455089a27a1dec9e8bf1823294788e30292d17d22404e105ab517534c246babe2478cdfa08 SHA512 ec1eac99a927595eab44a04cca08f6c6dded0b5cbbef402953ac55b7c911cee9c4bf6fecde6e6e5cba39673b9d07bfb4e5087937cb51ed56ae60239bb8df1ffd
 EBUILD gazebo_ros_pkgs-2.7.4.ebuild 477 BLAKE2B d9f4c6b5fed3b475447e26efe8be74e5e84cecec13c86ddc37f7dc455089a27a1dec9e8bf1823294788e30292d17d22404e105ab517534c246babe2478cdfa08 SHA512 ec1eac99a927595eab44a04cca08f6c6dded0b5cbbef402953ac55b7c911cee9c4bf6fecde6e6e5cba39673b9d07bfb4e5087937cb51ed56ae60239bb8df1ffd
+EBUILD gazebo_ros_pkgs-2.8.4.ebuild 477 BLAKE2B d9f4c6b5fed3b475447e26efe8be74e5e84cecec13c86ddc37f7dc455089a27a1dec9e8bf1823294788e30292d17d22404e105ab517534c246babe2478cdfa08 SHA512 ec1eac99a927595eab44a04cca08f6c6dded0b5cbbef402953ac55b7c911cee9c4bf6fecde6e6e5cba39673b9d07bfb4e5087937cb51ed56ae60239bb8df1ffd
 EBUILD gazebo_ros_pkgs-9999.ebuild 477 BLAKE2B d9f4c6b5fed3b475447e26efe8be74e5e84cecec13c86ddc37f7dc455089a27a1dec9e8bf1823294788e30292d17d22404e105ab517534c246babe2478cdfa08 SHA512 ec1eac99a927595eab44a04cca08f6c6dded0b5cbbef402953ac55b7c911cee9c4bf6fecde6e6e5cba39673b9d07bfb4e5087937cb51ed56ae60239bb8df1ffd
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-2.8.4.ebuild b/ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-2.8.4.ebuild
new file mode 100644
index 000000000000..ef31ca273e02
--- /dev/null
+++ b/ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-2.8.4.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-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Interface for using ROS with the gazebo simulator"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/gazebo_dev
+	dev-ros/gazebo_msgs
+	dev-ros/gazebo_plugins
+	dev-ros/gazebo_ros
+	dev-ros/gazebo_ros_control
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/geometry2/Manifest b/ros-meta/geometry2/Manifest
index 1b1a82c2ee22..909bfa2c4c68 100644
--- a/ros-meta/geometry2/Manifest
+++ b/ros-meta/geometry2/Manifest
@@ -1,4 +1,6 @@
 DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
+DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
 EBUILD geometry2-0.6.2.ebuild 553 BLAKE2B a833d2917d2b101fb2780314fc94f13ae7b2868f02224b48de3ba4bbcdbc952f2c9807f9fb3914d2ab42584d6479f13dada6a9a06a3480c323af2174158b4f0b SHA512 d7349b359474da6932e0edd35c161589e68f371b1ded904746322659e50357f70c8490bfe07631bbf86feb874ca8213ac828ad765a7b6172a58c6b09c1046587
+EBUILD geometry2-0.6.3.ebuild 553 BLAKE2B a833d2917d2b101fb2780314fc94f13ae7b2868f02224b48de3ba4bbcdbc952f2c9807f9fb3914d2ab42584d6479f13dada6a9a06a3480c323af2174158b4f0b SHA512 d7349b359474da6932e0edd35c161589e68f371b1ded904746322659e50357f70c8490bfe07631bbf86feb874ca8213ac828ad765a7b6172a58c6b09c1046587
 EBUILD geometry2-9999.ebuild 553 BLAKE2B a833d2917d2b101fb2780314fc94f13ae7b2868f02224b48de3ba4bbcdbc952f2c9807f9fb3914d2ab42584d6479f13dada6a9a06a3480c323af2174158b4f0b SHA512 d7349b359474da6932e0edd35c161589e68f371b1ded904746322659e50357f70c8490bfe07631bbf86feb874ca8213ac828ad765a7b6172a58c6b09c1046587
 MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/ros-meta/geometry2/geometry2-0.6.3.ebuild b/ros-meta/geometry2/geometry2-0.6.3.ebuild
new file mode 100644
index 000000000000..ce3a95072a85
--- /dev/null
+++ b/ros-meta/geometry2/geometry2-0.6.3.ebuild
@@ -0,0 +1,29 @@
+# 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/geometry2"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="The second generation Transform Library in ros"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/test_tf2
+	dev-ros/tf2
+	dev-ros/tf2_bullet
+	dev-ros/tf2_eigen
+	dev-ros/tf2_geometry_msgs
+	dev-ros/tf2_kdl
+	dev-ros/tf2_msgs
+	dev-ros/tf2_py
+	dev-ros/tf2_ros
+	dev-ros/tf2_sensor_msgs
+	dev-ros/tf2_tools
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/perception/Manifest b/ros-meta/perception/Manifest
index b5ecd35ee33b..0dd3e89a6073 100644
--- a/ros-meta/perception/Manifest
+++ b/ros-meta/perception/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 DIST metapackages-1.4.0.tar.gz 1955 BLAKE2B ef6cfd432f8109a39db9e01dab9fc87f2c2da55f5c6890e9feee69e0a955c4f2eeb092ba61911cb700eb0feff7a2659dbd3b65019bfea960f293ee814b411380 SHA512 7694fcb88081c619e6b5aaedb7fbe2cd77f9cee8a45d79848ba354d654aff77467c3d28925b21c52b985b1cb81e36d2cdf84b5b27bfecd8f54b7acb2c92acd71
-EBUILD perception-1.3.1.ebuild 513 BLAKE2B ade319e73a11d3c56ea6e178aa0d3198d89ec78303e84643858c7276034bfaa4ab4a936f5a990501bffd6235d6d043d10fc42db28b652dde60a7f90e6c701a9f SHA512 bef67e78bc39dfd6297d7813bfb46b1f5969d4f57f3ec8c06d9a336e5e2ed1b0e253f710337b7ac0ed4f01f1bf2fe6fbd1a74750d27c29e523e0fa46cad3e2c5
-EBUILD perception-1.3.2.ebuild 513 BLAKE2B 6053fd2384b293bc47f875a209e0d3da510c67c1b39043b880f73ef135b2c0d4d91527d508abcc6ccc8cb33ffdc84a97120438a8a8b2cbc3ada7d4b6126ebb49 SHA512 59199855d0562abf6f0bc5bbd1ebdaa9fd9e6492f57b1283806030634b0f8f71f98b36f8cfa26a5f2298ff80bb92361650c437790df15c977f3a026308b0f818
+DIST metapackages-1.4.1.tar.gz 1961 BLAKE2B 9fb450ad10a9d8485314ddbb1acfaec0961fecfc7098a1de314e2dc5abf55f6267bb5e528a107a46b22f37e1afe96b42b0896e5f2513905d85b94aebeb56e425 SHA512 cbfb8d865d95f2759f8f57df2cb81ef7fa3ca21698e11b442a6dbce5cba8ba93f09022fcafd4efa3e2197ee726e082de62f213e009684a62589358a64495f9fd
 EBUILD perception-1.4.0.ebuild 513 BLAKE2B 6053fd2384b293bc47f875a209e0d3da510c67c1b39043b880f73ef135b2c0d4d91527d508abcc6ccc8cb33ffdc84a97120438a8a8b2cbc3ada7d4b6126ebb49 SHA512 59199855d0562abf6f0bc5bbd1ebdaa9fd9e6492f57b1283806030634b0f8f71f98b36f8cfa26a5f2298ff80bb92361650c437790df15c977f3a026308b0f818
+EBUILD perception-1.4.1.ebuild 513 BLAKE2B 6053fd2384b293bc47f875a209e0d3da510c67c1b39043b880f73ef135b2c0d4d91527d508abcc6ccc8cb33ffdc84a97120438a8a8b2cbc3ada7d4b6126ebb49 SHA512 59199855d0562abf6f0bc5bbd1ebdaa9fd9e6492f57b1283806030634b0f8f71f98b36f8cfa26a5f2298ff80bb92361650c437790df15c977f3a026308b0f818
 EBUILD perception-9999.ebuild 513 BLAKE2B cd224cd32cf4b525298158367d2e993d58b5689c8788b824c3f2f3df1b8e1e302e1c74a6f03f755114b1de00a80e6b1e9962a1d807916c7d499eb9a7bbc667e7 SHA512 a10767d24fcabefa889f5e74cc897fbfef67be4f2ecaaf94e8f286680facc1566973fce7f7292c01c03f3b705ec9994bb82f4570d56dadd07545743be83d7f3f
 MISC metadata.xml 330 BLAKE2B 36f43f490574870aeef3890638e64a34286ccf546cdfc0451b5fddeefef2e32dffa69699d6154999c54368cdf7c42974800efa44515e6d2485d36acb04f9197a SHA512 62a9e0730238ae6511441116167bd835c785291f6db65c554a68069e69b81a713f1ed7a46cbc30cafc64377b170c3f94ee979140013c11f41af9f43906214da5
diff --git a/ros-meta/perception/perception-1.3.1.ebuild b/ros-meta/perception/perception-1.3.1.ebuild
deleted file mode 100644
index 79538b393c6c..000000000000
--- a/ros-meta/perception/perception-1.3.1.ebuild
+++ /dev/null
@@ -1,26 +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/metapackages"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Metapackage for ROS perception stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	ros-meta/ros_base
-	ros-meta/image_common
-	ros-meta/image_pipeline
-	ros-meta/image_transport_plugins
-	ros-meta/laser_pipeline
-	ros-meta/perception_pcl
-	ros-meta/vision_opencv
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/perception/perception-1.3.2.ebuild b/ros-meta/perception/perception-1.4.1.ebuild
index 935d09829b90..935d09829b90 100644
--- a/ros-meta/perception/perception-1.3.2.ebuild
+++ b/ros-meta/perception/perception-1.4.1.ebuild
diff --git a/ros-meta/perception_pcl/Manifest b/ros-meta/perception_pcl/Manifest
index 6ebb88f147a3..5d774f58ef7e 100644
--- a/ros-meta/perception_pcl/Manifest
+++ b/ros-meta/perception_pcl/Manifest
@@ -1,6 +1,8 @@
 DIST perception_pcl-1.5.4.tar.gz 73829 BLAKE2B cfc6e964691da42717d134e0b639ef4af4491074de171a84d081bf66c061a51b7c2da750ff539dd784a7a4c34cfdfe18d7d2e38c4e6d0370fbc441f9b3a6196d SHA512 e9da9b2f9b602b67bceec9b0adf515b500d77c9e5c2dbdc1f63bf5a91419bbf7f9f41d602646b8197dffcf7a077b63eb402a507dbc6bb96405a8f4d64576e36e
 DIST perception_pcl-1.6.1.tar.gz 82552 BLAKE2B a442c9df193e38b6aca9e45ec3a469d6603bc2c909fc8c33ad612b2b6448956863555608cb0a0102593e2e71aa7f54ae88b677c2bfbde7df23b114ff4ca83c8f SHA512 c0b63833dd12f3eee5f5ec1e5d8f8bd9c001f1f1787572717a0845fa9a18862bb49a134638f9f0bde5587ac26ab8fd9e6534fcd5ed6b69842780a6fd3762fb5c
+DIST perception_pcl-1.6.2.tar.gz 82896 BLAKE2B dc5d4e25b1841ffde720f7f0231570fcca687d32158da0bb9510f37b7cefbd71dd774bae31a0aa8fdfe7330c98721a7d0df7236bbc9452f9f82c09cd42236695 SHA512 c7c0524a8095fd42b8e12bf2f4453a07d758822ba5a345353df8790e4c22faf250e400fa88a90aea828e80ef4a9992ead04635a5898a45b47245235fec7700ed
 EBUILD perception_pcl-1.5.4.ebuild 381 BLAKE2B 3713f9a5fdd6a88a3bf7f6bdfba2d03bae31601fc38812ccba4c7414a8899e059a78211038ecb055b1899c89b0fc2ed056b2d2d9eca3f951227ec998c007c818 SHA512 320691fce86bc1e045d54216fcb7200ed341ce416364f70f2920259675e92d4f8d2cde9879dd2774a93fde24891ea481e257afcd85b43bb0cba14e5f46565809
 EBUILD perception_pcl-1.6.1.ebuild 406 BLAKE2B 60b7e102147421e44251bd0d991b6b7a687ed35dbdbd25fbd71a36a9c48255bee137061804208dee4a6e939cdfb8e95050541549b7aed56b0393e17c5407a49e SHA512 d8e93b0da589104eaa755287405568ac764ea49427c3d947c4f432d8e60695e54b5d09d7be552bf5fd04fae8cef342cfab4363330941b0bbf869ae00f56d2731
+EBUILD perception_pcl-1.6.2.ebuild 406 BLAKE2B 60b7e102147421e44251bd0d991b6b7a687ed35dbdbd25fbd71a36a9c48255bee137061804208dee4a6e939cdfb8e95050541549b7aed56b0393e17c5407a49e SHA512 d8e93b0da589104eaa755287405568ac764ea49427c3d947c4f432d8e60695e54b5d09d7be552bf5fd04fae8cef342cfab4363330941b0bbf869ae00f56d2731
 EBUILD perception_pcl-9999.ebuild 406 BLAKE2B 60b7e102147421e44251bd0d991b6b7a687ed35dbdbd25fbd71a36a9c48255bee137061804208dee4a6e939cdfb8e95050541549b7aed56b0393e17c5407a49e SHA512 d8e93b0da589104eaa755287405568ac764ea49427c3d947c4f432d8e60695e54b5d09d7be552bf5fd04fae8cef342cfab4363330941b0bbf869ae00f56d2731
 MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/ros-meta/perception_pcl/perception_pcl-1.6.2.ebuild b/ros-meta/perception_pcl/perception_pcl-1.6.2.ebuild
new file mode 100644
index 000000000000..7d954d9b1638
--- /dev/null
+++ b/ros-meta/perception_pcl/perception_pcl-1.6.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="PCL (Point Cloud Library) ROS interface stack"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/pcl_conversions
+	dev-ros/pcl_ros
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/robot/Manifest b/ros-meta/robot/Manifest
index ced3488ce470..2f4c4f8a7c15 100644
--- a/ros-meta/robot/Manifest
+++ b/ros-meta/robot/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 DIST metapackages-1.4.0.tar.gz 1955 BLAKE2B ef6cfd432f8109a39db9e01dab9fc87f2c2da55f5c6890e9feee69e0a955c4f2eeb092ba61911cb700eb0feff7a2659dbd3b65019bfea960f293ee814b411380 SHA512 7694fcb88081c619e6b5aaedb7fbe2cd77f9cee8a45d79848ba354d654aff77467c3d28925b21c52b985b1cb81e36d2cdf84b5b27bfecd8f54b7acb2c92acd71
-EBUILD robot-1.3.1.ebuild 737 BLAKE2B 90d7f43a1d757dc2cae80da8e58663a8109ab474c7a50e06404a01c79e6ba1c7abf809d712f589cbb25449f31e0cf6d47212ed6ab84b9df4191428e2959df3fd SHA512 7f969c5a1d054576feb2fef93a992b21e177dfa6c04ca0bbf27409d19a23b3f883de645574f806fd5be8fe56e2b14aa837bd5ae8e50a79bcabbcf66872d3de49
-EBUILD robot-1.3.2.ebuild 672 BLAKE2B 6803d7b3bfcf08b7b40f2ffa11a1527b6883fafc9da94167a8896885b4731581202187d87ff22cf650f3d1d80470bbc9522789b8b440dff9d22ee5cb7f3bde78 SHA512 2c6fa7342d2c2143ee21dff8d1309bb6f355d9b47a1812339728cad231188129f6057b4acdb6e8a47382a24dbab825307c920cbee604e14aafff7eec23f313ba
+DIST metapackages-1.4.1.tar.gz 1961 BLAKE2B 9fb450ad10a9d8485314ddbb1acfaec0961fecfc7098a1de314e2dc5abf55f6267bb5e528a107a46b22f37e1afe96b42b0896e5f2513905d85b94aebeb56e425 SHA512 cbfb8d865d95f2759f8f57df2cb81ef7fa3ca21698e11b442a6dbce5cba8ba93f09022fcafd4efa3e2197ee726e082de62f213e009684a62589358a64495f9fd
 EBUILD robot-1.4.0.ebuild 672 BLAKE2B 6803d7b3bfcf08b7b40f2ffa11a1527b6883fafc9da94167a8896885b4731581202187d87ff22cf650f3d1d80470bbc9522789b8b440dff9d22ee5cb7f3bde78 SHA512 2c6fa7342d2c2143ee21dff8d1309bb6f355d9b47a1812339728cad231188129f6057b4acdb6e8a47382a24dbab825307c920cbee604e14aafff7eec23f313ba
+EBUILD robot-1.4.1.ebuild 672 BLAKE2B 6803d7b3bfcf08b7b40f2ffa11a1527b6883fafc9da94167a8896885b4731581202187d87ff22cf650f3d1d80470bbc9522789b8b440dff9d22ee5cb7f3bde78 SHA512 2c6fa7342d2c2143ee21dff8d1309bb6f355d9b47a1812339728cad231188129f6057b4acdb6e8a47382a24dbab825307c920cbee604e14aafff7eec23f313ba
 EBUILD robot-9999.ebuild 672 BLAKE2B 6803d7b3bfcf08b7b40f2ffa11a1527b6883fafc9da94167a8896885b4731581202187d87ff22cf650f3d1d80470bbc9522789b8b440dff9d22ee5cb7f3bde78 SHA512 2c6fa7342d2c2143ee21dff8d1309bb6f355d9b47a1812339728cad231188129f6057b4acdb6e8a47382a24dbab825307c920cbee604e14aafff7eec23f313ba
 MISC metadata.xml 330 BLAKE2B 36f43f490574870aeef3890638e64a34286ccf546cdfc0451b5fddeefef2e32dffa69699d6154999c54368cdf7c42974800efa44515e6d2485d36acb04f9197a SHA512 62a9e0730238ae6511441116167bd835c785291f6db65c554a68069e69b81a713f1ed7a46cbc30cafc64377b170c3f94ee979140013c11f41af9f43906214da5
diff --git a/ros-meta/robot/robot-1.3.1.ebuild b/ros-meta/robot/robot-1.3.1.ebuild
deleted file mode 100644
index eb8af7a172af..000000000000
--- a/ros-meta/robot/robot-1.3.1.ebuild
+++ /dev/null
@@ -1,35 +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/metapackages"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Metapackage which extends ros_base and includes ROS libaries for any robot hardware"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	ros-meta/ros_base
-	dev-ros/control_msgs
-	ros-meta/diagnostics
-	dev-ros/filters
-	ros-meta/geometry
-	ros-meta/robot_model
-	dev-ros/robot_state_publisher
-	dev-ros/xacro
-	ros-meta/executive_smach
-	dev-ros/actionlib
-	ros-meta/bond_core
-	dev-ros/class_loader
-	dev-ros/dynamic_reconfigure
-	ros-meta/common_tutorials
-	ros-meta/nodelet_core
-	dev-ros/pluginlib
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/robot/robot-1.3.2.ebuild b/ros-meta/robot/robot-1.4.1.ebuild
index 3762fd95629e..3762fd95629e 100644
--- a/ros-meta/robot/robot-1.3.2.ebuild
+++ b/ros-meta/robot/robot-1.4.1.ebuild
diff --git a/ros-meta/ros_base/Manifest b/ros-meta/ros_base/Manifest
index b2405176339c..3a5e60a43dd1 100644
--- a/ros-meta/ros_base/Manifest
+++ b/ros-meta/ros_base/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 DIST metapackages-1.4.0.tar.gz 1955 BLAKE2B ef6cfd432f8109a39db9e01dab9fc87f2c2da55f5c6890e9feee69e0a955c4f2eeb092ba61911cb700eb0feff7a2659dbd3b65019bfea960f293ee814b411380 SHA512 7694fcb88081c619e6b5aaedb7fbe2cd77f9cee8a45d79848ba354d654aff77467c3d28925b21c52b985b1cb81e36d2cdf84b5b27bfecd8f54b7acb2c92acd71
-EBUILD ros_base-1.3.1.ebuild 536 BLAKE2B 4151952fa349db4aaa72e2ef8ee78be181fcc8aeb54b0c6ab6fe71476d3447562ac96486ae4245b54eff8fa8f3165894e010e8257de7915298c9f725ddf9cd6c SHA512 19a7bead19f66e88ff1bd1b9896c0e358bb30ddab8d1371b13d18c63aed2ab371bea3cf1cb1bd96e4b81aca002661d4fe33fc5270ea598ea0f7df376dab9260a
-EBUILD ros_base-1.3.2.ebuild 509 BLAKE2B b388945f4b17d03abbdb00d80783822eff2af322e91555854571f64a90323ea7d565eb90da7b1d037536cec62c61ed2ec248bcbe43d25caa360087e7072079a5 SHA512 661b92bc7069ba2b0fd80587b132176156800c5f89cb50145f2b41f76a884ff7f3ae5281ae5d6e9463f3e5cdf2a969f6f2dc9987f07708addc64baef99cf76c6
+DIST metapackages-1.4.1.tar.gz 1961 BLAKE2B 9fb450ad10a9d8485314ddbb1acfaec0961fecfc7098a1de314e2dc5abf55f6267bb5e528a107a46b22f37e1afe96b42b0896e5f2513905d85b94aebeb56e425 SHA512 cbfb8d865d95f2759f8f57df2cb81ef7fa3ca21698e11b442a6dbce5cba8ba93f09022fcafd4efa3e2197ee726e082de62f213e009684a62589358a64495f9fd
 EBUILD ros_base-1.4.0.ebuild 509 BLAKE2B b388945f4b17d03abbdb00d80783822eff2af322e91555854571f64a90323ea7d565eb90da7b1d037536cec62c61ed2ec248bcbe43d25caa360087e7072079a5 SHA512 661b92bc7069ba2b0fd80587b132176156800c5f89cb50145f2b41f76a884ff7f3ae5281ae5d6e9463f3e5cdf2a969f6f2dc9987f07708addc64baef99cf76c6
-EBUILD ros_base-9999.ebuild 509 BLAKE2B b388945f4b17d03abbdb00d80783822eff2af322e91555854571f64a90323ea7d565eb90da7b1d037536cec62c61ed2ec248bcbe43d25caa360087e7072079a5 SHA512 661b92bc7069ba2b0fd80587b132176156800c5f89cb50145f2b41f76a884ff7f3ae5281ae5d6e9463f3e5cdf2a969f6f2dc9987f07708addc64baef99cf76c6
+EBUILD ros_base-1.4.1.ebuild 468 BLAKE2B 0d40f13cf830912b2de2a76cd7ce10e882c4e370f366bfba660288cd864d5ea7c2559f6ff7cacefda214896dc61ff89f958155acb67b53fb9a1420a4ba092ebe SHA512 15ebd571681ff7924d851b05b61ea530b56dd03f42588b21263c9d5a69b7b3544a2f4da9d96dd7e533692af6e5c1d0cd4e9af7d2d1bd297f2b625680579be80e
+EBUILD ros_base-9999.ebuild 468 BLAKE2B 0d40f13cf830912b2de2a76cd7ce10e882c4e370f366bfba660288cd864d5ea7c2559f6ff7cacefda214896dc61ff89f958155acb67b53fb9a1420a4ba092ebe SHA512 15ebd571681ff7924d851b05b61ea530b56dd03f42588b21263c9d5a69b7b3544a2f4da9d96dd7e533692af6e5c1d0cd4e9af7d2d1bd297f2b625680579be80e
 MISC metadata.xml 330 BLAKE2B 36f43f490574870aeef3890638e64a34286ccf546cdfc0451b5fddeefef2e32dffa69699d6154999c54368cdf7c42974800efa44515e6d2485d36acb04f9197a SHA512 62a9e0730238ae6511441116167bd835c785291f6db65c554a68069e69b81a713f1ed7a46cbc30cafc64377b170c3f94ee979140013c11f41af9f43906214da5
diff --git a/ros-meta/ros_base/ros_base-1.3.1.ebuild b/ros-meta/ros_base/ros_base-1.3.1.ebuild
deleted file mode 100644
index daf30c8a83fb..000000000000
--- a/ros-meta/ros_base/ros_base-1.3.1.ebuild
+++ /dev/null
@@ -1,26 +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/metapackages"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Metapackage which extends ros_core and includes other basic non-robot tools"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib
-	ros-meta/bond_core
-	dev-ros/class_loader
-	dev-ros/dynamic_reconfigure
-	ros-meta/common_tutorials
-	ros-meta/nodelet_core
-	dev-ros/pluginlib
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/ros_base/ros_base-1.3.2.ebuild b/ros-meta/ros_base/ros_base-1.4.1.ebuild
index 96e3b6f80ab5..dbe04af7dd15 100644
--- a/ros-meta/ros_base/ros_base-1.3.2.ebuild
+++ b/ros-meta/ros_base/ros_base-1.4.1.ebuild
@@ -17,9 +17,7 @@ IUSE=""
 RDEPEND="
 	dev-ros/actionlib
 	ros-meta/bond_core
-	dev-ros/class_loader
 	dev-ros/dynamic_reconfigure
 	ros-meta/nodelet_core
-	dev-ros/pluginlib
 "
 DEPEND="${RDEPEND}"
diff --git a/ros-meta/ros_base/ros_base-9999.ebuild b/ros-meta/ros_base/ros_base-9999.ebuild
index 96e3b6f80ab5..dbe04af7dd15 100644
--- a/ros-meta/ros_base/ros_base-9999.ebuild
+++ b/ros-meta/ros_base/ros_base-9999.ebuild
@@ -17,9 +17,7 @@ IUSE=""
 RDEPEND="
 	dev-ros/actionlib
 	ros-meta/bond_core
-	dev-ros/class_loader
 	dev-ros/dynamic_reconfigure
 	ros-meta/nodelet_core
-	dev-ros/pluginlib
 "
 DEPEND="${RDEPEND}"
diff --git a/ros-meta/ros_control/Manifest b/ros-meta/ros_control/Manifest
index 2b1f3db13622..18c71754c943 100644
--- a/ros-meta/ros_control/Manifest
+++ b/ros-meta/ros_control/Manifest
@@ -1,6 +1,8 @@
 DIST ros_control-0.14.1.tar.gz 655028 BLAKE2B 86bdce47b947fc4f9b8be9c791ba4247240b81e391bb3f5916b26ff67256c928ea4c68d46ac3ffbe2ddb4f3b746769799bbc6617ae7822618f47770b55a09f15 SHA512 c668e589361084e51359bff2af055978cfd73c99fd33ae51962a7cefa7c6fd5a7027c0b2e5ca0c045a602b33b8037d587f9b4d958eea8b2f4199bff1e4016689
 DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
+DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
 EBUILD ros_control-0.14.1.ebuild 713 BLAKE2B 36734e4c3bcefbb8a92dd9dd5df289c9217fdb7fc25a13110c461f556e6993e07e583b8561c82e7f67dfb6724608ac52bfca7dd0f3d7bd708a5892cd819d9af5 SHA512 d7bd30446de06477fbb967595859e2860b77f2df94e1cef22dcc51d5288f6603c81501b1ae899b1562ef559a6da3f04ac3dc0a6a68b62c6adffd11b62952d6eb
 EBUILD ros_control-0.14.2.ebuild 713 BLAKE2B 36734e4c3bcefbb8a92dd9dd5df289c9217fdb7fc25a13110c461f556e6993e07e583b8561c82e7f67dfb6724608ac52bfca7dd0f3d7bd708a5892cd819d9af5 SHA512 d7bd30446de06477fbb967595859e2860b77f2df94e1cef22dcc51d5288f6603c81501b1ae899b1562ef559a6da3f04ac3dc0a6a68b62c6adffd11b62952d6eb
+EBUILD ros_control-0.15.0.ebuild 713 BLAKE2B 36734e4c3bcefbb8a92dd9dd5df289c9217fdb7fc25a13110c461f556e6993e07e583b8561c82e7f67dfb6724608ac52bfca7dd0f3d7bd708a5892cd819d9af5 SHA512 d7bd30446de06477fbb967595859e2860b77f2df94e1cef22dcc51d5288f6603c81501b1ae899b1562ef559a6da3f04ac3dc0a6a68b62c6adffd11b62952d6eb
 EBUILD ros_control-9999.ebuild 713 BLAKE2B 429e6d050f66f8a405872eb4ddbd32ae86bfb2c11fcea7dadbc04f7e90d84e6e059e2ea5f72a45d12d3e7eaedbd138e50bf99025e1f3b9d6f12269039e00235d SHA512 453c6a0089331dd0f3aa7d0fa32ed706b2b12b05ac0de923d8aa6d5aeac0de3edd0886dbb388a66b25aa551d303f2c8a71ec711b5758bec059175c0f9db8bcd8
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/ros-meta/ros_control/ros_control-0.15.0.ebuild b/ros-meta/ros_control/ros_control-0.15.0.ebuild
new file mode 100644
index 000000000000..0c1d836b8833
--- /dev/null
+++ b/ros-meta/ros_control/ros_control-0.15.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Controller interfaces, controller managers, transmissions, hardware_interfaces, control_toolbox"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/combined_robot_hw
+	dev-ros/combined_robot_hw_tests
+	dev-ros/controller_interface
+	dev-ros/controller_manager
+	dev-ros/controller_manager_msgs
+	dev-ros/controller_manager_tests
+	dev-ros/hardware_interface
+	dev-ros/joint_limits_interface
+	dev-ros/rqt_controller_manager
+	dev-ros/transmission_interface
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/ros_core/Manifest b/ros-meta/ros_core/Manifest
index 51127c7fd174..57ef8aeae3ac 100644
--- a/ros-meta/ros_core/Manifest
+++ b/ros-meta/ros_core/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 DIST metapackages-1.4.0.tar.gz 1955 BLAKE2B ef6cfd432f8109a39db9e01dab9fc87f2c2da55f5c6890e9feee69e0a955c4f2eeb092ba61911cb700eb0feff7a2659dbd3b65019bfea960f293ee814b411380 SHA512 7694fcb88081c619e6b5aaedb7fbe2cd77f9cee8a45d79848ba354d654aff77467c3d28925b21c52b985b1cb81e36d2cdf84b5b27bfecd8f54b7acb2c92acd71
-EBUILD ros_core-1.3.1.ebuild 786 BLAKE2B a8ef6c213e6663a0ab2ab5ffdab130d15d7b1bcd6a8efbe50e708162614c004b38868bddb60f10baa88ee41a6d40e26a55f9a29b062146fbe999c474cbf5c1dd SHA512 47b4af331afa9250f1b246d0c76c37c4375915234446fcf59dcb21d1b2ce1a76ca619d226f8f591d41441256c5e8c6c13c007d7740e66bec28b7f0c0884a08fa
-EBUILD ros_core-1.3.2.ebuild 793 BLAKE2B 4744a38faa33dabae018151764065fd023db5d0088dc35d78823c961c68600581e3a88ec2c3b7831c51090cf6ef7c540c6be293005324e1c059ce070b765e6cd SHA512 3205b2deafd71b0a71efe24c7431242cd4ee90378f7e5faa94ed4be50de1bf2dd4886243fefe2d37a094bb3f4a07e49484ca0b165246d836e52d18748fa0df31
+DIST metapackages-1.4.1.tar.gz 1961 BLAKE2B 9fb450ad10a9d8485314ddbb1acfaec0961fecfc7098a1de314e2dc5abf55f6267bb5e528a107a46b22f37e1afe96b42b0896e5f2513905d85b94aebeb56e425 SHA512 cbfb8d865d95f2759f8f57df2cb81ef7fa3ca21698e11b442a6dbce5cba8ba93f09022fcafd4efa3e2197ee726e082de62f213e009684a62589358a64495f9fd
 EBUILD ros_core-1.4.0.ebuild 793 BLAKE2B 4744a38faa33dabae018151764065fd023db5d0088dc35d78823c961c68600581e3a88ec2c3b7831c51090cf6ef7c540c6be293005324e1c059ce070b765e6cd SHA512 3205b2deafd71b0a71efe24c7431242cd4ee90378f7e5faa94ed4be50de1bf2dd4886243fefe2d37a094bb3f4a07e49484ca0b165246d836e52d18748fa0df31
-EBUILD ros_core-9999.ebuild 793 BLAKE2B 4744a38faa33dabae018151764065fd023db5d0088dc35d78823c961c68600581e3a88ec2c3b7831c51090cf6ef7c540c6be293005324e1c059ce070b765e6cd SHA512 3205b2deafd71b0a71efe24c7431242cd4ee90378f7e5faa94ed4be50de1bf2dd4886243fefe2d37a094bb3f4a07e49484ca0b165246d836e52d18748fa0df31
+EBUILD ros_core-1.4.1.ebuild 854 BLAKE2B 0b29772ca83b86786375fb0b3395f637fd1cd363f21d338c2697ca2744846093940aa5e2508362afdc7c4e05bf4ee20ba37ff8727ac099cbdb12d76066b5dc1c SHA512 04713684f11ca717b27639c9e3d54f1f8db4352d1b06a8909ceffcf96fe736fb0cac8fc99af4893cddb2ce7523f29ac7c32fd8ef83ce3d4d53a201221ccf6065
+EBUILD ros_core-9999.ebuild 854 BLAKE2B 0b29772ca83b86786375fb0b3395f637fd1cd363f21d338c2697ca2744846093940aa5e2508362afdc7c4e05bf4ee20ba37ff8727ac099cbdb12d76066b5dc1c SHA512 04713684f11ca717b27639c9e3d54f1f8db4352d1b06a8909ceffcf96fe736fb0cac8fc99af4893cddb2ce7523f29ac7c32fd8ef83ce3d4d53a201221ccf6065
 MISC metadata.xml 330 BLAKE2B 36f43f490574870aeef3890638e64a34286ccf546cdfc0451b5fddeefef2e32dffa69699d6154999c54368cdf7c42974800efa44515e6d2485d36acb04f9197a SHA512 62a9e0730238ae6511441116167bd835c785291f6db65c554a68069e69b81a713f1ed7a46cbc30cafc64377b170c3f94ee979140013c11f41af9f43906214da5
diff --git a/ros-meta/ros_core/ros_core-1.3.1.ebuild b/ros-meta/ros_core/ros_core-1.3.1.ebuild
deleted file mode 100644
index aea8dc9115a1..000000000000
--- a/ros-meta/ros_core/ros_core-1.3.1.ebuild
+++ /dev/null
@@ -1,40 +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/metapackages"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Metapackage to aggregate the packages required to use core ROS concepts"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-util/catkin
-	dev-ros/cmake_modules
-	ros-meta/common_msgs
-	dev-ros/gencpp
-	dev-ros/geneus
-	dev-ros/genlisp
-	dev-ros/genpy
-	dev-ros/gennodejs
-	dev-ros/genmsg
-	dev-ros/message_generation
-	dev-ros/message_runtime
-	ros-meta/ros
-	ros-meta/ros_comm
-	dev-ros/rosconsole_bridge
-	ros-meta/roscpp_core
-	dev-ros/rosgraph_msgs
-	dev-ros/rospack
-	dev-ros/std_msgs
-	dev-ros/std_srvs
-	ros-meta/ros_tutorials
-	dev-ros/roslisp
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/ros_core/ros_core-1.3.2.ebuild b/ros-meta/ros_core/ros_core-1.4.1.ebuild
index ebd39617e81e..a38edef6703f 100644
--- a/ros-meta/ros_core/ros_core-1.3.2.ebuild
+++ b/ros-meta/ros_core/ros_core-1.4.1.ebuild
@@ -16,6 +16,7 @@ IUSE=""
 
 RDEPEND="
 	dev-util/catkin
+	dev-ros/class_loader
 	dev-ros/cmake_modules
 	ros-meta/common_msgs
 	dev-ros/gencpp
@@ -26,9 +27,11 @@ RDEPEND="
 	dev-ros/genpy
 	dev-ros/message_generation
 	dev-ros/message_runtime
+	dev-ros/pluginlib
 	ros-meta/ros
 	ros-meta/ros_comm
 	dev-ros/rosbag_migration_rule
+	dev-ros/rosconsole
 	dev-ros/rosconsole_bridge
 	ros-meta/roscpp_core
 	dev-ros/rosgraph_msgs
diff --git a/ros-meta/ros_core/ros_core-9999.ebuild b/ros-meta/ros_core/ros_core-9999.ebuild
index ebd39617e81e..a38edef6703f 100644
--- a/ros-meta/ros_core/ros_core-9999.ebuild
+++ b/ros-meta/ros_core/ros_core-9999.ebuild
@@ -16,6 +16,7 @@ IUSE=""
 
 RDEPEND="
 	dev-util/catkin
+	dev-ros/class_loader
 	dev-ros/cmake_modules
 	ros-meta/common_msgs
 	dev-ros/gencpp
@@ -26,9 +27,11 @@ RDEPEND="
 	dev-ros/genpy
 	dev-ros/message_generation
 	dev-ros/message_runtime
+	dev-ros/pluginlib
 	ros-meta/ros
 	ros-meta/ros_comm
 	dev-ros/rosbag_migration_rule
+	dev-ros/rosconsole
 	dev-ros/rosconsole_bridge
 	ros-meta/roscpp_core
 	dev-ros/rosgraph_msgs
diff --git a/ros-meta/simulators/Manifest b/ros-meta/simulators/Manifest
index 9cfa61a2ee27..1eb700458e6c 100644
--- a/ros-meta/simulators/Manifest
+++ b/ros-meta/simulators/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 DIST metapackages-1.4.0.tar.gz 1955 BLAKE2B ef6cfd432f8109a39db9e01dab9fc87f2c2da55f5c6890e9feee69e0a955c4f2eeb092ba61911cb700eb0feff7a2659dbd3b65019bfea960f293ee814b411380 SHA512 7694fcb88081c619e6b5aaedb7fbe2cd77f9cee8a45d79848ba354d654aff77467c3d28925b21c52b985b1cb81e36d2cdf84b5b27bfecd8f54b7acb2c92acd71
-EBUILD simulators-1.3.1.ebuild 459 BLAKE2B c19449e9bc9f7023b332baa3e89b9769d4eadbb1e4f1f4fba5802aa666110e3d89dd779f4d85fead356dc31c20d7914ebeadb35d4dd573e1683c1a6f2d57a0b2 SHA512 1081400d1256f5d94216b2d76b62bf6af4e3d98b294f2d2ec1ec8dc8d83eacc6e6bbc428918a5a84334626739c82a45fb6d101400e11b887d6cca12d7893c0f1
-EBUILD simulators-1.3.2.ebuild 459 BLAKE2B b64edbc084f8baa0f473d6bb8ab2a402f5f581776195270acb07df6651c9e403dfe867883e468bdbbee1e3e77d22694fd03817543ae54a18496b8ded769f32a8 SHA512 d9352711a79c0c4ec87252cf32574ea2fe27db74a82549da983a9fc1b35c629228b99623e4cdeb10d6374c644d7c798f20fea0cfa928e59625dabbaee9b5ae03
+DIST metapackages-1.4.1.tar.gz 1961 BLAKE2B 9fb450ad10a9d8485314ddbb1acfaec0961fecfc7098a1de314e2dc5abf55f6267bb5e528a107a46b22f37e1afe96b42b0896e5f2513905d85b94aebeb56e425 SHA512 cbfb8d865d95f2759f8f57df2cb81ef7fa3ca21698e11b442a6dbce5cba8ba93f09022fcafd4efa3e2197ee726e082de62f213e009684a62589358a64495f9fd
 EBUILD simulators-1.4.0.ebuild 459 BLAKE2B b64edbc084f8baa0f473d6bb8ab2a402f5f581776195270acb07df6651c9e403dfe867883e468bdbbee1e3e77d22694fd03817543ae54a18496b8ded769f32a8 SHA512 d9352711a79c0c4ec87252cf32574ea2fe27db74a82549da983a9fc1b35c629228b99623e4cdeb10d6374c644d7c798f20fea0cfa928e59625dabbaee9b5ae03
+EBUILD simulators-1.4.1.ebuild 459 BLAKE2B b64edbc084f8baa0f473d6bb8ab2a402f5f581776195270acb07df6651c9e403dfe867883e468bdbbee1e3e77d22694fd03817543ae54a18496b8ded769f32a8 SHA512 d9352711a79c0c4ec87252cf32574ea2fe27db74a82549da983a9fc1b35c629228b99623e4cdeb10d6374c644d7c798f20fea0cfa928e59625dabbaee9b5ae03
 EBUILD simulators-9999.ebuild 459 BLAKE2B 7bd07a1c5578b04c097229f411cad97b02d23e4b7d436745d1e6d0e87133428ff11d53514b617043f4b9694079a4074cbb2a56f3d0224bf0ba48658f0f9a65c5 SHA512 8d22e5f9b25035cd7560b3d350e1a6c350f7cc6dabdd5733f92d97a15a0ad86fd57dba79f05e2fdc1bfce1ad0dadfccc5c22e0e4bb0fade98bbe3af4e0049f46
 MISC metadata.xml 330 BLAKE2B 36f43f490574870aeef3890638e64a34286ccf546cdfc0451b5fddeefef2e32dffa69699d6154999c54368cdf7c42974800efa44515e6d2485d36acb04f9197a SHA512 62a9e0730238ae6511441116167bd835c785291f6db65c554a68069e69b81a713f1ed7a46cbc30cafc64377b170c3f94ee979140013c11f41af9f43906214da5
diff --git a/ros-meta/simulators/simulators-1.3.1.ebuild b/ros-meta/simulators/simulators-1.3.1.ebuild
deleted file mode 100644
index 3f32b3bffea3..000000000000
--- a/ros-meta/simulators/simulators-1.3.1.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/metapackages"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Metapackage for ROS simulation packages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	ros-meta/robot
-	ros-meta/gazebo_ros_pkgs
-	ros-meta/rqt_common_plugins
-	ros-meta/rqt_robot_plugins
-	dev-ros/stage_ros
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/simulators/simulators-1.3.2.ebuild b/ros-meta/simulators/simulators-1.4.1.ebuild
index bdbe43f05722..bdbe43f05722 100644
--- a/ros-meta/simulators/simulators-1.3.2.ebuild
+++ b/ros-meta/simulators/simulators-1.4.1.ebuild
diff --git a/ros-meta/viz/Manifest b/ros-meta/viz/Manifest
index 3e760966cb5d..a2816465d6d3 100644
--- a/ros-meta/viz/Manifest
+++ b/ros-meta/viz/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 DIST metapackages-1.4.0.tar.gz 1955 BLAKE2B ef6cfd432f8109a39db9e01dab9fc87f2c2da55f5c6890e9feee69e0a955c4f2eeb092ba61911cb700eb0feff7a2659dbd3b65019bfea960f293ee814b411380 SHA512 7694fcb88081c619e6b5aaedb7fbe2cd77f9cee8a45d79848ba354d654aff77467c3d28925b21c52b985b1cb81e36d2cdf84b5b27bfecd8f54b7acb2c92acd71
-EBUILD viz-1.3.1.ebuild 434 BLAKE2B 8fa2a335a216f9af99da7807db102143b8a0bb37e9a322d8f0c3265d2ed6d1bca45832f0a6221a6a5d1178cb2c081f8b9cd2b55a9e2d0772c020ca8aa7f3c316 SHA512 e7beebea2671216385a521138cb82c65ca6595288c5a741f20d8931bebeab97427a4e71bf6b2e84af084e453b8833cc1acf5dcdb858a45f8f69795e67235f9e0
-EBUILD viz-1.3.2.ebuild 434 BLAKE2B 20fef374704aec5ea06e301211476e7f58d67d2a9bfb6d29e55d1d182c5e4a767293cf787a3490305427df64f521ceb318a8a63f382b8106cf6e54fceeab656f SHA512 db6e74f589daecf28cff97c2aeaca7d9d72d61ee2d84136a02392ef9579b994c8e71691e515887a3692f1df0c6cd0349af09f7e38432765a1db83a787a86f0bd
+DIST metapackages-1.4.1.tar.gz 1961 BLAKE2B 9fb450ad10a9d8485314ddbb1acfaec0961fecfc7098a1de314e2dc5abf55f6267bb5e528a107a46b22f37e1afe96b42b0896e5f2513905d85b94aebeb56e425 SHA512 cbfb8d865d95f2759f8f57df2cb81ef7fa3ca21698e11b442a6dbce5cba8ba93f09022fcafd4efa3e2197ee726e082de62f213e009684a62589358a64495f9fd
 EBUILD viz-1.4.0.ebuild 434 BLAKE2B 20fef374704aec5ea06e301211476e7f58d67d2a9bfb6d29e55d1d182c5e4a767293cf787a3490305427df64f521ceb318a8a63f382b8106cf6e54fceeab656f SHA512 db6e74f589daecf28cff97c2aeaca7d9d72d61ee2d84136a02392ef9579b994c8e71691e515887a3692f1df0c6cd0349af09f7e38432765a1db83a787a86f0bd
+EBUILD viz-1.4.1.ebuild 434 BLAKE2B 20fef374704aec5ea06e301211476e7f58d67d2a9bfb6d29e55d1d182c5e4a767293cf787a3490305427df64f521ceb318a8a63f382b8106cf6e54fceeab656f SHA512 db6e74f589daecf28cff97c2aeaca7d9d72d61ee2d84136a02392ef9579b994c8e71691e515887a3692f1df0c6cd0349af09f7e38432765a1db83a787a86f0bd
 EBUILD viz-9999.ebuild 434 BLAKE2B aa7cece1a4df982822c4c4e2bb8d2f35cbb8323ff10c8b6db41161e119f56bcccc3080bc10e1741a0dfe889ce1d6b49597ad05e697066763aea4f920b89e3110 SHA512 e414334a461788fa261c681474d288dd3deba70cfbcfc8f6f5bbf1f395f7f55dad661007195ee9cb4e2f7a583866b96b3c5f0f5bc30a9dade8b0ad63bab40663
 MISC metadata.xml 330 BLAKE2B 36f43f490574870aeef3890638e64a34286ccf546cdfc0451b5fddeefef2e32dffa69699d6154999c54368cdf7c42974800efa44515e6d2485d36acb04f9197a SHA512 62a9e0730238ae6511441116167bd835c785291f6db65c554a68069e69b81a713f1ed7a46cbc30cafc64377b170c3f94ee979140013c11f41af9f43906214da5
diff --git a/ros-meta/viz/viz-1.3.1.ebuild b/ros-meta/viz/viz-1.3.1.ebuild
deleted file mode 100644
index 02d5fff22972..000000000000
--- a/ros-meta/viz/viz-1.3.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/metapackages"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Metapackage for ROS visualization packages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	ros-meta/ros_base
-	ros-meta/rqt_common_plugins
-	ros-meta/rqt_robot_plugins
-	dev-ros/rviz
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/viz/viz-1.3.2.ebuild b/ros-meta/viz/viz-1.4.1.ebuild
index 24e9886bfad4..24e9886bfad4 100644
--- a/ros-meta/viz/viz-1.3.2.ebuild
+++ b/ros-meta/viz/viz-1.4.1.ebuild