2020-07-08 18:05:31 UTC

300 files changed, 1115 insertions, 3093 deletions

diff --git a/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.5 b/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.5
deleted file mode 100644
index 3723a49ac4a0..000000000000
--- a/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.5
+++ /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(-)] 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=Common messages to interact with an action server and an action client
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/actionlib_msgs https://github.com/ros/common_msgs
-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=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/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.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_=a56f199da20e09db1d648ee4a9981c04
diff --git a/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.6 b/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.6
deleted file mode 100644
index 86246054e4b6..000000000000
--- a/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.6
+++ /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(-)] 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=Common messages to interact with an action server and an action client
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/actionlib_msgs https://github.com/ros/common_msgs
-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=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/common_msgs/archive/1.12.6.tar.gz -> common_msgs-1.12.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_=a56f199da20e09db1d648ee4a9981c04
diff --git a/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.7 b/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.7
deleted file mode 100644
index 7c486c317a1e..000000000000
--- a/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.7
+++ /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(-)] 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=Common messages to interact with an action server and an action client
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/actionlib_msgs https://github.com/ros/common_msgs
-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=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/common_msgs/archive/1.12.7.tar.gz -> common_msgs-1.12.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_=a56f199da20e09db1d648ee4a9981c04
diff --git a/metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0 b/metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0
new file mode 100644
index 000000000000..195094d9e814
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0
@@ -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(-)] 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=Common messages to interact with an action server and an action client
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/actionlib_msgs https://github.com/ros/common_msgs
+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=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/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.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_=e95dcda748d6de6497ba8e893c632696
diff --git a/metadata/md5-cache/dev-ros/actionlib_msgs-9999 b/metadata/md5-cache/dev-ros/actionlib_msgs-9999
index 4a89c981486c..1bf676cdcd8e 100644
--- a/metadata/md5-cache/dev-ros/actionlib_msgs-9999
+++ b/metadata/md5-cache/dev-ros/actionlib_msgs-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(-)] 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(-)] )
+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(-)] 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=Common messages to interact with an action server and an action client
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_msgs https://github.com/ros/common_msgs
 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=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 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_=a56f199da20e09db1d648ee4a9981c04
+_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_=e95dcda748d6de6497ba8e893c632696
diff --git a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.10 b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.10
deleted file mode 100644
index 8f0639dd6826..000000000000
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] 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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Actionlib tutorials
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/actionlib_tutorials https://github.com/ros/common_tutorials
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/actionlib 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(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_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/common_tutorials/archive/0.1.10.tar.gz -> common_tutorials-0.1.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_=9582a328a342f40132aeeca68ba80921
diff --git a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.11 b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.11
deleted file mode 100644
index 14c1fccee6b8..000000000000
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] 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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Actionlib tutorials
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/actionlib_tutorials https://github.com/ros/common_tutorials
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/actionlib 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(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_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/common_tutorials/archive/0.1.11.tar.gz -> common_tutorials-0.1.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_=d44304a075715ff6392544dd01ed9eeb
diff --git a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.12 b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.12
new file mode 100644
index 000000000000..3ee73c7e48c2
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.12
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/actionlib 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(-)] 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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Actionlib tutorials
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/actionlib_tutorials https://github.com/ros/common_tutorials
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/actionlib 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(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_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/common_tutorials/archive/0.1.12.tar.gz -> common_tutorials-0.1.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_=530f7ea28fba85a8e902134c7c69a216
diff --git a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.8 b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.8
deleted file mode 100644
index 54dedc54b771..000000000000
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] 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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Actionlib tutorials
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/actionlib_tutorials https://github.com/ros/common_tutorials
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/actionlib 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(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_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/common_tutorials/archive/0.1.8.tar.gz -> common_tutorials-0.1.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_=aa06261fb363190490e88c5d8634e5aa
diff --git a/metadata/md5-cache/dev-ros/actionlib_tutorials-9999 b/metadata/md5-cache/dev-ros/actionlib_tutorials-9999
index f6f6db9ae4cc..753d99713c7a 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-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/roscpp dev-ros/actionlib dev-libs/boost:=[threads] >=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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=dev-ros/roscpp dev-ros/actionlib 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(-)] 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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=Actionlib tutorials
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_tutorials https://github.com/ros/common_tutorials
 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/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_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_=aa06261fb363190490e88c5d8634e5aa
+_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_=530f7ea28fba85a8e902134c7c69a216
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-0.14.2 b/metadata/md5-cache/dev-ros/combined_robot_hw-0.14.2
deleted file mode 100644
index 79d702060b3c..000000000000
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-0.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/hardware_interface-0.11 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp 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=Combined Robot HW class
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/combined_robot_hw https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-ros/hardware_interface-0.11 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp 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-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.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_=e001af4d104dcc1c07edcf065779fc35
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-0.15.0 b/metadata/md5-cache/dev-ros/combined_robot_hw-0.15.0
deleted file mode 100644
index 95f49f65d1de..000000000000
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-0.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp 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=Combined Robot HW class
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/combined_robot_hw https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp 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-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.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_=dfb24b26329355381b96f33e2622c611
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-0.15.1 b/metadata/md5-cache/dev-ros/combined_robot_hw-0.15.1
deleted file mode 100644
index 8d434e86dbf7..000000000000
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-0.15.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp 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=Combined Robot HW class
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/combined_robot_hw https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp 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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.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_=3c2295c71da4332cff29f48bf75bde2c
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.1 b/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.1
new file mode 100644
index 000000000000..44162efbd342
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp 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=Combined Robot HW class
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/combined_robot_hw https://github.com/ros-controls/ros_control
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp 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-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.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_=df7e8a0862fa84f81e4346d497255bc3
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-9999 b/metadata/md5-cache/dev-ros/combined_robot_hw-9999
index 873f0d8f5f37..41a85ca7e333 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-9999
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-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/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp 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-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp 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=Combined Robot HW class
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw https://github.com/ros-controls/ros_control
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:=
 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_=dfb24b26329355381b96f33e2622c611
+_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_=df7e8a0862fa84f81e4346d497255bc3
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.14.2 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.14.2
deleted file mode 100644
index ce5c669a76c8..000000000000
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[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=Combined Robot HW class tests
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/combined_robot_hw_tests https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp 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-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.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_=307d5145d85e0468a20d2ffce02dfbb4
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.15.0 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.15.0
deleted file mode 100644
index 18e668644414..000000000000
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[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=Combined Robot HW class tests
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/combined_robot_hw_tests https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp 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-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.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_=307d5145d85e0468a20d2ffce02dfbb4
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.15.1 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.15.1
deleted file mode 100644
index 163586ddd486..000000000000
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.15.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[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=Combined Robot HW class tests
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/combined_robot_hw_tests https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp 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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.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_=c6571999b5491f15f59e7c515c7df3db
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.1 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.1
new file mode 100644
index 000000000000..052bedc196d8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[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=Combined Robot HW class tests
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/combined_robot_hw_tests https://github.com/ros-controls/ros_control
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp 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-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.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_=cd9c5835d1d95e731f5c984b2836baf7
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
index 7d3684e3d93d..46a0af8cfac6 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-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/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[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/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[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=Combined Robot HW class tests
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw_tests https://github.com/ros-controls/ros_control
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_
 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_=16b150f13a23da3d83966fb264184df8
+_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_=cd9c5835d1d95e731f5c984b2836baf7
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.14.2 b/metadata/md5-cache/dev-ros/controller_interface-0.14.2
deleted file mode 100644
index 43b9377a3e6c..000000000000
--- a/metadata/md5-cache/dev-ros/controller_interface-0.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib 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=Interface base class for controllers
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/controller_interface https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib 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-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.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_=afd43a253220210a84b7ab0f43d66b66
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.15.0 b/metadata/md5-cache/dev-ros/controller_interface-0.15.0
deleted file mode 100644
index d2a446e43f59..000000000000
--- a/metadata/md5-cache/dev-ros/controller_interface-0.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib 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=Interface base class for controllers
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/controller_interface https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib 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-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.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_=afd43a253220210a84b7ab0f43d66b66
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.15.1 b/metadata/md5-cache/dev-ros/controller_interface-0.15.1
deleted file mode 100644
index c5bb820b6b5d..000000000000
--- a/metadata/md5-cache/dev-ros/controller_interface-0.15.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib 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=Interface base class for controllers
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/controller_interface https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib 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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.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_=43d10508354380fb7dce4bcbe5aa318b
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.19.1 b/metadata/md5-cache/dev-ros/controller_interface-0.19.1
new file mode 100644
index 000000000000..13afc1b55f78
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/controller_interface-0.19.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib 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=Interface base class for controllers
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/controller_interface https://github.com/ros-controls/ros_control
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib 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-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.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_=f233353f994d94812099ac2f7a9ac254
diff --git a/metadata/md5-cache/dev-ros/controller_interface-9999 b/metadata/md5-cache/dev-ros/controller_interface-9999
index 065d6ea844c6..ce8c3820aa43 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-9999
+++ b/metadata/md5-cache/dev-ros/controller_interface-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/roscpp dev-ros/hardware_interface dev-ros/pluginlib >=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/roscpp dev-ros/hardware_interface dev-ros/pluginlib 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=Interface base class for controllers
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_interface https://github.com/ros-controls/ros_control
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib python_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_=a3911d99ec776489c6fd2602ca8c74ac
+_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_=f233353f994d94812099ac2f7a9ac254
diff --git a/metadata/md5-cache/dev-ros/controller_manager-0.14.2 b/metadata/md5-cache/dev-ros/controller_manager-0.14.2
deleted file mode 100644
index d3d80d9c0d1e..000000000000
--- a/metadata/md5-cache/dev-ros/controller_manager-0.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[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=The controller manager
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/controller_manager https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.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_=5ff1390ff46a015dcc394169d7abe0c6
diff --git a/metadata/md5-cache/dev-ros/controller_manager-0.15.1 b/metadata/md5-cache/dev-ros/controller_manager-0.15.1
deleted file mode 100644
index 5361f4cb4e92..000000000000
--- a/metadata/md5-cache/dev-ros/controller_manager-0.15.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[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=The controller manager
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/controller_manager https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.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_=adea21c6d9523d14d9b64b1feda31781
diff --git a/metadata/md5-cache/dev-ros/controller_manager-0.15.0 b/metadata/md5-cache/dev-ros/controller_manager-0.19.1
index ea7227476fcf..ff6569be7ca5 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-0.15.0
+++ b/metadata/md5-cache/dev-ros/controller_manager-0.19.1
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[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/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[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=The controller manager
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager https://github.com/ros-controls/ros_control
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -10,6 +11,6 @@ RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.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_=8b340fed7715d5b8b513388f8eb1dc1f
+SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.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_=161f3999b55429aeed1ff99ce0676114
diff --git a/metadata/md5-cache/dev-ros/controller_manager-9999 b/metadata/md5-cache/dev-ros/controller_manager-9999
index 5b6968ad3a1d..8e56aed8d669 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager-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/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[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/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[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=The controller manager
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager https://github.com/ros-controls/ros_control
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.
 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_=8b340fed7715d5b8b513388f8eb1dc1f
+_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_=161f3999b55429aeed1ff99ce0676114
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.14.2 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.14.2
deleted file mode 100644
index 57da499b7460..000000000000
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.14.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(-)] 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=The controller manager
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/controller_manager_msgs https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/rospy[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/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-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.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_=3105e2ec8a8c1ea469dc7d0a82513963
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.15.0 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.15.0
deleted file mode 100644
index 5e299cb41851..000000000000
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.15.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(-)] 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=The controller manager
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/controller_manager_msgs https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/rospy[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/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-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.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_=3105e2ec8a8c1ea469dc7d0a82513963
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.15.1 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.15.1
deleted file mode 100644
index dec497824c92..000000000000
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.15.1
+++ /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(-)] 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=The controller manager
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/controller_manager_msgs https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/rospy[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/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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.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_=81cc2bcdcf348a73792336db28c674ca
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.1 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.1
new file mode 100644
index 000000000000..d20077b37871
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.1
@@ -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(-)] 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=The controller manager
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/controller_manager_msgs https://github.com/ros-controls/ros_control
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[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/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-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.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_=e4eeaa151033c94f8c057e18cd187c82
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-9999 b/metadata/md5-cache/dev-ros/controller_manager_msgs-9999
index 31d575d7092b..465ef9cdb9e4 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-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-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(-)] )
+DEPEND=dev-ros/rospy[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=The controller manager
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_msgs https://github.com/ros-controls/ros_control
 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/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_=943ce35d668b0524d2ae1d887840640f
+_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_=e4eeaa151033c94f8c057e18cd187c82
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.14.2 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.14.2
deleted file mode 100644
index de41e38aecd0..000000000000
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[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=Tests for the controller manager
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/controller_interface dev-ros/control_toolbox 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-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.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_=d33bf0342d4492c636b7e2370a3ccbe4
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.15.0 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.15.0
deleted file mode 100644
index d7a1abd2e9f5..000000000000
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[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=Tests for the controller manager
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/controller_interface dev-ros/control_toolbox 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-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.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_=d33bf0342d4492c636b7e2370a3ccbe4
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.15.1 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.15.1
deleted file mode 100644
index a4c23d9090ba..000000000000
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.15.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[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=Tests for the controller manager
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/controller_interface dev-ros/control_toolbox 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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.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_=abca84ac9db0820dffa733f55f32d629
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.1 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.1
new file mode 100644
index 000000000000..cc107c26f91f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[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=Tests for the controller manager
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/controller_interface dev-ros/control_toolbox 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-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.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_=0ecfd6a4472527ebf9ee1eb24b7658dd
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-9999 b/metadata/md5-cache/dev-ros/controller_manager_tests-9999
index 58212de54159..fadf45e9d784 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-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/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[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/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[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=Tests for the controller manager
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_t
 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_=6e8f5bcd06bfddc50576fb83075b4409
+_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_=0ecfd6a4472527ebf9ee1eb24b7658dd
diff --git a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.5 b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.5
deleted file mode 100644
index 04d0a83b5199..000000000000
--- a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.5
+++ /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(-)] 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=Standardized interface for the diagnostic and runtime monitoring systems in ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/diagnostic_msgs https://github.com/ros/common_msgs
-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=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/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.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_=d1b2d85d9299290151c5197c63284f84
diff --git a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.6 b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.6
deleted file mode 100644
index ddc8fd628f35..000000000000
--- a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.6
+++ /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(-)] 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=Standardized interface for the diagnostic and runtime monitoring systems in ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/diagnostic_msgs https://github.com/ros/common_msgs
-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=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/common_msgs/archive/1.12.6.tar.gz -> common_msgs-1.12.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_=d1b2d85d9299290151c5197c63284f84
diff --git a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.7 b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.7
deleted file mode 100644
index 79580b075c09..000000000000
--- a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.7
+++ /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(-)] 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=Standardized interface for the diagnostic and runtime monitoring systems in ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/diagnostic_msgs https://github.com/ros/common_msgs
-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=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/common_msgs/archive/1.12.7.tar.gz -> common_msgs-1.12.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_=d1b2d85d9299290151c5197c63284f84
diff --git a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.0 b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.0
new file mode 100644
index 000000000000..11ee95d5cddb
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.0
@@ -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(-)] 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=Standardized interface for the diagnostic and runtime monitoring systems in ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/diagnostic_msgs https://github.com/ros/common_msgs
+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=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/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.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_=886f5ee4f61183592c17894438837433
diff --git a/metadata/md5-cache/dev-ros/diagnostic_msgs-9999 b/metadata/md5-cache/dev-ros/diagnostic_msgs-9999
index 0c6185ca35d4..3d953a6c7823 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_msgs-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_msgs-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(-)] 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(-)] )
+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(-)] 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=Standardized interface for the diagnostic and runtime monitoring systems in ROS
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_msgs https://github.com/ros/common_msgs
 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=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 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_=d1b2d85d9299290151c5197c63284f84
+_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_=886f5ee4f61183592c17894438837433
diff --git a/metadata/md5-cache/dev-ros/geometry_msgs-1.12.5 b/metadata/md5-cache/dev-ros/geometry_msgs-1.12.5
deleted file mode 100644
index 44b890c51ce3..000000000000
--- a/metadata/md5-cache/dev-ros/geometry_msgs-1.12.5
+++ /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(-)] 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=Messages for common geometric primitives such as points, vectors, and poses
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/geometry_msgs https://github.com/ros/common_msgs
-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=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/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.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_=55d3fe2e108e719997225a1c3a8156c8
diff --git a/metadata/md5-cache/dev-ros/geometry_msgs-1.12.6 b/metadata/md5-cache/dev-ros/geometry_msgs-1.12.6
deleted file mode 100644
index 3b61dc9fb493..000000000000
--- a/metadata/md5-cache/dev-ros/geometry_msgs-1.12.6
+++ /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(-)] 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=Messages for common geometric primitives such as points, vectors, and poses
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/geometry_msgs https://github.com/ros/common_msgs
-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=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/common_msgs/archive/1.12.6.tar.gz -> common_msgs-1.12.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_=55d3fe2e108e719997225a1c3a8156c8
diff --git a/metadata/md5-cache/dev-ros/geometry_msgs-1.12.7 b/metadata/md5-cache/dev-ros/geometry_msgs-1.12.7
deleted file mode 100644
index 7ec2a11ca08f..000000000000
--- a/metadata/md5-cache/dev-ros/geometry_msgs-1.12.7
+++ /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(-)] 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=Messages for common geometric primitives such as points, vectors, and poses
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/geometry_msgs https://github.com/ros/common_msgs
-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=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/common_msgs/archive/1.12.7.tar.gz -> common_msgs-1.12.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_=55d3fe2e108e719997225a1c3a8156c8
diff --git a/metadata/md5-cache/dev-ros/geometry_msgs-1.13.0 b/metadata/md5-cache/dev-ros/geometry_msgs-1.13.0
new file mode 100644
index 000000000000..6e2f73269a6b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/geometry_msgs-1.13.0
@@ -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(-)] 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=Messages for common geometric primitives such as points, vectors, and poses
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/geometry_msgs https://github.com/ros/common_msgs
+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=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/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.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_=72701395a6441ca24710bdb9deb98c69
diff --git a/metadata/md5-cache/dev-ros/geometry_msgs-9999 b/metadata/md5-cache/dev-ros/geometry_msgs-9999
index a3e9db3fc9d8..d64e1bebc141 100644
--- a/metadata/md5-cache/dev-ros/geometry_msgs-9999
+++ b/metadata/md5-cache/dev-ros/geometry_msgs-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(-)] 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(-)] )
+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(-)] 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=Messages for common geometric primitives such as points, vectors, and poses
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometry_msgs https://github.com/ros/common_msgs
 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=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 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_=55d3fe2e108e719997225a1c3a8156c8
+_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_=72701395a6441ca24710bdb9deb98c69
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.15.1 b/metadata/md5-cache/dev-ros/hardware_interface-0.15.1
deleted file mode 100644
index b27a5f620467..000000000000
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.15.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) 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=Hardware Interface base class
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hardware_interface https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.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_=836e299def877687eca05bffdec3cc86
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.19.1 b/metadata/md5-cache/dev-ros/hardware_interface-0.19.1
new file mode 100644
index 000000000000..638131e06798
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.19.1
@@ -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 dev-ros/rostest ) 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=Hardware Interface base class
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hardware_interface https://github.com/ros-controls/ros_control
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+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-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.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_=27da90fb15967ce2b1e5611caf42f3c4
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-9999 b/metadata/md5-cache/dev-ros/hardware_interface-9999
index e9b26d0662aa..908fbc584954 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-9999
+++ b/metadata/md5-cache/dev-ros/hardware_interface-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/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) >=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/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) 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=Hardware Interface base class
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/hardware_interface https://github.com/ros-controls/ros_control
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-l
 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_=836e299def877687eca05bffdec3cc86
+_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_=27da90fb15967ce2b1e5611caf42f3c4
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-0.14.2 b/metadata/md5-cache/dev-ros/joint_limits_interface-0.14.2
deleted file mode 100644
index d47bc9ef8076..000000000000
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-0.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf 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=Interface for enforcing joint limits
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/joint_limits_interface https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf 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-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.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_=fe8aed8c1e38860e9ad14e9f48a4ed33
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-0.15.0 b/metadata/md5-cache/dev-ros/joint_limits_interface-0.15.0
deleted file mode 100644
index 8bfd002f6f39..000000000000
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-0.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf 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=Interface for enforcing joint limits
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/joint_limits_interface https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf 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-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.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_=fe8aed8c1e38860e9ad14e9f48a4ed33
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-0.15.1 b/metadata/md5-cache/dev-ros/joint_limits_interface-0.15.1
deleted file mode 100644
index b8fa913ae001..000000000000
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-0.15.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf 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=Interface for enforcing joint limits
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/joint_limits_interface https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf 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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.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_=0074f340462e4a11375b2dcfb8618aa1
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.1 b/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.1
new file mode 100644
index 000000000000..07081a389897
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf 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=Interface for enforcing joint limits
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/joint_limits_interface https://github.com/ros-controls/ros_control
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf 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-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.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_=2f03f39b66ef348260e0553d07e63c58
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-9999 b/metadata/md5-cache/dev-ros/joint_limits_interface-9999
index 962017e93aec..9706d2ed9851 100644
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-9999
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-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/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf 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(-)]
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf 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=Interface for enforcing joint limits
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_limits_interface https://github.com/ros-controls/ros_control
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf
 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_=cff2960576e9a0147fb79875573714bb
+_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_=2f03f39b66ef348260e0553d07e63c58
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.11 b/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.11
deleted file mode 100644
index f040ea7b168a..000000000000
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.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=Tool for setting and publishing joint state values for a given URDF
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/joint_state_publisher https://github.com/ros/robot_model
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rospy[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/sensor_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/robot_model/archive/1.12.11.tar.gz -> robot_model-1.12.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_=fe154dbcbc034df44bbb85d385aa20d7
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.13 b/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.13
deleted file mode 100644
index 50314aa3b637..000000000000
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.13
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/rostest[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=Tool for setting and publishing joint state values for a given URDF
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/joint_state_publisher https://github.com/ros/joint_state_publisher
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rospy[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/sensor_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/joint_state_publisher/archive/1.12.13.tar.gz -> joint_state_publisher-1.12.13.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_=c4d6824c7a0200411fc9fc08d4560216
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-1.15.0 b/metadata/md5-cache/dev-ros/joint_state_publisher-1.15.0
new file mode 100644
index 000000000000..7ba750889d50
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-1.15.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-ros/rostest[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=Tool for setting and publishing joint state values for a given URDF
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/joint_state_publisher https://github.com/ros/joint_state_publisher
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[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(-)] 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/joint_state_publisher/archive/1.15.0.tar.gz -> joint_state_publisher-1.15.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_=0a78b6d43ae85fce85d85d1023a2741b
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-9999 b/metadata/md5-cache/dev-ros/joint_state_publisher-9999
index bf3f5391497c..69c9e37beb92 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-9999
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-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=test? ( dev-ros/rostest[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=test? ( dev-ros/rostest[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=Tool for setting and publishing joint state values for a given URDF
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_state_publisher https://github.com/ros/joint_state_publisher
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[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/sensor_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(-)]
+RDEPEND=dev-ros/rospy[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(-)] 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_=c4d6824c7a0200411fc9fc08d4560216
+_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_=0a78b6d43ae85fce85d85d1023a2741b
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher_gui-1.15.0 b/metadata/md5-cache/dev-ros/joint_state_publisher_gui-1.15.0
new file mode 100644
index 000000000000..954d71a57a91
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher_gui-1.15.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-ros/rostest[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=Tool for setting and publishing joint state values for a given URDF
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/joint_state_publisher_gui https://github.com/ros/joint_state_publisher
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[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/joint_state_publisher[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/joint_state_publisher/archive/1.15.0.tar.gz -> joint_state_publisher-1.15.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_=aa2482195380d7eb965fc6813efaffdf
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher_gui-9999 b/metadata/md5-cache/dev-ros/joint_state_publisher_gui-9999
new file mode 100644
index 000000000000..b70b46a93765
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher_gui-9999
@@ -0,0 +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=test? ( dev-ros/rostest[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=Tool for setting and publishing joint state values for a given URDF
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/joint_state_publisher_gui https://github.com/ros/joint_state_publisher
+IUSE=python_targets_python3_6 test
+LICENSE=BSD
+PROPERTIES=live
+RDEPEND=dev-ros/rospy[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/joint_state_publisher[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
+_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_=aa2482195380d7eb965fc6813efaffdf
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.14.3-r1 b/metadata/md5-cache/dev-ros/message_filters-1.14.3-r1
deleted file mode 100644
index acc6226265a1..000000000000
--- a/metadata/md5-cache/dev-ros/message_filters-1.14.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest 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=Set of message filters which take in messages and may output those messages at a later time
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/message_filters https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=544a4d739e5262cefed55885d888b461
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.15.4 b/metadata/md5-cache/dev-ros/message_filters-1.15.4
deleted file mode 100644
index b234199534c1..000000000000
--- a/metadata/md5-cache/dev-ros/message_filters-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest 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=Set of message filters which take in messages and may output those messages at a later time
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/message_filters https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=2943496715ecde9ebfa72ebd47cba592
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.15.7 b/metadata/md5-cache/dev-ros/message_filters-1.15.7
new file mode 100644
index 000000000000..87540ad26816
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/message_filters-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest 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=Set of message filters which take in messages and outputs those at a later time
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/message_filters https://github.com/ros/ros_comm
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=f3915210834679b7552c8bbf65b0fe8b
diff --git a/metadata/md5-cache/dev-ros/message_filters-9999 b/metadata/md5-cache/dev-ros/message_filters-9999
index 743ca40e347d..38b7bafdf96f 100644
--- a/metadata/md5-cache/dev-ros/message_filters-9999
+++ b/metadata/md5-cache/dev-ros/message_filters-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/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest 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(-)]
-DESCRIPTION=Set of message filters which take in messages and may output those messages at a later time
-EAPI=5
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest 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=Set of message filters which take in messages and outputs those at a later time
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_filters https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genp
 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_=2943496715ecde9ebfa72ebd47cba592
+_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_=f3915210834679b7552c8bbf65b0fe8b
diff --git a/metadata/md5-cache/dev-ros/nav_msgs-1.12.5 b/metadata/md5-cache/dev-ros/nav_msgs-1.12.5
deleted file mode 100644
index 4bffcf0ac616..000000000000
--- a/metadata/md5-cache/dev-ros/nav_msgs-1.12.5
+++ /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(-)] 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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Common messages used to interact with the navigation stack
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/nav_msgs https://github.com/ros/common_msgs
-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=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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_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/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.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_=7815538f8f4ab20095e9c6112bf1e0b2
diff --git a/metadata/md5-cache/dev-ros/nav_msgs-1.12.6 b/metadata/md5-cache/dev-ros/nav_msgs-1.12.6
deleted file mode 100644
index a6bb03e5cde1..000000000000
--- a/metadata/md5-cache/dev-ros/nav_msgs-1.12.6
+++ /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(-)] 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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Common messages used to interact with the navigation stack
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/nav_msgs https://github.com/ros/common_msgs
-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=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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_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/common_msgs/archive/1.12.6.tar.gz -> common_msgs-1.12.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_=7815538f8f4ab20095e9c6112bf1e0b2
diff --git a/metadata/md5-cache/dev-ros/nav_msgs-1.12.7 b/metadata/md5-cache/dev-ros/nav_msgs-1.12.7
deleted file mode 100644
index c2b21a3d6184..000000000000
--- a/metadata/md5-cache/dev-ros/nav_msgs-1.12.7
+++ /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(-)] 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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Common messages used to interact with the navigation stack
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/nav_msgs https://github.com/ros/common_msgs
-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=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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_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/common_msgs/archive/1.12.7.tar.gz -> common_msgs-1.12.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_=7815538f8f4ab20095e9c6112bf1e0b2
diff --git a/metadata/md5-cache/dev-ros/nav_msgs-1.13.0 b/metadata/md5-cache/dev-ros/nav_msgs-1.13.0
new file mode 100644
index 000000000000..d6227e4f55fb
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/nav_msgs-1.13.0
@@ -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(-)] 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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Common messages used to interact with the navigation stack
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/nav_msgs https://github.com/ros/common_msgs
+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=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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_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/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.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_=eb4d3011de1b0ea7cb75e163d2233678
diff --git a/metadata/md5-cache/dev-ros/nav_msgs-9999 b/metadata/md5-cache/dev-ros/nav_msgs-9999
index bdf2cd67b534..20bca383986e 100644
--- a/metadata/md5-cache/dev-ros/nav_msgs-9999
+++ b/metadata/md5-cache/dev-ros/nav_msgs-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(-)] 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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[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(-)] 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/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=Common messages used to interact with the navigation stack
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/nav_msgs https://github.com/ros/common_msgs
 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=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 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_=7815538f8f4ab20095e9c6112bf1e0b2
+_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_=eb4d3011de1b0ea7cb75e163d2233678
diff --git a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.10-r1 b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.10-r1
deleted file mode 100644
index cb2351a6af08..000000000000
--- a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.10-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] 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=Nodelet tutorial
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/nodelet_tutorial_math https://github.com/ros/common_tutorials
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] 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/common_tutorials/archive/0.1.10.tar.gz -> common_tutorials-0.1.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_=6fc259d5a14ecae7361fb4693967825d
diff --git a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.11 b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.11
deleted file mode 100644
index d3696bc78b80..000000000000
--- a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] 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=Nodelet tutorial
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/nodelet_tutorial_math https://github.com/ros/common_tutorials
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] 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/common_tutorials/archive/0.1.11.tar.gz -> common_tutorials-0.1.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_=f42e05223aab004528dbee3af6382a39
diff --git a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.12 b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.12
new file mode 100644
index 000000000000..7c541a7edb1e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.12
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] 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=Nodelet tutorial
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/nodelet_tutorial_math https://github.com/ros/common_tutorials
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] 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/common_tutorials/archive/0.1.12.tar.gz -> common_tutorials-0.1.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_=2086caf097813e63bb91115c4a72df23
diff --git a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999 b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
index 53eb9b0ecfc8..42d7ac8ac94c 100644
--- a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
+++ b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-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/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] 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(-)]
+DEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] 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=Nodelet tutorial
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet_tutorial_math https://github.com/ros/common_tutorials
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msg
 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_=6fc259d5a14ecae7361fb4693967825d
+_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_=2086caf097813e63bb91115c4a72df23
diff --git a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.10-r1 b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.10-r1
deleted file mode 100644
index 2c247f3253c9..000000000000
--- a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.10-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp 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=Pluginlib tutorials
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pluginlib_tutorials https://github.com/ros/common_tutorials
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp 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/common_tutorials/archive/0.1.10.tar.gz -> common_tutorials-0.1.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_=e427b72da6e4532d56a69c9308004af1
diff --git a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.11 b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.11
deleted file mode 100644
index 7e9e4ef4cb7e..000000000000
--- a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp 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=Pluginlib tutorials
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pluginlib_tutorials https://github.com/ros/common_tutorials
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp 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/common_tutorials/archive/0.1.11.tar.gz -> common_tutorials-0.1.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_=2abe9f32d2506f90132a002bc43b5ed4
diff --git a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.12 b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.12
new file mode 100644
index 000000000000..a96f53743068
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.12
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp 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=Pluginlib tutorials
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/pluginlib_tutorials https://github.com/ros/common_tutorials
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp 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/common_tutorials/archive/0.1.12.tar.gz -> common_tutorials-0.1.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_=53016e53951fed5a9041fcc620dbcf95
diff --git a/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999 b/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
index c94e0ae39d63..3e0b469396b2 100644
--- a/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-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/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp 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(-)]
+DEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp 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=Pluginlib tutorials
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/pluginlib_tutorials https://github.com/ros/common_tutorials
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= 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_=e427b72da6e4532d56a69c9308004af1
+_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_=53016e53951fed5a9041fcc620dbcf95
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.14.3-r3 b/metadata/md5-cache/dev-ros/rosbag-1.14.3-r3
deleted file mode 100644
index 5372852840c1..000000000000
--- a/metadata/md5-cache/dev-ros/rosbag-1.14.3-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[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/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/console_bridge:= dev-python/pycryptodome[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python-gnupg[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=Set of tools for recording from and playing back to ROS topics
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosbag https://github.com/ros/ros_comm
-IUSE=lz4 python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[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/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/console_bridge:= dev-python/pycryptodome[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python-gnupg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] lz4? ( dev-ros/roslz4[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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=df66e22080d96709bdcc5494d005f97b
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.15.4 b/metadata/md5-cache/dev-ros/rosbag-1.15.7
index ce95c62e76d5..b8a7379cca1f 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.15.4
+++ b/metadata/md5-cache/dev-ros/rosbag-1.15.7
@@ -11,6 +11,6 @@ RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.tar.gz
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=9e837457cc74df1a2158f374d7253f07
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.14.2-r1 b/metadata/md5-cache/dev-ros/rosbag_storage-1.14.2-r1
deleted file mode 100644
index a5c47ee67de3..000000000000
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.14.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 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=Set of tools for recording from and playing back ROS message
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosbag_storage https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 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/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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_=f7925c61f68d68826a64ea1a3db361e5
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.14.3-r2 b/metadata/md5-cache/dev-ros/rosbag_storage-1.14.3-r2
deleted file mode 100644
index 96c7baf0348e..000000000000
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.14.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme 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=Set of tools for recording from and playing back ROS message
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosbag_storage https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme 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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=26c9eecea162439b7a8755b981e42ff8
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.4 b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.4
deleted file mode 100644
index dd53e721db50..000000000000
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme 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=Set of tools for recording from and playing back ROS message
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosbag_storage https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme 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/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=04d6df0cd529caca94225922c48d21f0
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.7 b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.7
new file mode 100644
index 000000000000..7a5885959344
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme 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=Set of tools for recording from and playing back ROS message
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosbag_storage https://github.com/ros/ros_comm
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme 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/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=b376a886272105ae167556a4bccaf26f
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-9999 b/metadata/md5-cache/dev-ros/rosbag_storage-9999
index 0e4044ed77e9..79880f82afd2 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-9999
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-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-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme >=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-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme 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=Set of tools for recording from and playing back ROS message
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbag_storage https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_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_=26c9eecea162439b7a8755b981e42ff8
+_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_=b376a886272105ae167556a4bccaf26f
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.14.3-r1 b/metadata/md5-cache/dev-ros/roscpp-1.14.3-r1
deleted file mode 100644
index c00c22067515..000000000000
--- a/metadata/md5-cache/dev-ros/roscpp-1.14.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_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(-)] 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(-)]
-DESCRIPTION=C++ implementation of ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/roscpp https://github.com/ros/ros_comm
-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/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_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
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=e54d1bb29fa72d170c1bb9fb23390017
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.15.4 b/metadata/md5-cache/dev-ros/roscpp-1.15.7
index d86ae50789fa..64422305ca92 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.15.4
+++ b/metadata/md5-cache/dev-ros/roscpp-1.15.7
@@ -11,6 +11,6 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-r
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.tar.gz
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=76c0f153c3a9ad7d28f851429461686d
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.14.3-r1 b/metadata/md5-cache/dev-ros/rosgraph-1.14.3-r1
deleted file mode 100644
index 7b895c7a7228..000000000000
--- a/metadata/md5-cache/dev-ros/rosgraph-1.14.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/netifaces[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Prints information about the ROS Computation Graph
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosgraph https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/netifaces[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=1094703482b6226f0190c1a8e2941e26
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.15.4 b/metadata/md5-cache/dev-ros/rosgraph-1.15.4
deleted file mode 100644
index f05de57a59cb..000000000000
--- a/metadata/md5-cache/dev-ros/rosgraph-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/netifaces[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Prints information about the ROS Computation Graph
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosgraph https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/netifaces[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=57aa3ec8d7a61a05c8c51db071cd781a
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.15.7 b/metadata/md5-cache/dev-ros/rosgraph-1.15.7
new file mode 100644
index 000000000000..70fa42095ece
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/netifaces[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Prints information about the ROS Computation Graph
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosgraph https://github.com/ros/ros_comm
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/netifaces[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=e0525c496a35f27b86e23800dd5ca4e4
diff --git a/metadata/md5-cache/dev-ros/rosgraph-9999 b/metadata/md5-cache/dev-ros/rosgraph-9999
index 769f461a1289..ec86579113ae 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-9999
+++ b/metadata/md5-cache/dev-ros/rosgraph-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/netifaces[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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/netifaces[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Prints information about the ROS Computation Graph
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosgraph https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-python/netifaces[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_=57aa3ec8d7a61a05c8c51db071cd781a
+_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_=e0525c496a35f27b86e23800dd5ca4e4
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.15.4 b/metadata/md5-cache/dev-ros/roslaunch-1.15.4
deleted file mode 100644
index 7b1fb325d4c1..000000000000
--- a/metadata/md5-cache/dev-ros/roslaunch-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare test
-DEPEND=dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosclean[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[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/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster ) 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=Tool for easily launching multiple ROS nodes
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosclean[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[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/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosout 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/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ae61185a09ec16a3b87ec3187f728d6
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.14.3-r2 b/metadata/md5-cache/dev-ros/roslaunch-1.15.7
index 2dd49135c3b1..f00252fd8cee 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.14.3-r2
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.15.7
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install preinst prepare test
-DEPEND=dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosclean[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[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/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster ) 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/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosclean[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[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/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster ) 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=Tool for easily launching multiple ROS nodes
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64 ~arm
@@ -10,6 +11,6 @@ RDEPEND=dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=855c83e5bc571ec17c0c7704c3cecbec
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e4a4497a0d598763212e4beb3b194884
diff --git a/metadata/md5-cache/dev-ros/roslaunch-9999 b/metadata/md5-cache/dev-ros/roslaunch-9999
index 5863fe7a621b..09b30a88feb0 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-9999
+++ b/metadata/md5-cache/dev-ros/roslaunch-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 preinst prepare test unpack
-DEPEND=dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosclean[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[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/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster ) >=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/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosclean[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[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/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster ) 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=Tool for easily launching multiple ROS nodes
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python
 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	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ae61185a09ec16a3b87ec3187f728d6
+_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	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e4a4497a0d598763212e4beb3b194884
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.13.0 b/metadata/md5-cache/dev-ros/roslz4-1.13.0
deleted file mode 100644
index 79f60174984a..000000000000
--- a/metadata/md5-cache/dev-ros/roslz4-1.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 test? ( 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=Python and C++ implementation of the LZ4 streaming format
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=app-arch/lz4 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/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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_=22b3119e9870c0feeca1a46ffcf2af11
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.13.1 b/metadata/md5-cache/dev-ros/roslz4-1.13.1
deleted file mode 100644
index 39758ecaf6af..000000000000
--- a/metadata/md5-cache/dev-ros/roslz4-1.13.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 test? ( 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=Python and C++ implementation of the LZ4 streaming format
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=app-arch/lz4 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/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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_=22b3119e9870c0feeca1a46ffcf2af11
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.13.2 b/metadata/md5-cache/dev-ros/roslz4-1.13.2
deleted file mode 100644
index ab891ffecc23..000000000000
--- a/metadata/md5-cache/dev-ros/roslz4-1.13.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 test? ( 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=Python and C++ implementation of the LZ4 streaming format
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=app-arch/lz4 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/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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_=22b3119e9870c0feeca1a46ffcf2af11
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.13.4 b/metadata/md5-cache/dev-ros/roslz4-1.13.4
deleted file mode 100644
index a08a45c2712f..000000000000
--- a/metadata/md5-cache/dev-ros/roslz4-1.13.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 test? ( 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=Python and C++ implementation of the LZ4 streaming format
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=app-arch/lz4 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/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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_=22b3119e9870c0feeca1a46ffcf2af11
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.13.5 b/metadata/md5-cache/dev-ros/roslz4-1.13.5
deleted file mode 100644
index 3843c5e78519..000000000000
--- a/metadata/md5-cache/dev-ros/roslz4-1.13.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 test? ( 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=Python and C++ implementation of the LZ4 streaming format
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=app-arch/lz4 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/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.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_=22b3119e9870c0feeca1a46ffcf2af11
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.13.6 b/metadata/md5-cache/dev-ros/roslz4-1.13.6
deleted file mode 100644
index 2b1b875052a8..000000000000
--- a/metadata/md5-cache/dev-ros/roslz4-1.13.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 test? ( 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=Python and C++ implementation of the LZ4 streaming format
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=app-arch/lz4 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/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.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_=22b3119e9870c0feeca1a46ffcf2af11
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.14.2 b/metadata/md5-cache/dev-ros/roslz4-1.14.2
deleted file mode 100644
index bb17286a9ba3..000000000000
--- a/metadata/md5-cache/dev-ros/roslz4-1.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 test? ( 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=Python and C++ implementation of the LZ4 streaming format
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=app-arch/lz4 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/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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_=22b3119e9870c0feeca1a46ffcf2af11
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.14.3 b/metadata/md5-cache/dev-ros/roslz4-1.14.3
deleted file mode 100644
index 086091c0ff9e..000000000000
--- a/metadata/md5-cache/dev-ros/roslz4-1.14.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 test? ( 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=Python and C++ implementation of the LZ4 streaming format
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=app-arch/lz4 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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=22b3119e9870c0feeca1a46ffcf2af11
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.15.4 b/metadata/md5-cache/dev-ros/roslz4-1.15.4
deleted file mode 100644
index 66fc1e6e8f8b..000000000000
--- a/metadata/md5-cache/dev-ros/roslz4-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 test? ( 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=Python and C++ implementation of the LZ4 streaming format
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=app-arch/lz4 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/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=22b3119e9870c0feeca1a46ffcf2af11
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.15.7 b/metadata/md5-cache/dev-ros/roslz4-1.15.7
new file mode 100644
index 000000000000..c93f1097673e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roslz4-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/lz4 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=Python and C++ implementation of the LZ4 streaming format
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=app-arch/lz4 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/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=3cd5565ddb40adaec1441b20af56f89d
diff --git a/metadata/md5-cache/dev-ros/roslz4-9999 b/metadata/md5-cache/dev-ros/roslz4-9999
index fbc6965d6b03..aee5d59d072b 100644
--- a/metadata/md5-cache/dev-ros/roslz4-9999
+++ b/metadata/md5-cache/dev-ros/roslz4-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=app-arch/lz4 test? ( 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(-)]
+DEPEND=app-arch/lz4 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=Python and C++ implementation of the LZ4 streaming format
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=app-arch/lz4 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lan
 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_=22b3119e9870c0feeca1a46ffcf2af11
+_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_=3cd5565ddb40adaec1441b20af56f89d
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.13.0 b/metadata/md5-cache/dev-ros/rosmaster-1.13.0
deleted file mode 100644
index b0c7dedb9211..000000000000
--- a/metadata/md5-cache/dev-ros/rosmaster-1.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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=ROS Master implementation
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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_=41a8b97c3a0bf42b5d9b72db9854e113
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.13.1 b/metadata/md5-cache/dev-ros/rosmaster-1.13.1
deleted file mode 100644
index b4f717330da0..000000000000
--- a/metadata/md5-cache/dev-ros/rosmaster-1.13.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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=ROS Master implementation
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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_=41a8b97c3a0bf42b5d9b72db9854e113
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.13.2 b/metadata/md5-cache/dev-ros/rosmaster-1.13.2
deleted file mode 100644
index 49fe06487c31..000000000000
--- a/metadata/md5-cache/dev-ros/rosmaster-1.13.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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=ROS Master implementation
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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_=41a8b97c3a0bf42b5d9b72db9854e113
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.13.4 b/metadata/md5-cache/dev-ros/rosmaster-1.13.4
deleted file mode 100644
index d4df9cb90b3b..000000000000
--- a/metadata/md5-cache/dev-ros/rosmaster-1.13.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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=ROS Master implementation
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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_=41a8b97c3a0bf42b5d9b72db9854e113
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.13.5 b/metadata/md5-cache/dev-ros/rosmaster-1.13.5
deleted file mode 100644
index dc8c35fcf66b..000000000000
--- a/metadata/md5-cache/dev-ros/rosmaster-1.13.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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=ROS Master implementation
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.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_=41a8b97c3a0bf42b5d9b72db9854e113
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.13.6 b/metadata/md5-cache/dev-ros/rosmaster-1.13.6
deleted file mode 100644
index c90e20122a73..000000000000
--- a/metadata/md5-cache/dev-ros/rosmaster-1.13.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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=ROS Master implementation
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.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_=41a8b97c3a0bf42b5d9b72db9854e113
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.14.2 b/metadata/md5-cache/dev-ros/rosmaster-1.14.2
deleted file mode 100644
index f745505bd4f1..000000000000
--- a/metadata/md5-cache/dev-ros/rosmaster-1.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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=ROS Master implementation
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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_=41a8b97c3a0bf42b5d9b72db9854e113
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.14.3 b/metadata/md5-cache/dev-ros/rosmaster-1.14.3
deleted file mode 100644
index b40be39922b9..000000000000
--- a/metadata/md5-cache/dev-ros/rosmaster-1.14.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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=ROS Master implementation
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=41a8b97c3a0bf42b5d9b72db9854e113
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.15.4 b/metadata/md5-cache/dev-ros/rosmaster-1.15.4
deleted file mode 100644
index 068a54be1c5e..000000000000
--- a/metadata/md5-cache/dev-ros/rosmaster-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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=ROS Master implementation
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=41a8b97c3a0bf42b5d9b72db9854e113
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.15.7 b/metadata/md5-cache/dev-ros/rosmaster-1.15.7
new file mode 100644
index 000000000000..af82748b1843
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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=ROS Master implementation
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=9a9ea57ac8fbec9c85ef085605cc055c
diff --git a/metadata/md5-cache/dev-ros/rosmaster-9999 b/metadata/md5-cache/dev-ros/rosmaster-9999
index 07ff1c00264c..e1b74107e468 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-9999
+++ b/metadata/md5-cache/dev-ros/rosmaster-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/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[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=ROS Master implementation
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_pyth
 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_=41a8b97c3a0bf42b5d9b72db9854e113
+_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_=9a9ea57ac8fbec9c85ef085605cc055c
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.14.3-r1 b/metadata/md5-cache/dev-ros/rosmsg-1.14.3-r1
deleted file mode 100644
index c3ec49f2bcf2..000000000000
--- a/metadata/md5-cache/dev-ros/rosmsg-1.14.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/test_rosmaster[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=Command-line tools for displaying information about message and services
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosmsg https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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/rosbag[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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=3a13ac18d7a6ac8f941fed7613b60282
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.15.4 b/metadata/md5-cache/dev-ros/rosmsg-1.15.4
deleted file mode 100644
index 6efb6b160232..000000000000
--- a/metadata/md5-cache/dev-ros/rosmsg-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/test_rosmaster[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=Command-line tools for displaying information about message and services
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosmsg https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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/rosbag[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/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=84c713f9477aeaf6d65c2894e649ac27
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.15.7 b/metadata/md5-cache/dev-ros/rosmsg-1.15.7
new file mode 100644
index 000000000000..65c0503ecefe
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/test_rosmaster[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=Command-line tools for displaying information about message and services
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosmsg https://github.com/ros/ros_comm
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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/rosbag[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/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=248a675bedf96fbd6eeff06645e7d616
diff --git a/metadata/md5-cache/dev-ros/rosmsg-9999 b/metadata/md5-cache/dev-ros/rosmsg-9999
index bf33be372b3f..5a1607a898db 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-9999
+++ b/metadata/md5-cache/dev-ros/rosmsg-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/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/test_rosmaster[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/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/test_rosmaster[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=Command-line tools for displaying information about message and services
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmsg https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python
 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_=84c713f9477aeaf6d65c2894e649ac27
+_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_=248a675bedf96fbd6eeff06645e7d616
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.13.0 b/metadata/md5-cache/dev-ros/rosnode-1.13.0
deleted file mode 100644
index d9d156238f6e..000000000000
--- a/metadata/md5-cache/dev-ros/rosnode-1.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[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=Command-line tool for displaying debug information about ROS nodes
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[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/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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_=ba2bef18bc89839faf2a82cff9c4736a
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.13.1 b/metadata/md5-cache/dev-ros/rosnode-1.13.1
deleted file mode 100644
index d94426795ef3..000000000000
--- a/metadata/md5-cache/dev-ros/rosnode-1.13.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[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=Command-line tool for displaying debug information about ROS nodes
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[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/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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_=ba2bef18bc89839faf2a82cff9c4736a
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.13.2 b/metadata/md5-cache/dev-ros/rosnode-1.13.2
deleted file mode 100644
index 9bae08b8c8ac..000000000000
--- a/metadata/md5-cache/dev-ros/rosnode-1.13.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[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=Command-line tool for displaying debug information about ROS nodes
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[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/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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_=ba2bef18bc89839faf2a82cff9c4736a
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.13.4 b/metadata/md5-cache/dev-ros/rosnode-1.13.4
deleted file mode 100644
index 4cd768c899b6..000000000000
--- a/metadata/md5-cache/dev-ros/rosnode-1.13.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[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=Command-line tool for displaying debug information about ROS nodes
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[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/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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_=ba2bef18bc89839faf2a82cff9c4736a
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.13.5 b/metadata/md5-cache/dev-ros/rosnode-1.13.5
deleted file mode 100644
index d7c8f83322bc..000000000000
--- a/metadata/md5-cache/dev-ros/rosnode-1.13.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[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=Command-line tool for displaying debug information about ROS nodes
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[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/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.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_=ba2bef18bc89839faf2a82cff9c4736a
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.13.6 b/metadata/md5-cache/dev-ros/rosnode-1.13.6
deleted file mode 100644
index 6ba9cef6ffd7..000000000000
--- a/metadata/md5-cache/dev-ros/rosnode-1.13.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[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=Command-line tool for displaying debug information about ROS nodes
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[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/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.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_=ba2bef18bc89839faf2a82cff9c4736a
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.14.2 b/metadata/md5-cache/dev-ros/rosnode-1.14.2
deleted file mode 100644
index 2649deb197d5..000000000000
--- a/metadata/md5-cache/dev-ros/rosnode-1.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[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=Command-line tool for displaying debug information about ROS nodes
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[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/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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_=ba2bef18bc89839faf2a82cff9c4736a
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.14.3 b/metadata/md5-cache/dev-ros/rosnode-1.14.3
deleted file mode 100644
index 22b1408d8791..000000000000
--- a/metadata/md5-cache/dev-ros/rosnode-1.14.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[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=Command-line tool for displaying debug information about ROS nodes
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=ba2bef18bc89839faf2a82cff9c4736a
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.15.4 b/metadata/md5-cache/dev-ros/rosnode-1.15.4
deleted file mode 100644
index f0924168edbb..000000000000
--- a/metadata/md5-cache/dev-ros/rosnode-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[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=Command-line tool for displaying debug information about ROS nodes
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[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/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=ba2bef18bc89839faf2a82cff9c4736a
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.15.7 b/metadata/md5-cache/dev-ros/rosnode-1.15.7
new file mode 100644
index 000000000000..1c00590f9129
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosnode-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[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=Command-line tool for displaying debug information about ROS nodes
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[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/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=fef6d203f36e3a09e4fee0b57ad138b5
diff --git a/metadata/md5-cache/dev-ros/rosnode-9999 b/metadata/md5-cache/dev-ros/rosnode-9999
index 63c4d07e21a7..97f65b1e3e26 100644
--- a/metadata/md5-cache/dev-ros/rosnode-9999
+++ b/metadata/md5-cache/dev-ros/rosnode-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/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[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/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[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=Command-line tool for displaying debug information about ROS nodes
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python
 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_=ba2bef18bc89839faf2a82cff9c4736a
+_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_=fef6d203f36e3a09e4fee0b57ad138b5
diff --git a/metadata/md5-cache/dev-ros/rosout-1.13.0 b/metadata/md5-cache/dev-ros/rosout-1.13.0
deleted file mode 100644
index 38450e4c7aa5..000000000000
--- a/metadata/md5-cache/dev-ros/rosout-1.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_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=System-wide logging mechanism for messages sent to the /rosout topic
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosgraph_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/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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_=d5ab415cde03018317b3db740c407853
diff --git a/metadata/md5-cache/dev-ros/rosout-1.13.1 b/metadata/md5-cache/dev-ros/rosout-1.13.1
deleted file mode 100644
index 94367222a733..000000000000
--- a/metadata/md5-cache/dev-ros/rosout-1.13.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_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=System-wide logging mechanism for messages sent to the /rosout topic
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosgraph_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/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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_=d5ab415cde03018317b3db740c407853
diff --git a/metadata/md5-cache/dev-ros/rosout-1.13.2 b/metadata/md5-cache/dev-ros/rosout-1.13.2
deleted file mode 100644
index 52b5a19ed23e..000000000000
--- a/metadata/md5-cache/dev-ros/rosout-1.13.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_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=System-wide logging mechanism for messages sent to the /rosout topic
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosgraph_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/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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_=d5ab415cde03018317b3db740c407853
diff --git a/metadata/md5-cache/dev-ros/rosout-1.13.4 b/metadata/md5-cache/dev-ros/rosout-1.13.4
deleted file mode 100644
index 30b9c9260d60..000000000000
--- a/metadata/md5-cache/dev-ros/rosout-1.13.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_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=System-wide logging mechanism for messages sent to the /rosout topic
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosgraph_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/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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_=d5ab415cde03018317b3db740c407853
diff --git a/metadata/md5-cache/dev-ros/rosout-1.13.5 b/metadata/md5-cache/dev-ros/rosout-1.13.5
deleted file mode 100644
index 12443279aac9..000000000000
--- a/metadata/md5-cache/dev-ros/rosout-1.13.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_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=System-wide logging mechanism for messages sent to the /rosout topic
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosgraph_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/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.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_=d5ab415cde03018317b3db740c407853
diff --git a/metadata/md5-cache/dev-ros/rosout-1.13.6 b/metadata/md5-cache/dev-ros/rosout-1.13.6
deleted file mode 100644
index 07c0938a4db1..000000000000
--- a/metadata/md5-cache/dev-ros/rosout-1.13.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_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=System-wide logging mechanism for messages sent to the /rosout topic
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosgraph_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/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.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_=2aaed6538c95db1d04be23166164f9fc
diff --git a/metadata/md5-cache/dev-ros/rosout-1.14.2 b/metadata/md5-cache/dev-ros/rosout-1.14.2
deleted file mode 100644
index 4639a188834d..000000000000
--- a/metadata/md5-cache/dev-ros/rosout-1.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_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=System-wide logging mechanism for messages sent to the /rosout topic
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosgraph_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/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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_=2aaed6538c95db1d04be23166164f9fc
diff --git a/metadata/md5-cache/dev-ros/rosout-1.14.3 b/metadata/md5-cache/dev-ros/rosout-1.14.3
deleted file mode 100644
index 84fc4b1204e5..000000000000
--- a/metadata/md5-cache/dev-ros/rosout-1.14.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_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=System-wide logging mechanism for messages sent to the /rosout topic
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosgraph_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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=2aaed6538c95db1d04be23166164f9fc
diff --git a/metadata/md5-cache/dev-ros/rosout-1.15.4 b/metadata/md5-cache/dev-ros/rosout-1.15.4
deleted file mode 100644
index e4c9095467b4..000000000000
--- a/metadata/md5-cache/dev-ros/rosout-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_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=System-wide logging mechanism for messages sent to the /rosout topic
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosgraph_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/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=9eeb5496021d55385dd3803a121376cc
diff --git a/metadata/md5-cache/dev-ros/rosout-1.15.7 b/metadata/md5-cache/dev-ros/rosout-1.15.7
new file mode 100644
index 000000000000..923d8d09bc98
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosout-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_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=System-wide logging mechanism for messages sent to the /rosout topic
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
+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/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=5acd9311aaeb96df2200f42788a0f9ca
diff --git a/metadata/md5-cache/dev-ros/rosout-9999 b/metadata/md5-cache/dev-ros/rosout-9999
index d1c890ac9018..4e87704ad705 100644
--- a/metadata/md5-cache/dev-ros/rosout-9999
+++ b/metadata/md5-cache/dev-ros/rosout-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/roscpp dev-ros/rosgraph_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/roscpp dev-ros/rosgraph_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=System-wide logging mechanism for messages sent to the /rosout topic
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rosgraph_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/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
-_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_=7b451ec02b3e27fc4016a359b7027f52
+_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_=5acd9311aaeb96df2200f42788a0f9ca
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.14.3-r1 b/metadata/md5-cache/dev-ros/rosparam-1.14.3-r1
deleted file mode 100644
index 4a099d87d077..000000000000
--- a/metadata/md5-cache/dev-ros/rosparam-1.14.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[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=Command-line tool for getting and setting ROS Parameters on the parameter server
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosparam https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=96edafd16a1e732acb504c92489a7a15
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.15.4 b/metadata/md5-cache/dev-ros/rosparam-1.15.4
deleted file mode 100644
index 4789c0acbe32..000000000000
--- a/metadata/md5-cache/dev-ros/rosparam-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[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=Command-line tool for getting and setting ROS Parameters on the parameter server
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosparam https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[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/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=682ea96a8f96cebfbbcaa579175206da
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.15.7 b/metadata/md5-cache/dev-ros/rosparam-1.15.7
new file mode 100644
index 000000000000..e0fed8279ea5
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosparam-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[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=Command-line tool for getting and setting ROS Parameters on the parameter server
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosparam https://github.com/ros/ros_comm
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[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/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=fe77ea695b8f1ed937f5b4af75b1d9a5
diff --git a/metadata/md5-cache/dev-ros/rosparam-9999 b/metadata/md5-cache/dev-ros/rosparam-9999
index d1c1ba8d567f..d2dbd245f7b1 100644
--- a/metadata/md5-cache/dev-ros/rosparam-9999
+++ b/metadata/md5-cache/dev-ros/rosparam-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/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[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/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[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=Command-line tool for getting and setting ROS Parameters on the parameter server
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosparam https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_pyth
 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_=682ea96a8f96cebfbbcaa579175206da
+_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_=fe77ea695b8f1ed937f5b4af75b1d9a5
diff --git a/metadata/md5-cache/dev-ros/rospy-1.14.3-r1 b/metadata/md5-cache/dev-ros/rospy-1.14.3-r1
deleted file mode 100644
index dfd1fdcaca59..000000000000
--- a/metadata/md5-cache/dev-ros/rospy-1.14.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp[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(-)] 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(-)]
-DESCRIPTION=Python client library for ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rospy https://github.com/ros/ros_comm
-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/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp[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(-)] 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
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=aca218759fc99f9df99fde0dfb2df1c2
diff --git a/metadata/md5-cache/dev-ros/rospy-1.15.4 b/metadata/md5-cache/dev-ros/rospy-1.15.4
deleted file mode 100644
index 6ffbfb5c58f3..000000000000
--- a/metadata/md5-cache/dev-ros/rospy-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp[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(-)] 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(-)]
-DESCRIPTION=Python client library for ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rospy https://github.com/ros/ros_comm
-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/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp[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(-)] 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
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=af601b632eb4741ef4e28cdff390cd52
diff --git a/metadata/md5-cache/dev-ros/rospy-1.15.7 b/metadata/md5-cache/dev-ros/rospy-1.15.7
new file mode 100644
index 000000000000..d3ce4b29df0d
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rospy-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp[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(-)] 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(-)]
+DESCRIPTION=Python client library for ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rospy https://github.com/ros/ros_comm
+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/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp[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(-)] 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
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=58bb0f35e7ecb714cb51407b5f04b003
diff --git a/metadata/md5-cache/dev-ros/rospy-9999 b/metadata/md5-cache/dev-ros/rospy-9999
index e64f0965dc23..c93a21060866 100644
--- a/metadata/md5-cache/dev-ros/rospy-9999
+++ b/metadata/md5-cache/dev-ros/rospy-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/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp[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-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(-)]
+DEPEND=dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp[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(-)] 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(-)]
 DESCRIPTION=Python client library for ROS
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospy https://github.com/ros/ros_comm
 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/roslib[python_targets_python3_6(-)?,-python_single_target_python
 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_=af601b632eb4741ef4e28cdff390cd52
+_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_=58bb0f35e7ecb714cb51407b5f04b003
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.14.3-r1 b/metadata/md5-cache/dev-ros/rosservice-1.14.3-r1
deleted file mode 100644
index 34d7b5f7f4dd..000000000000
--- a/metadata/md5-cache/dev-ros/rosservice-1.14.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[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/rosmsg[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=Command-line tool for listing and querying ROS Services
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosservice https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[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/rosmsg[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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=2b3fa74643b2fe3254a272959695f502
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.15.4 b/metadata/md5-cache/dev-ros/rosservice-1.15.4
deleted file mode 100644
index a7bdb0f6340c..000000000000
--- a/metadata/md5-cache/dev-ros/rosservice-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[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/rosmsg[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=Command-line tool for listing and querying ROS Services
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosservice https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[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/rosmsg[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/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=a4c54c75314be6d51630ec3fe583fbab
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.15.7 b/metadata/md5-cache/dev-ros/rosservice-1.15.7
new file mode 100644
index 000000000000..f3cc3caa349a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosservice-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rosgraph[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/rosmsg[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=Command-line tool for listing and querying ROS Services
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosservice https://github.com/ros/ros_comm
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosgraph[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/rosmsg[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/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=7382937efa7303ed97f81fdb138a1630
diff --git a/metadata/md5-cache/dev-ros/rosservice-9999 b/metadata/md5-cache/dev-ros/rosservice-9999
index de733e387d63..dd9e78932030 100644
--- a/metadata/md5-cache/dev-ros/rosservice-9999
+++ b/metadata/md5-cache/dev-ros/rosservice-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/rosgraph[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/rosmsg[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/rosgraph[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/rosmsg[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=Command-line tool for listing and querying ROS Services
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosservice https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_pyth
 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_=a4c54c75314be6d51630ec3fe583fbab
+_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_=7382937efa7303ed97f81fdb138a1630
diff --git a/metadata/md5-cache/dev-ros/rostest-1.13.0 b/metadata/md5-cache/dev-ros/rostest-1.13.0
deleted file mode 100644
index 41dd83ae4b77..000000000000
--- a/metadata/md5-cache/dev-ros/rostest-1.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] 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/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Integration test suite based on roslaunch that is compatible with xUnit frameworks
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] 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/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[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/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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_=3e5771eaa89df75e21936461d852199c
diff --git a/metadata/md5-cache/dev-ros/rostest-1.13.1 b/metadata/md5-cache/dev-ros/rostest-1.13.1
deleted file mode 100644
index 8ff4fe7af26d..000000000000
--- a/metadata/md5-cache/dev-ros/rostest-1.13.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] 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/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Integration test suite based on roslaunch that is compatible with xUnit frameworks
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] 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/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[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/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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_=3e5771eaa89df75e21936461d852199c
diff --git a/metadata/md5-cache/dev-ros/rostest-1.13.2 b/metadata/md5-cache/dev-ros/rostest-1.13.2
deleted file mode 100644
index 9b276888d972..000000000000
--- a/metadata/md5-cache/dev-ros/rostest-1.13.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] 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/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Integration test suite based on roslaunch that is compatible with xUnit frameworks
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] 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/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[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/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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_=3e5771eaa89df75e21936461d852199c
diff --git a/metadata/md5-cache/dev-ros/rostest-1.13.4 b/metadata/md5-cache/dev-ros/rostest-1.13.4
deleted file mode 100644
index 86b53315a2fd..000000000000
--- a/metadata/md5-cache/dev-ros/rostest-1.13.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] 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/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Integration test suite based on roslaunch that is compatible with xUnit frameworks
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] 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/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[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/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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_=3e5771eaa89df75e21936461d852199c
diff --git a/metadata/md5-cache/dev-ros/rostest-1.13.5 b/metadata/md5-cache/dev-ros/rostest-1.13.5
deleted file mode 100644
index 5921a068e813..000000000000
--- a/metadata/md5-cache/dev-ros/rostest-1.13.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] 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/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Integration test suite based on roslaunch that is compatible with xUnit frameworks
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] 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/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[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/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.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_=3e5771eaa89df75e21936461d852199c
diff --git a/metadata/md5-cache/dev-ros/rostest-1.13.6 b/metadata/md5-cache/dev-ros/rostest-1.13.6
deleted file mode 100644
index 17bb8379fcbf..000000000000
--- a/metadata/md5-cache/dev-ros/rostest-1.13.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] 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/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Integration test suite based on roslaunch that is compatible with xUnit frameworks
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] 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/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[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/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.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_=3e5771eaa89df75e21936461d852199c
diff --git a/metadata/md5-cache/dev-ros/rostest-1.14.2 b/metadata/md5-cache/dev-ros/rostest-1.14.2
deleted file mode 100644
index af1db9ea4a85..000000000000
--- a/metadata/md5-cache/dev-ros/rostest-1.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] 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/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Integration test suite based on roslaunch that is compatible with xUnit frameworks
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] 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/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[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/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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_=3e5771eaa89df75e21936461d852199c
diff --git a/metadata/md5-cache/dev-ros/rostest-1.15.4 b/metadata/md5-cache/dev-ros/rostest-1.15.4
deleted file mode 100644
index 613a12e345f2..000000000000
--- a/metadata/md5-cache/dev-ros/rostest-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] 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/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest dev-ros/rostopic ) 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=Integration test suite based on roslaunch that is compatible with xUnit frameworks
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] 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/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[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/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=c9430c7e37c5d6e9c4a3f327709d2d1a
diff --git a/metadata/md5-cache/dev-ros/rostest-1.14.3 b/metadata/md5-cache/dev-ros/rostest-1.15.7
index e4b5e6522636..80f52b77a208 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.14.3
+++ b/metadata/md5-cache/dev-ros/rostest-1.15.7
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] 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/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest dev-ros/rostopic ) 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=Integration test suite based on roslaunch that is compatible with xUnit frameworks
-EAPI=5
+DEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] 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/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest dev-ros/rostopic ) 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=Integration test suite based on roslaunch compatible with xUnit frameworks
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64 ~arm
@@ -10,6 +11,6 @@ RDEPEND=dev-ros/rosunit[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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=c9430c7e37c5d6e9c4a3f327709d2d1a
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=2abbe41a916fbd5a66ceafa25b01c90b
diff --git a/metadata/md5-cache/dev-ros/rostest-9999 b/metadata/md5-cache/dev-ros/rostest-9999
index 63f52a450614..c5a3f504edd4 100644
--- a/metadata/md5-cache/dev-ros/rostest-9999
+++ b/metadata/md5-cache/dev-ros/rostest-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/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] 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/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest dev-ros/rostopic ) >=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=Integration test suite based on roslaunch that is compatible with xUnit frameworks
-EAPI=5
+DEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] 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/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest dev-ros/rostopic ) 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=Integration test suite based on roslaunch compatible with xUnit frameworks
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/rosunit[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_=c9430c7e37c5d6e9c4a3f327709d2d1a
+_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_=2abbe41a916fbd5a66ceafa25b01c90b
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.14.3-r1 b/metadata/md5-cache/dev-ros/rostopic-1.14.3-r1
deleted file mode 100644
index 5ced628d579e..000000000000
--- a/metadata/md5-cache/dev-ros/rostopic-1.14.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Command-line tool for displaying debug information about ROS Topics
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rostopic https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=f9d8b8d306e356e1efab2642335db20d
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.15.4 b/metadata/md5-cache/dev-ros/rostopic-1.15.4
deleted file mode 100644
index 8fedd06e687a..000000000000
--- a/metadata/md5-cache/dev-ros/rostopic-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Command-line tool for displaying debug information about ROS Topics
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rostopic https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[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/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=2686c7085d37a05e49dab4ca636655cb
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.15.7 b/metadata/md5-cache/dev-ros/rostopic-1.15.7
new file mode 100644
index 000000000000..2f65ae555914
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rostopic-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Command-line tool for displaying debug information about ROS Topics
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rostopic https://github.com/ros/ros_comm
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[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/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=730401768c3111e4ac0f32619f3b5a69
diff --git a/metadata/md5-cache/dev-ros/rostopic-9999 b/metadata/md5-cache/dev-ros/rostopic-9999
index 70c70f776758..27558632f6f7 100644
--- a/metadata/md5-cache/dev-ros/rostopic-9999
+++ b/metadata/md5-cache/dev-ros/rostopic-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/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Command-line tool for displaying debug information about ROS Topics
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostopic https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python
 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_=2686c7085d37a05e49dab4ca636655cb
+_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_=730401768c3111e4ac0f32619f3b5a69
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.13.0 b/metadata/md5-cache/dev-ros/roswtf-1.13.0
deleted file mode 100644
index c9eb0610c21c..000000000000
--- a/metadata/md5-cache/dev-ros/roswtf-1.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosinstall[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Tool for diagnosing issues with a running ROS system
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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_=b125dac9ab7301db2c8899d1453c35f7
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.13.1 b/metadata/md5-cache/dev-ros/roswtf-1.13.1
deleted file mode 100644
index 9021bd4a7620..000000000000
--- a/metadata/md5-cache/dev-ros/roswtf-1.13.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosinstall[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Tool for diagnosing issues with a running ROS system
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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_=b125dac9ab7301db2c8899d1453c35f7
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.13.4 b/metadata/md5-cache/dev-ros/roswtf-1.13.4
deleted file mode 100644
index e5dd692e3559..000000000000
--- a/metadata/md5-cache/dev-ros/roswtf-1.13.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosinstall[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Tool for diagnosing issues with a running ROS system
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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_=b125dac9ab7301db2c8899d1453c35f7
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.13.5 b/metadata/md5-cache/dev-ros/roswtf-1.13.5
deleted file mode 100644
index 244b5378767a..000000000000
--- a/metadata/md5-cache/dev-ros/roswtf-1.13.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosinstall[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Tool for diagnosing issues with a running ROS system
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.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_=b125dac9ab7301db2c8899d1453c35f7
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.13.6 b/metadata/md5-cache/dev-ros/roswtf-1.13.6
deleted file mode 100644
index 745606c6f9f1..000000000000
--- a/metadata/md5-cache/dev-ros/roswtf-1.13.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosinstall[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Tool for diagnosing issues with a running ROS system
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.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_=12d49760283c9fe8c4a693ee5b412404
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.14.2 b/metadata/md5-cache/dev-ros/roswtf-1.14.2
deleted file mode 100644
index b757ea34f2a7..000000000000
--- a/metadata/md5-cache/dev-ros/roswtf-1.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosinstall[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Tool for diagnosing issues with a running ROS system
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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_=12d49760283c9fe8c4a693ee5b412404
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.14.3 b/metadata/md5-cache/dev-ros/roswtf-1.14.3
deleted file mode 100644
index ae72233abc89..000000000000
--- a/metadata/md5-cache/dev-ros/roswtf-1.14.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosinstall[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Tool for diagnosing issues with a running ROS system
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=12d49760283c9fe8c4a693ee5b412404
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.15.4 b/metadata/md5-cache/dev-ros/roswtf-1.15.4
deleted file mode 100644
index fc084efd8397..000000000000
--- a/metadata/md5-cache/dev-ros/roswtf-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosinstall[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Tool for diagnosing issues with a running ROS system
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=2dc440e5959ee59c4486ce249c4ba007
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.13.2 b/metadata/md5-cache/dev-ros/roswtf-1.15.7
index ff409246b80e..8013d28b0c34 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.13.2
+++ b/metadata/md5-cache/dev-ros/roswtf-1.15.7
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosinstall[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosinstall[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Tool for diagnosing issues with a running ROS system
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64 ~arm
@@ -10,6 +11,6 @@ RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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_=b125dac9ab7301db2c8899d1453c35f7
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=5bb3ba67066821fe340f709588c4fcba
diff --git a/metadata/md5-cache/dev-ros/roswtf-9999 b/metadata/md5-cache/dev-ros/roswtf-9999
index 72c0113b3c46..31f40b559688 100644
--- a/metadata/md5-cache/dev-ros/roswtf-9999
+++ b/metadata/md5-cache/dev-ros/roswtf-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/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosinstall[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosinstall[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=Tool for diagnosing issues with a running ROS system
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_p
 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_=e0e5007dc79240a317f9b0cdd58c2058
+_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_=5bb3ba67066821fe340f709588c4fcba
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.14.2 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.14.2
deleted file mode 100644
index d247889fd9af..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[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=RQT control manager plugin
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_controller_manager https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[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-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.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_=56d90a675886292a968bac35e075ec37
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.15.0 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.15.0
deleted file mode 100644
index 37ede62d772e..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[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=RQT control manager plugin
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_controller_manager https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[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-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.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_=56d90a675886292a968bac35e075ec37
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.15.1 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.15.1
deleted file mode 100644
index 662849aea2d0..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.15.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[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=RQT control manager plugin
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rqt_controller_manager https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.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_=9a57115510b307ed0f410559b3dca257
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.1 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.1
new file mode 100644
index 000000000000..0890b4953153
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[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=RQT control manager plugin
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt_controller_manager https://github.com/ros-controls/ros_control
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[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-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.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_=a18dfd110daa85a8a49354546ef3e533
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-9999 b/metadata/md5-cache/dev-ros/rqt_controller_manager-9999
index 10959d2d8a2e..adb974169b9c 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-9999
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-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/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[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/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[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=RQT control manager plugin
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_controller_manager https://github.com/ros-controls/ros_control
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_t
 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_=77d8b22a6cedc0f0f98e9175d02f1df0
+_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_=a18dfd110daa85a8a49354546ef3e533
diff --git a/metadata/md5-cache/dev-ros/sensor_msgs-1.12.5 b/metadata/md5-cache/dev-ros/sensor_msgs-1.12.5
deleted file mode 100644
index 10912331c783..000000000000
--- a/metadata/md5-cache/dev-ros/sensor_msgs-1.12.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)] ) 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(-)] )
-DESCRIPTION=Messages for commonly used sensors, including cameras and scanning laser rangefinders
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/sensor_msgs https://github.com/ros/common_msgs
-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=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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.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_=2eca2e44c44235ae8ff0059ecfbdf889
diff --git a/metadata/md5-cache/dev-ros/sensor_msgs-1.12.6 b/metadata/md5-cache/dev-ros/sensor_msgs-1.12.6
deleted file mode 100644
index 13f4c46c1283..000000000000
--- a/metadata/md5-cache/dev-ros/sensor_msgs-1.12.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)] ) 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(-)] )
-DESCRIPTION=Messages for commonly used sensors, including cameras and scanning laser rangefinders
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/sensor_msgs https://github.com/ros/common_msgs
-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=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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/common_msgs/archive/1.12.6.tar.gz -> common_msgs-1.12.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_=2eca2e44c44235ae8ff0059ecfbdf889
diff --git a/metadata/md5-cache/dev-ros/sensor_msgs-1.12.7 b/metadata/md5-cache/dev-ros/sensor_msgs-1.12.7
deleted file mode 100644
index 7132d25d8661..000000000000
--- a/metadata/md5-cache/dev-ros/sensor_msgs-1.12.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)] ) 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(-)] )
-DESCRIPTION=Messages for commonly used sensors, including cameras and scanning laser rangefinders
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/sensor_msgs https://github.com/ros/common_msgs
-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=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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/common_msgs/archive/1.12.7.tar.gz -> common_msgs-1.12.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_=2eca2e44c44235ae8ff0059ecfbdf889
diff --git a/metadata/md5-cache/dev-ros/sensor_msgs-1.13.0 b/metadata/md5-cache/dev-ros/sensor_msgs-1.13.0
new file mode 100644
index 000000000000..acceb8d44c5a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/sensor_msgs-1.13.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)] ) 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(-)] )
+DESCRIPTION=Messages for commonly used sensors: cameras and scanning laser rangefinders
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/sensor_msgs https://github.com/ros/common_msgs
+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=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(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.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_=9e9faee46136cdf32247c44478d3e4e8
diff --git a/metadata/md5-cache/dev-ros/sensor_msgs-9999 b/metadata/md5-cache/dev-ros/sensor_msgs-9999
index fdb790117b94..932a5a81419d 100644
--- a/metadata/md5-cache/dev-ros/sensor_msgs-9999
+++ b/metadata/md5-cache/dev-ros/sensor_msgs-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=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(-)] ) 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(-)] )
-DESCRIPTION=Messages for commonly used sensors, including cameras and scanning laser rangefinders
-EAPI=5
+DEPEND=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(-)] ) 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(-)] )
+DESCRIPTION=Messages for commonly used sensors: cameras and scanning laser rangefinders
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/sensor_msgs https://github.com/ros/common_msgs
 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=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 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_=2eca2e44c44235ae8ff0059ecfbdf889
+_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_=9e9faee46136cdf32247c44478d3e4e8
diff --git a/metadata/md5-cache/dev-ros/shape_msgs-1.12.5 b/metadata/md5-cache/dev-ros/shape_msgs-1.12.5
deleted file mode 100644
index 5c1725948b06..000000000000
--- a/metadata/md5-cache/dev-ros/shape_msgs-1.12.5
+++ /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(-)] 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(-)] )
-DESCRIPTION=Messages for defining shapes, such as simple solid object primitives, planes, and meshes
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/shape_msgs https://github.com/ros/common_msgs
-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=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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.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_=94d614ce6efe6e4f9a8a69d837227cf7
diff --git a/metadata/md5-cache/dev-ros/shape_msgs-1.12.6 b/metadata/md5-cache/dev-ros/shape_msgs-1.12.6
deleted file mode 100644
index cdc060f04ac9..000000000000
--- a/metadata/md5-cache/dev-ros/shape_msgs-1.12.6
+++ /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(-)] 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(-)] )
-DESCRIPTION=Messages for defining shapes, such as simple solid object primitives, planes, and meshes
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/shape_msgs https://github.com/ros/common_msgs
-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=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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/common_msgs/archive/1.12.6.tar.gz -> common_msgs-1.12.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_=94d614ce6efe6e4f9a8a69d837227cf7
diff --git a/metadata/md5-cache/dev-ros/shape_msgs-1.12.7 b/metadata/md5-cache/dev-ros/shape_msgs-1.12.7
deleted file mode 100644
index cd5d0e9c619f..000000000000
--- a/metadata/md5-cache/dev-ros/shape_msgs-1.12.7
+++ /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(-)] 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(-)] )
-DESCRIPTION=Messages for defining shapes, such as simple solid object primitives, planes, and meshes
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/shape_msgs https://github.com/ros/common_msgs
-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=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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/common_msgs/archive/1.12.7.tar.gz -> common_msgs-1.12.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_=94d614ce6efe6e4f9a8a69d837227cf7
diff --git a/metadata/md5-cache/dev-ros/shape_msgs-1.13.0 b/metadata/md5-cache/dev-ros/shape_msgs-1.13.0
new file mode 100644
index 000000000000..4270a12b76c1
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/shape_msgs-1.13.0
@@ -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(-)] 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(-)] )
+DESCRIPTION=Messages for defining shapes: simple solid object primitives, planes, and meshes
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/shape_msgs https://github.com/ros/common_msgs
+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=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(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.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_=b44e669f2aeeded957191d45aadcfee1
diff --git a/metadata/md5-cache/dev-ros/shape_msgs-9999 b/metadata/md5-cache/dev-ros/shape_msgs-9999
index 62e1c22a55e8..03229ff5f98c 100644
--- a/metadata/md5-cache/dev-ros/shape_msgs-9999
+++ b/metadata/md5-cache/dev-ros/shape_msgs-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(-)] 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(-)] )
-DESCRIPTION=Messages for defining shapes, such as simple solid object primitives, planes, and meshes
-EAPI=5
+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(-)] 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(-)] )
+DESCRIPTION=Messages for defining shapes: simple solid object primitives, planes, and meshes
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/shape_msgs https://github.com/ros/common_msgs
 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=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 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_=94d614ce6efe6e4f9a8a69d837227cf7
+_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_=b44e669f2aeeded957191d45aadcfee1
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.3 b/metadata/md5-cache/dev-ros/stereo_msgs-1.12.3
deleted file mode 100644
index dd209442b9aa..000000000000
--- a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.3
+++ /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(-)] 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/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Messages specific to stereo processing, such as disparity images
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/stereo_msgs https://github.com/ros/common_msgs
-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=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/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_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/common_msgs/archive/1.12.3.tar.gz -> common_msgs-1.12.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_=5b45e89bf5d8acf7db3a415b56827404
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.4 b/metadata/md5-cache/dev-ros/stereo_msgs-1.12.4
deleted file mode 100644
index ecfb137b68f9..000000000000
--- a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.4
+++ /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(-)] 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/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Messages specific to stereo processing, such as disparity images
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/stereo_msgs https://github.com/ros/common_msgs
-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=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/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_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/common_msgs/archive/1.12.4.tar.gz -> common_msgs-1.12.4.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_=5b45e89bf5d8acf7db3a415b56827404
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.5 b/metadata/md5-cache/dev-ros/stereo_msgs-1.12.5
deleted file mode 100644
index 91bb942d3e52..000000000000
--- a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.5
+++ /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(-)] 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/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Messages specific to stereo processing, such as disparity images
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/stereo_msgs https://github.com/ros/common_msgs
-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=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/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_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/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.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_=5b45e89bf5d8acf7db3a415b56827404
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.6 b/metadata/md5-cache/dev-ros/stereo_msgs-1.12.6
deleted file mode 100644
index 4aa693e952b4..000000000000
--- a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.6
+++ /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(-)] 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/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Messages specific to stereo processing, such as disparity images
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/stereo_msgs https://github.com/ros/common_msgs
-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=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/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_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/common_msgs/archive/1.12.6.tar.gz -> common_msgs-1.12.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_=5b45e89bf5d8acf7db3a415b56827404
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.7 b/metadata/md5-cache/dev-ros/stereo_msgs-1.12.7
deleted file mode 100644
index 9bfdff2e8801..000000000000
--- a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.7
+++ /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(-)] 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/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Messages specific to stereo processing, such as disparity images
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/stereo_msgs https://github.com/ros/common_msgs
-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=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/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_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/common_msgs/archive/1.12.7.tar.gz -> common_msgs-1.12.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_=5b45e89bf5d8acf7db3a415b56827404
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-1.13.0 b/metadata/md5-cache/dev-ros/stereo_msgs-1.13.0
new file mode 100644
index 000000000000..cbc70dd4c3e1
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/stereo_msgs-1.13.0
@@ -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(-)] 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/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Messages specific to stereo processing, such as disparity images
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/stereo_msgs https://github.com/ros/common_msgs
+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=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/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_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/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.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_=3d4ddbd19e2db907af8e7dcd62efd814
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-9999 b/metadata/md5-cache/dev-ros/stereo_msgs-9999
index f7b67395cf6d..e1beb59ea7b9 100644
--- a/metadata/md5-cache/dev-ros/stereo_msgs-9999
+++ b/metadata/md5-cache/dev-ros/stereo_msgs-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(-)] 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/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[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(-)] 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/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=Messages specific to stereo processing, such as disparity images
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/stereo_msgs https://github.com/ros/common_msgs
 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=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 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_=5b45e89bf5d8acf7db3a415b56827404
+_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_=3d4ddbd19e2db907af8e7dcd62efd814
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.13.1 b/metadata/md5-cache/dev-ros/test_rosbag-1.13.1
deleted file mode 100644
index fde71bb07ee1..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.13.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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=Unit tests for rosbag
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
-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/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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_=224b85d399c4d43bf3118653fd73a016
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.13.2 b/metadata/md5-cache/dev-ros/test_rosbag-1.13.2
deleted file mode 100644
index c61a01345660..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.13.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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=Unit tests for rosbag
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
-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/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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_=224b85d399c4d43bf3118653fd73a016
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.13.4 b/metadata/md5-cache/dev-ros/test_rosbag-1.13.4
deleted file mode 100644
index bf122d0dec00..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.13.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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=Unit tests for rosbag
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
-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/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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_=224b85d399c4d43bf3118653fd73a016
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.13.5 b/metadata/md5-cache/dev-ros/test_rosbag-1.13.5
deleted file mode 100644
index 8085901a0f0f..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.13.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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=Unit tests for rosbag
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
-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/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.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_=224b85d399c4d43bf3118653fd73a016
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.13.6 b/metadata/md5-cache/dev-ros/test_rosbag-1.13.6
deleted file mode 100644
index 6a54a6044edb..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.13.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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=Unit tests for rosbag
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
-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/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.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_=d843f7488fb7751fb1fe658e0a77871d
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.14.2 b/metadata/md5-cache/dev-ros/test_rosbag-1.14.2
deleted file mode 100644
index 2af639afd9df..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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=Unit tests for rosbag
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
-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/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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_=d843f7488fb7751fb1fe658e0a77871d
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.14.3 b/metadata/md5-cache/dev-ros/test_rosbag-1.14.3
deleted file mode 100644
index ad0eab49a7de..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.14.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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=Unit tests for rosbag
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
-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/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=d843f7488fb7751fb1fe658e0a77871d
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.15.4 b/metadata/md5-cache/dev-ros/test_rosbag-1.15.4
deleted file mode 100644
index a30a76855d57..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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=Unit tests for rosbag
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
-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/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=2aa9d80a24986057ed597249d48afa43
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.13.0 b/metadata/md5-cache/dev-ros/test_rosbag-1.15.7
index 5bf6d2f00f2a..4c7af05ed1b6 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.13.0
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.15.7
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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(-)] )
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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=Unit tests for rosbag
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
@@ -10,6 +11,6 @@ RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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_=224b85d399c4d43bf3118653fd73a016
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=22c208b9f34911ec50013e5e6a04b6fb
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-9999 b/metadata/md5-cache/dev-ros/test_rosbag-9999
index eedb5f0b88f4..974b157b64e2 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-9999
+++ b/metadata/md5-cache/dev-ros/test_rosbag-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/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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(-)] )
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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=Unit tests for rosbag
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
 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/message_generation dev-ros/rosbag[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_=a84506811c2d543143e517e84580d5be
+_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_=22c208b9f34911ec50013e5e6a04b6fb
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.0 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.0
deleted file mode 100644
index 2839b8b0c405..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( 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=Unit tests for rosbag_storage
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=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/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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_=90542630bdcabb3c6e78fbaff6a41fc9
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.1 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.1
deleted file mode 100644
index f72a65dc4f5d..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( 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=Unit tests for rosbag_storage
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=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/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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_=90542630bdcabb3c6e78fbaff6a41fc9
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.2 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.2
deleted file mode 100644
index 4af9211c13ff..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( 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=Unit tests for rosbag_storage
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=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/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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_=90542630bdcabb3c6e78fbaff6a41fc9
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.4 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.4
deleted file mode 100644
index c6d0decbd12f..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( 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=Unit tests for rosbag_storage
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=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/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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_=90542630bdcabb3c6e78fbaff6a41fc9
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.5 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.5
deleted file mode 100644
index 8061d363a2b2..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( 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=Unit tests for rosbag_storage
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=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/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.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_=90542630bdcabb3c6e78fbaff6a41fc9
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.6 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.6
deleted file mode 100644
index aeda2cbaf778..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.13.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( 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=Unit tests for rosbag_storage
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=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/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.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_=a3a4349eb4685fed27769dca9dbbba79
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.14.2 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.14.2
deleted file mode 100644
index f8693d2e08a9..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( 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=Unit tests for rosbag_storage
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=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/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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_=a3a4349eb4685fed27769dca9dbbba79
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.14.3 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.14.3
deleted file mode 100644
index fd6e410b931f..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.14.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( 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=Unit tests for rosbag_storage
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=a3a4349eb4685fed27769dca9dbbba79
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.4 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.4
deleted file mode 100644
index e4c2ecce0dc6..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( 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=Unit tests for rosbag_storage
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=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/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=239c8f0b4367c667040f6a740f4165b5
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.7 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.7
new file mode 100644
index 000000000000..fcb3f987660d
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= 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=Unit tests for rosbag_storage
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=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/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=0af2801fcc7f9a908b68b2ca52127fff
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-9999 b/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
index bcdb9d172573..98d243ebbb6a 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-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/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( 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(-)]
+DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= 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=Unit tests for rosbag_storage
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 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_=c62d47639eb77abb05341ba2bce42e69
+_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_=0af2801fcc7f9a908b68b2ca52127fff
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.14.3-r1 b/metadata/md5-cache/dev-ros/test_roscpp-1.14.3-r1
deleted file mode 100644
index 7a29bc971c85..000000000000
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.14.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( 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(-)] 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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=Unit tests for roscpp
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_roscpp https://github.com/ros/ros_comm
-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=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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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(-)] )
-REQUIRED_USE=test? ( ros_messages_cxx ) || ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=d7eac273d86021cf7c6cd2f5f5d6025a
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.15.4 b/metadata/md5-cache/dev-ros/test_roscpp-1.15.4
deleted file mode 100644
index bff5c21a996c..000000000000
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( 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(-)] 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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=Unit tests for roscpp
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_roscpp https://github.com/ros/ros_comm
-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=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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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(-)] )
-REQUIRED_USE=test? ( ros_messages_cxx ) || ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=46695969e89608e5fb51bde06f838445
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.15.7 b/metadata/md5-cache/dev-ros/test_roscpp-1.15.7
new file mode 100644
index 000000000000..1549f3860f4f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] 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(-)] 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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=Unit tests for roscpp
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_roscpp https://github.com/ros/ros_comm
+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=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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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(-)] )
+REQUIRED_USE=test? ( ros_messages_cxx ) || ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=81229a582c1a3d33680ae52cea68377e
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-9999 b/metadata/md5-cache/dev-ros/test_roscpp-9999
index 4f62fa21ce04..92368d0d6f2f 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-9999
+++ b/metadata/md5-cache/dev-ros/test_roscpp-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/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( 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(-)] 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] 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(-)] 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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=Unit tests for roscpp
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roscpp https://github.com/ros/ros_comm
 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=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=test? ( 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_=499afaa45bed99e701dcacca459b8302
+_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_=81229a582c1a3d33680ae52cea68377e
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.0 b/metadata/md5-cache/dev-ros/test_rosgraph-1.13.0
deleted file mode 100644
index de20df3a5477..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rosgraph[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=Unit tests for rosgraph
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rostest[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/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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_=4e2975d53b08447c903262922f86f9eb
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.1 b/metadata/md5-cache/dev-ros/test_rosgraph-1.13.1
deleted file mode 100644
index 8aac047200b3..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rosgraph[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=Unit tests for rosgraph
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rostest[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/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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_=4e2975d53b08447c903262922f86f9eb
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.2 b/metadata/md5-cache/dev-ros/test_rosgraph-1.13.2
deleted file mode 100644
index 414eb226ee1e..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rosgraph[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=Unit tests for rosgraph
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rostest[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/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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_=4e2975d53b08447c903262922f86f9eb
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.4 b/metadata/md5-cache/dev-ros/test_rosgraph-1.13.4
deleted file mode 100644
index fd82c6038e9c..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rosgraph[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=Unit tests for rosgraph
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rostest[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/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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_=4e2975d53b08447c903262922f86f9eb
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.5 b/metadata/md5-cache/dev-ros/test_rosgraph-1.13.5
deleted file mode 100644
index db4b50ea8909..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rosgraph[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=Unit tests for rosgraph
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rostest[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/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.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_=4e2975d53b08447c903262922f86f9eb
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.6 b/metadata/md5-cache/dev-ros/test_rosgraph-1.13.6
deleted file mode 100644
index 3488bad31945..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.13.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rosgraph[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=Unit tests for rosgraph
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rostest[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/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.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_=36004a15c0339bcfd879f71ab3b1b0f8
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.14.2 b/metadata/md5-cache/dev-ros/test_rosgraph-1.14.2
deleted file mode 100644
index 33c7cf90e80e..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rosgraph[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=Unit tests for rosgraph
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rostest[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/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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_=36004a15c0339bcfd879f71ab3b1b0f8
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.14.3 b/metadata/md5-cache/dev-ros/test_rosgraph-1.14.3
deleted file mode 100644
index ca12644f5e62..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.14.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rosgraph[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=Unit tests for rosgraph
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rostest[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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=36004a15c0339bcfd879f71ab3b1b0f8
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.15.4 b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.4
deleted file mode 100644
index 937ebc74b30a..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rosgraph[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=Unit tests for rosgraph
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rostest[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/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=4772c98f4e0e969619379d64d6d2523c
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.15.7 b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.7
new file mode 100644
index 000000000000..aecd5d834cc6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rosgraph[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=Unit tests for rosgraph
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rostest[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/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=f74d5dbdbc4137fea960529d46aa3773
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-9999 b/metadata/md5-cache/dev-ros/test_rosgraph-9999
index 76227ffccf5b..501566477beb 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-9999
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-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/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rosgraph[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/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rosgraph[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=Unit tests for rosgraph
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/rostest[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_=249647f9778320193cf869a7ab3651e9
+_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_=f74d5dbdbc4137fea960529d46aa3773
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.0 b/metadata/md5-cache/dev-ros/test_roslaunch-1.13.0
deleted file mode 100644
index f8c81ef29595..000000000000
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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=Unit tests for roslaunch
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=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/ros_comm/archive/1.13.0.tar.gz -> ros_comm-1.13.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_=e29f54d50d0078d8d4dc4f8dbe43c858
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.1 b/metadata/md5-cache/dev-ros/test_roslaunch-1.13.1
deleted file mode 100644
index 38c0feb91773..000000000000
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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=Unit tests for roslaunch
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=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/ros_comm/archive/1.13.1.tar.gz -> ros_comm-1.13.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_=e29f54d50d0078d8d4dc4f8dbe43c858
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.2 b/metadata/md5-cache/dev-ros/test_roslaunch-1.13.2
deleted file mode 100644
index f9ec5c616613..000000000000
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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=Unit tests for roslaunch
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=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/ros_comm/archive/1.13.2.tar.gz -> ros_comm-1.13.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_=e29f54d50d0078d8d4dc4f8dbe43c858
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.4 b/metadata/md5-cache/dev-ros/test_roslaunch-1.13.4
deleted file mode 100644
index e86a7b3cb252..000000000000
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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=Unit tests for roslaunch
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=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/ros_comm/archive/1.13.4.tar.gz -> ros_comm-1.13.4.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_=e29f54d50d0078d8d4dc4f8dbe43c858
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.5 b/metadata/md5-cache/dev-ros/test_roslaunch-1.13.5
deleted file mode 100644
index 50a3400f0fa1..000000000000
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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=Unit tests for roslaunch
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=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/ros_comm/archive/1.13.5.tar.gz -> ros_comm-1.13.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_=e29f54d50d0078d8d4dc4f8dbe43c858
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.6 b/metadata/md5-cache/dev-ros/test_roslaunch-1.13.6
deleted file mode 100644
index 0f51b6070e12..000000000000
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.13.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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=Unit tests for roslaunch
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=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/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.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_=049c34f79fde3816b3cd760c60d6ebe6
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.14.2 b/metadata/md5-cache/dev-ros/test_roslaunch-1.14.2
deleted file mode 100644
index 54cf598d1463..000000000000
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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=Unit tests for roslaunch
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=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/ros_comm/archive/1.14.2.tar.gz -> ros_comm-1.14.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_=049c34f79fde3816b3cd760c60d6ebe6
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.14.3 b/metadata/md5-cache/dev-ros/test_roslaunch-1.14.3
deleted file mode 100644
index 52255e359acb..000000000000
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.14.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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=Unit tests for roslaunch
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=049c34f79fde3816b3cd760c60d6ebe6
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.15.4 b/metadata/md5-cache/dev-ros/test_roslaunch-1.15.4
deleted file mode 100644
index 6ef1bc3479c2..000000000000
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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=Unit tests for roslaunch
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=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/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=6797f803c3a3cc3796c8677dabafe473
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.15.7 b/metadata/md5-cache/dev-ros/test_roslaunch-1.15.7
new file mode 100644
index 000000000000..22ebec946e12
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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=Unit tests for roslaunch
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=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/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=92d21d5ca405ebd473505439bbcefa2a
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-9999 b/metadata/md5-cache/dev-ros/test_roslaunch-9999
index de7fddf09156..0f60381dcd83 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-9999
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-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/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[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=Unit tests for roslaunch
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 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_=335d7571a767250095d6281930000caa
+_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_=92d21d5ca405ebd473505439bbcefa2a
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.14.3-r1 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.14.3-r1
deleted file mode 100644
index 8d37b39bd40d..000000000000
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.14.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster ) 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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=Unit tests for roslib
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_roslib_comm https://github.com/ros/ros_comm
-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=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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=eb0613ebdefae94161b3a446ed023c33
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.4 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.4
deleted file mode 100644
index c43de9867cf9..000000000000
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster ) 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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=Unit tests for roslib
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_roslib_comm https://github.com/ros/ros_comm
-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=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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=80353cad965a0d4eef10e9ae1019ab24
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.7 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.7
new file mode 100644
index 000000000000..0dfa7918de54
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster ) 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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=Unit tests for roslib
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_roslib_comm https://github.com/ros/ros_comm
+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=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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=ac74310843fd74845adb473b9a31ca88
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-9999 b/metadata/md5-cache/dev-ros/test_roslib_comm-9999
index 0c144efafe9c..c39d1ff5d727 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-9999
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-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=test? ( dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster ) >=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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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(-)] )
+DEPEND=test? ( dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster ) 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/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[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=Unit tests for roslib
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roslib_comm https://github.com/ros/ros_comm
 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=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 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_=d92e0eb4872d053930c1747e3c65c66a
+_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_=ac74310843fd74845adb473b9a31ca88
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.14.3-r2 b/metadata/md5-cache/dev-ros/test_rosmaster-1.14.3-r2
deleted file mode 100644
index d7a2ae858fb3..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.14.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslib[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(-)]
-DESCRIPTION=Unit tests for rosmaster
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosmaster https://github.com/ros/ros_comm
-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/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_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(-)] 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
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=bb903fa8d0c398a958cf6174b70e3d98
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.15.4 b/metadata/md5-cache/dev-ros/test_rosmaster-1.15.4
deleted file mode 100644
index bae031b69ac9..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslib[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(-)]
-DESCRIPTION=Unit tests for rosmaster
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosmaster https://github.com/ros/ros_comm
-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/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_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(-)] 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
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=f7841b3b46bc4bfc0fe70509750a7592
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.15.7 b/metadata/md5-cache/dev-ros/test_rosmaster-1.15.7
new file mode 100644
index 000000000000..4f9eed39bb4d
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslib[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(-)]
+DESCRIPTION=Unit tests for rosmaster
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosmaster https://github.com/ros/ros_comm
+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/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_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(-)] 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
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=a6e2be995eb29be8d7ff6860a11f2623
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-9999 b/metadata/md5-cache/dev-ros/test_rosmaster-9999
index bbbdd5a33f13..cd681431480f 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-9999
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-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/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslib[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(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslib[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(-)]
 DESCRIPTION=Unit tests for rosmaster
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosmaster https://github.com/ros/ros_comm
 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/rosgraph[python_targets_python3_6(-)?,-python_single_target_pyth
 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_=bc62d0ce164b612f1e480b67d4e1b989
+_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_=a6e2be995eb29be8d7ff6860a11f2623
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.14.3 b/metadata/md5-cache/dev-ros/test_rosparam-1.14.3
deleted file mode 100644
index 819b9c93f528..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.14.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[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(-)]
-DESCRIPTION=Unit tests for rosparam
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosparam https://github.com/ros/ros_comm
-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=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
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=05cee177c32acb1fe240a0298a678b64
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.15.4 b/metadata/md5-cache/dev-ros/test_rosparam-1.15.4
deleted file mode 100644
index d95b5e36043e..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[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(-)]
-DESCRIPTION=Unit tests for rosparam
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosparam https://github.com/ros/ros_comm
-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=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
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=b0c6b1d4f6fcd9f87fe03db1ecf98ba7
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.15.7 b/metadata/md5-cache/dev-ros/test_rosparam-1.15.7
new file mode 100644
index 000000000000..ea21959e0af8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[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(-)]
+DESCRIPTION=Unit tests for rosparam
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosparam https://github.com/ros/ros_comm
+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=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
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=12bdbf4023e29ca505e943874e60ac6c
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-9999 b/metadata/md5-cache/dev-ros/test_rosparam-9999
index 236fba22ef48..7ed0b057964c 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-9999
+++ b/metadata/md5-cache/dev-ros/test_rosparam-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/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[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(-)]
+DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[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(-)]
 DESCRIPTION=Unit tests for rosparam
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosparam https://github.com/ros/ros_comm
 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=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 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_=9783b48addfe2d7ecb881a41d41e6a69
+_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_=12bdbf4023e29ca505e943874e60ac6c
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.14.3-r1 b/metadata/md5-cache/dev-ros/test_rospy-1.14.3-r1
deleted file mode 100644
index 965baf0f4e5c..000000000000
--- a/metadata/md5-cache/dev-ros/test_rospy-1.14.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Unit tests for rospy
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rospy https://github.com/ros/ros_comm
-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=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/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=4b151650639473b710a07648193b69f9
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.15.4 b/metadata/md5-cache/dev-ros/test_rospy-1.15.4
deleted file mode 100644
index ed3df72076c6..000000000000
--- a/metadata/md5-cache/dev-ros/test_rospy-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Unit tests for rospy
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rospy https://github.com/ros/ros_comm
-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=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/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[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/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=269887ef27a7c6941a22186dc0de45ef
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.15.7 b/metadata/md5-cache/dev-ros/test_rospy-1.15.7
new file mode 100644
index 000000000000..a4e18d1c7731
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Unit tests for rospy
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rospy https://github.com/ros/ros_comm
+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=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/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[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/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=1d80f0a302cecdf7bb27f8f7d85c747c
diff --git a/metadata/md5-cache/dev-ros/test_rospy-9999 b/metadata/md5-cache/dev-ros/test_rospy-9999
index 908065a09af5..3e52eebb6705 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-9999
+++ b/metadata/md5-cache/dev-ros/test_rospy-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/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=Unit tests for rospy
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rospy https://github.com/ros/ros_comm
 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=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 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_=01943de04b9f18e8e5280e819bf1bd7d
+_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_=1d80f0a302cecdf7bb27f8f7d85c747c
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.14.3-r1 b/metadata/md5-cache/dev-ros/test_rosservice-1.14.3-r1
deleted file mode 100644
index 7efd27a7c790..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.14.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[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(-)] test? ( dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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=Unit tests for rospy
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosservice https://github.com/ros/ros_comm
-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=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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=05042bf105ff7d7b0bce883e48466a12
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.15.4 b/metadata/md5-cache/dev-ros/test_rosservice-1.15.4
deleted file mode 100644
index d55c3b73b6bf..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[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(-)] test? ( dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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=Unit tests for rospy
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/test_rosservice https://github.com/ros/ros_comm
-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=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/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=291085bf8bc1238f400d9f6d8849efdd
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.15.7 b/metadata/md5-cache/dev-ros/test_rosservice-1.15.7
new file mode 100644
index 000000000000..7dec6c1c2e0b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rostest[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(-)] test? ( dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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=Unit tests for rospy
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosservice https://github.com/ros/ros_comm
+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=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/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=734c88612fd93a78af4d96dc54ab2a7f
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-9999 b/metadata/md5-cache/dev-ros/test_rosservice-9999
index 9b0d92904f53..e3bd4111c3d7 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-9999
+++ b/metadata/md5-cache/dev-ros/test_rosservice-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/rostest[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(-)] test? ( dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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(-)] )
+DEPEND=dev-ros/rostest[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(-)] test? ( dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] 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=Unit tests for rospy
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosservice https://github.com/ros/ros_comm
 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=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 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_=a0e624b934108555eacc2a541bae9646
+_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_=734c88612fd93a78af4d96dc54ab2a7f
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.14.3-r1 b/metadata/md5-cache/dev-ros/topic_tools-1.14.3-r1
deleted file mode 100644
index d637c9ee41e6..000000000000
--- a/metadata/md5-cache/dev-ros/topic_tools-1.14.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest 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(-)] 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=Tools for directing, throttling and selecting ROS topics
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/topic_tools https://github.com/ros/ros_comm
-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/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp 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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.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_=4d36ef8f37928d0daa8c155f6db99e2b
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.15.4 b/metadata/md5-cache/dev-ros/topic_tools-1.15.4
deleted file mode 100644
index 565d5acd046e..000000000000
--- a/metadata/md5-cache/dev-ros/topic_tools-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest 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(-)] 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=Tools for directing, throttling and selecting ROS topics
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/topic_tools https://github.com/ros/ros_comm
-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/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp 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/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.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_=c06a8d0cda931dea72fbca02947f3730
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.15.7 b/metadata/md5-cache/dev-ros/topic_tools-1.15.7
new file mode 100644
index 000000000000..a7212bd9e1d9
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest 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(-)] 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=Tools for directing, throttling and selecting ROS topics
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/topic_tools https://github.com/ros/ros_comm
+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/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp 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/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=bc21c2b8712b4de8b6facff6da127598
diff --git a/metadata/md5-cache/dev-ros/topic_tools-9999 b/metadata/md5-cache/dev-ros/topic_tools-9999
index c1e74ca8e3aa..81e469277b25 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-9999
+++ b/metadata/md5-cache/dev-ros/topic_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/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest 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(-)] 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(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest 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(-)] 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=Tools for directing, throttling and selecting ROS topics
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/topic_tools https://github.com/ros/ros_comm
 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/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev
 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_=4169fe9f0ceeb6577c21064c1d7a0094
+_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_=bc21c2b8712b4de8b6facff6da127598
diff --git a/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.5 b/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.5
deleted file mode 100644
index 174d59c3ec5d..000000000000
--- a/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.5
+++ /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(-)] 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(-)] )
-DESCRIPTION=Messages for defining robot trajectories
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/trajectory_msgs https://github.com/ros/common_msgs
-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=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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.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_=a7c123da7a298cb9a9d651603fdf1f5d
diff --git a/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.6 b/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.6
deleted file mode 100644
index 48aec23d17e0..000000000000
--- a/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.6
+++ /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(-)] 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(-)] )
-DESCRIPTION=Messages for defining robot trajectories
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/trajectory_msgs https://github.com/ros/common_msgs
-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=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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/common_msgs/archive/1.12.6.tar.gz -> common_msgs-1.12.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_=a7c123da7a298cb9a9d651603fdf1f5d
diff --git a/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.7 b/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.7
deleted file mode 100644
index 0f6ab2eb5ad3..000000000000
--- a/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.7
+++ /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(-)] 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(-)] )
-DESCRIPTION=Messages for defining robot trajectories
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/trajectory_msgs https://github.com/ros/common_msgs
-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=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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/common_msgs/archive/1.12.7.tar.gz -> common_msgs-1.12.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_=a7c123da7a298cb9a9d651603fdf1f5d
diff --git a/metadata/md5-cache/dev-ros/trajectory_msgs-1.13.0 b/metadata/md5-cache/dev-ros/trajectory_msgs-1.13.0
new file mode 100644
index 000000000000..d11cd3735443
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/trajectory_msgs-1.13.0
@@ -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(-)] 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(-)] )
+DESCRIPTION=Messages for defining robot trajectories
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/trajectory_msgs https://github.com/ros/common_msgs
+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=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(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.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_=bbf0b7ab7b64de0c4bc8003a72476753
diff --git a/metadata/md5-cache/dev-ros/trajectory_msgs-9999 b/metadata/md5-cache/dev-ros/trajectory_msgs-9999
index 35f2bca5eba4..4b6ef3c5ba5f 100644
--- a/metadata/md5-cache/dev-ros/trajectory_msgs-9999
+++ b/metadata/md5-cache/dev-ros/trajectory_msgs-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(-)] 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(-)] )
+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(-)] 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(-)] )
 DESCRIPTION=Messages for defining robot trajectories
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/trajectory_msgs https://github.com/ros/common_msgs
 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=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 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_=a7c123da7a298cb9a9d651603fdf1f5d
+_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_=bbf0b7ab7b64de0c4bc8003a72476753
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.14.2 b/metadata/md5-cache/dev-ros/transmission_interface-0.14.2
deleted file mode 100644
index da7809d1fa43..000000000000
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml 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=Transmission Interface
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/transmission_interface https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml 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-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.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_=2b7a0f21f1b5ea013b17ee0d9d5a7ea6
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.15.0 b/metadata/md5-cache/dev-ros/transmission_interface-0.15.0
deleted file mode 100644
index fe8e61052c43..000000000000
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml 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=Transmission Interface
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/transmission_interface https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml 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-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.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_=2b7a0f21f1b5ea013b17ee0d9d5a7ea6
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.15.1 b/metadata/md5-cache/dev-ros/transmission_interface-0.15.1
deleted file mode 100644
index 8161df69eac5..000000000000
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.15.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml 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=Transmission Interface
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/transmission_interface https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml 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-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.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_=7821c1182b554840febbe48e3adad6a1
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.19.1 b/metadata/md5-cache/dev-ros/transmission_interface-0.19.1
new file mode 100644
index 000000000000..47a504a1a143
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.19.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml 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=Transmission Interface
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/transmission_interface https://github.com/ros-controls/ros_control
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml 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-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.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_=31e5204891176d981de353664e11805d
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-9999 b/metadata/md5-cache/dev-ros/transmission_interface-9999
index 4dd08d970502..bceb0b5ee8db 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-9999
+++ b/metadata/md5-cache/dev-ros/transmission_interface-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/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml 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(-)]
+DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml 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=Transmission Interface
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/transmission_interface https://github.com/ros-controls/ros_control
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-lib
 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_=2bfae9236590835dfa73e4b220761da8
+_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_=31e5204891176d981de353664e11805d
diff --git a/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.10 b/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.10
deleted file mode 100644
index 014640bbbc00..000000000000
--- a/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim 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(-)] 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(-)] )
-DESCRIPTION=Demonstrates how to write an action server and client with the turtlesim
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/turtle_actionlib https://github.com/ros/common_tutorials
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim 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(-)] 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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.10.tar.gz -> common_tutorials-0.1.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_=09f21103943f594be7f2b21c2faa0dbc
diff --git a/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.11 b/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.11
deleted file mode 100644
index a7b37dec578f..000000000000
--- a/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim 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(-)] 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(-)] )
-DESCRIPTION=Demonstrates how to write an action server and client with the turtlesim
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/turtle_actionlib https://github.com/ros/common_tutorials
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim 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(-)] 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(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.11.tar.gz -> common_tutorials-0.1.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_=8a9a0105420be7fe1ed8c0eb1a6c51b0
diff --git a/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.12 b/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.12
new file mode 100644
index 000000000000..55cdb2f3073a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.12
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim 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(-)] 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(-)] )
+DESCRIPTION=Demonstrates how to write an action server and client with the turtlesim
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/turtle_actionlib https://github.com/ros/common_tutorials
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim 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(-)] 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(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.12.tar.gz -> common_tutorials-0.1.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_=0d3d7af5649a4f79b3ce1811313fdfa2
diff --git a/metadata/md5-cache/dev-ros/turtle_actionlib-9999 b/metadata/md5-cache/dev-ros/turtle_actionlib-9999
index a7b53b97c5ba..f35b7c2ac0f7 100644
--- a/metadata/md5-cache/dev-ros/turtle_actionlib-9999
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-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 dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim 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(-)] 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(-)] )
+DEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim 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(-)] 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(-)] )
 DESCRIPTION=Demonstrates how to write an action server and client with the turtlesim
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtle_actionlib https://github.com/ros/common_tutorials
 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/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconso
 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_=09f21103943f594be7f2b21c2faa0dbc
+_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_=0d3d7af5649a4f79b3ce1811313fdfa2
diff --git a/metadata/md5-cache/dev-ros/urdf-1.13.1-r1 b/metadata/md5-cache/dev-ros/urdf-1.13.1-r1
deleted file mode 100644
index 1e4c6d617aa5..000000000000
--- a/metadata/md5-cache/dev-ros/urdf-1.13.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=C++ parser for the Unified Robot Description Format (URDF)
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/urdf https://github.com/ros/urdf
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= 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/urdf/archive/1.13.1.tar.gz -> urdf-1.13.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_=6d4fd6e531aebf26394ef0c0ca269d4c
diff --git a/metadata/md5-cache/dev-ros/urdf-1.13.2 b/metadata/md5-cache/dev-ros/urdf-1.13.2
new file mode 100644
index 000000000000..742b4c30701e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/urdf-1.13.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=C++ parser for the Unified Robot Description Format (URDF)
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/urdf https://github.com/ros/urdf
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= 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/urdf/archive/1.13.2.tar.gz -> urdf-1.13.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_=24ed7f3181d3b32a998f79f350124504
diff --git a/metadata/md5-cache/dev-ros/urdf-9999 b/metadata/md5-cache/dev-ros/urdf-9999
index 26e407d1231b..37233f865bbf 100644
--- a/metadata/md5-cache/dev-ros/urdf-9999
+++ b/metadata/md5-cache/dev-ros/urdf-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-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)]
+DEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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=C++ parser for the Unified Robot Description Format (URDF)
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf https://github.com/ros/urdf
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-
 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_=6d4fd6e531aebf26394ef0c0ca269d4c
+_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_=24ed7f3181d3b32a998f79f350124504
diff --git a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.11 b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.11
deleted file mode 100644
index 901177bf5d63..000000000000
--- a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/urdfdom_headers 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=C++ base class for URDF parsers
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/urdf_parser_plugin https://github.com/ros/robot_model
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/urdfdom_headers 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/robot_model/archive/1.12.11.tar.gz -> robot_model-1.12.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_=1c955f877a99bfdd68041e9be7950ce0
diff --git a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.13.1 b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.13.1
deleted file mode 100644
index 9c4423a1eb3a..000000000000
--- a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.13.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/urdfdom_headers 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=C++ base class for URDF parsers
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/urdf_parser_plugin https://github.com/ros/urdf
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/urdfdom_headers 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/urdf/archive/1.13.1.tar.gz -> urdf-1.13.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_=7a369ba8c2074ae0e8662e4b0b9dcc25
diff --git a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.13.2 b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.13.2
new file mode 100644
index 000000000000..99a1d9666143
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.13.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/urdfdom_headers 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=C++ base class for URDF parsers
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/urdf_parser_plugin https://github.com/ros/urdf
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/urdfdom_headers 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/urdf/archive/1.13.2.tar.gz -> urdf-1.13.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_=6d155665f4fc307edfcd3c35960fe013
diff --git a/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999 b/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
index fd77fa5dcf67..90af6e350fba 100644
--- a/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
+++ b/metadata/md5-cache/dev-ros/urdf_parser_plugin-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-libs/urdfdom_headers >=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-libs/urdfdom_headers 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=C++ base class for URDF parsers
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf_parser_plugin https://github.com/ros/urdf
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/urdfdom_headers python_targets_python3_6? ( dev-lang/python:3.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_=7a369ba8c2074ae0e8662e4b0b9dcc25
+_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_=6d155665f4fc307edfcd3c35960fe013
diff --git a/metadata/md5-cache/dev-ros/urdf_tutorial-0.3.0 b/metadata/md5-cache/dev-ros/urdf_tutorial-0.3.0
deleted file mode 100644
index 46ad740ae9f1..000000000000
--- a/metadata/md5-cache/dev-ros/urdf_tutorial-0.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro test? ( dev-ros/roslaunch[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=URDF tutorials
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/urdf_tutorial https://github.com/ros/urdf_tutorial
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/robot_state_publisher dev-ros/rviz 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/urdf_tutorial/archive/0.3.0.tar.gz -> urdf_tutorial-0.3.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_=9f0920e4d65469b84286d529b60c05d0
diff --git a/metadata/md5-cache/dev-ros/urdf_tutorial-0.4.0 b/metadata/md5-cache/dev-ros/urdf_tutorial-0.4.0
deleted file mode 100644
index 5d302f488b6d..000000000000
--- a/metadata/md5-cache/dev-ros/urdf_tutorial-0.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro test? ( dev-ros/roslaunch[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=URDF tutorials
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/urdf_tutorial https://github.com/ros/urdf_tutorial
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/robot_state_publisher dev-ros/rviz 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/urdf_tutorial/archive/0.4.0.tar.gz -> urdf_tutorial-0.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_=30d9886c6f52e313a6d2faa0a21b78e4
diff --git a/metadata/md5-cache/dev-ros/urdf_tutorial-0.5.0 b/metadata/md5-cache/dev-ros/urdf_tutorial-0.5.0
new file mode 100644
index 000000000000..e0318cf8cf71
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/urdf_tutorial-0.5.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro test? ( dev-ros/roslaunch[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=URDF tutorials
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/urdf_tutorial https://github.com/ros/urdf_tutorial
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz 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/urdf_tutorial/archive/0.5.0.tar.gz -> urdf_tutorial-0.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_=73a1b4bf227f64c792dc76dd80bc4368
diff --git a/metadata/md5-cache/dev-ros/urdf_tutorial-9999 b/metadata/md5-cache/dev-ros/urdf_tutorial-9999
index 87c343826d34..d84257dcaadb 100644
--- a/metadata/md5-cache/dev-ros/urdf_tutorial-9999
+++ b/metadata/md5-cache/dev-ros/urdf_tutorial-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/urdf dev-ros/joint_state_publisher dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro test? ( dev-ros/roslaunch[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/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro test? ( dev-ros/roslaunch[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=URDF tutorials
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf_tutorial https://github.com/ros/urdf_tutorial
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/robot_state_publisher dev-ros/rviz 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(-)]
+RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz 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
-_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_=30d9886c6f52e313a6d2faa0a21b78e4
+_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_=73a1b4bf227f64c792dc76dd80bc4368
diff --git a/metadata/md5-cache/dev-ros/visualization_msgs-1.13.0 b/metadata/md5-cache/dev-ros/visualization_msgs-1.13.0
new file mode 100644
index 000000000000..8ac49e36921a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-1.13.0
@@ -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(-)] 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(-)] )
+DESCRIPTION=Messages used by higher level packages that deal in visualization-specific data.
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/visualization_msgs https://github.com/ros/common_msgs
+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=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(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.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_=146e0f3b8edd5fd6437fde736305474c
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.7 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.7
new file mode 100644
index 000000000000..f72f9d702304
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/cpp_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=C++ implementation of the XML-RPC protocol
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cpp_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/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.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_=4e5fecdde253ed2037b490e81e167990