2020-07-10 16:35:31 UTC

184 files changed, 769 insertions, 1702 deletions

diff --git a/metadata/md5-cache/dev-ros/amcl-1.16.3-r1 b/metadata/md5-cache/dev-ros/amcl-1.16.3-r1
deleted file mode 100644
index b44e1b8d1277..000000000000
--- a/metadata/md5-cache/dev-ros/amcl-1.16.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_updater[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/map_server[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Probabilistic localization system for a robot moving in 2D
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/amcl https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=LGPL-2.1
-RDEPEND=dev-ros/diagnostic_updater[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.3.tar.gz -> navigation-1.16.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6a23080f40455c695a7fe92b70070056
diff --git a/metadata/md5-cache/dev-ros/amcl-1.16.6 b/metadata/md5-cache/dev-ros/amcl-1.16.6
deleted file mode 100644
index af6d0861a614..000000000000
--- a/metadata/md5-cache/dev-ros/amcl-1.16.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_updater[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/map_server[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Probabilistic localization system for a robot moving in 2D
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/amcl https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=LGPL-2.1
-RDEPEND=dev-ros/diagnostic_updater[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.6.tar.gz -> navigation-1.16.6.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6a23080f40455c695a7fe92b70070056
diff --git a/metadata/md5-cache/dev-ros/amcl-1.17.0 b/metadata/md5-cache/dev-ros/amcl-1.17.0
new file mode 100644
index 000000000000..660d6b50deb8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/amcl-1.17.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/diagnostic_updater[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/map_server[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Probabilistic localization system for a robot moving in 2D
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/amcl https://github.com/ros-planning/navigation
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=LGPL-2.1
+RDEPEND=dev-ros/diagnostic_updater[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5d70f4c58c9e3ea836d466abcb6ae7c2
diff --git a/metadata/md5-cache/dev-ros/amcl-9999 b/metadata/md5-cache/dev-ros/amcl-9999
index 04410b9f1bf1..e0b30d6a304e 100644
--- a/metadata/md5-cache/dev-ros/amcl-9999
+++ b/metadata/md5-cache/dev-ros/amcl-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_updater[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/map_server[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/diagnostic_updater[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/map_server[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Probabilistic localization system for a robot moving in 2D
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/amcl https://github.com/ros-planning/navigation
 IUSE=python_targets_python3_6 test
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_updater[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/diagnostic_updater[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6a23080f40455c695a7fe92b70070056
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5d70f4c58c9e3ea836d466abcb6ae7c2
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-1.16.1 b/metadata/md5-cache/dev-ros/base_local_planner-1.16.1
deleted file mode 100644
index a047b6f5e689..000000000000
--- a/metadata/md5-cache/dev-ros/base_local_planner-1.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules test? ( dev-cpp/gtest dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/base_local_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b3ed73ed616527b8d43769f3431cd67d
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-1.16.2 b/metadata/md5-cache/dev-ros/base_local_planner-1.16.2
deleted file mode 100644
index ac855cdd2f6e..000000000000
--- a/metadata/md5-cache/dev-ros/base_local_planner-1.16.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/cmake_modules test? ( dev-cpp/gtest dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/base_local_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3f2461b494627330ad86749debfa698d
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-1.16.3 b/metadata/md5-cache/dev-ros/base_local_planner-1.16.3
deleted file mode 100644
index 95ba5bb742a6..000000000000
--- a/metadata/md5-cache/dev-ros/base_local_planner-1.16.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/cmake_modules test? ( dev-cpp/gtest dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/base_local_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.3.tar.gz -> navigation-1.16.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bc6aa9f29c96e18e285236a83cd25692
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-1.16.6 b/metadata/md5-cache/dev-ros/base_local_planner-1.16.6
deleted file mode 100644
index 2610e5e75edd..000000000000
--- a/metadata/md5-cache/dev-ros/base_local_planner-1.16.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/cmake_modules test? ( dev-cpp/gtest dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/base_local_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.6.tar.gz -> navigation-1.16.6.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e3ea91cb6effbaea8f52a120f96b3613
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-1.17.0 b/metadata/md5-cache/dev-ros/base_local_planner-1.17.0
new file mode 100644
index 000000000000..ff483f95fba5
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/base_local_planner-1.17.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to robot navigation on a plane
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/base_local_planner https://github.com/ros-planning/navigation
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ad73feee65ff960fd9b52b3fd6174863
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-9999 b/metadata/md5-cache/dev-ros/base_local_planner-9999
index 1a6c301e9480..dcf1e0b448aa 100644
--- a/metadata/md5-cache/dev-ros/base_local_planner-9999
+++ b/metadata/md5-cache/dev-ros/base_local_planner-9999
@@ -1,14 +1,15 @@
+BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/cmake_modules test? ( dev-cpp/gtest dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane
-EAPI=5
+DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to robot navigation on a plane
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/base_local_planner https://github.com/ros-planning/navigation
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3f2461b494627330ad86749debfa698d
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ad73feee65ff960fd9b52b3fd6174863
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-1.16.1 b/metadata/md5-cache/dev-ros/carrot_planner-1.16.1
deleted file mode 100644
index fccee3cc6157..000000000000
--- a/metadata/md5-cache/dev-ros/carrot_planner-1.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/carrot_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4be292b4011ccde05d2990b2bf94c896
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-1.16.2 b/metadata/md5-cache/dev-ros/carrot_planner-1.16.2
deleted file mode 100644
index 5f3660458fda..000000000000
--- a/metadata/md5-cache/dev-ros/carrot_planner-1.16.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/carrot_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f313433e654cf7fd2c15889af60ca7b6
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-1.16.3 b/metadata/md5-cache/dev-ros/carrot_planner-1.16.3
deleted file mode 100644
index 453d2f7bc928..000000000000
--- a/metadata/md5-cache/dev-ros/carrot_planner-1.16.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/carrot_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.3.tar.gz -> navigation-1.16.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=efae72122889ac7751475924d1399fa0
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-1.16.6 b/metadata/md5-cache/dev-ros/carrot_planner-1.16.6
deleted file mode 100644
index 57f6c77275d6..000000000000
--- a/metadata/md5-cache/dev-ros/carrot_planner-1.16.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/carrot_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.6.tar.gz -> navigation-1.16.6.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de4722a445e4bc79f04180534bbcdd3a
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-1.17.0 b/metadata/md5-cache/dev-ros/carrot_planner-1.17.0
new file mode 100644
index 000000000000..26a7fae61c70
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/carrot_planner-1.17.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/carrot_planner https://github.com/ros-planning/navigation
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d4624062d4e5ec45de23f9b46a444b06
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-9999 b/metadata/md5-cache/dev-ros/carrot_planner-9999
index e457a6dadc49..9135a071d8cf 100644
--- a/metadata/md5-cache/dev-ros/carrot_planner-9999
+++ b/metadata/md5-cache/dev-ros/carrot_planner-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/carrot_planner https://github.com/ros-planning/navigation
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f313433e654cf7fd2c15889af60ca7b6
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d4624062d4e5ec45de23f9b46a444b06
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.3 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.3
deleted file mode 100644
index f74058099a39..000000000000
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Recovery behavior that attempts to clear space by reverting the costmaps to the static map
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/clear_costmap_recovery https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.3.tar.gz -> navigation-1.16.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=002d7dc4ff33bdec9288af568fa48145
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.6 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.6
deleted file mode 100644
index 6c0b33e8aad9..000000000000
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.16.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Recovery behavior that attempts to clear space by reverting the costmaps to the static map
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/clear_costmap_recovery https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.6.tar.gz -> navigation-1.16.6.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9a01639f4aa27c47308003e003a8101a
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.0 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.0
new file mode 100644
index 000000000000..a1ecfbb5976b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Recovery behavior that attempts reverting the costmaps to the static map
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/clear_costmap_recovery https://github.com/ros-planning/navigation
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=231b6389e7236afcdd3fdf6e8a4399cc
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
index 2f4755f412ef..09e877bcc2dc 100644
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Recovery behavior that attempts to clear space by reverting the costmaps to the static map
-EAPI=5
+DEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Recovery behavior that attempts reverting the costmaps to the static map
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/clear_costmap_recovery https://github.com/ros-planning/navigation
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/plu
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=002d7dc4ff33bdec9288af568fa48145
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=231b6389e7236afcdd3fdf6e8a4399cc
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-1.16.1 b/metadata/md5-cache/dev-ros/costmap_2d-1.16.1
deleted file mode 100644
index 2afe10200eb2..000000000000
--- a/metadata/md5-cache/dev-ros/costmap_2d-1.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-ros/cmake_modules test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Creates a 2D costmap from sensor data
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/costmap_2d https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=ros_messages_cxx || ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f757c71d5fed266aec092c5319e6cc91
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-1.16.2 b/metadata/md5-cache/dev-ros/costmap_2d-1.16.2
deleted file mode 100644
index f35ea7338ef4..000000000000
--- a/metadata/md5-cache/dev-ros/costmap_2d-1.16.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-ros/cmake_modules test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Creates a 2D costmap from sensor data
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/costmap_2d https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=ros_messages_cxx || ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57a98707a5970bcae04812304ccf114f
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-1.16.3 b/metadata/md5-cache/dev-ros/costmap_2d-1.16.3
deleted file mode 100644
index 23359e204669..000000000000
--- a/metadata/md5-cache/dev-ros/costmap_2d-1.16.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-ros/cmake_modules test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Creates a 2D costmap from sensor data
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/costmap_2d https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=ros_messages_cxx || ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.3.tar.gz -> navigation-1.16.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8cdcca24c8858b619f41057c4d250028
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-1.16.6 b/metadata/md5-cache/dev-ros/costmap_2d-1.16.6
deleted file mode 100644
index 201d186e8a9d..000000000000
--- a/metadata/md5-cache/dev-ros/costmap_2d-1.16.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-ros/cmake_modules test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Creates a 2D costmap from sensor data
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/costmap_2d https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=ros_messages_cxx || ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.6.tar.gz -> navigation-1.16.6.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=08af75e5499bc9e7e7447d28929cce4f
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-1.17.0 b/metadata/md5-cache/dev-ros/costmap_2d-1.17.0
new file mode 100644
index 000000000000..25e3090e1182
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/costmap_2d-1.17.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Creates a 2D costmap from sensor data
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/costmap_2d https://github.com/ros-planning/navigation
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=ros_messages_cxx || ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f7266b9bc440662589c5abaf8c8a165b
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-9999 b/metadata/md5-cache/dev-ros/costmap_2d-9999
index 7212c2f7e66a..f4a6ab599692 100644
--- a/metadata/md5-cache/dev-ros/costmap_2d-9999
+++ b/metadata/md5-cache/dev-ros/costmap_2d-9999
@@ -1,14 +1,15 @@
+BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-ros/cmake_modules test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=Creates a 2D costmap from sensor data
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/costmap_2d https://github.com/ros-planning/navigation
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/voxel_grid dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 REQUIRED_USE=ros_messages_cxx || ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57a98707a5970bcae04812304ccf114f
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f7266b9bc440662589c5abaf8c8a165b
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.1 b/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.1
deleted file mode 100644
index 3c85d387a74a..000000000000
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:=[threads] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/dwa_local_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25595817cf2e5428d925448732a50ab5
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.2 b/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.2
deleted file mode 100644
index fb84ec38790d..000000000000
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/dwa_local_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d6c3db79a4697290cfde448ae971a8b3
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.3 b/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.3
deleted file mode 100644
index 608ef4eaf9fb..000000000000
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/dwa_local_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.3.tar.gz -> navigation-1.16.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed1512705271ea651fa8a47dfb504cac
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.6 b/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.6
deleted file mode 100644
index af8af9f81140..000000000000
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-1.16.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/dwa_local_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.6.tar.gz -> navigation-1.16.6.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ccce7bc570bb758d3f79716674da30a4
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-1.17.0 b/metadata/md5-cache/dev-ros/dwa_local_planner-1.17.0
new file mode 100644
index 000000000000..0c60a40a642f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/dwa_local_planner-1.17.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/dwa_local_planner https://github.com/ros-planning/navigation
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6f7e1e64b14aecafc45af235480b20ca
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-9999 b/metadata/md5-cache/dev-ros/dwa_local_planner-9999
index 4124d69d13b0..281308791e60 100644
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-9999
+++ b/metadata/md5-cache/dev-ros/dwa_local_planner-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/dwa_local_planner https://github.com/ros-planning/navigation
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d6c3db79a4697290cfde448ae971a8b3
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6f7e1e64b14aecafc45af235480b20ca
diff --git a/metadata/md5-cache/dev-ros/fake_localization-1.16.6 b/metadata/md5-cache/dev-ros/fake_localization-1.17.0
index 84f649058e2c..6276545cab9c 100644
--- a/metadata/md5-cache/dev-ros/fake_localization-1.16.6
+++ b/metadata/md5-cache/dev-ros/fake_localization-1.17.0
@@ -11,6 +11,6 @@ RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targ
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.6.tar.gz -> navigation-1.16.6.tar.gz
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a019d2a4e48b416c113286a6f0853492
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.15.1-r1 b/metadata/md5-cache/dev-ros/global_planner-1.15.1-r1
deleted file mode 100644
index fb83ff8a67a1..000000000000
--- a/metadata/md5-cache/dev-ros/global_planner-1.15.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Path planner library and node
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/global_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.1.tar.gz -> navigation-1.15.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6029bfa3802b78b68265f0f8db751d24
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.15.2 b/metadata/md5-cache/dev-ros/global_planner-1.15.2
deleted file mode 100644
index 9ffe0f7e364a..000000000000
--- a/metadata/md5-cache/dev-ros/global_planner-1.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Path planner library and node
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/global_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b12d691b2197a404c698c88a00bda46a
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.16.0 b/metadata/md5-cache/dev-ros/global_planner-1.16.0
deleted file mode 100644
index 5190755e2aba..000000000000
--- a/metadata/md5-cache/dev-ros/global_planner-1.16.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Path planner library and node
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/global_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.0.tar.gz -> navigation-1.16.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d533489a07b679923b935774584e18d0
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.16.1 b/metadata/md5-cache/dev-ros/global_planner-1.16.1
deleted file mode 100644
index 8958156d85e4..000000000000
--- a/metadata/md5-cache/dev-ros/global_planner-1.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Path planner library and node
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/global_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d533489a07b679923b935774584e18d0
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.16.2 b/metadata/md5-cache/dev-ros/global_planner-1.16.2
deleted file mode 100644
index 8b7c6e648791..000000000000
--- a/metadata/md5-cache/dev-ros/global_planner-1.16.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Path planner library and node
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/global_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d533489a07b679923b935774584e18d0
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.16.3 b/metadata/md5-cache/dev-ros/global_planner-1.16.3
deleted file mode 100644
index 99c603909cb1..000000000000
--- a/metadata/md5-cache/dev-ros/global_planner-1.16.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Path planner library and node
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/global_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.3.tar.gz -> navigation-1.16.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eea4c5cf1ccb940847e4ea09a7cc35ec
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.16.6 b/metadata/md5-cache/dev-ros/global_planner-1.16.6
deleted file mode 100644
index 3f3e8189ed4d..000000000000
--- a/metadata/md5-cache/dev-ros/global_planner-1.16.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Path planner library and node
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/global_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.6.tar.gz -> navigation-1.16.6.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=427d5988c6c6f0f7d0bbe0b48dba1849
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.17.0 b/metadata/md5-cache/dev-ros/global_planner-1.17.0
new file mode 100644
index 000000000000..0a9ed8f2633e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/global_planner-1.17.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Path planner library and node
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/global_planner https://github.com/ros-planning/navigation
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6efe797aa9b0308c0655139e4afdf74f
diff --git a/metadata/md5-cache/dev-ros/global_planner-9999 b/metadata/md5-cache/dev-ros/global_planner-9999
index 6e88ac655131..a4cd74ef5c5e 100644
--- a/metadata/md5-cache/dev-ros/global_planner-9999
+++ b/metadata/md5-cache/dev-ros/global_planner-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Path planner library and node
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/global_planner https://github.com/ros-planning/navigation
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d533489a07b679923b935774584e18d0
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6efe797aa9b0308c0655139e4afdf74f
diff --git a/metadata/md5-cache/dev-ros/map_server-1.15.2-r1 b/metadata/md5-cache/dev-ros/map_server-1.15.2-r1
deleted file mode 100644
index 129e98d11dcd..000000000000
--- a/metadata/md5-cache/dev-ros/map_server-1.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5:= sci-physics/bullet:= test? ( dev-ros/rostest dev-cpp/gtest ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Offers map data as a ROS service
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/map_server https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5:= sci-physics/bullet:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0d06f89b202fd3c96b7683e749cf0cf7
diff --git a/metadata/md5-cache/dev-ros/map_server-1.16.0 b/metadata/md5-cache/dev-ros/map_server-1.16.0
deleted file mode 100644
index 1c5188fb7975..000000000000
--- a/metadata/md5-cache/dev-ros/map_server-1.16.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-physics/bullet:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Offers map data as a ROS service
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/map_server https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=sci-physics/bullet:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.0.tar.gz -> navigation-1.16.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20a9fcd3c331088ea81e0daac42647e1
diff --git a/metadata/md5-cache/dev-ros/map_server-1.16.1 b/metadata/md5-cache/dev-ros/map_server-1.16.1
deleted file mode 100644
index 03cbcaf29a5b..000000000000
--- a/metadata/md5-cache/dev-ros/map_server-1.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-physics/bullet:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Offers map data as a ROS service
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/map_server https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=sci-physics/bullet:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20a9fcd3c331088ea81e0daac42647e1
diff --git a/metadata/md5-cache/dev-ros/map_server-1.16.2 b/metadata/md5-cache/dev-ros/map_server-1.16.2
deleted file mode 100644
index 06c0eb173107..000000000000
--- a/metadata/md5-cache/dev-ros/map_server-1.16.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-physics/bullet:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Offers map data as a ROS service
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/map_server https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=sci-physics/bullet:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20a9fcd3c331088ea81e0daac42647e1
diff --git a/metadata/md5-cache/dev-ros/map_server-1.16.3 b/metadata/md5-cache/dev-ros/map_server-1.16.3
deleted file mode 100644
index ee016b682ca5..000000000000
--- a/metadata/md5-cache/dev-ros/map_server-1.16.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-physics/bullet:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Offers map data as a ROS service
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/map_server https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=sci-physics/bullet:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.3.tar.gz -> navigation-1.16.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4582c8558bf58a7b250be49623193c96
diff --git a/metadata/md5-cache/dev-ros/map_server-1.16.6 b/metadata/md5-cache/dev-ros/map_server-1.16.6
deleted file mode 100644
index 0f154ed7dca6..000000000000
--- a/metadata/md5-cache/dev-ros/map_server-1.16.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-physics/bullet:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Offers map data as a ROS service
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/map_server https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=sci-physics/bullet:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.6.tar.gz -> navigation-1.16.6.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8058eedb9332b8fcd076141f462caf67
diff --git a/metadata/md5-cache/dev-ros/map_server-1.17.0 b/metadata/md5-cache/dev-ros/map_server-1.17.0
new file mode 100644
index 000000000000..71d3c2ebb953
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/map_server-1.17.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit ) dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Offers map data as a ROS service
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/map_server https://github.com/ros-planning/navigation
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=89fb709f5b11cc0225b43e4823fb6565
diff --git a/metadata/md5-cache/dev-ros/map_server-9999 b/metadata/md5-cache/dev-ros/map_server-9999
index b26bacc85d38..ea56fc6013c0 100644
--- a/metadata/md5-cache/dev-ros/map_server-9999
+++ b/metadata/md5-cache/dev-ros/map_server-9999
@@ -1,14 +1,15 @@
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sci-physics/bullet:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit ) dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Offers map data as a ROS service
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/map_server https://github.com/ros-planning/navigation
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=sci-physics/bullet:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20a9fcd3c331088ea81e0daac42647e1
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=89fb709f5b11cc0225b43e4823fb6565
diff --git a/metadata/md5-cache/dev-ros/move_base-1.15.1-r2 b/metadata/md5-cache/dev-ros/move_base-1.15.1-r2
deleted file mode 100644
index 4a005ac543fc..000000000000
--- a/metadata/md5-cache/dev-ros/move_base-1.15.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.15.1 dev-ros/roscpp dev-ros/pluginlib 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/move_base https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.15.1 dev-ros/roscpp dev-ros/pluginlib 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.1.tar.gz -> navigation-1.15.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=46710ec6d0524eb750b4aa7d223c556f
diff --git a/metadata/md5-cache/dev-ros/move_base-1.15.2 b/metadata/md5-cache/dev-ros/move_base-1.15.2
deleted file mode 100644
index c3d01deb07a6..000000000000
--- a/metadata/md5-cache/dev-ros/move_base-1.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.15.1 dev-ros/roscpp dev-ros/pluginlib 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/move_base https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.15.1 dev-ros/roscpp dev-ros/pluginlib 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=46710ec6d0524eb750b4aa7d223c556f
diff --git a/metadata/md5-cache/dev-ros/move_base-1.16.0 b/metadata/md5-cache/dev-ros/move_base-1.16.0
deleted file mode 100644
index 9801764229ee..000000000000
--- a/metadata/md5-cache/dev-ros/move_base-1.16.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/move_base https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.0.tar.gz -> navigation-1.16.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=734742f28191ddb49d6b5ae03dde8f07
diff --git a/metadata/md5-cache/dev-ros/move_base-1.16.1 b/metadata/md5-cache/dev-ros/move_base-1.16.1
deleted file mode 100644
index fa5062bbaec8..000000000000
--- a/metadata/md5-cache/dev-ros/move_base-1.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/move_base https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=734742f28191ddb49d6b5ae03dde8f07
diff --git a/metadata/md5-cache/dev-ros/move_base-1.16.2 b/metadata/md5-cache/dev-ros/move_base-1.16.2
deleted file mode 100644
index f22fae2e0b70..000000000000
--- a/metadata/md5-cache/dev-ros/move_base-1.16.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/move_base https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=734742f28191ddb49d6b5ae03dde8f07
diff --git a/metadata/md5-cache/dev-ros/move_base-1.16.3 b/metadata/md5-cache/dev-ros/move_base-1.16.3
deleted file mode 100644
index ef1d6d8b0ced..000000000000
--- a/metadata/md5-cache/dev-ros/move_base-1.16.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/move_base https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.3.tar.gz -> navigation-1.16.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d76ffb2491c36a5986380c46b8d16274
diff --git a/metadata/md5-cache/dev-ros/move_base-1.16.6 b/metadata/md5-cache/dev-ros/move_base-1.16.6
deleted file mode 100644
index 95000d91b6d4..000000000000
--- a/metadata/md5-cache/dev-ros/move_base-1.16.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/move_base https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.6.tar.gz -> navigation-1.16.6.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f35633ded6bcd8222389b1e2844373b
diff --git a/metadata/md5-cache/dev-ros/move_base-1.17.0 b/metadata/md5-cache/dev-ros/move_base-1.17.0
new file mode 100644
index 000000000000..f88cdbec805b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/move_base-1.17.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/move_base https://github.com/ros-planning/navigation
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6e9d5b85609d3d781317f96c54f10d7d
diff --git a/metadata/md5-cache/dev-ros/move_base-9999 b/metadata/md5-cache/dev-ros/move_base-9999
index d18c1d00a04e..1b8b8988ae08 100644
--- a/metadata/md5-cache/dev-ros/move_base-9999
+++ b/metadata/md5-cache/dev-ros/move_base-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_base https://github.com/ros-planning/navigation
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=734742f28191ddb49d6b5ae03dde8f07
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6e9d5b85609d3d781317f96c54f10d7d
diff --git a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.1 b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.1
deleted file mode 100644
index 3ae5f992f9c6..000000000000
--- a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Move slow and clear
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/move_slow_and_clear https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=27440bbb78c1902a2e58cf47873f7e8b
diff --git a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.2 b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.2
deleted file mode 100644
index 3dae48e761a0..000000000000
--- a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Move slow and clear
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/move_slow_and_clear https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=27440bbb78c1902a2e58cf47873f7e8b
diff --git a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.3 b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.3
deleted file mode 100644
index 5c4b638b0596..000000000000
--- a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Move slow and clear
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/move_slow_and_clear https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.3.tar.gz -> navigation-1.16.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3abeb302bdc0454347581e9ef2dfcf7b
diff --git a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.6 b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.6
deleted file mode 100644
index 9a84fc413fc1..000000000000
--- a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.16.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Move slow and clear
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/move_slow_and_clear https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.6.tar.gz -> navigation-1.16.6.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5b7e4e3c8980f7653b554acda269b044
diff --git a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.17.0 b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.17.0
new file mode 100644
index 000000000000..2249c9c20d47
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.17.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Move slow and clear
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/move_slow_and_clear https://github.com/ros-planning/navigation
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9a58279222aca1163281df33cdf1af7f
diff --git a/metadata/md5-cache/dev-ros/move_slow_and_clear-9999 b/metadata/md5-cache/dev-ros/move_slow_and_clear-9999
index e3bba46905a9..1bda439924e2 100644
--- a/metadata/md5-cache/dev-ros/move_slow_and_clear-9999
+++ b/metadata/md5-cache/dev-ros/move_slow_and_clear-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Move slow and clear
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_slow_and_clear https://github.com/ros-planning/navigation
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=27440bbb78c1902a2e58cf47873f7e8b
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9a58279222aca1163281df33cdf1af7f
diff --git a/metadata/md5-cache/dev-ros/nav_core-1.15.2 b/metadata/md5-cache/dev-ros/nav_core-1.15.2
deleted file mode 100644
index a7ce8e48002c..000000000000
--- a/metadata/md5-cache/dev-ros/nav_core-1.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/costmap_2d sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Common interfaces for navigation specific robot actions
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/nav_core https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/costmap_2d python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=83a7268b87351721f1a618adc8c74530
diff --git a/metadata/md5-cache/dev-ros/nav_core-1.16.0 b/metadata/md5-cache/dev-ros/nav_core-1.16.0
deleted file mode 100644
index da0769782135..000000000000
--- a/metadata/md5-cache/dev-ros/nav_core-1.16.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Common interfaces for navigation specific robot actions
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/nav_core https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.0.tar.gz -> navigation-1.16.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=536f7f888c3b1762eb1f2b97d36770b7
diff --git a/metadata/md5-cache/dev-ros/nav_core-1.16.1 b/metadata/md5-cache/dev-ros/nav_core-1.16.1
deleted file mode 100644
index 709599927f61..000000000000
--- a/metadata/md5-cache/dev-ros/nav_core-1.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Common interfaces for navigation specific robot actions
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/nav_core https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=536f7f888c3b1762eb1f2b97d36770b7
diff --git a/metadata/md5-cache/dev-ros/nav_core-1.16.2 b/metadata/md5-cache/dev-ros/nav_core-1.16.2
deleted file mode 100644
index 155f4cc7fa92..000000000000
--- a/metadata/md5-cache/dev-ros/nav_core-1.16.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Common interfaces for navigation specific robot actions
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/nav_core https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=536f7f888c3b1762eb1f2b97d36770b7
diff --git a/metadata/md5-cache/dev-ros/nav_core-1.16.3 b/metadata/md5-cache/dev-ros/nav_core-1.16.3
deleted file mode 100644
index 7b70b5e08c86..000000000000
--- a/metadata/md5-cache/dev-ros/nav_core-1.16.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Common interfaces for navigation specific robot actions
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/nav_core https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.3.tar.gz -> navigation-1.16.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c7894c6fdbc10c95552c5a765f25143
diff --git a/metadata/md5-cache/dev-ros/nav_core-1.16.6 b/metadata/md5-cache/dev-ros/nav_core-1.16.6
deleted file mode 100644
index b948cd54f1c7..000000000000
--- a/metadata/md5-cache/dev-ros/nav_core-1.16.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Common interfaces for navigation specific robot actions
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/nav_core https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.6.tar.gz -> navigation-1.16.6.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1437597e9544ff4978b96d61cef75f6c
diff --git a/metadata/md5-cache/dev-ros/nav_core-1.17.0 b/metadata/md5-cache/dev-ros/nav_core-1.17.0
new file mode 100644
index 000000000000..f84acd46ec78
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/nav_core-1.17.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Common interfaces for navigation specific robot actions
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/nav_core https://github.com/ros-planning/navigation
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=abfeeba4f628bdf673b6b1a9b7aca8ee
diff --git a/metadata/md5-cache/dev-ros/nav_core-9999 b/metadata/md5-cache/dev-ros/nav_core-9999
index aa2c31f8d587..d7c9826cdecf 100644
--- a/metadata/md5-cache/dev-ros/nav_core-9999
+++ b/metadata/md5-cache/dev-ros/nav_core-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Common interfaces for navigation specific robot actions
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/nav_core https://github.com/ros-planning/navigation
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/st
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=536f7f888c3b1762eb1f2b97d36770b7
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=abfeeba4f628bdf673b6b1a9b7aca8ee
diff --git a/metadata/md5-cache/dev-ros/navfn-1.16.3 b/metadata/md5-cache/dev-ros/navfn-1.16.3
deleted file mode 100644
index ae41c3d9fca7..000000000000
--- a/metadata/md5-cache/dev-ros/navfn-1.16.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= test? ( dev-cpp/gtest ) dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Fast interpolated navigation function that can be used to create plans for a mobile base
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/navfn https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.3.tar.gz -> navigation-1.16.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=060f28b4ebf07a4782e9d453fa66e264
diff --git a/metadata/md5-cache/dev-ros/navfn-1.16.6 b/metadata/md5-cache/dev-ros/navfn-1.16.6
deleted file mode 100644
index ff5911b822c6..000000000000
--- a/metadata/md5-cache/dev-ros/navfn-1.16.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= test? ( dev-cpp/gtest ) dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Fast interpolated navigation function that can be used to create plans for a mobile base
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/navfn https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.6.tar.gz -> navigation-1.16.6.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a212363c7b8787b96eae20912a0c0f6e
diff --git a/metadata/md5-cache/dev-ros/navfn-1.17.0 b/metadata/md5-cache/dev-ros/navfn-1.17.0
new file mode 100644
index 000000000000..134eeceb1a8f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/navfn-1.17.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= test? ( dev-cpp/gtest ) dev-ros/cmake_modules python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Fast interpolated navigation function for creating plans for a mobile base
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/navfn https://github.com/ros-planning/navigation
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e35c60ae62d5a77f8938ba7810fb3071
diff --git a/metadata/md5-cache/dev-ros/navfn-9999 b/metadata/md5-cache/dev-ros/navfn-9999
index 8c74ad73071d..dfe9d250a28c 100644
--- a/metadata/md5-cache/dev-ros/navfn-9999
+++ b/metadata/md5-cache/dev-ros/navfn-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= test? ( dev-cpp/gtest ) dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Fast interpolated navigation function that can be used to create plans for a mobile base
-EAPI=5
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= test? ( dev-cpp/gtest ) dev-ros/cmake_modules python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Fast interpolated navigation function for creating plans for a mobile base
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/navfn https://github.com/ros-planning/navigation
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/ros
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=060f28b4ebf07a4782e9d453fa66e264
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e35c60ae62d5a77f8938ba7810fb3071
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-1.16.1 b/metadata/md5-cache/dev-ros/rotate_recovery-1.16.1
deleted file mode 100644
index 4331c6993318..000000000000
--- a/metadata/md5-cache/dev-ros/rotate_recovery-1.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/costmap_2d dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-ros/base_local_planner dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rotate_recovery https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/costmap_2d dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-ros/base_local_planner dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8840f4fb3afb2ce141fa9065d6c80a1
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-1.16.2 b/metadata/md5-cache/dev-ros/rotate_recovery-1.16.2
deleted file mode 100644
index d4e70842f3c4..000000000000
--- a/metadata/md5-cache/dev-ros/rotate_recovery-1.16.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rotate_recovery https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=79af0da29a098079e29336b6254e7576
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-1.16.3 b/metadata/md5-cache/dev-ros/rotate_recovery-1.16.3
deleted file mode 100644
index cfcba1664fd5..000000000000
--- a/metadata/md5-cache/dev-ros/rotate_recovery-1.16.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rotate_recovery https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.3.tar.gz -> navigation-1.16.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3c7bf89e4c043ddc30d7cde9eb28fd7f
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-1.16.6 b/metadata/md5-cache/dev-ros/rotate_recovery-1.16.6
deleted file mode 100644
index 3774f3a0c121..000000000000
--- a/metadata/md5-cache/dev-ros/rotate_recovery-1.16.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rotate_recovery https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.6.tar.gz -> navigation-1.16.6.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0245223f4fd9418942ec2389f74b981f
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-1.17.0 b/metadata/md5-cache/dev-ros/rotate_recovery-1.17.0
new file mode 100644
index 000000000000..b1505b78b018
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-1.17.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Recovery behavior that attempts performing a 360 degree rotation of the robot
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rotate_recovery https://github.com/ros-planning/navigation
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6abb5d12d5fbfcd5a10a1c0f88254f8b
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-9999 b/metadata/md5-cache/dev-ros/rotate_recovery-9999
index 17f5df19ac0b..801ac2e066ab 100644
--- a/metadata/md5-cache/dev-ros/rotate_recovery-9999
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot
-EAPI=5
+DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Recovery behavior that attempts performing a 360 degree rotation of the robot
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rotate_recovery https://github.com/ros-planning/navigation
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eig
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=79af0da29a098079e29336b6254e7576
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6abb5d12d5fbfcd5a10a1c0f88254f8b
diff --git a/metadata/md5-cache/dev-ros/rqt_action-0.4.9 b/metadata/md5-cache/dev-ros/rqt_action-0.4.9
index bdc70a0ca59b..de69a20c8683 100644
--- a/metadata/md5-cache/dev-ros/rqt_action-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_action-0.4.9
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_msg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_msg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Introspect all available ROS action (from actionlib) types
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_action https://github.com/ros-visualization/rqt_action
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_action/archive/0.4.9.tar.gz -> rqt_action-0.4.9.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=619cab03def1d3daa0fe4f966d00bc3e
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2c691ba41ce402769e3925b7bf8cbcba
diff --git a/metadata/md5-cache/dev-ros/rqt_action-9999 b/metadata/md5-cache/dev-ros/rqt_action-9999
index b1869c563f18..f36300812a6c 100644
--- a/metadata/md5-cache/dev-ros/rqt_action-9999
+++ b/metadata/md5-cache/dev-ros/rqt_action-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_msg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_msg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Introspect all available ROS action (from actionlib) types
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_action https://github.com/ros-visualization/rqt_action
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=619cab03def1d3daa0fe4f966d00bc3e
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2c691ba41ce402769e3925b7bf8cbcba
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-0.4.11 b/metadata/md5-cache/dev-ros/rqt_bag-0.4.11
deleted file mode 100644
index 3731a779511a..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_bag-0.4.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_bag https://github.com/ros-visualization/rqt_bag
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.11.tar.gz -> rqt_bag-0.4.11.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a71e381828c161ace3d18aca7ccb2c9
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-0.4.12 b/metadata/md5-cache/dev-ros/rqt_bag-0.4.12
deleted file mode 100644
index d945b9b1d09d..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_bag-0.4.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_bag https://github.com/ros-visualization/rqt_bag
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.12.tar.gz -> rqt_bag-0.4.12.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=31840280b0bb9fcb4078cd50956d7506
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-0.4.13 b/metadata/md5-cache/dev-ros/rqt_bag-0.4.13
new file mode 100644
index 000000000000..17627911fc0a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_bag-0.4.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt_bag https://github.com/ros-visualization/rqt_bag
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.13.tar.gz -> rqt_bag-0.4.13.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1bf35a7ad2f6ece5b61a6fb45d8771fe
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-9999 b/metadata/md5-cache/dev-ros/rqt_bag-9999
index 79bf2c63c035..e87f5b110b3b 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-9999
+++ b/metadata/md5-cache/dev-ros/rqt_bag-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_bag https://github.com/ros-visualization/rqt_bag
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a71e381828c161ace3d18aca7ccb2c9
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1bf35a7ad2f6ece5b61a6fb45d8771fe
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.11 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.11
deleted file mode 100644
index 8be19d7839bf..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_bag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_bag_plugins https://github.com/ros-visualization/rqt_bag
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_bag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.11.tar.gz -> rqt_bag-0.4.11.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=94413a8300acf7116bd5a7b0c93e0a28
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.12 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.13
index ee6d39a4a893..71dd59bb5db4 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.12
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.13
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_bag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_bag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_bag_plugins https://github.com/ros-visualization/rqt_bag
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -10,6 +11,6 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.12.tar.gz -> rqt_bag-0.4.12.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ebe53e9cf1defe8e0c140c3cf3883a31
+SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.13.tar.gz -> rqt_bag-0.4.13.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=777df0a43465476ebc88fd8fef8e3933
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
index 4b86d08ed726..dd042ca3d9dc 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_bag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_bag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_bag_plugins https://github.com/ros-visualization/rqt_bag
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=94413a8300acf7116bd5a7b0c93e0a28
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=777df0a43465476ebc88fd8fef8e3933
diff --git a/metadata/md5-cache/dev-ros/rqt_console-0.4.8 b/metadata/md5-cache/dev-ros/rqt_console-0.4.11
index f5fa241e0945..eeb31622385c 100644
--- a/metadata/md5-cache/dev-ros/rqt_console-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_console-0.4.11
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_logger_level[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_logger_level[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=GUI plugin for displaying and filtering ROS messages
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_console https://github.com/ros-visualization/rqt_console
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -10,6 +11,6 @@ RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_console/archive/0.4.8.tar.gz -> rqt_console-0.4.8.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd273580b23c0be7c621e5d14f709180
+SRC_URI=https://github.com/ros-visualization/rqt_console/archive/0.4.11.tar.gz -> rqt_console-0.4.11.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8ed14cc808fb0afd69af338c987d3b4b
diff --git a/metadata/md5-cache/dev-ros/rqt_console-0.4.7 b/metadata/md5-cache/dev-ros/rqt_console-0.4.7
deleted file mode 100644
index cc6c5a2d7d3b..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_console-0.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_logger_level[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=GUI plugin for displaying and filtering ROS messages
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_console https://github.com/ros-visualization/rqt_common_plugins
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_logger_level[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c77a31c70c0655199ecbfe5079337a72
diff --git a/metadata/md5-cache/dev-ros/rqt_console-9999 b/metadata/md5-cache/dev-ros/rqt_console-9999
index d420f2f5c1bb..1ccfbd3817ff 100644
--- a/metadata/md5-cache/dev-ros/rqt_console-9999
+++ b/metadata/md5-cache/dev-ros/rqt_console-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_logger_level[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_logger_level[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=GUI plugin for displaying and filtering ROS messages
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_console https://github.com/ros-visualization/rqt_console
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd273580b23c0be7c621e5d14f709180
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8ed14cc808fb0afd69af338c987d3b4b
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-0.4.9 b/metadata/md5-cache/dev-ros/rqt_dep-0.4.10
index b3eb24335c5b..46ba36712983 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_dep-0.4.10
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_graph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_graph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS dependency graph
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_dep https://github.com/ros-visualization/rqt_dep
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -10,6 +11,6 @@ RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_dep/archive/0.4.9.tar.gz -> rqt_dep-0.4.9.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d545c9cba9861e3e982689ffbe71fe0a
+SRC_URI=https://github.com/ros-visualization/rqt_dep/archive/0.4.10.tar.gz -> rqt_dep-0.4.10.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4985eede60527124834dc0d1998dfac7
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-0.4.7 b/metadata/md5-cache/dev-ros/rqt_dep-0.4.7
deleted file mode 100644
index e9bc67ea827d..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_dep-0.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_graph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=GUI plugin for visualizing the ROS dependency graph
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_dep https://github.com/ros-visualization/rqt_common_plugins
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_graph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f063e25702b3bf8ed050a86548dbc6b2
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-0.4.8 b/metadata/md5-cache/dev-ros/rqt_dep-0.4.8
deleted file mode 100644
index aebcb3a2874c..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_dep-0.4.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_graph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=GUI plugin for visualizing the ROS dependency graph
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_dep https://github.com/ros-visualization/rqt_dep
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_graph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_dep/archive/0.4.8.tar.gz -> rqt_dep-0.4.8.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=761680bc29cff76d33704a066090771b
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-9999 b/metadata/md5-cache/dev-ros/rqt_dep-9999
index 6af299827796..9c63a2393fcc 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-9999
+++ b/metadata/md5-cache/dev-ros/rqt_dep-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_graph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_graph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS dependency graph
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_dep https://github.com/ros-visualization/rqt_dep
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=761680bc29cff76d33704a066090771b
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4985eede60527124834dc0d1998dfac7
diff --git a/metadata/md5-cache/dev-ros/rqt_graph-0.4.10 b/metadata/md5-cache/dev-ros/rqt_graph-0.4.10
deleted file mode 100644
index efe14c56cd0d..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_graph-0.4.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=GUI plugin for visualizing the ROS computation graph
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_graph https://github.com/ros-visualization/rqt_graph
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_graph/archive/0.4.10.tar.gz -> rqt_graph-0.4.10.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b79cf8033ca053bfb45c3af1276f76a
diff --git a/metadata/md5-cache/dev-ros/rqt_graph-0.4.9 b/metadata/md5-cache/dev-ros/rqt_graph-0.4.14
index 3c008f1f9fcb..da0d8bf506ad 100644
--- a/metadata/md5-cache/dev-ros/rqt_graph-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_graph-0.4.14
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS computation graph
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_graph https://github.com/ros-visualization/rqt_graph
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -10,6 +11,6 @@ RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_graph/archive/0.4.9.tar.gz -> rqt_graph-0.4.9.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b04eaf560cc645fc019b19a221f3cfb5
+SRC_URI=https://github.com/ros-visualization/rqt_graph/archive/0.4.14.tar.gz -> rqt_graph-0.4.14.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=21713533a099e2abd1628213c4676351
diff --git a/metadata/md5-cache/dev-ros/rqt_graph-9999 b/metadata/md5-cache/dev-ros/rqt_graph-9999
index f8c5c06384d0..715a7765a0ec 100644
--- a/metadata/md5-cache/dev-ros/rqt_graph-9999
+++ b/metadata/md5-cache/dev-ros/rqt_graph-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS computation graph
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_graph https://github.com/ros-visualization/rqt_graph
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b04eaf560cc645fc019b19a221f3cfb5
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=21713533a099e2abd1628213c4676351
diff --git a/metadata/md5-cache/dev-ros/rqt_gui-0.5.0 b/metadata/md5-cache/dev-ros/rqt_gui-0.5.0
deleted file mode 100644
index 8469156b1fa1..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_gui-0.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Main to start an instance of the ROS integrated graphical user interface provided by qt_gui
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_gui https://github.com/ros-visualization/rqt
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.0.tar.gz -> rqt-0.5.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9fb02f1d42e0315ed98b953577bbfb5c
diff --git a/metadata/md5-cache/dev-ros/rqt_gui-0.5.2 b/metadata/md5-cache/dev-ros/rqt_gui-0.5.2
new file mode 100644
index 000000000000..8c393d3798bb
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_gui-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Instance of the ROS integrated graphical user interface provided by qt_gui
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt_gui https://github.com/ros-visualization/rqt
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.2.tar.gz -> rqt-0.5.2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a0539f1a6330b3818e92da3ac8f75ff9
diff --git a/metadata/md5-cache/dev-ros/rqt_gui-9999 b/metadata/md5-cache/dev-ros/rqt_gui-9999
index 90eb381d37f6..d1629b728752 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Main to start an instance of the ROS integrated graphical user interface provided by qt_gui
-EAPI=5
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Instance of the ROS integrated graphical user interface provided by qt_gui
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui https://github.com/ros-visualization/rqt
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9fb02f1d42e0315ed98b953577bbfb5c
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a0539f1a6330b3818e92da3ac8f75ff9
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.5.0-r1 b/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.5.0-r1
deleted file mode 100644
index e455e1512cab..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.5.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Enables GUI plugins to use the C++ client library for ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_gui_cpp https://github.com/ros-visualization/rqt
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.0.tar.gz -> rqt-0.5.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3879891cc437a57c2ae6affa1df70a9f
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.5.2 b/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.5.2
new file mode 100644
index 000000000000..14a54cb6fc24
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Enables GUI plugins to use the C++ client library for ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt_gui_cpp https://github.com/ros-visualization/rqt
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.2.tar.gz -> rqt-0.5.2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c6fd3fc039eead4d96d25c2ba55e309d
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999 b/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
index a25eaf1e5d48..3ab8391e52e7 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Enables GUI plugins to use the C++ client library for ROS
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui_cpp https://github.com/ros-visualization/rqt
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3879891cc437a57c2ae6affa1df70a9f
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c6fd3fc039eead4d96d25c2ba55e309d
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_py-0.3.2 b/metadata/md5-cache/dev-ros/rqt_gui_py-0.3.2
deleted file mode 100644
index 427ee6c92c04..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_gui_py-0.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/rqt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Enables GUI plugins to use the Python client library for ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_gui_py https://github.com/ros-visualization/rqt
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/rqt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt/archive/0.3.2.tar.gz -> rqt-0.3.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44cd741d94e57ecf65b9c4d665d26d56
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_py-0.5.0 b/metadata/md5-cache/dev-ros/rqt_gui_py-0.5.0
deleted file mode 100644
index 2a9e76960995..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_gui_py-0.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/rqt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Enables GUI plugins to use the Python client library for ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_gui_py https://github.com/ros-visualization/rqt
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/rqt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.0.tar.gz -> rqt-0.5.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44cd741d94e57ecf65b9c4d665d26d56
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_py-0.5.2 b/metadata/md5-cache/dev-ros/rqt_gui_py-0.5.2
new file mode 100644
index 000000000000..591f8f6b66b5
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_gui_py-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/rqt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Enables GUI plugins to use the Python client library for ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt_gui_py https://github.com/ros-visualization/rqt
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/rqt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.2.tar.gz -> rqt-0.5.2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f27c927a1e639318b53a399741f519ac
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_py-9999 b/metadata/md5-cache/dev-ros/rqt_gui_py-9999
index 12b6ffc21ffe..59698e9d9812 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_py-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui_py-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/rqt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/rqt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Enables GUI plugins to use the Python client library for ROS
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui_py https://github.com/ros-visualization/rqt
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44cd741d94e57ecf65b9c4d665d26d56
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f27c927a1e639318b53a399741f519ac
diff --git a/metadata/md5-cache/dev-ros/rqt_launch-0.4.7 b/metadata/md5-cache/dev-ros/rqt_launch-0.4.7
deleted file mode 100644
index 48723c3f1bbe..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_launch-0.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Easy view of .launch files
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_launch https://github.com/ros-visualization/rqt_common_plugins
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=95f71229f5c8bd9ae8987a82c82def19
diff --git a/metadata/md5-cache/dev-ros/rqt_launch-0.4.8 b/metadata/md5-cache/dev-ros/rqt_launch-0.4.8
index da05ec195d16..a0faee9c5e95 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_launch-0.4.8
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Easy view of .launch files
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_launch https://github.com/ros-visualization/rqt_launch
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_launch/archive/0.4.8.tar.gz -> rqt_launch-0.4.8.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0585909c41444af5c34587e06de023d4
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4197bba654ab36793f1fd8051fd8fb83
diff --git a/metadata/md5-cache/dev-ros/rqt_launch-9999 b/metadata/md5-cache/dev-ros/rqt_launch-9999
index 710f6eda07f4..87db4b49eadc 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-9999
+++ b/metadata/md5-cache/dev-ros/rqt_launch-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Easy view of .launch files
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_launch https://github.com/ros-visualization/rqt_launch
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0585909c41444af5c34587e06de023d4
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4197bba654ab36793f1fd8051fd8fb83
diff --git a/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.8 b/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.11
index 6b399181fb3f..0416cceb9f74 100644
--- a/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.11
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=GUI plugin for configuring the logger level of ROS nodes
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_logger_level https://github.com/ros-visualization/rqt_logger_level
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -10,6 +11,6 @@ RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_logger_level/archive/0.4.8.tar.gz -> rqt_logger_level-0.4.8.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ce595e87babdbbfa2575c1747d93020
+SRC_URI=https://github.com/ros-visualization/rqt_logger_level/archive/0.4.11.tar.gz -> rqt_logger_level-0.4.11.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=84dfcfc3d20a92480a7262ad3c18e92c
diff --git a/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.7 b/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.7
deleted file mode 100644
index c7cbf3e533e9..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=GUI plugin for configuring the logger level of ROS nodes
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_logger_level https://github.com/ros-visualization/rqt_common_plugins
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c19f8190d7d43bf07ec59f2b39ca85b2
diff --git a/metadata/md5-cache/dev-ros/rqt_logger_level-9999 b/metadata/md5-cache/dev-ros/rqt_logger_level-9999
index 85e50948c340..571c356b0996 100644
--- a/metadata/md5-cache/dev-ros/rqt_logger_level-9999
+++ b/metadata/md5-cache/dev-ros/rqt_logger_level-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=GUI plugin for configuring the logger level of ROS nodes
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_logger_level https://github.com/ros-visualization/rqt_logger_level
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ce595e87babdbbfa2575c1747d93020
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=84dfcfc3d20a92480a7262ad3c18e92c
diff --git a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.6 b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.6
deleted file mode 100644
index 642fcd745d46..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_topic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Assists monitoring tasks for MoveIt! motion planner
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_moveit https://github.com/ros-visualization/rqt_robot_plugins
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_topic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.6.tar.gz -> rqt_robot_plugins-0.5.6.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8f63357efcda840cc13599d1d17fd27
diff --git a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.7 b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.9
index 6ace8cfa21ef..1203fe4e11db 100644
--- a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.7
+++ b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.9
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_topic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_topic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Assists monitoring tasks for MoveIt! motion planner
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_moveit https://github.com/ros-visualization/rqt_moveit
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -10,6 +11,6 @@ RDEPEND=dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_moveit/archive/0.5.7.tar.gz -> rqt_moveit-0.5.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b34096f6033143d1e68b60d891e3f893
+SRC_URI=https://github.com/ros-visualization/rqt_moveit/archive/0.5.9.tar.gz -> rqt_moveit-0.5.9.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=db3aa7239e03162673daa3668ae8e03e
diff --git a/metadata/md5-cache/dev-ros/rqt_moveit-9999 b/metadata/md5-cache/dev-ros/rqt_moveit-9999
index 726b12921bc5..a43049094c4e 100644
--- a/metadata/md5-cache/dev-ros/rqt_moveit-9999
+++ b/metadata/md5-cache/dev-ros/rqt_moveit-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_topic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_topic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Assists monitoring tasks for MoveIt! motion planner
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_moveit https://github.com/ros-visualization/rqt_moveit
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b34096f6033143d1e68b60d891e3f893
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=db3aa7239e03162673daa3668ae8e03e
diff --git a/metadata/md5-cache/dev-ros/rqt_msg-0.4.7 b/metadata/md5-cache/dev-ros/rqt_msg-0.4.7
deleted file mode 100644
index aa7d29d89ef6..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_msg-0.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Python GUI plugin for introspecting available ROS message types
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_msg https://github.com/ros-visualization/rqt_common_plugins
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=168dcb63ee18945a263274933326a4b4
diff --git a/metadata/md5-cache/dev-ros/rqt_msg-0.4.8 b/metadata/md5-cache/dev-ros/rqt_msg-0.4.9
index e1769c938773..ed1966709e43 100644
--- a/metadata/md5-cache/dev-ros/rqt_msg-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_msg-0.4.9
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python GUI plugin for introspecting available ROS message types
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_msg https://github.com/ros-visualization/rqt_msg
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -10,6 +11,6 @@ RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_msg/archive/0.4.8.tar.gz -> rqt_msg-0.4.8.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8c52058bfb4e0ff47a5401aa4d4cdd8
+SRC_URI=https://github.com/ros-visualization/rqt_msg/archive/0.4.9.tar.gz -> rqt_msg-0.4.9.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=87f715634d4cf02f5ef1f902abcb458f
diff --git a/metadata/md5-cache/dev-ros/rqt_msg-9999 b/metadata/md5-cache/dev-ros/rqt_msg-9999
index 1966fdf70c9a..89b35fa53418 100644
--- a/metadata/md5-cache/dev-ros/rqt_msg-9999
+++ b/metadata/md5-cache/dev-ros/rqt_msg-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python GUI plugin for introspecting available ROS message types
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_msg https://github.com/ros-visualization/rqt_msg
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8c52058bfb4e0ff47a5401aa4d4cdd8
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=87f715634d4cf02f5ef1f902abcb458f
diff --git a/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.6 b/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.6
deleted file mode 100644
index 00c2ffa8597c..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Provides a gui for viewing navigation maps and paths
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_nav_view https://github.com/ros-visualization/rqt_robot_plugins
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.6.tar.gz -> rqt_robot_plugins-0.5.6.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=138ecb848a1651ed5424b31fc0cffaf5
diff --git a/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.7 b/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.7
index 3859c2cf3435..9c78a7e65edc 100644
--- a/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.7
+++ b/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.7
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Provides a gui for viewing navigation maps and paths
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_nav_view https://github.com/ros-visualization/rqt_nav_view
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_nav_view/archive/0.5.7.tar.gz -> rqt_nav_view-0.5.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0354dca772d17aa91f94901c3ba0f3d9
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9cad447bfa3bec52ff957914b58c4606
diff --git a/metadata/md5-cache/dev-ros/rqt_nav_view-9999 b/metadata/md5-cache/dev-ros/rqt_nav_view-9999
index 7eaaa1377255..09254920180b 100644
--- a/metadata/md5-cache/dev-ros/rqt_nav_view-9999
+++ b/metadata/md5-cache/dev-ros/rqt_nav_view-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Provides a gui for viewing navigation maps and paths
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_nav_view https://github.com/ros-visualization/rqt_nav_view
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0354dca772d17aa91f94901c3ba0f3d9
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9cad447bfa3bec52ff957914b58c4606
diff --git a/metadata/md5-cache/dev-ros/rqt_plot-0.4.8 b/metadata/md5-cache/dev-ros/rqt_plot-0.4.12
index 49e2f6e4af7b..314a5b9eece2 100644
--- a/metadata/md5-cache/dev-ros/rqt_plot-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_plot-0.4.12
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyqtgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyqtgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=GUI plugin visualizing numeric values in a 2D plot
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_plot https://github.com/ros-visualization/rqt_plot
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -10,6 +11,6 @@ RDEPEND=dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_plot/archive/0.4.8.tar.gz -> rqt_plot-0.4.8.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=586c73e7a62c72af4fd41d20565e71f2
+SRC_URI=https://github.com/ros-visualization/rqt_plot/archive/0.4.12.tar.gz -> rqt_plot-0.4.12.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a1eb98489f74cd37b3aee0a30e47d59c
diff --git a/metadata/md5-cache/dev-ros/rqt_plot-9999 b/metadata/md5-cache/dev-ros/rqt_plot-9999
index b51d31bf8eb4..e6ee5bb5c94c 100644
--- a/metadata/md5-cache/dev-ros/rqt_plot-9999
+++ b/metadata/md5-cache/dev-ros/rqt_plot-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyqtgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyqtgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=GUI plugin visualizing numeric values in a 2D plot
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_plot https://github.com/ros-visualization/rqt_plot
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=586c73e7a62c72af4fd41d20565e71f2
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a1eb98489f74cd37b3aee0a30e47d59c
diff --git a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.8 b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.10
index 27189d138d63..d0c87062d0cd 100644
--- a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.8
+++ b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.10
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyopengl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyopengl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=GUI plugin for visualizing 3D poses
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_pose_view https://github.com/ros-visualization/rqt_pose_view
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -10,6 +11,6 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_pose_view/archive/0.5.8.tar.gz -> rqt_pose_view-0.5.8.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48583ee5945caf339fdb69360800ce0f
+SRC_URI=https://github.com/ros-visualization/rqt_pose_view/archive/0.5.10.tar.gz -> rqt_pose_view-0.5.10.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=89150bd5e3dfb08fce84067c1ee4c3cc
diff --git a/metadata/md5-cache/dev-ros/rqt_pose_view-9999 b/metadata/md5-cache/dev-ros/rqt_pose_view-9999
index e4ba9e7140ad..544f161b9260 100644
--- a/metadata/md5-cache/dev-ros/rqt_pose_view-9999
+++ b/metadata/md5-cache/dev-ros/rqt_pose_view-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyopengl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyopengl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=GUI plugin for visualizing 3D poses
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_pose_view https://github.com/ros-visualization/rqt_pose_view
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48583ee5945caf339fdb69360800ce0f
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=89150bd5e3dfb08fce84067c1ee4c3cc
diff --git a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.7 b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.7
deleted file mode 100644
index 82d9b3cf8558..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=GUI plugin for publishing arbitrary messages with fixed or computed field values
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_publisher https://github.com/ros-visualization/rqt_common_plugins
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a65412646a53cd5f7b311142061037d0
diff --git a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.8 b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.9
index 28e558116ab9..aadd4315b275 100644
--- a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.9
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=GUI plugin for publishing arbitrary messages with fixed or computed field values
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_publisher https://github.com/ros-visualization/rqt_publisher
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -10,6 +11,6 @@ RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_publisher/archive/0.4.8.tar.gz -> rqt_publisher-0.4.8.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=85363e27e16b66fdaa84a514f3e62875
+SRC_URI=https://github.com/ros-visualization/rqt_publisher/archive/0.4.9.tar.gz -> rqt_publisher-0.4.9.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8f8a100c13d8a1ce43da6928cdbcad01
diff --git a/metadata/md5-cache/dev-ros/rqt_publisher-9999 b/metadata/md5-cache/dev-ros/rqt_publisher-9999
index 567810af51a0..1a56a84684dd 100644
--- a/metadata/md5-cache/dev-ros/rqt_publisher-9999
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=GUI plugin for publishing arbitrary messages with fixed or computed field values
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_publisher https://github.com/ros-visualization/rqt_publisher
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=85363e27e16b66fdaa84a514f3e62875
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8f8a100c13d8a1ce43da6928cdbcad01
diff --git a/metadata/md5-cache/dev-ros/rqt_py_common-0.4.7 b/metadata/md5-cache/dev-ros/rqt_py_common-0.4.7
deleted file mode 100644
index d1bf9670fbdd..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_py_common-0.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Common functionality for rqt plugins written in Python
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_py_common https://github.com/ros-visualization/rqt_common_plugins
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e00080b219f2d57217fcf3119c02caf
diff --git a/metadata/md5-cache/dev-ros/rqt_py_common-0.5.0 b/metadata/md5-cache/dev-ros/rqt_py_common-0.5.2
index 2699a4026834..2f5b1214967f 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_common-0.5.0
+++ b/metadata/md5-cache/dev-ros/rqt_py_common-0.5.2
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Common functionality for rqt plugins written in Python
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_py_common https://github.com/ros-visualization/rqt
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -10,6 +11,6 @@ RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.0.tar.gz -> rqt-0.5.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=336948e2d568e4b257e0b8289fc70866
+SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.2.tar.gz -> rqt-0.5.2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b2b81822be2ff0b00699100084a4cd3a
diff --git a/metadata/md5-cache/dev-ros/rqt_py_common-9999 b/metadata/md5-cache/dev-ros/rqt_py_common-9999
index 876d18328dc6..188eb1ff371a 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_common-9999
+++ b/metadata/md5-cache/dev-ros/rqt_py_common-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Common functionality for rqt plugins written in Python
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_py_common https://github.com/ros-visualization/rqt
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=336948e2d568e4b257e0b8289fc70866
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b2b81822be2ff0b00699100084a4cd3a
diff --git a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.7 b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.7
deleted file mode 100644
index 7b2acb396bd6..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Python GUI plugin providing an interactive Python console
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_py_console https://github.com/ros-visualization/rqt_common_plugins
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=46993c3a9603f544a73307e5c80790ee
diff --git a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.8 b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.9
index 6ec63ade46f3..e952d4e649ed 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.9
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python GUI plugin providing an interactive Python console
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_py_console https://github.com/ros-visualization/rqt_py_console
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -10,6 +11,6 @@ RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_py_console/archive/0.4.8.tar.gz -> rqt_py_console-0.4.8.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cfdbe0a7f26cae5c845bce456f8a83f7
+SRC_URI=https://github.com/ros-visualization/rqt_py_console/archive/0.4.9.tar.gz -> rqt_py_console-0.4.9.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c3394d2c96b39b4dea4c4d8b0c42ca81
diff --git a/metadata/md5-cache/dev-ros/rqt_py_console-9999 b/metadata/md5-cache/dev-ros/rqt_py_console-9999
index 67c06ce399ff..46e554ba6430 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_console-9999
+++ b/metadata/md5-cache/dev-ros/rqt_py_console-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python GUI plugin providing an interactive Python console
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_py_console https://github.com/ros-visualization/rqt_py_console
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cfdbe0a7f26cae5c845bce456f8a83f7
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c3394d2c96b39b4dea4c4d8b0c42ca81
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.10 b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.10
deleted file mode 100644
index 328085da96b4..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Provides the way to view and edit the parameters that are accessible via dynamic_reconfigure
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_reconfigure https://github.com/ros-visualization/rqt_reconfigure
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_reconfigure/archive/0.4.10.tar.gz -> rqt_reconfigure-0.4.10.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=abb6430a8c043b533006039f619744c6
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.9 b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.9
deleted file mode 100644
index 5dfb8b39a241..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Provides the way to view and edit the parameters that are accessible via dynamic_reconfigure
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_reconfigure https://github.com/ros-visualization/rqt_reconfigure
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_reconfigure/archive/0.4.9.tar.gz -> rqt_reconfigure-0.4.9.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=abb6430a8c043b533006039f619744c6
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.8 b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.5.3
index b063dd1543f0..520ad6c20f64 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.5.3
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Provides the way to view and edit the parameters that are accessible via dynamic_reconfigure
-EAPI=5
+DEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Provides the way to view and edit the parameters from dynamic_reconfigure
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_reconfigure https://github.com/ros-visualization/rqt_reconfigure
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -10,6 +11,6 @@ RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_reconfigure/archive/0.4.8.tar.gz -> rqt_reconfigure-0.4.8.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7bf9951d19896325ec157c46d8b684d8
+SRC_URI=https://github.com/ros-visualization/rqt_reconfigure/archive/0.5.3.tar.gz -> rqt_reconfigure-0.5.3.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=67a9b40addf8b56beb2aeb9f8d936376
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-9999 b/metadata/md5-cache/dev-ros/rqt_reconfigure-9999
index f4e4b7e69777..16c49fa4ed65 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-9999
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Provides the way to view and edit the parameters that are accessible via dynamic_reconfigure
-EAPI=5
+DEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Provides the way to view and edit the parameters from dynamic_reconfigure
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_reconfigure https://github.com/ros-visualization/rqt_reconfigure
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7bf9951d19896325ec157c46d8b684d8
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=67a9b40addf8b56beb2aeb9f8d936376
diff --git a/metadata/md5-cache/dev-ros/voxel_grid-1.17.0 b/metadata/md5-cache/dev-ros/voxel_grid-1.17.0
new file mode 100644
index 000000000000..ae2990bcc14f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/voxel_grid-1.17.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Implementation of an efficient 3D voxel grid
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/voxel_grid https://github.com/ros-planning/navigation
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=362dcdfbcfe82e7103ecd7af2b00eb12
diff --git a/metadata/md5-cache/ros-meta/desktop-1.4.0 b/metadata/md5-cache/ros-meta/desktop-1.4.0
deleted file mode 100644
index 4c66f05e0b14..000000000000
--- a/metadata/md5-cache/ros-meta/desktop-1.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Metapackage for a basic ROS desktop install
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/desktop https://github.com/ros/metapackages
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-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 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.4.0.tar.gz -> metapackages-1.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aa61b13f15c0356c0047639e2cced2f5
diff --git a/metadata/md5-cache/ros-meta/desktop-1.4.1 b/metadata/md5-cache/ros-meta/desktop-1.4.1
deleted file mode 100644
index cd697abecfe7..000000000000
--- a/metadata/md5-cache/ros-meta/desktop-1.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Metapackage for a basic ROS desktop install
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/desktop https://github.com/ros/metapackages
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-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 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.4.1.tar.gz -> metapackages-1.4.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aa61b13f15c0356c0047639e2cced2f5
diff --git a/metadata/md5-cache/ros-meta/desktop-1.5.0 b/metadata/md5-cache/ros-meta/desktop-1.5.0
new file mode 100644
index 000000000000..0eebc60ddeb5
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/desktop-1.5.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=ros-meta/robot ros-meta/viz dev-ros/angles ros-meta/common_tutorials ros-meta/geometry_tutorials dev-ros/joint_state_publisher_gui ros-meta/ros_tutorials dev-ros/roslint dev-ros/urdf_tutorial ros-meta/visualization_tutorials python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Metapackage for a basic ROS desktop install
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/desktop https://github.com/ros/metapackages
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=ros-meta/robot ros-meta/viz dev-ros/angles ros-meta/common_tutorials ros-meta/geometry_tutorials dev-ros/joint_state_publisher_gui ros-meta/ros_tutorials dev-ros/roslint dev-ros/urdf_tutorial ros-meta/visualization_tutorials python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/metapackages/archive/1.5.0.tar.gz -> metapackages-1.5.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f44394099d050492216fe7cfa23e817e
diff --git a/metadata/md5-cache/ros-meta/desktop-9999 b/metadata/md5-cache/ros-meta/desktop-9999
index 49fa9527b141..3cdd4969d34c 100644
--- a/metadata/md5-cache/ros-meta/desktop-9999
+++ b/metadata/md5-cache/ros-meta/desktop-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=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 >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=ros-meta/robot ros-meta/viz dev-ros/angles ros-meta/common_tutorials ros-meta/geometry_tutorials dev-ros/joint_state_publisher_gui ros-meta/ros_tutorials dev-ros/roslint dev-ros/urdf_tutorial ros-meta/visualization_tutorials python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Metapackage for a basic ROS desktop install
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/desktop https://github.com/ros/metapackages
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-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 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=ros-meta/robot ros-meta/viz dev-ros/angles ros-meta/common_tutorials ros-meta/geometry_tutorials dev-ros/joint_state_publisher_gui ros-meta/ros_tutorials dev-ros/roslint dev-ros/urdf_tutorial ros-meta/visualization_tutorials python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aa61b13f15c0356c0047639e2cced2f5
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f44394099d050492216fe7cfa23e817e
diff --git a/metadata/md5-cache/ros-meta/desktop_full-1.4.0 b/metadata/md5-cache/ros-meta/desktop_full-1.4.0
deleted file mode 100644
index 70d2268ced57..000000000000
--- a/metadata/md5-cache/ros-meta/desktop_full-1.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tutorial sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Metapackage for ROS complete desktop install
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/desktop_full https://github.com/ros/metapackages
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tutorial python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.4.0.tar.gz -> metapackages-1.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=925382c42c81e47395b6a441507f1b35
diff --git a/metadata/md5-cache/ros-meta/desktop_full-1.4.1 b/metadata/md5-cache/ros-meta/desktop_full-1.4.1
deleted file mode 100644
index 38d83459f389..000000000000
--- a/metadata/md5-cache/ros-meta/desktop_full-1.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tutorial sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Metapackage for ROS complete desktop install
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/desktop_full https://github.com/ros/metapackages
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tutorial python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.4.1.tar.gz -> metapackages-1.4.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=925382c42c81e47395b6a441507f1b35
diff --git a/metadata/md5-cache/ros-meta/desktop_full-1.5.0 b/metadata/md5-cache/ros-meta/desktop_full-1.5.0
new file mode 100644
index 000000000000..e4433059a786
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/desktop_full-1.5.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tutorial python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Metapackage for ROS complete desktop install
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/desktop_full https://github.com/ros/metapackages
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tutorial python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/metapackages/archive/1.5.0.tar.gz -> metapackages-1.5.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5e0180973a3a0dd51f9a64ebbfad80fb
diff --git a/metadata/md5-cache/ros-meta/desktop_full-9999 b/metadata/md5-cache/ros-meta/desktop_full-9999
index 1186bdf12bff..dab1805f1f53 100644
--- a/metadata/md5-cache/ros-meta/desktop_full-9999
+++ b/metadata/md5-cache/ros-meta/desktop_full-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tutorial >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tutorial python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Metapackage for ROS complete desktop install
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/desktop_full https://github.com/ros/metapackages
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tu
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=925382c42c81e47395b6a441507f1b35
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5e0180973a3a0dd51f9a64ebbfad80fb
diff --git a/metadata/md5-cache/ros-meta/imu_tools-1.1.5 b/metadata/md5-cache/ros-meta/imu_tools-1.1.5
deleted file mode 100644
index 93370f9334a3..000000000000
--- a/metadata/md5-cache/ros-meta/imu_tools-1.1.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Various tools for IMU devices
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/imu_tools https://github.com/ccny-ros-pkg/imu_tools
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.1.5.tar.gz -> imu_tools-1.1.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=07e9d2fe6032c2bfc1c64c6fa8af9156
diff --git a/metadata/md5-cache/ros-meta/imu_tools-1.2.0 b/metadata/md5-cache/ros-meta/imu_tools-1.2.0
deleted file mode 100644
index 17fd5f805414..000000000000
--- a/metadata/md5-cache/ros-meta/imu_tools-1.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Various tools for IMU devices
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/imu_tools https://github.com/ccny-ros-pkg/imu_tools
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.0.tar.gz -> imu_tools-1.2.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e9cb19be5295720e4e42305ce9933ea0
diff --git a/metadata/md5-cache/ros-meta/imu_tools-1.2.1 b/metadata/md5-cache/ros-meta/imu_tools-1.2.1
deleted file mode 100644
index e5666c0b58c8..000000000000
--- a/metadata/md5-cache/ros-meta/imu_tools-1.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Various tools for IMU devices
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/imu_tools https://github.com/ccny-ros-pkg/imu_tools
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.1.tar.gz -> imu_tools-1.2.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=94d6984f790a2cbb8182cb5cfef3fbca
diff --git a/metadata/md5-cache/ros-meta/imu_tools-1.2.2 b/metadata/md5-cache/ros-meta/imu_tools-1.2.2
index 9b0a6b225048..0f020607de35 100644
--- a/metadata/md5-cache/ros-meta/imu_tools-1.2.2
+++ b/metadata/md5-cache/ros-meta/imu_tools-1.2.2
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Various tools for IMU devices
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_tools https://github.com/ccny-ros-pkg/imu_tools
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.2.tar.gz -> imu_tools-1.2.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d91b529df0f9e8a0fdd9b8ac27d9bbab
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9cac88bf82170079549fd73049bead40
diff --git a/metadata/md5-cache/ros-meta/imu_tools-9999 b/metadata/md5-cache/ros-meta/imu_tools-9999
index da00550bd564..437ca4ec603a 100644
--- a/metadata/md5-cache/ros-meta/imu_tools-9999
+++ b/metadata/md5-cache/ros-meta/imu_tools-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Various tools for IMU devices
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_tools https://github.com/ccny-ros-pkg/imu_tools
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rvi
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=07e9d2fe6032c2bfc1c64c6fa8af9156
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9cac88bf82170079549fd73049bead40
diff --git a/metadata/md5-cache/ros-meta/navigation-1.17.0 b/metadata/md5-cache/ros-meta/navigation-1.17.0
new file mode 100644
index 000000000000..559249e789bb
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/navigation-1.17.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/clear_costmap_recovery dev-ros/costmap_2d dev-ros/dwa_local_planner dev-ros/fake_localization dev-ros/global_planner dev-ros/map_server dev-ros/move_base dev-ros/move_slow_and_clear dev-ros/nav_core dev-ros/navfn dev-ros/rotate_recovery dev-ros/voxel_grid sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=2D navigation stack
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/navigation https://github.com/ros-planning/navigation
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD LGPL-2.1
+RDEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/clear_costmap_recovery dev-ros/costmap_2d dev-ros/dwa_local_planner dev-ros/fake_localization dev-ros/global_planner dev-ros/map_server dev-ros/move_base dev-ros/move_slow_and_clear dev-ros/nav_core dev-ros/navfn dev-ros/rotate_recovery dev-ros/voxel_grid python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
+_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=789787ac6a4daf0a76ca8df257c64a17
diff --git a/metadata/md5-cache/ros-meta/perception-1.4.0 b/metadata/md5-cache/ros-meta/perception-1.4.0
deleted file mode 100644
index fba9c7e0ed4d..000000000000
--- a/metadata/md5-cache/ros-meta/perception-1.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Metapackage for ROS perception stack
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/perception https://github.com/ros/metapackages
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-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 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.4.0.tar.gz -> metapackages-1.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff6f17e09ce3d2c7ef39304407cdfb0e
diff --git a/metadata/md5-cache/ros-meta/perception-1.4.1 b/metadata/md5-cache/ros-meta/perception-1.4.1
deleted file mode 100644
index 3fa718e6d824..000000000000
--- a/metadata/md5-cache/ros-meta/perception-1.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Metapackage for ROS perception stack
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/perception https://github.com/ros/metapackages
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-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 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.4.1.tar.gz -> metapackages-1.4.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff6f17e09ce3d2c7ef39304407cdfb0e
diff --git a/metadata/md5-cache/ros-meta/perception-1.5.0 b/metadata/md5-cache/ros-meta/perception-1.5.0
new file mode 100644
index 000000000000..599dce820689
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/perception-1.5.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Metapackage for ROS perception stack
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/perception https://github.com/ros/metapackages
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+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 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/metapackages/archive/1.5.0.tar.gz -> metapackages-1.5.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f5f61dd0d92b9b3979905013fd0a78cb
diff --git a/metadata/md5-cache/ros-meta/perception-9999 b/metadata/md5-cache/ros-meta/perception-9999
index 1c3570dbfb09..370d9d8da39e 100644
--- a/metadata/md5-cache/ros-meta/perception-9999
+++ b/metadata/md5-cache/ros-meta/perception-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=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 >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=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 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Metapackage for ROS perception stack
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/perception https://github.com/ros/metapackages
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=ros-meta/ros_base ros-meta/image_common ros-meta/image_pipeline ros-meta
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e73585007f17dab9fbb90e552ad4c6f0
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f5f61dd0d92b9b3979905013fd0a78cb
diff --git a/metadata/md5-cache/ros-meta/robot-1.4.0 b/metadata/md5-cache/ros-meta/robot-1.4.0
deleted file mode 100644
index 96dbca420747..000000000000
--- a/metadata/md5-cache/ros-meta/robot-1.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry 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 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Metapackage which extends ros_base and includes ROS libaries for any robot hardware
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/robot https://github.com/ros/metapackages
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry 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 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.4.0.tar.gz -> metapackages-1.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5991742670bacdaa83c4f382ef2ce2a4
diff --git a/metadata/md5-cache/ros-meta/robot-1.4.1 b/metadata/md5-cache/ros-meta/robot-1.4.1
deleted file mode 100644
index 8346b1ec32ec..000000000000
--- a/metadata/md5-cache/ros-meta/robot-1.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry 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 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Metapackage which extends ros_base and includes ROS libaries for any robot hardware
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/robot https://github.com/ros/metapackages
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry 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 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.4.1.tar.gz -> metapackages-1.4.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5991742670bacdaa83c4f382ef2ce2a4
diff --git a/metadata/md5-cache/ros-meta/robot-1.5.0 b/metadata/md5-cache/ros-meta/robot-1.5.0
new file mode 100644
index 000000000000..16ec66f42e02
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/robot-1.5.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry 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 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Metapackage which includes ROS libaries for any robot hardware
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/robot https://github.com/ros/metapackages
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry 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 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/metapackages/archive/1.5.0.tar.gz -> metapackages-1.5.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a57cbac7a12e98b92a39e18bd97de8a8
diff --git a/metadata/md5-cache/ros-meta/robot-9999 b/metadata/md5-cache/ros-meta/robot-9999
index 41e46936dd17..e0b1fdaad776 100644
--- a/metadata/md5-cache/ros-meta/robot-9999
+++ b/metadata/md5-cache/ros-meta/robot-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry 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 >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Metapackage which extends ros_base and includes ROS libaries for any robot hardware
-EAPI=5
+DEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry 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 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Metapackage which includes ROS libaries for any robot hardware
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot https://github.com/ros/metapackages
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/exe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5991742670bacdaa83c4f382ef2ce2a4
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a57cbac7a12e98b92a39e18bd97de8a8
diff --git a/metadata/md5-cache/ros-meta/ros_base-1.5.0 b/metadata/md5-cache/ros-meta/ros_base-1.5.0
new file mode 100644
index 000000000000..851c2ca34ae0
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/ros_base-1.5.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/dynamic_reconfigure ros-meta/nodelet_core python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Metapackage which extends ros_core and includes other basic non-robot tools
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/ros_base https://github.com/ros/metapackages
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/dynamic_reconfigure ros-meta/nodelet_core python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/metapackages/archive/1.5.0.tar.gz -> metapackages-1.5.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=97823f145dcfbb38964e58d2d7fcec01
diff --git a/metadata/md5-cache/ros-meta/ros_base-9999 b/metadata/md5-cache/ros-meta/ros_base-9999
index 110aa0706171..4a5633c72629 100644
--- a/metadata/md5-cache/ros-meta/ros_base-9999
+++ b/metadata/md5-cache/ros-meta/ros_base-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/dynamic_reconfigure ros-meta/nodelet_core >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/dynamic_reconfigure ros-meta/nodelet_core python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Metapackage which extends ros_core and includes other basic non-robot tools
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_base https://github.com/ros/metapackages
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/dynamic_reconfigure ros-met
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f8cfe61b8edbf56d6ece24f12526d74d
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=97823f145dcfbb38964e58d2d7fcec01
diff --git a/metadata/md5-cache/ros-meta/ros_core-1.4.0 b/metadata/md5-cache/ros-meta/ros_core-1.4.0
deleted file mode 100644
index a1a67206af7a..000000000000
--- a/metadata/md5-cache/ros-meta/ros_core-1.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-util/catkin dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp 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 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Metapackage to aggregate the packages required to use core ROS concepts
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/ros_core https://github.com/ros/metapackages
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-util/catkin dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp 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 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.4.0.tar.gz -> metapackages-1.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3e89c6256f646e62b53a60c5802dcbfe
diff --git a/metadata/md5-cache/ros-meta/ros_core-1.4.1 b/metadata/md5-cache/ros-meta/ros_core-1.5.0
index 26cd26b5f4cb..1656f30e4488 100644
--- a/metadata/md5-cache/ros-meta/ros_core-1.4.1
+++ b/metadata/md5-cache/ros-meta/ros_core-1.5.0
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-util/catkin dev-ros/class_loader dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genmsg dev-ros/gennodejs dev-ros/genpy dev-ros/message_generation dev-ros/message_runtime dev-ros/pluginlib ros-meta/ros ros-meta/ros_comm dev-ros/rosbag_migration_rule dev-ros/rosconsole dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/roslisp dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-util/catkin dev-ros/class_loader dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genmsg dev-ros/gennodejs dev-ros/genpy dev-ros/message_generation dev-ros/message_runtime dev-ros/pluginlib ros-meta/ros ros-meta/ros_comm dev-ros/rosbag_migration_rule dev-ros/rosconsole dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/roslisp dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Metapackage to aggregate the packages required to use core ROS concepts
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_core https://github.com/ros/metapackages
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -10,6 +11,6 @@ RDEPEND=dev-util/catkin dev-ros/class_loader dev-ros/cmake_modules ros-meta/comm
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.4.1.tar.gz -> metapackages-1.4.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=65cd423e3bb1de5392425acc341526f3
+SRC_URI=https://github.com/ros/metapackages/archive/1.5.0.tar.gz -> metapackages-1.5.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e72503ddd524116b924ce2640b9d59b2
diff --git a/metadata/md5-cache/ros-meta/ros_core-9999 b/metadata/md5-cache/ros-meta/ros_core-9999
index 42780138ce9f..dd1f3f887b0c 100644
--- a/metadata/md5-cache/ros-meta/ros_core-9999
+++ b/metadata/md5-cache/ros-meta/ros_core-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-util/catkin dev-ros/class_loader dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genmsg dev-ros/gennodejs dev-ros/genpy dev-ros/message_generation dev-ros/message_runtime dev-ros/pluginlib ros-meta/ros ros-meta/ros_comm dev-ros/rosbag_migration_rule dev-ros/rosconsole dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/roslisp dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-util/catkin dev-ros/class_loader dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genmsg dev-ros/gennodejs dev-ros/genpy dev-ros/message_generation dev-ros/message_runtime dev-ros/pluginlib ros-meta/ros ros-meta/ros_comm dev-ros/rosbag_migration_rule dev-ros/rosconsole dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/roslisp dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Metapackage to aggregate the packages required to use core ROS concepts
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_core https://github.com/ros/metapackages
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-util/catkin dev-ros/class_loader dev-ros/cmake_modules ros-meta/comm
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=65cd423e3bb1de5392425acc341526f3
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e72503ddd524116b924ce2640b9d59b2
diff --git a/metadata/md5-cache/ros-meta/rqt-0.3.2 b/metadata/md5-cache/ros-meta/rqt-0.3.2
deleted file mode 100644
index 9cc412f9d105..000000000000
--- a/metadata/md5-cache/ros-meta/rqt-0.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Qt-based framework for GUI development for ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt https://github.com/ros-visualization/rqt
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt/archive/0.3.2.tar.gz -> rqt-0.3.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6c8b1677deff7d0e27d2efc69f56f0e7
diff --git a/metadata/md5-cache/ros-meta/rqt-0.5.0 b/metadata/md5-cache/ros-meta/rqt-0.5.0
deleted file mode 100644
index 5a8de612cc50..000000000000
--- a/metadata/md5-cache/ros-meta/rqt-0.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py dev-ros/rqt_py_common sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Qt-based framework for GUI development for ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt https://github.com/ros-visualization/rqt
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py dev-ros/rqt_py_common python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.0.tar.gz -> rqt-0.5.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d3252c6b649a19f50f81effbfc4bf5c7
diff --git a/metadata/md5-cache/ros-meta/rqt-0.5.2 b/metadata/md5-cache/ros-meta/rqt-0.5.2
new file mode 100644
index 000000000000..2319e3387c91
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/rqt-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py dev-ros/rqt_py_common python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Qt-based framework for GUI development for ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt https://github.com/ros-visualization/rqt
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py dev-ros/rqt_py_common python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.2.tar.gz -> rqt-0.5.2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=47ba1c67311a9643fdefa1ef189e1b1e
diff --git a/metadata/md5-cache/ros-meta/rqt-9999 b/metadata/md5-cache/ros-meta/rqt-9999
index a031ab0befd8..01ff1990a984 100644
--- a/metadata/md5-cache/ros-meta/rqt-9999
+++ b/metadata/md5-cache/ros-meta/rqt-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py dev-ros/rqt_py_common >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py dev-ros/rqt_py_common python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Qt-based framework for GUI development for ROS
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt https://github.com/ros-visualization/rqt
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py dev-ros/rqt_py_co
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d3252c6b649a19f50f81effbfc4bf5c7
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=47ba1c67311a9643fdefa1ef189e1b1e
diff --git a/metadata/md5-cache/ros-meta/simulators-1.4.0 b/metadata/md5-cache/ros-meta/simulators-1.4.0
deleted file mode 100644
index 603e7899e598..000000000000
--- a/metadata/md5-cache/ros-meta/simulators-1.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/stage_ros sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Metapackage for ROS simulation packages
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/simulators https://github.com/ros/metapackages
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/stage_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.4.0.tar.gz -> metapackages-1.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fb9965e70cfbaf4ec2df224175f672ad
diff --git a/metadata/md5-cache/ros-meta/simulators-1.4.1 b/metadata/md5-cache/ros-meta/simulators-1.4.1
deleted file mode 100644
index 9fedd1c0e9f0..000000000000
--- a/metadata/md5-cache/ros-meta/simulators-1.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/stage_ros sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Metapackage for ROS simulation packages
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/simulators https://github.com/ros/metapackages
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/stage_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.4.1.tar.gz -> metapackages-1.4.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fb9965e70cfbaf4ec2df224175f672ad
diff --git a/metadata/md5-cache/ros-meta/simulators-1.5.0 b/metadata/md5-cache/ros-meta/simulators-1.5.0
new file mode 100644
index 000000000000..732e77b72af0
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/simulators-1.5.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/stage_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Metapackage for ROS simulation packages
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/simulators https://github.com/ros/metapackages
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/stage_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/metapackages/archive/1.5.0.tar.gz -> metapackages-1.5.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8a02bd1bcd53ebd0dea12e2975ef2c5d
diff --git a/metadata/md5-cache/ros-meta/simulators-9999 b/metadata/md5-cache/ros-meta/simulators-9999
index a45bb5d58736..9fe005bd20f9 100644
--- a/metadata/md5-cache/ros-meta/simulators-9999
+++ b/metadata/md5-cache/ros-meta/simulators-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/stage_ros >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/stage_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Metapackage for ROS simulation packages
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/simulators https://github.com/ros/metapackages
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8a3f2f7b614467fb13f0bfb6eb557806
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8a02bd1bcd53ebd0dea12e2975ef2c5d
diff --git a/metadata/md5-cache/ros-meta/viz-1.4.0 b/metadata/md5-cache/ros-meta/viz-1.4.0
deleted file mode 100644
index ca14827bd7c0..000000000000
--- a/metadata/md5-cache/ros-meta/viz-1.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/rviz sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Metapackage for ROS visualization packages
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/viz https://github.com/ros/metapackages
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/rviz python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.4.0.tar.gz -> metapackages-1.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=904ae5a0d15a49683ee7f1f2398e3cbc
diff --git a/metadata/md5-cache/ros-meta/viz-1.4.1 b/metadata/md5-cache/ros-meta/viz-1.4.1
deleted file mode 100644
index 5e385d1de291..000000000000
--- a/metadata/md5-cache/ros-meta/viz-1.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/rviz sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Metapackage for ROS visualization packages
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/viz https://github.com/ros/metapackages
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/rviz python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.4.1.tar.gz -> metapackages-1.4.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=904ae5a0d15a49683ee7f1f2398e3cbc
diff --git a/metadata/md5-cache/ros-meta/viz-1.5.0 b/metadata/md5-cache/ros-meta/viz-1.5.0
new file mode 100644
index 000000000000..e7cc8d962642
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/viz-1.5.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/rviz python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Metapackage for ROS visualization packages
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/viz https://github.com/ros/metapackages
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/rviz python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/metapackages/archive/1.5.0.tar.gz -> metapackages-1.5.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2f271f98f275e19e362975b248cca963
diff --git a/metadata/md5-cache/ros-meta/viz-9999 b/metadata/md5-cache/ros-meta/viz-9999
index 9609f91d6b2b..6d4ee15a6dec 100644
--- a/metadata/md5-cache/ros-meta/viz-9999
+++ b/metadata/md5-cache/ros-meta/viz-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/rviz >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/rviz python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Metapackage for ROS visualization packages
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/viz https://github.com/ros/metapackages
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=180f2e8ba0e4f3aa0fef11109f4776cd
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2f271f98f275e19e362975b248cca963