gentoo resync : 15.02.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-02-15 16:58:00 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-02-15 16:58:00 +0000
commit: 434d713861b70f6c6563d6ee50a8e64f14c970d9 (patch)
tree: b72c523c72e764420f835ba9d63d43ffef687dcf /dev-ros
parent: f78108598211053d41752a83e0345441bb9014ae (diff)
40 files changed, 309 insertions, 185 deletions
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index bf37e56287af..46feed9b9996 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/gazebo_dev/Manifest b/dev-ros/gazebo_dev/Manifest
index 6ad70af80742..85cad328e9ea 100644
--- a/dev-ros/gazebo_dev/Manifest
+++ b/dev-ros/gazebo_dev/Manifest
@@ -1,4 +1,6 @@
 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
 EBUILD gazebo_dev-2.7.3.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
+EBUILD gazebo_dev-2.7.4.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
 EBUILD gazebo_dev-9999.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_dev/gazebo_dev-2.7.4.ebuild b/dev-ros/gazebo_dev/gazebo_dev-2.7.4.ebuild
new file mode 100644
index 000000000000..b7ed4eb9139f
--- /dev/null
+++ b/dev-ros/gazebo_dev/gazebo_dev-2.7.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-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Provides a cmake config for the default version of Gazebo for the ROS distribution."
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	sci-electronics/gazebo
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_msgs/Manifest b/dev-ros/gazebo_msgs/Manifest
index bde2ee337c92..84ef5248dd51 100644
--- a/dev-ros/gazebo_msgs/Manifest
+++ b/dev-ros/gazebo_msgs/Manifest
@@ -1,6 +1,8 @@
 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
 EBUILD gazebo_msgs-2.6.2.ebuild 582 BLAKE2B 15670ee1e99156f5a74f0527124cae39702cd712592abc6af1116ab479f833f70e828771a9718b745e917291e3fbe6534d6a76e753c7747bdd3cb870a1a179db SHA512 fe7a4b20c7e040eae416625326e4f4879a6ae3661981153d11e14711e48cffbdc92d65b503f835f4d4c40722f631c2ea4c6eb04b59993b9ed5466a6ea151f506
 EBUILD gazebo_msgs-2.7.3.ebuild 582 BLAKE2B 4f67fad9c1b3e04580803322540d16ada55edaa3c212bec423293ea9e2a5d03b8496beea4a4d19d71d806abe588a435fdd954803e52673ab10a5f53118604f44 SHA512 2a5a1a3764c4ab1a9798fcd5783be449393b73d2937766ec80ff68e68d68a3def76f1b26138e05417706603891528b8e11324400c248d12b75a8a788ce5efcea
+EBUILD gazebo_msgs-2.7.4.ebuild 582 BLAKE2B 4f67fad9c1b3e04580803322540d16ada55edaa3c212bec423293ea9e2a5d03b8496beea4a4d19d71d806abe588a435fdd954803e52673ab10a5f53118604f44 SHA512 2a5a1a3764c4ab1a9798fcd5783be449393b73d2937766ec80ff68e68d68a3def76f1b26138e05417706603891528b8e11324400c248d12b75a8a788ce5efcea
 EBUILD gazebo_msgs-9999.ebuild 582 BLAKE2B 15670ee1e99156f5a74f0527124cae39702cd712592abc6af1116ab479f833f70e828771a9718b745e917291e3fbe6534d6a76e753c7747bdd3cb870a1a179db SHA512 fe7a4b20c7e040eae416625326e4f4879a6ae3661981153d11e14711e48cffbdc92d65b503f835f4d4c40722f631c2ea4c6eb04b59993b9ed5466a6ea151f506
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_msgs/gazebo_msgs-2.7.4.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-2.7.4.ebuild
new file mode 100644
index 000000000000..5972a463ebe4
--- /dev/null
+++ b/dev-ros/gazebo_msgs/gazebo_msgs-2.7.4.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-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/trajectory_msgs dev-ros/std_msgs dev-ros/std_srvs"
+
+inherit ros-catkin
+
+DESCRIPTION="Message and service data structures for interacting with Gazebo from ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_plugins/Manifest b/dev-ros/gazebo_plugins/Manifest
index 537e845b9db0..413ded2a7c24 100644
--- a/dev-ros/gazebo_plugins/Manifest
+++ b/dev-ros/gazebo_plugins/Manifest
@@ -1,7 +1,9 @@
 DIST gazebo-ros-2.7.3-patches-1.tar.bz2 19057 BLAKE2B ee8040e7f25d734d31c32963d47601b908b153a55294e736e49d1a10ea14a9ed74133e547eb1abf5d50ee70814f6b3476433e835cc604798057cb9d5a698a3aa SHA512 12ec281277f83c7a267fc111ec029b732435f50f320c74255eeb8e8ea7b38aa8771d08c9815d6525b22b7f2fe706aae087a33591082cddbcf7a46742a35ae0fb
 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
 EBUILD gazebo_plugins-2.6.2.ebuild 1432 BLAKE2B 1a4091f23832ba40054adee8ca2e7c61a5e0f09310b4707fd0f825d5519bd3dc40caf8e10aedec4313ca007352ad8757f28dfae0658b7ca7c0f64cee48d7028b SHA512 edddcd676dd1c2fa36291ea384ad03a52d88497f12dd32eb783300628d752405259c74cf95c45daa57ed41d713c7d633d54a99cc471b2aa094e8335837fb4cb5
 EBUILD gazebo_plugins-2.7.3.ebuild 1705 BLAKE2B 1f8fa40449e524681b222af2f384eac69ed5135606996502b80043372b55d1fbc04d11cf62a22e7d601037a4a9ccfcf90afd78cd93f6a0141518ae20d76d168d SHA512 2985006fe109d82640c376e447fb2f5ba513d1800d2d1cb67ccf3c6b3ea8c380945c5bd8576042de6122d5154e1d4aa25926cfc0a5892d9dd882fbf56e1bdc8e
+EBUILD gazebo_plugins-2.7.4.ebuild 1452 BLAKE2B ac320e7f139fddac2e60f4431e64140fddaadd708a52432ce4681a78b95afacbdd31f532f7fd931cd23f8cdde684dced54e9bbe625e2d6fb676df4bf27b95aa2 SHA512 bf9f2756140d3e5788fac30deec7fda0c970a2cb1d0cddf66eee977b6717c851e8d1cbf670a7ad8dfe0d9f19987ee8f00fd9b37fc68994089e9ecb5dfcd36827
 EBUILD gazebo_plugins-9999.ebuild 1452 BLAKE2B ac320e7f139fddac2e60f4431e64140fddaadd708a52432ce4681a78b95afacbdd31f532f7fd931cd23f8cdde684dced54e9bbe625e2d6fb676df4bf27b95aa2 SHA512 bf9f2756140d3e5788fac30deec7fda0c970a2cb1d0cddf66eee977b6717c851e8d1cbf670a7ad8dfe0d9f19987ee8f00fd9b37fc68994089e9ecb5dfcd36827
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.7.4.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.7.4.ebuild
new file mode 100644
index 000000000000..ef6837eae89c
--- /dev/null
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-2.7.4.ebuild
@@ -0,0 +1,53 @@
+# 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"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components"
+LICENSE="BSD Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/gazebo_dev
+	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/rospy
+	dev-ros/nodelet
+	dev-ros/angles
+	dev-ros/std_srvs
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/urdf
+	dev-ros/tf
+	dev-ros/tf2_ros
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/driver_base[${PYTHON_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/pcl_conversions
+	dev-ros/image_transport
+	dev-ros/rosconsole
+	dev-ros/cv_bridge
+	media-libs/opencv:=
+	dev-ros/polled_camera
+	dev-ros/diagnostic_updater
+	dev-ros/camera_info_manager
+	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/libxml2
+	>=sci-electronics/gazebo-7:=
+	dev-libs/protobuf:=
+	dev-games/ogre
+	sci-libs/pcl
+	dev-libs/boost:=
+	dev-ros/roslib[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/Manifest b/dev-ros/gazebo_ros/Manifest
index 023bbf40b522..b7e8c9c341c4 100644
--- a/dev-ros/gazebo_ros/Manifest
+++ b/dev-ros/gazebo_ros/Manifest
@@ -1,7 +1,9 @@
 DIST gazebo-ros-2.7.3-patches-1.tar.bz2 19057 BLAKE2B ee8040e7f25d734d31c32963d47601b908b153a55294e736e49d1a10ea14a9ed74133e547eb1abf5d50ee70814f6b3476433e835cc604798057cb9d5a698a3aa SHA512 12ec281277f83c7a267fc111ec029b732435f50f320c74255eeb8e8ea7b38aa8771d08c9815d6525b22b7f2fe706aae087a33591082cddbcf7a46742a35ae0fb
 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
 EBUILD gazebo_ros-2.6.2.ebuild 1009 BLAKE2B 356b118f6b7e0e2638a9b513ded0b9a9ef94a413b17ecaad22d73984ae88980be5e77390774e2ef43fd470c8af1e5e997399a8011f1bbca04b4186e0bc1105bb SHA512 61c285486cf13f06346311cd83bb04c4c9dc87963ec2927d658a8782a5a4b43fe7f54bf07127652f20ae9dde473f1234e3fd2fc84b691f665b9f6d95f978c132
 EBUILD gazebo_ros-2.7.3.ebuild 1282 BLAKE2B 2ad6a1a6e9a192a34ac8140b20ebc4787a31971d176e4ddd7f929746b1d694955e50b166f732908906ee1b5385dd51cbca746ee1ff4727e48948fca8c3ce0f37 SHA512 5d25298b56befcd572bd1939b075ed34a772410e10ebe73975a6e1f756e10bd090a2cd4776fa4bda21bd994ed1cce20155a1dae02bf8918e46259228ec3c43f8
+EBUILD gazebo_ros-2.7.4.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
 EBUILD gazebo_ros-9999.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.7.4.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.7.4.ebuild
new file mode 100644
index 000000000000..ca217b085352
--- /dev/null
+++ b/dev-ros/gazebo_ros/gazebo_ros-2.7.4.ebuild
@@ -0,0 +1,36 @@
+# 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"
+PYTHON_COMPAT=( python2_7 )
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/gazebo_dev
+	dev-libs/tinyxml
+	sci-electronics/gazebo:=
+	dev-libs/protobuf:=
+	dev-ros/gazebo_plugins[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/tf[${PYTHON_USEDEP}]
+	dev-ros/dynamic_reconfigure
+	dev-libs/libxml2
+	dev-libs/boost:=[threads]
+	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros_control/Manifest b/dev-ros/gazebo_ros_control/Manifest
index 6fbad2808d5c..16725e873b4e 100644
--- a/dev-ros/gazebo_ros_control/Manifest
+++ b/dev-ros/gazebo_ros_control/Manifest
@@ -2,7 +2,9 @@ AUX urdfdom1.patch 590 BLAKE2B bd90ab431b09a009e19d664e1161cfe07d5f4783827dbb364
 DIST gazebo-ros-2.7.3-patches-1.tar.bz2 19057 BLAKE2B ee8040e7f25d734d31c32963d47601b908b153a55294e736e49d1a10ea14a9ed74133e547eb1abf5d50ee70814f6b3476433e835cc604798057cb9d5a698a3aa SHA512 12ec281277f83c7a267fc111ec029b732435f50f320c74255eeb8e8ea7b38aa8771d08c9815d6525b22b7f2fe706aae087a33591082cddbcf7a46742a35ae0fb
 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
 EBUILD gazebo_ros_control-2.6.2-r1.ebuild 743 BLAKE2B 7398cf457863ad2296e87275ad1a5dca21c5742d48bc9713a11a0a16d3b24906913460380349161f809abf61843616b12a18eea9472169db97f258b6d490fa60 SHA512 f7cee8fa23e02e997dea2462c6d87bfdf12fe68c6e5cc812c81fa119389517b4ee0743f93201bc4f2845ac154ac802ee0118da00a96c075a9296cad87b10dda0
 EBUILD gazebo_ros_control-2.7.3.ebuild 975 BLAKE2B 6c89cd3e49119edcd893a7f764d359035a08774b429f3b458178614f60dd0db9488f2c68f35f85c24cc100cd4705403e8b99df0a8fab1ce49a9b31c8c98c23d4 SHA512 94554d46030657d71e14614c0f297ad9e7541ef08bb601a2e8578d7187e31186c997f8298626a07b28d8110c8017e0cc129b4c07ab8831cf14c1c8df774a4e60
+EBUILD gazebo_ros_control-2.7.4.ebuild 722 BLAKE2B edd1cd3d2d5bfdc2e5c3e73264f49c3447831dc44a2363a0bcd2c8afaa3daaa0878032f43186c4a911d35f5d78e43377fd9aff973d1c0b9a5b2bcceb692b609a SHA512 5528e932fad26207b866e59b6d577892ee1a95493727434450ce5e7a07f9432e5d5fc426e89f2a7598f0ac8a4f1ba39b5354355dc7cba13fff90fe2632cb9715
 EBUILD gazebo_ros_control-9999.ebuild 722 BLAKE2B edd1cd3d2d5bfdc2e5c3e73264f49c3447831dc44a2363a0bcd2c8afaa3daaa0878032f43186c4a911d35f5d78e43377fd9aff973d1c0b9a5b2bcceb692b609a SHA512 5528e932fad26207b866e59b6d577892ee1a95493727434450ce5e7a07f9432e5d5fc426e89f2a7598f0ac8a4f1ba39b5354355dc7cba13fff90fe2632cb9715
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.4.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.4.ebuild
new file mode 100644
index 000000000000..e824028e5285
--- /dev/null
+++ b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS control plugins for gazebo"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/gazebo_dev
+	dev-ros/gazebo_ros
+	dev-ros/control_toolbox
+	dev-ros/controller_manager
+	dev-ros/hardware_interface
+	dev-ros/transmission_interface
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	>=dev-ros/joint_limits_interface-0.11.0
+	>=dev-ros/urdf-1.12.3-r1
+	dev-libs/urdfdom:=
+	sci-electronics/gazebo:=
+	dev-libs/boost:=[threads]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gencpp/Manifest b/dev-ros/gencpp/Manifest
index 39571b0852aa..d031b36e2c4e 100644
--- a/dev-ros/gencpp/Manifest
+++ b/dev-ros/gencpp/Manifest
@@ -1,4 +1,6 @@
 DIST gencpp-0.5.5.tar.gz 8601 BLAKE2B c048ce73f41d8b9ef3111bcb00b9a8776f4b1498bf4828e48ec45994c4f0fecfc75318fcfbfddd18b492d7b597e62e69fd497de63b6cc1417a107e11ecf38e83 SHA512 6440747ba98b23ed515db6d7b6760a98dcb3f832f87c0a8d3797b47c48e51cb01e2c62837ff5a84a2f8aeff16764493093170d83639602e3d82de846e95f9f8a
+DIST gencpp-0.6.0.tar.gz 9164 BLAKE2B 97b7e3904cde95ca6304e498d5f338cf303a55c407c187994b3dcb2bb062bd6dc1b4a2ab6f0cc949bfc6c481199586abef115fe54b4b99e99bc99dac8ae261cf SHA512 0ef0ae3d5f93ab5693455eb5319a0b8fbaab4ee56bd890e0ef96bfbdf8959affe61551f30739bab7e945c213c9b2fb51ff5e89c5b3a40d945da23e1ba88b9c1e
 EBUILD gencpp-0.5.5.ebuild 465 BLAKE2B 87d05b0ecdc318698f9d271bfcc541ce3cb4d030cbb39bd3d0a11208da0773cad93ec882abf43ab0fb134841263236b886a5518e00a82f5b231650991fe0b967 SHA512 4bc32dedeb187d80b202e1c34907ebde2b7fad8bdabe0e0b1fe801ce3bc2b472c638592e333497bd228e96ff5cdce173d7133fc9fe3941f8842733218c717347
+EBUILD gencpp-0.6.0.ebuild 465 BLAKE2B ebd8a37fc5ce1a996bd5ca8faa2173ab8f0daaac133bfce251407ee69685ba74aa7d191eb4f007ae8c9a1b1f3d6a1e6f7afe937dc46199d3e199b7518c7e38e1 SHA512 1129bf9486c73fc7dcd7f91982b683cc56dca8c4089a33db4860bbf5f464b2c2e5130e91cf4f5b2b793c10793474604c72111417f2e8e5c435e744548b5a1f26
 EBUILD gencpp-9999.ebuild 465 BLAKE2B 87d05b0ecdc318698f9d271bfcc541ce3cb4d030cbb39bd3d0a11208da0773cad93ec882abf43ab0fb134841263236b886a5518e00a82f5b231650991fe0b967 SHA512 4bc32dedeb187d80b202e1c34907ebde2b7fad8bdabe0e0b1fe801ce3bc2b472c638592e333497bd228e96ff5cdce173d7133fc9fe3941f8842733218c717347
 MISC metadata.xml 324 BLAKE2B acb13fb86def5c4a53edd5c0db5d4c65d73e99f6d18a2fa1509981878637f006f9b14c5cd40e56b886b73c4ac8ec957844da3e424bb515248c07298388eb23c4 SHA512 031c6670cbdd1abdf53174d877a08985012d75ffa1fb16415501d128ac519567f6b9ae3c786a878aba25481c4413ebbcbc34d3782bf1d85cc6976caccd1aaaac
diff --git a/dev-ros/gencpp/gencpp-0.6.0.ebuild b/dev-ros/gencpp/gencpp-0.6.0.ebuild
new file mode 100644
index 000000000000..e33fa4486006
--- /dev/null
+++ b/dev-ros/gencpp/gencpp-0.6.0.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/gencpp"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit ros-catkin
+
+DESCRIPTION="ROS C++ message definition and serialization generators"
+HOMEPAGE="http://wiki.ros.org/gencpp"
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+
+RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/genmsg/Manifest b/dev-ros/genmsg/Manifest
index b56d4804e723..c66b44979b93 100644
--- a/dev-ros/genmsg/Manifest
+++ b/dev-ros/genmsg/Manifest
@@ -1,6 +1,6 @@
-DIST genmsg-0.5.8.tar.gz 59250 BLAKE2B bd2aac0185a7476f93b9cce93daba2dfedcf008cd06b2e6448721488109fd483756120fd9e6322d2479a466f8e3df2ef01747463337ed76e79f75ae9aef390ec SHA512 78553d93a2adfe2c47c5fa68204418e321bc03a6083e344b456c2a727e5819747668b9c82b4b5862766b2fc2ad8b22b5165e9064b993a4491b1f7751db79dc07
+DIST genmsg-0.5.10.tar.gz 59468 BLAKE2B 2cb70a60dc9281c8999fd88615845bec840ba0d46b00e170fb56e152234c5762058a5a1b2f87fea67d596eadb330627bcfeb8554124894bfb1155654dadb7357 SHA512 8effbada30bc3c48526ef162ef11d0d14c8bba5688d26089cb934a0e9a069233a724608862188caa86d1a4dc8e773d4e93fce5d88239acf0af525f6821d01268
 DIST genmsg-0.5.9.tar.gz 59409 BLAKE2B e3d4ac69bbc665aa62ef9fb7b35cc9b47280690eb743f50e5fe5acaf96a0fda363d594878b1f3584f5d96952dbe9c64428e5e4aeb1f0432c591d03d9ce16cd89 SHA512 ac62c8d08da449890c6eb53264153e01237cd50b97d4d4123e334c59a9a1ef73ce70c4d3d7c95f91ea872ea06b30fa72bf8a3a177309493b33984b8d21e36939
-EBUILD genmsg-0.5.8.ebuild 470 BLAKE2B 61bfbd0c196380a71a0d1bdc476f4b103595f41e51d7e47cefb4c79ba872b0ad160f9cf7fe1690fa55329b25fe1fb1e19d513ca45136c5d431653b87956d864e SHA512 2ce83ace0d29fae10543fb03ea2e6a47cafb6feb5af6fff76b6c25788600a1e3837c218a57c5078676e323ce58542aeaa87e1ce095a3487f21206f03c83d4f5e
+EBUILD genmsg-0.5.10.ebuild 470 BLAKE2B 488207849ff40c952ea177dc818313c91a8cf535f5ce1fa75ad43c324a99c6fa6aacc27179bfb35746c07350f03c781c6e7475b165ec309ced2ee008d683b733 SHA512 6827248d5dcb07a5a032a137beab04cc28b57a824c7c24dbb3bf3832478b5579229cb424c82e430d77f85a7ee5eaa92b6750c243977fda0749cb41c4e0119239
 EBUILD genmsg-0.5.9.ebuild 470 BLAKE2B 61bfbd0c196380a71a0d1bdc476f4b103595f41e51d7e47cefb4c79ba872b0ad160f9cf7fe1690fa55329b25fe1fb1e19d513ca45136c5d431653b87956d864e SHA512 2ce83ace0d29fae10543fb03ea2e6a47cafb6feb5af6fff76b6c25788600a1e3837c218a57c5078676e323ce58542aeaa87e1ce095a3487f21206f03c83d4f5e
 EBUILD genmsg-9999.ebuild 470 BLAKE2B 61bfbd0c196380a71a0d1bdc476f4b103595f41e51d7e47cefb4c79ba872b0ad160f9cf7fe1690fa55329b25fe1fb1e19d513ca45136c5d431653b87956d864e SHA512 2ce83ace0d29fae10543fb03ea2e6a47cafb6feb5af6fff76b6c25788600a1e3837c218a57c5078676e323ce58542aeaa87e1ce095a3487f21206f03c83d4f5e
 MISC metadata.xml 324 BLAKE2B 4e885cafaf86dab897c52a6e27092584252b7daff9d9597c0bfd45b148b91ec763c3e46abbeb3db64fb5d17fc2d1ff83cf252201c165a3b52bc5e4d4033abcc6 SHA512 be0ee3a5595270480a29bf98888215b692009bdfaf06591c3cd56196b1c437e847abac787d4304f0166e76525b5ca7d82d81f660f1309a5139081bd205d95939
diff --git a/dev-ros/genmsg/genmsg-0.5.8.ebuild b/dev-ros/genmsg/genmsg-0.5.10.ebuild
index 4828b324180c..1eda6e3256c5 100644
--- a/dev-ros/genmsg/genmsg-0.5.8.ebuild
+++ b/dev-ros/genmsg/genmsg-0.5.10.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/dev-ros/gmapping/Manifest b/dev-ros/gmapping/Manifest
index 87c86257257b..8f539baa8058 100644
--- a/dev-ros/gmapping/Manifest
+++ b/dev-ros/gmapping/Manifest
@@ -1,8 +1,4 @@
 DIST slam_gmapping-1.3.10.tar.gz 21032 BLAKE2B cca0779e64d45622dad4ec29cb3c1d0162176038288c0aa7b117f1a76a7655f3af3024dba7ff1025948e400e0176794a553e357a235187d9196161a635ab6d01 SHA512 fa4485ddc9fcfaac63a63d209a5a994e33e78546a39edcf47eb3c3f1775f0d87a1f562319058868838990bbf85a9515ff0228779dce7531148f208b3522e7e7a
-DIST slam_gmapping-1.3.8.tar.gz 20533 BLAKE2B 5e096b4863077941843b966f2991a23c24e5396d42d0d8cd8beb7123805d085d07b8ac7e8e4a3c3ea43a6f4605ada40eb28b8c10207536dcdb7ef92cc1a5fcd8 SHA512 d7b054296f286a5e61e5f952a29ccff2165503123ab6a89724ec34180fb0f4c452fc0ae81ec853cac170b304095e62cef420431e5aca85a262febc2b5ab5ccf2
-DIST slam_gmapping-1.3.9.tar.gz 20951 BLAKE2B 989c28fe60668f0b37bf4766656764095157734c1ae0f41f6b95faa9ed9c20ed91de18534bfc99ea7ee035f2df213f8004adefcf06d269be55b27c37156da542 SHA512 fcab88127507206274e903de804aa9167b30c1dd9fbf2875aeafb990285923223a2ce71edecede60d2c93dba2d8fffd0d371abd643647755094abd9ffe0aba73
-EBUILD gmapping-1.3.10.ebuild 528 BLAKE2B b5399648f9ba344b1663932b02cec6ccdc22ae9cc55e90db76d9a55d8148f59eea12224b84759555bcc73a8beff135c89610230ddcd3253d1d8ced37a66a6c20 SHA512 59bfab00cb4003039a7dbcab9559970d2e79a43038d83b510635b3ef8524ffe001670fa372c4cc7905fe70e18f28ff72ae70266f292f2236b9cfb1089c62e853
-EBUILD gmapping-1.3.8.ebuild 528 BLAKE2B 905b5d54e0335b7b979714b0072654d77f556eccc7819ae2f730da8bbf1c6617cde388391147ab9202d2a84c1203225f4f70e2b589cd11a638d7e64d018d1e79 SHA512 92d31dccbad5f5e345b011779d386e3e4ea670f7447a566fc1628ef586d409e8b4d2bf07074ebb4899505ce8d131d8d80b5751501c4c87622c2ce32b276b93c2
-EBUILD gmapping-1.3.9.ebuild 528 BLAKE2B 76e9d437945d2d0dcb9a3dab407f8118f2f3865b8b44f26dba6be90c47d99d123311f7bb72f70f9c65e22e588d11afabd9bc3280861a699e92155b31ddfd51a1 SHA512 30b6fbbe860cdef1da38582e07f5030c4e748e7a4312409ce8f9eb115bc090daaaf6522483363858c990e87033d0557690fbe9bfc513f3c23b54f681a30c0d2c
-EBUILD gmapping-9999.ebuild 528 BLAKE2B 905b5d54e0335b7b979714b0072654d77f556eccc7819ae2f730da8bbf1c6617cde388391147ab9202d2a84c1203225f4f70e2b589cd11a638d7e64d018d1e79 SHA512 92d31dccbad5f5e345b011779d386e3e4ea670f7447a566fc1628ef586d409e8b4d2bf07074ebb4899505ce8d131d8d80b5751501c4c87622c2ce32b276b93c2
+EBUILD gmapping-1.3.10.ebuild 546 BLAKE2B 9a6c5e78a43ba77c86dd2a1640ef56bcd2f481a830c3333ab4b87f84f4c761c8728e811e5e314b5eed9809e987fd2b8a0a72aaf58b62f6c4dea561d2101682ad SHA512 41823e5fad9201ca764d2a22af8de2c88b19e449f8d2fec8682a5d21381e35f29a17b729d3b5cc5faacd50057fe5e69b110f7756b414b859528656bea3a963b8
+EBUILD gmapping-9999.ebuild 546 BLAKE2B 9a6c5e78a43ba77c86dd2a1640ef56bcd2f481a830c3333ab4b87f84f4c761c8728e811e5e314b5eed9809e987fd2b8a0a72aaf58b62f6c4dea561d2101682ad SHA512 41823e5fad9201ca764d2a22af8de2c88b19e449f8d2fec8682a5d21381e35f29a17b729d3b5cc5faacd50057fe5e69b110f7756b414b859528656bea3a963b8
 MISC metadata.xml 342 BLAKE2B 72a1fe4f1e7971418dbb3f5b1e78de71a77819b9fa7200feb2ce0abec5b50a5435c5e5541d290bfd23c7acee5a6920280934067c84e4716bd9f6bb0cc634544d SHA512 2a5beef664e8c79b9e4d858d0dc093068c6e462456ae6066ea637f4b725e5c7184dd65769906c34e55eb6b03949e957edba34b84a587e1daec784e1f74ea287c
diff --git a/dev-ros/gmapping/gmapping-1.3.10.ebuild b/dev-ros/gmapping/gmapping-1.3.10.ebuild
index 7cdf9ee6b7a1..ca6f43afe50c 100644
--- a/dev-ros/gmapping/gmapping-1.3.10.ebuild
+++ b/dev-ros/gmapping/gmapping-1.3.10.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
 	dev-ros/tf
 	dev-ros/openslam_gmapping
 	dev-ros/rosbag_storage
+	dev-ros/gmapping
 "
 DEPEND="${RDEPEND}
 	dev-ros/rostest"
diff --git a/dev-ros/gmapping/gmapping-1.3.8.ebuild b/dev-ros/gmapping/gmapping-1.3.8.ebuild
deleted file mode 100644
index 5c4afd8f8aa4..000000000000
--- a/dev-ros/gmapping/gmapping-1.3.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/slam_gmapping"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS wrapper for OpenSlam's Gmapping"
-LICENSE="CC-BY-NC-SA-2.5"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/openslam_gmapping
-	dev-ros/rosbag_storage
-"
-DEPEND="${RDEPEND}
-	dev-ros/rostest"
diff --git a/dev-ros/gmapping/gmapping-1.3.9.ebuild b/dev-ros/gmapping/gmapping-1.3.9.ebuild
deleted file mode 100644
index fe84880698b1..000000000000
--- a/dev-ros/gmapping/gmapping-1.3.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/slam_gmapping"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS wrapper for OpenSlam's Gmapping"
-LICENSE="CC-BY-NC-SA-2.5"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/openslam_gmapping
-	dev-ros/rosbag_storage
-"
-DEPEND="${RDEPEND}
-	dev-ros/rostest"
diff --git a/dev-ros/gmapping/gmapping-9999.ebuild b/dev-ros/gmapping/gmapping-9999.ebuild
index 5c4afd8f8aa4..ca6f43afe50c 100644
--- a/dev-ros/gmapping/gmapping-9999.ebuild
+++ b/dev-ros/gmapping/gmapping-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
@@ -20,6 +20,7 @@ RDEPEND="
 	dev-ros/tf
 	dev-ros/openslam_gmapping
 	dev-ros/rosbag_storage
+	dev-ros/gmapping
 "
 DEPEND="${RDEPEND}
 	dev-ros/rostest"
diff --git a/dev-ros/map_server/Manifest b/dev-ros/map_server/Manifest
index 77bdf1b0f782..8a0a4463720b 100644
--- a/dev-ros/map_server/Manifest
+++ b/dev-ros/map_server/Manifest
@@ -1,12 +1,4 @@
-DIST navigation-1.13.0.tar.gz 336419 BLAKE2B 8786b1279a569c81c25cf48184d37b2660e27735631539e78404fc9cff849634165fdcf11e0aa309172c55755eea3ef8a884ff633291b77f4e23873f9cd3f8fc SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af
-DIST navigation-1.13.1.tar.gz 335568 BLAKE2B 77177dee95744ef327156bcda3fcb59bd2a7701dbfc9fffb8e65501ebd21d3abd8439f67a8061abeecb0805c801a31a57b103f612f8ae9a15029466e87fa7252 SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e
-DIST navigation-1.14.0.tar.gz 340196 BLAKE2B 9338af98d1eb88e6bd79aa4f4c186ac6dc1c52b0f024286264f62e487f8e2236cff81397ccb8b828e4e000c0d05bc93963c979975089220b49cf980f465b643d SHA512 8ac2048be6d06be1f137aab2e73c5c724e794b9e6125fa70e2283df3790200f7b5203bae12c46e0796523ae58a4f8ede79fd0c1afc09a306a99f450576c7b11a
-DIST navigation-1.14.2.tar.gz 345166 BLAKE2B 4c54f975088e3f99102f7bb1ef500909b16218e48db97a875f8b980dfe1bfd51d51eccab308ba7a3d5bee444de7d9e9fdf7d6477583739740ad13e7f0c35d1ea SHA512 6477104a330a20722fde1634a0d51b1706c9705b4b9415aa9703c99a61d2ce3de97caba24a6b667897e842490c15a6bf2cdbb2f51341febf29d0475b4c0f384b
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
-EBUILD map_server-1.13.0.ebuild 546 BLAKE2B 93451029e5c8824321251359e6d4d1b0e2dc6dc3eca7144355ae2e767b640dcdcd3326b928f49e4a5c0edcf5247887cb457906444b9878bae684925542c3e9aa SHA512 29f9f1cc2fb9059705709f49069b6f7625b1ad79df9fe779e827ccc7bf70887b4c2accfaf4a21f34ed74bbbb1f322db2de2044f140358bbc6378e5c7f2d1bb66
-EBUILD map_server-1.13.1.ebuild 546 BLAKE2B 93451029e5c8824321251359e6d4d1b0e2dc6dc3eca7144355ae2e767b640dcdcd3326b928f49e4a5c0edcf5247887cb457906444b9878bae684925542c3e9aa SHA512 29f9f1cc2fb9059705709f49069b6f7625b1ad79df9fe779e827ccc7bf70887b4c2accfaf4a21f34ed74bbbb1f322db2de2044f140358bbc6378e5c7f2d1bb66
-EBUILD map_server-1.14.0.ebuild 546 BLAKE2B ca25dabafa9b7e669e96e740c05a7f4975af9655c9982435f75b4671531fd7c0d685d2162af3e9a0ca202d768415e1f5b34017fe5ce1f2623164679b100fc484 SHA512 a5a9f9ac2cfc449e26be138ffa28fe868d1e72fb7ca822211839cc6e87cdef39d606dbc1b6b388a2e4a8629e92a64cd00faaba32930cc417cf54f9c63ce82c5f
-EBUILD map_server-1.14.2.ebuild 546 BLAKE2B 6bf1a83fa675825564ebb6d16f435097a70aef0683403de823042265626bf58e99837eaf00df8353d5647e2e19c2ec8ce39562e53c36dc614984dd9dcdb74c57 SHA512 3310b6263fad86f87bd25e574f485b790be861f2e9d2a4ee5b7c585f9f6e40d73b10f4b8a21def39dfda882d84fff0e7c08790bb804644f86621343b5c6ba7ca
-EBUILD map_server-1.15.1.ebuild 546 BLAKE2B 6bf1a83fa675825564ebb6d16f435097a70aef0683403de823042265626bf58e99837eaf00df8353d5647e2e19c2ec8ce39562e53c36dc614984dd9dcdb74c57 SHA512 3310b6263fad86f87bd25e574f485b790be861f2e9d2a4ee5b7c585f9f6e40d73b10f4b8a21def39dfda882d84fff0e7c08790bb804644f86621343b5c6ba7ca
-EBUILD map_server-9999.ebuild 546 BLAKE2B 93451029e5c8824321251359e6d4d1b0e2dc6dc3eca7144355ae2e767b640dcdcd3326b928f49e4a5c0edcf5247887cb457906444b9878bae684925542c3e9aa SHA512 29f9f1cc2fb9059705709f49069b6f7625b1ad79df9fe779e827ccc7bf70887b4c2accfaf4a21f34ed74bbbb1f322db2de2044f140358bbc6378e5c7f2d1bb66
+EBUILD map_server-1.15.1-r1.ebuild 568 BLAKE2B 0982353d43d04acac64d9e256b7137a0873a6b678ca879bf8eeee0bd4a3af7ca38b461a0eb03328da6f29c087b37f21598b55718f48c6972486c19742ae63538 SHA512 a759f66177862c92e0151cf6c25a670c101e0ff1e9f05614b222ad86c4f0c0fc7916f21acd3d9f154502bec0c85aa0f168ad4a6e79d5041b56d19b54aab9c449
+EBUILD map_server-9999.ebuild 568 BLAKE2B 0982353d43d04acac64d9e256b7137a0873a6b678ca879bf8eeee0bd4a3af7ca38b461a0eb03328da6f29c087b37f21598b55718f48c6972486c19742ae63538 SHA512 a759f66177862c92e0151cf6c25a670c101e0ff1e9f05614b222ad86c4f0c0fc7916f21acd3d9f154502bec0c85aa0f168ad4a6e79d5041b56d19b54aab9c449
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/map_server/map_server-1.13.0.ebuild b/dev-ros/map_server/map_server-1.13.0.ebuild
deleted file mode 100644
index 2cf681c69a59..000000000000
--- a/dev-ros/map_server/map_server-1.13.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-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Offers map data as a ROS service"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	media-libs/sdl-image
-	>=dev-cpp/yaml-cpp-0.5
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )
-	virtual/pkgconfig"
diff --git a/dev-ros/map_server/map_server-1.14.0.ebuild b/dev-ros/map_server/map_server-1.14.0.ebuild
deleted file mode 100644
index ffa8ac2128e5..000000000000
--- a/dev-ros/map_server/map_server-1.14.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Offers map data as a ROS service"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	media-libs/sdl-image
-	>=dev-cpp/yaml-cpp-0.5
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )
-	virtual/pkgconfig"
diff --git a/dev-ros/map_server/map_server-1.14.2.ebuild b/dev-ros/map_server/map_server-1.14.2.ebuild
deleted file mode 100644
index 94e003da1ce2..000000000000
--- a/dev-ros/map_server/map_server-1.14.2.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-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Offers map data as a ROS service"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	media-libs/sdl-image
-	>=dev-cpp/yaml-cpp-0.5
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )
-	virtual/pkgconfig"
diff --git a/dev-ros/map_server/map_server-1.13.1.ebuild b/dev-ros/map_server/map_server-1.15.1-r1.ebuild
index 2cf681c69a59..8ed4e749308a 100644
--- a/dev-ros/map_server/map_server-1.13.1.ebuild
+++ b/dev-ros/map_server/map_server-1.15.1-r1.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
@@ -20,6 +20,7 @@ RDEPEND="
 	dev-libs/boost:=
 	media-libs/sdl-image
 	>=dev-cpp/yaml-cpp-0.5
+	sci-physics/bullet:=
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest dev-cpp/gtest )
diff --git a/dev-ros/map_server/map_server-1.15.1.ebuild b/dev-ros/map_server/map_server-1.15.1.ebuild
deleted file mode 100644
index 94e003da1ce2..000000000000
--- a/dev-ros/map_server/map_server-1.15.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-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Offers map data as a ROS service"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	media-libs/sdl-image
-	>=dev-cpp/yaml-cpp-0.5
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )
-	virtual/pkgconfig"
diff --git a/dev-ros/map_server/map_server-9999.ebuild b/dev-ros/map_server/map_server-9999.ebuild
index 2cf681c69a59..8ed4e749308a 100644
--- a/dev-ros/map_server/map_server-9999.ebuild
+++ b/dev-ros/map_server/map_server-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,6 +20,7 @@ RDEPEND="
 	dev-libs/boost:=
 	media-libs/sdl-image
 	>=dev-cpp/yaml-cpp-0.5
+	sci-physics/bullet:=
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest dev-cpp/gtest )
diff --git a/dev-ros/move_base/Manifest b/dev-ros/move_base/Manifest
index 0366ef37c2fa..2972844bc3ad 100644
--- a/dev-ros/move_base/Manifest
+++ b/dev-ros/move_base/Manifest
@@ -1,4 +1,4 @@
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
-EBUILD move_base-1.15.1-r1.ebuild 810 BLAKE2B 2e55b446c02e129f9c10b252180bab1529734c3380cd06d69ff38ff741802406bb75de31fccd8c5edd4ddcb9531882e22e986f4e7182bf58a9716ef98cde7e9c SHA512 21a9b01b6821db9e0975e4adcc7383c1c610afb833b4d106dcb656cfe0a1d51339f23beb8fd3c953d7b001a0af0252fd56dfbcf192beeb0133563e25adfc2be4
-EBUILD move_base-9999.ebuild 810 BLAKE2B 2e55b446c02e129f9c10b252180bab1529734c3380cd06d69ff38ff741802406bb75de31fccd8c5edd4ddcb9531882e22e986f4e7182bf58a9716ef98cde7e9c SHA512 21a9b01b6821db9e0975e4adcc7383c1c610afb833b4d106dcb656cfe0a1d51339f23beb8fd3c953d7b001a0af0252fd56dfbcf192beeb0133563e25adfc2be4
+EBUILD move_base-1.15.1-r2.ebuild 882 BLAKE2B c68f44cfe1582a8a66fee799f3a844daf4e507555510b565773c9741e489637bd5ed07b20538647b2599c4e842ffb2c28460e44baa2440c83549d80fefa16bc6 SHA512 80bd499cba6b095210a0d424ced28d65e5ebcece7d61b857db8eb0a78644f39099b22f2e82b9d14694963f58d51cca74509898c3038f8092f8fe958caed84b0b
+EBUILD move_base-9999.ebuild 882 BLAKE2B c68f44cfe1582a8a66fee799f3a844daf4e507555510b565773c9741e489637bd5ed07b20538647b2599c4e842ffb2c28460e44baa2440c83549d80fefa16bc6 SHA512 80bd499cba6b095210a0d424ced28d65e5ebcece7d61b857db8eb0a78644f39099b22f2e82b9d14694963f58d51cca74509898c3038f8092f8fe958caed84b0b
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/move_base/move_base-1.15.1-r1.ebuild b/dev-ros/move_base/move_base-1.15.1-r2.ebuild
index 2c81deaf968f..2905e24c89be 100644
--- a/dev-ros/move_base/move_base-1.15.1-r1.ebuild
+++ b/dev-ros/move_base/move_base-1.15.1-r2.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
@@ -21,6 +21,9 @@ RDEPEND="
 		dev-libs/tinyxml2:=
 	dev-ros/actionlib
 	dev-ros/base_local_planner
+	dev-ros/clear_costmap_recovery
+	dev-ros/navfn
+	dev-ros/rotate_recovery
 	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
 	dev-ros/nav_core
 	dev-ros/tf
diff --git a/dev-ros/move_base/move_base-9999.ebuild b/dev-ros/move_base/move_base-9999.ebuild
index 2c81deaf968f..2905e24c89be 100644
--- a/dev-ros/move_base/move_base-9999.ebuild
+++ b/dev-ros/move_base/move_base-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
@@ -21,6 +21,9 @@ RDEPEND="
 		dev-libs/tinyxml2:=
 	dev-ros/actionlib
 	dev-ros/base_local_planner
+	dev-ros/clear_costmap_recovery
+	dev-ros/navfn
+	dev-ros/rotate_recovery
 	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
 	dev-ros/nav_core
 	dev-ros/tf
diff --git a/dev-ros/pr2_dashboard_aggregator/Manifest b/dev-ros/pr2_dashboard_aggregator/Manifest
index 150649ccb488..21ad762141bf 100644
--- a/dev-ros/pr2_dashboard_aggregator/Manifest
+++ b/dev-ros/pr2_dashboard_aggregator/Manifest
@@ -4,11 +4,13 @@ DIST pr2_common-1.11.13.tar.gz 33598596 BLAKE2B 19aab42e80f1bd18f337d935c4e496cd
 DIST pr2_common-1.11.14.tar.gz 33598683 BLAKE2B b5658b42fabe0a3fa506f740610f0977f6b386f2b79789eb595985e27079e0e06668e21b582b88c4e9f9d2364ff176b4f9f2ec2b30ecbfb43224f9888ced3645 SHA512 c34a82f72aa0c64c7c2abe36af5ec02c73e4bff161e105d3f8cfd65a460688b4fbd3e4529109546bf525c4703706054f522f74a9c9b352939c5582f064bbf2bf
 DIST pr2_common-1.11.9.tar.gz 33337556 BLAKE2B b743f4fcde9b3688d3630ce42e5f194fd3a4aef40262aa8da61cb6337b50770d50e10ca4097f5f14104dbc99555b815ecd9ff14daa9ba7878cfc2e26bb85c8ac SHA512 44eb4f802a7b6983b621ca5b2c1c0e2516f16992f35902c2fb4afbdc9ffc8e63c1ed647f4ef09fd4cbeef747aba133a55172cec64c3cf9d759d2c83f7ec8a213
 DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
+DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
 EBUILD pr2_dashboard_aggregator-1.11.10.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
 EBUILD pr2_dashboard_aggregator-1.11.11.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
 EBUILD pr2_dashboard_aggregator-1.11.13.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
 EBUILD pr2_dashboard_aggregator-1.11.14.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
 EBUILD pr2_dashboard_aggregator-1.11.9.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
 EBUILD pr2_dashboard_aggregator-1.12.0.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
+EBUILD pr2_dashboard_aggregator-1.12.1.ebuild 542 BLAKE2B c2b9b70732d96c9b4828346afeb160ac782a35680e31d2198f1994f466f11a30d0d1aa2a77e864338f3430a617f74de43a577c61f0543973d67984d25f95c2c2 SHA512 001482e1ee8659473f59a9ba338d759712bc6fa5b775438cece7df5a16a309bd3caa7be436b598e2bc3d825b0f0c215f7dcd28cd87b55aaba2e96737aabe4b4e
 EBUILD pr2_dashboard_aggregator-9999.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.1.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.1.ebuild
new file mode 100644
index 000000000000..52c01cd2ea3e
--- /dev/null
+++ b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.1.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/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Aggregates all of the topics that a 'pr2_dashboard' app might be interested in"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_description/Manifest b/dev-ros/pr2_description/Manifest
index 0784f7b3952a..d543e38fee0c 100644
--- a/dev-ros/pr2_description/Manifest
+++ b/dev-ros/pr2_description/Manifest
@@ -1,5 +1,7 @@
 AUX tests.patch 582 BLAKE2B 33a4ebdb4e3cb56f3dda7d16d8d952bfb72ec883e2ebabd2a19a98bdc0fe3aee995654b9a0463ef551ad4343b77feb5719fe24489b220928162e81c1ac5eeee2 SHA512 435c0f6b38ffd49282971d563f4e68daa482b63da3b44ff2599ff68f08be404b7921e125463494970a2c70ce938871c7d7bbea00d06c0ce61a76ff8117dcea8b
 DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
+DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
 EBUILD pr2_description-1.12.0.ebuild 549 BLAKE2B 261499258b614a14fa77defd99c39031d0c91a1e278f71084ade80392b3fddc89057deaf10847f8d8ef76c12c2a67a412f7c531d88677f7740445dd43cbb1d0e SHA512 7fbcc6f38b7363adcdb226d8b8a30c404f62477f5fbdfd17d89b263ffd2f29fff3d24d6af51145484857a9485d922d3079db06e470b42ef7f05093e7717a1ccf
+EBUILD pr2_description-1.12.1.ebuild 549 BLAKE2B 9dc330a03b139dc0a9d3a4392bffdcc5061761ab85432c10365043c67de4110e52ab66cbee00b5b754f777723dbcf713b9cbcd6fa7b7fdf818674b5f9d77c2ff SHA512 555ea9ae0e9527403c295606b3d1cdded292282fdaf89590ee042915acc08d064a65e1dc8daf74a29e67d8b43e3bb7100b9a6c9e86f2f0c7da82906401c6dc4d
 EBUILD pr2_description-9999.ebuild 549 BLAKE2B 261499258b614a14fa77defd99c39031d0c91a1e278f71084ade80392b3fddc89057deaf10847f8d8ef76c12c2a67a412f7c531d88677f7740445dd43cbb1d0e SHA512 7fbcc6f38b7363adcdb226d8b8a30c404f62477f5fbdfd17d89b263ffd2f29fff3d24d6af51145484857a9485d922d3079db06e470b42ef7f05093e7717a1ccf
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_description/pr2_description-1.12.1.ebuild b/dev-ros/pr2_description/pr2_description-1.12.1.ebuild
new file mode 100644
index 000000000000..afdbbe676ffc
--- /dev/null
+++ b/dev-ros/pr2_description/pr2_description-1.12.1.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/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-ros/convex_decomposition
+	dev-ros/ivcon
+	test? ( dev-libs/urdfdom dev-cpp/gtest )"
+PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/pr2_machine/Manifest b/dev-ros/pr2_machine/Manifest
index 9f495e2604cb..1b0c72b8d128 100644
--- a/dev-ros/pr2_machine/Manifest
+++ b/dev-ros/pr2_machine/Manifest
@@ -4,11 +4,13 @@ DIST pr2_common-1.11.13.tar.gz 33598596 BLAKE2B 19aab42e80f1bd18f337d935c4e496cd
 DIST pr2_common-1.11.14.tar.gz 33598683 BLAKE2B b5658b42fabe0a3fa506f740610f0977f6b386f2b79789eb595985e27079e0e06668e21b582b88c4e9f9d2364ff176b4f9f2ec2b30ecbfb43224f9888ced3645 SHA512 c34a82f72aa0c64c7c2abe36af5ec02c73e4bff161e105d3f8cfd65a460688b4fbd3e4529109546bf525c4703706054f522f74a9c9b352939c5582f064bbf2bf
 DIST pr2_common-1.11.9.tar.gz 33337556 BLAKE2B b743f4fcde9b3688d3630ce42e5f194fd3a4aef40262aa8da61cb6337b50770d50e10ca4097f5f14104dbc99555b815ecd9ff14daa9ba7878cfc2e26bb85c8ac SHA512 44eb4f802a7b6983b621ca5b2c1c0e2516f16992f35902c2fb4afbdc9ffc8e63c1ed647f4ef09fd4cbeef747aba133a55172cec64c3cf9d759d2c83f7ec8a213
 DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
+DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
 EBUILD pr2_machine-1.11.10.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
 EBUILD pr2_machine-1.11.11.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
 EBUILD pr2_machine-1.11.13.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
 EBUILD pr2_machine-1.11.14.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
 EBUILD pr2_machine-1.11.9.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
 EBUILD pr2_machine-1.12.0.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
+EBUILD pr2_machine-1.12.1.ebuild 374 BLAKE2B 86ba2f0c3dcd06f19e3ea626bc745a5f42ea031ca5d86513661bc410d19d0a4f61b22ce66706ab01eec93e3f1c21d12c6c5b426dfed40a6881fbebaab4835d4f SHA512 62836154f2aee2c4a3167d70ee6ad98472e28f9d603d1e3627bf56e99f6358f4839ef8a355880a156562f03f3bb7e9af52dc64a12f6e648d1100459262b1b251
 EBUILD pr2_machine-9999.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_machine/pr2_machine-1.12.1.ebuild b/dev-ros/pr2_machine/pr2_machine-1.12.1.ebuild
new file mode 100644
index 000000000000..3a8a32077d50
--- /dev/null
+++ b/dev-ros/pr2_machine/pr2_machine-1.12.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="xxx.machine files that describe the different hosts a node can be spawned on"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_msgs/Manifest b/dev-ros/pr2_msgs/Manifest
index 8c1ff23588e9..67cde96bd6c1 100644
--- a/dev-ros/pr2_msgs/Manifest
+++ b/dev-ros/pr2_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
+DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
 EBUILD pr2_msgs-1.12.0.ebuild 540 BLAKE2B a81dd2fe728a8e08988cdd9003b9d9f3f23d575c68b0745b9f14c273bd61dbfcb675dcdc8793d9092a279f47f113a33c0024beb63634833192ec6af407ffdf0d SHA512 90817efe25563bc7e87d01c02c8a37334b0ee54ca0fdc69e17a2782e7b2f23e31cb3f950143f5f3b4fce0f16fd29035ce85b48241298fb5dacf2f68a48f6b35d
+EBUILD pr2_msgs-1.12.1.ebuild 540 BLAKE2B 886be8024a4e5351b83ee4d068ed91cffa4da3aceb54cf2c8d31f74673db1ce5b50562ff92353f4186709482b15c2732bc104daff1da0b234ed22729bfc7eabf SHA512 e4aa611b2481e9cf136acf0bdf3dec56646a35614d4442ebdc00f4bd1e7e26525fb9321a4a1757ab73383c8ce5a82a4e5eb387c4489e52fcfbd6b14a9c41012d
 EBUILD pr2_msgs-9999.ebuild 540 BLAKE2B a81dd2fe728a8e08988cdd9003b9d9f3f23d575c68b0745b9f14c273bd61dbfcb675dcdc8793d9092a279f47f113a33c0024beb63634833192ec6af407ffdf0d SHA512 90817efe25563bc7e87d01c02c8a37334b0ee54ca0fdc69e17a2782e7b2f23e31cb3f950143f5f3b4fce0f16fd29035ce85b48241298fb5dacf2f68a48f6b35d
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_msgs/pr2_msgs-1.12.1.ebuild b/dev-ros/pr2_msgs/pr2_msgs-1.12.1.ebuild
new file mode 100644
index 000000000000..fd03e78a9820
--- /dev/null
+++ b/dev-ros/pr2_msgs/pr2_msgs-1.12.1.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/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_reconfigure/Manifest b/dev-ros/rqt_reconfigure/Manifest
index 82ee8cf2d91c..40269118e217 100644
--- a/dev-ros/rqt_reconfigure/Manifest
+++ b/dev-ros/rqt_reconfigure/Manifest
@@ -1,6 +1,6 @@
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 BLAKE2B 5efebfa64dcc587822e558b5527a2ef2e33adc8adcb45800876e278be5ccdacbaef93b0f9dfbb7b98972fd5cffb4fcddee80e9522a4135a736d744765c2490ed SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7
 DIST rqt_reconfigure-0.4.8.tar.gz 27937 BLAKE2B c18d7bd646ebd6c19f2c8eb14093f9761b3e4dcfbd0f3989e7e45e230cfb40b402bc87016bd877433357d00ca03deb13ecee502a41332b79da0367faa4f4d7f8 SHA512 0ed02c9429974cfb598371923440dfa3b2ea00018898bb404f0301d1573d6162f61c7628edbf2b9517a9104d8dfbc63f31257a58ad3abf859165231159f794d2
-EBUILD rqt_reconfigure-0.4.7.ebuild 675 BLAKE2B eef22a396a1cd6d08749decc446a76628bbd9e670ce30baa4b8f18b74f33e6f5fb77938b1c89623249f54d94667f7de51b7f54487384fd255addae9cbe955e37 SHA512 b7b88586eac4d15f2711a47fb736cd0c6c8a29b100f1a4e0f38eed2d064a1b3895549865ee7037f4281a5efd4d5f47570e23417be1c51f89c01542b3ec9d4a2a
+DIST rqt_reconfigure-0.4.9.tar.gz 28120 BLAKE2B 91064b3a07d80c0d51178dbab882319326a03a00d648f14a6b160b008075bb59bc32c3f47e0ec1650b27ea1fe53e0bc92197d3dd7baf2bda5fcf75b77c3d5665 SHA512 20898a74d4b43442ab15890bdef8ccc62129fa2786d7c99515120eea90175a318ffaf75986b5b5b1ae5664548461a636ba15577b9a94084826272a4411162ac3
 EBUILD rqt_reconfigure-0.4.8.ebuild 655 BLAKE2B 40c952636cce4b3143957b73c3aa4de285d9cb17c072769e2ff618756b61ec10d44c3a68eb686539710944a9ddea996e9b92e2d5482ac7ea694906f45465038b SHA512 ae8663b9615445394b265dcbd5e1212273568b467230594b3e7a041509b3544d9bfb0f1d441aefb2aa88273a9e5baeacfa1e7763d6dbd58e35f72f53b3f82740
+EBUILD rqt_reconfigure-0.4.9.ebuild 655 BLAKE2B 3aa0450116f59085150a4d24c882e1c0939a97139f5620dc23aa024fb850182cf3875ba212edb7d3d5afd4308e1dab450886dbb821fe03c33d21c8f0fe7a95cd SHA512 e583f30d38fb8a5d972c83e93bf6146ad5e55824b55367c89732394c9ed433f10ea239bd2f0a3538fcf4c8dbf189deff6c9a06d0685085ee5c86bc524e81a4da
 EBUILD rqt_reconfigure-9999.ebuild 655 BLAKE2B 40c952636cce4b3143957b73c3aa4de285d9cb17c072769e2ff618756b61ec10d44c3a68eb686539710944a9ddea996e9b92e2d5482ac7ea694906f45465038b SHA512 ae8663b9615445394b265dcbd5e1212273568b467230594b3e7a041509b3544d9bfb0f1d441aefb2aa88273a9e5baeacfa1e7763d6dbd58e35f72f53b3f82740
 MISC metadata.xml 347 BLAKE2B 1ff3265b37380e28dd01d7f2ff2c6f2e373717f608c586e88fb7a6a4827d8a345e7181017ba7b2e03b6e1ca5b97960bbcb3a0f38c583510e3ca4ec96988ff2d0 SHA512 bc289c092d712b968ff74ac6e7d92545892a158442b31aba95afd99224a34c993c86e1a65bdbc0043381ee01f051309d35cd216f6316073f81b186dabaedb5ea
diff --git a/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.7.ebuild b/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.9.ebuild
index dc071e77bb0a..00637e917afc 100644
--- a/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.7.ebuild
+++ b/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.9.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_reconfigure"
 PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
 
 inherit ros-catkin
author	V3n3RiX <venerix@redcorelinux.org>	2018-02-15 16:58:00 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-02-15 16:58:00 +0000
commit	434d713861b70f6c6563d6ee50a8e64f14c970d9 (patch)
tree	b72c523c72e764420f835ba9d63d43ffef687dcf /dev-ros
parent	f78108598211053d41752a83e0345441bb9014ae (diff)