2020-07-31 11:05:23 UTC

39 files changed, 113 insertions, 175 deletions

diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Config-Git-0.920.0-r1 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Config-Git-0.920.0-r1
new file mode 100644
index 000000000000..a13a7724ffa9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Config-Git-0.920.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Dist-Zilla-1.0.0 >=dev-perl/Moose-0.340.0 >=dev-perl/MooseX-Types-0.60.0 >=dev-perl/String-Errf-0.1.0 >=dev-perl/namespace-clean-0.60.0 virtual/perl-ExtUtils-MakeMaker test? ( >=dev-perl/Test-CheckDeps-0.10.0 >=virtual/perl-Test-Simple-0.940.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Plugin configuration containing settings for a Git repo
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Dist-Zilla-Plugin-Config-Git
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=>=dev-perl/Dist-Zilla-1.0.0 >=dev-perl/Moose-0.340.0 >=dev-perl/MooseX-Types-0.60.0 >=dev-perl/String-Errf-0.1.0 >=dev-perl/namespace-clean-0.60.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BB/BBYRD/Dist-Zilla-Plugin-Config-Git-0.92.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=d2f6b0cdd5ad9e6711f0c789d5742ff6
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
index e2945da5bb8f..dce00e4fbd75 100644
--- 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
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup 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_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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_single_target_python3_7 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_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d80384d4bf8b0170f734a99ee9edb23
+_md5_=deee6244d4298b9bae3d37b7e290677e
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 0f7ad1350f59..5580535f08b6 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup 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_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-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_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d80384d4bf8b0170f734a99ee9edb23
+_md5_=deee6244d4298b9bae3d37b7e290677e
diff --git a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0 b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0
index 28ea66d8f1a9..9e168571679d 100644
--- a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0
+++ b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Plugin for transparently sending depth images using PNG compression
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/compressed_depth_image_transport https://github.com/ros-perception/image_transport_plugins
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.14.0.tar.gz -> image_transport_plugins-1.14.0.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=521bf30aafef812aae87a005c04d0500
+_md5_=dd664d07887fd189f098ff58d734b12b
diff --git a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999 b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
index 950662d163f6..64653c315ecb 100644
--- a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Plugin for transparently sending depth images using PNG compression
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/compressed_depth_image_transport https://github.com/ros-perception/image_transport_plugins
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=521bf30aafef812aae87a005c04d0500
+_md5_=dd664d07887fd189f098ff58d734b12b
diff --git a/metadata/md5-cache/dev-ros/controller_manager-0.19.1 b/metadata/md5-cache/dev-ros/controller_manager-0.19.1
index 046db63d4b39..5ae175ca8d10 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-0.19.1
+++ b/metadata/md5-cache/dev-ros/controller_manager-0.19.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?,ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager https://github.com/ros-controls/ros_control
 IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?,ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=314c7143b7b53834fd9856c4c427d582
+_md5_=6e9ea3a67a13514867b1c2b4d68191a8
diff --git a/metadata/md5-cache/dev-ros/controller_manager-9999 b/metadata/md5-cache/dev-ros/controller_manager-9999
index ee1264c0bc8a..4c1cef843c36 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?,ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager https://github.com/ros-controls/ros_control
 IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?,ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=314c7143b7b53834fd9856c4c427d582
+_md5_=6e9ea3a67a13514867b1c2b4d68191a8
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
index c1a6fbf5585c..c285c3c01cb9 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.1
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.1
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tests for the controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
@@ -13,4 +13,4 @@ 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	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5da38ef6a09d930e6d462717f8355ff7
+_md5_=e28097cc705e599902a138ef76cf4088
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-9999 b/metadata/md5-cache/dev-ros/controller_manager_tests-9999
index 13f34d731b34..dc2efc4a908d 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tests for the controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5da38ef6a09d930e6d462717f8355ff7
+_md5_=e28097cc705e599902a138ef76cf4088
diff --git a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8 b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8
index 3b7b5bbd5b31..bc72c2f69c3e 100644
--- a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8
+++ b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Converts a depth image to a laser scan for use with navigation and localization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/depthimage_to_laserscan https://github.com/ros-perception/depthimage_to_laserscan
 IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/depthimage_to_laserscan/archive/1.0.8.tar.gz -> depthimage_to_laserscan-1.0.8.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9001c7b240b4ea3c87868e410f39e505
+_md5_=8bdaeeb64d92430af5f36dfcc4404477
diff --git a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999 b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
index 949bad340d93..b1270c87a23a 100644
--- a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
+++ b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Converts a depth image to a laser scan for use with navigation and localization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/depthimage_to_laserscan https://github.com/ros-perception/depthimage_to_laserscan
 IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9001c7b240b4ea3c87868e410f39e505
+_md5_=8bdaeeb64d92430af5f36dfcc4404477
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.0 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.0
index 6ea309150be1..5491f3faa13b 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.0
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] 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_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest dev-ros/roslaunch ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] 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_single_target_python3_7(-)?] )
 DESCRIPTION=Provides a means to change node parameters at runtime
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/dynamic_reconfigure https://github.com/ros/dynamic_reconfigure
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/dynamic_reconfigure/archive/1.7.0.tar.gz -> dynamic_reconfigure-1.7.0.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13c8e8baa5c74e4a1d783bf6a9307387
+_md5_=5ce78cfbe04334f68528756e66072afe
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
index 259e23a5a319..41bdc887243c 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] 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_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest dev-ros/roslaunch ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] 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_single_target_python3_7(-)?] )
 DESCRIPTION=Provides a means to change node parameters at runtime
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/dynamic_reconfigure https://github.com/ros/dynamic_reconfigure
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13c8e8baa5c74e4a1d783bf6a9307387
+_md5_=5ce78cfbe04334f68528756e66072afe
diff --git a/metadata/md5-cache/dev-ros/image_proc-1.15.2 b/metadata/md5-cache/dev-ros/image_proc-1.15.2
index 0e464508b9a7..f9f324416d9c 100644
--- a/metadata/md5-cache/dev-ros/image_proc-1.15.2
+++ b/metadata/md5-cache/dev-ros/image_proc-1.15.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp media-libs/opencv:= dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/roscpp dev-libs/console_bridge:= media-libs/opencv:= dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Single image rectification and color processing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_proc https://github.com/ros-perception/image_pipeline
 IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp media-libs/opencv:= dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/roscpp dev-libs/console_bridge:= media-libs/opencv:= dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=54d1cab9cbc25699f774129e55de76e2
+_md5_=c717f6ff2c5c1c0362c8d712a7c794bb
diff --git a/metadata/md5-cache/dev-ros/image_proc-9999 b/metadata/md5-cache/dev-ros/image_proc-9999
index d20301efb3fa..5fdf8dd5df5b 100644
--- a/metadata/md5-cache/dev-ros/image_proc-9999
+++ b/metadata/md5-cache/dev-ros/image_proc-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp media-libs/opencv:= dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/roscpp dev-libs/console_bridge:= media-libs/opencv:= dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Single image rectification and color processing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_proc https://github.com/ros-perception/image_pipeline
 IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp media-libs/opencv:= dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/roscpp dev-libs/console_bridge:= media-libs/opencv:= dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=54d1cab9cbc25699f774129e55de76e2
+_md5_=c717f6ff2c5c1c0362c8d712a7c794bb
diff --git a/metadata/md5-cache/dev-ros/image_view-1.15.2 b/metadata/md5-cache/dev-ros/image_view-1.15.2
deleted file mode 100644
index 11474beeb024..000000000000
--- a/metadata/md5-cache/dev-ros/image_view-1.15.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
-DESCRIPTION=Simple viewer for ROS image topics
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/image_view https://github.com/ros-perception/image_pipeline
-IUSE=+python_single_target_python3_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8141dbe91fe5f566ee1bb082e1d5408
diff --git a/metadata/md5-cache/dev-ros/image_view-1.15.2-r1 b/metadata/md5-cache/dev-ros/image_view-1.15.2-r1
new file mode 100644
index 000000000000..59f1f5433cf3
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/image_view-1.15.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:3 media-libs/harfbuzz:= dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Simple viewer for ROS image topics
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/image_view https://github.com/ros-perception/image_pipeline
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:3 media-libs/harfbuzz:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b7a37ba16a9f22a43d5f134248482c6d
diff --git a/metadata/md5-cache/dev-ros/image_view-9999 b/metadata/md5-cache/dev-ros/image_view-9999
index 4c330a30f093..2ec334f42e8d 100644
--- a/metadata/md5-cache/dev-ros/image_view-9999
+++ b/metadata/md5-cache/dev-ros/image_view-9999
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:3 media-libs/harfbuzz:= dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Simple viewer for ROS image topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_view https://github.com/ros-perception/image_pipeline
 IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:3 media-libs/harfbuzz:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8141dbe91fe5f566ee1bb082e1d5408
+_md5_=b7a37ba16a9f22a43d5f134248482c6d
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.0 b/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.0
index 12690f99aa08..2c5e336ff5ef 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.0
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Python tools to construct a KDL tree from an XML robot representation in URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/kdl_parser_py https://github.com/ros/kdl_parser
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/kdl_parser/archive/1.14.0.tar.gz -> kdl_parser-1.14.0.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=63b70f3e8d4bb1a869be081829f979ef
+_md5_=470bfb8d39b27cbaf6b2e960b585a7ef
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-9999 b/metadata/md5-cache/dev-ros/kdl_parser_py-9999
index 07293e19479e..7883f9d63d22 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-9999
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Python tools to construct a KDL tree from an XML robot representation in URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/kdl_parser_py https://github.com/ros/kdl_parser
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=63b70f3e8d4bb1a869be081829f979ef
+_md5_=470bfb8d39b27cbaf6b2e960b585a7ef
diff --git a/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14 b/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14
index 554739c53aff..27b2c1214942 100644
--- a/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14
+++ b/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] 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_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] 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_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] )
 DESCRIPTION=Extracts checkerboard corners from a dense laser snapshot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_cb_detector https://github.com/ros-perception/calibration
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b2fd172315e335530976ec56e5ab607
+_md5_=74fc7a5d1a6af63c16fbfd2bdc50b049
diff --git a/metadata/md5-cache/dev-ros/laser_cb_detector-9999 b/metadata/md5-cache/dev-ros/laser_cb_detector-9999
index d858cc727bd4..688968a21e82 100644
--- a/metadata/md5-cache/dev-ros/laser_cb_detector-9999
+++ b/metadata/md5-cache/dev-ros/laser_cb_detector-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] 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_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] 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_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] )
 DESCRIPTION=Extracts checkerboard corners from a dense laser snapshot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_cb_detector https://github.com/ros-perception/calibration
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b2fd172315e335530976ec56e5ab607
+_md5_=74fc7a5d1a6af63c16fbfd2bdc50b049
diff --git a/metadata/md5-cache/dev-ros/laser_filters-1.8.11 b/metadata/md5-cache/dev-ros/laser_filters-1.8.11
index d74ddbaac029..c548255c6e84 100644
--- a/metadata/md5-cache/dev-ros/laser_filters-1.8.11
+++ b/metadata/md5-cache/dev-ros/laser_filters-1.8.11
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Assorted filters designed to operate on 2D planar laser scanners
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_filters https://github.com/ros-perception/laser_filters
 IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_filters/archive/1.8.11.tar.gz -> laser_filters-1.8.11.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=928580a640be09799b2d537f2d7990f7
+_md5_=234fba8da39dae2beff0c760ef2f4292
diff --git a/metadata/md5-cache/dev-ros/laser_filters-9999 b/metadata/md5-cache/dev-ros/laser_filters-9999
index b95250d053b3..bd75ae151f80 100644
--- a/metadata/md5-cache/dev-ros/laser_filters-9999
+++ b/metadata/md5-cache/dev-ros/laser_filters-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Assorted filters designed to operate on 2D planar laser scanners
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_filters https://github.com/ros-perception/laser_filters
 IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=928580a640be09799b2d537f2d7990f7
+_md5_=234fba8da39dae2beff0c760ef2f4292
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0 b/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
index 7a37e6868163..f16795480711 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] 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_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] )
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] )
 DESCRIPTION=Messages for MAVROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_msgs https://github.com/mavlink/mavros
 IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/1.2.0.tar.gz -> mavros-1.2.0.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f66daa314118b10711f88ec5629a5ef4
+_md5_=9cfac3d5630d73dfc3489eb948345dcb
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-9999 b/metadata/md5-cache/dev-ros/mavros_msgs-9999
index 2b3331cda131..fdb13193ba46 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-9999
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] 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_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] )
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] )
 DESCRIPTION=Messages for MAVROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_msgs https://github.com/mavlink/mavros
 IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] ) 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_single_target_python3_7(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f66daa314118b10711f88ec5629a5ef4
+_md5_=9cfac3d5630d73dfc3489eb948345dcb
diff --git a/metadata/md5-cache/dev-ros/opencv_apps-2.0.1 b/metadata/md5-cache/dev-ros/opencv_apps-2.0.1
index bdf230fdfaa4..8b512fbdd9c7 100644
--- a/metadata/md5-cache/dev-ros/opencv_apps-2.0.1
+++ b/metadata/md5-cache/dev-ros/opencv_apps-2.0.1
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] 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_single_target_python3_7(-)?] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/roslaunch dev-ros/rostest dev-ros/rosbag dev-ros/rosservice dev-ros/rostopic dev-ros/image_proc dev-ros/topic_tools dev-ros/compressed_image_transport ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] 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_single_target_python3_7(-)?] )
 DESCRIPTION=OpenCV applications for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/opencv_apps https://github.com/ros-perception/opencv_apps
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/opencv_apps/archive/2.0.1.tar.gz -> opencv_apps-2.0.1.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=996f277f5edd0928949f1fb064f925ed
+_md5_=0ffc28c764e0676746b7d4a932844880
diff --git a/metadata/md5-cache/dev-ros/opencv_apps-9999 b/metadata/md5-cache/dev-ros/opencv_apps-9999
index d8670c61e8a2..b7ac78d6e6de 100644
--- a/metadata/md5-cache/dev-ros/opencv_apps-9999
+++ b/metadata/md5-cache/dev-ros/opencv_apps-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] 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_single_target_python3_7(-)?] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/roslaunch dev-ros/rostest dev-ros/rosbag dev-ros/rosservice dev-ros/rostopic dev-ros/image_proc dev-ros/topic_tools dev-ros/compressed_image_transport ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] 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_single_target_python3_7(-)?] )
 DESCRIPTION=OpenCV applications for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/opencv_apps https://github.com/ros-perception/opencv_apps
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b56cb0eba749cbd19e4821c7ac52c2b6
+_md5_=eb9c64172d963edbe55bd45f25351765
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.7 b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.7
deleted file mode 100644
index 7a00237248d7..000000000000
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup 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_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
-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_single_target_python3_7 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_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
-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	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b376a886272105ae167556a4bccaf26f
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.8 b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.8
index f979a049f056..3ba59ecb2e22 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup 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_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/pluginlib 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-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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_single_target_python3_7 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_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/pluginlib 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_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b376a886272105ae167556a4bccaf26f
+_md5_=f8ee30278fb18467d5297c02a04a80e1
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-9999 b/metadata/md5-cache/dev-ros/rosbag_storage-9999
index 6b4eff56bfe2..87da980c6f36 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-9999
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup 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 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/pluginlib 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-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-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_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/pluginlib 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_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b376a886272105ae167556a4bccaf26f
+_md5_=f8ee30278fb18467d5297c02a04a80e1
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
deleted file mode 100644
index 33008c274414..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
-DESCRIPTION=Unit tests for rosbag_storage
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
-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	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	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 a9941bb74af1..50725b48e61f 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosbag_storage dev-ros/rosbag dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0af2801fcc7f9a908b68b2ca52127fff
+_md5_=ccb741cd674addcfa76d8f54ba889e57
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.4 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.4
deleted file mode 100644
index 36290d96f826..000000000000
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
-DESCRIPTION=C++ implementation of the XML-RPC protocol
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
-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	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e5fecdde253ed2037b490e81e167990
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.7 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.7
deleted file mode 100644
index c9e74319f248..000000000000
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
-DESCRIPTION=C++ implementation of the XML-RPC protocol
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
-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	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e5fecdde253ed2037b490e81e167990
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
index 3468b4e691e3..e0da809a3612 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime test? ( dev-cpp/gtest dev-libs/boost[threads] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
 IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e5fecdde253ed2037b490e81e167990
+_md5_=63f7cee17e2df190dc6e2752710315ae
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-9999 b/metadata/md5-cache/dev-ros/xmlrpcpp-9999
index a6e896ff5ff5..6d8e33090489 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-9999
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime test? ( dev-cpp/gtest dev-libs/boost[threads] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
 IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e5fecdde253ed2037b490e81e167990
+_md5_=63f7cee17e2df190dc6e2752710315ae
diff --git a/metadata/md5-cache/dev-util/cargo-tree-0.29.0-r1 b/metadata/md5-cache/dev-util/cargo-tree-0.29.0-r1
deleted file mode 100644
index bab1bf70dabf..000000000000
--- a/metadata/md5-cache/dev-util/cargo-tree-0.29.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=virtual/rust-1.37.0
-DEFINED_PHASES=compile install test unpack
-DESCRIPTION=Cargo subcommand that visualizes crate dependency graph in a tree-like format
-EAPI=7
-HOMEPAGE=https://github.com/sfackler/cargo-tree
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=Apache-2.0 Boost-1.0 MIT
-RDEPEND=<virtual/rust-1.44.0
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.26/download -> anyhow-1.0.26.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cargo-tree/0.29.0/download -> cargo-tree-0.29.0.crate https://crates.io/api/v1/crates/cargo_metadata/0.9.1/download -> cargo_metadata-0.9.1.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/fixedbitset/0.1.9/download -> fixedbitset-0.1.9.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.6/download -> hermit-abi-0.1.6.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.66/download -> libc-0.2.66.crate https://crates.io/api/v1/crates/ordermap/0.3.5/download -> ordermap-0.3.5.crate https://crates.io/api/v1/crates/petgraph/0.4.13/download -> petgraph-0.4.13.crate https://crates.io/api/v1/crates/proc-macro-error/0.4.5/download -> proc-macro-error-0.4.5.crate https://crates.io/api/v1/crates/proc-macro-error-attr/0.4.5/download -> proc-macro-error-attr-0.4.5.crate https://crates.io/api/v1/crates/proc-macro2/1.0.8/download -> proc-macro2-1.0.8.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/rustversion/1.0.2/download -> rustversion-1.0.2.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.104/download -> serde-1.0.104.crate https://crates.io/api/v1/crates/serde_derive/1.0.104/download -> serde_derive-1.0.104.crate https://crates.io/api/v1/crates/serde_json/1.0.45/download -> serde_json-1.0.45.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.8/download -> structopt-0.3.8.crate https://crates.io/api/v1/crates/structopt-derive/0.4.1/download -> structopt-derive-0.4.1.crate https://crates.io/api/v1/crates/syn/1.0.14/download -> syn-1.0.14.crate https://crates.io/api/v1/crates/syn-mid/0.4.0/download -> syn-mid-0.4.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	59ecae2c29d723be70671fd182038195	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8d01f3d5964a286d513c9a16b5511a39
diff --git a/metadata/md5-cache/media-sound/music-file-organizer-1.0.2 b/metadata/md5-cache/media-sound/music-file-organizer-1.0.3
index 61707515492d..04e26e2f3dba 100644
--- a/metadata/md5-cache/media-sound/music-file-organizer-1.0.2
+++ b/metadata/md5-cache/media-sound/music-file-organizer-1.0.3
@@ -1,11 +1,11 @@
 DEFINED_PHASES=postinst
 DEPEND=media-libs/taglib dev-libs/icu:= virtual/pkgconfig
-DESCRIPTION=Organizes audio files into directories based on metadata tags, along with other metadata utilities.
-EAPI=5
+DESCRIPTION=Organizes audio files into directories based on metadata tags
+EAPI=7
 HOMEPAGE=https://git.zx2c4.com/music-file-organizer/about/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/taglib dev-libs/icu:=
 SLOT=0
-SRC_URI=https://git.zx2c4.com/music-file-organizer/snapshot/music-file-organizer-1.0.2.tar.xz
-_md5_=06acbfb6091dcef4d423f34d0a3c74e8
+SRC_URI=https://git.zx2c4.com/music-file-organizer/snapshot/music-file-organizer-1.0.3.tar.xz
+_md5_=ffc78e51b9e52edce89705cb1ba2ccd5