gentoo resync : 07.04.2018

34 files changed, 109 insertions, 299 deletions

diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index 4d9196ed0fc2..0b3ced267d43 100644
--- a/ros-meta/Manifest.gz
+++ b/ros-meta/Manifest.gz
diff --git a/ros-meta/common_tutorials/Manifest b/ros-meta/common_tutorials/Manifest
index 92a160362a33..573012659e1f 100644
--- a/ros-meta/common_tutorials/Manifest
+++ b/ros-meta/common_tutorials/Manifest
@@ -1,6 +1,8 @@
 DIST common_tutorials-0.1.10.tar.gz 12511 BLAKE2B deeb06317c0f56f2496277f488592ba056b82440cb320fc9ea6bd3d2d6b8828301ce03c2f5db9ed1871b4f6a1caa8c874a510c912ab89ef1d05b01f364ee09be SHA512 92a1eb5865ec3b4acc9e04a507f050d9568e583ce6d0a29f3c6ab37f4c2feb5149f1ddd6269ce1a310251f7b4cbfe8a05c7e4c6bf4c3ca21c15d84f1c6f0422b
+DIST common_tutorials-0.1.11.tar.gz 12527 BLAKE2B 679cee86aad711677d1ed74320832c7ceb6d66adb34b835a80ad536be7bff517a78ca43e04372de23b491f8156ea3a4c268b4661d74fb1c04130e39033e1b961 SHA512 a42ab4b95eeaf9620ae0987f4e1cc530213b39455dea3ff8d944ac24ee7ed8e321ac8ed4f73b8e4d8d882248a850dface0169a5d521b02b226e6d0cb6016a33a
 DIST common_tutorials-0.1.8.tar.gz 10591 BLAKE2B 7bf99e6a46ff52904f34f0b8e226dab10634325531ac736e530499af43ad1f1ca62168e476ef6ea9e33007c883804220b512e7683fed36e6940017624031f0ac SHA512 a0a2e8a7aba3415bf133e95e7d1b72cf5ee81efa962003ccaa2108fdfebd2a03044c60fd4daf73ca69f3a2975bd7fa9c60adfefc32d1b048da11e65aa613607c
 EBUILD common_tutorials-0.1.10.ebuild 462 BLAKE2B 6c61574bf14b8d06905fa3d7b6962f00e2c91ff153008a46b00b22ce32cd8d9361a79e653f5b2569629b68528f52e1ef3ae4f46626f5a0f6f1b39649ab8d0a6d SHA512 9acd83437282fd3997ba76b29d702f143032885ff79867d7282c3b4704787fca61fa0d3570c3c8f329fdbed61a02ea3f655096d3228e0c0e0394c319169bf74b
+EBUILD common_tutorials-0.1.11.ebuild 462 BLAKE2B 6f04fcc0aeddea127e6728a915d78c2378cbc713ca3362984e6390a993a7cb033aa8c355eabbb19658872bd3f244fd087ff1d9b1c1de7b30e4c3b58a73f8558b SHA512 ba4baa4c593d360e30f567e6a0f161abf937d03ce24f2a1ccc025b4fe4b916e5e0ce77b89f35b7bea7b8d703ffac3b1cba293919e35879a4cb7c79151b7b9680
 EBUILD common_tutorials-0.1.8.ebuild 462 BLAKE2B 3c8d79dda3437c685b4f248c8dee082884784f5a697736d9a1d2bf612ece2830a11ae12372415078f3c4bc7c7d80526744951c90890da1048aa153ae2201ec3e SHA512 d436e4bacc9aa32ab033a283e1a8775ce1f7be0d29a7bfba29c806c659276c3549e20990131064a1aa16cbf26c0d4ebb4db9254ad36d77900737c93e93350295
 EBUILD common_tutorials-9999.ebuild 462 BLAKE2B 3c8d79dda3437c685b4f248c8dee082884784f5a697736d9a1d2bf612ece2830a11ae12372415078f3c4bc7c7d80526744951c90890da1048aa153ae2201ec3e SHA512 d436e4bacc9aa32ab033a283e1a8775ce1f7be0d29a7bfba29c806c659276c3549e20990131064a1aa16cbf26c0d4ebb4db9254ad36d77900737c93e93350295
 MISC metadata.xml 334 BLAKE2B 9448c76327ed1df85e94f230f66b62356f9f3f6e0ae2853cba879c3357bf19ba534098914207e4bca6e21b3a1e33a5a911084a5f83b9d9b1bdba8282bf70b6e5 SHA512 dcec72972fcaf9c06c0fcc8ed3825875667e3391de433ace73961159cede1a33c40f7dfca78ca22e018e730024af73562786f90fcc1f2ccf39ab11106f37d038
diff --git a/ros-meta/common_tutorials/common_tutorials-0.1.11.ebuild b/ros-meta/common_tutorials/common_tutorials-0.1.11.ebuild
new file mode 100644
index 000000000000..ba12d700282c
--- /dev/null
+++ b/ros-meta/common_tutorials/common_tutorials-0.1.11.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/common_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage that contains common tutorials"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/actionlib_tutorials
+	dev-ros/nodelet_tutorial_math
+	dev-ros/pluginlib_tutorials
+	dev-ros/turtle_actionlib
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/desktop/Manifest b/ros-meta/desktop/Manifest
index 7c3aec7b065f..a378e0043694 100644
--- a/ros-meta/desktop/Manifest
+++ b/ros-meta/desktop/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.2.0.tar.gz 1803 BLAKE2B 92238eddd05602507c91ae0ef1def2eb0a7608ca76dfed4579e9d5daf85a125f256ccab9b980389131aa3733d0ed8887a7f23b4945c9969291f5c7dd6029b283 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80
-DIST metapackages-1.3.0.tar.gz 1813 BLAKE2B f197af8c8db8ec6368597ce185dc48058b8e74e84952c92c549617fb48e261fc909f569e9a4f1b7bfc591123960ed38f07e2b36dac130e7c76061993d5d07e09 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12
 DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-EBUILD desktop-1.2.0.ebuild 506 BLAKE2B 5286e84fc69ef188fd9183e51f6e280f3609cfdd6c88914b7022895ffa5abe91805c2678590ad65729915b52ec5e76b83aad6b0d8244bfd1a7f0b9960ba97240 SHA512 7f13b4085c489328d514088966bf6172cd63efea43c5ae3cc48a0bf1a262bdde3e12b69acabe0af6750e325429562e262643cff05bf3307240674f805aa09dd1
-EBUILD desktop-1.3.0.ebuild 449 BLAKE2B c8554d264bdfd4c03dc486877ffa0972a01d9bb0a3d35b0c375d9b0d2f52d7ebb6ddfb10fa3d856d45c6bd47774e0ce54f4fdd14fa98a85b532d49ba1c5e0b11 SHA512 24bca18b22afd1bc4e436dd582d25f9a8f063959252706b53fe8e303bfd1b06bf75aaf01fff2cae2f895932e24c74322ff8dffeefe0a73d6e68598940ff63e85
+DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 EBUILD desktop-1.3.1.ebuild 426 BLAKE2B 62f0f275406b690b02893c52f8fdae0a240b55b5957de525b1acb5279ecb9103cbc807eaffb4793fd7199e530b5854ef6c239f6b8e5b5d31366292b850a5ee8e SHA512 e5b59aab7626053c2171bcf5b68953ede65661a055a4ab1a9da3026166febb6ca1f417108835d963adc4a1743fc417497da0b3f0430cbc87f3c36c8143fc47aa
-EBUILD desktop-9999.ebuild 426 BLAKE2B 62f0f275406b690b02893c52f8fdae0a240b55b5957de525b1acb5279ecb9103cbc807eaffb4793fd7199e530b5854ef6c239f6b8e5b5d31366292b850a5ee8e SHA512 e5b59aab7626053c2171bcf5b68953ede65661a055a4ab1a9da3026166febb6ca1f417108835d963adc4a1743fc417497da0b3f0430cbc87f3c36c8143fc47aa
+EBUILD desktop-1.3.2.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.0.ebuild b/ros-meta/desktop/desktop-1.3.0.ebuild
deleted file mode 100644
index 6ca330e23b94..000000000000
--- a/ros-meta/desktop/desktop-1.3.0.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/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
-	dev-ros/urdf_tutorial
-	ros-meta/visualization_tutorials
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/desktop/desktop-1.2.0.ebuild b/ros-meta/desktop/desktop-1.3.2.ebuild
index a7be5d33d287..801a5e18074b 100644
--- a/ros-meta/desktop/desktop-1.2.0.ebuild
+++ b/ros-meta/desktop/desktop-1.3.2.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
@@ -17,9 +17,11 @@ IUSE=""
 RDEPEND="
 	ros-meta/robot
 	ros-meta/viz
+	dev-ros/angles
+	ros-meta/common_tutorials
+	ros-meta/geometry_tutorials
+	ros-meta/ros_tutorials
 	dev-ros/roslint
-	ros-meta/rqt_common_plugins
-	ros-meta/rqt_robot_plugins
 	dev-ros/urdf_tutorial
 	ros-meta/visualization_tutorials
 "
diff --git a/ros-meta/desktop/desktop-9999.ebuild b/ros-meta/desktop/desktop-9999.ebuild
index 57ee10fc02b5..801a5e18074b 100644
--- a/ros-meta/desktop/desktop-9999.ebuild
+++ b/ros-meta/desktop/desktop-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,12 @@ IUSE=""
 RDEPEND="
 	ros-meta/robot
 	ros-meta/viz
+	dev-ros/angles
+	ros-meta/common_tutorials
+	ros-meta/geometry_tutorials
+	ros-meta/ros_tutorials
 	dev-ros/roslint
+	dev-ros/urdf_tutorial
 	ros-meta/visualization_tutorials
 "
 DEPEND="${RDEPEND}"
diff --git a/ros-meta/desktop_full/Manifest b/ros-meta/desktop_full/Manifest
index f21086d5651a..76c55f2e0c11 100644
--- a/ros-meta/desktop_full/Manifest
+++ b/ros-meta/desktop_full/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.2.0.tar.gz 1803 BLAKE2B 92238eddd05602507c91ae0ef1def2eb0a7608ca76dfed4579e9d5daf85a125f256ccab9b980389131aa3733d0ed8887a7f23b4945c9969291f5c7dd6029b283 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80
-DIST metapackages-1.3.0.tar.gz 1813 BLAKE2B f197af8c8db8ec6368597ce185dc48058b8e74e84952c92c549617fb48e261fc909f569e9a4f1b7bfc591123960ed38f07e2b36dac130e7c76061993d5d07e09 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12
 DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-EBUILD desktop_full-1.2.0.ebuild 406 BLAKE2B add15f05339431fd2b7f4367b4e8fc590d89dab73f23b52255b6e5d50ec26c3b450b5b8e90eee2a70799e1935b2c6b8daa48ac05f3224218d5f08d9f834ec246 SHA512 cd255969d597fe8efabd2094b615eec58bf8bfffc19b51f9f4010f19733f8bd921cb934c5e523bf3f314f707ef61ecf63e3a782134be22f20ef8471191770a0a
-EBUILD desktop_full-1.3.0.ebuild 406 BLAKE2B add15f05339431fd2b7f4367b4e8fc590d89dab73f23b52255b6e5d50ec26c3b450b5b8e90eee2a70799e1935b2c6b8daa48ac05f3224218d5f08d9f834ec246 SHA512 cd255969d597fe8efabd2094b615eec58bf8bfffc19b51f9f4010f19733f8bd921cb934c5e523bf3f314f707ef61ecf63e3a782134be22f20ef8471191770a0a
+DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 EBUILD desktop_full-1.3.1.ebuild 429 BLAKE2B f94e018c3ddb1606b32961151a7f7d22bc07b1024bcf3104a5569887faa7a0cbf23e4f6d08917e5a1715042c3f3995a5066b7579387c71f6091ce100e2ad597a SHA512 a909d6569232079079266e7167831db796b95dfafa393b89b0332e189fbfde3f16ca0cc35b54464e8a3bfb639dd64d396c384a207371eb27552e83ebf607a6b9
-EBUILD desktop_full-9999.ebuild 429 BLAKE2B f94e018c3ddb1606b32961151a7f7d22bc07b1024bcf3104a5569887faa7a0cbf23e4f6d08917e5a1715042c3f3995a5066b7579387c71f6091ce100e2ad597a SHA512 a909d6569232079079266e7167831db796b95dfafa393b89b0332e189fbfde3f16ca0cc35b54464e8a3bfb639dd64d396c384a207371eb27552e83ebf607a6b9
+EBUILD desktop_full-1.3.2.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.0.ebuild b/ros-meta/desktop_full/desktop_full-1.3.0.ebuild
deleted file mode 100644
index 0958a0238dc7..000000000000
--- a/ros-meta/desktop_full/desktop_full-1.3.0.ebuild
+++ /dev/null
@@ -1,22 +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/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
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/desktop_full/desktop_full-1.2.0.ebuild b/ros-meta/desktop_full/desktop_full-1.3.2.ebuild
index 0958a0238dc7..6355747b05a6 100644
--- a/ros-meta/desktop_full/desktop_full-1.2.0.ebuild
+++ b/ros-meta/desktop_full/desktop_full-1.3.2.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
@@ -18,5 +18,6 @@ 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-9999.ebuild b/ros-meta/desktop_full/desktop_full-9999.ebuild
index 5d7cc244f8fe..6355747b05a6 100644
--- a/ros-meta/desktop_full/desktop_full-9999.ebuild
+++ b/ros-meta/desktop_full/desktop_full-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
diff --git a/ros-meta/perception/Manifest b/ros-meta/perception/Manifest
index 850842a28abb..2db5662c6a34 100644
--- a/ros-meta/perception/Manifest
+++ b/ros-meta/perception/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.2.0.tar.gz 1803 BLAKE2B 92238eddd05602507c91ae0ef1def2eb0a7608ca76dfed4579e9d5daf85a125f256ccab9b980389131aa3733d0ed8887a7f23b4945c9969291f5c7dd6029b283 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80
-DIST metapackages-1.3.0.tar.gz 1813 BLAKE2B f197af8c8db8ec6368597ce185dc48058b8e74e84952c92c549617fb48e261fc909f569e9a4f1b7bfc591123960ed38f07e2b36dac130e7c76061993d5d07e09 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12
 DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-EBUILD perception-1.2.0.ebuild 513 BLAKE2B cd224cd32cf4b525298158367d2e993d58b5689c8788b824c3f2f3df1b8e1e302e1c74a6f03f755114b1de00a80e6b1e9962a1d807916c7d499eb9a7bbc667e7 SHA512 a10767d24fcabefa889f5e74cc897fbfef67be4f2ecaaf94e8f286680facc1566973fce7f7292c01c03f3b705ec9994bb82f4570d56dadd07545743be83d7f3f
-EBUILD perception-1.3.0.ebuild 513 BLAKE2B cd224cd32cf4b525298158367d2e993d58b5689c8788b824c3f2f3df1b8e1e302e1c74a6f03f755114b1de00a80e6b1e9962a1d807916c7d499eb9a7bbc667e7 SHA512 a10767d24fcabefa889f5e74cc897fbfef67be4f2ecaaf94e8f286680facc1566973fce7f7292c01c03f3b705ec9994bb82f4570d56dadd07545743be83d7f3f
+DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 EBUILD perception-1.3.1.ebuild 513 BLAKE2B ade319e73a11d3c56ea6e178aa0d3198d89ec78303e84643858c7276034bfaa4ab4a936f5a990501bffd6235d6d043d10fc42db28b652dde60a7f90e6c701a9f SHA512 bef67e78bc39dfd6297d7813bfb46b1f5969d4f57f3ec8c06d9a336e5e2ed1b0e253f710337b7ac0ed4f01f1bf2fe6fbd1a74750d27c29e523e0fa46cad3e2c5
+EBUILD perception-1.3.2.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.0.ebuild b/ros-meta/perception/perception-1.3.0.ebuild
deleted file mode 100644
index 79094bdc2634..000000000000
--- a/ros-meta/perception/perception-1.3.0.ebuild
+++ /dev/null
@@ -1,26 +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/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.2.0.ebuild b/ros-meta/perception/perception-1.3.2.ebuild
index 79094bdc2634..935d09829b90 100644
--- a/ros-meta/perception/perception-1.2.0.ebuild
+++ b/ros-meta/perception/perception-1.3.2.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/ros-meta/perception_pcl/Manifest b/ros-meta/perception_pcl/Manifest
index ff0227a4877e..4746dc3cfc65 100644
--- a/ros-meta/perception_pcl/Manifest
+++ b/ros-meta/perception_pcl/Manifest
@@ -4,11 +4,13 @@ DIST perception_pcl-1.4.1.tar.gz 66440 BLAKE2B 9670227e66b42c36a63de282eb015efe6
 DIST perception_pcl-1.5.1.tar.gz 66945 BLAKE2B a4ba43188386a39e5d73d0b4b67833ce1f6a6c6ce2e3912d743aae755116f2e5f6cc78ca9ea0d11b5e7ab5f07591872eca2df668e746df3dd0f9a79acc4554f4 SHA512 d7fd77e8afeccd45226404c57a267af19b0c98cb61123bdb1b1330fc3833b6bc1a72e775a3eba6a6f8df212af23328894617cf45a4c028278ef408a1d0ef74ce
 DIST perception_pcl-1.5.2.tar.gz 67004 BLAKE2B 6193ca81637df71c6e990d70425cc23b7284a756dc96d341ed5f9fc25d1404747dccc0a24d9de08428d7bec43bb13874619b70f57ef7fe35fbc72aeb0954dc77 SHA512 503f46d71dbf58e985422c6f31c3491189dbd9494bc68221026721dc889a34633be867b20f8b5cc8bec77f500cb4133061be1eb1775afd2a4edcdac13cb629f5
 DIST perception_pcl-1.5.3.tar.gz 67101 BLAKE2B 963d65d348068e574fd0d7431597409d607e779f017b3a645b1add5599baeed559898e5a9873d6b3ead6ea812cfda80b96f9ccfea482801b3c76d17bf234c26b SHA512 e34089f48cfe40f0209a7d4a3a0fb2402c1d1fc35bdf7a57970374bcec50185efcbb1e56b08ee64810a43e83fdf7e45ecddd09ff9660b47399b9f751be80df8b
+DIST perception_pcl-1.5.4.tar.gz 73829 BLAKE2B cfc6e964691da42717d134e0b639ef4af4491074de171a84d081bf66c061a51b7c2da750ff539dd784a7a4c34cfdfe18d7d2e38c4e6d0370fbc441f9b3a6196d SHA512 e9da9b2f9b602b67bceec9b0adf515b500d77c9e5c2dbdc1f63bf5a91419bbf7f9f41d602646b8197dffcf7a077b63eb402a507dbc6bb96405a8f4d64576e36e
 EBUILD perception_pcl-1.3.0.ebuild 381 BLAKE2B f6cca2b63dae4491d472fad5dc5dd354da8e36cf458bb51a9d80c09cb1f5e33e15207e72535b66b1924a6d2060ce593d6577acc61d4d66dcffad95ae9179bd67 SHA512 cda3607ca11a9f6731a4852fb9cf126ab87cfe2e819407ea2775321fd9a9dacf4bc01c586bd532b3dbe798cf2852ac33a301d4c043efeb68d103bdd528b41ebc
 EBUILD perception_pcl-1.4.0.ebuild 381 BLAKE2B f6cca2b63dae4491d472fad5dc5dd354da8e36cf458bb51a9d80c09cb1f5e33e15207e72535b66b1924a6d2060ce593d6577acc61d4d66dcffad95ae9179bd67 SHA512 cda3607ca11a9f6731a4852fb9cf126ab87cfe2e819407ea2775321fd9a9dacf4bc01c586bd532b3dbe798cf2852ac33a301d4c043efeb68d103bdd528b41ebc
 EBUILD perception_pcl-1.4.1.ebuild 381 BLAKE2B f6cca2b63dae4491d472fad5dc5dd354da8e36cf458bb51a9d80c09cb1f5e33e15207e72535b66b1924a6d2060ce593d6577acc61d4d66dcffad95ae9179bd67 SHA512 cda3607ca11a9f6731a4852fb9cf126ab87cfe2e819407ea2775321fd9a9dacf4bc01c586bd532b3dbe798cf2852ac33a301d4c043efeb68d103bdd528b41ebc
 EBUILD perception_pcl-1.5.1.ebuild 381 BLAKE2B 527415132369cf09251a5ea14121c50e2c9e1484d0fecdfb9329dec3ad8738d2f487155716d5ea2ade758346b713597d4a2d4844d97ba5e95411a31efca6afce SHA512 c5a71bad50fb9a8ea8c8488e54e75702399d1cd838006f3553d9e07e916ee1ac28ee6ccfc50608be148b17e724e02c7103142f1f06a5f996212fa7e4d61e1fa5
 EBUILD perception_pcl-1.5.2.ebuild 381 BLAKE2B 527415132369cf09251a5ea14121c50e2c9e1484d0fecdfb9329dec3ad8738d2f487155716d5ea2ade758346b713597d4a2d4844d97ba5e95411a31efca6afce SHA512 c5a71bad50fb9a8ea8c8488e54e75702399d1cd838006f3553d9e07e916ee1ac28ee6ccfc50608be148b17e724e02c7103142f1f06a5f996212fa7e4d61e1fa5
 EBUILD perception_pcl-1.5.3.ebuild 381 BLAKE2B 527415132369cf09251a5ea14121c50e2c9e1484d0fecdfb9329dec3ad8738d2f487155716d5ea2ade758346b713597d4a2d4844d97ba5e95411a31efca6afce SHA512 c5a71bad50fb9a8ea8c8488e54e75702399d1cd838006f3553d9e07e916ee1ac28ee6ccfc50608be148b17e724e02c7103142f1f06a5f996212fa7e4d61e1fa5
+EBUILD perception_pcl-1.5.4.ebuild 381 BLAKE2B 3713f9a5fdd6a88a3bf7f6bdfba2d03bae31601fc38812ccba4c7414a8899e059a78211038ecb055b1899c89b0fc2ed056b2d2d9eca3f951227ec998c007c818 SHA512 320691fce86bc1e045d54216fcb7200ed341ce416364f70f2920259675e92d4f8d2cde9879dd2774a93fde24891ea481e257afcd85b43bb0cba14e5f46565809
 EBUILD perception_pcl-9999.ebuild 381 BLAKE2B f6cca2b63dae4491d472fad5dc5dd354da8e36cf458bb51a9d80c09cb1f5e33e15207e72535b66b1924a6d2060ce593d6577acc61d4d66dcffad95ae9179bd67 SHA512 cda3607ca11a9f6731a4852fb9cf126ab87cfe2e819407ea2775321fd9a9dacf4bc01c586bd532b3dbe798cf2852ac33a301d4c043efeb68d103bdd528b41ebc
 MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/ros-meta/perception_pcl/perception_pcl-1.5.4.ebuild b/ros-meta/perception_pcl/perception_pcl-1.5.4.ebuild
new file mode 100644
index 000000000000..48d0c60e3ead
--- /dev/null
+++ b/ros-meta/perception_pcl/perception_pcl-1.5.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-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_ros
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/robot/Manifest b/ros-meta/robot/Manifest
index 3acf74590cef..5ccd8bcd3e50 100644
--- a/ros-meta/robot/Manifest
+++ b/ros-meta/robot/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.2.0.tar.gz 1803 BLAKE2B 92238eddd05602507c91ae0ef1def2eb0a7608ca76dfed4579e9d5daf85a125f256ccab9b980389131aa3733d0ed8887a7f23b4945c9969291f5c7dd6029b283 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80
-DIST metapackages-1.3.0.tar.gz 1813 BLAKE2B f197af8c8db8ec6368597ce185dc48058b8e74e84952c92c549617fb48e261fc909f569e9a4f1b7bfc591123960ed38f07e2b36dac130e7c76061993d5d07e09 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12
 DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-EBUILD robot-1.2.0.ebuild 737 BLAKE2B a9e0738e8b81460cadcbcdf3170aeb56ab8ed30e58e1e2c69ee8edf9f3d1749a241adaf262999acab5a8409f798316517fc0d268b89defb525a13f04c572e9e3 SHA512 18164ab53b49480238aaf9f6cce4ec060825103849711ce2430d2f8472ad1cada0047c8dccd184d618fd25637fe44ae2bee0b105d66a235519e2943edcab3373
-EBUILD robot-1.3.0.ebuild 737 BLAKE2B a9e0738e8b81460cadcbcdf3170aeb56ab8ed30e58e1e2c69ee8edf9f3d1749a241adaf262999acab5a8409f798316517fc0d268b89defb525a13f04c572e9e3 SHA512 18164ab53b49480238aaf9f6cce4ec060825103849711ce2430d2f8472ad1cada0047c8dccd184d618fd25637fe44ae2bee0b105d66a235519e2943edcab3373
+DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 EBUILD robot-1.3.1.ebuild 737 BLAKE2B 90d7f43a1d757dc2cae80da8e58663a8109ab474c7a50e06404a01c79e6ba1c7abf809d712f589cbb25449f31e0cf6d47212ed6ab84b9df4191428e2959df3fd SHA512 7f969c5a1d054576feb2fef93a992b21e177dfa6c04ca0bbf27409d19a23b3f883de645574f806fd5be8fe56e2b14aa837bd5ae8e50a79bcabbcf66872d3de49
-EBUILD robot-9999.ebuild 737 BLAKE2B a9e0738e8b81460cadcbcdf3170aeb56ab8ed30e58e1e2c69ee8edf9f3d1749a241adaf262999acab5a8409f798316517fc0d268b89defb525a13f04c572e9e3 SHA512 18164ab53b49480238aaf9f6cce4ec060825103849711ce2430d2f8472ad1cada0047c8dccd184d618fd25637fe44ae2bee0b105d66a235519e2943edcab3373
+EBUILD robot-1.3.2.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.0.ebuild b/ros-meta/robot/robot-1.3.0.ebuild
deleted file mode 100644
index a924cceb9df9..000000000000
--- a/ros-meta/robot/robot-1.3.0.ebuild
+++ /dev/null
@@ -1,35 +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/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.2.0.ebuild b/ros-meta/robot/robot-1.3.2.ebuild
index a924cceb9df9..3762fd95629e 100644
--- a/ros-meta/robot/robot-1.2.0.ebuild
+++ b/ros-meta/robot/robot-1.3.2.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
@@ -18,18 +18,15 @@ RDEPEND="
 	ros-meta/ros_base
 	dev-ros/control_msgs
 	ros-meta/diagnostics
+	ros-meta/executive_smach
 	dev-ros/filters
 	ros-meta/geometry
-	ros-meta/robot_model
+	dev-ros/joint_state_publisher
+	dev-ros/kdl_parser
+	dev-ros/kdl_parser_py
 	dev-ros/robot_state_publisher
+	dev-ros/urdf
+	dev-ros/urdf_parser_plugin
 	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-9999.ebuild b/ros-meta/robot/robot-9999.ebuild
index a924cceb9df9..3762fd95629e 100644
--- a/ros-meta/robot/robot-9999.ebuild
+++ b/ros-meta/robot/robot-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
@@ -18,18 +18,15 @@ RDEPEND="
 	ros-meta/ros_base
 	dev-ros/control_msgs
 	ros-meta/diagnostics
+	ros-meta/executive_smach
 	dev-ros/filters
 	ros-meta/geometry
-	ros-meta/robot_model
+	dev-ros/joint_state_publisher
+	dev-ros/kdl_parser
+	dev-ros/kdl_parser_py
 	dev-ros/robot_state_publisher
+	dev-ros/urdf
+	dev-ros/urdf_parser_plugin
 	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/ros_base/Manifest b/ros-meta/ros_base/Manifest
index 7314c45a8989..96d3cc932b1f 100644
--- a/ros-meta/ros_base/Manifest
+++ b/ros-meta/ros_base/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.2.0.tar.gz 1803 BLAKE2B 92238eddd05602507c91ae0ef1def2eb0a7608ca76dfed4579e9d5daf85a125f256ccab9b980389131aa3733d0ed8887a7f23b4945c9969291f5c7dd6029b283 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80
-DIST metapackages-1.3.0.tar.gz 1813 BLAKE2B f197af8c8db8ec6368597ce185dc48058b8e74e84952c92c549617fb48e261fc909f569e9a4f1b7bfc591123960ed38f07e2b36dac130e7c76061993d5d07e09 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12
 DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-EBUILD ros_base-1.2.0.ebuild 536 BLAKE2B b3a7f4b29c00502a396375b97af3daace6e16f4e722d1d987ecf7c374175c9c61d55e270d2d0ddd0c1ee0eff8dda1be1924c69cbd5616011f93154204d249338 SHA512 27a693613fe6580974d0027e463914c2aec8404e48d2314cd8e7d8022cb76d4ad84a27b8067c3e54c96761f3d71b07689f23d55c7632d16a709f64faa37142c0
-EBUILD ros_base-1.3.0.ebuild 536 BLAKE2B b3a7f4b29c00502a396375b97af3daace6e16f4e722d1d987ecf7c374175c9c61d55e270d2d0ddd0c1ee0eff8dda1be1924c69cbd5616011f93154204d249338 SHA512 27a693613fe6580974d0027e463914c2aec8404e48d2314cd8e7d8022cb76d4ad84a27b8067c3e54c96761f3d71b07689f23d55c7632d16a709f64faa37142c0
+DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 EBUILD ros_base-1.3.1.ebuild 536 BLAKE2B 4151952fa349db4aaa72e2ef8ee78be181fcc8aeb54b0c6ab6fe71476d3447562ac96486ae4245b54eff8fa8f3165894e010e8257de7915298c9f725ddf9cd6c SHA512 19a7bead19f66e88ff1bd1b9896c0e358bb30ddab8d1371b13d18c63aed2ab371bea3cf1cb1bd96e4b81aca002661d4fe33fc5270ea598ea0f7df376dab9260a
-EBUILD ros_base-9999.ebuild 536 BLAKE2B b3a7f4b29c00502a396375b97af3daace6e16f4e722d1d987ecf7c374175c9c61d55e270d2d0ddd0c1ee0eff8dda1be1924c69cbd5616011f93154204d249338 SHA512 27a693613fe6580974d0027e463914c2aec8404e48d2314cd8e7d8022cb76d4ad84a27b8067c3e54c96761f3d71b07689f23d55c7632d16a709f64faa37142c0
+EBUILD ros_base-1.3.2.ebuild 509 BLAKE2B b388945f4b17d03abbdb00d80783822eff2af322e91555854571f64a90323ea7d565eb90da7b1d037536cec62c61ed2ec248bcbe43d25caa360087e7072079a5 SHA512 661b92bc7069ba2b0fd80587b132176156800c5f89cb50145f2b41f76a884ff7f3ae5281ae5d6e9463f3e5cdf2a969f6f2dc9987f07708addc64baef99cf76c6
+EBUILD ros_base-9999.ebuild 509 BLAKE2B b388945f4b17d03abbdb00d80783822eff2af322e91555854571f64a90323ea7d565eb90da7b1d037536cec62c61ed2ec248bcbe43d25caa360087e7072079a5 SHA512 661b92bc7069ba2b0fd80587b132176156800c5f89cb50145f2b41f76a884ff7f3ae5281ae5d6e9463f3e5cdf2a969f6f2dc9987f07708addc64baef99cf76c6
 MISC metadata.xml 330 BLAKE2B 36f43f490574870aeef3890638e64a34286ccf546cdfc0451b5fddeefef2e32dffa69699d6154999c54368cdf7c42974800efa44515e6d2485d36acb04f9197a SHA512 62a9e0730238ae6511441116167bd835c785291f6db65c554a68069e69b81a713f1ed7a46cbc30cafc64377b170c3f94ee979140013c11f41af9f43906214da5
diff --git a/ros-meta/ros_base/ros_base-1.3.0.ebuild b/ros-meta/ros_base/ros_base-1.3.0.ebuild
deleted file mode 100644
index f0991587b06e..000000000000
--- a/ros-meta/ros_base/ros_base-1.3.0.ebuild
+++ /dev/null
@@ -1,26 +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/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.2.0.ebuild b/ros-meta/ros_base/ros_base-1.3.2.ebuild
index f0991587b06e..96e3b6f80ab5 100644
--- a/ros-meta/ros_base/ros_base-1.2.0.ebuild
+++ b/ros-meta/ros_base/ros_base-1.3.2.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
@@ -19,7 +19,6 @@ RDEPEND="
 	ros-meta/bond_core
 	dev-ros/class_loader
 	dev-ros/dynamic_reconfigure
-	ros-meta/common_tutorials
 	ros-meta/nodelet_core
 	dev-ros/pluginlib
 "
diff --git a/ros-meta/ros_base/ros_base-9999.ebuild b/ros-meta/ros_base/ros_base-9999.ebuild
index f0991587b06e..96e3b6f80ab5 100644
--- a/ros-meta/ros_base/ros_base-9999.ebuild
+++ b/ros-meta/ros_base/ros_base-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
@@ -19,7 +19,6 @@ RDEPEND="
 	ros-meta/bond_core
 	dev-ros/class_loader
 	dev-ros/dynamic_reconfigure
-	ros-meta/common_tutorials
 	ros-meta/nodelet_core
 	dev-ros/pluginlib
 "
diff --git a/ros-meta/ros_core/Manifest b/ros-meta/ros_core/Manifest
index e50a7defd3f3..0dcf0b27148d 100644
--- a/ros-meta/ros_core/Manifest
+++ b/ros-meta/ros_core/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.2.0.tar.gz 1803 BLAKE2B 92238eddd05602507c91ae0ef1def2eb0a7608ca76dfed4579e9d5daf85a125f256ccab9b980389131aa3733d0ed8887a7f23b4945c9969291f5c7dd6029b283 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80
-DIST metapackages-1.3.0.tar.gz 1813 BLAKE2B f197af8c8db8ec6368597ce185dc48058b8e74e84952c92c549617fb48e261fc909f569e9a4f1b7bfc591123960ed38f07e2b36dac130e7c76061993d5d07e09 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12
 DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-EBUILD ros_core-1.2.0.ebuild 767 BLAKE2B 1c991ead12d1b01cc1247e24abfd48e00326cb2a42ebce6400a505c6371fa0da9354ca9d8f70d2527ff7ee8a66ccf888b72f19ab41117281b9cead9abbe2515c SHA512 6184fd996feb7c8d1bd47ac95d716ce76fb484cfcc9fd2147c56435e846c79a4b8c43d8143d19820b324a1f82aecf9b7144a1d5952519ac3183ba133ad427473
-EBUILD ros_core-1.3.0.ebuild 786 BLAKE2B bbd0af294953bcd52ff10b26637b7ca0a1f82d8537bf04b7260ae3c6d6c09e1f39fce68b5b4ae6e1420c8704cdb8f4cf67c6c36b677ecd29d6afffc7dfeb0faa SHA512 d2d258a9d7ef95240da4017a72d86f75d4e18f3f05fd4c131b97a91bd705ff216ee5ee0e2988405970df975fef4e9feb64be630633b16a0d01f1ae9a856a2c17
+DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 EBUILD ros_core-1.3.1.ebuild 786 BLAKE2B a8ef6c213e6663a0ab2ab5ffdab130d15d7b1bcd6a8efbe50e708162614c004b38868bddb60f10baa88ee41a6d40e26a55f9a29b062146fbe999c474cbf5c1dd SHA512 47b4af331afa9250f1b246d0c76c37c4375915234446fcf59dcb21d1b2ce1a76ca619d226f8f591d41441256c5e8c6c13c007d7740e66bec28b7f0c0884a08fa
-EBUILD ros_core-9999.ebuild 786 BLAKE2B bbd0af294953bcd52ff10b26637b7ca0a1f82d8537bf04b7260ae3c6d6c09e1f39fce68b5b4ae6e1420c8704cdb8f4cf67c6c36b677ecd29d6afffc7dfeb0faa SHA512 d2d258a9d7ef95240da4017a72d86f75d4e18f3f05fd4c131b97a91bd705ff216ee5ee0e2988405970df975fef4e9feb64be630633b16a0d01f1ae9a856a2c17
+EBUILD ros_core-1.3.2.ebuild 793 BLAKE2B 4744a38faa33dabae018151764065fd023db5d0088dc35d78823c961c68600581e3a88ec2c3b7831c51090cf6ef7c540c6be293005324e1c059ce070b765e6cd SHA512 3205b2deafd71b0a71efe24c7431242cd4ee90378f7e5faa94ed4be50de1bf2dd4886243fefe2d37a094bb3f4a07e49484ca0b165246d836e52d18748fa0df31
+EBUILD ros_core-9999.ebuild 793 BLAKE2B 4744a38faa33dabae018151764065fd023db5d0088dc35d78823c961c68600581e3a88ec2c3b7831c51090cf6ef7c540c6be293005324e1c059ce070b765e6cd SHA512 3205b2deafd71b0a71efe24c7431242cd4ee90378f7e5faa94ed4be50de1bf2dd4886243fefe2d37a094bb3f4a07e49484ca0b165246d836e52d18748fa0df31
 MISC metadata.xml 330 BLAKE2B 36f43f490574870aeef3890638e64a34286ccf546cdfc0451b5fddeefef2e32dffa69699d6154999c54368cdf7c42974800efa44515e6d2485d36acb04f9197a SHA512 62a9e0730238ae6511441116167bd835c785291f6db65c554a68069e69b81a713f1ed7a46cbc30cafc64377b170c3f94ee979140013c11f41af9f43906214da5
diff --git a/ros-meta/ros_core/ros_core-1.2.0.ebuild b/ros-meta/ros_core/ros_core-1.2.0.ebuild
deleted file mode 100644
index e0074ba5f1a7..000000000000
--- a/ros-meta/ros_core/ros_core-1.2.0.ebuild
+++ /dev/null
@@ -1,39 +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/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/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.0.ebuild b/ros-meta/ros_core/ros_core-1.3.2.ebuild
index 83c1c3c445b4..ebd39617e81e 100644
--- a/ros-meta/ros_core/ros_core-1.3.0.ebuild
+++ b/ros-meta/ros_core/ros_core-1.3.2.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
@@ -21,20 +21,20 @@ RDEPEND="
 	dev-ros/gencpp
 	dev-ros/geneus
 	dev-ros/genlisp
-	dev-ros/genpy
-	dev-ros/gennodejs
 	dev-ros/genmsg
+	dev-ros/gennodejs
+	dev-ros/genpy
 	dev-ros/message_generation
 	dev-ros/message_runtime
 	ros-meta/ros
 	ros-meta/ros_comm
+	dev-ros/rosbag_migration_rule
 	dev-ros/rosconsole_bridge
 	ros-meta/roscpp_core
 	dev-ros/rosgraph_msgs
+	dev-ros/roslisp
 	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-9999.ebuild b/ros-meta/ros_core/ros_core-9999.ebuild
index 83c1c3c445b4..ebd39617e81e 100644
--- a/ros-meta/ros_core/ros_core-9999.ebuild
+++ b/ros-meta/ros_core/ros_core-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
@@ -21,20 +21,20 @@ RDEPEND="
 	dev-ros/gencpp
 	dev-ros/geneus
 	dev-ros/genlisp
-	dev-ros/genpy
-	dev-ros/gennodejs
 	dev-ros/genmsg
+	dev-ros/gennodejs
+	dev-ros/genpy
 	dev-ros/message_generation
 	dev-ros/message_runtime
 	ros-meta/ros
 	ros-meta/ros_comm
+	dev-ros/rosbag_migration_rule
 	dev-ros/rosconsole_bridge
 	ros-meta/roscpp_core
 	dev-ros/rosgraph_msgs
+	dev-ros/roslisp
 	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/simulators/Manifest b/ros-meta/simulators/Manifest
index 7f3139b857b0..9a10b5a7232c 100644
--- a/ros-meta/simulators/Manifest
+++ b/ros-meta/simulators/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.2.0.tar.gz 1803 BLAKE2B 92238eddd05602507c91ae0ef1def2eb0a7608ca76dfed4579e9d5daf85a125f256ccab9b980389131aa3733d0ed8887a7f23b4945c9969291f5c7dd6029b283 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80
-DIST metapackages-1.3.0.tar.gz 1813 BLAKE2B f197af8c8db8ec6368597ce185dc48058b8e74e84952c92c549617fb48e261fc909f569e9a4f1b7bfc591123960ed38f07e2b36dac130e7c76061993d5d07e09 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12
 DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-EBUILD simulators-1.2.0.ebuild 459 BLAKE2B 7bd07a1c5578b04c097229f411cad97b02d23e4b7d436745d1e6d0e87133428ff11d53514b617043f4b9694079a4074cbb2a56f3d0224bf0ba48658f0f9a65c5 SHA512 8d22e5f9b25035cd7560b3d350e1a6c350f7cc6dabdd5733f92d97a15a0ad86fd57dba79f05e2fdc1bfce1ad0dadfccc5c22e0e4bb0fade98bbe3af4e0049f46
-EBUILD simulators-1.3.0.ebuild 459 BLAKE2B 7bd07a1c5578b04c097229f411cad97b02d23e4b7d436745d1e6d0e87133428ff11d53514b617043f4b9694079a4074cbb2a56f3d0224bf0ba48658f0f9a65c5 SHA512 8d22e5f9b25035cd7560b3d350e1a6c350f7cc6dabdd5733f92d97a15a0ad86fd57dba79f05e2fdc1bfce1ad0dadfccc5c22e0e4bb0fade98bbe3af4e0049f46
+DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 EBUILD simulators-1.3.1.ebuild 459 BLAKE2B c19449e9bc9f7023b332baa3e89b9769d4eadbb1e4f1f4fba5802aa666110e3d89dd779f4d85fead356dc31c20d7914ebeadb35d4dd573e1683c1a6f2d57a0b2 SHA512 1081400d1256f5d94216b2d76b62bf6af4e3d98b294f2d2ec1ec8dc8d83eacc6e6bbc428918a5a84334626739c82a45fb6d101400e11b887d6cca12d7893c0f1
+EBUILD simulators-1.3.2.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.0.ebuild b/ros-meta/simulators/simulators-1.3.0.ebuild
deleted file mode 100644
index 6eebc4d7dcbf..000000000000
--- a/ros-meta/simulators/simulators-1.3.0.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/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.2.0.ebuild b/ros-meta/simulators/simulators-1.3.2.ebuild
index 6eebc4d7dcbf..bdbe43f05722 100644
--- a/ros-meta/simulators/simulators-1.2.0.ebuild
+++ b/ros-meta/simulators/simulators-1.3.2.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/ros-meta/viz/Manifest b/ros-meta/viz/Manifest
index b5ac8d91509f..5411447b8a05 100644
--- a/ros-meta/viz/Manifest
+++ b/ros-meta/viz/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.2.0.tar.gz 1803 BLAKE2B 92238eddd05602507c91ae0ef1def2eb0a7608ca76dfed4579e9d5daf85a125f256ccab9b980389131aa3733d0ed8887a7f23b4945c9969291f5c7dd6029b283 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80
-DIST metapackages-1.3.0.tar.gz 1813 BLAKE2B f197af8c8db8ec6368597ce185dc48058b8e74e84952c92c549617fb48e261fc909f569e9a4f1b7bfc591123960ed38f07e2b36dac130e7c76061993d5d07e09 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12
 DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-EBUILD viz-1.2.0.ebuild 434 BLAKE2B aa7cece1a4df982822c4c4e2bb8d2f35cbb8323ff10c8b6db41161e119f56bcccc3080bc10e1741a0dfe889ce1d6b49597ad05e697066763aea4f920b89e3110 SHA512 e414334a461788fa261c681474d288dd3deba70cfbcfc8f6f5bbf1f395f7f55dad661007195ee9cb4e2f7a583866b96b3c5f0f5bc30a9dade8b0ad63bab40663
-EBUILD viz-1.3.0.ebuild 434 BLAKE2B aa7cece1a4df982822c4c4e2bb8d2f35cbb8323ff10c8b6db41161e119f56bcccc3080bc10e1741a0dfe889ce1d6b49597ad05e697066763aea4f920b89e3110 SHA512 e414334a461788fa261c681474d288dd3deba70cfbcfc8f6f5bbf1f395f7f55dad661007195ee9cb4e2f7a583866b96b3c5f0f5bc30a9dade8b0ad63bab40663
+DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 EBUILD viz-1.3.1.ebuild 434 BLAKE2B 8fa2a335a216f9af99da7807db102143b8a0bb37e9a322d8f0c3265d2ed6d1bca45832f0a6221a6a5d1178cb2c081f8b9cd2b55a9e2d0772c020ca8aa7f3c316 SHA512 e7beebea2671216385a521138cb82c65ca6595288c5a741f20d8931bebeab97427a4e71bf6b2e84af084e453b8833cc1acf5dcdb858a45f8f69795e67235f9e0
+EBUILD viz-1.3.2.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.2.0.ebuild b/ros-meta/viz/viz-1.2.0.ebuild
deleted file mode 100644
index b606511875f3..000000000000
--- a/ros-meta/viz/viz-1.2.0.ebuild
+++ /dev/null
@@ -1,23 +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/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.0.ebuild b/ros-meta/viz/viz-1.3.2.ebuild
index b606511875f3..24e9886bfad4 100644
--- a/ros-meta/viz/viz-1.3.0.ebuild
+++ b/ros-meta/viz/viz-1.3.2.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